diff --git a/src/jmh/java/org/jabref/benchmarks/Benchmarks.java b/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
index e553c87ceec2..291f7420d554 100644
--- a/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
+++ b/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
@@ -1,10 +1,8 @@
 package org.jabref.benchmarks;
 
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Random;
+import static org.mockito.Mockito.mock;
+
+import com.airhacks.afterburner.injection.Injector;
 
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
@@ -31,8 +29,6 @@
 import org.jabref.model.groups.KeywordGroup;
 import org.jabref.model.groups.WordKeywordGroup;
 import org.jabref.model.metadata.MetaData;
-
-import com.airhacks.afterburner.injection.Injector;
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
@@ -40,7 +36,11 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.runner.RunnerException;
 
-import static org.mockito.Mockito.mock;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.List;
+import java.util.Random;
 
 @State(Scope.Thread)
 public class Benchmarks {
@@ -59,7 +59,9 @@ public void init() throws Exception {
             BibEntry entry = new BibEntry();
             entry.setCitationKey("id" + i);
             entry.setField(StandardField.TITLE, "This is my title " + i);
-            entry.setField(StandardField.AUTHOR, "Firstname Lastname and FirstnameA LastnameA and FirstnameB LastnameB" + i);
+            entry.setField(
+                    StandardField.AUTHOR,
+                    "Firstname Lastname and FirstnameA LastnameA and FirstnameB LastnameB" + i);
             entry.setField(StandardField.JOURNAL, "Journal Title " + i);
             entry.setField(StandardField.KEYWORDS, "testkeyword");
             entry.setField(StandardField.YEAR, "1" + i);
@@ -69,21 +71,25 @@ public void init() throws Exception {
 
         bibtexString = getOutputWriter().toString();
 
-        latexConversionString = "{A} \\textbf{bold} approach {\\it to} ${{\\Sigma}}{\\Delta}$ modulator \\textsuperscript{2} \\$";
+        latexConversionString =
+                "{A} \\textbf{bold} approach {\\it to} ${{\\Sigma}}{\\Delta}$ modulator \\textsuperscript{2} \\$";
 
-        htmlConversionString = "<b>&Ouml;sterreich</b> &#8211; &amp; characters &#x2aa2; <i>italic</i>";
+        htmlConversionString =
+                "<b>&Ouml;sterreich</b> &#8211; &amp; characters &#x2aa2; <i>italic</i>";
     }
 
     private StringWriter getOutputWriter() throws IOException {
         StringWriter outputWriter = new StringWriter();
         BibWriter bibWriter = new BibWriter(outputWriter, OS.NEWLINE);
-        BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
-                bibWriter,
-                mock(SelfContainedSaveConfiguration.class),
-                mock(FieldPreferences.class),
-                mock(CitationKeyPatternPreferences.class),
-                new BibEntryTypesManager());
-        databaseWriter.savePartOfDatabase(new BibDatabaseContext(database, new MetaData()), database.getEntries());
+        BibtexDatabaseWriter databaseWriter =
+                new BibtexDatabaseWriter(
+                        bibWriter,
+                        mock(SelfContainedSaveConfiguration.class),
+                        mock(FieldPreferences.class),
+                        mock(CitationKeyPatternPreferences.class),
+                        new BibEntryTypesManager());
+        databaseWriter.savePartOfDatabase(
+                new BibDatabaseContext(database, new MetaData()), database.getEntries());
         return outputWriter;
     }
 
@@ -136,7 +142,15 @@ public String htmlToLatexConversion() {
 
     @Benchmark
     public boolean keywordGroupContains() {
-        KeywordGroup group = new WordKeywordGroup("testGroup", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, "testkeyword", false, ',', false);
+        KeywordGroup group =
+                new WordKeywordGroup(
+                        "testGroup",
+                        GroupHierarchyType.INDEPENDENT,
+                        StandardField.KEYWORDS,
+                        "testkeyword",
+                        false,
+                        ',',
+                        false);
         return group.containsAll(database.getEntries());
     }
 
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 852af1ba3961..6cd6e00dc8d6 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -12,35 +12,34 @@
     requires javafx.controls;
     requires javafx.web;
     requires javafx.fxml;
-
     requires afterburner.fx;
-    provides com.airhacks.afterburner.views.ResourceLocator
-            with org.jabref.gui.util.JabRefResourceLocator;
+
+    provides com.airhacks.afterburner.views.ResourceLocator with
+            org.jabref.gui.util.JabRefResourceLocator;
 
     requires com.dlsc.gemsfx;
+
     uses com.dlsc.gemsfx.TagsField;
+
     // Provides number input fields for parameters in AI expert settings
     requires com.dlsc.unitfx;
-
     requires com.tobiasdiez.easybind;
-
     requires de.saxsys.mvvmfx;
     requires de.saxsys.mvvmfx.validation;
-
     requires org.controlsfx.controls;
     requires org.fxmisc.flowless;
     requires org.fxmisc.richtext;
-
     requires org.kordamp.ikonli.core;
     requires org.kordamp.ikonli.javafx;
     requires org.kordamp.ikonli.materialdesign2;
+
     uses org.kordamp.ikonli.IkonHandler;
     uses org.kordamp.ikonli.IkonProvider;
 
-    provides org.kordamp.ikonli.IkonHandler
-            with org.jabref.gui.icon.JabRefIkonHandler;
-    provides org.kordamp.ikonli.IkonProvider
-            with org.jabref.gui.icon.JabrefIconProvider;
+    provides org.kordamp.ikonli.IkonHandler with
+            org.jabref.gui.icon.JabRefIkonHandler;
+    provides org.kordamp.ikonli.IkonProvider with
+            org.jabref.gui.icon.JabrefIconProvider;
 
     requires reactfx;
     // endregion
@@ -52,10 +51,11 @@
     requires org.tinylog.api;
     requires org.tinylog.api.slf4j;
     requires org.tinylog.impl;
+
     // endregion
 
-    provides org.tinylog.writers.Writer
-    with org.jabref.gui.logging.GuiWriter;
+    provides org.tinylog.writers.Writer with
+            org.jabref.gui.logging.GuiWriter;
 
     // Preferences and XML
     requires java.prefs;
@@ -100,7 +100,9 @@
     requires ojdbc10;
     requires org.postgresql.jdbc;
     requires org.mariadb.jdbc;
+
     uses org.mariadb.jdbc.credential.CredentialPlugin;
+
     // endregion
 
     // region: Apache Commons and other (similar) helper libraries
@@ -123,23 +125,17 @@
 
     requires jbibtex;
     requires citeproc.java;
-
     requires snuggletex.core;
-
     requires org.apache.pdfbox;
     requires org.apache.xmpbox;
     requires com.ibm.icu;
-
     requires flexmark;
     requires flexmark.html2md.converter;
     requires flexmark.util.ast;
     requires flexmark.util.data;
-
     requires com.h2database.mvstore;
-
     requires java.keyring;
     requires org.freedesktop.dbus;
-
     requires org.jooq.jool;
 
     // region AI
@@ -153,6 +149,7 @@
     requires langchain4j.hugging.face;
     requires langchain4j.mistral.ai;
     requires langchain4j.open.ai;
+
     uses ai.djl.engine.EngineProvider;
     uses ai.djl.repository.RepositoryFactory;
     uses ai.djl.repository.zoo.ZooProvider;
@@ -164,6 +161,7 @@
      * In case the version is updated, please also increment {@link org.jabref.model.search.SearchFieldConstants#VERSION} to trigger reindexing.
      */
     uses org.apache.lucene.codecs.lucene99.Lucene99Codec;
+
     requires org.apache.lucene.analysis.common;
     requires org.apache.lucene.core;
     requires org.apache.lucene.highlighter;
@@ -173,8 +171,8 @@
     requires net.harawata.appdirs;
     requires com.sun.jna;
     requires com.sun.jna.platform;
-
     requires org.eclipse.jgit;
+
     uses org.eclipse.jgit.transport.SshSessionFactory;
     uses org.eclipse.jgit.lib.Signer;
 
@@ -189,5 +187,5 @@
     requires mslinks;
     requires org.antlr.antlr4.runtime;
     requires org.libreoffice.uno;
-    // endregion
+// endregion
 }
diff --git a/src/main/java/org/jabref/Launcher.java b/src/main/java/org/jabref/Launcher.java
index 947c2f3dd343..493f4c8758e2 100644
--- a/src/main/java/org/jabref/Launcher.java
+++ b/src/main/java/org/jabref/Launcher.java
@@ -1,16 +1,8 @@
 package org.jabref;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.Authenticator;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import com.airhacks.afterburner.injection.Injector;
 
+import org.apache.commons.cli.ParseException;
 import org.jabref.cli.ArgumentProcessor;
 import org.jabref.cli.JabRefCLI;
 import org.jabref.gui.JabRefGUI;
@@ -37,14 +29,22 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.DirectoryMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import com.airhacks.afterburner.injection.Injector;
-import org.apache.commons.cli.ParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 import org.tinylog.configuration.Configuration;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.Authenticator;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
 /**
  * The main entry point for the JabRef application.
  * <p>
@@ -76,8 +76,13 @@ public static void main(String[] args) {
 
             PreferencesMigrations.runMigrations(preferences, entryTypesManager);
 
-            Injector.setModelOrService(JournalAbbreviationRepository.class, JournalAbbreviationLoader.loadRepository(preferences.getJournalAbbreviationPreferences()));
-            Injector.setModelOrService(ProtectedTermsLoader.class, new ProtectedTermsLoader(preferences.getProtectedTermsPreferences()));
+            Injector.setModelOrService(
+                    JournalAbbreviationRepository.class,
+                    JournalAbbreviationLoader.loadRepository(
+                            preferences.getJournalAbbreviationPreferences()));
+            Injector.setModelOrService(
+                    ProtectedTermsLoader.class,
+                    new ProtectedTermsLoader(preferences.getProtectedTermsPreferences()));
 
             configureProxy(preferences.getProxyPreferences());
             configureSSL(preferences.getSSLPreferences());
@@ -87,19 +92,21 @@ public static void main(String[] args) {
             try {
                 DefaultFileUpdateMonitor fileUpdateMonitor = new DefaultFileUpdateMonitor();
                 Injector.setModelOrService(FileUpdateMonitor.class, fileUpdateMonitor);
-                HeadlessExecutorService.INSTANCE.executeInterruptableTask(fileUpdateMonitor, "FileUpdateMonitor");
+                HeadlessExecutorService.INSTANCE.executeInterruptableTask(
+                        fileUpdateMonitor, "FileUpdateMonitor");
 
                 DirectoryMonitor directoryMonitor = new DefaultDirectoryMonitor();
                 Injector.setModelOrService(DirectoryMonitor.class, directoryMonitor);
 
                 // Process arguments
-                ArgumentProcessor argumentProcessor = new ArgumentProcessor(
-                        args,
-                        ArgumentProcessor.Mode.INITIAL_START,
-                        preferences,
-                        preferences,
-                        fileUpdateMonitor,
-                        entryTypesManager);
+                ArgumentProcessor argumentProcessor =
+                        new ArgumentProcessor(
+                                args,
+                                ArgumentProcessor.Mode.INITIAL_START,
+                                preferences,
+                                preferences,
+                                fileUpdateMonitor,
+                                entryTypesManager);
                 argumentProcessor.processArguments();
                 if (argumentProcessor.shouldShutDown()) {
                     LOGGER.debug("JabRef shut down after processing command line arguments");
@@ -151,15 +158,18 @@ private static void initLogging(String[] args) {
 
         // The "Shared File Writer" is explained at
         // https://tinylog.org/v2/configuration/#shared-file-writer
-        Map<String, String> configuration = Map.of(
-                "level", isDebugEnabled ? "debug" : "info",
-                "writerFile", "rolling file",
-                "writerFile.level", isDebugEnabled ? "debug" : "info",
-                // We need to manually join the path, because ".resolve" does not work on Windows, because ":" is not allowed in file names on Windows
-                "writerFile.file", directory + File.separator + "log_{date:yyyy-MM-dd_HH-mm-ss}.txt",
-                "writerFile.charset", "UTF-8",
-                "writerFile.policies", "startup",
-                "writerFile.backups", "30");
+        Map<String, String> configuration =
+                Map.of(
+                        "level", isDebugEnabled ? "debug" : "info",
+                        "writerFile", "rolling file",
+                        "writerFile.level", isDebugEnabled ? "debug" : "info",
+                        // We need to manually join the path, because ".resolve" does not work on
+                        // Windows, because ":" is not allowed in file names on Windows
+                        "writerFile.file",
+                                directory + File.separator + "log_{date:yyyy-MM-dd_HH-mm-ss}.txt",
+                        "writerFile.charset", "UTF-8",
+                        "writerFile.policies", "startup",
+                        "writerFile.backups", "30");
         configuration.forEach(Configuration::set);
 
         LOGGER = LoggerFactory.getLogger(Launcher.class);
@@ -168,7 +178,8 @@ private static void initLogging(String[] args) {
     /**
      * @return true if JabRef should continue starting up, false if it should quit.
      */
-    private static boolean handleMultipleAppInstances(String[] args, RemotePreferences remotePreferences) throws InterruptedException {
+    private static boolean handleMultipleAppInstances(
+            String[] args, RemotePreferences remotePreferences) throws InterruptedException {
         LOGGER.trace("Checking for remote handling...");
         if (remotePreferences.useRemoteServer()) {
             // Try to contact already running JabRef
@@ -176,15 +187,20 @@ private static boolean handleMultipleAppInstances(String[] args, RemotePreferenc
             if (remoteClient.ping()) {
                 LOGGER.debug("Pinging other instance succeeded.");
                 if (args.length == 0) {
-                    // There is already a server out there, avoid showing log "Passing arguments" while no arguments are provided.
-                    LOGGER.warn("This JabRef instance is already running. Please switch to that instance.");
+                    // There is already a server out there, avoid showing log "Passing arguments"
+                    // while no arguments are provided.
+                    LOGGER.warn(
+                            "This JabRef instance is already running. Please switch to that instance.");
                 } else {
-                    // We are not alone, there is already a server out there, send command line arguments to other instance
+                    // We are not alone, there is already a server out there, send command line
+                    // arguments to other instance
                     LOGGER.debug("Passing arguments passed on to running JabRef...");
                     if (remoteClient.sendCommandLineArguments(args)) {
                         // So we assume it's all taken care of, and quit.
-                        // Output to both to the log and the screen. Therefore, we do not have an additional System.out.println.
-                        LOGGER.info("Arguments passed on to running JabRef instance. Shutting down.");
+                        // Output to both to the log and the screen. Therefore, we do not have an
+                        // additional System.out.println.
+                        LOGGER.info(
+                                "Arguments passed on to running JabRef instance. Shutting down.");
                     } else {
                         LOGGER.warn("Could not communicate with other running JabRef instance.");
                     }
@@ -206,7 +222,8 @@ private static void configureProxy(ProxyPreferences proxyPreferences) {
     }
 
     private static void configureSSL(SSLPreferences sslPreferences) {
-        TrustStoreManager.createTruststoreFileIfNotExist(Path.of(sslPreferences.getTruststorePath()));
+        TrustStoreManager.createTruststoreFileIfNotExist(
+                Path.of(sslPreferences.getTruststorePath()));
     }
 
     private static void clearOldSearchIndices() {
@@ -221,7 +238,9 @@ private static void clearOldSearchIndices() {
 
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(appData)) {
             for (Path path : stream) {
-                if (Files.isDirectory(path) && !path.toString().endsWith("ssl") && path.toString().contains("lucene")
+                if (Files.isDirectory(path)
+                        && !path.toString().endsWith("ssl")
+                        && path.toString().contains("lucene")
                         && !path.equals(currentIndexPath)) {
                     LOGGER.info("Deleting out-of-date fulltext search index at {}.", path);
                     Files.walk(path)
diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index 64edddac7a4f..26624075e34c 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -1,17 +1,7 @@
 package org.jabref.cli;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;
-import java.util.Set;
-import java.util.prefs.BackingStoreException;
+import com.airhacks.afterburner.injection.Injector;
+import com.google.common.base.Throwables;
 
 import org.jabref.gui.externalfiles.AutoSetFileLinksUtil;
 import org.jabref.gui.preferences.GuiPreferences;
@@ -59,16 +49,29 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import com.airhacks.afterburner.injection.Injector;
-import com.google.common.base.Throwables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.Set;
+import java.util.prefs.BackingStoreException;
+
 public class ArgumentProcessor {
     private static final Logger LOGGER = LoggerFactory.getLogger(ArgumentProcessor.class);
 
-    public enum Mode { INITIAL_START, REMOTE_START }
+    public enum Mode {
+        INITIAL_START,
+        REMOTE_START
+    }
 
     private final JabRefCLI cli;
 
@@ -88,12 +91,13 @@ public enum Mode { INITIAL_START, REMOTE_START }
      *
      * @implNote both cli and gui preferences are passed to make the dependency to GUI parts explicit
      */
-    public ArgumentProcessor(String[] args,
-                             Mode startupMode,
-                             CliPreferences cliPreferences,
-                             GuiPreferences guiPreferences,
-                             FileUpdateMonitor fileUpdateMonitor,
-                             BibEntryTypesManager entryTypesManager)
+    public ArgumentProcessor(
+            String[] args,
+            Mode startupMode,
+            CliPreferences cliPreferences,
+            GuiPreferences guiPreferences,
+            FileUpdateMonitor fileUpdateMonitor,
+            BibEntryTypesManager entryTypesManager)
             throws org.apache.commons.cli.ParseException {
         this.cli = new JabRefCLI(args);
         this.startupMode = startupMode;
@@ -114,7 +118,8 @@ private Optional<ParserResult> importToOpenBase(String importArguments) {
         return result;
     }
 
-    private Optional<ParserResult> importBibtexToOpenBase(String argument, ImportFormatPreferences importFormatPreferences) {
+    private Optional<ParserResult> importBibtexToOpenBase(
+            String argument, ImportFormatPreferences importFormatPreferences) {
         BibtexParser parser = new BibtexParser(importFormatPreferences);
         try {
             List<BibEntry> entries = parser.parseEntries(argument);
@@ -122,7 +127,10 @@ private Optional<ParserResult> importBibtexToOpenBase(String argument, ImportFor
             result.setToOpenTab();
             return Optional.of(result);
         } catch (ParseException e) {
-            System.err.println(Localization.lang("Error occurred when parsing entry") + ": " + e.getLocalizedMessage());
+            System.err.println(
+                    Localization.lang("Error occurred when parsing entry")
+                            + ": "
+                            + e.getLocalizedMessage());
             return Optional.empty();
         }
     }
@@ -137,12 +145,16 @@ private Optional<ParserResult> importFile(String importArguments) {
 
         String address = data[0];
         Path file;
-        if (address.startsWith("http://") || address.startsWith("https://") || address.startsWith("ftp://")) {
+        if (address.startsWith("http://")
+                || address.startsWith("https://")
+                || address.startsWith("ftp://")) {
             // Download web resource to temporary file
             try {
                 file = new URLDownload(address).toTemporaryFile();
             } catch (FetcherException | MalformedURLException e) {
-                System.err.println(Localization.lang("Problem downloading from %1", address) + e.getLocalizedMessage());
+                System.err.println(
+                        Localization.lang("Problem downloading from %1", address)
+                                + e.getLocalizedMessage());
                 return Optional.empty();
             }
         } else {
@@ -161,22 +173,23 @@ private Optional<ParserResult> importFile(String importArguments) {
         }
 
         Optional<ParserResult> importResult = importFile(file, importFormat);
-        importResult.ifPresent(result -> {
-            if (result.hasWarnings()) {
-                System.out.println(result.getErrorMessage());
-            }
-        });
+        importResult.ifPresent(
+                result -> {
+                    if (result.hasWarnings()) {
+                        System.out.println(result.getErrorMessage());
+                    }
+                });
         return importResult;
     }
 
     private Optional<ParserResult> importFile(Path file, String importFormat) {
         try {
-            ImportFormatReader importFormatReader = new ImportFormatReader(
-                    cliPreferences.getImporterPreferences(),
-                    cliPreferences.getImportFormatPreferences(),
-                    cliPreferences.getCitationKeyPatternPreferences(),
-                    fileUpdateMonitor
-            );
+            ImportFormatReader importFormatReader =
+                    new ImportFormatReader(
+                            cliPreferences.getImporterPreferences(),
+                            cliPreferences.getImportFormatPreferences(),
+                            cliPreferences.getCitationKeyPatternPreferences(),
+                            fileUpdateMonitor);
 
             if (!"*".equals(importFormat)) {
                 System.out.println(Localization.lang("Importing %0", file));
@@ -193,7 +206,10 @@ private Optional<ParserResult> importFile(Path file, String importFormat) {
                 return Optional.of(importResult.parserResult());
             }
         } catch (ImportException ex) {
-            System.err.println(Localization.lang("Error opening file '%0'", file) + "\n" + ex.getLocalizedMessage());
+            System.err.println(
+                    Localization.lang("Error opening file '%0'", file)
+                            + "\n"
+                            + ex.getLocalizedMessage());
             return Optional.empty();
         }
     }
@@ -235,7 +251,8 @@ public void processArguments() {
                     return;
                 }
             } else {
-                System.err.println(Localization.lang("The output option depends on a valid input option."));
+                System.err.println(
+                        Localization.lang("The output option depends on a valid input option."));
             }
         }
 
@@ -247,13 +264,17 @@ public void processArguments() {
             automaticallySetFileLinks(loaded);
         }
 
-        if ((cli.isWriteXmpToPdf() && cli.isEmbedBibFileInPdf()) || (cli.isWriteMetadataToPdf() && (cli.isWriteXmpToPdf() || cli.isEmbedBibFileInPdf()))) {
-            System.err.println("Give only one of [writeXmpToPdf, embedBibFileInPdf, writeMetadataToPdf]");
+        if ((cli.isWriteXmpToPdf() && cli.isEmbedBibFileInPdf())
+                || (cli.isWriteMetadataToPdf()
+                        && (cli.isWriteXmpToPdf() || cli.isEmbedBibFileInPdf()))) {
+            System.err.println(
+                    "Give only one of [writeXmpToPdf, embedBibFileInPdf, writeMetadataToPdf]");
         }
 
         if (cli.isWriteMetadataToPdf() || cli.isWriteXmpToPdf() || cli.isEmbedBibFileInPdf()) {
             if (!loaded.isEmpty()) {
-                writeMetadataToPdf(loaded,
+                writeMetadataToPdf(
+                        loaded,
                         cli.getWriteMetadataToPdf(),
                         cliPreferences.getXmpPreferences(),
                         cliPreferences.getFilePreferences(),
@@ -271,7 +292,8 @@ public void processArguments() {
                 exportFile(loaded, cli.getFileExport().split(","));
                 LOGGER.debug("Finished export");
             } else {
-                System.err.println(Localization.lang("The output option depends on a valid import option."));
+                System.err.println(
+                        Localization.lang("The output option depends on a valid import option."));
             }
         }
 
@@ -300,16 +322,17 @@ public void processArguments() {
         }
     }
 
-    private void writeMetadataToPdf(List<ParserResult> loaded,
-                                    String filesAndCiteKeys,
-                                    XmpPreferences xmpPreferences,
-                                    FilePreferences filePreferences,
-                                    BibDatabaseMode databaseMode,
-                                    BibEntryTypesManager entryTypesManager,
-                                    FieldPreferences fieldPreferences,
-                                    JournalAbbreviationRepository abbreviationRepository,
-                                    boolean writeXMP,
-                                    boolean embeddBibfile) {
+    private void writeMetadataToPdf(
+            List<ParserResult> loaded,
+            String filesAndCiteKeys,
+            XmpPreferences xmpPreferences,
+            FilePreferences filePreferences,
+            BibDatabaseMode databaseMode,
+            BibEntryTypesManager entryTypesManager,
+            FieldPreferences fieldPreferences,
+            JournalAbbreviationRepository abbreviationRepository,
+            boolean writeXMP,
+            boolean embeddBibfile) {
         if (loaded.isEmpty()) {
             LOGGER.error("The write xmp option depends on a valid import option.");
             return;
@@ -318,7 +341,8 @@ private void writeMetadataToPdf(List<ParserResult> loaded,
         BibDatabaseContext databaseContext = pr.getDatabaseContext();
 
         XmpPdfExporter xmpPdfExporter = new XmpPdfExporter(xmpPreferences);
-        EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter = new EmbeddedBibFilePdfExporter(databaseMode, entryTypesManager, fieldPreferences);
+        EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter =
+                new EmbeddedBibFilePdfExporter(databaseMode, entryTypesManager, fieldPreferences);
 
         if ("all".equals(filesAndCiteKeys)) {
             for (BibEntry entry : databaseContext.getEntries()) {
@@ -366,28 +390,47 @@ private void writeMetadataToPdf(List<ParserResult> loaded,
                 embeddBibfile);
     }
 
-    private void writeMetadataToPDFsOfEntry(BibDatabaseContext databaseContext,
-                                            String citeKey,
-                                            BibEntry entry,
-                                            FilePreferences filePreferences,
-                                            XmpPdfExporter xmpPdfExporter,
-                                            EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter,
-                                            JournalAbbreviationRepository abbreviationRepository,
-                                            boolean writeXMP,
-                                            boolean embedBibfile) {
+    private void writeMetadataToPDFsOfEntry(
+            BibDatabaseContext databaseContext,
+            String citeKey,
+            BibEntry entry,
+            FilePreferences filePreferences,
+            XmpPdfExporter xmpPdfExporter,
+            EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter,
+            JournalAbbreviationRepository abbreviationRepository,
+            boolean writeXMP,
+            boolean embedBibfile) {
         try {
             if (writeXMP) {
-                if (xmpPdfExporter.exportToAllFilesOfEntry(databaseContext, filePreferences, entry, List.of(entry), abbreviationRepository)) {
-                    System.out.printf("Successfully written XMP metadata on at least one linked file of %s%n", citeKey);
+                if (xmpPdfExporter.exportToAllFilesOfEntry(
+                        databaseContext,
+                        filePreferences,
+                        entry,
+                        List.of(entry),
+                        abbreviationRepository)) {
+                    System.out.printf(
+                            "Successfully written XMP metadata on at least one linked file of %s%n",
+                            citeKey);
                 } else {
-                    System.err.printf("Cannot write XMP metadata on any linked files of %s. Make sure there is at least one linked file and the path is correct.%n", citeKey);
+                    System.err.printf(
+                            "Cannot write XMP metadata on any linked files of %s. Make sure there is at least one linked file and the path is correct.%n",
+                            citeKey);
                 }
             }
             if (embedBibfile) {
-                if (embeddedBibFilePdfExporter.exportToAllFilesOfEntry(databaseContext, filePreferences, entry, List.of(entry), abbreviationRepository)) {
-                    System.out.printf("Successfully embedded metadata on at least one linked file of %s%n", citeKey);
+                if (embeddedBibFilePdfExporter.exportToAllFilesOfEntry(
+                        databaseContext,
+                        filePreferences,
+                        entry,
+                        List.of(entry),
+                        abbreviationRepository)) {
+                    System.out.printf(
+                            "Successfully embedded metadata on at least one linked file of %s%n",
+                            citeKey);
                 } else {
-                    System.out.printf("Cannot embed metadata on any linked files of %s. Make sure there is at least one linked file and the path is correct.%n", citeKey);
+                    System.out.printf(
+                            "Cannot embed metadata on any linked files of %s. Make sure there is at least one linked file and the path is correct.%n",
+                            citeKey);
                 }
             }
         } catch (Exception e) {
@@ -395,53 +438,85 @@ private void writeMetadataToPDFsOfEntry(BibDatabaseContext databaseContext,
         }
     }
 
-    private void writeMetadataToPdfByCitekey(BibDatabaseContext databaseContext,
-                                             List<String> citeKeys,
-                                             FilePreferences filePreferences,
-                                             XmpPdfExporter xmpPdfExporter,
-                                             EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter,
-                                             JournalAbbreviationRepository abbreviationRepository,
-                                             boolean writeXMP,
-                                             boolean embeddBibfile) {
+    private void writeMetadataToPdfByCitekey(
+            BibDatabaseContext databaseContext,
+            List<String> citeKeys,
+            FilePreferences filePreferences,
+            XmpPdfExporter xmpPdfExporter,
+            EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter,
+            JournalAbbreviationRepository abbreviationRepository,
+            boolean writeXMP,
+            boolean embeddBibfile) {
         for (String citeKey : citeKeys) {
-            List<BibEntry> bibEntryList = databaseContext.getDatabase().getEntriesByCitationKey(citeKey);
+            List<BibEntry> bibEntryList =
+                    databaseContext.getDatabase().getEntriesByCitationKey(citeKey);
             if (bibEntryList.isEmpty()) {
                 System.err.printf("Skipped - Cannot find %s in library.%n", citeKey);
                 continue;
             }
             for (BibEntry entry : bibEntryList) {
-                writeMetadataToPDFsOfEntry(databaseContext, citeKey, entry, filePreferences, xmpPdfExporter, embeddedBibFilePdfExporter, abbreviationRepository, writeXMP, embeddBibfile);
+                writeMetadataToPDFsOfEntry(
+                        databaseContext,
+                        citeKey,
+                        entry,
+                        filePreferences,
+                        xmpPdfExporter,
+                        embeddedBibFilePdfExporter,
+                        abbreviationRepository,
+                        writeXMP,
+                        embeddBibfile);
             }
         }
     }
 
-    private void writeMetadataToPdfByFileNames(BibDatabaseContext databaseContext,
-                                               List<String> pdfs,
-                                               FilePreferences filePreferences,
-                                               XmpPdfExporter xmpPdfExporter,
-                                               EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter,
-                                               JournalAbbreviationRepository abbreviationRepository,
-                                               boolean writeXMP,
-                                               boolean embeddBibfile) {
+    private void writeMetadataToPdfByFileNames(
+            BibDatabaseContext databaseContext,
+            List<String> pdfs,
+            FilePreferences filePreferences,
+            XmpPdfExporter xmpPdfExporter,
+            EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter,
+            JournalAbbreviationRepository abbreviationRepository,
+            boolean writeXMP,
+            boolean embeddBibfile) {
         for (String fileName : pdfs) {
             Path filePath = Path.of(fileName);
             if (!filePath.isAbsolute()) {
-                filePath = FileUtil.find(fileName, databaseContext.getFileDirectories(filePreferences)).orElse(FileUtil.find(fileName, List.of(Path.of("").toAbsolutePath())).orElse(filePath));
+                filePath =
+                        FileUtil.find(fileName, databaseContext.getFileDirectories(filePreferences))
+                                .orElse(
+                                        FileUtil.find(
+                                                        fileName,
+                                                        List.of(Path.of("").toAbsolutePath()))
+                                                .orElse(filePath));
             }
             if (Files.exists(filePath)) {
                 try {
                     if (writeXMP) {
-                        if (xmpPdfExporter.exportToFileByPath(databaseContext, filePreferences, filePath, abbreviationRepository)) {
-                            System.out.printf("Successfully written XMP metadata of at least one entry to %s%n", fileName);
+                        if (xmpPdfExporter.exportToFileByPath(
+                                databaseContext,
+                                filePreferences,
+                                filePath,
+                                abbreviationRepository)) {
+                            System.out.printf(
+                                    "Successfully written XMP metadata of at least one entry to %s%n",
+                                    fileName);
                         } else {
-                            System.out.printf("File %s is not linked to any entry in database.%n", fileName);
+                            System.out.printf(
+                                    "File %s is not linked to any entry in database.%n", fileName);
                         }
                     }
                     if (embeddBibfile) {
-                        if (embeddedBibFilePdfExporter.exportToFileByPath(databaseContext, filePreferences, filePath, abbreviationRepository)) {
-                            System.out.printf("Successfully embedded XMP metadata of at least one entry to %s%n", fileName);
+                        if (embeddedBibFilePdfExporter.exportToFileByPath(
+                                databaseContext,
+                                filePreferences,
+                                filePath,
+                                abbreviationRepository)) {
+                            System.out.printf(
+                                    "Successfully embedded XMP metadata of at least one entry to %s%n",
+                                    fileName);
                         } else {
-                            System.out.printf("File %s is not linked to any entry in database.%n", fileName);
+                            System.out.printf(
+                                    "File %s is not linked to any entry in database.%n", fileName);
                         }
                     }
                 } catch (IOException e) {
@@ -468,7 +543,13 @@ private boolean exportMatches(List<ParserResult> loaded) {
         List<BibEntry> matches;
         try {
             // extract current thread task executor from luceneManager
-            matches = new DatabaseSearcher(query, databaseContext, new CurrentThreadTaskExecutor(), cliPreferences.getFilePreferences()).getMatches();
+            matches =
+                    new DatabaseSearcher(
+                                    query,
+                                    databaseContext,
+                                    new CurrentThreadTaskExecutor(),
+                                    cliPreferences.getFilePreferences())
+                            .getMatches();
         } catch (IOException e) {
             LOGGER.error("Error occurred when searching", e);
             return false;
@@ -485,8 +566,12 @@ private boolean exportMatches(List<ParserResult> loaded) {
                         // default exporter: bib file
                         formatName = "bib";
                 default -> {
-                    System.err.println(Localization.lang("Output file missing").concat(". \n \t ")
-                                                   .concat(Localization.lang("Usage")).concat(": ") + JabRefCLI.getExportMatchesSyntax());
+                    System.err.println(
+                            Localization.lang("Output file missing")
+                                            .concat(". \n \t ")
+                                            .concat(Localization.lang("Usage"))
+                                            .concat(": ")
+                                    + JabRefCLI.getExportMatchesSyntax());
                     guiNeeded = false;
                     return false;
                 }
@@ -499,9 +584,10 @@ private boolean exportMatches(List<ParserResult> loaded) {
                 LOGGER.debug("Finished export");
             } else {
                 // export new database
-                ExporterFactory exporterFactory = ExporterFactory.create(
-                        cliPreferences,
-                        Injector.instantiateModelOrService(BibEntryTypesManager.class));
+                ExporterFactory exporterFactory =
+                        ExporterFactory.create(
+                                cliPreferences,
+                                Injector.instantiateModelOrService(BibEntryTypesManager.class));
                 Optional<Exporter> exporter = exporterFactory.getExporterByName(formatName);
                 if (exporter.isEmpty()) {
                     System.err.println(Localization.lang("Unknown export format %0", formatName));
@@ -509,14 +595,19 @@ private boolean exportMatches(List<ParserResult> loaded) {
                     // We have an TemplateExporter instance:
                     try {
                         System.out.println(Localization.lang("Exporting %0", data[1]));
-                        exporter.get().export(
-                                databaseContext,
-                                Path.of(data[1]),
-                                matches,
-                                Collections.emptyList(),
-                                Injector.instantiateModelOrService(JournalAbbreviationRepository.class));
+                        exporter.get()
+                                .export(
+                                        databaseContext,
+                                        Path.of(data[1]),
+                                        matches,
+                                        Collections.emptyList(),
+                                        Injector.instantiateModelOrService(
+                                                JournalAbbreviationRepository.class));
                     } catch (Exception ex) {
-                        System.err.println(Localization.lang("Could not export file '%0' (reason: %1)", data[1], Throwables.getStackTraceAsString(ex)));
+                        System.err.println(
+                                Localization.lang(
+                                        "Could not export file '%0' (reason: %1)",
+                                        data[1], Throwables.getStackTraceAsString(ex)));
                     }
                 }
             }
@@ -558,11 +649,14 @@ private List<ParserResult> importAndOpenFiles() {
                 ParserResult pr = new ParserResult();
                 if (bibExtension) {
                     try {
-                        pr = OpenDatabase.loadDatabase(
-                                Path.of(aLeftOver),
-                                cliPreferences.getImportFormatPreferences(),
-                                fileUpdateMonitor);
-                        // In contrast to org.jabref.gui.LibraryTab.onDatabaseLoadingSucceed, we do not execute OpenDatabaseAction.performPostOpenActions(result, dialogService);
+                        pr =
+                                OpenDatabase.loadDatabase(
+                                        Path.of(aLeftOver),
+                                        cliPreferences.getImportFormatPreferences(),
+                                        fileUpdateMonitor);
+                        // In contrast to org.jabref.gui.LibraryTab.onDatabaseLoadingSucceed, we do
+                        // not execute OpenDatabaseAction.performPostOpenActions(result,
+                        // dialogService);
                     } catch (IOException ex) {
                         pr = ParserResult.fromError(ex);
                         LOGGER.error("Error opening file '{}'", aLeftOver, ex);
@@ -600,7 +694,9 @@ private List<ParserResult> importAndOpenFiles() {
         }
 
         if (!cli.isBlank() && cli.isBibtexImport()) {
-            importBibtexToOpenBase(cli.getBibtexImport(), cliPreferences.getImportFormatPreferences()).ifPresent(loaded::add);
+            importBibtexToOpenBase(
+                            cli.getBibtexImport(), cliPreferences.getImportFormatPreferences())
+                    .ifPresent(loaded::add);
         }
 
         return loaded;
@@ -633,26 +729,38 @@ private boolean generateAux(List<ParserResult> loaded, String[] data) {
     private void saveDatabase(BibDatabase newBase, String subName) {
         try {
             System.out.println(Localization.lang("Saving") + ": " + subName);
-            try (AtomicFileWriter fileWriter = new AtomicFileWriter(Path.of(subName), StandardCharsets.UTF_8)) {
+            try (AtomicFileWriter fileWriter =
+                    new AtomicFileWriter(Path.of(subName), StandardCharsets.UTF_8)) {
                 BibWriter bibWriter = new BibWriter(fileWriter, OS.NEWLINE);
-                SelfContainedSaveConfiguration saveConfiguration = (SelfContainedSaveConfiguration) new SelfContainedSaveConfiguration()
-                        .withReformatOnSave(cliPreferences.getLibraryPreferences().shouldAlwaysReformatOnSave());
-                BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
-                        bibWriter,
-                        saveConfiguration,
-                        cliPreferences.getFieldPreferences(),
-                        cliPreferences.getCitationKeyPatternPreferences(),
-                        entryTypesManager);
+                SelfContainedSaveConfiguration saveConfiguration =
+                        (SelfContainedSaveConfiguration)
+                                new SelfContainedSaveConfiguration()
+                                        .withReformatOnSave(
+                                                cliPreferences
+                                                        .getLibraryPreferences()
+                                                        .shouldAlwaysReformatOnSave());
+                BibDatabaseWriter databaseWriter =
+                        new BibtexDatabaseWriter(
+                                bibWriter,
+                                saveConfiguration,
+                                cliPreferences.getFieldPreferences(),
+                                cliPreferences.getCitationKeyPatternPreferences(),
+                                entryTypesManager);
                 databaseWriter.saveDatabase(new BibDatabaseContext(newBase));
 
                 // Show just a warning message if encoding did not work for all characters:
                 if (fileWriter.hasEncodingProblems()) {
-                    System.err.println(Localization.lang("Warning") + ": "
-                                       + Localization.lang("UTF-8 could not be used to encode the following characters: %0", fileWriter.getEncodingProblems()));
+                    System.err.println(
+                            Localization.lang("Warning")
+                                    + ": "
+                                    + Localization.lang(
+                                            "UTF-8 could not be used to encode the following characters: %0",
+                                            fileWriter.getEncodingProblems()));
                 }
             }
         } catch (IOException ex) {
-            System.err.println(Localization.lang("Could not save file.") + "\n" + ex.getLocalizedMessage());
+            System.err.println(
+                    Localization.lang("Could not save file.") + "\n" + ex.getLocalizedMessage());
         }
     }
 
@@ -666,7 +774,8 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
                     saveDatabase(pr.getDatabase(), data[0]);
                 }
             } else {
-                System.err.println(Localization.lang("The output option depends on a valid import option."));
+                System.err.println(
+                        Localization.lang("The output option depends on a valid import option."));
             }
         } else if (data.length == 2) {
             // This signals that the latest import should be stored in the given
@@ -676,26 +785,32 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
             Path path = parserResult.getPath().get().toAbsolutePath();
             BibDatabaseContext databaseContext = parserResult.getDatabaseContext();
             databaseContext.setDatabasePath(path);
-            List<Path> fileDirForDatabase = databaseContext
-                    .getFileDirectories(cliPreferences.getFilePreferences());
+            List<Path> fileDirForDatabase =
+                    databaseContext.getFileDirectories(cliPreferences.getFilePreferences());
             System.out.println(Localization.lang("Exporting %0", data[0]));
-            ExporterFactory exporterFactory = ExporterFactory.create(
-                    cliPreferences,
-                    Injector.instantiateModelOrService(BibEntryTypesManager.class));
+            ExporterFactory exporterFactory =
+                    ExporterFactory.create(
+                            cliPreferences,
+                            Injector.instantiateModelOrService(BibEntryTypesManager.class));
             Optional<Exporter> exporter = exporterFactory.getExporterByName(data[1]);
             if (exporter.isEmpty()) {
                 System.err.println(Localization.lang("Unknown export format %0", data[1]));
             } else {
                 // We have an exporter:
                 try {
-                    exporter.get().export(
-                            parserResult.getDatabaseContext(),
-                            Path.of(data[0]),
-                            parserResult.getDatabaseContext().getDatabase().getEntries(),
-                            fileDirForDatabase,
-                            Injector.instantiateModelOrService(JournalAbbreviationRepository.class));
+                    exporter.get()
+                            .export(
+                                    parserResult.getDatabaseContext(),
+                                    Path.of(data[0]),
+                                    parserResult.getDatabaseContext().getDatabase().getEntries(),
+                                    fileDirForDatabase,
+                                    Injector.instantiateModelOrService(
+                                            JournalAbbreviationRepository.class));
                 } catch (Exception ex) {
-                    System.err.println(Localization.lang("Could not export file '%0' (reason: %1)", data[0], Throwables.getStackTraceAsString(ex)));
+                    System.err.println(
+                            Localization.lang(
+                                    "Could not export file '%0' (reason: %1)",
+                                    data[0], Throwables.getStackTraceAsString(ex)));
                 }
             }
         }
@@ -704,7 +819,8 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
     private void importPreferences() {
         try {
             cliPreferences.importPreferences(Path.of(cli.getPreferencesImport()));
-            Injector.setModelOrService(BibEntryTypesManager.class, cliPreferences.getCustomEntryTypesRepository());
+            Injector.setModelOrService(
+                    BibEntryTypesManager.class, cliPreferences.getCustomEntryTypesRepository());
         } catch (JabRefException ex) {
             LOGGER.error("Cannot import preferences", ex);
         }
@@ -725,7 +841,8 @@ private void resetPreferences(String value) {
             for (String key : keys) {
                 try {
                     cliPreferences.deleteKey(key.trim());
-                    System.out.println(Localization.lang("Resetting preference key '%0'", key.trim()));
+                    System.out.println(
+                            Localization.lang("Resetting preference key '%0'", key.trim()));
                 } catch (IllegalArgumentException e) {
                     System.out.println(e.getMessage());
                 }
@@ -736,18 +853,24 @@ private void resetPreferences(String value) {
     private void automaticallySetFileLinks(List<ParserResult> loaded) {
         for (ParserResult parserResult : loaded) {
             BibDatabase database = parserResult.getDatabase();
-            LOGGER.info("Automatically setting file links for {}",
-                    parserResult.getDatabaseContext().getDatabasePath()
-                                .map(Path::getFileName)
-                                .map(Path::toString).orElse("UNKNOWN"));
-
-            AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(
-                    parserResult.getDatabaseContext(),
-                    guiPreferences.getExternalApplicationsPreferences(),
-                    cliPreferences.getFilePreferences(),
-                    cliPreferences.getAutoLinkPreferences());
+            LOGGER.info(
+                    "Automatically setting file links for {}",
+                    parserResult
+                            .getDatabaseContext()
+                            .getDatabasePath()
+                            .map(Path::getFileName)
+                            .map(Path::toString)
+                            .orElse("UNKNOWN"));
+
+            AutoSetFileLinksUtil util =
+                    new AutoSetFileLinksUtil(
+                            parserResult.getDatabaseContext(),
+                            guiPreferences.getExternalApplicationsPreferences(),
+                            cliPreferences.getFilePreferences(),
+                            cliPreferences.getAutoLinkPreferences());
 
-            util.linkAssociatedFiles(database.getEntries(), (linkedFile, bibEntry) -> bibEntry.addFile(linkedFile));
+            util.linkAssociatedFiles(
+                    database.getEntries(), (linkedFile, bibEntry) -> bibEntry.addFile(linkedFile));
         }
     }
 
@@ -757,9 +880,10 @@ private void regenerateCitationKeys(List<ParserResult> loaded) {
 
             LOGGER.info(Localization.lang("Regenerating citation keys according to metadata"));
 
-            CitationKeyGenerator keyGenerator = new CitationKeyGenerator(
-                    parserResult.getDatabaseContext(),
-                    cliPreferences.getCitationKeyPatternPreferences());
+            CitationKeyGenerator keyGenerator =
+                    new CitationKeyGenerator(
+                            parserResult.getDatabaseContext(),
+                            cliPreferences.getCitationKeyPatternPreferences());
             for (BibEntry entry : database.getEntries()) {
                 keyGenerator.generateAndSetKey(entry);
             }
@@ -774,7 +898,8 @@ private void regenerateCitationKeys(List<ParserResult> loaded) {
      */
     private Optional<ParserResult> fetch(String fetchCommand) {
         if ((fetchCommand == null) || !fetchCommand.contains(":")) {
-            System.out.println(Localization.lang("Expected syntax for --fetch='<name of fetcher>:<query>'"));
+            System.out.println(
+                    Localization.lang("Expected syntax for --fetch='<name of fetcher>:<query>'"));
             System.out.println(Localization.lang("The following fetchers are available:"));
             return Optional.empty();
         }
@@ -783,12 +908,14 @@ private Optional<ParserResult> fetch(String fetchCommand) {
         String engine = split[0];
         String query = split[1];
 
-        Set<SearchBasedFetcher> fetchers = WebFetchers.getSearchBasedFetchers(
-                cliPreferences.getImportFormatPreferences(),
-                cliPreferences.getImporterPreferences());
-        Optional<SearchBasedFetcher> selectedFetcher = fetchers.stream()
-                                                               .filter(fetcher -> fetcher.getName().equalsIgnoreCase(engine))
-                                                               .findFirst();
+        Set<SearchBasedFetcher> fetchers =
+                WebFetchers.getSearchBasedFetchers(
+                        cliPreferences.getImportFormatPreferences(),
+                        cliPreferences.getImporterPreferences());
+        Optional<SearchBasedFetcher> selectedFetcher =
+                fetchers.stream()
+                        .filter(fetcher -> fetcher.getName().equalsIgnoreCase(engine))
+                        .findFirst();
         if (selectedFetcher.isEmpty()) {
             System.out.println(Localization.lang("Could not find fetcher '%0'", engine));
 
@@ -797,7 +924,8 @@ private Optional<ParserResult> fetch(String fetchCommand) {
 
             return Optional.empty();
         } else {
-            System.out.println(Localization.lang("Running query '%0' with fetcher '%1'.", query, engine));
+            System.out.println(
+                    Localization.lang("Running query '%0' with fetcher '%1'.", query, engine));
             System.out.print(Localization.lang("Please wait..."));
             try {
                 List<BibEntry> matches = selectedFetcher.get().performSearch(query);
@@ -805,7 +933,10 @@ private Optional<ParserResult> fetch(String fetchCommand) {
                     System.out.println("\r" + Localization.lang("No results found."));
                     return Optional.empty();
                 } else {
-                    System.out.println("\r" + Localization.lang("Found %0 results.", String.valueOf(matches.size())));
+                    System.out.println(
+                            "\r"
+                                    + Localization.lang(
+                                            "Found %0 results.", String.valueOf(matches.size())));
                     return Optional.of(new ParserResult(matches));
                 }
             } catch (FetcherException e) {
diff --git a/src/main/java/org/jabref/cli/AuxCommandLine.java b/src/main/java/org/jabref/cli/AuxCommandLine.java
index 61f4c133008d..fe8d9c02e9ee 100644
--- a/src/main/java/org/jabref/cli/AuxCommandLine.java
+++ b/src/main/java/org/jabref/cli/AuxCommandLine.java
@@ -1,7 +1,5 @@
 package org.jabref.cli;
 
-import java.nio.file.Path;
-
 import org.jabref.gui.auximport.AuxParserResultViewModel;
 import org.jabref.logic.auxparser.AuxParser;
 import org.jabref.logic.auxparser.AuxParserResult;
@@ -9,6 +7,8 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.strings.StringUtil;
 
+import java.nio.file.Path;
+
 public class AuxCommandLine {
     private final String auxFile;
     private final BibDatabase database;
diff --git a/src/main/java/org/jabref/cli/JabRefCLI.java b/src/main/java/org/jabref/cli/JabRefCLI.java
index 0cd74a0bba40..524f4f0d2778 100644
--- a/src/main/java/org/jabref/cli/JabRefCLI.java
+++ b/src/main/java/org/jabref/cli/JabRefCLI.java
@@ -1,10 +1,15 @@
 package org.jabref.cli;
 
-import java.util.List;
-import java.util.Objects;
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.util.Pair;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
 import org.jabref.logic.exporter.ExporterFactory;
 import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.logic.l10n.Localization;
@@ -15,17 +20,15 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
-import com.airhacks.afterburner.injection.Injector;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
+import java.util.List;
+import java.util.Objects;
 
 public class JabRefCLI {
-    private static final int WIDTH = 100; // Number of characters per line before a line break must be added.
-    private static final String WRAPPED_LINE_PREFIX = ""; // If a line break is added, this prefix will be inserted at the beginning of the next line
+    private static final int WIDTH =
+            100; // Number of characters per line before a line break must be added.
+    private static final String WRAPPED_LINE_PREFIX =
+            ""; // If a line break is added, this prefix will be inserted at the beginning of the
+                // next line
     private static final String STRING_TABLE_DELIMITER = " : ";
 
     private final CommandLine cl;
@@ -38,10 +41,11 @@ public JabRefCLI(String[] args) throws ParseException {
     }
 
     public static String getExportMatchesSyntax() {
-        return "[%s]searchTerm,outputFile:%s[,%s]".formatted(
-                Localization.lang("field"),
-                Localization.lang("file"),
-                Localization.lang("exportFormat"));
+        return "[%s]searchTerm,outputFile:%s[,%s]"
+                .formatted(
+                        Localization.lang("field"),
+                        Localization.lang("file"),
+                        Localization.lang("exportFormat"));
     }
 
     public boolean isHelp() {
@@ -165,9 +169,13 @@ public boolean isWriteMetadataToPdf() {
     }
 
     public String getWriteMetadataToPdf() {
-        return cl.hasOption("writeMetadatatoPdf") ? cl.getOptionValue("writeMetadataToPdf") :
-                cl.hasOption("writeXMPtoPdf") ? cl.getOptionValue("writeXmpToPdf") :
-                        cl.hasOption("embeddBibfileInPdf") ? cl.getOptionValue("embeddBibfileInPdf") : null;
+        return cl.hasOption("writeMetadatatoPdf")
+                ? cl.getOptionValue("writeMetadataToPdf")
+                : cl.hasOption("writeXMPtoPdf")
+                        ? cl.getOptionValue("writeXmpToPdf")
+                        : cl.hasOption("embeddBibfileInPdf")
+                                ? cl.getOptionValue("embeddBibfileInPdf")
+                                : null;
     }
 
     public String getJumpToKey() {
@@ -182,125 +190,196 @@ private static Options getOptions() {
         Options options = new Options();
 
         // boolean options
-        options.addOption("h", "help", false, Localization.lang("Display help on command line options"));
-        options.addOption("n", "nogui", false, Localization.lang("No GUI. Only process command line options"));
-        options.addOption("asfl", "automaticallySetFileLinks", false, Localization.lang("Automatically set file links"));
-        options.addOption("g", "generateCitationKeys", false, Localization.lang("Regenerate all keys for the entries in a BibTeX file"));
-        options.addOption("b", "blank", false, Localization.lang("Do not open any files at startup"));
+        options.addOption(
+                "h", "help", false, Localization.lang("Display help on command line options"));
+        options.addOption(
+                "n",
+                "nogui",
+                false,
+                Localization.lang("No GUI. Only process command line options"));
+        options.addOption(
+                "asfl",
+                "automaticallySetFileLinks",
+                false,
+                Localization.lang("Automatically set file links"));
+        options.addOption(
+                "g",
+                "generateCitationKeys",
+                false,
+                Localization.lang("Regenerate all keys for the entries in a BibTeX file"));
+        options.addOption(
+                "b", "blank", false, Localization.lang("Do not open any files at startup"));
         options.addOption("v", "version", false, Localization.lang("Display version"));
         options.addOption(null, "debug", false, Localization.lang("Show debug level messages"));
 
-        options.addOption(Option
-                .builder("i")
-                .longOpt("import")
-                .desc("%s: '%s'".formatted(Localization.lang("Import file"), "-i library.bib"))
-                .hasArg()
-                .argName("FILE[,FORMAT]")
-                .build());
-
-        options.addOption(Option
-                .builder()
-                .longOpt("importToOpen")
-                .desc(Localization.lang("Same as --import, but will be imported to the opened tab"))
-                .hasArg()
-                .argName("FILE[,FORMAT]")
-                .build());
-
-        options.addOption(Option
-                .builder("ib")
-                .longOpt("importBibtex")
-                .desc("%s: '%s'".formatted(Localization.lang("Import BibTeX"), "-ib @article{entry}"))
-                .hasArg()
-                .argName("BIBTEXT_STRING")
-                .build());
-
-        options.addOption(Option
-                .builder("o")
-                .longOpt("output")
-                .desc("%s: '%s'".formatted(Localization.lang("Export an input to a file"), "-i db.bib -o db.htm,html"))
-                .hasArg()
-                .argName("FILE[,FORMAT]")
-                .build());
-
-        options.addOption(Option
-                .builder("m")
-                .longOpt("exportMatches")
-                .desc("%s: '%s'".formatted(Localization.lang("Matching"), "-i db.bib -m author=Newton,search.htm,html"))
-                .hasArg()
-                .argName("QUERY,FILE[,FORMAT]")
-                .build());
-
-        options.addOption(Option
-                .builder("f")
-                .longOpt("fetch")
-                .desc("%s: '%s'".formatted(Localization.lang("Run fetcher"), "-f Medline/PubMed:cancer"))
-                .hasArg()
-                .argName("FETCHER:QUERY")
-                .build());
-
-        options.addOption(Option
-                .builder("a")
-                .longOpt("aux")
-                .desc("%s: '%s'".formatted(Localization.lang("Sublibrary from AUX to BibTeX"), "-a thesis.aux,new.bib"))
-                .hasArg()
-                .argName("FILE[.aux],FILE[.bib] FILE")
-                .build());
-
-        options.addOption(Option
-                .builder("x")
-                .longOpt("prexp")
-                .desc("%s: '%s'".formatted(Localization.lang("Export preferences to a file"), "-x prefs.xml"))
-                .hasArg()
-                .argName("[FILE]")
-                .build());
-
-        options.addOption(Option
-                .builder("p")
-                .longOpt("primp")
-                .desc("%s: '%s'".formatted(Localization.lang("Import preferences from a file"), "-p prefs.xml"))
-                .hasArg()
-                .argName("[FILE]")
-                .build());
-
-        options.addOption(Option
-                .builder("d")
-                .longOpt("prdef")
-                .desc("%s: '%s'".formatted(Localization.lang("Reset preferences"), "-d mainFontSize,newline' or '-d all"))
-                .hasArg()
-                .argName("KEY1[,KEY2][,KEYn] | all")
-                .build());
-
-        options.addOption(Option
-                .builder()
-                .longOpt("writeXmpToPdf")
-                .desc("%s: '%s'".formatted(Localization.lang("Write BibTeX as XMP metadata to PDF."), "-w pathToMyOwnPaper.pdf"))
-                .hasArg()
-                .argName("CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all")
-                .build());
-
-        options.addOption(Option
-                .builder()
-                .longOpt("embedBibFileInPdf")
-                .desc("%s: '%s'".formatted(Localization.lang("Embed BibTeX as attached file in PDF."), "-w pathToMyOwnPaper.pdf"))
-                .hasArg()
-                .argName("CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all")
-                .build());
-
-        options.addOption(Option
-                .builder("w")
-                .longOpt("writeMetadataToPdf")
-                .desc("%s: '%s'".formatted(Localization.lang("Write BibTeX to PDF (XMP and embedded)"), "-w pathToMyOwnPaper.pdf"))
-                .hasArg()
-                .argName("CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all")
-                .build());
-
-        options.addOption(Option
-                .builder("j")
-                .longOpt("jumpToKey")
-                .desc("%s: '%s'".formatted(Localization.lang("Jump to the entry of the given citation key."), "-j key"))
-                .hasArg()
-                .argName("CITATIONKEY")
-                .build());
+        options.addOption(
+                Option.builder("i")
+                        .longOpt("import")
+                        .desc(
+                                "%s: '%s'"
+                                        .formatted(
+                                                Localization.lang("Import file"), "-i library.bib"))
+                        .hasArg()
+                        .argName("FILE[,FORMAT]")
+                        .build());
+
+        options.addOption(
+                Option.builder()
+                        .longOpt("importToOpen")
+                        .desc(
+                                Localization.lang(
+                                        "Same as --import, but will be imported to the opened tab"))
+                        .hasArg()
+                        .argName("FILE[,FORMAT]")
+                        .build());
+
+        options.addOption(
+                Option.builder("ib")
+                        .longOpt("importBibtex")
+                        .desc(
+                                "%s: '%s'"
+                                        .formatted(
+                                                Localization.lang("Import BibTeX"),
+                                                "-ib @article{entry}"))
+                        .hasArg()
+                        .argName("BIBTEXT_STRING")
+                        .build());
+
+        options.addOption(
+                Option.builder("o")
+                        .longOpt("output")
+                        .desc(
+                                "%s: '%s'"
+                                        .formatted(
+                                                Localization.lang("Export an input to a file"),
+                                                "-i db.bib -o db.htm,html"))
+                        .hasArg()
+                        .argName("FILE[,FORMAT]")
+                        .build());
+
+        options.addOption(
+                Option.builder("m")
+                        .longOpt("exportMatches")
+                        .desc(
+                                "%s: '%s'"
+                                        .formatted(
+                                                Localization.lang("Matching"),
+                                                "-i db.bib -m author=Newton,search.htm,html"))
+                        .hasArg()
+                        .argName("QUERY,FILE[,FORMAT]")
+                        .build());
+
+        options.addOption(
+                Option.builder("f")
+                        .longOpt("fetch")
+                        .desc(
+                                "%s: '%s'"
+                                        .formatted(
+                                                Localization.lang("Run fetcher"),
+                                                "-f Medline/PubMed:cancer"))
+                        .hasArg()
+                        .argName("FETCHER:QUERY")
+                        .build());
+
+        options.addOption(
+                Option.builder("a")
+                        .longOpt("aux")
+                        .desc(
+                                "%s: '%s'"
+                                        .formatted(
+                                                Localization.lang("Sublibrary from AUX to BibTeX"),
+                                                "-a thesis.aux,new.bib"))
+                        .hasArg()
+                        .argName("FILE[.aux],FILE[.bib] FILE")
+                        .build());
+
+        options.addOption(
+                Option.builder("x")
+                        .longOpt("prexp")
+                        .desc(
+                                "%s: '%s'"
+                                        .formatted(
+                                                Localization.lang("Export preferences to a file"),
+                                                "-x prefs.xml"))
+                        .hasArg()
+                        .argName("[FILE]")
+                        .build());
+
+        options.addOption(
+                Option.builder("p")
+                        .longOpt("primp")
+                        .desc(
+                                "%s: '%s'"
+                                        .formatted(
+                                                Localization.lang("Import preferences from a file"),
+                                                "-p prefs.xml"))
+                        .hasArg()
+                        .argName("[FILE]")
+                        .build());
+
+        options.addOption(
+                Option.builder("d")
+                        .longOpt("prdef")
+                        .desc(
+                                "%s: '%s'"
+                                        .formatted(
+                                                Localization.lang("Reset preferences"),
+                                                "-d mainFontSize,newline' or '-d all"))
+                        .hasArg()
+                        .argName("KEY1[,KEY2][,KEYn] | all")
+                        .build());
+
+        options.addOption(
+                Option.builder()
+                        .longOpt("writeXmpToPdf")
+                        .desc(
+                                "%s: '%s'"
+                                        .formatted(
+                                                Localization.lang(
+                                                        "Write BibTeX as XMP metadata to PDF."),
+                                                "-w pathToMyOwnPaper.pdf"))
+                        .hasArg()
+                        .argName("CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all")
+                        .build());
+
+        options.addOption(
+                Option.builder()
+                        .longOpt("embedBibFileInPdf")
+                        .desc(
+                                "%s: '%s'"
+                                        .formatted(
+                                                Localization.lang(
+                                                        "Embed BibTeX as attached file in PDF."),
+                                                "-w pathToMyOwnPaper.pdf"))
+                        .hasArg()
+                        .argName("CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all")
+                        .build());
+
+        options.addOption(
+                Option.builder("w")
+                        .longOpt("writeMetadataToPdf")
+                        .desc(
+                                "%s: '%s'"
+                                        .formatted(
+                                                Localization.lang(
+                                                        "Write BibTeX to PDF (XMP and embedded)"),
+                                                "-w pathToMyOwnPaper.pdf"))
+                        .hasArg()
+                        .argName("CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all")
+                        .build());
+
+        options.addOption(
+                Option.builder("j")
+                        .longOpt("jumpToKey")
+                        .desc(
+                                "%s: '%s'"
+                                        .formatted(
+                                                Localization.lang(
+                                                        "Jump to the entry of the given citation key."),
+                                                "-j key"))
+                        .hasArg()
+                        .argName("CITATIONKEY")
+                        .build());
 
         return options;
     }
@@ -312,33 +391,46 @@ public void displayVersion() {
     public static void printUsage(CliPreferences preferences) {
         String header = "";
 
-        ImportFormatReader importFormatReader = new ImportFormatReader(
-                preferences.getImporterPreferences(),
-                preferences.getImportFormatPreferences(),
-                preferences.getCitationKeyPatternPreferences(),
-                new DummyFileUpdateMonitor()
-        );
-        List<Pair<String, String>> importFormats = importFormatReader
-                .getImportFormats().stream()
-                .map(format -> new Pair<>(format.getName(), format.getId()))
-                .toList();
+        ImportFormatReader importFormatReader =
+                new ImportFormatReader(
+                        preferences.getImporterPreferences(),
+                        preferences.getImportFormatPreferences(),
+                        preferences.getCitationKeyPatternPreferences(),
+                        new DummyFileUpdateMonitor());
+        List<Pair<String, String>> importFormats =
+                importFormatReader.getImportFormats().stream()
+                        .map(format -> new Pair<>(format.getName(), format.getId()))
+                        .toList();
         String importFormatsIntro = Localization.lang("Available import formats");
-        String importFormatsList = "%s:%n%s%n".formatted(importFormatsIntro, alignStringTable(importFormats));
-
-        ExporterFactory exporterFactory = ExporterFactory.create(
-                preferences,
-                Injector.instantiateModelOrService(BibEntryTypesManager.class));
-        List<Pair<String, String>> exportFormats = exporterFactory
-                .getExporters().stream()
-                .map(format -> new Pair<>(format.getName(), format.getId()))
-                .toList();
+        String importFormatsList =
+                "%s:%n%s%n".formatted(importFormatsIntro, alignStringTable(importFormats));
+
+        ExporterFactory exporterFactory =
+                ExporterFactory.create(
+                        preferences,
+                        Injector.instantiateModelOrService(BibEntryTypesManager.class));
+        List<Pair<String, String>> exportFormats =
+                exporterFactory.getExporters().stream()
+                        .map(format -> new Pair<>(format.getName(), format.getId()))
+                        .toList();
         String outFormatsIntro = Localization.lang("Available export formats");
-        String outFormatsList = "%s:%n%s%n".formatted(outFormatsIntro, alignStringTable(exportFormats));
+        String outFormatsList =
+                "%s:%n%s%n".formatted(outFormatsIntro, alignStringTable(exportFormats));
 
-        String footer = '\n' + importFormatsList + outFormatsList + "\nPlease report issues at https://github.com/JabRef/jabref/issues.";
+        String footer =
+                '\n'
+                        + importFormatsList
+                        + outFormatsList
+                        + "\nPlease report issues at https://github.com/JabRef/jabref/issues.";
 
         HelpFormatter formatter = new HelpFormatter();
-        formatter.printHelp(WIDTH, "jabref [OPTIONS] [BIBTEX_FILE]\n\nOptions:", header, getOptions(), footer, true);
+        formatter.printHelp(
+                WIDTH,
+                "jabref [OPTIONS] [BIBTEX_FILE]\n\nOptions:",
+                header,
+                getOptions(),
+                footer,
+                true);
     }
 
     private String getVersionInfo() {
@@ -353,9 +445,11 @@ public List<String> getLeftOver() {
     protected static String alignStringTable(List<Pair<String, String>> table) {
         StringBuilder sb = new StringBuilder();
 
-        int maxLength = table.stream()
-                             .mapToInt(pair -> Objects.requireNonNullElse(pair.getKey(), "").length())
-                             .max().orElse(0);
+        int maxLength =
+                table.stream()
+                        .mapToInt(pair -> Objects.requireNonNullElse(pair.getKey(), "").length())
+                        .max()
+                        .orElse(0);
 
         for (Pair<String, String> pair : table) {
             int padding = Math.max(0, maxLength - pair.getKey().length());
diff --git a/src/main/java/org/jabref/cli/JournalListMvGenerator.java b/src/main/java/org/jabref/cli/JournalListMvGenerator.java
index dad187dc81a3..779255f7ffee 100644
--- a/src/main/java/org/jabref/cli/JournalListMvGenerator.java
+++ b/src/main/java/org/jabref/cli/JournalListMvGenerator.java
@@ -1,5 +1,11 @@
 package org.jabref.cli;
 
+import org.h2.mvstore.MVMap;
+import org.h2.mvstore.MVStore;
+import org.jabref.logic.journals.Abbreviation;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
+import org.jooq.lambda.Unchecked;
+
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
@@ -9,13 +15,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.jabref.logic.journals.Abbreviation;
-import org.jabref.logic.journals.JournalAbbreviationLoader;
-
-import org.h2.mvstore.MVMap;
-import org.h2.mvstore.MVStore;
-import org.jooq.lambda.Unchecked;
-
 public class JournalListMvGenerator {
 
     public static void main(String[] args) throws IOException {
@@ -23,53 +22,66 @@ public static void main(String[] args) throws IOException {
 
         Path abbreviationsDirectory = Path.of("buildres", "abbrv.jabref.org", "journals");
         if (!Files.exists(abbreviationsDirectory)) {
-            System.out.println("Path " + abbreviationsDirectory.toAbsolutePath() + " does not exist");
+            System.out.println(
+                    "Path " + abbreviationsDirectory.toAbsolutePath() + " does not exist");
             System.exit(0);
         }
-        Path journalListMvFile = Path.of("build", "resources", "main", "journals", "journal-list.mv");
+        Path journalListMvFile =
+                Path.of("build", "resources", "main", "journals", "journal-list.mv");
 
-        Set<String> ignoredNames = Set.of(
-                // remove all lists without dot in them:
-                // we use abbreviation lists containing dots in them only (to be consistent)
-                "journal_abbreviations_entrez.csv",
-                "journal_abbreviations_medicus.csv",
-                "journal_abbreviations_webofscience-dotless.csv",
+        Set<String> ignoredNames =
+                Set.of(
+                        // remove all lists without dot in them:
+                        // we use abbreviation lists containing dots in them only (to be consistent)
+                        "journal_abbreviations_entrez.csv",
+                        "journal_abbreviations_medicus.csv",
+                        "journal_abbreviations_webofscience-dotless.csv",
 
-                // we currently do not have good support for BibTeX strings
-                "journal_abbreviations_ieee_strings.csv"
-        );
+                        // we currently do not have good support for BibTeX strings
+                        "journal_abbreviations_ieee_strings.csv");
 
         Files.createDirectories(journalListMvFile.getParent());
 
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(abbreviationsDirectory, "*.csv");
-             MVStore store = new MVStore.Builder().
-                     fileName(journalListMvFile.toString()).
-                     compressHigh().
-                     open()) {
+        try (DirectoryStream<Path> stream =
+                        Files.newDirectoryStream(abbreviationsDirectory, "*.csv");
+                MVStore store =
+                        new MVStore.Builder()
+                                .fileName(journalListMvFile.toString())
+                                .compressHigh()
+                                .open()) {
             MVMap<String, Abbreviation> fullToAbbreviation = store.openMap("FullToAbbreviation");
-            stream.forEach(Unchecked.consumer(path -> {
-                String fileName = path.getFileName().toString();
-                System.out.print("Checking ");
-                System.out.print(fileName);
-                if (ignoredNames.contains(fileName)) {
-                    System.out.println(" ignored");
-                } else {
-                    System.out.println("...");
-                    Collection<Abbreviation> abbreviations = JournalAbbreviationLoader.readAbbreviationsFromCsvFile(path);
-                    Map<String, Abbreviation> abbreviationMap = abbreviations
-                            .stream()
-                            .collect(Collectors.toMap(
-                                    Abbreviation::getName,
-                                    abbreviation -> abbreviation,
-                                    (abbreviation1, abbreviation2) -> {
-                                        if (verbose) {
-                                            System.out.println("Double entry " + abbreviation1.getName());
-                                        }
-                                        return abbreviation2;
-                                    }));
-                    fullToAbbreviation.putAll(abbreviationMap);
-                }
-            }));
+            stream.forEach(
+                    Unchecked.consumer(
+                            path -> {
+                                String fileName = path.getFileName().toString();
+                                System.out.print("Checking ");
+                                System.out.print(fileName);
+                                if (ignoredNames.contains(fileName)) {
+                                    System.out.println(" ignored");
+                                } else {
+                                    System.out.println("...");
+                                    Collection<Abbreviation> abbreviations =
+                                            JournalAbbreviationLoader.readAbbreviationsFromCsvFile(
+                                                    path);
+                                    Map<String, Abbreviation> abbreviationMap =
+                                            abbreviations.stream()
+                                                    .collect(
+                                                            Collectors.toMap(
+                                                                    Abbreviation::getName,
+                                                                    abbreviation -> abbreviation,
+                                                                    (abbreviation1,
+                                                                            abbreviation2) -> {
+                                                                        if (verbose) {
+                                                                            System.out.println(
+                                                                                    "Double entry "
+                                                                                            + abbreviation1
+                                                                                                    .getName());
+                                                                        }
+                                                                        return abbreviation2;
+                                                                    }));
+                                    fullToAbbreviation.putAll(abbreviationMap);
+                                }
+                            }));
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/ClipBoardManager.java b/src/main/java/org/jabref/gui/ClipBoardManager.java
index 3e1455908e05..f1c63af8c38b 100644
--- a/src/main/java/org/jabref/gui/ClipBoardManager.java
+++ b/src/main/java/org/jabref/gui/ClipBoardManager.java
@@ -1,12 +1,6 @@
 package org.jabref.gui;
 
-import java.awt.Toolkit;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.StringSelection;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.io.IOException;
-import java.util.List;
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.application.Platform;
 import javafx.scene.control.TextInputControl;
@@ -23,11 +17,17 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.BibtexString;
-
-import com.airhacks.afterburner.injection.Injector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.awt.Toolkit;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.IOException;
+import java.util.List;
+
 @AllowedToUseAwt("Requires ava.awt.datatransfer.Clipboard")
 public class ClipBoardManager {
 
@@ -58,19 +58,25 @@ public ClipBoardManager(Clipboard clipboard, java.awt.datatransfer.Clipboard pri
      * text over clipboards</a>
      */
     public static void addX11Support(TextInputControl input) {
-        input.selectedTextProperty().addListener(
-                // using InvalidationListener because of https://bugs.openjdk.java.net/browse/JDK-8176270
-                observable -> Platform.runLater(() -> {
-                    String newValue = input.getSelectedText();
-                    if (!newValue.isEmpty() && (primary != null)) {
-                        primary.setContents(new StringSelection(newValue), null);
+        input.selectedTextProperty()
+                .addListener(
+                        // using InvalidationListener because of
+                        // https://bugs.openjdk.java.net/browse/JDK-8176270
+                        observable ->
+                                Platform.runLater(
+                                        () -> {
+                                            String newValue = input.getSelectedText();
+                                            if (!newValue.isEmpty() && (primary != null)) {
+                                                primary.setContents(
+                                                        new StringSelection(newValue), null);
+                                            }
+                                        }));
+        input.setOnMouseClicked(
+                event -> {
+                    if (event.getButton() == MouseButton.MIDDLE) {
+                        input.insertText(input.getCaretPosition(), getContentsPrimary());
                     }
-                }));
-        input.setOnMouseClicked(event -> {
-            if (event.getButton() == MouseButton.MIDDLE) {
-                input.insertText(input.getCaretPosition(), getContentsPrimary());
-            }
-        });
+                });
     }
 
     /**
@@ -153,25 +159,39 @@ public void setContent(String string) {
         setPrimaryClipboardContent(content);
     }
 
-    public void setContent(List<BibEntry> entries, BibEntryTypesManager entryTypesManager) throws IOException {
+    public void setContent(List<BibEntry> entries, BibEntryTypesManager entryTypesManager)
+            throws IOException {
         String serializedEntries = serializeEntries(entries, entryTypesManager);
         setContent(serializedEntries);
     }
 
-    public void setContent(List<BibEntry> entries, BibEntryTypesManager entryTypesManager, List<BibtexString> stringConstants) throws IOException {
+    public void setContent(
+            List<BibEntry> entries,
+            BibEntryTypesManager entryTypesManager,
+            List<BibtexString> stringConstants)
+            throws IOException {
         StringBuilder builder = new StringBuilder();
-        stringConstants.forEach(strConst -> builder.append(strConst.getParsedSerialization() == null ? "" : strConst.getParsedSerialization()));
+        stringConstants.forEach(
+                strConst ->
+                        builder.append(
+                                strConst.getParsedSerialization() == null
+                                        ? ""
+                                        : strConst.getParsedSerialization()));
         String serializedEntries = serializeEntries(entries, entryTypesManager);
         builder.append(serializedEntries);
         setContent(builder.toString());
     }
 
-    private String serializeEntries(List<BibEntry> entries, BibEntryTypesManager entryTypesManager) throws IOException {
+    private String serializeEntries(List<BibEntry> entries, BibEntryTypesManager entryTypesManager)
+            throws IOException {
         CliPreferences preferences = Injector.instantiateModelOrService(CliPreferences.class);
         // BibEntry is not Java serializable. Thus, we need to do the serialization manually
-        // At reading of the clipboard in JabRef, we parse the plain string in all cases, so we don't need to flag we put BibEntries here
+        // At reading of the clipboard in JabRef, we parse the plain string in all cases, so we
+        // don't need to flag we put BibEntries here
         // Furthermore, storing a string also enables other applications to work with the data
-        BibEntryWriter writer = new BibEntryWriter(new FieldWriter(preferences.getFieldPreferences()), entryTypesManager);
+        BibEntryWriter writer =
+                new BibEntryWriter(
+                        new FieldWriter(preferences.getFieldPreferences()), entryTypesManager);
         return writer.serializeAll(entries, BibDatabaseMode.BIBTEX);
     }
 }
diff --git a/src/main/java/org/jabref/gui/CoreGuiPreferences.java b/src/main/java/org/jabref/gui/CoreGuiPreferences.java
index 23212a62ed19..0c949da63dff 100644
--- a/src/main/java/org/jabref/gui/CoreGuiPreferences.java
+++ b/src/main/java/org/jabref/gui/CoreGuiPreferences.java
@@ -19,13 +19,14 @@ public class CoreGuiPreferences {
 
     private final StringProperty lastSelectedIdBasedFetcher;
 
-    public CoreGuiPreferences(double positionX,
-                              double positionY,
-                              double sizeX,
-                              double sizeY,
-                              boolean windowMaximised,
-                              String lastSelectedIdBasedFetcher,
-                              double sidePaneWidth) {
+    public CoreGuiPreferences(
+            double positionX,
+            double positionY,
+            double sizeX,
+            double sizeY,
+            boolean windowMaximised,
+            String lastSelectedIdBasedFetcher,
+            double sidePaneWidth) {
         this.positionX = new SimpleDoubleProperty(positionX);
         this.positionY = new SimpleDoubleProperty(positionY);
         this.sizeX = new SimpleDoubleProperty(sizeX);
diff --git a/src/main/java/org/jabref/gui/DialogService.java b/src/main/java/org/jabref/gui/DialogService.java
index 7248be475117..bc08b1fc31fb 100644
--- a/src/main/java/org/jabref/gui/DialogService.java
+++ b/src/main/java/org/jabref/gui/DialogService.java
@@ -1,12 +1,5 @@
 package org.jabref.gui;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Consumer;
-
 import javafx.concurrent.Task;
 import javafx.print.PrinterJob;
 import javafx.scene.control.Alert;
@@ -17,6 +10,8 @@
 import javafx.scene.control.TextInputDialog;
 import javafx.util.StringConverter;
 
+import org.controlsfx.control.textfield.CustomPasswordField;
+import org.controlsfx.dialog.ProgressDialog;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.BaseWindow;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
@@ -24,8 +19,12 @@
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.util.NotificationService;
 
-import org.controlsfx.control.textfield.CustomPasswordField;
-import org.controlsfx.dialog.ProgressDialog;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
 
 /**
  * This interface provides methods to create dialogs and show them to the user.
@@ -37,19 +36,37 @@ public interface DialogService extends NotificationService {
      *
      * @implNote The implementation should accept {@code null} for {@code defaultChoice}, but callers should use {@link #showChoiceDialogAndWait(String, String, String, Collection)}.
      */
-    <T> Optional<T> showChoiceDialogAndWait(String title, String content, String okButtonLabel, T defaultChoice, Collection<T> choices);
+    <T> Optional<T> showChoiceDialogAndWait(
+            String title,
+            String content,
+            String okButtonLabel,
+            T defaultChoice,
+            Collection<T> choices);
 
     /**
      * This will create and display new {@link ChoiceDialog} of type T with a collection of possible choices
      */
-    default <T> Optional<T> showChoiceDialogAndWait(String title, String content, String okButtonLabel, Collection<T> choices) {
+    default <T> Optional<T> showChoiceDialogAndWait(
+            String title, String content, String okButtonLabel, Collection<T> choices) {
         return showChoiceDialogAndWait(title, content, okButtonLabel, null, choices);
     }
 
-    <T> Optional<T> showEditableChoiceDialogAndWait(String title, String content, String okButtonLabel, T defaultChoice, Collection<T> choices, StringConverter<T> converter);
-
-    default <T> Optional<T> showEditableChoiceDialogAndWait(String title, String content, String okButtonLabel, Collection<T> choices, StringConverter<T> converter) {
-        return showEditableChoiceDialogAndWait(title, content, okButtonLabel, null, choices, converter);
+    <T> Optional<T> showEditableChoiceDialogAndWait(
+            String title,
+            String content,
+            String okButtonLabel,
+            T defaultChoice,
+            Collection<T> choices,
+            StringConverter<T> converter);
+
+    default <T> Optional<T> showEditableChoiceDialogAndWait(
+            String title,
+            String content,
+            String okButtonLabel,
+            Collection<T> choices,
+            StringConverter<T> converter) {
+        return showEditableChoiceDialogAndWait(
+                title, content, okButtonLabel, null, choices, converter);
     }
 
     /**
@@ -60,7 +77,8 @@ default <T> Optional<T> showEditableChoiceDialogAndWait(String title, String con
     /**
      * This will create and display new {@link TextInputDialog} with a text field with a default value to enter data
      */
-    Optional<String> showInputDialogWithDefaultAndWait(String title, String content, String defaultValue);
+    Optional<String> showInputDialogWithDefaultAndWait(
+            String title, String content, String defaultValue);
 
     /**
      * This will create and display a new information dialog.
@@ -145,7 +163,8 @@ default <T> Optional<T> showEditableChoiceDialogAndWait(String title, String con
      *
      * @return true if the use clicked "OK" otherwise false
      */
-    boolean showConfirmationDialogAndWait(String title, String content, String okButtonLabel, String cancelButtonLabel);
+    boolean showConfirmationDialogAndWait(
+            String title, String content, String okButtonLabel, String cancelButtonLabel);
 
     /**
      * Create and display a new confirmation dialog.
@@ -156,8 +175,8 @@ default <T> Optional<T> showEditableChoiceDialogAndWait(String title, String con
      *
      * @return true if the use clicked "YES" otherwise false
      */
-    boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
-                                                    String optOutMessage, Consumer<Boolean> optOutAction);
+    boolean showConfirmationDialogWithOptOutAndWait(
+            String title, String content, String optOutMessage, Consumer<Boolean> optOutAction);
 
     /**
      * Create and display a new confirmation dialog.
@@ -168,9 +187,13 @@ boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
      *
      * @return true if the use clicked "YES" otherwise false
      */
-    boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
-                                                    String okButtonLabel, String cancelButtonLabel,
-                                                    String optOutMessage, Consumer<Boolean> optOutAction);
+    boolean showConfirmationDialogWithOptOutAndWait(
+            String title,
+            String content,
+            String okButtonLabel,
+            String cancelButtonLabel,
+            String optOutMessage,
+            Consumer<Boolean> optOutAction);
 
     /**
      * This will create and display new {@link CustomPasswordField} that doesn't show the text, and two buttons
@@ -201,8 +224,8 @@ boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
      *
      * @return Optional with the pressed Button as ButtonType
      */
-    Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String title, String content,
-                                                       ButtonType... buttonTypes);
+    Optional<ButtonType> showCustomButtonDialogAndWait(
+            Alert.AlertType type, String title, String content, ButtonType... buttonTypes);
 
     /**
      * This will create and display a new dialog showing a custom {@link DialogPane}
@@ -210,7 +233,8 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
      *
      * @return Optional with the pressed Button as ButtonType
      */
-    Optional<ButtonType> showCustomDialogAndWait(String title, DialogPane contentPane, ButtonType... buttonTypes);
+    Optional<ButtonType> showCustomDialogAndWait(
+            String title, DialogPane contentPane, ButtonType... buttonTypes);
 
     /**
      * Shows a custom dialog and returns the result.
@@ -250,7 +274,8 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
      * @param content      message to show below the list of background tasks
      * @param stateManager The {@link StateManager} which contains the background tasks
      */
-    <V> Optional<ButtonType> showBackgroundProgressDialogAndWait(String title, String content, StateManager stateManager);
+    <V> Optional<ButtonType> showBackgroundProgressDialogAndWait(
+            String title, String content, StateManager stateManager);
 
     /**
      * Shows a new file save dialog. The method doesn't return until the
@@ -281,7 +306,8 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
      *
      * @return the selected files or an empty {@link List} if no file has been selected
      */
-    List<Path> showFileOpenDialogAndGetMultipleFiles(FileDialogConfiguration fileDialogConfiguration);
+    List<Path> showFileOpenDialogAndGetMultipleFiles(
+            FileDialogConfiguration fileDialogConfiguration);
 
     /**
      * Shows a new directory selection dialog. The method doesn't return until the
@@ -291,7 +317,8 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
      *
      * @return the selected directory or an empty {@link Optional} if no directory has been selected
      */
-    Optional<Path> showDirectorySelectionDialog(DirectoryDialogConfiguration directoryDialogConfiguration);
+    Optional<Path> showDirectorySelectionDialog(
+            DirectoryDialogConfiguration directoryDialogConfiguration);
 
     /**
      * Displays a Print Dialog. Allow the user to update job state such as printer and settings. These changes will be
diff --git a/src/main/java/org/jabref/gui/DragAndDropDataFormats.java b/src/main/java/org/jabref/gui/DragAndDropDataFormats.java
index 4ab27396efa0..1fe7f2e9873a 100644
--- a/src/main/java/org/jabref/gui/DragAndDropDataFormats.java
+++ b/src/main/java/org/jabref/gui/DragAndDropDataFormats.java
@@ -1,20 +1,27 @@
 package org.jabref.gui;
 
-import java.util.List;
-
 import javafx.scene.input.DataFormat;
 
 import org.jabref.logic.preview.PreviewLayout;
 
+import java.util.List;
+
 /**
  * Contains all the different {@link DataFormat}s that may occur in JabRef.
  */
 public class DragAndDropDataFormats {
 
     public static final DataFormat FIELD = new DataFormat("dnd/org.jabref.model.entry.field.Field");
-    public static final DataFormat GROUP = new DataFormat("dnd/org.jabref.model.groups.GroupTreeNode");
-    public static final DataFormat LINKED_FILE = new DataFormat("dnd/org.jabref.model.entry.LinkedFile");
-    public static final DataFormat ENTRIES = new DataFormat("dnd/org.jabref.model.entry.BibEntries");
-    public static final DataFormat PREVIEWLAYOUTS = new DataFormat("dnd/org.jabref.logic.citationstyle.PreviewLayouts");
-    @SuppressWarnings("unchecked") public static final Class<List<PreviewLayout>> PREVIEWLAYOUT_LIST_CLASS = (Class<List<PreviewLayout>>) (Class<?>) List.class;
+    public static final DataFormat GROUP =
+            new DataFormat("dnd/org.jabref.model.groups.GroupTreeNode");
+    public static final DataFormat LINKED_FILE =
+            new DataFormat("dnd/org.jabref.model.entry.LinkedFile");
+    public static final DataFormat ENTRIES =
+            new DataFormat("dnd/org.jabref.model.entry.BibEntries");
+    public static final DataFormat PREVIEWLAYOUTS =
+            new DataFormat("dnd/org.jabref.logic.citationstyle.PreviewLayouts");
+
+    @SuppressWarnings("unchecked")
+    public static final Class<List<PreviewLayout>> PREVIEWLAYOUT_LIST_CLASS =
+            (Class<List<PreviewLayout>>) (Class<?>) List.class;
 }
diff --git a/src/main/java/org/jabref/gui/FXDialog.java b/src/main/java/org/jabref/gui/FXDialog.java
index 891eae589f7d..a16ea0d77eb3 100644
--- a/src/main/java/org/jabref/gui/FXDialog.java
+++ b/src/main/java/org/jabref/gui/FXDialog.java
@@ -1,5 +1,7 @@
 package org.jabref.gui;
 
+import com.airhacks.afterburner.injection.Injector;
+
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Dialog;
@@ -12,8 +14,6 @@
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
-import com.airhacks.afterburner.injection.Injector;
-
 /**
  * This class provides a super class for all dialogs implemented in JavaFX.
  * <p>
@@ -59,12 +59,17 @@ public FXDialog(AlertType type, boolean isModal) {
             initModality(Modality.NONE);
         }
 
-        dialogWindow.getScene().setOnKeyPressed(event -> {
-            KeyBindingRepository keyBindingRepository = Injector.instantiateModelOrService(KeyBindingRepository.class);
-            if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE, event)) {
-                dialogWindow.close();
-            }
-        });
+        dialogWindow
+                .getScene()
+                .setOnKeyPressed(
+                        event -> {
+                            KeyBindingRepository keyBindingRepository =
+                                    Injector.instantiateModelOrService(KeyBindingRepository.class);
+                            if (keyBindingRepository.checkKeyCombinationEquality(
+                                    KeyBinding.CLOSE, event)) {
+                                dialogWindow.close();
+                            }
+                        });
     }
 
     public FXDialog(AlertType type) {
diff --git a/src/main/java/org/jabref/gui/JabRefDialogService.java b/src/main/java/org/jabref/gui/JabRefDialogService.java
index dccdc17898dd..0e1c39925714 100644
--- a/src/main/java/org/jabref/gui/JabRefDialogService.java
+++ b/src/main/java/org/jabref/gui/JabRefDialogService.java
@@ -1,14 +1,6 @@
 package org.jabref.gui;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Consumer;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.concurrent.Task;
 import javafx.geometry.Pos;
@@ -37,6 +29,11 @@
 import javafx.util.Duration;
 import javafx.util.StringConverter;
 
+import org.controlsfx.control.Notifications;
+import org.controlsfx.control.TaskProgressView;
+import org.controlsfx.control.textfield.CustomPasswordField;
+import org.controlsfx.dialog.ExceptionDialog;
+import org.controlsfx.dialog.ProgressDialog;
 import org.jabref.gui.help.ErrorConsoleAction;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
@@ -51,16 +48,19 @@
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.FetcherServerException;
 import org.jabref.logic.l10n.Localization;
-
-import com.tobiasdiez.easybind.EasyBind;
-import org.controlsfx.control.Notifications;
-import org.controlsfx.control.TaskProgressView;
-import org.controlsfx.control.textfield.CustomPasswordField;
-import org.controlsfx.dialog.ExceptionDialog;
-import org.controlsfx.dialog.ProgressDialog;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+
 /**
  * This class provides methods to create default
  * JavaFX dialogs which will also work on top of Swing
@@ -97,26 +97,29 @@ private FXDialog createDialog(AlertType type, String title, String content) {
         return alert;
     }
 
-    private FXDialog createDialogWithOptOut(String title, String content,
-                                            String optOutMessage, Consumer<Boolean> optOutAction) {
+    private FXDialog createDialogWithOptOut(
+            String title, String content, String optOutMessage, Consumer<Boolean> optOutAction) {
         FXDialog alert = new FXDialog(AlertType.CONFIRMATION, title, true);
-        // Need to force the alert to layout in order to grab the graphic as we are replacing the dialog pane with a custom pane
+        // Need to force the alert to layout in order to grab the graphic as we are replacing the
+        // dialog pane with a custom pane
         alert.getDialogPane().applyCss();
         Node graphic = alert.getDialogPane().getGraphic();
 
         // Create a new dialog pane that has a checkbox instead of the hide/show details button
         // Use the supplied callback for the action of the checkbox
-        alert.setDialogPane(new DialogPane() {
-            @Override
-            protected Node createDetailsButton() {
-                CheckBox optOut = new CheckBox();
-                optOut.setText(optOutMessage);
-                optOut.setOnAction(e -> optOutAction.accept(optOut.isSelected()));
-                return optOut;
-            }
-        });
-
-        // Fool the dialog into thinking there is some expandable content; a group won't take up any space if it has no children
+        alert.setDialogPane(
+                new DialogPane() {
+                    @Override
+                    protected Node createDetailsButton() {
+                        CheckBox optOut = new CheckBox();
+                        optOut.setText(optOutMessage);
+                        optOut.setOnAction(e -> optOutAction.accept(optOut.isSelected()));
+                        return optOut;
+                    }
+                });
+
+        // Fool the dialog into thinking there is some expandable content; a group won't take up any
+        // space if it has no children
         alert.getDialogPane().setExpandableContent(new Group());
         alert.getDialogPane().setExpanded(true);
 
@@ -136,9 +139,16 @@ public static String shortenDialogMessage(String dialogMessage) {
         return (dialogMessage.substring(0, JabRefDialogService.DIALOG_SIZE_LIMIT) + "...").trim();
     }
 
-    private <T> ChoiceDialog<T> createChoiceDialog(String title, String content, String okButtonLabel, T defaultChoice, Collection<T> choices) {
+    private <T> ChoiceDialog<T> createChoiceDialog(
+            String title,
+            String content,
+            String okButtonLabel,
+            T defaultChoice,
+            Collection<T> choices) {
         ChoiceDialog<T> choiceDialog = new ChoiceDialog<>(defaultChoice, choices);
-        ((Stage) choiceDialog.getDialogPane().getScene().getWindow()).getIcons().add(IconTheme.getJabRefImage());
+        ((Stage) choiceDialog.getDialogPane().getScene().getWindow())
+                .getIcons()
+                .add(IconTheme.getJabRefImage());
         ButtonType okButtonType = new ButtonType(okButtonLabel, ButtonBar.ButtonData.OK_DONE);
         choiceDialog.getDialogPane().getButtonTypes().setAll(ButtonType.CANCEL, okButtonType);
         choiceDialog.setHeaderText(title);
@@ -149,17 +159,32 @@ private <T> ChoiceDialog<T> createChoiceDialog(String title, String content, Str
     }
 
     @Override
-    public <T> Optional<T> showChoiceDialogAndWait(String title, String content, String okButtonLabel, T defaultChoice, Collection<T> choices) {
-        return createChoiceDialog(title, content, okButtonLabel, defaultChoice, choices).showAndWait();
+    public <T> Optional<T> showChoiceDialogAndWait(
+            String title,
+            String content,
+            String okButtonLabel,
+            T defaultChoice,
+            Collection<T> choices) {
+        return createChoiceDialog(title, content, okButtonLabel, defaultChoice, choices)
+                .showAndWait();
     }
 
     @Override
-    public <T> Optional<T> showEditableChoiceDialogAndWait(String title, String content, String okButtonLabel, T defaultChoice, Collection<T> choices, StringConverter<T> converter) {
-        ChoiceDialog<T> choiceDialog = createChoiceDialog(title, content, okButtonLabel, defaultChoice, choices);
+    public <T> Optional<T> showEditableChoiceDialogAndWait(
+            String title,
+            String content,
+            String okButtonLabel,
+            T defaultChoice,
+            Collection<T> choices,
+            StringConverter<T> converter) {
+        ChoiceDialog<T> choiceDialog =
+                createChoiceDialog(title, content, okButtonLabel, defaultChoice, choices);
         ComboBox<T> comboBox = (ComboBox<T>) choiceDialog.getDialogPane().lookup(".combo-box");
         comboBox.setEditable(true);
         comboBox.setConverter(converter);
-        EasyBind.subscribe(comboBox.getEditor().textProperty(), text -> comboBox.setValue(converter.fromString(text)));
+        EasyBind.subscribe(
+                comboBox.getEditor().textProperty(),
+                text -> comboBox.setValue(converter.fromString(text)));
         return choiceDialog.showAndWait();
     }
 
@@ -173,7 +198,8 @@ public Optional<String> showInputDialogAndWait(String title, String content) {
     }
 
     @Override
-    public Optional<String> showInputDialogWithDefaultAndWait(String title, String content, String defaultValue) {
+    public Optional<String> showInputDialogWithDefaultAndWait(
+            String title, String content, String defaultValue) {
         TextInputDialog inputDialog = new TextInputDialog(defaultValue);
         inputDialog.setHeaderText(title);
         inputDialog.setContentText(content);
@@ -224,12 +250,23 @@ public void showErrorDialogAndWait(FetcherException fetcherException) {
         String localizedMessage = fetcherException.getLocalizedMessage();
         Optional<SimpleHttpResponse> httpResponse = fetcherException.getHttpResponse();
         if (httpResponse.isPresent()) {
-            this.showInformationDialogAndWait(failedTitle, getContentByCode(httpResponse.get().statusCode()) + "\n\n" + localizedMessage);
+            this.showInformationDialogAndWait(
+                    failedTitle,
+                    getContentByCode(httpResponse.get().statusCode()) + "\n\n" + localizedMessage);
         } else if (fetcherException instanceof FetcherClientException) {
-            this.showErrorDialogAndWait(failedTitle, Localization.lang("Something is wrong on JabRef side. Please check the URL and try again.") + "\n\n" + localizedMessage);
+            this.showErrorDialogAndWait(
+                    failedTitle,
+                    Localization.lang(
+                                    "Something is wrong on JabRef side. Please check the URL and try again.")
+                            + "\n\n"
+                            + localizedMessage);
         } else if (fetcherException instanceof FetcherServerException) {
-            this.showInformationDialogAndWait(failedTitle,
-                    Localization.lang("Error downloading from URL. Cause is likely the server side.\nPlease try again later or contact the server administrator.") + "\n\n" + localizedMessage);
+            this.showInformationDialogAndWait(
+                    failedTitle,
+                    Localization.lang(
+                                    "Error downloading from URL. Cause is likely the server side.\nPlease try again later or contact the server administrator.")
+                            + "\n\n"
+                            + localizedMessage);
         } else {
             this.showErrorDialogAndWait(failedTitle, localizedMessage);
         }
@@ -246,7 +283,8 @@ public void showErrorDialogAndWait(String title, String content, Throwable excep
 
     @Override
     public void showErrorDialogAndWait(String message) {
-        FXDialog alert = createDialog(AlertType.ERROR, Localization.lang("Error Occurred"), message);
+        FXDialog alert =
+                createDialog(AlertType.ERROR, Localization.lang("Error Occurred"), message);
         alert.showAndWait();
     }
 
@@ -257,7 +295,8 @@ public boolean showConfirmationDialogAndWait(String title, String content) {
     }
 
     @Override
-    public boolean showConfirmationDialogAndWait(String title, String content, String okButtonLabel) {
+    public boolean showConfirmationDialogAndWait(
+            String title, String content, String okButtonLabel) {
         FXDialog alert = createDialog(AlertType.CONFIRMATION, title, content);
         ButtonType okButtonType = new ButtonType(okButtonLabel, ButtonBar.ButtonData.OK_DONE);
         alert.getButtonTypes().setAll(ButtonType.CANCEL, okButtonType);
@@ -265,8 +304,8 @@ public boolean showConfirmationDialogAndWait(String title, String content, Strin
     }
 
     @Override
-    public boolean showConfirmationDialogAndWait(String title, String content,
-                                                 String okButtonLabel, String cancelButtonLabel) {
+    public boolean showConfirmationDialogAndWait(
+            String title, String content, String okButtonLabel, String cancelButtonLabel) {
         FXDialog alert = createDialog(AlertType.CONFIRMATION, title, content);
         ButtonType okButtonType = new ButtonType(okButtonLabel, ButtonBar.ButtonData.OK_DONE);
         ButtonType cancelButtonType = new ButtonType(cancelButtonLabel, ButtonBar.ButtonData.NO);
@@ -275,17 +314,21 @@ public boolean showConfirmationDialogAndWait(String title, String content,
     }
 
     @Override
-    public boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
-                                                           String optOutMessage, Consumer<Boolean> optOutAction) {
+    public boolean showConfirmationDialogWithOptOutAndWait(
+            String title, String content, String optOutMessage, Consumer<Boolean> optOutAction) {
         FXDialog alert = createDialogWithOptOut(title, content, optOutMessage, optOutAction);
         alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO);
         return alert.showAndWait().filter(buttonType -> buttonType == ButtonType.YES).isPresent();
     }
 
     @Override
-    public boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
-                                                           String okButtonLabel, String cancelButtonLabel,
-                                                           String optOutMessage, Consumer<Boolean> optOutAction) {
+    public boolean showConfirmationDialogWithOptOutAndWait(
+            String title,
+            String content,
+            String okButtonLabel,
+            String cancelButtonLabel,
+            String optOutMessage,
+            Consumer<Boolean> optOutAction) {
         FXDialog alert = createDialogWithOptOut(title, content, optOutMessage, optOutAction);
         ButtonType okButtonType = new ButtonType(okButtonLabel, ButtonBar.ButtonData.YES);
         ButtonType cancelButtonType = new ButtonType(cancelButtonLabel, ButtonBar.ButtonData.NO);
@@ -294,16 +337,16 @@ public boolean showConfirmationDialogWithOptOutAndWait(String title, String cont
     }
 
     @Override
-    public Optional<ButtonType> showCustomButtonDialogAndWait(AlertType type, String title, String content,
-                                                              ButtonType... buttonTypes) {
+    public Optional<ButtonType> showCustomButtonDialogAndWait(
+            AlertType type, String title, String content, ButtonType... buttonTypes) {
         FXDialog alert = createDialog(type, title, content);
         alert.getButtonTypes().setAll(buttonTypes);
         return alert.showAndWait();
     }
 
     @Override
-    public Optional<ButtonType> showCustomDialogAndWait(String title, DialogPane contentPane,
-                                                        ButtonType... buttonTypes) {
+    public Optional<ButtonType> showCustomDialogAndWait(
+            String title, DialogPane contentPane, ButtonType... buttonTypes) {
         FXDialog alert = new FXDialog(AlertType.NONE, title);
         alert.setDialogPane(contentPane);
         alert.getButtonTypes().setAll(buttonTypes);
@@ -336,12 +379,13 @@ public Optional<String> showPasswordDialogAndWait(String title, String header, S
         dialog.getDialogPane().setContent(box);
 
         dialog.getDialogPane().getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK);
-        dialog.setResultConverter(dialogButton -> {
-            if (dialogButton == ButtonType.OK) {
-                return passwordField.getText();
-            }
-            return null;
-        });
+        dialog.setResultConverter(
+                dialogButton -> {
+                    if (dialogButton == ButtonType.OK) {
+                        return passwordField.getText();
+                    }
+                    return null;
+                });
         return dialog.showAndWait();
     }
 
@@ -351,15 +395,18 @@ private <V> ProgressDialog createProgressDialog(String title, String content, Ta
         progressDialog.setTitle(title);
         progressDialog.setContentText(content);
         progressDialog.setGraphic(null);
-        ((Stage) progressDialog.getDialogPane().getScene().getWindow()).getIcons().add(IconTheme.getJabRefImage());
+        ((Stage) progressDialog.getDialogPane().getScene().getWindow())
+                .getIcons()
+                .add(IconTheme.getJabRefImage());
         progressDialog.setOnCloseRequest(evt -> task.cancel());
         DialogPane dialogPane = progressDialog.getDialogPane();
         dialogPane.getButtonTypes().add(ButtonType.CANCEL);
         Button cancelButton = (Button) dialogPane.lookupButton(ButtonType.CANCEL);
-        cancelButton.setOnAction(evt -> {
-            task.cancel();
-            progressDialog.close();
-        });
+        cancelButton.setOnAction(
+                evt -> {
+                    task.cancel();
+                    progressDialog.close();
+                });
         progressDialog.initOwner(mainWindow);
         return progressDialog;
     }
@@ -377,11 +424,13 @@ public <V> void showProgressDialogAndWait(String title, String content, Task<V>
     }
 
     @Override
-    public Optional<ButtonType> showBackgroundProgressDialogAndWait(String title, String content, StateManager stateManager) {
+    public Optional<ButtonType> showBackgroundProgressDialogAndWait(
+            String title, String content, StateManager stateManager) {
         TaskProgressView<Task<?>> taskProgressView = new TaskProgressView<>();
         EasyBind.bindContent(taskProgressView.getTasks(), stateManager.getRunningBackgroundTasks());
         taskProgressView.setRetainTasks(false);
-        taskProgressView.setGraphicFactory(task -> ThemeManager.getDownloadIconTitleMap.getOrDefault(task.getTitle(), null));
+        taskProgressView.setGraphicFactory(
+                task -> ThemeManager.getDownloadIconTitleMap.getOrDefault(task.getTitle(), null));
 
         Label message = new Label(content);
 
@@ -397,12 +446,15 @@ public Optional<ButtonType> showBackgroundProgressDialogAndWait(String title, St
         alert.setResizable(true);
         alert.initOwner(mainWindow);
 
-        stateManager.getAnyTasksThatWillNotBeRecoveredRunning().addListener((observable, oldValue, newValue) -> {
-            if (!newValue) {
-                alert.setResult(ButtonType.YES);
-                alert.close();
-            }
-        });
+        stateManager
+                .getAnyTasksThatWillNotBeRecoveredRunning()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            if (!newValue) {
+                                alert.setResult(ButtonType.YES);
+                                alert.close();
+                            }
+                        });
 
         return alert.showAndWait();
     }
@@ -413,31 +465,40 @@ public void notify(String message) {
         //       The event log is not that user friendly (different purpose).
         LOGGER.info(message);
 
-        UiTaskExecutor.runInJavaFXThread(() ->
-            Notifications.create()
-                         .text(message)
-                         .position(Pos.BOTTOM_CENTER)
-                         .hideAfter(TOAST_MESSAGE_DISPLAY_TIME)
-                         .owner(mainWindow)
-                         .threshold(5,
-                            Notifications.create()
-                                         .title(Localization.lang("Last notification"))
-                                         .text(
-                                            "(" + Localization.lang("Check the event log to see all notifications") + ")"
-                                            + "\n\n" + message)
-                                         .onAction(e -> {
-                                            ErrorConsoleAction ec = new ErrorConsoleAction();
-                                            ec.execute();
-                                         }))
-                         .hideCloseButton()
-                         .show());
+        UiTaskExecutor.runInJavaFXThread(
+                () ->
+                        Notifications.create()
+                                .text(message)
+                                .position(Pos.BOTTOM_CENTER)
+                                .hideAfter(TOAST_MESSAGE_DISPLAY_TIME)
+                                .owner(mainWindow)
+                                .threshold(
+                                        5,
+                                        Notifications.create()
+                                                .title(Localization.lang("Last notification"))
+                                                .text(
+                                                        "("
+                                                                + Localization.lang(
+                                                                        "Check the event log to see all notifications")
+                                                                + ")"
+                                                                + "\n\n"
+                                                                + message)
+                                                .onAction(
+                                                        e -> {
+                                                            ErrorConsoleAction ec =
+                                                                    new ErrorConsoleAction();
+                                                            ec.execute();
+                                                        }))
+                                .hideCloseButton()
+                                .show());
     }
 
     @Override
     public Optional<Path> showFileSaveDialog(FileDialogConfiguration fileDialogConfiguration) {
         FileChooser chooser = getConfiguredFileChooser(fileDialogConfiguration);
         File file = chooser.showSaveDialog(mainWindow);
-        Optional.ofNullable(chooser.getSelectedExtensionFilter()).ifPresent(fileDialogConfiguration::setSelectedExtensionFilter);
+        Optional.ofNullable(chooser.getSelectedExtensionFilter())
+                .ifPresent(fileDialogConfiguration::setSelectedExtensionFilter);
         return Optional.ofNullable(file).map(File::toPath);
     }
 
@@ -445,27 +506,34 @@ public Optional<Path> showFileSaveDialog(FileDialogConfiguration fileDialogConfi
     public Optional<Path> showFileOpenDialog(FileDialogConfiguration fileDialogConfiguration) {
         FileChooser chooser = getConfiguredFileChooser(fileDialogConfiguration);
         File file = chooser.showOpenDialog(mainWindow);
-        Optional.ofNullable(chooser.getSelectedExtensionFilter()).ifPresent(fileDialogConfiguration::setSelectedExtensionFilter);
+        Optional.ofNullable(chooser.getSelectedExtensionFilter())
+                .ifPresent(fileDialogConfiguration::setSelectedExtensionFilter);
         return Optional.ofNullable(file).map(File::toPath);
     }
 
     @Override
-    public Optional<Path> showDirectorySelectionDialog(DirectoryDialogConfiguration directoryDialogConfiguration) {
+    public Optional<Path> showDirectorySelectionDialog(
+            DirectoryDialogConfiguration directoryDialogConfiguration) {
         DirectoryChooser chooser = getConfiguredDirectoryChooser(directoryDialogConfiguration);
         File file = chooser.showDialog(mainWindow);
         return Optional.ofNullable(file).map(File::toPath);
     }
 
     @Override
-    public List<Path> showFileOpenDialogAndGetMultipleFiles(FileDialogConfiguration fileDialogConfiguration) {
+    public List<Path> showFileOpenDialogAndGetMultipleFiles(
+            FileDialogConfiguration fileDialogConfiguration) {
         FileChooser chooser = getConfiguredFileChooser(fileDialogConfiguration);
         List<File> files = chooser.showOpenMultipleDialog(mainWindow);
         return files != null ? files.stream().map(File::toPath).toList() : List.of();
     }
 
-    private DirectoryChooser getConfiguredDirectoryChooser(DirectoryDialogConfiguration directoryDialogConfiguration) {
+    private DirectoryChooser getConfiguredDirectoryChooser(
+            DirectoryDialogConfiguration directoryDialogConfiguration) {
         DirectoryChooser chooser = new DirectoryChooser();
-        directoryDialogConfiguration.getInitialDirectory().map(Path::toFile).ifPresent(chooser::setInitialDirectory);
+        directoryDialogConfiguration
+                .getInitialDirectory()
+                .map(Path::toFile)
+                .ifPresent(chooser::setInitialDirectory);
         return chooser;
     }
 
@@ -474,7 +542,10 @@ private FileChooser getConfiguredFileChooser(FileDialogConfiguration fileDialogC
         chooser.getExtensionFilters().addAll(fileDialogConfiguration.getExtensionFilters());
         chooser.setSelectedExtensionFilter(fileDialogConfiguration.getDefaultExtension());
         chooser.setInitialFileName(fileDialogConfiguration.getInitialFileName());
-        fileDialogConfiguration.getInitialDirectory().map(Path::toFile).ifPresent(chooser::setInitialDirectory);
+        fileDialogConfiguration
+                .getInitialDirectory()
+                .map(Path::toFile)
+                .ifPresent(chooser::setInitialDirectory);
         return chooser;
     }
 
@@ -512,13 +583,17 @@ public void showCustomWindow(BaseWindow window) {
     private String getContentByCode(int statusCode) {
         return switch (statusCode) {
             case 401 ->
-                    Localization.lang("Access denied. You are not authorized to access this resource. Please check your credentials and try again. If you believe you should have access, please contact the administrator for assistance.");
+                    Localization.lang(
+                            "Access denied. You are not authorized to access this resource. Please check your credentials and try again. If you believe you should have access, please contact the administrator for assistance.");
             case 403 ->
-                    Localization.lang("Access denied. You do not have permission to access this resource. Please contact the administrator for assistance or try a different action.");
+                    Localization.lang(
+                            "Access denied. You do not have permission to access this resource. Please contact the administrator for assistance or try a different action.");
             case 404 ->
-                    Localization.lang("The requested resource could not be found. It seems that the file you are trying to download is not available or has been moved. Please verify the URL and try again. If you believe this is an error, please contact the administrator for further assistance.");
+                    Localization.lang(
+                            "The requested resource could not be found. It seems that the file you are trying to download is not available or has been moved. Please verify the URL and try again. If you believe this is an error, please contact the administrator for further assistance.");
             default ->
-                    Localization.lang("Something is wrong on JabRef side. Please check the URL and try again.");
+                    Localization.lang(
+                            "Something is wrong on JabRef side. Please check the URL and try again.");
         };
     }
 }
diff --git a/src/main/java/org/jabref/gui/JabRefGUI.java b/src/main/java/org/jabref/gui/JabRefGUI.java
index b0c0e1c83f0e..fda21561e73b 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -1,9 +1,7 @@
 package org.jabref.gui;
 
-import java.util.List;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.injection.Injector;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -14,6 +12,8 @@
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
 
+import kong.unirest.core.Unirest;
+
 import org.jabref.gui.ai.chatting.chathistory.ChatHistoryService;
 import org.jabref.gui.frame.JabRefFrame;
 import org.jabref.gui.help.VersionWorker;
@@ -41,13 +41,14 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.DirectoryMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import com.airhacks.afterburner.injection.Injector;
-import com.tobiasdiez.easybind.EasyBind;
-import kong.unirest.core.Unirest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
+
 /**
  * Represents the outer stage and the scene of the JabRef window.
  */
@@ -75,9 +76,10 @@ public class JabRefGUI extends Application {
 
     private Stage mainStage;
 
-    public static void setup(List<UiCommand> uiCommands,
-                             GuiPreferences preferences,
-                             FileUpdateMonitor fileUpdateMonitor) {
+    public static void setup(
+            List<UiCommand> uiCommands,
+            GuiPreferences preferences,
+            FileUpdateMonitor fileUpdateMonitor) {
         JabRefGUI.uiCommands = uiCommands;
         JabRefGUI.preferences = preferences;
         JabRefGUI.fileUpdateMonitor = fileUpdateMonitor;
@@ -87,27 +89,32 @@ public static void setup(List<UiCommand> uiCommands,
     public void start(Stage stage) {
         this.mainStage = stage;
 
-        FallbackExceptionHandler.installExceptionHandler((exception, thread) -> {
-            UiTaskExecutor.runInJavaFXThread(() -> {
-                DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-                dialogService.showErrorDialogAndWait("Uncaught exception occurred in " + thread, exception);
-            });
-        });
+        FallbackExceptionHandler.installExceptionHandler(
+                (exception, thread) -> {
+                    UiTaskExecutor.runInJavaFXThread(
+                            () -> {
+                                DialogService dialogService =
+                                        Injector.instantiateModelOrService(DialogService.class);
+                                dialogService.showErrorDialogAndWait(
+                                        "Uncaught exception occurred in " + thread, exception);
+                            });
+                });
 
         initialize();
 
-        JabRefGUI.mainFrame = new JabRefFrame(
-                mainStage,
-                dialogService,
-                fileUpdateMonitor,
-                preferences,
-                aiService,
-                chatHistoryService,
-                stateManager,
-                countingUndoManager,
-                Injector.instantiateModelOrService(BibEntryTypesManager.class),
-                clipBoardManager,
-                taskExecutor);
+        JabRefGUI.mainFrame =
+                new JabRefFrame(
+                        mainStage,
+                        dialogService,
+                        fileUpdateMonitor,
+                        preferences,
+                        aiService,
+                        chatHistoryService,
+                        stateManager,
+                        countingUndoManager,
+                        Injector.instantiateModelOrService(BibEntryTypesManager.class),
+                        clipBoardManager,
+                        taskExecutor);
 
         openWindow();
 
@@ -115,21 +122,22 @@ public void start(Stage stage) {
 
         if (!fileUpdateMonitor.isActive()) {
             dialogService.showErrorDialogAndWait(
-                    Localization.lang("Unable to monitor file changes. Please close files " +
-                            "and processes and restart. You may encounter errors if you continue " +
-                            "with this session."));
+                    Localization.lang(
+                            "Unable to monitor file changes. Please close files "
+                                    + "and processes and restart. You may encounter errors if you continue "
+                                    + "with this session."));
         }
 
         BuildInfo buildInfo = Injector.instantiateModelOrService(BuildInfo.class);
-        EasyBind.subscribe(preferences.getInternalPreferences().versionCheckEnabledProperty(), enabled -> {
-            if (enabled) {
-                new VersionWorker(buildInfo.version,
-                        dialogService,
-                        taskExecutor,
-                        preferences)
-                        .checkForNewVersionDelayed();
-            }
-        });
+        EasyBind.subscribe(
+                preferences.getInternalPreferences().versionCheckEnabledProperty(),
+                enabled -> {
+                    if (enabled) {
+                        new VersionWorker(
+                                        buildInfo.version, dialogService, taskExecutor, preferences)
+                                .checkForNewVersionDelayed();
+                    }
+                });
 
         setupProxy();
     }
@@ -143,12 +151,12 @@ public void initialize() {
         JabRefGUI.stateManager = new StateManager();
         Injector.setModelOrService(StateManager.class, stateManager);
 
-        Injector.setModelOrService(KeyBindingRepository.class, preferences.getKeyBindingRepository());
+        Injector.setModelOrService(
+                KeyBindingRepository.class, preferences.getKeyBindingRepository());
 
-        JabRefGUI.themeManager = new ThemeManager(
-                preferences.getWorkspacePreferences(),
-                fileUpdateMonitor,
-                Runnable::run);
+        JabRefGUI.themeManager =
+                new ThemeManager(
+                        preferences.getWorkspacePreferences(), fileUpdateMonitor, Runnable::run);
         Injector.setModelOrService(ThemeManager.class, themeManager);
 
         JabRefGUI.countingUndoManager = new CountingUndoManager();
@@ -165,16 +173,17 @@ public void initialize() {
         JabRefGUI.clipBoardManager = new ClipBoardManager();
         Injector.setModelOrService(ClipBoardManager.class, clipBoardManager);
 
-        JabRefGUI.aiService = new AiService(
-                preferences.getAiPreferences(),
-                preferences.getFilePreferences(),
-                dialogService,
-                taskExecutor);
+        JabRefGUI.aiService =
+                new AiService(
+                        preferences.getAiPreferences(),
+                        preferences.getFilePreferences(),
+                        dialogService,
+                        taskExecutor);
         Injector.setModelOrService(AiService.class, aiService);
 
-        JabRefGUI.chatHistoryService = new ChatHistoryService(
-                preferences.getCitationKeyPatternPreferences(),
-                dialogService);
+        JabRefGUI.chatHistoryService =
+                new ChatHistoryService(
+                        preferences.getCitationKeyPatternPreferences(), dialogService);
         Injector.setModelOrService(ChatHistoryService.class, chatHistoryService);
     }
 
@@ -190,10 +199,11 @@ private void setupProxy() {
             return;
         }
 
-        Optional<String> password = dialogService.showPasswordDialogAndWait(
-                Localization.lang("Proxy configuration"),
-                Localization.lang("Proxy requires password"),
-                Localization.lang("Password"));
+        Optional<String> password =
+                dialogService.showPasswordDialogAndWait(
+                        Localization.lang("Proxy configuration"),
+                        Localization.lang("Proxy requires password"),
+                        Localization.lang("Password"));
 
         if (password.isPresent()) {
             preferences.getProxyPreferences().setPassword(password.get());
@@ -212,7 +222,8 @@ private void openWindow() {
         mainStage.setMinWidth(580);
         mainStage.setMinHeight(330);
 
-        // maximized target state is stored, because "saveWindowState" saves x and y only if not maximized
+        // maximized target state is stored, because "saveWindowState" saves x and y only if not
+        // maximized
         boolean windowMaximised = coreGuiPreferences.isWindowMaximised();
 
         LOGGER.debug("Screens: {}", Screen.getScreens());
@@ -226,7 +237,8 @@ private void openWindow() {
             mainStage.setHeight(coreGuiPreferences.getSizeY());
             LOGGER.debug("NOT saving window positions");
         } else {
-            LOGGER.info("The JabRef window is outside of screen bounds. Position and size will be corrected to 1024x768. Primary screen will be used.");
+            LOGGER.info(
+                    "The JabRef window is outside of screen bounds. Position and size will be corrected to 1024x768. Primary screen will be used.");
             Rectangle2D bounds = Screen.getPrimary().getBounds();
             mainStage.setX(bounds.getMinX());
             mainStage.setY(bounds.getMinY());
@@ -245,10 +257,11 @@ private void openWindow() {
         themeManager.installCss(scene);
 
         LOGGER.debug("Handle TextEditor key bindings");
-        scene.addEventFilter(KeyEvent.KEY_PRESSED, event -> TextInputKeyBindings.call(
-                scene,
-                event,
-                preferences.getKeyBindingRepository()));
+        scene.addEventFilter(
+                KeyEvent.KEY_PRESSED,
+                event ->
+                        TextInputKeyBindings.call(
+                                scene, event, preferences.getKeyBindingRepository()));
 
         mainStage.setTitle(JabRefFrame.FRAME_TITLE);
         mainStage.getIcons().addAll(IconTheme.getLogoSetFX());
@@ -270,7 +283,7 @@ public void onShowing(WindowEvent event) {
 
         // Open last edited databases
         if (uiCommands.stream().noneMatch(UiCommand.BlankWorkspace.class::isInstance)
-            && preferences.getWorkspacePreferences().shouldOpenLastEdited()) {
+                && preferences.getWorkspacePreferences().shouldOpenLastEdited()) {
             mainFrame.openLastEditedDatabases();
         }
     }
@@ -305,7 +318,8 @@ private void saveWindowState() {
      * @param mainStage JabRef's stage
      */
     private void debugLogWindowState(Stage mainStage) {
-        LOGGER.debug("""
+        LOGGER.debug(
+                """
                         screen data:
                           mainStage.WINDOW_MAXIMISED: {}
                           mainStage.POS_X: {}
@@ -313,7 +327,11 @@ private void debugLogWindowState(Stage mainStage) {
                           mainStage.SIZE_X: {}
                           mainStage.SIZE_Y: {}
                         """,
-                mainStage.isMaximized(), mainStage.getX(), mainStage.getY(), mainStage.getWidth(), mainStage.getHeight());
+                mainStage.isMaximized(),
+                mainStage.getX(),
+                mainStage.getY(),
+                mainStage.getWidth(),
+                mainStage.getHeight());
     }
 
     /**
@@ -323,7 +341,8 @@ private boolean isWindowPositionInBounds() {
         CoreGuiPreferences coreGuiPreferences = preferences.getGuiPreferences();
 
         if (LOGGER.isDebugEnabled()) {
-            Screen.getScreens().forEach(screen -> LOGGER.debug("Screen bounds: {}", screen.getBounds()));
+            Screen.getScreens()
+                    .forEach(screen -> LOGGER.debug("Screen bounds: {}", screen.getBounds()));
         }
 
         return lowerLeftIsInBounds(coreGuiPreferences) && upperRightIsInBounds(coreGuiPreferences);
@@ -335,19 +354,24 @@ private boolean lowerLeftIsInBounds(CoreGuiPreferences coreGuiPreferences) {
         double bottomY = coreGuiPreferences.getPositionY() + coreGuiPreferences.getSizeY();
         LOGGER.debug("left x: {}, bottom y: {}", leftX, bottomY);
 
-        boolean inBounds = Screen.getScreens().stream().anyMatch((screen -> screen.getBounds().contains(leftX, bottomY)));
+        boolean inBounds =
+                Screen.getScreens().stream()
+                        .anyMatch((screen -> screen.getBounds().contains(leftX, bottomY)));
         LOGGER.debug("lower left corner is in bounds: {}", inBounds);
         return inBounds;
     }
 
     private boolean upperRightIsInBounds(CoreGuiPreferences coreGuiPreferences) {
         // The upper right corner is checked as there are most probably the window controls.
-        // Windows/PowerToys somehow adds 10 pixels to the right and top of the screen, they are removed
+        // Windows/PowerToys somehow adds 10 pixels to the right and top of the screen, they are
+        // removed
         double rightX = coreGuiPreferences.getPositionX() + coreGuiPreferences.getSizeX() - 10.0;
         double topY = coreGuiPreferences.getPositionY();
         LOGGER.debug("right x: {}, top y: {}", rightX, topY);
 
-        boolean inBounds = Screen.getScreens().stream().anyMatch((screen -> screen.getBounds().contains(rightX, topY)));
+        boolean inBounds =
+                Screen.getScreens().stream()
+                        .anyMatch((screen -> screen.getBounds().contains(rightX, topY)));
         LOGGER.debug("upper right corner is in bounds: {}", inBounds);
         return inBounds;
     }
@@ -355,14 +379,12 @@ private boolean upperRightIsInBounds(CoreGuiPreferences coreGuiPreferences) {
     // Background tasks
     public void startBackgroundTasks() {
         RemotePreferences remotePreferences = preferences.getRemotePreferences();
-        BibEntryTypesManager bibEntryTypesManager = Injector.instantiateModelOrService(BibEntryTypesManager.class);
+        BibEntryTypesManager bibEntryTypesManager =
+                Injector.instantiateModelOrService(BibEntryTypesManager.class);
         if (remotePreferences.useRemoteServer()) {
             remoteListenerServerManager.openAndStart(
                     new CLIMessageHandler(
-                            mainFrame,
-                            preferences,
-                            fileUpdateMonitor,
-                            bibEntryTypesManager),
+                            mainFrame, preferences, fileUpdateMonitor, bibEntryTypesManager),
                     remotePreferences.getPort());
         }
     }
@@ -398,7 +420,8 @@ public static void shutdownThreadPools() {
         LOGGER.trace("Shutting down fileUpdateMonitor");
         fileUpdateMonitor.shutdown();
         LOGGER.trace("Shutting down directoryMonitor");
-        DirectoryMonitor directoryMonitor = Injector.instantiateModelOrService(DirectoryMonitor.class);
+        DirectoryMonitor directoryMonitor =
+                Injector.instantiateModelOrService(DirectoryMonitor.class);
         directoryMonitor.shutdown();
         LOGGER.trace("Shutting down HeadlessExecutorService");
         HeadlessExecutorService.INSTANCE.shutdownEverything();
diff --git a/src/main/java/org/jabref/gui/LibraryTab.java b/src/main/java/org/jabref/gui/LibraryTab.java
index 791eec0dee12..ca614a428e9f 100644
--- a/src/main/java/org/jabref/gui/LibraryTab.java
+++ b/src/main/java/org/jabref/gui/LibraryTab.java
@@ -1,16 +1,9 @@
 package org.jabref.gui;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Random;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.injection.Injector;
+import com.google.common.eventbus.Subscribe;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.Subscription;
 
 import javafx.animation.PauseTransition;
 import javafx.application.Platform;
@@ -36,6 +29,8 @@
 import javafx.scene.layout.BorderPane;
 import javafx.util.Duration;
 
+import org.controlsfx.control.NotificationPane;
+import org.controlsfx.control.action.Action;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.autocompleter.PersonNameSuggestionProvider;
@@ -98,16 +93,21 @@
 import org.jabref.model.util.DirectoryMonitor;
 import org.jabref.model.util.DirectoryMonitorManager;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import com.airhacks.afterburner.injection.Injector;
-import com.google.common.eventbus.Subscribe;
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.Subscription;
-import org.controlsfx.control.NotificationPane;
-import org.controlsfx.control.action.Action;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Random;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
+
 /**
  * Represents the ui area where the notifier pane, the library table and the entry editor are shown.
  */
@@ -115,7 +115,10 @@ public class LibraryTab extends Tab {
     /**
      * Defines the different modes that the tab can operate in
      */
-    private enum PanelMode { MAIN_TABLE, MAIN_TABLE_AND_ENTRY_EDITOR }
+    private enum PanelMode {
+        MAIN_TABLE,
+        MAIN_TABLE_AND_ENTRY_EDITOR
+    }
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
     private final LibraryTabContainer tabContainer;
@@ -155,7 +158,8 @@ private enum PanelMode { MAIN_TABLE, MAIN_TABLE_AND_ENTRY_EDITOR }
     private Subscription dividerPositionSubscription;
 
     private ListProperty<GroupTreeNode> selectedGroupsProperty;
-    private final OptionalObjectProperty<SearchQuery> searchQueryProperty = OptionalObjectProperty.empty();
+    private final OptionalObjectProperty<SearchQuery> searchQueryProperty =
+            OptionalObjectProperty.empty();
     private final IntegerProperty resultSize = new SimpleIntegerProperty(0);
 
     private Optional<DatabaseChangeMonitor> changeMonitor = Optional.empty();
@@ -175,17 +179,18 @@ private enum PanelMode { MAIN_TABLE, MAIN_TABLE_AND_ENTRY_EDITOR }
      *                       If the index is created for the dummy context, the actual context will not be able to open the index until it is closed by the dummy context.
      *                       Closing the index takes time and will slow down opening the library.
      */
-    private LibraryTab(BibDatabaseContext bibDatabaseContext,
-                       LibraryTabContainer tabContainer,
-                       DialogService dialogService,
-                       GuiPreferences preferences,
-                       StateManager stateManager,
-                       FileUpdateMonitor fileUpdateMonitor,
-                       BibEntryTypesManager entryTypesManager,
-                       CountingUndoManager undoManager,
-                       ClipBoardManager clipBoardManager,
-                       TaskExecutor taskExecutor,
-                       boolean isDummyContext) {
+    private LibraryTab(
+            BibDatabaseContext bibDatabaseContext,
+            LibraryTabContainer tabContainer,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            StateManager stateManager,
+            FileUpdateMonitor fileUpdateMonitor,
+            BibEntryTypesManager entryTypesManager,
+            CountingUndoManager undoManager,
+            ClipBoardManager clipBoardManager,
+            TaskExecutor taskExecutor,
+            boolean isDummyContext) {
         this.tabContainer = Objects.requireNonNull(tabContainer);
         this.bibDatabaseContext = Objects.requireNonNull(bibDatabaseContext);
         this.undoManager = undoManager;
@@ -196,7 +201,9 @@ private LibraryTab(BibDatabaseContext bibDatabaseContext,
         this.entryTypesManager = entryTypesManager;
         this.clipBoardManager = clipBoardManager;
         this.taskExecutor = taskExecutor;
-        this.directoryMonitorManager = new DirectoryMonitorManager(Injector.instantiateModelOrService(DirectoryMonitor.class));
+        this.directoryMonitorManager =
+                new DirectoryMonitorManager(
+                        Injector.instantiateModelOrService(DirectoryMonitor.class));
 
         initializeComponentsAndListeners(isDummyContext);
 
@@ -220,19 +227,31 @@ private void initializeComponentsAndListeners(boolean isDummyContext) {
         bibDatabaseContext.getDatabase().registerListener(this);
         bibDatabaseContext.getMetaData().registerListener(this);
 
-        this.selectedGroupsProperty = new SimpleListProperty<>(stateManager.getSelectedGroups(bibDatabaseContext));
-        this.tableModel = new MainTableDataModel(getBibDatabaseContext(), preferences, taskExecutor, stateManager, getLuceneManager(), selectedGroupsProperty(), searchQueryProperty(), resultSizeProperty());
+        this.selectedGroupsProperty =
+                new SimpleListProperty<>(stateManager.getSelectedGroups(bibDatabaseContext));
+        this.tableModel =
+                new MainTableDataModel(
+                        getBibDatabaseContext(),
+                        preferences,
+                        taskExecutor,
+                        stateManager,
+                        getLuceneManager(),
+                        selectedGroupsProperty(),
+                        searchQueryProperty(),
+                        resultSizeProperty());
 
         new CitationStyleCache(bibDatabaseContext);
-        annotationCache = new FileAnnotationCache(bibDatabaseContext, preferences.getFilePreferences());
-        importHandler = new ImportHandler(
-                bibDatabaseContext,
-                preferences,
-                fileUpdateMonitor,
-                undoManager,
-                stateManager,
-                dialogService,
-                taskExecutor);
+        annotationCache =
+                new FileAnnotationCache(bibDatabaseContext, preferences.getFilePreferences());
+        importHandler =
+                new ImportHandler(
+                        bibDatabaseContext,
+                        preferences,
+                        fileUpdateMonitor,
+                        undoManager,
+                        stateManager,
+                        dialogService,
+                        taskExecutor);
 
         setupMainPanel();
         setupAutoCompletion();
@@ -249,17 +268,23 @@ private void initializeComponentsAndListeners(boolean isDummyContext) {
 
         this.entryEditor = createEntryEditor();
 
-        Platform.runLater(() -> {
-            EasyBind.subscribe(changedProperty, this::updateTabTitle);
-            stateManager.getOpenDatabases().addListener((ListChangeListener<BibDatabaseContext>) c ->
-                    updateTabTitle(changedProperty.getValue()));
-        });
+        Platform.runLater(
+                () -> {
+                    EasyBind.subscribe(changedProperty, this::updateTabTitle);
+                    stateManager
+                            .getOpenDatabases()
+                            .addListener(
+                                    (ListChangeListener<BibDatabaseContext>)
+                                            c -> updateTabTitle(changedProperty.getValue()));
+                });
     }
 
     private EntryEditor createEntryEditor() {
         Supplier<LibraryTab> tabSupplier = () -> this;
-        return new EntryEditor(this,
-                // Actions are recreated here since this avoids passing more parameters and the amount of additional memory consumption is neglegtable.
+        return new EntryEditor(
+                this,
+                // Actions are recreated here since this avoids passing more parameters and the
+                // amount of additional memory consumption is neglegtable.
                 new UndoAction(tabSupplier, undoManager, dialogService, stateManager),
                 new RedoAction(tabSupplier, undoManager, dialogService, stateManager));
     }
@@ -275,7 +300,8 @@ private static void addModeInfo(StringBuilder text, BibDatabaseContext bibDataba
         text.append(modeInfo);
     }
 
-    private static void addSharedDbInformation(StringBuilder text, BibDatabaseContext bibDatabaseContext) {
+    private static void addSharedDbInformation(
+            StringBuilder text, BibDatabaseContext bibDatabaseContext) {
         text.append(bibDatabaseContext.getDBMSSynchronizer().getDBName());
         text.append(" [");
         text.append(Localization.lang("shared"));
@@ -291,7 +317,8 @@ private void setDataLoadingTask(BackgroundTask<ParserResult> dataLoadingTask) {
      * The layout to display in the tab when it is loading
      */
     private Node createLoadingAnimationLayout() {
-        ProgressIndicator progressIndicator = new ProgressIndicator(ProgressIndicator.INDETERMINATE_PROGRESS);
+        ProgressIndicator progressIndicator =
+                new ProgressIndicator(ProgressIndicator.INDETERMINATE_PROGRESS);
         BorderPane pane = new BorderPane();
         pane.setCenter(progressIndicator);
         return pane;
@@ -316,7 +343,9 @@ private void onDatabaseLoadingSucceed(ParserResult result) {
     }
 
     public void createLuceneManager() {
-        luceneManager = new LuceneManager(bibDatabaseContext, taskExecutor, preferences.getFilePreferences());
+        luceneManager =
+                new LuceneManager(
+                        bibDatabaseContext, taskExecutor, preferences.getFilePreferences());
         stateManager.setLuceneManager(bibDatabaseContext, luceneManager);
     }
 
@@ -332,7 +361,10 @@ private void onDatabaseLoadingFailed(Exception ex) {
         loading.set(false);
 
         String title = Localization.lang("Connection error");
-        String content = "%s\n\n%s".formatted(ex.getMessage(), Localization.lang("A local copy will be opened."));
+        String content =
+                "%s\n\n%s"
+                        .formatted(
+                                ex.getMessage(), Localization.lang("A local copy will be opened."));
 
         dialogService.showErrorDialogAndWait(title, content, ex);
     }
@@ -349,9 +381,14 @@ private void setDatabaseContext(BibDatabaseContext bibDatabaseContext) {
             stateManager.activeTabProperty().set(Optional.of(this));
         }
 
-        // Remove existing dummy BibDatabaseContext and add correct BibDatabaseContext from ParserResult to trigger changes in the openDatabases list in the stateManager
-        Optional<BibDatabaseContext> foundExistingBibDatabase = stateManager.getOpenDatabases().stream().filter(databaseContext -> databaseContext.equals(this.bibDatabaseContext)).findFirst();
-        foundExistingBibDatabase.ifPresent(databaseContext -> stateManager.getOpenDatabases().remove(databaseContext));
+        // Remove existing dummy BibDatabaseContext and add correct BibDatabaseContext from
+        // ParserResult to trigger changes in the openDatabases list in the stateManager
+        Optional<BibDatabaseContext> foundExistingBibDatabase =
+                stateManager.getOpenDatabases().stream()
+                        .filter(databaseContext -> databaseContext.equals(this.bibDatabaseContext))
+                        .findFirst();
+        foundExistingBibDatabase.ifPresent(
+                databaseContext -> stateManager.getOpenDatabases().remove(databaseContext));
 
         this.bibDatabaseContext = Objects.requireNonNull(bibDatabaseContext);
 
@@ -364,22 +401,29 @@ private void setDatabaseContext(BibDatabaseContext bibDatabaseContext) {
     public void installAutosaveManagerAndBackupManager() {
         if (isDatabaseReadyForAutoSave(bibDatabaseContext)) {
             AutosaveManager autosaveManager = AutosaveManager.start(bibDatabaseContext);
-            autosaveManager.registerListener(new AutosaveUiManager(this, dialogService, preferences, entryTypesManager));
+            autosaveManager.registerListener(
+                    new AutosaveUiManager(this, dialogService, preferences, entryTypesManager));
         }
-        if (isDatabaseReadyForBackup(bibDatabaseContext) && preferences.getFilePreferences().shouldCreateBackup()) {
-            BackupManager.start(this, bibDatabaseContext, Injector.instantiateModelOrService(BibEntryTypesManager.class), preferences);
+        if (isDatabaseReadyForBackup(bibDatabaseContext)
+                && preferences.getFilePreferences().shouldCreateBackup()) {
+            BackupManager.start(
+                    this,
+                    bibDatabaseContext,
+                    Injector.instantiateModelOrService(BibEntryTypesManager.class),
+                    preferences);
         }
     }
 
     private boolean isDatabaseReadyForAutoSave(BibDatabaseContext context) {
         return ((context.getLocation() == DatabaseLocation.SHARED)
-                || ((context.getLocation() == DatabaseLocation.LOCAL)
-                && preferences.getLibraryPreferences().shouldAutoSave()))
+                        || ((context.getLocation() == DatabaseLocation.LOCAL)
+                                && preferences.getLibraryPreferences().shouldAutoSave()))
                 && context.getDatabasePath().isPresent();
     }
 
     private boolean isDatabaseReadyForBackup(BibDatabaseContext context) {
-        return (context.getLocation() == DatabaseLocation.LOCAL) && context.getDatabasePath().isPresent();
+        return (context.getLocation() == DatabaseLocation.LOCAL)
+                && context.getDatabasePath().isPresent();
     }
 
     /**
@@ -426,7 +470,9 @@ public void updateTabTitle(boolean isChanged) {
             }
 
             // Unique path fragment
-            Optional<String> uniquePathPart = FileUtil.getUniquePathDirectory(stateManager.collectAllDatabasePaths(), databasePath);
+            Optional<String> uniquePathPart =
+                    FileUtil.getUniquePathDirectory(
+                            stateManager.collectAllDatabasePaths(), databasePath);
             uniquePathPart.ifPresent(part -> tabTitle.append(" \u2013 ").append(part));
         } else {
             if (databaseLocation == DatabaseLocation.LOCAL) {
@@ -437,15 +483,17 @@ public void updateTabTitle(boolean isChanged) {
                 addSharedDbInformation(toolTipText, bibDatabaseContext);
             }
             addModeInfo(toolTipText, bibDatabaseContext);
-            if ((databaseLocation == DatabaseLocation.LOCAL) && bibDatabaseContext.getDatabase().hasEntries()) {
+            if ((databaseLocation == DatabaseLocation.LOCAL)
+                    && bibDatabaseContext.getDatabase().hasEntries()) {
                 addChangedInformation(toolTipText, Localization.lang("untitled"));
             }
         }
 
-        UiTaskExecutor.runInJavaFXThread(() -> {
-            textProperty().setValue(tabTitle.toString());
-            setTooltip(new Tooltip(toolTipText.toString()));
-        });
+        UiTaskExecutor.runInJavaFXThread(
+                () -> {
+                    textProperty().setValue(tabTitle.toString());
+                    setTooltip(new Tooltip(toolTipText.toString()));
+                });
     }
 
     @Subscribe
@@ -473,36 +521,44 @@ public void registerUndoableChanges(List<FieldChange> changes) {
 
     public void editEntryAndFocusField(BibEntry entry, Field field) {
         showAndEdit(entry);
-        Platform.runLater(() -> {
-            // Focus field and entry in main table (async to give entry editor time to load)
-            entryEditor.setFocusToField(field);
-            clearAndSelect(entry);
-        });
+        Platform.runLater(
+                () -> {
+                    // Focus field and entry in main table (async to give entry editor time to load)
+                    entryEditor.setFocusToField(field);
+                    clearAndSelect(entry);
+                });
     }
 
     private void createMainTable() {
-        mainTable = new MainTable(tableModel,
-                this,
-                tabContainer,
-                bibDatabaseContext,
-                preferences,
-                dialogService,
-                stateManager,
-                preferences.getKeyBindingRepository(),
-                clipBoardManager,
-                entryTypesManager,
-                taskExecutor,
-                importHandler);
-        // Add the listener that binds selection to state manager (TODO: should be replaced by proper JavaFX binding as soon as table is implemented in JavaFX)
-        // content binding between StateManager#getselectedEntries and mainTable#getSelectedEntries does not work here as it does not trigger the ActionHelper#needsEntriesSelected checker for the menubar
-        mainTable.addSelectionListener(event -> {
-            List<BibEntry> entries = event.getList().stream().map(BibEntryTableViewModel::getEntry).toList();
-            stateManager.setSelectedEntries(entries);
-            if (!entries.isEmpty()) {
-                // Update entry editor and preview according to selected entries
-                entryEditor.setCurrentlyEditedEntry(entries.getFirst());
-            }
-        });
+        mainTable =
+                new MainTable(
+                        tableModel,
+                        this,
+                        tabContainer,
+                        bibDatabaseContext,
+                        preferences,
+                        dialogService,
+                        stateManager,
+                        preferences.getKeyBindingRepository(),
+                        clipBoardManager,
+                        entryTypesManager,
+                        taskExecutor,
+                        importHandler);
+        // Add the listener that binds selection to state manager (TODO: should be replaced by
+        // proper JavaFX binding as soon as table is implemented in JavaFX)
+        // content binding between StateManager#getselectedEntries and mainTable#getSelectedEntries
+        // does not work here as it does not trigger the ActionHelper#needsEntriesSelected checker
+        // for the menubar
+        mainTable.addSelectionListener(
+                event -> {
+                    List<BibEntry> entries =
+                            event.getList().stream().map(BibEntryTableViewModel::getEntry).toList();
+                    stateManager.setSelectedEntries(entries);
+                    if (!entries.isEmpty()) {
+                        // Update entry editor and preview according to selected entries
+                        entryEditor.setCurrentlyEditedEntry(entries.getFirst());
+                    }
+                });
     }
 
     public void setupMainPanel() {
@@ -516,10 +572,12 @@ public void setupMainPanel() {
         setContent(databaseNotificationPane);
 
         // Saves the divider position as soon as it changes
-        // We need to keep a reference to the subscription, otherwise the binding gets garbage collected
-        dividerPositionSubscription = EasyBind.valueAt(splitPane.getDividers(), 0)
-                                              .mapObservable(SplitPane.Divider::positionProperty)
-                                              .subscribeToValues(this::saveDividerLocation);
+        // We need to keep a reference to the subscription, otherwise the binding gets garbage
+        // collected
+        dividerPositionSubscription =
+                EasyBind.valueAt(splitPane.getDividers(), 0)
+                        .mapObservable(SplitPane.Divider::positionProperty)
+                        .subscribeToValues(this::saveDividerLocation);
 
         // Add changePane in case a file is present - otherwise just add the splitPane to the panel
         Optional<Path> file = bibDatabaseContext.getDatabasePath();
@@ -541,15 +599,17 @@ public void setupMainPanel() {
     private void setupAutoCompletion() {
         AutoCompletePreferences autoCompletePreferences = preferences.getAutoCompletePreferences();
         if (autoCompletePreferences.shouldAutoComplete()) {
-            suggestionProviders = new SuggestionProviders(
-                    getDatabase(),
-                    Injector.instantiateModelOrService(JournalAbbreviationRepository.class),
-                    autoCompletePreferences);
+            suggestionProviders =
+                    new SuggestionProviders(
+                            getDatabase(),
+                            Injector.instantiateModelOrService(JournalAbbreviationRepository.class),
+                            autoCompletePreferences);
         } else {
             // Create empty suggestion providers if auto-completion is deactivated
             suggestionProviders = new SuggestionProviders();
         }
-        searchAutoCompleter = new PersonNameSuggestionProvider(FieldFactory.getPersonNameFields(), getDatabase());
+        searchAutoCompleter =
+                new PersonNameSuggestionProvider(FieldFactory.getPersonNameFields(), getDatabase());
     }
 
     public SuggestionProvider<Author> getAutoCompleter() {
@@ -569,7 +629,8 @@ public void showAndEdit(BibEntry entry) {
         if (!splitPane.getItems().contains(entryEditor)) {
             splitPane.getItems().addLast(entryEditor);
             mode = PanelMode.MAIN_TABLE_AND_ENTRY_EDITOR;
-            splitPane.setDividerPositions(preferences.getEntryEditorPreferences().getDividerPosition());
+            splitPane.setDividerPositions(
+                    preferences.getEntryEditorPreferences().getDividerPosition());
         }
 
         // We use != instead of equals because of performance reasons
@@ -596,11 +657,15 @@ public void clearAndSelect(final BibEntry bibEntry) {
     }
 
     public void selectPreviousEntry() {
-        mainTable.getSelectionModel().clearAndSelect(mainTable.getSelectionModel().getSelectedIndex() - 1);
+        mainTable
+                .getSelectionModel()
+                .clearAndSelect(mainTable.getSelectionModel().getSelectedIndex() - 1);
     }
 
     public void selectNextEntry() {
-        mainTable.getSelectionModel().clearAndSelect(mainTable.getSelectionModel().getSelectedIndex() + 1);
+        mainTable
+                .getSelectionModel()
+                .clearAndSelect(mainTable.getSelectionModel().getSelectedIndex() + 1);
     }
 
     /**
@@ -617,7 +682,8 @@ public void entryEditorClosing() {
     private void ensureNotShowingBottomPanel(List<BibEntry> entriesToCheck) {
         // This method is not able to close the bottom pane currently
 
-        if ((mode == PanelMode.MAIN_TABLE_AND_ENTRY_EDITOR) && (entriesToCheck.contains(entryEditor.getCurrentlyEditedEntry()))) {
+        if ((mode == PanelMode.MAIN_TABLE_AND_ENTRY_EDITOR)
+                && (entriesToCheck.contains(entryEditor.getCurrentlyEditedEntry()))) {
             closeBottomPane();
         }
     }
@@ -660,7 +726,10 @@ private boolean showDeleteConfirmationDialog(int numberOfEntries) {
             String cancelButton = Localization.lang("Keep entry");
             if (numberOfEntries > 1) {
                 title = Localization.lang("Delete multiple entries");
-                message = Localization.lang("Really delete the %0 selected entries?", Integer.toString(numberOfEntries));
+                message =
+                        Localization.lang(
+                                "Really delete the %0 selected entries?",
+                                Integer.toString(numberOfEntries));
                 okButton = Localization.lang("Delete entries");
                 cancelButton = Localization.lang("Keep entries");
             }
@@ -709,20 +778,29 @@ private boolean confirmClose() {
             return true;
         }
 
-        String filename = getBibDatabaseContext()
-                .getDatabasePath()
-                .map(Path::toAbsolutePath)
-                .map(Path::toString)
-                .orElse(Localization.lang("untitled"));
-
-        ButtonType saveChanges = new ButtonType(Localization.lang("Save changes"), ButtonBar.ButtonData.YES);
-        ButtonType discardChanges = new ButtonType(Localization.lang("Discard changes"), ButtonBar.ButtonData.NO);
-        ButtonType returnToLibrary = new ButtonType(Localization.lang("Return to library"), ButtonBar.ButtonData.CANCEL_CLOSE);
-
-        Optional<ButtonType> response = dialogService.showCustomButtonDialogAndWait(Alert.AlertType.CONFIRMATION,
-                Localization.lang("Save before closing"),
-                Localization.lang("Library '%0' has changed.", filename),
-                saveChanges, discardChanges, returnToLibrary);
+        String filename =
+                getBibDatabaseContext()
+                        .getDatabasePath()
+                        .map(Path::toAbsolutePath)
+                        .map(Path::toString)
+                        .orElse(Localization.lang("untitled"));
+
+        ButtonType saveChanges =
+                new ButtonType(Localization.lang("Save changes"), ButtonBar.ButtonData.YES);
+        ButtonType discardChanges =
+                new ButtonType(Localization.lang("Discard changes"), ButtonBar.ButtonData.NO);
+        ButtonType returnToLibrary =
+                new ButtonType(
+                        Localization.lang("Return to library"), ButtonBar.ButtonData.CANCEL_CLOSE);
+
+        Optional<ButtonType> response =
+                dialogService.showCustomButtonDialogAndWait(
+                        Alert.AlertType.CONFIRMATION,
+                        Localization.lang("Save before closing"),
+                        Localization.lang("Library '%0' has changed.", filename),
+                        saveChanges,
+                        discardChanges,
+                        returnToLibrary);
 
         if (response.isEmpty()) {
             return true;
@@ -736,7 +814,12 @@ private boolean confirmClose() {
 
         if (buttonType.equals(saveChanges)) {
             try {
-                SaveDatabaseAction saveAction = new SaveDatabaseAction(this, dialogService, preferences, Injector.instantiateModelOrService(BibEntryTypesManager.class));
+                SaveDatabaseAction saveAction =
+                        new SaveDatabaseAction(
+                                this,
+                                dialogService,
+                                preferences,
+                                Injector.instantiateModelOrService(BibEntryTypesManager.class));
                 if (saveAction.save()) {
                     return true;
                 }
@@ -744,14 +827,18 @@ private boolean confirmClose() {
                 dialogService.notify(Localization.lang("Unable to save library"));
             } catch (Throwable ex) {
                 LOGGER.error("A problem occurred when trying to save the file", ex);
-                dialogService.showErrorDialogAndWait(Localization.lang("Save library"), Localization.lang("Could not save file."), ex);
+                dialogService.showErrorDialogAndWait(
+                        Localization.lang("Save library"),
+                        Localization.lang("Could not save file."),
+                        ex);
             }
             // Save was cancelled or an error occurred.
             return false;
         }
 
         if (buttonType.equals(discardChanges)) {
-            BackupManager.discardBackup(bibDatabaseContext, preferences.getFilePreferences().getBackupDirectory());
+            BackupManager.discardBackup(
+                    bibDatabaseContext, preferences.getFilePreferences().getBackupDirectory());
             return true;
         }
 
@@ -799,7 +886,8 @@ private void onClosed(Event event) {
             LOGGER.error("Problem when shutting down autosave manager", e);
         }
         try {
-            BackupManager.shutdown(bibDatabaseContext,
+            BackupManager.shutdown(
+                    bibDatabaseContext,
                     preferences.getFilePreferences().getBackupDirectory(),
                     preferences.getFilePreferences().shouldCreateBackup());
         } catch (RuntimeException e) {
@@ -868,14 +956,17 @@ public FileAnnotationCache getAnnotationCache() {
 
     public void resetChangeMonitor() {
         changeMonitor.ifPresent(DatabaseChangeMonitor::unregister);
-        changeMonitor = Optional.of(new DatabaseChangeMonitor(bibDatabaseContext,
-                fileUpdateMonitor,
-                taskExecutor,
-                dialogService,
-                preferences,
-                databaseNotificationPane,
-                undoManager,
-                stateManager));
+        changeMonitor =
+                Optional.of(
+                        new DatabaseChangeMonitor(
+                                bibDatabaseContext,
+                                fileUpdateMonitor,
+                                taskExecutor,
+                                dialogService,
+                                preferences,
+                                databaseNotificationPane,
+                                undoManager,
+                                stateManager));
     }
 
     public void insertEntry(final BibEntry bibEntry) {
@@ -887,7 +978,8 @@ public void insertEntries(final List<BibEntry> entries) {
             importHandler.importCleanedEntries(entries);
 
             // Create an UndoableInsertEntries object.
-            getUndoManager().addEdit(new UndoableInsertEntries(bibDatabaseContext.getDatabase(), entries));
+            getUndoManager()
+                    .addEdit(new UndoableInsertEntries(bibDatabaseContext.getDatabase(), entries));
 
             markBaseChanged();
             if (preferences.getEntryEditorPreferences().shouldOpenOnNewEntry()) {
@@ -908,12 +1000,14 @@ public void copyEntry() {
 
     private int doCopyEntry(List<BibEntry> selectedEntries) {
         if (!selectedEntries.isEmpty()) {
-            List<BibtexString> stringConstants = bibDatabaseContext.getDatabase().getUsedStrings(selectedEntries);
+            List<BibtexString> stringConstants =
+                    bibDatabaseContext.getDatabase().getUsedStrings(selectedEntries);
             try {
                 if (stringConstants.isEmpty()) {
                     clipBoardManager.setContent(selectedEntries, entryTypesManager);
                 } else {
-                    clipBoardManager.setContent(selectedEntries, entryTypesManager, stringConstants);
+                    clipBoardManager.setContent(
+                            selectedEntries, entryTypesManager, stringConstants);
                 }
                 return selectedEntries.size();
             } catch (IOException e) {
@@ -942,12 +1036,15 @@ public void pasteEntry() {
     private List<BibEntry> handleNonBibTeXStringData(String data) {
         try {
             return this.importHandler.handleStringData(data);
-        } catch (
-                FetcherException exception) {
+        } catch (FetcherException exception) {
             if (exception instanceof FetcherClientException) {
-                dialogService.showInformationDialogAndWait(Localization.lang("Look up identifier"), Localization.lang("No data was found for the identifier"));
+                dialogService.showInformationDialogAndWait(
+                        Localization.lang("Look up identifier"),
+                        Localization.lang("No data was found for the identifier"));
             } else if (exception instanceof FetcherServerException) {
-                dialogService.showInformationDialogAndWait(Localization.lang("Look up identifier"), Localization.lang("Server not available"));
+                dialogService.showInformationDialogAndWait(
+                        Localization.lang("Look up identifier"),
+                        Localization.lang("Server not available"));
             } else {
                 dialogService.showErrorDialogAndWait(exception);
             }
@@ -976,7 +1073,8 @@ public void cutEntry() {
      * Removes the selected entries and files linked to selected entries from the database
      */
     public void deleteEntry() {
-        int entriesDeleted = doDeleteEntry(StandardActions.DELETE_ENTRY, mainTable.getSelectedEntries());
+        int entriesDeleted =
+                doDeleteEntry(StandardActions.DELETE_ENTRY, mainTable.getSelectedEntries());
         dialogService.notify(Localization.lang("Deleted %0 entry(ies)", entriesDeleted));
     }
 
@@ -998,21 +1096,41 @@ private int doDeleteEntry(StandardActions mode, List<BibEntry> entries) {
         }
 
         // Delete selected entries
-        getUndoManager().addEdit(new UndoableRemoveEntries(bibDatabaseContext.getDatabase(), entries, mode == StandardActions.CUT));
+        getUndoManager()
+                .addEdit(
+                        new UndoableRemoveEntries(
+                                bibDatabaseContext.getDatabase(),
+                                entries,
+                                mode == StandardActions.CUT));
         bibDatabaseContext.getDatabase().removeEntries(entries);
 
         if (mode != StandardActions.CUT) {
-            List<LinkedFile> linkedFileList = entries.stream()
-                                                     .flatMap(entry -> entry.getFiles().stream())
-                                                     .distinct()
-                                                     .toList();
+            List<LinkedFile> linkedFileList =
+                    entries.stream()
+                            .flatMap(entry -> entry.getFiles().stream())
+                            .distinct()
+                            .toList();
 
             if (!linkedFileList.isEmpty()) {
-                List<LinkedFileViewModel> viewModels = linkedFileList.stream()
-                                                                     .map(linkedFile -> LinkedFileViewModel.fromLinkedFile(linkedFile, null, bibDatabaseContext, null, null, preferences))
-                                                                     .collect(Collectors.toList());
-
-                new DeleteFileAction(dialogService, preferences.getFilePreferences(), bibDatabaseContext, viewModels).execute();
+                List<LinkedFileViewModel> viewModels =
+                        linkedFileList.stream()
+                                .map(
+                                        linkedFile ->
+                                                LinkedFileViewModel.fromLinkedFile(
+                                                        linkedFile,
+                                                        null,
+                                                        bibDatabaseContext,
+                                                        null,
+                                                        null,
+                                                        preferences))
+                                .collect(Collectors.toList());
+
+                new DeleteFileAction(
+                                dialogService,
+                                preferences.getFilePreferences(),
+                                bibDatabaseContext,
+                                viewModels)
+                        .execute();
             }
         }
 
@@ -1049,52 +1167,56 @@ public void resetChangedProperties() {
      * @param dataLoadingTask The task to execute to load the data asynchronously.
      * @param file the path to the file (loaded by the dataLoadingTask)
      */
-    public static LibraryTab createLibraryTab(BackgroundTask<ParserResult> dataLoadingTask,
-                                              Path file,
-                                              DialogService dialogService,
-                                              GuiPreferences preferences,
-                                              StateManager stateManager,
-                                              LibraryTabContainer tabContainer,
-                                              FileUpdateMonitor fileUpdateMonitor,
-                                              BibEntryTypesManager entryTypesManager,
-                                              CountingUndoManager undoManager,
-                                              ClipBoardManager clipBoardManager,
-                                              TaskExecutor taskExecutor) {
+    public static LibraryTab createLibraryTab(
+            BackgroundTask<ParserResult> dataLoadingTask,
+            Path file,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            StateManager stateManager,
+            LibraryTabContainer tabContainer,
+            FileUpdateMonitor fileUpdateMonitor,
+            BibEntryTypesManager entryTypesManager,
+            CountingUndoManager undoManager,
+            ClipBoardManager clipBoardManager,
+            TaskExecutor taskExecutor) {
         BibDatabaseContext context = new BibDatabaseContext();
         context.setDatabasePath(file);
 
-        LibraryTab newTab = new LibraryTab(
-                context,
-                tabContainer,
-                dialogService,
-                preferences,
-                stateManager,
-                fileUpdateMonitor,
-                entryTypesManager,
-                undoManager,
-                clipBoardManager,
-                taskExecutor,
-                true);
+        LibraryTab newTab =
+                new LibraryTab(
+                        context,
+                        tabContainer,
+                        dialogService,
+                        preferences,
+                        stateManager,
+                        fileUpdateMonitor,
+                        entryTypesManager,
+                        undoManager,
+                        clipBoardManager,
+                        taskExecutor,
+                        true);
 
         newTab.setDataLoadingTask(dataLoadingTask);
-        dataLoadingTask.onRunning(newTab::onDatabaseLoadingStarted)
-                       .onSuccess(newTab::onDatabaseLoadingSucceed)
-                       .onFailure(newTab::onDatabaseLoadingFailed)
-                       .executeWith(taskExecutor);
+        dataLoadingTask
+                .onRunning(newTab::onDatabaseLoadingStarted)
+                .onSuccess(newTab::onDatabaseLoadingSucceed)
+                .onFailure(newTab::onDatabaseLoadingFailed)
+                .executeWith(taskExecutor);
 
         return newTab;
     }
 
-    public static LibraryTab createLibraryTab(BibDatabaseContext databaseContext,
-                                              LibraryTabContainer tabContainer,
-                                              DialogService dialogService,
-                                              GuiPreferences preferences,
-                                              StateManager stateManager,
-                                              FileUpdateMonitor fileUpdateMonitor,
-                                              BibEntryTypesManager entryTypesManager,
-                                              UndoManager undoManager,
-                                              ClipBoardManager clipBoardManager,
-                                              TaskExecutor taskExecutor) {
+    public static LibraryTab createLibraryTab(
+            BibDatabaseContext databaseContext,
+            LibraryTabContainer tabContainer,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            StateManager stateManager,
+            FileUpdateMonitor fileUpdateMonitor,
+            BibEntryTypesManager entryTypesManager,
+            UndoManager undoManager,
+            ClipBoardManager clipBoardManager,
+            TaskExecutor taskExecutor) {
         Objects.requireNonNull(databaseContext);
 
         return new LibraryTab(
@@ -1122,8 +1244,12 @@ public void listen(EntriesAddedEvent addedEntriesEvent) {
 
             // Automatically add new entries to the selected group (or set of groups)
             if (preferences.getGroupsPreferences().shouldAutoAssignGroup()) {
-                stateManager.getSelectedGroups(bibDatabaseContext).forEach(
-                        selectedGroup -> selectedGroup.addEntriesToGroup(addedEntriesEvent.getBibEntries()));
+                stateManager
+                        .getSelectedGroups(bibDatabaseContext)
+                        .forEach(
+                                selectedGroup ->
+                                        selectedGroup.addEntriesToGroup(
+                                                addedEntriesEvent.getBibEntries()));
             }
         }
     }
@@ -1150,7 +1276,11 @@ public void listen(EntriesRemovedEvent removedEntriesEvent) {
 
         @Subscribe
         public void listen(FieldChangedEvent fieldChangedEvent) {
-            luceneManager.updateEntry(fieldChangedEvent.getBibEntry(), fieldChangedEvent.getOldValue(), fieldChangedEvent.getNewValue(), fieldChangedEvent.getField().equals(StandardField.FILE));
+            luceneManager.updateEntry(
+                    fieldChangedEvent.getBibEntry(),
+                    fieldChangedEvent.getOldValue(),
+                    fieldChangedEvent.getNewValue(),
+                    fieldChangedEvent.getField().equals(StandardField.FILE));
         }
     }
 
@@ -1178,10 +1308,12 @@ public DatabaseNotification getNotificationPane() {
 
     @Override
     public String toString() {
-        return "LibraryTab{" +
-                "bibDatabaseContext=" + bibDatabaseContext +
-                ", showing=" + showing +
-                '}';
+        return "LibraryTab{"
+                + "bibDatabaseContext="
+                + bibDatabaseContext
+                + ", showing="
+                + showing
+                + '}';
     }
 
     public LibraryTabContainer getLibraryTabContainer() {
diff --git a/src/main/java/org/jabref/gui/LibraryTabContainer.java b/src/main/java/org/jabref/gui/LibraryTabContainer.java
index 139653c87caf..1ad7390ade1f 100644
--- a/src/main/java/org/jabref/gui/LibraryTabContainer.java
+++ b/src/main/java/org/jabref/gui/LibraryTabContainer.java
@@ -1,19 +1,17 @@
 package org.jabref.gui;
 
-import java.util.List;
-
 import org.jabref.model.database.BibDatabaseContext;
-
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
+import java.util.List;
+
 @NullMarked
 public interface LibraryTabContainer {
     List<LibraryTab> getLibraryTabs();
 
-    @Nullable
-    LibraryTab getCurrentLibraryTab();
+    @Nullable LibraryTab getCurrentLibraryTab();
 
     void showLibraryTab(LibraryTab libraryTab);
 
diff --git a/src/main/java/org/jabref/gui/StateManager.java b/src/main/java/org/jabref/gui/StateManager.java
index e75ffcdc89e9..77cb3e5f41a4 100644
--- a/src/main/java/org/jabref/gui/StateManager.java
+++ b/src/main/java/org/jabref/gui/StateManager.java
@@ -1,9 +1,7 @@
 package org.jabref.gui;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.EasyBinding;
 
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
@@ -33,12 +31,14 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.search.SearchQuery;
-
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.EasyBinding;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * This class manages the GUI-state of JabRef, including:
  *
@@ -56,26 +56,60 @@ public class StateManager {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(StateManager.class);
     private final CustomLocalDragboard localDragboard = new CustomLocalDragboard();
-    private final ObservableList<BibDatabaseContext> openDatabases = FXCollections.observableArrayList();
-    private final OptionalObjectProperty<BibDatabaseContext> activeDatabase = OptionalObjectProperty.empty();
+    private final ObservableList<BibDatabaseContext> openDatabases =
+            FXCollections.observableArrayList();
+    private final OptionalObjectProperty<BibDatabaseContext> activeDatabase =
+            OptionalObjectProperty.empty();
     private final OptionalObjectProperty<LibraryTab> activeTab = OptionalObjectProperty.empty();
     private final ObservableList<BibEntry> selectedEntries = FXCollections.observableArrayList();
-    private final ObservableMap<String, ObservableList<GroupTreeNode>> selectedGroups = FXCollections.observableHashMap();
-    private final ObservableMap<String, LuceneManager> luceneManagers = FXCollections.observableHashMap();
-    private final OptionalObjectProperty<SearchQuery> activeSearchQuery = OptionalObjectProperty.empty();
-    private final OptionalObjectProperty<SearchQuery> activeGlobalSearchQuery = OptionalObjectProperty.empty();
+    private final ObservableMap<String, ObservableList<GroupTreeNode>> selectedGroups =
+            FXCollections.observableHashMap();
+    private final ObservableMap<String, LuceneManager> luceneManagers =
+            FXCollections.observableHashMap();
+    private final OptionalObjectProperty<SearchQuery> activeSearchQuery =
+            OptionalObjectProperty.empty();
+    private final OptionalObjectProperty<SearchQuery> activeGlobalSearchQuery =
+            OptionalObjectProperty.empty();
     private final IntegerProperty searchResultSize = new SimpleIntegerProperty(0);
     private final IntegerProperty globalSearchResultSize = new SimpleIntegerProperty(0);
     private final OptionalObjectProperty<Node> focusOwner = OptionalObjectProperty.empty();
-    private final ObservableList<Pair<BackgroundTask<?>, Task<?>>> backgroundTasksPairs = FXCollections.observableArrayList(task -> new Observable[] {task.getValue().progressProperty(), task.getValue().runningProperty()});
-    private final ObservableList<Task<?>> backgroundTasks = EasyBind.map(backgroundTasksPairs, Pair::getValue);
-    private final FilteredList<Task<?>> runningBackgroundTasks = new FilteredList<>(backgroundTasks, Task::isRunning);
-    private final BooleanBinding anyTaskRunning = Bindings.createBooleanBinding(() -> !runningBackgroundTasks.isEmpty(), runningBackgroundTasks);
-    private final EasyBinding<Boolean> anyTasksThatWillNotBeRecoveredRunning = EasyBind.reduce(backgroundTasksPairs, tasks -> tasks.anyMatch(task -> !task.getKey().willBeRecoveredAutomatically() && task.getValue().isRunning()));
-    private final EasyBinding<Double> tasksProgress = EasyBind.reduce(backgroundTasksPairs, tasks -> tasks.map(Pair::getValue).filter(Task::isRunning).mapToDouble(Task::getProgress).average().orElse(1));
-    private final ObservableMap<String, DialogWindowState> dialogWindowStates = FXCollections.observableHashMap();
-    private final ObservableList<SidePaneType> visibleSidePanes = FXCollections.observableArrayList();
-    private final ObjectProperty<LastAutomaticFieldEditorEdit> lastAutomaticFieldEditorEdit = new SimpleObjectProperty<>();
+    private final ObservableList<Pair<BackgroundTask<?>, Task<?>>> backgroundTasksPairs =
+            FXCollections.observableArrayList(
+                    task ->
+                            new Observable[] {
+                                task.getValue().progressProperty(),
+                                task.getValue().runningProperty()
+                            });
+    private final ObservableList<Task<?>> backgroundTasks =
+            EasyBind.map(backgroundTasksPairs, Pair::getValue);
+    private final FilteredList<Task<?>> runningBackgroundTasks =
+            new FilteredList<>(backgroundTasks, Task::isRunning);
+    private final BooleanBinding anyTaskRunning =
+            Bindings.createBooleanBinding(
+                    () -> !runningBackgroundTasks.isEmpty(), runningBackgroundTasks);
+    private final EasyBinding<Boolean> anyTasksThatWillNotBeRecoveredRunning =
+            EasyBind.reduce(
+                    backgroundTasksPairs,
+                    tasks ->
+                            tasks.anyMatch(
+                                    task ->
+                                            !task.getKey().willBeRecoveredAutomatically()
+                                                    && task.getValue().isRunning()));
+    private final EasyBinding<Double> tasksProgress =
+            EasyBind.reduce(
+                    backgroundTasksPairs,
+                    tasks ->
+                            tasks.map(Pair::getValue)
+                                    .filter(Task::isRunning)
+                                    .mapToDouble(Task::getProgress)
+                                    .average()
+                                    .orElse(1));
+    private final ObservableMap<String, DialogWindowState> dialogWindowStates =
+            FXCollections.observableHashMap();
+    private final ObservableList<SidePaneType> visibleSidePanes =
+            FXCollections.observableArrayList();
+    private final ObjectProperty<LastAutomaticFieldEditorEdit> lastAutomaticFieldEditorEdit =
+            new SimpleObjectProperty<>();
     private final ObservableList<String> searchHistory = FXCollections.observableArrayList();
     private final List<AiChatWindow> aiChatWindows = new ArrayList<>();
 
@@ -115,17 +149,23 @@ public void setSelectedEntries(List<BibEntry> newSelectedEntries) {
         selectedEntries.setAll(newSelectedEntries);
     }
 
-    public void setSelectedGroups(BibDatabaseContext context, List<GroupTreeNode> newSelectedGroups) {
+    public void setSelectedGroups(
+            BibDatabaseContext context, List<GroupTreeNode> newSelectedGroups) {
         Objects.requireNonNull(newSelectedGroups);
-        selectedGroups.computeIfAbsent(context.getUid(), k -> FXCollections.observableArrayList()).setAll(newSelectedGroups);
+        selectedGroups
+                .computeIfAbsent(context.getUid(), k -> FXCollections.observableArrayList())
+                .setAll(newSelectedGroups);
     }
 
     public ObservableList<GroupTreeNode> getSelectedGroups(BibDatabaseContext context) {
-        return selectedGroups.computeIfAbsent(context.getUid(), k -> FXCollections.observableArrayList());
+        return selectedGroups.computeIfAbsent(
+                context.getUid(), k -> FXCollections.observableArrayList());
     }
 
     public void clearSelectedGroups(BibDatabaseContext context) {
-        selectedGroups.computeIfAbsent(context.getUid(), k -> FXCollections.observableArrayList()).clear();
+        selectedGroups
+                .computeIfAbsent(context.getUid(), k -> FXCollections.observableArrayList())
+                .clear();
     }
 
     public void setLuceneManager(BibDatabaseContext database, LuceneManager luceneManager) {
@@ -193,17 +233,20 @@ public ObjectProperty<LastAutomaticFieldEditorEdit> lastAutomaticFieldEditorEdit
         return lastAutomaticFieldEditorEdit;
     }
 
-    public void setLastAutomaticFieldEditorEdit(LastAutomaticFieldEditorEdit automaticFieldEditorEdit) {
+    public void setLastAutomaticFieldEditorEdit(
+            LastAutomaticFieldEditorEdit automaticFieldEditorEdit) {
         lastAutomaticFieldEditorEditProperty().set(automaticFieldEditorEdit);
     }
 
     public List<String> collectAllDatabasePaths() {
         List<String> list = new ArrayList<>();
         getOpenDatabases().stream()
-                          .map(BibDatabaseContext::getDatabasePath)
-                          .forEachOrdered(pathOptional -> pathOptional.ifPresentOrElse(
-                                  path -> list.add(path.toAbsolutePath().toString()),
-                                  () -> list.add("")));
+                .map(BibDatabaseContext::getDatabasePath)
+                .forEachOrdered(
+                        pathOptional ->
+                                pathOptional.ifPresentOrElse(
+                                        path -> list.add(path.toAbsolutePath().toString()),
+                                        () -> list.add("")));
         return list;
     }
 
diff --git a/src/main/java/org/jabref/gui/UpdateTimestampListener.java b/src/main/java/org/jabref/gui/UpdateTimestampListener.java
index b975773dee80..2fcd52151259 100644
--- a/src/main/java/org/jabref/gui/UpdateTimestampListener.java
+++ b/src/main/java/org/jabref/gui/UpdateTimestampListener.java
@@ -1,12 +1,12 @@
 package org.jabref.gui;
 
+import com.google.common.eventbus.Subscribe;
+
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.model.entry.event.EntriesEventSource;
 import org.jabref.model.entry.event.EntryChangedEvent;
 import org.jabref.model.entry.field.StandardField;
 
-import com.google.common.eventbus.Subscribe;
-
 /**
  * Updates the timestamp of changed entries if the feature is enabled
  */
@@ -19,11 +19,16 @@ class UpdateTimestampListener {
 
     @Subscribe
     public void listen(EntryChangedEvent event) {
-        // The event source needs to be checked, since the timestamp is always updated on every change. The cleanup formatter is an exception to that behaviour,
-        // since it just should move the contents from the timestamp field to modificationdate or creationdate.
-        if (preferences.getTimestampPreferences().shouldAddModificationDate() && event.getEntriesEventSource() != EntriesEventSource.CLEANUP_TIMESTAMP) {
-            event.getBibEntry().setField(StandardField.MODIFICATIONDATE,
-                    preferences.getTimestampPreferences().now());
+        // The event source needs to be checked, since the timestamp is always updated on every
+        // change. The cleanup formatter is an exception to that behaviour,
+        // since it just should move the contents from the timestamp field to modificationdate or
+        // creationdate.
+        if (preferences.getTimestampPreferences().shouldAddModificationDate()
+                && event.getEntriesEventSource() != EntriesEventSource.CLEANUP_TIMESTAMP) {
+            event.getBibEntry()
+                    .setField(
+                            StandardField.MODIFICATIONDATE,
+                            preferences.getTimestampPreferences().now());
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/WorkspacePreferences.java b/src/main/java/org/jabref/gui/WorkspacePreferences.java
index 2948be7582e7..fe6c6cea8a83 100644
--- a/src/main/java/org/jabref/gui/WorkspacePreferences.java
+++ b/src/main/java/org/jabref/gui/WorkspacePreferences.java
@@ -1,7 +1,5 @@
 package org.jabref.gui;
 
-import java.util.List;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
@@ -14,6 +12,8 @@
 import org.jabref.gui.theme.Theme;
 import org.jabref.logic.l10n.Language;
 
+import java.util.List;
+
 public class WorkspacePreferences {
     private final ObjectProperty<Language> language;
     private final BooleanProperty shouldOverrideDefaultFontSize;
@@ -27,26 +27,29 @@ public class WorkspacePreferences {
     private final BooleanProperty confirmDelete;
     private final ObservableList<String> selectedSlrCatalogs;
 
-    public WorkspacePreferences(Language language,
-                                boolean shouldOverrideDefaultFontSize,
-                                int mainFontSize,
-                                int defaultFontSize,
-                                Theme theme,
-                                boolean themeSyncOs,
-                                boolean shouldOpenLastEdited,
-                                boolean showAdvancedHints,
-                                boolean warnAboutDuplicatesInInspection,
-                                boolean confirmDelete,
-                                List<String> selectedSlrCatalogs) {
+    public WorkspacePreferences(
+            Language language,
+            boolean shouldOverrideDefaultFontSize,
+            int mainFontSize,
+            int defaultFontSize,
+            Theme theme,
+            boolean themeSyncOs,
+            boolean shouldOpenLastEdited,
+            boolean showAdvancedHints,
+            boolean warnAboutDuplicatesInInspection,
+            boolean confirmDelete,
+            List<String> selectedSlrCatalogs) {
         this.language = new SimpleObjectProperty<>(language);
-        this.shouldOverrideDefaultFontSize = new SimpleBooleanProperty(shouldOverrideDefaultFontSize);
+        this.shouldOverrideDefaultFontSize =
+                new SimpleBooleanProperty(shouldOverrideDefaultFontSize);
         this.mainFontSize = new SimpleIntegerProperty(mainFontSize);
         this.defaultFontSize = new SimpleIntegerProperty(defaultFontSize);
         this.theme = new SimpleObjectProperty<>(theme);
         this.themeSyncOs = new SimpleBooleanProperty(themeSyncOs);
         this.shouldOpenLastEdited = new SimpleBooleanProperty(shouldOpenLastEdited);
         this.showAdvancedHints = new SimpleBooleanProperty(showAdvancedHints);
-        this.warnAboutDuplicatesInInspection = new SimpleBooleanProperty(warnAboutDuplicatesInInspection);
+        this.warnAboutDuplicatesInInspection =
+                new SimpleBooleanProperty(warnAboutDuplicatesInInspection);
         this.confirmDelete = new SimpleBooleanProperty(confirmDelete);
         this.selectedSlrCatalogs = FXCollections.observableArrayList(selectedSlrCatalogs);
     }
diff --git a/src/main/java/org/jabref/gui/actions/Action.java b/src/main/java/org/jabref/gui/actions/Action.java
index e6ccfe487b24..d6ee0ebf9679 100644
--- a/src/main/java/org/jabref/gui/actions/Action.java
+++ b/src/main/java/org/jabref/gui/actions/Action.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.actions;
 
-import java.util.Optional;
-
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.keyboard.KeyBinding;
 
+import java.util.Optional;
+
 public interface Action {
     default Optional<JabRefIcon> getIcon() {
         return Optional.empty();
diff --git a/src/main/java/org/jabref/gui/actions/ActionFactory.java b/src/main/java/org/jabref/gui/actions/ActionFactory.java
index 74f1b25e7401..5f188369d95c 100644
--- a/src/main/java/org/jabref/gui/actions/ActionFactory.java
+++ b/src/main/java/org/jabref/gui/actions/ActionFactory.java
@@ -1,8 +1,10 @@
 package org.jabref.gui.actions;
 
-import java.lang.reflect.InaccessibleObjectException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import com.airhacks.afterburner.injection.Injector;
+import com.sun.javafx.scene.control.ContextMenuContent;
+import com.tobiasdiez.easybind.EasyBind;
+
+import de.saxsys.mvvmfx.utils.commands.Command;
 
 import javafx.beans.binding.BooleanExpression;
 import javafx.scene.control.Button;
@@ -13,17 +15,16 @@
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.Tooltip;
 
+import org.controlsfx.control.action.ActionUtils;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.model.strings.StringUtil;
-
-import com.airhacks.afterburner.injection.Injector;
-import com.sun.javafx.scene.control.ContextMenuContent;
-import com.tobiasdiez.easybind.EasyBind;
-import de.saxsys.mvvmfx.utils.commands.Command;
-import org.controlsfx.control.action.ActionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.InaccessibleObjectException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 /**
  * Helper class to create and style controls according to an {@link Action}.
  */
@@ -58,17 +59,22 @@ private static void setGraphic(MenuItem node, Action action) {
      * should not be used since it's marked as deprecated.
      */
     private static Label getAssociatedNode(MenuItem menuItem) {
-        ContextMenuContent.MenuItemContainer container = (ContextMenuContent.MenuItemContainer) menuItem.getStyleableNode();
+        ContextMenuContent.MenuItemContainer container =
+                (ContextMenuContent.MenuItemContainer) menuItem.getStyleableNode();
 
         if (container == null) {
             return null;
         } else {
             // We have to use reflection to get the associated label
             try {
-                Method getLabel = ContextMenuContent.MenuItemContainer.class.getDeclaredMethod("getLabel");
+                Method getLabel =
+                        ContextMenuContent.MenuItemContainer.class.getDeclaredMethod("getLabel");
                 getLabel.setAccessible(true);
                 return (Label) getLabel.invoke(container);
-            } catch (InaccessibleObjectException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            } catch (InaccessibleObjectException
+                    | IllegalAccessException
+                    | InvocationTargetException
+                    | NoSuchMethodException e) {
                 LOGGER.warn("Could not get label of menu item", e);
             }
         }
@@ -76,7 +82,8 @@ private static Label getAssociatedNode(MenuItem menuItem) {
     }
 
     public MenuItem configureMenuItem(Action action, Command command, MenuItem menuItem) {
-        ActionUtils.configureMenuItem(new JabRefAction(action, command, keyBindingRepository), menuItem);
+        ActionUtils.configureMenuItem(
+                new JabRefAction(action, command, keyBindingRepository), menuItem);
         setGraphic(menuItem, action);
         enableTooltips(command, menuItem);
         return menuItem;
@@ -96,8 +103,7 @@ private static void enableTooltips(Command command, MenuItem menuItem) {
                                 label.setTooltip(new Tooltip(message));
                             }
                         }
-                    }
-            );
+                    });
         }
     }
 
@@ -108,15 +114,20 @@ public MenuItem createMenuItem(Action action, Command command) {
     }
 
     public CheckMenuItem createCheckMenuItem(Action action, Command command, boolean selected) {
-        CheckMenuItem checkMenuItem = ActionUtils.createCheckMenuItem(new JabRefAction(action, command, keyBindingRepository));
+        CheckMenuItem checkMenuItem =
+                ActionUtils.createCheckMenuItem(
+                        new JabRefAction(action, command, keyBindingRepository));
         checkMenuItem.setSelected(selected);
         setGraphic(checkMenuItem, action);
 
         return checkMenuItem;
     }
 
-    public CheckMenuItem createCheckMenuItem(Action action, Command command, BooleanExpression selectedBinding) {
-        CheckMenuItem checkMenuItem = ActionUtils.createCheckMenuItem(new JabRefAction(action, command, keyBindingRepository));
+    public CheckMenuItem createCheckMenuItem(
+            Action action, Command command, BooleanExpression selectedBinding) {
+        CheckMenuItem checkMenuItem =
+                ActionUtils.createCheckMenuItem(
+                        new JabRefAction(action, command, keyBindingRepository));
         EasyBind.subscribe(selectedBinding, checkMenuItem::setSelected);
         setGraphic(checkMenuItem, action);
 
@@ -138,7 +149,10 @@ public Menu createSubMenu(Action action, MenuItem... children) {
     }
 
     public Button createIconButton(Action action, Command command) {
-        Button button = ActionUtils.createButton(new JabRefAction(action, command, keyBindingRepository), ActionUtils.ActionTextBehavior.HIDE);
+        Button button =
+                ActionUtils.createButton(
+                        new JabRefAction(action, command, keyBindingRepository),
+                        ActionUtils.ActionTextBehavior.HIDE);
 
         button.getStyleClass().setAll("icon-button");
 
diff --git a/src/main/java/org/jabref/gui/actions/ActionHelper.java b/src/main/java/org/jabref/gui/actions/ActionHelper.java
index 437d38d9bfe0..e3e5273f67bc 100644
--- a/src/main/java/org/jabref/gui/actions/ActionHelper.java
+++ b/src/main/java/org/jabref/gui/actions/ActionHelper.java
@@ -1,9 +1,7 @@
 package org.jabref.gui.actions;
 
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.EasyBinding;
 
 import javafx.beans.binding.Binding;
 import javafx.beans.binding.Bindings;
@@ -20,8 +18,10 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.Field;
 
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.EasyBinding;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 public class ActionHelper {
 
@@ -30,7 +30,12 @@ public static BooleanExpression needsDatabase(StateManager stateManager) {
     }
 
     public static BooleanExpression needsSharedDatabase(StateManager stateManager) {
-        EasyBinding<Boolean> binding = EasyBind.map(stateManager.activeDatabaseProperty(), context -> context.filter(c -> c.getLocation() == DatabaseLocation.SHARED).isPresent());
+        EasyBinding<Boolean> binding =
+                EasyBind.map(
+                        stateManager.activeDatabaseProperty(),
+                        context ->
+                                context.filter(c -> c.getLocation() == DatabaseLocation.SHARED)
+                                        .isPresent());
         return BooleanExpression.booleanExpression(binding);
     }
 
@@ -39,7 +44,10 @@ public static BooleanExpression needsMultipleDatabases(TabPane tabbedPane) {
     }
 
     public static BooleanExpression needsStudyDatabase(StateManager stateManager) {
-        EasyBinding<Boolean> binding = EasyBind.map(stateManager.activeDatabaseProperty(), context -> context.filter(BibDatabaseContext::isStudy).isPresent());
+        EasyBinding<Boolean> binding =
+                EasyBind.map(
+                        stateManager.activeDatabaseProperty(),
+                        context -> context.filter(BibDatabaseContext::isStudy).isPresent());
         return BooleanExpression.booleanExpression(binding);
     }
 
@@ -47,44 +55,61 @@ public static BooleanExpression needsEntriesSelected(StateManager stateManager)
         return Bindings.isNotEmpty(stateManager.getSelectedEntries());
     }
 
-    public static BooleanExpression needsEntriesSelected(int numberOfEntries, StateManager stateManager) {
-        return Bindings.createBooleanBinding(() -> stateManager.getSelectedEntries().size() == numberOfEntries,
-                                             stateManager.getSelectedEntries());
+    public static BooleanExpression needsEntriesSelected(
+            int numberOfEntries, StateManager stateManager) {
+        return Bindings.createBooleanBinding(
+                () -> stateManager.getSelectedEntries().size() == numberOfEntries,
+                stateManager.getSelectedEntries());
     }
 
-    public static BooleanExpression isFieldSetForSelectedEntry(Field field, StateManager stateManager) {
+    public static BooleanExpression isFieldSetForSelectedEntry(
+            Field field, StateManager stateManager) {
         return isAnyFieldSetForSelectedEntry(Collections.singletonList(field), stateManager);
     }
 
-    public static BooleanExpression isAnyFieldSetForSelectedEntry(List<Field> fields, StateManager stateManager) {
+    public static BooleanExpression isAnyFieldSetForSelectedEntry(
+            List<Field> fields, StateManager stateManager) {
         ObservableList<BibEntry> selectedEntries = stateManager.getSelectedEntries();
-        Binding<Boolean> fieldsAreSet = EasyBind.valueAt(selectedEntries, 0)
-                                                .mapObservable(entry -> Bindings.createBooleanBinding(() -> {
-                                                    return entry.getFields().stream().anyMatch(fields::contains);
-                                                }, entry.getFieldsObservable()))
-                                                .orElseOpt(false);
+        Binding<Boolean> fieldsAreSet =
+                EasyBind.valueAt(selectedEntries, 0)
+                        .mapObservable(
+                                entry ->
+                                        Bindings.createBooleanBinding(
+                                                () -> {
+                                                    return entry.getFields().stream()
+                                                            .anyMatch(fields::contains);
+                                                },
+                                                entry.getFieldsObservable()))
+                        .orElseOpt(false);
         return BooleanExpression.booleanExpression(fieldsAreSet);
     }
 
-    public static BooleanExpression isFilePresentForSelectedEntry(StateManager stateManager, CliPreferences preferences) {
+    public static BooleanExpression isFilePresentForSelectedEntry(
+            StateManager stateManager, CliPreferences preferences) {
         ObservableList<BibEntry> selectedEntries = stateManager.getSelectedEntries();
-        Binding<Boolean> fileIsPresent = EasyBind.valueAt(selectedEntries, 0).mapOpt(entry -> {
-            List<LinkedFile> files = entry.getFiles();
-
-            if ((!entry.getFiles().isEmpty()) && stateManager.getActiveDatabase().isPresent()) {
-                if (files.getFirst().isOnlineLink()) {
-                    return true;
-                }
-
-                Optional<Path> filename = FileUtil.find(
-                        stateManager.getActiveDatabase().get(),
-                        files.getFirst().getLink(),
-                        preferences.getFilePreferences());
-                return filename.isPresent();
-            } else {
-                return false;
-            }
-        }).orElseOpt(false);
+        Binding<Boolean> fileIsPresent =
+                EasyBind.valueAt(selectedEntries, 0)
+                        .mapOpt(
+                                entry -> {
+                                    List<LinkedFile> files = entry.getFiles();
+
+                                    if ((!entry.getFiles().isEmpty())
+                                            && stateManager.getActiveDatabase().isPresent()) {
+                                        if (files.getFirst().isOnlineLink()) {
+                                            return true;
+                                        }
+
+                                        Optional<Path> filename =
+                                                FileUtil.find(
+                                                        stateManager.getActiveDatabase().get(),
+                                                        files.getFirst().getLink(),
+                                                        preferences.getFilePreferences());
+                                        return filename.isPresent();
+                                    } else {
+                                        return false;
+                                    }
+                                })
+                        .orElseOpt(false);
 
         return BooleanExpression.booleanExpression(fileIsPresent);
     }
@@ -98,7 +123,9 @@ public static BooleanExpression isFilePresentForSelectedEntry(StateManager state
      * @return a boolean binding
      */
     public static BooleanExpression hasLinkedFileForSelectedEntries(StateManager stateManager) {
-        return BooleanExpression.booleanExpression(EasyBind.reduce(stateManager.getSelectedEntries(),
-                entries -> entries.anyMatch(entry -> !entry.getFiles().isEmpty())));
+        return BooleanExpression.booleanExpression(
+                EasyBind.reduce(
+                        stateManager.getSelectedEntries(),
+                        entries -> entries.anyMatch(entry -> !entry.getFiles().isEmpty())));
     }
 }
diff --git a/src/main/java/org/jabref/gui/actions/JabRefAction.java b/src/main/java/org/jabref/gui/actions/JabRefAction.java
index 50d6be4d3b26..a7cc342c8ff8 100644
--- a/src/main/java/org/jabref/gui/actions/JabRefAction.java
+++ b/src/main/java/org/jabref/gui/actions/JabRefAction.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.actions;
 
+import de.saxsys.mvvmfx.utils.commands.Command;
+
 import javafx.beans.binding.Bindings;
 
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
-import de.saxsys.mvvmfx.utils.commands.Command;
-
 /**
  * Wrapper around one of our actions from {@link Action} to convert them to controlsfx {@link org.controlsfx.control.action.Action}.
  */
@@ -14,7 +14,9 @@ class JabRefAction extends org.controlsfx.control.action.Action {
     public JabRefAction(Action action, KeyBindingRepository keyBindingRepository) {
         super(action.getText());
         action.getIcon().ifPresent(icon -> setGraphic(icon.getGraphicNode()));
-        action.getKeyBinding().flatMap(keyBindingRepository::getKeyCombination).ifPresent(this::setAccelerator);
+        action.getKeyBinding()
+                .flatMap(keyBindingRepository::getKeyCombination)
+                .ifPresent(this::setAccelerator);
 
         setLongText(action.getDescription());
     }
@@ -27,7 +29,11 @@ public JabRefAction(Action action, Command command, KeyBindingRepository keyBind
         disabledProperty().bind(command.executableProperty().not());
 
         if (command instanceof SimpleCommand simpleCommand) {
-            longTextProperty().bind(Bindings.concat(action.getDescription(), simpleCommand.statusMessageProperty()));
+            longTextProperty()
+                    .bind(
+                            Bindings.concat(
+                                    action.getDescription(),
+                                    simpleCommand.statusMessageProperty()));
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/actions/SimpleCommand.java b/src/main/java/org/jabref/gui/actions/SimpleCommand.java
index 89ef7ad100a6..ad6edc420214 100644
--- a/src/main/java/org/jabref/gui/actions/SimpleCommand.java
+++ b/src/main/java/org/jabref/gui/actions/SimpleCommand.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.actions;
 
+import de.saxsys.mvvmfx.utils.commands.CommandBase;
+
 import javafx.beans.property.ReadOnlyDoubleProperty;
 import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.ReadOnlyStringWrapper;
 
 import org.jabref.gui.util.BindingsHelper;
 
-import de.saxsys.mvvmfx.utils.commands.CommandBase;
-
 /**
  * A simple command that does not track progress of the action.
  */
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index 7f44fb8810f6..67d102b908b9 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -1,51 +1,74 @@
 package org.jabref.gui.actions;
 
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.logic.l10n.Localization;
 
-public enum StandardActions implements Action {
+import java.util.Objects;
+import java.util.Optional;
 
+public enum StandardActions implements Action {
     COPY_MORE(Localization.lang("Copy") + "..."),
     COPY_TITLE(Localization.lang("Copy title"), KeyBinding.COPY_TITLE),
     COPY_KEY(Localization.lang("Copy citation key"), KeyBinding.COPY_CITATION_KEY),
-    COPY_CITE_KEY(Localization.lang("Copy citation key with configured cite command"), KeyBinding.COPY_CITE_CITATION_KEY),
-    COPY_KEY_AND_TITLE(Localization.lang("Copy citation key and title"), KeyBinding.COPY_CITATION_KEY_AND_TITLE),
-    COPY_KEY_AND_LINK(Localization.lang("Copy citation key and link"), KeyBinding.COPY_CITATION_KEY_AND_LINK),
+    COPY_CITE_KEY(
+            Localization.lang("Copy citation key with configured cite command"),
+            KeyBinding.COPY_CITE_CITATION_KEY),
+    COPY_KEY_AND_TITLE(
+            Localization.lang("Copy citation key and title"),
+            KeyBinding.COPY_CITATION_KEY_AND_TITLE),
+    COPY_KEY_AND_LINK(
+            Localization.lang("Copy citation key and link"), KeyBinding.COPY_CITATION_KEY_AND_LINK),
     COPY_CITATION_HTML(Localization.lang("Copy citation (html)"), KeyBinding.COPY_PREVIEW),
     COPY_CITATION_TEXT(Localization.lang("Copy citation (text)")),
     COPY_CITATION_PREVIEW(Localization.lang("Copy preview"), KeyBinding.COPY_PREVIEW),
-    EXPORT_TO_CLIPBOARD(Localization.lang("Export to clipboard"), IconTheme.JabRefIcons.EXPORT_TO_CLIPBOARD),
-    EXPORT_SELECTED_TO_CLIPBOARD(Localization.lang("Export selected entries to clipboard"), IconTheme.JabRefIcons.EXPORT_TO_CLIPBOARD),
+    EXPORT_TO_CLIPBOARD(
+            Localization.lang("Export to clipboard"), IconTheme.JabRefIcons.EXPORT_TO_CLIPBOARD),
+    EXPORT_SELECTED_TO_CLIPBOARD(
+            Localization.lang("Export selected entries to clipboard"),
+            IconTheme.JabRefIcons.EXPORT_TO_CLIPBOARD),
     COPY(Localization.lang("Copy"), IconTheme.JabRefIcons.COPY, KeyBinding.COPY),
     PASTE(Localization.lang("Paste"), IconTheme.JabRefIcons.PASTE, KeyBinding.PASTE),
     CUT(Localization.lang("Cut"), IconTheme.JabRefIcons.CUT, KeyBinding.CUT),
     DELETE(Localization.lang("Delete"), IconTheme.JabRefIcons.DELETE_ENTRY),
-    DELETE_ENTRY(Localization.lang("Delete entry"), IconTheme.JabRefIcons.DELETE_ENTRY, KeyBinding.DELETE_ENTRY),
+    DELETE_ENTRY(
+            Localization.lang("Delete entry"),
+            IconTheme.JabRefIcons.DELETE_ENTRY,
+            KeyBinding.DELETE_ENTRY),
     SEND(Localization.lang("Send"), IconTheme.JabRefIcons.EMAIL),
     SEND_AS_EMAIL(Localization.lang("As Email")),
     SEND_TO_KINDLE(Localization.lang("To Kindle")),
-    REBUILD_FULLTEXT_SEARCH_INDEX(Localization.lang("Rebuild fulltext search index"), IconTheme.JabRefIcons.FILE),
-    REDOWNLOAD_MISSING_FILES(Localization.lang("Redownload missing files"), IconTheme.JabRefIcons.DOWNLOAD),
-    OPEN_EXTERNAL_FILE(Localization.lang("Open file"), IconTheme.JabRefIcons.FILE, KeyBinding.OPEN_FILE),
-    EXTRACT_FILE_REFERENCES_ONLINE(Localization.lang("Extract references from file (online)"), IconTheme.JabRefIcons.FILE_STAR),
-    EXTRACT_FILE_REFERENCES_OFFLINE(Localization.lang("Extract references from file (offline)"), IconTheme.JabRefIcons.FILE_STAR),
-    OPEN_URL(Localization.lang("Open URL or DOI"), IconTheme.JabRefIcons.WWW, KeyBinding.OPEN_URL_OR_DOI),
+    REBUILD_FULLTEXT_SEARCH_INDEX(
+            Localization.lang("Rebuild fulltext search index"), IconTheme.JabRefIcons.FILE),
+    REDOWNLOAD_MISSING_FILES(
+            Localization.lang("Redownload missing files"), IconTheme.JabRefIcons.DOWNLOAD),
+    OPEN_EXTERNAL_FILE(
+            Localization.lang("Open file"), IconTheme.JabRefIcons.FILE, KeyBinding.OPEN_FILE),
+    EXTRACT_FILE_REFERENCES_ONLINE(
+            Localization.lang("Extract references from file (online)"),
+            IconTheme.JabRefIcons.FILE_STAR),
+    EXTRACT_FILE_REFERENCES_OFFLINE(
+            Localization.lang("Extract references from file (offline)"),
+            IconTheme.JabRefIcons.FILE_STAR),
+    OPEN_URL(
+            Localization.lang("Open URL or DOI"),
+            IconTheme.JabRefIcons.WWW,
+            KeyBinding.OPEN_URL_OR_DOI),
     SEARCH_SHORTSCIENCE(Localization.lang("Search ShortScience")),
     MERGE_WITH_FETCHED_ENTRY(Localization.lang("Get bibliographic data from %0", "DOI/ISBN/...")),
     ATTACH_FILE(Localization.lang("Attach file"), IconTheme.JabRefIcons.ATTACH_FILE),
-    ATTACH_FILE_FROM_URL(Localization.lang("Attach file from URL"), IconTheme.JabRefIcons.DOWNLOAD_FILE),
+    ATTACH_FILE_FROM_URL(
+            Localization.lang("Attach file from URL"), IconTheme.JabRefIcons.DOWNLOAD_FILE),
     PRIORITY(Localization.lang("Priority"), IconTheme.JabRefIcons.PRIORITY),
     CLEAR_PRIORITY(Localization.lang("Clear priority")),
     PRIORITY_HIGH(Localization.lang("Set priority to high"), IconTheme.JabRefIcons.PRIORITY_HIGH),
-    PRIORITY_MEDIUM(Localization.lang("Set priority to medium"), IconTheme.JabRefIcons.PRIORITY_MEDIUM),
+    PRIORITY_MEDIUM(
+            Localization.lang("Set priority to medium"), IconTheme.JabRefIcons.PRIORITY_MEDIUM),
     PRIORITY_LOW(Localization.lang("Set priority to low"), IconTheme.JabRefIcons.PRIORITY_LOW),
     QUALITY(Localization.lang("Quality"), IconTheme.JabRefIcons.QUALITY),
-    QUALITY_ASSURED(Localization.lang("Toggle quality assured"), IconTheme.JabRefIcons.QUALITY_ASSURED),
+    QUALITY_ASSURED(
+            Localization.lang("Toggle quality assured"), IconTheme.JabRefIcons.QUALITY_ASSURED),
     RANKING(Localization.lang("Rank"), IconTheme.JabRefIcons.RANKING),
     CLEAR_RANK(Localization.lang("Clear rank")),
     RANK_1(Localization.lang("Set rank to one"), IconTheme.JabRefIcons.RANK1),
@@ -57,29 +80,65 @@ public enum StandardActions implements Action {
     TOGGLE_PRINTED(Localization.lang("Toggle print status"), IconTheme.JabRefIcons.PRINTED),
     READ_STATUS(Localization.lang("Read status"), IconTheme.JabRefIcons.READ_STATUS),
     CLEAR_READ_STATUS(Localization.lang("Clear read status"), KeyBinding.CLEAR_READ_STATUS),
-    READ(Localization.lang("Set read status to read"), IconTheme.JabRefIcons.READ_STATUS_READ, KeyBinding.READ),
-    SKIMMED(Localization.lang("Set read status to skimmed"), IconTheme.JabRefIcons.READ_STATUS_SKIMMED, KeyBinding.SKIMMED),
+    READ(
+            Localization.lang("Set read status to read"),
+            IconTheme.JabRefIcons.READ_STATUS_READ,
+            KeyBinding.READ),
+    SKIMMED(
+            Localization.lang("Set read status to skimmed"),
+            IconTheme.JabRefIcons.READ_STATUS_SKIMMED,
+            KeyBinding.SKIMMED),
     RELEVANCE(Localization.lang("Relevance"), IconTheme.JabRefIcons.RELEVANCE),
     RELEVANT(Localization.lang("Toggle relevance"), IconTheme.JabRefIcons.RELEVANCE),
     NEW_LIBRARY(Localization.lang("New library"), IconTheme.JabRefIcons.NEW),
-    OPEN_LIBRARY(Localization.lang("Open library"), IconTheme.JabRefIcons.OPEN, KeyBinding.OPEN_DATABASE),
+    OPEN_LIBRARY(
+            Localization.lang("Open library"),
+            IconTheme.JabRefIcons.OPEN,
+            KeyBinding.OPEN_DATABASE),
     IMPORT(Localization.lang("Import"), IconTheme.JabRefIcons.IMPORT),
     EXPORT(Localization.lang("Export"), IconTheme.JabRefIcons.EXPORT, KeyBinding.EXPORT),
-    SAVE_LIBRARY(Localization.lang("Save library"), IconTheme.JabRefIcons.SAVE, KeyBinding.SAVE_DATABASE),
+    SAVE_LIBRARY(
+            Localization.lang("Save library"),
+            IconTheme.JabRefIcons.SAVE,
+            KeyBinding.SAVE_DATABASE),
     SAVE_LIBRARY_AS(Localization.lang("Save library as..."), KeyBinding.SAVE_DATABASE_AS),
     SAVE_SELECTED_AS_PLAIN_BIBTEX(Localization.lang("Save selected as plain BibTeX...")),
-    SAVE_ALL(Localization.lang("Save all"), Localization.lang("Save all open libraries"), IconTheme.JabRefIcons.SAVE_ALL, KeyBinding.SAVE_ALL),
-    IMPORT_INTO_NEW_LIBRARY(Localization.lang("Import into new library"), KeyBinding.IMPORT_INTO_NEW_DATABASE),
-    IMPORT_INTO_CURRENT_LIBRARY(Localization.lang("Import into current library"), KeyBinding.IMPORT_INTO_CURRENT_DATABASE),
+    SAVE_ALL(
+            Localization.lang("Save all"),
+            Localization.lang("Save all open libraries"),
+            IconTheme.JabRefIcons.SAVE_ALL,
+            KeyBinding.SAVE_ALL),
+    IMPORT_INTO_NEW_LIBRARY(
+            Localization.lang("Import into new library"), KeyBinding.IMPORT_INTO_NEW_DATABASE),
+    IMPORT_INTO_CURRENT_LIBRARY(
+            Localization.lang("Import into current library"),
+            KeyBinding.IMPORT_INTO_CURRENT_DATABASE),
     EXPORT_ALL(Localization.lang("Export all entries")),
     REMOTE_DB(Localization.lang("Shared database"), IconTheme.JabRefIcons.REMOTE_DATABASE),
     EXPORT_SELECTED(Localization.lang("Export selected entries"), KeyBinding.EXPORT_SELECTED),
-    CONNECT_TO_SHARED_DB(Localization.lang("Connect to shared database"), IconTheme.JabRefIcons.CONNECT_DB),
-    PULL_CHANGES_FROM_SHARED_DB(Localization.lang("Pull changes from shared database"), KeyBinding.PULL_CHANGES_FROM_SHARED_DATABASE),
-    CLOSE_LIBRARY(Localization.lang("Close library"), Localization.lang("Close the current library"), IconTheme.JabRefIcons.CLOSE, KeyBinding.CLOSE_DATABASE),
-    CLOSE_OTHER_LIBRARIES(Localization.lang("Close others"), Localization.lang("Close other libraries"), IconTheme.JabRefIcons.CLOSE),
-    CLOSE_ALL_LIBRARIES(Localization.lang("Close all"), Localization.lang("Close all libraries"), IconTheme.JabRefIcons.CLOSE),
-    QUIT(Localization.lang("Quit"), Localization.lang("Quit JabRef"), IconTheme.JabRefIcons.CLOSE_JABREF, KeyBinding.QUIT_JABREF),
+    CONNECT_TO_SHARED_DB(
+            Localization.lang("Connect to shared database"), IconTheme.JabRefIcons.CONNECT_DB),
+    PULL_CHANGES_FROM_SHARED_DB(
+            Localization.lang("Pull changes from shared database"),
+            KeyBinding.PULL_CHANGES_FROM_SHARED_DATABASE),
+    CLOSE_LIBRARY(
+            Localization.lang("Close library"),
+            Localization.lang("Close the current library"),
+            IconTheme.JabRefIcons.CLOSE,
+            KeyBinding.CLOSE_DATABASE),
+    CLOSE_OTHER_LIBRARIES(
+            Localization.lang("Close others"),
+            Localization.lang("Close other libraries"),
+            IconTheme.JabRefIcons.CLOSE),
+    CLOSE_ALL_LIBRARIES(
+            Localization.lang("Close all"),
+            Localization.lang("Close all libraries"),
+            IconTheme.JabRefIcons.CLOSE),
+    QUIT(
+            Localization.lang("Quit"),
+            Localization.lang("Quit JabRef"),
+            IconTheme.JabRefIcons.CLOSE_JABREF,
+            KeyBinding.QUIT_JABREF),
     UNDO(Localization.lang("Undo"), IconTheme.JabRefIcons.UNDO, KeyBinding.UNDO),
     REDO(Localization.lang("Redo"), IconTheme.JabRefIcons.REDO, KeyBinding.REDO),
     REPLACE_ALL(Localization.lang("Find and replace"), KeyBinding.REPLACE_STRING),
@@ -87,32 +146,85 @@ public enum StandardActions implements Action {
     MASS_SET_FIELDS(Localization.lang("Manage field names & content")),
 
     AUTOMATIC_FIELD_EDITOR(Localization.lang("Automatic field editor")),
-    TOGGLE_GROUPS(Localization.lang("Groups"), IconTheme.JabRefIcons.TOGGLE_GROUPS, KeyBinding.TOGGLE_GROUPS_INTERFACE),
-    TOGGLE_OO(Localization.lang("OpenOffice/LibreOffice"), IconTheme.JabRefIcons.FILE_OPENOFFICE, KeyBinding.OPEN_OPEN_OFFICE_LIBRE_OFFICE_CONNECTION),
-    TOGGLE_WEB_SEARCH(Localization.lang("Web search"), Localization.lang("Toggle web search interface"), IconTheme.JabRefIcons.WWW, KeyBinding.WEB_SEARCH),
+    TOGGLE_GROUPS(
+            Localization.lang("Groups"),
+            IconTheme.JabRefIcons.TOGGLE_GROUPS,
+            KeyBinding.TOGGLE_GROUPS_INTERFACE),
+    TOGGLE_OO(
+            Localization.lang("OpenOffice/LibreOffice"),
+            IconTheme.JabRefIcons.FILE_OPENOFFICE,
+            KeyBinding.OPEN_OPEN_OFFICE_LIBRE_OFFICE_CONNECTION),
+    TOGGLE_WEB_SEARCH(
+            Localization.lang("Web search"),
+            Localization.lang("Toggle web search interface"),
+            IconTheme.JabRefIcons.WWW,
+            KeyBinding.WEB_SEARCH),
 
-    PARSE_LATEX(Localization.lang("Search for citations in LaTeX files..."), IconTheme.JabRefIcons.LATEX_CITATIONS),
-    NEW_SUB_LIBRARY_FROM_AUX(Localization.lang("New sublibrary based on AUX file") + "...", Localization.lang("New BibTeX sublibrary") + Localization.lang("This feature generates a new library based on which entries are needed in an existing LaTeX document."), IconTheme.JabRefIcons.NEW),
-    NEW_LIBRARY_FROM_PDF_ONLINE(Localization.lang("New library based on references in PDF file... (online)"), Localization.lang("This feature generates a new library based on the list of references in a PDF file. Thereby, it uses Grobid's functionality."), IconTheme.JabRefIcons.NEW),
-    NEW_LIBRARY_FROM_PDF_OFFLINE(Localization.lang("New library based on references in PDF file... (offline)"), Localization.lang("This feature generates a new library based on the list of references in a PDF file. Thereby, it uses JabRef's built-in functionality."), IconTheme.JabRefIcons.NEW),
-    WRITE_METADATA_TO_PDF(Localization.lang("Write metadata to PDF files"), Localization.lang("Will write metadata to the PDFs linked from selected entries."), KeyBinding.WRITE_METADATA_TO_PDF),
+    PARSE_LATEX(
+            Localization.lang("Search for citations in LaTeX files..."),
+            IconTheme.JabRefIcons.LATEX_CITATIONS),
+    NEW_SUB_LIBRARY_FROM_AUX(
+            Localization.lang("New sublibrary based on AUX file") + "...",
+            Localization.lang("New BibTeX sublibrary")
+                    + Localization.lang(
+                            "This feature generates a new library based on which entries are needed in an existing LaTeX document."),
+            IconTheme.JabRefIcons.NEW),
+    NEW_LIBRARY_FROM_PDF_ONLINE(
+            Localization.lang("New library based on references in PDF file... (online)"),
+            Localization.lang(
+                    "This feature generates a new library based on the list of references in a PDF file. Thereby, it uses Grobid's functionality."),
+            IconTheme.JabRefIcons.NEW),
+    NEW_LIBRARY_FROM_PDF_OFFLINE(
+            Localization.lang("New library based on references in PDF file... (offline)"),
+            Localization.lang(
+                    "This feature generates a new library based on the list of references in a PDF file. Thereby, it uses JabRef's built-in functionality."),
+            IconTheme.JabRefIcons.NEW),
+    WRITE_METADATA_TO_PDF(
+            Localization.lang("Write metadata to PDF files"),
+            Localization.lang("Will write metadata to the PDFs linked from selected entries."),
+            KeyBinding.WRITE_METADATA_TO_PDF),
 
     START_NEW_STUDY(Localization.lang("Start new systematic literature review")),
     UPDATE_SEARCH_RESULTS_OF_STUDY(Localization.lang("Update study search results")),
     EDIT_EXISTING_STUDY(Localization.lang("Manage study definition")),
 
     OPEN_DATABASE_FOLDER(Localization.lang("Reveal in file explorer")),
-    OPEN_FOLDER(Localization.lang("Open folder"), Localization.lang("Open folder"), IconTheme.JabRefIcons.FOLDER, KeyBinding.OPEN_FOLDER),
-    OPEN_FILE(Localization.lang("Open file"), Localization.lang("Open file"), IconTheme.JabRefIcons.FILE, KeyBinding.OPEN_FILE),
-    OPEN_CONSOLE(Localization.lang("Open terminal here"), Localization.lang("Open terminal here"), IconTheme.JabRefIcons.CONSOLE, KeyBinding.OPEN_CONSOLE),
+    OPEN_FOLDER(
+            Localization.lang("Open folder"),
+            Localization.lang("Open folder"),
+            IconTheme.JabRefIcons.FOLDER,
+            KeyBinding.OPEN_FOLDER),
+    OPEN_FILE(
+            Localization.lang("Open file"),
+            Localization.lang("Open file"),
+            IconTheme.JabRefIcons.FILE,
+            KeyBinding.OPEN_FILE),
+    OPEN_CONSOLE(
+            Localization.lang("Open terminal here"),
+            Localization.lang("Open terminal here"),
+            IconTheme.JabRefIcons.CONSOLE,
+            KeyBinding.OPEN_CONSOLE),
     COPY_LINKED_FILES(Localization.lang("Copy linked files to folder...")),
     COPY_DOI(Localization.lang("Copy DOI")),
     COPY_DOI_URL(Localization.lang("Copy DOI url")),
     ABBREVIATE(Localization.lang("Abbreviate journal names")),
-    ABBREVIATE_DEFAULT(Localization.lang("default"), Localization.lang("Abbreviate journal names of the selected entries (DEFAULT abbreviation)"), KeyBinding.ABBREVIATE),
-    ABBREVIATE_DOTLESS(Localization.lang("dotless"), Localization.lang("Abbreviate journal names of the selected entries (DOTLESS abbreviation)")),
-    ABBREVIATE_SHORTEST_UNIQUE(Localization.lang("shortest unique"), Localization.lang("Abbreviate journal names of the selected entries (SHORTEST UNIQUE abbreviation)")),
-    UNABBREVIATE(Localization.lang("Unabbreviate journal names"), Localization.lang("Unabbreviate journal names of the selected entries"), KeyBinding.UNABBREVIATE),
+    ABBREVIATE_DEFAULT(
+            Localization.lang("default"),
+            Localization.lang(
+                    "Abbreviate journal names of the selected entries (DEFAULT abbreviation)"),
+            KeyBinding.ABBREVIATE),
+    ABBREVIATE_DOTLESS(
+            Localization.lang("dotless"),
+            Localization.lang(
+                    "Abbreviate journal names of the selected entries (DOTLESS abbreviation)")),
+    ABBREVIATE_SHORTEST_UNIQUE(
+            Localization.lang("shortest unique"),
+            Localization.lang(
+                    "Abbreviate journal names of the selected entries (SHORTEST UNIQUE abbreviation)")),
+    UNABBREVIATE(
+            Localization.lang("Unabbreviate journal names"),
+            Localization.lang("Unabbreviate journal names of the selected entries"),
+            KeyBinding.UNABBREVIATE),
 
     MANAGE_CUSTOM_EXPORTS(Localization.lang("Manage custom exports")),
     MANAGE_CUSTOM_IMPORTS(Localization.lang("Manage custom imports")),
@@ -120,68 +232,167 @@ public enum StandardActions implements Action {
     SETUP_GENERAL_FIELDS(Localization.lang("Set up general fields")),
     MANAGE_PROTECTED_TERMS(Localization.lang("Manage protected terms")),
     CITATION_KEY_PATTERN(Localization.lang("Citation key patterns")),
-    SHOW_PREFS(Localization.lang("Preferences"), IconTheme.JabRefIcons.PREFERENCES, KeyBinding.SHOW_PREFS),
+    SHOW_PREFS(
+            Localization.lang("Preferences"),
+            IconTheme.JabRefIcons.PREFERENCES,
+            KeyBinding.SHOW_PREFS),
     MANAGE_JOURNALS(Localization.lang("Manage journal abbreviations")),
-    CUSTOMIZE_KEYBINDING(Localization.lang("Customize keyboard shortcuts"), IconTheme.JabRefIcons.KEY_BINDINGS),
-    EDIT_ENTRY(Localization.lang("Open entry editor"), IconTheme.JabRefIcons.EDIT_ENTRY, KeyBinding.OPEN_CLOSE_ENTRY_EDITOR),
+    CUSTOMIZE_KEYBINDING(
+            Localization.lang("Customize keyboard shortcuts"), IconTheme.JabRefIcons.KEY_BINDINGS),
+    EDIT_ENTRY(
+            Localization.lang("Open entry editor"),
+            IconTheme.JabRefIcons.EDIT_ENTRY,
+            KeyBinding.OPEN_CLOSE_ENTRY_EDITOR),
     SHOW_PDF_VIEWER(Localization.lang("Open document viewer"), IconTheme.JabRefIcons.PDF_FILE),
     NEXT_PREVIEW_STYLE(Localization.lang("Next preview style"), KeyBinding.NEXT_PREVIEW_LAYOUT),
-    PREVIOUS_PREVIEW_STYLE(Localization.lang("Previous preview style"), KeyBinding.PREVIOUS_PREVIEW_LAYOUT),
+    PREVIOUS_PREVIEW_STYLE(
+            Localization.lang("Previous preview style"), KeyBinding.PREVIOUS_PREVIEW_LAYOUT),
     SELECT_ALL(Localization.lang("Select all"), KeyBinding.SELECT_ALL),
     UNSELECT_ALL(Localization.lang("Unselect all")),
 
     EXPAND_ALL(Localization.lang("Expand all")),
     COLLAPSE_ALL(Localization.lang("Collapse all")),
 
-    NEW_ENTRY(Localization.lang("New entry"), IconTheme.JabRefIcons.ADD_ENTRY, KeyBinding.NEW_ENTRY),
+    NEW_ENTRY(
+            Localization.lang("New entry"), IconTheme.JabRefIcons.ADD_ENTRY, KeyBinding.NEW_ENTRY),
     NEW_ARTICLE(Localization.lang("New article"), IconTheme.JabRefIcons.ADD_ARTICLE),
-    NEW_ENTRY_FROM_PLAIN_TEXT(Localization.lang("New entry from plain text"), IconTheme.JabRefIcons.NEW_ENTRY_FROM_PLAIN_TEXT),
-    NEW_ENTRY_FROM_PLAIN_TEXT_ONLINE(Localization.lang("New entry from plain text (online)"), IconTheme.JabRefIcons.NEW_ENTRY_FROM_PLAIN_TEXT, KeyBinding.NEW_ENTRY_FROM_PLAIN_TEXT_ONLINE),
-    NEW_ENTRY_FROM_PLAIN_TEXT_OFFLINE(Localization.lang("New entry from plain text (offline)"), IconTheme.JabRefIcons.NEW_ENTRY_FROM_PLAIN_TEXT),
+    NEW_ENTRY_FROM_PLAIN_TEXT(
+            Localization.lang("New entry from plain text"),
+            IconTheme.JabRefIcons.NEW_ENTRY_FROM_PLAIN_TEXT),
+    NEW_ENTRY_FROM_PLAIN_TEXT_ONLINE(
+            Localization.lang("New entry from plain text (online)"),
+            IconTheme.JabRefIcons.NEW_ENTRY_FROM_PLAIN_TEXT,
+            KeyBinding.NEW_ENTRY_FROM_PLAIN_TEXT_ONLINE),
+    NEW_ENTRY_FROM_PLAIN_TEXT_OFFLINE(
+            Localization.lang("New entry from plain text (offline)"),
+            IconTheme.JabRefIcons.NEW_ENTRY_FROM_PLAIN_TEXT),
     LIBRARY_PROPERTIES(Localization.lang("Library properties")),
     FIND_DUPLICATES(Localization.lang("Find duplicates"), IconTheme.JabRefIcons.FIND_DUPLICATES),
-    MERGE_ENTRIES(Localization.lang("Merge entries"), IconTheme.JabRefIcons.MERGE_ENTRIES, KeyBinding.MERGE_ENTRIES),
-    RESOLVE_DUPLICATE_KEYS(Localization.lang("Resolve duplicate citation keys"), Localization.lang("Find and remove duplicate citation keys"), KeyBinding.RESOLVE_DUPLICATE_CITATION_KEYS),
+    MERGE_ENTRIES(
+            Localization.lang("Merge entries"),
+            IconTheme.JabRefIcons.MERGE_ENTRIES,
+            KeyBinding.MERGE_ENTRIES),
+    RESOLVE_DUPLICATE_KEYS(
+            Localization.lang("Resolve duplicate citation keys"),
+            Localization.lang("Find and remove duplicate citation keys"),
+            KeyBinding.RESOLVE_DUPLICATE_CITATION_KEYS),
     CHECK_INTEGRITY(Localization.lang("Check integrity"), KeyBinding.CHECK_INTEGRITY),
-    FIND_UNLINKED_FILES(Localization.lang("Search for unlinked local files"), IconTheme.JabRefIcons.SEARCH, KeyBinding.FIND_UNLINKED_FILES),
-    AUTO_LINK_FILES(Localization.lang("Automatically set file links"), IconTheme.JabRefIcons.AUTO_FILE_LINK, KeyBinding.AUTOMATICALLY_LINK_FILES),
+    FIND_UNLINKED_FILES(
+            Localization.lang("Search for unlinked local files"),
+            IconTheme.JabRefIcons.SEARCH,
+            KeyBinding.FIND_UNLINKED_FILES),
+    AUTO_LINK_FILES(
+            Localization.lang("Automatically set file links"),
+            IconTheme.JabRefIcons.AUTO_FILE_LINK,
+            KeyBinding.AUTOMATICALLY_LINK_FILES),
     LOOKUP_DOC_IDENTIFIER(Localization.lang("Search document identifier online")),
-    LOOKUP_FULLTEXT(Localization.lang("Search full text documents online"), IconTheme.JabRefIcons.FILE_SEARCH, KeyBinding.DOWNLOAD_FULL_TEXT),
-    GENERATE_CITE_KEY(Localization.lang("Generate citation key"), IconTheme.JabRefIcons.MAKE_KEY, KeyBinding.AUTOGENERATE_CITATION_KEYS),
-    GENERATE_CITE_KEYS(Localization.lang("Generate citation keys"), IconTheme.JabRefIcons.MAKE_KEY, KeyBinding.AUTOGENERATE_CITATION_KEYS),
-    DOWNLOAD_FULL_TEXT(Localization.lang("Search full text documents online"), IconTheme.JabRefIcons.FILE_SEARCH, KeyBinding.DOWNLOAD_FULL_TEXT),
-    CLEANUP_ENTRIES(Localization.lang("Cleanup entries"), IconTheme.JabRefIcons.CLEANUP_ENTRIES, KeyBinding.CLEANUP),
-    SET_FILE_LINKS(Localization.lang("Automatically set file links"), KeyBinding.AUTOMATICALLY_LINK_FILES),
+    LOOKUP_FULLTEXT(
+            Localization.lang("Search full text documents online"),
+            IconTheme.JabRefIcons.FILE_SEARCH,
+            KeyBinding.DOWNLOAD_FULL_TEXT),
+    GENERATE_CITE_KEY(
+            Localization.lang("Generate citation key"),
+            IconTheme.JabRefIcons.MAKE_KEY,
+            KeyBinding.AUTOGENERATE_CITATION_KEYS),
+    GENERATE_CITE_KEYS(
+            Localization.lang("Generate citation keys"),
+            IconTheme.JabRefIcons.MAKE_KEY,
+            KeyBinding.AUTOGENERATE_CITATION_KEYS),
+    DOWNLOAD_FULL_TEXT(
+            Localization.lang("Search full text documents online"),
+            IconTheme.JabRefIcons.FILE_SEARCH,
+            KeyBinding.DOWNLOAD_FULL_TEXT),
+    CLEANUP_ENTRIES(
+            Localization.lang("Cleanup entries"),
+            IconTheme.JabRefIcons.CLEANUP_ENTRIES,
+            KeyBinding.CLEANUP),
+    SET_FILE_LINKS(
+            Localization.lang("Automatically set file links"), KeyBinding.AUTOMATICALLY_LINK_FILES),
 
-    EDIT_FILE_LINK(Localization.lang("Edit"), IconTheme.JabRefIcons.EDIT, KeyBinding.OPEN_CLOSE_ENTRY_EDITOR),
+    EDIT_FILE_LINK(
+            Localization.lang("Edit"),
+            IconTheme.JabRefIcons.EDIT,
+            KeyBinding.OPEN_CLOSE_ENTRY_EDITOR),
     DOWNLOAD_FILE(Localization.lang("Download file"), IconTheme.JabRefIcons.DOWNLOAD_FILE),
     REDOWNLOAD_FILE(Localization.lang("Redownload file"), IconTheme.JabRefIcons.DOWNLOAD_FILE),
-    RENAME_FILE_TO_PATTERN(Localization.lang("Rename file to defined pattern"), IconTheme.JabRefIcons.AUTO_RENAME),
-    RENAME_FILE_TO_NAME(Localization.lang("Rename file to a given name"), IconTheme.JabRefIcons.RENAME, KeyBinding.REPLACE_STRING),
-    MOVE_FILE_TO_FOLDER(Localization.lang("Move file to file directory"), IconTheme.JabRefIcons.MOVE_TO_FOLDER),
-    MOVE_FILE_TO_FOLDER_AND_RENAME(Localization.lang("Move file to file directory and rename file")),
-    COPY_FILE_TO_FOLDER(Localization.lang("Copy linked file to folder..."), IconTheme.JabRefIcons.COPY_TO_FOLDER, KeyBinding.COPY),
+    RENAME_FILE_TO_PATTERN(
+            Localization.lang("Rename file to defined pattern"), IconTheme.JabRefIcons.AUTO_RENAME),
+    RENAME_FILE_TO_NAME(
+            Localization.lang("Rename file to a given name"),
+            IconTheme.JabRefIcons.RENAME,
+            KeyBinding.REPLACE_STRING),
+    MOVE_FILE_TO_FOLDER(
+            Localization.lang("Move file to file directory"), IconTheme.JabRefIcons.MOVE_TO_FOLDER),
+    MOVE_FILE_TO_FOLDER_AND_RENAME(
+            Localization.lang("Move file to file directory and rename file")),
+    COPY_FILE_TO_FOLDER(
+            Localization.lang("Copy linked file to folder..."),
+            IconTheme.JabRefIcons.COPY_TO_FOLDER,
+            KeyBinding.COPY),
     REMOVE_LINK(Localization.lang("Remove link"), IconTheme.JabRefIcons.REMOVE_LINK),
-    DELETE_FILE(Localization.lang("Permanently delete local file"), IconTheme.JabRefIcons.DELETE_FILE, KeyBinding.DELETE_ENTRY),
+    DELETE_FILE(
+            Localization.lang("Permanently delete local file"),
+            IconTheme.JabRefIcons.DELETE_FILE,
+            KeyBinding.DELETE_ENTRY),
 
     HELP(Localization.lang("Online help"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
     HELP_GROUPS(Localization.lang("Open Help page"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
-    HELP_KEY_PATTERNS(Localization.lang("Help on key patterns"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
-    HELP_REGEX_SEARCH(Localization.lang("Help on regular expression search"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
-    HELP_NAME_FORMATTER(Localization.lang("Help on Name Formatting"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
-    HELP_SPECIAL_FIELDS(Localization.lang("Help on special fields"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
-    HELP_PUSH_TO_APPLICATION(Localization.lang("Help on external applications"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
+    HELP_KEY_PATTERNS(
+            Localization.lang("Help on key patterns"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
+    HELP_REGEX_SEARCH(
+            Localization.lang("Help on regular expression search"),
+            IconTheme.JabRefIcons.HELP,
+            KeyBinding.HELP),
+    HELP_NAME_FORMATTER(
+            Localization.lang("Help on Name Formatting"),
+            IconTheme.JabRefIcons.HELP,
+            KeyBinding.HELP),
+    HELP_SPECIAL_FIELDS(
+            Localization.lang("Help on special fields"),
+            IconTheme.JabRefIcons.HELP,
+            KeyBinding.HELP),
+    HELP_PUSH_TO_APPLICATION(
+            Localization.lang("Help on external applications"),
+            IconTheme.JabRefIcons.HELP,
+            KeyBinding.HELP),
     WEB_MENU(Localization.lang("JabRef resources")),
-    OPEN_WEBPAGE(Localization.lang("Website"), Localization.lang("Opens JabRef's website"), IconTheme.JabRefIcons.HOME),
-    OPEN_FACEBOOK("Facebook", Localization.lang("Opens JabRef's Facebook page"), IconTheme.JabRefIcons.FACEBOOK),
-    OPEN_TWITTER("Twitter", Localization.lang("Opens JabRef's Twitter page"), IconTheme.JabRefIcons.TWITTER),
-    OPEN_BLOG(Localization.lang("Blog"), Localization.lang("Opens JabRef's blog"), IconTheme.JabRefIcons.BLOG),
-    OPEN_DEV_VERSION_LINK(Localization.lang("Development version"), Localization.lang("Opens a link where the current development version can be downloaded")),
-    OPEN_CHANGELOG(Localization.lang("View change log"), Localization.lang("See what has been changed in the JabRef versions")),
-    OPEN_GITHUB("GitHub", Localization.lang("Opens JabRef's GitHub page"), IconTheme.JabRefIcons.GITHUB),
-    DONATE(Localization.lang("Donate to JabRef"), Localization.lang("Donate to JabRef"), IconTheme.JabRefIcons.DONATE),
-    OPEN_FORUM(Localization.lang("Online help forum"), Localization.lang("Online help forum"), IconTheme.JabRefIcons.FORUM),
-    ERROR_CONSOLE(Localization.lang("View event log"), Localization.lang("Display all error messages")),
+    OPEN_WEBPAGE(
+            Localization.lang("Website"),
+            Localization.lang("Opens JabRef's website"),
+            IconTheme.JabRefIcons.HOME),
+    OPEN_FACEBOOK(
+            "Facebook",
+            Localization.lang("Opens JabRef's Facebook page"),
+            IconTheme.JabRefIcons.FACEBOOK),
+    OPEN_TWITTER(
+            "Twitter",
+            Localization.lang("Opens JabRef's Twitter page"),
+            IconTheme.JabRefIcons.TWITTER),
+    OPEN_BLOG(
+            Localization.lang("Blog"),
+            Localization.lang("Opens JabRef's blog"),
+            IconTheme.JabRefIcons.BLOG),
+    OPEN_DEV_VERSION_LINK(
+            Localization.lang("Development version"),
+            Localization.lang(
+                    "Opens a link where the current development version can be downloaded")),
+    OPEN_CHANGELOG(
+            Localization.lang("View change log"),
+            Localization.lang("See what has been changed in the JabRef versions")),
+    OPEN_GITHUB(
+            "GitHub",
+            Localization.lang("Opens JabRef's GitHub page"),
+            IconTheme.JabRefIcons.GITHUB),
+    DONATE(
+            Localization.lang("Donate to JabRef"),
+            Localization.lang("Donate to JabRef"),
+            IconTheme.JabRefIcons.DONATE),
+    OPEN_FORUM(
+            Localization.lang("Online help forum"),
+            Localization.lang("Online help forum"),
+            IconTheme.JabRefIcons.FORUM),
+    ERROR_CONSOLE(
+            Localization.lang("View event log"), Localization.lang("Display all error messages")),
     SEARCH_FOR_UPDATES(Localization.lang("Check for updates")),
     ABOUT(Localization.lang("About JabRef"), Localization.lang("About JabRef")),
 
@@ -200,7 +411,8 @@ public enum StandardActions implements Action {
     GROUP_SUBGROUP_SORT(Localization.lang("Sort subgroups A-Z")),
     GROUP_SUBGROUP_SORT_REVERSE(Localization.lang("Sort subgroups Z-A")),
     GROUP_SUBGROUP_SORT_ENTRIES(Localization.lang("Sort subgroups by # of entries (Descending)")),
-    GROUP_SUBGROUP_SORT_ENTRIES_REVERSE(Localization.lang("Sort subgroups by # of entries (Ascending)")),
+    GROUP_SUBGROUP_SORT_ENTRIES_REVERSE(
+            Localization.lang("Sort subgroups by # of entries (Ascending)")),
     GROUP_ENTRIES_ADD(Localization.lang("Add selected entries to this group")),
     GROUP_ENTRIES_REMOVE(Localization.lang("Remove selected entries from this group")),
 
@@ -236,7 +448,8 @@ public enum StandardActions implements Action {
         this.keyBinding = Optional.empty();
     }
 
-    StandardActions(String text, String description, IconTheme.JabRefIcons icon, KeyBinding keyBinding) {
+    StandardActions(
+            String text, String description, IconTheme.JabRefIcons icon, KeyBinding keyBinding) {
         this.text = text;
         this.description = description;
         this.icon = Optional.of(icon);
diff --git a/src/main/java/org/jabref/gui/ai/ClearEmbeddingsAction.java b/src/main/java/org/jabref/gui/ai/ClearEmbeddingsAction.java
index 91b3e926269b..0125ddc2b0cd 100644
--- a/src/main/java/org/jabref/gui/ai/ClearEmbeddingsAction.java
+++ b/src/main/java/org/jabref/gui/ai/ClearEmbeddingsAction.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.ai;
 
-import java.util.List;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
@@ -11,7 +11,7 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.LinkedFile;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import java.util.List;
 
 public class ClearEmbeddingsAction extends SimpleCommand {
     private final StateManager stateManager;
@@ -19,10 +19,11 @@ public class ClearEmbeddingsAction extends SimpleCommand {
     private final AiService aiService;
     private final TaskExecutor taskExecutor;
 
-    public ClearEmbeddingsAction(StateManager stateManager,
-                                 DialogService dialogService,
-                                 AiService aiService,
-                                 TaskExecutor taskExecutor) {
+    public ClearEmbeddingsAction(
+            StateManager stateManager,
+            DialogService dialogService,
+            AiService aiService,
+            TaskExecutor taskExecutor) {
         this.stateManager = stateManager;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
@@ -36,9 +37,10 @@ public void execute() {
             return;
         }
 
-        boolean confirmed = dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Clear embeddings cache"),
-                Localization.lang("Clear embeddings cache for current library?"));
+        boolean confirmed =
+                dialogService.showConfirmationDialogAndWait(
+                        Localization.lang("Clear embeddings cache"),
+                        Localization.lang("Clear embeddings cache for current library?"));
 
         if (!confirmed) {
             return;
@@ -46,16 +48,12 @@ public void execute() {
 
         dialogService.notify(Localization.lang("Clearing embeddings cache..."));
 
-        List<LinkedFile> linkedFiles = stateManager
-                .getActiveDatabase()
-                .get()
-                .getDatabase()
-                .getEntries()
-                .stream()
-                .flatMap(entry -> entry.getFiles().stream())
-                .toList();
+        List<LinkedFile> linkedFiles =
+                stateManager.getActiveDatabase().get().getDatabase().getEntries().stream()
+                        .flatMap(entry -> entry.getFiles().stream())
+                        .toList();
 
         BackgroundTask.wrap(() -> aiService.getIngestionService().clearEmbeddingsFor(linkedFiles))
-                      .executeWith(taskExecutor);
+                .executeWith(taskExecutor);
     }
 }
diff --git a/src/main/java/org/jabref/gui/ai/chatting/chathistory/ChatHistoryService.java b/src/main/java/org/jabref/gui/ai/chatting/chathistory/ChatHistoryService.java
index 872a263c7a1a..22729b2abfbd 100644
--- a/src/main/java/org/jabref/gui/ai/chatting/chathistory/ChatHistoryService.java
+++ b/src/main/java/org/jabref/gui/ai/chatting/chathistory/ChatHistoryService.java
@@ -1,10 +1,9 @@
 package org.jabref.gui.ai.chatting.chathistory;
 
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.TreeMap;
+import com.airhacks.afterburner.injection.Injector;
+import com.google.common.eventbus.Subscribe;
+
+import dev.langchain4j.data.message.ChatMessage;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
@@ -24,13 +23,15 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.groups.AbstractGroup;
 import org.jabref.model.groups.GroupTreeNode;
-
-import com.airhacks.afterburner.injection.Injector;
-import com.google.common.eventbus.Subscribe;
-import dev.langchain4j.data.message.ChatMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.TreeMap;
+
 /**
  * Main class for getting and storing chat history for entries and groups.
  * Use this class <s>in logic and</s> UI.
@@ -58,35 +59,50 @@ public class ChatHistoryService implements AutoCloseable {
 
     private static final String CHAT_HISTORY_FILE_NAME = "chat-histories.mv";
 
-    private final StateManager stateManager = Injector.instantiateModelOrService(StateManager.class);
+    private final StateManager stateManager =
+            Injector.instantiateModelOrService(StateManager.class);
 
     private final CitationKeyPatternPreferences citationKeyPatternPreferences;
 
     private final ChatHistoryStorage implementation;
 
-    private record ChatHistoryManagementRecord(Optional<BibDatabaseContext> bibDatabaseContext, ObservableList<ChatMessage> chatHistory) { }
+    private record ChatHistoryManagementRecord(
+            Optional<BibDatabaseContext> bibDatabaseContext,
+            ObservableList<ChatMessage> chatHistory) {}
 
     // We use a {@link TreeMap} here to store {@link BibEntry} chat histories by their id.
     // When you compare {@link BibEntry} instances, they are compared by value, not by reference.
-    // And when you store {@link BibEntry} instances in a {@link HashMap}, an old hash may be stored when the {@link BibEntry} is changed.
+    // And when you store {@link BibEntry} instances in a {@link HashMap}, an old hash may be stored
+    // when the {@link BibEntry} is changed.
     // See also ADR-38.
-    private final TreeMap<BibEntry, ChatHistoryManagementRecord> bibEntriesChatHistory = new TreeMap<>(Comparator.comparing(BibEntry::getId));
+    private final TreeMap<BibEntry, ChatHistoryManagementRecord> bibEntriesChatHistory =
+            new TreeMap<>(Comparator.comparing(BibEntry::getId));
 
     // We use {@link TreeMap} for group chat history for the same reason as for {@link BibEntry}ies.
-    private final TreeMap<GroupTreeNode, ChatHistoryManagementRecord> groupsChatHistory = new TreeMap<>((o1, o2) -> {
-        // The most important thing is to catch equality/non-equality.
-        // For "less" or "bigger" comparison, we will fall back to group names.
-        return o1 == o2 ? 0 : o1.getGroup().getName().compareTo(o2.getGroup().getName());
-    });
-
-    public ChatHistoryService(CitationKeyPatternPreferences citationKeyPatternPreferences, NotificationService notificationService) {
+    private final TreeMap<GroupTreeNode, ChatHistoryManagementRecord> groupsChatHistory =
+            new TreeMap<>(
+                    (o1, o2) -> {
+                        // The most important thing is to catch equality/non-equality.
+                        // For "less" or "bigger" comparison, we will fall back to group names.
+                        return o1 == o2
+                                ? 0
+                                : o1.getGroup().getName().compareTo(o2.getGroup().getName());
+                    });
+
+    public ChatHistoryService(
+            CitationKeyPatternPreferences citationKeyPatternPreferences,
+            NotificationService notificationService) {
         this.citationKeyPatternPreferences = citationKeyPatternPreferences;
-        this.implementation = new MVStoreChatHistoryStorage(Directories.getAiFilesDirectory().resolve(CHAT_HISTORY_FILE_NAME), notificationService);
+        this.implementation =
+                new MVStoreChatHistoryStorage(
+                        Directories.getAiFilesDirectory().resolve(CHAT_HISTORY_FILE_NAME),
+                        notificationService);
         configureHistoryTransfer();
     }
 
-    public ChatHistoryService(CitationKeyPatternPreferences citationKeyPatternPreferences,
-                              ChatHistoryStorage implementation) {
+    public ChatHistoryService(
+            CitationKeyPatternPreferences citationKeyPatternPreferences,
+            ChatHistoryStorage implementation) {
         this.citationKeyPatternPreferences = citationKeyPatternPreferences;
         this.implementation = implementation;
 
@@ -94,52 +110,98 @@ public ChatHistoryService(CitationKeyPatternPreferences citationKeyPatternPrefer
     }
 
     private void configureHistoryTransfer() {
-        stateManager.getOpenDatabases().addListener((ListChangeListener<BibDatabaseContext>) change -> {
-            while (change.next()) {
-                if (change.wasAdded()) {
-                    change.getAddedSubList().forEach(this::configureHistoryTransfer);
-                }
-            }
-        });
+        stateManager
+                .getOpenDatabases()
+                .addListener(
+                        (ListChangeListener<BibDatabaseContext>)
+                                change -> {
+                                    while (change.next()) {
+                                        if (change.wasAdded()) {
+                                            change.getAddedSubList()
+                                                    .forEach(this::configureHistoryTransfer);
+                                        }
+                                    }
+                                });
     }
 
     private void configureHistoryTransfer(BibDatabaseContext bibDatabaseContext) {
-        bibDatabaseContext.getMetaData().getGroups().ifPresent(rootGroupTreeNode -> {
-            rootGroupTreeNode.iterateOverTree().forEach(groupNode -> {
-                groupNode.getGroup().nameProperty().addListener((observable, oldValue, newValue) -> {
-                    if (newValue != null && oldValue != null) {
-                        transferGroupHistory(bibDatabaseContext, groupNode, oldValue, newValue);
-                    }
-                });
-
-                groupNode.getGroupProperty().addListener((obs, oldValue, newValue) -> {
-                    if (oldValue != null && newValue != null) {
-                        transferGroupHistory(bibDatabaseContext, groupNode, oldValue.getName(), newValue.getName());
-                    }
-                });
-            });
-        });
-
-        bibDatabaseContext.getDatabase().getEntries().forEach(entry -> {
-            entry.registerListener(new CitationKeyChangeListener(bibDatabaseContext));
-        });
+        bibDatabaseContext
+                .getMetaData()
+                .getGroups()
+                .ifPresent(
+                        rootGroupTreeNode -> {
+                            rootGroupTreeNode
+                                    .iterateOverTree()
+                                    .forEach(
+                                            groupNode -> {
+                                                groupNode
+                                                        .getGroup()
+                                                        .nameProperty()
+                                                        .addListener(
+                                                                (observable,
+                                                                        oldValue,
+                                                                        newValue) -> {
+                                                                    if (newValue != null
+                                                                            && oldValue != null) {
+                                                                        transferGroupHistory(
+                                                                                bibDatabaseContext,
+                                                                                groupNode,
+                                                                                oldValue,
+                                                                                newValue);
+                                                                    }
+                                                                });
+
+                                                groupNode
+                                                        .getGroupProperty()
+                                                        .addListener(
+                                                                (obs, oldValue, newValue) -> {
+                                                                    if (oldValue != null
+                                                                            && newValue != null) {
+                                                                        transferGroupHistory(
+                                                                                bibDatabaseContext,
+                                                                                groupNode,
+                                                                                oldValue.getName(),
+                                                                                newValue.getName());
+                                                                    }
+                                                                });
+                                            });
+                        });
+
+        bibDatabaseContext
+                .getDatabase()
+                .getEntries()
+                .forEach(
+                        entry -> {
+                            entry.registerListener(
+                                    new CitationKeyChangeListener(bibDatabaseContext));
+                        });
     }
 
     public ObservableList<ChatMessage> getChatHistoryForEntry(BibEntry entry) {
-        return bibEntriesChatHistory.computeIfAbsent(entry, entryArg -> {
-            Optional<BibDatabaseContext> bibDatabaseContext = findBibDatabaseForEntry(entry);
-
-            ObservableList<ChatMessage> chatHistory;
-
-            if (bibDatabaseContext.isEmpty() || entry.getCitationKey().isEmpty() || !correctCitationKey(bibDatabaseContext.get(), entry) || bibDatabaseContext.get().getDatabasePath().isEmpty()) {
-                chatHistory = FXCollections.observableArrayList();
-            } else {
-                List<ChatMessage> chatMessagesList = implementation.loadMessagesForEntry(bibDatabaseContext.get().getDatabasePath().get(), entry.getCitationKey().get());
-                chatHistory = FXCollections.observableArrayList(chatMessagesList);
-            }
-
-            return new ChatHistoryManagementRecord(bibDatabaseContext, chatHistory);
-        }).chatHistory;
+        return bibEntriesChatHistory.computeIfAbsent(
+                        entry,
+                        entryArg -> {
+                            Optional<BibDatabaseContext> bibDatabaseContext =
+                                    findBibDatabaseForEntry(entry);
+
+                            ObservableList<ChatMessage> chatHistory;
+
+                            if (bibDatabaseContext.isEmpty()
+                                    || entry.getCitationKey().isEmpty()
+                                    || !correctCitationKey(bibDatabaseContext.get(), entry)
+                                    || bibDatabaseContext.get().getDatabasePath().isEmpty()) {
+                                chatHistory = FXCollections.observableArrayList();
+                            } else {
+                                List<ChatMessage> chatMessagesList =
+                                        implementation.loadMessagesForEntry(
+                                                bibDatabaseContext.get().getDatabasePath().get(),
+                                                entry.getCitationKey().get());
+                                chatHistory = FXCollections.observableArrayList(chatMessagesList);
+                            }
+
+                            return new ChatHistoryManagementRecord(bibDatabaseContext, chatHistory);
+                        })
+                .chatHistory;
     }
 
     /**
@@ -157,16 +219,20 @@ public void closeChatHistoryForEntry(BibEntry entry) {
             return;
         }
 
-        Optional<BibDatabaseContext> bibDatabaseContext = chatHistoryManagementRecord.bibDatabaseContext();
+        Optional<BibDatabaseContext> bibDatabaseContext =
+                chatHistoryManagementRecord.bibDatabaseContext();
 
-        if (bibDatabaseContext.isPresent() && entry.getCitationKey().isPresent() && correctCitationKey(bibDatabaseContext.get(), entry) && bibDatabaseContext.get().getDatabasePath().isPresent()) {
-            // Method `correctCitationKey` will already check `entry.getCitationKey().isPresent()`, but it is still
+        if (bibDatabaseContext.isPresent()
+                && entry.getCitationKey().isPresent()
+                && correctCitationKey(bibDatabaseContext.get(), entry)
+                && bibDatabaseContext.get().getDatabasePath().isPresent()) {
+            // Method `correctCitationKey` will already check `entry.getCitationKey().isPresent()`,
+            // but it is still
             // there, to suppress warning from IntelliJ IDEA on `entry.getCitationKey().get()`.
             implementation.storeMessagesForEntry(
                     bibDatabaseContext.get().getDatabasePath().get(),
                     entry.getCitationKey().get(),
-                    chatHistoryManagementRecord.chatHistory()
-            );
+                    chatHistoryManagementRecord.chatHistory());
         }
 
         // TODO: What if there is two AI chats for the same entry? And one is closed and one is not?
@@ -174,24 +240,29 @@ public void closeChatHistoryForEntry(BibEntry entry) {
     }
 
     public ObservableList<ChatMessage> getChatHistoryForGroup(GroupTreeNode group) {
-        return groupsChatHistory.computeIfAbsent(group, groupArg -> {
-            Optional<BibDatabaseContext> bibDatabaseContext = findBibDatabaseForGroup(group);
-
-            ObservableList<ChatMessage> chatHistory;
-
-            if (bibDatabaseContext.isEmpty() || bibDatabaseContext.get().getDatabasePath().isEmpty()) {
-                chatHistory = FXCollections.observableArrayList();
-            } else {
-                List<ChatMessage> chatMessagesList = implementation.loadMessagesForGroup(
-                        bibDatabaseContext.get().getDatabasePath().get(),
-                        group.getGroup().getName()
-                );
-
-                chatHistory = FXCollections.observableArrayList(chatMessagesList);
-            }
-
-            return new ChatHistoryManagementRecord(bibDatabaseContext, chatHistory);
-        }).chatHistory;
+        return groupsChatHistory.computeIfAbsent(
+                        group,
+                        groupArg -> {
+                            Optional<BibDatabaseContext> bibDatabaseContext =
+                                    findBibDatabaseForGroup(group);
+
+                            ObservableList<ChatMessage> chatHistory;
+
+                            if (bibDatabaseContext.isEmpty()
+                                    || bibDatabaseContext.get().getDatabasePath().isEmpty()) {
+                                chatHistory = FXCollections.observableArrayList();
+                            } else {
+                                List<ChatMessage> chatMessagesList =
+                                        implementation.loadMessagesForGroup(
+                                                bibDatabaseContext.get().getDatabasePath().get(),
+                                                group.getGroup().getName());
+
+                                chatHistory = FXCollections.observableArrayList(chatMessagesList);
+                            }
+
+                            return new ChatHistoryManagementRecord(bibDatabaseContext, chatHistory);
+                        })
+                .chatHistory;
     }
 
     /**
@@ -209,14 +280,15 @@ public void closeChatHistoryForGroup(GroupTreeNode group) {
             return;
         }
 
-        Optional<BibDatabaseContext> bibDatabaseContext = chatHistoryManagementRecord.bibDatabaseContext();
+        Optional<BibDatabaseContext> bibDatabaseContext =
+                chatHistoryManagementRecord.bibDatabaseContext();
 
-        if (bibDatabaseContext.isPresent() && bibDatabaseContext.get().getDatabasePath().isPresent()) {
+        if (bibDatabaseContext.isPresent()
+                && bibDatabaseContext.get().getDatabasePath().isPresent()) {
             implementation.storeMessagesForGroup(
                     bibDatabaseContext.get().getDatabasePath().get(),
                     group.getGroup().getName(),
-                    chatHistoryManagementRecord.chatHistory()
-            );
+                    chatHistoryManagementRecord.chatHistory());
         }
 
         // TODO: What if there is two AI chats for the same entry? And one is closed and one is not?
@@ -231,33 +303,38 @@ private boolean correctCitationKey(BibDatabaseContext bibDatabaseContext, BibEnt
         return CitationKeyCheck.citationKeyIsPresentAndUnique(bibDatabaseContext, bibEntry);
     }
 
-    private void tryToGenerateCitationKey(BibDatabaseContext bibDatabaseContext, BibEntry bibEntry) {
-        new CitationKeyGenerator(bibDatabaseContext, citationKeyPatternPreferences).generateAndSetKey(bibEntry);
+    private void tryToGenerateCitationKey(
+            BibDatabaseContext bibDatabaseContext, BibEntry bibEntry) {
+        new CitationKeyGenerator(bibDatabaseContext, citationKeyPatternPreferences)
+                .generateAndSetKey(bibEntry);
     }
 
     private Optional<BibDatabaseContext> findBibDatabaseForEntry(BibEntry entry) {
-        return stateManager
-                .getOpenDatabases()
-                .stream()
+        return stateManager.getOpenDatabases().stream()
                 .filter(dbContext -> dbContext.getDatabase().getEntries().contains(entry))
                 .findFirst();
     }
 
     private Optional<BibDatabaseContext> findBibDatabaseForGroup(GroupTreeNode group) {
-        return stateManager
-                .getOpenDatabases()
-                .stream()
-                .filter(dbContext ->
-                        dbContext.getMetaData().groupsBinding().get().map(groupTreeNode ->
-                                groupTreeNode.containsGroup(group.getGroup())
-                        ).orElse(false)
-                )
+        return stateManager.getOpenDatabases().stream()
+                .filter(
+                        dbContext ->
+                                dbContext
+                                        .getMetaData()
+                                        .groupsBinding()
+                                        .get()
+                                        .map(
+                                                groupTreeNode ->
+                                                        groupTreeNode.containsGroup(
+                                                                group.getGroup()))
+                                        .orElse(false))
                 .findFirst();
     }
 
     @Override
     public void close() {
-        // We need to clone `bibEntriesChatHistory.keySet()` because closeChatHistoryForEntry() modifies the `bibEntriesChatHistory` map.
+        // We need to clone `bibEntriesChatHistory.keySet()` because closeChatHistoryForEntry()
+        // modifies the `bibEntriesChatHistory` map.
         new HashSet<>(bibEntriesChatHistory.keySet()).forEach(this::closeChatHistoryForEntry);
 
         // Clone is for the same reason, as written above.
@@ -266,30 +343,60 @@ public void close() {
         implementation.commit();
     }
 
-    private void transferGroupHistory(BibDatabaseContext bibDatabaseContext, GroupTreeNode groupTreeNode, String oldName, String newName) {
+    private void transferGroupHistory(
+            BibDatabaseContext bibDatabaseContext,
+            GroupTreeNode groupTreeNode,
+            String oldName,
+            String newName) {
         if (bibDatabaseContext.getDatabasePath().isEmpty()) {
-            LOGGER.warn("Could not transfer chat history of group {} (old name: {}): database path is empty.", newName, oldName);
+            LOGGER.warn(
+                    "Could not transfer chat history of group {} (old name: {}): database path is empty.",
+                    newName,
+                    oldName);
             return;
         }
 
-        List<ChatMessage> chatMessages = groupsChatHistory.computeIfAbsent(groupTreeNode,
-                e -> new ChatHistoryManagementRecord(Optional.of(bibDatabaseContext), FXCollections.observableArrayList())).chatHistory;
-        implementation.storeMessagesForGroup(bibDatabaseContext.getDatabasePath().get(), oldName, List.of());
-        implementation.storeMessagesForGroup(bibDatabaseContext.getDatabasePath().get(), newName, chatMessages);
+        List<ChatMessage> chatMessages =
+                groupsChatHistory.computeIfAbsent(
+                                groupTreeNode,
+                                e ->
+                                        new ChatHistoryManagementRecord(
+                                                Optional.of(bibDatabaseContext),
+                                                FXCollections.observableArrayList()))
+                        .chatHistory;
+        implementation.storeMessagesForGroup(
+                bibDatabaseContext.getDatabasePath().get(), oldName, List.of());
+        implementation.storeMessagesForGroup(
+                bibDatabaseContext.getDatabasePath().get(), newName, chatMessages);
     }
 
-    private void transferEntryHistory(BibDatabaseContext bibDatabaseContext, BibEntry entry, String oldCitationKey, String newCitationKey) {
+    private void transferEntryHistory(
+            BibDatabaseContext bibDatabaseContext,
+            BibEntry entry,
+            String oldCitationKey,
+            String newCitationKey) {
         // TODO: This method does not check if the citation key is valid.
 
         if (bibDatabaseContext.getDatabasePath().isEmpty()) {
-            LOGGER.warn("Could not transfer chat history of entry {} (old key: {}): database path is empty.", newCitationKey, oldCitationKey);
+            LOGGER.warn(
+                    "Could not transfer chat history of entry {} (old key: {}): database path is empty.",
+                    newCitationKey,
+                    oldCitationKey);
             return;
         }
 
-        List<ChatMessage> chatMessages = bibEntriesChatHistory.computeIfAbsent(entry,
-                e -> new ChatHistoryManagementRecord(Optional.of(bibDatabaseContext), FXCollections.observableArrayList())).chatHistory;
-        implementation.storeMessagesForGroup(bibDatabaseContext.getDatabasePath().get(), oldCitationKey, List.of());
-        implementation.storeMessagesForEntry(bibDatabaseContext.getDatabasePath().get(), newCitationKey, chatMessages);
+        List<ChatMessage> chatMessages =
+                bibEntriesChatHistory.computeIfAbsent(
+                                entry,
+                                e ->
+                                        new ChatHistoryManagementRecord(
+                                                Optional.of(bibDatabaseContext),
+                                                FXCollections.observableArrayList()))
+                        .chatHistory;
+        implementation.storeMessagesForGroup(
+                bibDatabaseContext.getDatabasePath().get(), oldCitationKey, List.of());
+        implementation.storeMessagesForEntry(
+                bibDatabaseContext.getDatabasePath().get(), newCitationKey, chatMessages);
     }
 
     private class CitationKeyChangeListener {
@@ -305,7 +412,8 @@ void listen(FieldChangedEvent e) {
                 return;
             }
 
-            transferEntryHistory(bibDatabaseContext, e.getBibEntry(), e.getOldValue(), e.getNewValue());
+            transferEntryHistory(
+                    bibDatabaseContext, e.getBibEntry(), e.getOldValue(), e.getNewValue());
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.java b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.java
index 25e52d294e42..ddf4e33a9950 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.java
@@ -1,9 +1,10 @@
 package org.jabref.gui.ai.components.aichat;
 
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Stream;
+import com.airhacks.afterburner.views.ViewLoader;
+
+import dev.langchain4j.data.message.AiMessage;
+import dev.langchain4j.data.message.ChatMessage;
+import dev.langchain4j.data.message.UserMessage;
 
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
@@ -14,6 +15,7 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 
+import org.controlsfx.control.PopOver;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.ai.components.aichat.chathistory.ChatHistoryComponent;
 import org.jabref.gui.ai.components.aichat.chatprompt.ChatPromptComponent;
@@ -34,15 +36,14 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.ListUtil;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import dev.langchain4j.data.message.AiMessage;
-import dev.langchain4j.data.message.ChatMessage;
-import dev.langchain4j.data.message.UserMessage;
-import org.controlsfx.control.PopOver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
 public class AiChatComponent extends VBox {
     private static final Logger LOGGER = LoggerFactory.getLogger(AiChatComponent.class);
 
@@ -63,15 +64,15 @@ public class AiChatComponent extends VBox {
     @FXML private ChatPromptComponent chatPrompt;
     @FXML private Label noticeText;
 
-    public AiChatComponent(AiService aiService,
-                           StringProperty name,
-                           ObservableList<ChatMessage> chatHistory,
-                           ObservableList<BibEntry> entries,
-                           BibDatabaseContext bibDatabaseContext,
-                           AiPreferences aiPreferences,
-                           DialogService dialogService,
-                           TaskExecutor taskExecutor
-    ) {
+    public AiChatComponent(
+            AiService aiService,
+            StringProperty name,
+            ObservableList<ChatMessage> chatHistory,
+            ObservableList<BibEntry> entries,
+            BibDatabaseContext bibDatabaseContext,
+            AiPreferences aiPreferences,
+            DialogService dialogService,
+            TaskExecutor taskExecutor) {
         this.aiService = aiService;
         this.entries = entries;
         this.bibDatabaseContext = bibDatabaseContext;
@@ -79,13 +80,16 @@ public AiChatComponent(AiService aiService,
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
 
-        this.aiChatLogic = aiService.getAiChatService().makeChat(name, chatHistory, entries, bibDatabaseContext);
+        this.aiChatLogic =
+                aiService
+                        .getAiChatService()
+                        .makeChat(name, chatHistory, entries, bibDatabaseContext);
 
-        aiService.getIngestionService().ingest(name, ListUtil.getLinkedFiles(entries).toList(), bibDatabaseContext);
+        aiService
+                .getIngestionService()
+                .ingest(name, ListUtil.getLinkedFiles(entries).toList(), bibDatabaseContext);
 
-        ViewLoader.view(this)
-                .root(this)
-                .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @FXML
@@ -97,36 +101,48 @@ public void initialize() {
     }
 
     private void initializeNotifications() {
-        ListUtil.getLinkedFiles(entries).forEach(file ->
-                aiService.getIngestionService().ingest(file, bibDatabaseContext).stateProperty().addListener(obs -> updateNotifications()));
+        ListUtil.getLinkedFiles(entries)
+                .forEach(
+                        file ->
+                                aiService
+                                        .getIngestionService()
+                                        .ingest(file, bibDatabaseContext)
+                                        .stateProperty()
+                                        .addListener(obs -> updateNotifications()));
 
         updateNotifications();
     }
 
     private void initializeNotice() {
-        String newNotice = noticeText
-                .getText()
-                .replaceAll("%0", aiPreferences.getAiProvider().getLabel() + " " + aiPreferences.getSelectedChatModel());
+        String newNotice =
+                noticeText
+                        .getText()
+                        .replaceAll(
+                                "%0",
+                                aiPreferences.getAiProvider().getLabel()
+                                        + " "
+                                        + aiPreferences.getSelectedChatModel());
 
         noticeText.setText(newNotice);
     }
 
     private void initializeChatPrompt() {
-        notificationsButton.setOnAction(event ->
-                new PopOver(new NotificationsComponent(notifications))
-                        .show(notificationsButton)
-        );
+        notificationsButton.setOnAction(
+                event ->
+                        new PopOver(new NotificationsComponent(notifications))
+                                .show(notificationsButton));
 
         chatPrompt.setSendCallback(this::onSendMessage);
 
         chatPrompt.setCancelCallback(() -> chatPrompt.switchToNormalState());
 
-        chatPrompt.setRetryCallback(userMessage -> {
-            deleteLastMessage();
-            deleteLastMessage();
-            chatPrompt.switchToNormalState();
-            onSendMessage(userMessage);
-        });
+        chatPrompt.setRetryCallback(
+                userMessage -> {
+                    deleteLastMessage();
+                    deleteLastMessage();
+                    chatPrompt.switchToNormalState();
+                    onSendMessage(userMessage);
+                });
 
         chatPrompt.requestPromptFocus();
 
@@ -135,13 +151,22 @@ private void initializeChatPrompt() {
 
     private void updateNotifications() {
         notifications.clear();
-        notifications.addAll(entries.stream().map(this::updateNotificationsForEntry).flatMap(List::stream).toList());
+        notifications.addAll(
+                entries.stream()
+                        .map(this::updateNotificationsForEntry)
+                        .flatMap(List::stream)
+                        .toList());
 
         notificationsButton.setVisible(!notifications.isEmpty());
         notificationsButton.setManaged(!notifications.isEmpty());
 
         if (!notifications.isEmpty()) {
-            UiTaskExecutor.runInJavaFXThread(() -> notificationsButton.setGraphic(IconTheme.JabRefIcons.WARNING.withColor(Color.YELLOW).getGraphicNode()));
+            UiTaskExecutor.runInJavaFXThread(
+                    () ->
+                            notificationsButton.setGraphic(
+                                    IconTheme.JabRefIcons.WARNING
+                                            .withColor(Color.YELLOW)
+                                            .getGraphicNode()));
         }
     }
 
@@ -150,46 +175,73 @@ private List<Notification> updateNotificationsForEntry(BibEntry entry) {
 
         if (entries.size() == 1) {
             if (entry.getCitationKey().isEmpty()) {
-                notifications.add(new Notification(
-                        Localization.lang("No citation key for %0", entry.getAuthorTitleYear()),
-                        Localization.lang("The chat history will not be stored in next sessions")
-                ));
+                notifications.add(
+                        new Notification(
+                                Localization.lang(
+                                        "No citation key for %0", entry.getAuthorTitleYear()),
+                                Localization.lang(
+                                        "The chat history will not be stored in next sessions")));
             } else if (!CitationKeyCheck.citationKeyIsPresentAndUnique(bibDatabaseContext, entry)) {
-                notifications.add(new Notification(
-                        Localization.lang("Invalid citation key for %0 (%1)", entry.getCitationKey().get(), entry.getAuthorTitleYear()),
-                        Localization.lang("The chat history will not be stored in next sessions")
-                ));
+                notifications.add(
+                        new Notification(
+                                Localization.lang(
+                                        "Invalid citation key for %0 (%1)",
+                                        entry.getCitationKey().get(), entry.getAuthorTitleYear()),
+                                Localization.lang(
+                                        "The chat history will not be stored in next sessions")));
             }
         }
 
-        entry.getFiles().forEach(file -> {
-            if (!FileUtil.isPDFFile(Path.of(file.getLink()))) {
-                notifications.add(new Notification(
-                        Localization.lang("File %0 is not a PDF file", file.getLink()),
-                        Localization.lang("Only PDF files can be used for chatting")
-                ));
-            }
-        });
-
-        entry.getFiles().stream().map(file -> aiService.getIngestionService().ingest(file, bibDatabaseContext)).forEach(ingestionStatus -> {
-            switch (ingestionStatus.getState()) {
-                case PROCESSING -> notifications.add(new Notification(
-                    Localization.lang("File %0 is currently being processed", ingestionStatus.getObject().getLink()),
-                    Localization.lang("After the file will be ingested, you will be able to chat with it.")
-                ));
-
-                case ERROR -> {
-                    assert ingestionStatus.getException().isPresent(); // When the state is ERROR, the exception must be present.
-
-                    notifications.add(new Notification(
-                            Localization.lang("File %0 could not be ingested", ingestionStatus.getObject().getLink()),
-                            ingestionStatus.getException().get().getLocalizedMessage()
-                    ));
-                }
+        entry.getFiles()
+                .forEach(
+                        file -> {
+                            if (!FileUtil.isPDFFile(Path.of(file.getLink()))) {
+                                notifications.add(
+                                        new Notification(
+                                                Localization.lang(
+                                                        "File %0 is not a PDF file",
+                                                        file.getLink()),
+                                                Localization.lang(
+                                                        "Only PDF files can be used for chatting")));
+                            }
+                        });
 
-                case SUCCESS -> { }
-            }
-        });
+        entry.getFiles().stream()
+                .map(file -> aiService.getIngestionService().ingest(file, bibDatabaseContext))
+                .forEach(
+                        ingestionStatus -> {
+                            switch (ingestionStatus.getState()) {
+                                case PROCESSING ->
+                                        notifications.add(
+                                                new Notification(
+                                                        Localization.lang(
+                                                                "File %0 is currently being processed",
+                                                                ingestionStatus
+                                                                        .getObject()
+                                                                        .getLink()),
+                                                        Localization.lang(
+                                                                "After the file will be ingested, you will be able to chat with it.")));
+
+                                case ERROR -> {
+                                    assert ingestionStatus
+                                            .getException()
+                                            .isPresent(); // When the state is ERROR, the exception
+                                                          // must be present.
+
+                                    notifications.add(
+                                            new Notification(
+                                                    Localization.lang(
+                                                            "File %0 could not be ingested",
+                                                            ingestionStatus.getObject().getLink()),
+                                                    ingestionStatus
+                                                            .getException()
+                                                            .get()
+                                                            .getLocalizedMessage()));
+                                }
+
+                                case SUCCESS -> {}
+                            }
+                        });
 
         return notifications;
     }
@@ -200,27 +252,33 @@ private void onSendMessage(String userPrompt) {
         setLoading(true);
 
         BackgroundTask<AiMessage> task =
-                BackgroundTask
-                        .wrap(() -> aiChatLogic.execute(userMessage))
+                BackgroundTask.wrap(() -> aiChatLogic.execute(userMessage))
                         .showToUser(true)
-                        .onSuccess(aiMessage -> {
-                            setLoading(false);
-                            chatPrompt.requestPromptFocus();
-                        })
-                        .onFailure(e -> {
-                            LOGGER.error("Got an error while sending a message to AI", e);
-                            setLoading(false);
-
-                            // Typically, if user has entered an invalid API base URL, we get either "401 - null" or "404 - null" strings.
-                            // Since there might be other strings returned from other API endpoints, we use startsWith() here.
-                            if (e.getMessage().startsWith("404") || e.getMessage().startsWith("401")) {
-                                addError(Localization.lang("API base URL setting appears to be incorrect. Please check it in AI expert settings."));
-                            } else {
-                                addError(e.getMessage());
-                            }
-
-                            chatPrompt.switchToErrorState(userPrompt);
-                        });
+                        .onSuccess(
+                                aiMessage -> {
+                                    setLoading(false);
+                                    chatPrompt.requestPromptFocus();
+                                })
+                        .onFailure(
+                                e -> {
+                                    LOGGER.error("Got an error while sending a message to AI", e);
+                                    setLoading(false);
+
+                                    // Typically, if user has entered an invalid API base URL, we
+                                    // get either "401 - null" or "404 - null" strings.
+                                    // Since there might be other strings returned from other API
+                                    // endpoints, we use startsWith() here.
+                                    if (e.getMessage().startsWith("404")
+                                            || e.getMessage().startsWith("401")) {
+                                        addError(
+                                                Localization.lang(
+                                                        "API base URL setting appears to be incorrect. Please check it in AI expert settings."));
+                                    } else {
+                                        addError(e.getMessage());
+                                    }
+
+                                    chatPrompt.switchToErrorState(userPrompt);
+                                });
 
         task.titleProperty().set(Localization.lang("Waiting for AI reply..."));
 
@@ -234,14 +292,13 @@ private void addError(String error) {
 
     private void updatePromptHistory() {
         chatPrompt.getHistory().clear();
-        chatPrompt.getHistory().addAll(getReversedUserMessagesStream().map(UserMessage::singleText).toList());
+        chatPrompt
+                .getHistory()
+                .addAll(getReversedUserMessagesStream().map(UserMessage::singleText).toList());
     }
 
     private Stream<UserMessage> getReversedUserMessagesStream() {
-        return aiChatLogic
-                .getChatHistory()
-                .reversed()
-                .stream()
+        return aiChatLogic.getChatHistory().reversed().stream()
                 .filter(message -> message instanceof UserMessage)
                 .map(UserMessage.class::cast);
     }
@@ -253,10 +310,11 @@ private void setLoading(boolean loading) {
 
     @FXML
     private void onClearChatHistory() {
-        boolean agreed = dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Clear chat history"),
-                Localization.lang("Are you sure you want to clear the chat history of this entry?")
-        );
+        boolean agreed =
+                dialogService.showConfirmationDialogAndWait(
+                        Localization.lang("Clear chat history"),
+                        Localization.lang(
+                                "Are you sure you want to clear the chat history of this entry?"));
 
         if (agreed) {
             aiChatLogic.getChatHistory().clear();
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatGuardedComponent.java b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatGuardedComponent.java
index c8f48ecb1500..30630fb8a753 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatGuardedComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatGuardedComponent.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.ai.components.aichat;
 
+import dev.langchain4j.data.message.ChatMessage;
+
 import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
 import javafx.scene.Node;
@@ -13,8 +15,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import dev.langchain4j.data.message.ChatMessage;
-
 /**
  * Main class for AI chatting. It checks if the AI features are enabled and if the embedding model is properly set up.
  */
@@ -22,7 +22,8 @@ public class AiChatGuardedComponent extends EmbeddingModelGuardedComponent {
     /// This field is used for two purposes:
     /// 1. Logging
     /// 2. Title of group chat window
-    /// Thus, if you use {@link AiChatGuardedComponent} for one entry in {@link EntryEditor}, then you may not localize
+    /// Thus, if you use {@link AiChatGuardedComponent} for one entry in {@link EntryEditor}, then
+    // you may not localize
     /// this parameter. However, for group chat window, you should.
     private final StringProperty name;
 
@@ -34,16 +35,16 @@ public class AiChatGuardedComponent extends EmbeddingModelGuardedComponent {
     private final AiPreferences aiPreferences;
     private final TaskExecutor taskExecutor;
 
-    public AiChatGuardedComponent(StringProperty name,
-                                  ObservableList<ChatMessage> chatHistory,
-                                  BibDatabaseContext bibDatabaseContext,
-                                  ObservableList<BibEntry> entries,
-                                  AiService aiService,
-                                  DialogService dialogService,
-                                  AiPreferences aiPreferences,
-                                  ExternalApplicationsPreferences externalApplicationsPreferences,
-                                  TaskExecutor taskExecutor
-    ) {
+    public AiChatGuardedComponent(
+            StringProperty name,
+            ObservableList<ChatMessage> chatHistory,
+            BibDatabaseContext bibDatabaseContext,
+            ObservableList<BibEntry> entries,
+            AiService aiService,
+            DialogService dialogService,
+            AiPreferences aiPreferences,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            TaskExecutor taskExecutor) {
         super(aiService, aiPreferences, externalApplicationsPreferences, dialogService);
 
         this.name = name;
@@ -68,7 +69,6 @@ protected Node showEmbeddingModelGuardedContent() {
                 bibDatabaseContext,
                 aiPreferences,
                 dialogService,
-                taskExecutor
-        );
+                taskExecutor);
     }
 }
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatWindow.java b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatWindow.java
index 7e4dcd8b3e1e..d476e8e0759a 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatWindow.java
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatWindow.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.ai.components.aichat;
 
+import dev.langchain4j.data.message.ChatMessage;
+
 import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
 import javafx.scene.Scene;
@@ -14,8 +16,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import dev.langchain4j.data.message.ChatMessage;
-
 public class AiChatWindow extends BaseWindow {
     private final AiService aiService;
     private final DialogService dialogService;
@@ -23,15 +23,16 @@ public class AiChatWindow extends BaseWindow {
     private final ExternalApplicationsPreferences externalApplicationsPreferences;
     private final TaskExecutor taskExecutor;
 
-    // This field is used for finding an existing AI chat window when user wants to chat with the same group again.
+    // This field is used for finding an existing AI chat window when user wants to chat with the
+    // same group again.
     private String chatName;
 
-    public AiChatWindow(AiService aiService,
-                        DialogService dialogService,
-                        AiPreferences aiPreferences,
-                        ExternalApplicationsPreferences externalApplicationsPreferences,
-                        TaskExecutor taskExecutor
-    ) {
+    public AiChatWindow(
+            AiService aiService,
+            DialogService dialogService,
+            AiPreferences aiPreferences,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            TaskExecutor taskExecutor) {
         this.aiService = aiService;
         this.dialogService = dialogService;
         this.aiPreferences = aiPreferences;
@@ -39,7 +40,11 @@ public AiChatWindow(AiService aiService,
         this.taskExecutor = taskExecutor;
     }
 
-    public void setChat(StringProperty name, ObservableList<ChatMessage> chatHistory, BibDatabaseContext bibDatabaseContext, ObservableList<BibEntry> entries) {
+    public void setChat(
+            StringProperty name,
+            ObservableList<ChatMessage> chatHistory,
+            BibDatabaseContext bibDatabaseContext,
+            ObservableList<BibEntry> entries) {
         setTitle(Localization.lang("AI chat with %0", name.getValue()));
         chatName = name.getValue();
         setScene(
@@ -53,12 +58,9 @@ public void setChat(StringProperty name, ObservableList<ChatMessage> chatHistory
                                 dialogService,
                                 aiPreferences,
                                 externalApplicationsPreferences,
-                                taskExecutor
-                        ),
+                                taskExecutor),
                         800,
-                        600
-                )
-        );
+                        600));
     }
 
     public String getChatName() {
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/chathistory/ChatHistoryComponent.java b/src/main/java/org/jabref/gui/ai/components/aichat/chathistory/ChatHistoryComponent.java
index c99e125b8e7f..00014b0be57c 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/chathistory/ChatHistoryComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/chathistory/ChatHistoryComponent.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.ai.components.aichat.chathistory;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import dev.langchain4j.data.message.ChatMessage;
+
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -9,22 +13,19 @@
 import org.jabref.gui.ai.components.aichat.chatmessage.ChatMessageComponent;
 import org.jabref.gui.util.UiTaskExecutor;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import dev.langchain4j.data.message.ChatMessage;
-
 public class ChatHistoryComponent extends ScrollPane {
     @FXML private VBox vBox;
 
     public ChatHistoryComponent() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-
-        this.needsLayoutProperty().addListener((obs, oldValue, newValue) -> {
-            if (newValue) {
-                scrollDown();
-            }
-        });
+        ViewLoader.view(this).root(this).load();
+
+        this.needsLayoutProperty()
+                .addListener(
+                        (obs, oldValue, newValue) -> {
+                            if (newValue) {
+                                scrollDown();
+                            }
+                        });
     }
 
     /**
@@ -36,14 +37,23 @@ public void setItems(ObservableList<ChatMessage> items) {
     }
 
     private void fill(ObservableList<ChatMessage> items) {
-        UiTaskExecutor.runInJavaFXThread(() -> {
-            vBox.getChildren().clear();
-            items.forEach(chatMessage ->
-                    vBox.getChildren().add(new ChatMessageComponent(chatMessage, chatMessageComponent -> {
-                        int index = vBox.getChildren().indexOf(chatMessageComponent);
-                        items.remove(index);
-                    })));
-        });
+        UiTaskExecutor.runInJavaFXThread(
+                () -> {
+                    vBox.getChildren().clear();
+                    items.forEach(
+                            chatMessage ->
+                                    vBox.getChildren()
+                                            .add(
+                                                    new ChatMessageComponent(
+                                                            chatMessage,
+                                                            chatMessageComponent -> {
+                                                                int index =
+                                                                        vBox.getChildren()
+                                                                                .indexOf(
+                                                                                        chatMessageComponent);
+                                                                items.remove(index);
+                                                            })));
+                });
     }
 
     public void scrollDown() {
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/chatmessage/ChatMessageComponent.java b/src/main/java/org/jabref/gui/ai/components/aichat/chatmessage/ChatMessageComponent.java
index 511c3d066289..8cd50be8f0e0 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/chatmessage/ChatMessageComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/chatmessage/ChatMessageComponent.java
@@ -1,6 +1,11 @@
 package org.jabref.gui.ai.components.aichat.chatmessage;
 
-import java.util.function.Consumer;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.dlsc.gemsfx.ExpandingTextArea;
+
+import dev.langchain4j.data.message.AiMessage;
+import dev.langchain4j.data.message.ChatMessage;
+import dev.langchain4j.data.message.UserMessage;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -12,20 +17,17 @@
 
 import org.jabref.logic.ai.util.ErrorMessage;
 import org.jabref.logic.l10n.Localization;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import com.dlsc.gemsfx.ExpandingTextArea;
-import dev.langchain4j.data.message.AiMessage;
-import dev.langchain4j.data.message.ChatMessage;
-import dev.langchain4j.data.message.UserMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.function.Consumer;
+
 public class ChatMessageComponent extends HBox {
     private static final Logger LOGGER = LoggerFactory.getLogger(ChatMessageComponent.class);
 
     private final ObjectProperty<ChatMessage> chatMessage = new SimpleObjectProperty<>();
-    private final ObjectProperty<Consumer<ChatMessageComponent>> onDelete = new SimpleObjectProperty<>();
+    private final ObjectProperty<Consumer<ChatMessageComponent>> onDelete =
+            new SimpleObjectProperty<>();
 
     @FXML private HBox wrapperHBox;
     @FXML private VBox vBox;
@@ -34,18 +36,18 @@ public class ChatMessageComponent extends HBox {
     @FXML private VBox buttonsVBox;
 
     public ChatMessageComponent() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-
-        chatMessage.addListener((observable, oldValue, newValue) -> {
-            if (newValue != null) {
-                loadChatMessage();
-            }
-        });
+        ViewLoader.view(this).root(this).load();
+
+        chatMessage.addListener(
+                (observable, oldValue, newValue) -> {
+                    if (newValue != null) {
+                        loadChatMessage();
+                    }
+                });
     }
 
-    public ChatMessageComponent(ChatMessage chatMessage, Consumer<ChatMessageComponent> onDeleteCallback) {
+    public ChatMessageComponent(
+            ChatMessage chatMessage, Consumer<ChatMessageComponent> onDeleteCallback) {
         this();
         setChatMessage(chatMessage);
         setOnDelete(onDeleteCallback);
@@ -87,7 +89,9 @@ private void loadChatMessage() {
             }
 
             default ->
-                LOGGER.error("ChatMessageComponent supports only user, AI, or error messages, but other type was passed: {}", chatMessage.get().type().name());
+                    LOGGER.error(
+                            "ChatMessageComponent supports only user, AI, or error messages, but other type was passed: {}",
+                            chatMessage.get().type().name());
         }
     }
 
@@ -104,6 +108,11 @@ private void onDeleteClick() {
     }
 
     private void setColor(String fillColor, String borderColor) {
-        vBox.setStyle("-fx-background-color: " + fillColor + "; -fx-border-radius: 10; -fx-background-radius: 10; -fx-border-color: " + borderColor + "; -fx-border-width: 3;");
+        vBox.setStyle(
+                "-fx-background-color: "
+                        + fillColor
+                        + "; -fx-border-radius: 10; -fx-background-radius: 10; -fx-border-color: "
+                        + borderColor
+                        + "; -fx-border-width: 3;");
     }
 }
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/chatprompt/ChatPromptComponent.java b/src/main/java/org/jabref/gui/ai/components/aichat/chatprompt/ChatPromptComponent.java
index 8bb590103acd..c69d80b3b026 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/chatprompt/ChatPromptComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/chatprompt/ChatPromptComponent.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.ai.components.aichat.chatprompt;
 
-import java.util.function.Consumer;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.dlsc.gemsfx.ExpandingTextArea;
 
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
@@ -19,8 +20,7 @@
 
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.dlsc.gemsfx.ExpandingTextArea;
+import java.util.function.Consumer;
 
 public class ChatPromptComponent extends HBox {
     // If current message that user is typing in prompt is non-existent, new, or empty, then we use
@@ -31,12 +31,14 @@ public class ChatPromptComponent extends HBox {
     private final ObjectProperty<Consumer<String>> retryCallback = new SimpleObjectProperty<>();
     private final ObjectProperty<Runnable> cancelCallback = new SimpleObjectProperty<>();
 
-    private final ListProperty<String> history = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<String> history =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
 
     // This property stores index of a user history message.
     // When user scrolls history in the prompt, this value is updated.
     // Whenever user edits the prompt, this value is reset to NEW_NON_EXISTENT_MESSAGE.
-    private final IntegerProperty currentUserMessageScroll = new SimpleIntegerProperty(NEW_NON_EXISTENT_MESSAGE);
+    private final IntegerProperty currentUserMessageScroll =
+            new SimpleIntegerProperty(NEW_NON_EXISTENT_MESSAGE);
 
     // If the current content of the prompt is a history message, then this property is true.
     // If user begins to edit or type a new text, then this property is false.
@@ -46,14 +48,13 @@ public class ChatPromptComponent extends HBox {
     @FXML private Button submitButton;
 
     public ChatPromptComponent() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-
-        history.addListener((observable, oldValue, newValue) -> {
-            currentUserMessageScroll.set(NEW_NON_EXISTENT_MESSAGE);
-            showingHistoryMessage.set(false);
-        });
+        ViewLoader.view(this).root(this).load();
+
+        history.addListener(
+                (observable, oldValue, newValue) -> {
+                    currentUserMessageScroll.set(NEW_NON_EXISTENT_MESSAGE);
+                    showingHistoryMessage.set(false);
+                });
     }
 
     public void setSendCallback(Consumer<String> sendCallback) {
@@ -74,73 +75,92 @@ public ListProperty<String> getHistory() {
 
     @FXML
     private void initialize() {
-        userPromptTextArea.setOnKeyPressed(keyEvent -> {
-            if (keyEvent.getCode() == KeyCode.DOWN) {
-                // Do not go down in the history.
-                if (currentUserMessageScroll.get() != NEW_NON_EXISTENT_MESSAGE) {
-                    showingHistoryMessage.set(true);
-                    currentUserMessageScroll.set(currentUserMessageScroll.get() - 1);
-
-                    // There could be two effects after setting the properties:
-                    // 1) User scrolls to a recent message, then we should properly update the prompt text.
-                    // 2) Scroll is set to -1 (which is NEW_NON_EXISTENT_MESSAGE) and we should clear the prompt text.
-                    // On the second event currentUserMessageScroll will be set to -1 and showingHistoryMessage
-                    // will be true (this is important).
-                }
-            } else if (keyEvent.getCode() == KeyCode.UP) {
-                // [impl->req~ai.chat.new-message-based-on-previous~1]
-                if ((currentUserMessageScroll.get() < history.get().size() - 1) && (userPromptTextArea.getText().isEmpty() || showingHistoryMessage.get())) {
-                    // 1. We should not go up the maximum number of user messages.
-                    // 2. We can scroll history only on two conditions:
-                    //    1) The prompt is empty.
-                    //    2) User has already been scrolling the history.
-                    showingHistoryMessage.set(true);
-                    currentUserMessageScroll.set(currentUserMessageScroll.get() + 1);
-                }
-            } else {
-                // Cursor left/right should not stop history scrolling
-                if (keyEvent.getCode() != KeyCode.RIGHT && keyEvent.getCode() != KeyCode.LEFT) {
-                    // It is okay to go back and forth in the prompt while showing a history message.
-                    // But if user begins doing something else, we should not track the history and reset
-                    // all the properties.
-                    showingHistoryMessage.set(false);
-                    currentUserMessageScroll.set(NEW_NON_EXISTENT_MESSAGE);
-                }
-
-                if (keyEvent.getCode() == KeyCode.ENTER) {
-                    if (keyEvent.isControlDown()) {
-                        userPromptTextArea.appendText("\n");
+        userPromptTextArea.setOnKeyPressed(
+                keyEvent -> {
+                    if (keyEvent.getCode() == KeyCode.DOWN) {
+                        // Do not go down in the history.
+                        if (currentUserMessageScroll.get() != NEW_NON_EXISTENT_MESSAGE) {
+                            showingHistoryMessage.set(true);
+                            currentUserMessageScroll.set(currentUserMessageScroll.get() - 1);
+
+                            // There could be two effects after setting the properties:
+                            // 1) User scrolls to a recent message, then we should properly update
+                            // the prompt text.
+                            // 2) Scroll is set to -1 (which is NEW_NON_EXISTENT_MESSAGE) and we
+                            // should clear the prompt text.
+                            // On the second event currentUserMessageScroll will be set to -1 and
+                            // showingHistoryMessage
+                            // will be true (this is important).
+                        }
+                    } else if (keyEvent.getCode() == KeyCode.UP) {
+                        // [impl->req~ai.chat.new-message-based-on-previous~1]
+                        if ((currentUserMessageScroll.get() < history.get().size() - 1)
+                                && (userPromptTextArea.getText().isEmpty()
+                                        || showingHistoryMessage.get())) {
+                            // 1. We should not go up the maximum number of user messages.
+                            // 2. We can scroll history only on two conditions:
+                            //    1) The prompt is empty.
+                            //    2) User has already been scrolling the history.
+                            showingHistoryMessage.set(true);
+                            currentUserMessageScroll.set(currentUserMessageScroll.get() + 1);
+                        }
                     } else {
-                        onSendMessage();
+                        // Cursor left/right should not stop history scrolling
+                        if (keyEvent.getCode() != KeyCode.RIGHT
+                                && keyEvent.getCode() != KeyCode.LEFT) {
+                            // It is okay to go back and forth in the prompt while showing a history
+                            // message.
+                            // But if user begins doing something else, we should not track the
+                            // history and reset
+                            // all the properties.
+                            showingHistoryMessage.set(false);
+                            currentUserMessageScroll.set(NEW_NON_EXISTENT_MESSAGE);
+                        }
+
+                        if (keyEvent.getCode() == KeyCode.ENTER) {
+                            if (keyEvent.isControlDown()) {
+                                userPromptTextArea.appendText("\n");
+                            } else {
+                                onSendMessage();
+                            }
+                        }
                     }
-                }
-            }
-        });
-
-        currentUserMessageScroll.addListener((observable, oldValue, newValue) -> {
-            // When currentUserMessageScroll is reset, then its value is
-            // 1) either to NEW_NON_EXISTENT_MESSAGE,
-            // 2) or to a new history entry.
-            if (newValue.intValue() != NEW_NON_EXISTENT_MESSAGE && showingHistoryMessage.get()) {
-                if (userPromptTextArea.getCaretPosition() == 0 || !userPromptTextArea.getText().contains("\n")) {
-                    // If there are new lines in the prompt, then it is ambiguous whether the user tries to scroll up or down in history or editing lines in the current prompt.
-                    // The easy way to get rid of this ambiguity is to disallow scrolling when there are new lines in the prompt.
-                    // But the exception to this situation is when the caret position is at the beginning of the prompt.
-                    history.get().stream()
-                            .skip(newValue.intValue())
-                            .findFirst()
-                            .ifPresent(message -> userPromptTextArea.setText(message));
-                }
-            } else {
-                // When currentUserMessageScroll is set to NEW_NON_EXISTENT_MESSAGE, then we should:
-                // 1) either clear the prompt, if user scrolls down the most recent history entry.
-                // 2) do nothing, if user starts to edit the history entry.
-                // We distinguish these two cases by checking showingHistoryMessage, which is true for -1 message, and false for others.
-                if (showingHistoryMessage.get()) {
-                    userPromptTextArea.setText("");
-                }
-            }
-        });
+                });
+
+        currentUserMessageScroll.addListener(
+                (observable, oldValue, newValue) -> {
+                    // When currentUserMessageScroll is reset, then its value is
+                    // 1) either to NEW_NON_EXISTENT_MESSAGE,
+                    // 2) or to a new history entry.
+                    if (newValue.intValue() != NEW_NON_EXISTENT_MESSAGE
+                            && showingHistoryMessage.get()) {
+                        if (userPromptTextArea.getCaretPosition() == 0
+                                || !userPromptTextArea.getText().contains("\n")) {
+                            // If there are new lines in the prompt, then it is ambiguous whether
+                            // the user tries to scroll up or down in history or editing lines in
+                            // the current prompt.
+                            // The easy way to get rid of this ambiguity is to disallow scrolling
+                            // when there are new lines in the prompt.
+                            // But the exception to this situation is when the caret position is at
+                            // the beginning of the prompt.
+                            history.get().stream()
+                                    .skip(newValue.intValue())
+                                    .findFirst()
+                                    .ifPresent(message -> userPromptTextArea.setText(message));
+                        }
+                    } else {
+                        // When currentUserMessageScroll is set to NEW_NON_EXISTENT_MESSAGE, then we
+                        // should:
+                        // 1) either clear the prompt, if user scrolls down the most recent history
+                        // entry.
+                        // 2) do nothing, if user starts to edit the history entry.
+                        // We distinguish these two cases by checking showingHistoryMessage, which
+                        // is true for -1 message, and false for others.
+                        if (showingHistoryMessage.get()) {
+                            userPromptTextArea.setText("");
+                        }
+                    }
+                });
     }
 
     public void setDisableToButtons(boolean disable) {
@@ -152,19 +172,21 @@ public void switchToErrorState(String userMessage) {
 
         Button retryButton = new Button(Localization.lang("Retry"));
 
-        retryButton.setOnAction(event -> {
-            if (retryCallback.get() != null) {
-                retryCallback.get().accept(userMessage);
-            }
-        });
+        retryButton.setOnAction(
+                event -> {
+                    if (retryCallback.get() != null) {
+                        retryCallback.get().accept(userMessage);
+                    }
+                });
 
         Button cancelButton = new Button(Localization.lang("Cancel"));
 
-        cancelButton.setOnAction(event -> {
-            if (cancelCallback.get() != null) {
-                cancelCallback.get().run();
-            }
-        });
+        cancelButton.setOnAction(
+                event -> {
+                    if (cancelCallback.get() != null) {
+                        cancelCallback.get().run();
+                    }
+                });
 
         this.getChildren().add(retryButton);
         this.getChildren().add(cancelButton);
@@ -178,7 +200,8 @@ public void switchToNormalState() {
     }
 
     public void requestPromptFocus() {
-        // TODO: Check what would happen when programmer calls requestPromptFocus() while the component is in error state.
+        // TODO: Check what would happen when programmer calls requestPromptFocus() while the
+        // component is in error state.
         Platform.runLater(() -> userPromptTextArea.requestFocus());
     }
 
diff --git a/src/main/java/org/jabref/gui/ai/components/privacynotice/AiPrivacyNoticeGuardedComponent.java b/src/main/java/org/jabref/gui/ai/components/privacynotice/AiPrivacyNoticeGuardedComponent.java
index a286be359bee..8b6f6acc9a16 100644
--- a/src/main/java/org/jabref/gui/ai/components/privacynotice/AiPrivacyNoticeGuardedComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/privacynotice/AiPrivacyNoticeGuardedComponent.java
@@ -17,7 +17,10 @@ public abstract class AiPrivacyNoticeGuardedComponent extends DynamicallyChangea
     private final ExternalApplicationsPreferences externalApplicationsPreferences;
     private final DialogService dialogService;
 
-    public AiPrivacyNoticeGuardedComponent(AiPreferences aiPreferences, ExternalApplicationsPreferences externalApplicationsPreferences, DialogService dialogService) {
+    public AiPrivacyNoticeGuardedComponent(
+            AiPreferences aiPreferences,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            DialogService dialogService) {
         this.aiPreferences = aiPreferences;
         this.externalApplicationsPreferences = externalApplicationsPreferences;
         this.dialogService = dialogService;
@@ -34,9 +37,7 @@ public final void rebuildUi() {
                             aiPreferences,
                             this::rebuildUi,
                             externalApplicationsPreferences,
-                            dialogService
-                    )
-            );
+                            dialogService));
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java b/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java
index 9681379d60d8..8670f2096ec4 100644
--- a/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.ai.components.privacynotice;
 
-import java.io.IOException;
+import com.airhacks.afterburner.views.ViewLoader;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Hyperlink;
@@ -14,11 +14,11 @@
 import org.jabref.logic.ai.AiDefaultPreferences;
 import org.jabref.logic.ai.AiPreferences;
 import org.jabref.model.ai.AiProvider;
-
-import com.airhacks.afterburner.views.ViewLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+
 public class PrivacyNoticeComponent extends ScrollPane {
     private final Logger LOGGER = LoggerFactory.getLogger(PrivacyNoticeComponent.class);
 
@@ -33,15 +33,17 @@ public class PrivacyNoticeComponent extends ScrollPane {
     private final DialogService dialogService;
     private final ExternalApplicationsPreferences externalApplicationsPreferences;
 
-    public PrivacyNoticeComponent(AiPreferences aiPreferences, Runnable onIAgreeButtonClickCallback, ExternalApplicationsPreferences externalApplicationsPreferences, DialogService dialogService) {
+    public PrivacyNoticeComponent(
+            AiPreferences aiPreferences,
+            Runnable onIAgreeButtonClickCallback,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            DialogService dialogService) {
         this.aiPreferences = aiPreferences;
         this.onIAgreeButtonClickCallback = onIAgreeButtonClickCallback;
         this.externalApplicationsPreferences = externalApplicationsPreferences;
         this.dialogService = dialogService;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @FXML
@@ -51,23 +53,32 @@ private void initialize() {
         initPrivacyHyperlink(geminiPrivacyTextFlow, AiProvider.GEMINI);
         initPrivacyHyperlink(huggingFacePrivacyTextFlow, AiProvider.HUGGING_FACE);
 
-        String newEmbeddingModelText = embeddingModelText.getText().replaceAll("%0", aiPreferences.getEmbeddingModel().sizeInfo());
+        String newEmbeddingModelText =
+                embeddingModelText
+                        .getText()
+                        .replaceAll("%0", aiPreferences.getEmbeddingModel().sizeInfo());
         embeddingModelText.setText(newEmbeddingModelText);
 
-        // Because of the https://bugs.openjdk.org/browse/JDK-8090400 bug, the text in the privacy policy cannot be
+        // Because of the https://bugs.openjdk.org/browse/JDK-8090400 bug, the text in the privacy
+        // policy cannot be
         // fully wrapped.
 
         embeddingModelText.wrappingWidthProperty().bind(this.widthProperty());
     }
 
     private void initPrivacyHyperlink(TextFlow textFlow, AiProvider aiProvider) {
-        if (textFlow.getChildren().isEmpty() || !(textFlow.getChildren().getFirst() instanceof Text text)) {
+        if (textFlow.getChildren().isEmpty()
+                || !(textFlow.getChildren().getFirst() instanceof Text text)) {
             return;
         }
 
-        String replacedText = text.getText().replaceAll("%0", aiProvider.getLabel()).replace("%1", "");
+        String replacedText =
+                text.getText().replaceAll("%0", aiProvider.getLabel()).replace("%1", "");
 
-        replacedText = replacedText.endsWith(".") ? replacedText.substring(0, replacedText.length() - 1) : replacedText;
+        replacedText =
+                replacedText.endsWith(".")
+                        ? replacedText.substring(0, replacedText.length() - 1)
+                        : replacedText;
 
         text.setText(replacedText);
         text.wrappingWidthProperty().bind(this.widthProperty());
@@ -76,9 +87,10 @@ private void initPrivacyHyperlink(TextFlow textFlow, AiProvider aiProvider) {
         Hyperlink hyperlink = new Hyperlink(link);
         hyperlink.setWrapText(true);
         hyperlink.setFont(text.getFont());
-        hyperlink.setOnAction(event -> {
-            openBrowser(link);
-        });
+        hyperlink.setOnAction(
+                event -> {
+                    openBrowser(link);
+                });
 
         textFlow.getChildren().add(hyperlink);
 
@@ -97,14 +109,16 @@ private void onIAgreeButtonClick() {
 
     @FXML
     private void onDjlPrivacyPolicyClick() {
-        openBrowser("https://github.com/deepjavalibrary/djl/discussions/3370#discussioncomment-10233632");
+        openBrowser(
+                "https://github.com/deepjavalibrary/djl/discussions/3370#discussioncomment-10233632");
     }
 
     private void openBrowser(String link) {
         try {
             NativeDesktop.openBrowser(link, externalApplicationsPreferences);
         } catch (IOException e) {
-            LOGGER.error("Error opening the browser to the Privacy Policy page of the AI provider.", e);
+            LOGGER.error(
+                    "Error opening the browser to the Privacy Policy page of the AI provider.", e);
             dialogService.showErrorDialogAndWait(e);
         }
     }
diff --git a/src/main/java/org/jabref/gui/ai/components/summary/SummaryComponent.java b/src/main/java/org/jabref/gui/ai/components/summary/SummaryComponent.java
index ed8e66980e0e..e5a31fdf0516 100644
--- a/src/main/java/org/jabref/gui/ai/components/summary/SummaryComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/summary/SummaryComponent.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.ai.components.summary;
 
-import java.nio.file.Path;
-
 import javafx.scene.Node;
 
 import org.jabref.gui.DialogService;
@@ -20,10 +18,11 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.file.Path;
+
 public class SummaryComponent extends AiPrivacyNoticeGuardedComponent {
     private static final Logger LOGGER = LoggerFactory.getLogger(SummaryComponent.class);
 
@@ -33,23 +32,28 @@ public class SummaryComponent extends AiPrivacyNoticeGuardedComponent {
     private final AiService aiService;
     private final AiPreferences aiPreferences;
 
-    public SummaryComponent(BibDatabaseContext bibDatabaseContext,
-                            BibEntry entry,
-                            AiService aiService,
-                            AiPreferences aiPreferences,
-                            ExternalApplicationsPreferences externalApplicationsPreferences,
-                            CitationKeyPatternPreferences citationKeyPatternPreferences,
-                            DialogService dialogService
-    ) {
+    public SummaryComponent(
+            BibDatabaseContext bibDatabaseContext,
+            BibEntry entry,
+            AiService aiService,
+            AiPreferences aiPreferences,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            CitationKeyPatternPreferences citationKeyPatternPreferences,
+            DialogService dialogService) {
         super(aiPreferences, externalApplicationsPreferences, dialogService);
 
         this.bibDatabaseContext = bibDatabaseContext;
         this.entry = entry;
-        this.citationKeyGenerator = new CitationKeyGenerator(bibDatabaseContext, citationKeyPatternPreferences);
+        this.citationKeyGenerator =
+                new CitationKeyGenerator(bibDatabaseContext, citationKeyPatternPreferences);
         this.aiService = aiService;
         this.aiPreferences = aiPreferences;
 
-        aiService.getSummariesService().summarize(entry, bibDatabaseContext).stateProperty().addListener(o -> rebuildUi());
+        aiService
+                .getSummariesService()
+                .summarize(entry, bibDatabaseContext)
+                .stateProperty()
+                .addListener(o -> rebuildUi());
 
         rebuildUi();
     }
@@ -60,7 +64,10 @@ protected Node showPrivacyPolicyGuardedContent() {
             return showErrorNoDatabasePath();
         } else if (entry.getFiles().isEmpty()) {
             return showErrorNoFiles();
-        } else if (entry.getFiles().stream().map(LinkedFile::getLink).map(Path::of).noneMatch(FileUtil::isPDFFile)) {
+        } else if (entry.getFiles().stream()
+                .map(LinkedFile::getLink)
+                .map(Path::of)
+                .noneMatch(FileUtil::isPDFFile)) {
             return showErrorNotPdfs();
         } else if (!CitationKeyCheck.citationKeyIsPresentAndUnique(bibDatabaseContext, entry)) {
             return tryToGenerateCitationKeyThenBind(entry);
@@ -72,86 +79,95 @@ protected Node showPrivacyPolicyGuardedContent() {
     private Node showErrorNoDatabasePath() {
         return new ErrorStateComponent(
                 Localization.lang("Unable to generate summary"),
-                Localization.lang("The path of the current library is not set, but it is required for summarization")
-        );
+                Localization.lang(
+                        "The path of the current library is not set, but it is required for summarization"));
     }
 
     private Node showErrorNotPdfs() {
         return new ErrorStateComponent(
                 Localization.lang("Unable to generate summary"),
-                Localization.lang("Only PDF files are supported.")
-        );
+                Localization.lang("Only PDF files are supported."));
     }
 
     private Node showErrorNoFiles() {
         return new ErrorStateComponent(
                 Localization.lang("Unable to generate summary"),
-                Localization.lang("Please attach at least one PDF file to enable summarization of PDF file(s).")
-        );
+                Localization.lang(
+                        "Please attach at least one PDF file to enable summarization of PDF file(s)."));
     }
 
     private Node tryToGenerateCitationKeyThenBind(BibEntry entry) {
         if (citationKeyGenerator.generateAndSetKey(entry).isEmpty()) {
             return new ErrorStateComponent(
                     Localization.lang("Unable to generate summary"),
-                    Localization.lang("Please provide a non-empty and unique citation key for this entry.")
-            );
+                    Localization.lang(
+                            "Please provide a non-empty and unique citation key for this entry."));
         } else {
             return showPrivacyPolicyGuardedContent();
         }
     }
 
     private Node tryToShowSummary() {
-        ProcessingInfo<BibEntry, Summary> processingInfo = aiService.getSummariesService().summarize(entry, bibDatabaseContext);
+        ProcessingInfo<BibEntry, Summary> processingInfo =
+                aiService.getSummariesService().summarize(entry, bibDatabaseContext);
 
         return switch (processingInfo.getState()) {
             case SUCCESS -> {
-                assert processingInfo.getData().isPresent(); // When the state is SUCCESS, the data must be present.
+                assert processingInfo
+                        .getData()
+                        .isPresent(); // When the state is SUCCESS, the data must be present.
                 yield showSummary(processingInfo.getData().get());
             }
-            case ERROR ->
-                    showErrorWhileSummarizing(processingInfo);
-            case PROCESSING,
-                 STOPPED ->
-                    showErrorNotSummarized();
+            case ERROR -> showErrorWhileSummarizing(processingInfo);
+            case PROCESSING, STOPPED -> showErrorNotSummarized();
         };
     }
 
     private Node showErrorWhileSummarizing(ProcessingInfo<BibEntry, Summary> processingInfo) {
-        assert processingInfo.getException().isPresent(); // When the state is ERROR, the exception must be present.
+        assert processingInfo
+                .getException()
+                .isPresent(); // When the state is ERROR, the exception must be present.
 
-        LOGGER.error("Got an error while generating a summary for entry {}", entry.getCitationKey().orElse("<no citation key>"), processingInfo.getException().get());
+        LOGGER.error(
+                "Got an error while generating a summary for entry {}",
+                entry.getCitationKey().orElse("<no citation key>"),
+                processingInfo.getException().get());
 
         return ErrorStateComponent.withTextAreaAndButton(
                 Localization.lang("Unable to chat"),
                 Localization.lang("Got error while processing the file:"),
                 processingInfo.getException().get().getLocalizedMessage(),
                 Localization.lang("Regenerate"),
-                () -> aiService.getSummariesService().regenerateSummary(entry, bibDatabaseContext)
-        );
+                () -> aiService.getSummariesService().regenerateSummary(entry, bibDatabaseContext));
     }
 
     private Node showErrorNotSummarized() {
         return ErrorStateComponent.withSpinner(
                 Localization.lang("Processing..."),
-                Localization.lang("The attached file(s) are currently being processed by %0. Once completed, you will be able to see the summary.", aiPreferences.getAiProvider().getLabel())
-        );
+                Localization.lang(
+                        "The attached file(s) are currently being processed by %0. Once completed, you will be able to see the summary.",
+                        aiPreferences.getAiProvider().getLabel()));
     }
 
     private Node showSummary(Summary summary) {
-        return new SummaryShowingComponent(summary, () -> {
-            if (bibDatabaseContext.getDatabasePath().isEmpty()) {
-                LOGGER.error("Bib database path is not set, but it was expected to be present. Unable to regenerate summary");
-                return;
-            }
-
-            if (entry.getCitationKey().isEmpty()) {
-                LOGGER.error("Citation key is not set, but it was expected to be present. Unable to regenerate summary");
-                return;
-            }
-
-            aiService.getSummariesService().regenerateSummary(entry, bibDatabaseContext);
-            // No need to rebuildUi(), because this class listens to the state of ProcessingInfo of the summary.
-        });
+        return new SummaryShowingComponent(
+                summary,
+                () -> {
+                    if (bibDatabaseContext.getDatabasePath().isEmpty()) {
+                        LOGGER.error(
+                                "Bib database path is not set, but it was expected to be present. Unable to regenerate summary");
+                        return;
+                    }
+
+                    if (entry.getCitationKey().isEmpty()) {
+                        LOGGER.error(
+                                "Citation key is not set, but it was expected to be present. Unable to regenerate summary");
+                        return;
+                    }
+
+                    aiService.getSummariesService().regenerateSummary(entry, bibDatabaseContext);
+                    // No need to rebuildUi(), because this class listens to the state of
+                    // ProcessingInfo of the summary.
+                });
     }
 }
diff --git a/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.java b/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.java
index 3cb04347d11b..929d99316050 100644
--- a/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.java
@@ -1,9 +1,6 @@
 package org.jabref.gui.ai.components.summary;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.FormatStyle;
-import java.util.Locale;
+import com.airhacks.afterburner.views.ViewLoader;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.TextArea;
@@ -12,7 +9,10 @@
 
 import org.jabref.logic.ai.summarization.Summary;
 
-import com.airhacks.afterburner.views.ViewLoader;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
+import java.util.Locale;
 
 public class SummaryShowingComponent extends VBox {
     @FXML private TextArea summaryTextArea;
@@ -25,25 +25,26 @@ public SummaryShowingComponent(Summary summary, Runnable regenerateCallback) {
         this.summary = summary;
         this.regenerateCallback = regenerateCallback;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @FXML
     private void initialize() {
         summaryTextArea.setText(summary.content());
 
-        String newInfo = summaryInfoText
-                .getText()
-                .replaceAll("%0", formatTimestamp(summary.timestamp()))
-                .replaceAll("%1", summary.aiProvider().getLabel() + " " + summary.model());
+        String newInfo =
+                summaryInfoText
+                        .getText()
+                        .replaceAll("%0", formatTimestamp(summary.timestamp()))
+                        .replaceAll("%1", summary.aiProvider().getLabel() + " " + summary.model());
 
         summaryInfoText.setText(newInfo);
     }
 
     private static String formatTimestamp(LocalDateTime timestamp) {
-        return timestamp.format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM).withLocale(Locale.getDefault()));
+        return timestamp.format(
+                DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)
+                        .withLocale(Locale.getDefault()));
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/ai/components/util/EmbeddingModelGuardedComponent.java b/src/main/java/org/jabref/gui/ai/components/util/EmbeddingModelGuardedComponent.java
index a89bdf6a1612..a798de6f23d6 100644
--- a/src/main/java/org/jabref/gui/ai/components/util/EmbeddingModelGuardedComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/util/EmbeddingModelGuardedComponent.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.ai.components.util;
 
+import com.google.common.eventbus.Subscribe;
+
 import javafx.scene.Node;
 
 import org.jabref.gui.DialogService;
@@ -12,8 +14,6 @@
 import org.jabref.logic.ai.ingestion.model.JabRefEmbeddingModel;
 import org.jabref.logic.l10n.Localization;
 
-import com.google.common.eventbus.Subscribe;
-
 /**
  * Class that has similar logic to {@link AiPrivacyNoticeGuardedComponent}. It extends from it, so that means,
  * if a component needs embedding model, then it should also be guarded with accepting AI privacy policy.
@@ -21,11 +21,11 @@
 public abstract class EmbeddingModelGuardedComponent extends AiPrivacyNoticeGuardedComponent {
     private final AiService aiService;
 
-    public EmbeddingModelGuardedComponent(AiService aiService,
-                                          AiPreferences aiPreferences,
-                                          ExternalApplicationsPreferences externalApplicationsPreferences,
-                                          DialogService dialogService
-    ) {
+    public EmbeddingModelGuardedComponent(
+            AiService aiService,
+            AiPreferences aiPreferences,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            DialogService dialogService) {
         super(aiPreferences, externalApplicationsPreferences, dialogService);
 
         this.aiService = aiService;
@@ -54,15 +54,14 @@ private Node showErrorWhileBuildingEmbeddingModel() {
                 Localization.lang("An error occurred while building the embedding model"),
                 aiService.getEmbeddingModel().getErrorWhileBuildingModel(),
                 Localization.lang("Rebuild"),
-                () -> aiService.getEmbeddingModel().startRebuildingTask()
-        );
+                () -> aiService.getEmbeddingModel().startRebuildingTask());
     }
 
     public Node showBuildingEmbeddingModel() {
         return ErrorStateComponent.withSpinner(
                 Localization.lang("Downloading..."),
-                Localization.lang("Downloading embedding model... Afterward, you will be able to chat with your files.")
-        );
+                Localization.lang(
+                        "Downloading embedding model... Afterward, you will be able to chat with your files."));
     }
 
     @Subscribe
diff --git a/src/main/java/org/jabref/gui/ai/components/util/errorstate/ErrorStateComponent.java b/src/main/java/org/jabref/gui/ai/components/util/errorstate/ErrorStateComponent.java
index da640261ef72..2582936bb797 100644
--- a/src/main/java/org/jabref/gui/ai/components/util/errorstate/ErrorStateComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/util/errorstate/ErrorStateComponent.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.ai.components.util.errorstate;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
@@ -8,17 +10,13 @@
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
 public class ErrorStateComponent extends BorderPane {
     @FXML private Label titleText;
     @FXML private Label contentText;
     @FXML private VBox contentsVBox;
 
     public ErrorStateComponent(String title, String content) {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
 
         setTitle(title);
         setContent(content);
@@ -32,7 +30,8 @@ public static ErrorStateComponent withSpinner(String title, String content) {
         return errorStateComponent;
     }
 
-    public static ErrorStateComponent withTextArea(String title, String content, String textAreaContent) {
+    public static ErrorStateComponent withTextArea(
+            String title, String content, String textAreaContent) {
         ErrorStateComponent errorStateComponent = new ErrorStateComponent(title, content);
 
         TextArea textArea = new TextArea(textAreaContent);
@@ -44,8 +43,14 @@ public static ErrorStateComponent withTextArea(String title, String content, Str
         return errorStateComponent;
     }
 
-    public static ErrorStateComponent withTextAreaAndButton(String title, String content, String textAreaContent, String buttonText, Runnable onClick) {
-        ErrorStateComponent errorStateComponent = ErrorStateComponent.withTextArea(title, content, textAreaContent);
+    public static ErrorStateComponent withTextAreaAndButton(
+            String title,
+            String content,
+            String textAreaContent,
+            String buttonText,
+            Runnable onClick) {
+        ErrorStateComponent errorStateComponent =
+                ErrorStateComponent.withTextArea(title, content, textAreaContent);
 
         Button button = new Button(buttonText);
         button.setOnAction(e -> onClick.run());
diff --git a/src/main/java/org/jabref/gui/ai/components/util/notifications/Notification.java b/src/main/java/org/jabref/gui/ai/components/util/notifications/Notification.java
index c8123974a161..52f081747587 100644
--- a/src/main/java/org/jabref/gui/ai/components/util/notifications/Notification.java
+++ b/src/main/java/org/jabref/gui/ai/components/util/notifications/Notification.java
@@ -9,4 +9,4 @@
  * about possible problems with entries (because that will affect LLM output), but on the other hand the user would
  * like to chat with all available entries in the group, even if some of them are not valid.
  */
-public record Notification(String title, String message) { }
+public record Notification(String title, String message) {}
diff --git a/src/main/java/org/jabref/gui/ai/components/util/notifications/NotificationsComponent.java b/src/main/java/org/jabref/gui/ai/components/util/notifications/NotificationsComponent.java
index 72ec5f271ce3..73df75aef7a1 100644
--- a/src/main/java/org/jabref/gui/ai/components/util/notifications/NotificationsComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/util/notifications/NotificationsComponent.java
@@ -1,12 +1,12 @@
 package org.jabref.gui.ai.components.util.notifications;
 
-import java.util.List;
-
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.VBox;
 
+import java.util.List;
+
 /**
  * A {@link ScrollPane} for displaying AI chat {@link Notification}s. See the documentation of {@link Notification} for
  * more details.
@@ -21,7 +21,8 @@ public NotificationsComponent(ObservableList<Notification> notifications) {
         setMaxHeight(SCROLL_PANE_MAX_HEIGHT);
 
         fill(notifications);
-        notifications.addListener((ListChangeListener<? super Notification>) change -> fill(notifications));
+        notifications.addListener(
+                (ListChangeListener<? super Notification>) change -> fill(notifications));
     }
 
     private void fill(List<Notification> notifications) {
diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java b/src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java
index 46265c15369b..5a4afe040c24 100644
--- a/src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java
+++ b/src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Set;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -12,10 +10,14 @@
 import org.jabref.logic.preferences.AutoCompleteFirstNameMode;
 import org.jabref.model.entry.field.Field;
 
+import java.util.Set;
+
 public class AutoCompletePreferences {
 
     public enum NameFormat {
-        LAST_FIRST, FIRST_LAST, BOTH
+        LAST_FIRST,
+        FIRST_LAST,
+        BOTH
     }
 
     private final BooleanProperty shouldAutoComplete;
@@ -23,10 +25,11 @@ public enum NameFormat {
     private final ObjectProperty<NameFormat> nameFormat;
     private final ObservableSet<Field> completeFields;
 
-    public AutoCompletePreferences(boolean shouldAutoComplete,
-                                   AutoCompleteFirstNameMode firstNameMode,
-                                   NameFormat nameFormat,
-                                   Set<Field> completeFields) {
+    public AutoCompletePreferences(
+            boolean shouldAutoComplete,
+            AutoCompleteFirstNameMode firstNameMode,
+            NameFormat nameFormat,
+            Set<Field> completeFields) {
         this.shouldAutoComplete = new SimpleBooleanProperty(shouldAutoComplete);
         this.firstNameMode = new SimpleObjectProperty<>(firstNameMode);
         this.nameFormat = new SimpleObjectProperty<>(nameFormat);
diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java b/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java
index 89b7b520a62f..11467de62e3f 100644
--- a/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java
+++ b/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java
@@ -26,16 +26,15 @@
  */
 package org.jabref.gui.autocompleter;
 
-import java.util.Collection;
-
 import javafx.beans.value.ChangeListener;
 import javafx.scene.control.TextInputControl;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
 
+import org.controlsfx.control.textfield.AutoCompletionBinding;
 import org.jabref.gui.util.UiTaskExecutor;
 
-import org.controlsfx.control.textfield.AutoCompletionBinding;
+import java.util.Collection;
 
 /**
  * Represents a binding between a text input control and an auto-completion popup
@@ -48,46 +47,53 @@ public class AutoCompletionTextInputBinding<T> extends AutoCompletionBinding<T>
      * String converter to be used to convert suggestions to strings.
      */
     private StringConverter<T> converter;
+
     private AutoCompletionStrategy inputAnalyzer;
-    private final ChangeListener<String> textChangeListener = (obs, oldText, newText) -> {
-        if (getCompletionTarget().isFocused()) {
-            setUserInputText(newText);
-        }
-    };
+    private final ChangeListener<String> textChangeListener =
+            (obs, oldText, newText) -> {
+                if (getCompletionTarget().isFocused()) {
+                    setUserInputText(newText);
+                }
+            };
     private boolean showOnFocus;
-    private final ChangeListener<Boolean> focusChangedListener = (obs, oldFocused, newFocused) -> {
-        if (newFocused) {
-            if (showOnFocus) {
-                setUserInputText(getCompletionTarget().getText());
-            }
-        } else {
-            hidePopup();
-        }
-    };
+    private final ChangeListener<Boolean> focusChangedListener =
+            (obs, oldFocused, newFocused) -> {
+                if (newFocused) {
+                    if (showOnFocus) {
+                        setUserInputText(getCompletionTarget().getText());
+                    }
+                } else {
+                    hidePopup();
+                }
+            };
 
     /**
      * Creates a new auto-completion binding between the given textInputControl
      * and the given suggestion provider.
      */
-    private AutoCompletionTextInputBinding(final TextInputControl textInputControl,
-                                           Callback<ISuggestionRequest, Collection<T>> suggestionProvider) {
+    private AutoCompletionTextInputBinding(
+            final TextInputControl textInputControl,
+            Callback<ISuggestionRequest, Collection<T>> suggestionProvider) {
 
-        this(textInputControl,
+        this(
+                textInputControl,
                 suggestionProvider,
                 AutoCompletionTextInputBinding.defaultStringConverter(),
                 new ReplaceStrategy());
     }
 
-    private AutoCompletionTextInputBinding(final TextInputControl textInputControl,
-                                           final Callback<ISuggestionRequest, Collection<T>> suggestionProvider,
-                                           final StringConverter<T> converter) {
+    private AutoCompletionTextInputBinding(
+            final TextInputControl textInputControl,
+            final Callback<ISuggestionRequest, Collection<T>> suggestionProvider,
+            final StringConverter<T> converter) {
         this(textInputControl, suggestionProvider, converter, new ReplaceStrategy());
     }
 
-    private AutoCompletionTextInputBinding(final TextInputControl textInputControl,
-                                           final Callback<ISuggestionRequest, Collection<T>> suggestionProvider,
-                                           final StringConverter<T> converter,
-                                           final AutoCompletionStrategy inputAnalyzer) {
+    private AutoCompletionTextInputBinding(
+            final TextInputControl textInputControl,
+            final Callback<ISuggestionRequest, Collection<T>> suggestionProvider,
+            final StringConverter<T> converter,
+            final AutoCompletionStrategy inputAnalyzer) {
 
         super(textInputControl, suggestionProvider, converter);
         this.converter = converter;
@@ -112,20 +118,37 @@ public T fromString(String string) {
         };
     }
 
-    public static <T> void autoComplete(TextInputControl textArea, Callback<ISuggestionRequest, Collection<T>> suggestionProvider) {
+    public static <T> void autoComplete(
+            TextInputControl textArea,
+            Callback<ISuggestionRequest, Collection<T>> suggestionProvider) {
         new AutoCompletionTextInputBinding<>(textArea, suggestionProvider);
     }
 
-    public static <T> void autoComplete(TextInputControl textArea, Callback<ISuggestionRequest, Collection<T>> suggestionProvider, StringConverter<T> converter) {
+    public static <T> void autoComplete(
+            TextInputControl textArea,
+            Callback<ISuggestionRequest, Collection<T>> suggestionProvider,
+            StringConverter<T> converter) {
         new AutoCompletionTextInputBinding<>(textArea, suggestionProvider, converter);
     }
 
-    public static <T> AutoCompletionTextInputBinding<T> autoComplete(TextInputControl textArea, Callback<ISuggestionRequest, Collection<T>> suggestionProvider, StringConverter<T> converter, AutoCompletionStrategy inputAnalyzer) {
-        return new AutoCompletionTextInputBinding<>(textArea, suggestionProvider, converter, inputAnalyzer);
+    public static <T> AutoCompletionTextInputBinding<T> autoComplete(
+            TextInputControl textArea,
+            Callback<ISuggestionRequest, Collection<T>> suggestionProvider,
+            StringConverter<T> converter,
+            AutoCompletionStrategy inputAnalyzer) {
+        return new AutoCompletionTextInputBinding<>(
+                textArea, suggestionProvider, converter, inputAnalyzer);
     }
 
-    public static <T> AutoCompletionTextInputBinding<T> autoComplete(TextInputControl textArea, Callback<ISuggestionRequest, Collection<T>> suggestionProvider, AutoCompletionStrategy inputAnalyzer) {
-        return autoComplete(textArea, suggestionProvider, AutoCompletionTextInputBinding.defaultStringConverter(), inputAnalyzer);
+    public static <T> AutoCompletionTextInputBinding<T> autoComplete(
+            TextInputControl textArea,
+            Callback<ISuggestionRequest, Collection<T>> suggestionProvider,
+            AutoCompletionStrategy inputAnalyzer) {
+        return autoComplete(
+                textArea,
+                suggestionProvider,
+                AutoCompletionTextInputBinding.defaultStringConverter(),
+                inputAnalyzer);
     }
 
     private void setUserInputText(String newText) {
diff --git a/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java
index a69b8a3b1c18..f5b4954700f6 100644
--- a/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java
@@ -1,16 +1,16 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Comparator;
-import java.util.stream.Stream;
+import com.google.common.base.Equivalence;
 
+import org.controlsfx.control.textfield.AutoCompletionBinding;
 import org.jabref.logic.bibtex.comparator.EntryComparator;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.strings.StringUtil;
 
-import com.google.common.base.Equivalence;
-import org.controlsfx.control.textfield.AutoCompletionBinding;
+import java.util.Comparator;
+import java.util.stream.Stream;
 
 /**
  * Delivers possible completions as a list of {@link BibEntry} based on their citation key.
@@ -37,8 +37,8 @@ protected Comparator<BibEntry> getComparator() {
     protected boolean isMatch(BibEntry entry, AutoCompletionBinding.ISuggestionRequest request) {
         String userText = request.getUserText();
         return entry.getCitationKey()
-                    .map(key -> StringUtil.containsIgnoreCase(key, userText))
-                    .orElse(false);
+                .map(key -> StringUtil.containsIgnoreCase(key, userText))
+                .orElse(false);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java
index ebb6ec048371..34ffcde93ce3 100644
--- a/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java
@@ -12,8 +12,8 @@ public class ContentSelectorSuggestionProvider extends StringSuggestionProvider
     private final SuggestionProvider<String> suggestionProvider;
     private final List<String> contentSelectorValues;
 
-    public ContentSelectorSuggestionProvider(SuggestionProvider<String> suggestionProvider,
-                                             List<String> contentSelectorValues) {
+    public ContentSelectorSuggestionProvider(
+            SuggestionProvider<String> suggestionProvider, List<String> contentSelectorValues) {
 
         this.suggestionProvider = suggestionProvider;
         this.contentSelectorValues = contentSelectorValues;
diff --git a/src/main/java/org/jabref/gui/autocompleter/EmptySuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/EmptySuggestionProvider.java
index ab7df191fb53..ca81e5c02515 100644
--- a/src/main/java/org/jabref/gui/autocompleter/EmptySuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/EmptySuggestionProvider.java
@@ -1,11 +1,12 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Comparator;
-import java.util.stream.Stream;
-
 import com.google.common.base.Equivalence;
+
 import org.controlsfx.control.textfield.AutoCompletionBinding;
 
+import java.util.Comparator;
+import java.util.stream.Stream;
+
 public class EmptySuggestionProvider extends SuggestionProvider<String> {
     @Override
     protected Equivalence<String> getEquivalence() {
diff --git a/src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java
index 1fae672e250b..8ca3ef6f669e 100644
--- a/src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Objects;
-import java.util.stream.Stream;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.field.Field;
 
+import java.util.Objects;
+import java.util.stream.Stream;
+
 /**
  * Stores the full content of one field.
  */
@@ -21,6 +21,7 @@ class FieldValueSuggestionProvider extends StringSuggestionProvider {
 
     @Override
     public Stream<String> getSource() {
-        return database.getEntries().parallelStream().flatMap(entry -> entry.getField(field).stream());
+        return database.getEntries().parallelStream()
+                .flatMap(entry -> entry.getField(field).stream());
     }
 }
diff --git a/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java
index c0ece6855190..01f877f034e9 100644
--- a/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java
@@ -1,18 +1,19 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.stream.Stream;
+import com.google.common.collect.Streams;
 
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.field.Field;
 
-import com.google.common.collect.Streams;
+import java.util.stream.Stream;
 
 public class JournalsSuggestionProvider extends FieldValueSuggestionProvider {
 
     private final JournalAbbreviationRepository repository;
 
-    JournalsSuggestionProvider(Field field, BibDatabase database, JournalAbbreviationRepository repository) {
+    JournalsSuggestionProvider(
+            Field field, BibDatabase database, JournalAbbreviationRepository repository) {
         super(field, database);
 
         this.repository = repository;
diff --git a/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java b/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java
index c58ffda2849b..a6557d7e50fa 100644
--- a/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java
+++ b/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java
@@ -12,7 +12,10 @@ public class PersonNameStringConverter extends StringConverter<Author> {
     private final boolean autoCompLF;
     private final AutoCompleteFirstNameMode autoCompleteFirstNameMode;
 
-    public PersonNameStringConverter(boolean autoCompFF, boolean autoCompLF, AutoCompleteFirstNameMode autoCompleteFirstNameMode) {
+    public PersonNameStringConverter(
+            boolean autoCompFF,
+            boolean autoCompLF,
+            AutoCompleteFirstNameMode autoCompleteFirstNameMode) {
         this.autoCompFF = autoCompFF;
         this.autoCompLF = autoCompLF;
         this.autoCompleteFirstNameMode = autoCompleteFirstNameMode;
diff --git a/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java
index 8457ea5dbd52..c42462aef5cb 100644
--- a/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java
@@ -1,12 +1,8 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Stream;
+import com.google.common.base.Equivalence;
 
+import org.controlsfx.control.textfield.AutoCompletionBinding;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
@@ -14,8 +10,12 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.strings.StringUtil;
 
-import com.google.common.base.Equivalence;
-import org.controlsfx.control.textfield.AutoCompletionBinding;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Stream;
 
 /**
  * Delivers possible completions as a list of {@link Author}s.
@@ -37,13 +37,11 @@ public PersonNameSuggestionProvider(Collection<Field> fields, BibDatabase databa
     }
 
     public Stream<Author> getAuthors(BibEntry entry) {
-        return entry.getFieldMap()
-                    .entrySet()
-                    .stream()
-                    .filter(fieldValuePair -> fields.contains(fieldValuePair.getKey()))
-                    .map(Map.Entry::getValue)
-                    .map(AuthorList::parse)
-                    .flatMap(authors -> authors.getAuthors().stream());
+        return entry.getFieldMap().entrySet().stream()
+                .filter(fieldValuePair -> fields.contains(fieldValuePair.getKey()))
+                .map(Map.Entry::getValue)
+                .map(AuthorList::parse)
+                .flatMap(authors -> authors.getAuthors().stream());
     }
 
     @Override
@@ -58,13 +56,12 @@ protected Comparator<Author> getComparator() {
 
     @Override
     protected boolean isMatch(Author candidate, AutoCompletionBinding.ISuggestionRequest request) {
-        return StringUtil.containsIgnoreCase(candidate.getFamilyGiven(false), request.getUserText());
+        return StringUtil.containsIgnoreCase(
+                candidate.getFamilyGiven(false), request.getUserText());
     }
 
     @Override
     public Stream<Author> getSource() {
-        return database.getEntries()
-                       .parallelStream()
-                       .flatMap(this::getAuthors);
+        return database.getEntries().parallelStream().flatMap(this::getAuthors);
     }
 }
diff --git a/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java
index 01ba19ef39e7..d066b39976b6 100644
--- a/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java
@@ -1,12 +1,12 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Comparator;
-import java.util.stream.Stream;
+import com.google.common.base.Equivalence;
 
+import org.controlsfx.control.textfield.AutoCompletionBinding;
 import org.jabref.model.strings.StringUtil;
 
-import com.google.common.base.Equivalence;
-import org.controlsfx.control.textfield.AutoCompletionBinding;
+import java.util.Comparator;
+import java.util.stream.Stream;
 
 abstract class StringSuggestionProvider extends SuggestionProvider<String> {
 
diff --git a/src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java
index fb64bb372b7f..9b8ab9070f9c 100644
--- a/src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java
@@ -26,6 +26,10 @@
  */
 package org.jabref.gui.autocompleter;
 
+import com.google.common.base.Equivalence;
+
+import org.controlsfx.control.textfield.AutoCompletionBinding.ISuggestionRequest;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -33,9 +37,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.google.common.base.Equivalence;
-import org.controlsfx.control.textfield.AutoCompletionBinding.ISuggestionRequest;
-
 /**
  * This is a simple implementation of a generic suggestion provider callback.
  *
@@ -47,13 +48,17 @@ public final Collection<T> provideSuggestions(ISuggestionRequest request) {
         if (!request.getUserText().isEmpty()) {
             Comparator<T> comparator = getComparator();
             Equivalence<T> equivalence = getEquivalence();
-            return getSource().filter(candidate -> isMatch(candidate, request))
-                              .map(equivalence::wrap) // Need to do a bit of acrobatic as there is no distinctBy method
-                              .distinct()
-                              .limit(10)
-                              .map(Equivalence.Wrapper::get)
-                              .sorted(comparator)
-                              .collect(Collectors.toList());
+            return getSource()
+                    .filter(candidate -> isMatch(candidate, request))
+                    .map(
+                            equivalence
+                                    ::wrap) // Need to do a bit of acrobatic as there is no
+                                            // distinctBy method
+                    .distinct()
+                    .limit(10)
+                    .map(Equivalence.Wrapper::get)
+                    .sorted(comparator)
+                    .collect(Collectors.toList());
         } else {
             return Collections.emptyList();
         }
@@ -64,11 +69,15 @@ public final Collection<T> provideSuggestions(ISuggestionRequest request) {
     public List<T> getPossibleSuggestions() {
         Comparator<T> comparator = getComparator().reversed();
         Equivalence<T> equivalence = getEquivalence();
-        return getSource().map(equivalence::wrap) // Need to do a bit of acrobatic as there is no distinctBy method
-                          .distinct()
-                          .map(Equivalence.Wrapper::get)
-                          .sorted(comparator)
-                          .collect(Collectors.toList());
+        return getSource()
+                .map(
+                        equivalence
+                                ::wrap) // Need to do a bit of acrobatic as there is no distinctBy
+                                        // method
+                .distinct()
+                .map(Equivalence.Wrapper::get)
+                .sorted(comparator)
+                .collect(Collectors.toList());
     }
 
     /**
diff --git a/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java b/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java
index 06d2abef8a8e..1c21ab2d19e0 100644
--- a/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java
+++ b/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Set;
-
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldProperty;
 import org.jabref.model.entry.field.StandardField;
 
+import java.util.Set;
+
 public class SuggestionProviders {
 
     private final boolean isEmpty;
@@ -15,7 +15,10 @@ public class SuggestionProviders {
     private JournalAbbreviationRepository abbreviationRepository;
     private AutoCompletePreferences autoCompletePreferences;
 
-    public SuggestionProviders(BibDatabase database, JournalAbbreviationRepository abbreviationRepository, AutoCompletePreferences autoCompletePreferences) {
+    public SuggestionProviders(
+            BibDatabase database,
+            JournalAbbreviationRepository abbreviationRepository,
+            AutoCompletePreferences autoCompletePreferences) {
         this.database = database;
         this.abbreviationRepository = abbreviationRepository;
         this.autoCompletePreferences = autoCompletePreferences;
@@ -34,9 +37,11 @@ public SuggestionProvider<?> getForField(Field field) {
         Set<FieldProperty> fieldProperties = field.getProperties();
         if (fieldProperties.contains(FieldProperty.PERSON_NAMES)) {
             return new PersonNameSuggestionProvider(field, database);
-        } else if (fieldProperties.contains(FieldProperty.SINGLE_ENTRY_LINK) || fieldProperties.contains(FieldProperty.MULTIPLE_ENTRY_LINK)) {
+        } else if (fieldProperties.contains(FieldProperty.SINGLE_ENTRY_LINK)
+                || fieldProperties.contains(FieldProperty.MULTIPLE_ENTRY_LINK)) {
             return new BibEntrySuggestionProvider(database);
-        } else if (fieldProperties.contains(FieldProperty.JOURNAL_NAME) || StandardField.PUBLISHER == field) {
+        } else if (fieldProperties.contains(FieldProperty.JOURNAL_NAME)
+                || StandardField.PUBLISHER == field) {
             return new JournalsSuggestionProvider(field, database, abbreviationRepository);
         } else {
             return new WordSuggestionProvider(field, database);
diff --git a/src/main/java/org/jabref/gui/autocompleter/WordSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/WordSuggestionProvider.java
index f83d047b0f7d..3b8672d6c294 100644
--- a/src/main/java/org/jabref/gui/autocompleter/WordSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/WordSuggestionProvider.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Objects;
-import java.util.stream.Stream;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.field.Field;
 
+import java.util.Objects;
+import java.util.stream.Stream;
+
 /**
  * Stores all words in the given field.
  */
@@ -21,8 +21,7 @@ public WordSuggestionProvider(Field field, BibDatabase database) {
 
     @Override
     public Stream<String> getSource() {
-        return database.getEntries()
-                       .parallelStream()
-                       .flatMap(entry -> entry.getFieldAsWords(field).stream());
+        return database.getEntries().parallelStream()
+                .flatMap(entry -> entry.getFieldAsWords(field).stream());
     }
 }
diff --git a/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java b/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java
index 72402b18dd56..500b64de14f4 100644
--- a/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java
+++ b/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java
@@ -1,20 +1,20 @@
 package org.jabref.gui.autosaveandbackup;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
 
 import org.jabref.logic.util.CoarseChangeFilter;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.event.AutosaveEvent;
 import org.jabref.model.database.event.BibDatabaseContextChangedEvent;
-
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
 /**
  * Saves the given {@link BibDatabaseContext} on every {@link BibDatabaseContextChangedEvent} by posting a new {@link AutosaveEvent}.
  * An intelligent {@link ScheduledThreadPoolExecutor} prevents a high load while saving and rejects all redundant save tasks.
@@ -45,8 +45,8 @@ private AutosaveManager(BibDatabaseContext bibDatabaseContext) {
         this.executor.scheduleAtFixedRate(
                 () -> {
                     if (needsSave) {
-                       eventBus.post(new AutosaveEvent());
-                       needsSave = false;
+                        eventBus.post(new AutosaveEvent());
+                        needsSave = false;
                     }
                 },
                 DELAY_BETWEEN_AUTOSAVE_ATTEMPTS_IN_SECONDS,
@@ -84,8 +84,11 @@ public static AutosaveManager start(BibDatabaseContext bibDatabaseContext) {
      * @param bibDatabaseContext Associated {@link BibDatabaseContext}
      */
     public static void shutdown(BibDatabaseContext bibDatabaseContext) {
-        runningInstances.stream().filter(instance -> instance.bibDatabaseContext == bibDatabaseContext).findAny()
-                        .ifPresent(instance -> {
+        runningInstances.stream()
+                .filter(instance -> instance.bibDatabaseContext == bibDatabaseContext)
+                .findAny()
+                .ifPresent(
+                        instance -> {
                             instance.shutdown();
                             runningInstances.remove(instance);
                         });
diff --git a/src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java b/src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java
index acae02c01c8b..591b0272e889 100644
--- a/src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java
+++ b/src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java
@@ -1,23 +1,6 @@
 package org.jabref.gui.autosaveandbackup;
 
-import java.io.IOException;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.nio.file.attribute.FileTime;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Queue;
-import java.util.Set;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import com.google.common.eventbus.Subscribe;
 
 import javafx.scene.control.TableColumn;
 
@@ -40,11 +23,28 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.metadata.SelfContainedSaveOrder;
-
-import com.google.common.eventbus.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.Writer;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.FileTime;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
 /**
  * Backups the given bib database file from {@link BibDatabaseContext} on every {@link BibDatabaseContextChangedEvent}.
  * An intelligent {@link ExecutorService} with a {@link BlockingQueue} prevents a high load while making backups and
@@ -73,7 +73,11 @@ public class BackupManager {
     private final Queue<Path> backupFilesQueue = new LinkedBlockingQueue<>();
     private boolean needsBackup = false;
 
-    BackupManager(LibraryTab libraryTab, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager, CliPreferences preferences) {
+    BackupManager(
+            LibraryTab libraryTab,
+            BibDatabaseContext bibDatabaseContext,
+            BibEntryTypesManager entryTypesManager,
+            CliPreferences preferences) {
         this.bibDatabaseContext = bibDatabaseContext;
         this.entryTypesManager = entryTypesManager;
         this.preferences = preferences;
@@ -88,14 +92,16 @@ public class BackupManager {
      * Determines the most recent backup file name
      */
     static Path getBackupPathForNewBackup(Path originalPath, Path backupDir) {
-        return BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(originalPath, BackupFileType.BACKUP, backupDir);
+        return BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(
+                originalPath, BackupFileType.BACKUP, backupDir);
     }
 
     /**
      * Determines the most recent existing backup file name
      */
     static Optional<Path> getLatestBackupPath(Path originalPath, Path backupDir) {
-        return BackupFileUtil.getPathOfLatestExistingBackupFile(originalPath, BackupFileType.BACKUP, backupDir);
+        return BackupFileUtil.getPathOfLatestExistingBackupFile(
+                originalPath, BackupFileType.BACKUP, backupDir);
     }
 
     /**
@@ -106,8 +112,13 @@ static Optional<Path> getLatestBackupPath(Path originalPath, Path backupDir) {
      *
      * @param bibDatabaseContext Associated {@link BibDatabaseContext}
      */
-    public static BackupManager start(LibraryTab libraryTab, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager, CliPreferences preferences) {
-        BackupManager backupManager = new BackupManager(libraryTab, bibDatabaseContext, entryTypesManager, preferences);
+    public static BackupManager start(
+            LibraryTab libraryTab,
+            BibDatabaseContext bibDatabaseContext,
+            BibEntryTypesManager entryTypesManager,
+            CliPreferences preferences) {
+        BackupManager backupManager =
+                new BackupManager(libraryTab, bibDatabaseContext, entryTypesManager, preferences);
         backupManager.startBackupTask(preferences.getFilePreferences().getBackupDirectory());
         runningInstances.add(backupManager);
         return backupManager;
@@ -119,7 +130,9 @@ public static BackupManager start(LibraryTab libraryTab, BibDatabaseContext bibD
      * @param bibDatabaseContext Associated {@link BibDatabaseContext}
      */
     public static void discardBackup(BibDatabaseContext bibDatabaseContext, Path backupDir) {
-        runningInstances.stream().filter(instance -> instance.bibDatabaseContext == bibDatabaseContext).forEach(backupManager -> backupManager.discardBackup(backupDir));
+        runningInstances.stream()
+                .filter(instance -> instance.bibDatabaseContext == bibDatabaseContext)
+                .forEach(backupManager -> backupManager.discardBackup(backupDir));
     }
 
     /**
@@ -129,8 +142,11 @@ public static void discardBackup(BibDatabaseContext bibDatabaseContext, Path bac
      * @param createBackup True, if a backup should be created
      * @param backupDir The path to the backup directory
      */
-    public static void shutdown(BibDatabaseContext bibDatabaseContext, Path backupDir, boolean createBackup) {
-        runningInstances.stream().filter(instance -> instance.bibDatabaseContext == bibDatabaseContext).forEach(backupManager -> backupManager.shutdown(backupDir, createBackup));
+    public static void shutdown(
+            BibDatabaseContext bibDatabaseContext, Path backupDir, boolean createBackup) {
+        runningInstances.stream()
+                .filter(instance -> instance.bibDatabaseContext == bibDatabaseContext)
+                .forEach(backupManager -> backupManager.shutdown(backupDir, createBackup));
         runningInstances.removeIf(instance -> instance.bibDatabaseContext == bibDatabaseContext);
     }
 
@@ -157,40 +173,57 @@ public static boolean backupFileDiffers(Path originalPath, Path backupDir) {
             }
             return false;
         }
-        return getLatestBackupPath(originalPath, backupDir).map(latestBackupPath -> {
-            FileTime latestBackupFileLastModifiedTime;
-            try {
-                latestBackupFileLastModifiedTime = Files.getLastModifiedTime(latestBackupPath);
-            } catch (IOException e) {
-                LOGGER.debug("Could not get timestamp of backup file {}", latestBackupPath, e);
-                // If we cannot get the timestamp, we do show any warning
-                return false;
-            }
-            FileTime currentFileLastModifiedTime;
-            try {
-                currentFileLastModifiedTime = Files.getLastModifiedTime(originalPath);
-            } catch (IOException e) {
-                LOGGER.debug("Could not get timestamp of current file file {}", originalPath, e);
-                // If we cannot get the timestamp, we do show any warning
-                return false;
-            }
-            if (latestBackupFileLastModifiedTime.compareTo(currentFileLastModifiedTime) <= 0) {
-                // Backup is older than current file
-                // We treat the backup as non-different (even if it could differ)
-                return false;
-            }
-            try {
-                boolean result = Files.mismatch(originalPath, latestBackupPath) != -1L;
-                if (result) {
-                    LOGGER.info("Backup file {} differs from current file {}", latestBackupPath, originalPath);
-                }
-                return result;
-            } catch (IOException e) {
-                LOGGER.debug("Could not compare original file and backup file.", e);
-                // User has to investigate in this case
-                return true;
-            }
-        }).orElse(false);
+        return getLatestBackupPath(originalPath, backupDir)
+                .map(
+                        latestBackupPath -> {
+                            FileTime latestBackupFileLastModifiedTime;
+                            try {
+                                latestBackupFileLastModifiedTime =
+                                        Files.getLastModifiedTime(latestBackupPath);
+                            } catch (IOException e) {
+                                LOGGER.debug(
+                                        "Could not get timestamp of backup file {}",
+                                        latestBackupPath,
+                                        e);
+                                // If we cannot get the timestamp, we do show any warning
+                                return false;
+                            }
+                            FileTime currentFileLastModifiedTime;
+                            try {
+                                currentFileLastModifiedTime =
+                                        Files.getLastModifiedTime(originalPath);
+                            } catch (IOException e) {
+                                LOGGER.debug(
+                                        "Could not get timestamp of current file file {}",
+                                        originalPath,
+                                        e);
+                                // If we cannot get the timestamp, we do show any warning
+                                return false;
+                            }
+                            if (latestBackupFileLastModifiedTime.compareTo(
+                                            currentFileLastModifiedTime)
+                                    <= 0) {
+                                // Backup is older than current file
+                                // We treat the backup as non-different (even if it could differ)
+                                return false;
+                            }
+                            try {
+                                boolean result =
+                                        Files.mismatch(originalPath, latestBackupPath) != -1L;
+                                if (result) {
+                                    LOGGER.info(
+                                            "Backup file {} differs from current file {}",
+                                            latestBackupPath,
+                                            originalPath);
+                                }
+                                return result;
+                            } catch (IOException e) {
+                                LOGGER.debug("Could not compare original file and backup file.", e);
+                                // User has to investigate in this case
+                                return true;
+                            }
+                        })
+                .orElse(false);
     }
 
     /**
@@ -212,7 +245,9 @@ public static void restoreBackup(Path originalPath, Path backupDir) {
     }
 
     Optional<Path> determineBackupPathForNewBackup(Path backupDir) {
-        return bibDatabaseContext.getDatabasePath().map(path -> BackupManager.getBackupPathForNewBackup(path, backupDir));
+        return bibDatabaseContext
+                .getDatabasePath()
+                .map(path -> BackupManager.getBackupPathForNewBackup(path, backupDir));
     }
 
     /**
@@ -238,52 +273,82 @@ void performBackup(Path backupPath) {
         }
 
         // code similar to org.jabref.gui.exporter.SaveDatabaseAction.saveDatabase
-        SelfContainedSaveOrder saveOrder = bibDatabaseContext
-                .getMetaData().getSaveOrder()
-                .map(so -> {
-                    if (so.getOrderType() == SaveOrder.OrderType.TABLE) {
-                        // We need to "flatten out" SaveOrder.OrderType.TABLE as BibWriter does not have access to preferences
-                        List<TableColumn<BibEntryTableViewModel, ?>> sortOrder = libraryTab.getMainTable().getSortOrder();
-                        return new SelfContainedSaveOrder(
-                                SaveOrder.OrderType.SPECIFIED,
-                                sortOrder.stream()
-                                         .filter(col -> col instanceof MainTableColumn<?>)
-                                         .map(column -> ((MainTableColumn<?>) column).getModel())
-                                         .flatMap(model -> model.getSortCriteria().stream())
-                                         .toList());
-                    } else {
-                        return SelfContainedSaveOrder.of(so);
-                    }
-                })
-                .orElse(SaveOrder.getDefaultSaveOrder());
-        SelfContainedSaveConfiguration saveConfiguration = (SelfContainedSaveConfiguration) new SelfContainedSaveConfiguration()
-                .withMakeBackup(false)
-                .withSaveOrder(saveOrder)
-                .withReformatOnSave(preferences.getLibraryPreferences().shouldAlwaysReformatOnSave());
+        SelfContainedSaveOrder saveOrder =
+                bibDatabaseContext
+                        .getMetaData()
+                        .getSaveOrder()
+                        .map(
+                                so -> {
+                                    if (so.getOrderType() == SaveOrder.OrderType.TABLE) {
+                                        // We need to "flatten out" SaveOrder.OrderType.TABLE as
+                                        // BibWriter does not have access to preferences
+                                        List<TableColumn<BibEntryTableViewModel, ?>> sortOrder =
+                                                libraryTab.getMainTable().getSortOrder();
+                                        return new SelfContainedSaveOrder(
+                                                SaveOrder.OrderType.SPECIFIED,
+                                                sortOrder.stream()
+                                                        .filter(
+                                                                col ->
+                                                                        col
+                                                                                instanceof
+                                                                                MainTableColumn<?>)
+                                                        .map(
+                                                                column ->
+                                                                        ((MainTableColumn<?>)
+                                                                                        column)
+                                                                                .getModel())
+                                                        .flatMap(
+                                                                model ->
+                                                                        model
+                                                                                .getSortCriteria()
+                                                                                .stream())
+                                                        .toList());
+                                    } else {
+                                        return SelfContainedSaveOrder.of(so);
+                                    }
+                                })
+                        .orElse(SaveOrder.getDefaultSaveOrder());
+        SelfContainedSaveConfiguration saveConfiguration =
+                (SelfContainedSaveConfiguration)
+                        new SelfContainedSaveConfiguration()
+                                .withMakeBackup(false)
+                                .withSaveOrder(saveOrder)
+                                .withReformatOnSave(
+                                        preferences
+                                                .getLibraryPreferences()
+                                                .shouldAlwaysReformatOnSave());
 
         // "Clone" the database context
-        // We "know" that "only" the BibEntries might be changed during writing (see [org.jabref.logic.exporter.BibDatabaseWriter.savePartOfDatabase])
-        List<BibEntry> list = bibDatabaseContext.getDatabase().getEntries().stream()
-                                                .map(BibEntry::clone)
-                                                .map(BibEntry.class::cast)
-                                                .toList();
+        // We "know" that "only" the BibEntries might be changed during writing (see
+        // [org.jabref.logic.exporter.BibDatabaseWriter.savePartOfDatabase])
+        List<BibEntry> list =
+                bibDatabaseContext.getDatabase().getEntries().stream()
+                        .map(BibEntry::clone)
+                        .map(BibEntry.class::cast)
+                        .toList();
         BibDatabase bibDatabaseClone = new BibDatabase(list);
-        BibDatabaseContext bibDatabaseContextClone = new BibDatabaseContext(bibDatabaseClone, bibDatabaseContext.getMetaData());
+        BibDatabaseContext bibDatabaseContextClone =
+                new BibDatabaseContext(bibDatabaseClone, bibDatabaseContext.getMetaData());
 
-        Charset encoding = bibDatabaseContext.getMetaData().getEncoding().orElse(StandardCharsets.UTF_8);
+        Charset encoding =
+                bibDatabaseContext.getMetaData().getEncoding().orElse(StandardCharsets.UTF_8);
         // We want to have successful backups only
         // Thus, we do not use a plain "FileWriter", but the "AtomicFileWriter"
-        // Example: What happens if one hard powers off the machine (or kills the jabref process) during writing of the backup?
-        //          This MUST NOT create a broken backup file that then jabref wants to "restore" from?
+        // Example: What happens if one hard powers off the machine (or kills the jabref process)
+        // during writing of the backup?
+        //          This MUST NOT create a broken backup file that then jabref wants to "restore"
+        // from?
         try (Writer writer = new AtomicFileWriter(backupPath, encoding, false)) {
-            BibWriter bibWriter = new BibWriter(writer, bibDatabaseContext.getDatabase().getNewLineSeparator());
+            BibWriter bibWriter =
+                    new BibWriter(writer, bibDatabaseContext.getDatabase().getNewLineSeparator());
             new BibtexDatabaseWriter(
-                    bibWriter,
-                    saveConfiguration,
-                    preferences.getFieldPreferences(),
-                    preferences.getCitationKeyPatternPreferences(),
-                    entryTypesManager)
-                    // we save the clone to prevent the original database (and thus the UI) from being changed
+                            bibWriter,
+                            saveConfiguration,
+                            preferences.getFieldPreferences(),
+                            preferences.getCitationKeyPatternPreferences(),
+                            entryTypesManager)
+                    // we save the clone to prevent the original database (and thus the UI) from
+                    // being changed
                     .saveDatabase(bibDatabaseContextClone);
             backupFilesQueue.add(backupPath);
 
@@ -296,7 +361,11 @@ void performBackup(Path backupPath) {
     }
 
     private static Path determineDiscardedFile(Path file, Path backupDir) {
-        return backupDir.resolve(BackupFileUtil.getUniqueFilePrefix(file) + "--" + file.getFileName() + "--discarded");
+        return backupDir.resolve(
+                BackupFileUtil.getUniqueFilePrefix(file)
+                        + "--"
+                        + file.getFileName()
+                        + "--discarded");
     }
 
     /**
@@ -328,7 +397,8 @@ private void logIfCritical(Path backupPath, IOException e) {
     }
 
     @Subscribe
-    public synchronized void listen(@SuppressWarnings("unused") BibDatabaseContextChangedEvent event) {
+    public synchronized void listen(
+            @SuppressWarnings("unused") BibDatabaseContextChangedEvent event) {
         if (!event.isFilteredOut()) {
             this.needsBackup = true;
         }
@@ -338,30 +408,47 @@ private void startBackupTask(Path backupDir) {
         fillQueue(backupDir);
 
         executor.scheduleAtFixedRate(
-                                     // We need to determine the backup path on each action, because we use the timestamp in the filename
-                                     () -> determineBackupPathForNewBackup(backupDir).ifPresent(path -> this.performBackup(path)),
-                                     DELAY_BETWEEN_BACKUP_ATTEMPTS_IN_SECONDS,
-                                     DELAY_BETWEEN_BACKUP_ATTEMPTS_IN_SECONDS,
-                                     TimeUnit.SECONDS);
+                // We need to determine the backup path on each action, because we use the timestamp
+                // in the filename
+                () ->
+                        determineBackupPathForNewBackup(backupDir)
+                                .ifPresent(path -> this.performBackup(path)),
+                DELAY_BETWEEN_BACKUP_ATTEMPTS_IN_SECONDS,
+                DELAY_BETWEEN_BACKUP_ATTEMPTS_IN_SECONDS,
+                TimeUnit.SECONDS);
     }
 
     private void fillQueue(Path backupDir) {
         if (!Files.exists(backupDir)) {
             return;
         }
-        bibDatabaseContext.getDatabasePath().ifPresent(databasePath -> {
-            // code similar to {@link org.jabref.logic.util.io.BackupFileUtil.getPathOfLatestExisingBackupFile}
-            final String prefix = BackupFileUtil.getUniqueFilePrefix(databasePath) + "--" + databasePath.getFileName();
-            try {
-                List<Path> allSavFiles = Files.list(backupDir)
-                                              // just list the .sav belonging to the given targetFile
-                                              .filter(p -> p.getFileName().toString().startsWith(prefix))
-                                              .sorted().toList();
-                backupFilesQueue.addAll(allSavFiles);
-            } catch (IOException e) {
-                LOGGER.error("Could not determine most recent file", e);
-            }
-        });
+        bibDatabaseContext
+                .getDatabasePath()
+                .ifPresent(
+                        databasePath -> {
+                            // code similar to {@link
+                            // org.jabref.logic.util.io.BackupFileUtil.getPathOfLatestExisingBackupFile}
+                            final String prefix =
+                                    BackupFileUtil.getUniqueFilePrefix(databasePath)
+                                            + "--"
+                                            + databasePath.getFileName();
+                            try {
+                                List<Path> allSavFiles =
+                                        Files.list(backupDir)
+                                                // just list the .sav belonging to the given
+                                                // targetFile
+                                                .filter(
+                                                        p ->
+                                                                p.getFileName()
+                                                                        .toString()
+                                                                        .startsWith(prefix))
+                                                .sorted()
+                                                .toList();
+                                backupFilesQueue.addAll(allSavFiles);
+                            } catch (IOException e) {
+                                LOGGER.error("Could not determine most recent file", e);
+                            }
+                        });
     }
 
     /**
diff --git a/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java b/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java
index 511ef2d168a1..d3e903efa592 100644
--- a/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java
+++ b/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.auximport;
 
-import java.util.stream.Collectors;
-
 import org.jabref.logic.auxparser.AuxParserResult;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.stream.Collectors;
+
 public class AuxParserResultViewModel {
 
     private AuxParserResult auxParserResult;
@@ -21,18 +21,41 @@ public AuxParserResultViewModel(AuxParserResult auxParserResult) {
     public String getInformation(boolean includeMissingEntries) {
         String missingEntries = "";
         if (includeMissingEntries && (this.auxParserResult.getUnresolvedKeysCount() > 0)) {
-            missingEntries = this.auxParserResult.getUnresolvedKeys().stream().collect(Collectors.joining(", ", " (", ")"));
+            missingEntries =
+                    this.auxParserResult.getUnresolvedKeys().stream()
+                            .collect(Collectors.joining(", ", " (", ")"));
         }
 
         StringBuilder result = new StringBuilder();
-        result.append(Localization.lang("keys in library")).append(' ').append(this.auxParserResult.getMasterDatabase().getEntryCount()).append('\n')
-              .append(Localization.lang("found in AUX file")).append(' ').append(this.auxParserResult.getFoundKeysInAux()).append('\n')
-              .append(Localization.lang("resolved")).append(' ').append(this.auxParserResult.getResolvedKeysCount()).append('\n')
-              .append(Localization.lang("not found")).append(' ').append(this.auxParserResult.getUnresolvedKeysCount()).append(missingEntries).append('\n')
-              .append(Localization.lang("crossreferenced entries included")).append(' ').append(this.auxParserResult.getCrossRefEntriesCount()).append('\n')
-              .append(Localization.lang("strings included")).append(' ').append(this.auxParserResult.getInsertedStrings()).append('\n');
+        result.append(Localization.lang("keys in library"))
+                .append(' ')
+                .append(this.auxParserResult.getMasterDatabase().getEntryCount())
+                .append('\n')
+                .append(Localization.lang("found in AUX file"))
+                .append(' ')
+                .append(this.auxParserResult.getFoundKeysInAux())
+                .append('\n')
+                .append(Localization.lang("resolved"))
+                .append(' ')
+                .append(this.auxParserResult.getResolvedKeysCount())
+                .append('\n')
+                .append(Localization.lang("not found"))
+                .append(' ')
+                .append(this.auxParserResult.getUnresolvedKeysCount())
+                .append(missingEntries)
+                .append('\n')
+                .append(Localization.lang("crossreferenced entries included"))
+                .append(' ')
+                .append(this.auxParserResult.getCrossRefEntriesCount())
+                .append('\n')
+                .append(Localization.lang("strings included"))
+                .append(' ')
+                .append(this.auxParserResult.getInsertedStrings())
+                .append('\n');
         if (this.auxParserResult.getNestedAuxCount() > 0) {
-            result.append(Localization.lang("nested AUX files")).append(' ').append(this.auxParserResult.getNestedAuxCount());
+            result.append(Localization.lang("nested AUX files"))
+                    .append(' ')
+                    .append(this.auxParserResult.getNestedAuxCount());
         }
         return result.toString();
     }
diff --git a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
index f60123a2b948..5f02e6db920f 100644
--- a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
+++ b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
@@ -1,5 +1,10 @@
 package org.jabref.gui.auximport;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import jakarta.inject.Inject;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -18,10 +23,6 @@
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
-
 /**
  * A wizard dialog for generating a new sub database from existing TeX AUX file
  */
@@ -44,26 +45,26 @@ public FromAuxDialog(LibraryTabContainer tabContainer) {
         this.tabContainer = tabContainer;
         this.setTitle(Localization.lang("AUX file import"));
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         Button generateButton = (Button) this.getDialogPane().lookupButton(generateButtonType);
         generateButton.disableProperty().bind(viewModel.parseFailedProperty());
         generateButton.defaultButtonProperty().bind(generateButton.disableProperty().not());
-        setResultConverter(button -> {
-            if (button == generateButtonType) {
-                viewModel.addResultToTabContainer();
-            }
-            return null;
-        });
+        setResultConverter(
+                button -> {
+                    if (button == generateButtonType) {
+                        viewModel.addResultToTabContainer();
+                    }
+                    return null;
+                });
 
         themeManager.updateFontStyle(getDialogPane().getScene());
     }
 
     @FXML
     private void initialize() {
-        viewModel = new FromAuxDialogViewModel(tabContainer, dialogService, preferences, stateManager);
+        viewModel =
+                new FromAuxDialogViewModel(tabContainer, dialogService, preferences, stateManager);
 
         auxFileField.textProperty().bindBidirectional(viewModel.auxFileProperty());
         statusInfos.textProperty().bindBidirectional(viewModel.statusTextProperty());
@@ -75,7 +76,9 @@ private void initialize() {
         new ViewModelListCellFactory<BibDatabaseContext>()
                 .withText(viewModel::getDatabaseName)
                 .install(libraryListView);
-        EasyBind.listen(libraryListView.getSelectionModel().selectedItemProperty(), (obs, oldValue, newValue) -> parseActionPerformed());
+        EasyBind.listen(
+                libraryListView.getSelectionModel().selectedItemProperty(),
+                (obs, oldValue, newValue) -> parseActionPerformed());
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/auximport/FromAuxDialogViewModel.java b/src/main/java/org/jabref/gui/auximport/FromAuxDialogViewModel.java
index eb871f44a225..be31383f858e 100644
--- a/src/main/java/org/jabref/gui/auximport/FromAuxDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/auximport/FromAuxDialogViewModel.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.auximport;
 
-import java.nio.file.Path;
-import java.util.Optional;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -29,16 +28,20 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 
-import com.tobiasdiez.easybind.EasyBind;
+import java.nio.file.Path;
+import java.util.Optional;
 
 public class FromAuxDialogViewModel {
 
     private final BooleanProperty parseFailedProperty = new SimpleBooleanProperty(false);
     private final StringProperty auxFileProperty = new SimpleStringProperty();
     private final StringProperty statusTextProperty = new SimpleStringProperty();
-    private final ListProperty<String> notFoundList = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ListProperty<BibDatabaseContext> librariesProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<BibDatabaseContext> selectedLibraryProperty = new SimpleObjectProperty<>();
+    private final ListProperty<String> notFoundList =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<BibDatabaseContext> librariesProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<BibDatabaseContext> selectedLibraryProperty =
+            new SimpleObjectProperty<>();
 
     private final LibraryTabContainer tabContainer;
     private final DialogService dialogService;
@@ -47,10 +50,11 @@ public class FromAuxDialogViewModel {
 
     private AuxParserResult auxParserResult;
 
-    public FromAuxDialogViewModel(LibraryTabContainer tabContainer,
-                                  DialogService dialogService,
-                                  CliPreferences preferences,
-                                  StateManager stateManager) {
+    public FromAuxDialogViewModel(
+            LibraryTabContainer tabContainer,
+            DialogService dialogService,
+            CliPreferences preferences,
+            StateManager stateManager) {
         this.tabContainer = tabContainer;
         this.dialogService = dialogService;
         this.preferences = preferences;
@@ -58,31 +62,44 @@ public FromAuxDialogViewModel(LibraryTabContainer tabContainer,
 
         librariesProperty.setAll(stateManager.getOpenDatabases());
         selectedLibraryProperty.set(tabContainer.getCurrentLibraryTab().getBibDatabaseContext());
-        EasyBind.listen(selectedLibraryProperty, (obs, oldValue, newValue) -> {
-            if (auxParserResult != null) {
-                parse();
-            }
-        });
+        EasyBind.listen(
+                selectedLibraryProperty,
+                (obs, oldValue, newValue) -> {
+                    if (auxParserResult != null) {
+                        parse();
+                    }
+                });
     }
 
     public String getDatabaseName(BibDatabaseContext databaseContext) {
         Optional<String> dbOpt = Optional.empty();
         if (databaseContext.getDatabasePath().isPresent()) {
-            dbOpt = FileUtil.getUniquePathFragment(stateManager.collectAllDatabasePaths(), databaseContext.getDatabasePath().get());
+            dbOpt =
+                    FileUtil.getUniquePathFragment(
+                            stateManager.collectAllDatabasePaths(),
+                            databaseContext.getDatabasePath().get());
         }
         if (databaseContext.getLocation() == DatabaseLocation.SHARED) {
-            return databaseContext.getDBMSSynchronizer().getDBName() + " [" + Localization.lang("shared") + "]";
+            return databaseContext.getDBMSSynchronizer().getDBName()
+                    + " ["
+                    + Localization.lang("shared")
+                    + "]";
         }
 
         return dbOpt.orElse(Localization.lang("untitled"));
     }
 
     public void browse() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.AUX)
-                .withDefaultExtension(StandardFileType.AUX)
-                .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory()).build();
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> auxFileProperty.setValue(file.toAbsolutePath().toString()));
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(StandardFileType.AUX)
+                        .withDefaultExtension(StandardFileType.AUX)
+                        .withInitialDirectory(
+                                preferences.getFilePreferences().getWorkingDirectory())
+                        .build();
+        dialogService
+                .showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(file -> auxFileProperty.setValue(file.toAbsolutePath().toString()));
     }
 
     public void parse() {
@@ -96,11 +113,13 @@ public void parse() {
             AuxParser auxParser = new DefaultAuxParser(referenceDatabase);
             auxParserResult = auxParser.parse(Path.of(auxName));
             notFoundList.setAll(auxParserResult.getUnresolvedKeys());
-            statusTextProperty.set(new AuxParserResultViewModel(auxParserResult).getInformation(false));
+            statusTextProperty.set(
+                    new AuxParserResultViewModel(auxParserResult).getInformation(false));
 
             if (!auxParserResult.getGeneratedBibDatabase().hasEntries()) {
                 // The generated database contains no entries -> no active generate-button
-                statusTextProperty.set(statusTextProperty.get() + "\n" + Localization.lang("empty library"));
+                statusTextProperty.set(
+                        statusTextProperty.get() + "\n" + Localization.lang("empty library"));
                 parseFailedProperty.set(true);
             }
         } else {
@@ -109,7 +128,8 @@ public void parse() {
     }
 
     public void addResultToTabContainer() {
-        BibDatabaseContext context = new BibDatabaseContext(auxParserResult.getGeneratedBibDatabase());
+        BibDatabaseContext context =
+                new BibDatabaseContext(auxParserResult.getGeneratedBibDatabase());
         tabContainer.addTab(context, true);
     }
 
diff --git a/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java b/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java
index 2af0171b5da7..f7f71d5efbd7 100644
--- a/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java
+++ b/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java
@@ -1,12 +1,12 @@
 package org.jabref.gui.auximport;
 
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-
 /**
  * The action concerned with generate a new (sub-)database from latex AUX file.
  *
@@ -17,7 +17,10 @@ public class NewSubLibraryAction extends SimpleCommand {
     private final LibraryTabContainer tabContainer;
     private final DialogService dialogService;
 
-    public NewSubLibraryAction(LibraryTabContainer tabContainer, StateManager stateManager, DialogService dialogService) {
+    public NewSubLibraryAction(
+            LibraryTabContainer tabContainer,
+            StateManager stateManager,
+            DialogService dialogService) {
         this.tabContainer = tabContainer;
         this.dialogService = dialogService;
 
diff --git a/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java b/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java
index cf35336765d2..32894d3beed6 100644
--- a/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java
+++ b/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java
@@ -1,61 +1,81 @@
 package org.jabref.gui.backup;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Optional;
-
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Hyperlink;
 
+import org.controlsfx.control.HyperlinkLabel;
 import org.jabref.gui.FXDialog;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BackupFileType;
 import org.jabref.logic.util.io.BackupFileUtil;
-
-import org.controlsfx.control.HyperlinkLabel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+
 public class BackupResolverDialog extends FXDialog {
-    public static final ButtonType RESTORE_FROM_BACKUP = new ButtonType(Localization.lang("Restore from backup"), ButtonBar.ButtonData.OK_DONE);
-    public static final ButtonType REVIEW_BACKUP = new ButtonType(Localization.lang("Review backup"), ButtonBar.ButtonData.LEFT);
-    public static final ButtonType IGNORE_BACKUP = new ButtonType(Localization.lang("Ignore backup"), ButtonBar.ButtonData.CANCEL_CLOSE);
+    public static final ButtonType RESTORE_FROM_BACKUP =
+            new ButtonType(Localization.lang("Restore from backup"), ButtonBar.ButtonData.OK_DONE);
+    public static final ButtonType REVIEW_BACKUP =
+            new ButtonType(Localization.lang("Review backup"), ButtonBar.ButtonData.LEFT);
+    public static final ButtonType IGNORE_BACKUP =
+            new ButtonType(Localization.lang("Ignore backup"), ButtonBar.ButtonData.CANCEL_CLOSE);
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BackupResolverDialog.class);
 
-    public BackupResolverDialog(Path originalPath, Path backupDir, ExternalApplicationsPreferences externalApplicationsPreferences) {
+    public BackupResolverDialog(
+            Path originalPath,
+            Path backupDir,
+            ExternalApplicationsPreferences externalApplicationsPreferences) {
         super(AlertType.CONFIRMATION, Localization.lang("Backup found"), true);
         setHeaderText(null);
         getDialogPane().setMinHeight(180);
         getDialogPane().getButtonTypes().setAll(RESTORE_FROM_BACKUP, REVIEW_BACKUP, IGNORE_BACKUP);
 
-        Optional<Path> backupPathOpt = BackupFileUtil.getPathOfLatestExistingBackupFile(originalPath, BackupFileType.BACKUP, backupDir);
-        String backupFilename = backupPathOpt.map(Path::getFileName).map(Path::toString).orElse(Localization.lang("File not found"));
-        String content = Localization.lang("A backup file for '%0' was found at [%1]", originalPath.getFileName().toString(), backupFilename) + "\n" +
-                Localization.lang("This could indicate that JabRef did not shut down cleanly last time the file was used.") + "\n\n" +
-                Localization.lang("Do you want to recover the library from the backup file?");
+        Optional<Path> backupPathOpt =
+                BackupFileUtil.getPathOfLatestExistingBackupFile(
+                        originalPath, BackupFileType.BACKUP, backupDir);
+        String backupFilename =
+                backupPathOpt
+                        .map(Path::getFileName)
+                        .map(Path::toString)
+                        .orElse(Localization.lang("File not found"));
+        String content =
+                Localization.lang(
+                                "A backup file for '%0' was found at [%1]",
+                                originalPath.getFileName().toString(), backupFilename)
+                        + "\n"
+                        + Localization.lang(
+                                "This could indicate that JabRef did not shut down cleanly last time the file was used.")
+                        + "\n\n"
+                        + Localization.lang(
+                                "Do you want to recover the library from the backup file?");
         setContentText(content);
 
         HyperlinkLabel contentLabel = new HyperlinkLabel(content);
         contentLabel.setPrefWidth(360);
-        contentLabel.setOnAction(e -> {
-            if (backupPathOpt.isPresent()) {
-                if (!(e.getSource() instanceof Hyperlink)) {
-                    return;
-                }
-                String clickedLinkText = ((Hyperlink) (e.getSource())).getText();
-                if (backupFilename.equals(clickedLinkText)) {
-                    try {
-                        NativeDesktop.openFolderAndSelectFile(backupPathOpt.get(), externalApplicationsPreferences, null);
-                    } catch (IOException ex) {
-                        LOGGER.error("Could not open backup folder", ex);
+        contentLabel.setOnAction(
+                e -> {
+                    if (backupPathOpt.isPresent()) {
+                        if (!(e.getSource() instanceof Hyperlink)) {
+                            return;
+                        }
+                        String clickedLinkText = ((Hyperlink) (e.getSource())).getText();
+                        if (backupFilename.equals(clickedLinkText)) {
+                            try {
+                                NativeDesktop.openFolderAndSelectFile(
+                                        backupPathOpt.get(), externalApplicationsPreferences, null);
+                            } catch (IOException ex) {
+                                LOGGER.error("Could not open backup folder", ex);
+                            }
+                        }
                     }
-                }
-            }
-        });
+                });
         getDialogPane().setContent(contentLabel);
     }
 }
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractor.java b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractor.java
index 98b29620e5bc..b24dc50cacfc 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractor.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractor.java
@@ -1,5 +1,10 @@
 package org.jabref.gui.bibtexextractor;
 
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.EntryType;
+import org.jabref.model.entry.types.StandardEntryType;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -7,11 +12,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.entry.types.EntryType;
-import org.jabref.model.entry.types.StandardEntryType;
-
 public class BibtexExtractor {
 
     private static final String AUTHOR_TAG = "[author_tag]";
@@ -22,29 +22,41 @@ public class BibtexExtractor {
     private static final String INITIALS_GROUP = "INITIALS";
     private static final String LASTNAME_GROUP = "LASTNAME";
 
-    private static final Pattern URL_PATTERN = Pattern.compile(
-            "(?:^|[\\W])((ht|f)tp(s?):\\/\\/|www\\.)" +
-                    "(([\\w\\-]+\\.)+?([\\w\\-.~]+\\/?)*" +
-                    "[\\p{Alnum}.,%_=?&#\\-+()\\[\\]\\*$~@!:/{};']*)",
-            Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-
-    private static final Pattern YEAR_PATTERN = Pattern.compile(
-            "\\d{4}",
-            Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-
-    private static final Pattern AUTHOR_PATTERN = Pattern.compile(
-            "(?<" + LASTNAME_GROUP + ">\\p{Lu}\\w+),?\\s(?<" + INITIALS_GROUP + ">(\\p{Lu}\\.\\s){1,2})" +
-                    "\\s*(and|,|\\.)*",
-            Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-
-    private static final Pattern AUTHOR_PATTERN_2 = Pattern.compile(
-            "(?<" + INITIALS_GROUP + ">(\\p{Lu}\\.\\s){1,2})(?<" + LASTNAME_GROUP + ">\\p{Lu}\\w+)" +
-                    "\\s*(and|,|\\.)*",
-            Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-
-    private static final Pattern PAGES_PATTERN = Pattern.compile(
-            "(p.)?\\s?\\d+(-\\d+)?",
-            Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+    private static final Pattern URL_PATTERN =
+            Pattern.compile(
+                    "(?:^|[\\W])((ht|f)tp(s?):\\/\\/|www\\.)"
+                            + "(([\\w\\-]+\\.)+?([\\w\\-.~]+\\/?)*"
+                            + "[\\p{Alnum}.,%_=?&#\\-+()\\[\\]\\*$~@!:/{};']*)",
+                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+
+    private static final Pattern YEAR_PATTERN =
+            Pattern.compile(
+                    "\\d{4}", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+
+    private static final Pattern AUTHOR_PATTERN =
+            Pattern.compile(
+                    "(?<"
+                            + LASTNAME_GROUP
+                            + ">\\p{Lu}\\w+),?\\s(?<"
+                            + INITIALS_GROUP
+                            + ">(\\p{Lu}\\.\\s){1,2})"
+                            + "\\s*(and|,|\\.)*",
+                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+
+    private static final Pattern AUTHOR_PATTERN_2 =
+            Pattern.compile(
+                    "(?<"
+                            + INITIALS_GROUP
+                            + ">(\\p{Lu}\\.\\s){1,2})(?<"
+                            + LASTNAME_GROUP
+                            + ">\\p{Lu}\\w+)"
+                            + "\\s*(and|,|\\.)*",
+                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+
+    private static final Pattern PAGES_PATTERN =
+            Pattern.compile(
+                    "(p.)?\\s?\\d+(-\\d+)?",
+                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
 
     private final List<String> urls = new ArrayList<>();
     private final List<String> authors = new ArrayList<>();
@@ -93,7 +105,8 @@ private String findYear(String input) {
         while (matcher.find()) {
             String yearCandidate = input.substring(matcher.start(), matcher.end());
             int intYearCandidate = Integer.parseInt(yearCandidate);
-            if ((intYearCandidate > 1700) && (intYearCandidate <= Calendar.getInstance().get(Calendar.YEAR))) {
+            if ((intYearCandidate > 1700)
+                    && (intYearCandidate <= Calendar.getInstance().get(Calendar.YEAR))) {
                 year = yearCandidate;
                 return fixSpaces(input.replace(year, YEAR_TAG));
             }
@@ -109,7 +122,8 @@ private String findAuthors(String input) {
     private String findAuthorsByPattern(String input, Pattern pattern) {
         Matcher matcher = pattern.matcher(input);
         while (matcher.find()) {
-            authors.add(GenerateAuthor(matcher.group(LASTNAME_GROUP), matcher.group(INITIALS_GROUP)));
+            authors.add(
+                    GenerateAuthor(matcher.group(LASTNAME_GROUP), matcher.group(INITIALS_GROUP)));
         }
         return fixSpaces(matcher.replaceAll(AUTHOR_TAG));
     }
@@ -128,8 +142,9 @@ private String findPages(String input) {
 
     private String fixSpaces(String input) {
         return input.replaceAll("[,.!?;:]", "$0 ")
-                    .replaceAll("\\p{Lt}", " $0")
-                    .replaceAll("\\s+", " ").trim();
+                .replaceAll("\\p{Lt}", " $0")
+                .replaceAll("\\s+", " ")
+                .trim();
     }
 
     private String findParts(String input) {
@@ -142,9 +157,10 @@ private String findParts(String input) {
         }
         int delimiterIndex = input.lastIndexOf("//");
         if (delimiterIndex != -1) {
-            lastParts.add(input.substring(afterAuthorsIndex, delimiterIndex)
-                               .replace(YEAR_TAG, "")
-                               .replace(PAGES_TAG, ""));
+            lastParts.add(
+                    input.substring(afterAuthorsIndex, delimiterIndex)
+                            .replace(YEAR_TAG, "")
+                            .replace(PAGES_TAG, ""));
             lastParts.addAll(Arrays.asList(input.substring(delimiterIndex + 2).split(",|\\.")));
         } else {
             lastParts.addAll(Arrays.asList(input.substring(afterAuthorsIndex).split(",|\\.")));
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
index 4e1ea80e0e16..789140f9a942 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.bibtexextractor;
 
-import java.util.List;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
@@ -20,10 +16,13 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
+import javax.swing.undo.UndoManager;
+
 /**
  * View model for the feature "Extract BibTeX from plain text".
  * Handles both online and offline case.
@@ -42,26 +41,28 @@ public class BibtexExtractorViewModel {
     private final ImportHandler importHandler;
     private final StringProperty inputTextProperty = new SimpleStringProperty("");
 
-    public BibtexExtractorViewModel(boolean onlineMode,
-                                    BibDatabaseContext bibdatabaseContext,
-                                    DialogService dialogService,
-                                    GuiPreferences preferences,
-                                    FileUpdateMonitor fileUpdateMonitor,
-                                    TaskExecutor taskExecutor,
-                                    UndoManager undoManager,
-                                    StateManager stateManager) {
+    public BibtexExtractorViewModel(
+            boolean onlineMode,
+            BibDatabaseContext bibdatabaseContext,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            FileUpdateMonitor fileUpdateMonitor,
+            TaskExecutor taskExecutor,
+            UndoManager undoManager,
+            StateManager stateManager) {
         this.onlineMode = onlineMode;
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.taskExecutor = taskExecutor;
-        this.importHandler = new ImportHandler(
-                bibdatabaseContext,
-                preferences,
-                fileUpdateMonitor,
-                undoManager,
-                stateManager,
-                dialogService,
-                taskExecutor);
+        this.importHandler =
+                new ImportHandler(
+                        bibdatabaseContext,
+                        preferences,
+                        fileUpdateMonitor,
+                        undoManager,
+                        stateManager,
+                        dialogService,
+                        taskExecutor);
     }
 
     public void startParsing() {
@@ -78,22 +79,36 @@ private void startParsingOffline() {
     }
 
     private void startParsingOnline() {
-        GrobidCitationFetcher grobidCitationFetcher = new GrobidCitationFetcher(preferences.getGrobidPreferences(), preferences.getImportFormatPreferences());
+        GrobidCitationFetcher grobidCitationFetcher =
+                new GrobidCitationFetcher(
+                        preferences.getGrobidPreferences(),
+                        preferences.getImportFormatPreferences());
         BackgroundTask.wrap(() -> grobidCitationFetcher.performSearch(inputTextProperty.getValue()))
-                      .onRunning(() -> dialogService.notify(Localization.lang("Your text is being parsed...")))
-                      .onFailure(e -> {
-                          if (e instanceof FetcherException) {
-                              String msg = Localization.lang("There are connection issues with a JabRef server. Detailed information: %0",
-                                      e.getMessage());
-                              dialogService.notify(msg);
-                          } else {
-                              LOGGER.warn("Missing exception handling.", e);
-                          }
-                      })
-                      .onSuccess(parsedEntries -> {
-                          dialogService.notify(Localization.lang("%0 entries were parsed from your query.", String.valueOf(parsedEntries.size())));
-                          importHandler.importEntries(parsedEntries);
-                      }).executeWith(taskExecutor);
+                .onRunning(
+                        () ->
+                                dialogService.notify(
+                                        Localization.lang("Your text is being parsed...")))
+                .onFailure(
+                        e -> {
+                            if (e instanceof FetcherException) {
+                                String msg =
+                                        Localization.lang(
+                                                "There are connection issues with a JabRef server. Detailed information: %0",
+                                                e.getMessage());
+                                dialogService.notify(msg);
+                            } else {
+                                LOGGER.warn("Missing exception handling.", e);
+                            }
+                        })
+                .onSuccess(
+                        parsedEntries -> {
+                            dialogService.notify(
+                                    Localization.lang(
+                                            "%0 entries were parsed from your query.",
+                                            String.valueOf(parsedEntries.size())));
+                            importHandler.importEntries(parsedEntries);
+                        })
+                .executeWith(taskExecutor);
     }
 
     public StringProperty inputTextProperty() {
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexActionOffline.java b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexActionOffline.java
index ddd1eba3dda4..8b179264449e 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexActionOffline.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexActionOffline.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.bibtexextractor;
 
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-
 public class ExtractBibtexActionOffline extends SimpleCommand {
 
     private final DialogService dialogService;
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexActionOnline.java b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexActionOnline.java
index 043076067e4b..d0144137c57d 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexActionOnline.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexActionOnline.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.bibtexextractor;
 
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+
 import javafx.beans.binding.Bindings;
 
 import org.jabref.gui.DialogService;
@@ -8,22 +10,23 @@
 import org.jabref.gui.importer.GrobidOptInDialogHelper;
 import org.jabref.logic.preferences.CliPreferences;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-
 public class ExtractBibtexActionOnline extends SimpleCommand {
 
     private final CliPreferences preferences;
     private final DialogService dialogService;
 
-    public ExtractBibtexActionOnline(DialogService dialogService, CliPreferences preferences, StateManager stateManager, boolean requiresGrobid) {
+    public ExtractBibtexActionOnline(
+            DialogService dialogService,
+            CliPreferences preferences,
+            StateManager stateManager,
+            boolean requiresGrobid) {
         this.preferences = preferences;
         this.dialogService = dialogService;
         if (requiresGrobid) {
             this.executable.bind(
                     Bindings.and(
                             preferences.getGrobidPreferences().grobidEnabledProperty(),
-                            needsDatabase(stateManager)
-                    ));
+                            needsDatabase(stateManager)));
         } else {
             this.executable.bind(needsDatabase(stateManager));
         }
@@ -31,7 +34,9 @@ public ExtractBibtexActionOnline(DialogService dialogService, CliPreferences pre
 
     @Override
     public void execute() {
-        boolean useGrobid = GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferences.getGrobidPreferences());
+        boolean useGrobid =
+                GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(
+                        dialogService, preferences.getGrobidPreferences());
         dialogService.showCustomDialogAndWait(new ExtractBibtexDialog(useGrobid));
     }
 }
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
index bf6266630b4a..aef116bc9968 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
@@ -1,6 +1,8 @@
 package org.jabref.gui.bibtexextractor;
 
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
 
 import javafx.application.Platform;
 import javafx.fxml.FXML;
@@ -20,8 +22,7 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+import javax.swing.undo.UndoManager;
 
 /**
  * GUI Dialog for the feature "Extract BibTeX from plain text".
@@ -46,9 +47,7 @@ public class ExtractBibtexDialog extends BaseDialog<Void> {
 
     public ExtractBibtexDialog(boolean onlineMode) {
         this.onlineMode = onlineMode;
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
         if (onlineMode) {
             this.setTitle(Localization.lang("Plain References Parser (online)"));
         } else {
@@ -58,32 +57,42 @@ public ExtractBibtexDialog(boolean onlineMode) {
 
     @FXML
     private void initialize() {
-        BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null"));
-        BibtexExtractorViewModel viewModel = new BibtexExtractorViewModel(
-                onlineMode,
-                database,
-                dialogService,
-                preferences,
-                fileUpdateMonitor,
-                taskExecutor,
-                undoManager,
-                stateManager);
+        BibDatabaseContext database =
+                stateManager
+                        .getActiveDatabase()
+                        .orElseThrow(() -> new NullPointerException("Database null"));
+        BibtexExtractorViewModel viewModel =
+                new BibtexExtractorViewModel(
+                        onlineMode,
+                        database,
+                        dialogService,
+                        preferences,
+                        fileUpdateMonitor,
+                        taskExecutor,
+                        undoManager,
+                        stateManager);
 
         input.textProperty().bindBidirectional(viewModel.inputTextProperty());
         String clipText = ClipBoardManager.getContents();
         if (StringUtil.isBlank(clipText)) {
-            input.setPromptText(Localization.lang("Please enter the plain references to extract from separated by double empty lines."));
+            input.setPromptText(
+                    Localization.lang(
+                            "Please enter the plain references to extract from separated by double empty lines."));
         } else {
             input.setText(clipText);
             input.selectAll();
         }
 
-        Platform.runLater(() -> {
-            input.requestFocus();
-            Button buttonParse = (Button) getDialogPane().lookupButton(parseButtonType);
-            buttonParse.setTooltip(new Tooltip((Localization.lang("Starts the extraction and adds the resulting entries to the currently opened database"))));
-            buttonParse.setOnAction(event -> viewModel.startParsing());
-            buttonParse.disableProperty().bind(viewModel.inputTextProperty().isEmpty());
-        });
+        Platform.runLater(
+                () -> {
+                    input.requestFocus();
+                    Button buttonParse = (Button) getDialogPane().lookupButton(parseButtonType);
+                    buttonParse.setTooltip(
+                            new Tooltip(
+                                    (Localization.lang(
+                                            "Starts the extraction and adds the resulting entries to the currently opened database"))));
+                    buttonParse.setOnAction(event -> viewModel.startParsing());
+                    buttonParse.disableProperty().bind(viewModel.inputTextProperty().isEmpty());
+                });
     }
 }
diff --git a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
index ce661fdff534..cfe53e9ada00 100644
--- a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
+++ b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.citationkeypattern;
 
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
@@ -21,6 +15,12 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntry;
 
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import javax.swing.undo.UndoManager;
+
 public class GenerateCitationKeyAction extends SimpleCommand {
 
     private final Supplier<LibraryTab> tabSupplier;
@@ -34,12 +34,13 @@ public class GenerateCitationKeyAction extends SimpleCommand {
     private final CliPreferences preferences;
     private final UndoManager undoManager;
 
-    public GenerateCitationKeyAction(Supplier<LibraryTab> tabSupplier,
-                                     DialogService dialogService,
-                                     StateManager stateManager,
-                                     TaskExecutor taskExecutor,
-                                     CliPreferences preferences,
-                                     UndoManager undoManager) {
+    public GenerateCitationKeyAction(
+            Supplier<LibraryTab> tabSupplier,
+            DialogService dialogService,
+            StateManager stateManager,
+            TaskExecutor taskExecutor,
+            CliPreferences preferences,
+            UndoManager undoManager) {
         this.tabSupplier = tabSupplier;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
@@ -55,11 +56,15 @@ public void execute() {
         entries = stateManager.getSelectedEntries();
 
         if (entries.isEmpty()) {
-            dialogService.showWarningDialogAndWait(Localization.lang("Autogenerate citation keys"),
-                    Localization.lang("First select the entries you want keys to be generated for."));
+            dialogService.showWarningDialogAndWait(
+                    Localization.lang("Autogenerate citation keys"),
+                    Localization.lang(
+                            "First select the entries you want keys to be generated for."));
             return;
         }
-        dialogService.notify(formatOutputMessage(Localization.lang("Generating citation key for"), entries.size()));
+        dialogService.notify(
+                formatOutputMessage(
+                        Localization.lang("Generating citation key for"), entries.size()));
 
         checkOverwriteKeysChosen();
 
@@ -67,13 +72,16 @@ public void execute() {
             BackgroundTask<Void> backgroundTask = this.generateKeysInBackground();
             backgroundTask.showToUser(true);
             backgroundTask.titleProperty().set(Localization.lang("Autogenerate citation keys"));
-            backgroundTask.messageProperty().set(Localization.lang("%0/%1 entries", 0, entries.size()));
+            backgroundTask
+                    .messageProperty()
+                    .set(Localization.lang("%0/%1 entries", 0, entries.size()));
 
             backgroundTask.executeWith(this.taskExecutor);
         }
     }
 
-    public static boolean confirmOverwriteKeys(DialogService dialogService, CliPreferences preferences) {
+    public static boolean confirmOverwriteKeys(
+            DialogService dialogService, CliPreferences preferences) {
         if (preferences.getCitationKeyPatternPreferences().shouldWarnBeforeOverwriteCiteKey()) {
             return dialogService.showConfirmationDialogWithOptOutAndWait(
                     Localization.lang("Overwrite keys"),
@@ -81,7 +89,10 @@ public static boolean confirmOverwriteKeys(DialogService dialogService, CliPrefe
                     Localization.lang("Overwrite keys"),
                     Localization.lang("Cancel"),
                     Localization.lang("Do not ask again"),
-                    optOut -> preferences.getCitationKeyPatternPreferences().setWarnBeforeOverwriteCiteKey(!optOut));
+                    optOut ->
+                            preferences
+                                    .getCitationKeyPatternPreferences()
+                                    .setWarnBeforeOverwriteCiteKey(!optOut));
         } else {
             // Always overwrite keys by default
             return true;
@@ -109,32 +120,54 @@ private BackgroundTask<Void> generateKeysInBackground() {
 
             @Override
             public Void call() {
-                    if (isCanceled) {
-                        return null;
-                    }
-                UiTaskExecutor.runInJavaFXThread(() -> {
-                        updateProgress(0, entries.size());
-                        messageProperty().set(Localization.lang("%0/%1 entries", 0, entries.size()));
-                    });
-                    stateManager.getActiveDatabase().ifPresent(databaseContext -> {
-                        // generate the new citation keys for each entry
-                        compound = new NamedCompound(Localization.lang("Autogenerate citation keys"));
-                        CitationKeyGenerator keyGenerator =
-                                new CitationKeyGenerator(databaseContext, preferences.getCitationKeyPatternPreferences());
-                        int entriesDone = 0;
-                        for (BibEntry entry : entries) {
-                            keyGenerator.generateAndSetKey(entry)
-                                        .ifPresent(fieldChange -> compound.addEdit(new UndoableKeyChange(fieldChange)));
-                            entriesDone++;
-                            int finalEntriesDone = entriesDone;
-                            UiTaskExecutor.runInJavaFXThread(() -> {
-                                updateProgress(finalEntriesDone, entries.size());
-                                messageProperty().set(Localization.lang("%0/%1 entries", finalEntriesDone, entries.size()));
-                            });
-                        }
-                        compound.end();
-                    });
+                if (isCanceled) {
                     return null;
+                }
+                UiTaskExecutor.runInJavaFXThread(
+                        () -> {
+                            updateProgress(0, entries.size());
+                            messageProperty()
+                                    .set(Localization.lang("%0/%1 entries", 0, entries.size()));
+                        });
+                stateManager
+                        .getActiveDatabase()
+                        .ifPresent(
+                                databaseContext -> {
+                                    // generate the new citation keys for each entry
+                                    compound =
+                                            new NamedCompound(
+                                                    Localization.lang(
+                                                            "Autogenerate citation keys"));
+                                    CitationKeyGenerator keyGenerator =
+                                            new CitationKeyGenerator(
+                                                    databaseContext,
+                                                    preferences.getCitationKeyPatternPreferences());
+                                    int entriesDone = 0;
+                                    for (BibEntry entry : entries) {
+                                        keyGenerator
+                                                .generateAndSetKey(entry)
+                                                .ifPresent(
+                                                        fieldChange ->
+                                                                compound.addEdit(
+                                                                        new UndoableKeyChange(
+                                                                                fieldChange)));
+                                        entriesDone++;
+                                        int finalEntriesDone = entriesDone;
+                                        UiTaskExecutor.runInJavaFXThread(
+                                                () -> {
+                                                    updateProgress(
+                                                            finalEntriesDone, entries.size());
+                                                    messageProperty()
+                                                            .set(
+                                                                    Localization.lang(
+                                                                            "%0/%1 entries",
+                                                                            finalEntriesDone,
+                                                                            entries.size()));
+                                                });
+                                    }
+                                    compound.end();
+                                });
+                return null;
             }
 
             @Override
@@ -145,14 +178,19 @@ public BackgroundTask<Void> onSuccess(Consumer<Void> onSuccess) {
                 }
 
                 tabSupplier.get().markBaseChanged();
-                dialogService.notify(formatOutputMessage(Localization.lang("Generated citation key for"), entries.size()));
+                dialogService.notify(
+                        formatOutputMessage(
+                                Localization.lang("Generated citation key for"), entries.size()));
                 return super.onSuccess(onSuccess);
             }
         };
     }
 
     private String formatOutputMessage(String start, int count) {
-        return "%s %d %s.".formatted(start, count,
-                (count > 1 ? Localization.lang("entries") : Localization.lang("entry")));
+        return "%s %d %s."
+                .formatted(
+                        start,
+                        count,
+                        (count > 1 ? Localization.lang("entries") : Localization.lang("entry")));
     }
 }
diff --git a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeySingleAction.java b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeySingleAction.java
index 3b99157d6aa7..2395f27d681e 100644
--- a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeySingleAction.java
+++ b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeySingleAction.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.citationkeypattern;
 
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.undo.UndoableKeyChange;
@@ -10,6 +8,8 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
+import javax.swing.undo.UndoManager;
+
 public class GenerateCitationKeySingleAction extends SimpleCommand {
 
     private final DialogService dialogService;
@@ -18,7 +18,12 @@ public class GenerateCitationKeySingleAction extends SimpleCommand {
     private final BibEntry entry;
     private final UndoManager undoManager;
 
-    public GenerateCitationKeySingleAction(BibEntry entry, BibDatabaseContext databaseContext, DialogService dialogService, CliPreferences preferences, UndoManager undoManager) {
+    public GenerateCitationKeySingleAction(
+            BibEntry entry,
+            BibDatabaseContext databaseContext,
+            DialogService dialogService,
+            CliPreferences preferences,
+            UndoManager undoManager) {
         this.entry = entry;
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
@@ -32,8 +37,10 @@ public GenerateCitationKeySingleAction(BibEntry entry, BibDatabaseContext databa
 
     @Override
     public void execute() {
-        if (!entry.hasCitationKey() || GenerateCitationKeyAction.confirmOverwriteKeys(dialogService, preferences)) {
-            new CitationKeyGenerator(databaseContext, preferences.getCitationKeyPatternPreferences())
+        if (!entry.hasCitationKey()
+                || GenerateCitationKeyAction.confirmOverwriteKeys(dialogService, preferences)) {
+            new CitationKeyGenerator(
+                            databaseContext, preferences.getCitationKeyPatternPreferences())
                     .generateAndSetKey(entry)
                     .ifPresent(change -> undoManager.addEdit(new UndoableKeyChange(change)));
         }
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupAction.java b/src/main/java/org/jabref/gui/cleanup/CleanupAction.java
index 9fdac23cd88e..0893bf5aab59 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupAction.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupAction.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.cleanup;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Supplier;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
@@ -23,6 +17,12 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import javax.swing.undo.UndoManager;
+
 public class CleanupAction extends SimpleCommand {
 
     private final Supplier<LibraryTab> tabSupplier;
@@ -35,12 +35,13 @@ public class CleanupAction extends SimpleCommand {
     private boolean isCanceled;
     private int modifiedEntriesCount;
 
-    public CleanupAction(Supplier<LibraryTab> tabSupplier,
-                         CliPreferences preferences,
-                         DialogService dialogService,
-                         StateManager stateManager,
-                         TaskExecutor taskExecutor,
-                         UndoManager undoManager) {
+    public CleanupAction(
+            Supplier<LibraryTab> tabSupplier,
+            CliPreferences preferences,
+            DialogService dialogService,
+            StateManager stateManager,
+            TaskExecutor taskExecutor,
+            UndoManager undoManager) {
         this.tabSupplier = tabSupplier;
         this.preferences = preferences;
         this.dialogService = dialogService;
@@ -57,55 +58,76 @@ public void execute() {
             return;
         }
 
-        if (stateManager.getSelectedEntries().isEmpty()) { // None selected. Inform the user to select entries first.
-            dialogService.showInformationDialogAndWait(Localization.lang("Cleanup entry"), Localization.lang("First select entries to clean up."));
+        if (stateManager
+                .getSelectedEntries()
+                .isEmpty()) { // None selected. Inform the user to select entries first.
+            dialogService.showInformationDialogAndWait(
+                    Localization.lang("Cleanup entry"),
+                    Localization.lang("First select entries to clean up."));
             return;
         }
 
         isCanceled = false;
         modifiedEntriesCount = 0;
 
-        CleanupDialog cleanupDialog = new CleanupDialog(
-                stateManager.getActiveDatabase().get(),
-                preferences.getCleanupPreferences(),
-                preferences.getFilePreferences()
-        );
-
-        Optional<CleanupPreferences> chosenPreset = dialogService.showCustomDialogAndWait(cleanupDialog);
-
-        chosenPreset.ifPresent(preset -> {
-            if (preset.isActive(CleanupPreferences.CleanupStep.RENAME_PDF) && preferences.getAutoLinkPreferences().shouldAskAutoNamingPdfs()) {
-                boolean confirmed = dialogService.showConfirmationDialogWithOptOutAndWait(Localization.lang("Autogenerate PDF Names"),
-                        Localization.lang("Auto-generating PDF-Names does not support undo. Continue?"),
-                        Localization.lang("Autogenerate PDF Names"),
-                        Localization.lang("Cancel"),
-                        Localization.lang("Do not ask again"),
-                        optOut -> preferences.getAutoLinkPreferences().setAskAutoNamingPdfs(!optOut));
-                if (!confirmed) {
-                    isCanceled = true;
-                    return;
-                }
-            }
-
-            preferences.getCleanupPreferences().setActiveJobs(preset.getActiveJobs());
-            preferences.getCleanupPreferences().setFieldFormatterCleanups(preset.getFieldFormatterCleanups());
-
-            BackgroundTask.wrap(() -> cleanup(stateManager.getActiveDatabase().get(), preset))
-                          .onSuccess(result -> showResults())
-                          .onFailure(dialogService::showErrorDialogAndWait)
-                          .executeWith(taskExecutor);
-        });
+        CleanupDialog cleanupDialog =
+                new CleanupDialog(
+                        stateManager.getActiveDatabase().get(),
+                        preferences.getCleanupPreferences(),
+                        preferences.getFilePreferences());
+
+        Optional<CleanupPreferences> chosenPreset =
+                dialogService.showCustomDialogAndWait(cleanupDialog);
+
+        chosenPreset.ifPresent(
+                preset -> {
+                    if (preset.isActive(CleanupPreferences.CleanupStep.RENAME_PDF)
+                            && preferences.getAutoLinkPreferences().shouldAskAutoNamingPdfs()) {
+                        boolean confirmed =
+                                dialogService.showConfirmationDialogWithOptOutAndWait(
+                                        Localization.lang("Autogenerate PDF Names"),
+                                        Localization.lang(
+                                                "Auto-generating PDF-Names does not support undo. Continue?"),
+                                        Localization.lang("Autogenerate PDF Names"),
+                                        Localization.lang("Cancel"),
+                                        Localization.lang("Do not ask again"),
+                                        optOut ->
+                                                preferences
+                                                        .getAutoLinkPreferences()
+                                                        .setAskAutoNamingPdfs(!optOut));
+                        if (!confirmed) {
+                            isCanceled = true;
+                            return;
+                        }
+                    }
+
+                    preferences.getCleanupPreferences().setActiveJobs(preset.getActiveJobs());
+                    preferences
+                            .getCleanupPreferences()
+                            .setFieldFormatterCleanups(preset.getFieldFormatterCleanups());
+
+                    BackgroundTask.wrap(
+                                    () -> cleanup(stateManager.getActiveDatabase().get(), preset))
+                            .onSuccess(result -> showResults())
+                            .onFailure(dialogService::showErrorDialogAndWait)
+                            .executeWith(taskExecutor);
+                });
     }
 
     /**
      * Runs the cleanup on the entry and records the change.
      */
-    private void doCleanup(BibDatabaseContext databaseContext, CleanupPreferences preset, BibEntry entry, NamedCompound ce) {
+    private void doCleanup(
+            BibDatabaseContext databaseContext,
+            CleanupPreferences preset,
+            BibEntry entry,
+            NamedCompound ce) {
         // Create and run cleaner
-        CleanupWorker cleaner = new CleanupWorker(
-                databaseContext,
-                preferences.getFilePreferences(),
-                preferences.getTimestampPreferences());
+        CleanupWorker cleaner =
+                new CleanupWorker(
+                        databaseContext,
+                        preferences.getFilePreferences(),
+                        preferences.getTimestampPreferences());
 
         List<FieldChange> changes = cleaner.cleanup(preset, entry);
 
@@ -130,11 +152,15 @@ private void showResults() {
         } else if (modifiedEntriesCount == 1) {
             dialogService.notify(Localization.lang("One entry needed a clean up"));
         } else {
-            dialogService.notify(Localization.lang("%0 entries needed a clean up", Integer.toString(modifiedEntriesCount)));
+            dialogService.notify(
+                    Localization.lang(
+                            "%0 entries needed a clean up",
+                            Integer.toString(modifiedEntriesCount)));
         }
     }
 
-    private void cleanup(BibDatabaseContext databaseContext, CleanupPreferences cleanupPreferences) {
+    private void cleanup(
+            BibDatabaseContext databaseContext, CleanupPreferences cleanupPreferences) {
         for (BibEntry entry : stateManager.getSelectedEntries()) {
             // undo granularity is on entry level
             NamedCompound ce = new NamedCompound(Localization.lang("Cleanup entry"));
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java b/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
index 380dea76fe23..24c55a8064a0 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
@@ -10,12 +10,16 @@
 import org.jabref.model.database.BibDatabaseContext;
 
 public class CleanupDialog extends BaseDialog<CleanupPreferences> {
-    public CleanupDialog(BibDatabaseContext databaseContext, CleanupPreferences initialPreset, FilePreferences filePreferences) {
+    public CleanupDialog(
+            BibDatabaseContext databaseContext,
+            CleanupPreferences initialPreset,
+            FilePreferences filePreferences) {
         setTitle(Localization.lang("Cleanup entries"));
         getDialogPane().setPrefSize(600, 650);
         getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
 
-        CleanupPresetPanel presetPanel = new CleanupPresetPanel(databaseContext, initialPreset, filePreferences);
+        CleanupPresetPanel presetPanel =
+                new CleanupPresetPanel(databaseContext, initialPreset, filePreferences);
 
         // placing the content of the presetPanel in a scroll pane
         ScrollPane scrollPane = new ScrollPane();
@@ -24,12 +28,13 @@ public CleanupDialog(BibDatabaseContext databaseContext, CleanupPreferences init
         scrollPane.setContent(presetPanel);
 
         getDialogPane().setContent(scrollPane);
-        setResultConverter(button -> {
-            if (button == ButtonType.OK) {
-                return presetPanel.getCleanupPreset();
-            } else {
-                return null;
-            }
-        });
+        setResultConverter(
+                button -> {
+                    if (button == ButtonType.OK) {
+                        return presetPanel.getCleanupPreset();
+                    } else {
+                        return null;
+                    }
+                });
     }
 }
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
index a31f385781db..9345aad7748a 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
@@ -1,9 +1,6 @@
 package org.jabref.gui.cleanup;
 
-import java.nio.file.Path;
-import java.util.EnumSet;
-import java.util.Objects;
-import java.util.Optional;
+import com.airhacks.afterburner.views.ViewLoader;
 
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
@@ -19,7 +16,10 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.field.StandardField;
 
-import com.airhacks.afterburner.views.ViewLoader;
+import java.nio.file.Path;
+import java.util.EnumSet;
+import java.util.Objects;
+import java.util.Optional;
 
 public class CleanupPresetPanel extends VBox {
 
@@ -41,13 +41,14 @@ public class CleanupPresetPanel extends VBox {
     @FXML private CheckBox cleanUpTimestampToModificationDate;
     @FXML private FieldFormatterCleanupsPanel formatterCleanupsPanel;
 
-    public CleanupPresetPanel(BibDatabaseContext databaseContext, CleanupPreferences cleanupPreferences, FilePreferences filePreferences) {
+    public CleanupPresetPanel(
+            BibDatabaseContext databaseContext,
+            CleanupPreferences cleanupPreferences,
+            FilePreferences filePreferences) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
 
         // Load FXML
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
 
         init(cleanupPreferences, filePreferences);
     }
@@ -55,48 +56,69 @@ public CleanupPresetPanel(BibDatabaseContext databaseContext, CleanupPreferences
     private void init(CleanupPreferences cleanupPreferences, FilePreferences filePreferences) {
         Optional<Path> firstExistingDir = databaseContext.getFirstExistingFileDir(filePreferences);
         if (firstExistingDir.isPresent()) {
-            cleanUpMovePDF.setText(Localization.lang("Move linked files to default file directory %0", firstExistingDir.get().toString()));
+            cleanUpMovePDF.setText(
+                    Localization.lang(
+                            "Move linked files to default file directory %0",
+                            firstExistingDir.get().toString()));
         } else {
-            cleanUpMovePDF.setText(Localization.lang("Move linked files to default file directory %0", "..."));
+            cleanUpMovePDF.setText(
+                    Localization.lang("Move linked files to default file directory %0", "..."));
 
-            // Since the directory does not exist, we cannot move it to there. So, this option is not checked - regardless of the presets stored in the preferences.
+            // Since the directory does not exist, we cannot move it to there. So, this option is
+            // not checked - regardless of the presets stored in the preferences.
             cleanUpMovePDF.setDisable(true);
             cleanUpMovePDF.setSelected(false);
         }
 
-        cleanUpRenamePDFonlyRelativePaths.disableProperty().bind(cleanUpRenamePDF.selectedProperty().not());
+        cleanUpRenamePDFonlyRelativePaths
+                .disableProperty()
+                .bind(cleanUpRenamePDF.selectedProperty().not());
 
-        cleanUpUpgradeExternalLinks.setText(Localization.lang("Upgrade external PDF/PS links to use the '%0' field.", StandardField.FILE.getDisplayName()));
+        cleanUpUpgradeExternalLinks.setText(
+                Localization.lang(
+                        "Upgrade external PDF/PS links to use the '%0' field.",
+                        StandardField.FILE.getDisplayName()));
 
-        String currentPattern = Localization.lang("Filename format pattern")
-                                            .concat(": ")
-                                            .concat(filePreferences.getFileNamePattern());
+        String currentPattern =
+                Localization.lang("Filename format pattern")
+                        .concat(": ")
+                        .concat(filePreferences.getFileNamePattern());
         cleanupRenamePDFLabel.setText(currentPattern);
 
-        cleanUpBibtex.selectedProperty().addListener(
-                (observable, oldValue, newValue) -> {
-                    if (newValue) {
-                        cleanUpBiblatex.selectedProperty().setValue(false);
-                    }
-                });
-        cleanUpBiblatex.selectedProperty().addListener(
-                (observable, oldValue, newValue) -> {
-                    if (newValue) {
-                        cleanUpBibtex.selectedProperty().setValue(false);
-                    }
-                });
-        cleanUpTimestampToCreationDate.selectedProperty().addListener(
-                (observable, oldValue, newValue) -> {
-                    if (newValue) {
-                        cleanUpTimestampToModificationDate.selectedProperty().setValue(false);
-                    }
-                });
-        cleanUpTimestampToModificationDate.selectedProperty().addListener(
-                (observable, oldValue, newValue) -> {
-                    if (newValue) {
-                        cleanUpTimestampToCreationDate.selectedProperty().setValue(false);
-                    }
-                });
+        cleanUpBibtex
+                .selectedProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            if (newValue) {
+                                cleanUpBiblatex.selectedProperty().setValue(false);
+                            }
+                        });
+        cleanUpBiblatex
+                .selectedProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            if (newValue) {
+                                cleanUpBibtex.selectedProperty().setValue(false);
+                            }
+                        });
+        cleanUpTimestampToCreationDate
+                .selectedProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            if (newValue) {
+                                cleanUpTimestampToModificationDate
+                                        .selectedProperty()
+                                        .setValue(false);
+                            }
+                        });
+        cleanUpTimestampToModificationDate
+                .selectedProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            if (newValue) {
+                                cleanUpTimestampToCreationDate.selectedProperty().setValue(false);
+                            }
+                        });
         updateDisplay(cleanupPreferences);
     }
 
@@ -107,23 +129,40 @@ private void updateDisplay(CleanupPreferences preset) {
         if (!cleanUpMovePDF.isDisabled()) {
             cleanUpMovePDF.setSelected(preset.isActive(CleanupPreferences.CleanupStep.MOVE_PDF));
         }
-        cleanUpMakePathsRelative.setSelected(preset.isActive(CleanupPreferences.CleanupStep.MAKE_PATHS_RELATIVE));
+        cleanUpMakePathsRelative.setSelected(
+                preset.isActive(CleanupPreferences.CleanupStep.MAKE_PATHS_RELATIVE));
         cleanUpRenamePDF.setSelected(preset.isActive(CleanupPreferences.CleanupStep.RENAME_PDF));
-        cleanUpRenamePDFonlyRelativePaths.setSelected(preset.isActive(CleanupPreferences.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS));
-        cleanUpUpgradeExternalLinks.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS));
-        cleanUpDeletedFiles.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_DELETED_LINKED_FILES));
-        cleanUpBiblatex.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CONVERT_TO_BIBLATEX));
-        cleanUpBibtex.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CONVERT_TO_BIBTEX));
-        cleanUpTimestampToCreationDate.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_CREATIONDATE));
-        cleanUpTimestampToModificationDate.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_MODIFICATIONDATE));
-        cleanUpTimestampToModificationDate.setSelected(preset.isActive(CleanupPreferences.CleanupStep.DO_NOT_CONVERT_TIMESTAMP));
+        cleanUpRenamePDFonlyRelativePaths.setSelected(
+                preset.isActive(CleanupPreferences.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS));
+        cleanUpUpgradeExternalLinks.setSelected(
+                preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS));
+        cleanUpDeletedFiles.setSelected(
+                preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_DELETED_LINKED_FILES));
+        cleanUpBiblatex.setSelected(
+                preset.isActive(CleanupPreferences.CleanupStep.CONVERT_TO_BIBLATEX));
+        cleanUpBibtex.setSelected(
+                preset.isActive(CleanupPreferences.CleanupStep.CONVERT_TO_BIBTEX));
+        cleanUpTimestampToCreationDate.setSelected(
+                preset.isActive(CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_CREATIONDATE));
+        cleanUpTimestampToModificationDate.setSelected(
+                preset.isActive(
+                        CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_MODIFICATIONDATE));
+        cleanUpTimestampToModificationDate.setSelected(
+                preset.isActive(CleanupPreferences.CleanupStep.DO_NOT_CONVERT_TIMESTAMP));
         cleanUpISSN.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_ISSN));
-        formatterCleanupsPanel.cleanupsDisableProperty().setValue(!preset.getFieldFormatterCleanups().isEnabled());
-        formatterCleanupsPanel.cleanupsProperty().setValue(FXCollections.observableArrayList(preset.getFieldFormatterCleanups().getConfiguredActions()));
+        formatterCleanupsPanel
+                .cleanupsDisableProperty()
+                .setValue(!preset.getFieldFormatterCleanups().isEnabled());
+        formatterCleanupsPanel
+                .cleanupsProperty()
+                .setValue(
+                        FXCollections.observableArrayList(
+                                preset.getFieldFormatterCleanups().getConfiguredActions()));
     }
 
     public CleanupPreferences getCleanupPreset() {
-        EnumSet<CleanupPreferences.CleanupStep> activeJobs = EnumSet.noneOf(CleanupPreferences.CleanupStep.class);
+        EnumSet<CleanupPreferences.CleanupStep> activeJobs =
+                EnumSet.noneOf(CleanupPreferences.CleanupStep.class);
 
         if (cleanUpMovePDF.isSelected()) {
             activeJobs.add(CleanupPreferences.CleanupStep.MOVE_PDF);
@@ -171,8 +210,10 @@ public CleanupPreferences getCleanupPreset() {
 
         activeJobs.add(CleanupPreferences.CleanupStep.FIX_FILE_LINKS);
 
-        return new CleanupPreferences(activeJobs, new FieldFormatterCleanups(
-                !formatterCleanupsPanel.cleanupsDisableProperty().getValue(),
-                formatterCleanupsPanel.cleanupsProperty()));
+        return new CleanupPreferences(
+                activeJobs,
+                new FieldFormatterCleanups(
+                        !formatterCleanupsPanel.cleanupsDisableProperty().getValue(),
+                        formatterCleanupsPanel.cleanupsProperty()));
     }
 }
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupSingleAction.java b/src/main/java/org/jabref/gui/cleanup/CleanupSingleAction.java
index 4688ca6c67ab..3e3c77712c35 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupSingleAction.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupSingleAction.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.cleanup;
 
-import java.util.List;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
@@ -19,6 +14,11 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
+import java.util.List;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
+
 public class CleanupSingleAction extends SimpleCommand {
 
     private final CliPreferences preferences;
@@ -30,7 +30,12 @@ public class CleanupSingleAction extends SimpleCommand {
     private boolean isCanceled;
     private int modifiedEntriesCount;
 
-    public CleanupSingleAction(BibEntry entry, CliPreferences preferences, DialogService dialogService, StateManager stateManager, UndoManager undoManager) {
+    public CleanupSingleAction(
+            BibEntry entry,
+            CliPreferences preferences,
+            DialogService dialogService,
+            StateManager stateManager,
+            UndoManager undoManager) {
         this.entry = entry;
         this.preferences = preferences;
         this.dialogService = dialogService;
@@ -44,44 +49,60 @@ public CleanupSingleAction(BibEntry entry, CliPreferences preferences, DialogSer
     public void execute() {
         isCanceled = false;
 
-        CleanupDialog cleanupDialog = new CleanupDialog(
-                stateManager.getActiveDatabase().get(),
-                preferences.getCleanupPreferences(),
-                preferences.getFilePreferences()
-        );
-
-        Optional<CleanupPreferences> chosenPreset = dialogService.showCustomDialogAndWait(cleanupDialog);
-
-        chosenPreset.ifPresent(preset -> {
-            if (preset.isActive(CleanupPreferences.CleanupStep.RENAME_PDF) && preferences.getAutoLinkPreferences().shouldAskAutoNamingPdfs()) {
-                boolean confirmed = dialogService.showConfirmationDialogWithOptOutAndWait(Localization.lang("Autogenerate PDF Names"),
-                        Localization.lang("Auto-generating PDF-Names does not support undo. Continue?"),
-                        Localization.lang("Autogenerate PDF Names"),
-                        Localization.lang("Cancel"),
-                        Localization.lang("Do not ask again"),
-                        optOut -> preferences.getAutoLinkPreferences().setAskAutoNamingPdfs(!optOut));
-                if (!confirmed) {
-                    isCanceled = true;
-                    return;
-                }
-            }
-
-            preferences.getCleanupPreferences().setActiveJobs(preset.getActiveJobs());
-            preferences.getCleanupPreferences().setFieldFormatterCleanups(preset.getFieldFormatterCleanups());
-
-            cleanup(stateManager.getActiveDatabase().get(), preset);
-        });
+        CleanupDialog cleanupDialog =
+                new CleanupDialog(
+                        stateManager.getActiveDatabase().get(),
+                        preferences.getCleanupPreferences(),
+                        preferences.getFilePreferences());
+
+        Optional<CleanupPreferences> chosenPreset =
+                dialogService.showCustomDialogAndWait(cleanupDialog);
+
+        chosenPreset.ifPresent(
+                preset -> {
+                    if (preset.isActive(CleanupPreferences.CleanupStep.RENAME_PDF)
+                            && preferences.getAutoLinkPreferences().shouldAskAutoNamingPdfs()) {
+                        boolean confirmed =
+                                dialogService.showConfirmationDialogWithOptOutAndWait(
+                                        Localization.lang("Autogenerate PDF Names"),
+                                        Localization.lang(
+                                                "Auto-generating PDF-Names does not support undo. Continue?"),
+                                        Localization.lang("Autogenerate PDF Names"),
+                                        Localization.lang("Cancel"),
+                                        Localization.lang("Do not ask again"),
+                                        optOut ->
+                                                preferences
+                                                        .getAutoLinkPreferences()
+                                                        .setAskAutoNamingPdfs(!optOut));
+                        if (!confirmed) {
+                            isCanceled = true;
+                            return;
+                        }
+                    }
+
+                    preferences.getCleanupPreferences().setActiveJobs(preset.getActiveJobs());
+                    preferences
+                            .getCleanupPreferences()
+                            .setFieldFormatterCleanups(preset.getFieldFormatterCleanups());
+
+                    cleanup(stateManager.getActiveDatabase().get(), preset);
+                });
     }
 
     /**
      * Runs the cleanup on the entry and records the change.
      */
-    private void doCleanup(BibDatabaseContext databaseContext, CleanupPreferences preset, BibEntry entry, NamedCompound ce) {
+    private void doCleanup(
+            BibDatabaseContext databaseContext,
+            CleanupPreferences preset,
+            BibEntry entry,
+            NamedCompound ce) {
         // Create and run cleaner
-        CleanupWorker cleaner = new CleanupWorker(
-                databaseContext,
-                preferences.getFilePreferences(),
-                preferences.getTimestampPreferences());
+        CleanupWorker cleaner =
+                new CleanupWorker(
+                        databaseContext,
+                        preferences.getFilePreferences(),
+                        preferences.getTimestampPreferences());
 
         List<FieldChange> changes = cleaner.cleanup(preset, entry);
 
@@ -91,15 +112,16 @@ private void doCleanup(BibDatabaseContext databaseContext, CleanupPreferences pr
         }
     }
 
-    private void cleanup(BibDatabaseContext databaseContext, CleanupPreferences cleanupPreferences) {
-            // undo granularity is on entry level
-            NamedCompound ce = new NamedCompound(Localization.lang("Cleanup entry"));
+    private void cleanup(
+            BibDatabaseContext databaseContext, CleanupPreferences cleanupPreferences) {
+        // undo granularity is on entry level
+        NamedCompound ce = new NamedCompound(Localization.lang("Cleanup entry"));
 
-            doCleanup(databaseContext, cleanupPreferences, entry, ce);
+        doCleanup(databaseContext, cleanupPreferences, entry, ce);
 
-            ce.end();
-            if (ce.hasEdits()) {
-                undoManager.addEdit(ce);
-            }
+        ce.end();
+        if (ce.hasEdits()) {
+            undoManager.addEdit(ce);
+        }
     }
 }
diff --git a/src/main/java/org/jabref/gui/collab/ChangeScanner.java b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
index e840136c9f57..bcca90f5c6ff 100644
--- a/src/main/java/org/jabref/gui/collab/ChangeScanner.java
+++ b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.collab;
 
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -11,10 +7,13 @@
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
 public class ChangeScanner {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ChangeScanner.class);
@@ -23,12 +22,12 @@ public class ChangeScanner {
 
     private final DatabaseChangeResolverFactory databaseChangeResolverFactory;
 
-    public ChangeScanner(BibDatabaseContext database,
-                         DialogService dialogService,
-                         GuiPreferences preferences) {
+    public ChangeScanner(
+            BibDatabaseContext database, DialogService dialogService, GuiPreferences preferences) {
         this.database = database;
         this.preferences = preferences;
-        this.databaseChangeResolverFactory = new DatabaseChangeResolverFactory(dialogService, database, preferences);
+        this.databaseChangeResolverFactory =
+                new DatabaseChangeResolverFactory(dialogService, database, preferences);
     }
 
     public List<DatabaseChange> scanForChanges() {
@@ -39,11 +38,17 @@ public List<DatabaseChange> scanForChanges() {
         try {
             // Parse the modified file
             // Important: apply all post-load actions
-            ImportFormatPreferences importFormatPreferences = preferences.getImportFormatPreferences();
-            ParserResult result = OpenDatabase.loadDatabase(database.getDatabasePath().get(), importFormatPreferences, new DummyFileUpdateMonitor());
+            ImportFormatPreferences importFormatPreferences =
+                    preferences.getImportFormatPreferences();
+            ParserResult result =
+                    OpenDatabase.loadDatabase(
+                            database.getDatabasePath().get(),
+                            importFormatPreferences,
+                            new DummyFileUpdateMonitor());
             BibDatabaseContext databaseOnDisk = result.getDatabaseContext();
 
-            return DatabaseChangeList.compareAndGetChanges(database, databaseOnDisk, databaseChangeResolverFactory);
+            return DatabaseChangeList.compareAndGetChanges(
+                    database, databaseOnDisk, databaseChangeResolverFactory);
         } catch (IOException e) {
             LOGGER.warn("Error while parsing changed file.", e);
             return Collections.emptyList();
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChange.java b/src/main/java/org/jabref/gui/collab/DatabaseChange.java
index 0ef63184c371..a4458b8d4c57 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChange.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChange.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.collab;
 
-import java.util.Optional;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -21,13 +19,28 @@
 import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.model.database.BibDatabaseContext;
 
-public sealed abstract class DatabaseChange permits EntryAdd, EntryChange, EntryDelete, GroupChange, MetadataChange, PreambleChange, BibTexStringAdd, BibTexStringChange, BibTexStringDelete, BibTexStringRename {
+import java.util.Optional;
+
+public abstract sealed class DatabaseChange
+        permits EntryAdd,
+                EntryChange,
+                EntryDelete,
+                GroupChange,
+                MetadataChange,
+                PreambleChange,
+                BibTexStringAdd,
+                BibTexStringChange,
+                BibTexStringDelete,
+                BibTexStringRename {
     protected final BibDatabaseContext databaseContext;
-    protected final OptionalObjectProperty<DatabaseChangeResolver> externalChangeResolver = OptionalObjectProperty.empty();
+    protected final OptionalObjectProperty<DatabaseChangeResolver> externalChangeResolver =
+            OptionalObjectProperty.empty();
     private final BooleanProperty accepted = new SimpleBooleanProperty();
     private final StringProperty name = new SimpleStringProperty();
 
-    protected DatabaseChange(BibDatabaseContext databaseContext, DatabaseChangeResolverFactory databaseChangeResolverFactory) {
+    protected DatabaseChange(
+            BibDatabaseContext databaseContext,
+            DatabaseChangeResolverFactory databaseChangeResolverFactory) {
         this.databaseContext = databaseContext;
         setChangeName("Unnamed Change!");
 
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsView.java
index f1160582e673..224958a8b671 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsView.java
@@ -13,16 +13,16 @@
 import org.jabref.gui.collab.stringdelete.BibTexStringDeleteDetailsView;
 import org.jabref.gui.collab.stringrename.BibTexStringRenameDetailsView;
 
-public sealed abstract class DatabaseChangeDetailsView extends AnchorPane permits
-        EntryWithPreviewAndSourceDetailsView,
-        GroupChangeDetailsView,
-        MetadataChangeDetailsView,
-        PreambleChangeDetailsView,
-        BibTexStringAddDetailsView,
-        BibTexStringChangeDetailsView,
-        BibTexStringDeleteDetailsView,
-        BibTexStringRenameDetailsView,
-        EntryChangeDetailsView {
+public abstract sealed class DatabaseChangeDetailsView extends AnchorPane
+        permits EntryWithPreviewAndSourceDetailsView,
+                GroupChangeDetailsView,
+                MetadataChangeDetailsView,
+                PreambleChangeDetailsView,
+                BibTexStringAddDetailsView,
+                BibTexStringChangeDetailsView,
+                BibTexStringDeleteDetailsView,
+                BibTexStringRenameDetailsView,
+                EntryChangeDetailsView {
 
     private static Double ANCHOR_PANE_OFFSET = 8D;
 
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java
index 39939bce2636..4474fe3e8df6 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java
@@ -36,13 +36,14 @@ public class DatabaseChangeDetailsViewFactory {
     private final PreviewViewer previewViewer;
     private final TaskExecutor taskExecutor;
 
-    public DatabaseChangeDetailsViewFactory(BibDatabaseContext databaseContext,
-                                            DialogService dialogService,
-                                            ThemeManager themeManager,
-                                            GuiPreferences preferences,
-                                            BibEntryTypesManager entryTypesManager,
-                                            PreviewViewer previewViewer,
-                                            TaskExecutor taskExecutor) {
+    public DatabaseChangeDetailsViewFactory(
+            BibDatabaseContext databaseContext,
+            DialogService dialogService,
+            ThemeManager themeManager,
+            GuiPreferences preferences,
+            BibEntryTypesManager entryTypesManager,
+            PreviewViewer previewViewer,
+            TaskExecutor taskExecutor) {
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
         this.themeManager = themeManager;
@@ -54,39 +55,39 @@ public DatabaseChangeDetailsViewFactory(BibDatabaseContext databaseContext,
 
     public DatabaseChangeDetailsView create(DatabaseChange databaseChange) {
         return switch (databaseChange) {
-            case EntryChange entryChange -> new EntryChangeDetailsView(
-                entryChange.getOldEntry(),
-                entryChange.getNewEntry(),
-                databaseContext,
-                dialogService,
-                themeManager,
-                preferences,
-                entryTypesManager,
-                previewViewer,
-                taskExecutor
-            );
-            case EntryAdd entryAdd -> new EntryWithPreviewAndSourceDetailsView(
-                entryAdd.getAddedEntry(),
-                databaseContext,
-                preferences,
-                entryTypesManager,
-                previewViewer
-            );
-            case EntryDelete entryDelete -> new EntryWithPreviewAndSourceDetailsView(
-                entryDelete.getDeletedEntry(),
-                databaseContext,
-                preferences,
-                entryTypesManager,
-                previewViewer
-            );
+            case EntryChange entryChange ->
+                    new EntryChangeDetailsView(
+                            entryChange.getOldEntry(),
+                            entryChange.getNewEntry(),
+                            databaseContext,
+                            dialogService,
+                            themeManager,
+                            preferences,
+                            entryTypesManager,
+                            previewViewer,
+                            taskExecutor);
+            case EntryAdd entryAdd ->
+                    new EntryWithPreviewAndSourceDetailsView(
+                            entryAdd.getAddedEntry(),
+                            databaseContext,
+                            preferences,
+                            entryTypesManager,
+                            previewViewer);
+            case EntryDelete entryDelete ->
+                    new EntryWithPreviewAndSourceDetailsView(
+                            entryDelete.getDeletedEntry(),
+                            databaseContext,
+                            preferences,
+                            entryTypesManager,
+                            previewViewer);
             case BibTexStringAdd stringAdd -> new BibTexStringAddDetailsView(stringAdd);
             case BibTexStringDelete stringDelete -> new BibTexStringDeleteDetailsView(stringDelete);
             case BibTexStringChange stringChange -> new BibTexStringChangeDetailsView(stringChange);
             case BibTexStringRename stringRename -> new BibTexStringRenameDetailsView(stringRename);
-            case MetadataChange metadataChange -> new MetadataChangeDetailsView(
-                metadataChange,
-                preferences.getCitationKeyPatternPreferences().getKeyPatterns()
-            );
+            case MetadataChange metadataChange ->
+                    new MetadataChangeDetailsView(
+                            metadataChange,
+                            preferences.getCitationKeyPatternPreferences().getKeyPatterns());
             case GroupChange groupChange -> new GroupChangeDetailsView(groupChange);
             case PreambleChange preambleChange -> new PreambleChangeDetailsView(preambleChange);
         };
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeList.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeList.java
index be4969d1e52d..0b51cc5a94dd 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeList.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeList.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.collab;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import org.jabref.gui.collab.entryadd.EntryAdd;
 import org.jabref.gui.collab.entrychange.EntryChange;
 import org.jabref.gui.collab.entrydelete.EntryDelete;
@@ -19,9 +15,12 @@
 import org.jabref.logic.bibtex.comparator.BibStringDiff;
 import org.jabref.model.database.BibDatabaseContext;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 public class DatabaseChangeList {
-    private DatabaseChangeList() {
-    }
+    private DatabaseChangeList() {}
 
     /**
      * Compares the given two databases, and returns the list of changes required to change the {@code originalDatabase} into the {@code otherDatabase}
@@ -30,49 +29,107 @@ private DatabaseChangeList() {
      * @param otherDatabase    This is the other database.
      * @return an unmodifiable list of {@code DatabaseChange} required to change {@code originalDatabase} into {@code otherDatabase}
      */
-    public static List<DatabaseChange> compareAndGetChanges(BibDatabaseContext originalDatabase, BibDatabaseContext otherDatabase, DatabaseChangeResolverFactory databaseChangeResolverFactory) {
+    public static List<DatabaseChange> compareAndGetChanges(
+            BibDatabaseContext originalDatabase,
+            BibDatabaseContext otherDatabase,
+            DatabaseChangeResolverFactory databaseChangeResolverFactory) {
         List<DatabaseChange> changes = new ArrayList<>();
 
         BibDatabaseDiff differences = BibDatabaseDiff.compare(originalDatabase, otherDatabase);
 
-        differences.getMetaDataDifferences().ifPresent(diff -> {
-            changes.add(new MetadataChange(diff, originalDatabase, databaseChangeResolverFactory));
-            diff.getGroupDifferences().ifPresent(groupDiff -> changes.add(new GroupChange(
-                    groupDiff, originalDatabase, databaseChangeResolverFactory
-            )));
-        });
-        differences.getPreambleDifferences().ifPresent(diff -> changes.add(new PreambleChange(diff, originalDatabase, databaseChangeResolverFactory)));
-        differences.getBibStringDifferences().forEach(diff -> changes.add(createBibStringDiff(originalDatabase, databaseChangeResolverFactory, diff)));
-        differences.getEntryDifferences().forEach(diff -> changes.add(createBibEntryDiff(originalDatabase, databaseChangeResolverFactory, diff)));
+        differences
+                .getMetaDataDifferences()
+                .ifPresent(
+                        diff -> {
+                            changes.add(
+                                    new MetadataChange(
+                                            diff, originalDatabase, databaseChangeResolverFactory));
+                            diff.getGroupDifferences()
+                                    .ifPresent(
+                                            groupDiff ->
+                                                    changes.add(
+                                                            new GroupChange(
+                                                                    groupDiff,
+                                                                    originalDatabase,
+                                                                    databaseChangeResolverFactory)));
+                        });
+        differences
+                .getPreambleDifferences()
+                .ifPresent(
+                        diff ->
+                                changes.add(
+                                        new PreambleChange(
+                                                diff,
+                                                originalDatabase,
+                                                databaseChangeResolverFactory)));
+        differences
+                .getBibStringDifferences()
+                .forEach(
+                        diff ->
+                                changes.add(
+                                        createBibStringDiff(
+                                                originalDatabase,
+                                                databaseChangeResolverFactory,
+                                                diff)));
+        differences
+                .getEntryDifferences()
+                .forEach(
+                        diff ->
+                                changes.add(
+                                        createBibEntryDiff(
+                                                originalDatabase,
+                                                databaseChangeResolverFactory,
+                                                diff)));
 
         return Collections.unmodifiableList(changes);
     }
 
-    private static DatabaseChange createBibStringDiff(BibDatabaseContext originalDatabase, DatabaseChangeResolverFactory databaseChangeResolverFactory, BibStringDiff diff) {
+    private static DatabaseChange createBibStringDiff(
+            BibDatabaseContext originalDatabase,
+            DatabaseChangeResolverFactory databaseChangeResolverFactory,
+            BibStringDiff diff) {
         if (diff.getOriginalString() == null) {
-            return new BibTexStringAdd(diff.getNewString(), originalDatabase, databaseChangeResolverFactory);
+            return new BibTexStringAdd(
+                    diff.getNewString(), originalDatabase, databaseChangeResolverFactory);
         }
 
         if (diff.getNewString() == null) {
-            return new BibTexStringDelete(diff.getOriginalString(), originalDatabase, databaseChangeResolverFactory);
+            return new BibTexStringDelete(
+                    diff.getOriginalString(), originalDatabase, databaseChangeResolverFactory);
         }
 
         if (diff.getOriginalString().getName().equals(diff.getNewString().getName())) {
-            return new BibTexStringChange(diff.getOriginalString(), diff.getNewString(), originalDatabase, databaseChangeResolverFactory);
+            return new BibTexStringChange(
+                    diff.getOriginalString(),
+                    diff.getNewString(),
+                    originalDatabase,
+                    databaseChangeResolverFactory);
         }
 
-        return new BibTexStringRename(diff.getOriginalString(), diff.getNewString(), originalDatabase, databaseChangeResolverFactory);
+        return new BibTexStringRename(
+                diff.getOriginalString(),
+                diff.getNewString(),
+                originalDatabase,
+                databaseChangeResolverFactory);
     }
 
-    private static DatabaseChange createBibEntryDiff(BibDatabaseContext originalDatabase, DatabaseChangeResolverFactory databaseChangeResolverFactory, BibEntryDiff diff) {
+    private static DatabaseChange createBibEntryDiff(
+            BibDatabaseContext originalDatabase,
+            DatabaseChangeResolverFactory databaseChangeResolverFactory,
+            BibEntryDiff diff) {
         if (diff.originalEntry() == null) {
             return new EntryAdd(diff.newEntry(), originalDatabase, databaseChangeResolverFactory);
         }
 
         if (diff.newEntry() == null) {
-            return new EntryDelete(diff.originalEntry(), originalDatabase, databaseChangeResolverFactory);
+            return new EntryDelete(
+                    diff.originalEntry(), originalDatabase, databaseChangeResolverFactory);
         }
 
-        return new EntryChange(diff.originalEntry(), diff.newEntry(), originalDatabase, databaseChangeResolverFactory);
+        return new EntryChange(
+                diff.originalEntry(),
+                diff.newEntry(),
+                originalDatabase,
+                databaseChangeResolverFactory);
     }
 }
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
index a9db70abd51a..ec38a29d01e8 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
@@ -1,13 +1,8 @@
 package org.jabref.gui.collab;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.util.Duration;
 
+import org.controlsfx.control.action.Action;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
@@ -20,11 +15,15 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.FileUpdateListener;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import org.controlsfx.control.action.Action;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.undo.UndoManager;
+
 public class DatabaseChangeMonitor implements FileUpdateListener {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseChangeMonitor.class);
@@ -40,14 +39,15 @@ public class DatabaseChangeMonitor implements FileUpdateListener {
     private final StateManager stateManager;
     private LibraryTab saveState;
 
-    public DatabaseChangeMonitor(BibDatabaseContext database,
-                                 FileUpdateMonitor fileMonitor,
-                                 TaskExecutor taskExecutor,
-                                 DialogService dialogService,
-                                 GuiPreferences preferences,
-                                 LibraryTab.DatabaseNotification notificationPane,
-                                 UndoManager undoManager,
-                                 StateManager stateManager) {
+    public DatabaseChangeMonitor(
+            BibDatabaseContext database,
+            FileUpdateMonitor fileMonitor,
+            TaskExecutor taskExecutor,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            LibraryTab.DatabaseNotification notificationPane,
+            UndoManager undoManager,
+            StateManager stateManager) {
         this.database = database;
         this.fileMonitor = fileMonitor;
         this.taskExecutor = taskExecutor;
@@ -59,57 +59,81 @@ public DatabaseChangeMonitor(BibDatabaseContext database,
 
         this.listeners = new ArrayList<>();
 
-        this.database.getDatabasePath().ifPresent(path -> {
-            try {
-                fileMonitor.addListenerForFile(path, this);
-            } catch (IOException e) {
-                LOGGER.error("Error while trying to monitor {}", path, e);
-            }
-        });
+        this.database
+                .getDatabasePath()
+                .ifPresent(
+                        path -> {
+                            try {
+                                fileMonitor.addListenerForFile(path, this);
+                            } catch (IOException e) {
+                                LOGGER.error("Error while trying to monitor {}", path, e);
+                            }
+                        });
 
         addListener(this::notifyOnChange);
     }
 
     private void notifyOnChange(List<DatabaseChange> changes) {
-        // The changes come from {@link org.jabref.gui.collab.DatabaseChangeList.compareAndGetChanges}
+        // The changes come from {@link
+        // org.jabref.gui.collab.DatabaseChangeList.compareAndGetChanges}
         notificationPane.notify(
                 IconTheme.JabRefIcons.SAVE.getGraphicNode(),
                 Localization.lang("The library has been modified by another program."),
-                List.of(new Action(Localization.lang("Dismiss changes"), event -> notificationPane.hide()),
-                        new Action(Localization.lang("Review changes"), event -> {
-                            DatabaseChangesResolverDialog databaseChangesResolverDialog = new DatabaseChangesResolverDialog(changes, database, Localization.lang("External Changes Resolver"));
-                            var areAllChangesResolved = dialogService.showCustomDialogAndWait(databaseChangesResolverDialog);
-                            saveState = stateManager.activeTabProperty().get().get();
-                            final NamedCompound ce = new NamedCompound(Localization.lang("Merged external changes"));
-                            changes.stream().filter(DatabaseChange::isAccepted).forEach(change -> change.applyChange(ce));
-                            ce.end();
-                            undoManager.addEdit(ce);
-                            if (areAllChangesResolved.get()) {
-                                if (databaseChangesResolverDialog.areAllChangesAccepted()) {
-                                    // In case all changes of the file on disk are merged into the current in-memory file, the file on disk does not differ from the in-memory file
-                                    saveState.resetChangedProperties();
-                                } else {
-                                    saveState.markBaseChanged();
-                                }
-                            }
-                            notificationPane.hide();
-                        })),
+                List.of(
+                        new Action(
+                                Localization.lang("Dismiss changes"),
+                                event -> notificationPane.hide()),
+                        new Action(
+                                Localization.lang("Review changes"),
+                                event -> {
+                                    DatabaseChangesResolverDialog databaseChangesResolverDialog =
+                                            new DatabaseChangesResolverDialog(
+                                                    changes,
+                                                    database,
+                                                    Localization.lang("External Changes Resolver"));
+                                    var areAllChangesResolved =
+                                            dialogService.showCustomDialogAndWait(
+                                                    databaseChangesResolverDialog);
+                                    saveState = stateManager.activeTabProperty().get().get();
+                                    final NamedCompound ce =
+                                            new NamedCompound(
+                                                    Localization.lang("Merged external changes"));
+                                    changes.stream()
+                                            .filter(DatabaseChange::isAccepted)
+                                            .forEach(change -> change.applyChange(ce));
+                                    ce.end();
+                                    undoManager.addEdit(ce);
+                                    if (areAllChangesResolved.get()) {
+                                        if (databaseChangesResolverDialog.areAllChangesAccepted()) {
+                                            // In case all changes of the file on disk are merged
+                                            // into the current in-memory file, the file on disk
+                                            // does not differ from the in-memory file
+                                            saveState.resetChangedProperties();
+                                        } else {
+                                            saveState.markBaseChanged();
+                                        }
+                                    }
+                                    notificationPane.hide();
+                                })),
                 Duration.ZERO);
     }
 
     @Override
     public void fileUpdated() {
         synchronized (database) {
-            // File on disk has changed, thus look for notable changes and notify listeners in case there are such changes
+            // File on disk has changed, thus look for notable changes and notify listeners in case
+            // there are such changes
             ChangeScanner scanner = new ChangeScanner(database, dialogService, preferences);
             BackgroundTask.wrap(scanner::scanForChanges)
-                          .onSuccess(changes -> {
-                              if (!changes.isEmpty()) {
-                                  listeners.forEach(listener -> listener.databaseChanged(changes));
-                              }
-                          })
-                          .onFailure(e -> LOGGER.error("Error while watching for changes", e))
-                          .executeWith(taskExecutor);
+                    .onSuccess(
+                            changes -> {
+                                if (!changes.isEmpty()) {
+                                    listeners.forEach(
+                                            listener -> listener.databaseChanged(changes));
+                                }
+                            })
+                    .onFailure(e -> LOGGER.error("Error while watching for changes", e))
+                    .executeWith(taskExecutor);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeResolver.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeResolver.java
index 83c318d49653..963094fcefcf 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeResolver.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeResolver.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.collab;
 
-import java.util.Optional;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.collab.entrychange.EntryChangeResolver;
 
-public sealed abstract class DatabaseChangeResolver permits EntryChangeResolver {
+import java.util.Optional;
+
+public abstract sealed class DatabaseChangeResolver permits EntryChangeResolver {
     protected final DialogService dialogService;
 
     protected DatabaseChangeResolver(DialogService dialogService) {
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeResolverFactory.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeResolverFactory.java
index 401d119d8eaa..045386d8439f 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeResolverFactory.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeResolverFactory.java
@@ -1,19 +1,22 @@
 package org.jabref.gui.collab;
 
-import java.util.Optional;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.collab.entrychange.EntryChange;
 import org.jabref.gui.collab.entrychange.EntryChangeResolver;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 
+import java.util.Optional;
+
 public class DatabaseChangeResolverFactory {
     private final DialogService dialogService;
     private final BibDatabaseContext databaseContext;
     private final GuiPreferences preferences;
 
-    public DatabaseChangeResolverFactory(DialogService dialogService, BibDatabaseContext databaseContext, GuiPreferences preferences) {
+    public DatabaseChangeResolverFactory(
+            DialogService dialogService,
+            BibDatabaseContext databaseContext,
+            GuiPreferences preferences) {
         this.dialogService = dialogService;
         this.databaseContext = databaseContext;
         this.preferences = preferences;
@@ -21,7 +24,9 @@ public DatabaseChangeResolverFactory(DialogService dialogService, BibDatabaseCon
 
     public Optional<DatabaseChangeResolver> create(DatabaseChange change) {
         if (change instanceof EntryChange entryChange) {
-            return Optional.of(new EntryChangeResolver(entryChange, dialogService, databaseContext, preferences));
+            return Optional.of(
+                    new EntryChangeResolver(
+                            entryChange, dialogService, databaseContext, preferences));
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java b/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
index 7c86ee9950bf..1d3ce461dcfe 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
@@ -1,10 +1,9 @@
 package org.jabref.gui.collab;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
 
-import javax.swing.undo.UndoManager;
+import jakarta.inject.Inject;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.fxml.FXML;
@@ -22,30 +21,31 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.undo.UndoManager;
+
 public class DatabaseChangesResolverDialog extends BaseDialog<Boolean> {
-    private final static Logger LOGGER = LoggerFactory.getLogger(DatabaseChangesResolverDialog.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(DatabaseChangesResolverDialog.class);
+
     /**
      * Reconstructing the details view to preview an {@link DatabaseChange} every time it's selected is a heavy operation.
      * It is also useless because changes are static and if the change data is static then the view doesn't have to change
      * either. This cache is used to ensure that we only create the detail view instance once for each {@link DatabaseChange}.
      */
-    private final Map<DatabaseChange, DatabaseChangeDetailsView> DETAILS_VIEW_CACHE = new HashMap<>();
+    private final Map<DatabaseChange, DatabaseChangeDetailsView> DETAILS_VIEW_CACHE =
+            new HashMap<>();
 
-    @FXML
-    private TableView<DatabaseChange> changesTableView;
-    @FXML
-    private TableColumn<DatabaseChange, String> changeName;
-    @FXML
-    private Button askUserToResolveChangeButton;
-    @FXML
-    private BorderPane changeInfoPane;
+    @FXML private TableView<DatabaseChange> changesTableView;
+    @FXML private TableColumn<DatabaseChange, String> changeName;
+    @FXML private Button askUserToResolveChangeButton;
+    @FXML private BorderPane changeInfoPane;
 
     private final List<DatabaseChange> changes;
     private final BibDatabaseContext database;
@@ -69,24 +69,24 @@ public class DatabaseChangesResolverDialog extends BaseDialog<Boolean> {
      * @param changes The list of changes
      * @param database The database to apply the changes to
      */
-    public DatabaseChangesResolverDialog(List<DatabaseChange> changes, BibDatabaseContext database, String dialogTitle) {
+    public DatabaseChangesResolverDialog(
+            List<DatabaseChange> changes, BibDatabaseContext database, String dialogTitle) {
         this.changes = changes;
         this.database = database;
 
         this.setTitle(dialogTitle);
-        ViewLoader.view(this)
-                .load()
-                .setAsDialogPane(this);
-
-        this.setResultConverter(button -> {
-            if (viewModel.areAllChangesResolved()) {
-                LOGGER.info("External changes are resolved successfully");
-                return true;
-            } else {
-                LOGGER.info("External changes aren't resolved");
-                return false;
-            }
-        });
+        ViewLoader.view(this).load().setAsDialogPane(this);
+
+        this.setResultConverter(
+                button -> {
+                    if (viewModel.areAllChangesResolved()) {
+                        LOGGER.info("External changes are resolved successfully");
+                        return true;
+                    } else {
+                        LOGGER.info("External changes aren't resolved");
+                        return false;
+                    }
+                });
     }
 
     public boolean areAllChangesAccepted() {
@@ -99,34 +99,53 @@ public boolean areAllChangesDenied() {
 
     @FXML
     private void initialize() {
-        PreviewViewer previewViewer = new PreviewViewer(database, dialogService, preferences, themeManager, taskExecutor);
-        DatabaseChangeDetailsViewFactory databaseChangeDetailsViewFactory = new DatabaseChangeDetailsViewFactory(database, dialogService, themeManager, preferences, entryTypesManager, previewViewer, taskExecutor);
+        PreviewViewer previewViewer =
+                new PreviewViewer(database, dialogService, preferences, themeManager, taskExecutor);
+        DatabaseChangeDetailsViewFactory databaseChangeDetailsViewFactory =
+                new DatabaseChangeDetailsViewFactory(
+                        database,
+                        dialogService,
+                        themeManager,
+                        preferences,
+                        entryTypesManager,
+                        previewViewer,
+                        taskExecutor);
 
         viewModel = new ExternalChangesResolverViewModel(changes, undoManager);
 
         changeName.setCellValueFactory(data -> new SimpleStringProperty(data.getValue().getName()));
-        askUserToResolveChangeButton.disableProperty().bind(viewModel.canAskUserToResolveChangeProperty().not());
+        askUserToResolveChangeButton
+                .disableProperty()
+                .bind(viewModel.canAskUserToResolveChangeProperty().not());
 
         changesTableView.setItems(viewModel.getVisibleChanges());
         // Think twice before setting this to MULTIPLE...
         changesTableView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
         changesTableView.getSelectionModel().selectFirst();
 
-        viewModel.selectedChangeProperty().bind(changesTableView.getSelectionModel().selectedItemProperty());
-        EasyBind.subscribe(viewModel.selectedChangeProperty(), selectedChange -> {
-            if (selectedChange != null) {
-                DatabaseChangeDetailsView detailsView = DETAILS_VIEW_CACHE.computeIfAbsent(selectedChange, databaseChangeDetailsViewFactory::create);
-                changeInfoPane.setCenter(detailsView);
-            }
-        });
-
-        EasyBind.subscribe(viewModel.areAllChangesResolvedProperty(), isResolved -> {
-            if (isResolved) {
-                areAllChangesAccepted = viewModel.areAllChangesAccepted();
-                areAllChangesDenied = viewModel.areAllChangesDenied();
-                close();
-            }
-        });
+        viewModel
+                .selectedChangeProperty()
+                .bind(changesTableView.getSelectionModel().selectedItemProperty());
+        EasyBind.subscribe(
+                viewModel.selectedChangeProperty(),
+                selectedChange -> {
+                    if (selectedChange != null) {
+                        DatabaseChangeDetailsView detailsView =
+                                DETAILS_VIEW_CACHE.computeIfAbsent(
+                                        selectedChange, databaseChangeDetailsViewFactory::create);
+                        changeInfoPane.setCenter(detailsView);
+                    }
+                });
+
+        EasyBind.subscribe(
+                viewModel.areAllChangesResolvedProperty(),
+                isResolved -> {
+                    if (isResolved) {
+                        areAllChangesAccepted = viewModel.areAllChangesAccepted();
+                        areAllChangesDenied = viewModel.areAllChangesDenied();
+                        close();
+                    }
+                });
     }
 
     @FXML
@@ -141,7 +160,10 @@ public void acceptChanges() {
 
     @FXML
     public void askUserToResolveChange() {
-        viewModel.getSelectedChange().flatMap(DatabaseChange::getExternalChangeResolver)
-                 .flatMap(DatabaseChangeResolver::askUserToResolveChange).ifPresent(viewModel::acceptMergedChange);
+        viewModel
+                .getSelectedChange()
+                .flatMap(DatabaseChange::getExternalChangeResolver)
+                .flatMap(DatabaseChangeResolver::askUserToResolveChange)
+                .ifPresent(viewModel::acceptMergedChange);
     }
 }
diff --git a/src/main/java/org/jabref/gui/collab/ExternalChangesResolverViewModel.java b/src/main/java/org/jabref/gui/collab/ExternalChangesResolverViewModel.java
index 1970921b3ddd..aae0df7d6370 100644
--- a/src/main/java/org/jabref/gui/collab/ExternalChangesResolverViewModel.java
+++ b/src/main/java/org/jabref/gui/collab/ExternalChangesResolverViewModel.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.collab;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ObjectProperty;
@@ -14,15 +8,22 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.AbstractViewModel;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
+
 public class ExternalChangesResolverViewModel extends AbstractViewModel {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(ExternalChangesResolverViewModel.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(ExternalChangesResolverViewModel.class);
 
-    private final ObservableList<DatabaseChange> visibleChanges = FXCollections.observableArrayList();
+    private final ObservableList<DatabaseChange> visibleChanges =
+            FXCollections.observableArrayList();
 
     /**
      * Because visible changes list will be bound to the UI, certain changes can be removed. This list is used to keep
@@ -42,7 +43,8 @@ public class ExternalChangesResolverViewModel extends AbstractViewModel {
 
     private final UndoManager undoManager;
 
-    public ExternalChangesResolverViewModel(List<DatabaseChange> externalChanges, UndoManager undoManager) {
+    public ExternalChangesResolverViewModel(
+            List<DatabaseChange> externalChanges, UndoManager undoManager) {
         Objects.requireNonNull(externalChanges);
         assert !externalChanges.isEmpty();
 
@@ -50,10 +52,23 @@ public ExternalChangesResolverViewModel(List<DatabaseChange> externalChanges, Un
         this.changes.addAll(externalChanges);
         this.undoManager = undoManager;
 
-        areAllChangesResolved = Bindings.createBooleanBinding(visibleChanges::isEmpty, visibleChanges);
-        areAllChangesAccepted = Bindings.createBooleanBinding(() -> changes.stream().allMatch(DatabaseChange::isAccepted));
-        areAllChangesDenied = Bindings.createBooleanBinding(() -> changes.stream().noneMatch(DatabaseChange::isAccepted));
-        canAskUserToResolveChange = Bindings.createBooleanBinding(() -> selectedChange.isNotNull().get() && selectedChange.get().getExternalChangeResolver().isPresent(), selectedChange);
+        areAllChangesResolved =
+                Bindings.createBooleanBinding(visibleChanges::isEmpty, visibleChanges);
+        areAllChangesAccepted =
+                Bindings.createBooleanBinding(
+                        () -> changes.stream().allMatch(DatabaseChange::isAccepted));
+        areAllChangesDenied =
+                Bindings.createBooleanBinding(
+                        () -> changes.stream().noneMatch(DatabaseChange::isAccepted));
+        canAskUserToResolveChange =
+                Bindings.createBooleanBinding(
+                        () ->
+                                selectedChange.isNotNull().get()
+                                        && selectedChange
+                                                .get()
+                                                .getExternalChangeResolver()
+                                                .isPresent(),
+                        selectedChange);
     }
 
     public ObservableList<DatabaseChange> getVisibleChanges() {
@@ -97,10 +112,12 @@ public BooleanBinding canAskUserToResolveChangeProperty() {
     }
 
     public void acceptChange() {
-        getSelectedChange().ifPresent(selectedChange -> {
-            selectedChange.accept();
-            getVisibleChanges().remove(selectedChange);
-        });
+        getSelectedChange()
+                .ifPresent(
+                        selectedChange -> {
+                            selectedChange.accept();
+                            getVisibleChanges().remove(selectedChange);
+                        });
     }
 
     public void denyChange() {
@@ -110,11 +127,13 @@ public void denyChange() {
     public void acceptMergedChange(DatabaseChange databaseChange) {
         Objects.requireNonNull(databaseChange);
 
-        getSelectedChange().ifPresent(oldChange -> {
-            changes.remove(oldChange);
-            changes.add(databaseChange);
-            databaseChange.accept();
-            getVisibleChanges().remove(oldChange);
-        });
+        getSelectedChange()
+                .ifPresent(
+                        oldChange -> {
+                            changes.remove(oldChange);
+                            changes.add(databaseChange);
+                            databaseChange.accept();
+                            getVisibleChanges().remove(oldChange);
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/collab/entryadd/EntryAdd.java b/src/main/java/org/jabref/gui/collab/entryadd/EntryAdd.java
index abf8ae633bfc..c105a07b79e9 100644
--- a/src/main/java/org/jabref/gui/collab/entryadd/EntryAdd.java
+++ b/src/main/java/org/jabref/gui/collab/entryadd/EntryAdd.java
@@ -11,12 +11,17 @@
 public final class EntryAdd extends DatabaseChange {
     private final BibEntry addedEntry;
 
-    public EntryAdd(BibEntry addedEntry, BibDatabaseContext databaseContext, DatabaseChangeResolverFactory databaseChangeResolverFactory) {
+    public EntryAdd(
+            BibEntry addedEntry,
+            BibDatabaseContext databaseContext,
+            DatabaseChangeResolverFactory databaseChangeResolverFactory) {
         super(databaseContext, databaseChangeResolverFactory);
         this.addedEntry = addedEntry;
-        setChangeName(addedEntry.getCitationKey()
-                           .map(key -> Localization.lang("Added entry '%0'", key))
-                           .orElse(Localization.lang("Added entry")));
+        setChangeName(
+                addedEntry
+                        .getCitationKey()
+                        .map(key -> Localization.lang("Added entry '%0'", key))
+                        .orElse(Localization.lang("Added entry")));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/collab/entrychange/EntryChange.java b/src/main/java/org/jabref/gui/collab/entrychange/EntryChange.java
index 44189beef936..bfb880f3eeb7 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/EntryChange.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryChange.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.collab.entrychange;
 
-import javax.swing.undo.CompoundEdit;
-
 import org.jabref.gui.collab.DatabaseChange;
 import org.jabref.gui.collab.DatabaseChangeResolverFactory;
 import org.jabref.gui.undo.NamedCompound;
@@ -11,16 +9,24 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
+import javax.swing.undo.CompoundEdit;
+
 public final class EntryChange extends DatabaseChange {
     private final BibEntry oldEntry;
     private final BibEntry newEntry;
 
-    public EntryChange(BibEntry oldEntry, BibEntry newEntry, BibDatabaseContext databaseContext, DatabaseChangeResolverFactory databaseChangeResolverFactory) {
+    public EntryChange(
+            BibEntry oldEntry,
+            BibEntry newEntry,
+            BibDatabaseContext databaseContext,
+            DatabaseChangeResolverFactory databaseChangeResolverFactory) {
         super(databaseContext, databaseChangeResolverFactory);
         this.oldEntry = oldEntry;
         this.newEntry = newEntry;
-        setChangeName(oldEntry.getCitationKey().map(key -> Localization.lang("Modified entry '%0'", key))
-                           .orElse(Localization.lang("Modified entry")));
+        setChangeName(
+                oldEntry.getCitationKey()
+                        .map(key -> Localization.lang("Modified entry '%0'", key))
+                        .orElse(Localization.lang("Modified entry")));
     }
 
     public EntryChange(BibEntry oldEntry, BibEntry newEntry, BibDatabaseContext databaseContext) {
diff --git a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
index 8cdabe824ef8..06bd8a9b67f2 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.collab.entrychange;
 
+import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.event.Event;
 import javafx.geometry.Orientation;
 import javafx.scene.control.Label;
@@ -20,27 +22,28 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public final class EntryChangeDetailsView extends DatabaseChangeDetailsView {
     private boolean scrolling = false;
 
-    public EntryChangeDetailsView(BibEntry oldEntry,
-                                  BibEntry newEntry,
-                                  BibDatabaseContext databaseContext,
-                                  DialogService dialogService,
-                                  ThemeManager themeManager,
-                                  GuiPreferences preferences,
-                                  BibEntryTypesManager entryTypesManager,
-                                  PreviewViewer previewViewer,
-                                  TaskExecutor taskExecutor) {
+    public EntryChangeDetailsView(
+            BibEntry oldEntry,
+            BibEntry newEntry,
+            BibDatabaseContext databaseContext,
+            DialogService dialogService,
+            ThemeManager themeManager,
+            GuiPreferences preferences,
+            BibEntryTypesManager entryTypesManager,
+            PreviewViewer previewViewer,
+            TaskExecutor taskExecutor) {
         Label inJabRef = new Label(Localization.lang("In JabRef"));
         inJabRef.getStyleClass().add("lib-change-header");
         Label onDisk = new Label(Localization.lang("On disk"));
         onDisk.getStyleClass().add("lib-change-header");
 
         // we need a copy here as we otherwise would set the same entry twice
-        PreviewViewer previewClone = new PreviewViewer(databaseContext, dialogService, preferences, themeManager, taskExecutor);
+        PreviewViewer previewClone =
+                new PreviewViewer(
+                        databaseContext, dialogService, preferences, themeManager, taskExecutor);
 
         // The scroll bar used is not part of ScrollPane, but the attached WebView.
         WebView previewCloneView = (WebView) previewClone.getContent();
@@ -50,19 +53,38 @@ public EntryChangeDetailsView(BibEntry oldEntry,
         // TODO: Also sync scrolling for BibTeX view.
 
         PreviewWithSourceTab oldPreviewWithSourcesTab = new PreviewWithSourceTab();
-        TabPane oldEntryTabPane = oldPreviewWithSourcesTab.getPreviewWithSourceTab(oldEntry, databaseContext, preferences, entryTypesManager, previewClone, Localization.lang("Entry Preview"));
+        TabPane oldEntryTabPane =
+                oldPreviewWithSourcesTab.getPreviewWithSourceTab(
+                        oldEntry,
+                        databaseContext,
+                        preferences,
+                        entryTypesManager,
+                        previewClone,
+                        Localization.lang("Entry Preview"));
         PreviewWithSourceTab newPreviewWithSourcesTab = new PreviewWithSourceTab();
-        TabPane newEntryTabPane = newPreviewWithSourcesTab.getPreviewWithSourceTab(newEntry, databaseContext, preferences, entryTypesManager, previewViewer, Localization.lang("Entry Preview"));
+        TabPane newEntryTabPane =
+                newPreviewWithSourcesTab.getPreviewWithSourceTab(
+                        newEntry,
+                        databaseContext,
+                        preferences,
+                        entryTypesManager,
+                        previewViewer,
+                        Localization.lang("Entry Preview"));
 
-        EasyBind.subscribe(oldEntryTabPane.getSelectionModel().selectedIndexProperty(), selectedIndex -> {
-            newEntryTabPane.getSelectionModel().select(selectedIndex.intValue());
-        });
+        EasyBind.subscribe(
+                oldEntryTabPane.getSelectionModel().selectedIndexProperty(),
+                selectedIndex -> {
+                    newEntryTabPane.getSelectionModel().select(selectedIndex.intValue());
+                });
 
-        EasyBind.subscribe(newEntryTabPane.getSelectionModel().selectedIndexProperty(), selectedIndex -> {
-            if (oldEntryTabPane.getSelectionModel().getSelectedIndex() != selectedIndex.intValue()) {
-                oldEntryTabPane.getSelectionModel().select(selectedIndex.intValue());
-            }
-        });
+        EasyBind.subscribe(
+                newEntryTabPane.getSelectionModel().selectedIndexProperty(),
+                selectedIndex -> {
+                    if (oldEntryTabPane.getSelectionModel().getSelectedIndex()
+                            != selectedIndex.intValue()) {
+                        oldEntryTabPane.getSelectionModel().select(selectedIndex.intValue());
+                    }
+                });
 
         VBox containerOld = new VBox(inJabRef, oldEntryTabPane);
         VBox containerNew = new VBox(onDisk, newEntryTabPane);
@@ -77,19 +99,25 @@ public EntryChangeDetailsView(BibEntry oldEntry,
     // https://stackoverflow.com/questions/49509395/synchronize-scrollbars-of-two-javafx-webviews
     // https://stackoverflow.com/questions/31264847/how-to-set-remember-scrollbar-thumb-position-in-javafx-8-webview
     private void synchronizeScrolling(WebView webView, WebView otherWebView) {
-        webView.addEventHandler(Event.ANY, event -> {
-            if (!scrolling) {
-                scrolling = true;
-                if (event instanceof MouseEvent mouseEvent) {
-                    if (mouseEvent.isPrimaryButtonDown()) {
-                        int value = (Integer) webView.getEngine().executeScript("window.scrollY");
-                        otherWebView.getEngine().executeScript("window.scrollTo(0, " + value + ")");
+        webView.addEventHandler(
+                Event.ANY,
+                event -> {
+                    if (!scrolling) {
+                        scrolling = true;
+                        if (event instanceof MouseEvent mouseEvent) {
+                            if (mouseEvent.isPrimaryButtonDown()) {
+                                int value =
+                                        (Integer)
+                                                webView.getEngine().executeScript("window.scrollY");
+                                otherWebView
+                                        .getEngine()
+                                        .executeScript("window.scrollTo(0, " + value + ")");
+                            }
+                        } else {
+                            otherWebView.fireEvent(event.copyFor(otherWebView, otherWebView));
+                        }
+                        scrolling = false;
                     }
-                } else {
-                    otherWebView.fireEvent(event.copyFor(otherWebView, otherWebView));
-                }
-                scrolling = false;
-            }
-        });
+                });
     }
 }
diff --git a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeResolver.java b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeResolver.java
index 82afd0eced13..e80012b49af9 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeResolver.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeResolver.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.collab.entrychange;
 
-import java.util.Optional;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.collab.DatabaseChange;
 import org.jabref.gui.collab.DatabaseChangeResolver;
@@ -14,13 +12,19 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 
+import java.util.Optional;
+
 public final class EntryChangeResolver extends DatabaseChangeResolver {
     private final EntryChange entryChange;
     private final BibDatabaseContext databaseContext;
 
     private final GuiPreferences preferences;
 
-    public EntryChangeResolver(EntryChange entryChange, DialogService dialogService, BibDatabaseContext databaseContext, GuiPreferences preferences) {
+    public EntryChangeResolver(
+            EntryChange entryChange,
+            DialogService dialogService,
+            BibDatabaseContext databaseContext,
+            GuiPreferences preferences) {
         super(dialogService);
         this.entryChange = entryChange;
         this.databaseContext = databaseContext;
@@ -29,20 +33,21 @@ public EntryChangeResolver(EntryChange entryChange, DialogService dialogService,
 
     @Override
     public Optional<DatabaseChange> askUserToResolveChange() {
-        MergeEntriesDialog mergeEntriesDialog = new MergeEntriesDialog(entryChange.getOldEntry(), entryChange.getNewEntry(), preferences);
+        MergeEntriesDialog mergeEntriesDialog =
+                new MergeEntriesDialog(
+                        entryChange.getOldEntry(), entryChange.getNewEntry(), preferences);
         mergeEntriesDialog.setLeftHeaderText(Localization.lang("In JabRef"));
         mergeEntriesDialog.setRightHeaderText(Localization.lang("On disk"));
-        mergeEntriesDialog.configureDiff(new ShowDiffConfig(ThreeWayMergeToolbar.DiffView.SPLIT, BasicDiffMethod.WORDS));
+        mergeEntriesDialog.configureDiff(
+                new ShowDiffConfig(ThreeWayMergeToolbar.DiffView.SPLIT, BasicDiffMethod.WORDS));
 
-        return dialogService.showCustomDialogAndWait(mergeEntriesDialog)
-                            .map(this::mapMergeResultToExternalChange);
+        return dialogService
+                .showCustomDialogAndWait(mergeEntriesDialog)
+                .map(this::mapMergeResultToExternalChange);
     }
 
     private EntryChange mapMergeResultToExternalChange(EntriesMergeResult entriesMergeResult) {
         return new EntryChange(
-                entryChange.getOldEntry(),
-                entriesMergeResult.mergedEntry(),
-                databaseContext
-        );
+                entryChange.getOldEntry(), entriesMergeResult.mergedEntry(), databaseContext);
     }
 }
diff --git a/src/main/java/org/jabref/gui/collab/entrychange/EntryWithPreviewAndSourceDetailsView.java b/src/main/java/org/jabref/gui/collab/entrychange/EntryWithPreviewAndSourceDetailsView.java
index a4720a5f29b3..c46542a013e0 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/EntryWithPreviewAndSourceDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryWithPreviewAndSourceDetailsView.java
@@ -13,8 +13,15 @@ public final class EntryWithPreviewAndSourceDetailsView extends DatabaseChangeDe
 
     private final PreviewWithSourceTab previewWithSourceTab = new PreviewWithSourceTab();
 
-    public EntryWithPreviewAndSourceDetailsView(BibEntry entry, BibDatabaseContext bibDatabaseContext, GuiPreferences preferences, BibEntryTypesManager entryTypesManager, PreviewViewer previewViewer) {
-        TabPane tabPanePreviewCode = previewWithSourceTab.getPreviewWithSourceTab(entry, bibDatabaseContext, preferences, entryTypesManager, previewViewer);
+    public EntryWithPreviewAndSourceDetailsView(
+            BibEntry entry,
+            BibDatabaseContext bibDatabaseContext,
+            GuiPreferences preferences,
+            BibEntryTypesManager entryTypesManager,
+            PreviewViewer previewViewer) {
+        TabPane tabPanePreviewCode =
+                previewWithSourceTab.getPreviewWithSourceTab(
+                        entry, bibDatabaseContext, preferences, entryTypesManager, previewViewer);
         setLeftAnchor(tabPanePreviewCode, 8d);
         setTopAnchor(tabPanePreviewCode, 8d);
         setRightAnchor(tabPanePreviewCode, 8d);
diff --git a/src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java b/src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java
index 385d9d73ddd7..e6ad370f723c 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java
@@ -1,11 +1,9 @@
 package org.jabref.gui.collab.entrychange;
 
-import java.io.IOException;
-import java.io.StringWriter;
-
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 
+import org.fxmisc.richtext.CodeArea;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.preview.PreviewViewer;
 import org.jabref.logic.bibtex.BibEntryWriter;
@@ -19,20 +17,33 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.strings.StringUtil;
-
-import org.fxmisc.richtext.CodeArea;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.StringWriter;
+
 public class PreviewWithSourceTab {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PreviewWithSourceTab.class);
 
-    public TabPane getPreviewWithSourceTab(BibEntry entry, BibDatabaseContext bibDatabaseContext, GuiPreferences preferences, BibEntryTypesManager entryTypesManager, PreviewViewer previewViewer) {
-        return getPreviewWithSourceTab(entry, bibDatabaseContext, preferences, entryTypesManager, previewViewer, "");
+    public TabPane getPreviewWithSourceTab(
+            BibEntry entry,
+            BibDatabaseContext bibDatabaseContext,
+            GuiPreferences preferences,
+            BibEntryTypesManager entryTypesManager,
+            PreviewViewer previewViewer) {
+        return getPreviewWithSourceTab(
+                entry, bibDatabaseContext, preferences, entryTypesManager, previewViewer, "");
     }
 
-    public TabPane getPreviewWithSourceTab(BibEntry entry, BibDatabaseContext bibDatabaseContext, GuiPreferences preferences, BibEntryTypesManager entryTypesManager, PreviewViewer previewViewer, String label) {
+    public TabPane getPreviewWithSourceTab(
+            BibEntry entry,
+            BibDatabaseContext bibDatabaseContext,
+            GuiPreferences preferences,
+            BibEntryTypesManager entryTypesManager,
+            PreviewViewer previewViewer,
+            String label) {
         previewViewer.setLayout(preferences.getPreviewPreferences().getSelectedPreviewLayout());
         previewViewer.setEntry(entry);
 
@@ -52,18 +63,32 @@ public TabPane getPreviewWithSourceTab(BibEntry entry, BibDatabaseContext bibDat
         }
 
         try {
-            codeArea.appendText(getSourceString(entry, bibDatabaseContext.getMode(), preferences.getFieldPreferences(), entryTypesManager));
+            codeArea.appendText(
+                    getSourceString(
+                            entry,
+                            bibDatabaseContext.getMode(),
+                            preferences.getFieldPreferences(),
+                            entryTypesManager));
         } catch (IOException e) {
             LOGGER.error("Error getting Bibtex: {}", entry);
         }
         codeArea.setEditable(false);
-        Tab codeTab = new Tab(Localization.lang("%0 source", bibDatabaseContext.getMode().getFormattedName()), codeArea);
+        Tab codeTab =
+                new Tab(
+                        Localization.lang(
+                                "%0 source", bibDatabaseContext.getMode().getFormattedName()),
+                        codeArea);
 
         tabPanePreviewCode.getTabs().addAll(previewTab, codeTab);
         return tabPanePreviewCode;
     }
 
-    private String getSourceString(BibEntry entry, BibDatabaseMode type, FieldPreferences fieldPreferences, BibEntryTypesManager entryTypesManager) throws IOException {
+    private String getSourceString(
+            BibEntry entry,
+            BibDatabaseMode type,
+            FieldPreferences fieldPreferences,
+            BibEntryTypesManager entryTypesManager)
+            throws IOException {
         StringWriter writer = new StringWriter();
         BibWriter bibWriter = new BibWriter(writer, OS.NEWLINE);
         FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(fieldPreferences);
diff --git a/src/main/java/org/jabref/gui/collab/entrydelete/EntryDelete.java b/src/main/java/org/jabref/gui/collab/entrydelete/EntryDelete.java
index 36116bb5845c..ab984bab82cc 100644
--- a/src/main/java/org/jabref/gui/collab/entrydelete/EntryDelete.java
+++ b/src/main/java/org/jabref/gui/collab/entrydelete/EntryDelete.java
@@ -11,12 +11,17 @@
 public final class EntryDelete extends DatabaseChange {
     private final BibEntry deletedEntry;
 
-    public EntryDelete(BibEntry deletedEntry, BibDatabaseContext databaseContext, DatabaseChangeResolverFactory databaseChangeResolverFactory) {
+    public EntryDelete(
+            BibEntry deletedEntry,
+            BibDatabaseContext databaseContext,
+            DatabaseChangeResolverFactory databaseChangeResolverFactory) {
         super(databaseContext, databaseChangeResolverFactory);
         this.deletedEntry = deletedEntry;
-        setChangeName(deletedEntry.getCitationKey()
-                           .map(key -> Localization.lang("Deleted entry '%0'", key))
-                           .orElse(Localization.lang("Deleted entry")));
+        setChangeName(
+                deletedEntry
+                        .getCitationKey()
+                        .map(key -> Localization.lang("Deleted entry '%0'", key))
+                        .orElse(Localization.lang("Deleted entry")));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/collab/groupchange/GroupChange.java b/src/main/java/org/jabref/gui/collab/groupchange/GroupChange.java
index 4444d0f79c3b..8a29bf1a259b 100644
--- a/src/main/java/org/jabref/gui/collab/groupchange/GroupChange.java
+++ b/src/main/java/org/jabref/gui/collab/groupchange/GroupChange.java
@@ -14,11 +14,16 @@
 public final class GroupChange extends DatabaseChange {
     private final GroupDiff groupDiff;
 
-    public GroupChange(GroupDiff groupDiff, BibDatabaseContext databaseContext, DatabaseChangeResolverFactory databaseChangeResolverFactory) {
+    public GroupChange(
+            GroupDiff groupDiff,
+            BibDatabaseContext databaseContext,
+            DatabaseChangeResolverFactory databaseChangeResolverFactory) {
         super(databaseContext, databaseChangeResolverFactory);
         this.groupDiff = groupDiff;
-        setChangeName(groupDiff.getOriginalGroupRoot() == null ? Localization.lang("Removed all groups") : Localization
-                .lang("Modified groups tree"));
+        setChangeName(
+                groupDiff.getOriginalGroupRoot() == null
+                        ? Localization.lang("Removed all groups")
+                        : Localization.lang("Modified groups tree"));
     }
 
     @Override
@@ -26,15 +31,25 @@ public void applyChange(NamedCompound undoEdit) {
         GroupTreeNode oldRoot = groupDiff.getOriginalGroupRoot();
         GroupTreeNode newRoot = groupDiff.getNewGroupRoot();
 
-        GroupTreeNode root = databaseContext.getMetaData().getGroups().orElseGet(() -> {
-            GroupTreeNode groupTreeNode = new GroupTreeNode(DefaultGroupsFactory.getAllEntriesGroup());
-            databaseContext.getMetaData().setGroups(groupTreeNode);
-            return groupTreeNode;
-        });
+        GroupTreeNode root =
+                databaseContext
+                        .getMetaData()
+                        .getGroups()
+                        .orElseGet(
+                                () -> {
+                                    GroupTreeNode groupTreeNode =
+                                            new GroupTreeNode(
+                                                    DefaultGroupsFactory.getAllEntriesGroup());
+                                    databaseContext.getMetaData().setGroups(groupTreeNode);
+                                    return groupTreeNode;
+                                });
 
-        final UndoableModifySubtree undo = new UndoableModifySubtree(
-                new GroupTreeNodeViewModel(databaseContext.getMetaData().getGroups().orElse(null)),
-                new GroupTreeNodeViewModel(root), Localization.lang("Modified groups"));
+        final UndoableModifySubtree undo =
+                new UndoableModifySubtree(
+                        new GroupTreeNodeViewModel(
+                                databaseContext.getMetaData().getGroups().orElse(null)),
+                        new GroupTreeNodeViewModel(root),
+                        Localization.lang("Modified groups"));
         root.removeAllChildren();
         if (newRoot == null) {
             // I think setting root to null is not possible
diff --git a/src/main/java/org/jabref/gui/collab/groupchange/GroupChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/groupchange/GroupChangeDetailsView.java
index de428484f295..d8765cada76e 100644
--- a/src/main/java/org/jabref/gui/collab/groupchange/GroupChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/groupchange/GroupChangeDetailsView.java
@@ -12,7 +12,10 @@ public GroupChangeDetailsView(GroupChange groupChange) {
         if (groupChange.getGroupDiff().getNewGroupRoot() == null) {
             labelValue = groupChange.getName() + '.';
         } else {
-            labelValue = Localization.lang("%0. Accepting the change replaces the complete groups tree with the externally modified groups tree.", groupChange.getName());
+            labelValue =
+                    Localization.lang(
+                            "%0. Accepting the change replaces the complete groups tree with the externally modified groups tree.",
+                            groupChange.getName());
         }
         Label label = new Label(labelValue);
         label.setWrapText(true);
diff --git a/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChange.java b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChange.java
index 571fe74b7528..d477597bab4a 100644
--- a/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChange.java
+++ b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChange.java
@@ -10,7 +10,10 @@
 public final class MetadataChange extends DatabaseChange {
     private final MetaDataDiff metaDataDiff;
 
-    public MetadataChange(MetaDataDiff metaDataDiff, BibDatabaseContext databaseContext, DatabaseChangeResolverFactory databaseChangeResolverFactory) {
+    public MetadataChange(
+            MetaDataDiff metaDataDiff,
+            BibDatabaseContext databaseContext,
+            DatabaseChangeResolverFactory databaseChangeResolverFactory) {
         super(databaseContext, databaseChangeResolverFactory);
         this.metaDataDiff = metaDataDiff;
         setChangeName(Localization.lang("Metadata change"));
@@ -22,8 +25,13 @@ public void applyChange(NamedCompound undoEdit) {
         databaseContext.setMetaData(metaDataDiff.getNewMetaData());
         // group change is handled by GroupChange, so we set the groups root to the original value
         // to prevent any inconsistency
-        metaDataDiff.getGroupDifferences()
-                    .ifPresent(groupDiff -> databaseContext.getMetaData().setGroups(groupDiff.getOriginalGroupRoot()));
+        metaDataDiff
+                .getGroupDifferences()
+                .ifPresent(
+                        groupDiff ->
+                                databaseContext
+                                        .getMetaData()
+                                        .setGroups(groupDiff.getOriginalGroupRoot()));
     }
 
     public MetaDataDiff getMetaDataDiff() {
diff --git a/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java
index 7a6da5205b92..097646b421b0 100644
--- a/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java
@@ -11,14 +11,16 @@
 
 public final class MetadataChangeDetailsView extends DatabaseChangeDetailsView {
 
-    public MetadataChangeDetailsView(MetadataChange metadataChange, GlobalCitationKeyPatterns globalCitationKeyPatterns) {
+    public MetadataChangeDetailsView(
+            MetadataChange metadataChange, GlobalCitationKeyPatterns globalCitationKeyPatterns) {
         VBox container = new VBox(15);
 
         Label header = new Label(Localization.lang("The following metadata changed:"));
         header.getStyleClass().add("sectionHeader");
         container.getChildren().add(header);
 
-        for (MetaDataDiff.Difference diff : metadataChange.getMetaDataDiff().getDifferences(globalCitationKeyPatterns)) {
+        for (MetaDataDiff.Difference diff :
+                metadataChange.getMetaDataDiff().getDifferences(globalCitationKeyPatterns)) {
             container.getChildren().add(new Label(getDifferenceString(diff.differenceType())));
             container.getChildren().add(new Label(diff.originalObject().toString()));
             container.getChildren().add(new Label(diff.newObject().toString()));
@@ -31,30 +33,18 @@ public MetadataChangeDetailsView(MetadataChange metadataChange, GlobalCitationKe
 
     private String getDifferenceString(MetaDataDiff.DifferenceType changeType) {
         return switch (changeType) {
-            case PROTECTED ->
-                    Localization.lang("Library protection");
-            case GROUPS ->
-                    Localization.lang("Modified groups tree");
-            case ENCODING ->
-                    Localization.lang("Library encoding");
-            case SAVE_SORT_ORDER ->
-                    Localization.lang("Save sort order");
-            case KEY_PATTERNS ->
-                    Localization.lang("Key patterns");
-            case USER_FILE_DIRECTORY ->
-                    Localization.lang("User-specific file directory");
-            case LATEX_FILE_DIRECTORY ->
-                    Localization.lang("LaTeX file directory");
-            case DEFAULT_KEY_PATTERN ->
-                    Localization.lang("Default pattern");
-            case SAVE_ACTIONS ->
-                    Localization.lang("Save actions");
-            case MODE ->
-                    Localization.lang("Library mode");
-            case GENERAL_FILE_DIRECTORY ->
-                    Localization.lang("General file directory");
-            case CONTENT_SELECTOR ->
-                    Localization.lang("Content selectors");
+            case PROTECTED -> Localization.lang("Library protection");
+            case GROUPS -> Localization.lang("Modified groups tree");
+            case ENCODING -> Localization.lang("Library encoding");
+            case SAVE_SORT_ORDER -> Localization.lang("Save sort order");
+            case KEY_PATTERNS -> Localization.lang("Key patterns");
+            case USER_FILE_DIRECTORY -> Localization.lang("User-specific file directory");
+            case LATEX_FILE_DIRECTORY -> Localization.lang("LaTeX file directory");
+            case DEFAULT_KEY_PATTERN -> Localization.lang("Default pattern");
+            case SAVE_ACTIONS -> Localization.lang("Save actions");
+            case MODE -> Localization.lang("Library mode");
+            case GENERAL_FILE_DIRECTORY -> Localization.lang("General file directory");
+            case CONTENT_SELECTOR -> Localization.lang("Content selectors");
         };
     }
 }
diff --git a/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChange.java b/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChange.java
index 5789d2bbbccc..3817678c9410 100644
--- a/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChange.java
+++ b/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChange.java
@@ -7,7 +7,6 @@
 import org.jabref.logic.bibtex.comparator.PreambleDiff;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,7 +15,10 @@ public final class PreambleChange extends DatabaseChange {
 
     private final PreambleDiff preambleDiff;
 
-    public PreambleChange(PreambleDiff preambleDiff, BibDatabaseContext databaseContext, DatabaseChangeResolverFactory databaseChangeResolverFactory) {
+    public PreambleChange(
+            PreambleDiff preambleDiff,
+            BibDatabaseContext databaseContext,
+            DatabaseChangeResolverFactory databaseChangeResolverFactory) {
         super(databaseContext, databaseChangeResolverFactory);
         this.preambleDiff = preambleDiff;
 
@@ -26,7 +28,11 @@ public PreambleChange(PreambleDiff preambleDiff, BibDatabaseContext databaseCont
     @Override
     public void applyChange(NamedCompound undoEdit) {
         databaseContext.getDatabase().setPreamble(preambleDiff.getNewPreamble());
-        undoEdit.addEdit(new UndoablePreambleChange(databaseContext.getDatabase(), preambleDiff.getOriginalPreamble(), preambleDiff.getNewPreamble()));
+        undoEdit.addEdit(
+                new UndoablePreambleChange(
+                        databaseContext.getDatabase(),
+                        preambleDiff.getOriginalPreamble(),
+                        preambleDiff.getNewPreamble()));
     }
 
     public PreambleDiff getPreambleDiff() {
diff --git a/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChangeDetailsView.java
index c49182f1d2e3..536fa46f851a 100644
--- a/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChangeDetailsView.java
@@ -19,11 +19,23 @@ public PreambleChangeDetailsView(PreambleChange preambleChange) {
         container.getChildren().add(header);
 
         if (StringUtil.isNotBlank(preambleDiff.getOriginalPreamble())) {
-            container.getChildren().add(new Label(Localization.lang("Current value: %0", preambleDiff.getOriginalPreamble())));
+            container
+                    .getChildren()
+                    .add(
+                            new Label(
+                                    Localization.lang(
+                                            "Current value: %0",
+                                            preambleDiff.getOriginalPreamble())));
         }
 
         if (StringUtil.isNotBlank(preambleDiff.getNewPreamble())) {
-            container.getChildren().add(new Label(Localization.lang("Value set externally: %0", preambleDiff.getNewPreamble())));
+            container
+                    .getChildren()
+                    .add(
+                            new Label(
+                                    Localization.lang(
+                                            "Value set externally: %0",
+                                            preambleDiff.getNewPreamble())));
         } else {
             container.getChildren().add(new Label(Localization.lang("Value cleared externally")));
         }
diff --git a/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAdd.java b/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAdd.java
index 98c311ca6dce..ad7b598a434f 100644
--- a/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAdd.java
+++ b/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAdd.java
@@ -8,7 +8,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.KeyCollisionException;
 import org.jabref.model.entry.BibtexString;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,7 +16,10 @@ public final class BibTexStringAdd extends DatabaseChange {
 
     private final BibtexString addedString;
 
-    public BibTexStringAdd(BibtexString addedString, BibDatabaseContext databaseContext, DatabaseChangeResolverFactory databaseChangeResolverFactory) {
+    public BibTexStringAdd(
+            BibtexString addedString,
+            BibDatabaseContext databaseContext,
+            DatabaseChangeResolverFactory databaseChangeResolverFactory) {
         super(databaseContext, databaseChangeResolverFactory);
         this.addedString = addedString;
         setChangeName(Localization.lang("Added string: '%0'", addedString.getName()));
@@ -29,7 +31,11 @@ public void applyChange(NamedCompound undoEdit) {
             databaseContext.getDatabase().addString(addedString);
             undoEdit.addEdit(new UndoableInsertString(databaseContext.getDatabase(), addedString));
         } catch (KeyCollisionException ex) {
-            LOGGER.warn("Error: could not add string '{}': {}", addedString.getName(), ex.getMessage(), ex);
+            LOGGER.warn(
+                    "Error: could not add string '{}': {}",
+                    addedString.getName(),
+                    ex.getMessage(),
+                    ex);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAddDetailsView.java b/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAddDetailsView.java
index ffca7b4d7ba6..5eb3cc135307 100644
--- a/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAddDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAddDetailsView.java
@@ -12,11 +12,16 @@ public BibTexStringAddDetailsView(BibTexStringAdd stringAdd) {
         VBox container = new VBox();
         Label header = new Label(Localization.lang("Added string"));
         header.getStyleClass().add("sectionHeader");
-        container.getChildren().addAll(
-                header,
-                new Label(Localization.lang("Label: %0", stringAdd.getAddedString().getName())),
-                new Label(Localization.lang("Content: %0", stringAdd.getAddedString().getContent()))
-        );
+        container
+                .getChildren()
+                .addAll(
+                        header,
+                        new Label(
+                                Localization.lang(
+                                        "Label: %0", stringAdd.getAddedString().getName())),
+                        new Label(
+                                Localization.lang(
+                                        "Content: %0", stringAdd.getAddedString().getContent())));
 
         this.setAllAnchorsAndAttachChild(container);
     }
diff --git a/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChange.java b/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChange.java
index 8cb58e99d46e..cd8959622365 100644
--- a/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChange.java
+++ b/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChange.java
@@ -7,7 +7,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibtexString;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,7 +16,11 @@ public final class BibTexStringChange extends DatabaseChange {
     private final BibtexString oldString;
     private final BibtexString newString;
 
-    public BibTexStringChange(BibtexString oldString, BibtexString newString, BibDatabaseContext databaseContext, DatabaseChangeResolverFactory databaseChangeResolverFactory) {
+    public BibTexStringChange(
+            BibtexString oldString,
+            BibtexString newString,
+            BibDatabaseContext databaseContext,
+            DatabaseChangeResolverFactory databaseChangeResolverFactory) {
         super(databaseContext, databaseChangeResolverFactory);
         this.oldString = oldString;
         this.newString = newString;
diff --git a/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChangeDetailsView.java
index 880f5661ad85..26283bb2a5ba 100644
--- a/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChangeDetailsView.java
@@ -12,13 +12,24 @@ public BibTexStringChangeDetailsView(BibTexStringChange stringChange) {
         VBox container = new VBox();
         Label header = new Label(Localization.lang("Modified string"));
         header.getStyleClass().add("sectionHeader");
-        container.getChildren().addAll(
-                header,
-                new Label(Localization.lang("Label: %0", stringChange.getOldString().getName())),
-                new Label(Localization.lang("Content: %0", stringChange.getNewString().getContent()))
-        );
+        container
+                .getChildren()
+                .addAll(
+                        header,
+                        new Label(
+                                Localization.lang(
+                                        "Label: %0", stringChange.getOldString().getName())),
+                        new Label(
+                                Localization.lang(
+                                        "Content: %0", stringChange.getNewString().getContent())));
 
-        container.getChildren().add(new Label(Localization.lang("Current content: %0", stringChange.getOldString().getContent())));
+        container
+                .getChildren()
+                .add(
+                        new Label(
+                                Localization.lang(
+                                        "Current content: %0",
+                                        stringChange.getOldString().getContent())));
 
         this.setAllAnchorsAndAttachChild(container);
     }
diff --git a/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDelete.java b/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDelete.java
index 2f55cf7d3317..61b3a3032c91 100644
--- a/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDelete.java
+++ b/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDelete.java
@@ -7,7 +7,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibtexString;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,7 +15,10 @@ public final class BibTexStringDelete extends DatabaseChange {
 
     private final BibtexString deletedString;
 
-    public BibTexStringDelete(BibtexString deletedString, BibDatabaseContext databaseContext, DatabaseChangeResolverFactory databaseChangeResolverFactory) {
+    public BibTexStringDelete(
+            BibtexString deletedString,
+            BibDatabaseContext databaseContext,
+            DatabaseChangeResolverFactory databaseChangeResolverFactory) {
         super(databaseContext, databaseChangeResolverFactory);
         this.deletedString = deletedString;
         setChangeName(Localization.lang("Deleted string: '%0'", deletedString.getName()));
@@ -26,9 +28,14 @@ public BibTexStringDelete(BibtexString deletedString, BibDatabaseContext databas
     public void applyChange(NamedCompound undoEdit) {
         try {
             databaseContext.getDatabase().removeString(deletedString.getId());
-            undoEdit.addEdit(new UndoableRemoveString(databaseContext.getDatabase(), deletedString));
+            undoEdit.addEdit(
+                    new UndoableRemoveString(databaseContext.getDatabase(), deletedString));
         } catch (Exception ex) {
-            LOGGER.warn("Error: could not remove string '{}': {}", deletedString.getName(), ex.getMessage(), ex);
+            LOGGER.warn(
+                    "Error: could not remove string '{}': {}",
+                    deletedString.getName(),
+                    ex.getMessage(),
+                    ex);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDeleteDetailsView.java b/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDeleteDetailsView.java
index 31a63e5504c3..e87a8d5936a7 100644
--- a/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDeleteDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDeleteDetailsView.java
@@ -12,11 +12,17 @@ public BibTexStringDeleteDetailsView(BibTexStringDelete stringDelete) {
         VBox container = new VBox();
         Label header = new Label(Localization.lang("Deleted string"));
         header.getStyleClass().add("sectionHeader");
-        container.getChildren().addAll(
-                header,
-                new Label(Localization.lang("Label: %0", stringDelete.getDeletedString().getName())),
-                new Label(Localization.lang("Content: %0", stringDelete.getDeletedString().getContent()))
-        );
+        container
+                .getChildren()
+                .addAll(
+                        header,
+                        new Label(
+                                Localization.lang(
+                                        "Label: %0", stringDelete.getDeletedString().getName())),
+                        new Label(
+                                Localization.lang(
+                                        "Content: %0",
+                                        stringDelete.getDeletedString().getContent())));
 
         this.setAllAnchorsAndAttachChild(container);
     }
diff --git a/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRename.java b/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRename.java
index 0236ebda467d..0ab2938fc1f1 100644
--- a/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRename.java
+++ b/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRename.java
@@ -7,7 +7,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibtexString;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,7 +16,11 @@ public final class BibTexStringRename extends DatabaseChange {
     private final BibtexString oldString;
     private final BibtexString newString;
 
-    public BibTexStringRename(BibtexString oldString, BibtexString newString, BibDatabaseContext databaseContext, DatabaseChangeResolverFactory databaseChangeResolverFactory) {
+    public BibTexStringRename(
+            BibtexString oldString,
+            BibtexString newString,
+            BibDatabaseContext databaseContext,
+            DatabaseChangeResolverFactory databaseChangeResolverFactory) {
         super(databaseContext, databaseChangeResolverFactory);
         this.oldString = oldString;
         this.newString = newString;
@@ -29,7 +32,10 @@ public BibTexStringRename(BibtexString oldString, BibtexString newString, BibDat
     public void applyChange(NamedCompound undoEdit) {
         if (databaseContext.getDatabase().hasStringByName(newString.getName())) {
             // The name to change to is already in the database, so we can't comply.
-            LOGGER.info("Cannot rename string '{}' to '{}' because the name is already in use", oldString.getName(), newString.getName());
+            LOGGER.info(
+                    "Cannot rename string '{}' to '{}' because the name is already in use",
+                    oldString.getName(),
+                    newString.getName());
         }
 
         String currentName = oldString.getName();
diff --git a/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRenameDetailsView.java b/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRenameDetailsView.java
index fa826b08e8f3..5ea7c0553dc8 100644
--- a/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRenameDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRenameDetailsView.java
@@ -7,7 +7,11 @@
 public final class BibTexStringRenameDetailsView extends DatabaseChangeDetailsView {
 
     public BibTexStringRenameDetailsView(BibTexStringRename stringRename) {
-        Label label = new Label(stringRename.getNewString().getName() + " : " + stringRename.getOldString().getContent());
+        Label label =
+                new Label(
+                        stringRename.getNewString().getName()
+                                + " : "
+                                + stringRename.getOldString().getContent());
 
         this.setAllAnchorsAndAttachChild(label);
     }
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternsPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternsPanel.java
index 1c234329b764..7e9c395a3bae 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternsPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternsPanel.java
@@ -1,6 +1,8 @@
 package org.jabref.gui.commonfxcontrols;
 
-import java.util.Collection;
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
 
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -19,8 +21,7 @@
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.types.EntryType;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+import java.util.Collection;
 
 public class CitationKeyPatternsPanel extends TableView<CitationKeyPatternsPanelItemModel> {
 
@@ -38,14 +39,14 @@ public class CitationKeyPatternsPanel extends TableView<CitationKeyPatternsPanel
     public CitationKeyPatternsPanel() {
         super();
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @FXML
     private void initialize() {
-        viewModel = new CitationKeyPatternsPanelViewModel(preferences.getCitationKeyPatternPreferences());
+        viewModel =
+                new CitationKeyPatternsPanelViewModel(
+                        preferences.getCitationKeyPatternPreferences());
 
         this.setEditable(true);
 
@@ -55,8 +56,11 @@ private void initialize() {
         new ValueTableCellFactory<CitationKeyPatternsPanelItemModel, EntryType>()
                 .withText(EntryType::getDisplayName)
                 .install(entryTypeColumn);
-        this.setOnSort(event ->
-                viewModel.patternListProperty().sort(CitationKeyPatternsPanelViewModel.defaultOnTopComparator));
+        this.setOnSort(
+                event ->
+                        viewModel
+                                .patternListProperty()
+                                .sort(CitationKeyPatternsPanelViewModel.defaultOnTopComparator));
 
         patternColumn.setSortable(true);
         patternColumn.setReorderable(false);
@@ -72,10 +76,15 @@ private void initialize() {
         actionsColumn.setCellValueFactory(cellData -> cellData.getValue().entryType());
         new ValueTableCellFactory<CitationKeyPatternsPanelItemModel, EntryType>()
                 .withGraphic(entryType -> IconTheme.JabRefIcons.REFRESH.getGraphicNode())
-                .withTooltip(entryType ->
-                        Localization.lang("Reset %s to default value").formatted(entryType.getDisplayName()))
-                .withOnMouseClickedEvent(item -> evt ->
-                        viewModel.setItemToDefaultPattern(this.getFocusModel().getFocusedItem()))
+                .withTooltip(
+                        entryType ->
+                                Localization.lang("Reset %s to default value")
+                                        .formatted(entryType.getDisplayName()))
+                .withOnMouseClickedEvent(
+                        item ->
+                                evt ->
+                                        viewModel.setItemToDefaultPattern(
+                                                this.getFocusModel().getFocusedItem()))
                 .install(actionsColumn);
 
         this.setRowFactory(item -> new HighlightTableRow());
@@ -83,7 +92,8 @@ private void initialize() {
         this.itemsProperty().bindBidirectional(viewModel.patternListProperty());
     }
 
-    public void setValues(Collection<BibEntryType> entryTypeList, AbstractCitationKeyPatterns keyPattern) {
+    public void setValues(
+            Collection<BibEntryType> entryTypeList, AbstractCitationKeyPatterns keyPattern) {
         viewModel.setValues(entryTypeList, keyPattern);
     }
 
@@ -112,8 +122,15 @@ private void jumpToSearchKey(KeyEvent keypressed) {
 
         lastKeyPressTime = System.currentTimeMillis();
 
-        this.getItems().stream().filter(item -> item.getEntryType().getName().toLowerCase().startsWith(tableSearchTerm))
-            .findFirst().ifPresent(this::scrollTo);
+        this.getItems().stream()
+                .filter(
+                        item ->
+                                item.getEntryType()
+                                        .getName()
+                                        .toLowerCase()
+                                        .startsWith(tableSearchTerm))
+                .findFirst()
+                .ifPresent(this::scrollTo);
     }
 
     private static class HighlightTableRow extends TableRow<CitationKeyPatternsPanelItemModel> {
@@ -124,7 +141,9 @@ public void updateItem(CitationKeyPatternsPanelItemModel item, boolean empty) {
                 setStyle("");
             } else if (isSelected()) {
                 setStyle("-fx-background-color: -fx-selection-bar");
-            } else if (item.getEntryType().getName().equals(CitationKeyPatternsPanelViewModel.ENTRY_TYPE_DEFAULT_NAME)) {
+            } else if (item.getEntryType()
+                    .getName()
+                    .equals(CitationKeyPatternsPanelViewModel.ENTRY_TYPE_DEFAULT_NAME)) {
                 setStyle("-fx-background-color: -fx-default-button");
             } else {
                 setStyle("");
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternsPanelItemModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternsPanelItemModel.java
index 86cd170d4ead..3f03302bbbc5 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternsPanelItemModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternsPanelItemModel.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.commonfxcontrols;
 
-import java.util.Objects;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -9,6 +7,8 @@
 
 import org.jabref.model.entry.types.EntryType;
 
+import java.util.Objects;
+
 public class CitationKeyPatternsPanelItemModel {
     private final ObjectProperty<EntryType> entryType = new SimpleObjectProperty<>();
     private final StringProperty pattern = new SimpleStringProperty("");
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternsPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternsPanelViewModel.java
index 7a0c98f4cd8e..cfa1baed4fca 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternsPanelViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternsPanelViewModel.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.commonfxcontrols;
 
-import java.util.Collection;
-import java.util.Comparator;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleListProperty;
@@ -16,27 +13,33 @@
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.types.EntryType;
 
+import java.util.Collection;
+import java.util.Comparator;
+
 public class CitationKeyPatternsPanelViewModel {
 
     public static final String ENTRY_TYPE_DEFAULT_NAME = "default";
 
-    public static Comparator<CitationKeyPatternsPanelItemModel> defaultOnTopComparator = (o1, o2) -> {
-        String itemOneName = o1.getEntryType().getName();
-        String itemTwoName = o2.getEntryType().getName();
+    public static Comparator<CitationKeyPatternsPanelItemModel> defaultOnTopComparator =
+            (o1, o2) -> {
+                String itemOneName = o1.getEntryType().getName();
+                String itemTwoName = o2.getEntryType().getName();
 
-        if (itemOneName.equals(itemTwoName)) {
-            return 0;
-        } else if (itemOneName.equals(ENTRY_TYPE_DEFAULT_NAME)) {
-            return -1;
-        } else if (itemTwoName.equals(ENTRY_TYPE_DEFAULT_NAME)) {
-            return 1;
-        }
+                if (itemOneName.equals(itemTwoName)) {
+                    return 0;
+                } else if (itemOneName.equals(ENTRY_TYPE_DEFAULT_NAME)) {
+                    return -1;
+                } else if (itemTwoName.equals(ENTRY_TYPE_DEFAULT_NAME)) {
+                    return 1;
+                }
 
-        return 0;
-    };
+                return 0;
+            };
 
-    private final ListProperty<CitationKeyPatternsPanelItemModel> patternListProperty = new SimpleListProperty<>();
-    private final ObjectProperty<CitationKeyPatternsPanelItemModel> defaultItemProperty = new SimpleObjectProperty<>();
+    private final ListProperty<CitationKeyPatternsPanelItemModel> patternListProperty =
+            new SimpleListProperty<>();
+    private final ObjectProperty<CitationKeyPatternsPanelItemModel> defaultItemProperty =
+            new SimpleObjectProperty<>();
 
     private final CitationKeyPatternPreferences keyPatternPreferences;
 
@@ -44,29 +47,40 @@ public CitationKeyPatternsPanelViewModel(CitationKeyPatternPreferences keyPatter
         this.keyPatternPreferences = keyPatternPreferences;
     }
 
-    public void setValues(Collection<BibEntryType> entryTypeList, AbstractCitationKeyPatterns initialKeyPattern) {
+    public void setValues(
+            Collection<BibEntryType> entryTypeList, AbstractCitationKeyPatterns initialKeyPattern) {
         String defaultPattern;
-        if ((initialKeyPattern.getDefaultValue() == null) || initialKeyPattern.getDefaultValue().equals(CitationKeyPattern.NULL_CITATION_KEY_PATTERN)) {
+        if ((initialKeyPattern.getDefaultValue() == null)
+                || initialKeyPattern
+                        .getDefaultValue()
+                        .equals(CitationKeyPattern.NULL_CITATION_KEY_PATTERN)) {
             defaultPattern = "";
         } else {
             defaultPattern = initialKeyPattern.getDefaultValue().stringRepresentation();
         }
 
-        defaultItemProperty.setValue(new CitationKeyPatternsPanelItemModel(new DefaultEntryType(), defaultPattern));
+        defaultItemProperty.setValue(
+                new CitationKeyPatternsPanelItemModel(new DefaultEntryType(), defaultPattern));
         patternListProperty.setValue(FXCollections.observableArrayList());
         patternListProperty.add(defaultItemProperty.getValue());
 
         entryTypeList.stream()
-                     .map(BibEntryType::getType)
-                     .forEach(entryType -> {
-                         String pattern;
-                         if (initialKeyPattern.isDefaultValue(entryType)) {
-                             pattern = "";
-                         } else {
-                             pattern = initialKeyPattern.getPatterns().get(entryType).stringRepresentation();
-                         }
-                         patternListProperty.add(new CitationKeyPatternsPanelItemModel(entryType, pattern));
-                     });
+                .map(BibEntryType::getType)
+                .forEach(
+                        entryType -> {
+                            String pattern;
+                            if (initialKeyPattern.isDefaultValue(entryType)) {
+                                pattern = "";
+                            } else {
+                                pattern =
+                                        initialKeyPattern
+                                                .getPatterns()
+                                                .get(entryType)
+                                                .stringRepresentation();
+                            }
+                            patternListProperty.add(
+                                    new CitationKeyPatternsPanelItemModel(entryType, pattern));
+                        });
     }
 
     public void setItemToDefaultPattern(CitationKeyPatternsPanelItemModel item) {
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java
index 287b2918aaca..a4887e2a2321 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.commonfxcontrols;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
@@ -24,9 +28,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class FieldFormatterCleanupsPanel extends VBox {
 
     @FXML private CheckBox cleanupsEnabled;
@@ -42,9 +43,7 @@ public class FieldFormatterCleanupsPanel extends VBox {
     private FieldFormatterCleanupsPanelViewModel viewModel;
 
     public FieldFormatterCleanupsPanel() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @FXML
@@ -61,30 +60,41 @@ private void setupTable() {
 
         // ToDo: To be editable the list needs a view model wrapper for FieldFormatterCleanup
 
-        fieldColumn.setCellValueFactory(cellData -> new ReadOnlyObjectWrapper<>(cellData.getValue().getField()));
+        fieldColumn.setCellValueFactory(
+                cellData -> new ReadOnlyObjectWrapper<>(cellData.getValue().getField()));
         new ValueTableCellFactory<FieldFormatterCleanup, Field>()
                 .withText(Field::getDisplayName)
                 .install(fieldColumn);
 
-        formatterColumn.setCellValueFactory(cellData -> new ReadOnlyObjectWrapper<>(cellData.getValue().getFormatter()));
+        formatterColumn.setCellValueFactory(
+                cellData -> new ReadOnlyObjectWrapper<>(cellData.getValue().getFormatter()));
         new ValueTableCellFactory<FieldFormatterCleanup, Formatter>()
                 .withText(Formatter::getName)
                 .install(formatterColumn);
 
-        actionsColumn.setCellValueFactory(cellData -> new ReadOnlyObjectWrapper<>(cellData.getValue().getField()));
+        actionsColumn.setCellValueFactory(
+                cellData -> new ReadOnlyObjectWrapper<>(cellData.getValue().getField()));
         new ValueTableCellFactory<FieldFormatterCleanup, Field>()
                 .withGraphic(field -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
-                .withTooltip(field -> Localization.lang("Remove formatter for %0", field.getDisplayName()))
-                .withOnMouseClickedEvent(item -> event -> viewModel.removeCleanup(cleanupsList.getSelectionModel().getSelectedItem()))
+                .withTooltip(
+                        field ->
+                                Localization.lang(
+                                        "Remove formatter for %0", field.getDisplayName()))
+                .withOnMouseClickedEvent(
+                        item ->
+                                event ->
+                                        viewModel.removeCleanup(
+                                                cleanupsList.getSelectionModel().getSelectedItem()))
                 .install(actionsColumn);
 
         viewModel.selectedCleanupProperty().setValue(cleanupsList.getSelectionModel());
 
-        cleanupsList.setOnKeyPressed(event -> {
-            if (event.getCode() == KeyCode.DELETE) {
-                viewModel.removeCleanup(cleanupsList.getSelectionModel().getSelectedItem());
-            }
-        });
+        cleanupsList.setOnKeyPressed(
+                event -> {
+                    if (event.getCode() == KeyCode.DELETE) {
+                        viewModel.removeCleanup(cleanupsList.getSelectionModel().getSelectedItem());
+                    }
+                });
     }
 
     private void setupCombos() {
@@ -92,27 +102,30 @@ private void setupCombos() {
                 .withText(Field::getDisplayName)
                 .install(addableFields);
         addableFields.setConverter(FieldsUtil.FIELD_STRING_CONVERTER);
-        addableFields.setOnKeyPressed(event -> {
-            if (event.getCode() == KeyCode.TAB || event.getCode() == KeyCode.ENTER) {
-                addableFormatters.requestFocus();
-                event.consume();
-            }
-        });
+        addableFields.setOnKeyPressed(
+                event -> {
+                    if (event.getCode() == KeyCode.TAB || event.getCode() == KeyCode.ENTER) {
+                        addableFormatters.requestFocus();
+                        event.consume();
+                    }
+                });
 
         new ViewModelListCellFactory<Formatter>()
                 .withText(Formatter::getName)
                 .withStringTooltip(Formatter::getDescription)
                 .install(addableFormatters);
-        addableFormatters.setOnKeyPressed(event -> {
-            if (event.getCode() == KeyCode.ENTER) {
-                viewModel.addCleanup();
-                event.consume();
-            }
-        });
+        addableFormatters.setOnKeyPressed(
+                event -> {
+                    if (event.getCode() == KeyCode.ENTER) {
+                        viewModel.addCleanup();
+                        event.consume();
+                    }
+                });
     }
 
     private void setupBindings() {
-        BindingsHelper.bindBidirectional((ObservableValue<Boolean>) cleanupsEnabled.selectedProperty(),
+        BindingsHelper.bindBidirectional(
+                (ObservableValue<Boolean>) cleanupsEnabled.selectedProperty(),
                 viewModel.cleanupsDisableProperty(),
                 disabled -> cleanupsEnabled.selectedProperty().setValue(!disabled),
                 selected -> viewModel.cleanupsDisableProperty().setValue(!selected));
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java
index d7a926291e1f..11c59294538c 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.commonfxcontrols;
 
-import java.util.Comparator;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -21,15 +19,28 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 
+import java.util.Comparator;
+
 public class FieldFormatterCleanupsPanelViewModel {
 
     private final BooleanProperty cleanupsDisableProperty = new SimpleBooleanProperty();
-    private final ListProperty<FieldFormatterCleanup> cleanupsListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<SelectionModel<FieldFormatterCleanup>> selectedCleanupProperty = new SimpleObjectProperty<>(new NoSelectionModel<>());
-    private final ListProperty<Field> availableFieldsProperty = new SimpleListProperty<>(new SortedList<>(FXCollections.observableArrayList(FieldFactory.getCommonFields()), Comparator.comparing(Field::getDisplayName)));
+    private final ListProperty<FieldFormatterCleanup> cleanupsListProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<SelectionModel<FieldFormatterCleanup>> selectedCleanupProperty =
+            new SimpleObjectProperty<>(new NoSelectionModel<>());
+    private final ListProperty<Field> availableFieldsProperty =
+            new SimpleListProperty<>(
+                    new SortedList<>(
+                            FXCollections.observableArrayList(FieldFactory.getCommonFields()),
+                            Comparator.comparing(Field::getDisplayName)));
     private final ObjectProperty<Field> selectedFieldProperty = new SimpleObjectProperty<>();
-    private final ListProperty<Formatter> availableFormattersProperty = new SimpleListProperty<>(new SortedList<>(FXCollections.observableArrayList(Formatters.getAll()), Comparator.comparing(Formatter::getName)));
-    private final ObjectProperty<Formatter> selectedFormatterProperty = new SimpleObjectProperty<>();
+    private final ListProperty<Formatter> availableFormattersProperty =
+            new SimpleListProperty<>(
+                    new SortedList<>(
+                            FXCollections.observableArrayList(Formatters.getAll()),
+                            Comparator.comparing(Formatter::getName)));
+    private final ObjectProperty<Formatter> selectedFormatterProperty =
+            new SimpleObjectProperty<>();
 
     private final StateManager stateManager;
 
@@ -38,13 +49,18 @@ public FieldFormatterCleanupsPanelViewModel(StateManager stateManager) {
     }
 
     public void resetToRecommended() {
-        stateManager.getActiveDatabase().ifPresent(databaseContext -> {
-            if (databaseContext.isBiblatexMode()) {
-                cleanupsListProperty.setAll(FieldFormatterCleanups.RECOMMEND_BIBLATEX_ACTIONS);
-            } else {
-                cleanupsListProperty.setAll(FieldFormatterCleanups.RECOMMEND_BIBTEX_ACTIONS);
-            }
-        });
+        stateManager
+                .getActiveDatabase()
+                .ifPresent(
+                        databaseContext -> {
+                            if (databaseContext.isBiblatexMode()) {
+                                cleanupsListProperty.setAll(
+                                        FieldFormatterCleanups.RECOMMEND_BIBLATEX_ACTIONS);
+                            } else {
+                                cleanupsListProperty.setAll(
+                                        FieldFormatterCleanups.RECOMMEND_BIBTEX_ACTIONS);
+                            }
+                        });
     }
 
     public void clearAll() {
@@ -52,13 +68,14 @@ public void clearAll() {
     }
 
     public void addCleanup() {
-        if (selectedFieldProperty.getValue() == null || selectedFormatterProperty.getValue() == null) {
+        if (selectedFieldProperty.getValue() == null
+                || selectedFormatterProperty.getValue() == null) {
             return;
         }
 
-        FieldFormatterCleanup cleanup = new FieldFormatterCleanup(
-                selectedFieldProperty.getValue(),
-                selectedFormatterProperty.getValue());
+        FieldFormatterCleanup cleanup =
+                new FieldFormatterCleanup(
+                        selectedFieldProperty.getValue(), selectedFormatterProperty.getValue());
 
         if (cleanupsListProperty.stream().noneMatch(item -> item.equals(cleanup))) {
             cleanupsListProperty.add(cleanup);
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
index 12dcd20777f0..a6c15c8bab86 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
@@ -1,9 +1,8 @@
 package org.jabref.gui.commonfxcontrols;
 
-import java.util.List;
-import java.util.stream.Collectors;
+import com.airhacks.afterburner.views.ViewLoader;
 
-import javax.swing.undo.UndoManager;
+import jakarta.inject.Inject;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
@@ -28,8 +27,10 @@
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
 
 public class SaveOrderConfigPanel extends VBox {
 
@@ -45,47 +46,64 @@ public class SaveOrderConfigPanel extends VBox {
     private SaveOrderConfigPanelViewModel viewModel;
 
     public SaveOrderConfigPanel() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @FXML
     private void initialize() {
         viewModel = new SaveOrderConfigPanelViewModel();
 
-        exportInOriginalOrder.selectedProperty().bindBidirectional(viewModel.saveInOriginalProperty());
-        exportInTableOrder.selectedProperty().bindBidirectional(viewModel.saveInTableOrderProperty());
-        exportInSpecifiedOrder.selectedProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
-
-        viewModel.sortCriteriaProperty().addListener((ListChangeListener<SortCriterionViewModel>) change -> {
-            while (change.next()) {
-                if (change.wasReplaced()) {
-                        clearCriterionRow(change.getFrom());
-                        createCriterionRow(change.getAddedSubList().getFirst(), change.getFrom());
-                } else if (change.wasAdded()) {
-                    for (SortCriterionViewModel criterionViewModel : change.getAddedSubList()) {
-                        int row = change.getFrom() + change.getAddedSubList().indexOf(criterionViewModel);
-                        createCriterionRow(criterionViewModel, row);
-                    }
-                } else if (change.wasRemoved()) {
-                    for (SortCriterionViewModel criterionViewModel : change.getRemoved()) {
-                        clearCriterionRow(change.getFrom());
-                    }
-                }
-            }
-        });
+        exportInOriginalOrder
+                .selectedProperty()
+                .bindBidirectional(viewModel.saveInOriginalProperty());
+        exportInTableOrder
+                .selectedProperty()
+                .bindBidirectional(viewModel.saveInTableOrderProperty());
+        exportInSpecifiedOrder
+                .selectedProperty()
+                .bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
+
+        viewModel
+                .sortCriteriaProperty()
+                .addListener(
+                        (ListChangeListener<SortCriterionViewModel>)
+                                change -> {
+                                    while (change.next()) {
+                                        if (change.wasReplaced()) {
+                                            clearCriterionRow(change.getFrom());
+                                            createCriterionRow(
+                                                    change.getAddedSubList().getFirst(),
+                                                    change.getFrom());
+                                        } else if (change.wasAdded()) {
+                                            for (SortCriterionViewModel criterionViewModel :
+                                                    change.getAddedSubList()) {
+                                                int row =
+                                                        change.getFrom()
+                                                                + change.getAddedSubList()
+                                                                        .indexOf(
+                                                                                criterionViewModel);
+                                                createCriterionRow(criterionViewModel, row);
+                                            }
+                                        } else if (change.wasRemoved()) {
+                                            for (SortCriterionViewModel criterionViewModel :
+                                                    change.getRemoved()) {
+                                                clearCriterionRow(change.getFrom());
+                                            }
+                                        }
+                                    }
+                                });
     }
 
     private void createCriterionRow(SortCriterionViewModel criterionViewModel, int row) {
         sortCriterionList.getChildren().stream()
-                         .filter(item -> GridPane.getRowIndex(item) >= row)
-                         .forEach(item -> {
-                             GridPane.setRowIndex(item, GridPane.getRowIndex(item) + 1);
-                             if (item instanceof Label label) {
-                                 label.setText(String.valueOf(GridPane.getRowIndex(item) + 1));
-                             }
-                         });
+                .filter(item -> GridPane.getRowIndex(item) >= row)
+                .forEach(
+                        item -> {
+                            GridPane.setRowIndex(item, GridPane.getRowIndex(item) + 1);
+                            if (item instanceof Label label) {
+                                label.setText(String.valueOf(GridPane.getRowIndex(item) + 1));
+                            }
+                        });
 
         Label label = new Label(String.valueOf(row + 1));
         sortCriterionList.add(label, 0, row);
@@ -134,28 +152,34 @@ private List<Node> createRowButtons(SortCriterionViewModel criterionViewModel) {
     }
 
     private void clearCriterionRow(int row) {
-        List<Node> criterionRow = sortCriterionList.getChildren().stream()
-                                                   .filter(item -> GridPane.getRowIndex(item) == row)
-                                                   .collect(Collectors.toList());
+        List<Node> criterionRow =
+                sortCriterionList.getChildren().stream()
+                        .filter(item -> GridPane.getRowIndex(item) == row)
+                        .collect(Collectors.toList());
         sortCriterionList.getChildren().removeAll(criterionRow);
 
         sortCriterionList.getChildren().stream()
-                         .filter(item -> GridPane.getRowIndex(item) > row)
-                         .forEach(item -> {
-                             GridPane.setRowIndex(item, GridPane.getRowIndex(item) - 1);
-                             if (item instanceof Label label) {
-                                 label.setText(String.valueOf(GridPane.getRowIndex(item) + 1));
-                             }
-                         });
+                .filter(item -> GridPane.getRowIndex(item) > row)
+                .forEach(
+                        item -> {
+                            GridPane.setRowIndex(item, GridPane.getRowIndex(item) - 1);
+                            if (item instanceof Label label) {
+                                label.setText(String.valueOf(GridPane.getRowIndex(item) + 1));
+                            }
+                        });
     }
 
     public void setCriteriaLimit(int limit) {
         addButton.disableProperty().unbind();
-        addButton.disableProperty().bind(
-                Bindings.createBooleanBinding(
-                        () -> viewModel.sortCriteriaProperty().size() >= limit || !exportInSpecifiedOrder.selectedProperty().get(),
-                        viewModel.sortCriteriaProperty().sizeProperty(),
-                        exportInSpecifiedOrder.selectedProperty()));
+        addButton
+                .disableProperty()
+                .bind(
+                        Bindings.createBooleanBinding(
+                                () ->
+                                        viewModel.sortCriteriaProperty().size() >= limit
+                                                || !exportInSpecifiedOrder.selectedProperty().get(),
+                                viewModel.sortCriteriaProperty().sizeProperty(),
+                                exportInSpecifiedOrder.selectedProperty()));
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModel.java
index 6776df54e471..ea650e007144 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModel.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.commonfxcontrols;
 
-import java.util.Collections;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -10,17 +8,20 @@
 
 import org.jabref.model.entry.field.Field;
 
+import java.util.Collections;
+
 public class SaveOrderConfigPanelViewModel {
 
     private final BooleanProperty saveInOriginalProperty = new SimpleBooleanProperty();
     private final BooleanProperty saveInTableOrderProperty = new SimpleBooleanProperty();
     private final BooleanProperty saveInSpecifiedOrderProperty = new SimpleBooleanProperty();
 
-    private final ListProperty<Field> sortableFieldsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ListProperty<SortCriterionViewModel> selectedSortCriteriaProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<Field> sortableFieldsProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<SortCriterionViewModel> selectedSortCriteriaProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
 
-    public SaveOrderConfigPanelViewModel() {
-    }
+    public SaveOrderConfigPanelViewModel() {}
 
     public void addCriterion() {
         selectedSortCriteriaProperty.add(new SortCriterionViewModel());
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
index 582971b6cc74..140c93cdb853 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
@@ -1,8 +1,7 @@
 package org.jabref.gui.copyfiles;
 
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
 
 import javafx.concurrent.Task;
 
@@ -16,8 +15,9 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
 
 public class CopyFilesAction extends SimpleCommand {
 
@@ -26,10 +26,11 @@ public class CopyFilesAction extends SimpleCommand {
     private final StateManager stateManager;
     private final UiTaskExecutor uiTaskExecutor;
 
-    public CopyFilesAction(DialogService dialogService,
-                           CliPreferences preferences,
-                           StateManager stateManager,
-                           UiTaskExecutor taskExecutor) {
+    public CopyFilesAction(
+            DialogService dialogService,
+            CliPreferences preferences,
+            StateManager stateManager,
+            UiTaskExecutor taskExecutor) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.stateManager = stateManager;
@@ -40,31 +41,42 @@ public CopyFilesAction(DialogService dialogService,
 
     private void showDialog(List<CopyFilesResultItemViewModel> data) {
         if (data.isEmpty()) {
-            dialogService.showInformationDialogAndWait(Localization.lang("Copy linked files to folder..."), Localization.lang("No linked files found for export."));
+            dialogService.showInformationDialogAndWait(
+                    Localization.lang("Copy linked files to folder..."),
+                    Localization.lang("No linked files found for export."));
             return;
         }
-        dialogService.showCustomDialogAndWait(new CopyFilesDialogView(new CopyFilesResultListDependency(data)));
+        dialogService.showCustomDialogAndWait(
+                new CopyFilesDialogView(new CopyFilesResultListDependency(data)));
     }
 
     @Override
     public void execute() {
-        BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null"));
+        BibDatabaseContext database =
+                stateManager
+                        .getActiveDatabase()
+                        .orElseThrow(() -> new NullPointerException("Database null"));
         List<BibEntry> entries = stateManager.getSelectedEntries();
 
-        DirectoryDialogConfiguration dirDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(preferences.getExportPreferences().getExportWorkingDirectory())
-                .build();
-        Optional<Path> exportPath = dialogService.showDirectorySelectionDialog(dirDialogConfiguration);
-        exportPath.ifPresent(path -> {
-            Task<List<CopyFilesResultItemViewModel>> exportTask = new CopyFilesTask(database, entries, path, preferences);
+        DirectoryDialogConfiguration dirDialogConfiguration =
+                new DirectoryDialogConfiguration.Builder()
+                        .withInitialDirectory(
+                                preferences.getExportPreferences().getExportWorkingDirectory())
+                        .build();
+        Optional<Path> exportPath =
+                dialogService.showDirectorySelectionDialog(dirDialogConfiguration);
+        exportPath.ifPresent(
+                path -> {
+                    Task<List<CopyFilesResultItemViewModel>> exportTask =
+                            new CopyFilesTask(database, entries, path, preferences);
 
-            dialogService.showProgressDialog(
-                    Localization.lang("Copy linked files to folder..."),
-                    Localization.lang("Copy linked files to folder..."),
-                    exportTask);
+                    dialogService.showProgressDialog(
+                            Localization.lang("Copy linked files to folder..."),
+                            Localization.lang("Copy linked files to folder..."),
+                            exportTask);
 
-            uiTaskExecutor.execute(exportTask);
-            exportTask.setOnSucceeded(e -> showDialog(exportTask.getValue()));
-        });
+                    uiTaskExecutor.execute(exportTask);
+                    exportTask.setOnSucceeded(e -> showDialog(exportTask.getValue()));
+                });
     }
 }
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
index 7b1bfcc2f58b..bca1ce0f08a5 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.copyfiles;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.TableColumn;
@@ -12,8 +14,6 @@
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
 public class CopyFilesDialogView extends BaseDialog<Void> {
 
     @FXML private TableView<CopyFilesResultItemViewModel> tvResult;
@@ -29,9 +29,7 @@ public CopyFilesDialogView(CopyFilesResultListDependency results) {
 
         viewModel = new CopyFilesDialogViewModel(results);
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsContent(this.getDialogPane());
+        ViewLoader.view(this).load().setAsContent(this.getDialogPane());
     }
 
     @FXML
@@ -44,16 +42,22 @@ private void setupTable() {
         colMessage.setCellValueFactory(cellData -> cellData.getValue().getMessage());
         colStatus.setCellValueFactory(cellData -> cellData.getValue().getIcon());
 
-        colFile.setCellFactory(new ValueTableCellFactory<CopyFilesResultItemViewModel, String>().withText(item -> item).withTooltip(item -> item));
-        colStatus.setCellFactory(new ValueTableCellFactory<CopyFilesResultItemViewModel, JabRefIcon>().withGraphic(item -> {
-            if (item == IconTheme.JabRefIcons.CHECK) {
-                item = item.withColor(Color.GREEN);
-            }
-            if (item == IconTheme.JabRefIcons.WARNING) {
-                item = item.withColor(Color.RED);
-            }
-            return item.getGraphicNode();
-        }));
+        colFile.setCellFactory(
+                new ValueTableCellFactory<CopyFilesResultItemViewModel, String>()
+                        .withText(item -> item)
+                        .withTooltip(item -> item));
+        colStatus.setCellFactory(
+                new ValueTableCellFactory<CopyFilesResultItemViewModel, JabRefIcon>()
+                        .withGraphic(
+                                item -> {
+                                    if (item == IconTheme.JabRefIcons.CHECK) {
+                                        item = item.withColor(Color.GREEN);
+                                    }
+                                    if (item == IconTheme.JabRefIcons.WARNING) {
+                                        item = item.withColor(Color.RED);
+                                    }
+                                    return item.getGraphicNode();
+                                }));
 
         tvResult.setItems(viewModel.copyFilesResultListProperty());
         tvResult.setColumnResizePolicy(param -> true);
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogViewModel.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogViewModel.java
index e30563b4fa9b..7b235943ae56 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogViewModel.java
@@ -7,8 +7,8 @@
 
 public class CopyFilesDialogViewModel extends AbstractViewModel {
 
-    private final SimpleListProperty<CopyFilesResultItemViewModel> copyFilesResultItems = new SimpleListProperty<>(
-            FXCollections.observableArrayList());
+    private final SimpleListProperty<CopyFilesResultItemViewModel> copyFilesResultItems =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
 
     public CopyFilesDialogViewModel(CopyFilesResultListDependency results) {
         copyFilesResultItems.addAll(results.getResults());
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java
index e48f06851126..de83460d2333 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.copyfiles;
 
-import java.nio.file.Path;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -10,10 +8,13 @@
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 
+import java.nio.file.Path;
+
 public class CopyFilesResultItemViewModel {
 
     private final StringProperty file = new SimpleStringProperty("");
-    private final ObjectProperty<JabRefIcon> icon = new SimpleObjectProperty<>(IconTheme.JabRefIcons.WARNING);
+    private final ObjectProperty<JabRefIcon> icon =
+            new SimpleObjectProperty<>(IconTheme.JabRefIcons.WARNING);
     private final StringProperty message = new SimpleStringProperty("");
 
     public CopyFilesResultItemViewModel(Path file, boolean success, String message) {
@@ -38,6 +39,10 @@ public ObjectProperty<JabRefIcon> getIcon() {
 
     @Override
     public String toString() {
-        return "CopyFilesResultItemViewModel [file=" + file.get() + ", message=" + message.get() + "]";
+        return "CopyFilesResultItemViewModel [file="
+                + file.get()
+                + ", message="
+                + message.get()
+                + "]";
     }
 }
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
index b92991a7a650..31ebd5c1f3e0 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
@@ -1,17 +1,5 @@
 package org.jabref.gui.copyfiles;
 
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.BiFunction;
-
 import javafx.concurrent.Task;
 
 import org.jabref.logic.l10n.Localization;
@@ -22,10 +10,21 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.OptionalUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiFunction;
+
 public class CopyFilesTask extends Task<List<CopyFilesResultItemViewModel>> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CopyFilesTask.class);
@@ -35,7 +34,8 @@ public class CopyFilesTask extends Task<List<CopyFilesResultItemViewModel>> {
     private final CliPreferences preferences;
     private final Path exportPath;
     private final String localizedSuccessMessage = Localization.lang("Copied file successfully");
-    private final String localizedErrorMessage = Localization.lang("Could not copy file") + ": " + Localization.lang("File exists");
+    private final String localizedErrorMessage =
+            Localization.lang("Could not copy file") + ": " + Localization.lang("File exists");
     private final long totalFilesCount;
     private final List<BibEntry> entries;
     private final List<CopyFilesResultItemViewModel> results = new ArrayList<>();
@@ -43,9 +43,14 @@ public class CopyFilesTask extends Task<List<CopyFilesResultItemViewModel>> {
     private int numberSuccessful;
     private int totalFilesCounter;
 
-    private final BiFunction<Path, Path, Path> resolvePathFilename = (path, file) -> path.resolve(file.getFileName());
+    private final BiFunction<Path, Path, Path> resolvePathFilename =
+            (path, file) -> path.resolve(file.getFileName());
 
-    public CopyFilesTask(BibDatabaseContext databaseContext, List<BibEntry> entries, Path path, CliPreferences preferences) {
+    public CopyFilesTask(
+            BibDatabaseContext databaseContext,
+            List<BibEntry> entries,
+            Path path,
+            CliPreferences preferences) {
         this.databaseContext = databaseContext;
         this.preferences = preferences;
         this.entries = entries;
@@ -62,7 +67,10 @@ protected List<CopyFilesResultItemViewModel> call() throws InterruptedException,
         LocalDateTime currentTime = LocalDateTime.now();
         String currentDate = currentTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss"));
 
-        try (BufferedWriter bw = Files.newBufferedWriter(exportPath.resolve(LOGFILE_PREFIX + currentDate + LOGFILE_EXT), StandardCharsets.UTF_8)) {
+        try (BufferedWriter bw =
+                Files.newBufferedWriter(
+                        exportPath.resolve(LOGFILE_PREFIX + currentDate + LOGFILE_EXT),
+                        StandardCharsets.UTF_8)) {
             for (int i = 0; i < entries.size(); i++) {
                 if (isCancelled()) {
                     break;
@@ -75,13 +83,19 @@ protected List<CopyFilesResultItemViewModel> call() throws InterruptedException,
                         break;
                     }
 
-                    updateMessage(Localization.lang("Copying file %0 of entry %1", Integer.toString(j + 1), Integer.toString(i + 1)));
+                    updateMessage(
+                            Localization.lang(
+                                    "Copying file %0 of entry %1",
+                                    Integer.toString(j + 1), Integer.toString(i + 1)));
 
                     LinkedFile fileName = files.get(j);
 
-                    Optional<Path> fileToExport = fileName.findIn(databaseContext, preferences.getFilePreferences());
+                    Optional<Path> fileToExport =
+                            fileName.findIn(databaseContext, preferences.getFilePreferences());
 
-                    newPath = OptionalUtil.combine(Optional.of(exportPath), fileToExport, resolvePathFilename);
+                    newPath =
+                            OptionalUtil.combine(
+                                    Optional.of(exportPath), fileToExport, resolvePathFilename);
 
                     if (newPath.isPresent()) {
                         Path newFile = newPath.get();
@@ -110,10 +124,12 @@ protected List<CopyFilesResultItemViewModel> call() throws InterruptedException,
             }
             updateMessage(Localization.lang("Finished copying"));
 
-            String successMessage = Localization.lang("Copied %0 files of %1 successfully to %2",
-                    Integer.toString(numberSuccessful),
-                    Integer.toString(totalFilesCounter),
-                    newPath.map(Path::getParent).map(Path::toString).orElse(""));
+            String successMessage =
+                    Localization.lang(
+                            "Copied %0 files of %1 successfully to %2",
+                            Integer.toString(numberSuccessful),
+                            Integer.toString(totalFilesCounter),
+                            newPath.map(Path::getParent).map(Path::toString).orElse(""));
             updateMessage(successMessage);
             bw.write(successMessage);
             return results;
@@ -130,7 +146,8 @@ private void writeLogMessage(Path newFile, BufferedWriter bw, String logMessage)
     }
 
     private void addResultToList(Path newFile, boolean success, String logMessage) {
-        CopyFilesResultItemViewModel result = new CopyFilesResultItemViewModel(newFile, success, logMessage);
+        CopyFilesResultItemViewModel result =
+                new CopyFilesResultItemViewModel(newFile, success, logMessage);
         results.add(result);
     }
 }
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java b/src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java
index 22ae70d77cd3..0c92e7434eeb 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.copyfiles;
 
-import java.nio.file.Path;
-import java.util.Optional;
-import java.util.function.BiFunction;
-
 import javafx.beans.binding.Bindings;
 
 import org.jabref.gui.DialogService;
@@ -16,6 +12,10 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.OptionalUtil;
 
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.function.BiFunction;
+
 public class CopySingleFileAction extends SimpleCommand {
 
     private final LinkedFile linkedFile;
@@ -23,43 +23,68 @@ public class CopySingleFileAction extends SimpleCommand {
     private final BibDatabaseContext databaseContext;
     private final FilePreferences filePreferences;
 
-    private final BiFunction<Path, Path, Path> resolvePathFilename = (path, file) -> path.resolve(file.getFileName());
+    private final BiFunction<Path, Path, Path> resolvePathFilename =
+            (path, file) -> path.resolve(file.getFileName());
 
-    public CopySingleFileAction(LinkedFile linkedFile, DialogService dialogService, BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+    public CopySingleFileAction(
+            LinkedFile linkedFile,
+            DialogService dialogService,
+            BibDatabaseContext databaseContext,
+            FilePreferences filePreferences) {
         this.linkedFile = linkedFile;
         this.dialogService = dialogService;
         this.databaseContext = databaseContext;
         this.filePreferences = filePreferences;
 
-        this.executable.bind(Bindings.createBooleanBinding(
-                () -> !linkedFile.isOnlineLink()
-                        && linkedFile.findIn(databaseContext, this.filePreferences).isPresent(),
-                linkedFile.linkProperty()));
+        this.executable.bind(
+                Bindings.createBooleanBinding(
+                        () ->
+                                !linkedFile.isOnlineLink()
+                                        && linkedFile
+                                                .findIn(databaseContext, this.filePreferences)
+                                                .isPresent(),
+                        linkedFile.linkProperty()));
     }
 
     @Override
     public void execute() {
-        DirectoryDialogConfiguration dirDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(filePreferences.getWorkingDirectory())
-                .build();
-        Optional<Path> exportPath = dialogService.showDirectorySelectionDialog(dirDialogConfiguration);
+        DirectoryDialogConfiguration dirDialogConfiguration =
+                new DirectoryDialogConfiguration.Builder()
+                        .withInitialDirectory(filePreferences.getWorkingDirectory())
+                        .build();
+        Optional<Path> exportPath =
+                dialogService.showDirectorySelectionDialog(dirDialogConfiguration);
         exportPath.ifPresent(this::copyFileToDestination);
     }
 
     private void copyFileToDestination(Path exportPath) {
         Optional<Path> fileToExport = linkedFile.findIn(databaseContext, filePreferences);
-        Optional<Path> newPath = OptionalUtil.combine(Optional.of(exportPath), fileToExport, resolvePathFilename);
+        Optional<Path> newPath =
+                OptionalUtil.combine(Optional.of(exportPath), fileToExport, resolvePathFilename);
 
         if (newPath.isPresent()) {
             Path newFile = newPath.get();
-            boolean success = fileToExport.isPresent() && FileUtil.copyFile(fileToExport.get(), newFile, false);
+            boolean success =
+                    fileToExport.isPresent()
+                            && FileUtil.copyFile(fileToExport.get(), newFile, false);
             if (success) {
-                dialogService.showInformationDialogAndWait(Localization.lang("Copy linked file"), Localization.lang("Successfully copied file to %0.", newPath.map(Path::getParent).map(Path::toString).orElse("")));
+                dialogService.showInformationDialogAndWait(
+                        Localization.lang("Copy linked file"),
+                        Localization.lang(
+                                "Successfully copied file to %0.",
+                                newPath.map(Path::getParent).map(Path::toString).orElse("")));
             } else {
-                dialogService.showErrorDialogAndWait(Localization.lang("Copy linked file"), Localization.lang("Could not copy file to %0, maybe the file is already existing?", newPath.map(Path::getParent).map(Path::toString).orElse("")));
+                dialogService.showErrorDialogAndWait(
+                        Localization.lang("Copy linked file"),
+                        Localization.lang(
+                                "Could not copy file to %0, maybe the file is already existing?",
+                                newPath.map(Path::getParent).map(Path::toString).orElse("")));
             }
         } else {
-            dialogService.showErrorDialogAndWait(Localization.lang("Could not resolve the file %0", fileToExport.map(Path::getParent).map(Path::toString).orElse("")));
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang(
+                            "Could not resolve the file %0",
+                            fileToExport.map(Path::getParent).map(Path::toString).orElse("")));
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java b/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
index 449f89adc29e..c3e4b619da0a 100644
--- a/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
@@ -1,18 +1,17 @@
 package org.jabref.gui.desktop.os;
 
-import java.awt.Desktop;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-
 import org.jabref.Launcher;
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.logic.util.Directories;
-
 import org.slf4j.LoggerFactory;
 
+import java.awt.Desktop;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+
 /**
  * This class contains some default implementations (if OS is neither linux, windows or osx) file directories and file/application open handling methods <br>
  * We cannot use a static logger instance here in this class as the Logger first needs to be configured in the {@link Launcher#addLogToDisk}
@@ -23,7 +22,11 @@
 public class DefaultDesktop extends NativeDesktop {
 
     @Override
-    public void openFile(String filePath, String fileType, ExternalApplicationsPreferences externalApplicationsPreferences) throws IOException {
+    public void openFile(
+            String filePath,
+            String fileType,
+            ExternalApplicationsPreferences externalApplicationsPreferences)
+            throws IOException {
         Desktop.getDesktop().open(new File(filePath));
     }
 
@@ -40,7 +43,8 @@ public void openFolderAndSelectFile(Path filePath) throws IOException {
 
     @Override
     public void openConsole(String absolutePath, DialogService dialogService) throws IOException {
-        LoggerFactory.getLogger(DefaultDesktop.class).error("This feature is not supported by your Operating System.");
+        LoggerFactory.getLogger(DefaultDesktop.class)
+                .error("This feature is not supported by your Operating System.");
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/desktop/os/Linux.java b/src/main/java/org/jabref/gui/desktop/os/Linux.java
index b083212bb7bc..503683f426d9 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Linux.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Linux.java
@@ -1,17 +1,5 @@
 package org.jabref.gui.desktop.os;
 
-import java.awt.Desktop;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;
-
 import org.jabref.Launcher;
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.gui.DialogService;
@@ -22,9 +10,20 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.Directories;
 import org.jabref.logic.util.HeadlessExecutorService;
-
 import org.slf4j.LoggerFactory;
 
+import java.awt.Desktop;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+
 /**
  * This class contains Linux specific implementations for file directories and file/application open handling methods <br>
  * We cannot use a static logger instance here in this class as the Logger first needs to be configured in the {@link Launcher#addLogToDisk}
@@ -34,39 +33,54 @@
 @AllowedToUseAwt("Requires AWT to open a file with the native method")
 public class Linux extends NativeDesktop {
 
-    private static final String ETC_ALTERNATIVES_X_TERMINAL_EMULATOR = "/etc/alternatives/x-terminal-emulator";
+    private static final String ETC_ALTERNATIVES_X_TERMINAL_EMULATOR =
+            "/etc/alternatives/x-terminal-emulator";
 
     private void nativeOpenFile(String filePath) {
-        HeadlessExecutorService.INSTANCE.execute(() -> {
-            try {
-                File file = new File(filePath);
-                Desktop.getDesktop().open(file);
-                LoggerFactory.getLogger(Linux.class).debug("Open file in default application with Desktop integration");
-            } catch (IllegalArgumentException e) {
-                LoggerFactory.getLogger(Linux.class).debug("Fail back to xdg-open");
-                try {
-                    String[] cmd = {"xdg-open", filePath};
-                    Runtime.getRuntime().exec(cmd);
-                } catch (Exception e2) {
-                    LoggerFactory.getLogger(Linux.class).warn("Open operation not successful: ", e2);
-                }
-            } catch (IOException e) {
-                LoggerFactory.getLogger(Linux.class).warn("Native open operation not successful: ", e);
-            }
-        });
+        HeadlessExecutorService.INSTANCE.execute(
+                () -> {
+                    try {
+                        File file = new File(filePath);
+                        Desktop.getDesktop().open(file);
+                        LoggerFactory.getLogger(Linux.class)
+                                .debug("Open file in default application with Desktop integration");
+                    } catch (IllegalArgumentException e) {
+                        LoggerFactory.getLogger(Linux.class).debug("Fail back to xdg-open");
+                        try {
+                            String[] cmd = {"xdg-open", filePath};
+                            Runtime.getRuntime().exec(cmd);
+                        } catch (Exception e2) {
+                            LoggerFactory.getLogger(Linux.class)
+                                    .warn("Open operation not successful: ", e2);
+                        }
+                    } catch (IOException e) {
+                        LoggerFactory.getLogger(Linux.class)
+                                .warn("Native open operation not successful: ", e);
+                    }
+                });
     }
 
     @Override
-    public void openFile(String filePath, String fileType, ExternalApplicationsPreferences externalApplicationsPreferences) throws IOException {
-        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(fileType, externalApplicationsPreferences);
+    public void openFile(
+            String filePath,
+            String fileType,
+            ExternalApplicationsPreferences externalApplicationsPreferences)
+            throws IOException {
+        Optional<ExternalFileType> type =
+                ExternalFileTypes.getExternalFileTypeByExt(
+                        fileType, externalApplicationsPreferences);
         String viewer;
 
         if (type.isPresent() && !type.get().getOpenWithApplication().isEmpty()) {
             viewer = type.get().getOpenWithApplication();
             ProcessBuilder processBuilder = new ProcessBuilder(viewer, filePath);
             Process process = processBuilder.start();
-            StreamGobbler streamGobblerInput = new StreamGobbler(process.getInputStream(), LoggerFactory.getLogger(Linux.class)::debug);
-            StreamGobbler streamGobblerError = new StreamGobbler(process.getErrorStream(), LoggerFactory.getLogger(Linux.class)::debug);
+            StreamGobbler streamGobblerInput =
+                    new StreamGobbler(
+                            process.getInputStream(), LoggerFactory.getLogger(Linux.class)::debug);
+            StreamGobbler streamGobblerError =
+                    new StreamGobbler(
+                            process.getErrorStream(), LoggerFactory.getLogger(Linux.class)::debug);
 
             HeadlessExecutorService.INSTANCE.execute(streamGobblerInput);
             HeadlessExecutorService.INSTANCE.execute(streamGobblerError);
@@ -88,8 +102,12 @@ public void openFileWithApplication(String filePath, String application) throws
             ProcessBuilder processBuilder = new ProcessBuilder(cmdArray);
             Process process = processBuilder.start();
 
-            StreamGobbler streamGobblerInput = new StreamGobbler(process.getInputStream(), LoggerFactory.getLogger(Linux.class)::debug);
-            StreamGobbler streamGobblerError = new StreamGobbler(process.getErrorStream(), LoggerFactory.getLogger(Linux.class)::debug);
+            StreamGobbler streamGobblerInput =
+                    new StreamGobbler(
+                            process.getInputStream(), LoggerFactory.getLogger(Linux.class)::debug);
+            StreamGobbler streamGobblerError =
+                    new StreamGobbler(
+                            process.getErrorStream(), LoggerFactory.getLogger(Linux.class)::debug);
 
             HeadlessExecutorService.INSTANCE.execute(streamGobblerInput);
             HeadlessExecutorService.INSTANCE.execute(streamGobblerError);
@@ -103,7 +121,9 @@ public void openFolderAndSelectFile(Path filePath) throws IOException {
         String desktopSession = System.getenv("DESKTOP_SESSION");
 
         String absoluteFilePath = filePath.toAbsolutePath().toString();
-        String[] cmd = {"xdg-open", filePath.getParent().toString()}; // default is the folder of the file
+        String[] cmd = {
+            "xdg-open", filePath.getParent().toString()
+        }; // default is the folder of the file
 
         if (desktopSession != null) {
             desktopSession = desktopSession.toLowerCase(Locale.ROOT);
@@ -114,17 +134,26 @@ public void openFolderAndSelectFile(Path filePath) throws IOException {
             } else if (desktopSession.contains("mate")) {
                 cmd = new String[] {"caja", "--select", absoluteFilePath};
             } else if (desktopSession.contains("cinnamon")) {
-                cmd = new String[] {"nemo", absoluteFilePath}; // Although nemo is based on nautilus it does not support --select, it directly highlights the file
+                cmd =
+                        new String[] {
+                            "nemo", absoluteFilePath
+                        }; // Although nemo is based on nautilus it does not support --select, it
+                           // directly highlights the file
             } else if (desktopSession.contains("xfce")) {
                 cmd = new String[] {"thunar", absoluteFilePath};
             }
         }
-        LoggerFactory.getLogger(Linux.class).debug("Opening folder and selecting file using {}", String.join(" ", cmd));
+        LoggerFactory.getLogger(Linux.class)
+                .debug("Opening folder and selecting file using {}", String.join(" ", cmd));
         ProcessBuilder processBuilder = new ProcessBuilder(cmd);
         Process process = processBuilder.start();
 
-        StreamGobbler streamGobblerInput = new StreamGobbler(process.getInputStream(), LoggerFactory.getLogger(Linux.class)::debug);
-        StreamGobbler streamGobblerError = new StreamGobbler(process.getErrorStream(), LoggerFactory.getLogger(Linux.class)::debug);
+        StreamGobbler streamGobblerInput =
+                new StreamGobbler(
+                        process.getInputStream(), LoggerFactory.getLogger(Linux.class)::debug);
+        StreamGobbler streamGobblerError =
+                new StreamGobbler(
+                        process.getErrorStream(), LoggerFactory.getLogger(Linux.class)::debug);
 
         HeadlessExecutorService.INSTANCE.execute(streamGobblerInput);
         HeadlessExecutorService.INSTANCE.execute(streamGobblerError);
@@ -134,14 +163,19 @@ public void openFolderAndSelectFile(Path filePath) throws IOException {
     public void openConsole(String absolutePath, DialogService dialogService) throws IOException {
 
         if (!Files.exists(Path.of(ETC_ALTERNATIVES_X_TERMINAL_EMULATOR))) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Could not detect terminal automatically using '%0'. Please define a custom terminal in the preferences.", ETC_ALTERNATIVES_X_TERMINAL_EMULATOR));
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang(
+                            "Could not detect terminal automatically using '%0'. Please define a custom terminal in the preferences.",
+                            ETC_ALTERNATIVES_X_TERMINAL_EMULATOR));
             return;
         }
 
-        ProcessBuilder processBuilder = new ProcessBuilder("readlink", ETC_ALTERNATIVES_X_TERMINAL_EMULATOR);
+        ProcessBuilder processBuilder =
+                new ProcessBuilder("readlink", ETC_ALTERNATIVES_X_TERMINAL_EMULATOR);
         Process process = processBuilder.start();
 
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+        try (BufferedReader reader =
+                new BufferedReader(new InputStreamReader(process.getInputStream()))) {
             String emulatorName = reader.readLine();
             if (emulatorName != null) {
                 emulatorName = emulatorName.substring(emulatorName.lastIndexOf(File.separator) + 1);
@@ -158,14 +192,21 @@ public void openConsole(String absolutePath, DialogService dialogService) throws
                     cmd = new String[] {emulatorName, absolutePath};
                 }
 
-                LoggerFactory.getLogger(Linux.class).debug("Opening terminal using {}", String.join(" ", cmd));
+                LoggerFactory.getLogger(Linux.class)
+                        .debug("Opening terminal using {}", String.join(" ", cmd));
 
                 ProcessBuilder builder = new ProcessBuilder(cmd);
                 builder.directory(new File(absolutePath));
                 Process processTerminal = builder.start();
 
-                StreamGobbler streamGobblerInput = new StreamGobbler(processTerminal.getInputStream(), LoggerFactory.getLogger(Linux.class)::debug);
-                StreamGobbler streamGobblerError = new StreamGobbler(processTerminal.getErrorStream(), LoggerFactory.getLogger(Linux.class)::debug);
+                StreamGobbler streamGobblerInput =
+                        new StreamGobbler(
+                                processTerminal.getInputStream(),
+                                LoggerFactory.getLogger(Linux.class)::debug);
+                StreamGobbler streamGobblerError =
+                        new StreamGobbler(
+                                processTerminal.getErrorStream(),
+                                LoggerFactory.getLogger(Linux.class)::debug);
 
                 HeadlessExecutorService.INSTANCE.execute(streamGobblerInput);
                 HeadlessExecutorService.INSTANCE.execute(streamGobblerError);
@@ -188,9 +229,15 @@ public Path getDefaultFileChooserDirectory() {
         // Make use of xdg-user-dirs
         // See https://www.freedesktop.org/wiki/Software/xdg-user-dirs/ for details
         try {
-            Process process = new ProcessBuilder("xdg-user-dir", "DOCUMENTS").start(); // Package name with 's', command without
-            List<String> strings = new BufferedReader(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8))
-                    .lines().toList();
+            Process process =
+                    new ProcessBuilder("xdg-user-dir", "DOCUMENTS")
+                            .start(); // Package name with 's', command without
+            List<String> strings =
+                    new BufferedReader(
+                                    new InputStreamReader(
+                                            process.getInputStream(), StandardCharsets.UTF_8))
+                            .lines()
+                            .toList();
             if (strings.isEmpty()) {
                 LoggerFactory.getLogger(Linux.class).error("xdg-user-dir returned nothing");
                 return Directories.getUserDirectory();
@@ -198,7 +245,10 @@ public Path getDefaultFileChooserDirectory() {
             String documentsDirectory = strings.getFirst();
             Path documentsPath = Path.of(documentsDirectory);
             if (!Files.exists(documentsPath)) {
-                LoggerFactory.getLogger(Linux.class).error("xdg-user-dir returned non-existant directory {}", documentsDirectory);
+                LoggerFactory.getLogger(Linux.class)
+                        .error(
+                                "xdg-user-dir returned non-existant directory {}",
+                                documentsDirectory);
                 return Directories.getUserDirectory();
             }
             LoggerFactory.getLogger(Linux.class).debug("Got documents path {}", documentsPath);
diff --git a/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java b/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
index e68b255d9953..92bff4aa698a 100644
--- a/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
@@ -1,16 +1,10 @@
 package org.jabref.gui.desktop.os;
 
-import java.awt.Desktop;
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Pattern;
+import static org.jabref.model.entry.field.StandardField.PDF;
+import static org.jabref.model.entry.field.StandardField.PS;
+import static org.jabref.model.entry.field.StandardField.URL;
+
+import com.airhacks.afterburner.injection.Injector;
 
 import org.jabref.Launcher;
 import org.jabref.architecture.AllowedToUseAwt;
@@ -32,13 +26,19 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.identifier.Identifier;
-
-import com.airhacks.afterburner.injection.Injector;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.model.entry.field.StandardField.PDF;
-import static org.jabref.model.entry.field.StandardField.PS;
-import static org.jabref.model.entry.field.StandardField.URL;
+import java.awt.Desktop;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Pattern;
 
 /**
  * This class contains bundles OS specific implementations for file directories and file/application open handling methods.
@@ -56,7 +56,8 @@
 @AllowedToUseAwt("Because of moveToTrash() is not available elsewhere.")
 public abstract class NativeDesktop {
     // No LOGGER may be initialized directly
-    // Otherwise, org.jabref.Launcher.addLogToDisk will fail, because tinylog's properties are frozen
+    // Otherwise, org.jabref.Launcher.addLogToDisk will fail, because tinylog's properties are
+    // frozen
 
     private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
 
@@ -65,18 +66,20 @@ public abstract class NativeDesktop {
      * <p>
      * Opening a PDF file at the file field is done at {@link org.jabref.gui.fieldeditors.LinkedFileViewModel#open}
      */
-    public static void openExternalViewer(BibDatabaseContext databaseContext,
-                                          GuiPreferences preferences,
-                                          String initialLink,
-                                          Field initialField,
-                                          DialogService dialogService,
-                                          BibEntry entry)
+    public static void openExternalViewer(
+            BibDatabaseContext databaseContext,
+            GuiPreferences preferences,
+            String initialLink,
+            Field initialField,
+            DialogService dialogService,
+            BibEntry entry)
             throws IOException {
         String link = initialLink;
         Field field = initialField;
         if ((PS == field) || (PDF == field)) {
             // Find the default directory for this field type:
-            List<Path> directories = databaseContext.getFileDirectories(preferences.getFilePreferences());
+            List<Path> directories =
+                    databaseContext.getFileDirectories(preferences.getFilePreferences());
 
             Optional<Path> file = FileUtil.find(link, directories);
 
@@ -92,7 +95,8 @@ public static void openExternalViewer(BibDatabaseContext databaseContext,
                 if ("pdf".equalsIgnoreCase(split[split.length - 1])) {
                     field = PDF;
                 } else if ("ps".equalsIgnoreCase(split[split.length - 1])
-                        || ((split.length >= 3) && "ps".equalsIgnoreCase(split[split.length - 2]))) {
+                        || ((split.length >= 3)
+                                && "ps".equalsIgnoreCase(split[split.length - 2]))) {
                     field = PS;
                 }
             }
@@ -105,18 +109,25 @@ public static void openExternalViewer(BibDatabaseContext databaseContext,
         } else if (StandardField.EPRINT == field) {
             IdentifierParser identifierParser = new IdentifierParser(entry);
 
-            link = identifierParser.parse(StandardField.EPRINT)
-                                   .flatMap(Identifier::getExternalURI)
-                                   .map(URI::toASCIIString)
-                                   .orElse(link);
+            link =
+                    identifierParser
+                            .parse(StandardField.EPRINT)
+                            .flatMap(Identifier::getExternalURI)
+                            .map(URI::toASCIIString)
+                            .orElse(link);
 
             if (Objects.equals(link, initialLink)) {
                 Optional<String> eprintTypeOpt = entry.getField(StandardField.EPRINTTYPE);
                 Optional<String> archivePrefixOpt = entry.getField(StandardField.ARCHIVEPREFIX);
                 if (eprintTypeOpt.isEmpty() && archivePrefixOpt.isEmpty()) {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Unable to open linked eprint. Please set the eprinttype field"));
+                    dialogService.showErrorDialogAndWait(
+                            Localization.lang(
+                                    "Unable to open linked eprint. Please set the eprinttype field"));
                 } else {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Unable to open linked eprint. Please verify that the eprint field has a valid '%0' id", link));
+                    dialogService.showErrorDialogAndWait(
+                            Localization.lang(
+                                    "Unable to open linked eprint. Please verify that the eprint field has a valid '%0' id",
+                                    link));
                 }
             }
             // should be opened in browser
@@ -124,24 +135,33 @@ public static void openExternalViewer(BibDatabaseContext databaseContext,
         }
 
         switch (field) {
-            case URL ->
-                    openBrowser(link, preferences.getExternalApplicationsPreferences());
+            case URL -> openBrowser(link, preferences.getExternalApplicationsPreferences());
             case PS -> {
                 try {
-                    get().openFile(link, PS.getName(), preferences.getExternalApplicationsPreferences());
+                    get().openFile(
+                                    link,
+                                    PS.getName(),
+                                    preferences.getExternalApplicationsPreferences());
                 } catch (IOException e) {
-                    LoggerFactory.getLogger(NativeDesktop.class).error("An error occurred on the command: {}", link, e);
+                    LoggerFactory.getLogger(NativeDesktop.class)
+                            .error("An error occurred on the command: {}", link, e);
                 }
             }
             case PDF -> {
                 try {
-                    get().openFile(link, PDF.getName(), preferences.getExternalApplicationsPreferences());
+                    get().openFile(
+                                    link,
+                                    PDF.getName(),
+                                    preferences.getExternalApplicationsPreferences());
                 } catch (IOException e) {
-                    LoggerFactory.getLogger(NativeDesktop.class).error("An error occurred on the command: {}", link, e);
+                    LoggerFactory.getLogger(NativeDesktop.class)
+                            .error("An error occurred on the command: {}", link, e);
                 }
             }
             case null, default ->
-                    LoggerFactory.getLogger(NativeDesktop.class).info("Message: currently only PDF, PS and HTML files can be opened by double clicking");
+                    LoggerFactory.getLogger(NativeDesktop.class)
+                            .info(
+                                    "Message: currently only PDF, PS and HTML files can be opened by double clicking");
         }
     }
 
@@ -150,16 +170,22 @@ private static void openDoi(String doi, GuiPreferences preferences) throws IOExc
         openBrowser(link, preferences.getExternalApplicationsPreferences());
     }
 
-    public static void openCustomDoi(String link, GuiPreferences preferences, DialogService dialogService) {
+    public static void openCustomDoi(
+            String link, GuiPreferences preferences, DialogService dialogService) {
         DOI.parse(link)
-           .flatMap(doi -> doi.getExternalURIWithCustomBase(preferences.getDOIPreferences().getDefaultBaseURI()))
-           .ifPresent(uri -> {
-               try {
-                   openBrowser(uri, preferences.getExternalApplicationsPreferences());
-               } catch (IOException e) {
-                   dialogService.showErrorDialogAndWait(Localization.lang("Unable to open link."), e);
-               }
-           });
+                .flatMap(
+                        doi ->
+                                doi.getExternalURIWithCustomBase(
+                                        preferences.getDOIPreferences().getDefaultBaseURI()))
+                .ifPresent(
+                        uri -> {
+                            try {
+                                openBrowser(uri, preferences.getExternalApplicationsPreferences());
+                            } catch (IOException e) {
+                                dialogService.showErrorDialogAndWait(
+                                        Localization.lang("Unable to open link."), e);
+                            }
+                        });
     }
 
     private static void openIsbn(String isbn, GuiPreferences preferences) throws IOException {
@@ -175,11 +201,13 @@ private static void openIsbn(String isbn, GuiPreferences preferences) throws IOE
      * @param link            The filename.
      * @return false if the link couldn't be resolved, true otherwise.
      */
-    public static boolean openExternalFileAnyFormat(final BibDatabaseContext databaseContext,
-                                                    ExternalApplicationsPreferences externalApplicationsPreferences,
-                                                    FilePreferences filePreferences,
-                                                    String link,
-                                                    final Optional<ExternalFileType> type) throws IOException {
+    public static boolean openExternalFileAnyFormat(
+            final BibDatabaseContext databaseContext,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            FilePreferences filePreferences,
+            String link,
+            final Optional<ExternalFileType> type)
+            throws IOException {
         if (REMOTE_LINK_PATTERN.matcher(link.toLowerCase(Locale.ROOT)).matches()) {
             openBrowser(link, externalApplicationsPreferences);
             return true;
@@ -197,15 +225,19 @@ public static boolean openExternalFileAnyFormat(final BibDatabaseContext databas
         return true;
     }
 
-    private static void openExternalFilePlatformIndependent(Optional<ExternalFileType> fileType,
-                                                            String filePath,
-                                                            ExternalApplicationsPreferences externalApplicationsPreferences)
+    private static void openExternalFilePlatformIndependent(
+            Optional<ExternalFileType> fileType,
+            String filePath,
+            ExternalApplicationsPreferences externalApplicationsPreferences)
             throws IOException {
         if (fileType.isPresent()) {
             String application = fileType.get().getOpenWithApplication();
 
             if (application.isEmpty()) {
-                get().openFile(filePath, fileType.get().getExtension(), externalApplicationsPreferences);
+                get().openFile(
+                                filePath,
+                                fileType.get().getExtension(),
+                                externalApplicationsPreferences);
             } else {
                 get().openFileWithApplication(filePath, application);
             }
@@ -222,9 +254,11 @@ private static void openExternalFilePlatformIndependent(Optional<ExternalFileTyp
      * @param fileLink the location of the file
      * @throws IOException if the default file browser cannot be opened
      */
-    public static void openFolderAndSelectFile(Path fileLink,
-                                               ExternalApplicationsPreferences externalApplicationsPreferences,
-                                               DialogService dialogService) throws IOException {
+    public static void openFolderAndSelectFile(
+            Path fileLink,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            DialogService dialogService)
+            throws IOException {
         if (fileLink == null) {
             return;
         }
@@ -237,7 +271,8 @@ public static void openFolderAndSelectFile(Path fileLink,
         String absolutePath = fileLink.toAbsolutePath().getParent().toString();
         String command = externalApplicationsPreferences.getCustomFileBrowserCommand();
         if (command.isEmpty()) {
-            LoggerFactory.getLogger(NativeDesktop.class).info("No custom file browser command defined");
+            LoggerFactory.getLogger(NativeDesktop.class)
+                    .info("No custom file browser command defined");
             get().openFolderAndSelectFile(fileLink);
             return;
         }
@@ -249,29 +284,34 @@ public static void openFolderAndSelectFile(Path fileLink,
      *
      * @param file Location the console should be opened at.
      */
-    public static void openConsole(Path file, GuiPreferences preferences, DialogService dialogService) throws IOException {
+    public static void openConsole(
+            Path file, GuiPreferences preferences, DialogService dialogService) throws IOException {
         if (file == null) {
             return;
         }
 
         String absolutePath = file.toAbsolutePath().getParent().toString();
 
-        boolean useCustomTerminal = preferences.getExternalApplicationsPreferences().useCustomTerminal();
+        boolean useCustomTerminal =
+                preferences.getExternalApplicationsPreferences().useCustomTerminal();
         if (!useCustomTerminal) {
             get().openConsole(absolutePath, dialogService);
             return;
         }
-        String command = preferences.getExternalApplicationsPreferences().getCustomTerminalCommand();
+        String command =
+                preferences.getExternalApplicationsPreferences().getCustomTerminalCommand();
         command = command.trim();
         if (command.isEmpty()) {
             get().openConsole(absolutePath, dialogService);
-            LoggerFactory.getLogger(NativeDesktop.class).info("Preference for custom terminal is empty. Using default terminal.");
+            LoggerFactory.getLogger(NativeDesktop.class)
+                    .info("Preference for custom terminal is empty. Using default terminal.");
             return;
         }
         executeCommand(command, absolutePath, dialogService);
     }
 
-    private static void executeCommand(String command, String absolutePath, DialogService dialogService) {
+    private static void executeCommand(
+            String command, String absolutePath, DialogService dialogService) {
         // normalize white spaces
         command = command.replaceAll("\\s+", " ");
 
@@ -285,8 +325,11 @@ private static void executeCommand(String command, String absolutePath, DialogSe
         try {
             new ProcessBuilder(subcommands).start();
         } catch (IOException exception) {
-            LoggerFactory.getLogger(NativeDesktop.class).error("Error during command execution", exception);
-            dialogService.notify(Localization.lang("Error occurred while executing the command \"%0\".", command));
+            LoggerFactory.getLogger(NativeDesktop.class)
+                    .error("Error during command execution", exception);
+            dialogService.notify(
+                    Localization.lang(
+                            "Error occurred while executing the command \"%0\".", command));
         }
     }
 
@@ -295,12 +338,17 @@ private static void executeCommand(String command, String absolutePath, DialogSe
      *
      * @param url the URL to open
      */
-    public static void openBrowser(String url, ExternalApplicationsPreferences externalApplicationsPreferences) throws IOException {
-        Optional<ExternalFileType> fileType = ExternalFileTypes.getExternalFileTypeByExt("html", externalApplicationsPreferences);
+    public static void openBrowser(
+            String url, ExternalApplicationsPreferences externalApplicationsPreferences)
+            throws IOException {
+        Optional<ExternalFileType> fileType =
+                ExternalFileTypes.getExternalFileTypeByExt("html", externalApplicationsPreferences);
         openExternalFilePlatformIndependent(fileType, url, externalApplicationsPreferences);
     }
 
-    public static void openBrowser(URI url, ExternalApplicationsPreferences externalApplicationsPreferences) throws IOException {
+    public static void openBrowser(
+            URI url, ExternalApplicationsPreferences externalApplicationsPreferences)
+            throws IOException {
         openBrowser(url.toASCIIString(), externalApplicationsPreferences);
     }
 
@@ -309,18 +357,25 @@ public static void openBrowser(URI url, ExternalApplicationsPreferences external
      *
      * @param url the URL to open
      */
-    public static void openBrowserShowPopup(String url, DialogService dialogService, ExternalApplicationsPreferences externalApplicationsPreferences) {
+    public static void openBrowserShowPopup(
+            String url,
+            DialogService dialogService,
+            ExternalApplicationsPreferences externalApplicationsPreferences) {
         try {
             openBrowser(url, externalApplicationsPreferences);
         } catch (IOException exception) {
-            ClipBoardManager clipBoardManager = Injector.instantiateModelOrService(ClipBoardManager.class);
+            ClipBoardManager clipBoardManager =
+                    Injector.instantiateModelOrService(ClipBoardManager.class);
             clipBoardManager.setContent(url);
             LoggerFactory.getLogger(NativeDesktop.class).error("Could not open browser", exception);
             String couldNotOpenBrowser = Localization.lang("Could not open browser.");
             String openManually = Localization.lang("Please open %0 manually.", url);
-            String copiedToClipboard = Localization.lang("The link has been copied to the clipboard.");
+            String copiedToClipboard =
+                    Localization.lang("The link has been copied to the clipboard.");
             dialogService.notify(couldNotOpenBrowser);
-            dialogService.showErrorDialogAndWait(couldNotOpenBrowser, couldNotOpenBrowser + "\n" + openManually + "\n" + copiedToClipboard);
+            dialogService.showErrorDialogAndWait(
+                    couldNotOpenBrowser,
+                    couldNotOpenBrowser + "\n" + openManually + "\n" + copiedToClipboard);
         }
     }
 
@@ -335,7 +390,11 @@ public static NativeDesktop get() {
         return new DefaultDesktop();
     }
 
-    public abstract void openFile(String filePath, String fileType, ExternalApplicationsPreferences externalApplicationsPreferences) throws IOException;
+    public abstract void openFile(
+            String filePath,
+            String fileType,
+            ExternalApplicationsPreferences externalApplicationsPreferences)
+            throws IOException;
 
     /**
      * Opens a file on an Operating System, using the given application.
@@ -343,11 +402,13 @@ public static NativeDesktop get() {
      * @param filePath    The filename.
      * @param application Link to the app that opens the file.
      */
-    public abstract void openFileWithApplication(String filePath, String application) throws IOException;
+    public abstract void openFileWithApplication(String filePath, String application)
+            throws IOException;
 
     public abstract void openFolderAndSelectFile(Path file) throws IOException;
 
-    public abstract void openConsole(String absolutePath, DialogService dialogService) throws IOException;
+    public abstract void openConsole(String absolutePath, DialogService dialogService)
+            throws IOException;
 
     /**
      * Returns the path to the system's applications folder.
@@ -362,13 +423,13 @@ public static NativeDesktop get() {
      * @return the path
      */
     public Path getDefaultFileChooserDirectory() {
-         Path userDirectory = Directories.getUserDirectory();
-         Path documents = userDirectory.resolve("Documents");
-         if (!Files.exists(documents)) {
-             return userDirectory;
-         }
-         return documents;
-     }
+        Path userDirectory = Directories.getUserDirectory();
+        Path documents = userDirectory.resolve("Documents");
+        if (!Files.exists(documents)) {
+            return userDirectory;
+        }
+        return documents;
+    }
 
     /**
      * Moves the given file to the trash.
@@ -379,7 +440,8 @@ public Path getDefaultFileChooserDirectory() {
     public void moveToTrash(Path path) {
         boolean success = Desktop.getDesktop().moveToTrash(path.toFile());
         if (!success) {
-            LoggerFactory.getLogger(NativeDesktop.class).warn("Could not move to trash. File {} is kept.", path);
+            LoggerFactory.getLogger(NativeDesktop.class)
+                    .warn("Could not move to trash. File {} is kept.", path);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/desktop/os/OSX.java b/src/main/java/org/jabref/gui/desktop/os/OSX.java
index 33df47c886af..e034d9b2d1d6 100644
--- a/src/main/java/org/jabref/gui/desktop/os/OSX.java
+++ b/src/main/java/org/jabref/gui/desktop/os/OSX.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.desktop.os;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Optional;
-
 import org.jabref.Launcher;
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.gui.DialogService;
@@ -11,6 +7,10 @@
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.frame.ExternalApplicationsPreferences;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+
 /**
  * This class contains macOS (OSX) specific implementations for file directories and file/application open handling methods <br>
  * We cannot use a static logger instance here in this class as the Logger first needs to be configured in the {@link Launcher#addLogToDisk}
@@ -21,8 +21,14 @@
 public class OSX extends NativeDesktop {
 
     @Override
-    public void openFile(String filePath, String fileType, ExternalApplicationsPreferences externalApplicationsPreferences) throws IOException {
-        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(fileType, externalApplicationsPreferences);
+    public void openFile(
+            String filePath,
+            String fileType,
+            ExternalApplicationsPreferences externalApplicationsPreferences)
+            throws IOException {
+        Optional<ExternalFileType> type =
+                ExternalFileTypes.getExternalFileTypeByExt(
+                        fileType, externalApplicationsPreferences);
         if (type.isPresent() && !type.get().getOpenWithApplication().isEmpty()) {
             openFileWithApplication(filePath, type.get().getOpenWithApplication());
         } else {
@@ -34,8 +40,10 @@ public void openFile(String filePath, String fileType, ExternalApplicationsPrefe
     @Override
     public void openFileWithApplication(String filePath, String application) throws IOException {
         // Use "-a <application>" if the app is specified, and just "open <filename>" otherwise:
-        String[] cmd = (application != null) && !application.isEmpty() ? new String[] {"/usr/bin/open", "-a",
-                application, filePath} : new String[] {"/usr/bin/open", filePath};
+        String[] cmd =
+                (application != null) && !application.isEmpty()
+                        ? new String[] {"/usr/bin/open", "-a", application, filePath}
+                        : new String[] {"/usr/bin/open", filePath};
         new ProcessBuilder(cmd).start();
     }
 
@@ -47,7 +55,7 @@ public void openFolderAndSelectFile(Path file) throws IOException {
 
     @Override
     public void openConsole(String absolutePath, DialogService dialogService) throws IOException {
-         new ProcessBuilder("open", "-a", "Terminal", absolutePath).start();
+        new ProcessBuilder("open", "-a", "Terminal", absolutePath).start();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/desktop/os/Windows.java b/src/main/java/org/jabref/gui/desktop/os/Windows.java
index 596c3d1ce54d..f74db3413c93 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Windows.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Windows.java
@@ -1,9 +1,9 @@
 package org.jabref.gui.desktop.os;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Optional;
+import com.sun.jna.platform.win32.KnownFolders;
+import com.sun.jna.platform.win32.Shell32Util;
+import com.sun.jna.platform.win32.ShlObj;
+import com.sun.jna.platform.win32.Win32Exception;
 
 import org.jabref.Launcher;
 import org.jabref.gui.DialogService;
@@ -11,13 +11,13 @@
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.logic.util.Directories;
-
-import com.sun.jna.platform.win32.KnownFolders;
-import com.sun.jna.platform.win32.Shell32Util;
-import com.sun.jna.platform.win32.ShlObj;
-import com.sun.jna.platform.win32.Win32Exception;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+
 /**
  * This class contains Windows specific implementations for file directories and file/application open handling methods <br>
  * We cannot use a static logger instance here in this class as the Logger first needs to be configured in the {@link Launcher#addLogToDisk}
@@ -27,8 +27,14 @@
 public class Windows extends NativeDesktop {
 
     @Override
-    public void openFile(String filePath, String fileType, ExternalApplicationsPreferences externalApplicationsPreferences) throws IOException {
-        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(fileType, externalApplicationsPreferences);
+    public void openFile(
+            String filePath,
+            String fileType,
+            ExternalApplicationsPreferences externalApplicationsPreferences)
+            throws IOException {
+        Optional<ExternalFileType> type =
+                ExternalFileTypes.getExternalFileTypeByExt(
+                        fileType, externalApplicationsPreferences);
 
         if (type.isPresent() && !type.get().getOpenWithApplication().isEmpty()) {
             openFileWithApplication(filePath, type.get().getOpenWithApplication());
diff --git a/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java b/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
index ed57563c30c4..1a031a1d3052 100644
--- a/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
+++ b/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.dialogs;
 
+import com.google.common.eventbus.Subscribe;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.exporter.SaveDatabaseAction;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.model.database.event.AutosaveEvent;
 import org.jabref.model.entry.BibEntryTypesManager;
-
-import com.google.common.eventbus.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,8 +20,13 @@ public class AutosaveUiManager {
 
     private final SaveDatabaseAction saveDatabaseAction;
 
-    public AutosaveUiManager(LibraryTab libraryTab, DialogService dialogService, GuiPreferences preferences, BibEntryTypesManager entryTypesManager) {
-        this.saveDatabaseAction = new SaveDatabaseAction(libraryTab, dialogService, preferences, entryTypesManager);
+    public AutosaveUiManager(
+            LibraryTab libraryTab,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            BibEntryTypesManager entryTypesManager) {
+        this.saveDatabaseAction =
+                new SaveDatabaseAction(libraryTab, dialogService, preferences, entryTypesManager);
     }
 
     @Subscribe
diff --git a/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java b/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
index 08dd120ab789..c14f20567911 100644
--- a/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
+++ b/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
@@ -1,12 +1,5 @@
 package org.jabref.gui.dialogs;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.ButtonType;
 
 import org.jabref.gui.DialogService;
@@ -31,47 +24,67 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
+
 /**
  * Stores all user dialogs related to {@link BackupManager}.
  */
 public class BackupUIManager {
     private static final Logger LOGGER = LoggerFactory.getLogger(BackupUIManager.class);
 
-    private BackupUIManager() {
-    }
+    private BackupUIManager() {}
 
-    public static Optional<ParserResult> showRestoreBackupDialog(DialogService dialogService,
-                                                                 Path originalPath,
-                                                                 GuiPreferences preferences,
-                                                                 FileUpdateMonitor fileUpdateMonitor,
-                                                                 UndoManager undoManager,
-                                                                 StateManager stateManager) {
-        var actionOpt = showBackupResolverDialog(
-                dialogService,
-                preferences.getExternalApplicationsPreferences(),
-                originalPath,
-                preferences.getFilePreferences().getBackupDirectory());
-        return actionOpt.flatMap(action -> {
-            if (action == BackupResolverDialog.RESTORE_FROM_BACKUP) {
-                BackupManager.restoreBackup(originalPath, preferences.getFilePreferences().getBackupDirectory());
-                return Optional.empty();
-            } else if (action == BackupResolverDialog.REVIEW_BACKUP) {
-                return showReviewBackupDialog(dialogService, originalPath, preferences, fileUpdateMonitor, undoManager, stateManager);
-            }
-            return Optional.empty();
-        });
+    public static Optional<ParserResult> showRestoreBackupDialog(
+            DialogService dialogService,
+            Path originalPath,
+            GuiPreferences preferences,
+            FileUpdateMonitor fileUpdateMonitor,
+            UndoManager undoManager,
+            StateManager stateManager) {
+        var actionOpt =
+                showBackupResolverDialog(
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences(),
+                        originalPath,
+                        preferences.getFilePreferences().getBackupDirectory());
+        return actionOpt.flatMap(
+                action -> {
+                    if (action == BackupResolverDialog.RESTORE_FROM_BACKUP) {
+                        BackupManager.restoreBackup(
+                                originalPath,
+                                preferences.getFilePreferences().getBackupDirectory());
+                        return Optional.empty();
+                    } else if (action == BackupResolverDialog.REVIEW_BACKUP) {
+                        return showReviewBackupDialog(
+                                dialogService,
+                                originalPath,
+                                preferences,
+                                fileUpdateMonitor,
+                                undoManager,
+                                stateManager);
+                    }
+                    return Optional.empty();
+                });
     }
 
-    private static Optional<ButtonType> showBackupResolverDialog(DialogService dialogService,
-                                                                 ExternalApplicationsPreferences externalApplicationsPreferences,
-                                                                 Path originalPath,
-                                                                 Path backupDir) {
+    private static Optional<ButtonType> showBackupResolverDialog(
+            DialogService dialogService,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            Path originalPath,
+            Path backupDir) {
         return UiTaskExecutor.runInJavaFXThread(
-                () -> dialogService.showCustomDialogAndWait(new BackupResolverDialog(originalPath, backupDir, externalApplicationsPreferences)));
+                () ->
+                        dialogService.showCustomDialogAndWait(
+                                new BackupResolverDialog(
+                                        originalPath, backupDir, externalApplicationsPreferences)));
     }
 
     private static Optional<ParserResult> showReviewBackupDialog(
@@ -82,45 +95,75 @@ private static Optional<ParserResult> showReviewBackupDialog(
             UndoManager undoManager,
             StateManager stateManager) {
         try {
-            ImportFormatPreferences importFormatPreferences = preferences.getImportFormatPreferences();
+            ImportFormatPreferences importFormatPreferences =
+                    preferences.getImportFormatPreferences();
 
             // The database of the originalParserResult will be modified
-            ParserResult originalParserResult = OpenDatabase.loadDatabase(originalPath, importFormatPreferences, fileUpdateMonitor);
+            ParserResult originalParserResult =
+                    OpenDatabase.loadDatabase(
+                            originalPath, importFormatPreferences, fileUpdateMonitor);
             // This will be modified by using the `DatabaseChangesResolverDialog`.
             BibDatabaseContext originalDatabase = originalParserResult.getDatabaseContext();
 
-            Path backupPath = BackupFileUtil.getPathOfLatestExistingBackupFile(originalPath, BackupFileType.BACKUP, preferences.getFilePreferences().getBackupDirectory()).orElseThrow();
-            BibDatabaseContext backupDatabase = OpenDatabase.loadDatabase(backupPath, importFormatPreferences, new DummyFileUpdateMonitor()).getDatabaseContext();
+            Path backupPath =
+                    BackupFileUtil.getPathOfLatestExistingBackupFile(
+                                    originalPath,
+                                    BackupFileType.BACKUP,
+                                    preferences.getFilePreferences().getBackupDirectory())
+                            .orElseThrow();
+            BibDatabaseContext backupDatabase =
+                    OpenDatabase.loadDatabase(
+                                    backupPath,
+                                    importFormatPreferences,
+                                    new DummyFileUpdateMonitor())
+                            .getDatabaseContext();
 
-            DatabaseChangeResolverFactory changeResolverFactory = new DatabaseChangeResolverFactory(dialogService, originalDatabase, preferences);
+            DatabaseChangeResolverFactory changeResolverFactory =
+                    new DatabaseChangeResolverFactory(dialogService, originalDatabase, preferences);
 
-            return UiTaskExecutor.runInJavaFXThread(() -> {
-                List<DatabaseChange> changes = DatabaseChangeList.compareAndGetChanges(originalDatabase, backupDatabase, changeResolverFactory);
-                DatabaseChangesResolverDialog reviewBackupDialog = new DatabaseChangesResolverDialog(
-                        changes,
-                        originalDatabase, "Review Backup"
-                );
-                var allChangesResolved = dialogService.showCustomDialogAndWait(reviewBackupDialog);
-                LibraryTab saveState = stateManager.activeTabProperty().get().get();
-                final NamedCompound CE = new NamedCompound(Localization.lang("Merged external changes"));
-                changes.stream().filter(DatabaseChange::isAccepted).forEach(change -> change.applyChange(CE));
-                CE.end();
-                undoManager.addEdit(CE);
-                if (allChangesResolved.get()) {
-                    if (reviewBackupDialog.areAllChangesDenied()) {
-                        // Here the case of a backup file is handled: If no changes of the backup are merged in, the file stays the same
-                        saveState.resetChangeMonitor();
-                    } else {
-                        // In case any change of the backup is accepted, this means, the in-memory file differs from the file on disk (which is not the backup file)
-                        saveState.markBaseChanged();
-                    }
-                    // This does NOT return the original ParserResult, but a modified version with all changes accepted or rejected
-                    return Optional.of(originalParserResult);
-                }
+            return UiTaskExecutor.runInJavaFXThread(
+                    () -> {
+                        List<DatabaseChange> changes =
+                                DatabaseChangeList.compareAndGetChanges(
+                                        originalDatabase, backupDatabase, changeResolverFactory);
+                        DatabaseChangesResolverDialog reviewBackupDialog =
+                                new DatabaseChangesResolverDialog(
+                                        changes, originalDatabase, "Review Backup");
+                        var allChangesResolved =
+                                dialogService.showCustomDialogAndWait(reviewBackupDialog);
+                        LibraryTab saveState = stateManager.activeTabProperty().get().get();
+                        final NamedCompound CE =
+                                new NamedCompound(Localization.lang("Merged external changes"));
+                        changes.stream()
+                                .filter(DatabaseChange::isAccepted)
+                                .forEach(change -> change.applyChange(CE));
+                        CE.end();
+                        undoManager.addEdit(CE);
+                        if (allChangesResolved.get()) {
+                            if (reviewBackupDialog.areAllChangesDenied()) {
+                                // Here the case of a backup file is handled: If no changes of the
+                                // backup are merged in, the file stays the same
+                                saveState.resetChangeMonitor();
+                            } else {
+                                // In case any change of the backup is accepted, this means, the
+                                // in-memory file differs from the file on disk (which is not the
+                                // backup file)
+                                saveState.markBaseChanged();
+                            }
+                            // This does NOT return the original ParserResult, but a modified
+                            // version with all changes accepted or rejected
+                            return Optional.of(originalParserResult);
+                        }
 
-                // In case not all changes are resolved, start from scratch
-                return showRestoreBackupDialog(dialogService, originalPath, preferences, fileUpdateMonitor, undoManager, stateManager);
-            });
+                        // In case not all changes are resolved, start from scratch
+                        return showRestoreBackupDialog(
+                                dialogService,
+                                originalPath,
+                                preferences,
+                                fileUpdateMonitor,
+                                undoManager,
+                                stateManager);
+                    });
         } catch (IOException e) {
             LOGGER.error("Error while loading backup or current database", e);
             return Optional.empty();
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java
index 6871bcd6d5cc..7d9d1505f5f1 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.documentviewer;
 
-import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.Optional;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.animation.FadeTransition;
 import javafx.beans.property.DoubleProperty;
@@ -19,13 +17,15 @@
 import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 
-import org.jabref.logic.util.BackgroundTask;
-import org.jabref.logic.util.TaskExecutor;
-
-import com.tobiasdiez.easybind.EasyBind;
 import org.fxmisc.flowless.Cell;
 import org.fxmisc.flowless.VirtualFlow;
 import org.fxmisc.flowless.VirtualFlowHit;
+import org.jabref.logic.util.BackgroundTask;
+import org.jabref.logic.util.TaskExecutor;
+
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Optional;
 
 public class DocumentViewerControl extends StackPane {
 
@@ -71,22 +71,31 @@ private void showPage(int pageNumber) {
     public void show(DocumentViewModel document) {
         flow = VirtualFlow.createVertical(document.getPages(), DocumentViewerPage::new);
         getChildren().setAll(flow);
-        flow.visibleCells().addListener((ListChangeListener<? super DocumentViewerPage>) c -> updateCurrentPage(flow.visibleCells()));
+        flow.visibleCells()
+                .addListener(
+                        (ListChangeListener<? super DocumentViewerPage>)
+                                c -> updateCurrentPage(flow.visibleCells()));
 
         // (Bidirectional) binding does not work, so use listeners instead
-        flow.estimatedScrollYProperty().addListener((observable, oldValue, newValue) -> scrollY.setValue(newValue));
-        scrollY.addListener((observable, oldValue, newValue) -> flow.estimatedScrollYProperty().setValue((double) newValue));
-        flow.totalLengthEstimateProperty().addListener((observable, oldValue, newValue) -> scrollYMax.setValue(newValue));
-        flow.addEventFilter(ScrollEvent.SCROLL, (ScrollEvent event) -> {
-            if (event.isControlDown()) {
-                event.consume();
-                if (event.getDeltaY() > 0) {
-                    changePageWidth(100);
-                } else {
-                    changePageWidth(-100);
-                }
-            }
-        });
+        flow.estimatedScrollYProperty()
+                .addListener((observable, oldValue, newValue) -> scrollY.setValue(newValue));
+        scrollY.addListener(
+                (observable, oldValue, newValue) ->
+                        flow.estimatedScrollYProperty().setValue((double) newValue));
+        flow.totalLengthEstimateProperty()
+                .addListener((observable, oldValue, newValue) -> scrollYMax.setValue(newValue));
+        flow.addEventFilter(
+                ScrollEvent.SCROLL,
+                (ScrollEvent event) -> {
+                    if (event.isControlDown()) {
+                        event.consume();
+                        if (event.getDeltaY() > 0) {
+                            changePageWidth(100);
+                        } else {
+                            changePageWidth(-100);
+                        }
+                    }
+                });
     }
 
     private void updateCurrentPage(ObservableList<DocumentViewerPage> visiblePages) {
@@ -112,7 +121,10 @@ private void updateCurrentPage(ObservableList<DocumentViewerPage> visiblePages)
         } else {
             // Heuristic missed, so try to get page number from first shown page
             currentPage.set(
-                    visiblePages.stream().findFirst().map(DocumentViewerPage::getPageNumber).orElse(1));
+                    visiblePages.stream()
+                            .findFirst()
+                            .map(DocumentViewerPage::getPageNumber)
+                            .orElse(1));
         }
     }
 
@@ -143,7 +155,7 @@ public void changePageWidth(int delta) {
         // Limit zoom out to ~1 page due to occasional display errors when zooming out further
         int minWidth = (int) (flow.getHeight() / 2 * Math.sqrt(2));
         if (newWidth < minWidth) {
-            if (newWidth - delta == minWidth) {  // Attempting to zoom out when already at minWidth
+            if (newWidth - delta == minWidth) { // Attempting to zoom out when already at minWidth
                 return;
             }
             newWidth = minWidth;
@@ -176,13 +188,14 @@ public DocumentViewerPage(DocumentPageViewModel initialPage) {
             background = new Rectangle(getDesiredWidth(), getDesiredHeight());
             background.setStyle("-fx-fill: WHITE");
             // imageView.setImage(new WritableImage(getDesiredWidth(), getDesiredHeight()));
-            BackgroundTask<Image> generateImage = BackgroundTask
-                    .wrap(() -> renderPage(initialPage))
-                    .onSuccess(image -> {
-                        imageView.setImage(image);
-                        progress.setVisible(false);
-                        background.setVisible(false);
-                    });
+            BackgroundTask<Image> generateImage =
+                    BackgroundTask.wrap(() -> renderPage(initialPage))
+                            .onSuccess(
+                                    image -> {
+                                        imageView.setImage(image);
+                                        progress.setVisible(false);
+                                        background.setVisible(false);
+                                    });
             taskExecutor.execute(generateImage);
 
             imageHolder.getChildren().setAll(background, progress, imageView);
@@ -210,23 +223,26 @@ public boolean isReusable() {
         public void updateItem(DocumentPageViewModel page) {
             this.page = page;
 
-            // First hide old page and show background instead (recalculate size of background to make sure its correct)
+            // First hide old page and show background instead (recalculate size of background to
+            // make sure its correct)
             background.setWidth(getDesiredWidth());
             background.setHeight(getDesiredHeight());
             background.setVisible(true);
             imageView.setOpacity(0);
 
-            BackgroundTask<Image> generateImage = BackgroundTask
-                    .wrap(() -> renderPage(page))
-                    .onSuccess(image -> {
-                        imageView.setImage(image);
-
-                        // Fade new page in for smoother transition
-                        FadeTransition fadeIn = new FadeTransition(Duration.millis(100), imageView);
-                        fadeIn.setFromValue(0);
-                        fadeIn.setToValue(1);
-                        fadeIn.play();
-                    });
+            BackgroundTask<Image> generateImage =
+                    BackgroundTask.wrap(() -> renderPage(page))
+                            .onSuccess(
+                                    image -> {
+                                        imageView.setImage(image);
+
+                                        // Fade new page in for smoother transition
+                                        FadeTransition fadeIn =
+                                                new FadeTransition(Duration.millis(100), imageView);
+                                        fadeIn.setFromValue(0);
+                                        fadeIn.setToValue(1);
+                                        fadeIn.play();
+                                    });
             taskExecutor.execute(generateImage);
         }
 
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
index a2e774b53218..0da703e3781e 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.documentviewer;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
+
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -24,9 +28,6 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.LinkedFile;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class DocumentViewerView extends BaseDialog<Void> {
 
     @FXML private ScrollBar scrollBar;
@@ -51,11 +52,10 @@ public DocumentViewerView() {
         this.setTitle(Localization.lang("Document viewer"));
         this.initModality(Modality.NONE);
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
-        // Remove button bar at bottom, but add close button to keep the dialog closable by clicking the "x" window symbol
+        // Remove button bar at bottom, but add close button to keep the dialog closable by clicking
+        // the "x" window symbol
         getDialogPane().getButtonTypes().add(ButtonType.CLOSE);
         getDialogPane().getChildren().removeIf(ButtonBar.class::isInstance);
     }
@@ -73,23 +73,30 @@ private void initialize() {
 
     private void setupModeButtons() {
         // make sure that always one toggle is selected
-        toggleGroupMode.selectedToggleProperty().addListener((observable, oldToggle, newToggle) -> {
-            if (newToggle == null) {
-                oldToggle.setSelected(true);
-            }
-        });
-
-        modeLive.selectedProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue) {
-                viewModel.setLiveMode(true);
-            }
-        });
-
-        modeLock.selectedProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue) {
-                viewModel.setLiveMode(false);
-            }
-        });
+        toggleGroupMode
+                .selectedToggleProperty()
+                .addListener(
+                        (observable, oldToggle, newToggle) -> {
+                            if (newToggle == null) {
+                                oldToggle.setSelected(true);
+                            }
+                        });
+
+        modeLive.selectedProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            if (newValue) {
+                                viewModel.setLiveMode(true);
+                            }
+                        });
+
+        modeLock.selectedProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            if (newValue) {
+                                viewModel.setLiveMode(false);
+                            }
+                        });
     }
 
     private void setupScrollbar() {
@@ -103,39 +110,50 @@ private void setupPageControls() {
         currentPage.setTextFormatter(integerFormatter);
         maxPages.textProperty().bind(viewModel.maxPagesProperty().asString());
         previousButton.setDisable(true);
-        viewModel.currentPageProperty().addListener((observable, oldValue, newValue) -> {
-            nextButton.setDisable(newValue == viewModel.maxPagesProperty().get());
-            previousButton.setDisable(newValue == 1);
-        });
+        viewModel
+                .currentPageProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            nextButton.setDisable(newValue == viewModel.maxPagesProperty().get());
+                            previousButton.setDisable(newValue == 1);
+                        });
     }
 
     private void setupFileChoice() {
-        ViewModelListCellFactory<LinkedFile> cellFactory = new ViewModelListCellFactory<LinkedFile>()
-                .withText(LinkedFile::getLink);
+        ViewModelListCellFactory<LinkedFile> cellFactory =
+                new ViewModelListCellFactory<LinkedFile>().withText(LinkedFile::getLink);
         fileChoice.setButtonCell(cellFactory.call(null));
         fileChoice.setCellFactory(cellFactory);
-        fileChoice.getSelectionModel().selectedItemProperty().addListener(
-                (observable, oldValue, newValue) -> viewModel.switchToFile(newValue));
+        fileChoice
+                .getSelectionModel()
+                .selectedItemProperty()
+                .addListener((observable, oldValue, newValue) -> viewModel.switchToFile(newValue));
         // We always want that the first item is selected after a change
         // This also automatically selects the first file on the initial load
         Stage stage = (Stage) getDialogPane().getScene().getWindow();
-        fileChoice.itemsProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue.isEmpty()) {
-                stage.close();
-            } else {
-                fileChoice.getSelectionModel().selectFirst();
-            }
-        });
+        fileChoice
+                .itemsProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            if (newValue.isEmpty()) {
+                                stage.close();
+                            } else {
+                                fileChoice.getSelectionModel().selectFirst();
+                            }
+                        });
         fileChoice.itemsProperty().bind(viewModel.filesProperty());
     }
 
     private void setupViewer() {
         viewer = new DocumentViewerControl(taskExecutor);
-        viewModel.currentDocumentProperty().addListener((observable, oldDocument, newDocument) -> {
-            if (newDocument != null) {
-                viewer.show(newDocument);
-            }
-        });
+        viewModel
+                .currentDocumentProperty()
+                .addListener(
+                        (observable, oldDocument, newDocument) -> {
+                            if (newDocument != null) {
+                                viewer.show(newDocument);
+                            }
+                        });
         viewModel.currentPageProperty().bindBidirectional(viewer.currentPageProperty());
         mainPane.setCenter(viewer);
     }
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java
index 2be460966a18..c208ba35b748 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java
@@ -1,11 +1,6 @@
 package org.jabref.gui.documentviewer;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
@@ -18,6 +13,8 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.UiTaskExecutor;
@@ -25,13 +22,16 @@
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-
-import com.tobiasdiez.easybind.EasyBind;
-import org.apache.pdfbox.Loader;
-import org.apache.pdfbox.pdmodel.PDDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 public class DocumentViewerViewModel extends AbstractViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DocumentViewerViewModel.class);
@@ -48,23 +48,31 @@ public DocumentViewerViewModel(StateManager stateManager, CliPreferences prefere
         this.stateManager = Objects.requireNonNull(stateManager);
         this.preferences = Objects.requireNonNull(preferences);
 
-        this.stateManager.getSelectedEntries().addListener((ListChangeListener<? super BibEntry>) c -> {
-            // Switch to currently selected entry in live mode
-            if (liveMode.get()) {
-                setCurrentEntries(this.stateManager.getSelectedEntries());
-            }
-        });
-
-        this.liveMode.addListener((observable, oldValue, newValue) -> {
-            // Switch to currently selected entry if mode is changed to live
-            if ((oldValue != newValue) && newValue) {
-                setCurrentEntries(this.stateManager.getSelectedEntries());
-            }
-        });
+        this.stateManager
+                .getSelectedEntries()
+                .addListener(
+                        (ListChangeListener<? super BibEntry>)
+                                c -> {
+                                    // Switch to currently selected entry in live mode
+                                    if (liveMode.get()) {
+                                        setCurrentEntries(this.stateManager.getSelectedEntries());
+                                    }
+                                });
+
+        this.liveMode.addListener(
+                (observable, oldValue, newValue) -> {
+                    // Switch to currently selected entry if mode is changed to live
+                    if ((oldValue != newValue) && newValue) {
+                        setCurrentEntries(this.stateManager.getSelectedEntries());
+                    }
+                });
 
         // we need to wrap this in run later so that the max pages number is correctly shown
-        UiTaskExecutor.runInJavaFXThread(() -> maxPages.bind(
-                EasyBind.wrapNullable(currentDocument).selectProperty(DocumentViewModel::maxPagesProperty)));
+        UiTaskExecutor.runInJavaFXThread(
+                () ->
+                        maxPages.bind(
+                                EasyBind.wrapNullable(currentDocument)
+                                        .selectProperty(DocumentViewModel::maxPagesProperty)));
         setCurrentEntries(this.stateManager.getSelectedEntries());
     }
 
@@ -92,7 +100,11 @@ private void setCurrentEntries(List<BibEntry> entries) {
         if (entries.isEmpty()) {
             files.clear();
         } else {
-            Set<LinkedFile> linkedFiles = entries.stream().map(BibEntry::getFiles).flatMap(List::stream).collect(Collectors.toSet());
+            Set<LinkedFile> linkedFiles =
+                    entries.stream()
+                            .map(BibEntry::getFiles)
+                            .flatMap(List::stream)
+                            .collect(Collectors.toSet());
             // We don't need to switch to the first file, this is done automatically in the UI part
             files.setValue(FXCollections.observableArrayList(linkedFiles));
         }
@@ -111,9 +123,10 @@ private void setCurrentDocument(Path path) {
 
     public void switchToFile(LinkedFile file) {
         if (file != null) {
-            stateManager.getActiveDatabase()
-                        .flatMap(database -> file.findIn(database, preferences.getFilePreferences()))
-                        .ifPresent(this::setCurrentDocument);
+            stateManager
+                    .getActiveDatabase()
+                    .flatMap(database -> file.findIn(database, preferences.getFilePreferences()))
+                    .ifPresent(this::setCurrentDocument);
             currentPage.set(1);
         }
     }
diff --git a/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java b/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java
index 607709742b1e..9b5126864a12 100644
--- a/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java
+++ b/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java
@@ -1,21 +1,20 @@
 package org.jabref.gui.documentviewer;
 
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.util.Objects;
-
 import javafx.scene.image.Image;
 import javafx.scene.image.PixelWriter;
 import javafx.scene.image.WritableImage;
 
-import org.jabref.architecture.AllowedToUseAwt;
-
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
+import org.jabref.architecture.AllowedToUseAwt;
+
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.Objects;
 
 /**
  * Represents the view model of a pdf page backed by a {@link PDPage}.
@@ -35,7 +34,8 @@ public PdfDocumentPageViewModel(PDPage page, int pageNumber, PDDocument document
 
     // Taken from http://stackoverflow.com/a/9417836/873661
     private static BufferedImage resize(BufferedImage img, int newWidth, int newHeight) {
-        java.awt.Image tmp = img.getScaledInstance(newWidth, newHeight, java.awt.Image.SCALE_SMOOTH);
+        java.awt.Image tmp =
+                img.getScaledInstance(newWidth, newHeight, java.awt.Image.SCALE_SMOOTH);
         BufferedImage dimg = new BufferedImage(newWidth, newHeight, BufferedImage.TYPE_INT_ARGB);
 
         Graphics2D g2d = dimg.createGraphics();
@@ -51,7 +51,8 @@ public Image render(int width, int height) {
         PDFRenderer renderer = new PDFRenderer(document);
         try {
             int resolution = 96;
-            BufferedImage image = renderer.renderImageWithDPI(pageNumber, 2 * resolution, ImageType.RGB);
+            BufferedImage image =
+                    renderer.renderImageWithDPI(pageNumber, 2 * resolution, ImageType.RGB);
             return convertToFxImage(resize(image, width, height));
         } catch (IOException e) {
             // TODO: LOG
diff --git a/src/main/java/org/jabref/gui/documentviewer/PdfDocumentViewModel.java b/src/main/java/org/jabref/gui/documentviewer/PdfDocumentViewModel.java
index 7e5ae9a59691..5de6c8fd2a40 100644
--- a/src/main/java/org/jabref/gui/documentviewer/PdfDocumentViewModel.java
+++ b/src/main/java/org/jabref/gui/documentviewer/PdfDocumentViewModel.java
@@ -1,15 +1,15 @@
 package org.jabref.gui.documentviewer;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPageTree;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 public class PdfDocumentViewModel extends DocumentViewModel {
 
     private final PDDocument document;
@@ -24,7 +24,8 @@ public ObservableList<DocumentPageViewModel> getPages() {
         PDPageTree pages = document.getDocumentCatalog().getPages();
 
         List<PdfDocumentPageViewModel> pdfPages = new ArrayList<>();
-        // There is apparently no neat way to get the page number from a PDPage...thus this old-style for loop
+        // There is apparently no neat way to get the page number from a PDPage...thus this
+        // old-style for loop
         for (int i = 0; i < pages.getCount(); i++) {
             pdfPages.add(new PdfDocumentPageViewModel(pages.get(i), i, document));
         }
diff --git a/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java b/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java
index c75bf81ee054..ffe4e34307e5 100644
--- a/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java
+++ b/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java
@@ -1,21 +1,26 @@
 package org.jabref.gui.documentviewer;
 
+import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
+
+import com.airhacks.afterburner.injection.Injector;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.logic.preferences.CliPreferences;
 
-import com.airhacks.afterburner.injection.Injector;
-
-import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
-
 public class ShowDocumentViewerAction extends SimpleCommand {
-    private final DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
+    private final DialogService dialogService =
+            Injector.instantiateModelOrService(DialogService.class);
     private DocumentViewerView documentViewerView;
 
     public ShowDocumentViewerAction(StateManager stateManager, CliPreferences preferences) {
-        this.executable.bind(needsEntriesSelected(stateManager).and(ActionHelper.isFilePresentForSelectedEntry(stateManager, preferences)));
+        this.executable.bind(
+                needsEntriesSelected(stateManager)
+                        .and(
+                                ActionHelper.isFilePresentForSelectedEntry(
+                                        stateManager, preferences)));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
index 1dab94af6b92..3362085dd8c5 100644
--- a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
+++ b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
@@ -62,12 +62,13 @@ public static DuplicateResolverResult parse(String name) {
     private final ActionFactory actionFactory;
     private final GuiPreferences preferences;
 
-    public DuplicateResolverDialog(BibEntry one,
-                                   BibEntry two,
-                                   DuplicateResolverType type,
-                                   StateManager stateManager,
-                                   DialogService dialogService,
-                                   GuiPreferences preferences) {
+    public DuplicateResolverDialog(
+            BibEntry one,
+            BibEntry two,
+            DuplicateResolverType type,
+            StateManager stateManager,
+            DialogService dialogService,
+            GuiPreferences preferences) {
         this.setTitle(Localization.lang("Possible duplicate entries"));
         this.stateManager = stateManager;
         this.dialogService = dialogService;
@@ -83,7 +84,10 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
         ButtonType both;
         ButtonType second;
         ButtonType first;
-        ButtonType removeExact = new ButtonType(Localization.lang("Automatically remove exact duplicates"), ButtonData.LEFT);
+        ButtonType removeExact =
+                new ButtonType(
+                        Localization.lang("Automatically remove exact duplicates"),
+                        ButtonData.LEFT);
         boolean removeExactVisible = false;
 
         switch (type) {
@@ -104,8 +108,13 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
                 first = new ButtonType(Localization.lang("Keep existing entry"), ButtonData.LEFT);
                 second = new ButtonType(Localization.lang("Keep from import"), ButtonData.LEFT);
                 both = new ButtonType(Localization.lang("Keep both"), ButtonData.LEFT);
-                threeWayMerge = new ThreeWayMergeView(one, two, Localization.lang("Existing entry"),
-                        Localization.lang("From import"), preferences);
+                threeWayMerge =
+                        new ThreeWayMergeView(
+                                one,
+                                two,
+                                Localization.lang("Existing entry"),
+                                Localization.lang("From import"),
+                                preferences);
             }
             default -> throw new IllegalStateException("Switch expression should be exhaustive");
         }
@@ -117,13 +126,15 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
             this.getDialogPane().getButtonTypes().add(removeExact);
 
             // This will prevent all dialog buttons from having the same size
-            // Read more: https://stackoverflow.com/questions/45866249/javafx-8-alert-different-button-sizes
+            // Read more:
+            // https://stackoverflow.com/questions/45866249/javafx-8-alert-different-button-sizes
             getDialogPane().getButtonTypes().stream()
-                           .map(getDialogPane()::lookupButton)
-                           .forEach(btn -> ButtonBar.setButtonUniformSize(btn, false));
+                    .map(getDialogPane()::lookupButton)
+                    .forEach(btn -> ButtonBar.setButtonUniformSize(btn, false));
         }
 
-        // Retrieves the previous window state and sets the new dialog window size and position to match it
+        // Retrieves the previous window state and sets the new dialog window size and position to
+        // match it
         DialogWindowState state = stateManager.getDialogWindowState(getClass().getSimpleName());
         if (state != null) {
             this.getDialogPane().setPrefSize(state.getWidth(), state.getHeight());
@@ -133,28 +144,39 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
 
         BorderPane borderPane = new BorderPane(threeWayMerge);
 
-        this.setResultConverter(button -> {
-            // Updates the window state on button press
-            stateManager.setDialogWindowState(getClass().getSimpleName(), new DialogWindowState(this.getX(), this.getY(), this.getDialogPane().getHeight(), this.getDialogPane().getWidth()));
-            threeWayMerge.saveConfiguration();
-
-            if (button.equals(first)) {
-                return DuplicateResolverResult.KEEP_LEFT;
-            } else if (button.equals(second)) {
-                return DuplicateResolverResult.KEEP_RIGHT;
-            } else if (button.equals(both)) {
-                return DuplicateResolverResult.KEEP_BOTH;
-            } else if (button.equals(merge)) {
-                return DuplicateResolverResult.KEEP_MERGE;
-            } else if (button.equals(removeExact)) {
-                return DuplicateResolverResult.AUTOREMOVE_EXACT;
-            } else if (button.equals(cancel)) {
-                return DuplicateResolverResult.KEEP_LEFT;
-            }
-            return null;
-        });
-
-        HelpAction helpCommand = new HelpAction(HelpFile.FIND_DUPLICATES, dialogService, preferences.getExternalApplicationsPreferences());
+        this.setResultConverter(
+                button -> {
+                    // Updates the window state on button press
+                    stateManager.setDialogWindowState(
+                            getClass().getSimpleName(),
+                            new DialogWindowState(
+                                    this.getX(),
+                                    this.getY(),
+                                    this.getDialogPane().getHeight(),
+                                    this.getDialogPane().getWidth()));
+                    threeWayMerge.saveConfiguration();
+
+                    if (button.equals(first)) {
+                        return DuplicateResolverResult.KEEP_LEFT;
+                    } else if (button.equals(second)) {
+                        return DuplicateResolverResult.KEEP_RIGHT;
+                    } else if (button.equals(both)) {
+                        return DuplicateResolverResult.KEEP_BOTH;
+                    } else if (button.equals(merge)) {
+                        return DuplicateResolverResult.KEEP_MERGE;
+                    } else if (button.equals(removeExact)) {
+                        return DuplicateResolverResult.AUTOREMOVE_EXACT;
+                    } else if (button.equals(cancel)) {
+                        return DuplicateResolverResult.KEEP_LEFT;
+                    }
+                    return null;
+                });
+
+        HelpAction helpCommand =
+                new HelpAction(
+                        HelpFile.FIND_DUPLICATES,
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences());
         Button helpButton = actionFactory.createIconButton(StandardActions.HELP, helpCommand);
         borderPane.setRight(helpButton);
 
diff --git a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
index f2e5ed1a0c8e..02c7d73368f3 100644
--- a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
+++ b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
@@ -1,16 +1,6 @@
 package org.jabref.gui.duplicationFinder;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Supplier;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -37,7 +27,17 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
 
 public class DuplicateSearch extends SimpleCommand {
 
@@ -57,12 +57,13 @@ public class DuplicateSearch extends SimpleCommand {
     private final BibEntryTypesManager entryTypesManager;
     private final TaskExecutor taskExecutor;
 
-    public DuplicateSearch(Supplier<LibraryTab> tabSupplier,
-                           DialogService dialogService,
-                           StateManager stateManager,
-                           GuiPreferences preferences,
-                           BibEntryTypesManager entryTypesManager,
-                           TaskExecutor taskExecutor) {
+    public DuplicateSearch(
+            Supplier<LibraryTab> tabSupplier,
+            DialogService dialogService,
+            StateManager stateManager,
+            GuiPreferences preferences,
+            BibEntryTypesManager entryTypesManager,
+            TaskExecutor taskExecutor) {
         this.tabSupplier = tabSupplier;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
@@ -75,7 +76,10 @@ public DuplicateSearch(Supplier<LibraryTab> tabSupplier,
 
     @Override
     public void execute() {
-        BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null"));
+        BibDatabaseContext database =
+                stateManager
+                        .getActiveDatabase()
+                        .orElseThrow(() -> new NullPointerException("Database null"));
         dialogService.notify(Localization.lang("Searching for duplicates..."));
 
         List<BibEntry> entries = database.getEntries();
@@ -88,12 +92,16 @@ public void execute() {
             return;
         }
 
-        duplicateCountObservable.addListener((obj, oldValue, newValue) -> UiTaskExecutor.runAndWaitInJavaFXThread(() -> duplicateTotal.set(newValue)));
+        duplicateCountObservable.addListener(
+                (obj, oldValue, newValue) ->
+                        UiTaskExecutor.runAndWaitInJavaFXThread(
+                                () -> duplicateTotal.set(newValue)));
 
-        HeadlessExecutorService.INSTANCE.executeInterruptableTask(() -> searchPossibleDuplicates(entries, database.getMode()), "DuplicateSearcher");
+        HeadlessExecutorService.INSTANCE.executeInterruptableTask(
+                () -> searchPossibleDuplicates(entries, database.getMode()), "DuplicateSearcher");
         BackgroundTask.wrap(this::verifyDuplicates)
-                      .onSuccess(this::handleDuplicates)
-                      .executeWith(taskExecutor);
+                .onSuccess(this::handleDuplicates)
+                .executeWith(taskExecutor);
     }
 
     private void searchPossibleDuplicates(List<BibEntry> entries, BibDatabaseMode databaseMode) {
@@ -106,7 +114,8 @@ private void searchPossibleDuplicates(List<BibEntry> entries, BibDatabaseMode da
                 BibEntry first = entries.get(i);
                 BibEntry second = entries.get(j);
 
-                if (new DuplicateCheck(entryTypesManager).isDuplicate(first, second, databaseMode)) {
+                if (new DuplicateCheck(entryTypesManager)
+                        .isDuplicate(first, second, databaseMode)) {
                     duplicates.add(Arrays.asList(first, second));
                     duplicateCountObservable.set(String.valueOf(duplicateCount.incrementAndGet()));
                 }
@@ -123,7 +132,8 @@ private DuplicateSearchResult verifyDuplicates() {
 
             List<BibEntry> dups;
             try {
-                // poll with timeout in case the library is not analyzed completely, but contains no more duplicates
+                // poll with timeout in case the library is not analyzed completely, but contains no
+                // more duplicates
                 dups = this.duplicates.poll(100, TimeUnit.MILLISECONDS);
                 if (dups == null) {
                     continue;
@@ -146,22 +156,39 @@ private DuplicateSearchResult verifyDuplicates() {
                     askAboutExact = true;
                 }
 
-                DuplicateResolverType resolverType = askAboutExact ? DuplicateResolverType.DUPLICATE_SEARCH_WITH_EXACT : DuplicateResolverType.DUPLICATE_SEARCH;
+                DuplicateResolverType resolverType =
+                        askAboutExact
+                                ? DuplicateResolverType.DUPLICATE_SEARCH_WITH_EXACT
+                                : DuplicateResolverType.DUPLICATE_SEARCH;
 
-                UiTaskExecutor.runAndWaitInJavaFXThread(() -> askResolveStrategy(result, first, second, resolverType));
+                UiTaskExecutor.runAndWaitInJavaFXThread(
+                        () -> askResolveStrategy(result, first, second, resolverType));
             }
         }
 
         return result;
     }
 
-    private void askResolveStrategy(DuplicateSearchResult result, BibEntry first, BibEntry second, DuplicateResolverType resolverType) {
-        DuplicateResolverDialog dialog = new DuplicateResolverDialog(first, second, resolverType, stateManager, dialogService, preferences);
-
-        dialog.titleProperty().bind(Bindings.concat(dialog.getTitle()).concat(" (").concat(duplicateProgress.getValue()).concat("/").concat(duplicateTotal).concat(")"));
-
-        DuplicateResolverResult resolverResult = dialogService.showCustomDialogAndWait(dialog)
-                                                              .orElse(DuplicateResolverResult.BREAK);
+    private void askResolveStrategy(
+            DuplicateSearchResult result,
+            BibEntry first,
+            BibEntry second,
+            DuplicateResolverType resolverType) {
+        DuplicateResolverDialog dialog =
+                new DuplicateResolverDialog(
+                        first, second, resolverType, stateManager, dialogService, preferences);
+
+        dialog.titleProperty()
+                .bind(
+                        Bindings.concat(dialog.getTitle())
+                                .concat(" (")
+                                .concat(duplicateProgress.getValue())
+                                .concat("/")
+                                .concat(duplicateTotal)
+                                .concat(")"));
+
+        DuplicateResolverResult resolverResult =
+                dialogService.showCustomDialogAndWait(dialog).orElse(DuplicateResolverResult.BREAK);
 
         if ((resolverResult == DuplicateResolverResult.KEEP_LEFT)
                 || (resolverResult == DuplicateResolverResult.AUTOREMOVE_EXACT)) {
@@ -190,24 +217,33 @@ private void handleDuplicates(DuplicateSearchResult result) {
         }
 
         LibraryTab libraryTab = tabSupplier.get();
-        final NamedCompound compoundEdit = new NamedCompound(Localization.lang("duplicate removal"));
+        final NamedCompound compoundEdit =
+                new NamedCompound(Localization.lang("duplicate removal"));
         // Now, do the actual removal:
         if (!result.getToRemove().isEmpty()) {
-            compoundEdit.addEdit(new UndoableRemoveEntries(libraryTab.getDatabase(), result.getToRemove()));
+            compoundEdit.addEdit(
+                    new UndoableRemoveEntries(libraryTab.getDatabase(), result.getToRemove()));
             libraryTab.getDatabase().removeEntries(result.getToRemove());
             libraryTab.markBaseChanged();
         }
         // and adding merged entries:
         if (!result.getToAdd().isEmpty()) {
-            compoundEdit.addEdit(new UndoableInsertEntries(libraryTab.getDatabase(), result.getToAdd()));
+            compoundEdit.addEdit(
+                    new UndoableInsertEntries(libraryTab.getDatabase(), result.getToAdd()));
             libraryTab.getDatabase().insertEntries(result.getToAdd());
             libraryTab.markBaseChanged();
         }
 
         duplicateProgress.set(0);
 
-        dialogService.notify(Localization.lang("Duplicates found") + ": " + duplicateCount.get() + ' '
-                + Localization.lang("pairs processed") + ": " + result.getDuplicateCount());
+        dialogService.notify(
+                Localization.lang("Duplicates found")
+                        + ": "
+                        + duplicateCount.get()
+                        + ' '
+                        + Localization.lang("pairs processed")
+                        + ": "
+                        + result.getDuplicateCount());
         compoundEdit.end();
         libraryTab.getUndoManager().addEdit(compoundEdit);
     }
diff --git a/src/main/java/org/jabref/gui/edit/CopyDoiUrlAction.java b/src/main/java/org/jabref/gui/edit/CopyDoiUrlAction.java
index 7dec0abeae15..e7a8eac76713 100644
--- a/src/main/java/org/jabref/gui/edit/CopyDoiUrlAction.java
+++ b/src/main/java/org/jabref/gui/edit/CopyDoiUrlAction.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.edit;
 
-import java.util.Optional;
-
 import javafx.scene.control.TextArea;
 
 import org.jabref.gui.ClipBoardManager;
@@ -11,6 +9,8 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.DOI;
 
+import java.util.Optional;
+
 /**
  * Copies the doi url to the clipboard
  */
@@ -21,7 +21,11 @@ public class CopyDoiUrlAction extends SimpleCommand {
     private final DialogService dialogService;
     private final ClipBoardManager clipBoardManager;
 
-    public CopyDoiUrlAction(TextArea component, StandardActions action, DialogService dialogService, ClipBoardManager clipBoardManager) {
+    public CopyDoiUrlAction(
+            TextArea component,
+            StandardActions action,
+            DialogService dialogService,
+            ClipBoardManager clipBoardManager) {
         this.component = component;
         this.action = action;
         this.dialogService = dialogService;
diff --git a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
index 0ef4ea2b74ab..ab263920c8ab 100644
--- a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
+++ b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.edit;
 
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefDialogService;
@@ -23,10 +17,15 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
 public class CopyMoreAction extends SimpleCommand {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CopyMoreAction.class);
@@ -37,12 +36,13 @@ public class CopyMoreAction extends SimpleCommand {
     private final GuiPreferences preferences;
     private final JournalAbbreviationRepository abbreviationRepository;
 
-    public CopyMoreAction(StandardActions action,
-                          DialogService dialogService,
-                          StateManager stateManager,
-                          ClipBoardManager clipBoardManager,
-                          GuiPreferences preferences,
-                          JournalAbbreviationRepository abbreviationRepository) {
+    public CopyMoreAction(
+            StandardActions action,
+            DialogService dialogService,
+            StateManager stateManager,
+            ClipBoardManager clipBoardManager,
+            GuiPreferences preferences,
+            JournalAbbreviationRepository abbreviationRepository) {
         this.action = action;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
@@ -55,35 +55,30 @@ public CopyMoreAction(StandardActions action,
 
     @Override
     public void execute() {
-        if (stateManager.getActiveDatabase().isEmpty() || stateManager.getSelectedEntries().isEmpty()) {
+        if (stateManager.getActiveDatabase().isEmpty()
+                || stateManager.getSelectedEntries().isEmpty()) {
             return;
         }
 
         switch (action) {
-            case COPY_TITLE ->
-                    copyTitle();
-            case COPY_KEY ->
-                    copyKey();
-            case COPY_CITE_KEY ->
-                    copyCiteKey();
-            case COPY_KEY_AND_TITLE ->
-                    copyKeyAndTitle();
-            case COPY_KEY_AND_LINK ->
-                    copyKeyAndLink();
-            case COPY_DOI, COPY_DOI_URL ->
-                    copyDoi();
-            default ->
-                    LOGGER.info("Unknown copy command.");
+            case COPY_TITLE -> copyTitle();
+            case COPY_KEY -> copyKey();
+            case COPY_CITE_KEY -> copyCiteKey();
+            case COPY_KEY_AND_TITLE -> copyKeyAndTitle();
+            case COPY_KEY_AND_LINK -> copyKeyAndLink();
+            case COPY_DOI, COPY_DOI_URL -> copyDoi();
+            default -> LOGGER.info("Unknown copy command.");
         }
     }
 
     private void copyTitle() {
         List<BibEntry> selectedBibEntries = stateManager.getSelectedEntries();
 
-        List<String> titles = selectedBibEntries.stream()
-                                                .filter(bibEntry -> bibEntry.getTitle().isPresent())
-                                                .map(bibEntry -> bibEntry.getTitle().get())
-                                                .collect(Collectors.toList());
+        List<String> titles =
+                selectedBibEntries.stream()
+                        .filter(bibEntry -> bibEntry.getTitle().isPresent())
+                        .map(bibEntry -> bibEntry.getTitle().get())
+                        .collect(Collectors.toList());
 
         if (titles.isEmpty()) {
             dialogService.notify(Localization.lang("None of the selected entries have titles."));
@@ -95,11 +90,16 @@ private void copyTitle() {
 
         if (titles.size() == selectedBibEntries.size()) {
             // All entries had titles.
-            dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
-                    JabRefDialogService.shortenDialogMessage(copiedTitles)));
+            dialogService.notify(
+                    Localization.lang(
+                            "Copied '%0' to clipboard.",
+                            JabRefDialogService.shortenDialogMessage(copiedTitles)));
         } else {
-            dialogService.notify(Localization.lang("Warning: %0 out of %1 entries have undefined title.",
-                    Integer.toString(selectedBibEntries.size() - titles.size()), Integer.toString(selectedBibEntries.size())));
+            dialogService.notify(
+                    Localization.lang(
+                            "Warning: %0 out of %1 entries have undefined title.",
+                            Integer.toString(selectedBibEntries.size() - titles.size()),
+                            Integer.toString(selectedBibEntries.size())));
         }
     }
 
@@ -108,15 +108,19 @@ private void copyDoi() {
 
         // Collect all non-null DOI or DOI urls
         if (action == StandardActions.COPY_DOI_URL) {
-            copyDoiList(entries.stream()
-                               .filter(entry -> entry.getDOI().isPresent())
-                               .map(entry -> entry.getDOI().get().getURIAsASCIIString())
-                               .collect(Collectors.toList()), entries.size());
+            copyDoiList(
+                    entries.stream()
+                            .filter(entry -> entry.getDOI().isPresent())
+                            .map(entry -> entry.getDOI().get().getURIAsASCIIString())
+                            .collect(Collectors.toList()),
+                    entries.size());
         } else {
-            copyDoiList(entries.stream()
-                               .filter(entry -> entry.getDOI().isPresent())
-                               .map(entry -> entry.getDOI().get().getDOI())
-                               .collect(Collectors.toList()), entries.size());
+            copyDoiList(
+                    entries.stream()
+                            .filter(entry -> entry.getDOI().isPresent())
+                            .map(entry -> entry.getDOI().get().getDOI())
+                            .collect(Collectors.toList()),
+                    entries.size());
         }
     }
 
@@ -131,11 +135,15 @@ private void copyDoiList(List<String> dois, int size) {
 
         if (dois.size() == size) {
             // All entries had DOIs.
-            dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
-                    JabRefDialogService.shortenDialogMessage(copiedDois)));
+            dialogService.notify(
+                    Localization.lang(
+                            "Copied '%0' to clipboard.",
+                            JabRefDialogService.shortenDialogMessage(copiedDois)));
         } else {
-            dialogService.notify(Localization.lang("Warning: %0 out of %1 entries have undefined DOIs.",
-                    Integer.toString(size - dois.size()), Integer.toString(size)));
+            dialogService.notify(
+                    Localization.lang(
+                            "Warning: %0 out of %1 entries have undefined DOIs.",
+                            Integer.toString(size - dois.size()), Integer.toString(size)));
         }
     }
 
@@ -143,13 +151,15 @@ private void doCopyKey(Function<List<String>, String> mapKeyList) {
         List<BibEntry> entries = stateManager.getSelectedEntries();
 
         // Collect all non-null keys.
-        List<String> keys = entries.stream()
-                                   .filter(entry -> entry.getCitationKey().isPresent())
-                                   .map(entry -> entry.getCitationKey().get())
-                                   .collect(Collectors.toList());
+        List<String> keys =
+                entries.stream()
+                        .filter(entry -> entry.getCitationKey().isPresent())
+                        .map(entry -> entry.getCitationKey().get())
+                        .collect(Collectors.toList());
 
         if (keys.isEmpty()) {
-            dialogService.notify(Localization.lang("None of the selected entries have citation keys."));
+            dialogService.notify(
+                    Localization.lang("None of the selected entries have citation keys."));
             return;
         }
 
@@ -159,33 +169,56 @@ private void doCopyKey(Function<List<String>, String> mapKeyList) {
 
         if (keys.size() == entries.size()) {
             // All entries had keys.
-            dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
-                    JabRefDialogService.shortenDialogMessage(clipBoardContent)));
+            dialogService.notify(
+                    Localization.lang(
+                            "Copied '%0' to clipboard.",
+                            JabRefDialogService.shortenDialogMessage(clipBoardContent)));
         } else {
-            dialogService.notify(Localization.lang("Warning: %0 out of %1 entries have undefined citation key.",
-                    Integer.toString(entries.size() - keys.size()), Integer.toString(entries.size())));
+            dialogService.notify(
+                    Localization.lang(
+                            "Warning: %0 out of %1 entries have undefined citation key.",
+                            Integer.toString(entries.size() - keys.size()),
+                            Integer.toString(entries.size())));
         }
     }
 
     private void copyCiteKey() {
-        doCopyKey(keys -> {
-            CitationCommandString citeCommand = preferences.getExternalApplicationsPreferences().getCiteCommand();
-            return citeCommand.prefix() + String.join(citeCommand.delimiter(), keys) + citeCommand.suffix();
-        });
+        doCopyKey(
+                keys -> {
+                    CitationCommandString citeCommand =
+                            preferences.getExternalApplicationsPreferences().getCiteCommand();
+                    return citeCommand.prefix()
+                            + String.join(citeCommand.delimiter(), keys)
+                            + citeCommand.suffix();
+                });
     }
 
     private void copyKey() {
-        doCopyKey(keys -> String.join(preferences.getExternalApplicationsPreferences().getCiteCommand().delimiter(), keys));
+        doCopyKey(
+                keys ->
+                        String.join(
+                                preferences
+                                        .getExternalApplicationsPreferences()
+                                        .getCiteCommand()
+                                        .delimiter(),
+                                keys));
     }
 
     private void copyKeyAndTitle() {
         List<BibEntry> entries = stateManager.getSelectedEntries();
 
         // ToDo: this string should be configurable to allow arbitrary exports
-        StringReader layoutString = new StringReader("\\citationkey - \\begin{title}\\format[RemoveBrackets]{\\title}\\end{title}\n");
+        StringReader layoutString =
+                new StringReader(
+                        "\\citationkey - \\begin{title}\\format[RemoveBrackets]{\\title}\\end{title}\n");
         Layout layout;
         try {
-            layout = new LayoutHelper(layoutString, preferences.getLayoutFormatterPreferences(), abbreviationRepository).getLayoutFromText();
+            layout =
+                    new LayoutHelper(
+                                    layoutString,
+                                    preferences.getLayoutFormatterPreferences(),
+                                    abbreviationRepository)
+                            .getLayoutFromText();
         } catch (IOException e) {
             LOGGER.info("Could not get layout.", e);
             return;
@@ -198,14 +231,18 @@ private void copyKeyAndTitle() {
         for (BibEntry entry : entries) {
             if (entry.hasCitationKey()) {
                 entriesWithKeys++;
-                stateManager.getActiveDatabase()
-                            .map(BibDatabaseContext::getDatabase)
-                            .ifPresent(bibDatabase -> keyAndTitle.append(layout.doLayout(entry, bibDatabase)));
+                stateManager
+                        .getActiveDatabase()
+                        .map(BibDatabaseContext::getDatabase)
+                        .ifPresent(
+                                bibDatabase ->
+                                        keyAndTitle.append(layout.doLayout(entry, bibDatabase)));
             }
         }
 
         if (entriesWithKeys == 0) {
-            dialogService.notify(Localization.lang("None of the selected entries have citation keys."));
+            dialogService.notify(
+                    Localization.lang("None of the selected entries have citation keys."));
             return;
         }
 
@@ -213,11 +250,16 @@ private void copyKeyAndTitle() {
 
         if (entriesWithKeys == entries.size()) {
             // All entries had keys.
-            dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
-                    JabRefDialogService.shortenDialogMessage(keyAndTitle.toString())));
+            dialogService.notify(
+                    Localization.lang(
+                            "Copied '%0' to clipboard.",
+                            JabRefDialogService.shortenDialogMessage(keyAndTitle.toString())));
         } else {
-            dialogService.notify(Localization.lang("Warning: %0 out of %1 entries have undefined citation key.",
-                    Integer.toString(entries.size() - entriesWithKeys), Integer.toString(entries.size())));
+            dialogService.notify(
+                    Localization.lang(
+                            "Warning: %0 out of %1 entries have undefined citation key.",
+                            Integer.toString(entries.size() - entriesWithKeys),
+                            Integer.toString(entries.size())));
         }
     }
 
@@ -232,12 +274,11 @@ private void copyKeyAndLink() {
         StringBuilder keyAndLink = new StringBuilder();
         StringBuilder fallbackString = new StringBuilder();
 
-        List<BibEntry> entriesWithKey = entries.stream()
-                                               .filter(BibEntry::hasCitationKey)
-                                               .toList();
+        List<BibEntry> entriesWithKey = entries.stream().filter(BibEntry::hasCitationKey).toList();
 
         if (entriesWithKey.isEmpty()) {
-            dialogService.notify(Localization.lang("None of the selected entries have citation keys."));
+            dialogService.notify(
+                    Localization.lang("None of the selected entries have citation keys."));
             return;
         }
 
@@ -257,11 +298,16 @@ private void copyKeyAndLink() {
 
         if (entriesWithKey.size() == entries.size()) {
             // All entries had keys.
-            dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
-                    JabRefDialogService.shortenDialogMessage(keyAndLink.toString())));
+            dialogService.notify(
+                    Localization.lang(
+                            "Copied '%0' to clipboard.",
+                            JabRefDialogService.shortenDialogMessage(keyAndLink.toString())));
         } else {
-            dialogService.notify(Localization.lang("Warning: %0 out of %1 entries have undefined citation key.",
-                    Long.toString(entries.size() - entriesWithKey.size()), Integer.toString(entries.size())));
+            dialogService.notify(
+                    Localization.lang(
+                            "Warning: %0 out of %1 entries have undefined citation key.",
+                            Long.toString(entries.size() - entriesWithKey.size()),
+                            Integer.toString(entries.size())));
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/EditAction.java b/src/main/java/org/jabref/gui/edit/EditAction.java
index c6be070e0e85..89a044997ac9 100644
--- a/src/main/java/org/jabref/gui/edit/EditAction.java
+++ b/src/main/java/org/jabref/gui/edit/EditAction.java
@@ -1,22 +1,21 @@
 package org.jabref.gui.edit;
 
-import java.util.function.Supplier;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.TextInputControl;
 import javafx.scene.web.WebView;
 
+import org.fxmisc.richtext.CodeArea;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
-
-import org.fxmisc.richtext.CodeArea;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.function.Supplier;
+
+import javax.swing.undo.UndoManager;
+
 /**
  * Class for handling general actions; cut, copy and paste. The focused component is kept track of by
  * Globals.focusListener, and we call the action stored under the relevant name in its action map.
@@ -30,7 +29,11 @@ public class EditAction extends SimpleCommand {
     private final StateManager stateManager;
     private final UndoManager undoManager;
 
-    public EditAction(StandardActions action, Supplier<LibraryTab> tabSupplier, StateManager stateManager, UndoManager undoManager) {
+    public EditAction(
+            StandardActions action,
+            Supplier<LibraryTab> tabSupplier,
+            StateManager stateManager,
+            UndoManager undoManager) {
         this.action = action;
         this.tabSupplier = tabSupplier;
         this.stateManager = stateManager;
@@ -50,51 +53,63 @@ public String toString() {
 
     @Override
     public void execute() {
-        stateManager.getFocusOwner().ifPresent(focusOwner -> {
-            LOGGER.debug("focusOwner: {}; Action: {}", focusOwner, action.getText());
-            if (focusOwner instanceof TextInputControl textInput) {
-                // Focus is on text field -> copy/paste/cut selected text
-                // DELETE_ENTRY in text field should do forward delete
-                switch (action) {
-                    case SELECT_ALL -> textInput.selectAll();
-                    case COPY -> textInput.copy();
-                    case CUT -> textInput.cut();
-                    case PASTE -> textInput.paste();
-                    case DELETE -> textInput.clear();
-                    case DELETE_ENTRY -> textInput.deleteNextChar();
-                    case UNDO -> textInput.undo();
-                    case REDO -> textInput.redo();
-                    default -> {
-                        String message = "Only cut/copy/paste supported in TextInputControl but got " + action;
-                        LOGGER.error(message);
-                        throw new IllegalStateException(message);
-                    }
-                }
-            } else if ((focusOwner instanceof CodeArea) || (focusOwner instanceof WebView)) {
-                LOGGER.debug("Ignoring request in CodeArea or WebView");
-                return;
-            } else {
-                LOGGER.debug("Else: {}", focusOwner.getClass().getSimpleName());
-                // Not sure what is selected -> copy/paste/cut selected entries except for Preview and CodeArea
+        stateManager
+                .getFocusOwner()
+                .ifPresent(
+                        focusOwner -> {
+                            LOGGER.debug(
+                                    "focusOwner: {}; Action: {}", focusOwner, action.getText());
+                            if (focusOwner instanceof TextInputControl textInput) {
+                                // Focus is on text field -> copy/paste/cut selected text
+                                // DELETE_ENTRY in text field should do forward delete
+                                switch (action) {
+                                    case SELECT_ALL -> textInput.selectAll();
+                                    case COPY -> textInput.copy();
+                                    case CUT -> textInput.cut();
+                                    case PASTE -> textInput.paste();
+                                    case DELETE -> textInput.clear();
+                                    case DELETE_ENTRY -> textInput.deleteNextChar();
+                                    case UNDO -> textInput.undo();
+                                    case REDO -> textInput.redo();
+                                    default -> {
+                                        String message =
+                                                "Only cut/copy/paste supported in TextInputControl but got "
+                                                        + action;
+                                        LOGGER.error(message);
+                                        throw new IllegalStateException(message);
+                                    }
+                                }
+                            } else if ((focusOwner instanceof CodeArea)
+                                    || (focusOwner instanceof WebView)) {
+                                LOGGER.debug("Ignoring request in CodeArea or WebView");
+                                return;
+                            } else {
+                                LOGGER.debug("Else: {}", focusOwner.getClass().getSimpleName());
+                                // Not sure what is selected -> copy/paste/cut selected entries
+                                // except for Preview and CodeArea
 
-                switch (action) {
-                    case COPY -> tabSupplier.get().copyEntry();
-                    case CUT -> tabSupplier.get().cutEntry();
-                    case PASTE -> tabSupplier.get().pasteEntry();
-                    case DELETE_ENTRY -> tabSupplier.get().deleteEntry();
-                    case UNDO -> {
-                        if (undoManager.canUndo()) {
-                            undoManager.undo();
-                        }
-                    }
-                    case REDO -> {
-                        if (undoManager.canRedo()) {
-                            undoManager.redo();
-                        }
-                    }
-                    default -> LOGGER.debug("Only cut/copy/paste/deleteEntry supported but got: {} and focus owner {}", action, focusOwner);
-                }
-            }
-        });
+                                switch (action) {
+                                    case COPY -> tabSupplier.get().copyEntry();
+                                    case CUT -> tabSupplier.get().cutEntry();
+                                    case PASTE -> tabSupplier.get().pasteEntry();
+                                    case DELETE_ENTRY -> tabSupplier.get().deleteEntry();
+                                    case UNDO -> {
+                                        if (undoManager.canUndo()) {
+                                            undoManager.undo();
+                                        }
+                                    }
+                                    case REDO -> {
+                                        if (undoManager.canRedo()) {
+                                            undoManager.redo();
+                                        }
+                                    }
+                                    default ->
+                                            LOGGER.debug(
+                                                    "Only cut/copy/paste/deleteEntry supported but got: {} and focus owner {}",
+                                                    action,
+                                                    focusOwner);
+                                }
+                            }
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/ManageKeywordsAction.java b/src/main/java/org/jabref/gui/edit/ManageKeywordsAction.java
index 5ea7a6c95650..5fd356317fea 100644
--- a/src/main/java/org/jabref/gui/edit/ManageKeywordsAction.java
+++ b/src/main/java/org/jabref/gui/edit/ManageKeywordsAction.java
@@ -1,16 +1,16 @@
 package org.jabref.gui.edit;
 
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
+
+import com.airhacks.afterburner.injection.Injector;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.util.BindingsHelper;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.injection.Injector;
-
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
-
 /**
  * An Action for launching keyword managing dialog
  */
@@ -22,12 +22,17 @@ public ManageKeywordsAction(StateManager stateManager) {
         this.stateManager = stateManager;
 
         this.executable.bind(needsDatabase(stateManager).and(needsEntriesSelected(stateManager)));
-        this.statusMessage.bind(BindingsHelper.ifThenElse(this.executable, "", Localization.lang("Select at least one entry to manage keywords.")));
+        this.statusMessage.bind(
+                BindingsHelper.ifThenElse(
+                        this.executable,
+                        "",
+                        Localization.lang("Select at least one entry to manage keywords.")));
     }
 
     @Override
     public void execute() {
         DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialogAndWait(new ManageKeywordsDialog(stateManager.getSelectedEntries()));
+        dialogService.showCustomDialogAndWait(
+                new ManageKeywordsDialog(stateManager.getSelectedEntries()));
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java b/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java
index 00d42f25e310..1aea1562109b 100644
--- a/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java
+++ b/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java
@@ -1,6 +1,9 @@
 package org.jabref.gui.edit;
 
-import java.util.List;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import jakarta.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
@@ -17,9 +20,7 @@
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.model.entry.BibEntry;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
+import java.util.List;
 
 public class ManageKeywordsDialog extends BaseDialog<Void> {
     private final List<BibEntry> entries;
@@ -35,48 +36,61 @@ public ManageKeywordsDialog(List<BibEntry> entries) {
         this.entries = entries;
         this.setTitle(Localization.lang("Manage keywords"));
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
-        setResultConverter(button -> {
-            if (button == ButtonType.APPLY) {
-                viewModel.saveChanges();
-            }
-            return null;
-        });
+        setResultConverter(
+                button -> {
+                    if (button == ButtonType.APPLY) {
+                        viewModel.saveChanges();
+                    }
+                    return null;
+                });
     }
 
     @FXML
     public void initialize() {
         viewModel = new ManageKeywordsViewModel(preferences.getBibEntryPreferences(), entries);
 
-        viewModel.displayTypeProperty().bind(
-                EasyBind.map(displayType.selectedToggleProperty(), toggle -> {
-                    if (toggle != null) {
-                        return (ManageKeywordsDisplayType) toggle.getUserData();
-                    } else {
-                        return ManageKeywordsDisplayType.CONTAINED_IN_ALL_ENTRIES;
-                    }
-                })
-        );
+        viewModel
+                .displayTypeProperty()
+                .bind(
+                        EasyBind.map(
+                                displayType.selectedToggleProperty(),
+                                toggle -> {
+                                    if (toggle != null) {
+                                        return (ManageKeywordsDisplayType) toggle.getUserData();
+                                    } else {
+                                        return ManageKeywordsDisplayType.CONTAINED_IN_ALL_ENTRIES;
+                                    }
+                                }));
 
         keywordsTable.setItems(viewModel.getKeywords());
-        keywordsTableMainColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue()));
-        keywordsTableMainColumn.setOnEditCommit(event -> {
-            // Poor mans reverse databinding (necessary because we use a constant value above)
-            viewModel.getKeywords().set(event.getTablePosition().getRow(), event.getNewValue());
-        });
+        keywordsTableMainColumn.setCellValueFactory(
+                data -> BindingsHelper.constantOf(data.getValue()));
+        keywordsTableMainColumn.setOnEditCommit(
+                event -> {
+                    // Poor mans reverse databinding (necessary because we use a constant value
+                    // above)
+                    viewModel
+                            .getKeywords()
+                            .set(event.getTablePosition().getRow(), event.getNewValue());
+                });
         keywordsTableMainColumn.setCellFactory(TextFieldTableCell.forTableColumn());
         keywordsTableEditColumn.setCellValueFactory(data -> BindingsHelper.constantOf(true));
         keywordsTableDeleteColumn.setCellValueFactory(data -> BindingsHelper.constantOf(true));
         new ValueTableCellFactory<String, Boolean>()
                 .withGraphic(none -> IconTheme.JabRefIcons.EDIT.getGraphicNode())
-                .withOnMouseClickedEvent(none -> event -> keywordsTable.edit(keywordsTable.getFocusModel().getFocusedIndex(), keywordsTableMainColumn))
+                .withOnMouseClickedEvent(
+                        none ->
+                                event ->
+                                        keywordsTable.edit(
+                                                keywordsTable.getFocusModel().getFocusedIndex(),
+                                                keywordsTableMainColumn))
                 .install(keywordsTableEditColumn);
         new ValueTableCellFactory<String, Boolean>()
                 .withGraphic(none -> IconTheme.JabRefIcons.REMOVE.getGraphicNode())
-                .withOnMouseClickedEvent((keyword, none) -> event -> viewModel.removeKeyword(keyword))
+                .withOnMouseClickedEvent(
+                        (keyword, none) -> event -> viewModel.removeKeyword(keyword))
                 .install(keywordsTableDeleteColumn);
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java b/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java
index c4a5f8773a0c..b06bbe978b3a 100644
--- a/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.edit;
 
-import java.util.List;
-import java.util.Optional;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -17,17 +16,20 @@
 import org.jabref.model.entry.Keyword;
 import org.jabref.model.entry.KeywordList;
 
-import com.tobiasdiez.easybind.EasyBind;
+import java.util.List;
+import java.util.Optional;
 
 public class ManageKeywordsViewModel {
 
     private final List<BibEntry> entries;
     private final KeywordList sortedKeywordsOfAllEntriesBeforeUpdateByUser = new KeywordList();
     private final BibEntryPreferences bibEntryPreferences;
-    private final ObjectProperty<ManageKeywordsDisplayType> displayType = new SimpleObjectProperty<>(ManageKeywordsDisplayType.CONTAINED_IN_ALL_ENTRIES);
+    private final ObjectProperty<ManageKeywordsDisplayType> displayType =
+            new SimpleObjectProperty<>(ManageKeywordsDisplayType.CONTAINED_IN_ALL_ENTRIES);
     private final ObservableList<String> keywords;
 
-    public ManageKeywordsViewModel(BibEntryPreferences bibEntryPreferences, List<BibEntry> entries) {
+    public ManageKeywordsViewModel(
+            BibEntryPreferences bibEntryPreferences, List<BibEntry> entries) {
         this.bibEntryPreferences = bibEntryPreferences;
         this.entries = entries;
         this.keywords = FXCollections.observableArrayList();
@@ -60,7 +62,8 @@ private void fillKeywordsList(ManageKeywordsDisplayType type) {
             sortedKeywordsOfAllEntriesBeforeUpdateByUser.addAll(separatedKeywords);
 
             // for the remaining entries, intersection has to be used
-            // this approach ensures that one empty keyword list leads to an empty set of common keywords
+            // this approach ensures that one empty keyword list leads to an empty set of common
+            // keywords
             for (BibEntry entry : entries) {
                 separatedKeywords = entry.getKeywords(keywordSeparator);
                 sortedKeywordsOfAllEntriesBeforeUpdateByUser.retainAll(separatedKeywords);
@@ -108,8 +111,8 @@ public void saveChanges() {
         // TODO: bp.getUndoManager().addEdit(ce);
     }
 
-    private NamedCompound updateKeywords(List<BibEntry> entries, KeywordList keywordsToAdd,
-                                         KeywordList keywordsToRemove) {
+    private NamedCompound updateKeywords(
+            List<BibEntry> entries, KeywordList keywordsToAdd, KeywordList keywordsToRemove) {
         Character keywordSeparator = bibEntryPreferences.getKeywordSeparator();
 
         NamedCompound ce = new NamedCompound(Localization.lang("Update keywords"));
diff --git a/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java b/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
index 9711dd5478ef..a3baf46e7be6 100644
--- a/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
+++ b/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
@@ -11,7 +11,10 @@ public class OpenBrowserAction extends SimpleCommand {
     private final DialogService dialogService;
     private final ExternalApplicationsPreferences externalApplicationsPreferences;
 
-    public OpenBrowserAction(String urlToOpen, DialogService dialogService, ExternalApplicationsPreferences externalApplicationsPreferences) {
+    public OpenBrowserAction(
+            String urlToOpen,
+            DialogService dialogService,
+            ExternalApplicationsPreferences externalApplicationsPreferences) {
         this.urlToOpen = urlToOpen;
         this.dialogService = dialogService;
         this.externalApplicationsPreferences = externalApplicationsPreferences;
@@ -19,6 +22,7 @@ public OpenBrowserAction(String urlToOpen, DialogService dialogService, External
 
     @Override
     public void execute() {
-        NativeDesktop.openBrowserShowPopup(urlToOpen, dialogService, externalApplicationsPreferences);
+        NativeDesktop.openBrowserShowPopup(
+                urlToOpen, dialogService, externalApplicationsPreferences);
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java b/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java
index 3a7ba00795cf..72aef28bdc0f 100644
--- a/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java
+++ b/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java
@@ -1,18 +1,21 @@
 package org.jabref.gui.edit;
 
-import java.util.function.Supplier;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 
+import java.util.function.Supplier;
+
 public class ReplaceStringAction extends SimpleCommand {
     private final Supplier<LibraryTab> tabSupplier;
     private final DialogService dialogService;
 
-    public ReplaceStringAction(Supplier<LibraryTab> tabSupplier, StateManager stateManager, DialogService dialogService) {
+    public ReplaceStringAction(
+            Supplier<LibraryTab> tabSupplier,
+            StateManager stateManager,
+            DialogService dialogService) {
         this.tabSupplier = tabSupplier;
         this.dialogService = dialogService;
         this.executable.bind(ActionHelper.needsDatabase(stateManager));
diff --git a/src/main/java/org/jabref/gui/edit/ReplaceStringView.java b/src/main/java/org/jabref/gui/edit/ReplaceStringView.java
index a931406c99cd..4c428dfd534e 100644
--- a/src/main/java/org/jabref/gui/edit/ReplaceStringView.java
+++ b/src/main/java/org/jabref/gui/edit/ReplaceStringView.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.edit;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.CheckBox;
@@ -12,9 +16,6 @@
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-
 public class ReplaceStringView extends BaseDialog<Void> {
 
     @FXML private RadioButton allReplace;
@@ -33,9 +34,7 @@ public ReplaceStringView(LibraryTab libraryTab) {
 
         viewModel = new ReplaceStringViewModel(libraryTab);
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         ControlHelper.setAction(replaceButton, getDialogPane(), event -> buttonReplace());
     }
diff --git a/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java b/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java
index 04db4bf91479..1945635c9dee 100644
--- a/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.edit;
 
-import java.util.Objects;
-import java.util.Set;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -17,6 +14,9 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 
+import java.util.Objects;
+import java.util.Set;
+
 public class ReplaceStringViewModel extends AbstractViewModel {
     private boolean allFieldReplace;
     private String findString;
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabView.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabView.java
index 2954b013f68a..5c9217dde7e3 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabView.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabView.java
@@ -2,7 +2,8 @@
 
 import javafx.scene.layout.AnchorPane;
 
-public abstract class AbstractAutomaticFieldEditorTabView extends AnchorPane implements AutomaticFieldEditorTab {
+public abstract class AbstractAutomaticFieldEditorTabView extends AnchorPane
+        implements AutomaticFieldEditorTab {
 
     @Override
     public AnchorPane getContent() {
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabViewModel.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabViewModel.java
index fe6e60fee01a..4227512117ef 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabViewModel.java
@@ -1,12 +1,5 @@
 package org.jabref.gui.edit.automaticfiededitor;
 
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
@@ -15,18 +8,26 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
 public abstract class AbstractAutomaticFieldEditorTabViewModel extends AbstractViewModel {
-    public static final Logger LOGGER = LoggerFactory.getLogger(AbstractAutomaticFieldEditorTabViewModel.class);
+    public static final Logger LOGGER =
+            LoggerFactory.getLogger(AbstractAutomaticFieldEditorTabViewModel.class);
 
     protected final StateManager stateManager;
 
     private final ObservableList<Field> allFields = FXCollections.observableArrayList();
 
-    public AbstractAutomaticFieldEditorTabViewModel(BibDatabase bibDatabase, StateManager stateManager) {
+    public AbstractAutomaticFieldEditorTabViewModel(
+            BibDatabase bibDatabase, StateManager stateManager) {
         Objects.requireNonNull(bibDatabase);
         Objects.requireNonNull(stateManager);
         this.stateManager = stateManager;
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorAction.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorAction.java
index afd8adc29b9e..cd239ff0c4a1 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorAction.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorAction.java
@@ -1,20 +1,21 @@
 package org.jabref.gui.edit.automaticfiededitor;
 
-import javax.swing.undo.UndoManager;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
+import javax.swing.undo.UndoManager;
 
 public class AutomaticFieldEditorAction extends SimpleCommand {
     private final StateManager stateManager;
     private final DialogService dialogService;
     private final UndoManager undoManager;
 
-    public AutomaticFieldEditorAction(StateManager stateManager, DialogService dialogService, UndoManager undoManager) {
+    public AutomaticFieldEditorAction(
+            StateManager stateManager, DialogService dialogService, UndoManager undoManager) {
         this.stateManager = stateManager;
         this.dialogService = dialogService;
         this.undoManager = undoManager;
@@ -24,6 +25,7 @@ public AutomaticFieldEditorAction(StateManager stateManager, DialogService dialo
 
     @Override
     public void execute() {
-        dialogService.showCustomDialogAndWait(new AutomaticFieldEditorDialog(stateManager, undoManager));
+        dialogService.showCustomDialogAndWait(
+                new AutomaticFieldEditorDialog(stateManager, undoManager));
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java
index d2d0893a4887..b76c45c6496d 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java
@@ -1,10 +1,7 @@
 package org.jabref.gui.edit.automaticfiededitor;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.undo.CannotUndoException;
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonBar;
@@ -16,18 +13,20 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.undo.CannotUndoException;
+import javax.swing.undo.UndoManager;
+
 public class AutomaticFieldEditorDialog extends BaseDialog<String> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AutomaticFieldEditorDialog.class);
 
-    @FXML
-    private TabPane tabPane;
+    @FXML private TabPane tabPane;
 
     private final UndoManager undoManager;
 
@@ -48,41 +47,48 @@ public AutomaticFieldEditorDialog(StateManager stateManager, UndoManager undoMan
 
         this.setTitle(Localization.lang("Automatic field editor"));
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
-        setResultConverter(buttonType -> {
-            if (buttonType != null && buttonType.getButtonData() == ButtonBar.ButtonData.OK_DONE) {
-                saveChanges();
-            } else {
-                cancelChanges();
-            }
-            return "";
-        });
+        setResultConverter(
+                buttonType -> {
+                    if (buttonType != null
+                            && buttonType.getButtonData() == ButtonBar.ButtonData.OK_DONE) {
+                        saveChanges();
+                    } else {
+                        cancelChanges();
+                    }
+                    return "";
+                });
 
         // This will prevent all dialog buttons from having the same size
-        // Read more: https://stackoverflow.com/questions/45866249/javafx-8-alert-different-button-sizes
+        // Read more:
+        // https://stackoverflow.com/questions/45866249/javafx-8-alert-different-button-sizes
         getDialogPane().getButtonTypes().stream()
-            .map(getDialogPane()::lookupButton)
-            .forEach(btn -> ButtonBar.setButtonUniformSize(btn, false));
+                .map(getDialogPane()::lookupButton)
+                .forEach(btn -> ButtonBar.setButtonUniformSize(btn, false));
     }
 
     @FXML
     public void initialize() {
-        viewModel = new AutomaticFieldEditorViewModel(selectedEntries, database, undoManager, stateManager);
+        viewModel =
+                new AutomaticFieldEditorViewModel(
+                        selectedEntries, database, undoManager, stateManager);
 
         for (AutomaticFieldEditorTab tabModel : viewModel.getFieldEditorTabs()) {
-            NotificationPaneAdapter notificationPane = new NotificationPaneAdapter(tabModel.getContent());
+            NotificationPaneAdapter notificationPane =
+                    new NotificationPaneAdapter(tabModel.getContent());
             notificationPanes.add(notificationPane);
             tabPane.getTabs().add(new Tab(tabModel.getTabName(), notificationPane));
         }
 
-        EasyBind.listen(stateManager.lastAutomaticFieldEditorEditProperty(), (obs, old, lastEdit) -> {
-            viewModel.getDialogEdits().addEdit(lastEdit.getEdit());
-            notificationPanes.get(lastEdit.getTabIndex())
-                             .notify(lastEdit.getAffectedEntries(), selectedEntries.size());
-        });
+        EasyBind.listen(
+                stateManager.lastAutomaticFieldEditorEditProperty(),
+                (obs, old, lastEdit) -> {
+                    viewModel.getDialogEdits().addEdit(lastEdit.getEdit());
+                    notificationPanes
+                            .get(lastEdit.getTabIndex())
+                            .notify(lastEdit.getAffectedEntries(), selectedEntries.size());
+                });
     }
 
     private void saveChanges() {
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorViewModel.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorViewModel.java
index 3f517a1dabd7..e72acafbd1a4 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorViewModel.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.edit.automaticfiededitor;
 
-import java.util.List;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
@@ -16,20 +12,28 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 
+import java.util.List;
+
+import javax.swing.undo.UndoManager;
+
 public class AutomaticFieldEditorViewModel extends AbstractViewModel {
     public static final String NAMED_COMPOUND_EDITS = "EDIT_FIELDS";
-    private final ObservableList<AutomaticFieldEditorTab> fieldEditorTabs = FXCollections.observableArrayList();
+    private final ObservableList<AutomaticFieldEditorTab> fieldEditorTabs =
+            FXCollections.observableArrayList();
     private final NamedCompound dialogEdits = new NamedCompound(NAMED_COMPOUND_EDITS);
 
     private final UndoManager undoManager;
 
-    public AutomaticFieldEditorViewModel(List<BibEntry> selectedEntries, BibDatabase database, UndoManager undoManager, StateManager stateManager) {
+    public AutomaticFieldEditorViewModel(
+            List<BibEntry> selectedEntries,
+            BibDatabase database,
+            UndoManager undoManager,
+            StateManager stateManager) {
         this.undoManager = undoManager;
         fieldEditorTabs.addAll(
                 new EditFieldContentTabView(database, stateManager),
                 new CopyOrMoveFieldContentTabView(database, stateManager),
-                new RenameFieldTabView(database, stateManager)
-        );
+                new RenameFieldTabView(database, stateManager));
     }
 
     public NamedCompound getDialogEdits() {
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/LastAutomaticFieldEditorEdit.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/LastAutomaticFieldEditorEdit.java
index a1263576608d..35186d68a9cf 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/LastAutomaticFieldEditorEdit.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/LastAutomaticFieldEditorEdit.java
@@ -1,18 +1,19 @@
 package org.jabref.gui.edit.automaticfiededitor;
 
+import org.jabref.gui.undo.NamedCompound;
+
 import javax.swing.undo.AbstractUndoableEdit;
 import javax.swing.undo.CannotRedoException;
 import javax.swing.undo.CannotUndoException;
 
-import org.jabref.gui.undo.NamedCompound;
-
 public class LastAutomaticFieldEditorEdit extends AbstractUndoableEdit {
     private final Integer affectedEntries;
     private final NamedCompound edit;
 
     private final Integer tabIndex;
 
-    public LastAutomaticFieldEditorEdit(Integer affectedEntries, Integer tabIndex, NamedCompound edit) {
+    public LastAutomaticFieldEditorEdit(
+            Integer affectedEntries, Integer tabIndex, NamedCompound edit) {
         this.affectedEntries = affectedEntries;
         this.edit = edit;
         this.tabIndex = tabIndex;
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/MoveFieldValueAction.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/MoveFieldValueAction.java
index 660c2f8454b4..7d23bdedf4c9 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/MoveFieldValueAction.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/MoveFieldValueAction.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.edit.automaticfiededitor;
 
-import java.util.List;
-
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableFieldChange;
@@ -9,6 +7,8 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.List;
+
 public class MoveFieldValueAction extends SimpleCommand {
     private final Field fromField;
     private final Field toField;
@@ -20,7 +20,12 @@ public class MoveFieldValueAction extends SimpleCommand {
 
     private final boolean overwriteToFieldContent;
 
-    public MoveFieldValueAction(Field fromField, Field toField, List<BibEntry> entries, NamedCompound edits, boolean overwriteToFieldContent) {
+    public MoveFieldValueAction(
+            Field fromField,
+            Field toField,
+            List<BibEntry> entries,
+            NamedCompound edits,
+            boolean overwriteToFieldContent) {
         this.fromField = fromField;
         this.toField = toField;
         this.entries = entries;
@@ -28,7 +33,8 @@ public MoveFieldValueAction(Field fromField, Field toField, List<BibEntry> entri
         this.overwriteToFieldContent = overwriteToFieldContent;
     }
 
-    public MoveFieldValueAction(Field fromField, Field toField, List<BibEntry> entries, NamedCompound edits) {
+    public MoveFieldValueAction(
+            Field fromField, Field toField, List<BibEntry> entries, NamedCompound edits) {
         this(fromField, toField, entries, edits, true);
     }
 
@@ -44,7 +50,8 @@ public void execute() {
                     entry.setField(fromField, "");
 
                     edits.addEdit(new UndoableFieldChange(entry, fromField, fromFieldValue, null));
-                    edits.addEdit(new UndoableFieldChange(entry, toField, toFieldValue, fromFieldValue));
+                    edits.addEdit(
+                            new UndoableFieldChange(entry, toField, toFieldValue, fromFieldValue));
                     affectedEntriesCount++;
                 }
             }
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/NotificationPaneAdapter.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/NotificationPaneAdapter.java
index 811a954a8aae..49eb3b7778fa 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/NotificationPaneAdapter.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/NotificationPaneAdapter.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.edit.automaticfiededitor;
 
-import java.util.Collections;
-
 import javafx.scene.Node;
 import javafx.util.Duration;
 
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.icon.IconTheme;
 
+import java.util.Collections;
+
 public class NotificationPaneAdapter extends LibraryTab.DatabaseNotification {
 
     public NotificationPaneAdapter(Node content) {
@@ -15,9 +15,14 @@ public NotificationPaneAdapter(Node content) {
     }
 
     public void notify(int affectedEntries, int totalEntries) {
-        String notificationMessage = "%d/%d affected entries".formatted(affectedEntries, totalEntries);
+        String notificationMessage =
+                "%d/%d affected entries".formatted(affectedEntries, totalEntries);
         Node notificationGraphic = IconTheme.JabRefIcons.INTEGRITY_INFO.getGraphicNode();
 
-        notify(notificationGraphic, notificationMessage, Collections.emptyList(), Duration.seconds(2));
+        notify(
+                notificationGraphic,
+                notificationMessage,
+                Collections.emptyList(),
+                Duration.seconds(2));
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTabView.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTabView.java
index 179004ec0ac7..900275ffd511 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTabView.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTabView.java
@@ -1,7 +1,11 @@
 package org.jabref.gui.edit.automaticfiededitor.copyormovecontent;
 
-import java.util.ArrayList;
-import java.util.List;
+import static org.jabref.gui.util.FieldsUtil.FIELD_STRING_CONVERTER;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
 import javafx.application.Platform;
 import javafx.fxml.FXML;
@@ -17,27 +21,20 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-
-import static org.jabref.gui.util.FieldsUtil.FIELD_STRING_CONVERTER;
+import java.util.ArrayList;
+import java.util.List;
 
-public class CopyOrMoveFieldContentTabView extends AbstractAutomaticFieldEditorTabView implements AutomaticFieldEditorTab {
+public class CopyOrMoveFieldContentTabView extends AbstractAutomaticFieldEditorTabView
+        implements AutomaticFieldEditorTab {
     public Button copyContentButton;
-    @FXML
-    private Button moveContentButton;
+    @FXML private Button moveContentButton;
 
-    @FXML
-    private Button swapContentButton;
+    @FXML private Button swapContentButton;
 
-    @FXML
-    private ComboBox<Field> fromFieldComboBox;
-    @FXML
-    private ComboBox<Field> toFieldComboBox;
+    @FXML private ComboBox<Field> fromFieldComboBox;
+    @FXML private ComboBox<Field> toFieldComboBox;
 
-    @FXML
-    private CheckBox overwriteFieldContentCheckBox;
+    @FXML private CheckBox overwriteFieldContentCheckBox;
 
     private CopyOrMoveFieldContentTabViewModel viewModel;
     private final List<BibEntry> selectedEntries;
@@ -51,25 +48,31 @@ public CopyOrMoveFieldContentTabView(BibDatabase database, StateManager stateMan
         this.database = database;
         this.stateManager = stateManager;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     public void initialize() {
         viewModel = new CopyOrMoveFieldContentTabViewModel(selectedEntries, database, stateManager);
         initializeFromAndToComboBox();
 
-        viewModel.overwriteFieldContentProperty().bindBidirectional(overwriteFieldContentCheckBox.selectedProperty());
+        viewModel
+                .overwriteFieldContentProperty()
+                .bindBidirectional(overwriteFieldContentCheckBox.selectedProperty());
 
         moveContentButton.disableProperty().bind(viewModel.canMoveProperty().not());
         swapContentButton.disableProperty().bind(viewModel.canSwapProperty().not());
-        copyContentButton.disableProperty().bind(viewModel.toFieldValidationStatus().validProperty().not());
-        overwriteFieldContentCheckBox.disableProperty().bind(viewModel.toFieldValidationStatus().validProperty().not());
-
-        Platform.runLater(() -> {
-            visualizer.initVisualization(viewModel.toFieldValidationStatus(), toFieldComboBox, true);
-        });
+        copyContentButton
+                .disableProperty()
+                .bind(viewModel.toFieldValidationStatus().validProperty().not());
+        overwriteFieldContentCheckBox
+                .disableProperty()
+                .bind(viewModel.toFieldValidationStatus().validProperty().not());
+
+        Platform.runLater(
+                () -> {
+                    visualizer.initVisualization(
+                            viewModel.toFieldValidationStatus(), toFieldComboBox, true);
+                });
     }
 
     private void initializeFromAndToComboBox() {
@@ -83,8 +86,12 @@ private void initializeFromAndToComboBox() {
         fromFieldComboBox.valueProperty().bindBidirectional(viewModel.fromFieldProperty());
         toFieldComboBox.valueProperty().bindBidirectional(viewModel.toFieldProperty());
 
-        EasyBind.listen(fromFieldComboBox.getEditor().textProperty(), observable -> fromFieldComboBox.commitValue());
-        EasyBind.listen(toFieldComboBox.getEditor().textProperty(), observable -> toFieldComboBox.commitValue());
+        EasyBind.listen(
+                fromFieldComboBox.getEditor().textProperty(),
+                observable -> fromFieldComboBox.commitValue());
+        EasyBind.listen(
+                toFieldComboBox.getEditor().textProperty(),
+                observable -> toFieldComboBox.commitValue());
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTabViewModel.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTabViewModel.java
index 3ed3a1b38eea..4af7d60a40ef 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTabViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTabViewModel.java
@@ -1,7 +1,9 @@
 package org.jabref.gui.edit.automaticfiededitor.copyormovecontent;
 
-import java.util.ArrayList;
-import java.util.List;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.BooleanProperty;
@@ -21,14 +23,13 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
 
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
+import java.util.ArrayList;
+import java.util.List;
 
 public class CopyOrMoveFieldContentTabViewModel extends AbstractAutomaticFieldEditorTabViewModel {
     public static final int TAB_INDEX = 1;
-    private final ObjectProperty<Field> fromField = new SimpleObjectProperty<>(StandardField.ABSTRACT);
+    private final ObjectProperty<Field> fromField =
+            new SimpleObjectProperty<>(StandardField.ABSTRACT);
 
     private final ObjectProperty<Field> toField = new SimpleObjectProperty<>(StandardField.AUTHOR);
 
@@ -41,24 +42,31 @@ public class CopyOrMoveFieldContentTabViewModel extends AbstractAutomaticFieldEd
 
     private final BooleanBinding canSwap;
 
-    public CopyOrMoveFieldContentTabViewModel(List<BibEntry> selectedEntries, BibDatabase bibDatabase, StateManager stateManager) {
+    public CopyOrMoveFieldContentTabViewModel(
+            List<BibEntry> selectedEntries, BibDatabase bibDatabase, StateManager stateManager) {
         super(bibDatabase, stateManager);
         this.selectedEntries = new ArrayList<>(selectedEntries);
 
-        toFieldValidator = new FunctionBasedValidator<>(toField, field -> {
-            if (StringUtil.isBlank(field.getName())) {
-                return ValidationMessage.error("Field name cannot be empty");
-            } else if (StringUtil.containsWhitespace(field.getName())) {
-                return ValidationMessage.error("Field name cannot have whitespace characters");
-            }
-            return null;
-        });
-
-        canMove = BooleanBinding.booleanExpression(toFieldValidationStatus().validProperty())
-                                .and(overwriteFieldContentProperty());
-
-        canSwap = BooleanBinding.booleanExpression(toFieldValidationStatus().validProperty())
-                                .and(overwriteFieldContentProperty());
+        toFieldValidator =
+                new FunctionBasedValidator<>(
+                        toField,
+                        field -> {
+                            if (StringUtil.isBlank(field.getName())) {
+                                return ValidationMessage.error("Field name cannot be empty");
+                            } else if (StringUtil.containsWhitespace(field.getName())) {
+                                return ValidationMessage.error(
+                                        "Field name cannot have whitespace characters");
+                            }
+                            return null;
+                        });
+
+        canMove =
+                BooleanBinding.booleanExpression(toFieldValidationStatus().validProperty())
+                        .and(overwriteFieldContentProperty());
+
+        canSwap =
+                BooleanBinding.booleanExpression(toFieldValidationStatus().validProperty())
+                        .and(overwriteFieldContentProperty());
     }
 
     public ValidationStatus toFieldValidationStatus() {
@@ -107,10 +115,9 @@ public void copyValue() {
             if (overwriteFieldContent.get() || StringUtil.isBlank(toFieldValue)) {
                 if (StringUtil.isNotBlank(fromFieldValue)) {
                     entry.setField(toField.get(), fromFieldValue);
-                    copyFieldValueEdit.addEdit(new UndoableFieldChange(entry,
-                            toField.get(),
-                            toFieldValue,
-                            fromFieldValue));
+                    copyFieldValueEdit.addEdit(
+                            new UndoableFieldChange(
+                                    entry, toField.get(), toFieldValue, fromFieldValue));
                     affectedEntriesCount++;
                 }
             }
@@ -118,27 +125,26 @@ public void copyValue() {
         if (copyFieldValueEdit.hasEdits()) {
             copyFieldValueEdit.end();
         }
-        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
-                affectedEntriesCount, TAB_INDEX, copyFieldValueEdit
-        ));
+        stateManager.setLastAutomaticFieldEditorEdit(
+                new LastAutomaticFieldEditorEdit(
+                        affectedEntriesCount, TAB_INDEX, copyFieldValueEdit));
     }
 
     public void moveValue() {
         NamedCompound moveEdit = new NamedCompound("MOVE_EDIT");
         int affectedEntriesCount = 0;
         if (overwriteFieldContent.get()) {
-            affectedEntriesCount = new MoveFieldValueAction(fromField.get(),
-                    toField.get(),
-                    selectedEntries,
-                    moveEdit).executeAndGetAffectedEntriesCount();
+            affectedEntriesCount =
+                    new MoveFieldValueAction(
+                                    fromField.get(), toField.get(), selectedEntries, moveEdit)
+                            .executeAndGetAffectedEntriesCount();
 
             if (moveEdit.hasEdits()) {
                 moveEdit.end();
             }
         }
-        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
-                affectedEntriesCount, TAB_INDEX, moveEdit
-        ));
+        stateManager.setLastAutomaticFieldEditorEdit(
+                new LastAutomaticFieldEditorEdit(affectedEntriesCount, TAB_INDEX, moveEdit));
     }
 
     public void swapValues() {
@@ -148,23 +154,19 @@ public void swapValues() {
             String fromFieldValue = entry.getField(fromField.get()).orElse("");
             String toFieldValue = entry.getField(toField.get()).orElse("");
 
-            if (overwriteFieldContent.get() && StringUtil.isNotBlank(fromFieldValue) && StringUtil.isNotBlank(toFieldValue)) {
+            if (overwriteFieldContent.get()
+                    && StringUtil.isNotBlank(fromFieldValue)
+                    && StringUtil.isNotBlank(toFieldValue)) {
                 entry.setField(toField.get(), fromFieldValue);
                 entry.setField(fromField.get(), toFieldValue);
 
-                swapFieldValuesEdit.addEdit(new UndoableFieldChange(
-                        entry,
-                        toField.get(),
-                        toFieldValue,
-                        fromFieldValue
-                ));
-
-                swapFieldValuesEdit.addEdit(new UndoableFieldChange(
-                        entry,
-                        fromField.get(),
-                        fromFieldValue,
-                        toFieldValue
-                ));
+                swapFieldValuesEdit.addEdit(
+                        new UndoableFieldChange(
+                                entry, toField.get(), toFieldValue, fromFieldValue));
+
+                swapFieldValuesEdit.addEdit(
+                        new UndoableFieldChange(
+                                entry, fromField.get(), fromFieldValue, toFieldValue));
                 affectedEntriesCount++;
             }
         }
@@ -172,9 +174,9 @@ public void swapValues() {
         if (swapFieldValuesEdit.hasEdits()) {
             swapFieldValuesEdit.end();
         }
-        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
-                affectedEntriesCount, TAB_INDEX, swapFieldValuesEdit
-        ));
+        stateManager.setLastAutomaticFieldEditorEdit(
+                new LastAutomaticFieldEditorEdit(
+                        affectedEntriesCount, TAB_INDEX, swapFieldValuesEdit));
     }
 
     public List<BibEntry> getSelectedEntries() {
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentTabView.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentTabView.java
index 0c97b3f81e6c..e4fc20fe7a56 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentTabView.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentTabView.java
@@ -1,6 +1,11 @@
 package org.jabref.gui.edit.automaticfiededitor.editfieldcontent;
 
-import java.util.List;
+import static org.jabref.gui.util.FieldsUtil.FIELD_STRING_CONVERTER;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
 import javafx.application.Platform;
 import javafx.fxml.FXML;
@@ -16,24 +21,17 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-
-import static org.jabref.gui.util.FieldsUtil.FIELD_STRING_CONVERTER;
+import java.util.List;
 
 public class EditFieldContentTabView extends AbstractAutomaticFieldEditorTabView {
     public Button appendValueButton;
     public Button clearFieldButton;
     public Button setValueButton;
-    @FXML
-    private ComboBox<Field> fieldComboBox;
+    @FXML private ComboBox<Field> fieldComboBox;
 
-    @FXML
-    private TextField fieldValueTextField;
+    @FXML private TextField fieldValueTextField;
 
-    @FXML
-    private CheckBox overwriteFieldContentCheckBox;
+    @FXML private CheckBox overwriteFieldContentCheckBox;
 
     private final List<BibEntry> selectedEntries;
     private final BibDatabase database;
@@ -49,9 +47,7 @@ public EditFieldContentTabView(BibDatabase database, StateManager stateManager)
         this.database = database;
         this.stateManager = stateManager;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @FXML
@@ -64,18 +60,31 @@ public void initialize() {
         fieldComboBox.getSelectionModel().selectFirst();
 
         fieldComboBox.valueProperty().bindBidirectional(viewModel.selectedFieldProperty());
-        EasyBind.listen(fieldComboBox.getEditor().textProperty(), observable -> fieldComboBox.commitValue());
+        EasyBind.listen(
+                fieldComboBox.getEditor().textProperty(),
+                observable -> fieldComboBox.commitValue());
 
         fieldValueTextField.textProperty().bindBidirectional(viewModel.fieldValueProperty());
 
-        overwriteFieldContentCheckBox.selectedProperty().bindBidirectional(viewModel.overwriteFieldContentProperty());
+        overwriteFieldContentCheckBox
+                .selectedProperty()
+                .bindBidirectional(viewModel.overwriteFieldContentProperty());
 
         appendValueButton.disableProperty().bind(viewModel.canAppendProperty().not());
-        setValueButton.disableProperty().bind(viewModel.fieldValidationStatus().validProperty().not());
-        clearFieldButton.disableProperty().bind(viewModel.fieldValidationStatus().validProperty().not());
-        overwriteFieldContentCheckBox.disableProperty().bind(viewModel.fieldValidationStatus().validProperty().not());
-
-        Platform.runLater(() -> visualizer.initVisualization(viewModel.fieldValidationStatus(), fieldComboBox, true));
+        setValueButton
+                .disableProperty()
+                .bind(viewModel.fieldValidationStatus().validProperty().not());
+        clearFieldButton
+                .disableProperty()
+                .bind(viewModel.fieldValidationStatus().validProperty().not());
+        overwriteFieldContentCheckBox
+                .disableProperty()
+                .bind(viewModel.fieldValidationStatus().validProperty().not());
+
+        Platform.runLater(
+                () ->
+                        visualizer.initVisualization(
+                                viewModel.fieldValidationStatus(), fieldComboBox, true));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentViewModel.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentViewModel.java
index 933e1d4f87bf..0aa69b3982cb 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentViewModel.java
@@ -1,8 +1,9 @@
 package org.jabref.gui.edit.automaticfiededitor.editfieldcontent;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -24,10 +25,9 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
 
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 
 public class EditFieldContentViewModel extends AbstractAutomaticFieldEditorTabViewModel {
     public static final int TAB_INDEX = 0;
@@ -36,27 +36,35 @@ public class EditFieldContentViewModel extends AbstractAutomaticFieldEditorTabVi
 
     private final StringProperty fieldValue = new SimpleStringProperty("");
 
-    private final ObjectProperty<Field> selectedField = new SimpleObjectProperty<>(StandardField.AUTHOR);
+    private final ObjectProperty<Field> selectedField =
+            new SimpleObjectProperty<>(StandardField.AUTHOR);
 
     private final BooleanProperty overwriteFieldContent = new SimpleBooleanProperty(Boolean.FALSE);
 
     private final Validator fieldValidator;
     private final BooleanBinding canAppend;
 
-    public EditFieldContentViewModel(BibDatabase database, List<BibEntry> selectedEntries, StateManager stateManager) {
+    public EditFieldContentViewModel(
+            BibDatabase database, List<BibEntry> selectedEntries, StateManager stateManager) {
         super(database, stateManager);
         this.selectedEntries = new ArrayList<>(selectedEntries);
 
-        fieldValidator = new FunctionBasedValidator<>(selectedField, field -> {
-            if (StringUtil.isBlank(field.getName())) {
-                return ValidationMessage.error("Field name cannot be empty");
-            } else if (StringUtil.containsWhitespace(field.getName())) {
-                return ValidationMessage.error("Field name cannot have whitespace characters");
-            }
-            return null;
-        });
-
-        canAppend = Bindings.and(overwriteFieldContentProperty(), fieldValidationStatus().validProperty());
+        fieldValidator =
+                new FunctionBasedValidator<>(
+                        selectedField,
+                        field -> {
+                            if (StringUtil.isBlank(field.getName())) {
+                                return ValidationMessage.error("Field name cannot be empty");
+                            } else if (StringUtil.containsWhitespace(field.getName())) {
+                                return ValidationMessage.error(
+                                        "Field name cannot have whitespace characters");
+                            }
+                            return null;
+                        });
+
+        canAppend =
+                Bindings.and(
+                        overwriteFieldContentProperty(), fieldValidationStatus().validProperty());
     }
 
     public ValidationStatus fieldValidationStatus() {
@@ -74,7 +82,10 @@ public void clearSelectedField() {
             Optional<String> oldFieldValue = entry.getField(selectedField.get());
             if (oldFieldValue.isPresent()) {
                 entry.clearField(selectedField.get())
-                        .ifPresent(fieldChange -> clearFieldEdit.addEdit(new UndoableFieldChange(fieldChange)));
+                        .ifPresent(
+                                fieldChange ->
+                                        clearFieldEdit.addEdit(
+                                                new UndoableFieldChange(fieldChange)));
                 affectedEntriesCount++;
             }
         }
@@ -82,11 +93,8 @@ public void clearSelectedField() {
         if (clearFieldEdit.hasEdits()) {
             clearFieldEdit.end();
         }
-        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
-                affectedEntriesCount,
-                TAB_INDEX,
-                clearFieldEdit
-        ));
+        stateManager.setLastAutomaticFieldEditorEdit(
+                new LastAutomaticFieldEditorEdit(affectedEntriesCount, TAB_INDEX, clearFieldEdit));
     }
 
     public void setFieldValue() {
@@ -97,7 +105,9 @@ public void setFieldValue() {
             Optional<String> oldFieldValue = entry.getField(selectedField.get());
             if (oldFieldValue.isEmpty() || overwriteFieldContent.get()) {
                 entry.setField(selectedField.get(), toSetFieldValue)
-                     .ifPresent(fieldChange -> setFieldEdit.addEdit(new UndoableFieldChange(fieldChange)));
+                        .ifPresent(
+                                fieldChange ->
+                                        setFieldEdit.addEdit(new UndoableFieldChange(fieldChange)));
                 fieldValue.set("");
                 // TODO: increment affected entries only when UndoableFieldChange.isPresent()
                 affectedEntriesCount++;
@@ -107,11 +117,8 @@ public void setFieldValue() {
         if (setFieldEdit.hasEdits()) {
             setFieldEdit.end();
         }
-        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
-                affectedEntriesCount,
-                TAB_INDEX,
-                setFieldEdit
-        ));
+        stateManager.setLastAutomaticFieldEditorEdit(
+                new LastAutomaticFieldEditorEdit(affectedEntriesCount, TAB_INDEX, setFieldEdit));
     }
 
     public void appendToFieldValue() {
@@ -125,7 +132,10 @@ public void appendToFieldValue() {
                 String newFieldValue = oldFieldValue.orElse("").concat(toAppendFieldValue);
 
                 entry.setField(selectedField.get(), newFieldValue)
-                        .ifPresent(fieldChange -> appendToFieldEdit.addEdit(new UndoableFieldChange(fieldChange)));
+                        .ifPresent(
+                                fieldChange ->
+                                        appendToFieldEdit.addEdit(
+                                                new UndoableFieldChange(fieldChange)));
 
                 fieldValue.set("");
                 affectedEntriesCount++;
@@ -135,11 +145,9 @@ public void appendToFieldValue() {
         if (appendToFieldEdit.hasEdits()) {
             appendToFieldEdit.end();
         }
-        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
-                affectedEntriesCount,
-                TAB_INDEX,
-                appendToFieldEdit
-        ));
+        stateManager.setLastAutomaticFieldEditorEdit(
+                new LastAutomaticFieldEditorEdit(
+                        affectedEntriesCount, TAB_INDEX, appendToFieldEdit));
     }
 
     public ObjectProperty<Field> selectedFieldProperty() {
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldTabView.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldTabView.java
index fc111cecc463..2fe40e7ff78d 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldTabView.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldTabView.java
@@ -1,6 +1,11 @@
 package org.jabref.gui.edit.automaticfiededitor.renamefield;
 
-import java.util.List;
+import static org.jabref.gui.util.FieldsUtil.FIELD_STRING_CONVERTER;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
 import javafx.application.Platform;
 import javafx.fxml.FXML;
@@ -16,19 +21,13 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-
-import static org.jabref.gui.util.FieldsUtil.FIELD_STRING_CONVERTER;
+import java.util.List;
 
-public class RenameFieldTabView extends AbstractAutomaticFieldEditorTabView implements AutomaticFieldEditorTab {
-    @FXML
-    private Button renameButton;
-    @FXML
-    private ComboBox<Field> fieldComboBox;
-    @FXML
-    private TextField newFieldNameTextField;
+public class RenameFieldTabView extends AbstractAutomaticFieldEditorTabView
+        implements AutomaticFieldEditorTab {
+    @FXML private Button renameButton;
+    @FXML private ComboBox<Field> fieldComboBox;
+    @FXML private TextField newFieldNameTextField;
     private final List<BibEntry> selectedEntries;
     private final BibDatabase database;
     private final StateManager stateManager;
@@ -41,9 +40,7 @@ public RenameFieldTabView(BibDatabase database, StateManager stateManager) {
         this.database = database;
         this.stateManager = stateManager;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @FXML
@@ -56,15 +53,19 @@ public void initialize() {
         fieldComboBox.setConverter(FIELD_STRING_CONVERTER);
 
         fieldComboBox.valueProperty().bindBidirectional(viewModel.selectedFieldProperty());
-        EasyBind.listen(fieldComboBox.getEditor().textProperty(), observable -> fieldComboBox.commitValue());
+        EasyBind.listen(
+                fieldComboBox.getEditor().textProperty(),
+                observable -> fieldComboBox.commitValue());
 
         renameButton.disableProperty().bind(viewModel.canRenameProperty().not());
 
         newFieldNameTextField.textProperty().bindBidirectional(viewModel.newFieldNameProperty());
 
-        Platform.runLater(() -> {
-            visualizer.initVisualization(viewModel.fieldNameValidationStatus(), newFieldNameTextField, true);
-        });
+        Platform.runLater(
+                () -> {
+                    visualizer.initVisualization(
+                            viewModel.fieldNameValidationStatus(), newFieldNameTextField, true);
+                });
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldViewModel.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldViewModel.java
index 6f22623d4669..9e7f942413f8 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldViewModel.java
@@ -1,6 +1,9 @@
 package org.jabref.gui.edit.automaticfiededitor.renamefield;
 
-import java.util.List;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -21,15 +24,13 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
 
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
+import java.util.List;
 
 public class RenameFieldViewModel extends AbstractAutomaticFieldEditorTabViewModel {
     public static final int TAB_INDEX = 2;
     private final StringProperty newFieldName = new SimpleStringProperty("");
-    private final ObjectProperty<Field> selectedField = new SimpleObjectProperty<>(StandardField.AUTHOR);
+    private final ObjectProperty<Field> selectedField =
+            new SimpleObjectProperty<>(StandardField.AUTHOR);
     private final List<BibEntry> selectedEntries;
 
     private final Validator fieldValidator;
@@ -38,22 +39,33 @@ public class RenameFieldViewModel extends AbstractAutomaticFieldEditorTabViewMod
 
     private final BooleanBinding canRename;
 
-    public RenameFieldViewModel(List<BibEntry> selectedEntries, BibDatabase database, StateManager stateManager) {
+    public RenameFieldViewModel(
+            List<BibEntry> selectedEntries, BibDatabase database, StateManager stateManager) {
         super(database, stateManager);
         this.selectedEntries = selectedEntries;
 
-        fieldValidator = new FunctionBasedValidator<>(selectedField, field -> StringUtil.isNotBlank(field.getName()),
-                ValidationMessage.error("Field cannot be empty"));
-        fieldNameValidator = new FunctionBasedValidator<>(newFieldName, fieldName -> {
-            if (StringUtil.isBlank(fieldName)) {
-                return ValidationMessage.error("Field name cannot be empty");
-            } else if (StringUtil.containsWhitespace(fieldName)) {
-                return ValidationMessage.error("Field name cannot have whitespace characters");
-            }
-            return null;
-        });
-
-        canRename = Bindings.and(fieldValidationStatus().validProperty(), fieldNameValidationStatus().validProperty());
+        fieldValidator =
+                new FunctionBasedValidator<>(
+                        selectedField,
+                        field -> StringUtil.isNotBlank(field.getName()),
+                        ValidationMessage.error("Field cannot be empty"));
+        fieldNameValidator =
+                new FunctionBasedValidator<>(
+                        newFieldName,
+                        fieldName -> {
+                            if (StringUtil.isBlank(fieldName)) {
+                                return ValidationMessage.error("Field name cannot be empty");
+                            } else if (StringUtil.containsWhitespace(fieldName)) {
+                                return ValidationMessage.error(
+                                        "Field name cannot have whitespace characters");
+                            }
+                            return null;
+                        });
+
+        canRename =
+                Bindings.and(
+                        fieldValidationStatus().validProperty(),
+                        fieldNameValidationStatus().validProperty());
     }
 
     public ValidationStatus fieldValidationStatus() {
@@ -96,19 +108,21 @@ public void renameField() {
         NamedCompound renameEdit = new NamedCompound("RENAME_EDIT");
         int affectedEntriesCount = 0;
         if (fieldNameValidationStatus().isValid()) {
-            affectedEntriesCount = new MoveFieldValueAction(selectedField.get(),
-                    FieldFactory.parseField(newFieldName.get()),
-                    selectedEntries,
-                    renameEdit,
-                    false).executeAndGetAffectedEntriesCount();
+            affectedEntriesCount =
+                    new MoveFieldValueAction(
+                                    selectedField.get(),
+                                    FieldFactory.parseField(newFieldName.get()),
+                                    selectedEntries,
+                                    renameEdit,
+                                    false)
+                            .executeAndGetAffectedEntriesCount();
 
             if (renameEdit.hasEdits()) {
                 renameEdit.end();
             }
         }
 
-        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
-                affectedEntriesCount, TAB_INDEX, renameEdit
-        ));
+        stateManager.setLastAutomaticFieldEditorEdit(
+                new LastAutomaticFieldEditorEdit(affectedEntriesCount, TAB_INDEX, renameEdit));
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/AiChatTab.java b/src/main/java/org/jabref/gui/entryeditor/AiChatTab.java
index 95e2b7bf102a..dfb79318768a 100644
--- a/src/main/java/org/jabref/gui/entryeditor/AiChatTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/AiChatTab.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.entryeditor;
 
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
@@ -28,6 +23,11 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
 public class AiChatTab extends EntryEditorTab {
     private final BibDatabaseContext bibDatabaseContext;
     private final AiService aiService;
@@ -41,13 +41,13 @@ public class AiChatTab extends EntryEditorTab {
 
     private Optional<BibEntry> previousBibEntry = Optional.empty();
 
-    public AiChatTab(BibDatabaseContext bibDatabaseContext,
-                     AiService aiService,
-                     ChatHistoryService chatHistoryService,
-                     DialogService dialogService,
-                     GuiPreferences preferences,
-                     TaskExecutor taskExecutor
-    ) {
+    public AiChatTab(
+            BibDatabaseContext bibDatabaseContext,
+            AiService aiService,
+            ChatHistoryService chatHistoryService,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            TaskExecutor taskExecutor) {
         this.bibDatabaseContext = bibDatabaseContext;
 
         this.aiService = aiService;
@@ -58,12 +58,15 @@ public AiChatTab(BibDatabaseContext bibDatabaseContext,
         this.externalApplicationsPreferences = preferences.getExternalApplicationsPreferences();
         this.entryEditorPreferences = preferences.getEntryEditorPreferences();
 
-        this.citationKeyGenerator = new CitationKeyGenerator(bibDatabaseContext, preferences.getCitationKeyPatternPreferences());
+        this.citationKeyGenerator =
+                new CitationKeyGenerator(
+                        bibDatabaseContext, preferences.getCitationKeyPatternPreferences());
 
         this.taskExecutor = taskExecutor;
 
         setText(Localization.lang("AI chat"));
-        setTooltip(new Tooltip(Localization.lang("Chat with AI about content of attached file(s)")));
+        setTooltip(
+                new Tooltip(Localization.lang("Chat with AI about content of attached file(s)")));
     }
 
     @Override
@@ -76,14 +79,18 @@ public boolean shouldShow(BibEntry entry) {
      */
     @Override
     protected void bindToEntry(BibEntry entry) {
-        previousBibEntry.ifPresent(previousBibEntry -> chatHistoryService.closeChatHistoryForEntry(previousBibEntry));
+        previousBibEntry.ifPresent(
+                previousBibEntry -> chatHistoryService.closeChatHistoryForEntry(previousBibEntry));
         previousBibEntry = Optional.of(entry);
 
         if (!aiPreferences.getEnableAi()) {
             showPrivacyNotice(entry);
         } else if (entry.getFiles().isEmpty()) {
             showErrorNoFiles();
-        } else if (entry.getFiles().stream().map(LinkedFile::getLink).map(Path::of).noneMatch(FileUtil::isPDFFile)) {
+        } else if (entry.getFiles().stream()
+                .map(LinkedFile::getLink)
+                .map(Path::of)
+                .noneMatch(FileUtil::isPDFFile)) {
             showErrorNotPdfs();
         } else if (!CitationKeyCheck.citationKeyIsPresentAndUnique(bibDatabaseContext, entry)) {
             tryToGenerateCitationKeyThenBind(entry);
@@ -93,25 +100,27 @@ protected void bindToEntry(BibEntry entry) {
     }
 
     private void showPrivacyNotice(BibEntry entry) {
-        setContent(new PrivacyNoticeComponent(aiPreferences, () -> bindToEntry(entry), externalApplicationsPreferences, dialogService));
+        setContent(
+                new PrivacyNoticeComponent(
+                        aiPreferences,
+                        () -> bindToEntry(entry),
+                        externalApplicationsPreferences,
+                        dialogService));
     }
 
     private void showErrorNotPdfs() {
         setContent(
                 new ErrorStateComponent(
                         Localization.lang("Unable to chat"),
-                        Localization.lang("Only PDF files are supported.")
-                )
-        );
+                        Localization.lang("Only PDF files are supported.")));
     }
 
     private void showErrorNoFiles() {
         setContent(
                 new ErrorStateComponent(
                         Localization.lang("Unable to chat"),
-                        Localization.lang("Please attach at least one PDF file to enable chatting with PDF file(s).")
-                )
-        );
+                        Localization.lang(
+                                "Please attach at least one PDF file to enable chatting with PDF file(s).")));
     }
 
     private void tryToGenerateCitationKeyThenBind(BibEntry entry) {
@@ -119,30 +128,34 @@ private void tryToGenerateCitationKeyThenBind(BibEntry entry) {
             setContent(
                     new ErrorStateComponent(
                             Localization.lang("Unable to chat"),
-                            Localization.lang("Please provide a non-empty and unique citation key for this entry.")
-                    )
-            );
+                            Localization.lang(
+                                    "Please provide a non-empty and unique citation key for this entry.")));
         } else {
             bindToEntry(entry);
         }
     }
 
     private void bindToCorrectEntry(BibEntry entry) {
-        // We omit the localization here, because it is only a chat with one entry in the {@link EntryEditor}.
+        // We omit the localization here, because it is only a chat with one entry in the {@link
+        // EntryEditor}.
         // See documentation for {@link AiChatGuardedComponent#name}.
-        StringProperty chatName = new SimpleStringProperty("entry " + entry.getCitationKey().orElse("<no citation key>"));
-        entry.getCiteKeyBinding().addListener((observable, oldValue, newValue) -> chatName.setValue("entry " + newValue));
-
-        setContent(new AiChatGuardedComponent(
-                chatName,
-                chatHistoryService.getChatHistoryForEntry(entry),
-                bibDatabaseContext,
-                FXCollections.observableArrayList(new ArrayList<>(List.of(entry))),
-                aiService,
-                dialogService,
-                aiPreferences,
-                externalApplicationsPreferences,
-                taskExecutor
-        ));
+        StringProperty chatName =
+                new SimpleStringProperty(
+                        "entry " + entry.getCitationKey().orElse("<no citation key>"));
+        entry.getCiteKeyBinding()
+                .addListener(
+                        (observable, oldValue, newValue) -> chatName.setValue("entry " + newValue));
+
+        setContent(
+                new AiChatGuardedComponent(
+                        chatName,
+                        chatHistoryService.getChatHistoryForEntry(entry),
+                        bibDatabaseContext,
+                        FXCollections.observableArrayList(new ArrayList<>(List.of(entry))),
+                        aiService,
+                        dialogService,
+                        aiPreferences,
+                        externalApplicationsPreferences,
+                        taskExecutor));
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/AiSummaryTab.java b/src/main/java/org/jabref/gui/entryeditor/AiSummaryTab.java
index 6e77c34270fc..7272b76db3fd 100644
--- a/src/main/java/org/jabref/gui/entryeditor/AiSummaryTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/AiSummaryTab.java
@@ -22,11 +22,11 @@ public class AiSummaryTab extends EntryEditorTab {
     private final CitationKeyPatternPreferences citationKeyPatternPreferences;
     private final EntryEditorPreferences entryEditorPreferences;
 
-    public AiSummaryTab(BibDatabaseContext bibDatabaseContext,
-                        AiService aiService,
-                        DialogService dialogService,
-                        GuiPreferences preferences
-    ) {
+    public AiSummaryTab(
+            BibDatabaseContext bibDatabaseContext,
+            AiService aiService,
+            DialogService dialogService,
+            GuiPreferences preferences) {
         this.bibDatabaseContext = bibDatabaseContext;
 
         this.aiService = aiService;
@@ -51,14 +51,14 @@ public boolean shouldShow(BibEntry entry) {
      */
     @Override
     protected void bindToEntry(BibEntry entry) {
-        setContent(new SummaryComponent(
-                bibDatabaseContext,
-                entry,
-                aiService,
-                aiPreferences,
-                externalApplicationsPreferences,
-                citationKeyPatternPreferences,
-                dialogService
-        ));
+        setContent(
+                new SummaryComponent(
+                        bibDatabaseContext,
+                        entry,
+                        aiService,
+                        aiPreferences,
+                        externalApplicationsPreferences,
+                        citationKeyPatternPreferences,
+                        dialogService));
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
index 428052847bf5..f37b22f99e56 100644
--- a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
@@ -1,15 +1,5 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.Comparator;
-import java.util.LinkedHashSet;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
-import java.util.SequencedSet;
-import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.collections.ObservableList;
 import javafx.geometry.VPos;
 import javafx.scene.control.Button;
@@ -37,6 +27,16 @@
 import org.jabref.model.entry.field.UserSpecificCommentField;
 import org.jabref.model.search.SearchQuery;
 
+import java.util.Comparator;
+import java.util.LinkedHashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.SequencedSet;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
+
 public class CommentsTab extends FieldsEditorTab {
     public static final String NAME = "Comments";
 
@@ -45,18 +45,19 @@ public class CommentsTab extends FieldsEditorTab {
 
     private final EntryEditorPreferences entryEditorPreferences;
 
-    public CommentsTab(GuiPreferences preferences,
-                       BibDatabaseContext databaseContext,
-                       SuggestionProviders suggestionProviders,
-                       UndoManager undoManager,
-                       UndoAction undoAction,
-                       RedoAction redoAction,
-                       DialogService dialogService,
-                       ThemeManager themeManager,
-                       TaskExecutor taskExecutor,
-                       JournalAbbreviationRepository journalAbbreviationRepository,
-                       LuceneManager luceneManager,
-                       OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+    public CommentsTab(
+            GuiPreferences preferences,
+            BibDatabaseContext databaseContext,
+            SuggestionProviders suggestionProviders,
+            UndoManager undoManager,
+            UndoAction undoAction,
+            RedoAction redoAction,
+            DialogService dialogService,
+            ThemeManager themeManager,
+            TaskExecutor taskExecutor,
+            JournalAbbreviationRepository journalAbbreviationRepository,
+            LuceneManager luceneManager,
+            OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         super(
                 false,
                 databaseContext,
@@ -70,9 +71,13 @@ public CommentsTab(GuiPreferences preferences,
                 taskExecutor,
                 journalAbbreviationRepository,
                 luceneManager,
-                searchQueryProperty
-        );
-        this.defaultOwner = preferences.getOwnerPreferences().getDefaultOwner().toLowerCase(Locale.ROOT).replaceAll("[^a-z0-9]", "-");
+                searchQueryProperty);
+        this.defaultOwner =
+                preferences
+                        .getOwnerPreferences()
+                        .getDefaultOwner()
+                        .toLowerCase(Locale.ROOT)
+                        .replaceAll("[^a-z0-9]", "-");
         setText(Localization.lang("Comments"));
         setGraphic(IconTheme.JabRefIcons.COMMENT.getGraphicNode());
 
@@ -88,16 +93,23 @@ protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
         comments.add(StandardField.COMMENT);
 
         // Also show comment field of the current user (if enabled in the preferences)
-        if (entry.hasField(userSpecificCommentField) || entryEditorPreferences.shouldShowUserCommentsFields()) {
+        if (entry.hasField(userSpecificCommentField)
+                || entryEditorPreferences.shouldShowUserCommentsFields()) {
             comments.add(userSpecificCommentField);
         }
 
         // Show all non-empty comment fields (otherwise, they are completely hidden)
-        comments.addAll(entry.getFields().stream()
-                .filter(field -> (field instanceof UserSpecificCommentField && !field.equals(userSpecificCommentField))
-                        || field.getName().toLowerCase().contains("comment"))
-                .sorted(Comparator.comparing(Field::getName))
-                .collect(Collectors.toCollection(LinkedHashSet::new)));
+        comments.addAll(
+                entry.getFields().stream()
+                        .filter(
+                                field ->
+                                        (field instanceof UserSpecificCommentField
+                                                        && !field.equals(userSpecificCommentField))
+                                                || field.getName()
+                                                        .toLowerCase()
+                                                        .contains("comment"))
+                        .sorted(Comparator.comparing(Field::getName))
+                        .collect(Collectors.toCollection(LinkedHashSet::new)));
         return comments;
     }
 
@@ -132,7 +144,11 @@ private void setCompressedRowLayout() {
     protected void setupPanel(BibEntry entry, boolean compressed) {
         super.setupPanel(entry, compressed);
 
-        Optional<FieldEditorFX> fieldEditorForUserDefinedComment = editors.entrySet().stream().filter(f -> f.getKey().getName().contains(defaultOwner)).map(Map.Entry::getValue).findFirst();
+        Optional<FieldEditorFX> fieldEditorForUserDefinedComment =
+                editors.entrySet().stream()
+                        .filter(f -> f.getKey().getName().contains(defaultOwner))
+                        .map(Map.Entry::getValue)
+                        .findFirst();
         for (Map.Entry<Field, FieldEditorFX> fieldEditorEntry : editors.entrySet()) {
             Field field = fieldEditorEntry.getKey();
             FieldEditorFX editor = fieldEditorEntry.getValue();
@@ -143,19 +159,34 @@ protected void setupPanel(BibEntry entry, boolean compressed) {
             editor.getNode().setDisable(!shouldBeEnabled);
         }
 
-        // Show "Hide" button only if user-specific comment field is empty. Otherwise, it is a strange UI, because the
+        // Show "Hide" button only if user-specific comment field is empty. Otherwise, it is a
+        // strange UI, because the
         // button would just disappear and no change **in the current** editor would be made
-        if (entryEditorPreferences.shouldShowUserCommentsFields() && !entry.hasField(userSpecificCommentField)) {
-            Button hideDefaultOwnerCommentButton = new Button(Localization.lang("Hide user comments"));
-            hideDefaultOwnerCommentButton.setOnAction(e -> {
-                var labelForField = gridPane.getChildren().stream().filter(s -> s instanceof FieldNameLabel).filter(x -> ((FieldNameLabel) x).getText().equals(userSpecificCommentField.getDisplayName())).findFirst();
-                labelForField.ifPresent(label -> gridPane.getChildren().remove(label));
-                fieldEditorForUserDefinedComment.ifPresent(f -> gridPane.getChildren().remove(f.getNode()));
-                editors.remove(userSpecificCommentField);
-
-                entryEditorPreferences.setShowUserCommentsFields(false);
-                setupPanel(entry, false);
-            });
+        if (entryEditorPreferences.shouldShowUserCommentsFields()
+                && !entry.hasField(userSpecificCommentField)) {
+            Button hideDefaultOwnerCommentButton =
+                    new Button(Localization.lang("Hide user comments"));
+            hideDefaultOwnerCommentButton.setOnAction(
+                    e -> {
+                        var labelForField =
+                                gridPane.getChildren().stream()
+                                        .filter(s -> s instanceof FieldNameLabel)
+                                        .filter(
+                                                x ->
+                                                        ((FieldNameLabel) x)
+                                                                .getText()
+                                                                .equals(
+                                                                        userSpecificCommentField
+                                                                                .getDisplayName()))
+                                        .findFirst();
+                        labelForField.ifPresent(label -> gridPane.getChildren().remove(label));
+                        fieldEditorForUserDefinedComment.ifPresent(
+                                f -> gridPane.getChildren().remove(f.getNode()));
+                        editors.remove(userSpecificCommentField);
+
+                        entryEditorPreferences.setShowUserCommentsFields(false);
+                        setupPanel(entry, false);
+                    });
             gridPane.add(hideDefaultOwnerCommentButton, 1, gridPane.getRowCount(), 2, 1);
             setCompressedRowLayout();
         }
diff --git a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
index 45248e89dfe0..dd1f417ce077 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
@@ -1,11 +1,6 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.LinkedHashSet;
-import java.util.Optional;
-import java.util.SequencedSet;
-import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.scene.control.Tooltip;
 
@@ -29,37 +24,64 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.search.SearchQuery;
 
-import com.tobiasdiez.easybind.EasyBind;
+import java.util.LinkedHashSet;
+import java.util.Optional;
+import java.util.SequencedSet;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
 
 public class DeprecatedFieldsTab extends FieldsEditorTab {
 
     public static final String NAME = "Deprecated fields";
     private final BibEntryTypesManager entryTypesManager;
 
-    public DeprecatedFieldsTab(BibDatabaseContext databaseContext,
-                               SuggestionProviders suggestionProviders,
-                               UndoManager undoManager,
-                               UndoAction undoAction,
-                               RedoAction redoAction,
-                               DialogService dialogService,
-                               GuiPreferences preferences,
-                               ThemeManager themeManager,
-                               BibEntryTypesManager entryTypesManager,
-                               TaskExecutor taskExecutor,
-                               JournalAbbreviationRepository journalAbbreviationRepository,
-                               LuceneManager luceneManager,
-                               OptionalObjectProperty<SearchQuery> searchQueryProperty) {
-        super(false, databaseContext, suggestionProviders, undoManager, undoAction, redoAction, dialogService, preferences, themeManager, taskExecutor, journalAbbreviationRepository, luceneManager, searchQueryProperty);
+    public DeprecatedFieldsTab(
+            BibDatabaseContext databaseContext,
+            SuggestionProviders suggestionProviders,
+            UndoManager undoManager,
+            UndoAction undoAction,
+            RedoAction redoAction,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            ThemeManager themeManager,
+            BibEntryTypesManager entryTypesManager,
+            TaskExecutor taskExecutor,
+            JournalAbbreviationRepository journalAbbreviationRepository,
+            LuceneManager luceneManager,
+            OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+        super(
+                false,
+                databaseContext,
+                suggestionProviders,
+                undoManager,
+                undoAction,
+                redoAction,
+                dialogService,
+                preferences,
+                themeManager,
+                taskExecutor,
+                journalAbbreviationRepository,
+                luceneManager,
+                searchQueryProperty);
         this.entryTypesManager = entryTypesManager;
 
         setText(Localization.lang("Deprecated fields"));
-        EasyBind.subscribe(preferences.getWorkspacePreferences().showAdvancedHintsProperty(), advancedHints -> {
-            if (advancedHints) {
-                setTooltip(new Tooltip(Localization.lang("Shows fields having a successor in biblatex.\nFor instance, the publication month should be part of the date field.\nUse the Cleanup Entries functionality to convert the entry to biblatex.")));
-            } else {
-                setTooltip(new Tooltip(Localization.lang("Shows fields having a successor in biblatex.")));
-            }
-        });
+        EasyBind.subscribe(
+                preferences.getWorkspacePreferences().showAdvancedHintsProperty(),
+                advancedHints -> {
+                    if (advancedHints) {
+                        setTooltip(
+                                new Tooltip(
+                                        Localization.lang(
+                                                "Shows fields having a successor in biblatex.\nFor instance, the publication month should be part of the date field.\nUse the Cleanup Entries functionality to convert the entry to biblatex.")));
+                    } else {
+                        setTooltip(
+                                new Tooltip(
+                                        Localization.lang(
+                                                "Shows fields having a successor in biblatex.")));
+                    }
+                });
         setGraphic(IconTheme.JabRefIcons.OPTIONAL.getGraphicNode());
     }
 
@@ -68,7 +90,9 @@ protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
         BibDatabaseMode mode = databaseContext.getMode();
         Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), mode);
         if (entryType.isPresent()) {
-            return entryType.get().getDeprecatedFields(mode).stream().filter(field -> entry.getField(field).isPresent()).collect(Collectors.toCollection(LinkedHashSet::new));
+            return entryType.get().getDeprecatedFields(mode).stream()
+                    .filter(field -> entry.getField(field).isPresent())
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
         } else {
             // Entry type unknown -> treat all fields as required (thus no optional fields)
             return new LinkedHashSet<>();
diff --git a/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java
index 4458d80a405d..5e25f7244bd2 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DetailOptionalFieldsTab.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.entryeditor;
 
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.preferences.GuiPreferences;
@@ -17,23 +15,26 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.search.SearchQuery;
 
+import javax.swing.undo.UndoManager;
+
 public class DetailOptionalFieldsTab extends OptionalFieldsTabBase {
 
     public static final String NAME = "Optional fields 2";
 
-    public DetailOptionalFieldsTab(BibDatabaseContext databaseContext,
-                                   SuggestionProviders suggestionProviders,
-                                   UndoManager undoManager,
-                                   UndoAction undoAction,
-                                   RedoAction redoAction,
-                                   DialogService dialogService,
-                                   GuiPreferences preferences,
-                                   ThemeManager themeManager,
-                                   BibEntryTypesManager entryTypesManager,
-                                   TaskExecutor taskExecutor,
-                                   JournalAbbreviationRepository journalAbbreviationRepository,
-                                   LuceneManager luceneManager,
-                                   OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+    public DetailOptionalFieldsTab(
+            BibDatabaseContext databaseContext,
+            SuggestionProviders suggestionProviders,
+            UndoManager undoManager,
+            UndoAction undoAction,
+            RedoAction redoAction,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            ThemeManager themeManager,
+            BibEntryTypesManager entryTypesManager,
+            TaskExecutor taskExecutor,
+            JournalAbbreviationRepository journalAbbreviationRepository,
+            LuceneManager luceneManager,
+            OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         super(
                 Localization.lang("Optional fields 2"),
                 false,
@@ -49,7 +50,6 @@ public DetailOptionalFieldsTab(BibDatabaseContext databaseContext,
                 taskExecutor,
                 journalAbbreviationRepository,
                 luceneManager,
-                searchQueryProperty
-        );
+                searchQueryProperty);
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 88c282366f28..ad539a224b59 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -1,18 +1,10 @@
 package org.jabref.gui.entryeditor;
 
-import java.io.File;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.stream.Collectors;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.Subscription;
+
+import jakarta.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.geometry.Side;
@@ -64,14 +56,23 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.util.DirectoryMonitorManager;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.Subscription;
-import jakarta.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.stream.Collectors;
+
 /**
  * GUI component that allows editing of the fields of a BibEntry (i.e. the one that shows up, when you double click on
  * an entry in the table)
@@ -131,28 +132,38 @@ public EntryEditor(LibraryTab libraryTab, UndoAction undoAction, RedoAction redo
         this.undoAction = undoAction;
         this.redoAction = redoAction;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
 
         this.entryEditorPreferences = preferences.getEntryEditorPreferences();
-        this.fileLinker = new ExternalFilesEntryLinker(preferences.getExternalApplicationsPreferences(), preferences.getFilePreferences(), databaseContext, dialogService);
+        this.fileLinker =
+                new ExternalFilesEntryLinker(
+                        preferences.getExternalApplicationsPreferences(),
+                        preferences.getFilePreferences(),
+                        databaseContext,
+                        dialogService);
 
         setupKeyBindings();
 
         this.allPossibleTabs = createTabs();
-        this.previewTabs = this.allPossibleTabs.stream().filter(OffersPreview.class::isInstance).map(OffersPreview.class::cast).toList();
+        this.previewTabs =
+                this.allPossibleTabs.stream()
+                        .filter(OffersPreview.class::isInstance)
+                        .map(OffersPreview.class::cast)
+                        .toList();
 
         setupDragAndDrop(libraryTab);
 
-        EasyBind.subscribe(tabbed.getSelectionModel().selectedItemProperty(), tab -> {
-            EntryEditorTab activeTab = (EntryEditorTab) tab;
-            if (activeTab != null) {
-                activeTab.notifyAboutFocus(currentlyEditedEntry);
-            }
-        });
+        EasyBind.subscribe(
+                tabbed.getSelectionModel().selectedItemProperty(),
+                tab -> {
+                    EntryEditorTab activeTab = (EntryEditorTab) tab;
+                    if (activeTab != null) {
+                        activeTab.notifyAboutFocus(currentlyEditedEntry);
+                    }
+                });
 
-        EasyBind.listen(preferences.getPreviewPreferences().showPreviewAsExtraTabProperty(),
+        EasyBind.listen(
+                preferences.getPreviewPreferences().showPreviewAsExtraTabProperty(),
                 (obs, oldValue, newValue) -> {
                     if (currentlyEditedEntry != null) {
                         adaptVisibleTabs();
@@ -161,85 +172,99 @@ public EntryEditor(LibraryTab libraryTab, UndoAction undoAction, RedoAction redo
     }
 
     private void setupDragAndDrop(LibraryTab libraryTab) {
-        this.setOnDragOver(event -> {
-            if (event.getDragboard().hasFiles()) {
-                event.acceptTransferModes(TransferMode.COPY, TransferMode.MOVE, TransferMode.LINK);
-            }
-            event.consume();
-        });
-
-        this.setOnDragDropped(event -> {
-            BibEntry entry = this.getCurrentlyEditedEntry();
-            boolean success = false;
-
-            if (event.getDragboard().hasContent(DataFormat.FILES)) {
-                List<Path> draggedFiles = event.getDragboard().getFiles().stream().map(File::toPath).collect(Collectors.toList());
-                switch (event.getTransferMode()) {
-                    case COPY -> {
-                        LOGGER.debug("Mode COPY");
-                        fileLinker.copyFilesToFileDirAndAddToEntry(entry, draggedFiles, libraryTab.getLuceneManager());
-                    }
-                    case MOVE -> {
-                        LOGGER.debug("Mode MOVE");
-                        fileLinker.moveFilesToFileDirRenameAndAddToEntry(entry, draggedFiles, libraryTab.getLuceneManager());
+        this.setOnDragOver(
+                event -> {
+                    if (event.getDragboard().hasFiles()) {
+                        event.acceptTransferModes(
+                                TransferMode.COPY, TransferMode.MOVE, TransferMode.LINK);
                     }
-                    case LINK -> {
-                        LOGGER.debug("Mode LINK");
-                        fileLinker.addFilesToEntry(entry, draggedFiles);
+                    event.consume();
+                });
+
+        this.setOnDragDropped(
+                event -> {
+                    BibEntry entry = this.getCurrentlyEditedEntry();
+                    boolean success = false;
+
+                    if (event.getDragboard().hasContent(DataFormat.FILES)) {
+                        List<Path> draggedFiles =
+                                event.getDragboard().getFiles().stream()
+                                        .map(File::toPath)
+                                        .collect(Collectors.toList());
+                        switch (event.getTransferMode()) {
+                            case COPY -> {
+                                LOGGER.debug("Mode COPY");
+                                fileLinker.copyFilesToFileDirAndAddToEntry(
+                                        entry, draggedFiles, libraryTab.getLuceneManager());
+                            }
+                            case MOVE -> {
+                                LOGGER.debug("Mode MOVE");
+                                fileLinker.moveFilesToFileDirRenameAndAddToEntry(
+                                        entry, draggedFiles, libraryTab.getLuceneManager());
+                            }
+                            case LINK -> {
+                                LOGGER.debug("Mode LINK");
+                                fileLinker.addFilesToEntry(entry, draggedFiles);
+                            }
+                        }
+                        success = true;
                     }
-                }
-                success = true;
-            }
 
-            event.setDropCompleted(success);
-            event.consume();
-        });
+                    event.setDropCompleted(success);
+                    event.consume();
+                });
     }
 
     /**
      * Set up key bindings specific for the entry editor.
      */
     private void setupKeyBindings() {
-        this.addEventHandler(KeyEvent.KEY_PRESSED, event -> {
-            Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
-            if (keyBinding.isPresent()) {
-                switch (keyBinding.get()) {
-                    case ENTRY_EDITOR_NEXT_PANEL:
-                    case ENTRY_EDITOR_NEXT_PANEL_2:
-                        tabbed.getSelectionModel().selectNext();
-                        event.consume();
-                        break;
-                    case ENTRY_EDITOR_PREVIOUS_PANEL:
-                    case ENTRY_EDITOR_PREVIOUS_PANEL_2:
-                        tabbed.getSelectionModel().selectPrevious();
-                        event.consume();
-                        break;
-                    case ENTRY_EDITOR_NEXT_ENTRY:
-                        libraryTab.selectNextEntry();
-                        event.consume();
-                        break;
-                    case ENTRY_EDITOR_PREVIOUS_ENTRY:
-                        libraryTab.selectPreviousEntry();
-                        event.consume();
-                        break;
-                    case HELP:
-                        new HelpAction(HelpFile.ENTRY_EDITOR, dialogService, preferences.getExternalApplicationsPreferences()).execute();
-                        event.consume();
-                        break;
-                    case CLOSE:
-                        // We do not want to close the entry editor as such
-                        // We just want to unfocus the field
-                        tabbed.requestFocus();
-                        break;
-                    case OPEN_CLOSE_ENTRY_EDITOR:
-                        close();
-                        event.consume();
-                        break;
-                    default:
-                        // Pass other keys to parent
-                }
-            }
-        });
+        this.addEventHandler(
+                KeyEvent.KEY_PRESSED,
+                event -> {
+                    Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
+                    if (keyBinding.isPresent()) {
+                        switch (keyBinding.get()) {
+                            case ENTRY_EDITOR_NEXT_PANEL:
+                            case ENTRY_EDITOR_NEXT_PANEL_2:
+                                tabbed.getSelectionModel().selectNext();
+                                event.consume();
+                                break;
+                            case ENTRY_EDITOR_PREVIOUS_PANEL:
+                            case ENTRY_EDITOR_PREVIOUS_PANEL_2:
+                                tabbed.getSelectionModel().selectPrevious();
+                                event.consume();
+                                break;
+                            case ENTRY_EDITOR_NEXT_ENTRY:
+                                libraryTab.selectNextEntry();
+                                event.consume();
+                                break;
+                            case ENTRY_EDITOR_PREVIOUS_ENTRY:
+                                libraryTab.selectPreviousEntry();
+                                event.consume();
+                                break;
+                            case HELP:
+                                new HelpAction(
+                                                HelpFile.ENTRY_EDITOR,
+                                                dialogService,
+                                                preferences.getExternalApplicationsPreferences())
+                                        .execute();
+                                event.consume();
+                                break;
+                            case CLOSE:
+                                // We do not want to close the entry editor as such
+                                // We just want to unfocus the field
+                                tabbed.requestFocus();
+                                break;
+                            case OPEN_CLOSE_ENTRY_EDITOR:
+                                close();
+                                event.consume();
+                                break;
+                            default:
+                                // Pass other keys to parent
+                        }
+                    }
+                });
     }
 
     @FXML
@@ -254,14 +279,25 @@ private void deleteEntry() {
 
     @FXML
     void generateCiteKeyButton() {
-        GenerateCitationKeySingleAction action = new GenerateCitationKeySingleAction(getCurrentlyEditedEntry(), databaseContext,
-                dialogService, preferences, undoManager);
+        GenerateCitationKeySingleAction action =
+                new GenerateCitationKeySingleAction(
+                        getCurrentlyEditedEntry(),
+                        databaseContext,
+                        dialogService,
+                        preferences,
+                        undoManager);
         action.execute();
     }
 
     @FXML
     void generateCleanupButton() {
-        CleanupSingleAction action = new CleanupSingleAction(getCurrentlyEditedEntry(), preferences, dialogService, stateManager, undoManager);
+        CleanupSingleAction action =
+                new CleanupSingleAction(
+                        getCurrentlyEditedEntry(),
+                        preferences,
+                        dialogService,
+                        stateManager,
+                        undoManager);
         action.execute();
     }
 
@@ -278,44 +314,180 @@ private void navigateToNextEntry() {
     private List<EntryEditorTab> createTabs() {
         List<EntryEditorTab> tabs = new LinkedList<>();
 
-        tabs.add(new PreviewTab(databaseContext, dialogService, preferences, themeManager, taskExecutor, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
+        tabs.add(
+                new PreviewTab(
+                        databaseContext,
+                        dialogService,
+                        preferences,
+                        themeManager,
+                        taskExecutor,
+                        libraryTab.getLuceneManager(),
+                        libraryTab.searchQueryProperty()));
 
         // Required, optional (important+detail), deprecated, and "other" fields
-        tabs.add(new RequiredFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferences, themeManager, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
-        tabs.add(new ImportantOptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferences, themeManager, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
-        tabs.add(new DetailOptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferences, themeManager, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
-        tabs.add(new DeprecatedFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferences, themeManager, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
-        tabs.add(new OtherFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferences, themeManager, bibEntryTypesManager, taskExecutor, journalAbbreviationRepository, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
+        tabs.add(
+                new RequiredFieldsTab(
+                        databaseContext,
+                        libraryTab.getSuggestionProviders(),
+                        undoManager,
+                        undoAction,
+                        redoAction,
+                        dialogService,
+                        preferences,
+                        themeManager,
+                        bibEntryTypesManager,
+                        taskExecutor,
+                        journalAbbreviationRepository,
+                        libraryTab.getLuceneManager(),
+                        libraryTab.searchQueryProperty()));
+        tabs.add(
+                new ImportantOptionalFieldsTab(
+                        databaseContext,
+                        libraryTab.getSuggestionProviders(),
+                        undoManager,
+                        undoAction,
+                        redoAction,
+                        dialogService,
+                        preferences,
+                        themeManager,
+                        bibEntryTypesManager,
+                        taskExecutor,
+                        journalAbbreviationRepository,
+                        libraryTab.getLuceneManager(),
+                        libraryTab.searchQueryProperty()));
+        tabs.add(
+                new DetailOptionalFieldsTab(
+                        databaseContext,
+                        libraryTab.getSuggestionProviders(),
+                        undoManager,
+                        undoAction,
+                        redoAction,
+                        dialogService,
+                        preferences,
+                        themeManager,
+                        bibEntryTypesManager,
+                        taskExecutor,
+                        journalAbbreviationRepository,
+                        libraryTab.getLuceneManager(),
+                        libraryTab.searchQueryProperty()));
+        tabs.add(
+                new DeprecatedFieldsTab(
+                        databaseContext,
+                        libraryTab.getSuggestionProviders(),
+                        undoManager,
+                        undoAction,
+                        redoAction,
+                        dialogService,
+                        preferences,
+                        themeManager,
+                        bibEntryTypesManager,
+                        taskExecutor,
+                        journalAbbreviationRepository,
+                        libraryTab.getLuceneManager(),
+                        libraryTab.searchQueryProperty()));
+        tabs.add(
+                new OtherFieldsTab(
+                        databaseContext,
+                        libraryTab.getSuggestionProviders(),
+                        undoManager,
+                        undoAction,
+                        redoAction,
+                        dialogService,
+                        preferences,
+                        themeManager,
+                        bibEntryTypesManager,
+                        taskExecutor,
+                        journalAbbreviationRepository,
+                        libraryTab.getLuceneManager(),
+                        libraryTab.searchQueryProperty()));
 
         // Comment Tab: Tab for general and user-specific comments
-        tabs.add(new CommentsTab(preferences, databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, themeManager, taskExecutor, journalAbbreviationRepository, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
+        tabs.add(
+                new CommentsTab(
+                        preferences,
+                        databaseContext,
+                        libraryTab.getSuggestionProviders(),
+                        undoManager,
+                        undoAction,
+                        redoAction,
+                        dialogService,
+                        themeManager,
+                        taskExecutor,
+                        journalAbbreviationRepository,
+                        libraryTab.getLuceneManager(),
+                        libraryTab.searchQueryProperty()));
 
         Map<String, Set<Field>> entryEditorTabList = getAdditionalUserConfiguredTabs();
         for (Map.Entry<String, Set<Field>> tab : entryEditorTabList.entrySet()) {
-            tabs.add(new UserDefinedFieldsTab(tab.getKey(), tab.getValue(), databaseContext, libraryTab.getSuggestionProviders(), undoManager, undoAction, redoAction, dialogService, preferences, themeManager, taskExecutor, journalAbbreviationRepository, libraryTab.getLuceneManager(), libraryTab.searchQueryProperty()));
+            tabs.add(
+                    new UserDefinedFieldsTab(
+                            tab.getKey(),
+                            tab.getValue(),
+                            databaseContext,
+                            libraryTab.getSuggestionProviders(),
+                            undoManager,
+                            undoAction,
+                            redoAction,
+                            dialogService,
+                            preferences,
+                            themeManager,
+                            taskExecutor,
+                            journalAbbreviationRepository,
+                            libraryTab.getLuceneManager(),
+                            libraryTab.searchQueryProperty()));
         }
 
         tabs.add(new MathSciNetTab());
         tabs.add(new FileAnnotationTab(libraryTab.getAnnotationCache()));
         tabs.add(new SciteTab(preferences, taskExecutor, dialogService));
-        tabs.add(new CitationRelationsTab(dialogService, databaseContext,
-                undoManager, stateManager, fileMonitor, preferences, libraryTab, taskExecutor, bibEntryTypesManager));
-        tabs.add(new RelatedArticlesTab(buildInfo, databaseContext, preferences, dialogService, taskExecutor));
-        sourceTab = new SourceTab(
-                databaseContext,
-                undoManager,
-                preferences.getFieldPreferences(),
-                preferences.getImportFormatPreferences(),
-                fileMonitor,
-                dialogService,
-                bibEntryTypesManager,
-                keyBindingRepository,
-                libraryTab.searchQueryProperty());
+        tabs.add(
+                new CitationRelationsTab(
+                        dialogService,
+                        databaseContext,
+                        undoManager,
+                        stateManager,
+                        fileMonitor,
+                        preferences,
+                        libraryTab,
+                        taskExecutor,
+                        bibEntryTypesManager));
+        tabs.add(
+                new RelatedArticlesTab(
+                        buildInfo, databaseContext, preferences, dialogService, taskExecutor));
+        sourceTab =
+                new SourceTab(
+                        databaseContext,
+                        undoManager,
+                        preferences.getFieldPreferences(),
+                        preferences.getImportFormatPreferences(),
+                        fileMonitor,
+                        dialogService,
+                        bibEntryTypesManager,
+                        keyBindingRepository,
+                        libraryTab.searchQueryProperty());
         tabs.add(sourceTab);
-        tabs.add(new LatexCitationsTab(databaseContext, preferences, dialogService, directoryMonitorManager));
-        tabs.add(new FulltextSearchResultsTab(stateManager, preferences, dialogService, databaseContext, taskExecutor, libraryTab.searchQueryProperty()));
-        tabs.add(new AiSummaryTab(libraryTab.getBibDatabaseContext(), aiService, dialogService, preferences));
-        tabs.add(new AiChatTab(libraryTab.getBibDatabaseContext(), aiService, chatHistoryService, dialogService, preferences, taskExecutor));
+        tabs.add(
+                new LatexCitationsTab(
+                        databaseContext, preferences, dialogService, directoryMonitorManager));
+        tabs.add(
+                new FulltextSearchResultsTab(
+                        stateManager,
+                        preferences,
+                        dialogService,
+                        databaseContext,
+                        taskExecutor,
+                        libraryTab.searchQueryProperty()));
+        tabs.add(
+                new AiSummaryTab(
+                        libraryTab.getBibDatabaseContext(), aiService, dialogService, preferences));
+        tabs.add(
+                new AiChatTab(
+                        libraryTab.getBibDatabaseContext(),
+                        aiService,
+                        chatHistoryService,
+                        dialogService,
+                        preferences,
+                        taskExecutor));
 
         return tabs;
     }
@@ -328,9 +500,11 @@ private List<EntryEditorTab> createTabs() {
      * @return Map of tab names and the fields to show in them.
      */
     private Map<String, Set<Field>> getAdditionalUserConfiguredTabs() {
-        Map<String, Set<Field>> entryEditorTabList = new HashMap<>(entryEditorPreferences.getEntryEditorTabs());
+        Map<String, Set<Field>> entryEditorTabList =
+                new HashMap<>(entryEditorPreferences.getEntryEditorTabs());
 
-        // Same order as in org.jabref.gui.entryeditor.EntryEditor.createTabs before the call of getAdditionalUserConfiguredTabs
+        // Same order as in org.jabref.gui.entryeditor.EntryEditor.createTabs before the call of
+        // getAdditionalUserConfiguredTabs
         entryEditorTabList.remove(PreviewTab.NAME);
         entryEditorTabList.remove(RequiredFieldsTab.NAME);
         entryEditorTabList.remove(ImportantOptionalFieldsTab.NAME);
@@ -339,7 +513,8 @@ private Map<String, Set<Field>> getAdditionalUserConfiguredTabs() {
         entryEditorTabList.remove(OtherFieldsTab.NAME);
         entryEditorTabList.remove(CommentsTab.NAME);
 
-        // Same order as in org.jabref.gui.entryeditor.EntryEditor.createTabs after the call of getAdditionalUserConfiguredTabs
+        // Same order as in org.jabref.gui.entryeditor.EntryEditor.createTabs after the call of
+        // getAdditionalUserConfiguredTabs
         entryEditorTabList.remove(MathSciNetTab.NAME);
         entryEditorTabList.remove(FileAnnotationTab.NAME);
         entryEditorTabList.remove(SciteTab.NAME);
@@ -356,17 +531,27 @@ private Map<String, Set<Field>> getAdditionalUserConfiguredTabs() {
      * Adapt the visible tabs to the current entry type.
      */
     private void adaptVisibleTabs() {
-        // We need to find out, which tabs will be shown (and which not anymore) and remove and re-add the appropriate tabs
-        // to the editor. We cannot to simply remove all and re-add the complete list of visible tabs, because
-        // the tabs give an ugly animation the looks like all tabs are shifting in from the right. In other words:
-        // This hack is required since tabbed.getTabs().setAll(visibleTabs) changes the order of the tabs in the editor
+        // We need to find out, which tabs will be shown (and which not anymore) and remove and
+        // re-add the appropriate tabs
+        // to the editor. We cannot to simply remove all and re-add the complete list of visible
+        // tabs, because
+        // the tabs give an ugly animation the looks like all tabs are shifting in from the right.
+        // In other words:
+        // This hack is required since tabbed.getTabs().setAll(visibleTabs) changes the order of the
+        // tabs in the editor
 
         // First, remove tabs that we do not want to show
-        List<EntryEditorTab> toBeRemoved = allPossibleTabs.stream().filter(tab -> !tab.shouldShow(currentlyEditedEntry)).toList();
+        List<EntryEditorTab> toBeRemoved =
+                allPossibleTabs.stream()
+                        .filter(tab -> !tab.shouldShow(currentlyEditedEntry))
+                        .toList();
         tabbed.getTabs().removeAll(toBeRemoved);
 
         // Next add all the visible tabs (if not already present) at the right position
-        List<Tab> visibleTabs = allPossibleTabs.stream().filter(tab -> tab.shouldShow(currentlyEditedEntry)).collect(Collectors.toList());
+        List<Tab> visibleTabs =
+                allPossibleTabs.stream()
+                        .filter(tab -> tab.shouldShow(currentlyEditedEntry))
+                        .collect(Collectors.toList());
         for (int i = 0; i < visibleTabs.size(); i++) {
             Tab toBeAdded = visibleTabs.get(i);
             Tab shown = null;
@@ -393,11 +578,17 @@ public void setCurrentlyEditedEntry(BibEntry currentlyEditedEntry) {
             // Remove subscription for old entry if existing
             typeSubscription.unsubscribe();
         }
-        typeSubscription = EasyBind.subscribe(this.currentlyEditedEntry.typeProperty(), type -> {
-            typeLabel.setText(new TypedBibEntry(currentlyEditedEntry, databaseContext.getMode()).getTypeForDisplay());
-            adaptVisibleTabs();
-            getSelectedTab().notifyAboutFocus(currentlyEditedEntry);
-        });
+        typeSubscription =
+                EasyBind.subscribe(
+                        this.currentlyEditedEntry.typeProperty(),
+                        type -> {
+                            typeLabel.setText(
+                                    new TypedBibEntry(
+                                                    currentlyEditedEntry, databaseContext.getMode())
+                                            .getTypeForDisplay());
+                            adaptVisibleTabs();
+                            getSelectedTab().notifyAboutFocus(currentlyEditedEntry);
+                        });
 
         adaptVisibleTabs();
         setupToolBar();
@@ -414,34 +605,46 @@ private EntryEditorTab getSelectedTab() {
 
     private void setupToolBar() {
         // Update type label
-        TypedBibEntry typedEntry = new TypedBibEntry(currentlyEditedEntry, databaseContext.getMode());
+        TypedBibEntry typedEntry =
+                new TypedBibEntry(currentlyEditedEntry, databaseContext.getMode());
         typeLabel.setText(typedEntry.getTypeForDisplay());
 
         // Add type change menu
-        ContextMenu typeMenu = new ChangeEntryTypeMenu(Collections.singletonList(currentlyEditedEntry), databaseContext, undoManager, bibEntryTypesManager).asContextMenu();
+        ContextMenu typeMenu =
+                new ChangeEntryTypeMenu(
+                                Collections.singletonList(currentlyEditedEntry),
+                                databaseContext,
+                                undoManager,
+                                bibEntryTypesManager)
+                        .asContextMenu();
         typeLabel.setOnMouseClicked(event -> typeMenu.show(typeLabel, Side.RIGHT, 0, 0));
-        typeChangeButton.setOnMouseClicked(event -> typeMenu.show(typeChangeButton, Side.RIGHT, 0, 0));
+        typeChangeButton.setOnMouseClicked(
+                event -> typeMenu.show(typeChangeButton, Side.RIGHT, 0, 0));
 
         // Add menu for fetching bibliographic information
         ContextMenu fetcherMenu = new ContextMenu();
-        SortedSet<EntryBasedFetcher> entryBasedFetchers = WebFetchers.getEntryBasedFetchers(
-                preferences.getImporterPreferences(),
-                preferences.getImportFormatPreferences(),
-                preferences.getFilePreferences(),
-                databaseContext);
+        SortedSet<EntryBasedFetcher> entryBasedFetchers =
+                WebFetchers.getEntryBasedFetchers(
+                        preferences.getImporterPreferences(),
+                        preferences.getImportFormatPreferences(),
+                        preferences.getFilePreferences(),
+                        databaseContext);
         for (EntryBasedFetcher fetcher : entryBasedFetchers) {
             MenuItem fetcherMenuItem = new MenuItem(fetcher.getName());
             if (fetcher instanceof PdfMergeMetadataImporter.EntryBasedFetcherWrapper) {
                 // Handle Grobid Opt-In in case of the PdfMergeMetadataImporter
-                fetcherMenuItem.setOnAction(event -> {
-                    GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferences.getGrobidPreferences());
-                    PdfMergeMetadataImporter.EntryBasedFetcherWrapper pdfMergeMetadataImporter =
-                            new PdfMergeMetadataImporter.EntryBasedFetcherWrapper(
-                                    preferences.getImportFormatPreferences(),
-                                    preferences.getFilePreferences(),
-                                    databaseContext);
-                    fetchAndMerge(pdfMergeMetadataImporter);
-                });
+                fetcherMenuItem.setOnAction(
+                        event -> {
+                            GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(
+                                    dialogService, preferences.getGrobidPreferences());
+                            PdfMergeMetadataImporter.EntryBasedFetcherWrapper
+                                    pdfMergeMetadataImporter =
+                                            new PdfMergeMetadataImporter.EntryBasedFetcherWrapper(
+                                                    preferences.getImportFormatPreferences(),
+                                                    preferences.getFilePreferences(),
+                                                    databaseContext);
+                            fetchAndMerge(pdfMergeMetadataImporter);
+                        });
             } else {
                 fetcherMenuItem.setOnAction(event -> fetchAndMerge(fetcher));
             }
@@ -452,19 +655,26 @@ private void setupToolBar() {
     }
 
     private void fetchAndMerge(EntryBasedFetcher fetcher) {
-        new FetchAndMergeEntry(libraryTab.getBibDatabaseContext(), taskExecutor, preferences, dialogService, undoManager).fetchAndMerge(currentlyEditedEntry, fetcher);
+        new FetchAndMergeEntry(
+                        libraryTab.getBibDatabaseContext(),
+                        taskExecutor,
+                        preferences,
+                        dialogService,
+                        undoManager)
+                .fetchAndMerge(currentlyEditedEntry, fetcher);
     }
 
     public void setFocusToField(Field field) {
-        UiTaskExecutor.runInJavaFXThread(() -> {
-            for (Tab tab : tabbed.getTabs()) {
-                if ((tab instanceof FieldsEditorTab fieldsEditorTab)
-                        && fieldsEditorTab.getShownFields().contains(field)) {
-                    tabbed.getSelectionModel().select(tab);
-                    fieldsEditorTab.requestFocus(field);
-                }
-            }
-        });
+        UiTaskExecutor.runInJavaFXThread(
+                () -> {
+                    for (Tab tab : tabbed.getTabs()) {
+                        if ((tab instanceof FieldsEditorTab fieldsEditorTab)
+                                && fieldsEditorTab.getShownFields().contains(field)) {
+                            tabbed.getSelectionModel().select(tab);
+                            fieldsEditorTab.requestFocus(field);
+                        }
+                    }
+                });
     }
 
     public void nextPreviewStyle() {
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
index 04ce8173bc9b..03574e12d12b 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.Map;
-import java.util.Set;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.MapProperty;
@@ -16,6 +13,9 @@
 
 import org.jabref.model.entry.field.Field;
 
+import java.util.Map;
+import java.util.Set;
+
 public class EntryEditorPreferences {
 
     /**
@@ -53,25 +53,28 @@ public static JournalPopupEnabled fromString(String status) {
     private final BooleanProperty showUserCommentsFields;
     private final DoubleProperty previewWidthDividerPosition;
 
-    public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList,
-                                  Map<String, Set<Field>> defaultEntryEditorTabList,
-                                  boolean shouldOpenOnNewEntry,
-                                  boolean shouldShowRecommendationsTab,
-                                  boolean shouldShowAiSummaryTab,
-                                  boolean shouldShowAiChatTab,
-                                  boolean shouldShowLatexCitationsTab,
-                                  boolean showSourceTabByDefault,
-                                  boolean enableValidation,
-                                  boolean allowIntegerEditionBibtex,
-                                  double dividerPosition,
-                                  boolean autolinkFilesEnabled,
-                                  JournalPopupEnabled journalPopupEnabled,
-                                  boolean showSciteTab,
-                                  boolean showUserCommentsFields,
-                                  double previewWidthDividerPosition) {
-
-        this.entryEditorTabList = new SimpleMapProperty<>(FXCollections.observableMap(entryEditorTabList));
-        this.defaultEntryEditorTabList = new SimpleMapProperty<>(FXCollections.observableMap(defaultEntryEditorTabList));
+    public EntryEditorPreferences(
+            Map<String, Set<Field>> entryEditorTabList,
+            Map<String, Set<Field>> defaultEntryEditorTabList,
+            boolean shouldOpenOnNewEntry,
+            boolean shouldShowRecommendationsTab,
+            boolean shouldShowAiSummaryTab,
+            boolean shouldShowAiChatTab,
+            boolean shouldShowLatexCitationsTab,
+            boolean showSourceTabByDefault,
+            boolean enableValidation,
+            boolean allowIntegerEditionBibtex,
+            double dividerPosition,
+            boolean autolinkFilesEnabled,
+            JournalPopupEnabled journalPopupEnabled,
+            boolean showSciteTab,
+            boolean showUserCommentsFields,
+            double previewWidthDividerPosition) {
+
+        this.entryEditorTabList =
+                new SimpleMapProperty<>(FXCollections.observableMap(entryEditorTabList));
+        this.defaultEntryEditorTabList =
+                new SimpleMapProperty<>(FXCollections.observableMap(defaultEntryEditorTabList));
         this.shouldOpenOnNewEntry = new SimpleBooleanProperty(shouldOpenOnNewEntry);
         this.shouldShowRecommendationsTab = new SimpleBooleanProperty(shouldShowRecommendationsTab);
         this.shouldShowAiSummaryTab = new SimpleBooleanProperty(shouldShowAiSummaryTab);
diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 41b29ee8f421..2b0263bee296 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -1,15 +1,7 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.SequencedSet;
-import java.util.stream.Stream;
-
-import javax.swing.undo.UndoManager;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.Subscription;
 
 import javafx.collections.ObservableList;
 import javafx.geometry.VPos;
@@ -43,8 +35,16 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.search.SearchQuery;
 
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.Subscription;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.SequencedSet;
+import java.util.stream.Stream;
+
+import javax.swing.undo.UndoManager;
 
 /**
  * A single tab displayed in the EntryEditor holding several FieldEditors.
@@ -67,22 +67,24 @@ abstract class FieldsEditorTab extends EntryEditorTab implements OffersPreview {
     private final LuceneManager luceneManager;
     private final OptionalObjectProperty<SearchQuery> searchQueryProperty;
     private Collection<Field> fields = new ArrayList<>();
+
     @SuppressWarnings("FieldCanBeLocal")
     private Subscription dividerPositionSubscription;
 
-    public FieldsEditorTab(boolean compressed,
-                           BibDatabaseContext databaseContext,
-                           SuggestionProviders suggestionProviders,
-                           UndoManager undoManager,
-                           UndoAction undoAction,
-                           RedoAction redoAction,
-                           DialogService dialogService,
-                           GuiPreferences preferences,
-                           ThemeManager themeManager,
-                           TaskExecutor taskExecutor,
-                           JournalAbbreviationRepository journalAbbreviationRepository,
-                           LuceneManager luceneManager,
-                           OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+    public FieldsEditorTab(
+            boolean compressed,
+            BibDatabaseContext databaseContext,
+            SuggestionProviders suggestionProviders,
+            UndoManager undoManager,
+            UndoAction undoAction,
+            RedoAction redoAction,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            ThemeManager themeManager,
+            TaskExecutor taskExecutor,
+            JournalAbbreviationRepository journalAbbreviationRepository,
+            LuceneManager luceneManager,
+            OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         this.isCompressed = compressed;
         this.databaseContext = Objects.requireNonNull(databaseContext);
         this.suggestionProviders = Objects.requireNonNull(suggestionProviders);
@@ -120,10 +122,8 @@ protected void setupPanel(BibEntry entry, boolean compressed) {
 
         fields = determineFieldsToShow(entry);
 
-        List<Label> labels = fields
-                .stream()
-                .map(field -> createLabelAndEditor(entry, field))
-                .toList();
+        List<Label> labels =
+                fields.stream().map(field -> createLabelAndEditor(entry, field)).toList();
 
         ColumnConstraints columnExpand = new ColumnConstraints();
         columnExpand.setHgrow(Priority.ALWAYS);
@@ -134,13 +134,20 @@ protected void setupPanel(BibEntry entry, boolean compressed) {
             int rows = (int) Math.ceil((double) fields.size() / 2);
 
             addColumn(gridPane, 0, labels.subList(0, rows));
-            addColumn(gridPane, 1, editors.values().stream().map(FieldEditorFX::getNode).limit(rows));
+            addColumn(
+                    gridPane, 1, editors.values().stream().map(FieldEditorFX::getNode).limit(rows));
             addColumn(gridPane, 3, labels.subList(rows, labels.size()));
-            addColumn(gridPane, 4, editors.values().stream().map(FieldEditorFX::getNode).skip(rows));
+            addColumn(
+                    gridPane, 4, editors.values().stream().map(FieldEditorFX::getNode).skip(rows));
 
             columnExpand.setPercentWidth(40);
-            gridPane.getColumnConstraints().addAll(columnDoNotContract, columnExpand, new ColumnConstraints(10),
-                    columnDoNotContract, columnExpand);
+            gridPane.getColumnConstraints()
+                    .addAll(
+                            columnDoNotContract,
+                            columnExpand,
+                            new ColumnConstraints(10),
+                            columnDoNotContract,
+                            columnExpand);
 
             setCompressedRowLayout(gridPane, rows);
         } else {
@@ -154,36 +161,39 @@ protected void setupPanel(BibEntry entry, boolean compressed) {
     }
 
     protected Label createLabelAndEditor(BibEntry entry, Field field) {
-        FieldEditorFX fieldEditor = FieldEditors.getForField(
-                field,
-                taskExecutor,
-                dialogService,
-                journalAbbreviationRepository,
-                preferences,
-                databaseContext,
-                entry.getType(),
-                suggestionProviders,
-                undoManager,
-                undoAction,
-                redoAction);
+        FieldEditorFX fieldEditor =
+                FieldEditors.getForField(
+                        field,
+                        taskExecutor,
+                        dialogService,
+                        journalAbbreviationRepository,
+                        preferences,
+                        databaseContext,
+                        entry.getType(),
+                        suggestionProviders,
+                        undoManager,
+                        undoAction,
+                        redoAction);
         fieldEditor.bindToEntry(entry);
         editors.put(field, fieldEditor);
         return new FieldNameLabel(field);
     }
 
     private void setRegularRowLayout(GridPane gridPane) {
-        double totalWeight = fields.stream()
-                                   .mapToDouble(field -> editors.get(field).getWeight())
-                                   .sum();
-        List<RowConstraints> constraints = fields
-                .stream()
-                .map(field -> {
-                    RowConstraints rowExpand = new RowConstraints();
-                    rowExpand.setVgrow(Priority.ALWAYS);
-                    rowExpand.setValignment(VPos.TOP);
-                    rowExpand.setPercentHeight(100 * editors.get(field).getWeight() / totalWeight);
-                    return rowExpand;
-                }).toList();
+        double totalWeight =
+                fields.stream().mapToDouble(field -> editors.get(field).getWeight()).sum();
+        List<RowConstraints> constraints =
+                fields.stream()
+                        .map(
+                                field -> {
+                                    RowConstraints rowExpand = new RowConstraints();
+                                    rowExpand.setVgrow(Priority.ALWAYS);
+                                    rowExpand.setValignment(VPos.TOP);
+                                    rowExpand.setPercentHeight(
+                                            100 * editors.get(field).getWeight() / totalWeight);
+                                    return rowExpand;
+                                })
+                        .toList();
         gridPane.getRowConstraints().addAll(constraints);
     }
 
@@ -258,36 +268,44 @@ private void initPanel() {
             scrollPane.setFitToHeight(true);
 
             SplitPane container = new SplitPane(scrollPane);
-            previewPanel = new PreviewPanel(
-                    databaseContext,
-                    dialogService,
-                    preferences.getKeyBindingRepository(),
-                    preferences,
-                    themeManager,
-                    taskExecutor,
-                    luceneManager,
-                    searchQueryProperty);
-            EasyBind.subscribe(preferences.getPreviewPreferences().showPreviewAsExtraTabProperty(), show -> {
-                if (show) {
-                    container.getItems().remove(previewPanel);
-                } else {
-                    container.getItems().add(1, previewPanel);
-                    container.setDividerPositions(preferences.getEntryEditorPreferences().getPreviewWidthDividerPosition());
-                }
-            });
+            previewPanel =
+                    new PreviewPanel(
+                            databaseContext,
+                            dialogService,
+                            preferences.getKeyBindingRepository(),
+                            preferences,
+                            themeManager,
+                            taskExecutor,
+                            luceneManager,
+                            searchQueryProperty);
+            EasyBind.subscribe(
+                    preferences.getPreviewPreferences().showPreviewAsExtraTabProperty(),
+                    show -> {
+                        if (show) {
+                            container.getItems().remove(previewPanel);
+                        } else {
+                            container.getItems().add(1, previewPanel);
+                            container.setDividerPositions(
+                                    preferences
+                                            .getEntryEditorPreferences()
+                                            .getPreviewWidthDividerPosition());
+                        }
+                    });
 
             // save position
-            dividerPositionSubscription = EasyBind.valueAt(container.getDividers(), 0)
-                                                  .mapObservable(SplitPane.Divider::positionProperty)
-                                                  .subscribeToValues(this::savePreviewWidthDividerPosition);
+            dividerPositionSubscription =
+                    EasyBind.valueAt(container.getDividers(), 0)
+                            .mapObservable(SplitPane.Divider::positionProperty)
+                            .subscribeToValues(this::savePreviewWidthDividerPosition);
             setContent(container);
         }
     }
 
     private void savePreviewWidthDividerPosition(Number position) {
         if (!preferences.getPreviewPreferences().shouldShowPreviewAsExtraTab()) {
-            preferences.getEntryEditorPreferences().setPreviewWidthDividerPosition(position.doubleValue());
+            preferences
+                    .getEntryEditorPreferences()
+                    .setPreviewWidthDividerPosition(position.doubleValue());
         }
     }
 }
-
diff --git a/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java
index 64004b708485..3ed71a0cd1df 100644
--- a/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/ImportantOptionalFieldsTab.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.entryeditor;
 
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.preferences.GuiPreferences;
@@ -17,23 +15,26 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.search.SearchQuery;
 
+import javax.swing.undo.UndoManager;
+
 public class ImportantOptionalFieldsTab extends OptionalFieldsTabBase {
 
     public static final String NAME = "Optional fields";
 
-    public ImportantOptionalFieldsTab(BibDatabaseContext databaseContext,
-                                      SuggestionProviders suggestionProviders,
-                                      UndoManager undoManager,
-                                      UndoAction undoAction,
-                                      RedoAction redoAction,
-                                      DialogService dialogService,
-                                      GuiPreferences preferences,
-                                      ThemeManager themeManager,
-                                      BibEntryTypesManager entryTypesManager,
-                                      TaskExecutor taskExecutor,
-                                      JournalAbbreviationRepository journalAbbreviationRepository,
-                                      LuceneManager luceneManager,
-                                      OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+    public ImportantOptionalFieldsTab(
+            BibDatabaseContext databaseContext,
+            SuggestionProviders suggestionProviders,
+            UndoManager undoManager,
+            UndoAction undoAction,
+            RedoAction redoAction,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            ThemeManager themeManager,
+            BibEntryTypesManager entryTypesManager,
+            TaskExecutor taskExecutor,
+            JournalAbbreviationRepository journalAbbreviationRepository,
+            LuceneManager luceneManager,
+            OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         super(
                 Localization.lang("Optional fields"),
                 true,
@@ -49,7 +50,6 @@ public ImportantOptionalFieldsTab(BibDatabaseContext databaseContext,
                 taskExecutor,
                 journalAbbreviationRepository,
                 luceneManager,
-                searchQueryProperty
-        );
+                searchQueryProperty);
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java
index 6e45f1d491e7..e1d63da2ffd4 100644
--- a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.entryeditor;
 
+import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.geometry.HPos;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
@@ -23,8 +25,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.DirectoryMonitorManager;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class LatexCitationsTab extends EntryEditorTab {
 
     public static final String NAME = "LaTeX citations";
@@ -33,23 +33,23 @@ public class LatexCitationsTab extends EntryEditorTab {
     private final ProgressIndicator progressIndicator;
     private final CitationsDisplay citationsDisplay;
 
-    public LatexCitationsTab(BibDatabaseContext databaseContext,
-                             GuiPreferences preferences,
-                             DialogService dialogService,
-                             DirectoryMonitorManager directoryMonitorManager) {
+    public LatexCitationsTab(
+            BibDatabaseContext databaseContext,
+            GuiPreferences preferences,
+            DialogService dialogService,
+            DirectoryMonitorManager directoryMonitorManager) {
 
-        this.viewModel = new LatexCitationsTabViewModel(
-                databaseContext,
-                preferences,
-                dialogService,
-                directoryMonitorManager);
+        this.viewModel =
+                new LatexCitationsTabViewModel(
+                        databaseContext, preferences, dialogService, directoryMonitorManager);
 
         this.searchPane = new GridPane();
         this.progressIndicator = new ProgressIndicator();
         this.citationsDisplay = new CitationsDisplay();
 
         setText(Localization.lang("LaTeX citations"));
-        setTooltip(new Tooltip(Localization.lang("Search citations for this entry in LaTeX files")));
+        setTooltip(
+                new Tooltip(Localization.lang("Search citations for this entry in LaTeX files")));
         setGraphic(IconTheme.JabRefIcons.LATEX_CITATIONS.getGraphicNode());
         setSearchPane();
     }
@@ -79,24 +79,26 @@ private void setSearchPane() {
         VBox notFoundPane = getNotFoundPane();
         VBox errorPane = getErrorPane();
 
-        EasyBind.subscribe(viewModel.statusProperty(), status -> {
-            searchPane.getChildren().clear();
-            switch (status) {
-                case IN_PROGRESS:
-                    searchPane.add(progressIndicator, 0, 0);
-                    break;
-                case CITATIONS_FOUND:
-                    searchPane.add(citationsPane, 0, 0);
-                    break;
-                case NO_RESULTS:
-                    searchPane.add(notFoundPane, 0, 0);
-                    break;
-                case ERROR:
-                    searchPane.add(errorPane, 0, 0);
-                    break;
-            }
-            searchPane.add(latexDirectoryBox, 0, 1);
-        });
+        EasyBind.subscribe(
+                viewModel.statusProperty(),
+                status -> {
+                    searchPane.getChildren().clear();
+                    switch (status) {
+                        case IN_PROGRESS:
+                            searchPane.add(progressIndicator, 0, 0);
+                            break;
+                        case CITATIONS_FOUND:
+                            searchPane.add(citationsPane, 0, 0);
+                            break;
+                        case NO_RESULTS:
+                            searchPane.add(notFoundPane, 0, 0);
+                            break;
+                        case ERROR:
+                            searchPane.add(errorPane, 0, 0);
+                            break;
+                    }
+                    searchPane.add(latexDirectoryBox, 0, 1);
+                });
     }
 
     private HBox getLatexDirectoryBox() {
@@ -105,9 +107,11 @@ private HBox getLatexDirectoryBox() {
         latexDirectoryPath.textProperty().bind(viewModel.directoryProperty().asString());
         latexDirectoryPath.setStyle("-fx-font-family:monospace;-fx-font-weight: bold;");
         Button latexDirectoryButton = new Button(Localization.lang("Set LaTeX file directory"));
-        latexDirectoryButton.setGraphic(IconTheme.JabRefIcons.LATEX_FILE_DIRECTORY.getGraphicNode());
+        latexDirectoryButton.setGraphic(
+                IconTheme.JabRefIcons.LATEX_FILE_DIRECTORY.getGraphicNode());
         latexDirectoryButton.setOnAction(event -> viewModel.setLatexDirectory());
-        HBox latexDirectoryBox = new HBox(10, latexDirectoryText, latexDirectoryPath, latexDirectoryButton);
+        HBox latexDirectoryBox =
+                new HBox(10, latexDirectoryText, latexDirectoryPath, latexDirectoryButton);
         latexDirectoryBox.setAlignment(Pos.CENTER);
         return latexDirectoryBox;
     }
@@ -123,7 +127,8 @@ private VBox getNotFoundPane() {
         Label titleLabel = new Label(Localization.lang("No citations found"));
         titleLabel.getStyleClass().add("heading");
 
-        Text notFoundText = new Text(Localization.lang("No LaTeX files containing this entry were found."));
+        Text notFoundText =
+                new Text(Localization.lang("No LaTeX files containing this entry were found."));
         notFoundText.getStyleClass().add("description");
 
         VBox notFoundBox = new VBox(30, titleLabel, notFoundText);
@@ -133,7 +138,8 @@ private VBox getNotFoundPane() {
 
     private VBox getErrorPane() {
         Label titleLabel = new Label(Localization.lang("Error"));
-        titleLabel.setStyle("-fx-font-size: 1.5em;-fx-font-weight: bold;-fx-text-fill: -fx-accent;");
+        titleLabel.setStyle(
+                "-fx-font-size: 1.5em;-fx-font-weight: bold;-fx-text-fill: -fx-accent;");
         Text errorMessageText = new Text();
         errorMessageText.textProperty().bind(viewModel.searchErrorProperty());
         VBox errorMessageBox = new VBox(30, titleLabel, errorMessageText);
diff --git a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java
index b4fa51069b37..4b039f93e94d 100644
--- a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.entryeditor;
 
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.Optional;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyListWrapper;
@@ -16,6 +10,10 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
+import org.apache.commons.io.filefilter.FileFilterUtils;
+import org.apache.commons.io.filefilter.IOFileFilter;
+import org.apache.commons.io.monitor.FileAlterationListener;
+import org.apache.commons.io.monitor.FileAlterationObserver;
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.GuiPreferences;
@@ -30,14 +28,15 @@
 import org.jabref.model.texparser.LatexParserResult;
 import org.jabref.model.texparser.LatexParserResults;
 import org.jabref.model.util.DirectoryMonitorManager;
-
-import org.apache.commons.io.filefilter.FileFilterUtils;
-import org.apache.commons.io.filefilter.IOFileFilter;
-import org.apache.commons.io.monitor.FileAlterationListener;
-import org.apache.commons.io.monitor.FileAlterationObserver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Optional;
+
 public class LatexCitationsTabViewModel extends AbstractViewModel {
 
     public enum Status {
@@ -49,7 +48,10 @@ public enum Status {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LatexCitationsTabViewModel.class);
     private static final String TEX_EXT = ".tex";
-    private static final IOFileFilter FILE_FILTER = FileFilterUtils.or(FileFilterUtils.suffixFileFilter(TEX_EXT), FileFilterUtils.directoryFileFilter());
+    private static final IOFileFilter FILE_FILTER =
+            FileFilterUtils.or(
+                    FileFilterUtils.suffixFileFilter(TEX_EXT),
+                    FileFilterUtils.directoryFileFilter());
     private final BibDatabaseContext databaseContext;
     private final GuiPreferences preferences;
     private final DialogService dialogService;
@@ -65,16 +67,27 @@ public enum Status {
     private FileAlterationObserver observer;
     private BibEntry currentEntry;
 
-    public LatexCitationsTabViewModel(BibDatabaseContext databaseContext,
-                                      GuiPreferences preferences,
-                                      DialogService dialogService,
-                                      DirectoryMonitorManager directoryMonitorManager) {
+    public LatexCitationsTabViewModel(
+            BibDatabaseContext databaseContext,
+            GuiPreferences preferences,
+            DialogService dialogService,
+            DirectoryMonitorManager directoryMonitorManager) {
 
         this.databaseContext = databaseContext;
         this.preferences = preferences;
         this.dialogService = dialogService;
-        this.directory = new SimpleObjectProperty<>(databaseContext.getMetaData().getLatexFileDirectory(preferences.getFilePreferences().getUserAndHost())
-                                                                   .orElse(FileUtil.getInitialDirectory(databaseContext, preferences.getFilePreferences().getWorkingDirectory())));
+        this.directory =
+                new SimpleObjectProperty<>(
+                        databaseContext
+                                .getMetaData()
+                                .getLatexFileDirectory(
+                                        preferences.getFilePreferences().getUserAndHost())
+                                .orElse(
+                                        FileUtil.getInitialDirectory(
+                                                databaseContext,
+                                                preferences
+                                                        .getFilePreferences()
+                                                        .getWorkingDirectory())));
 
         this.citationList = FXCollections.observableArrayList();
         this.status = new SimpleObjectProperty<>(Status.IN_PROGRESS);
@@ -141,16 +154,13 @@ public void onFileChange(File file) {
             }
 
             @Override
-            public void onDirectoryChange(File directory) {
-            }
+            public void onDirectoryChange(File directory) {}
 
             @Override
-            public void onDirectoryCreate(File directory) {
-            }
+            public void onDirectoryCreate(File directory) {}
 
             @Override
-            public void onDirectoryDelete(File directory) {
-            }
+            public void onDirectoryDelete(File directory) {}
         };
     }
 
@@ -171,24 +181,40 @@ public void bindToEntry(BibEntry entry) {
                 updateStatus();
             }
         } else {
-            searchError.set(Localization.lang("Selected entry does not have an associated citation key."));
+            searchError.set(
+                    Localization.lang("Selected entry does not have an associated citation key."));
             status.set(Status.ERROR);
         }
     }
 
     public void setLatexDirectory() {
-        DirectoryDialogConfiguration directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(directory.get()).build();
-
-        dialogService.showDirectorySelectionDialog(directoryDialogConfiguration).ifPresent(selectedDirectory ->
-                databaseContext.getMetaData().setLatexFileDirectory(preferences.getFilePreferences().getUserAndHost(), selectedDirectory.toAbsolutePath()));
+        DirectoryDialogConfiguration directoryDialogConfiguration =
+                new DirectoryDialogConfiguration.Builder()
+                        .withInitialDirectory(directory.get())
+                        .build();
+
+        dialogService
+                .showDirectorySelectionDialog(directoryDialogConfiguration)
+                .ifPresent(
+                        selectedDirectory ->
+                                databaseContext
+                                        .getMetaData()
+                                        .setLatexFileDirectory(
+                                                preferences.getFilePreferences().getUserAndHost(),
+                                                selectedDirectory.toAbsolutePath()));
 
         checkAndUpdateDirectory();
     }
 
     private void checkAndUpdateDirectory() {
-        Path newDirectory = databaseContext.getMetaData().getLatexFileDirectory(preferences.getFilePreferences().getUserAndHost())
-                                           .orElse(FileUtil.getInitialDirectory(databaseContext, preferences.getFilePreferences().getWorkingDirectory()));
+        Path newDirectory =
+                databaseContext
+                        .getMetaData()
+                        .getLatexFileDirectory(preferences.getFilePreferences().getUserAndHost())
+                        .orElse(
+                                FileUtil.getInitialDirectory(
+                                        databaseContext,
+                                        preferences.getFilePreferences().getWorkingDirectory()));
 
         if (!newDirectory.equals(directory.get())) {
             status.set(Status.IN_PROGRESS);
@@ -204,16 +230,20 @@ private void checkAndUpdateDirectory() {
     }
 
     private void updateStatus() {
-        UiTaskExecutor.runInJavaFXThread(() -> {
-            if (!Files.exists(directory.get())) {
-                searchError.set(Localization.lang("Current search directory does not exist: %0", directory.get()));
-                status.set(Status.ERROR);
-            } else if (citationList.isEmpty()) {
-                status.set(Status.NO_RESULTS);
-            } else {
-                status.set(Status.CITATIONS_FOUND);
-            }
-        });
+        UiTaskExecutor.runInJavaFXThread(
+                () -> {
+                    if (!Files.exists(directory.get())) {
+                        searchError.set(
+                                Localization.lang(
+                                        "Current search directory does not exist: %0",
+                                        directory.get()));
+                        status.set(Status.ERROR);
+                    } else if (citationList.isEmpty()) {
+                        status.set(Status.NO_RESULTS);
+                    } else {
+                        status.set(Status.CITATIONS_FOUND);
+                    }
+                });
     }
 
     public ObjectProperty<Path> directoryProperty() {
diff --git a/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java b/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java
index 59118f0240e6..ea62f9302038 100644
--- a/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.Optional;
-
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.StackPane;
@@ -13,6 +11,8 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.MathSciNetId;
 
+import java.util.Optional;
+
 public class MathSciNetTab extends EntryEditorTab {
 
     public static final String NAME = "MathSciNet Review";
@@ -38,15 +38,20 @@ private StackPane getPane(BibEntry entry) {
         root.getChildren().addAll(browser, progress);
 
         Optional<MathSciNetId> mathSciNetId = getMathSciNetId(entry);
-        mathSciNetId.flatMap(MathSciNetId::getExternalURI)
-                    .ifPresent(url -> browser.getEngine().load(url.toASCIIString()));
+        mathSciNetId
+                .flatMap(MathSciNetId::getExternalURI)
+                .ifPresent(url -> browser.getEngine().load(url.toASCIIString()));
 
         // Hide progress indicator if finished (over 70% loaded)
-        browser.getEngine().getLoadWorker().progressProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue.doubleValue() >= 0.7) {
-                progress.setVisible(false);
-            }
-        });
+        browser.getEngine()
+                .getLoadWorker()
+                .progressProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            if (newValue.doubleValue() >= 0.7) {
+                                progress.setVisible(false);
+                            }
+                        });
         return root;
     }
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/OpenEntryEditorAction.java b/src/main/java/org/jabref/gui/entryeditor/OpenEntryEditorAction.java
index 367582154016..59921980ea61 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OpenEntryEditorAction.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OpenEntryEditorAction.java
@@ -1,12 +1,12 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.function.Supplier;
-
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 
+import java.util.function.Supplier;
+
 public class OpenEntryEditorAction extends SimpleCommand {
 
     private final Supplier<LibraryTab> tabSupplier;
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
index 0d59a31bbf90..ce10e5eb77b4 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.LinkedHashSet;
-import java.util.Optional;
-import java.util.SequencedSet;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.Tooltip;
 
 import org.jabref.gui.DialogService;
@@ -28,26 +22,34 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.search.SearchQuery;
 
+import java.util.LinkedHashSet;
+import java.util.Optional;
+import java.util.SequencedSet;
+
+import javax.swing.undo.UndoManager;
+
 public class OptionalFieldsTabBase extends FieldsEditorTab {
     private final BibEntryTypesManager entryTypesManager;
     private final boolean isImportantOptionalFields;
 
-    public OptionalFieldsTabBase(String title,
-                                 boolean isImportantOptionalFields,
-                                 BibDatabaseContext databaseContext,
-                                 SuggestionProviders suggestionProviders,
-                                 UndoManager undoManager,
-                                 UndoAction undoAction,
-                                 RedoAction redoAction,
-                                 DialogService dialogService,
-                                 GuiPreferences preferences,
-                                 ThemeManager themeManager,
-                                 BibEntryTypesManager entryTypesManager,
-                                 TaskExecutor taskExecutor,
-                                 JournalAbbreviationRepository journalAbbreviationRepository,
-                                 LuceneManager luceneManager,
-                                 OptionalObjectProperty<SearchQuery> searchQueryProperty) {
-        super(true,
+    public OptionalFieldsTabBase(
+            String title,
+            boolean isImportantOptionalFields,
+            BibDatabaseContext databaseContext,
+            SuggestionProviders suggestionProviders,
+            UndoManager undoManager,
+            UndoAction undoAction,
+            RedoAction redoAction,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            ThemeManager themeManager,
+            BibEntryTypesManager entryTypesManager,
+            TaskExecutor taskExecutor,
+            JournalAbbreviationRepository journalAbbreviationRepository,
+            LuceneManager luceneManager,
+            OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+        super(
+                true,
                 databaseContext,
                 suggestionProviders,
                 undoManager,
diff --git a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
index 5fda93688853..0ddeb70d5089 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
@@ -1,15 +1,5 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.SequencedSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.Tooltip;
 
 import org.jabref.gui.DialogService;
@@ -35,26 +25,38 @@
 import org.jabref.model.entry.field.UserSpecificCommentField;
 import org.jabref.model.search.SearchQuery;
 
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.SequencedSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
+
 public class OtherFieldsTab extends FieldsEditorTab {
 
     public static final String NAME = "Other fields";
     private final List<Field> customTabsFieldNames;
     private final BibEntryTypesManager entryTypesManager;
 
-    public OtherFieldsTab(BibDatabaseContext databaseContext,
-                          SuggestionProviders suggestionProviders,
-                          UndoManager undoManager,
-                          UndoAction undoAction,
-                          RedoAction redoAction,
-                          DialogService dialogService,
-                          GuiPreferences preferences,
-                          ThemeManager themeManager,
-                          BibEntryTypesManager entryTypesManager,
-                          TaskExecutor taskExecutor,
-                          JournalAbbreviationRepository journalAbbreviationRepository,
-                          LuceneManager luceneManager,
-                          OptionalObjectProperty<SearchQuery> searchQueryProperty) {
-        super(false,
+    public OtherFieldsTab(
+            BibDatabaseContext databaseContext,
+            SuggestionProviders suggestionProviders,
+            UndoManager undoManager,
+            UndoAction undoAction,
+            RedoAction redoAction,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            ThemeManager themeManager,
+            BibEntryTypesManager entryTypesManager,
+            TaskExecutor taskExecutor,
+            JournalAbbreviationRepository journalAbbreviationRepository,
+            LuceneManager luceneManager,
+            OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+        super(
+                false,
                 databaseContext,
                 suggestionProviders,
                 undoManager,
@@ -70,7 +72,11 @@ public OtherFieldsTab(BibDatabaseContext databaseContext,
 
         this.entryTypesManager = entryTypesManager;
         this.customTabsFieldNames = new ArrayList<>();
-        preferences.getEntryEditorPreferences().getEntryEditorTabs().values().forEach(customTabsFieldNames::addAll);
+        preferences
+                .getEntryEditorPreferences()
+                .getEntryEditorTabs()
+                .values()
+                .forEach(customTabsFieldNames::addAll);
 
         setText(Localization.lang("Other fields"));
         setTooltip(new Tooltip(Localization.lang("Show remaining fields")));
@@ -85,9 +91,10 @@ protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
             // Get all required and optional fields configured for the entry
             Set<Field> allKnownFields = entryType.get().getAllFields();
             // Remove all fields being required or optional
-            SequencedSet<Field> otherFields = entry.getFields().stream()
-                                          .filter(field -> !allKnownFields.contains(field))
-                                          .collect(Collectors.toCollection(LinkedHashSet::new));
+            SequencedSet<Field> otherFields =
+                    entry.getFields().stream()
+                            .filter(field -> !allKnownFields.contains(field))
+                            .collect(Collectors.toCollection(LinkedHashSet::new));
             // The key field is in the required tab, but has a special treatment
             otherFields.remove(InternalField.KEY_FIELD);
             // Remove all fields contained in JabRef's tab "Deprecated"
diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java b/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java
index aa98a5b7e24d..3418b34c7239 100644
--- a/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java
@@ -1,21 +1,25 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.function.Supplier;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
 
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import java.util.function.Supplier;
 
 public class PreviewSwitchAction extends SimpleCommand {
 
-    public enum Direction { PREVIOUS, NEXT }
+    public enum Direction {
+        PREVIOUS,
+        NEXT
+    }
 
     private final Supplier<LibraryTab> tabSupplier;
     private final Direction direction;
 
-    public PreviewSwitchAction(Direction direction, Supplier<LibraryTab> tabSupplier, StateManager stateManager) {
+    public PreviewSwitchAction(
+            Direction direction, Supplier<LibraryTab> tabSupplier, StateManager stateManager) {
         this.tabSupplier = tabSupplier;
         this.direction = direction;
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
index 52b51b67b7e0..ba3ac762b55c 100644
--- a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
@@ -24,13 +24,14 @@ public class PreviewTab extends EntryEditorTab implements OffersPreview {
     private final OptionalObjectProperty<SearchQuery> searchQueryProperty;
     private PreviewPanel previewPanel;
 
-    public PreviewTab(BibDatabaseContext databaseContext,
-                      DialogService dialogService,
-                      GuiPreferences preferences,
-                      ThemeManager themeManager,
-                      TaskExecutor taskExecutor,
-                      LuceneManager luceneManager,
-                      OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+    public PreviewTab(
+            BibDatabaseContext databaseContext,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            ThemeManager themeManager,
+            TaskExecutor taskExecutor,
+            LuceneManager luceneManager,
+            OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
         this.preferences = preferences;
@@ -65,7 +66,16 @@ public boolean shouldShow(BibEntry entry) {
     @Override
     protected void bindToEntry(BibEntry entry) {
         if (previewPanel == null) {
-            previewPanel = new PreviewPanel(databaseContext, dialogService, preferences.getKeyBindingRepository(), preferences, themeManager, taskExecutor, luceneManager, searchQueryProperty);
+            previewPanel =
+                    new PreviewPanel(
+                            databaseContext,
+                            dialogService,
+                            preferences.getKeyBindingRepository(),
+                            preferences,
+                            themeManager,
+                            taskExecutor,
+                            luceneManager,
+                            searchQueryProperty);
             setContent(previewPanel);
         }
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
index dba05a35317e..54f432108f67 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.entryeditor;
 
-import java.io.IOException;
-import java.util.List;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.DoubleBinding;
 import javafx.scene.control.Button;
@@ -31,10 +28,12 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.List;
+
 /**
  * Tab displaying article recommendations based on the currently selected BibEntry
  */
@@ -51,11 +50,12 @@ public class RelatedArticlesTab extends EntryEditorTab {
 
     private final GuiPreferences preferences;
 
-    public RelatedArticlesTab(BuildInfo buildInfo,
-                              BibDatabaseContext databaseContext,
-                              GuiPreferences preferences,
-                              DialogService dialogService,
-                              TaskExecutor taskExecutor) {
+    public RelatedArticlesTab(
+            BuildInfo buildInfo,
+            BibDatabaseContext databaseContext,
+            GuiPreferences preferences,
+            DialogService dialogService,
+            TaskExecutor taskExecutor) {
         this.databaseContext = databaseContext;
 
         this.dialogService = dialogService;
@@ -80,24 +80,29 @@ private StackPane getRelatedArticlesPane(BibEntry entry) {
         ProgressIndicator progress = new ProgressIndicator();
         progress.setMaxSize(100, 100);
 
-        MrDLibFetcher fetcher = new MrDLibFetcher(
-                preferences.getWorkspacePreferences().getLanguage().name(),
-                buildInfo.version,
-                preferences.getMrDlibPreferences());
-        BackgroundTask
-                .wrap(() -> fetcher.performSearch(entry))
+        MrDLibFetcher fetcher =
+                new MrDLibFetcher(
+                        preferences.getWorkspacePreferences().getLanguage().name(),
+                        buildInfo.version,
+                        preferences.getMrDlibPreferences());
+        BackgroundTask.wrap(() -> fetcher.performSearch(entry))
                 .onRunning(() -> progress.setVisible(true))
-                .onSuccess(relatedArticles -> {
-                    ImportCleanup cleanup = ImportCleanup.targeting(databaseContext.getMode(), preferences.getFieldPreferences());
-                    cleanup.doPostCleanup(relatedArticles);
-                    progress.setVisible(false);
-                    root.getChildren().add(getRelatedArticleInfo(relatedArticles, fetcher));
-                })
-                .onFailure(exception -> {
-                    LOGGER.error("Error while fetching from Mr. DLib", exception);
-                    progress.setVisible(false);
-                    root.getChildren().add(getErrorInfo());
-                })
+                .onSuccess(
+                        relatedArticles -> {
+                            ImportCleanup cleanup =
+                                    ImportCleanup.targeting(
+                                            databaseContext.getMode(),
+                                            preferences.getFieldPreferences());
+                            cleanup.doPostCleanup(relatedArticles);
+                            progress.setVisible(false);
+                            root.getChildren().add(getRelatedArticleInfo(relatedArticles, fetcher));
+                        })
+                .onFailure(
+                        exception -> {
+                            LOGGER.error("Error while fetching from Mr. DLib", exception);
+                            progress.setVisible(false);
+                            root.getChildren().add(getErrorInfo());
+                        })
                 .executeWith(taskExecutor);
 
         root.getChildren().add(progress);
@@ -138,19 +143,29 @@ private ScrollPane getRelatedArticleInfo(List<BibEntry> list, MrDLibFetcher fetc
 
             Hyperlink titleLink = new Hyperlink(title);
             Text journalText = new Text(journal);
-            journalText.setFont(Font.font(Font.getDefault().getFamily(), FontPosture.ITALIC, Font.getDefault().getSize()));
+            journalText.setFont(
+                    Font.font(
+                            Font.getDefault().getFamily(),
+                            FontPosture.ITALIC,
+                            Font.getDefault().getSize()));
             Text authorsText = new Text(authors);
             Text yearText = new Text("(" + year + ")");
-            titleLink.setOnAction(event -> {
-                if (entry.getField(StandardField.URL).isPresent()) {
-                    try {
-                        NativeDesktop.openBrowser(entry.getField(StandardField.URL).get(), preferences.getExternalApplicationsPreferences());
-                    } catch (IOException e) {
-                        LOGGER.error("Error opening the browser to: {}", entry.getField(StandardField.URL).get(), e);
-                        dialogService.showErrorDialogAndWait(e);
-                    }
-                }
-            });
+            titleLink.setOnAction(
+                    event -> {
+                        if (entry.getField(StandardField.URL).isPresent()) {
+                            try {
+                                NativeDesktop.openBrowser(
+                                        entry.getField(StandardField.URL).get(),
+                                        preferences.getExternalApplicationsPreferences());
+                            } catch (IOException e) {
+                                LOGGER.error(
+                                        "Error opening the browser to: {}",
+                                        entry.getField(StandardField.URL).get(),
+                                        e);
+                                dialogService.showErrorDialogAndWait(e);
+                            }
+                        }
+                    });
 
             hBox.getChildren().addAll(titleLink, journalText, authorsText, yearText);
             vBox.getChildren().add(hBox);
@@ -170,7 +185,10 @@ private ScrollPane getErrorInfo() {
         VBox vBox = new VBox();
         vBox.setSpacing(20.0);
 
-        Text descriptionText = new Text(Localization.lang("No recommendations received from Mr. DLib for this entry."));
+        Text descriptionText =
+                new Text(
+                        Localization.lang(
+                                "No recommendations received from Mr. DLib for this entry."));
         descriptionText.getStyleClass().add("description");
         vBox.getChildren().add(descriptionText);
         scrollPane.setContent(vBox);
@@ -199,44 +217,76 @@ private ScrollPane getPrivacyDialog(BibEntry entry) {
 
         DoubleBinding rootWidth = Bindings.subtract(root.widthProperty(), 88d);
 
-        Text line1 = new Text(Localization.lang("JabRef requests recommendations from Mr. DLib, which is an external service. To enable Mr. DLib to calculate recommendations, some of your data must be shared with Mr. DLib. Generally, the more data is shared the better recommendations can be calculated. However, we understand that some of your data in JabRef is sensitive, and you may not want to share it. Therefore, Mr. DLib offers a choice of which data you would like to share."));
+        Text line1 =
+                new Text(
+                        Localization.lang(
+                                "JabRef requests recommendations from Mr. DLib, which is an external service. To enable Mr. DLib to calculate recommendations, some of your data must be shared with Mr. DLib. Generally, the more data is shared the better recommendations can be calculated. However, we understand that some of your data in JabRef is sensitive, and you may not want to share it. Therefore, Mr. DLib offers a choice of which data you would like to share."));
         line1.wrappingWidthProperty().bind(rootWidth);
-        Text line2 = new Text(Localization.lang("Whatever option you choose, Mr. DLib may share its data with research partners to further improve recommendation quality as part of a 'living lab'. Mr. DLib may also release public datasets that may contain anonymized information about you and the recommendations (sensitive information such as metadata of your articles will be anonymised through e.g. hashing). Research partners are obliged to adhere to the same strict data protection policy as Mr. DLib."));
+        Text line2 =
+                new Text(
+                        Localization.lang(
+                                "Whatever option you choose, Mr. DLib may share its data with research partners to further improve recommendation quality as part of a 'living lab'. Mr. DLib may also release public datasets that may contain anonymized information about you and the recommendations (sensitive information such as metadata of your articles will be anonymised through e.g. hashing). Research partners are obliged to adhere to the same strict data protection policy as Mr. DLib."));
         line2.wrappingWidthProperty().bind(rootWidth);
-        Text line3 = new Text(Localization.lang("This setting may be changed in preferences at any time."));
+        Text line3 =
+                new Text(
+                        Localization.lang(
+                                "This setting may be changed in preferences at any time."));
         line3.wrappingWidthProperty().bind(rootWidth);
-        Hyperlink mdlLink = new Hyperlink(Localization.lang("Further information about Mr. DLib for JabRef users."));
-        mdlLink.setOnAction(event -> {
-            try {
-                NativeDesktop.openBrowser("http://mr-dlib.org/information-for-users/information-about-mr-dlib-for-jabref-users/", preferences.getExternalApplicationsPreferences());
-            } catch (IOException e) {
-                LOGGER.error("Error opening the browser to Mr. DLib information page.", e);
-                dialogService.showErrorDialogAndWait(e);
-            }
-        });
+        Hyperlink mdlLink =
+                new Hyperlink(
+                        Localization.lang("Further information about Mr. DLib for JabRef users."));
+        mdlLink.setOnAction(
+                event -> {
+                    try {
+                        NativeDesktop.openBrowser(
+                                "http://mr-dlib.org/information-for-users/information-about-mr-dlib-for-jabref-users/",
+                                preferences.getExternalApplicationsPreferences());
+                    } catch (IOException e) {
+                        LOGGER.error("Error opening the browser to Mr. DLib information page.", e);
+                        dialogService.showErrorDialogAndWait(e);
+                    }
+                });
         VBox vb = new VBox();
-        CheckBox cbTitle = new CheckBox(Localization.lang("Entry Title (Required to deliver recommendations.)"));
+        CheckBox cbTitle =
+                new CheckBox(
+                        Localization.lang("Entry Title (Required to deliver recommendations.)"));
         cbTitle.setSelected(true);
         cbTitle.setDisable(true);
-        CheckBox cbVersion = new CheckBox(Localization.lang("JabRef Version (Required to ensure backwards compatibility with Mr. DLib's Web Service)"));
+        CheckBox cbVersion =
+                new CheckBox(
+                        Localization.lang(
+                                "JabRef Version (Required to ensure backwards compatibility with Mr. DLib's Web Service)"));
         cbVersion.setSelected(true);
         cbVersion.setDisable(true);
-        CheckBox cbLanguage = new CheckBox(Localization.lang("JabRef Language (Provides for better recommendations by giving an indication of user's preferred language.)"));
-        CheckBox cbOS = new CheckBox(Localization.lang("Operating System (Provides for better recommendations by giving an indication of user's system set-up.)"));
-        CheckBox cbTimezone = new CheckBox(Localization.lang("Timezone (Provides for better recommendations by indicating the time of day the request is being made.)"));
+        CheckBox cbLanguage =
+                new CheckBox(
+                        Localization.lang(
+                                "JabRef Language (Provides for better recommendations by giving an indication of user's preferred language.)"));
+        CheckBox cbOS =
+                new CheckBox(
+                        Localization.lang(
+                                "Operating System (Provides for better recommendations by giving an indication of user's system set-up.)"));
+        CheckBox cbTimezone =
+                new CheckBox(
+                        Localization.lang(
+                                "Timezone (Provides for better recommendations by indicating the time of day the request is being made.)"));
         vb.getChildren().addAll(cbTitle, cbVersion, cbLanguage, cbOS, cbTimezone);
         vb.setSpacing(10);
 
-        button.setOnAction(event -> {
-            MrDlibPreferences mrDlibPreferences = preferences.getMrDlibPreferences();
-            mrDlibPreferences.setAcceptRecommendations(true);
-            mrDlibPreferences.setSendLanguage(cbLanguage.isSelected());
-            mrDlibPreferences.setSendOs(cbOS.isSelected());
-            mrDlibPreferences.setSendTimezone(cbTimezone.isSelected());
-
-            dialogService.showWarningDialogAndWait(Localization.lang("Restart"), Localization.lang("Please restart JabRef for preferences to take effect."));
-            setContent(getRelatedArticlesPane(entry));
-        });
+        button.setOnAction(
+                event -> {
+                    MrDlibPreferences mrDlibPreferences = preferences.getMrDlibPreferences();
+                    mrDlibPreferences.setAcceptRecommendations(true);
+                    mrDlibPreferences.setSendLanguage(cbLanguage.isSelected());
+                    mrDlibPreferences.setSendOs(cbOS.isSelected());
+                    mrDlibPreferences.setSendTimezone(cbTimezone.isSelected());
+
+                    dialogService.showWarningDialogAndWait(
+                            Localization.lang("Restart"),
+                            Localization.lang(
+                                    "Please restart JabRef for preferences to take effect."));
+                    setContent(getRelatedArticlesPane(entry));
+                });
 
         vbox.getChildren().addAll(title, line1, line2, mdlLink, line3, vb, button);
         root.setContent(vbox);
diff --git a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
index 5966c329fdae..869f1e9613e8 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.LinkedHashSet;
-import java.util.Optional;
-import java.util.SequencedSet;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.Tooltip;
 
 import org.jabref.gui.DialogService;
@@ -29,26 +23,45 @@
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.search.SearchQuery;
 
+import java.util.LinkedHashSet;
+import java.util.Optional;
+import java.util.SequencedSet;
+
+import javax.swing.undo.UndoManager;
+
 public class RequiredFieldsTab extends FieldsEditorTab {
 
     public static final String NAME = "Required fields";
     private final BibEntryTypesManager entryTypesManager;
 
-    public RequiredFieldsTab(BibDatabaseContext databaseContext,
-                             SuggestionProviders suggestionProviders,
-                             UndoManager undoManager,
-                             UndoAction undoAction,
-                             RedoAction redoAction,
-                             DialogService dialogService,
-                             GuiPreferences preferences,
-                             ThemeManager themeManager,
-                             BibEntryTypesManager entryTypesManager,
-                             TaskExecutor taskExecutor,
-                             JournalAbbreviationRepository journalAbbreviationRepository,
-                             LuceneManager luceneManager,
-                             OptionalObjectProperty<SearchQuery> searchQueryProperty) {
-        super(false, databaseContext, suggestionProviders, undoManager, undoAction, redoAction, dialogService,
-                preferences, themeManager, taskExecutor, journalAbbreviationRepository, luceneManager, searchQueryProperty);
+    public RequiredFieldsTab(
+            BibDatabaseContext databaseContext,
+            SuggestionProviders suggestionProviders,
+            UndoManager undoManager,
+            UndoAction undoAction,
+            RedoAction redoAction,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            ThemeManager themeManager,
+            BibEntryTypesManager entryTypesManager,
+            TaskExecutor taskExecutor,
+            JournalAbbreviationRepository journalAbbreviationRepository,
+            LuceneManager luceneManager,
+            OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+        super(
+                false,
+                databaseContext,
+                suggestionProviders,
+                undoManager,
+                undoAction,
+                redoAction,
+                dialogService,
+                preferences,
+                themeManager,
+                taskExecutor,
+                journalAbbreviationRepository,
+                luceneManager,
+                searchQueryProperty);
         this.entryTypesManager = entryTypesManager;
         setText(Localization.lang("Required fields"));
         setTooltip(new Tooltip(Localization.lang("Show required fields")));
@@ -57,7 +70,8 @@ public RequiredFieldsTab(BibDatabaseContext databaseContext,
 
     @Override
     protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
-        Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
+        Optional<BibEntryType> entryType =
+                entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
         SequencedSet<Field> fields = new LinkedHashSet<>();
         if (entryType.isPresent()) {
             for (OrFields orFields : entryType.get().getRequiredFields()) {
diff --git a/src/main/java/org/jabref/gui/entryeditor/SciteTab.java b/src/main/java/org/jabref/gui/entryeditor/SciteTab.java
index 9ea4a9ad71fa..0fa9f70c7449 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SciteTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SciteTab.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.entryeditor;
 
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.geometry.HPos;
 import javafx.scene.control.Hyperlink;
@@ -14,6 +12,7 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 
+import org.controlsfx.control.HyperlinkLabel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.preferences.GuiPreferences;
@@ -21,8 +20,9 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntry;
 
-import com.tobiasdiez.easybind.EasyBind;
-import org.controlsfx.control.HyperlinkLabel;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 
 /**
  * @implNote This tab is called <code>SciteTab</code>, because it uses the service <code>**scite** aI</code>.
@@ -38,7 +38,8 @@ public class SciteTab extends EntryEditorTab {
     private final GuiPreferences preferences;
     private final DialogService dialogService;
 
-    public SciteTab(GuiPreferences preferences, TaskExecutor taskExecutor, DialogService dialogService) {
+    public SciteTab(
+            GuiPreferences preferences, TaskExecutor taskExecutor, DialogService dialogService) {
         this.preferences = preferences;
         this.viewModel = new SciteTabViewModel(preferences, taskExecutor);
         this.dialogService = dialogService;
@@ -61,17 +62,22 @@ private void setSciteResultsPane() {
         sciteResultsPane.setId("scitePane");
         setContent(sciteResultsPane);
 
-        EasyBind.subscribe(viewModel.statusProperty(), status -> {
-            sciteResultsPane.getChildren().clear();
-            switch (status) {
-                case IN_PROGRESS ->
-                        sciteResultsPane.add(progressIndicator, 0, 0);
-                case FOUND ->
-                        viewModel.getCurrentResult().ifPresent(result -> sciteResultsPane.add(getTalliesPane(result), 0, 0));
-                case ERROR ->
-                        sciteResultsPane.add(getErrorPane(), 0, 0);
-            }
-        });
+        EasyBind.subscribe(
+                viewModel.statusProperty(),
+                status -> {
+                    sciteResultsPane.getChildren().clear();
+                    switch (status) {
+                        case IN_PROGRESS -> sciteResultsPane.add(progressIndicator, 0, 0);
+                        case FOUND ->
+                                viewModel
+                                        .getCurrentResult()
+                                        .ifPresent(
+                                                result ->
+                                                        sciteResultsPane.add(
+                                                                getTalliesPane(result), 0, 0));
+                        case ERROR -> sciteResultsPane.add(getErrorPane(), 0, 0);
+                    }
+                });
     }
 
     @Override
@@ -96,15 +102,18 @@ private VBox getErrorPane() {
     private VBox getTalliesPane(SciteTallyModel tallModel) {
         Label titleLabel = new Label(Localization.lang("Tallies for %0", tallModel.doi()));
         titleLabel.getStyleClass().add("scite-tallies-label");
-        Text message = new Text("Total Citations: %d\nSupporting: %d\nContradicting: %d\nMentioning: %d\nUnclassified: %d\nCiting Publications: %d".formatted(
-                tallModel.total(),
-                tallModel.supporting(),
-                tallModel.contradicting(),
-                tallModel.mentioning(),
-                tallModel.unclassified(),
-                tallModel.citingPublications()
-        ));
-        String url = SCITE_REPORTS_URL_BASE + URLEncoder.encode(tallModel.doi(), StandardCharsets.UTF_8);
+        Text message =
+                new Text(
+                        "Total Citations: %d\nSupporting: %d\nContradicting: %d\nMentioning: %d\nUnclassified: %d\nCiting Publications: %d"
+                                .formatted(
+                                        tallModel.total(),
+                                        tallModel.supporting(),
+                                        tallModel.contradicting(),
+                                        tallModel.mentioning(),
+                                        tallModel.unclassified(),
+                                        tallModel.citingPublications()));
+        String url =
+                SCITE_REPORTS_URL_BASE + URLEncoder.encode(tallModel.doi(), StandardCharsets.UTF_8);
         VBox messageBox = getMessageBox(url, titleLabel, message);
         messageBox.getStyleClass().add("scite-message-box");
         return messageBox;
@@ -112,20 +121,25 @@ private VBox getTalliesPane(SciteTallyModel tallModel) {
 
     private VBox getMessageBox(String url, Label titleLabel, Text message) {
         HyperlinkLabel link = new HyperlinkLabel(Localization.lang("See full report at [%0]", url));
-        link.setOnAction(event -> {
-            if (event.getSource() instanceof Hyperlink) {
-                try {
-                    NativeDesktop.openBrowser(url, preferences.getExternalApplicationsPreferences());
-                } catch (IOException ioex) {
-                    // Can't throw a checked exception from here, so display a message to the user instead.
-                    dialogService.showErrorDialogAndWait(
-                    "An error occurred opening web browser",
-                "JabRef was unable to open a web browser for link:\n\n" + url + "\n\nError Message:\n\n" + ioex.getMessage(),
-                        ioex
-                    );
-                }
-            }
-        });
+        link.setOnAction(
+                event -> {
+                    if (event.getSource() instanceof Hyperlink) {
+                        try {
+                            NativeDesktop.openBrowser(
+                                    url, preferences.getExternalApplicationsPreferences());
+                        } catch (IOException ioex) {
+                            // Can't throw a checked exception from here, so display a message to
+                            // the user instead.
+                            dialogService.showErrorDialogAndWait(
+                                    "An error occurred opening web browser",
+                                    "JabRef was unable to open a web browser for link:\n\n"
+                                            + url
+                                            + "\n\nError Message:\n\n"
+                                            + ioex.getMessage(),
+                                    ioex);
+                        }
+                    }
+                });
 
         return new VBox(30, titleLabel, message, link);
     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/SciteTabViewModel.java b/src/main/java/org/jabref/gui/entryeditor/SciteTabViewModel.java
index e592062bc93c..dc86be565714 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SciteTabViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SciteTabViewModel.java
@@ -1,17 +1,12 @@
 package org.jabref.gui.entryeditor;
 
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Optional;
-import java.util.concurrent.Future;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
+import kong.unirest.core.json.JSONObject;
+
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.logic.importer.FetcherException;
@@ -21,11 +16,16 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.identifier.DOI;
-
-import kong.unirest.core.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Optional;
+import java.util.concurrent.Future;
+
 public class SciteTabViewModel extends AbstractViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SciteTabViewModel.class);
@@ -73,17 +73,20 @@ public void bindToEntry(BibEntry entry) {
             return;
         }
 
-        searchTask = BackgroundTask.wrap(() -> fetchTallies(entry.getDOI().get()))
-                                   .onRunning(() -> status.set(SciteStatus.IN_PROGRESS))
-                                   .onSuccess(result -> {
-                                       currentResult = Optional.of(result);
-                                       status.set(SciteStatus.FOUND);
-                                   })
-                                   .onFailure(error -> {
-                                       searchError.set(error.getMessage());
-                                       status.set(SciteStatus.ERROR);
-                                   })
-                                   .executeWith(taskExecutor);
+        searchTask =
+                BackgroundTask.wrap(() -> fetchTallies(entry.getDOI().get()))
+                        .onRunning(() -> status.set(SciteStatus.IN_PROGRESS))
+                        .onSuccess(
+                                result -> {
+                                    currentResult = Optional.of(result);
+                                    status.set(SciteStatus.FOUND);
+                                })
+                        .onFailure(
+                                error -> {
+                                    searchError.set(error.getMessage());
+                                    status.set(SciteStatus.ERROR);
+                                })
+                        .executeWith(taskExecutor);
     }
 
     private void cancelSearch() {
diff --git a/src/main/java/org/jabref/gui/entryeditor/SciteTallyModel.java b/src/main/java/org/jabref/gui/entryeditor/SciteTallyModel.java
index b4f747064284..52d39bf9a0dc 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SciteTallyModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SciteTallyModel.java
@@ -28,7 +28,6 @@ public static SciteTallyModel fromJSONObject(JSONObject jsonObject) {
                 jsonObject.getInt("contradicting"),
                 jsonObject.getInt("mentioning"),
                 jsonObject.getInt("unclassified"),
-                jsonObject.getInt("citingPublications")
-        );
+                jsonObject.getInt("citingPublications"));
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
index 26cf33bb55aa..0ef6ed201fc3 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
@@ -1,15 +1,8 @@
 package org.jabref.gui.entryeditor;
 
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.swing.undo.UndoManager;
+import de.saxsys.mvvmfx.utils.validation.ObservableRuleBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
 
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.ObjectProperty;
@@ -20,6 +13,8 @@
 import javafx.scene.input.InputMethodRequests;
 import javafx.scene.input.KeyEvent;
 
+import org.fxmisc.flowless.VirtualizedScrollPane;
+import org.fxmisc.richtext.CodeArea;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.SimpleCommand;
@@ -51,15 +46,20 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.search.SearchQuery;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import de.saxsys.mvvmfx.utils.validation.ObservableRuleBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import org.fxmisc.flowless.VirtualizedScrollPane;
-import org.fxmisc.richtext.CodeArea;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.swing.undo.UndoManager;
+
 public class SourceTab extends EntryEditorTab {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SourceTab.class);
@@ -97,18 +97,20 @@ public void execute() {
         }
     }
 
-    public SourceTab(BibDatabaseContext bibDatabaseContext,
-                     CountingUndoManager undoManager,
-                     FieldPreferences fieldPreferences,
-                     ImportFormatPreferences importFormatPreferences,
-                     FileUpdateMonitor fileMonitor,
-                     DialogService dialogService,
-                     BibEntryTypesManager entryTypesManager,
-                     KeyBindingRepository keyBindingRepository,
-                     OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+    public SourceTab(
+            BibDatabaseContext bibDatabaseContext,
+            CountingUndoManager undoManager,
+            FieldPreferences fieldPreferences,
+            ImportFormatPreferences importFormatPreferences,
+            FileUpdateMonitor fileMonitor,
+            DialogService dialogService,
+            BibEntryTypesManager entryTypesManager,
+            KeyBindingRepository keyBindingRepository,
+            OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         this.mode = bibDatabaseContext.getMode();
         this.setText(Localization.lang("%0 source", mode.getFormattedName()));
-        this.setTooltip(new Tooltip(Localization.lang("Show/edit %0 source", mode.getFormattedName())));
+        this.setTooltip(
+                new Tooltip(Localization.lang("Show/edit %0 source", mode.getFormattedName())));
         this.setGraphic(IconTheme.JabRefIcons.SOURCE.getGraphicNode());
         this.undoManager = undoManager;
         this.fieldPreferences = fieldPreferences;
@@ -118,10 +120,11 @@ public SourceTab(BibDatabaseContext bibDatabaseContext,
         this.entryTypesManager = entryTypesManager;
         this.keyBindingRepository = keyBindingRepository;
 
-        searchQueryProperty.addListener((observable, oldValue, newValue) -> {
-            searchHighlightPattern = newValue.flatMap(SearchQuery::getPatternForWords);
-            highlightSearchPattern();
-        });
+        searchQueryProperty.addListener(
+                (observable, oldValue, newValue) -> {
+                    searchHighlightPattern = newValue.flatMap(SearchQuery::getPatternForWords);
+                    highlightSearchPattern();
+                });
     }
 
     private void highlightSearchPattern() {
@@ -138,7 +141,9 @@ private void highlightSearchPattern() {
         }
     }
 
-    private String getSourceString(BibEntry entry, BibDatabaseMode type, FieldPreferences fieldPreferences) throws IOException {
+    private String getSourceString(
+            BibEntry entry, BibDatabaseMode type, FieldPreferences fieldPreferences)
+            throws IOException {
         StringWriter writer = new StringWriter();
         BibWriter bibWriter = new BibWriter(writer, OS.NEWLINE);
         FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(fieldPreferences);
@@ -162,8 +167,7 @@ public int getLocationOffset(int x, int y) {
         }
 
         @Override
-        public void cancelLatestCommittedText() {
-        }
+        public void cancelLatestCommittedText() {}
 
         @Override
         public Point2D getTextLocation(int offset) {
@@ -175,47 +179,75 @@ private void setupSourceEditor() {
         codeArea = new CodeArea();
         codeArea.setWrapText(true);
         codeArea.setInputMethodRequests(new InputMethodRequestsObject());
-        codeArea.setOnInputMethodTextChanged(event -> {
-            String committed = event.getCommitted();
-            if (!committed.isEmpty()) {
-                codeArea.insertText(codeArea.getCaretPosition(), committed);
-            }
-        });
+        codeArea.setOnInputMethodTextChanged(
+                event -> {
+                    String committed = event.getCommitted();
+                    if (!committed.isEmpty()) {
+                        codeArea.insertText(codeArea.getCaretPosition(), committed);
+                    }
+                });
         codeArea.setId("bibtexSourceCodeArea");
-        codeArea.addEventFilter(KeyEvent.KEY_PRESSED, event -> CodeAreaKeyBindings.call(codeArea, event, keyBindingRepository));
+        codeArea.addEventFilter(
+                KeyEvent.KEY_PRESSED,
+                event -> CodeAreaKeyBindings.call(codeArea, event, keyBindingRepository));
         codeArea.addEventFilter(KeyEvent.KEY_PRESSED, this::listenForSaveKeybinding);
 
         ActionFactory factory = new ActionFactory();
         ContextMenu contextMenu = new ContextMenu();
-        contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT)),
-                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY)),
-                factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE)),
-                factory.createMenuItem(StandardActions.SELECT_ALL, new EditAction(StandardActions.SELECT_ALL))
-        );
+        contextMenu
+                .getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.CUT, new EditAction(StandardActions.CUT)),
+                        factory.createMenuItem(
+                                StandardActions.COPY, new EditAction(StandardActions.COPY)),
+                        factory.createMenuItem(
+                                StandardActions.PASTE, new EditAction(StandardActions.PASTE)),
+                        factory.createMenuItem(
+                                StandardActions.SELECT_ALL,
+                                new EditAction(StandardActions.SELECT_ALL)));
 
         contextMenu.getStyleClass().add("context-menu");
         codeArea.setContextMenu(contextMenu);
 
         sourceValidator.addRule(sourceIsValid);
 
-        sourceValidator.getValidationStatus().getMessages().addListener((InvalidationListener) c -> {
-            ValidationStatus sourceValidationStatus = sourceValidator.getValidationStatus();
-            if (!sourceValidationStatus.isValid()) {
-                sourceValidationStatus.getHighestMessage().ifPresent(message -> {
-                    String content = Localization.lang("User input via entry-editor in `{}bibtex source` tab led to failure.")
-                            + "\n" + Localization.lang("Please check your library file for wrong syntax.")
-                            + "\n\n" + message.getMessage();
-                    dialogService.showWarningDialogAndWait(Localization.lang("SourceTab error"), content);
-                });
-            }
-        });
-
-        codeArea.focusedProperty().addListener((obs, oldValue, onFocus) -> {
-            if (!onFocus && (currentEntry != null)) {
-                storeSource(currentEntry, codeArea.textProperty().getValue());
-            }
-        });
+        sourceValidator
+                .getValidationStatus()
+                .getMessages()
+                .addListener(
+                        (InvalidationListener)
+                                c -> {
+                                    ValidationStatus sourceValidationStatus =
+                                            sourceValidator.getValidationStatus();
+                                    if (!sourceValidationStatus.isValid()) {
+                                        sourceValidationStatus
+                                                .getHighestMessage()
+                                                .ifPresent(
+                                                        message -> {
+                                                            String content =
+                                                                    Localization.lang(
+                                                                                    "User input via entry-editor in `{}bibtex source` tab led to failure.")
+                                                                            + "\n"
+                                                                            + Localization.lang(
+                                                                                    "Please check your library file for wrong syntax.")
+                                                                            + "\n\n"
+                                                                            + message.getMessage();
+                                                            dialogService.showWarningDialogAndWait(
+                                                                    Localization.lang(
+                                                                            "SourceTab error"),
+                                                                    content);
+                                                        });
+                                    }
+                                });
+
+        codeArea.focusedProperty()
+                .addListener(
+                        (obs, oldValue, onFocus) -> {
+                            if (!onFocus && (currentEntry != null)) {
+                                storeSource(currentEntry, codeArea.textProperty().getValue());
+                            }
+                        });
         VirtualizedScrollPane<CodeArea> scrollableCodeArea = new VirtualizedScrollPane<>(codeArea);
         this.setContent(scrollableCodeArea);
     }
@@ -226,23 +258,27 @@ public boolean shouldShow(BibEntry entry) {
     }
 
     private void updateCodeArea() {
-        UiTaskExecutor.runAndWaitInJavaFXThread(() -> {
-            if (codeArea == null) {
-                setupSourceEditor();
-            }
+        UiTaskExecutor.runAndWaitInJavaFXThread(
+                () -> {
+                    if (codeArea == null) {
+                        setupSourceEditor();
+                    }
 
-            codeArea.clear();
-            try {
-                codeArea.appendText(getSourceString(currentEntry, mode, fieldPreferences));
-                codeArea.setEditable(true);
-                highlightSearchPattern();
-            } catch (IOException ex) {
-                codeArea.setEditable(false);
-                codeArea.appendText(ex.getMessage() + "\n\n" +
-                        Localization.lang("Correct the entry, and reopen editor to display/edit source."));
-                LOGGER.debug("Incorrect entry", ex);
-            }
-        });
+                    codeArea.clear();
+                    try {
+                        codeArea.appendText(getSourceString(currentEntry, mode, fieldPreferences));
+                        codeArea.setEditable(true);
+                        highlightSearchPattern();
+                    } catch (IOException ex) {
+                        codeArea.setEditable(false);
+                        codeArea.appendText(
+                                ex.getMessage()
+                                        + "\n\n"
+                                        + Localization.lang(
+                                                "Correct the entry, and reopen editor to display/edit source."));
+                        LOGGER.debug("Incorrect entry", ex);
+                    }
+                });
     }
 
     @Override
@@ -255,7 +291,8 @@ protected void bindToEntry(BibEntry entry) {
         updateCodeArea();
 
         entry.typeProperty().addListener(listener -> updateCodeArea());
-        entry.getFieldsObservable().addListener((InvalidationListener) listener -> updateCodeArea());
+        entry.getFieldsObservable()
+                .addListener((InvalidationListener) listener -> updateCodeArea());
     }
 
     private void storeSource(BibEntry outOfFocusEntry, String text) {
@@ -302,7 +339,8 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
                 String fieldValue = field.getValue();
 
                 if (!newEntry.hasField(fieldName)) {
-                    compound.addEdit(new UndoableFieldChange(outOfFocusEntry, fieldName, fieldValue, null));
+                    compound.addEdit(
+                            new UndoableFieldChange(outOfFocusEntry, fieldName, fieldValue, null));
                     outOfFocusEntry.clearField(fieldName);
                 }
             }
@@ -316,14 +354,18 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
                     // Test if the field is legally set.
                     new FieldWriter(fieldPreferences).write(fieldName, newValue);
 
-                    compound.addEdit(new UndoableFieldChange(outOfFocusEntry, fieldName, oldValue, newValue));
+                    compound.addEdit(
+                            new UndoableFieldChange(
+                                    outOfFocusEntry, fieldName, oldValue, newValue));
                     outOfFocusEntry.setField(fieldName, newValue);
                 }
             }
 
             // See if the user has changed the entry type:
             if (!Objects.equals(newEntry.getType(), outOfFocusEntry.getType())) {
-                compound.addEdit(new UndoableChangeType(outOfFocusEntry, outOfFocusEntry.getType(), newEntry.getType()));
+                compound.addEdit(
+                        new UndoableChangeType(
+                                outOfFocusEntry, outOfFocusEntry.getType(), newEntry.getType()));
                 outOfFocusEntry.setType(newEntry.getType());
             }
             compound.end();
@@ -331,19 +373,25 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
 
             sourceIsValid.setValue(null);
         } catch (InvalidFieldValueException | IllegalStateException | IOException ex) {
-            sourceIsValid.setValue(ValidationMessage.error(Localization.lang("Problem with parsing entry") + ": " + ex.getMessage()));
+            sourceIsValid.setValue(
+                    ValidationMessage.error(
+                            Localization.lang("Problem with parsing entry")
+                                    + ": "
+                                    + ex.getMessage()));
             LOGGER.debug("Incorrect source", ex);
         }
     }
 
     private void listenForSaveKeybinding(KeyEvent event) {
-        keyBindingRepository.mapToKeyBinding(event).ifPresent(binding -> {
-
-            switch (binding) {
-                case SAVE_DATABASE, SAVE_ALL, SAVE_DATABASE_AS -> {
-                    storeSource(currentEntry, codeArea.textProperty().getValue());
-                }
-            }
-        });
+        keyBindingRepository
+                .mapToKeyBinding(event)
+                .ifPresent(
+                        binding -> {
+                            switch (binding) {
+                                case SAVE_DATABASE, SAVE_ALL, SAVE_DATABASE_AS -> {
+                                    storeSource(currentEntry, codeArea.textProperty().getValue());
+                                }
+                            }
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
index 3e09cdb59e88..b75da3cfbed0 100644
--- a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.LinkedHashSet;
-import java.util.SequencedSet;
-import java.util.Set;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.icon.IconTheme;
@@ -22,24 +16,44 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.search.SearchQuery;
 
+import java.util.LinkedHashSet;
+import java.util.SequencedSet;
+import java.util.Set;
+
+import javax.swing.undo.UndoManager;
+
 public class UserDefinedFieldsTab extends FieldsEditorTab {
     private final LinkedHashSet<Field> fields;
 
-    public UserDefinedFieldsTab(String name,
-                                Set<Field> fields,
-                                BibDatabaseContext databaseContext,
-                                SuggestionProviders suggestionProviders,
-                                UndoManager undoManager,
-                                UndoAction undoAction,
-                                RedoAction redoAction,
-                                DialogService dialogService,
-                                GuiPreferences preferences,
-                                ThemeManager themeManager,
-                                TaskExecutor taskExecutor,
-                                JournalAbbreviationRepository journalAbbreviationRepository,
-                                LuceneManager luceneManager,
-                                OptionalObjectProperty<SearchQuery> searchQueryProperty) {
-        super(false, databaseContext, suggestionProviders, undoManager, undoAction, redoAction, dialogService, preferences, themeManager, taskExecutor, journalAbbreviationRepository, luceneManager, searchQueryProperty);
+    public UserDefinedFieldsTab(
+            String name,
+            Set<Field> fields,
+            BibDatabaseContext databaseContext,
+            SuggestionProviders suggestionProviders,
+            UndoManager undoManager,
+            UndoAction undoAction,
+            RedoAction redoAction,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            ThemeManager themeManager,
+            TaskExecutor taskExecutor,
+            JournalAbbreviationRepository journalAbbreviationRepository,
+            LuceneManager luceneManager,
+            OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+        super(
+                false,
+                databaseContext,
+                suggestionProviders,
+                undoManager,
+                undoAction,
+                redoAction,
+                dialogService,
+                preferences,
+                themeManager,
+                taskExecutor,
+                journalAbbreviationRepository,
+                luceneManager,
+                searchQueryProperty);
 
         this.fields = new LinkedHashSet<>(fields);
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsCache.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsCache.java
index 55888aa660fa..57d6ea35d1ae 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsCache.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsCache.java
@@ -1,25 +1,28 @@
 package org.jabref.gui.entryeditor.citationrelationtab;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
+import org.eclipse.jgit.util.LRUMap;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.identifier.DOI;
 
-import org.eclipse.jgit.util.LRUMap;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 public class BibEntryRelationsCache {
     private static final Integer MAX_CACHED_ENTRIES = 100;
-    private static final Map<String, List<BibEntry>> CITATIONS_MAP = new LRUMap<>(MAX_CACHED_ENTRIES, MAX_CACHED_ENTRIES);
-    private static final Map<String, List<BibEntry>> REFERENCES_MAP = new LRUMap<>(MAX_CACHED_ENTRIES, MAX_CACHED_ENTRIES);
+    private static final Map<String, List<BibEntry>> CITATIONS_MAP =
+            new LRUMap<>(MAX_CACHED_ENTRIES, MAX_CACHED_ENTRIES);
+    private static final Map<String, List<BibEntry>> REFERENCES_MAP =
+            new LRUMap<>(MAX_CACHED_ENTRIES, MAX_CACHED_ENTRIES);
 
     public List<BibEntry> getCitations(BibEntry entry) {
-        return CITATIONS_MAP.getOrDefault(entry.getDOI().map(DOI::getDOI).orElse(""), Collections.emptyList());
+        return CITATIONS_MAP.getOrDefault(
+                entry.getDOI().map(DOI::getDOI).orElse(""), Collections.emptyList());
     }
 
     public List<BibEntry> getReferences(BibEntry entry) {
-        return REFERENCES_MAP.getOrDefault(entry.getDOI().map(DOI::getDOI).orElse(""), Collections.emptyList());
+        return REFERENCES_MAP.getOrDefault(
+                entry.getDOI().map(DOI::getDOI).orElse(""), Collections.emptyList());
     }
 
     public void cacheOrMergeCitations(BibEntry entry, List<BibEntry> citations) {
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsRepository.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsRepository.java
index f7f29052da27..41d16e425d40 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsRepository.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsRepository.java
@@ -1,21 +1,21 @@
 package org.jabref.gui.entryeditor.citationrelationtab;
 
-import java.util.List;
-
 import org.jabref.gui.entryeditor.citationrelationtab.semanticscholar.SemanticScholarFetcher;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.model.entry.BibEntry;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 public class BibEntryRelationsRepository {
     private static final Logger LOGGER = LoggerFactory.getLogger(BibEntryRelationsRepository.class);
 
     private final SemanticScholarFetcher fetcher;
     private final BibEntryRelationsCache cache;
 
-    public BibEntryRelationsRepository(SemanticScholarFetcher fetcher, BibEntryRelationsCache cache) {
+    public BibEntryRelationsRepository(
+            SemanticScholarFetcher fetcher, BibEntryRelationsCache cache) {
         this.fetcher = fetcher;
         this.cache = cache;
     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryView.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryView.java
index de5bb165576a..b7fb79a5255f 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryView.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryView.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.entryeditor.citationrelationtab;
 
-import java.util.EnumSet;
-
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
@@ -15,6 +13,8 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 
+import java.util.EnumSet;
+
 /**
  * Class to unify the display method of BibEntries in ListViews.
  */
@@ -40,16 +40,15 @@ public static Node getEntryNode(BibEntry entry) {
         Label journal = new Label(entry.getFieldOrAliasLatexFree(StandardField.JOURNAL).orElse(""));
         journal.getStyleClass().add("journal");
 
-        VBox entryContainer = new VBox(
-                new HBox(10, entryType, title),
-                new HBox(5, year, journal),
-                authors
-        );
-        entry.getFieldOrAliasLatexFree(StandardField.ABSTRACT).ifPresent(summaryText -> {
-            TextFlowLimited summary = new TextFlowLimited(new Text(summaryText));
-            summary.getStyleClass().add("summary");
-            entryContainer.getChildren().add(summary);
-        });
+        VBox entryContainer =
+                new VBox(new HBox(10, entryType, title), new HBox(5, year, journal), authors);
+        entry.getFieldOrAliasLatexFree(StandardField.ABSTRACT)
+                .ifPresent(
+                        summaryText -> {
+                            TextFlowLimited summary = new TextFlowLimited(new Text(summaryText));
+                            summary.getStyleClass().add("summary");
+                            entryContainer.getChildren().add(summary);
+                        });
 
         entryContainer.getStyleClass().add("bibEntry");
         return entryContainer;
@@ -62,8 +61,11 @@ public static Node getEntryNode(BibEntry entry) {
      * @return Icon corresponding to {@link EntryType}
      */
     private static IconTheme.JabRefIcons getIcon(EntryType type) {
-        EnumSet<StandardEntryType> crossRefTypes = EnumSet.of(StandardEntryType.InBook,
-                StandardEntryType.InProceedings, StandardEntryType.InCollection);
+        EnumSet<StandardEntryType> crossRefTypes =
+                EnumSet.of(
+                        StandardEntryType.InBook,
+                        StandardEntryType.InProceedings,
+                        StandardEntryType.InCollection);
         if (type == StandardEntryType.Book) {
             return IconTheme.JabRefIcons.BOOK;
         } else if (crossRefTypes.contains(type)) {
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationItem.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationItem.java
index 3ad1017cd330..4866d18b8399 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationItem.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationItem.java
@@ -5,10 +5,7 @@
 /**
  * Class to hold a BibEntry and a boolean value whether it is already in the current database or not.
  */
-public record CitationRelationItem(
-        BibEntry entry,
-        BibEntry localEntry,
-        boolean isLocal) {
+public record CitationRelationItem(BibEntry entry, BibEntry localEntry, boolean isLocal) {
     public CitationRelationItem(BibEntry entry, boolean isLocal) {
         this(entry, null, isLocal);
     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java
index 3ab2a167b9c4..4589eeb55053 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java
@@ -1,12 +1,6 @@
 package org.jabref.gui.entryeditor.citationrelationtab;
 
-import java.io.IOException;
-import java.io.StringWriter;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.undo.UndoManager;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -30,6 +24,9 @@
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 
+import org.controlsfx.control.CheckListView;
+import org.fxmisc.flowless.VirtualizedScrollPane;
+import org.fxmisc.richtext.CodeArea;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
@@ -60,14 +57,17 @@
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import com.tobiasdiez.easybind.EasyBind;
-import org.controlsfx.control.CheckListView;
-import org.fxmisc.flowless.VirtualizedScrollPane;
-import org.fxmisc.richtext.CodeArea;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.StringWriter;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.swing.undo.UndoManager;
+
 /**
  * GUI for tab displaying an articles citation relations in two lists based on the currently selected BibEntry
  */
@@ -90,15 +90,16 @@ public class CitationRelationsTab extends EntryEditorTab {
     private final DuplicateCheck duplicateCheck;
     private final BibEntryTypesManager entryTypesManager;
 
-    public CitationRelationsTab(DialogService dialogService,
-                                BibDatabaseContext databaseContext,
-                                UndoManager undoManager,
-                                StateManager stateManager,
-                                FileUpdateMonitor fileUpdateMonitor,
-                                GuiPreferences preferences,
-                                LibraryTab libraryTab,
-                                TaskExecutor taskExecutor,
-                                BibEntryTypesManager bibEntryTypesManager) {
+    public CitationRelationsTab(
+            DialogService dialogService,
+            BibDatabaseContext databaseContext,
+            UndoManager undoManager,
+            StateManager stateManager,
+            FileUpdateMonitor fileUpdateMonitor,
+            GuiPreferences preferences,
+            LibraryTab libraryTab,
+            TaskExecutor taskExecutor,
+            BibEntryTypesManager bibEntryTypesManager) {
         this.dialogService = dialogService;
         this.databaseContext = databaseContext;
         this.preferences = preferences;
@@ -109,9 +110,19 @@ public CitationRelationsTab(DialogService dialogService,
 
         this.entryTypesManager = bibEntryTypesManager;
         this.duplicateCheck = new DuplicateCheck(entryTypesManager);
-        this.bibEntryRelationsRepository = new BibEntryRelationsRepository(new SemanticScholarFetcher(preferences.getImporterPreferences()),
-                new BibEntryRelationsCache());
-        citationsRelationsTabViewModel = new CitationsRelationsTabViewModel(databaseContext, preferences, undoManager, stateManager, dialogService, fileUpdateMonitor, taskExecutor);
+        this.bibEntryRelationsRepository =
+                new BibEntryRelationsRepository(
+                        new SemanticScholarFetcher(preferences.getImporterPreferences()),
+                        new BibEntryRelationsCache());
+        citationsRelationsTabViewModel =
+                new CitationsRelationsTabViewModel(
+                        databaseContext,
+                        preferences,
+                        undoManager,
+                        stateManager,
+                        dialogService,
+                        fileUpdateMonitor,
+                        taskExecutor);
     }
 
     /**
@@ -170,39 +181,86 @@ private SplitPane getPaneAndStartSearch(BibEntry entry) {
 
         // Create import buttons for both sides
         Button importCitingButton = IconTheme.JabRefIcons.ADD_ENTRY.asButton();
-        importCitingButton.setTooltip(new Tooltip(Localization.lang("Add selected entries to database")));
+        importCitingButton.setTooltip(
+                new Tooltip(Localization.lang("Add selected entries to database")));
         styleTopBarNode(importCitingButton, 50.0);
         Button importCitedByButton = IconTheme.JabRefIcons.ADD_ENTRY.asButton();
-        importCitedByButton.setTooltip(new Tooltip(Localization.lang("Add selected entries to database")));
+        importCitedByButton.setTooltip(
+                new Tooltip(Localization.lang("Add selected entries to database")));
         styleTopBarNode(importCitedByButton, 50.0);
         hideNodes(importCitingButton, importCitedByButton);
 
-        citingHBox.getChildren().addAll(citingLabel, refreshCitingButton, importCitingButton, citingProgress, abortCitingButton);
-        citedByHBox.getChildren().addAll(citedByLabel, refreshCitedByButton, importCitedByButton, citedByProgress, abortCitedButton);
+        citingHBox
+                .getChildren()
+                .addAll(
+                        citingLabel,
+                        refreshCitingButton,
+                        importCitingButton,
+                        citingProgress,
+                        abortCitingButton);
+        citedByHBox
+                .getChildren()
+                .addAll(
+                        citedByLabel,
+                        refreshCitedByButton,
+                        importCitedByButton,
+                        citedByProgress,
+                        abortCitedButton);
 
         VBox.setVgrow(citingListView, Priority.ALWAYS);
         VBox.setVgrow(citedByListView, Priority.ALWAYS);
         citingVBox.getChildren().addAll(citingHBox, citingListView);
         citedByVBox.getChildren().addAll(citedByHBox, citedByListView);
 
-        refreshCitingButton.setOnMouseClicked(event -> {
-            searchForRelations(entry, citingListView, abortCitingButton,
-                    refreshCitingButton, CitationFetcher.SearchType.CITES, importCitingButton, citingProgress, true);
-        });
-
-        refreshCitedByButton.setOnMouseClicked(event -> searchForRelations(entry, citedByListView, abortCitedButton,
-                refreshCitedByButton, CitationFetcher.SearchType.CITED_BY, importCitedByButton, citedByProgress, true));
+        refreshCitingButton.setOnMouseClicked(
+                event -> {
+                    searchForRelations(
+                            entry,
+                            citingListView,
+                            abortCitingButton,
+                            refreshCitingButton,
+                            CitationFetcher.SearchType.CITES,
+                            importCitingButton,
+                            citingProgress,
+                            true);
+                });
+
+        refreshCitedByButton.setOnMouseClicked(
+                event ->
+                        searchForRelations(
+                                entry,
+                                citedByListView,
+                                abortCitedButton,
+                                refreshCitedByButton,
+                                CitationFetcher.SearchType.CITED_BY,
+                                importCitedByButton,
+                                citedByProgress,
+                                true));
 
         // Create SplitPane to hold all nodes above
         SplitPane container = new SplitPane(citingVBox, citedByVBox);
         styleFetchedListView(citedByListView);
         styleFetchedListView(citingListView);
 
-        searchForRelations(entry, citingListView, abortCitingButton, refreshCitingButton,
-                CitationFetcher.SearchType.CITES, importCitingButton, citingProgress, false);
-
-        searchForRelations(entry, citedByListView, abortCitedButton, refreshCitedByButton,
-                CitationFetcher.SearchType.CITED_BY, importCitedByButton, citedByProgress, false);
+        searchForRelations(
+                entry,
+                citingListView,
+                abortCitingButton,
+                refreshCitingButton,
+                CitationFetcher.SearchType.CITES,
+                importCitingButton,
+                citingProgress,
+                false);
+
+        searchForRelations(
+                entry,
+                citedByListView,
+                abortCitedButton,
+                refreshCitedByButton,
+                CitationFetcher.SearchType.CITED_BY,
+                importCitedByButton,
+                citedByProgress,
+                false);
 
         return container;
     }
@@ -215,80 +273,113 @@ private SplitPane getPaneAndStartSearch(BibEntry entry) {
     private void styleFetchedListView(CheckListView<CitationRelationItem> listView) {
         PseudoClass entrySelected = PseudoClass.getPseudoClass("selected");
         new ViewModelListCellFactory<CitationRelationItem>()
-                .withGraphic(entry -> {
-
-                    HBox separator = new HBox();
-                    HBox.setHgrow(separator, Priority.SOMETIMES);
-                    Node entryNode = BibEntryView.getEntryNode(entry.entry());
-                    HBox.setHgrow(entryNode, Priority.ALWAYS);
-                    HBox hContainer = new HBox();
-                    hContainer.prefWidthProperty().bind(listView.widthProperty().subtract(25));
-
-                    VBox vContainer = new VBox();
-
-                    if (entry.isLocal()) {
-                        hContainer.getStyleClass().add("duplicate-entry");
-                        Button jumpTo = IconTheme.JabRefIcons.LINK.asButton();
-                        jumpTo.setTooltip(new Tooltip(Localization.lang("Jump to entry in library")));
-                        jumpTo.getStyleClass().add("addEntryButton");
-                        jumpTo.setOnMouseClicked(event -> {
-                            citingTask.cancel();
-                            citedByTask.cancel();
-                            libraryTab.showAndEdit(entry.localEntry());
-                            libraryTab.clearAndSelect(entry.localEntry());
-                        });
-                        vContainer.getChildren().add(jumpTo);
-                    } else {
-                        ToggleButton addToggle = IconTheme.JabRefIcons.ADD.asToggleButton();
-                        addToggle.setTooltip(new Tooltip(Localization.lang("Select entry")));
-                        EasyBind.subscribe(addToggle.selectedProperty(), selected -> {
-                            if (selected) {
-                                addToggle.setGraphic(IconTheme.JabRefIcons.ADD_FILLED.withColor(IconTheme.SELECTED_COLOR).getGraphicNode());
+                .withGraphic(
+                        entry -> {
+                            HBox separator = new HBox();
+                            HBox.setHgrow(separator, Priority.SOMETIMES);
+                            Node entryNode = BibEntryView.getEntryNode(entry.entry());
+                            HBox.setHgrow(entryNode, Priority.ALWAYS);
+                            HBox hContainer = new HBox();
+                            hContainer
+                                    .prefWidthProperty()
+                                    .bind(listView.widthProperty().subtract(25));
+
+                            VBox vContainer = new VBox();
+
+                            if (entry.isLocal()) {
+                                hContainer.getStyleClass().add("duplicate-entry");
+                                Button jumpTo = IconTheme.JabRefIcons.LINK.asButton();
+                                jumpTo.setTooltip(
+                                        new Tooltip(Localization.lang("Jump to entry in library")));
+                                jumpTo.getStyleClass().add("addEntryButton");
+                                jumpTo.setOnMouseClicked(
+                                        event -> {
+                                            citingTask.cancel();
+                                            citedByTask.cancel();
+                                            libraryTab.showAndEdit(entry.localEntry());
+                                            libraryTab.clearAndSelect(entry.localEntry());
+                                        });
+                                vContainer.getChildren().add(jumpTo);
                             } else {
-                                addToggle.setGraphic(IconTheme.JabRefIcons.ADD.getGraphicNode());
+                                ToggleButton addToggle = IconTheme.JabRefIcons.ADD.asToggleButton();
+                                addToggle.setTooltip(
+                                        new Tooltip(Localization.lang("Select entry")));
+                                EasyBind.subscribe(
+                                        addToggle.selectedProperty(),
+                                        selected -> {
+                                            if (selected) {
+                                                addToggle.setGraphic(
+                                                        IconTheme.JabRefIcons.ADD_FILLED
+                                                                .withColor(IconTheme.SELECTED_COLOR)
+                                                                .getGraphicNode());
+                                            } else {
+                                                addToggle.setGraphic(
+                                                        IconTheme.JabRefIcons.ADD.getGraphicNode());
+                                            }
+                                        });
+                                addToggle.getStyleClass().add("addEntryButton");
+                                addToggle
+                                        .selectedProperty()
+                                        .bindBidirectional(listView.getItemBooleanProperty(entry));
+                                vContainer.getChildren().add(addToggle);
                             }
-                        });
-                        addToggle.getStyleClass().add("addEntryButton");
-                        addToggle.selectedProperty().bindBidirectional(listView.getItemBooleanProperty(entry));
-                        vContainer.getChildren().add(addToggle);
-                    }
-
-                    if (entry.entry().getDOI().isPresent() || entry.entry().getField(StandardField.URL).isPresent()) {
-                        Button openWeb = IconTheme.JabRefIcons.OPEN_LINK.asButton();
-                        openWeb.setTooltip(new Tooltip(Localization.lang("Open URL or DOI")));
-                        openWeb.setOnMouseClicked(event -> {
-                            String url = entry.entry().getDOI().flatMap(DOI::getExternalURI).map(URI::toString)
-                                              .or(() -> entry.entry().getField(StandardField.URL)).orElse("");
-                            if (StringUtil.isNullOrEmpty(url)) {
-                                return;
+
+                            if (entry.entry().getDOI().isPresent()
+                                    || entry.entry().getField(StandardField.URL).isPresent()) {
+                                Button openWeb = IconTheme.JabRefIcons.OPEN_LINK.asButton();
+                                openWeb.setTooltip(
+                                        new Tooltip(Localization.lang("Open URL or DOI")));
+                                openWeb.setOnMouseClicked(
+                                        event -> {
+                                            String url =
+                                                    entry.entry()
+                                                            .getDOI()
+                                                            .flatMap(DOI::getExternalURI)
+                                                            .map(URI::toString)
+                                                            .or(
+                                                                    () ->
+                                                                            entry.entry()
+                                                                                    .getField(
+                                                                                            StandardField
+                                                                                                    .URL))
+                                                            .orElse("");
+                                            if (StringUtil.isNullOrEmpty(url)) {
+                                                return;
+                                            }
+                                            try {
+                                                NativeDesktop.openBrowser(
+                                                        url,
+                                                        preferences
+                                                                .getExternalApplicationsPreferences());
+                                            } catch (IOException ex) {
+                                                dialogService.notify(
+                                                        Localization.lang("Unable to open link."));
+                                            }
+                                        });
+                                vContainer.getChildren().addLast(openWeb);
                             }
-                            try {
-                                NativeDesktop.openBrowser(url, preferences.getExternalApplicationsPreferences());
-                            } catch (IOException ex) {
-                                dialogService.notify(Localization.lang("Unable to open link."));
+
+                            Button showEntrySource = IconTheme.JabRefIcons.SOURCE.asButton();
+                            showEntrySource.setTooltip(
+                                    new Tooltip(Localization.lang("%0 source", "BibTeX")));
+                            showEntrySource.setOnMouseClicked(
+                                    event -> {
+                                        showEntrySourceDialog(entry.entry());
+                                    });
+
+                            vContainer.getChildren().addLast(showEntrySource);
+
+                            hContainer.getChildren().addAll(entryNode, separator, vContainer);
+                            hContainer.getStyleClass().add("entry-container");
+
+                            return hContainer;
+                        })
+                .withOnMouseClickedEvent(
+                        (ee, event) -> {
+                            if (!ee.isLocal()) {
+                                listView.getCheckModel().toggleCheckState(ee);
                             }
-                        });
-                        vContainer.getChildren().addLast(openWeb);
-                    }
-
-                    Button showEntrySource = IconTheme.JabRefIcons.SOURCE.asButton();
-                    showEntrySource.setTooltip(new Tooltip(Localization.lang("%0 source", "BibTeX")));
-                    showEntrySource.setOnMouseClicked(event -> {
-                        showEntrySourceDialog(entry.entry());
-                    });
-
-                    vContainer.getChildren().addLast(showEntrySource);
-
-                    hContainer.getChildren().addAll(entryNode, separator, vContainer);
-                    hContainer.getStyleClass().add("entry-container");
-
-                    return hContainer;
-                })
-                .withOnMouseClickedEvent((ee, event) -> {
-                    if (!ee.isLocal()) {
-                        listView.getCheckModel().toggleCheckState(ee);
-                    }
-                })
+                        })
                 .withPseudoClass(entrySelected, listView::getItemBooleanProperty)
                 .install(listView);
 
@@ -298,7 +389,12 @@ private void styleFetchedListView(CheckListView<CitationRelationItem> listView)
     /**
      * @implNote This code is similar to {@link PreviewWithSourceTab#getSourceString(BibEntry, BibDatabaseMode, FieldPreferences, BibEntryTypesManager)}.
      */
-    private String getSourceString(BibEntry entry, BibDatabaseMode type, FieldPreferences fieldPreferences, BibEntryTypesManager entryTypesManager) throws IOException {
+    private String getSourceString(
+            BibEntry entry,
+            BibDatabaseMode type,
+            FieldPreferences fieldPreferences,
+            BibEntryTypesManager entryTypesManager)
+            throws IOException {
         StringWriter writer = new StringWriter();
         BibWriter bibWriter = new BibWriter(writer, OS.NEWLINE);
         FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(fieldPreferences);
@@ -309,7 +405,12 @@ private String getSourceString(BibEntry entry, BibDatabaseMode type, FieldPrefer
     private void showEntrySourceDialog(BibEntry entry) {
         CodeArea ca = new CodeArea();
         try {
-            ca.appendText(getSourceString(entry, databaseContext.getMode(), preferences.getFieldPreferences(), this.entryTypesManager));
+            ca.appendText(
+                    getSourceString(
+                            entry,
+                            databaseContext.getMode(),
+                            preferences.getFieldPreferences(),
+                            this.entryTypesManager));
         } catch (IOException e) {
             LOGGER.warn("Incorrect entry, could not load source:", e);
             return;
@@ -383,15 +484,23 @@ protected void bindToEntry(BibEntry entry) {
      * @param refreshButton refresh Button to use
      * @param searchType    type of search (CITING / CITEDBY)
      */
-    private void searchForRelations(BibEntry entry, CheckListView<CitationRelationItem> listView, Button abortButton,
-                                    Button refreshButton, CitationFetcher.SearchType searchType, Button importButton,
-                                    ProgressIndicator progress, boolean shouldRefresh) {
+    private void searchForRelations(
+            BibEntry entry,
+            CheckListView<CitationRelationItem> listView,
+            Button abortButton,
+            Button refreshButton,
+            CitationFetcher.SearchType searchType,
+            Button importButton,
+            ProgressIndicator progress,
+            boolean shouldRefresh) {
         if (entry.getDOI().isEmpty()) {
             hideNodes(abortButton, progress);
             showNodes(refreshButton);
             listView.getItems().clear();
             listView.setPlaceholder(
-                    new Label(Localization.lang("The selected entry doesn't have a DOI linked to it. Lookup a DOI and try again.")));
+                    new Label(
+                            Localization.lang(
+                                    "The selected entry doesn't have a DOI linked to it. Lookup a DOI and try again.")));
             return;
         }
 
@@ -399,64 +508,103 @@ private void searchForRelations(BibEntry entry, CheckListView<CitationRelationIt
 
         listView.setItems(observableList);
 
-        if (citingTask != null && !citingTask.isCancelled() && searchType == CitationFetcher.SearchType.CITES) {
+        if (citingTask != null
+                && !citingTask.isCancelled()
+                && searchType == CitationFetcher.SearchType.CITES) {
             citingTask.cancel();
-        } else if (citedByTask != null && !citedByTask.isCancelled() && searchType == CitationFetcher.SearchType.CITED_BY) {
+        } else if (citedByTask != null
+                && !citedByTask.isCancelled()
+                && searchType == CitationFetcher.SearchType.CITED_BY) {
             citedByTask.cancel();
         }
 
         BackgroundTask<List<BibEntry>> task;
 
         if (searchType == CitationFetcher.SearchType.CITES) {
-            task = BackgroundTask.wrap(() -> {
-                if (shouldRefresh) {
-                    bibEntryRelationsRepository.forceRefreshReferences(entry);
-                }
-                return bibEntryRelationsRepository.getReferences(entry);
-            });
+            task =
+                    BackgroundTask.wrap(
+                            () -> {
+                                if (shouldRefresh) {
+                                    bibEntryRelationsRepository.forceRefreshReferences(entry);
+                                }
+                                return bibEntryRelationsRepository.getReferences(entry);
+                            });
             citingTask = task;
         } else {
-            task = BackgroundTask.wrap(() -> {
-                if (shouldRefresh) {
-                    bibEntryRelationsRepository.forceRefreshCitations(entry);
-                }
-                return bibEntryRelationsRepository.getCitations(entry);
-            });
+            task =
+                    BackgroundTask.wrap(
+                            () -> {
+                                if (shouldRefresh) {
+                                    bibEntryRelationsRepository.forceRefreshCitations(entry);
+                                }
+                                return bibEntryRelationsRepository.getCitations(entry);
+                            });
             citedByTask = task;
         }
 
-        task.onRunning(() -> prepareToSearchForRelations(abortButton, refreshButton, importButton, progress, task))
-            .onSuccess(fetchedList -> onSearchForRelationsSucceed(entry, listView, abortButton, refreshButton,
-                    searchType, importButton, progress, fetchedList, observableList))
-            .onFailure(exception -> {
-                LOGGER.error("Error while fetching citing Articles", exception);
-                hideNodes(abortButton, progress, importButton);
-                listView.setPlaceholder(new Label(Localization.lang("Error while fetching citing entries: %0",
-                        exception.getMessage())));
-
-                refreshButton.setVisible(true);
-                dialogService.notify(exception.getMessage());
-            })
-            .executeWith(taskExecutor);
+        task.onRunning(
+                        () ->
+                                prepareToSearchForRelations(
+                                        abortButton, refreshButton, importButton, progress, task))
+                .onSuccess(
+                        fetchedList ->
+                                onSearchForRelationsSucceed(
+                                        entry,
+                                        listView,
+                                        abortButton,
+                                        refreshButton,
+                                        searchType,
+                                        importButton,
+                                        progress,
+                                        fetchedList,
+                                        observableList))
+                .onFailure(
+                        exception -> {
+                            LOGGER.error("Error while fetching citing Articles", exception);
+                            hideNodes(abortButton, progress, importButton);
+                            listView.setPlaceholder(
+                                    new Label(
+                                            Localization.lang(
+                                                    "Error while fetching citing entries: %0",
+                                                    exception.getMessage())));
+
+                            refreshButton.setVisible(true);
+                            dialogService.notify(exception.getMessage());
+                        })
+                .executeWith(taskExecutor);
     }
 
-    private void onSearchForRelationsSucceed(BibEntry entry, CheckListView<CitationRelationItem> listView,
-                                             Button abortButton, Button refreshButton,
-                                             CitationFetcher.SearchType searchType, Button importButton,
-                                             ProgressIndicator progress, List<BibEntry> fetchedList,
-                                             ObservableList<CitationRelationItem> observableList) {
+    private void onSearchForRelationsSucceed(
+            BibEntry entry,
+            CheckListView<CitationRelationItem> listView,
+            Button abortButton,
+            Button refreshButton,
+            CitationFetcher.SearchType searchType,
+            Button importButton,
+            ProgressIndicator progress,
+            List<BibEntry> fetchedList,
+            ObservableList<CitationRelationItem> observableList) {
         hideNodes(abortButton, progress);
 
         observableList.setAll(
-        fetchedList.stream()
-            .map(entr -> duplicateCheck.containsDuplicate(
-                    databaseContext.getDatabase(),
-                    entr,
-                    BibDatabaseModeDetection.inferMode(databaseContext.getDatabase()))
-                .map(localEntry -> new CitationRelationItem(entr, localEntry, true))
-                .orElseGet(() -> new CitationRelationItem(entr, false)))
-            .toList()
-    );
+                fetchedList.stream()
+                        .map(
+                                entr ->
+                                        duplicateCheck
+                                                .containsDuplicate(
+                                                        databaseContext.getDatabase(),
+                                                        entr,
+                                                        BibDatabaseModeDetection.inferMode(
+                                                                databaseContext.getDatabase()))
+                                                .map(
+                                                        localEntry ->
+                                                                new CitationRelationItem(
+                                                                        entr, localEntry, true))
+                                                .orElseGet(
+                                                        () ->
+                                                                new CitationRelationItem(
+                                                                        entr, false)))
+                        .toList());
 
         if (!observableList.isEmpty()) {
             listView.refresh();
@@ -466,21 +614,29 @@ private void onSearchForRelationsSucceed(BibEntry entry, CheckListView<CitationR
         }
         BooleanBinding booleanBind = Bindings.isEmpty(listView.getCheckModel().getCheckedItems());
         importButton.disableProperty().bind(booleanBind);
-        importButton.setOnMouseClicked(event -> importEntries(listView.getCheckModel().getCheckedItems(), searchType, entry));
+        importButton.setOnMouseClicked(
+                event ->
+                        importEntries(
+                                listView.getCheckModel().getCheckedItems(), searchType, entry));
         showNodes(refreshButton, importButton);
     }
 
-    private void prepareToSearchForRelations(Button abortButton, Button refreshButton, Button importButton,
-                                             ProgressIndicator progress, BackgroundTask<List<BibEntry>> task) {
+    private void prepareToSearchForRelations(
+            Button abortButton,
+            Button refreshButton,
+            Button importButton,
+            ProgressIndicator progress,
+            BackgroundTask<List<BibEntry>> task) {
         showNodes(abortButton, progress);
         hideNodes(refreshButton, importButton);
 
-        abortButton.setOnAction(event -> {
-            hideNodes(abortButton, progress, importButton);
-            showNodes(refreshButton);
-            task.cancel();
-            dialogService.notify(Localization.lang("Search aborted!"));
-        });
+        abortButton.setOnAction(
+                event -> {
+                    hideNodes(abortButton, progress, importButton);
+                    showNodes(refreshButton);
+                    task.cancel();
+                    dialogService.notify(Localization.lang("Search aborted!"));
+                });
     }
 
     private void hideNodes(Node... nodes) {
@@ -496,12 +652,18 @@ private void showNodes(Node... nodes) {
      *
      * @param entriesToImport entries to import
      */
-    private void importEntries(List<CitationRelationItem> entriesToImport, CitationFetcher.SearchType searchType, BibEntry existingEntry) {
+    private void importEntries(
+            List<CitationRelationItem> entriesToImport,
+            CitationFetcher.SearchType searchType,
+            BibEntry existingEntry) {
         citingTask.cancel();
         citedByTask.cancel();
 
         citationsRelationsTabViewModel.importEntries(entriesToImport, searchType, existingEntry);
 
-        dialogService.notify(Localization.lang("Number of entries successfully imported") + ": " + entriesToImport.size());
+        dialogService.notify(
+                Localization.lang("Number of entries successfully imported")
+                        + ": "
+                        + entriesToImport.size());
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModel.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModel.java
index 7ae52965b8f4..009477801bec 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModel.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.entryeditor.citationrelationtab;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.entryeditor.citationrelationtab.semanticscholar.CitationFetcher;
@@ -19,6 +13,12 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.util.FileUpdateMonitor;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
+
 public class CitationsRelationsTabViewModel {
 
     private final BibDatabaseContext databaseContext;
@@ -29,7 +29,14 @@ public class CitationsRelationsTabViewModel {
     private final FileUpdateMonitor fileUpdateMonitor;
     private final TaskExecutor taskExecutor;
 
-    public CitationsRelationsTabViewModel(BibDatabaseContext databaseContext, GuiPreferences preferences, UndoManager undoManager, StateManager stateManager, DialogService dialogService, FileUpdateMonitor fileUpdateMonitor, TaskExecutor taskExecutor) {
+    public CitationsRelationsTabViewModel(
+            BibDatabaseContext databaseContext,
+            GuiPreferences preferences,
+            UndoManager undoManager,
+            StateManager stateManager,
+            DialogService dialogService,
+            FileUpdateMonitor fileUpdateMonitor,
+            TaskExecutor taskExecutor) {
         this.databaseContext = databaseContext;
         this.preferences = preferences;
         this.undoManager = undoManager;
@@ -39,17 +46,21 @@ public CitationsRelationsTabViewModel(BibDatabaseContext databaseContext, GuiPre
         this.taskExecutor = taskExecutor;
     }
 
-    public void importEntries(List<CitationRelationItem> entriesToImport, CitationFetcher.SearchType searchType, BibEntry existingEntry) {
+    public void importEntries(
+            List<CitationRelationItem> entriesToImport,
+            CitationFetcher.SearchType searchType,
+            BibEntry existingEntry) {
         List<BibEntry> entries = entriesToImport.stream().map(CitationRelationItem::entry).toList();
 
-        ImportHandler importHandler = new ImportHandler(
-                databaseContext,
-                preferences,
-                fileUpdateMonitor,
-                undoManager,
-                stateManager,
-                dialogService,
-                taskExecutor);
+        ImportHandler importHandler =
+                new ImportHandler(
+                        databaseContext,
+                        preferences,
+                        fileUpdateMonitor,
+                        undoManager,
+                        stateManager,
+                        dialogService,
+                        taskExecutor);
 
         switch (searchType) {
             case CITES -> importCites(entries, existingEntry, importHandler);
@@ -57,10 +68,14 @@ public void importEntries(List<CitationRelationItem> entriesToImport, CitationFe
         }
     }
 
-    private void importCites(List<BibEntry> entries, BibEntry existingEntry, ImportHandler importHandler) {
-        CitationKeyPatternPreferences citationKeyPatternPreferences = preferences.getCitationKeyPatternPreferences();
-        CitationKeyGenerator generator = new CitationKeyGenerator(databaseContext, citationKeyPatternPreferences);
-        boolean generateNewKeyOnImport = preferences.getImporterPreferences().generateNewKeyOnImportProperty().get();
+    private void importCites(
+            List<BibEntry> entries, BibEntry existingEntry, ImportHandler importHandler) {
+        CitationKeyPatternPreferences citationKeyPatternPreferences =
+                preferences.getCitationKeyPatternPreferences();
+        CitationKeyGenerator generator =
+                new CitationKeyGenerator(databaseContext, citationKeyPatternPreferences);
+        boolean generateNewKeyOnImport =
+                preferences.getImporterPreferences().generateNewKeyOnImportProperty().get();
 
         List<String> citeKeys = getExistingEntriesFromCiteField(existingEntry);
         citeKeys.removeIf(String::isEmpty);
@@ -77,23 +92,30 @@ private void importCites(List<BibEntry> entries, BibEntry existingEntry, ImportH
         importHandler.importEntries(entries);
     }
 
-    private void importCitedBy(List<BibEntry> entries, BibEntry existingEntry, ImportHandler importHandler) {
-        CitationKeyPatternPreferences citationKeyPatternPreferences = preferences.getCitationKeyPatternPreferences();
-        CitationKeyGenerator generator = new CitationKeyGenerator(databaseContext, citationKeyPatternPreferences);
-        boolean generateNewKeyOnImport = preferences.getImporterPreferences().generateNewKeyOnImportProperty().get();
+    private void importCitedBy(
+            List<BibEntry> entries, BibEntry existingEntry, ImportHandler importHandler) {
+        CitationKeyPatternPreferences citationKeyPatternPreferences =
+                preferences.getCitationKeyPatternPreferences();
+        CitationKeyGenerator generator =
+                new CitationKeyGenerator(databaseContext, citationKeyPatternPreferences);
+        boolean generateNewKeyOnImport =
+                preferences.getImporterPreferences().generateNewKeyOnImportProperty().get();
 
         for (BibEntry entryThatCitesOurExistingEntry : entries) {
-            List<String> existingCites = getExistingEntriesFromCiteField(entryThatCitesOurExistingEntry);
+            List<String> existingCites =
+                    getExistingEntriesFromCiteField(entryThatCitesOurExistingEntry);
             existingCites.removeIf(String::isEmpty);
             String key;
-            if (generateNewKeyOnImport || entryThatCitesOurExistingEntry.getCitationKey().isEmpty()) {
+            if (generateNewKeyOnImport
+                    || entryThatCitesOurExistingEntry.getCitationKey().isEmpty()) {
                 key = generator.generateKey(entryThatCitesOurExistingEntry);
                 entryThatCitesOurExistingEntry.setCitationKey(key);
             } else {
                 key = existingEntry.getCitationKey().get();
             }
             addToKeyToList(existingCites, key);
-            entryThatCitesOurExistingEntry.setField(StandardField.CITES, toCommaSeparatedString(existingCites));
+            entryThatCitesOurExistingEntry.setField(
+                    StandardField.CITES, toCommaSeparatedString(existingCites));
         }
 
         importHandler.importEntries(entries);
@@ -106,7 +128,8 @@ private void addToKeyToList(List<String> list, String key) {
     }
 
     private List<String> getExistingEntriesFromCiteField(BibEntry entry) {
-        return Arrays.stream(entry.getField(StandardField.CITES).orElse("").split(",")).collect(Collectors.toList());
+        return Arrays.stream(entry.getField(StandardField.CITES).orElse("").split(","))
+                .collect(Collectors.toList());
     }
 
     private String toCommaSeparatedString(List<String> citeentries) {
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationFetcher.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationFetcher.java
index 1b87c7ab0bb2..230a61ec79d5 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationFetcher.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationFetcher.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.entryeditor.citationrelationtab.semanticscholar;
 
-import java.util.List;
-
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.model.entry.BibEntry;
 
+import java.util.List;
+
 /**
  * Searches web resources for citing related articles based on a {@link BibEntry}.
  */
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/PaperDetails.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/PaperDetails.java
index 58ba269616e5..26eb40554a58 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/PaperDetails.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/PaperDetails.java
@@ -1,14 +1,14 @@
 package org.jabref.gui.entryeditor.citationrelationtab.semanticscholar;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import com.google.gson.annotations.SerializedName;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 
-import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 public class PaperDetails {
     private String paperId;
@@ -17,6 +17,7 @@ public class PaperDetails {
 
     @SerializedName("abstract")
     private String abstr;
+
     private String url;
     private int citationCount;
     private int referenceCount;
@@ -94,30 +95,18 @@ public String getPublicationType() {
             return "Article";
         } else {
             return switch (publicationTypes.getFirst()) {
-                case "Review" ->
-                        "Misc";
-                case "CaseReport" ->
-                        "Report";
-                case "ClinicalTrial" ->
-                        "Report";
-                case "Dataset" ->
-                        "Dataset";
-                case "Editorial" ->
-                        "Misc";
-                case "LettersAndComments" ->
-                        "Misc";
-                case "MetaAnalysis" ->
-                        "Article";
-                case "News" ->
-                        "Misc";
-                case "Study" ->
-                        "Article";
-                case "Book" ->
-                        "Book";
-                case "BookSection" ->
-                        "InBook";
-                default ->
-                        "Misc";
+                case "Review" -> "Misc";
+                case "CaseReport" -> "Report";
+                case "ClinicalTrial" -> "Report";
+                case "Dataset" -> "Dataset";
+                case "Editorial" -> "Misc";
+                case "LettersAndComments" -> "Misc";
+                case "MetaAnalysis" -> "Article";
+                case "News" -> "Misc";
+                case "Study" -> "Article";
+                case "Book" -> "Book";
+                case "BookSection" -> "InBook";
+                default -> "Misc";
             };
         }
     }
@@ -127,7 +116,8 @@ public String getDOI() {
             if (externalIds.containsKey("DOI")) {
                 return externalIds.get("DOI");
             } else if (externalIds.containsKey("ArXiv")) {
-                // Some ArXiv articles don't return the DOI, even though it's easy to obtain from the ArXiv ID
+                // Some ArXiv articles don't return the DOI, even though it's easy to obtain from
+                // the ArXiv ID
                 return "10.48550/arXiv." + externalIds.get("ArXiv");
             }
         }
@@ -141,9 +131,10 @@ public BibEntry toBibEntry() {
             bibEntry.setField(StandardField.YEAR, getYear());
         }
 
-        String authors = getAuthors().stream()
-                                     .map(AuthorResponse::getName)
-                                     .collect(Collectors.joining(" and "));
+        String authors =
+                getAuthors().stream()
+                        .map(AuthorResponse::getName)
+                        .collect(Collectors.joining(" and "));
         bibEntry.setField(StandardField.AUTHOR, authors);
 
         bibEntry.setType(StandardEntryType.valueOf(getPublicationType()));
@@ -165,12 +156,20 @@ public BibEntry toBibEntry() {
 
     @Override
     public String toString() {
-        return "PaperDetails{" +
-                "paperId='" + paperId + '\'' +
-                ", title='" + title + '\'' +
-                ", year='" + year + '\'' +
-                ", citationCount=" + citationCount +
-                ", referenceCount=" + referenceCount +
-                '}';
+        return "PaperDetails{"
+                + "paperId='"
+                + paperId
+                + '\''
+                + ", title='"
+                + title
+                + '\''
+                + ", year='"
+                + year
+                + '\''
+                + ", citationCount="
+                + citationCount
+                + ", referenceCount="
+                + referenceCount
+                + '}';
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/SemanticScholarFetcher.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/SemanticScholarFetcher.java
index 557a135741e0..c3db36154875 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/SemanticScholarFetcher.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/SemanticScholarFetcher.java
@@ -1,9 +1,6 @@
 package org.jabref.gui.entryeditor.citationrelationtab.semanticscholar;
 
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
+import com.google.gson.Gson;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImporterPreferences;
@@ -12,7 +9,10 @@
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.model.entry.BibEntry;
 
-import com.google.gson.Gson;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.List;
 
 public class SemanticScholarFetcher implements CitationFetcher, CustomizableKeyFetcher {
     private static final String SEMANTIC_SCHOLAR_API = "https://api.semanticscholar.org/graph/v1/";
@@ -26,8 +26,14 @@ public SemanticScholarFetcher(ImporterPreferences importerPreferences) {
     }
 
     public String getAPIUrl(String entry_point, BibEntry entry) {
-        return SEMANTIC_SCHOLAR_API + "paper/" + "DOI:" + entry.getDOI().orElseThrow().getDOI() + "/" + entry_point
-                + "?fields=" + "title,authors,year,citationCount,referenceCount,externalIds,publicationTypes,abstract,url"
+        return SEMANTIC_SCHOLAR_API
+                + "paper/"
+                + "DOI:"
+                + entry.getDOI().orElseThrow().getDOI()
+                + "/"
+                + entry_point
+                + "?fields="
+                + "title,authors,year,citationCount,referenceCount,externalIds,publicationTypes,abstract,url"
                 + "&limit=1000";
     }
 
@@ -49,12 +55,13 @@ public List<BibEntry> searchCitedBy(BibEntry entry) throws FetcherException {
         if (!apiKey.isEmpty()) {
             urlDownload.addHeader("x-api-key", apiKey);
         }
-        CitationsResponse citationsResponse = new Gson()
-                .fromJson(urlDownload.asString(), CitationsResponse.class);
+        CitationsResponse citationsResponse =
+                new Gson().fromJson(urlDownload.asString(), CitationsResponse.class);
 
-        return citationsResponse.getData()
-                                .stream().filter(citationDataItem -> citationDataItem.getCitingPaper() != null)
-                                .map(citationDataItem -> citationDataItem.getCitingPaper().toBibEntry()).toList();
+        return citationsResponse.getData().stream()
+                .filter(citationDataItem -> citationDataItem.getCitingPaper() != null)
+                .map(citationDataItem -> citationDataItem.getCitingPaper().toBibEntry())
+                .toList();
     }
 
     @Override
@@ -75,13 +82,13 @@ public List<BibEntry> searchCiting(BibEntry entry) throws FetcherException {
         if (!apiKey.isEmpty()) {
             urlDownload.addHeader("x-api-key", apiKey);
         }
-        ReferencesResponse referencesResponse = new Gson()
-                .fromJson(urlDownload.asString(), ReferencesResponse.class);
+        ReferencesResponse referencesResponse =
+                new Gson().fromJson(urlDownload.asString(), ReferencesResponse.class);
 
-        return referencesResponse.getData()
-                                 .stream()
-                                 .filter(citationDataItem -> citationDataItem.getCitedPaper() != null)
-                                 .map(referenceDataItem -> referenceDataItem.getCitedPaper().toBibEntry()).toList();
+        return referencesResponse.getData().stream()
+                .filter(citationDataItem -> citationDataItem.getCitedPaper() != null)
+                .map(referenceDataItem -> referenceDataItem.getCitedPaper().toBibEntry())
+                .toList();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.java b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.java
index 338cc91872bf..33e87e6db9aa 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.entryeditor.fileannotationtab;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
 import javafx.scene.Parent;
 import javafx.scene.control.Tooltip;
 
@@ -9,8 +11,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
 public class FileAnnotationTab extends EntryEditorTab {
 
     public static final String NAME = "File annotations";
@@ -30,9 +30,10 @@ public boolean shouldShow(BibEntry entry) {
 
     @Override
     protected void bindToEntry(BibEntry entry) {
-        Parent content = ViewLoader.view(new FileAnnotationTabView(entry, fileAnnotationCache))
-                                   .load()
-                                   .getView();
+        Parent content =
+                ViewLoader.view(new FileAnnotationTabView(entry, fileAnnotationCache))
+                        .load()
+                        .getView();
         setContent(content);
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java
index 5316c42eaed3..256336835811 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java
@@ -1,6 +1,8 @@
 package org.jabref.gui.entryeditor.fileannotationtab;
 
-import java.nio.file.Path;
+import com.tobiasdiez.easybind.EasyBind;
+
+import jakarta.inject.Inject;
 
 import javafx.beans.binding.Bindings;
 import javafx.collections.ListChangeListener;
@@ -26,8 +28,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileUpdateMonitor;
 
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
+import java.nio.file.Path;
 
 public class FileAnnotationTabView {
 
@@ -53,28 +54,51 @@ public FileAnnotationTabView(BibEntry entry, FileAnnotationCache fileAnnotationC
 
     @FXML
     public void initialize() {
-        viewModel = new FileAnnotationTabViewModel(fileAnnotationCache, entry, fileMonitor, clipBoardManager);
+        viewModel =
+                new FileAnnotationTabViewModel(
+                        fileAnnotationCache, entry, fileMonitor, clipBoardManager);
 
         // Set-up files list
         files.getItems().setAll(viewModel.filesProperty().get());
-        files.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> viewModel.notifyNewSelectedFile(newValue));
+        files.getSelectionModel()
+                .selectedItemProperty()
+                .addListener(
+                        (observable, oldValue, newValue) ->
+                                viewModel.notifyNewSelectedFile(newValue));
         files.getSelectionModel().selectFirst();
 
         // Set-up annotation list
         annotationList.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
-        annotationList.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> viewModel.notifyNewSelectedAnnotation(newValue));
-        ViewModelListCellFactory<FileAnnotationViewModel> cellFactory = new ViewModelListCellFactory<FileAnnotationViewModel>()
-                .withGraphic(this::createFileAnnotationNode);
+        annotationList
+                .getSelectionModel()
+                .selectedItemProperty()
+                .addListener(
+                        (observable, oldValue, newValue) ->
+                                viewModel.notifyNewSelectedAnnotation(newValue));
+        ViewModelListCellFactory<FileAnnotationViewModel> cellFactory =
+                new ViewModelListCellFactory<FileAnnotationViewModel>()
+                        .withGraphic(this::createFileAnnotationNode);
         annotationList.setCellFactory(cellFactory);
-        annotationList.setPlaceholder(new Label(Localization.lang("File has no attached annotations")));
+        annotationList.setPlaceholder(
+                new Label(Localization.lang("File has no attached annotations")));
         Bindings.bindContent(annotationList.itemsProperty().get(), viewModel.annotationsProperty());
         annotationList.getSelectionModel().selectFirst();
-        annotationList.itemsProperty().get().addListener(
-                (ListChangeListener<? super FileAnnotationViewModel>) c -> annotationList.getSelectionModel().selectFirst());
+        annotationList
+                .itemsProperty()
+                .get()
+                .addListener(
+                        (ListChangeListener<? super FileAnnotationViewModel>)
+                                c -> annotationList.getSelectionModel().selectFirst());
 
         // Set-up details pane
-        content.textProperty().bind(EasyBind.select(viewModel.currentAnnotationProperty()).selectObject(FileAnnotationViewModel::contentProperty));
-        marking.textProperty().bind(EasyBind.select(viewModel.currentAnnotationProperty()).selectObject(FileAnnotationViewModel::markingProperty));
+        content.textProperty()
+                .bind(
+                        EasyBind.select(viewModel.currentAnnotationProperty())
+                                .selectObject(FileAnnotationViewModel::contentProperty));
+        marking.textProperty()
+                .bind(
+                        EasyBind.select(viewModel.currentAnnotationProperty())
+                                .selectObject(FileAnnotationViewModel::markingProperty));
         details.disableProperty().bind(viewModel.isAnnotationsEmpty());
     }
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java
index 2d98719ac2ea..e9ce4b18d545 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java
@@ -1,14 +1,5 @@
 package org.jabref.gui.entryeditor.fileannotationtab;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringJoiner;
-import java.util.stream.Collectors;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
@@ -26,16 +17,27 @@
 import org.jabref.model.pdf.FileAnnotation;
 import org.jabref.model.util.FileUpdateListener;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.StringJoiner;
+import java.util.stream.Collectors;
+
 public class FileAnnotationTabViewModel extends AbstractViewModel {
     private static final Logger LOGGER = LoggerFactory.getLogger(FileAnnotationTabViewModel.class);
 
-    private final ListProperty<FileAnnotationViewModel> annotations = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ListProperty<Path> files = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<FileAnnotationViewModel> currentAnnotation = new SimpleObjectProperty<>();
+    private final ListProperty<FileAnnotationViewModel> annotations =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<Path> files =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<FileAnnotationViewModel> currentAnnotation =
+            new SimpleObjectProperty<>();
     private final ReadOnlyBooleanProperty annotationEmpty = annotations.emptyProperty();
 
     private final FileAnnotationCache cache;
@@ -46,10 +48,11 @@ public class FileAnnotationTabViewModel extends AbstractViewModel {
     private final ClipBoardManager clipBoardManager;
     private final FileUpdateListener fileListener = this::reloadAnnotations;
 
-    public FileAnnotationTabViewModel(FileAnnotationCache cache,
-                                      BibEntry entry,
-                                      FileUpdateMonitor fileMonitor,
-                                      ClipBoardManager clipBoardManager) {
+    public FileAnnotationTabViewModel(
+            FileAnnotationCache cache,
+            BibEntry entry,
+            FileUpdateMonitor fileMonitor,
+            ClipBoardManager clipBoardManager) {
         this.cache = cache;
         this.entry = entry;
         this.fileMonitor = fileMonitor;
@@ -85,13 +88,12 @@ public void notifyNewSelectedFile(Path newFile) {
 
         Comparator<FileAnnotation> byPage = Comparator.comparingInt(FileAnnotation::getPage);
 
-        List<FileAnnotationViewModel> newAnnotations = fileAnnotations
-                .getOrDefault(currentFile, new ArrayList<>())
-                .stream()
-                .filter(annotation -> (null != annotation.getContent()))
-                .sorted(byPage)
-                .map(FileAnnotationViewModel::new)
-                .collect(Collectors.toList());
+        List<FileAnnotationViewModel> newAnnotations =
+                fileAnnotations.getOrDefault(currentFile, new ArrayList<>()).stream()
+                        .filter(annotation -> (null != annotation.getContent()))
+                        .sorted(byPage)
+                        .map(FileAnnotationViewModel::new)
+                        .collect(Collectors.toList());
         annotations.setAll(newAnnotations);
 
         try {
@@ -102,16 +104,19 @@ public void notifyNewSelectedFile(Path newFile) {
     }
 
     private void reloadAnnotations() {
-        // Make sure to always run this in the JavaFX thread as the file monitor (and its notifications) live in a different thread
-        UiTaskExecutor.runInJavaFXThread(() -> {
-            // Remove annotations for the current entry and reinitialize annotation/cache
-            cache.remove(entry);
-            fileAnnotations = cache.getFromCache(entry);
-            files.setAll(fileAnnotations.keySet());
-
-            // Pretend that we just switched to the current file in order to refresh the display
-            notifyNewSelectedFile(currentFile);
-        });
+        // Make sure to always run this in the JavaFX thread as the file monitor (and its
+        // notifications) live in a different thread
+        UiTaskExecutor.runInJavaFXThread(
+                () -> {
+                    // Remove annotations for the current entry and reinitialize annotation/cache
+                    cache.remove(entry);
+                    fileAnnotations = cache.getFromCache(entry);
+                    files.setAll(fileAnnotations.keySet());
+
+                    // Pretend that we just switched to the current file in order to refresh the
+                    // display
+                    notifyNewSelectedFile(currentFile);
+                });
     }
 
     /**
@@ -126,7 +131,10 @@ public void copyCurrentAnnotation() {
         sj.add(Localization.lang("Date") + ": " + getCurrentAnnotation().getDate());
         sj.add(Localization.lang("Page") + ": " + getCurrentAnnotation().getPage());
         sj.add(Localization.lang("Content") + ": " + getCurrentAnnotation().getContent());
-        sj.add(Localization.lang("Marking") + ": " + getCurrentAnnotation().markingProperty().get());
+        sj.add(
+                Localization.lang("Marking")
+                        + ": "
+                        + getCurrentAnnotation().markingProperty().get());
 
         clipBoardManager.setContent(sj.toString());
     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
index 92ca042e0623..571ad046397f 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
@@ -30,8 +30,10 @@ private void setupContentProperties(FileAnnotation annotation) {
         if (annotation.hasLinkedAnnotation()) {
             this.content.set(annotation.getLinkedFileAnnotation().getContent());
             String annotationContent = annotation.getContent();
-            String illegibleTextMessage = Localization.lang("The marked area does not contain any legible text!");
-            String markingContent = annotationContent.isEmpty() ? illegibleTextMessage : annotationContent;
+            String illegibleTextMessage =
+                    Localization.lang("The marked area does not contain any legible text!");
+            String markingContent =
+                    annotationContent.isEmpty() ? illegibleTextMessage : annotationContent;
             this.marking.set(removePunctuationMark(markingContent));
         } else {
             String content = annotation.getContent();
diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java
index 01441568e608..f49b901543f3 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.entryeditor.fileannotationtab;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
-
 import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
 import javafx.scene.control.ContextMenu;
@@ -37,10 +32,14 @@
 import org.jabref.model.search.SearchQuery;
 import org.jabref.model.search.SearchResult;
 import org.jabref.model.search.SearchResults;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+
 public class FulltextSearchResultsTab extends EntryEditorTab {
 
     public static final String NAME = "Search results";
@@ -57,12 +56,13 @@ public class FulltextSearchResultsTab extends EntryEditorTab {
     private BibEntry entry;
     private DocumentViewerView documentViewerView;
 
-    public FulltextSearchResultsTab(StateManager stateManager,
-                                    GuiPreferences preferences,
-                                    DialogService dialogService,
-                                    BibDatabaseContext databaseContext,
-                                    TaskExecutor taskExecutor,
-                                    OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+    public FulltextSearchResultsTab(
+            StateManager stateManager,
+            GuiPreferences preferences,
+            DialogService dialogService,
+            BibDatabaseContext databaseContext,
+            TaskExecutor taskExecutor,
+            OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         this.stateManager = stateManager;
         this.preferences = preferences;
         this.dialogService = dialogService;
@@ -82,7 +82,13 @@ public FulltextSearchResultsTab(StateManager stateManager,
 
     @Override
     public boolean shouldShow(BibEntry entry) {
-        return searchQueryProperty.get().map(query -> query.isValid() && query.getSearchFlags().contains(SearchFlags.FULLTEXT)).orElse(false);
+        return searchQueryProperty
+                .get()
+                .map(
+                        query ->
+                                query.isValid()
+                                        && query.getSearchFlags().contains(SearchFlags.FULLTEXT))
+                .orElse(false);
     }
 
     @Override
@@ -96,84 +102,191 @@ protected void bindToEntry(BibEntry entry) {
         this.entry = entry;
         content.getChildren().clear();
 
-        stateManager.activeSearchQuery(SearchType.NORMAL_SEARCH).get().ifPresent(searchQuery -> {
-            SearchResults searchResults = searchQuery.getSearchResults();
-            if (searchResults != null) {
-                Map<String, List<SearchResult>> searchResultsForEntry = searchResults.getFileSearchResultsForEntry(entry);
-                if (searchResultsForEntry.isEmpty()) {
-                    content.getChildren().add(new Text(Localization.lang("No search matches.")));
-                } else {
-                    // Iterate through files with search hits
-                    for (Map.Entry<String, List<SearchResult>> iterator : searchResultsForEntry.entrySet()) {
-                        entry.getFiles().stream().filter(file -> file.getLink().equals(iterator.getKey())).findFirst().ifPresent(linkedFile -> {
-                            content.getChildren().addAll(createFileLink(linkedFile), lineSeparator());
-                            // Iterate through pages (within file) with search hits
-                            for (SearchResult searchResult : iterator.getValue()) {
-                                for (String resultTextHtml : searchResult.getContentResultStringsHtml()) {
-                                    content.getChildren().addAll(TooltipTextUtil.createTextsFromHtml(resultTextHtml.replace("</b> <b>", " ")));
-                                    content.getChildren().addAll(new Text(System.lineSeparator()), lineSeparator(0.8), createPageLink(linkedFile, searchResult.getPageNumber()));
-                                }
-                                if (!searchResult.getAnnotationsResultStringsHtml().isEmpty()) {
-                                    Text annotationsText = new Text(System.lineSeparator() + Localization.lang("Found matches in annotations:") + System.lineSeparator() + System.lineSeparator());
-                                    annotationsText.setStyle("-fx-font-style: italic;");
-                                    content.getChildren().add(annotationsText);
-
-                                    for (String resultTextHtml : searchResult.getAnnotationsResultStringsHtml()) {
-                                        content.getChildren().addAll(TooltipTextUtil.createTextsFromHtml(resultTextHtml.replace("</b> <b>", " ")));
-                                        content.getChildren().addAll(new Text(System.lineSeparator()), lineSeparator(0.8), createPageLink(linkedFile, searchResult.getPageNumber()));
+        stateManager
+                .activeSearchQuery(SearchType.NORMAL_SEARCH)
+                .get()
+                .ifPresent(
+                        searchQuery -> {
+                            SearchResults searchResults = searchQuery.getSearchResults();
+                            if (searchResults != null) {
+                                Map<String, List<SearchResult>> searchResultsForEntry =
+                                        searchResults.getFileSearchResultsForEntry(entry);
+                                if (searchResultsForEntry.isEmpty()) {
+                                    content.getChildren()
+                                            .add(new Text(Localization.lang("No search matches.")));
+                                } else {
+                                    // Iterate through files with search hits
+                                    for (Map.Entry<String, List<SearchResult>> iterator :
+                                            searchResultsForEntry.entrySet()) {
+                                        entry.getFiles().stream()
+                                                .filter(
+                                                        file ->
+                                                                file.getLink()
+                                                                        .equals(iterator.getKey()))
+                                                .findFirst()
+                                                .ifPresent(
+                                                        linkedFile -> {
+                                                            content.getChildren()
+                                                                    .addAll(
+                                                                            createFileLink(
+                                                                                    linkedFile),
+                                                                            lineSeparator());
+                                                            // Iterate through pages (within file)
+                                                            // with search hits
+                                                            for (SearchResult searchResult :
+                                                                    iterator.getValue()) {
+                                                                for (String resultTextHtml :
+                                                                        searchResult
+                                                                                .getContentResultStringsHtml()) {
+                                                                    content.getChildren()
+                                                                            .addAll(
+                                                                                    TooltipTextUtil
+                                                                                            .createTextsFromHtml(
+                                                                                                    resultTextHtml
+                                                                                                            .replace(
+                                                                                                                    "</b> <b>",
+                                                                                                                    " ")));
+                                                                    content.getChildren()
+                                                                            .addAll(
+                                                                                    new Text(
+                                                                                            System
+                                                                                                    .lineSeparator()),
+                                                                                    lineSeparator(
+                                                                                            0.8),
+                                                                                    createPageLink(
+                                                                                            linkedFile,
+                                                                                            searchResult
+                                                                                                    .getPageNumber()));
+                                                                }
+                                                                if (!searchResult
+                                                                        .getAnnotationsResultStringsHtml()
+                                                                        .isEmpty()) {
+                                                                    Text annotationsText =
+                                                                            new Text(
+                                                                                    System
+                                                                                                    .lineSeparator()
+                                                                                            + Localization
+                                                                                                    .lang(
+                                                                                                            "Found matches in annotations:")
+                                                                                            + System
+                                                                                                    .lineSeparator()
+                                                                                            + System
+                                                                                                    .lineSeparator());
+                                                                    annotationsText.setStyle(
+                                                                            "-fx-font-style: italic;");
+                                                                    content.getChildren()
+                                                                            .add(annotationsText);
+
+                                                                    for (String resultTextHtml :
+                                                                            searchResult
+                                                                                    .getAnnotationsResultStringsHtml()) {
+                                                                        content.getChildren()
+                                                                                .addAll(
+                                                                                        TooltipTextUtil
+                                                                                                .createTextsFromHtml(
+                                                                                                        resultTextHtml
+                                                                                                                .replace(
+                                                                                                                        "</b> <b>",
+                                                                                                                        " ")));
+                                                                        content.getChildren()
+                                                                                .addAll(
+                                                                                        new Text(
+                                                                                                System
+                                                                                                        .lineSeparator()),
+                                                                                        lineSeparator(
+                                                                                                0.8),
+                                                                                        createPageLink(
+                                                                                                linkedFile,
+                                                                                                searchResult
+                                                                                                        .getPageNumber()));
+                                                                    }
+                                                                }
+                                                            }
+                                                        });
                                     }
                                 }
                             }
                         });
-                    }
-                }
-            }
-        });
     }
 
     private Text createFileLink(LinkedFile linkedFile) {
-        Text fileLinkText = new Text(Localization.lang("Found match in %0", linkedFile.getLink()) + System.lineSeparator() + System.lineSeparator());
+        Text fileLinkText =
+                new Text(
+                        Localization.lang("Found match in %0", linkedFile.getLink())
+                                + System.lineSeparator()
+                                + System.lineSeparator());
         fileLinkText.setStyle("-fx-font-weight: bold;");
 
         ContextMenu fileContextMenu = getFileContextMenu(linkedFile);
-        Path resolvedPath = linkedFile.findIn(databaseContext, preferences.getFilePreferences()).orElse(Path.of(linkedFile.getLink()));
+        Path resolvedPath =
+                linkedFile
+                        .findIn(databaseContext, preferences.getFilePreferences())
+                        .orElse(Path.of(linkedFile.getLink()));
         Tooltip fileLinkTooltip = new Tooltip(resolvedPath.toAbsolutePath().toString());
         Tooltip.install(fileLinkText, fileLinkTooltip);
-        fileLinkText.setOnMouseClicked(event -> {
-            if (MouseButton.PRIMARY == event.getButton()) {
-                try {
-                    NativeDesktop.openBrowser(resolvedPath.toUri(), preferences.getExternalApplicationsPreferences());
-                } catch (IOException e) {
-                    LOGGER.error("Cannot open {}.", resolvedPath, e);
-                }
-            } else {
-                fileContextMenu.show(fileLinkText, event.getScreenX(), event.getScreenY());
-            }
-        });
+        fileLinkText.setOnMouseClicked(
+                event -> {
+                    if (MouseButton.PRIMARY == event.getButton()) {
+                        try {
+                            NativeDesktop.openBrowser(
+                                    resolvedPath.toUri(),
+                                    preferences.getExternalApplicationsPreferences());
+                        } catch (IOException e) {
+                            LOGGER.error("Cannot open {}.", resolvedPath, e);
+                        }
+                    } else {
+                        fileContextMenu.show(fileLinkText, event.getScreenX(), event.getScreenY());
+                    }
+                });
         return fileLinkText;
     }
 
     private Text createPageLink(LinkedFile linkedFile, int pageNumber) {
-        Text pageLink = new Text(Localization.lang("On page %0", pageNumber) + System.lineSeparator() + System.lineSeparator());
+        Text pageLink =
+                new Text(
+                        Localization.lang("On page %0", pageNumber)
+                                + System.lineSeparator()
+                                + System.lineSeparator());
         pageLink.setStyle("-fx-font-style: italic; -fx-font-weight: bold;");
 
-        pageLink.setOnMouseClicked(event -> {
-            if (MouseButton.PRIMARY == event.getButton()) {
-                documentViewerView.switchToFile(linkedFile);
-                documentViewerView.gotoPage(pageNumber);
-                documentViewerView.disableLiveMode();
-                dialogService.showCustomDialog(documentViewerView);
-            }
-        });
+        pageLink.setOnMouseClicked(
+                event -> {
+                    if (MouseButton.PRIMARY == event.getButton()) {
+                        documentViewerView.switchToFile(linkedFile);
+                        documentViewerView.gotoPage(pageNumber);
+                        documentViewerView.disableLiveMode();
+                        dialogService.showCustomDialog(documentViewerView);
+                    }
+                });
         return pageLink;
     }
 
     private ContextMenu getFileContextMenu(LinkedFile file) {
         ContextMenu fileContextMenu = new ContextMenu();
-        fileContextMenu.getItems().add(actionFactory.createMenuItem(
-                StandardActions.OPEN_FOLDER, new OpenFolderAction(dialogService, stateManager, preferences, entry, file, taskExecutor)));
-        fileContextMenu.getItems().add(actionFactory.createMenuItem(
-                StandardActions.OPEN_EXTERNAL_FILE, new OpenExternalFileAction(dialogService, stateManager, preferences, entry, file, taskExecutor)));
+        fileContextMenu
+                .getItems()
+                .add(
+                        actionFactory.createMenuItem(
+                                StandardActions.OPEN_FOLDER,
+                                new OpenFolderAction(
+                                        dialogService,
+                                        stateManager,
+                                        preferences,
+                                        entry,
+                                        file,
+                                        taskExecutor)));
+        fileContextMenu
+                .getItems()
+                .add(
+                        actionFactory.createMenuItem(
+                                StandardActions.OPEN_EXTERNAL_FILE,
+                                new OpenExternalFileAction(
+                                        dialogService,
+                                        stateManager,
+                                        preferences,
+                                        entry,
+                                        file,
+                                        taskExecutor)));
         return fileContextMenu;
     }
 
diff --git a/src/main/java/org/jabref/gui/entrytype/EntryTypeView.java b/src/main/java/org/jabref/gui/entrytype/EntryTypeView.java
index 8884561f2a74..e8aaf3382e1d 100644
--- a/src/main/java/org/jabref/gui/entrytype/EntryTypeView.java
+++ b/src/main/java/org/jabref/gui/entrytype/EntryTypeView.java
@@ -1,9 +1,12 @@
 package org.jabref.gui.entrytype;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import com.airhacks.afterburner.injection.Injector;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+import jakarta.inject.Inject;
 
 import javafx.application.Platform;
 import javafx.event.Event;
@@ -44,11 +47,10 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
 
-import com.airhacks.afterburner.injection.Injector;
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import jakarta.inject.Inject;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * Dialog that prompts the user to choose a type for an entry.
@@ -77,35 +79,54 @@ public class EntryTypeView extends BaseDialog<EntryType> {
     private EntryTypeViewModel viewModel;
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
 
-    public EntryTypeView(LibraryTab libraryTab, DialogService dialogService, GuiPreferences preferences) {
+    public EntryTypeView(
+            LibraryTab libraryTab, DialogService dialogService, GuiPreferences preferences) {
         this.libraryTab = libraryTab;
         this.dialogService = dialogService;
         this.preferences = preferences;
 
         this.setTitle(Localization.lang("Select entry type"));
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
-        ControlHelper.setAction(generateButton, this.getDialogPane(), event -> viewModel.runFetcherWorker());
+        ControlHelper.setAction(
+                generateButton, this.getDialogPane(), event -> viewModel.runFetcherWorker());
         setOnCloseRequest(e -> viewModel.cancelFetcherWorker());
 
-        setResultConverter(button -> {
-            // The buttonType will always be "cancel", even if we pressed one of the entry type buttons
-            return type;
-        });
+        setResultConverter(
+                button -> {
+                    // The buttonType will always be "cancel", even if we pressed one of the entry
+                    // type buttons
+                    return type;
+                });
 
         Button btnGenerate = (Button) this.getDialogPane().lookupButton(generateButton);
         btnGenerate.getStyleClass().add("customGenerateButton");
 
-        btnGenerate.textProperty().bind(EasyBind.map(viewModel.searchingProperty(), searching -> searching ? Localization.lang("Searching...") : Localization.lang("Generate")));
-        btnGenerate.disableProperty().bind(viewModel.idFieldValidationStatus().validProperty().not().or(viewModel.searchingProperty()));
-
-        EasyBind.subscribe(viewModel.searchSuccesfulProperty(), isSuccessful -> {
-            if (isSuccessful) {
-                setEntryTypeForReturnAndClose(Optional.empty());
-            }
-        });
+        btnGenerate
+                .textProperty()
+                .bind(
+                        EasyBind.map(
+                                viewModel.searchingProperty(),
+                                searching ->
+                                        searching
+                                                ? Localization.lang("Searching...")
+                                                : Localization.lang("Generate")));
+        btnGenerate
+                .disableProperty()
+                .bind(
+                        viewModel
+                                .idFieldValidationStatus()
+                                .validProperty()
+                                .not()
+                                .or(viewModel.searchingProperty()));
+
+        EasyBind.subscribe(
+                viewModel.searchSuccesfulProperty(),
+                isSuccessful -> {
+                    if (isSuccessful) {
+                        setEntryTypeForReturnAndClose(Optional.empty());
+                    }
+                });
     }
 
     private void addEntriesToPane(FlowPane pane, Collection<? extends BibEntryType> entryTypes) {
@@ -131,74 +152,92 @@ private void addEntriesToPane(FlowPane pane, Collection<? extends BibEntryType>
     @FXML
     public void initialize() {
         visualizer.setDecoration(new IconValidationDecorator());
-        viewModel = new EntryTypeViewModel(
-                preferences,
-                libraryTab,
-                dialogService,
-                stateManager,
-                (UiTaskExecutor) taskExecutor,
-                fileUpdateMonitor);
+        viewModel =
+                new EntryTypeViewModel(
+                        preferences,
+                        libraryTab,
+                        dialogService,
+                        stateManager,
+                        (UiTaskExecutor) taskExecutor,
+                        fileUpdateMonitor);
 
         idBasedFetchers.itemsProperty().bind(viewModel.fetcherItemsProperty());
         idTextField.textProperty().bindBidirectional(viewModel.idTextProperty());
         idBasedFetchers.valueProperty().bindBidirectional(viewModel.selectedItemProperty());
 
-        EasyBind.subscribe(viewModel.getFocusAndSelectAllProperty(), evt -> {
-            if (evt) {
-                idTextField.requestFocus();
-                idTextField.selectAll();
-            }
-        });
-
-        new ViewModelListCellFactory<IdBasedFetcher>().withText(WebFetcher::getName).install(idBasedFetchers);
-
-        // we set the managed property so that they will only be rendered when they are visble so that the Nodes only take the space when visible
+        EasyBind.subscribe(
+                viewModel.getFocusAndSelectAllProperty(),
+                evt -> {
+                    if (evt) {
+                        idTextField.requestFocus();
+                        idTextField.selectAll();
+                    }
+                });
+
+        new ViewModelListCellFactory<IdBasedFetcher>()
+                .withText(WebFetcher::getName)
+                .install(idBasedFetchers);
+
+        // we set the managed property so that they will only be rendered when they are visble so
+        // that the Nodes only take the space when visible
         // avoids removing and adding from the scence graph
-        recommendedEntriesTitlePane.managedProperty().bind(recommendedEntriesTitlePane.visibleProperty());
+        recommendedEntriesTitlePane
+                .managedProperty()
+                .bind(recommendedEntriesTitlePane.visibleProperty());
         otherEntriesTitlePane.managedProperty().bind(otherEntriesTitlePane.visibleProperty());
         customTitlePane.managedProperty().bind(customTitlePane.visibleProperty());
 
-        otherEntriesTitlePane.expandedProperty().addListener((obs, wasExpanded, isNowExpanded) -> {
-            if (isNowExpanded) {
-                this.setHeight(this.getHeight() + otherEntriesPane.getHeight());
-            } else {
-                this.setHeight(this.getHeight() - otherEntriesPane.getHeight());
-            }
-        });
+        otherEntriesTitlePane
+                .expandedProperty()
+                .addListener(
+                        (obs, wasExpanded, isNowExpanded) -> {
+                            if (isNowExpanded) {
+                                this.setHeight(this.getHeight() + otherEntriesPane.getHeight());
+                            } else {
+                                this.setHeight(this.getHeight() - otherEntriesPane.getHeight());
+                            }
+                        });
 
         boolean isBiblatexMode = libraryTab.getBibDatabaseContext().isBiblatexMode();
         List<BibEntryType> recommendedEntries;
         List<BibEntryType> otherEntries;
         if (isBiblatexMode) {
             recommendedEntries = BiblatexEntryTypeDefinitions.RECOMMENDED;
-            otherEntries = BiblatexEntryTypeDefinitions.ALL
-                .stream()
-                .filter(e -> !recommendedEntries.contains(e))
-                .collect(Collectors.toList());
+            otherEntries =
+                    BiblatexEntryTypeDefinitions.ALL.stream()
+                            .filter(e -> !recommendedEntries.contains(e))
+                            .collect(Collectors.toList());
             otherEntries.addAll(BiblatexSoftwareEntryTypeDefinitions.ALL);
             otherEntries.addAll(BiblatexAPAEntryTypeDefinitions.ALL);
         } else {
             recommendedEntries = BibtexEntryTypeDefinitions.RECOMMENDED;
-            otherEntries = BibtexEntryTypeDefinitions.ALL
-                .stream()
-                .filter(e -> !recommendedEntries.contains(e))
-                .collect(Collectors.toList());
+            otherEntries =
+                    BibtexEntryTypeDefinitions.ALL.stream()
+                            .filter(e -> !recommendedEntries.contains(e))
+                            .collect(Collectors.toList());
             otherEntries.addAll(IEEETranEntryTypeDefinitions.ALL);
         }
         addEntriesToPane(recommendedEntriesPane, recommendedEntries);
         addEntriesToPane(otherEntriesPane, otherEntries);
 
-        BibDatabaseMode customTypeDatabaseMode = isBiblatexMode ? BibDatabaseMode.BIBLATEX : BibDatabaseMode.BIBTEX;
-        BibEntryTypesManager entryTypesManager = Injector.instantiateModelOrService(BibEntryTypesManager.class);
-        List<BibEntryType> customTypes = entryTypesManager.getAllCustomTypes(customTypeDatabaseMode);
+        BibDatabaseMode customTypeDatabaseMode =
+                isBiblatexMode ? BibDatabaseMode.BIBLATEX : BibDatabaseMode.BIBTEX;
+        BibEntryTypesManager entryTypesManager =
+                Injector.instantiateModelOrService(BibEntryTypesManager.class);
+        List<BibEntryType> customTypes =
+                entryTypesManager.getAllCustomTypes(customTypeDatabaseMode);
         if (customTypes.isEmpty()) {
             customTitlePane.setVisible(false);
         } else {
             addEntriesToPane(customPane, customTypes);
         }
 
-        viewModel.idTextProperty().addListener((obs, oldValue, newValue) ->
-                visualizer.initVisualization(viewModel.idFieldValidationStatus(), idTextField, true));
+        viewModel
+                .idTextProperty()
+                .addListener(
+                        (obs, oldValue, newValue) ->
+                                visualizer.initVisualization(
+                                        viewModel.idFieldValidationStatus(), idTextField, true));
 
         Platform.runLater(() -> idTextField.requestFocus());
     }
@@ -232,55 +271,70 @@ public static String getDescription(EntryType selectedType) {
         if (selectedType instanceof StandardEntryType entryType) {
             switch (entryType) {
                 case Article -> {
-                    return Localization.lang("An article in a journal, magazine, newspaper, or other periodical which forms a self-contained unit with its own title.");
+                    return Localization.lang(
+                            "An article in a journal, magazine, newspaper, or other periodical which forms a self-contained unit with its own title.");
                 }
                 case Book -> {
-                    return Localization.lang("A single-volume book with one or more authors where the authors share credit for the work as a whole.");
+                    return Localization.lang(
+                            "A single-volume book with one or more authors where the authors share credit for the work as a whole.");
                 }
                 case Booklet -> {
-                    return Localization.lang("A book-like work without a formal publisher or sponsoring institution.");
+                    return Localization.lang(
+                            "A book-like work without a formal publisher or sponsoring institution.");
                 }
                 case Collection -> {
-                    return Localization.lang("A single-volume collection with multiple, self-contained contributions by distinct authors which have their own title. The work as a whole has no overall author but it will usually have an editor.");
+                    return Localization.lang(
+                            "A single-volume collection with multiple, self-contained contributions by distinct authors which have their own title. The work as a whole has no overall author but it will usually have an editor.");
                 }
                 case Conference -> {
                     return Localization.lang("A legacy alias for \"InProceedings\".");
                 }
                 case InBook -> {
-                    return Localization.lang("A part of a book which forms a self-contained unit with its own title.");
+                    return Localization.lang(
+                            "A part of a book which forms a self-contained unit with its own title.");
                 }
                 case InCollection -> {
-                    return Localization.lang("A contribution to a collection which forms a self-contained unit with a distinct author and title.");
+                    return Localization.lang(
+                            "A contribution to a collection which forms a self-contained unit with a distinct author and title.");
                 }
                 case InProceedings -> {
                     return Localization.lang("An article in a conference proceedings.");
                 }
                 case Manual -> {
-                    return Localization.lang("Technical or other documentation, not necessarily in printed form.");
+                    return Localization.lang(
+                            "Technical or other documentation, not necessarily in printed form.");
                 }
                 case MastersThesis -> {
-                    return Localization.lang("Similar to \"Thesis\" except that the type field is optional and defaults to the localised term  Master's thesis.");
+                    return Localization.lang(
+                            "Similar to \"Thesis\" except that the type field is optional and defaults to the localised term  Master's thesis.");
                 }
                 case Misc -> {
-                    return Localization.lang("A fallback type for entries which do not fit into any other category.");
+                    return Localization.lang(
+                            "A fallback type for entries which do not fit into any other category.");
                 }
                 case PhdThesis -> {
-                    return Localization.lang("Similar to \"Thesis\" except that the type field is optional and defaults to the localised term PhD thesis.");
+                    return Localization.lang(
+                            "Similar to \"Thesis\" except that the type field is optional and defaults to the localised term PhD thesis.");
                 }
                 case Proceedings -> {
-                    return Localization.lang("A single-volume conference proceedings. This type is very similar to \"Collection\".");
+                    return Localization.lang(
+                            "A single-volume conference proceedings. This type is very similar to \"Collection\".");
                 }
                 case TechReport -> {
-                    return Localization.lang("Similar to \"Report\" except that the type field is optional and defaults to the localised term technical report.");
+                    return Localization.lang(
+                            "Similar to \"Report\" except that the type field is optional and defaults to the localised term technical report.");
                 }
                 case Unpublished -> {
-                    return Localization.lang("A work with an author and a title which has not been formally published, such as a manuscript or the script of a talk.");
+                    return Localization.lang(
+                            "A work with an author and a title which has not been formally published, such as a manuscript or the script of a talk.");
                 }
                 case BookInBook -> {
-                    return Localization.lang("This type is similar to \"InBook\" but intended for works originally published as a stand-alone book.");
+                    return Localization.lang(
+                            "This type is similar to \"InBook\" but intended for works originally published as a stand-alone book.");
                 }
                 case InReference -> {
-                    return Localization.lang("An article in a work of reference. This is a more specific variant of the generic \"InCollection\" entry type.");
+                    return Localization.lang(
+                            "An article in a work of reference. This is a more specific variant of the generic \"InCollection\" entry type.");
                 }
                 case MvBook -> {
                     return Localization.lang("A multi-volume \"Book\".");
@@ -292,40 +346,51 @@ public static String getDescription(EntryType selectedType) {
                     return Localization.lang("A multi-volume \"Proceedings\" entry.");
                 }
                 case MvReference -> {
-                    return Localization.lang("A multi-volume \"Reference\" entry. The standard styles will treat this entry type as an alias for \"MvCollection\".");
+                    return Localization.lang(
+                            "A multi-volume \"Reference\" entry. The standard styles will treat this entry type as an alias for \"MvCollection\".");
                 }
                 case Online -> {
-                    return Localization.lang("This entry type is intended for sources such as web sites which are intrinsically online resources.");
+                    return Localization.lang(
+                            "This entry type is intended for sources such as web sites which are intrinsically online resources.");
                 }
                 case Reference -> {
-                    return Localization.lang("A single-volume work of reference such as an encyclopedia or a dictionary.");
+                    return Localization.lang(
+                            "A single-volume work of reference such as an encyclopedia or a dictionary.");
                 }
                 case Report -> {
-                    return Localization.lang("A technical report, research report, or white paper published by a university or some other institution.");
+                    return Localization.lang(
+                            "A technical report, research report, or white paper published by a university or some other institution.");
                 }
                 case Set -> {
-                    return Localization.lang("An entry set is a group of entries which are cited as a single reference and listed as a single item in the bibliography.");
+                    return Localization.lang(
+                            "An entry set is a group of entries which are cited as a single reference and listed as a single item in the bibliography.");
                 }
                 case SuppBook -> {
-                    return Localization.lang("Supplemental material in a \"Book\". This type is provided for elements such as prefaces, introductions, forewords, afterwords, etc. which often have a generic title only.");
+                    return Localization.lang(
+                            "Supplemental material in a \"Book\". This type is provided for elements such as prefaces, introductions, forewords, afterwords, etc. which often have a generic title only.");
                 }
                 case SuppCollection -> {
                     return Localization.lang("Supplemental material in a \"Collection\".");
                 }
                 case SuppPeriodical -> {
-                    return Localization.lang("Supplemental material in a \"Periodical\". This type may be useful when referring to items such as regular columns, obituaries, letters to the editor, etc. which only have a generic title.");
+                    return Localization.lang(
+                            "Supplemental material in a \"Periodical\". This type may be useful when referring to items such as regular columns, obituaries, letters to the editor, etc. which only have a generic title.");
                 }
                 case Thesis -> {
-                    return Localization.lang("A thesis written for an educational institution to satisfy the requirements for a degree.");
+                    return Localization.lang(
+                            "A thesis written for an educational institution to satisfy the requirements for a degree.");
                 }
                 case WWW -> {
-                    return Localization.lang("An alias for \"Online\", provided for jurabib compatibility.");
+                    return Localization.lang(
+                            "An alias for \"Online\", provided for jurabib compatibility.");
                 }
                 case Software -> {
-                    return Localization.lang("Computer software. The standard styles will treat this entry type as an alias for \"Misc\".");
+                    return Localization.lang(
+                            "Computer software. The standard styles will treat this entry type as an alias for \"Misc\".");
                 }
                 case Dataset -> {
-                    return Localization.lang("A data set or a similar collection of (mostly) raw data.");
+                    return Localization.lang(
+                            "A data set or a similar collection of (mostly) raw data.");
                 }
                 default -> {
                     return "";
diff --git a/src/main/java/org/jabref/gui/entrytype/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/entrytype/EntryTypeViewModel.java
index 77fd0fad13f5..22b07a4580cb 100644
--- a/src/main/java/org/jabref/gui/entrytype/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/entrytype/EntryTypeViewModel.java
@@ -1,6 +1,9 @@
 package org.jabref.gui.entrytype;
 
-import java.util.Optional;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -32,14 +35,11 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Optional;
+
 public class EntryTypeViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EntryTypeViewModel.class);
@@ -47,8 +47,10 @@ public class EntryTypeViewModel {
     private final GuiPreferences preferences;
     private final BooleanProperty searchingProperty = new SimpleBooleanProperty();
     private final BooleanProperty searchSuccesfulProperty = new SimpleBooleanProperty();
-    private final ObjectProperty<IdBasedFetcher> selectedItemProperty = new SimpleObjectProperty<>();
-    private final ListProperty<IdBasedFetcher> fetchers = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<IdBasedFetcher> selectedItemProperty =
+            new SimpleObjectProperty<>();
+    private final ListProperty<IdBasedFetcher> fetchers =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
     private final StringProperty idText = new SimpleStringProperty();
     private final BooleanProperty focusAndSelectAllProperty = new SimpleBooleanProperty();
     private Task<Optional<BibEntry>> fetcherWorker = new FetcherWorker();
@@ -59,12 +61,13 @@ public class EntryTypeViewModel {
     private final UiTaskExecutor taskExecutor;
     private final FileUpdateMonitor fileUpdateMonitor;
 
-    public EntryTypeViewModel(GuiPreferences preferences,
-                              LibraryTab libraryTab,
-                              DialogService dialogService,
-                              StateManager stateManager,
-                              UiTaskExecutor taskExecutor,
-                              FileUpdateMonitor fileUpdateMonitor) {
+    public EntryTypeViewModel(
+            GuiPreferences preferences,
+            LibraryTab libraryTab,
+            DialogService dialogService,
+            StateManager stateManager,
+            UiTaskExecutor taskExecutor,
+            FileUpdateMonitor fileUpdateMonitor) {
         this.libraryTab = libraryTab;
         this.preferences = preferences;
         this.dialogService = dialogService;
@@ -72,14 +75,19 @@ public EntryTypeViewModel(GuiPreferences preferences,
         this.taskExecutor = taskExecutor;
         this.fileUpdateMonitor = fileUpdateMonitor;
 
-        fetchers.addAll(WebFetchers.getIdBasedFetchers(
-                preferences.getImportFormatPreferences(),
-                preferences.getImporterPreferences()));
+        fetchers.addAll(
+                WebFetchers.getIdBasedFetchers(
+                        preferences.getImportFormatPreferences(),
+                        preferences.getImporterPreferences()));
         selectedItemProperty.setValue(getLastSelectedFetcher());
-        idFieldValidator = new FunctionBasedValidator<>(
-                idText,
-                StringUtil::isNotBlank,
-                ValidationMessage.error(Localization.lang("Required field \"%0\" is empty.", Localization.lang("ID"))));
+        idFieldValidator =
+                new FunctionBasedValidator<>(
+                        idText,
+                        StringUtil::isNotBlank,
+                        ValidationMessage.error(
+                                Localization.lang(
+                                        "Required field \"%0\" is empty.",
+                                        Localization.lang("ID"))));
     }
 
     public BooleanProperty searchSuccesfulProperty() {
@@ -107,15 +115,22 @@ public BooleanProperty getFocusAndSelectAllProperty() {
     }
 
     public void storeSelectedFetcher() {
-        preferences.getGuiPreferences().setLastSelectedIdBasedFetcher(selectedItemProperty.getValue().getName());
+        preferences
+                .getGuiPreferences()
+                .setLastSelectedIdBasedFetcher(selectedItemProperty.getValue().getName());
     }
 
     private IdBasedFetcher getLastSelectedFetcher() {
-        return fetchers.stream().filter(fetcher -> fetcher.getName()
-                                                          .equals(preferences.getGuiPreferences()
-                                                                             .getLastSelectedIdBasedFetcher()))
-                       .findFirst()
-                       .orElse(new DoiFetcher(preferences.getImportFormatPreferences()));
+        return fetchers.stream()
+                .filter(
+                        fetcher ->
+                                fetcher.getName()
+                                        .equals(
+                                                preferences
+                                                        .getGuiPreferences()
+                                                        .getLastSelectedIdBasedFetcher()))
+                .findFirst()
+                .orElse(new DoiFetcher(preferences.getImportFormatPreferences()));
     }
 
     public ListProperty<IdBasedFetcher> fetcherItemsProperty() {
@@ -147,71 +162,99 @@ protected Optional<BibEntry> call() throws FetcherException {
     public void runFetcherWorker() {
         fetcherWorker.setOnRunning(event -> searchingProperty().setValue(true));
 
-        fetcherWorker.setOnFailed(event -> {
-            searchSuccesfulProperty.set(false);
-            Throwable exception = fetcherWorker.getException();
-            String fetcherExceptionMessage = exception.getMessage();
-            String fetcher = selectedItemProperty().getValue().getName();
-            String searchId = idText.getValue();
-
-            if (exception instanceof FetcherClientException) {
-                dialogService.showInformationDialogAndWait(Localization.lang("Failed to import by ID"), Localization.lang("Bibliographic data not found. Cause is likely the client side. Please check connection and identifier for correctness.") + "\n" + fetcherExceptionMessage);
-            } else if (exception instanceof FetcherServerException) {
-                dialogService.showInformationDialogAndWait(Localization.lang("Failed to import by ID"), Localization.lang("Bibliographic data not found. Cause is likely the server side. Please try again later.") + "\n" + fetcherExceptionMessage);
-            } else {
-                dialogService.showInformationDialogAndWait(Localization.lang("Failed to import by ID"), Localization.lang("Error message %0", fetcherExceptionMessage));
-            }
-
-            LOGGER.error("Exception during fetching when using fetcher '{}' with entry id '{}'.", fetcher, searchId, exception);
-
-            searchingProperty.set(false);
-            fetcherWorker = new FetcherWorker();
-        });
-
-        fetcherWorker.setOnSucceeded(evt -> {
-            Optional<BibEntry> result = fetcherWorker.getValue();
-            if (result.isPresent()) {
-                final BibEntry entry = result.get();
-
-                ImportHandler handler = new ImportHandler(
-                        libraryTab.getBibDatabaseContext(),
-                        preferences,
-                        fileUpdateMonitor,
-                        libraryTab.getUndoManager(),
-                        stateManager,
-                        dialogService,
-                        taskExecutor);
-                handler.importEntryWithDuplicateCheck(libraryTab.getBibDatabaseContext(), entry);
-
-                searchSuccesfulProperty.set(true);
-            } else if (StringUtil.isBlank(idText.getValue())) {
-                dialogService.showWarningDialogAndWait(Localization.lang("Empty search ID"), Localization.lang("The given search ID was empty."));
-            } else {
-                // result is empty
-
-                String fetcher = selectedItemProperty().getValue().getName();
-                String searchId = idText.getValue();
-
-                // When DOI ID is not found, allow the user to either return to the dialog or add entry manually
-                boolean addEntryFlag = dialogService.showConfirmationDialogAndWait(Localization.lang("Identifier not found"),
-                        Localization.lang("Fetcher '%0' did not find an entry for id '%1'.", fetcher, searchId),
-                        Localization.lang("Add entry manually"),
-                        Localization.lang("Return to dialog"));
-                if (addEntryFlag) {
-                    new NewEntryAction(
-                            () -> libraryTab,
-                            StandardEntryType.Article,
-                            dialogService,
-                            preferences,
-                            stateManager).execute();
-                    searchSuccesfulProperty.set(true);
-                }
-            }
-
-            focusAndSelectAllProperty.set(true);
-            searchingProperty().set(false);
-            fetcherWorker = new FetcherWorker();
-        });
+        fetcherWorker.setOnFailed(
+                event -> {
+                    searchSuccesfulProperty.set(false);
+                    Throwable exception = fetcherWorker.getException();
+                    String fetcherExceptionMessage = exception.getMessage();
+                    String fetcher = selectedItemProperty().getValue().getName();
+                    String searchId = idText.getValue();
+
+                    if (exception instanceof FetcherClientException) {
+                        dialogService.showInformationDialogAndWait(
+                                Localization.lang("Failed to import by ID"),
+                                Localization.lang(
+                                                "Bibliographic data not found. Cause is likely the client side. Please check connection and identifier for correctness.")
+                                        + "\n"
+                                        + fetcherExceptionMessage);
+                    } else if (exception instanceof FetcherServerException) {
+                        dialogService.showInformationDialogAndWait(
+                                Localization.lang("Failed to import by ID"),
+                                Localization.lang(
+                                                "Bibliographic data not found. Cause is likely the server side. Please try again later.")
+                                        + "\n"
+                                        + fetcherExceptionMessage);
+                    } else {
+                        dialogService.showInformationDialogAndWait(
+                                Localization.lang("Failed to import by ID"),
+                                Localization.lang("Error message %0", fetcherExceptionMessage));
+                    }
+
+                    LOGGER.error(
+                            "Exception during fetching when using fetcher '{}' with entry id '{}'.",
+                            fetcher,
+                            searchId,
+                            exception);
+
+                    searchingProperty.set(false);
+                    fetcherWorker = new FetcherWorker();
+                });
+
+        fetcherWorker.setOnSucceeded(
+                evt -> {
+                    Optional<BibEntry> result = fetcherWorker.getValue();
+                    if (result.isPresent()) {
+                        final BibEntry entry = result.get();
+
+                        ImportHandler handler =
+                                new ImportHandler(
+                                        libraryTab.getBibDatabaseContext(),
+                                        preferences,
+                                        fileUpdateMonitor,
+                                        libraryTab.getUndoManager(),
+                                        stateManager,
+                                        dialogService,
+                                        taskExecutor);
+                        handler.importEntryWithDuplicateCheck(
+                                libraryTab.getBibDatabaseContext(), entry);
+
+                        searchSuccesfulProperty.set(true);
+                    } else if (StringUtil.isBlank(idText.getValue())) {
+                        dialogService.showWarningDialogAndWait(
+                                Localization.lang("Empty search ID"),
+                                Localization.lang("The given search ID was empty."));
+                    } else {
+                        // result is empty
+
+                        String fetcher = selectedItemProperty().getValue().getName();
+                        String searchId = idText.getValue();
+
+                        // When DOI ID is not found, allow the user to either return to the dialog
+                        // or add entry manually
+                        boolean addEntryFlag =
+                                dialogService.showConfirmationDialogAndWait(
+                                        Localization.lang("Identifier not found"),
+                                        Localization.lang(
+                                                "Fetcher '%0' did not find an entry for id '%1'.",
+                                                fetcher, searchId),
+                                        Localization.lang("Add entry manually"),
+                                        Localization.lang("Return to dialog"));
+                        if (addEntryFlag) {
+                            new NewEntryAction(
+                                            () -> libraryTab,
+                                            StandardEntryType.Article,
+                                            dialogService,
+                                            preferences,
+                                            stateManager)
+                                    .execute();
+                            searchSuccesfulProperty.set(true);
+                        }
+                    }
+
+                    focusAndSelectAllProperty.set(true);
+                    searchingProperty().set(false);
+                    fetcherWorker = new FetcherWorker();
+                });
         taskExecutor.execute(fetcherWorker);
     }
 
diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
index 30a276468b2b..13b9d54a990d 100644
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
+++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.errorconsole;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
+
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -30,9 +34,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BuildInfo;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class ErrorConsoleView extends BaseDialog<Void> {
 
     private ErrorConsoleViewModel viewModel;
@@ -54,9 +55,7 @@ public ErrorConsoleView() {
         this.setTitle(Localization.lang("Event log"));
         this.initModality(Modality.NONE);
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         ControlHelper.setAction(copyLogButton, getDialogPane(), event -> copyLog());
         ControlHelper.setAction(clearLogButton, getDialogPane(), event -> clearLog());
@@ -67,69 +66,76 @@ public ErrorConsoleView() {
 
     @FXML
     private void initialize() {
-        viewModel = new ErrorConsoleViewModel(dialogService, preferences, clipBoardManager, buildInfo);
+        viewModel =
+                new ErrorConsoleViewModel(dialogService, preferences, clipBoardManager, buildInfo);
         messagesListView.setCellFactory(createCellFactory());
         messagesListView.itemsProperty().bind(viewModel.allMessagesDataProperty());
         messagesListView.scrollTo(viewModel.allMessagesDataProperty().getSize() - 1);
         messagesListView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
-        viewModel.allMessagesDataProperty().addListener((ListChangeListener<LogEventViewModel>) (change -> {
-            int size = viewModel.allMessagesDataProperty().size();
-            if (size > 0) {
-                messagesListView.scrollTo(size - 1);
-            }
-        }));
+        viewModel
+                .allMessagesDataProperty()
+                .addListener(
+                        (ListChangeListener<LogEventViewModel>)
+                                (change -> {
+                                    int size = viewModel.allMessagesDataProperty().size();
+                                    if (size > 0) {
+                                        messagesListView.scrollTo(size - 1);
+                                    }
+                                }));
         descriptionLabel.setGraphic(IconTheme.JabRefIcons.CONSOLE.getGraphicNode());
     }
 
     private Callback<ListView<LogEventViewModel>, ListCell<LogEventViewModel>> createCellFactory() {
-        return cell -> new ListCell<>() {
-            private HBox graphic;
-            private Node icon;
-            private VBox message;
-            private Label heading;
-            private Label stacktrace;
-
-            {
-                graphic = new HBox(10);
-                heading = new Label();
-                stacktrace = new Label();
-                message = new VBox();
-                message.getChildren().setAll(heading, stacktrace);
-                setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-            }
-
-            @Override
-            public void updateItem(LogEventViewModel event, boolean empty) {
-                super.updateItem(event, empty);
-
-                if ((event == null) || empty) {
-                    setGraphic(null);
-                } else {
-                    icon = event.getIcon().getGraphicNode();
-                    heading.setText(event.getDisplayText());
-                    heading.getStyleClass().setAll(event.getStyleClass());
-                    stacktrace.setText(event.getStackTrace().orElse(""));
-                    graphic.getStyleClass().setAll(event.getStyleClass());
-                    graphic.getChildren().setAll(icon, message);
-                    setGraphic(graphic);
-                    setContextMenu(createContextMenu(event));
-                }
-            }
-
-            private ContextMenu createContextMenu(LogEventViewModel selectedLogEntry) {
-                ContextMenu contextMenu = new ContextMenu();
-                MenuItem copyItem = new MenuItem("Copy");
-                copyItem.setOnAction(event -> viewModel.copyLogEntry(selectedLogEntry));
-                contextMenu.getItems().add(copyItem);
-                return contextMenu;
-            }
-        };
+        return cell ->
+                new ListCell<>() {
+                    private HBox graphic;
+                    private Node icon;
+                    private VBox message;
+                    private Label heading;
+                    private Label stacktrace;
+
+                    {
+                        graphic = new HBox(10);
+                        heading = new Label();
+                        stacktrace = new Label();
+                        message = new VBox();
+                        message.getChildren().setAll(heading, stacktrace);
+                        setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+                    }
+
+                    @Override
+                    public void updateItem(LogEventViewModel event, boolean empty) {
+                        super.updateItem(event, empty);
+
+                        if ((event == null) || empty) {
+                            setGraphic(null);
+                        } else {
+                            icon = event.getIcon().getGraphicNode();
+                            heading.setText(event.getDisplayText());
+                            heading.getStyleClass().setAll(event.getStyleClass());
+                            stacktrace.setText(event.getStackTrace().orElse(""));
+                            graphic.getStyleClass().setAll(event.getStyleClass());
+                            graphic.getChildren().setAll(icon, message);
+                            setGraphic(graphic);
+                            setContextMenu(createContextMenu(event));
+                        }
+                    }
+
+                    private ContextMenu createContextMenu(LogEventViewModel selectedLogEntry) {
+                        ContextMenu contextMenu = new ContextMenu();
+                        MenuItem copyItem = new MenuItem("Copy");
+                        copyItem.setOnAction(event -> viewModel.copyLogEntry(selectedLogEntry));
+                        contextMenu.getItems().add(copyItem);
+                        return contextMenu;
+                    }
+                };
     }
 
     @FXML
     private void copySelectedLogEntries(KeyEvent event) {
         if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.COPY, event)) {
-            ObservableList<LogEventViewModel> selectedEntries = messagesListView.getSelectionModel().getSelectedItems();
+            ObservableList<LogEventViewModel> selectedEntries =
+                    messagesListView.getSelectionModel().getSelectedItems();
             viewModel.copyLog(selectedEntries);
         }
     }
diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
index 90dd83d41810..22eeab44ef08 100644
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
+++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
@@ -1,15 +1,12 @@
 package org.jabref.gui.errorconsole;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ReadOnlyListWrapper;
 import javafx.collections.ObservableList;
 
+import org.apache.hc.core5.net.URIBuilder;
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
@@ -20,12 +17,15 @@
 import org.jabref.logic.logging.LogMessages;
 import org.jabref.logic.os.OS;
 import org.jabref.logic.util.BuildInfo;
-
-import com.tobiasdiez.easybind.EasyBind;
-import org.apache.hc.core5.net.URIBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 public class ErrorConsoleViewModel extends AbstractViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ErrorConsoleViewModel.class);
@@ -36,12 +36,19 @@ public class ErrorConsoleViewModel extends AbstractViewModel {
     private final BuildInfo buildInfo;
     private final ListProperty<LogEventViewModel> allMessagesData;
 
-    public ErrorConsoleViewModel(DialogService dialogService, GuiPreferences preferences, ClipBoardManager clipBoardManager, BuildInfo buildInfo) {
+    public ErrorConsoleViewModel(
+            DialogService dialogService,
+            GuiPreferences preferences,
+            ClipBoardManager clipBoardManager,
+            BuildInfo buildInfo) {
         this.dialogService = Objects.requireNonNull(dialogService);
         this.preferences = Objects.requireNonNull(preferences);
         this.clipBoardManager = Objects.requireNonNull(clipBoardManager);
         this.buildInfo = Objects.requireNonNull(buildInfo);
-        ObservableList<LogEventViewModel> eventViewModels = EasyBind.map(BindingsHelper.forUI(LogMessages.getInstance().getMessages()), LogEventViewModel::new);
+        ObservableList<LogEventViewModel> eventViewModels =
+                EasyBind.map(
+                        BindingsHelper.forUI(LogMessages.getInstance().getMessages()),
+                        LogEventViewModel::new);
         allMessagesData = new ReadOnlyListWrapper<>(eventViewModels);
     }
 
@@ -56,8 +63,8 @@ public ListProperty<LogEventViewModel> allMessagesDataProperty() {
      */
     private String getLogMessagesAsString(List<LogEventViewModel> messages) {
         return messages.stream()
-                       .map(LogEventViewModel::getDetailedText)
-                       .collect(Collectors.joining(OS.NEWLINE));
+                .map(LogEventViewModel::getDetailedText)
+                .collect(Collectors.joining(OS.NEWLINE));
     }
 
     /**
@@ -98,29 +105,52 @@ public void clearLog() {
     public void reportIssue() {
         try {
             // System info
-            String systemInfo = "JabRef %s%n%s %s %s %nJava %s".formatted(buildInfo.version, BuildInfo.OS,
-                    BuildInfo.OS_VERSION, BuildInfo.OS_ARCH, BuildInfo.JAVA_VERSION);
+            String systemInfo =
+                    "JabRef %s%n%s %s %s %nJava %s"
+                            .formatted(
+                                    buildInfo.version,
+                                    BuildInfo.OS,
+                                    BuildInfo.OS_VERSION,
+                                    BuildInfo.OS_ARCH,
+                                    BuildInfo.JAVA_VERSION);
             // Steps to reproduce
             String howToReproduce = "Steps to reproduce:\n\n1. ...\n2. ...\n3. ...";
             // Log messages
-            String issueDetails = "<details>\n" + "<summary>" + "Detail information:" + "</summary>\n\n```\n"
-                    + getLogMessagesAsString(allMessagesData) + "\n```\n\n</details>";
+            String issueDetails =
+                    "<details>\n"
+                            + "<summary>"
+                            + "Detail information:"
+                            + "</summary>\n\n```\n"
+                            + getLogMessagesAsString(allMessagesData)
+                            + "\n```\n\n</details>";
             clipBoardManager.setContent(issueDetails);
             // Bug report body
-            String issueBody = systemInfo + "\n\n" + howToReproduce + "\n\n" + "Paste your log details here.";
+            String issueBody =
+                    systemInfo + "\n\n" + howToReproduce + "\n\n" + "Paste your log details here.";
 
             dialogService.notify(Localization.lang("Issue on GitHub successfully reported."));
-            dialogService.showInformationDialogAndWait(Localization.lang("Issue report successful"),
-                    Localization.lang("Your issue was reported in your browser.") + "\n" +
-                            Localization.lang("The log and exception information was copied to your clipboard.") + " " +
-                            Localization.lang("Please paste this information (with Ctrl+V) in the issue description.") + "\n" +
-                            Localization.lang("Please also add all steps to reproduce this issue, if possible."));
-
-            URIBuilder uriBuilder = new URIBuilder()
-                    .setScheme("https").setHost("github.com")
-                    .setPath("/JabRef/jabref/issues/new")
-                    .setParameter("body", issueBody);
-            NativeDesktop.openBrowser(uriBuilder.build().toString(), preferences.getExternalApplicationsPreferences());
+            dialogService.showInformationDialogAndWait(
+                    Localization.lang("Issue report successful"),
+                    Localization.lang("Your issue was reported in your browser.")
+                            + "\n"
+                            + Localization.lang(
+                                    "The log and exception information was copied to your clipboard.")
+                            + " "
+                            + Localization.lang(
+                                    "Please paste this information (with Ctrl+V) in the issue description.")
+                            + "\n"
+                            + Localization.lang(
+                                    "Please also add all steps to reproduce this issue, if possible."));
+
+            URIBuilder uriBuilder =
+                    new URIBuilder()
+                            .setScheme("https")
+                            .setHost("github.com")
+                            .setPath("/JabRef/jabref/issues/new")
+                            .setParameter("body", issueBody);
+            NativeDesktop.openBrowser(
+                    uriBuilder.build().toString(),
+                    preferences.getExternalApplicationsPreferences());
         } catch (IOException | URISyntaxException e) {
             LOGGER.error("Problem opening url", e);
         }
diff --git a/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java b/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java
index 378317147afd..f5c07b758d5a 100644
--- a/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java
+++ b/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java
@@ -1,15 +1,15 @@
 package org.jabref.gui.errorconsole;
 
-import java.util.Objects;
-import java.util.Optional;
+import com.google.common.base.Throwables;
 
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.logic.os.OS;
-
-import com.google.common.base.Throwables;
 import org.tinylog.core.LogEntry;
 
+import java.util.Objects;
+import java.util.Optional;
+
 public class LogEventViewModel {
 
     private final LogEntry logEvent;
@@ -51,6 +51,7 @@ public Optional<String> getStackTrace() {
     }
 
     public String getDetailedText() {
-        return getDisplayText() + getStackTrace().map(stacktrace -> OS.NEWLINE + stacktrace).orElse("");
+        return getDisplayText()
+                + getStackTrace().map(stacktrace -> OS.NEWLINE + stacktrace).orElse("");
     }
 }
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
index dc7f27da2c3d..92bddcb90918 100644
--- a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.exporter;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
+
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
@@ -10,9 +14,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.preferences.CliPreferences;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class CreateModifyExporterDialogView extends BaseDialog<ExporterViewModel> {
 
     private final ExporterViewModel exporter;
@@ -28,17 +29,16 @@ public CreateModifyExporterDialogView(ExporterViewModel exporter) {
         this.setTitle(Localization.lang("Customize Export Formats"));
         this.exporter = exporter;
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
-
-        this.setResultConverter(button -> {
-            if (button == saveExporter) {
-                return viewModel.saveExporter();
-            } else {
-                return null;
-            }
-        });
+        ViewLoader.view(this).load().setAsDialogPane(this);
+
+        this.setResultConverter(
+                button -> {
+                    if (button == saveExporter) {
+                        return viewModel.saveExporter();
+                    } else {
+                        return null;
+                    }
+                });
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
index 57613bd8af7c..fecc84f40c5b 100644
--- a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.exporter;
 
-import java.nio.file.Path;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
@@ -12,20 +10,21 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.util.StandardFileType;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.file.Path;
+
 /**
  * This view model can be used both for "add exporter" and "modify exporter" functionalities.
  * It takes an optional exporter which is empty for "add exporter," and takes the selected exporter
  * for "modify exporter."  It returns an optional exporter which empty if an invalid or no exporter is
  * created, and otherwise contains the exporter to be added or that is modified.
  */
-
 public class CreateModifyExporterDialogViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CreateModifyExporterDialogViewModel.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(CreateModifyExporterDialogViewModel.class);
 
     private final DialogService dialogService;
     private final CliPreferences preferences;
@@ -34,9 +33,8 @@ public class CreateModifyExporterDialogViewModel extends AbstractViewModel {
     private final StringProperty layoutFile = new SimpleStringProperty("");
     private final StringProperty extension = new SimpleStringProperty("");
 
-    public CreateModifyExporterDialogViewModel(ExporterViewModel exporter,
-                                               DialogService dialogService,
-                                               CliPreferences preferences) {
+    public CreateModifyExporterDialogViewModel(
+            ExporterViewModel exporter, DialogService dialogService, CliPreferences preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
 
@@ -55,33 +53,46 @@ public ExporterViewModel saveExporter() {
         }
 
         // Check that there are no empty strings.
-        if (layoutFile.get().isEmpty() || name.get().isEmpty() || extension.get().isEmpty()
+        if (layoutFile.get().isEmpty()
+                || name.get().isEmpty()
+                || extension.get().isEmpty()
                 || !layoutFile.get().endsWith(".layout")) {
             LOGGER.info("One of the fields is empty or invalid.");
             return null;
         }
 
-        // Create a new exporter to be returned to ExportCustomizationDialogViewModel, which requested it
-        TemplateExporter format = new TemplateExporter(
-                name.get(),
-                layoutFile.get(),
-                extension.get(),
-                preferences.getLayoutFormatterPreferences(),
-                preferences.getSelfContainedExportConfiguration().getSelfContainedSaveOrder());
+        // Create a new exporter to be returned to ExportCustomizationDialogViewModel, which
+        // requested it
+        TemplateExporter format =
+                new TemplateExporter(
+                        name.get(),
+                        layoutFile.get(),
+                        extension.get(),
+                        preferences.getLayoutFormatterPreferences(),
+                        preferences
+                                .getSelfContainedExportConfiguration()
+                                .getSelfContainedSaveOrder());
         format.setCustomExport(true);
         return new ExporterViewModel(format);
     }
 
     public void browse() {
-        String fileDir = layoutFile.getValue().isEmpty()
-                ? preferences.getExportPreferences().getExportWorkingDirectory().toString()
-                : layoutFile.getValue();
-
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
-                .withDefaultExtension(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
-                .withInitialDirectory(fileDir).build();
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(f -> layoutFile.set(f.toAbsolutePath().toString()));
+        String fileDir =
+                layoutFile.getValue().isEmpty()
+                        ? preferences.getExportPreferences().getExportWorkingDirectory().toString()
+                        : layoutFile.getValue();
+
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(
+                                Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
+                        .withDefaultExtension(
+                                Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
+                        .withInitialDirectory(fileDir)
+                        .build();
+        dialogService
+                .showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(f -> layoutFile.set(f.toAbsolutePath().toString()));
     }
 
     public StringProperty getName() {
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCommand.java b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
index 4cadba61f5bf..4e8771b12d3e 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportCommand.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
@@ -1,16 +1,9 @@
 package org.jabref.gui.exporter;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
 import javafx.stage.FileChooser;
 import javafx.util.Duration;
 
+import org.controlsfx.control.action.Action;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
@@ -31,17 +24,26 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
-
-import org.controlsfx.control.action.Action;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
 /**
  * Performs an export action
  */
 public class ExportCommand extends SimpleCommand {
 
-    public enum ExportMethod { EXPORT_ALL, EXPORT_SELECTED }
+    public enum ExportMethod {
+        EXPORT_ALL,
+        EXPORT_SELECTED
+    }
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ExportCommand.class);
 
@@ -54,14 +56,15 @@ public enum ExportMethod { EXPORT_ALL, EXPORT_SELECTED }
     private final JournalAbbreviationRepository abbreviationRepository;
     private final TaskExecutor taskExecutor;
 
-    public ExportCommand(ExportMethod exportMethod,
-                         Supplier<LibraryTab> tabSupplier,
-                         StateManager stateManager,
-                         DialogService dialogService,
-                         GuiPreferences preferences,
-                         BibEntryTypesManager entryTypesManager,
-                         JournalAbbreviationRepository abbreviationRepository,
-                         TaskExecutor taskExecutor) {
+    public ExportCommand(
+            ExportMethod exportMethod,
+            Supplier<LibraryTab> tabSupplier,
+            StateManager stateManager,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            BibEntryTypesManager entryTypesManager,
+            JournalAbbreviationRepository abbreviationRepository,
+            TaskExecutor taskExecutor) {
         this.exportMethod = exportMethod;
         this.tabSupplier = tabSupplier;
         this.stateManager = stateManager;
@@ -71,52 +74,74 @@ public ExportCommand(ExportMethod exportMethod,
         this.abbreviationRepository = abbreviationRepository;
         this.taskExecutor = taskExecutor;
 
-        this.executable.bind(exportMethod == ExportMethod.EXPORT_SELECTED
-                ? ActionHelper.needsEntriesSelected(stateManager)
-                : ActionHelper.needsDatabase(stateManager));
+        this.executable.bind(
+                exportMethod == ExportMethod.EXPORT_SELECTED
+                        ? ActionHelper.needsEntriesSelected(stateManager)
+                        : ActionHelper.needsDatabase(stateManager));
     }
 
     @Override
     public void execute() {
         // Get list of exporters and sort before adding to file dialog
-        ExporterFactory exporterFactory = ExporterFactory.create(
-                preferences,
-                entryTypesManager);
-        List<Exporter> exporters = exporterFactory.getExporters().stream()
-                                                  .sorted(Comparator.comparing(Exporter::getName))
-                                                  .collect(Collectors.toList());
-
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(FileFilterConverter.exporterToExtensionFilter(exporters))
-                .withDefaultExtension(preferences.getExportPreferences().getLastExportExtension())
-                .withInitialDirectory(preferences.getExportPreferences().getExportWorkingDirectory())
-                .build();
-        dialogService.showFileSaveDialog(fileDialogConfiguration)
-                     .ifPresent(path -> export(path, fileDialogConfiguration.getSelectedExtensionFilter(), exporters));
+        ExporterFactory exporterFactory = ExporterFactory.create(preferences, entryTypesManager);
+        List<Exporter> exporters =
+                exporterFactory.getExporters().stream()
+                        .sorted(Comparator.comparing(Exporter::getName))
+                        .collect(Collectors.toList());
+
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(
+                                FileFilterConverter.exporterToExtensionFilter(exporters))
+                        .withDefaultExtension(
+                                preferences.getExportPreferences().getLastExportExtension())
+                        .withInitialDirectory(
+                                preferences.getExportPreferences().getExportWorkingDirectory())
+                        .build();
+        dialogService
+                .showFileSaveDialog(fileDialogConfiguration)
+                .ifPresent(
+                        path ->
+                                export(
+                                        path,
+                                        fileDialogConfiguration.getSelectedExtensionFilter(),
+                                        exporters));
     }
 
-    private void export(Path file, FileChooser.ExtensionFilter selectedExtensionFilter, List<Exporter> exporters) {
-        String selectedExtension = selectedExtensionFilter.getExtensions().getFirst().replace("*", "");
+    private void export(
+            Path file,
+            FileChooser.ExtensionFilter selectedExtensionFilter,
+            List<Exporter> exporters) {
+        String selectedExtension =
+                selectedExtensionFilter.getExtensions().getFirst().replace("*", "");
         if (!file.endsWith(selectedExtension)) {
             FileUtil.addExtension(file, selectedExtension);
         }
 
-        final Exporter format = FileFilterConverter.getExporter(selectedExtensionFilter, exporters)
-                                                   .orElseThrow(() -> new IllegalStateException("User didn't selected a file type for the extension"));
+        final Exporter format =
+                FileFilterConverter.getExporter(selectedExtensionFilter, exporters)
+                        .orElseThrow(
+                                () ->
+                                        new IllegalStateException(
+                                                "User didn't selected a file type for the extension"));
         List<BibEntry> entries;
         if (exportMethod == ExportMethod.EXPORT_SELECTED) {
             // Selected entries
             entries = stateManager.getSelectedEntries();
         } else {
             // All entries
-            entries = stateManager.getActiveDatabase()
-                                  .map(BibDatabaseContext::getEntries)
-                                  .orElse(Collections.emptyList());
+            entries =
+                    stateManager
+                            .getActiveDatabase()
+                            .map(BibDatabaseContext::getEntries)
+                            .orElse(Collections.emptyList());
         }
 
-        List<Path> fileDirForDatabase = stateManager.getActiveDatabase()
-                                                       .map(db -> db.getFileDirectories(preferences.getFilePreferences()))
-                                                       .orElse(List.of(preferences.getFilePreferences().getWorkingDirectory()));
+        List<Path> fileDirForDatabase =
+                stateManager
+                        .getActiveDatabase()
+                        .map(db -> db.getFileDirectories(preferences.getFilePreferences()))
+                        .orElse(List.of(preferences.getFilePreferences().getWorkingDirectory()));
 
         // Make sure we remember which filter was used, to set
         // the default for next time:
@@ -125,30 +150,43 @@ private void export(Path file, FileChooser.ExtensionFilter selectedExtensionFilt
 
         final List<BibEntry> finEntries = entries;
 
-        BackgroundTask
-                .wrap(() -> {
-                    format.export(stateManager.getActiveDatabase().get(),
-                            file,
-                            finEntries,
-                            fileDirForDatabase,
-                            abbreviationRepository);
-                    return null; // can not use BackgroundTask.wrap(Runnable) because Runnable.run() can't throw Exceptions
-                })
-                .onSuccess(save -> {
-                    LibraryTab.DatabaseNotification notificationPane = tabSupplier.get().getNotificationPane();
-                    notificationPane.notify(
-                            IconTheme.JabRefIcons.FOLDER.getGraphicNode(),
-                            Localization.lang("Export operation finished successfully."),
-                            List.of(new Action(Localization.lang("Reveal in File Explorer"), event -> {
-                                try {
-                                    NativeDesktop.openFolderAndSelectFile(file, preferences.getExternalApplicationsPreferences(), dialogService);
-                                } catch (IOException e) {
-                                    LOGGER.error("Could not open export folder.", e);
-                                }
-                                notificationPane.hide();
-                            })),
-                            Duration.seconds(5));
-                })
+        BackgroundTask.wrap(
+                        () -> {
+                            format.export(
+                                    stateManager.getActiveDatabase().get(),
+                                    file,
+                                    finEntries,
+                                    fileDirForDatabase,
+                                    abbreviationRepository);
+                            return null; // can not use BackgroundTask.wrap(Runnable) because
+                                         // Runnable.run() can't throw Exceptions
+                        })
+                .onSuccess(
+                        save -> {
+                            LibraryTab.DatabaseNotification notificationPane =
+                                    tabSupplier.get().getNotificationPane();
+                            notificationPane.notify(
+                                    IconTheme.JabRefIcons.FOLDER.getGraphicNode(),
+                                    Localization.lang("Export operation finished successfully."),
+                                    List.of(
+                                            new Action(
+                                                    Localization.lang("Reveal in File Explorer"),
+                                                    event -> {
+                                                        try {
+                                                            NativeDesktop.openFolderAndSelectFile(
+                                                                    file,
+                                                                    preferences
+                                                                            .getExternalApplicationsPreferences(),
+                                                                    dialogService);
+                                                        } catch (IOException e) {
+                                                            LOGGER.error(
+                                                                    "Could not open export folder.",
+                                                                    e);
+                                                        }
+                                                        notificationPane.hide();
+                                                    })),
+                                    Duration.seconds(5));
+                        })
                 .onFailure(this::handleError)
                 .executeWith(taskExecutor);
     }
@@ -157,6 +195,7 @@ private void handleError(Exception ex) {
         LOGGER.warn("Problem exporting", ex);
         dialogService.notify(Localization.lang("Could not save file."));
         // Need to warn the user that saving failed!
-        dialogService.showErrorDialogAndWait(Localization.lang("Save library"), Localization.lang("Could not save file."), ex);
+        dialogService.showErrorDialogAndWait(
+                Localization.lang("Save library"), Localization.lang("Could not save file."), ex);
     }
 }
diff --git a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
index 5fb8cb1fe0c4..3b0ad13cd533 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
@@ -1,14 +1,6 @@
 package org.jabref.gui.exporter;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.scene.input.ClipboardContent;
 
@@ -28,24 +20,33 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
-
-import com.airhacks.afterburner.injection.Injector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 public class ExportToClipboardAction extends SimpleCommand {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ExportToClipboardAction.class);
 
     // Only text based exporters can be used
-    private static final Set<FileType> SUPPORTED_FILETYPES = Set.of(
-            StandardFileType.TXT,
-            StandardFileType.RTF,
-            StandardFileType.RDF,
-            StandardFileType.XML,
-            StandardFileType.HTML,
-            StandardFileType.CSV,
-            StandardFileType.RIS);
+    private static final Set<FileType> SUPPORTED_FILETYPES =
+            Set.of(
+                    StandardFileType.TXT,
+                    StandardFileType.RTF,
+                    StandardFileType.RDF,
+                    StandardFileType.XML,
+                    StandardFileType.HTML,
+                    StandardFileType.CSV,
+                    StandardFileType.RIS);
 
     private final DialogService dialogService;
     private final List<BibEntry> entries = new ArrayList<>();
@@ -54,11 +55,12 @@ public class ExportToClipboardAction extends SimpleCommand {
     private final CliPreferences preferences;
     private final StateManager stateManager;
 
-    public ExportToClipboardAction(DialogService dialogService,
-                                   StateManager stateManager,
-                                   ClipBoardManager clipBoardManager,
-                                   TaskExecutor taskExecutor,
-                                   CliPreferences preferences) {
+    public ExportToClipboardAction(
+            DialogService dialogService,
+            StateManager stateManager,
+            ClipBoardManager clipBoardManager,
+            TaskExecutor taskExecutor,
+            CliPreferences preferences) {
         this.dialogService = dialogService;
         this.clipBoardManager = clipBoardManager;
         this.taskExecutor = taskExecutor;
@@ -71,41 +73,62 @@ public ExportToClipboardAction(DialogService dialogService,
     @Override
     public void execute() {
         if (stateManager.getSelectedEntries().isEmpty()) {
-            dialogService.notify(Localization.lang("This operation requires one or more entries to be selected."));
+            dialogService.notify(
+                    Localization.lang(
+                            "This operation requires one or more entries to be selected."));
             return;
         }
 
-        ExporterFactory exporterFactory = ExporterFactory.create(
-                preferences,
-                Injector.instantiateModelOrService(BibEntryTypesManager.class));
-        List<Exporter> exporters = exporterFactory.getExporters().stream()
-                                                  .sorted(Comparator.comparing(Exporter::getName))
-                                                  .filter(exporter -> SUPPORTED_FILETYPES.contains(exporter.getFileType()))
-                                                  .collect(Collectors.toList());
+        ExporterFactory exporterFactory =
+                ExporterFactory.create(
+                        preferences,
+                        Injector.instantiateModelOrService(BibEntryTypesManager.class));
+        List<Exporter> exporters =
+                exporterFactory.getExporters().stream()
+                        .sorted(Comparator.comparing(Exporter::getName))
+                        .filter(exporter -> SUPPORTED_FILETYPES.contains(exporter.getFileType()))
+                        .collect(Collectors.toList());
 
         // Find default choice, if any
-        Exporter defaultChoice = exporters.stream()
-                                          .filter(exporter -> exporter.getName().equals(preferences.getExportPreferences().getLastExportExtension()))
-                                          .findAny()
-                                          .orElse(null);
-
-        Optional<Exporter> selectedExporter = dialogService.showChoiceDialogAndWait(
-                Localization.lang("Export"), Localization.lang("Select export format"),
-                Localization.lang("Export"), defaultChoice, exporters);
-
-        selectedExporter.ifPresent(exporter -> BackgroundTask.wrap(() -> exportToClipboard(exporter))
-                                                             .onSuccess(this::setContentToClipboard)
-                                                             .onFailure(ex -> {
-                                                                 LOGGER.error("Error exporting to clipboard", ex);
-                                                                 dialogService.showErrorDialogAndWait("Error exporting to clipboard", ex);
-                                                             })
-                                                             .executeWith(taskExecutor));
+        Exporter defaultChoice =
+                exporters.stream()
+                        .filter(
+                                exporter ->
+                                        exporter.getName()
+                                                .equals(
+                                                        preferences
+                                                                .getExportPreferences()
+                                                                .getLastExportExtension()))
+                        .findAny()
+                        .orElse(null);
+
+        Optional<Exporter> selectedExporter =
+                dialogService.showChoiceDialogAndWait(
+                        Localization.lang("Export"),
+                        Localization.lang("Select export format"),
+                        Localization.lang("Export"),
+                        defaultChoice,
+                        exporters);
+
+        selectedExporter.ifPresent(
+                exporter ->
+                        BackgroundTask.wrap(() -> exportToClipboard(exporter))
+                                .onSuccess(this::setContentToClipboard)
+                                .onFailure(
+                                        ex -> {
+                                            LOGGER.error("Error exporting to clipboard", ex);
+                                            dialogService.showErrorDialogAndWait(
+                                                    "Error exporting to clipboard", ex);
+                                        })
+                                .executeWith(taskExecutor));
     }
 
     private ExportResult exportToClipboard(Exporter exporter) throws Exception {
-        List<Path> fileDirForDatabase = stateManager.getActiveDatabase()
-                                                    .map(db -> db.getFileDirectories(preferences.getFilePreferences()))
-                                                    .orElse(List.of(preferences.getFilePreferences().getWorkingDirectory()));
+        List<Path> fileDirForDatabase =
+                stateManager
+                        .getActiveDatabase()
+                        .map(db -> db.getFileDirectories(preferences.getFilePreferences()))
+                        .orElse(List.of(preferences.getFilePreferences().getWorkingDirectory()));
 
         // Add chosen export type to last used preference, to become default
         preferences.getExportPreferences().setLastExportExtension(exporter.getName());
@@ -153,9 +176,9 @@ private void setContentToClipboard(ExportResult result) {
         clipboardContent.putString(result.content);
         this.clipBoardManager.setContent(clipboardContent);
 
-        dialogService.notify(Localization.lang("Entries exported to clipboard") + ": " + entries.size());
+        dialogService.notify(
+                Localization.lang("Entries exported to clipboard") + ": " + entries.size());
     }
 
-    private record ExportResult(String content, FileType fileType) {
-    }
+    private record ExportResult(String content, FileType fileType) {}
 }
diff --git a/src/main/java/org/jabref/gui/exporter/ExporterViewModel.java b/src/main/java/org/jabref/gui/exporter/ExporterViewModel.java
index 23b92f010834..e881d1bf33c4 100644
--- a/src/main/java/org/jabref/gui/exporter/ExporterViewModel.java
+++ b/src/main/java/org/jabref/gui/exporter/ExporterViewModel.java
@@ -8,7 +8,6 @@
 /**
  * ExporterViewModel wraps a TemplateExporter from logic and is used in the exporter customization dialog view and ViewModel.
  */
-
 public class ExporterViewModel {
 
     private final TemplateExporter exporter;
@@ -20,7 +19,8 @@ public ExporterViewModel(TemplateExporter exporter) {
         this.exporter = exporter;
         this.name.setValue(exporter.getName());
         this.layoutFileName.setValue(exporter.getLayoutFileNameWithExtension());
-        // Only the first of the extensions gotten from FileType is saved into the class using get(0)
+        // Only the first of the extensions gotten from FileType is saved into the class using
+        // get(0)
         String extensionString = exporter.getFileType().getExtensions().getFirst();
         this.extension.setValue(extensionString);
     }
diff --git a/src/main/java/org/jabref/gui/exporter/SaveAction.java b/src/main/java/org/jabref/gui/exporter/SaveAction.java
index 04b12fd88928..3119500bc0a8 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveAction.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.exporter;
 
-import java.util.function.Supplier;
+import com.airhacks.afterburner.injection.Injector;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
@@ -10,14 +10,18 @@
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.model.entry.BibEntryTypesManager;
 
-import com.airhacks.afterburner.injection.Injector;
+import java.util.function.Supplier;
 
 /**
  * This class is just a simple wrapper for the soon to be refactored SaveDatabaseAction.
  */
 public class SaveAction extends SimpleCommand {
 
-    public enum SaveMethod { SAVE, SAVE_AS, SAVE_SELECTED }
+    public enum SaveMethod {
+        SAVE,
+        SAVE_AS,
+        SAVE_SELECTED
+    }
 
     private final SaveMethod saveMethod;
     private final Supplier<LibraryTab> tabSupplier;
@@ -25,11 +29,12 @@ public enum SaveMethod { SAVE, SAVE_AS, SAVE_SELECTED }
     private final DialogService dialogService;
     private final GuiPreferences preferences;
 
-    public SaveAction(SaveMethod saveMethod,
-                      Supplier<LibraryTab> tabSupplier,
-                      DialogService dialogService,
-                      GuiPreferences preferences,
-                      StateManager stateManager) {
+    public SaveAction(
+            SaveMethod saveMethod,
+            Supplier<LibraryTab> tabSupplier,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            StateManager stateManager) {
         this.saveMethod = saveMethod;
         this.tabSupplier = tabSupplier;
         this.dialogService = dialogService;
@@ -44,11 +49,12 @@ public SaveAction(SaveMethod saveMethod,
 
     @Override
     public void execute() {
-        SaveDatabaseAction saveDatabaseAction = new SaveDatabaseAction(
-                tabSupplier.get(),
-                dialogService,
-                preferences,
-                Injector.instantiateModelOrService(BibEntryTypesManager.class));
+        SaveDatabaseAction saveDatabaseAction =
+                new SaveDatabaseAction(
+                        tabSupplier.get(),
+                        dialogService,
+                        preferences,
+                        Injector.instantiateModelOrService(BibEntryTypesManager.class));
 
         switch (saveMethod) {
             case SAVE -> saveDatabaseAction.save();
diff --git a/src/main/java/org/jabref/gui/exporter/SaveAllAction.java b/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
index a31329039bec..430b2cd40269 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.exporter;
 
-import java.util.List;
-import java.util.function.Supplier;
+import com.airhacks.afterburner.injection.Injector;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
@@ -10,7 +9,8 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntryTypesManager;
 
-import com.airhacks.afterburner.injection.Injector;
+import java.util.List;
+import java.util.function.Supplier;
 
 public class SaveAllAction extends SimpleCommand {
 
@@ -18,7 +18,10 @@ public class SaveAllAction extends SimpleCommand {
     private final DialogService dialogService;
     private final GuiPreferences preferences;
 
-    public SaveAllAction(Supplier<List<LibraryTab>> tabsSupplier, GuiPreferences preferences, DialogService dialogService) {
+    public SaveAllAction(
+            Supplier<List<LibraryTab>> tabsSupplier,
+            GuiPreferences preferences,
+            DialogService dialogService) {
         this.tabsSupplier = tabsSupplier;
         this.dialogService = dialogService;
         this.preferences = preferences;
@@ -29,7 +32,12 @@ public void execute() {
         dialogService.notify(Localization.lang("Saving all libraries..."));
 
         for (LibraryTab libraryTab : tabsSupplier.get()) {
-            SaveDatabaseAction saveDatabaseAction = new SaveDatabaseAction(libraryTab, dialogService, preferences, Injector.instantiateModelOrService(BibEntryTypesManager.class));
+            SaveDatabaseAction saveDatabaseAction =
+                    new SaveDatabaseAction(
+                            libraryTab,
+                            dialogService,
+                            preferences,
+                            Injector.instantiateModelOrService(BibEntryTypesManager.class));
             boolean saveResult = saveDatabaseAction.save();
             if (!saveResult) {
                 dialogService.notify(Localization.lang("Could not save file."));
diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index 6a2dd9cb42b1..ed51ae36e3de 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -1,16 +1,5 @@
 package org.jabref.gui.exporter;
 
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.charset.UnsupportedCharsetException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.DialogPane;
@@ -43,10 +32,20 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.metadata.SelfContainedSaveOrder;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.charset.UnsupportedCharsetException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * Action for the "Save" and "Save as" operations called from BasePanel. This class is also used for save operations
  * when closing a database or quitting the applications.
@@ -63,13 +62,15 @@ public class SaveDatabaseAction {
     private final BibEntryTypesManager entryTypesManager;
 
     public enum SaveDatabaseMode {
-        SILENT, NORMAL
+        SILENT,
+        NORMAL
     }
 
-    public SaveDatabaseAction(LibraryTab libraryTab,
-                              DialogService dialogService,
-                              GuiPreferences preferences,
-                              BibEntryTypesManager entryTypesManager) {
+    public SaveDatabaseAction(
+            LibraryTab libraryTab,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            BibEntryTypesManager entryTypesManager) {
         this.libraryTab = libraryTab;
         this.dialogService = dialogService;
         this.preferences = preferences;
@@ -96,37 +97,60 @@ public boolean saveAs(Path file) {
     }
 
     private SelfContainedSaveOrder getSaveOrder() {
-        return libraryTab.getBibDatabaseContext()
-                .getMetaData().getSaveOrder()
-                .map(so -> {
-                    if (so.getOrderType() == SaveOrder.OrderType.TABLE) {
-                        // We need to "flatten out" SaveOrder.OrderType.TABLE as BibWriter does not have access to preferences
-                        List<TableColumn<BibEntryTableViewModel, ?>> sortOrder = libraryTab.getMainTable().getSortOrder();
-                        return new SelfContainedSaveOrder(
-                                SaveOrder.OrderType.SPECIFIED,
-                                sortOrder.stream()
-                                         .filter(col -> col instanceof MainTableColumn<?>)
-                                         .map(column -> ((MainTableColumn<?>) column).getModel())
-                                         .flatMap(model -> model.getSortCriteria().stream())
-                                         .toList());
-                    } else {
-                        return SelfContainedSaveOrder.of(so);
-                    }
-                })
+        return libraryTab
+                .getBibDatabaseContext()
+                .getMetaData()
+                .getSaveOrder()
+                .map(
+                        so -> {
+                            if (so.getOrderType() == SaveOrder.OrderType.TABLE) {
+                                // We need to "flatten out" SaveOrder.OrderType.TABLE as BibWriter
+                                // does not have access to preferences
+                                List<TableColumn<BibEntryTableViewModel, ?>> sortOrder =
+                                        libraryTab.getMainTable().getSortOrder();
+                                return new SelfContainedSaveOrder(
+                                        SaveOrder.OrderType.SPECIFIED,
+                                        sortOrder.stream()
+                                                .filter(col -> col instanceof MainTableColumn<?>)
+                                                .map(
+                                                        column ->
+                                                                ((MainTableColumn<?>) column)
+                                                                        .getModel())
+                                                .flatMap(model -> model.getSortCriteria().stream())
+                                                .toList());
+                            } else {
+                                return SelfContainedSaveOrder.of(so);
+                            }
+                        })
                 .orElse(SaveOrder.getDefaultSaveOrder());
     }
 
     public void saveSelectedAsPlain() {
-        askForSavePath().ifPresent(path -> {
-            try {
-                saveDatabase(path, true, StandardCharsets.UTF_8, BibDatabaseWriter.SaveType.PLAIN_BIBTEX, getSaveOrder());
-                preferences.getLastFilesOpenedPreferences().getFileHistory().newFile(path);
-                dialogService.notify(Localization.lang("Saved selected to '%0'.", path.toString()));
-            } catch (SaveException ex) {
-                LOGGER.error("A problem occurred when trying to save the file", ex);
-                dialogService.showErrorDialogAndWait(Localization.lang("Save library"), Localization.lang("Could not save file."), ex);
-            }
-        });
+        askForSavePath()
+                .ifPresent(
+                        path -> {
+                            try {
+                                saveDatabase(
+                                        path,
+                                        true,
+                                        StandardCharsets.UTF_8,
+                                        BibDatabaseWriter.SaveType.PLAIN_BIBTEX,
+                                        getSaveOrder());
+                                preferences
+                                        .getLastFilesOpenedPreferences()
+                                        .getFileHistory()
+                                        .newFile(path);
+                                dialogService.notify(
+                                        Localization.lang(
+                                                "Saved selected to '%0'.", path.toString()));
+                            } catch (SaveException ex) {
+                                LOGGER.error("A problem occurred when trying to save the file", ex);
+                                dialogService.showErrorDialogAndWait(
+                                        Localization.lang("Save library"),
+                                        Localization.lang("Could not save file."),
+                                        ex);
+                            }
+                        });
     }
 
     /**
@@ -141,7 +165,10 @@ boolean saveAs(Path file, SaveDatabaseMode mode) {
         if (databasePath.isPresent()) {
             // Close AutosaveManager, BackupManager, and LuceneManager for original library
             AutosaveManager.shutdown(context);
-            BackupManager.shutdown(context, this.preferences.getFilePreferences().getBackupDirectory(), preferences.getFilePreferences().shouldCreateBackup());
+            BackupManager.shutdown(
+                    context,
+                    this.preferences.getFilePreferences().getBackupDirectory(),
+                    preferences.getFilePreferences().shouldCreateBackup());
             libraryTab.closeLuceneManger();
         }
 
@@ -149,7 +176,8 @@ boolean saveAs(Path file, SaveDatabaseMode mode) {
         if (context.getLocation() == DatabaseLocation.SHARED) {
             // Save all properties dependent on the ID. This makes it possible to restore them.
             new SharedDatabasePreferences(context.getDatabase().generateSharedDatabaseID())
-                    .putAllDBMSConnectionProperties(context.getDBMSSynchronizer().getConnectionProperties());
+                    .putAllDBMSConnectionProperties(
+                            context.getDBMSSynchronizer().getConnectionProperties());
         }
 
         boolean saveResult = save(file, mode);
@@ -160,7 +188,8 @@ boolean saveAs(Path file, SaveDatabaseMode mode) {
             context.setDatabasePath(file);
             libraryTab.updateTabTitle(false);
 
-            // Reset (here: uninstall and install again) AutosaveManager, BackupManager and LuceneManager for the new file name
+            // Reset (here: uninstall and install again) AutosaveManager, BackupManager and
+            // LuceneManager for the new file name
             libraryTab.resetChangeMonitor();
             libraryTab.installAutosaveManagerAndBackupManager();
             libraryTab.createLuceneManager();
@@ -177,20 +206,26 @@ boolean saveAs(Path file, SaveDatabaseMode mode) {
      * @return the path set by the user
      */
     private Optional<Path> askForSavePath() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.BIBTEX_DB)
-                .withDefaultExtension(StandardFileType.BIBTEX_DB)
-                .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory())
-                .build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(StandardFileType.BIBTEX_DB)
+                        .withDefaultExtension(StandardFileType.BIBTEX_DB)
+                        .withInitialDirectory(
+                                preferences.getFilePreferences().getWorkingDirectory())
+                        .build();
         Optional<Path> selectedPath = dialogService.showFileSaveDialog(fileDialogConfiguration);
-        selectedPath.ifPresent(path -> preferences.getFilePreferences().setWorkingDirectory(path.getParent()));
+        selectedPath.ifPresent(
+                path -> preferences.getFilePreferences().setWorkingDirectory(path.getParent()));
         if (selectedPath.isPresent()) {
             Path savePath = selectedPath.get();
             // Workaround for linux systems not adding file extension
             if (!savePath.getFileName().toString().toLowerCase().endsWith(".bib")) {
                 savePath = Path.of(savePath.toString() + ".bib");
                 if (!Files.notExists(savePath)) {
-                    if (!dialogService.showConfirmationDialogAndWait(Localization.lang("Overwrite file"), Localization.lang("'%0' exists. Overwrite file?", savePath.getFileName()))) {
+                    if (!dialogService.showConfirmationDialogAndWait(
+                            Localization.lang("Overwrite file"),
+                            Localization.lang(
+                                    "'%0' exists. Overwrite file?", savePath.getFileName()))) {
                         return Optional.empty();
                     }
                 }
@@ -211,7 +246,8 @@ private boolean save(BibDatabaseContext bibDatabaseContext, SaveDatabaseMode mod
     }
 
     private boolean save(Path targetPath, SaveDatabaseMode mode) {
-        if (mode == SaveDatabaseMode.NORMAL && libraryTab.getBibDatabaseContext().getEntries().size() > 2_000) {
+        if (mode == SaveDatabaseMode.NORMAL
+                && libraryTab.getBibDatabaseContext().getEntries().size() > 2_000) {
             dialogService.notify("%s...".formatted(Localization.lang("Saving library")));
         }
 
@@ -224,15 +260,26 @@ private boolean save(Path targetPath, SaveDatabaseMode mode) {
         }
 
         try {
-            Charset encoding = libraryTab.getBibDatabaseContext()
-                                         .getMetaData()
-                                         .getEncoding()
-                                         .orElse(StandardCharsets.UTF_8);
+            Charset encoding =
+                    libraryTab
+                            .getBibDatabaseContext()
+                            .getMetaData()
+                            .getEncoding()
+                            .orElse(StandardCharsets.UTF_8);
 
             // Make sure to remember which encoding we used
-            libraryTab.getBibDatabaseContext().getMetaData().setEncoding(encoding, ChangePropagation.DO_NOT_POST_EVENT);
-
-            boolean success = saveDatabase(targetPath, false, encoding, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, getSaveOrder());
+            libraryTab
+                    .getBibDatabaseContext()
+                    .getMetaData()
+                    .setEncoding(encoding, ChangePropagation.DO_NOT_POST_EVENT);
+
+            boolean success =
+                    saveDatabase(
+                            targetPath,
+                            false,
+                            encoding,
+                            BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
+                            getSaveOrder());
 
             if (success) {
                 libraryTab.getUndoManager().markUnchanged();
@@ -241,8 +288,12 @@ private boolean save(Path targetPath, SaveDatabaseMode mode) {
             dialogService.notify(Localization.lang("Library saved"));
             return success;
         } catch (SaveException ex) {
-            LOGGER.error("A problem occurred when trying to save the file %s".formatted(targetPath), ex);
-            dialogService.showErrorDialogAndWait(Localization.lang("Save library"), Localization.lang("Could not save file."), ex);
+            LOGGER.error(
+                    "A problem occurred when trying to save the file %s".formatted(targetPath), ex);
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Save library"),
+                    Localization.lang("Could not save file."),
+                    ex);
             return false;
         } finally {
             // release panel from save status
@@ -250,23 +301,39 @@ private boolean save(Path targetPath, SaveDatabaseMode mode) {
         }
     }
 
-    private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding, BibDatabaseWriter.SaveType saveType, SelfContainedSaveOrder saveOrder) throws SaveException {
-        // if this code is adapted, please also adapt org.jabref.logic.autosaveandbackup.BackupManager.performBackup
-        SelfContainedSaveConfiguration saveConfiguration
-                = new SelfContainedSaveConfiguration(saveOrder, false, saveType, preferences.getLibraryPreferences().shouldAlwaysReformatOnSave());
+    private boolean saveDatabase(
+            Path file,
+            boolean selectedOnly,
+            Charset encoding,
+            BibDatabaseWriter.SaveType saveType,
+            SelfContainedSaveOrder saveOrder)
+            throws SaveException {
+        // if this code is adapted, please also adapt
+        // org.jabref.logic.autosaveandbackup.BackupManager.performBackup
+        SelfContainedSaveConfiguration saveConfiguration =
+                new SelfContainedSaveConfiguration(
+                        saveOrder,
+                        false,
+                        saveType,
+                        preferences.getLibraryPreferences().shouldAlwaysReformatOnSave());
         BibDatabaseContext bibDatabaseContext = libraryTab.getBibDatabaseContext();
         synchronized (bibDatabaseContext) {
-            try (AtomicFileWriter fileWriter = new AtomicFileWriter(file, encoding, saveConfiguration.shouldMakeBackup())) {
-                BibWriter bibWriter = new BibWriter(fileWriter, bibDatabaseContext.getDatabase().getNewLineSeparator());
-                BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
-                        bibWriter,
-                        saveConfiguration,
-                        preferences.getFieldPreferences(),
-                        preferences.getCitationKeyPatternPreferences(),
-                        entryTypesManager);
+            try (AtomicFileWriter fileWriter =
+                    new AtomicFileWriter(file, encoding, saveConfiguration.shouldMakeBackup())) {
+                BibWriter bibWriter =
+                        new BibWriter(
+                                fileWriter, bibDatabaseContext.getDatabase().getNewLineSeparator());
+                BibtexDatabaseWriter databaseWriter =
+                        new BibtexDatabaseWriter(
+                                bibWriter,
+                                saveConfiguration,
+                                preferences.getFieldPreferences(),
+                                preferences.getCitationKeyPatternPreferences(),
+                                entryTypesManager);
 
                 if (selectedOnly) {
-                    databaseWriter.savePartOfDatabase(bibDatabaseContext, libraryTab.getSelectedEntries());
+                    databaseWriter.savePartOfDatabase(
+                            bibDatabaseContext, libraryTab.getSelectedEntries());
                 } else {
                     databaseWriter.saveDatabase(bibDatabaseContext);
                 }
@@ -274,10 +341,20 @@ private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding,
                 libraryTab.registerUndoableChanges(databaseWriter.getSaveActionsFieldChanges());
 
                 if (fileWriter.hasEncodingProblems()) {
-                    saveWithDifferentEncoding(file, selectedOnly, encoding, fileWriter.getEncodingProblems(), saveType, saveOrder);
+                    saveWithDifferentEncoding(
+                            file,
+                            selectedOnly,
+                            encoding,
+                            fileWriter.getEncodingProblems(),
+                            saveType,
+                            saveOrder);
                 }
             } catch (UnsupportedCharsetException ex) {
-                throw new SaveException(Localization.lang("Character encoding '%0' is not supported.", encoding.displayName()), ex);
+                throw new SaveException(
+                        Localization.lang(
+                                "Character encoding '%0' is not supported.",
+                                encoding.displayName()),
+                        ex);
             } catch (IOException ex) {
                 throw new SaveException("Problems saving: " + ex, ex);
             }
@@ -285,27 +362,56 @@ private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding,
         }
     }
 
-    private void saveWithDifferentEncoding(Path file, boolean selectedOnly, Charset encoding, Set<Character> encodingProblems, BibDatabaseWriter.SaveType saveType, SelfContainedSaveOrder saveOrder) throws SaveException {
+    private void saveWithDifferentEncoding(
+            Path file,
+            boolean selectedOnly,
+            Charset encoding,
+            Set<Character> encodingProblems,
+            BibDatabaseWriter.SaveType saveType,
+            SelfContainedSaveOrder saveOrder)
+            throws SaveException {
         DialogPane pane = new DialogPane();
         VBox vbox = new VBox();
-        vbox.getChildren().addAll(
-                new Text(Localization.lang("The chosen encoding '%0' could not encode the following characters:", encoding.displayName())),
-                new Text(encodingProblems.stream().map(Object::toString).collect(Collectors.joining("."))),
-                new Text(Localization.lang("What do you want to do?"))
-        );
+        vbox.getChildren()
+                .addAll(
+                        new Text(
+                                Localization.lang(
+                                        "The chosen encoding '%0' could not encode the following characters:",
+                                        encoding.displayName())),
+                        new Text(
+                                encodingProblems.stream()
+                                        .map(Object::toString)
+                                        .collect(Collectors.joining("."))),
+                        new Text(Localization.lang("What do you want to do?")));
         pane.setContent(vbox);
 
-        ButtonType tryDifferentEncoding = new ButtonType(Localization.lang("Try different encoding"), ButtonBar.ButtonData.OTHER);
+        ButtonType tryDifferentEncoding =
+                new ButtonType(
+                        Localization.lang("Try different encoding"), ButtonBar.ButtonData.OTHER);
         ButtonType ignore = new ButtonType(Localization.lang("Ignore"), ButtonBar.ButtonData.APPLY);
-        boolean saveWithDifferentEncoding = dialogService
-                .showCustomDialogAndWait(Localization.lang("Save library"), pane, ignore, tryDifferentEncoding)
-                .filter(buttonType -> buttonType.equals(tryDifferentEncoding))
-                .isPresent();
+        boolean saveWithDifferentEncoding =
+                dialogService
+                        .showCustomDialogAndWait(
+                                Localization.lang("Save library"),
+                                pane,
+                                ignore,
+                                tryDifferentEncoding)
+                        .filter(buttonType -> buttonType.equals(tryDifferentEncoding))
+                        .isPresent();
         if (saveWithDifferentEncoding) {
-            Optional<Charset> newEncoding = dialogService.showChoiceDialogAndWait(Localization.lang("Save library"), Localization.lang("Select new encoding"), Localization.lang("Save library"), encoding, Encodings.getCharsets());
+            Optional<Charset> newEncoding =
+                    dialogService.showChoiceDialogAndWait(
+                            Localization.lang("Save library"),
+                            Localization.lang("Select new encoding"),
+                            Localization.lang("Save library"),
+                            encoding,
+                            Encodings.getCharsets());
             if (newEncoding.isPresent()) {
                 // Make sure to remember which encoding we used.
-                libraryTab.getBibDatabaseContext().getMetaData().setEncoding(newEncoding.get(), ChangePropagation.DO_NOT_POST_EVENT);
+                libraryTab
+                        .getBibDatabaseContext()
+                        .getMetaData()
+                        .setEncoding(newEncoding.get(), ChangePropagation.DO_NOT_POST_EVENT);
 
                 saveDatabase(file, selectedOnly, newEncoding.get(), saveType, saveOrder);
             }
diff --git a/src/main/java/org/jabref/gui/exporter/WriteMetadataToLinkedPdfsAction.java b/src/main/java/org/jabref/gui/exporter/WriteMetadataToLinkedPdfsAction.java
index 0b084517295e..8fe96ebb4b8c 100644
--- a/src/main/java/org/jabref/gui/exporter/WriteMetadataToLinkedPdfsAction.java
+++ b/src/main/java/org/jabref/gui/exporter/WriteMetadataToLinkedPdfsAction.java
@@ -1,10 +1,6 @@
 package org.jabref.gui.exporter;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
@@ -21,17 +17,21 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 
 /**
  * Writes XMP Metadata to all the linked pdfs of the selected entries according to the linking entry
  */
 public class WriteMetadataToLinkedPdfsAction extends SimpleCommand {
-    private static final Logger LOGGER = LoggerFactory.getLogger(WriteMetadataToLinkedPdfsAction.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(WriteMetadataToLinkedPdfsAction.class);
 
     private final StateManager stateManager;
     private final BibEntryTypesManager entryTypesManager;
@@ -42,14 +42,15 @@ public class WriteMetadataToLinkedPdfsAction extends SimpleCommand {
     private final XmpPreferences xmpPreferences;
     private final JournalAbbreviationRepository abbreviationRepository;
 
-    public WriteMetadataToLinkedPdfsAction(DialogService dialogService,
-                                           FieldPreferences fieldPreferences,
-                                           FilePreferences filePreferences,
-                                           XmpPreferences xmpPreferences,
-                                           BibEntryTypesManager entryTypesManager,
-                                           JournalAbbreviationRepository abbreviationRepository,
-                                           TaskExecutor taskExecutor,
-                                           StateManager stateManager) {
+    public WriteMetadataToLinkedPdfsAction(
+            DialogService dialogService,
+            FieldPreferences fieldPreferences,
+            FilePreferences filePreferences,
+            XmpPreferences xmpPreferences,
+            BibEntryTypesManager entryTypesManager,
+            JournalAbbreviationRepository abbreviationRepository,
+            TaskExecutor taskExecutor,
+            StateManager stateManager) {
         this.stateManager = stateManager;
         this.entryTypesManager = entryTypesManager;
         this.fieldPreferences = fieldPreferences;
@@ -75,12 +76,16 @@ public void execute() {
 
             if (entries.isEmpty()) {
                 LOGGER.warn("No entry selected for fulltext download.");
-                dialogService.notify(Localization.lang("This operation requires one or more entries to be selected."));
+                dialogService.notify(
+                        Localization.lang(
+                                "This operation requires one or more entries to be selected."));
                 return;
             } else {
-                boolean confirm = dialogService.showConfirmationDialogAndWait(
-                        Localization.lang("Write metadata to PDF files"),
-                        Localization.lang("Write metadata for all PDFs in current library?"));
+                boolean confirm =
+                        dialogService.showConfirmationDialogAndWait(
+                                Localization.lang("Write metadata to PDF files"),
+                                Localization.lang(
+                                        "Write metadata for all PDFs in current library?"));
                 if (!confirm) {
                     return;
                 }
@@ -90,15 +95,15 @@ public void execute() {
         dialogService.notify(Localization.lang("Writing metadata..."));
 
         new WriteMetaDataTask(
-                databaseContext,
-                entries,
-                abbreviationRepository,
-                entryTypesManager,
-                fieldPreferences,
-                filePreferences,
-                xmpPreferences,
-                stateManager,
-                dialogService)
+                        databaseContext,
+                        entries,
+                        abbreviationRepository,
+                        entryTypesManager,
+                        fieldPreferences,
+                        filePreferences,
+                        xmpPreferences,
+                        stateManager,
+                        dialogService)
                 .executeWith(taskExecutor);
     }
 
@@ -119,15 +124,16 @@ private static class WriteMetaDataTask extends BackgroundTask<Void> {
         private int entriesChanged = 0;
         private int errors = 0;
 
-        public WriteMetaDataTask(BibDatabaseContext databaseContext,
-                                 List<BibEntry> entries,
-                                 JournalAbbreviationRepository abbreviationRepository,
-                                 BibEntryTypesManager entryTypesManager,
-                                 FieldPreferences fieldPreferences,
-                                 FilePreferences filePreferences,
-                                 XmpPreferences xmpPreferences,
-                                 StateManager stateManager,
-                                 DialogService dialogService) {
+        public WriteMetaDataTask(
+                BibDatabaseContext databaseContext,
+                List<BibEntry> entries,
+                JournalAbbreviationRepository abbreviationRepository,
+                BibEntryTypesManager entryTypesManager,
+                FieldPreferences fieldPreferences,
+                FilePreferences filePreferences,
+                XmpPreferences xmpPreferences,
+                StateManager stateManager,
+                DialogService dialogService) {
             this.databaseContext = databaseContext;
             this.entries = entries;
             this.abbreviationRepository = abbreviationRepository;
@@ -152,19 +158,26 @@ public Void call() throws Exception {
                 updateProgress(i, entries.size());
 
                 // Make a list of all PDFs linked from this entry:
-                List<Path> files = entry.getFiles().stream()
-                                        .map(file -> file.findIn(stateManager.getActiveDatabase().get(), filePreferences))
-                                        .filter(Optional::isPresent)
-                                        .map(Optional::get)
-                                        .filter(FileUtil::isPDFFile)
-                                        .toList();
+                List<Path> files =
+                        entry.getFiles().stream()
+                                .map(
+                                        file ->
+                                                file.findIn(
+                                                        stateManager.getActiveDatabase().get(),
+                                                        filePreferences))
+                                .filter(Optional::isPresent)
+                                .map(Optional::get)
+                                .filter(FileUtil::isPDFFile)
+                                .toList();
                 if (files.isEmpty()) {
-                    LOGGER.debug("Skipped empty entry '{}'",
+                    LOGGER.debug(
+                            "Skipped empty entry '{}'",
                             entry.getCitationKey().orElse(entry.getAuthorTitleYear(16)));
                     skipped++;
                 } else {
                     for (Path file : files) {
-                        updateMessage(Localization.lang("Writing metadata to %0", file.getFileName()));
+                        updateMessage(
+                                Localization.lang("Writing metadata to %0", file.getFileName()));
 
                         if (Files.exists(file)) {
                             try {
@@ -193,9 +206,16 @@ public Void call() throws Exception {
             }
 
             updateMessage(Localization.lang("Finished"));
-            dialogService.notify(Localization.lang("Finished writing metadata for library %0 (%1 succeeded, %2 skipped, %3 errors).",
-                    databaseContext.getDatabasePath().map(Path::toString).orElse("undefined"),
-                    String.valueOf(entriesChanged), String.valueOf(skipped), String.valueOf(errors)));
+            dialogService.notify(
+                    Localization.lang(
+                            "Finished writing metadata for library %0 (%1 succeeded, %2 skipped, %3 errors).",
+                            databaseContext
+                                    .getDatabasePath()
+                                    .map(Path::toString)
+                                    .orElse("undefined"),
+                            String.valueOf(entriesChanged),
+                            String.valueOf(skipped),
+                            String.valueOf(errors)));
 
             if (!failedWrittenFiles.isEmpty()) {
                 LOGGER.error("Failed to write XMP data to PDFs:\n{}", failedWrittenFiles);
diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java b/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
index d81a9cebcfa8..b3b6610af9ff 100644
--- a/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
@@ -1,9 +1,7 @@
 package org.jabref.gui.externalfiles;
 
-import java.util.List;
-import java.util.function.BiConsumer;
-
-import javax.swing.undo.UndoManager;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
 
 import javafx.concurrent.Task;
 
@@ -22,8 +20,10 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
+import java.util.List;
+import java.util.function.BiConsumer;
+
+import javax.swing.undo.UndoManager;
 
 /**
  * This Action may only be used in a menu or button.
@@ -37,71 +37,100 @@ public class AutoLinkFilesAction extends SimpleCommand {
     private final UndoManager undoManager;
     private final UiTaskExecutor taskExecutor;
 
-    public AutoLinkFilesAction(DialogService dialogService, GuiPreferences preferences, StateManager stateManager, UndoManager undoManager, UiTaskExecutor taskExecutor) {
+    public AutoLinkFilesAction(
+            DialogService dialogService,
+            GuiPreferences preferences,
+            StateManager stateManager,
+            UndoManager undoManager,
+            UiTaskExecutor taskExecutor) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.stateManager = stateManager;
         this.undoManager = undoManager;
         this.taskExecutor = taskExecutor;
 
-        this.executable.bind(needsDatabase(this.stateManager).and(needsEntriesSelected(stateManager)));
-        this.statusMessage.bind(BindingsHelper.ifThenElse(executable, "", Localization.lang("This operation requires one or more entries to be selected.")));
+        this.executable.bind(
+                needsDatabase(this.stateManager).and(needsEntriesSelected(stateManager)));
+        this.statusMessage.bind(
+                BindingsHelper.ifThenElse(
+                        executable,
+                        "",
+                        Localization.lang(
+                                "This operation requires one or more entries to be selected.")));
     }
 
     @Override
     public void execute() {
-        final BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null"));
+        final BibDatabaseContext database =
+                stateManager
+                        .getActiveDatabase()
+                        .orElseThrow(() -> new NullPointerException("Database null"));
         final List<BibEntry> entries = stateManager.getSelectedEntries();
 
-        AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(
-                database,
-                preferences.getExternalApplicationsPreferences(),
-                preferences.getFilePreferences(),
-                preferences.getAutoLinkPreferences());
-        final NamedCompound nc = new NamedCompound(Localization.lang("Automatically set file links"));
-
-        Task<AutoSetFileLinksUtil.LinkFilesResult> linkFilesTask = new Task<>() {
-            final BiConsumer<LinkedFile, BibEntry> onLinkedFile = (linkedFile, entry) -> {
-                // lambda for gui actions that are relevant when setting the linked file entry when ui is opened
-                String newVal = FileFieldWriter.getStringRepresentation(linkedFile);
-                String oldVal = entry.getField(StandardField.FILE).orElse(null);
-                UndoableFieldChange fieldChange = new UndoableFieldChange(entry, StandardField.FILE, oldVal, newVal);
-                nc.addEdit(fieldChange); // push to undo manager is in succeeded
-                entry.addFile(linkedFile);
-            };
-
-            @Override
-            protected AutoSetFileLinksUtil.LinkFilesResult call() {
-                return util.linkAssociatedFiles(entries, onLinkedFile);
-            }
-
-            @Override
-            protected void succeeded() {
-                AutoSetFileLinksUtil.LinkFilesResult result = getValue();
-
-                if (!result.getFileExceptions().isEmpty()) {
-                    dialogService.showWarningDialogAndWait(
-                            Localization.lang("Automatically set file links"),
-                            Localization.lang("Problem finding files. See error log for details."));
-                    return;
-                }
-
-                if (result.getChangedEntries().isEmpty()) {
-                    dialogService.showWarningDialogAndWait("Automatically set file links",
-                            Localization.lang("Finished automatically setting external links.") + "\n"
-                                    + Localization.lang("No files found."));
-                    return;
-                }
-
-                if (nc.hasEdits()) {
-                    nc.end();
-                    undoManager.addEdit(nc);
-                }
-
-                dialogService.notify(Localization.lang("Finished automatically setting external links.") + " "
-                        + Localization.lang("Changed %0 entries.", String.valueOf(result.getChangedEntries().size())));
-            }
-        };
+        AutoSetFileLinksUtil util =
+                new AutoSetFileLinksUtil(
+                        database,
+                        preferences.getExternalApplicationsPreferences(),
+                        preferences.getFilePreferences(),
+                        preferences.getAutoLinkPreferences());
+        final NamedCompound nc =
+                new NamedCompound(Localization.lang("Automatically set file links"));
+
+        Task<AutoSetFileLinksUtil.LinkFilesResult> linkFilesTask =
+                new Task<>() {
+                    final BiConsumer<LinkedFile, BibEntry> onLinkedFile =
+                            (linkedFile, entry) -> {
+                                // lambda for gui actions that are relevant when setting the linked
+                                // file entry when ui is opened
+                                String newVal = FileFieldWriter.getStringRepresentation(linkedFile);
+                                String oldVal = entry.getField(StandardField.FILE).orElse(null);
+                                UndoableFieldChange fieldChange =
+                                        new UndoableFieldChange(
+                                                entry, StandardField.FILE, oldVal, newVal);
+                                nc.addEdit(fieldChange); // push to undo manager is in succeeded
+                                entry.addFile(linkedFile);
+                            };
+
+                    @Override
+                    protected AutoSetFileLinksUtil.LinkFilesResult call() {
+                        return util.linkAssociatedFiles(entries, onLinkedFile);
+                    }
+
+                    @Override
+                    protected void succeeded() {
+                        AutoSetFileLinksUtil.LinkFilesResult result = getValue();
+
+                        if (!result.getFileExceptions().isEmpty()) {
+                            dialogService.showWarningDialogAndWait(
+                                    Localization.lang("Automatically set file links"),
+                                    Localization.lang(
+                                            "Problem finding files. See error log for details."));
+                            return;
+                        }
+
+                        if (result.getChangedEntries().isEmpty()) {
+                            dialogService.showWarningDialogAndWait(
+                                    "Automatically set file links",
+                                    Localization.lang(
+                                                    "Finished automatically setting external links.")
+                                            + "\n"
+                                            + Localization.lang("No files found."));
+                            return;
+                        }
+
+                        if (nc.hasEdits()) {
+                            nc.end();
+                            undoManager.addEdit(nc);
+                        }
+
+                        dialogService.notify(
+                                Localization.lang("Finished automatically setting external links.")
+                                        + " "
+                                        + Localization.lang(
+                                                "Changed %0 entries.",
+                                                String.valueOf(result.getChangedEntries().size())));
+                    }
+                };
 
         dialogService.showProgressDialog(
                 Localization.lang("Automatically setting file links"),
diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java b/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
index a5fd3c5050bc..62d05f151f2f 100644
--- a/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
+++ b/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
@@ -1,13 +1,5 @@
 package org.jabref.gui.externalfiles;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.BiConsumer;
-
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.externalfiletype.UnknownExternalFileType;
@@ -20,10 +12,17 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+
 public class AutoSetFileLinksUtil {
 
     public static class LinkFilesResult {
@@ -54,21 +53,31 @@ public List<IOException> getFileExceptions() {
     private final ExternalApplicationsPreferences externalApplicationsPreferences;
     private final FilePreferences filePreferences;
 
-    public AutoSetFileLinksUtil(BibDatabaseContext databaseContext,
-                                ExternalApplicationsPreferences externalApplicationsPreferences,
-                                FilePreferences filePreferences,
-                                AutoLinkPreferences autoLinkPreferences) {
-        this(databaseContext.getFileDirectories(filePreferences), externalApplicationsPreferences, filePreferences, autoLinkPreferences);
+    public AutoSetFileLinksUtil(
+            BibDatabaseContext databaseContext,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            FilePreferences filePreferences,
+            AutoLinkPreferences autoLinkPreferences) {
+        this(
+                databaseContext.getFileDirectories(filePreferences),
+                externalApplicationsPreferences,
+                filePreferences,
+                autoLinkPreferences);
     }
 
-    private AutoSetFileLinksUtil(List<Path> directories, ExternalApplicationsPreferences externalApplicationsPreferences, FilePreferences filePreferences, AutoLinkPreferences autoLinkPreferences) {
+    private AutoSetFileLinksUtil(
+            List<Path> directories,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            FilePreferences filePreferences,
+            AutoLinkPreferences autoLinkPreferences) {
         this.directories = directories;
         this.autoLinkPreferences = autoLinkPreferences;
         this.externalApplicationsPreferences = externalApplicationsPreferences;
         this.filePreferences = filePreferences;
     }
 
-    public LinkFilesResult linkAssociatedFiles(List<BibEntry> entries, BiConsumer<LinkedFile, BibEntry> onAddLinkedFile) {
+    public LinkFilesResult linkAssociatedFiles(
+            List<BibEntry> entries, BiConsumer<LinkedFile, BibEntry> onAddLinkedFile) {
         LinkFilesResult result = new LinkFilesResult();
 
         for (BibEntry entry : entries) {
@@ -94,7 +103,10 @@ public LinkFilesResult linkAssociatedFiles(List<BibEntry> entries, BiConsumer<Li
     public List<LinkedFile> findAssociatedNotLinkedFiles(BibEntry entry) throws IOException {
         List<LinkedFile> linkedFiles = new ArrayList<>();
 
-        List<String> extensions = externalApplicationsPreferences.getExternalFileTypes().stream().map(ExternalFileType::getExtension).toList();
+        List<String> extensions =
+                externalApplicationsPreferences.getExternalFileTypes().stream()
+                        .map(ExternalFileType::getExtension)
+                        .toList();
 
         LOGGER.debug("Searching for extensions {} in directories {}", extensions, directories);
 
@@ -104,21 +116,28 @@ public List<LinkedFile> findAssociatedNotLinkedFiles(BibEntry entry) throws IOEx
 
         // Collect the found files that are not yet linked
         for (Path foundFile : result) {
-            boolean fileAlreadyLinked = entry.getFiles().stream()
-                                             .map(file -> file.findIn(directories))
-                                             .anyMatch(file -> {
-                                                 try {
-                                                     return file.isPresent() && Files.isSameFile(file.get(), foundFile);
-                                                 } catch (IOException e) {
-                                                     LOGGER.error("Problem with isSameFile", e);
-                                                 }
-                                                 return false;
-                                             });
+            boolean fileAlreadyLinked =
+                    entry.getFiles().stream()
+                            .map(file -> file.findIn(directories))
+                            .anyMatch(
+                                    file -> {
+                                        try {
+                                            return file.isPresent()
+                                                    && Files.isSameFile(file.get(), foundFile);
+                                        } catch (IOException e) {
+                                            LOGGER.error("Problem with isSameFile", e);
+                                        }
+                                        return false;
+                                    });
 
             if (!fileAlreadyLinked) {
-                Optional<ExternalFileType> type = FileUtil.getFileExtension(foundFile)
-                                                            .map(extension -> ExternalFileTypes.getExternalFileTypeByExt(extension, externalApplicationsPreferences))
-                                                            .orElse(Optional.of(new UnknownExternalFileType("")));
+                Optional<ExternalFileType> type =
+                        FileUtil.getFileExtension(foundFile)
+                                .map(
+                                        extension ->
+                                                ExternalFileTypes.getExternalFileTypeByExt(
+                                                        extension, externalApplicationsPreferences))
+                                .orElse(Optional.of(new UnknownExternalFileType("")));
 
                 String strType = type.isPresent() ? type.get().getName() : "";
                 Path relativeFilePath = FileUtil.relativize(foundFile, directories);
diff --git a/src/main/java/org/jabref/gui/externalfiles/ChainedFilters.java b/src/main/java/org/jabref/gui/externalfiles/ChainedFilters.java
index 4162c9c674f6..2b93a0bba047 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ChainedFilters.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ChainedFilters.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.externalfiles;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Path;
 import java.util.Arrays;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Chains the given filters - if ALL of them accept, the result is also accepted
  */
@@ -23,13 +23,15 @@ public ChainedFilters(DirectoryStream.Filter<Path>... filters) {
 
     @Override
     public boolean accept(Path entry) throws IOException {
-        return Arrays.stream(filters).allMatch(filter -> {
-            try {
-                return filter.accept(entry);
-            } catch (IOException e) {
-                LOGGER.error("Could not apply filter", e);
-                return true;
-            }
-        });
+        return Arrays.stream(filters)
+                .allMatch(
+                        filter -> {
+                            try {
+                                return filter.accept(entry);
+                            } catch (IOException e) {
+                                LOGGER.error("Could not apply filter", e);
+                                return true;
+                            }
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java b/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
index b0bdff13ed80..6d20da483bc2 100644
--- a/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.externalfiles;
 
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-
 import javafx.concurrent.Task;
 
 import org.jabref.gui.DialogService;
@@ -20,10 +14,15 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+
 /**
  * Try to download fulltext PDF for selected entry(ies) by following URL or DOI link.
  */
@@ -38,10 +37,11 @@ public class DownloadFullTextAction extends SimpleCommand {
     private final GuiPreferences preferences;
     private final UiTaskExecutor taskExecutor;
 
-    public DownloadFullTextAction(DialogService dialogService,
-                                  StateManager stateManager,
-                                  GuiPreferences preferences,
-                                  UiTaskExecutor taskExecutor) {
+    public DownloadFullTextAction(
+            DialogService dialogService,
+            StateManager stateManager,
+            GuiPreferences preferences,
+            UiTaskExecutor taskExecutor) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.preferences = preferences;
@@ -65,16 +65,20 @@ public void execute() {
         dialogService.notify(Localization.lang("Looking for full text document..."));
 
         if (entries.size() >= WARNING_LIMIT) {
-            boolean confirmDownload = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("Download full text documents"),
-                    Localization.lang(
-                            "You are about to download full text documents for %0 entries.",
-                            String.valueOf(stateManager.getSelectedEntries().size())) + "\n"
-                            + Localization.lang("JabRef will send at least one request per entry to a publisher.")
-                            + "\n"
-                            + Localization.lang("Do you still want to continue?"),
-                    Localization.lang("Download full text documents"),
-                    Localization.lang("Cancel"));
+            boolean confirmDownload =
+                    dialogService.showConfirmationDialogAndWait(
+                            Localization.lang("Download full text documents"),
+                            Localization.lang(
+                                            "You are about to download full text documents for %0 entries.",
+                                            String.valueOf(
+                                                    stateManager.getSelectedEntries().size()))
+                                    + "\n"
+                                    + Localization.lang(
+                                            "JabRef will send at least one request per entry to a publisher.")
+                                    + "\n"
+                                    + Localization.lang("Do you still want to continue?"),
+                            Localization.lang("Download full text documents"),
+                            Localization.lang("Cancel"));
 
             if (!confirmDownload) {
                 dialogService.notify(Localization.lang("Operation canceled."));
@@ -82,24 +86,29 @@ public void execute() {
             }
         }
 
-        Task<Map<BibEntry, Optional<URL>>> findFullTextsTask = new Task<>() {
-            @Override
-            protected Map<BibEntry, Optional<URL>> call() {
-                Map<BibEntry, Optional<URL>> downloads = new ConcurrentHashMap<>();
-                int count = 0;
-                for (BibEntry entry : entries) {
-                    FulltextFetchers fetchers = new FulltextFetchers(
-                            preferences.getImportFormatPreferences(),
-                            preferences.getImporterPreferences());
-                    downloads.put(entry, fetchers.findFullTextPDF(entry));
-                    updateProgress(++count, entries.size());
-                }
-                return downloads;
-            }
-        };
-
-        findFullTextsTask.setOnSucceeded(value ->
-                downloadFullTexts(findFullTextsTask.getValue(), stateManager.getActiveDatabase().get()));
+        Task<Map<BibEntry, Optional<URL>>> findFullTextsTask =
+                new Task<>() {
+                    @Override
+                    protected Map<BibEntry, Optional<URL>> call() {
+                        Map<BibEntry, Optional<URL>> downloads = new ConcurrentHashMap<>();
+                        int count = 0;
+                        for (BibEntry entry : entries) {
+                            FulltextFetchers fetchers =
+                                    new FulltextFetchers(
+                                            preferences.getImportFormatPreferences(),
+                                            preferences.getImporterPreferences());
+                            downloads.put(entry, fetchers.findFullTextPDF(entry));
+                            updateProgress(++count, entries.size());
+                        }
+                        return downloads;
+                    }
+                };
+
+        findFullTextsTask.setOnSucceeded(
+                value ->
+                        downloadFullTexts(
+                                findFullTextsTask.getValue(),
+                                stateManager.getActiveDatabase().get()));
 
         dialogService.showProgressDialog(
                 Localization.lang("Download full text documents"),
@@ -109,15 +118,18 @@ protected Map<BibEntry, Optional<URL>> call() {
         taskExecutor.execute(findFullTextsTask);
     }
 
-    private void downloadFullTexts(Map<BibEntry, Optional<URL>> downloads, BibDatabaseContext databaseContext) {
+    private void downloadFullTexts(
+            Map<BibEntry, Optional<URL>> downloads, BibDatabaseContext databaseContext) {
         for (Map.Entry<BibEntry, Optional<URL>> download : downloads.entrySet()) {
             BibEntry entry = download.getKey();
             Optional<URL> result = download.getValue();
             if (result.isPresent()) {
                 addLinkedFileFromURL(databaseContext, result.get(), entry);
             } else {
-                dialogService.notify(Localization.lang("No full text document found for entry %0.",
-                        entry.getCitationKey().orElse(Localization.lang("undefined"))));
+                dialogService.notify(
+                        Localization.lang(
+                                "No full text document found for entry %0.",
+                                entry.getCitationKey().orElse(Localization.lang("undefined"))));
             }
         }
     }
@@ -134,17 +146,20 @@ private void addLinkedFileFromURL(BibDatabaseContext databaseContext, URL url, B
         LinkedFile newLinkedFile = new LinkedFile(url, "");
 
         if (!entry.getFiles().contains(newLinkedFile)) {
-            LinkedFileViewModel onlineFile = new LinkedFileViewModel(
-                    newLinkedFile,
-                    entry,
-                    databaseContext,
-                    taskExecutor,
-                    dialogService,
-                    preferences);
+            LinkedFileViewModel onlineFile =
+                    new LinkedFileViewModel(
+                            newLinkedFile,
+                            entry,
+                            databaseContext,
+                            taskExecutor,
+                            dialogService,
+                            preferences);
             onlineFile.download(true);
         } else {
-            dialogService.notify(Localization.lang("Full text document for entry %0 already linked.",
-                    entry.getCitationKey().orElse(Localization.lang("undefined"))));
+            dialogService.notify(
+                    Localization.lang(
+                            "Full text document for entry %0 already linked.",
+                            entry.getCitationKey().orElse(Localization.lang("undefined"))));
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiles/DuplicateDecisionResult.java b/src/main/java/org/jabref/gui/externalfiles/DuplicateDecisionResult.java
index 8bfc842297da..a55b0821a156 100644
--- a/src/main/java/org/jabref/gui/externalfiles/DuplicateDecisionResult.java
+++ b/src/main/java/org/jabref/gui/externalfiles/DuplicateDecisionResult.java
@@ -4,8 +4,4 @@
 import org.jabref.model.entry.BibEntry;
 
 public record DuplicateDecisionResult(
-        DuplicateResolverDialog.DuplicateResolverResult decision,
-        BibEntry mergedEntry) {
-}
-
-
+        DuplicateResolverDialog.DuplicateResolverResult decision, BibEntry mergedEntry) {}
diff --git a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
index 85b1a83213e7..7214f7d811b1 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
@@ -1,13 +1,5 @@
 package org.jabref.gui.externalfiles;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
@@ -23,10 +15,17 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
 public class ExternalFilesEntryLinker {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ExternalFilesEntryLinker.class);
@@ -38,7 +37,11 @@ public class ExternalFilesEntryLinker {
     private final RenamePdfCleanup renameFilesCleanup;
     private final DialogService dialogService;
 
-    public ExternalFilesEntryLinker(ExternalApplicationsPreferences externalApplicationsPreferences, FilePreferences filePreferences, BibDatabaseContext bibDatabaseContext, DialogService dialogService) {
+    public ExternalFilesEntryLinker(
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            FilePreferences filePreferences,
+            BibDatabaseContext bibDatabaseContext,
+            DialogService dialogService) {
         this.externalApplicationsPreferences = externalApplicationsPreferences;
         this.filePreferences = filePreferences;
         this.bibDatabaseContext = bibDatabaseContext;
@@ -48,7 +51,8 @@ public ExternalFilesEntryLinker(ExternalApplicationsPreferences externalApplicat
     }
 
     public Optional<Path> copyFileToFileDir(Path file) {
-        Optional<Path> firstExistingFileDir = bibDatabaseContext.getFirstExistingFileDir(filePreferences);
+        Optional<Path> firstExistingFileDir =
+                bibDatabaseContext.getFirstExistingFileDir(filePreferences);
         if (firstExistingFileDir.isPresent()) {
             Path targetFile = firstExistingFileDir.get().resolve(file.getFileName());
             if (FileUtil.copyFile(file, targetFile, false)) {
@@ -69,17 +73,25 @@ public void moveLinkedFilesToFileDir(BibEntry entry) {
     public void addFilesToEntry(BibEntry entry, List<Path> files) {
         List<Path> validFiles = getValidFileNames(files);
         for (Path file : validFiles) {
-            FileUtil.getFileExtension(file).ifPresent(ext -> {
-                ExternalFileType type = ExternalFileTypes.getExternalFileTypeByExt(ext, externalApplicationsPreferences)
-                                                         .orElse(new UnknownExternalFileType(ext));
-                Path relativePath = FileUtil.relativize(file, bibDatabaseContext, filePreferences);
-                LinkedFile linkedfile = new LinkedFile("", relativePath, type.getName());
-                entry.addFile(linkedfile);
-            });
+            FileUtil.getFileExtension(file)
+                    .ifPresent(
+                            ext -> {
+                                ExternalFileType type =
+                                        ExternalFileTypes.getExternalFileTypeByExt(
+                                                        ext, externalApplicationsPreferences)
+                                                .orElse(new UnknownExternalFileType(ext));
+                                Path relativePath =
+                                        FileUtil.relativize(
+                                                file, bibDatabaseContext, filePreferences);
+                                LinkedFile linkedfile =
+                                        new LinkedFile("", relativePath, type.getName());
+                                entry.addFile(linkedfile);
+                            });
         }
     }
 
-    public void moveFilesToFileDirRenameAndAddToEntry(BibEntry entry, List<Path> files, LuceneManager luceneManager) {
+    public void moveFilesToFileDirRenameAndAddToEntry(
+            BibEntry entry, List<Path> files, LuceneManager luceneManager) {
         try (AutoCloseable blocker = luceneManager.blockLinkedFileIndexer()) {
             addFilesToEntry(entry, files);
             moveLinkedFilesToFileDir(entry);
@@ -90,11 +102,15 @@ public void moveFilesToFileDirRenameAndAddToEntry(BibEntry entry, List<Path> fil
         luceneManager.updateAfterDropFiles(entry);
     }
 
-    public void copyFilesToFileDirAndAddToEntry(BibEntry entry, List<Path> files, LuceneManager luceneManager) {
+    public void copyFilesToFileDirAndAddToEntry(
+            BibEntry entry, List<Path> files, LuceneManager luceneManager) {
         try (AutoCloseable blocker = luceneManager.blockLinkedFileIndexer()) {
             for (Path file : files) {
                 copyFileToFileDir(file)
-                        .ifPresent(copiedFile -> addFilesToEntry(entry, Collections.singletonList(copiedFile)));
+                        .ifPresent(
+                                copiedFile ->
+                                        addFilesToEntry(
+                                                entry, Collections.singletonList(copiedFile)));
             }
             renameLinkedFilesToPattern(entry);
         } catch (Exception e) {
@@ -108,11 +124,17 @@ private List<Path> getValidFileNames(List<Path> filesToAdd) {
 
         for (Path fileToAdd : filesToAdd) {
             if (FileUtil.detectBadFileName(fileToAdd.toString())) {
-                String newFilename = FileNameCleaner.cleanFileName(fileToAdd.getFileName().toString());
-
-                boolean correctButtonPressed = dialogService.showConfirmationDialogAndWait(Localization.lang("File \"%0\" cannot be added!", fileToAdd.getFileName()),
-                        Localization.lang("Illegal characters in the file name detected.\nFile will be renamed to \"%0\" and added.", newFilename),
-                        Localization.lang("Rename and add"));
+                String newFilename =
+                        FileNameCleaner.cleanFileName(fileToAdd.getFileName().toString());
+
+                boolean correctButtonPressed =
+                        dialogService.showConfirmationDialogAndWait(
+                                Localization.lang(
+                                        "File \"%0\" cannot be added!", fileToAdd.getFileName()),
+                                Localization.lang(
+                                        "Illegal characters in the file name detected.\nFile will be renamed to \"%0\" and added.",
+                                        newFilename),
+                                Localization.lang("Rename and add"));
 
                 if (correctButtonPressed) {
                     Path correctPath = fileToAdd.resolveSibling(newFilename);
diff --git a/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java b/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
index 28a4f284c9e6..3a600c2960a7 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.externalfiles;
 
-import java.nio.file.DirectoryStream.Filter;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.frame.ExternalApplicationsPreferences;
@@ -13,6 +8,11 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.FileType;
 
+import java.nio.file.DirectoryStream.Filter;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class FileExtensionViewModel {
 
     private final String name;
@@ -20,7 +20,8 @@ public class FileExtensionViewModel {
     private final List<String> extensions;
     private final ExternalApplicationsPreferences externalApplicationsPreferences;
 
-    FileExtensionViewModel(FileType fileType, ExternalApplicationsPreferences externalApplicationsPreferences) {
+    FileExtensionViewModel(
+            FileType fileType, ExternalApplicationsPreferences externalApplicationsPreferences) {
         this.name = fileType.getName();
         this.description = Localization.lang("%0 file", fileType.getName());
         this.extensions = fileType.getExtensionsWithAsteriskAndDot();
@@ -36,9 +37,10 @@ public String getDescription() {
     }
 
     public JabRefIcon getIcon() {
-        return ExternalFileTypes.getExternalFileTypeByExt(extensions.getFirst(), externalApplicationsPreferences)
-                                .map(ExternalFileType::getIcon)
-                                .orElse(null);
+        return ExternalFileTypes.getExternalFileTypeByExt(
+                        extensions.getFirst(), externalApplicationsPreferences)
+                .map(ExternalFileType::getIcon)
+                .orElse(null);
     }
 
     public Filter<Path> dirFilter() {
diff --git a/src/main/java/org/jabref/gui/externalfiles/FileFilterUtils.java b/src/main/java/org/jabref/gui/externalfiles/FileFilterUtils.java
index 22f2aee57f58..f11fcba57095 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FileFilterUtils.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FileFilterUtils.java
@@ -1,5 +1,10 @@
 package org.jabref.gui.externalfiles;
 
+import org.jabref.logic.externalfiles.DateRange;
+import org.jabref.logic.externalfiles.ExternalFileSorter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -10,12 +15,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.jabref.logic.externalfiles.DateRange;
-import org.jabref.logic.externalfiles.ExternalFileSorter;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class FileFilterUtils {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FileFilterUtils.class);
@@ -29,10 +28,8 @@ public static LocalDateTime getFileTime(Path path) {
             LOGGER.error("Could not retrieve file time", e);
             return LocalDateTime.now();
         }
-        LocalDateTime localDateTime = lastEditedTime
-                .toInstant()
-                .atZone(ZoneId.systemDefault())
-                .toLocalDateTime();
+        LocalDateTime localDateTime =
+                lastEditedTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
         return localDateTime;
     }
 
@@ -68,13 +65,14 @@ public boolean isDuringLastYear(LocalDateTime fileEditTime) {
     public static boolean filterByDate(Path path, DateRange filter) {
         FileFilterUtils fileFilter = new FileFilterUtils();
         LocalDateTime fileTime = FileFilterUtils.getFileTime(path);
-        boolean isInDateRange = switch (filter) {
-            case DAY -> fileFilter.isDuringLastDay(fileTime);
-            case WEEK -> fileFilter.isDuringLastWeek(fileTime);
-            case MONTH -> fileFilter.isDuringLastMonth(fileTime);
-            case YEAR -> fileFilter.isDuringLastYear(fileTime);
-            case ALL_TIME -> true;
-        };
+        boolean isInDateRange =
+                switch (filter) {
+                    case DAY -> fileFilter.isDuringLastDay(fileTime);
+                    case WEEK -> fileFilter.isDuringLastWeek(fileTime);
+                    case MONTH -> fileFilter.isDuringLastMonth(fileTime);
+                    case YEAR -> fileFilter.isDuringLastYear(fileTime);
+                    case ALL_TIME -> true;
+                };
         return isInDateRange;
     }
 
@@ -84,10 +82,13 @@ public static boolean filterByDate(Path path, DateRange filter) {
      */
     public List<Path> sortByDateAscending(List<Path> files) {
         return files.stream()
-                .sorted(Comparator.comparingLong(file -> FileFilterUtils.getFileTime(file)
-                        .atZone(ZoneId.systemDefault())
-                        .toInstant()
-                        .toEpochMilli()))
+                .sorted(
+                        Comparator.comparingLong(
+                                file ->
+                                        FileFilterUtils.getFileTime(file)
+                                                .atZone(ZoneId.systemDefault())
+                                                .toInstant()
+                                                .toEpochMilli()))
                 .collect(Collectors.toList());
     }
 
@@ -97,10 +98,13 @@ public List<Path> sortByDateAscending(List<Path> files) {
      */
     public List<Path> sortByDateDescending(List<Path> files) {
         return files.stream()
-                .sorted(Comparator.comparingLong(file -> -FileFilterUtils.getFileTime(file)
-                        .atZone(ZoneId.systemDefault())
-                        .toInstant()
-                        .toEpochMilli()))
+                .sorted(
+                        Comparator.comparingLong(
+                                file ->
+                                        -FileFilterUtils.getFileTime(file)
+                                                .atZone(ZoneId.systemDefault())
+                                                .toInstant()
+                                                .toEpochMilli()))
                 .collect(Collectors.toList());
     }
 
@@ -110,12 +114,12 @@ public List<Path> sortByDateDescending(List<Path> files) {
      */
     public static List<Path> sortByDate(List<Path> files, ExternalFileSorter sortType) {
         FileFilterUtils fileFilter = new FileFilterUtils();
-        List<Path> sortedFiles = switch (sortType) {
-            case DEFAULT -> files;
-            case DATE_ASCENDING -> fileFilter.sortByDateDescending(files);
-            case DATE_DESCENDING -> fileFilter.sortByDateAscending(files);
-        };
+        List<Path> sortedFiles =
+                switch (sortType) {
+                    case DEFAULT -> files;
+                    case DATE_ASCENDING -> fileFilter.sortByDateDescending(files);
+                    case DATE_DESCENDING -> fileFilter.sortByDateAscending(files);
+                };
         return sortedFiles;
     }
 }
-
diff --git a/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesAction.java b/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesAction.java
index 7c5cb7bf6447..60eadc8f0040 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesAction.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.externalfiles;
 
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-
 public class FindUnlinkedFilesAction extends SimpleCommand {
 
     private final DialogService dialogService;
diff --git a/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java b/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java
index e396c4f883a9..b3cda0fadca5 100644
--- a/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java
+++ b/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java
@@ -1,5 +1,10 @@
 package org.jabref.gui.externalfiles;
 
+import static java.util.function.Predicate.not;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
 import java.nio.file.FileSystems;
@@ -10,11 +15,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static java.util.function.Predicate.not;
-
 public class GitIgnoreFileFilter implements DirectoryStream.Filter<Path> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GitIgnoreFileFilter.class);
@@ -28,22 +28,29 @@ public GitIgnoreFileFilter(Path path) {
         }
         if (currentPath == null) {
             // we did not find any gitignore, lets use the default
-            gitIgnorePatterns = Set.of(".git", ".DS_Store", "desktop.ini", "Thumbs.db").stream()
-                                   // duplicate code as below
-                                   .map(line -> "glob:" + line)
-                                   .map(matcherString -> FileSystems.getDefault().getPathMatcher(matcherString))
-                                   .collect(Collectors.toSet());
+            gitIgnorePatterns =
+                    Set.of(".git", ".DS_Store", "desktop.ini", "Thumbs.db").stream()
+                            // duplicate code as below
+                            .map(line -> "glob:" + line)
+                            .map(
+                                    matcherString ->
+                                            FileSystems.getDefault().getPathMatcher(matcherString))
+                            .collect(Collectors.toSet());
         } else {
             Path gitIgnore = currentPath.resolve(".gitignore");
             try {
-                Set<PathMatcher> plainGitIgnorePatternsFromGitIgnoreFile = Files.readAllLines(gitIgnore).stream()
-                                                                                .map(String::trim)
-                                                                                .filter(not(String::isEmpty))
-                                                                                .filter(line -> !line.startsWith("#"))
-                                                                                // convert to Java syntax for Glob patterns
-                                                                                .map(line -> "glob:" + line)
-                                                                                .map(matcherString -> FileSystems.getDefault().getPathMatcher(matcherString))
-                                                                                .collect(Collectors.toSet());
+                Set<PathMatcher> plainGitIgnorePatternsFromGitIgnoreFile =
+                        Files.readAllLines(gitIgnore).stream()
+                                .map(String::trim)
+                                .filter(not(String::isEmpty))
+                                .filter(line -> !line.startsWith("#"))
+                                // convert to Java syntax for Glob patterns
+                                .map(line -> "glob:" + line)
+                                .map(
+                                        matcherString ->
+                                                FileSystems.getDefault()
+                                                        .getPathMatcher(matcherString))
+                                .collect(Collectors.toSet());
                 gitIgnorePatterns = new HashSet<>(plainGitIgnorePatternsFromGitIgnoreFile);
                 // we want to ignore ".gitignore" itself
                 gitIgnorePatterns.add(FileSystems.getDefault().getPathMatcher("glob:.gitignore"));
@@ -57,10 +64,13 @@ public GitIgnoreFileFilter(Path path) {
     @Override
     public boolean accept(Path path) throws IOException {
         // We assume that git does not stop at a patern, but tries all. We implement that behavior
-        return gitIgnorePatterns.stream().noneMatch(filter ->
-                // we need this one for "*.png"
-                filter.matches(path.getFileName()) ||
-                // we need this one for "**/*.png"
-                filter.matches(path));
+        return gitIgnorePatterns.stream()
+                .noneMatch(
+                        filter ->
+                                // we need this one for "*.png"
+                                filter.matches(path.getFileName())
+                                        ||
+                                        // we need this one for "**/*.png"
+                                        filter.matches(path));
     }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiles/ImportFilesResultItemViewModel.java b/src/main/java/org/jabref/gui/externalfiles/ImportFilesResultItemViewModel.java
index 3677107b4278..8e3f5735fb36 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ImportFilesResultItemViewModel.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ImportFilesResultItemViewModel.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.externalfiles;
 
-import java.nio.file.Path;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -11,10 +9,13 @@
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 
+import java.nio.file.Path;
+
 public class ImportFilesResultItemViewModel {
 
     private final StringProperty file = new SimpleStringProperty("");
-    private final ObjectProperty<JabRefIcon> icon = new SimpleObjectProperty<>(IconTheme.JabRefIcons.WARNING);
+    private final ObjectProperty<JabRefIcon> icon =
+            new SimpleObjectProperty<>(IconTheme.JabRefIcons.WARNING);
     private final StringProperty message = new SimpleStringProperty("");
 
     public ImportFilesResultItemViewModel(Path file, boolean success, String message) {
@@ -41,6 +42,10 @@ public StringProperty message() {
 
     @Override
     public String toString() {
-        return "ImportFilesResultItemViewModel [file=" + file.get() + ", message=" + message.get() + "]";
+        return "ImportFilesResultItemViewModel [file="
+                + file.get()
+                + ", message="
+                + message.get()
+                + "]";
     }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
index 669aa9a21bc4..c0cf8856e561 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
@@ -1,17 +1,9 @@
 package org.jabref.gui.externalfiles;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.jabref.gui.duplicationFinder.DuplicateResolverDialog.DuplicateResolverResult.BREAK;
 
-import javax.swing.undo.CompoundEdit;
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.injection.Injector;
+import com.google.common.annotations.VisibleForTesting;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
@@ -55,13 +47,21 @@
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.model.util.OptionalUtil;
-
-import com.airhacks.afterburner.injection.Injector;
-import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.gui.duplicationFinder.DuplicateResolverDialog.DuplicateResolverResult.BREAK;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import javax.swing.undo.CompoundEdit;
+import javax.swing.undo.UndoManager;
 
 public class ImportHandler {
 
@@ -76,13 +76,14 @@ public class ImportHandler {
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
 
-    public ImportHandler(BibDatabaseContext database,
-                         GuiPreferences preferences,
-                         FileUpdateMonitor fileupdateMonitor,
-                         UndoManager undoManager,
-                         StateManager stateManager,
-                         DialogService dialogService,
-                         TaskExecutor taskExecutor) {
+    public ImportHandler(
+            BibDatabaseContext database,
+            GuiPreferences preferences,
+            FileUpdateMonitor fileupdateMonitor,
+            UndoManager undoManager,
+            StateManager stateManager,
+            DialogService dialogService,
+            TaskExecutor taskExecutor) {
 
         this.bibDatabaseContext = database;
         this.preferences = preferences;
@@ -91,8 +92,14 @@ public ImportHandler(BibDatabaseContext database,
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
 
-        this.linker = new ExternalFilesEntryLinker(preferences.getExternalApplicationsPreferences(), preferences.getFilePreferences(), database, dialogService);
-        this.contentImporter = new ExternalFilesContentImporter(preferences.getImportFormatPreferences());
+        this.linker =
+                new ExternalFilesEntryLinker(
+                        preferences.getExternalApplicationsPreferences(),
+                        preferences.getFilePreferences(),
+                        database,
+                        dialogService);
+        this.contentImporter =
+                new ExternalFilesContentImporter(preferences.getImportFormatPreferences());
         this.undoManager = undoManager;
     }
 
@@ -100,7 +107,10 @@ public ExternalFilesEntryLinker getLinker() {
         return linker;
     }
 
-    public BackgroundTask<List<ImportFilesResultItemViewModel>> importFilesInBackground(final List<Path> files, final BibDatabaseContext bibDatabaseContext, final FilePreferences filePreferences) {
+    public BackgroundTask<List<ImportFilesResultItemViewModel>> importFilesInBackground(
+            final List<Path> files,
+            final BibDatabaseContext bibDatabaseContext,
+            final FilePreferences filePreferences) {
         return new BackgroundTask<>() {
             private int counter;
             private final List<ImportFilesResultItemViewModel> results = new ArrayList<>();
@@ -116,50 +126,88 @@ public List<ImportFilesResultItemViewModel> call() {
                         break;
                     }
 
-                    UiTaskExecutor.runInJavaFXThread(() -> {
-                        updateMessage(Localization.lang("Processing file %0", file.getFileName()));
-                        updateProgress(counter, files.size() - 1d);
-                    });
+                    UiTaskExecutor.runInJavaFXThread(
+                            () -> {
+                                updateMessage(
+                                        Localization.lang(
+                                                "Processing file %0", file.getFileName()));
+                                updateProgress(counter, files.size() - 1d);
+                            });
 
                     try {
                         if (FileUtil.isPDFFile(file)) {
                             var pdfImporterResult = contentImporter.importPDFContent(file);
-                            List<BibEntry> pdfEntriesInFile = pdfImporterResult.getDatabase().getEntries();
+                            List<BibEntry> pdfEntriesInFile =
+                                    pdfImporterResult.getDatabase().getEntries();
 
                             if (pdfImporterResult.hasWarnings()) {
-                                addResultToList(file, false, Localization.lang("Error reading PDF content: %0", pdfImporterResult.getErrorMessage()));
+                                addResultToList(
+                                        file,
+                                        false,
+                                        Localization.lang(
+                                                "Error reading PDF content: %0",
+                                                pdfImporterResult.getErrorMessage()));
                             }
 
                             if (!pdfEntriesInFile.isEmpty()) {
-                                entriesToAdd.addAll(FileUtil.relativize(pdfEntriesInFile, bibDatabaseContext, filePreferences));
-                                addResultToList(file, true, Localization.lang("File was successfully imported as a new entry"));
+                                entriesToAdd.addAll(
+                                        FileUtil.relativize(
+                                                pdfEntriesInFile,
+                                                bibDatabaseContext,
+                                                filePreferences));
+                                addResultToList(
+                                        file,
+                                        true,
+                                        Localization.lang(
+                                                "File was successfully imported as a new entry"));
                             } else {
                                 entriesToAdd.add(createEmptyEntryWithLink(file));
-                                addResultToList(file, false, Localization.lang("No BibTeX was found. An empty entry was created with file link."));
+                                addResultToList(
+                                        file,
+                                        false,
+                                        Localization.lang(
+                                                "No BibTeX was found. An empty entry was created with file link."));
                             }
                         } else if (FileUtil.isBibFile(file)) {
-                            var bibtexParserResult = contentImporter.importFromBibFile(file, fileUpdateMonitor);
+                            var bibtexParserResult =
+                                    contentImporter.importFromBibFile(file, fileUpdateMonitor);
                             if (bibtexParserResult.hasWarnings()) {
                                 addResultToList(file, false, bibtexParserResult.getErrorMessage());
                             }
 
-                            entriesToAdd.addAll(bibtexParserResult.getDatabaseContext().getEntries());
-                            addResultToList(file, true, Localization.lang("Bib entry was successfully imported"));
+                            entriesToAdd.addAll(
+                                    bibtexParserResult.getDatabaseContext().getEntries());
+                            addResultToList(
+                                    file,
+                                    true,
+                                    Localization.lang("Bib entry was successfully imported"));
                         } else {
                             entriesToAdd.add(createEmptyEntryWithLink(file));
-                            addResultToList(file, false, Localization.lang("No BibTeX data was found. An empty entry was created with file link."));
+                            addResultToList(
+                                    file,
+                                    false,
+                                    Localization.lang(
+                                            "No BibTeX data was found. An empty entry was created with file link."));
                         }
                     } catch (IOException ex) {
                         LOGGER.error("Error importing", ex);
-                        addResultToList(file, false, Localization.lang("Error from import: %0", ex.getLocalizedMessage()));
-
-                        UiTaskExecutor.runInJavaFXThread(() -> updateMessage(Localization.lang("Error")));
+                        addResultToList(
+                                file,
+                                false,
+                                Localization.lang(
+                                        "Error from import: %0", ex.getLocalizedMessage()));
+
+                        UiTaskExecutor.runInJavaFXThread(
+                                () -> updateMessage(Localization.lang("Error")));
                     }
 
-                    // We need to run the actual import on the FX Thread, otherwise we will get some deadlocks with the UIThreadList
+                    // We need to run the actual import on the FX Thread, otherwise we will get some
+                    // deadlocks with the UIThreadList
                     UiTaskExecutor.runInJavaFXThread(() -> importEntries(entriesToAdd));
 
-                    ce.addEdit(new UndoableInsertEntries(bibDatabaseContext.getDatabase(), entriesToAdd));
+                    ce.addEdit(
+                            new UndoableInsertEntries(
+                                    bibDatabaseContext.getDatabase(), entriesToAdd));
                     ce.end();
                     // prevent fx thread exception in undo manager
                     UiTaskExecutor.runInJavaFXThread(() -> undoManager.addEdit(ce));
@@ -188,7 +236,9 @@ private BibEntry createEmptyEntryWithLink(Path file) {
      * There is no automatic download done.
      */
     public void importEntries(List<BibEntry> entries) {
-        ImportCleanup cleanup = ImportCleanup.targeting(bibDatabaseContext.getMode(), preferences.getFieldPreferences());
+        ImportCleanup cleanup =
+                ImportCleanup.targeting(
+                        bibDatabaseContext.getMode(), preferences.getFieldPreferences());
         cleanup.doPostCleanup(entries);
         importCleanedEntries(entries);
     }
@@ -200,42 +250,64 @@ public void importCleanedEntries(List<BibEntry> entries) {
         addToGroups(entries, stateManager.getSelectedGroups(bibDatabaseContext));
     }
 
-    public void importEntryWithDuplicateCheck(BibDatabaseContext bibDatabaseContext, BibEntry entry) {
+    public void importEntryWithDuplicateCheck(
+            BibDatabaseContext bibDatabaseContext, BibEntry entry) {
         importEntryWithDuplicateCheck(bibDatabaseContext, entry, BREAK);
     }
 
-    private void importEntryWithDuplicateCheck(BibDatabaseContext bibDatabaseContext, BibEntry entry, DuplicateResolverDialog.DuplicateResolverResult decision) {
+    private void importEntryWithDuplicateCheck(
+            BibDatabaseContext bibDatabaseContext,
+            BibEntry entry,
+            DuplicateResolverDialog.DuplicateResolverResult decision) {
         BibEntry entryToInsert = cleanUpEntry(bibDatabaseContext, entry);
 
         BackgroundTask.wrap(() -> findDuplicate(bibDatabaseContext, entryToInsert))
-                      .onFailure(e -> LOGGER.error("Error in duplicate search"))
-                      .onSuccess(existingDuplicateInLibrary -> {
-                          BibEntry finalEntry = entryToInsert;
-                          if (existingDuplicateInLibrary.isPresent()) {
-                              Optional<BibEntry> duplicateHandledEntry = handleDuplicates(bibDatabaseContext, entryToInsert, existingDuplicateInLibrary.get(), decision);
-                              if (duplicateHandledEntry.isEmpty()) {
-                                  return;
-                              }
-                              finalEntry = duplicateHandledEntry.get();
-                          }
-                          importCleanedEntries(List.of(finalEntry));
-                          downloadLinkedFiles(finalEntry);
-                      }).executeWith(taskExecutor);
+                .onFailure(e -> LOGGER.error("Error in duplicate search"))
+                .onSuccess(
+                        existingDuplicateInLibrary -> {
+                            BibEntry finalEntry = entryToInsert;
+                            if (existingDuplicateInLibrary.isPresent()) {
+                                Optional<BibEntry> duplicateHandledEntry =
+                                        handleDuplicates(
+                                                bibDatabaseContext,
+                                                entryToInsert,
+                                                existingDuplicateInLibrary.get(),
+                                                decision);
+                                if (duplicateHandledEntry.isEmpty()) {
+                                    return;
+                                }
+                                finalEntry = duplicateHandledEntry.get();
+                            }
+                            importCleanedEntries(List.of(finalEntry));
+                            downloadLinkedFiles(finalEntry);
+                        })
+                .executeWith(taskExecutor);
     }
 
     @VisibleForTesting
     BibEntry cleanUpEntry(BibDatabaseContext bibDatabaseContext, BibEntry entry) {
-        ImportCleanup cleanup = ImportCleanup.targeting(bibDatabaseContext.getMode(), preferences.getFieldPreferences());
+        ImportCleanup cleanup =
+                ImportCleanup.targeting(
+                        bibDatabaseContext.getMode(), preferences.getFieldPreferences());
         return cleanup.doPostCleanup(entry);
     }
 
-    public Optional<BibEntry> findDuplicate(BibDatabaseContext bibDatabaseContext, BibEntry entryToCheck) {
+    public Optional<BibEntry> findDuplicate(
+            BibDatabaseContext bibDatabaseContext, BibEntry entryToCheck) {
         return new DuplicateCheck(Injector.instantiateModelOrService(BibEntryTypesManager.class))
-                .containsDuplicate(bibDatabaseContext.getDatabase(), entryToCheck, bibDatabaseContext.getMode());
+                .containsDuplicate(
+                        bibDatabaseContext.getDatabase(),
+                        entryToCheck,
+                        bibDatabaseContext.getMode());
     }
 
-    public Optional<BibEntry> handleDuplicates(BibDatabaseContext bibDatabaseContext, BibEntry originalEntry, BibEntry duplicateEntry, DuplicateResolverDialog.DuplicateResolverResult decision) {
-        DuplicateDecisionResult decisionResult = getDuplicateDecision(originalEntry, duplicateEntry, decision);
+    public Optional<BibEntry> handleDuplicates(
+            BibDatabaseContext bibDatabaseContext,
+            BibEntry originalEntry,
+            BibEntry duplicateEntry,
+            DuplicateResolverDialog.DuplicateResolverResult decision) {
+        DuplicateDecisionResult decisionResult =
+                getDuplicateDecision(originalEntry, duplicateEntry, decision);
         switch (decisionResult.decision()) {
             case KEEP_RIGHT:
                 bibDatabaseContext.getDatabase().removeEntry(duplicateEntry);
@@ -254,39 +326,48 @@ public Optional<BibEntry> handleDuplicates(BibDatabaseContext bibDatabaseContext
         return Optional.of(originalEntry);
     }
 
-    public DuplicateDecisionResult getDuplicateDecision(BibEntry originalEntry, BibEntry duplicateEntry, DuplicateResolverDialog.DuplicateResolverResult decision) {
-        DuplicateResolverDialog dialog = new DuplicateResolverDialog(duplicateEntry, originalEntry, DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK, stateManager, dialogService, preferences);
+    public DuplicateDecisionResult getDuplicateDecision(
+            BibEntry originalEntry,
+            BibEntry duplicateEntry,
+            DuplicateResolverDialog.DuplicateResolverResult decision) {
+        DuplicateResolverDialog dialog =
+                new DuplicateResolverDialog(
+                        duplicateEntry,
+                        originalEntry,
+                        DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK,
+                        stateManager,
+                        dialogService,
+                        preferences);
         if (decision == BREAK) {
             decision = dialogService.showCustomDialogAndWait(dialog).orElse(BREAK);
         }
         if (preferences.getMergeDialogPreferences().shouldMergeApplyToAllEntries()) {
-            preferences.getMergeDialogPreferences().setAllEntriesDuplicateResolverDecision(decision);
+            preferences
+                    .getMergeDialogPreferences()
+                    .setAllEntriesDuplicateResolverDecision(decision);
         }
         return new DuplicateDecisionResult(decision, dialog.getMergedEntry());
     }
 
     public void setAutomaticFields(List<BibEntry> entries) {
         UpdateField.setAutomaticFields(
-                entries,
-                preferences.getOwnerPreferences(),
-                preferences.getTimestampPreferences()
-        );
+                entries, preferences.getOwnerPreferences(), preferences.getTimestampPreferences());
     }
 
     public void downloadLinkedFiles(BibEntry entry) {
         if (preferences.getFilePreferences().shouldDownloadLinkedFiles()) {
             entry.getFiles().stream()
-                 .filter(LinkedFile::isOnlineLink)
-                 .forEach(linkedFile ->
-                         new LinkedFileViewModel(
-                                 linkedFile,
-                                 entry,
-                                 bibDatabaseContext,
-                                 taskExecutor,
-                                 dialogService,
-                                 preferences
-                         ).download(false)
-                 );
+                    .filter(LinkedFile::isOnlineLink)
+                    .forEach(
+                            linkedFile ->
+                                    new LinkedFileViewModel(
+                                                    linkedFile,
+                                                    entry,
+                                                    bibDatabaseContext,
+                                                    taskExecutor,
+                                                    dialogService,
+                                                    preferences)
+                                            .download(false));
         }
     }
 
@@ -296,7 +377,8 @@ private void addToGroups(List<BibEntry> entries, Collection<GroupTreeNode> group
                 List<FieldChange> undo = entryChanger.add(entries);
                 // TODO: Add undo
                 // if (!undo.isEmpty()) {
-                //    ce.addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(new GroupTreeNodeViewModel(node),
+                //    ce.addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(new
+                // GroupTreeNodeViewModel(node),
                 //            undo));
                 // }
             }
@@ -312,18 +394,26 @@ private void generateKeys(List<BibEntry> entries) {
         if (!preferences.getImporterPreferences().isGenerateNewKeyOnImport()) {
             return;
         }
-        CitationKeyGenerator keyGenerator = new CitationKeyGenerator(
-                bibDatabaseContext.getMetaData().getCiteKeyPatterns(preferences.getCitationKeyPatternPreferences()
-                                                                               .getKeyPatterns()),
-                bibDatabaseContext.getDatabase(),
-                preferences.getCitationKeyPatternPreferences());
+        CitationKeyGenerator keyGenerator =
+                new CitationKeyGenerator(
+                        bibDatabaseContext
+                                .getMetaData()
+                                .getCiteKeyPatterns(
+                                        preferences
+                                                .getCitationKeyPatternPreferences()
+                                                .getKeyPatterns()),
+                        bibDatabaseContext.getDatabase(),
+                        preferences.getCitationKeyPatternPreferences());
         entries.forEach(keyGenerator::generateAndSetKey);
     }
 
     public List<BibEntry> handleBibTeXData(String entries) {
-        BibtexParser parser = new BibtexParser(preferences.getImportFormatPreferences(), fileUpdateMonitor);
+        BibtexParser parser =
+                new BibtexParser(preferences.getImportFormatPreferences(), fileUpdateMonitor);
         try {
-            List<BibEntry> result = parser.parseEntries(new ByteArrayInputStream(entries.getBytes(StandardCharsets.UTF_8)));
+            List<BibEntry> result =
+                    parser.parseEntries(
+                            new ByteArrayInputStream(entries.getBytes(StandardCharsets.UTF_8)));
             Collection<BibtexString> stringConstants = parser.getStringValues();
             importStringConstantsWithDuplicateCheck(stringConstants);
             return result;
@@ -338,18 +428,30 @@ public void importStringConstantsWithDuplicateCheck(Collection<BibtexString> str
 
         for (BibtexString stringConstantToAdd : stringConstants) {
             try {
-                ConstantsItemModel checker = new ConstantsItemModel(stringConstantToAdd.getName(), stringConstantToAdd.getContent());
+                ConstantsItemModel checker =
+                        new ConstantsItemModel(
+                                stringConstantToAdd.getName(), stringConstantToAdd.getContent());
                 if (checker.combinedValidationValidProperty().get()) {
                     bibDatabaseContext.getDatabase().addString(stringConstantToAdd);
                 } else {
-                    failures.add(Localization.lang("String constant \"%0\" was not imported because it is not a valid string constant", stringConstantToAdd.getName()));
+                    failures.add(
+                            Localization.lang(
+                                    "String constant \"%0\" was not imported because it is not a valid string constant",
+                                    stringConstantToAdd.getName()));
                 }
             } catch (KeyCollisionException ex) {
-                failures.add(Localization.lang("String constant %0 was not imported because it already exists in this library", stringConstantToAdd.getName()));
+                failures.add(
+                        Localization.lang(
+                                "String constant %0 was not imported because it already exists in this library",
+                                stringConstantToAdd.getName()));
             }
         }
         if (!failures.isEmpty()) {
-            dialogService.showWarningDialogAndWait(Localization.lang("Importing String constants"), Localization.lang("Could not import the following string constants:\n %0", String.join("\n", failures)));
+            dialogService.showWarningDialogAndWait(
+                    Localization.lang("Importing String constants"),
+                    Localization.lang(
+                            "Could not import the following string constants:\n %0",
+                            String.join("\n", failures)));
         }
     }
 
@@ -378,12 +480,12 @@ public List<BibEntry> handleStringData(String data) throws FetcherException {
 
     private List<BibEntry> tryImportFormats(String data) {
         try {
-            ImportFormatReader importFormatReader = new ImportFormatReader(
-                    preferences.getImporterPreferences(),
-                    preferences.getImportFormatPreferences(),
-                    preferences.getCitationKeyPatternPreferences(),
-                    fileUpdateMonitor
-            );
+            ImportFormatReader importFormatReader =
+                    new ImportFormatReader(
+                            preferences.getImporterPreferences(),
+                            preferences.getImportFormatPreferences(),
+                            preferences.getCitationKeyPatternPreferences(),
+                            fileUpdateMonitor);
             UnknownFormatImport unknownFormatImport = importFormatReader.importUnknownFormat(data);
             return unknownFormatImport.parserResult().getDatabase().getEntries();
         } catch (ImportException ex) { // ex is already localized
@@ -394,33 +496,44 @@ private List<BibEntry> tryImportFormats(String data) {
 
     private List<BibEntry> fetchByDOI(DOI doi) throws FetcherException {
         LOGGER.info("Found DOI identifier in clipboard");
-        Optional<BibEntry> entry = new DoiFetcher(preferences.getImportFormatPreferences()).performSearchById(doi.getDOI());
+        Optional<BibEntry> entry =
+                new DoiFetcher(preferences.getImportFormatPreferences())
+                        .performSearchById(doi.getDOI());
         return OptionalUtil.toList(entry);
     }
 
     private List<BibEntry> fetchByArXiv(ArXivIdentifier arXivIdentifier) throws FetcherException {
         LOGGER.info("Found arxiv identifier in clipboard");
-        Optional<BibEntry> entry = new ArXivFetcher(preferences.getImportFormatPreferences()).performSearchById(arXivIdentifier.getNormalizedWithoutVersion());
+        Optional<BibEntry> entry =
+                new ArXivFetcher(preferences.getImportFormatPreferences())
+                        .performSearchById(arXivIdentifier.getNormalizedWithoutVersion());
         return OptionalUtil.toList(entry);
     }
 
     private List<BibEntry> fetchByISBN(ISBN isbn) throws FetcherException {
         LOGGER.info("Found ISBN identifier in clipboard");
-        Optional<BibEntry> entry = new IsbnFetcher(preferences.getImportFormatPreferences()).performSearchById(isbn.getNormalized());
+        Optional<BibEntry> entry =
+                new IsbnFetcher(preferences.getImportFormatPreferences())
+                        .performSearchById(isbn.getNormalized());
         return OptionalUtil.toList(entry);
     }
 
-    public void importEntriesWithDuplicateCheck(BibDatabaseContext database, List<BibEntry> entriesToAdd) {
+    public void importEntriesWithDuplicateCheck(
+            BibDatabaseContext database, List<BibEntry> entriesToAdd) {
         boolean firstEntry = true;
         for (BibEntry entry : entriesToAdd) {
             if (firstEntry) {
-                LOGGER.debug("First entry to import, we use BREAK (\"Ask every time\") as decision");
+                LOGGER.debug(
+                        "First entry to import, we use BREAK (\"Ask every time\") as decision");
                 importEntryWithDuplicateCheck(database, entry, BREAK);
                 firstEntry = false;
                 continue;
             }
             if (preferences.getMergeDialogPreferences().shouldMergeApplyToAllEntries()) {
-                DuplicateResolverDialog.DuplicateResolverResult decision = preferences.getMergeDialogPreferences().getAllEntriesDuplicateResolverDecision();
+                DuplicateResolverDialog.DuplicateResolverResult decision =
+                        preferences
+                                .getMergeDialogPreferences()
+                                .getAllEntriesDuplicateResolverDecision();
                 LOGGER.debug("Not first entry, pref flag is true, we use {}", decision);
                 importEntryWithDuplicateCheck(database, entry, decision);
             } else {
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java
index 93986d5743e3..cf3a684b2e4e 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java
@@ -1,17 +1,5 @@
 package org.jabref.gui.externalfiles;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.DirectoryStream.Filter;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
 import javafx.scene.control.CheckBoxTreeItem;
 
 import org.jabref.gui.util.FileNodeViewModel;
@@ -21,10 +9,21 @@
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.DirectoryStream.Filter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
 /**
  * Util class for searching files on the file system which are not linked to a provided {@link BibDatabase}.
  */
@@ -39,7 +38,13 @@ public class UnlinkedFilesCrawler extends BackgroundTask<FileNodeViewModel> {
     private final BibDatabaseContext databaseContext;
     private final FilePreferences filePreferences;
 
-    public UnlinkedFilesCrawler(Path directory, Filter<Path> fileFilter, DateRange dateFilter, ExternalFileSorter sorter, BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+    public UnlinkedFilesCrawler(
+            Path directory,
+            Filter<Path> fileFilter,
+            DateRange dateFilter,
+            ExternalFileSorter sorter,
+            BibDatabaseContext databaseContext,
+            FilePreferences filePreferences) {
         this.directory = directory;
         this.fileFilter = fileFilter;
         this.dateFilter = dateFilter;
@@ -50,7 +55,8 @@ public UnlinkedFilesCrawler(Path directory, Filter<Path> fileFilter, DateRange d
 
     @Override
     public FileNodeViewModel call() throws IOException {
-        UnlinkedPDFFileFilter unlinkedPDFFileFilter = new UnlinkedPDFFileFilter(fileFilter, databaseContext, filePreferences);
+        UnlinkedPDFFileFilter unlinkedPDFFileFilter =
+                new UnlinkedPDFFileFilter(fileFilter, databaseContext, filePreferences);
         return searchDirectory(directory, unlinkedPDFFileFilter);
     }
 
@@ -76,7 +82,8 @@ public FileNodeViewModel call() throws IOException {
      * @return FileNodeViewModel containing the data of the current directory and all subdirectories
      * @throws IOException if directory is not a directory or empty
      */
-    FileNodeViewModel searchDirectory(Path directory, UnlinkedPDFFileFilter unlinkedPDFFileFilter) throws IOException {
+    FileNodeViewModel searchDirectory(Path directory, UnlinkedPDFFileFilter unlinkedPDFFileFilter)
+            throws IOException {
         // Return null if the directory is not valid.
         if ((directory == null) || !Files.isDirectory(directory)) {
             throw new IOException("Invalid directory for searching: %s".formatted(directory));
@@ -85,14 +92,19 @@ FileNodeViewModel searchDirectory(Path directory, UnlinkedPDFFileFilter unlinked
         FileNodeViewModel fileNodeViewModelForCurrentDirectory = new FileNodeViewModel(directory);
 
         // Map from isDirectory (true/false) to full path
-        // Result: Contains only files not matching the filter (i.e., PDFs not linked and files not ignored)
+        // Result: Contains only files not matching the filter (i.e., PDFs not linked and files not
+        // ignored)
         // Filters:
         //   1. UnlinkedPDFFileFilter
         //   2. GitIgnoreFilter
-        ChainedFilters filters = new ChainedFilters(unlinkedPDFFileFilter, new GitIgnoreFileFilter(directory));
+        ChainedFilters filters =
+                new ChainedFilters(unlinkedPDFFileFilter, new GitIgnoreFileFilter(directory));
         Map<Boolean, List<Path>> directoryAndFilePartition;
-        try (Stream<Path> filesStream = StreamSupport.stream(Files.newDirectoryStream(directory, filters).spliterator(), false)) {
-            directoryAndFilePartition = filesStream.collect(Collectors.partitioningBy(Files::isDirectory));
+        try (Stream<Path> filesStream =
+                StreamSupport.stream(
+                        Files.newDirectoryStream(directory, filters).spliterator(), false)) {
+            directoryAndFilePartition =
+                    filesStream.collect(Collectors.partitioningBy(Files::isDirectory));
         } catch (IOException e) {
             LOGGER.error("Error while searching files", e);
             return fileNodeViewModelForCurrentDirectory;
@@ -119,7 +131,8 @@ FileNodeViewModel searchDirectory(Path directory, UnlinkedPDFFileFilter unlinked
         // now we handle the files in the current directory
 
         // filter files according to last edited date.
-        // Note that we do not use the "StreamSupport.stream" filtering functionality, because refactoring the code to that would lead to more code
+        // Note that we do not use the "StreamSupport.stream" filtering functionality, because
+        // refactoring the code to that would lead to more code
         List<Path> resultingFiles = new ArrayList<>();
         for (Path path : files) {
             if (FileFilterUtils.filterByDate(path, dateFilter)) {
@@ -130,13 +143,18 @@ FileNodeViewModel searchDirectory(Path directory, UnlinkedPDFFileFilter unlinked
         // sort files according to last edited date.
         resultingFiles = FileFilterUtils.sortByDate(resultingFiles, sorter);
 
-        // the count of all files is the count of the found files in current directory plus the count of all files in the subdirectories
-        fileNodeViewModelForCurrentDirectory.setFileCount(resultingFiles.size() + fileCountOfSubdirectories);
+        // the count of all files is the count of the found files in current directory plus the
+        // count of all files in the subdirectories
+        fileNodeViewModelForCurrentDirectory.setFileCount(
+                resultingFiles.size() + fileCountOfSubdirectories);
 
         // create and add FileNodeViewModel to the FileNodeViewModel for the current directory
-        fileNodeViewModelForCurrentDirectory.getChildren().addAll(resultingFiles.stream()
-                .map(FileNodeViewModel::new)
-                .collect(Collectors.toList()));
+        fileNodeViewModelForCurrentDirectory
+                .getChildren()
+                .addAll(
+                        resultingFiles.stream()
+                                .map(FileNodeViewModel::new)
+                                .collect(Collectors.toList()));
 
         return fileNodeViewModelForCurrentDirectory;
     }
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogPreferences.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogPreferences.java
index 26324a7e9491..ad2cfb5c497b 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogPreferences.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogPreferences.java
@@ -13,11 +13,14 @@ public class UnlinkedFilesDialogPreferences {
     private final ObjectProperty<DateRange> unlinkedFilesSelectedDateRange;
     private final ObjectProperty<ExternalFileSorter> unlinkedFilesSelectedSort;
 
-    public UnlinkedFilesDialogPreferences(String unlinkedFilesSelectedExtension,
-                                          DateRange unlinkedFilesSelectedDateRange,
-                                          ExternalFileSorter unlinkedFilesSelectedSort) {
-        this.unlinkedFilesSelectedExtension = new SimpleStringProperty(unlinkedFilesSelectedExtension);
-        this.unlinkedFilesSelectedDateRange = new SimpleObjectProperty<>(unlinkedFilesSelectedDateRange);
+    public UnlinkedFilesDialogPreferences(
+            String unlinkedFilesSelectedExtension,
+            DateRange unlinkedFilesSelectedDateRange,
+            ExternalFileSorter unlinkedFilesSelectedSort) {
+        this.unlinkedFilesSelectedExtension =
+                new SimpleStringProperty(unlinkedFilesSelectedExtension);
+        this.unlinkedFilesSelectedDateRange =
+                new SimpleObjectProperty<>(unlinkedFilesSelectedDateRange);
         this.unlinkedFilesSelectedSort = new SimpleObjectProperty<>(unlinkedFilesSelectedSort);
     }
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
index b148818ebb55..e7d38a9f72bb 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
@@ -1,9 +1,11 @@
 package org.jabref.gui.externalfiles;
 
-import java.nio.file.Path;
-import java.util.Objects;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
 
-import javax.swing.undo.UndoManager;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+import jakarta.inject.Inject;
 
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
@@ -28,6 +30,7 @@
 import javafx.scene.control.TreeItem;
 import javafx.scene.layout.VBox;
 
+import org.controlsfx.control.CheckTreeView;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
@@ -51,11 +54,10 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.FileUpdateMonitor;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import jakarta.inject.Inject;
-import org.controlsfx.control.CheckTreeView;
+import java.nio.file.Path;
+import java.util.Objects;
+
+import javax.swing.undo.UndoManager;
 
 public class UnlinkedFilesDialogView extends BaseDialog<Void> {
 
@@ -98,32 +100,35 @@ public UnlinkedFilesDialogView() {
 
         this.setTitle(Localization.lang("Search for unlinked local files"));
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
-        setResultConverter(button -> {
-            if (button == ButtonType.CANCEL) {
-                viewModel.cancelTasks();
-            }
-            saveConfiguration();
-            return null;
-        });
+        setResultConverter(
+                button -> {
+                    if (button == ButtonType.CANCEL) {
+                        viewModel.cancelTasks();
+                    }
+                    saveConfiguration();
+                    return null;
+                });
 
         themeManager.updateFontStyle(getDialogPane().getScene());
     }
 
     @FXML
     private void initialize() {
-        viewModel = new UnlinkedFilesDialogViewModel(
-                dialogService,
-                undoManager,
-                fileUpdateMonitor,
-                preferences,
-                stateManager,
-                taskExecutor);
-
-        this.bibDatabaseContext = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("No active library"));
+        viewModel =
+                new UnlinkedFilesDialogViewModel(
+                        dialogService,
+                        undoManager,
+                        fileUpdateMonitor,
+                        preferences,
+                        stateManager,
+                        taskExecutor);
+
+        this.bibDatabaseContext =
+                stateManager
+                        .getActiveDatabase()
+                        .orElseThrow(() -> new NullPointerException("No active library"));
 
         progressDisplay.progressProperty().bind(viewModel.progressValueProperty());
         progressText.textProperty().bind(viewModel.progressTextProperty());
@@ -131,19 +136,26 @@ private void initialize() {
         progressPane.visibleProperty().bind(viewModel.taskActiveProperty());
         accordion.disableProperty().bind(viewModel.taskActiveProperty());
 
-        viewModel.treeRootProperty().addListener(observable -> {
-            scanButton.setDefaultButton(false);
-            importButton.setDefaultButton(true);
-            scanButton.setDefaultButton(false);
-            filePane.setExpanded(true);
-            resultPane.setExpanded(false);
-        });
-
-        viewModel.resultTableItems().addListener((InvalidationListener) observable -> {
-            filePane.setExpanded(false);
-            resultPane.setExpanded(true);
-            resultPane.setDisable(false);
-        });
+        viewModel
+                .treeRootProperty()
+                .addListener(
+                        observable -> {
+                            scanButton.setDefaultButton(false);
+                            importButton.setDefaultButton(true);
+                            scanButton.setDefaultButton(false);
+                            filePane.setExpanded(true);
+                            resultPane.setExpanded(false);
+                        });
+
+        viewModel
+                .resultTableItems()
+                .addListener(
+                        (InvalidationListener)
+                                observable -> {
+                                    filePane.setExpanded(false);
+                                    resultPane.setExpanded(true);
+                                    resultPane.setDisable(false);
+                                });
 
         initDirectorySelection();
         initUnlinkedFilesList();
@@ -155,7 +167,10 @@ private void initDirectorySelection() {
         validationVisualizer.setDecoration(new IconValidationDecorator());
 
         directoryPathField.textProperty().bindBidirectional(viewModel.directoryPathProperty());
-        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.directoryPathValidationStatus(), directoryPathField));
+        Platform.runLater(
+                () ->
+                        validationVisualizer.initVisualization(
+                                viewModel.directoryPathValidationStatus(), directoryPathField));
 
         new ViewModelListCellFactory<FileExtensionViewModel>()
                 .withText(FileExtensionViewModel::getDescription)
@@ -165,8 +180,8 @@ private void initDirectorySelection() {
         fileTypeCombo.valueProperty().bindBidirectional(viewModel.selectedExtensionProperty());
 
         new ViewModelListCellFactory<DateRange>()
-            .withText(DateRange::getDateRange)
-            .install(fileDateCombo);
+                .withText(DateRange::getDateRange)
+                .install(fileDateCombo);
         fileDateCombo.setItems(viewModel.getDateFilters());
         fileDateCombo.valueProperty().bindBidirectional(viewModel.selectedDateProperty());
 
@@ -176,7 +191,11 @@ private void initDirectorySelection() {
         fileSortCombo.setItems(viewModel.getSorters());
         fileSortCombo.valueProperty().bindBidirectional(viewModel.selectedSortProperty());
 
-        directoryPathField.setText(bibDatabaseContext.getFirstExistingFileDir(preferences.getFilePreferences()).map(Path::toString).orElse(""));
+        directoryPathField.setText(
+                bibDatabaseContext
+                        .getFirstExistingFileDir(preferences.getFilePreferences())
+                        .map(Path::toString)
+                        .orElse(""));
         loadSavedConfiguration();
     }
 
@@ -185,70 +204,122 @@ private void initUnlinkedFilesList() {
                 .withText(FileNodeViewModel::getDisplayTextWithEditDate)
                 .install(unlinkedFilesList);
 
-        unlinkedFilesList.maxHeightProperty().bind(((Control) filePane.contentProperty().get()).heightProperty());
+        unlinkedFilesList
+                .maxHeightProperty()
+                .bind(((Control) filePane.contentProperty().get()).heightProperty());
         unlinkedFilesList.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
-        unlinkedFilesList.rootProperty().bind(EasyBind.map(viewModel.treeRootProperty(),
-                fileNode -> fileNode.map(fileNodeViewModel -> new RecursiveTreeItem<>(fileNodeViewModel, FileNodeViewModel::getChildren))
-                                    .orElse(null)));
+        unlinkedFilesList
+                .rootProperty()
+                .bind(
+                        EasyBind.map(
+                                viewModel.treeRootProperty(),
+                                fileNode ->
+                                        fileNode.map(
+                                                        fileNodeViewModel ->
+                                                                new RecursiveTreeItem<>(
+                                                                        fileNodeViewModel,
+                                                                        FileNodeViewModel
+                                                                                ::getChildren))
+                                                .orElse(null)));
 
         unlinkedFilesList.setContextMenu(createSearchContextMenu());
 
-        EasyBind.subscribe(unlinkedFilesList.rootProperty(), root -> {
-            if (root != null) {
-                ((CheckBoxTreeItem<FileNodeViewModel>) root).setSelected(true);
-                root.setExpanded(true);
-                EasyBind.bindContent(viewModel.checkedFileListProperty(), unlinkedFilesList.getCheckModel().getCheckedItems());
-            } else {
-                EasyBind.bindContent(viewModel.checkedFileListProperty(), FXCollections.observableArrayList());
-            }
-        });
+        EasyBind.subscribe(
+                unlinkedFilesList.rootProperty(),
+                root -> {
+                    if (root != null) {
+                        ((CheckBoxTreeItem<FileNodeViewModel>) root).setSelected(true);
+                        root.setExpanded(true);
+                        EasyBind.bindContent(
+                                viewModel.checkedFileListProperty(),
+                                unlinkedFilesList.getCheckModel().getCheckedItems());
+                    } else {
+                        EasyBind.bindContent(
+                                viewModel.checkedFileListProperty(),
+                                FXCollections.observableArrayList());
+                    }
+                });
     }
 
     private void initResultTable() {
         colFile.setCellValueFactory(cellData -> cellData.getValue().file());
         new ValueTableCellFactory<ImportFilesResultItemViewModel, String>()
-                .withText(item -> item).withTooltip(item -> item)
+                .withText(item -> item)
+                .withTooltip(item -> item)
                 .install(colFile);
 
         colMessage.setCellValueFactory(cellData -> cellData.getValue().message());
         new ValueTableCellFactory<ImportFilesResultItemViewModel, String>()
-                .withText(item -> item).withTooltip(item -> item)
+                .withText(item -> item)
+                .withTooltip(item -> item)
                 .install(colMessage);
 
         colStatus.setCellValueFactory(cellData -> cellData.getValue().icon());
-        colStatus.setCellFactory(new ValueTableCellFactory<ImportFilesResultItemViewModel, JabRefIcon>().withGraphic(JabRefIcon::getGraphicNode));
+        colStatus.setCellFactory(
+                new ValueTableCellFactory<ImportFilesResultItemViewModel, JabRefIcon>()
+                        .withGraphic(JabRefIcon::getGraphicNode));
         importResultTable.setColumnResizePolicy(param -> true);
 
         importResultTable.setItems(viewModel.resultTableItems());
     }
 
     private void initButtons() {
-        BooleanBinding noItemsChecked = Bindings.isNull(unlinkedFilesList.rootProperty())
-                                                .or(Bindings.isEmpty(viewModel.checkedFileListProperty()));
+        BooleanBinding noItemsChecked =
+                Bindings.isNull(unlinkedFilesList.rootProperty())
+                        .or(Bindings.isEmpty(viewModel.checkedFileListProperty()));
         exportButton.disableProperty().bind(noItemsChecked);
         importButton.disableProperty().bind(noItemsChecked);
 
         scanButton.setDefaultButton(true);
-        scanButton.disableProperty().bind(viewModel.taskActiveProperty().or(viewModel.directoryPathValidationStatus().validProperty().not()));
+        scanButton
+                .disableProperty()
+                .bind(
+                        viewModel
+                                .taskActiveProperty()
+                                .or(
+                                        viewModel
+                                                .directoryPathValidationStatus()
+                                                .validProperty()
+                                                .not()));
     }
 
     private void loadSavedConfiguration() {
-        UnlinkedFilesDialogPreferences unlinkedFilesDialogPreferences = preferences.getUnlinkedFilesDialogPreferences();
-
-        FileExtensionViewModel selectedExtension = fileTypeCombo.getItems()
-                                                                .stream()
-                                                                .filter(item -> Objects.equals(item.getName(), unlinkedFilesDialogPreferences.getUnlinkedFilesSelectedExtension()))
-                                                                .findFirst()
-                                                                .orElseGet(() -> new FileExtensionViewModel(StandardFileType.ANY_FILE, preferences.getExternalApplicationsPreferences()));
+        UnlinkedFilesDialogPreferences unlinkedFilesDialogPreferences =
+                preferences.getUnlinkedFilesDialogPreferences();
+
+        FileExtensionViewModel selectedExtension =
+                fileTypeCombo.getItems().stream()
+                        .filter(
+                                item ->
+                                        Objects.equals(
+                                                item.getName(),
+                                                unlinkedFilesDialogPreferences
+                                                        .getUnlinkedFilesSelectedExtension()))
+                        .findFirst()
+                        .orElseGet(
+                                () ->
+                                        new FileExtensionViewModel(
+                                                StandardFileType.ANY_FILE,
+                                                preferences.getExternalApplicationsPreferences()));
         fileTypeCombo.getSelectionModel().select(selectedExtension);
-        fileDateCombo.getSelectionModel().select(unlinkedFilesDialogPreferences.getUnlinkedFilesSelectedDateRange());
-        fileSortCombo.getSelectionModel().select(unlinkedFilesDialogPreferences.getUnlinkedFilesSelectedSort());
+        fileDateCombo
+                .getSelectionModel()
+                .select(unlinkedFilesDialogPreferences.getUnlinkedFilesSelectedDateRange());
+        fileSortCombo
+                .getSelectionModel()
+                .select(unlinkedFilesDialogPreferences.getUnlinkedFilesSelectedSort());
     }
 
     public void saveConfiguration() {
-        preferences.getUnlinkedFilesDialogPreferences().setUnlinkedFilesSelectedExtension(fileTypeCombo.getValue().getName());
-        preferences.getUnlinkedFilesDialogPreferences().setUnlinkedFilesSelectedDateRange(fileDateCombo.getValue());
-        preferences.getUnlinkedFilesDialogPreferences().setUnlinkedFilesSelectedSort(fileSortCombo.getValue());
+        preferences
+                .getUnlinkedFilesDialogPreferences()
+                .setUnlinkedFilesSelectedExtension(fileTypeCombo.getValue().getName());
+        preferences
+                .getUnlinkedFilesDialogPreferences()
+                .setUnlinkedFilesSelectedDateRange(fileDateCombo.getValue());
+        preferences
+                .getUnlinkedFilesDialogPreferences()
+                .setUnlinkedFilesSelectedSort(fileSortCombo.getValue());
     }
 
     @FXML
@@ -287,10 +358,30 @@ private ContextMenu createSearchContextMenu() {
         ContextMenu contextMenu = new ContextMenu();
         ActionFactory factory = new ActionFactory();
 
-        contextMenu.getItems().add(factory.createMenuItem(StandardActions.SELECT_ALL, new SearchContextAction(StandardActions.SELECT_ALL)));
-        contextMenu.getItems().add(factory.createMenuItem(StandardActions.UNSELECT_ALL, new SearchContextAction(StandardActions.UNSELECT_ALL)));
-        contextMenu.getItems().add(factory.createMenuItem(StandardActions.EXPAND_ALL, new SearchContextAction(StandardActions.EXPAND_ALL)));
-        contextMenu.getItems().add(factory.createMenuItem(StandardActions.COLLAPSE_ALL, new SearchContextAction(StandardActions.COLLAPSE_ALL)));
+        contextMenu
+                .getItems()
+                .add(
+                        factory.createMenuItem(
+                                StandardActions.SELECT_ALL,
+                                new SearchContextAction(StandardActions.SELECT_ALL)));
+        contextMenu
+                .getItems()
+                .add(
+                        factory.createMenuItem(
+                                StandardActions.UNSELECT_ALL,
+                                new SearchContextAction(StandardActions.UNSELECT_ALL)));
+        contextMenu
+                .getItems()
+                .add(
+                        factory.createMenuItem(
+                                StandardActions.EXPAND_ALL,
+                                new SearchContextAction(StandardActions.EXPAND_ALL)));
+        contextMenu
+                .getItems()
+                .add(
+                        factory.createMenuItem(
+                                StandardActions.COLLAPSE_ALL,
+                                new SearchContextAction(StandardActions.COLLAPSE_ALL)));
 
         return contextMenu;
     }
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
index ecee35887f35..c8fad5601913 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
@@ -1,18 +1,8 @@
 package org.jabref.gui.externalfiles;
 
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.DirectoryStream.Filter;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
@@ -43,31 +33,46 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.DirectoryStream.Filter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
+
 public class UnlinkedFilesDialogViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UnlinkedFilesDialogViewModel.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(UnlinkedFilesDialogViewModel.class);
 
     private final ImportHandler importHandler;
     private final StringProperty directoryPath = new SimpleStringProperty("");
-    private final ObjectProperty<FileExtensionViewModel> selectedExtension = new SimpleObjectProperty<>();
+    private final ObjectProperty<FileExtensionViewModel> selectedExtension =
+            new SimpleObjectProperty<>();
     private final ObjectProperty<DateRange> selectedDate = new SimpleObjectProperty<>();
     private final ObjectProperty<ExternalFileSorter> selectedSort = new SimpleObjectProperty<>();
 
-    private final ObjectProperty<Optional<FileNodeViewModel>> treeRootProperty = new SimpleObjectProperty<>();
-    private final SimpleListProperty<TreeItem<FileNodeViewModel>> checkedFileListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<Optional<FileNodeViewModel>> treeRootProperty =
+            new SimpleObjectProperty<>();
+    private final SimpleListProperty<TreeItem<FileNodeViewModel>> checkedFileListProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
 
     private final BooleanProperty taskActiveProperty = new SimpleBooleanProperty(false);
     private final DoubleProperty progressValueProperty = new SimpleDoubleProperty(0);
     private final StringProperty progressTextProperty = new SimpleStringProperty();
 
-    private final ObservableList<ImportFilesResultItemViewModel> resultList = FXCollections.observableArrayList();
+    private final ObservableList<ImportFilesResultItemViewModel> resultList =
+            FXCollections.observableArrayList();
     private final ObservableList<FileExtensionViewModel> fileFilterList;
     private final ObservableList<DateRange> dateFilterList;
     private final ObservableList<ExternalFileSorter> fileSortList;
@@ -82,38 +87,56 @@ public class UnlinkedFilesDialogViewModel {
 
     private final FunctionBasedValidator<String> scanDirectoryValidator;
 
-    public UnlinkedFilesDialogViewModel(DialogService dialogService,
-                                        UndoManager undoManager,
-                                        FileUpdateMonitor fileUpdateMonitor,
-                                        GuiPreferences preferences,
-                                        StateManager stateManager,
-                                        TaskExecutor taskExecutor) {
+    public UnlinkedFilesDialogViewModel(
+            DialogService dialogService,
+            UndoManager undoManager,
+            FileUpdateMonitor fileUpdateMonitor,
+            GuiPreferences preferences,
+            StateManager stateManager,
+            TaskExecutor taskExecutor) {
         this.preferences = preferences;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
-        this.bibDatabase = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null"));
-        importHandler = new ImportHandler(
-                bibDatabase,
-                preferences,
-                fileUpdateMonitor,
-                undoManager,
-                stateManager,
-                dialogService,
-                taskExecutor);
-
-        this.fileFilterList = FXCollections.observableArrayList(
-                new FileExtensionViewModel(StandardFileType.ANY_FILE, preferences.getExternalApplicationsPreferences()),
-                new FileExtensionViewModel(StandardFileType.HTML, preferences.getExternalApplicationsPreferences()),
-                new FileExtensionViewModel(StandardFileType.MARKDOWN, preferences.getExternalApplicationsPreferences()),
-                new FileExtensionViewModel(StandardFileType.PDF, preferences.getExternalApplicationsPreferences()));
+        this.bibDatabase =
+                stateManager
+                        .getActiveDatabase()
+                        .orElseThrow(() -> new NullPointerException("Database null"));
+        importHandler =
+                new ImportHandler(
+                        bibDatabase,
+                        preferences,
+                        fileUpdateMonitor,
+                        undoManager,
+                        stateManager,
+                        dialogService,
+                        taskExecutor);
+
+        this.fileFilterList =
+                FXCollections.observableArrayList(
+                        new FileExtensionViewModel(
+                                StandardFileType.ANY_FILE,
+                                preferences.getExternalApplicationsPreferences()),
+                        new FileExtensionViewModel(
+                                StandardFileType.HTML,
+                                preferences.getExternalApplicationsPreferences()),
+                        new FileExtensionViewModel(
+                                StandardFileType.MARKDOWN,
+                                preferences.getExternalApplicationsPreferences()),
+                        new FileExtensionViewModel(
+                                StandardFileType.PDF,
+                                preferences.getExternalApplicationsPreferences()));
 
         this.dateFilterList = FXCollections.observableArrayList(DateRange.values());
 
         this.fileSortList = FXCollections.observableArrayList(ExternalFileSorter.values());
 
         Predicate<String> isDirectory = path -> Files.isDirectory(Path.of(path));
-        scanDirectoryValidator = new FunctionBasedValidator<>(directoryPath, isDirectory,
-                ValidationMessage.error(Localization.lang("Please enter a valid file path.")));
+        scanDirectoryValidator =
+                new FunctionBasedValidator<>(
+                        directoryPath,
+                        isDirectory,
+                        ValidationMessage.error(
+                                Localization.lang("Please enter a valid file path.")));
 
         treeRootProperty.setValue(Optional.empty());
     }
@@ -126,46 +149,66 @@ public void startSearch() {
         progressValueProperty.unbind();
         progressTextProperty.unbind();
 
-        findUnlinkedFilesTask = new UnlinkedFilesCrawler(directory, selectedFileFilter, selectedDateFilter, selectedSortFilter, bibDatabase, preferences.getFilePreferences())
-                .onRunning(() -> {
-                    progressValueProperty.set(ProgressIndicator.INDETERMINATE_PROGRESS);
-                    progressTextProperty.setValue(Localization.lang("Searching file system..."));
-                    progressTextProperty.bind(findUnlinkedFilesTask.messageProperty());
-                    taskActiveProperty.setValue(true);
-                    treeRootProperty.setValue(Optional.empty());
-                })
-                .onFinished(() -> {
-                    progressValueProperty.set(0);
-                    taskActiveProperty.setValue(false);
-                })
-                .onSuccess(treeRoot -> treeRootProperty.setValue(Optional.of(treeRoot)));
+        findUnlinkedFilesTask =
+                new UnlinkedFilesCrawler(
+                                directory,
+                                selectedFileFilter,
+                                selectedDateFilter,
+                                selectedSortFilter,
+                                bibDatabase,
+                                preferences.getFilePreferences())
+                        .onRunning(
+                                () -> {
+                                    progressValueProperty.set(
+                                            ProgressIndicator.INDETERMINATE_PROGRESS);
+                                    progressTextProperty.setValue(
+                                            Localization.lang("Searching file system..."));
+                                    progressTextProperty.bind(
+                                            findUnlinkedFilesTask.messageProperty());
+                                    taskActiveProperty.setValue(true);
+                                    treeRootProperty.setValue(Optional.empty());
+                                })
+                        .onFinished(
+                                () -> {
+                                    progressValueProperty.set(0);
+                                    taskActiveProperty.setValue(false);
+                                })
+                        .onSuccess(treeRoot -> treeRootProperty.setValue(Optional.of(treeRoot)));
 
         findUnlinkedFilesTask.executeWith(taskExecutor);
     }
 
     public void startImport() {
-        List<Path> fileList = checkedFileListProperty.stream()
-                                                     .map(item -> item.getValue().getPath())
-                                                     .filter(path -> path.toFile().isFile())
-                                                     .collect(Collectors.toList());
+        List<Path> fileList =
+                checkedFileListProperty.stream()
+                        .map(item -> item.getValue().getPath())
+                        .filter(path -> path.toFile().isFile())
+                        .collect(Collectors.toList());
         if (fileList.isEmpty()) {
             LOGGER.warn("There are no valid files checked");
             return;
         }
         resultList.clear();
 
-        importFilesBackgroundTask = importHandler.importFilesInBackground(fileList, bibDatabase, preferences.getFilePreferences())
-                                                 .onRunning(() -> {
-                                                     progressValueProperty.bind(importFilesBackgroundTask.workDonePercentageProperty());
-                                                     progressTextProperty.bind(importFilesBackgroundTask.messageProperty());
-                                                     taskActiveProperty.setValue(true);
-                                                 })
-                                                 .onFinished(() -> {
-                                                     progressValueProperty.unbind();
-                                                     progressTextProperty.unbind();
-                                                     taskActiveProperty.setValue(false);
-                                                 })
-                                                 .onSuccess(resultList::addAll);
+        importFilesBackgroundTask =
+                importHandler
+                        .importFilesInBackground(
+                                fileList, bibDatabase, preferences.getFilePreferences())
+                        .onRunning(
+                                () -> {
+                                    progressValueProperty.bind(
+                                            importFilesBackgroundTask.workDonePercentageProperty());
+                                    progressTextProperty.bind(
+                                            importFilesBackgroundTask.messageProperty());
+                                    taskActiveProperty.setValue(true);
+                                })
+                        .onFinished(
+                                () -> {
+                                    progressValueProperty.unbind();
+                                    progressTextProperty.unbind();
+                                    taskActiveProperty.setValue(false);
+                                })
+                        .onSuccess(resultList::addAll);
         importFilesBackgroundTask.executeWith(taskExecutor);
     }
 
@@ -173,35 +216,39 @@ public void startImport() {
      * This starts the export of all files of all selected nodes in the file tree view.
      */
     public void startExport() {
-        List<Path> fileList = checkedFileListProperty.stream()
-                                                     .map(item -> item.getValue().getPath())
-                                                     .filter(path -> path.toFile().isFile())
-                                                     .toList();
+        List<Path> fileList =
+                checkedFileListProperty.stream()
+                        .map(item -> item.getValue().getPath())
+                        .filter(path -> path.toFile().isFile())
+                        .toList();
         if (fileList.isEmpty()) {
             LOGGER.warn("There are no valid files checked");
             return;
         }
 
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory())
-                .addExtensionFilter(StandardFileType.TXT)
-                .withDefaultExtension(StandardFileType.TXT)
-                .build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .withInitialDirectory(
+                                preferences.getFilePreferences().getWorkingDirectory())
+                        .addExtensionFilter(StandardFileType.TXT)
+                        .withDefaultExtension(StandardFileType.TXT)
+                        .build();
         Optional<Path> exportPath = dialogService.showFileSaveDialog(fileDialogConfiguration);
 
         if (exportPath.isEmpty()) {
             return;
         }
 
-        try (BufferedWriter writer = Files.newBufferedWriter(exportPath.get(), StandardCharsets.UTF_8,
-                StandardOpenOption.CREATE)) {
+        try (BufferedWriter writer =
+                Files.newBufferedWriter(
+                        exportPath.get(), StandardCharsets.UTF_8, StandardOpenOption.CREATE)) {
             for (Path file : fileList) {
                 writer.write(file.toString() + "\n");
             }
         } catch (IOException e) {
             LOGGER.error("Error exporting", e);
         }
-     }
+    }
 
     public ObservableList<FileExtensionViewModel> getFileFilters() {
         return this.fileFilterList;
@@ -225,14 +272,21 @@ public void cancelTasks() {
     }
 
     public void browseFileDirectory() {
-        DirectoryDialogConfiguration directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory()).build();
-
-        dialogService.showDirectorySelectionDialog(directoryDialogConfiguration)
-                     .ifPresent(selectedDirectory -> {
-                         directoryPath.setValue(selectedDirectory.toAbsolutePath().toString());
-                         preferences.getFilePreferences().setWorkingDirectory(selectedDirectory.toAbsolutePath());
-                     });
+        DirectoryDialogConfiguration directoryDialogConfiguration =
+                new DirectoryDialogConfiguration.Builder()
+                        .withInitialDirectory(
+                                preferences.getFilePreferences().getWorkingDirectory())
+                        .build();
+
+        dialogService
+                .showDirectorySelectionDialog(directoryDialogConfiguration)
+                .ifPresent(
+                        selectedDirectory -> {
+                            directoryPath.setValue(selectedDirectory.toAbsolutePath().toString());
+                            preferences
+                                    .getFilePreferences()
+                                    .setWorkingDirectory(selectedDirectory.toAbsolutePath());
+                        });
     }
 
     private Path getSearchDirectory() {
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java
index 6b684596dd77..97ab3587da8b 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java
@@ -1,5 +1,11 @@
 package org.jabref.gui.externalfiles;
 
+import org.jabref.logic.FilePreferences;
+import org.jabref.logic.util.io.DatabaseFileLookup;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+
 import java.io.FileFilter;
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
@@ -7,12 +13,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import org.jabref.logic.FilePreferences;
-import org.jabref.logic.util.io.DatabaseFileLookup;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-
 /**
  * {@link FileFilter} implementation, that allows only files which are not linked in any of the {@link BibEntry}s of the
  * specified {@link BibDatabase}.
@@ -25,7 +25,10 @@ public class UnlinkedPDFFileFilter implements DirectoryStream.Filter<Path> {
     private final DatabaseFileLookup lookup;
     private final Filter<Path> fileFilter;
 
-    public UnlinkedPDFFileFilter(DirectoryStream.Filter<Path> fileFilter, BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+    public UnlinkedPDFFileFilter(
+            DirectoryStream.Filter<Path> fileFilter,
+            BibDatabaseContext databaseContext,
+            FilePreferences filePreferences) {
         this.fileFilter = fileFilter;
         this.lookup = new DatabaseFileLookup(databaseContext, filePreferences);
     }
@@ -35,7 +38,9 @@ public boolean accept(Path pathname) throws IOException {
         if (Files.isDirectory(pathname)) {
             return true;
         } else {
-            return fileFilter.accept(pathname) && !lookup.lookupDatabase(pathname) && !lookup.getPathOfDatabase().equals(pathname);
+            return fileFilter.accept(pathname)
+                    && !lookup.lookupDatabase(pathname)
+                    && !lookup.getPathOfDatabase().equals(pathname);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java b/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java
index 396e1cacf979..9f50e01b0913 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.externalfiletype;
 
-import java.util.Objects;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.logic.FilePreferences;
 
+import java.util.Objects;
+
 /**
  * This class defines a type of external files that can be linked to from JabRef.
  * The class contains enough information to provide an icon, a standard extension
@@ -22,8 +22,13 @@ public class CustomExternalFileType implements ExternalFileType {
     private String mimeType;
     private JabRefIcon icon;
 
-    public CustomExternalFileType(String name, String extension, String mimeType,
-                                  String openWith, String iconName, JabRefIcon icon) {
+    public CustomExternalFileType(
+            String name,
+            String extension,
+            String mimeType,
+            String openWith,
+            String iconName,
+            JabRefIcon icon) {
         this.name = name;
         this.extension = extension;
         this.mimeType = mimeType;
@@ -34,7 +39,13 @@ public CustomExternalFileType(String name, String extension, String mimeType,
     }
 
     public CustomExternalFileType(ExternalFileType type) {
-        this(type.getName(), type.getExtension(), type.getMimeType(), type.getOpenWithApplication(), "", type.getIcon());
+        this(
+                type.getName(),
+                type.getExtension(),
+                type.getMimeType(),
+                type.getOpenWithApplication(),
+                "",
+                type.getIcon());
     }
 
     /**
@@ -47,7 +58,8 @@ public CustomExternalFileType(ExternalFileType type) {
      */
     public static ExternalFileType buildFromArgs(String[] val) {
         if ((val == null) || (val.length < 4) || (val.length > 5)) {
-            throw new IllegalArgumentException("Cannot construct ExternalFileType without four elements in String[] argument.");
+            throw new IllegalArgumentException(
+                    "Cannot construct ExternalFileType without four elements in String[] argument.");
         }
         String name = val[0];
         String extension = val[1];
@@ -182,8 +194,11 @@ public boolean equals(Object object) {
         }
 
         if (object instanceof CustomExternalFileType other) {
-            return Objects.equals(name, other.name) && Objects.equals(extension, other.extension) &&
-                    Objects.equals(mimeType, other.mimeType) && Objects.equals(openWith, other.openWith) && Objects.equals(iconName, other.iconName);
+            return Objects.equals(name, other.name)
+                    && Objects.equals(extension, other.extension)
+                    && Objects.equals(mimeType, other.mimeType)
+                    && Objects.equals(openWith, other.openWith)
+                    && Objects.equals(iconName, other.iconName);
         }
         return false;
     }
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java
index 0a5a44259cfb..95866b53177e 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java
@@ -32,6 +32,8 @@ default Field getField() {
      * @return A String[] containing all information about this file type.
      */
     default String[] toStringArray() {
-        return new String[]{getName(), getExtension(), getMimeType(), getOpenWithApplication(), getIcon().name()};
+        return new String[] {
+            getName(), getExtension(), getMimeType(), getOpenWithApplication(), getIcon().name()
+        };
     }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
index 4a79e57b45c8..7b412d6836c7 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
@@ -1,5 +1,11 @@
 package org.jabref.gui.externalfiletype;
 
+import org.jabref.gui.frame.ExternalApplicationsPreferences;
+import org.jabref.logic.bibtex.FileFieldWriter;
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.strings.StringUtil;
+
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -10,12 +16,6 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.jabref.gui.frame.ExternalApplicationsPreferences;
-import org.jabref.logic.bibtex.FileFieldWriter;
-import org.jabref.logic.util.io.FileUtil;
-import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.strings.StringUtil;
-
 // Do not make this class final, as it otherwise can't be mocked for tests
 public class ExternalFileTypes {
 
@@ -24,8 +24,7 @@ public class ExternalFileTypes {
     private static final String FILE_TYPE_REMOVED_FLAG = "REMOVED";
     private static final ExternalFileType HTML_FALLBACK_TYPE = StandardExternalFileType.URL;
 
-    private ExternalFileTypes() {
-    }
+    private ExternalFileTypes() {}
 
     public static List<ExternalFileType> getDefaultExternalFileTypes() {
         return Arrays.asList(StandardExternalFileType.values());
@@ -37,8 +36,12 @@ public static List<ExternalFileType> getDefaultExternalFileTypes() {
      * @param name The file type name.
      * @return The ExternalFileType registered, or null if none.
      */
-    public static Optional<ExternalFileType> getExternalFileTypeByName(String name, ExternalApplicationsPreferences externalApplicationsPreferences) {
-        Optional<ExternalFileType> externalFileType = externalApplicationsPreferences.getExternalFileTypes().stream().filter(type -> type.getName().equals(name)).findFirst();
+    public static Optional<ExternalFileType> getExternalFileTypeByName(
+            String name, ExternalApplicationsPreferences externalApplicationsPreferences) {
+        Optional<ExternalFileType> externalFileType =
+                externalApplicationsPreferences.getExternalFileTypes().stream()
+                        .filter(type -> type.getName().equals(name))
+                        .findFirst();
         if (externalFileType.isPresent()) {
             return externalFileType;
         }
@@ -52,9 +55,12 @@ public static Optional<ExternalFileType> getExternalFileTypeByName(String name,
      * @param extension The file extension.
      * @return The ExternalFileType registered, or null if none.
      */
-    public static Optional<ExternalFileType> getExternalFileTypeByExt(String extension, ExternalApplicationsPreferences externalApplicationsPreferences) {
+    public static Optional<ExternalFileType> getExternalFileTypeByExt(
+            String extension, ExternalApplicationsPreferences externalApplicationsPreferences) {
         String extensionCleaned = extension.replace(".", "").replace("*", "");
-        return externalApplicationsPreferences.getExternalFileTypes().stream().filter(type -> type.getExtension().equalsIgnoreCase(extensionCleaned)).findFirst();
+        return externalApplicationsPreferences.getExternalFileTypes().stream()
+                .filter(type -> type.getExtension().equalsIgnoreCase(extensionCleaned))
+                .findFirst();
     }
 
     /**
@@ -63,8 +69,10 @@ public static Optional<ExternalFileType> getExternalFileTypeByExt(String extensi
      * @param extension The file extension.
      * @return true if an ExternalFileType with the extension exists, false otherwise
      */
-    public static boolean isExternalFileTypeByExt(String extension, ExternalApplicationsPreferences externalApplicationsPreferences) {
-        return externalApplicationsPreferences.getExternalFileTypes().stream().anyMatch(type -> type.getExtension().equalsIgnoreCase(extension));
+    public static boolean isExternalFileTypeByExt(
+            String extension, ExternalApplicationsPreferences externalApplicationsPreferences) {
+        return externalApplicationsPreferences.getExternalFileTypes().stream()
+                .anyMatch(type -> type.getExtension().equalsIgnoreCase(extension));
     }
 
     /**
@@ -73,11 +81,14 @@ public static boolean isExternalFileTypeByExt(String extension, ExternalApplicat
      * @param filename The name of the file whose type to look up.
      * @return The ExternalFileType registered, or null if none.
      */
-    public static Optional<ExternalFileType> getExternalFileTypeForName(String filename, ExternalApplicationsPreferences externalApplicationsPreferences) {
+    public static Optional<ExternalFileType> getExternalFileTypeForName(
+            String filename, ExternalApplicationsPreferences externalApplicationsPreferences) {
         int longestFound = -1;
         ExternalFileType foundType = null;
         for (ExternalFileType type : externalApplicationsPreferences.getExternalFileTypes()) {
-            if (!type.getExtension().isEmpty() && filename.toLowerCase(Locale.ROOT).endsWith(type.getExtension().toLowerCase(Locale.ROOT))
+            if (!type.getExtension().isEmpty()
+                    && filename.toLowerCase(Locale.ROOT)
+                            .endsWith(type.getExtension().toLowerCase(Locale.ROOT))
                     && (type.getExtension().length() > longestFound)) {
                 longestFound = type.getExtension().length();
                 foundType = type;
@@ -93,8 +104,10 @@ public static Optional<ExternalFileType> getExternalFileTypeForName(String filen
      * @return The ExternalFileType registered, or null if none. For the mime type "text/html", a valid file type is
      *         guaranteed to be returned.
      */
-    public static Optional<ExternalFileType> getExternalFileTypeByMimeType(String mimeType, ExternalApplicationsPreferences externalApplicationsPreferences) {
-        // Ignores parameters according to link: (https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types)
+    public static Optional<ExternalFileType> getExternalFileTypeByMimeType(
+            String mimeType, ExternalApplicationsPreferences externalApplicationsPreferences) {
+        // Ignores parameters according to link:
+        // (https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types)
         if (mimeType.indexOf(';') != -1) {
             mimeType = mimeType.substring(0, mimeType.indexOf(';')).trim();
         }
@@ -110,26 +123,38 @@ public static Optional<ExternalFileType> getExternalFileTypeByMimeType(String mi
         }
     }
 
-    public static Optional<ExternalFileType> getExternalFileTypeByFile(Path file, ExternalApplicationsPreferences externalApplicationsPreferences) {
+    public static Optional<ExternalFileType> getExternalFileTypeByFile(
+            Path file, ExternalApplicationsPreferences externalApplicationsPreferences) {
         final String filePath = file.toString();
         final Optional<String> extension = FileUtil.getFileExtension(filePath);
-        return extension.flatMap(ext -> getExternalFileTypeByExt(ext, externalApplicationsPreferences));
+        return extension.flatMap(
+                ext -> getExternalFileTypeByExt(ext, externalApplicationsPreferences));
     }
 
-    public static Optional<ExternalFileType> getExternalFileTypeByLinkedFile(LinkedFile linkedFile, boolean deduceUnknownType, ExternalApplicationsPreferences externalApplicationsPreferences) {
-        Optional<ExternalFileType> type = getExternalFileTypeByName(linkedFile.getFileType(), externalApplicationsPreferences);
+    public static Optional<ExternalFileType> getExternalFileTypeByLinkedFile(
+            LinkedFile linkedFile,
+            boolean deduceUnknownType,
+            ExternalApplicationsPreferences externalApplicationsPreferences) {
+        Optional<ExternalFileType> type =
+                getExternalFileTypeByName(
+                        linkedFile.getFileType(), externalApplicationsPreferences);
         boolean isUnknownType = type.isEmpty() || (type.get() instanceof UnknownExternalFileType);
 
         if (isUnknownType && deduceUnknownType) {
             // No file type was recognized. Try to find a usable file type based on mime type:
-            Optional<ExternalFileType> mimeType = getExternalFileTypeByMimeType(linkedFile.getFileType(), externalApplicationsPreferences);
+            Optional<ExternalFileType> mimeType =
+                    getExternalFileTypeByMimeType(
+                            linkedFile.getFileType(), externalApplicationsPreferences);
             if (mimeType.isPresent()) {
                 return mimeType;
             }
 
             // No type could be found from mime type. Try based on the extension:
             return FileUtil.getFileExtension(linkedFile.getLink())
-                             .flatMap(extension -> getExternalFileTypeByExt(extension, externalApplicationsPreferences));
+                    .flatMap(
+                            extension ->
+                                    getExternalFileTypeByExt(
+                                            extension, externalApplicationsPreferences));
         } else {
             return type;
         }
diff --git a/src/main/java/org/jabref/gui/externalfiletype/StandardExternalFileType.java b/src/main/java/org/jabref/gui/externalfiletype/StandardExternalFileType.java
index fc12e9670e8c..0ed4d68b6d70 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/StandardExternalFileType.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/StandardExternalFileType.java
@@ -5,27 +5,116 @@
 import org.jabref.logic.l10n.Localization;
 
 public enum StandardExternalFileType implements ExternalFileType {
-
     PDF("PDF", "pdf", "application/pdf", "evince", "pdfSmall", IconTheme.JabRefIcons.PDF_FILE),
-    PostScript("PostScript", "ps", "application/postscript", "evince", "psSmall", IconTheme.JabRefIcons.FILE),
-    Word("Word", "doc", "application/msword", "oowriter", "openoffice", IconTheme.JabRefIcons.FILE_WORD),
-    Word_NEW("Word 2007+", "docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "oowriter", "openoffice", IconTheme.JabRefIcons.FILE_WORD),
-    OpenDocument_TEXT(Localization.lang("OpenDocument text"), "odt", "application/vnd.oasis.opendocument.text", "oowriter", "openoffice", IconTheme.JabRefIcons.FILE_OPENOFFICE),
-    Excel("Excel", "xls", "application/excel", "oocalc", "openoffice", IconTheme.JabRefIcons.FILE_EXCEL),
-    Excel_NEW("Excel 2007+", "xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "oocalc", "openoffice", IconTheme.JabRefIcons.FILE_EXCEL),
-    OpenDocumentSpreadsheet(Localization.lang("OpenDocument spreadsheet"), "ods", "application/vnd.oasis.opendocument.spreadsheet", "oocalc", "openoffice", IconTheme.JabRefIcons.FILE_OPENOFFICE),
-    PowerPoint("PowerPoint", "ppt", "application/vnd.ms-powerpoint", "ooimpress", "openoffice", IconTheme.JabRefIcons.FILE_POWERPOINT),
-    PowerPoint_NEW("PowerPoint 2007+", "pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation", "ooimpress", "openoffice", IconTheme.JabRefIcons.FILE_POWERPOINT),
-    OpenDocumentPresentation(Localization.lang("OpenDocument presentation"), "odp", "application/vnd.oasis.opendocument.presentation", "ooimpress", "openoffice", IconTheme.JabRefIcons.FILE_OPENOFFICE),
-    RTF("Rich Text Format", "rtf", "application/rtf", "oowriter", "openoffice", IconTheme.JabRefIcons.FILE_TEXT),
-    PNG(Localization.lang("%0 image", "PNG"), "png", "image/png", "gimp", "picture", IconTheme.JabRefIcons.PICTURE),
-    GIF(Localization.lang("%0 image", "GIF"), "gif", "image/gif", "gimp", "picture", IconTheme.JabRefIcons.PICTURE),
-    JPG(Localization.lang("%0 image", "JPG"), "jpg", "image/jpeg", "gimp", "picture", IconTheme.JabRefIcons.PICTURE),
+    PostScript(
+            "PostScript",
+            "ps",
+            "application/postscript",
+            "evince",
+            "psSmall",
+            IconTheme.JabRefIcons.FILE),
+    Word(
+            "Word",
+            "doc",
+            "application/msword",
+            "oowriter",
+            "openoffice",
+            IconTheme.JabRefIcons.FILE_WORD),
+    Word_NEW(
+            "Word 2007+",
+            "docx",
+            "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+            "oowriter",
+            "openoffice",
+            IconTheme.JabRefIcons.FILE_WORD),
+    OpenDocument_TEXT(
+            Localization.lang("OpenDocument text"),
+            "odt",
+            "application/vnd.oasis.opendocument.text",
+            "oowriter",
+            "openoffice",
+            IconTheme.JabRefIcons.FILE_OPENOFFICE),
+    Excel(
+            "Excel",
+            "xls",
+            "application/excel",
+            "oocalc",
+            "openoffice",
+            IconTheme.JabRefIcons.FILE_EXCEL),
+    Excel_NEW(
+            "Excel 2007+",
+            "xlsx",
+            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+            "oocalc",
+            "openoffice",
+            IconTheme.JabRefIcons.FILE_EXCEL),
+    OpenDocumentSpreadsheet(
+            Localization.lang("OpenDocument spreadsheet"),
+            "ods",
+            "application/vnd.oasis.opendocument.spreadsheet",
+            "oocalc",
+            "openoffice",
+            IconTheme.JabRefIcons.FILE_OPENOFFICE),
+    PowerPoint(
+            "PowerPoint",
+            "ppt",
+            "application/vnd.ms-powerpoint",
+            "ooimpress",
+            "openoffice",
+            IconTheme.JabRefIcons.FILE_POWERPOINT),
+    PowerPoint_NEW(
+            "PowerPoint 2007+",
+            "pptx",
+            "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+            "ooimpress",
+            "openoffice",
+            IconTheme.JabRefIcons.FILE_POWERPOINT),
+    OpenDocumentPresentation(
+            Localization.lang("OpenDocument presentation"),
+            "odp",
+            "application/vnd.oasis.opendocument.presentation",
+            "ooimpress",
+            "openoffice",
+            IconTheme.JabRefIcons.FILE_OPENOFFICE),
+    RTF(
+            "Rich Text Format",
+            "rtf",
+            "application/rtf",
+            "oowriter",
+            "openoffice",
+            IconTheme.JabRefIcons.FILE_TEXT),
+    PNG(
+            Localization.lang("%0 image", "PNG"),
+            "png",
+            "image/png",
+            "gimp",
+            "picture",
+            IconTheme.JabRefIcons.PICTURE),
+    GIF(
+            Localization.lang("%0 image", "GIF"),
+            "gif",
+            "image/gif",
+            "gimp",
+            "picture",
+            IconTheme.JabRefIcons.PICTURE),
+    JPG(
+            Localization.lang("%0 image", "JPG"),
+            "jpg",
+            "image/jpeg",
+            "gimp",
+            "picture",
+            IconTheme.JabRefIcons.PICTURE),
     Djvu("Djvu", "djvu", "image/vnd.djvu", "evince", "psSmall", IconTheme.JabRefIcons.FILE),
     TXT("Text", "txt", "text/plain", "emacs", "emacs", IconTheme.JabRefIcons.FILE_TEXT),
     TEX("LaTeX", "tex", "application/x-latex", "emacs", "emacs", IconTheme.JabRefIcons.FILE_TEXT),
     CHM("CHM", "chm", "application/mshelp", "gnochm", "www", IconTheme.JabRefIcons.WWW),
-    TIFF(Localization.lang("%0 image", "TIFF"), "tiff", "image/tiff", "gimp", "picture", IconTheme.JabRefIcons.PICTURE),
+    TIFF(
+            Localization.lang("%0 image", "TIFF"),
+            "tiff",
+            "image/tiff",
+            "gimp",
+            "picture",
+            IconTheme.JabRefIcons.PICTURE),
     URL("URL", "html", "text/html", "firefox", "www", IconTheme.JabRefIcons.WWW),
     MHT("MHT", "mht", "multipart/related", "firefox", "www", IconTheme.JabRefIcons.WWW),
     ePUB("ePUB", "epub", "application/epub+zip", "firefox", "www", IconTheme.JabRefIcons.WWW),
@@ -37,8 +126,13 @@ public enum StandardExternalFileType implements ExternalFileType {
     private final String iconName;
     private final JabRefIcon icon;
 
-    StandardExternalFileType(String name, String extension, String mimeType,
-                             String openWith, String iconName, JabRefIcon icon) {
+    StandardExternalFileType(
+            String name,
+            String extension,
+            String mimeType,
+            String openWith,
+            String iconName,
+            JabRefIcon icon) {
         this.name = name;
         this.extension = extension;
         this.mimeType = mimeType;
@@ -64,7 +158,8 @@ public String getMimeType() {
 
     @Override
     public String getOpenWithApplication() {
-        // On all OSes there is a generic application available to handle file opening, so use this one
+        // On all OSes there is a generic application available to handle file opening, so use this
+        // one
         return "";
     }
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java
index 5fada27175aa..dd3a101f99b9 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java
@@ -1,12 +1,16 @@
 package org.jabref.gui.fieldeditors;
 
-import java.util.Collection;
+import com.tobiasdiez.easybind.EasyObservableValue;
 
-import javax.swing.undo.UndoManager;
+import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
+import org.controlsfx.control.textfield.AutoCompletionBinding;
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.undo.UndoableFieldChange;
@@ -16,12 +20,9 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
-import com.tobiasdiez.easybind.EasyObservableValue;
-import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.Validator;
-import org.controlsfx.control.textfield.AutoCompletionBinding;
+import java.util.Collection;
+
+import javax.swing.undo.UndoManager;
 
 public class AbstractEditorViewModel extends AbstractViewModel {
     protected final Field field;
@@ -32,15 +33,24 @@ public class AbstractEditorViewModel extends AbstractViewModel {
     private final CompositeValidator fieldValidator;
     private EasyObservableValue<String> fieldBinding;
 
-    public AbstractEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public AbstractEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager) {
         this.field = field;
         this.suggestionProvider = suggestionProvider;
         this.undoManager = undoManager;
 
         this.fieldValidator = new CompositeValidator();
         for (ValueChecker checker : fieldCheckers.getForField(field)) {
-            FunctionBasedValidator<String> validator = new FunctionBasedValidator<>(text, value ->
-                    checker.checkValue(value).map(ValidationMessage::warning).orElse(null));
+            FunctionBasedValidator<String> validator =
+                    new FunctionBasedValidator<>(
+                            text,
+                            value ->
+                                    checker.checkValue(value)
+                                            .map(ValidationMessage::warning)
+                                            .orElse(null));
             fieldValidator.addValidators(validator);
         }
     }
@@ -64,13 +74,19 @@ public void bindToEntry(BibEntry entry) {
                 fieldBinding,
                 newValue -> {
                     if (newValue != null) {
-                        // A file may be loaded using CRLF. ControlsFX uses hardcoded \n for multiline fields.
+                        // A file may be loaded using CRLF. ControlsFX uses hardcoded \n for
+                        // multiline fields.
                         // Thus, we need to normalize the line endings.
-                        // Note: Normalizing for the .bib file is done during writing of the .bib file (see org.jabref.logic.exporter.BibWriter.BibWriter).
-                        String oldValue = entry.getField(field).map(value -> value.replace("\r\n", "\n")).orElse(null);
+                        // Note: Normalizing for the .bib file is done during writing of the .bib
+                        // file (see org.jabref.logic.exporter.BibWriter.BibWriter).
+                        String oldValue =
+                                entry.getField(field)
+                                        .map(value -> value.replace("\r\n", "\n"))
+                                        .orElse(null);
                         if (!newValue.equals(oldValue)) {
                             entry.setField(field, newValue);
-                            undoManager.addEdit(new UndoableFieldChange(entry, field, oldValue, newValue));
+                            undoManager.addEdit(
+                                    new UndoableFieldChange(entry, field, oldValue, newValue));
                         }
                     }
                 });
diff --git a/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.java b/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.java
index 53251ba46a2c..fd336352608a 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.java
@@ -1,8 +1,8 @@
 package org.jabref.gui.fieldeditors;
 
-import java.util.Collections;
+import com.airhacks.afterburner.views.ViewLoader;
 
-import javax.swing.undo.UndoManager;
+import jakarta.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
@@ -22,8 +22,9 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+import java.util.Collections;
+
+import javax.swing.undo.UndoManager;
 
 public class CitationKeyEditor extends HBox implements FieldEditorFX {
 
@@ -36,29 +37,32 @@ public class CitationKeyEditor extends HBox implements FieldEditorFX {
     @Inject private DialogService dialogService;
     @Inject private UndoManager undoManager;
 
-    public CitationKeyEditor(Field field,
-                             SuggestionProvider<?> suggestionProvider,
-                             FieldCheckers fieldCheckers,
-                             BibDatabaseContext databaseContext,
-                             UndoAction undoAction,
-                             RedoAction redoAction) {
-
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-
-        this.viewModel = new CitationKeyEditorViewModel(
-                field,
-                suggestionProvider,
-                fieldCheckers,
-                preferences,
-                databaseContext,
-                undoManager,
-                dialogService);
-
-        establishBinding(textField, viewModel.textProperty(), keyBindingRepository, undoAction, redoAction);
+    public CitationKeyEditor(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            BibDatabaseContext databaseContext,
+            UndoAction undoAction,
+            RedoAction redoAction) {
+
+        ViewLoader.view(this).root(this).load();
+
+        this.viewModel =
+                new CitationKeyEditorViewModel(
+                        field,
+                        suggestionProvider,
+                        fieldCheckers,
+                        preferences,
+                        databaseContext,
+                        undoManager,
+                        dialogService);
+
+        establishBinding(
+                textField, viewModel.textProperty(), keyBindingRepository, undoAction, redoAction);
         textField.initContextMenu(Collections::emptyList, keyBindingRepository);
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textField);
+        new EditorValidator(preferences)
+                .configureValidation(
+                        viewModel.getFieldValidator().getValidationStatus(), textField);
     }
 
     public CitationKeyEditorViewModel getViewModel() {
@@ -70,10 +74,11 @@ public void bindToEntry(BibEntry entry) {
         viewModel.bindToEntry(entry);
 
         // Configure button to generate citation key
-        new ActionFactory().configureIconButton(
-                StandardActions.GENERATE_CITE_KEY,
-                viewModel.getGenerateCiteKeyCommand(),
-                generateCitationKeyButton);
+        new ActionFactory()
+                .configureIconButton(
+                        StandardActions.GENERATE_CITE_KEY,
+                        viewModel.getGenerateCiteKeyCommand(),
+                        generateCitationKeyButton);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditorViewModel.java
index 109258ae0845..ce2a3b4c4328 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditorViewModel.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
-import javax.swing.undo.UndoManager;
+import de.saxsys.mvvmfx.utils.commands.Command;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProvider;
@@ -10,7 +10,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.field.Field;
 
-import de.saxsys.mvvmfx.utils.commands.Command;
+import javax.swing.undo.UndoManager;
 
 public class CitationKeyEditorViewModel extends AbstractEditorViewModel {
     private final CliPreferences preferences;
@@ -18,13 +18,14 @@ public class CitationKeyEditorViewModel extends AbstractEditorViewModel {
     private final UndoManager undoManager;
     private final DialogService dialogService;
 
-    public CitationKeyEditorViewModel(Field field,
-                                      SuggestionProvider<?> suggestionProvider,
-                                      FieldCheckers fieldCheckers,
-                                      CliPreferences preferences,
-                                      BibDatabaseContext databaseContext,
-                                      UndoManager undoManager,
-                                      DialogService dialogService) {
+    public CitationKeyEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            CliPreferences preferences,
+            BibDatabaseContext databaseContext,
+            UndoManager undoManager,
+            DialogService dialogService) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
         this.preferences = preferences;
         this.databaseContext = databaseContext;
@@ -33,6 +34,7 @@ public CitationKeyEditorViewModel(Field field,
     }
 
     public Command getGenerateCiteKeyCommand() {
-        return new GenerateCitationKeySingleAction(entry, databaseContext, dialogService, preferences, undoManager);
+        return new GenerateCitationKeySingleAction(
+                entry, databaseContext, dialogService, preferences, undoManager);
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/ContextMenuAddable.java b/src/main/java/org/jabref/gui/fieldeditors/ContextMenuAddable.java
index 86b22ca86e5e..d83b66424fcd 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/ContextMenuAddable.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/ContextMenuAddable.java
@@ -1,17 +1,18 @@
 package org.jabref.gui.fieldeditors;
 
-import java.util.List;
-import java.util.function.Supplier;
-
 import javafx.scene.control.MenuItem;
 
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
+import java.util.List;
+import java.util.function.Supplier;
+
 public interface ContextMenuAddable {
     /**
      * Adds the given list of menu items to the context menu. The usage of {@link Supplier} prevents that the menus need
      * to be instantiated at this point. They are populated when the user needs them which prevents many unnecessary
      * allocations when the main table is just scrolled with the entry editor open.
      */
-    void initContextMenu(final Supplier<List<MenuItem>> items, KeyBindingRepository keyBindingRepository);
+    void initContextMenu(
+            final Supplier<List<MenuItem>> items, KeyBindingRepository keyBindingRepository);
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java b/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java
index d4db223ab9d7..a495f435a074 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java
@@ -1,8 +1,8 @@
 package org.jabref.gui.fieldeditors;
 
-import java.time.format.DateTimeFormatter;
+import com.airhacks.afterburner.views.ViewLoader;
 
-import javax.swing.undo.UndoManager;
+import jakarta.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
@@ -18,8 +18,9 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+import java.time.format.DateTimeFormatter;
+
+import javax.swing.undo.UndoManager;
 
 public class DateEditor extends HBox implements FieldEditorFX {
 
@@ -30,20 +31,29 @@ public class DateEditor extends HBox implements FieldEditorFX {
     @Inject private GuiPreferences preferences;
     @Inject private KeyBindingRepository keyBindingRepository;
 
-    public DateEditor(Field field,
-                      DateTimeFormatter dateFormatter,
-                      SuggestionProvider<?> suggestionProvider,
-                      FieldCheckers fieldCheckers,
-                      UndoAction undoAction,
-                      RedoAction redoAction) {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-
-        this.viewModel = new DateEditorViewModel(field, suggestionProvider, dateFormatter, fieldCheckers, undoManager);
+    public DateEditor(
+            Field field,
+            DateTimeFormatter dateFormatter,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoAction undoAction,
+            RedoAction redoAction) {
+        ViewLoader.view(this).root(this).load();
+
+        this.viewModel =
+                new DateEditorViewModel(
+                        field, suggestionProvider, dateFormatter, fieldCheckers, undoManager);
         datePicker.setStringConverter(viewModel.getDateToStringConverter());
-        establishBinding(datePicker.getEditor(), viewModel.textProperty(), keyBindingRepository, undoAction, redoAction);
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), datePicker.getEditor());
+        establishBinding(
+                datePicker.getEditor(),
+                viewModel.textProperty(),
+                keyBindingRepository,
+                undoAction,
+                redoAction);
+        new EditorValidator(preferences)
+                .configureValidation(
+                        viewModel.getFieldValidator().getValidationStatus(),
+                        datePicker.getEditor());
     }
 
     public DateEditorViewModel getViewModel() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java
index d8bc6e37e123..aba609ec3072 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java
@@ -1,12 +1,5 @@
 package org.jabref.gui.fieldeditors;
 
-import java.time.DateTimeException;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
-import java.time.temporal.TemporalAccessor;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.util.StringConverter;
 
 import org.jabref.gui.autocompleter.SuggestionProvider;
@@ -14,16 +7,27 @@
 import org.jabref.model.entry.Date;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.time.DateTimeException;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.TemporalAccessor;
+
+import javax.swing.undo.UndoManager;
+
 public class DateEditorViewModel extends AbstractEditorViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DateEditorViewModel.class);
     private final DateTimeFormatter dateFormatter;
 
-    public DateEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, DateTimeFormatter dateFormatter, FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public DateEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            DateTimeFormatter dateFormatter,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
         this.dateFormatter = dateFormatter;
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
index 7b478f946951..ef61aa7a21ec 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.fieldeditors;
 
-import java.net.URL;
-import java.util.List;
-import java.util.Objects;
-import java.util.ResourceBundle;
-import java.util.function.Supplier;
-
 import javafx.fxml.Initializable;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
@@ -15,15 +9,23 @@
 import org.jabref.gui.fieldeditors.contextmenu.EditorContextAction;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
+import java.net.URL;
+import java.util.List;
+import java.util.Objects;
+import java.util.ResourceBundle;
+import java.util.function.Supplier;
+
 public class EditorTextArea extends TextArea implements Initializable, ContextMenuAddable {
 
     private final ContextMenu contextMenu = new ContextMenu();
+
     /**
      * Variable that contains user-defined behavior for paste action.
      */
-    private PasteActionHandler pasteActionHandler = () -> {
-        // Set empty paste behavior by default
-    };
+    private PasteActionHandler pasteActionHandler =
+            () -> {
+                // Set empty paste behavior by default
+            };
 
     public EditorTextArea() {
         this("");
@@ -39,12 +41,16 @@ public EditorTextArea(final String text) {
     }
 
     @Override
-    public void initContextMenu(final Supplier<List<MenuItem>> items, KeyBindingRepository keyBindingRepository) {
-        setOnContextMenuRequested(event -> {
-            contextMenu.getItems().setAll(EditorContextAction.getDefaultContextMenuItems(this));
-            contextMenu.getItems().addAll(0, items.get());
-            contextMenu.show(this, event.getScreenX(), event.getScreenY());
-        });
+    public void initContextMenu(
+            final Supplier<List<MenuItem>> items, KeyBindingRepository keyBindingRepository) {
+        setOnContextMenuRequested(
+                event -> {
+                    contextMenu
+                            .getItems()
+                            .setAll(EditorContextAction.getDefaultContextMenuItems(this));
+                    contextMenu.getItems().addAll(0, items.get());
+                    contextMenu.show(this, event.getScreenX(), event.getScreenY());
+                });
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
index 34fd2be09f47..050758c85b52 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.fieldeditors;
 
-import java.net.URL;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.function.Supplier;
-
 import javafx.fxml.Initializable;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
@@ -16,6 +11,11 @@
 import org.jabref.gui.fieldeditors.contextmenu.EditorContextAction;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
+import java.net.URL;
+import java.util.List;
+import java.util.ResourceBundle;
+import java.util.function.Supplier;
+
 public class EditorTextField extends TextField implements Initializable, ContextMenuAddable {
 
     private final ContextMenu contextMenu = new ContextMenu();
@@ -35,12 +35,16 @@ public EditorTextField(final String text) {
     }
 
     @Override
-    public void initContextMenu(final Supplier<List<MenuItem>> items, KeyBindingRepository keyBindingRepository) {
-        setOnContextMenuRequested(event -> {
-            contextMenu.getItems().setAll(EditorContextAction.getDefaultContextMenuItems(this));
-            contextMenu.getItems().addAll(0, items.get());
-            contextMenu.show(this, event.getScreenX(), event.getScreenY());
-        });
+    public void initContextMenu(
+            final Supplier<List<MenuItem>> items, KeyBindingRepository keyBindingRepository) {
+        setOnContextMenuRequested(
+                event -> {
+                    contextMenu
+                            .getItems()
+                            .setAll(EditorContextAction.getDefaultContextMenuItems(this));
+                    contextMenu.getItems().addAll(0, items.get());
+                    contextMenu.show(this, event.getScreenX(), event.getScreenY());
+                });
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java b/src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java
index 64a5ff7e4cf2..29ea53c006e2 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.fieldeditors;
 
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
 import javafx.scene.control.TextInputControl;
 
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.util.IconValidationDecorator;
 
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-
 public class EditorValidator {
 
     private final GuiPreferences preferences;
@@ -16,7 +16,8 @@ public EditorValidator(GuiPreferences preferences) {
         this.preferences = preferences;
     }
 
-    public void configureValidation(final ValidationStatus status, final TextInputControl textInput) {
+    public void configureValidation(
+            final ValidationStatus status, final TextInputControl textInput) {
         if (preferences.getEntryEditorPreferences().shouldEnableValidation()) {
             ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
             validationVisualizer.setDecoration(new IconValidationDecorator());
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
index 8371ccbfa2ff..aa59e7d83dd8 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
@@ -1,7 +1,8 @@
 package org.jabref.gui.fieldeditors;
 
-import java.util.Arrays;
-import java.util.List;
+import com.github.difflib.DiffUtils;
+import com.github.difflib.patch.AbstractDelta;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.application.Platform;
 import javafx.beans.property.StringProperty;
@@ -15,13 +16,12 @@
 import org.jabref.gui.undo.UndoAction;
 import org.jabref.gui.util.UiTaskExecutor;
 import org.jabref.model.entry.BibEntry;
-
-import com.github.difflib.DiffUtils;
-import com.github.difflib.patch.AbstractDelta;
-import com.tobiasdiez.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+import java.util.List;
+
 public interface FieldEditorFX {
 
     void bindToEntry(BibEntry entry);
@@ -29,40 +29,59 @@ public interface FieldEditorFX {
     /**
      * @implNote Decided to add undoAction and redoAction as parameter instead of passing a tabSupplier, {@link org.jabref.gui.DialogService} and {@link org.jabref.gui.StateManager} to the method.
      */
-    default void establishBinding(TextInputControl textInputControl, StringProperty viewModelTextProperty, KeyBindingRepository keyBindingRepository, UndoAction undoAction, RedoAction redoAction) {
+    default void establishBinding(
+            TextInputControl textInputControl,
+            StringProperty viewModelTextProperty,
+            KeyBindingRepository keyBindingRepository,
+            UndoAction undoAction,
+            RedoAction redoAction) {
         Logger logger = LoggerFactory.getLogger(FieldEditorFX.class);
 
-        // We need to use the "global" UndoManager instead of JavaFX TextInputControls's native undo/redo handling.
+        // We need to use the "global" UndoManager instead of JavaFX TextInputControls's native
+        // undo/redo handling.
         // This also prevents NPEs. See https://github.com/JabRef/jabref/issues/11420 for details.
-        textInputControl.addEventFilter(KeyEvent.ANY, e -> {
-            // Fix based on https://stackoverflow.com/a/37575818/873282
-            if (e.getEventType() == KeyEvent.KEY_PRESSED // if not checked, it will be fired twice: once for key pressed and once for key released
-                    && e.isShortcutDown()) {
-                if (keyBindingRepository.matches(e, KeyBinding.UNDO)) {
-                    undoAction.execute();
-                    e.consume();
-                } else if (keyBindingRepository.matches(e, KeyBinding.REDO)) {
-                    redoAction.execute();
-                    e.consume();
-                }
-            }
-        });
+        textInputControl.addEventFilter(
+                KeyEvent.ANY,
+                e -> {
+                    // Fix based on https://stackoverflow.com/a/37575818/873282
+                    if (e.getEventType()
+                                    == KeyEvent
+                                            .KEY_PRESSED // if not checked, it will be fired twice:
+                                                         // once for key pressed and once for key
+                                                         // released
+                            && e.isShortcutDown()) {
+                        if (keyBindingRepository.matches(e, KeyBinding.UNDO)) {
+                            undoAction.execute();
+                            e.consume();
+                        } else if (keyBindingRepository.matches(e, KeyBinding.REDO)) {
+                            redoAction.execute();
+                            e.consume();
+                        }
+                    }
+                });
 
         // We need some more sophisticated handling to avoid cursor jumping
         // https://github.com/JabRef/jabref/issues/5904
 
-        EasyBind.subscribe(viewModelTextProperty, newText -> {
-            // This might be triggered by save actions from a background thread, so we need to check if we are in the FX thread
-            if (Platform.isFxApplicationThread()) {
-                setTextAndUpdateCaretPosition(textInputControl, newText, logger);
-            } else {
-                UiTaskExecutor.runInJavaFXThread(() -> setTextAndUpdateCaretPosition(textInputControl, newText, logger));
-            }
-        });
+        EasyBind.subscribe(
+                viewModelTextProperty,
+                newText -> {
+                    // This might be triggered by save actions from a background thread, so we need
+                    // to check if we are in the FX thread
+                    if (Platform.isFxApplicationThread()) {
+                        setTextAndUpdateCaretPosition(textInputControl, newText, logger);
+                    } else {
+                        UiTaskExecutor.runInJavaFXThread(
+                                () ->
+                                        setTextAndUpdateCaretPosition(
+                                                textInputControl, newText, logger));
+                    }
+                });
         EasyBind.subscribe(textInputControl.textProperty(), viewModelTextProperty::set);
     }
 
-    private void setTextAndUpdateCaretPosition(TextInputControl textInputControl, String newText, Logger logger) {
+    private void setTextAndUpdateCaretPosition(
+            TextInputControl textInputControl, String newText, Logger logger) {
         int lastCaretPosition = textInputControl.getCaretPosition();
         logger.trace("Caret at position {}", lastCaretPosition);
         String oldText = textInputControl.getText();
@@ -85,7 +104,8 @@ private void setTextAndUpdateCaretPosition(TextInputControl textInputControl, St
         // In this case, we want to adjust the caret position
         List<String> oldValueCharacters = Arrays.asList(oldText.split(""));
         List<String> newValueCharacters = Arrays.asList(newText.split(""));
-        List<AbstractDelta<String>> deltaList = DiffUtils.diff(oldValueCharacters, newValueCharacters).getDeltas();
+        List<AbstractDelta<String>> deltaList =
+                DiffUtils.diff(oldValueCharacters, newValueCharacters).getDeltas();
         logger.trace("Deltas: {}", deltaList);
         AbstractDelta<String> lastDelta = null;
         for (AbstractDelta<String> delta : deltaList) {
@@ -129,11 +149,7 @@ private void setTextAndUpdateCaretPosition(TextInputControl textInputControl, St
     Parent getNode();
 
     default void focus() {
-        getNode().getChildrenUnmodifiable()
-                 .stream()
-                 .findFirst()
-                 .orElse(getNode())
-                 .requestFocus();
+        getNode().getChildrenUnmodifiable().stream().findFirst().orElse(getNode()).requestFocus();
     }
 
     /**
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
index 643ca3179e35..a2ed7a613f29 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.fieldeditors;
 
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.Set;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.ContentSelectorSuggestionProvider;
 import org.jabref.gui.autocompleter.SuggestionProvider;
@@ -35,106 +29,198 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.metadata.MetaData;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.undo.UndoManager;
+
 @SuppressWarnings("unchecked")
 public class FieldEditors {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FieldEditors.class);
 
-    public static FieldEditorFX getForField(final Field field,
-                                            final TaskExecutor taskExecutor,
-                                            final DialogService dialogService,
-                                            final JournalAbbreviationRepository journalAbbreviationRepository,
-                                            final GuiPreferences preferences,
-                                            final BibDatabaseContext databaseContext,
-                                            final EntryType entryType,
-                                            final SuggestionProviders suggestionProviders,
-                                            final UndoManager undoManager,
-                                            final UndoAction undoAction,
-                                            final RedoAction redoAction) {
+    public static FieldEditorFX getForField(
+            final Field field,
+            final TaskExecutor taskExecutor,
+            final DialogService dialogService,
+            final JournalAbbreviationRepository journalAbbreviationRepository,
+            final GuiPreferences preferences,
+            final BibDatabaseContext databaseContext,
+            final EntryType entryType,
+            final SuggestionProviders suggestionProviders,
+            final UndoManager undoManager,
+            final UndoAction undoAction,
+            final RedoAction redoAction) {
         final Set<FieldProperty> fieldProperties = field.getProperties();
 
-        final SuggestionProvider<?> suggestionProvider = getSuggestionProvider(field, suggestionProviders, databaseContext.getMetaData());
+        final SuggestionProvider<?> suggestionProvider =
+                getSuggestionProvider(field, suggestionProviders, databaseContext.getMetaData());
 
-        final FieldCheckers fieldCheckers = new FieldCheckers(
-                databaseContext,
-                preferences.getFilePreferences(),
-                journalAbbreviationRepository,
-                preferences.getEntryEditorPreferences().shouldAllowIntegerEditionBibtex());
+        final FieldCheckers fieldCheckers =
+                new FieldCheckers(
+                        databaseContext,
+                        preferences.getFilePreferences(),
+                        journalAbbreviationRepository,
+                        preferences.getEntryEditorPreferences().shouldAllowIntegerEditionBibtex());
 
-        boolean isMultiLine = FieldFactory.isMultiLineField(field, preferences.getFieldPreferences().getNonWrappableFields());
+        boolean isMultiLine =
+                FieldFactory.isMultiLineField(
+                        field, preferences.getFieldPreferences().getNonWrappableFields());
 
         if (preferences.getTimestampPreferences().getTimestampField().equals(field)) {
-            return new DateEditor(field, DateTimeFormatter.ofPattern(preferences.getTimestampPreferences().getTimestampFormat()), suggestionProvider, fieldCheckers, undoAction, redoAction);
+            return new DateEditor(
+                    field,
+                    DateTimeFormatter.ofPattern(
+                            preferences.getTimestampPreferences().getTimestampFormat()),
+                    suggestionProvider,
+                    fieldCheckers,
+                    undoAction,
+                    redoAction);
         } else if (fieldProperties.contains(FieldProperty.DATE)) {
-            return new DateEditor(field, DateTimeFormatter.ofPattern("[uuuu][-MM][-dd]"), suggestionProvider, fieldCheckers, undoAction, redoAction);
+            return new DateEditor(
+                    field,
+                    DateTimeFormatter.ofPattern("[uuuu][-MM][-dd]"),
+                    suggestionProvider,
+                    fieldCheckers,
+                    undoAction,
+                    redoAction);
         } else if (fieldProperties.contains(FieldProperty.EXTERNAL)) {
             return new UrlEditor(field, suggestionProvider, fieldCheckers, undoAction, redoAction);
         } else if (fieldProperties.contains(FieldProperty.JOURNAL_NAME)) {
-            return new JournalEditor(field, suggestionProvider, fieldCheckers, undoAction, redoAction);
-        } else if (fieldProperties.contains(FieldProperty.IDENTIFIER) && field != StandardField.PMID || field == StandardField.ISBN) {
+            return new JournalEditor(
+                    field, suggestionProvider, fieldCheckers, undoAction, redoAction);
+        } else if (fieldProperties.contains(FieldProperty.IDENTIFIER) && field != StandardField.PMID
+                || field == StandardField.ISBN) {
             // Identifier editor does not support PMID, therefore excluded at the condition above
             return new IdentifierEditor(field, suggestionProvider, fieldCheckers);
         } else if (field == StandardField.ISSN) {
             return new ISSNEditor(field, suggestionProvider, fieldCheckers, undoAction, redoAction);
         } else if (field == StandardField.OWNER) {
-            return new OwnerEditor(field, suggestionProvider, fieldCheckers, undoAction, redoAction);
+            return new OwnerEditor(
+                    field, suggestionProvider, fieldCheckers, undoAction, redoAction);
         } else if (field == StandardField.GROUPS) {
-            return new GroupEditor(field, suggestionProvider, fieldCheckers, preferences, isMultiLine, undoManager, undoAction, redoAction);
+            return new GroupEditor(
+                    field,
+                    suggestionProvider,
+                    fieldCheckers,
+                    preferences,
+                    isMultiLine,
+                    undoManager,
+                    undoAction,
+                    redoAction);
         } else if (field == StandardField.FILE) {
             return new LinkedFilesEditor(field, databaseContext, suggestionProvider, fieldCheckers);
         } else if (fieldProperties.contains(FieldProperty.YES_NO)) {
-            return new OptionEditor<>(new YesNoEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager));
+            return new OptionEditor<>(
+                    new YesNoEditorViewModel(
+                            field, suggestionProvider, fieldCheckers, undoManager));
         } else if (fieldProperties.contains(FieldProperty.MONTH)) {
-            return new OptionEditor<>(new MonthEditorViewModel(field, suggestionProvider, databaseContext.getMode(), fieldCheckers, undoManager));
+            return new OptionEditor<>(
+                    new MonthEditorViewModel(
+                            field,
+                            suggestionProvider,
+                            databaseContext.getMode(),
+                            fieldCheckers,
+                            undoManager));
         } else if (field == StandardField.GENDER) {
-            return new OptionEditor<>(new GenderEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager));
+            return new OptionEditor<>(
+                    new GenderEditorViewModel(
+                            field, suggestionProvider, fieldCheckers, undoManager));
         } else if (fieldProperties.contains(FieldProperty.EDITOR_TYPE)) {
-            return new OptionEditor<>(new EditorTypeEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager));
+            return new OptionEditor<>(
+                    new EditorTypeEditorViewModel(
+                            field, suggestionProvider, fieldCheckers, undoManager));
         } else if (fieldProperties.contains(FieldProperty.PAGINATION)) {
-            return new OptionEditor<>(new PaginationEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager));
+            return new OptionEditor<>(
+                    new PaginationEditorViewModel(
+                            field, suggestionProvider, fieldCheckers, undoManager));
         } else if (field == StandardField.TYPE) {
             if (entryType.equals(IEEETranEntryType.Patent)) {
-                return new OptionEditor<>(new PatentTypeEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager));
+                return new OptionEditor<>(
+                        new PatentTypeEditorViewModel(
+                                field, suggestionProvider, fieldCheckers, undoManager));
             } else {
-                return new OptionEditor<>(new TypeEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager));
+                return new OptionEditor<>(
+                        new TypeEditorViewModel(
+                                field, suggestionProvider, fieldCheckers, undoManager));
             }
-        } else if (fieldProperties.contains(FieldProperty.SINGLE_ENTRY_LINK) || fieldProperties.contains(FieldProperty.MULTIPLE_ENTRY_LINK)) {
-            return new LinkedEntriesEditor(field, databaseContext, suggestionProvider, fieldCheckers);
+        } else if (fieldProperties.contains(FieldProperty.SINGLE_ENTRY_LINK)
+                || fieldProperties.contains(FieldProperty.MULTIPLE_ENTRY_LINK)) {
+            return new LinkedEntriesEditor(
+                    field, databaseContext, suggestionProvider, fieldCheckers);
         } else if (fieldProperties.contains(FieldProperty.PERSON_NAMES)) {
-            return new PersonsEditor(field, suggestionProvider, fieldCheckers, isMultiLine, undoManager, undoAction, redoAction);
+            return new PersonsEditor(
+                    field,
+                    suggestionProvider,
+                    fieldCheckers,
+                    isMultiLine,
+                    undoManager,
+                    undoAction,
+                    redoAction);
         } else if (StandardField.KEYWORDS == field) {
             return new KeywordsEditor(field, suggestionProvider, fieldCheckers);
         } else if (field == InternalField.KEY_FIELD) {
-            return new CitationKeyEditor(field, suggestionProvider, fieldCheckers, databaseContext, undoAction, redoAction);
+            return new CitationKeyEditor(
+                    field,
+                    suggestionProvider,
+                    fieldCheckers,
+                    databaseContext,
+                    undoAction,
+                    redoAction);
         } else if (fieldProperties.contains(FieldProperty.MARKDOWN)) {
-            return new MarkdownEditor(field, suggestionProvider, fieldCheckers, preferences, undoManager, undoAction, redoAction);
+            return new MarkdownEditor(
+                    field,
+                    suggestionProvider,
+                    fieldCheckers,
+                    preferences,
+                    undoManager,
+                    undoAction,
+                    redoAction);
         } else {
             // There was no specific editor found
 
             // Check whether there are selectors defined for the field at hand
-            List<String> selectorValues = databaseContext.getMetaData().getContentSelectorValuesForField(field);
+            List<String> selectorValues =
+                    databaseContext.getMetaData().getContentSelectorValuesForField(field);
             if (!isMultiLine && !selectorValues.isEmpty()) {
-                return new OptionEditor<>(new CustomFieldEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager, selectorValues));
+                return new OptionEditor<>(
+                        new CustomFieldEditorViewModel(
+                                field,
+                                suggestionProvider,
+                                fieldCheckers,
+                                undoManager,
+                                selectorValues));
             } else {
-                return new SimpleEditor(field, suggestionProvider, fieldCheckers, preferences, isMultiLine, undoManager, undoAction, redoAction);
+                return new SimpleEditor(
+                        field,
+                        suggestionProvider,
+                        fieldCheckers,
+                        preferences,
+                        isMultiLine,
+                        undoManager,
+                        undoAction,
+                        redoAction);
             }
         }
     }
 
-    private static SuggestionProvider<?> getSuggestionProvider(Field field, SuggestionProviders suggestionProviders, MetaData metaData) {
+    private static SuggestionProvider<?> getSuggestionProvider(
+            Field field, SuggestionProviders suggestionProviders, MetaData metaData) {
         SuggestionProvider<?> suggestionProvider = suggestionProviders.getForField(field);
 
         List<String> contentSelectorValues = metaData.getContentSelectorValuesForField(field);
         if (!contentSelectorValues.isEmpty()) {
             // Enrich auto completion by content selector values
             try {
-                return new ContentSelectorSuggestionProvider((SuggestionProvider<String>) suggestionProvider, contentSelectorValues);
+                return new ContentSelectorSuggestionProvider(
+                        (SuggestionProvider<String>) suggestionProvider, contentSelectorValues);
             } catch (ClassCastException exception) {
-                LOGGER.error("Content selectors are only supported for normal fields with string-based auto completion.");
+                LOGGER.error(
+                        "Content selectors are only supported for normal fields with string-based auto completion.");
                 return suggestionProvider;
             }
         } else {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java b/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
index 33c9018a829d..f5ac5745c7ff 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
@@ -38,14 +38,17 @@ public String getDescription(Field field) {
             StandardField standardField = (StandardField) field;
             switch (standardField) {
                 case ABSTRACT:
-                    return Localization.lang("This field is intended for recording abstracts, to be printed by a special bibliography style.");
+                    return Localization.lang(
+                            "This field is intended for recording abstracts, to be printed by a special bibliography style.");
                 case ADDENDUM:
-                    return Localization.lang("Miscellaneous bibliographic data usually printed at the end of the entry.");
+                    return Localization.lang(
+                            "Miscellaneous bibliographic data usually printed at the end of the entry.");
                 case AFTERWORD:
                     return Localization.lang("Author(s) of an afterword to the work.");
                 case ANNOTATION:
                 case ANNOTE:
-                    return Localization.lang("This field may be useful when implementing a style for annotated bibliographies.");
+                    return Localization.lang(
+                            "This field may be useful when implementing a style for annotated bibliographies.");
                 case ANNOTATOR:
                     return Localization.lang("Author(s) of annotations to the work.");
                 case AUTHOR:
@@ -55,14 +58,17 @@ public String getDescription(Field field) {
                 case BOOKTITLE:
                     return Localization.lang("Title of the main publication this work is part of.");
                 case BOOKTITLEADDON:
-                    return Localization.lang("Annex to the \"Booktitle\", to be printed in a different font.");
+                    return Localization.lang(
+                            "Annex to the \"Booktitle\", to be printed in a different font.");
                 case CHAPTER:
                     return Localization.lang("Chapter or section or any other unit of a work.");
                 case COMMENT:
                     return Localization.lang("Comment to this entry.");
                 case COMMENTATOR:
-                    return Localization.lang("Author(s) of a commentary to the work.") + "\n" +
-                            Localization.lang("Note that this field is intended for commented editions which have a commentator in addition to the author. If the work is a stand-alone commentary, the commentator should be given in the author field.");
+                    return Localization.lang("Author(s) of a commentary to the work.")
+                            + "\n"
+                            + Localization.lang(
+                                    "Note that this field is intended for commented editions which have a commentator in addition to the author. If the work is a stand-alone commentary, the commentator should be given in the author field.");
                 case DATE:
                     return Localization.lang("Publication date of the work.");
                 case DOI:
@@ -70,49 +76,71 @@ public String getDescription(Field field) {
                 case EDITION:
                     return Localization.lang("Edition of a printed publication.");
                 case EDITOR:
-                    return Localization.lang("Editor(s) of the work or the main publication, depending on the type of the entry.");
+                    return Localization.lang(
+                            "Editor(s) of the work or the main publication, depending on the type of the entry.");
                 case EDITORA:
-                    return Localization.lang("Secondary editor performing a different editorial role, such as compiling, redacting, etc.");
+                    return Localization.lang(
+                            "Secondary editor performing a different editorial role, such as compiling, redacting, etc.");
                 case EDITORB:
-                    return Localization.lang("Another secondary editor performing a different role.");
+                    return Localization.lang(
+                            "Another secondary editor performing a different role.");
                 case EDITORC:
-                    return Localization.lang("Another secondary editor performing a different role.");
+                    return Localization.lang(
+                            "Another secondary editor performing a different role.");
                 case EDITORTYPE:
                     return Localization.lang("Type of editorial role performed by the \"Editor\".");
                 case EDITORATYPE:
-                    return Localization.lang("Type of editorial role performed by the \"Editora\".");
+                    return Localization.lang(
+                            "Type of editorial role performed by the \"Editora\".");
                 case EDITORBTYPE:
-                    return Localization.lang("Type of editorial role performed by the \"Editorb\".");
+                    return Localization.lang(
+                            "Type of editorial role performed by the \"Editorb\".");
                 case EDITORCTYPE:
-                    return Localization.lang("Type of editorial role performed by the \"Editorc\".");
+                    return Localization.lang(
+                            "Type of editorial role performed by the \"Editorc\".");
                 case EID:
-                    return Localization.lang("Electronic identifier of a work.") + "\n" +
-                            Localization.lang("This field may replace the pages field for journals deviating from the classic pagination scheme of printed journals by only enumerating articles or papers and not pages.");
+                    return Localization.lang("Electronic identifier of a work.")
+                            + "\n"
+                            + Localization.lang(
+                                    "This field may replace the pages field for journals deviating from the classic pagination scheme of printed journals by only enumerating articles or papers and not pages.");
                 case EPRINT:
-                    return Localization.lang("Electronic identifier of an online publication.") + "\n" +
-                            Localization.lang("This is roughly comparable to a DOI but specific to a certain archive, repository, service, or system.");
+                    return Localization.lang("Electronic identifier of an online publication.")
+                            + "\n"
+                            + Localization.lang(
+                                    "This is roughly comparable to a DOI but specific to a certain archive, repository, service, or system.");
                 case EPRINTCLASS:
                 case PRIMARYCLASS:
-                    return Localization.lang("Additional information related to the resource indicated by the eprint field.") + "\n" +
-                            Localization.lang("This could be a section of an archive, a path indicating a service, a classification of some sort.");
+                    return Localization.lang(
+                                    "Additional information related to the resource indicated by the eprint field.")
+                            + "\n"
+                            + Localization.lang(
+                                    "This could be a section of an archive, a path indicating a service, a classification of some sort.");
                 case EPRINTTYPE:
                 case ARCHIVEPREFIX:
-                    return Localization.lang("Type of the eprint identifier, e. g., the name of the archive, repository, service, or system the eprint field refers to.");
+                    return Localization.lang(
+                            "Type of the eprint identifier, e. g., the name of the archive, repository, service, or system the eprint field refers to.");
                 case EVENTDATE:
-                    return Localization.lang("Date of a conference, a symposium, or some other event.");
+                    return Localization.lang(
+                            "Date of a conference, a symposium, or some other event.");
                 case EVENTTITLE:
-                    return Localization.lang("Title of a conference, a symposium, or some other event.") + "\n"
-                            + Localization.lang("Note that this field holds the plain title of the event. Things like \"Proceedings of the Fifth XYZ Conference\" go into the titleaddon or booktitleaddon field.");
+                    return Localization.lang(
+                                    "Title of a conference, a symposium, or some other event.")
+                            + "\n"
+                            + Localization.lang(
+                                    "Note that this field holds the plain title of the event. Things like \"Proceedings of the Fifth XYZ Conference\" go into the titleaddon or booktitleaddon field.");
                 case EVENTTITLEADDON:
-                    return Localization.lang("Annex to the eventtitle field.") + "\n" +
-                            Localization.lang("Can be used for known event acronyms.");
+                    return Localization.lang("Annex to the eventtitle field.")
+                            + "\n"
+                            + Localization.lang("Can be used for known event acronyms.");
                 case FILE:
                 case PDF:
-                    return Localization.lang("Link(s) to a local PDF or other document of the work.");
+                    return Localization.lang(
+                            "Link(s) to a local PDF or other document of the work.");
                 case FOREWORD:
                     return Localization.lang("Author(s) of a foreword to the work.");
                 case HOWPUBLISHED:
-                    return Localization.lang("Publication notice for unusual publications which do not fit into any of the common categories.");
+                    return Localization.lang(
+                            "Publication notice for unusual publications which do not fit into any of the common categories.");
                 case INSTITUTION:
                 case SCHOOL:
                     return Localization.lang("Name of a university or some other institution.");
@@ -121,65 +149,90 @@ public String getDescription(Field field) {
                 case ISBN:
                     return Localization.lang("International Standard Book Number of a book.");
                 case ISRN:
-                    return Localization.lang("International Standard Technical Report Number of a technical report.");
+                    return Localization.lang(
+                            "International Standard Technical Report Number of a technical report.");
                 case ISSN:
-                    return Localization.lang("International Standard Serial Number of a periodical.");
+                    return Localization.lang(
+                            "International Standard Serial Number of a periodical.");
                 case ISSUE:
-                    return Localization.lang("Issue of a journal.") + "\n" +
-                            Localization.lang("This field is intended for journals whose individual issues are identified by a designation such as \"Spring\" or \"Summer\" rather than the month or a number. Integer ranges and short designators are better written to the number field.");
+                    return Localization.lang("Issue of a journal.")
+                            + "\n"
+                            + Localization.lang(
+                                    "This field is intended for journals whose individual issues are identified by a designation such as \"Spring\" or \"Summer\" rather than the month or a number. Integer ranges and short designators are better written to the number field.");
                 case ISSUESUBTITLE:
-                    return Localization.lang("Subtitle of a specific issue of a journal or other periodical.");
+                    return Localization.lang(
+                            "Subtitle of a specific issue of a journal or other periodical.");
                 case ISSUETITLE:
-                    return Localization.lang("Title of a specific issue of a journal or other periodical.");
+                    return Localization.lang(
+                            "Title of a specific issue of a journal or other periodical.");
                 case JOURNALSUBTITLE:
-                    return Localization.lang("Subtitle of a journal, a newspaper, or some other periodical.");
+                    return Localization.lang(
+                            "Subtitle of a journal, a newspaper, or some other periodical.");
                 case JOURNALTITLE:
                 case JOURNAL:
-                    return Localization.lang("Name of a journal, a newspaper, or some other periodical.");
+                    return Localization.lang(
+                            "Name of a journal, a newspaper, or some other periodical.");
                 case LABEL:
-                    return Localization.lang("Designation to be used by the citation style as a substitute for the regular label if any data required to generate the regular label is missing.");
+                    return Localization.lang(
+                            "Designation to be used by the citation style as a substitute for the regular label if any data required to generate the regular label is missing.");
                 case LANGUAGE:
-                    return Localization.lang("Language(s) of the work. Languages may be specified literally or as localisation keys.");
+                    return Localization.lang(
+                            "Language(s) of the work. Languages may be specified literally or as localisation keys.");
                 case LIBRARY:
-                    return Localization.lang("Information such as a library name and a call number.");
+                    return Localization.lang(
+                            "Information such as a library name and a call number.");
                 case LOCATION:
                 case ADDRESS:
-                    return Localization.lang("Place(s) of publication, i. e., the location of the publisher or institution, depending on the entry type.");
+                    return Localization.lang(
+                            "Place(s) of publication, i. e., the location of the publisher or institution, depending on the entry type.");
                 case MAINSUBTITLE:
                     return Localization.lang("Subtitle related to the \"Maintitle\".");
                 case MAINTITLE:
-                    return Localization.lang("Main title of a multi-volume book, such as \"Collected Works\".");
+                    return Localization.lang(
+                            "Main title of a multi-volume book, such as \"Collected Works\".");
                 case MAINTITLEADDON:
-                    return Localization.lang("Annex to the \"Maintitle\", to be printed in a different font.");
+                    return Localization.lang(
+                            "Annex to the \"Maintitle\", to be printed in a different font.");
                 case MONTH:
                     return Localization.lang("Publication month.");
                 case NAMEADDON:
-                    return Localization.lang("Addon to be printed immediately after the author name in the bibliography.");
+                    return Localization.lang(
+                            "Addon to be printed immediately after the author name in the bibliography.");
                 case NOTE:
-                    return Localization.lang("Miscellaneous bibliographic data which does not fit into any other field.");
+                    return Localization.lang(
+                            "Miscellaneous bibliographic data which does not fit into any other field.");
                 case NUMBER:
-                    return Localization.lang("Number of a journal or the volume/number of a book in a series.");
+                    return Localization.lang(
+                            "Number of a journal or the volume/number of a book in a series.");
                 case ORGANIZATION:
-                    return Localization.lang("Organization(s) that published a manual or an online resource, or sponsored a conference.");
+                    return Localization.lang(
+                            "Organization(s) that published a manual or an online resource, or sponsored a conference.");
                 case ORIGDATE:
-                    return Localization.lang("If the work is a translation, a reprint, or something similar, the publication date of the original edition.");
+                    return Localization.lang(
+                            "If the work is a translation, a reprint, or something similar, the publication date of the original edition.");
                 case ORIGLANGUAGE:
-                    return Localization.lang("If the work is a translation, the language(s) of the original work.");
+                    return Localization.lang(
+                            "If the work is a translation, the language(s) of the original work.");
                 case PAGES:
-                    return Localization.lang("One or more page numbers or page ranges.") + "\n" +
-                            Localization.lang("If the work is published as part of another one, such as an article in a journal or a collection, this field holds the relevant page range in that other work. It may also be used to limit the reference to a specific part of a work (a chapter in a book, for example). For papers in electronic journals with anon-classical pagination setup the eid field may be more suitable.");
+                    return Localization.lang("One or more page numbers or page ranges.")
+                            + "\n"
+                            + Localization.lang(
+                                    "If the work is published as part of another one, such as an article in a journal or a collection, this field holds the relevant page range in that other work. It may also be used to limit the reference to a specific part of a work (a chapter in a book, for example). For papers in electronic journals with anon-classical pagination setup the eid field may be more suitable.");
                 case PAGETOTAL:
                     return Localization.lang("Total number of pages of the work.");
                 case PAGINATION:
-                    return Localization.lang("Pagination of the work. The key should be given in the singular form.");
+                    return Localization.lang(
+                            "Pagination of the work. The key should be given in the singular form.");
                 case PART:
-                    return Localization.lang("Number of a partial volume. This field applies to books only, not to journals. It may be used when a logical volume consists of two or more physical ones.");
+                    return Localization.lang(
+                            "Number of a partial volume. This field applies to books only, not to journals. It may be used when a logical volume consists of two or more physical ones.");
                 case PUBLISHER:
                     return Localization.lang("Name(s) of the publisher(s).");
                 case PUBSTATE:
                     return Localization.lang("Publication state of the work, e. g., \"in press\".");
                 case SERIES:
-                    return Localization.lang("Name of a publication series, such as \"Studies in...\", or the number of a journal series.");
+                    return Localization.lang(
+                            "Name of a publication series, such as \"Studies in...\", or the number of a journal series.");
                 case SHORTTITLE:
                     return Localization.lang("Title in an abridged form.");
                 case SUBTITLE:
@@ -187,19 +240,25 @@ public String getDescription(Field field) {
                 case TITLE:
                     return Localization.lang("Title of the work.");
                 case TITLEADDON:
-                    return Localization.lang("Annex to the \"Title\", to be printed in a different font.");
+                    return Localization.lang(
+                            "Annex to the \"Title\", to be printed in a different font.");
                 case TRANSLATOR:
-                    return Localization.lang("Translator(s) of the \"Title\" or \"Booktitle\", depending on the entry type. If the translator is identical to the \"Editor\", the standard styles will automatically concatenate these fields in the bibliography.");
+                    return Localization.lang(
+                            "Translator(s) of the \"Title\" or \"Booktitle\", depending on the entry type. If the translator is identical to the \"Editor\", the standard styles will automatically concatenate these fields in the bibliography.");
                 case TYPE:
-                    return Localization.lang("Type of a \"Manual\", \"Patent\", \"Report\", or \"Thesis\".");
+                    return Localization.lang(
+                            "Type of a \"Manual\", \"Patent\", \"Report\", or \"Thesis\".");
                 case URL:
                     return Localization.lang("URL of an online publication.");
                 case URLDATE:
-                    return Localization.lang("Access date of the address specified in the url field.");
+                    return Localization.lang(
+                            "Access date of the address specified in the url field.");
                 case VENUE:
-                    return Localization.lang("Location of a conference, a symposium, or some other event.");
+                    return Localization.lang(
+                            "Location of a conference, a symposium, or some other event.");
                 case VERSION:
-                    return Localization.lang("Revision number of a piece of software, a manual, etc.");
+                    return Localization.lang(
+                            "Revision number of a piece of software, a manual, etc.");
                 case VOLUME:
                     return Localization.lang("Volume of a multi-volume book or a periodical.");
                 case VOLUMES:
@@ -207,21 +266,27 @@ public String getDescription(Field field) {
                 case YEAR:
                     return Localization.lang("Year of publication.");
                 case CROSSREF:
-                    return Localization.lang("This field holds an entry key for the cross-referencing feature. Child entries with a \"Crossref\" field inherit data from the parent entry specified in the \"Crossref\" field.");
+                    return Localization.lang(
+                            "This field holds an entry key for the cross-referencing feature. Child entries with a \"Crossref\" field inherit data from the parent entry specified in the \"Crossref\" field.");
                 case GENDER:
-                    return Localization.lang("Gender of the author or gender of the editor, if there is no author.");
+                    return Localization.lang(
+                            "Gender of the author or gender of the editor, if there is no author.");
                 case KEYWORDS:
                     return Localization.lang("Separated list of keywords.");
                 case RELATED:
-                    return Localization.lang("Citation keys of other entries which have a relationship to this entry.");
+                    return Localization.lang(
+                            "Citation keys of other entries which have a relationship to this entry.");
                 case XREF:
-                    return Localization.lang("This field is an alternative cross-referencing mechanism. It differs from \"Crossref\" in that the child entry will not inherit any data from the parent entry specified in the \"Xref\" field.");
+                    return Localization.lang(
+                            "This field is an alternative cross-referencing mechanism. It differs from \"Crossref\" in that the child entry will not inherit any data from the parent entry specified in the \"Xref\" field.");
                 case GROUPS:
-                    return Localization.lang("Name(s) of the (manual) groups the entry belongs to.");
+                    return Localization.lang(
+                            "Name(s) of the (manual) groups the entry belongs to.");
                 case OWNER:
                     return Localization.lang("Owner/creator of this entry.");
                 case TIMESTAMP:
-                    return Localization.lang("Timestamp of this entry, when it has been created or last modified.");
+                    return Localization.lang(
+                            "Timestamp of this entry, when it has been created or last modified.");
             }
         } else if (field instanceof InternalField internalField) {
             switch (internalField) {
@@ -231,17 +296,20 @@ public String getDescription(Field field) {
         } else if (field instanceof SpecialField specialField) {
             switch (specialField) {
                 case PRINTED:
-                    return Localization.lang("User-specific printed flag, in case the entry has been printed.");
+                    return Localization.lang(
+                            "User-specific printed flag, in case the entry has been printed.");
                 case PRIORITY:
                     return Localization.lang("User-specific priority.");
                 case QUALITY:
-                    return Localization.lang("User-specific quality flag, in case its quality is assured.");
+                    return Localization.lang(
+                            "User-specific quality flag, in case its quality is assured.");
                 case RANKING:
                     return Localization.lang("User-specific ranking.");
                 case READ_STATUS:
                     return Localization.lang("User-specific read status.");
                 case RELEVANCE:
-                    return Localization.lang("User-specific relevance flag, in case the entry is relevant.");
+                    return Localization.lang(
+                            "User-specific relevance flag, in case the entry is relevant.");
             }
         }
         return "";
diff --git a/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java b/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java
index 16a50521b656..b37e1480cebf 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.fieldeditors;
 
-import java.util.List;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.input.TransferMode;
 
 import org.jabref.gui.DragAndDropDataFormats;
@@ -17,43 +12,74 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 
+import java.util.List;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
+
 public class GroupEditor extends SimpleEditor {
 
     private Optional<BibEntry> bibEntry;
 
-    public GroupEditor(final Field field,
-                       final SuggestionProvider<?> suggestionProvider,
-                       final FieldCheckers fieldCheckers,
-                       final GuiPreferences preferences,
-                       final boolean isMultiLine,
-                       final UndoManager undoManager,
-                       final UndoAction undoAction,
-                       final RedoAction redoAction) {
-        super(field, suggestionProvider, fieldCheckers, preferences, isMultiLine, undoManager, undoAction, redoAction);
+    public GroupEditor(
+            final Field field,
+            final SuggestionProvider<?> suggestionProvider,
+            final FieldCheckers fieldCheckers,
+            final GuiPreferences preferences,
+            final boolean isMultiLine,
+            final UndoManager undoManager,
+            final UndoAction undoAction,
+            final RedoAction redoAction) {
+        super(
+                field,
+                suggestionProvider,
+                fieldCheckers,
+                preferences,
+                isMultiLine,
+                undoManager,
+                undoAction,
+                redoAction);
 
-        this.setOnDragOver(event -> {
-            if (event.getDragboard().hasContent(DragAndDropDataFormats.GROUP)) {
-                event.acceptTransferModes(TransferMode.MOVE);
-            }
-            event.consume();
-        });
+        this.setOnDragOver(
+                event -> {
+                    if (event.getDragboard().hasContent(DragAndDropDataFormats.GROUP)) {
+                        event.acceptTransferModes(TransferMode.MOVE);
+                    }
+                    event.consume();
+                });
 
-        this.setOnDragDropped(event -> {
-            boolean success = false;
-            if (event.getDragboard().hasContent(DragAndDropDataFormats.GROUP)) {
-                List<String> draggedGroups = (List<String>) event.getDragboard().getContent(DragAndDropDataFormats.GROUP);
-                if (bibEntry.isPresent() && draggedGroups.getFirst() != null) {
-                    String newGroup = bibEntry.map(entry -> entry.getField(StandardField.GROUPS)
-                                                                     .map(oldGroups -> oldGroups + (preferences.getBibEntryPreferences().getKeywordSeparator()) + (draggedGroups.getFirst()))
-                                                                     .orElse(draggedGroups.getFirst()))
-                                                  .orElse(null);
-                    bibEntry.map(entry -> entry.setField(StandardField.GROUPS, newGroup));
-                    success = true;
-                }
-            }
-            event.setDropCompleted(success);
-            event.consume();
-        });
+        this.setOnDragDropped(
+                event -> {
+                    boolean success = false;
+                    if (event.getDragboard().hasContent(DragAndDropDataFormats.GROUP)) {
+                        List<String> draggedGroups =
+                                (List<String>)
+                                        event.getDragboard()
+                                                .getContent(DragAndDropDataFormats.GROUP);
+                        if (bibEntry.isPresent() && draggedGroups.getFirst() != null) {
+                            String newGroup =
+                                    bibEntry.map(
+                                                    entry ->
+                                                            entry.getField(StandardField.GROUPS)
+                                                                    .map(
+                                                                            oldGroups ->
+                                                                                    oldGroups
+                                                                                            + (preferences
+                                                                                                    .getBibEntryPreferences()
+                                                                                                    .getKeywordSeparator())
+                                                                                            + (draggedGroups
+                                                                                                    .getFirst()))
+                                                                    .orElse(
+                                                                            draggedGroups
+                                                                                    .getFirst()))
+                                            .orElse(null);
+                            bibEntry.map(entry -> entry.setField(StandardField.GROUPS, newGroup));
+                            success = true;
+                        }
+                    }
+                    event.setDropCompleted(success);
+                    event.consume();
+                });
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java
index e273faa16ce0..c7a8f367cd6e 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java
@@ -1,8 +1,8 @@
 package org.jabref.gui.fieldeditors;
 
-import java.util.Optional;
+import com.airhacks.afterburner.views.ViewLoader;
 
-import javax.swing.undo.UndoManager;
+import jakarta.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
@@ -22,8 +22,9 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
 
 public class ISSNEditor extends HBox implements FieldEditorFX {
     @FXML private ISSNEditorViewModel viewModel;
@@ -40,29 +41,31 @@ public class ISSNEditor extends HBox implements FieldEditorFX {
 
     private Optional<BibEntry> entry = Optional.empty();
 
-    public ISSNEditor(Field field,
-                      SuggestionProvider<?> suggestionProvider,
-                      FieldCheckers fieldCheckers,
-                      UndoAction undoAction,
-                      RedoAction redoAction) {
-
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-
-        this.viewModel = new ISSNEditorViewModel(
-                field,
-                suggestionProvider,
-                fieldCheckers,
-                taskExecutor,
-                dialogService,
-                undoManager,
-                stateManager,
-                preferences);
-
-        establishBinding(textArea, viewModel.textProperty(), keyBindingRepository, undoAction, redoAction);
+    public ISSNEditor(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoAction undoAction,
+            RedoAction redoAction) {
+
+        ViewLoader.view(this).root(this).load();
+
+        this.viewModel =
+                new ISSNEditorViewModel(
+                        field,
+                        suggestionProvider,
+                        fieldCheckers,
+                        taskExecutor,
+                        dialogService,
+                        undoManager,
+                        stateManager,
+                        preferences);
+
+        establishBinding(
+                textArea, viewModel.textProperty(), keyBindingRepository, undoAction, redoAction);
         textArea.initContextMenu(new DefaultMenu(textArea), keyBindingRepository);
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
+        new EditorValidator(preferences)
+                .configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
     }
 
     public ISSNEditorViewModel getViewModel() {
@@ -92,7 +95,8 @@ private void fetchInformationByIdentifier() {
 
     @FXML
     private void showJournalInfo() {
-        if (JournalInfoOptInDialogHelper.isJournalInfoEnabled(dialogService, preferences.getEntryEditorPreferences())) {
+        if (JournalInfoOptInDialogHelper.isJournalInfoEnabled(
+                dialogService, preferences.getEntryEditorPreferences())) {
             viewModel.showJournalInfo(journalInfoButton);
         }
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/ISSNEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditorViewModel.java
index b260019f2f94..5375699c6240 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/ISSNEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditorViewModel.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.fieldeditors;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.Button;
 
 import org.jabref.gui.DialogService;
@@ -16,6 +14,8 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 
+import javax.swing.undo.UndoManager;
+
 public class ISSNEditorViewModel extends AbstractEditorViewModel {
     private final TaskExecutor taskExecutor;
     private final DialogService dialogService;
@@ -45,10 +45,17 @@ public void showJournalInfo(Button journalInfoButton) {
     }
 
     public void fetchBibliographyInformation(BibEntry bibEntry) {
-        stateManager.getActiveDatabase().ifPresentOrElse(
-                databaseContext -> new FetchAndMergeEntry(databaseContext, taskExecutor, preferences, dialogService, undoManager)
-                        .fetchAndMerge(bibEntry, StandardField.ISSN),
-                () -> dialogService.notify(Localization.lang("No library selected"))
-        );
+        stateManager
+                .getActiveDatabase()
+                .ifPresentOrElse(
+                        databaseContext ->
+                                new FetchAndMergeEntry(
+                                                databaseContext,
+                                                taskExecutor,
+                                                preferences,
+                                                dialogService,
+                                                undoManager)
+                                        .fetchAndMerge(bibEntry, StandardField.ISSN),
+                        () -> dialogService.notify(Localization.lang("No library selected")));
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
index 0c964ef95329..dba3161931e3 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
@@ -1,6 +1,8 @@
 package org.jabref.gui.fieldeditors;
 
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
@@ -21,8 +23,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+import javax.swing.undo.UndoManager;
 
 public class JournalEditor extends HBox implements FieldEditorFX {
 
@@ -37,29 +38,32 @@ public class JournalEditor extends HBox implements FieldEditorFX {
     @Inject private JournalAbbreviationRepository abbreviationRepository;
     @Inject private UndoManager undoManager;
 
-    public JournalEditor(Field field,
-                         SuggestionProvider<?> suggestionProvider,
-                         FieldCheckers fieldCheckers,
-                         UndoAction undoAction,
-                         RedoAction redoAction) {
-
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-
-        this.viewModel = new JournalEditorViewModel(
-                field,
-                suggestionProvider,
-                abbreviationRepository,
-                fieldCheckers,
-                taskExecutor,
-                dialogService,
-                undoManager);
-
-        establishBinding(textField, viewModel.textProperty(), keyBindingRepository, undoAction, redoAction);
+    public JournalEditor(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoAction undoAction,
+            RedoAction redoAction) {
+
+        ViewLoader.view(this).root(this).load();
+
+        this.viewModel =
+                new JournalEditorViewModel(
+                        field,
+                        suggestionProvider,
+                        abbreviationRepository,
+                        fieldCheckers,
+                        taskExecutor,
+                        dialogService,
+                        undoManager);
+
+        establishBinding(
+                textField, viewModel.textProperty(), keyBindingRepository, undoAction, redoAction);
         textField.initContextMenu(new DefaultMenu(textField), keyBindingRepository);
         AutoCompletionTextInputBinding.autoComplete(textField, viewModel::complete);
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textField);
+        new EditorValidator(preferences)
+                .configureValidation(
+                        viewModel.getFieldValidator().getValidationStatus(), textField);
     }
 
     public JournalEditorViewModel getViewModel() {
@@ -83,7 +87,8 @@ private void toggleAbbreviation() {
 
     @FXML
     private void showJournalInfo() {
-        if (JournalInfoOptInDialogHelper.isJournalInfoEnabled(dialogService, preferences.getEntryEditorPreferences())) {
+        if (JournalInfoOptInDialogHelper.isJournalInfoEnabled(
+                dialogService, preferences.getEntryEditorPreferences())) {
             viewModel.showJournalInfo(journalInfoButton);
         }
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java
index 4fba9d2635e2..d17c158395a4 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.fieldeditors;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.Button;
 
 import org.jabref.gui.DialogService;
@@ -12,6 +10,8 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.strings.StringUtil;
 
+import javax.swing.undo.UndoManager;
+
 public class JournalEditorViewModel extends AbstractEditorViewModel {
     private final JournalAbbreviationRepository journalAbbreviationRepository;
     private final TaskExecutor taskExecutor;
@@ -39,11 +39,15 @@ public void toggleAbbreviation() {
         // Ignore brackets when matching abbreviations.
         final String name = StringUtil.ignoreCurlyBracket(text.get());
 
-        journalAbbreviationRepository.getNextAbbreviation(name).ifPresent(nextAbbreviation -> {
-            text.set(nextAbbreviation);
-            // TODO: Add undo
-            // panel.getUndoManager().addEdit(new UndoableFieldChange(entry, editor.getName(), text, nextAbbreviation));
-        });
+        journalAbbreviationRepository
+                .getNextAbbreviation(name)
+                .ifPresent(
+                        nextAbbreviation -> {
+                            text.set(nextAbbreviation);
+                            // TODO: Add undo
+                            // panel.getUndoManager().addEdit(new UndoableFieldChange(entry,
+                            // editor.getName(), text, nextAbbreviation));
+                        });
     }
 
     public void showJournalInfo(Button journalInfoButton) {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java b/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java
index b1209ba95db9..62aef47a0d35 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java
@@ -9,33 +9,43 @@ public class JournalInfoOptInDialogHelper {
     /**
      * Using the journal information data fetcher service needs to be opt-in for GDPR compliance.
      */
-    public static boolean isJournalInfoEnabled(DialogService dialogService, EntryEditorPreferences preferences) {
-        if (preferences.shouldEnableJournalPopup() == EntryEditorPreferences.JournalPopupEnabled.ENABLED) {
+    public static boolean isJournalInfoEnabled(
+            DialogService dialogService, EntryEditorPreferences preferences) {
+        if (preferences.shouldEnableJournalPopup()
+                == EntryEditorPreferences.JournalPopupEnabled.ENABLED) {
             return true;
         }
 
-        if (preferences.shouldEnableJournalPopup() == EntryEditorPreferences.JournalPopupEnabled.DISABLED) {
-            boolean enableJournalPopup = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("Enable Journal Information Fetching?"),
-                    Localization.lang("Would you like to enable fetching of journal information? This can be changed later in %0 > %1.",
-                            Localization.lang("Preferences"),
-                            Localization.lang("Entry editor")), Localization.lang("Enable"), Localization.lang("Keep disabled")
-            );
-
-            preferences.setEnableJournalPopup(enableJournalPopup
-                    ? EntryEditorPreferences.JournalPopupEnabled.ENABLED
-                    : EntryEditorPreferences.JournalPopupEnabled.DISABLED);
+        if (preferences.shouldEnableJournalPopup()
+                == EntryEditorPreferences.JournalPopupEnabled.DISABLED) {
+            boolean enableJournalPopup =
+                    dialogService.showConfirmationDialogAndWait(
+                            Localization.lang("Enable Journal Information Fetching?"),
+                            Localization.lang(
+                                    "Would you like to enable fetching of journal information? This can be changed later in %0 > %1.",
+                                    Localization.lang("Preferences"),
+                                    Localization.lang("Entry editor")),
+                            Localization.lang("Enable"),
+                            Localization.lang("Keep disabled"));
+
+            preferences.setEnableJournalPopup(
+                    enableJournalPopup
+                            ? EntryEditorPreferences.JournalPopupEnabled.ENABLED
+                            : EntryEditorPreferences.JournalPopupEnabled.DISABLED);
 
             return enableJournalPopup;
         }
 
-        boolean journalInfoEnabled = dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Remote services"),
-                Localization.lang("Allow sending ISSN to a JabRef online service (SCimago) for fetching journal information"));
+        boolean journalInfoEnabled =
+                dialogService.showConfirmationDialogAndWait(
+                        Localization.lang("Remote services"),
+                        Localization.lang(
+                                "Allow sending ISSN to a JabRef online service (SCimago) for fetching journal information"));
 
-        preferences.setEnableJournalPopup(journalInfoEnabled
-                ? EntryEditorPreferences.JournalPopupEnabled.ENABLED
-                : EntryEditorPreferences.JournalPopupEnabled.DISABLED);
+        preferences.setEnableJournalPopup(
+                journalInfoEnabled
+                        ? EntryEditorPreferences.JournalPopupEnabled.ENABLED
+                        : EntryEditorPreferences.JournalPopupEnabled.DISABLED);
         return journalInfoEnabled;
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java b/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java
index 4da18163ab25..7da6fcafda37 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java
@@ -1,8 +1,9 @@
 package org.jabref.gui.fieldeditors;
 
-import java.util.Comparator;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.dlsc.gemsfx.TagsField;
 
-import javax.swing.undo.UndoManager;
+import jakarta.inject.Inject;
 
 import javafx.beans.binding.Bindings;
 import javafx.css.PseudoClass;
@@ -29,13 +30,13 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Keyword;
 import org.jabref.model.entry.field.Field;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import com.dlsc.gemsfx.TagsField;
-import jakarta.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Comparator;
+
+import javax.swing.undo.UndoManager;
+
 public class KeywordsEditor extends HBox implements FieldEditorFX {
     private static final Logger LOGGER = LoggerFactory.getLogger(KeywordsEditor.class);
     private static final PseudoClass FOCUSED = PseudoClass.getPseudoClass("focused");
@@ -48,46 +49,54 @@ public class KeywordsEditor extends HBox implements FieldEditorFX {
     @Inject private UndoManager undoManager;
     @Inject private ClipBoardManager clipBoardManager;
 
-    public KeywordsEditor(Field field,
-                          SuggestionProvider<?> suggestionProvider,
-                          FieldCheckers fieldCheckers) {
+    public KeywordsEditor(
+            Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
 
-        this.viewModel = new KeywordsEditorViewModel(
-                field,
-                suggestionProvider,
-                fieldCheckers,
-                preferences,
-                undoManager);
+        this.viewModel =
+                new KeywordsEditorViewModel(
+                        field, suggestionProvider, fieldCheckers, preferences, undoManager);
 
-        keywordTagsField.setCellFactory(new ViewModelListCellFactory<Keyword>().withText(Keyword::get));
+        keywordTagsField.setCellFactory(
+                new ViewModelListCellFactory<Keyword>().withText(Keyword::get));
         keywordTagsField.setTagViewFactory(this::createTag);
 
-        keywordTagsField.setSuggestionProvider(request -> viewModel.getSuggestions(request.getUserText()));
+        keywordTagsField.setSuggestionProvider(
+                request -> viewModel.getSuggestions(request.getUserText()));
         keywordTagsField.setConverter(viewModel.getStringConverter());
-        keywordTagsField.setMatcher((keyword, searchText) -> keyword.get().toLowerCase().startsWith(searchText.toLowerCase()));
+        keywordTagsField.setMatcher(
+                (keyword, searchText) ->
+                        keyword.get().toLowerCase().startsWith(searchText.toLowerCase()));
         keywordTagsField.setComparator(Comparator.comparing(Keyword::get));
 
-        keywordTagsField.setNewItemProducer(searchText -> viewModel.getStringConverter().fromString(searchText));
+        keywordTagsField.setNewItemProducer(
+                searchText -> viewModel.getStringConverter().fromString(searchText));
 
         keywordTagsField.setShowSearchIcon(false);
         keywordTagsField.setOnMouseClicked(event -> keywordTagsField.getEditor().requestFocus());
         keywordTagsField.getEditor().getStyleClass().clear();
         keywordTagsField.getEditor().getStyleClass().add("tags-field-editor");
-        keywordTagsField.getEditor().focusedProperty().addListener((observable, oldValue, newValue) -> keywordTagsField.pseudoClassStateChanged(FOCUSED, newValue));
+        keywordTagsField
+                .getEditor()
+                .focusedProperty()
+                .addListener(
+                        (observable, oldValue, newValue) ->
+                                keywordTagsField.pseudoClassStateChanged(FOCUSED, newValue));
 
         String keywordSeparator = String.valueOf(viewModel.getKeywordSeparator());
-        keywordTagsField.getEditor().setOnKeyReleased(event -> {
-            if (event.getText().equals(keywordSeparator)) {
-                keywordTagsField.commit();
-                event.consume();
-            }
-        });
-
-        Bindings.bindContentBidirectional(keywordTagsField.getTags(), viewModel.keywordListProperty());
+        keywordTagsField
+                .getEditor()
+                .setOnKeyReleased(
+                        event -> {
+                            if (event.getText().equals(keywordSeparator)) {
+                                keywordTagsField.commit();
+                                event.consume();
+                            }
+                        });
+
+        Bindings.bindContentBidirectional(
+                keywordTagsField.getTags(), viewModel.keywordListProperty());
     }
 
     private Node createTag(Keyword keyword) {
@@ -98,11 +107,19 @@ private Node createTag(Keyword keyword) {
         tagLabel.setContentDisplay(ContentDisplay.RIGHT);
         ContextMenu contextMenu = new ContextMenu();
         ActionFactory factory = new ActionFactory();
-        contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.COPY, new KeywordsEditor.TagContextAction(StandardActions.COPY, keyword)),
-                factory.createMenuItem(StandardActions.CUT, new KeywordsEditor.TagContextAction(StandardActions.CUT, keyword)),
-                factory.createMenuItem(StandardActions.DELETE, new KeywordsEditor.TagContextAction(StandardActions.DELETE, keyword))
-        );
+        contextMenu
+                .getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.COPY,
+                                new KeywordsEditor.TagContextAction(StandardActions.COPY, keyword)),
+                        factory.createMenuItem(
+                                StandardActions.CUT,
+                                new KeywordsEditor.TagContextAction(StandardActions.CUT, keyword)),
+                        factory.createMenuItem(
+                                StandardActions.DELETE,
+                                new KeywordsEditor.TagContextAction(
+                                        StandardActions.DELETE, keyword)));
         tagLabel.setContextMenu(contextMenu);
         return tagLabel;
     }
@@ -140,19 +157,21 @@ public void execute() {
             switch (command) {
                 case COPY -> {
                     clipBoardManager.setContent(keyword.get());
-                    dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
-                            JabRefDialogService.shortenDialogMessage(keyword.get())));
+                    dialogService.notify(
+                            Localization.lang(
+                                    "Copied '%0' to clipboard.",
+                                    JabRefDialogService.shortenDialogMessage(keyword.get())));
                 }
                 case CUT -> {
                     clipBoardManager.setContent(keyword.get());
-                    dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
-                            JabRefDialogService.shortenDialogMessage(keyword.get())));
+                    dialogService.notify(
+                            Localization.lang(
+                                    "Copied '%0' to clipboard.",
+                                    JabRefDialogService.shortenDialogMessage(keyword.get())));
                     keywordTagsField.removeTags(keyword);
                 }
-                case DELETE ->
-                        keywordTagsField.removeTags(keyword);
-                default ->
-                        LOGGER.info("Action {} not defined", command.getText());
+                case DELETE -> keywordTagsField.removeTags(keyword);
+                default -> LOGGER.info("Action {} not defined", command.getText());
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditorViewModel.java
index e33b22098e2f..4c33437129d8 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditorViewModel.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.fieldeditors;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
@@ -17,20 +12,25 @@
 import org.jabref.model.entry.Keyword;
 import org.jabref.model.entry.KeywordList;
 import org.jabref.model.entry.field.Field;
-
 import org.tinylog.Logger;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
+
 public class KeywordsEditorViewModel extends AbstractEditorViewModel {
 
     private final ListProperty<Keyword> keywordListProperty;
     private final Character keywordSeparator;
     private final SuggestionProvider<?> suggestionProvider;
 
-    public KeywordsEditorViewModel(Field field,
-                                   SuggestionProvider<?> suggestionProvider,
-                                   FieldCheckers fieldCheckers,
-                                   CliPreferences preferences,
-                                   UndoManager undoManager) {
+    public KeywordsEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            CliPreferences preferences,
+            UndoManager undoManager) {
 
         super(field, suggestionProvider, fieldCheckers, undoManager);
 
@@ -39,10 +39,7 @@ public KeywordsEditorViewModel(Field field,
         this.suggestionProvider = suggestionProvider;
 
         BindingsHelper.bindContentBidirectional(
-                keywordListProperty,
-                text,
-                this::serializeKeywords,
-                this::parseKeywords);
+                keywordListProperty, text, this::serializeKeywords, this::parseKeywords);
     }
 
     private String serializeKeywords(List<Keyword> keywords) {
@@ -76,12 +73,13 @@ public Keyword fromString(String keywordString) {
     }
 
     public List<Keyword> getSuggestions(String request) {
-        List<Keyword> suggestions = suggestionProvider.getPossibleSuggestions().stream()
-                                                      .map(String.class::cast)
-                                                      .filter(keyword -> keyword.toLowerCase().contains(request.toLowerCase()))
-                                                      .map(Keyword::new)
-                                                      .distinct()
-                                                      .collect(Collectors.toList());
+        List<Keyword> suggestions =
+                suggestionProvider.getPossibleSuggestions().stream()
+                        .map(String.class::cast)
+                        .filter(keyword -> keyword.toLowerCase().contains(request.toLowerCase()))
+                        .map(Keyword::new)
+                        .distinct()
+                        .collect(Collectors.toList());
 
         Keyword requestedKeyword = new Keyword(request);
         if (!suggestions.contains(requestedKeyword)) {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java
index 4b65ad78349f..4e09c51a92d3 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java
@@ -1,8 +1,9 @@
 package org.jabref.gui.fieldeditors;
 
-import java.util.Comparator;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.dlsc.gemsfx.TagsField;
 
-import javax.swing.undo.UndoManager;
+import jakarta.inject.Inject;
 
 import javafx.beans.binding.Bindings;
 import javafx.css.PseudoClass;
@@ -32,13 +33,13 @@
 import org.jabref.model.entry.EntryLinkList;
 import org.jabref.model.entry.ParsedEntryLink;
 import org.jabref.model.entry.field.Field;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import com.dlsc.gemsfx.TagsField;
-import jakarta.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Comparator;
+
+import javax.swing.undo.UndoManager;
+
 public class LinkedEntriesEditor extends HBox implements FieldEditorFX {
     private static final Logger LOGGER = LoggerFactory.getLogger(LinkedEntriesEditor.class);
     private static final PseudoClass FOCUSED = PseudoClass.getPseudoClass("focused");
@@ -51,37 +52,60 @@ public class LinkedEntriesEditor extends HBox implements FieldEditorFX {
     @Inject private UndoManager undoManager;
     @Inject private StateManager stateManager;
 
-    public LinkedEntriesEditor(Field field, BibDatabaseContext databaseContext, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-
-        this.viewModel = new LinkedEntriesEditorViewModel(field, suggestionProvider, databaseContext, fieldCheckers, undoManager, stateManager);
-
-        entryLinkField.setCellFactory(new ViewModelListCellFactory<ParsedEntryLink>().withText(ParsedEntryLink::getKey));
-        entryLinkField.setSuggestionProvider(request -> viewModel.getSuggestions(request.getUserText()));
+    public LinkedEntriesEditor(
+            Field field,
+            BibDatabaseContext databaseContext,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers) {
+        ViewLoader.view(this).root(this).load();
+
+        this.viewModel =
+                new LinkedEntriesEditorViewModel(
+                        field,
+                        suggestionProvider,
+                        databaseContext,
+                        fieldCheckers,
+                        undoManager,
+                        stateManager);
+
+        entryLinkField.setCellFactory(
+                new ViewModelListCellFactory<ParsedEntryLink>().withText(ParsedEntryLink::getKey));
+        entryLinkField.setSuggestionProvider(
+                request -> viewModel.getSuggestions(request.getUserText()));
 
         entryLinkField.setTagViewFactory(this::createTag);
         entryLinkField.setConverter(viewModel.getStringConverter());
-        entryLinkField.setNewItemProducer(searchText -> viewModel.getStringConverter().fromString(searchText));
-        entryLinkField.setMatcher((entryLink, searchText) -> entryLink.getKey().toLowerCase().startsWith(searchText.toLowerCase()));
+        entryLinkField.setNewItemProducer(
+                searchText -> viewModel.getStringConverter().fromString(searchText));
+        entryLinkField.setMatcher(
+                (entryLink, searchText) ->
+                        entryLink.getKey().toLowerCase().startsWith(searchText.toLowerCase()));
         entryLinkField.setComparator(Comparator.comparing(ParsedEntryLink::getKey));
 
         entryLinkField.setShowSearchIcon(false);
         entryLinkField.setOnMouseClicked(event -> entryLinkField.getEditor().requestFocus());
         entryLinkField.getEditor().getStyleClass().clear();
         entryLinkField.getEditor().getStyleClass().add("tags-field-editor");
-        entryLinkField.getEditor().focusedProperty().addListener((observable, oldValue, newValue) -> entryLinkField.pseudoClassStateChanged(FOCUSED, newValue));
+        entryLinkField
+                .getEditor()
+                .focusedProperty()
+                .addListener(
+                        (observable, oldValue, newValue) ->
+                                entryLinkField.pseudoClassStateChanged(FOCUSED, newValue));
 
         String separator = EntryLinkList.SEPARATOR;
-        entryLinkField.getEditor().setOnKeyReleased(event -> {
-            if (event.getText().equals(separator)) {
-                entryLinkField.commit();
-                event.consume();
-            }
-        });
-
-        Bindings.bindContentBidirectional(entryLinkField.getTags(), viewModel.linkedEntriesProperty());
+        entryLinkField
+                .getEditor()
+                .setOnKeyReleased(
+                        event -> {
+                            if (event.getText().equals(separator)) {
+                                entryLinkField.commit();
+                                event.consume();
+                            }
+                        });
+
+        Bindings.bindContentBidirectional(
+                entryLinkField.getTags(), viewModel.linkedEntriesProperty());
     }
 
     private Node createTag(ParsedEntryLink entryLink) {
@@ -90,19 +114,28 @@ private Node createTag(ParsedEntryLink entryLink) {
         tagLabel.setGraphic(IconTheme.JabRefIcons.REMOVE_TAGS.getGraphicNode());
         tagLabel.getGraphic().setOnMouseClicked(event -> entryLinkField.removeTags(entryLink));
         tagLabel.setContentDisplay(ContentDisplay.RIGHT);
-        tagLabel.setOnMouseClicked(event -> {
-            if ((event.getClickCount() == 2 || event.isControlDown()) && event.getButton() == MouseButton.PRIMARY) {
-                viewModel.jumpToEntry(entryLink);
-            }
-        });
+        tagLabel.setOnMouseClicked(
+                event -> {
+                    if ((event.getClickCount() == 2 || event.isControlDown())
+                            && event.getButton() == MouseButton.PRIMARY) {
+                        viewModel.jumpToEntry(entryLink);
+                    }
+                });
 
         ContextMenu contextMenu = new ContextMenu();
         ActionFactory factory = new ActionFactory();
-        contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.COPY, new TagContextAction(StandardActions.COPY, entryLink)),
-                factory.createMenuItem(StandardActions.CUT, new TagContextAction(StandardActions.CUT, entryLink)),
-                factory.createMenuItem(StandardActions.DELETE, new TagContextAction(StandardActions.DELETE, entryLink))
-        );
+        contextMenu
+                .getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.COPY,
+                                new TagContextAction(StandardActions.COPY, entryLink)),
+                        factory.createMenuItem(
+                                StandardActions.CUT,
+                                new TagContextAction(StandardActions.CUT, entryLink)),
+                        factory.createMenuItem(
+                                StandardActions.DELETE,
+                                new TagContextAction(StandardActions.DELETE, entryLink)));
         tagLabel.setContextMenu(contextMenu);
         return tagLabel;
     }
@@ -135,19 +168,21 @@ public void execute() {
             switch (command) {
                 case COPY -> {
                     clipBoardManager.setContent(entryLink.getKey());
-                    dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
-                            JabRefDialogService.shortenDialogMessage(entryLink.getKey())));
+                    dialogService.notify(
+                            Localization.lang(
+                                    "Copied '%0' to clipboard.",
+                                    JabRefDialogService.shortenDialogMessage(entryLink.getKey())));
                 }
                 case CUT -> {
                     clipBoardManager.setContent(entryLink.getKey());
-                    dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
-                            JabRefDialogService.shortenDialogMessage(entryLink.getKey())));
+                    dialogService.notify(
+                            Localization.lang(
+                                    "Copied '%0' to clipboard.",
+                                    JabRefDialogService.shortenDialogMessage(entryLink.getKey())));
                     entryLinkField.removeTags(entryLink);
                 }
-                case DELETE ->
-                        entryLinkField.removeTags(entryLink);
-                default ->
-                        LOGGER.info("Action {} not defined", command.getText());
+                case DELETE -> entryLinkField.removeTags(entryLink);
+                default -> LOGGER.info("Action {} not defined", command.getText());
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java
index a61599e9a30a..65e4e49a656d 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.fieldeditors;
 
-import java.util.List;
-import java.util.Locale;
-import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
@@ -21,6 +15,12 @@
 import org.jabref.model.entry.ParsedEntryLink;
 import org.jabref.model.entry.field.Field;
 
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
+
 public class LinkedEntriesEditorViewModel extends AbstractEditorViewModel {
 
     private final BibDatabaseContext databaseContext;
@@ -28,12 +28,13 @@ public class LinkedEntriesEditorViewModel extends AbstractEditorViewModel {
     private final ListProperty<ParsedEntryLink> linkedEntries;
     private final StateManager stateManager;
 
-    public LinkedEntriesEditorViewModel(Field field,
-                                        SuggestionProvider<?> suggestionProvider,
-                                        BibDatabaseContext databaseContext,
-                                        FieldCheckers fieldCheckers,
-                                        UndoManager undoManager,
-                                        StateManager stateManager) {
+    public LinkedEntriesEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            BibDatabaseContext databaseContext,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager,
+            StateManager stateManager) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
 
         this.databaseContext = databaseContext;
@@ -70,14 +71,24 @@ public ParsedEntryLink fromString(String key) {
     }
 
     public List<ParsedEntryLink> getSuggestions(String request) {
-        List<ParsedEntryLink> suggestions = suggestionProvider
-                .getPossibleSuggestions()
-                .stream()
-                .map(suggestion -> suggestion instanceof BibEntry bibEntry ? bibEntry.getCitationKey().orElse("") : (String) suggestion)
-                .filter(suggestion -> suggestion.toLowerCase(Locale.ROOT).contains(request.toLowerCase(Locale.ROOT)))
-                .map(suggestion -> new ParsedEntryLink(suggestion, databaseContext.getDatabase()))
-                .distinct()
-                .collect(Collectors.toList());
+        List<ParsedEntryLink> suggestions =
+                suggestionProvider.getPossibleSuggestions().stream()
+                        .map(
+                                suggestion ->
+                                        suggestion instanceof BibEntry bibEntry
+                                                ? bibEntry.getCitationKey().orElse("")
+                                                : (String) suggestion)
+                        .filter(
+                                suggestion ->
+                                        suggestion
+                                                .toLowerCase(Locale.ROOT)
+                                                .contains(request.toLowerCase(Locale.ROOT)))
+                        .map(
+                                suggestion ->
+                                        new ParsedEntryLink(
+                                                suggestion, databaseContext.getDatabase()))
+                        .distinct()
+                        .collect(Collectors.toList());
 
         ParsedEntryLink requestedLink = new ParsedEntryLink(request, databaseContext.getDatabase());
         if (!suggestions.contains(requestedLink)) {
@@ -88,7 +99,13 @@ public List<ParsedEntryLink> getSuggestions(String request) {
     }
 
     public void jumpToEntry(ParsedEntryLink parsedEntryLink) {
-        parsedEntryLink.getLinkedEntry().ifPresent(entry ->
-                stateManager.activeTabProperty().get().ifPresent(tab -> tab.clearAndSelect(entry)));
+        parsedEntryLink
+                .getLinkedEntry()
+                .ifPresent(
+                        entry ->
+                                stateManager
+                                        .activeTabProperty()
+                                        .get()
+                                        .ifPresent(tab -> tab.clearAndSelect(entry)));
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 7d72252ada2b..92ed8c712a0f 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -1,14 +1,9 @@
 package org.jabref.gui.fieldeditors;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.BiPredicate;
-import java.util.function.Supplier;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
@@ -50,14 +45,19 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.OptionalUtil;
-
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiPredicate;
+import java.util.function.Supplier;
+
 public class LinkedFileViewModel extends AbstractViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LinkedFileViewModel.class);
@@ -78,34 +78,46 @@ public class LinkedFileViewModel extends AbstractViewModel {
 
     private final Validator fileExistsValidator;
 
-    public LinkedFileViewModel(LinkedFile linkedFile,
-                               BibEntry entry,
-                               BibDatabaseContext databaseContext,
-                               TaskExecutor taskExecutor,
-                               DialogService dialogService,
-                               GuiPreferences preferences) {
+    public LinkedFileViewModel(
+            LinkedFile linkedFile,
+            BibEntry entry,
+            BibDatabaseContext databaseContext,
+            TaskExecutor taskExecutor,
+            DialogService dialogService,
+            GuiPreferences preferences) {
         this.linkedFile = linkedFile;
         this.preferences = preferences;
-        this.linkedFileHandler = new LinkedFileHandler(linkedFile, entry, databaseContext, preferences.getFilePreferences());
+        this.linkedFileHandler =
+                new LinkedFileHandler(
+                        linkedFile, entry, databaseContext, preferences.getFilePreferences());
         this.databaseContext = databaseContext;
         this.entry = entry;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
 
-        fileExistsValidator = new FunctionBasedValidator<>(
-                linkedFile.linkProperty(),
-                link -> {
-                    if (linkedFile.isOnlineLink()) {
-                        return true;
-                    } else {
-                        Optional<Path> path = FileUtil.find(databaseContext, link, preferences.getFilePreferences());
-                        return path.isPresent() && Files.exists(path.get());
-                    }
-                },
-                ValidationMessage.warning(Localization.lang("Could not find file '%0'.", linkedFile.getLink())));
-
-        downloadOngoing.bind(downloadProgress.greaterThanOrEqualTo(0).and(downloadProgress.lessThan(1)));
-        isOfflinePdf.setValue(!linkedFile.isOnlineLink() && "pdf".equalsIgnoreCase(linkedFile.getFileType()));
+        fileExistsValidator =
+                new FunctionBasedValidator<>(
+                        linkedFile.linkProperty(),
+                        link -> {
+                            if (linkedFile.isOnlineLink()) {
+                                return true;
+                            } else {
+                                Optional<Path> path =
+                                        FileUtil.find(
+                                                databaseContext,
+                                                link,
+                                                preferences.getFilePreferences());
+                                return path.isPresent() && Files.exists(path.get());
+                            }
+                        },
+                        ValidationMessage.warning(
+                                Localization.lang(
+                                        "Could not find file '%0'.", linkedFile.getLink())));
+
+        downloadOngoing.bind(
+                downloadProgress.greaterThanOrEqualTo(0).and(downloadProgress.lessThan(1)));
+        isOfflinePdf.setValue(
+                !linkedFile.isOnlineLink() && "pdf".equalsIgnoreCase(linkedFile.getFileType()));
     }
 
     public static LinkedFileViewModel fromLinkedFile(
@@ -116,12 +128,7 @@ public static LinkedFileViewModel fromLinkedFile(
             DialogService dialogService,
             GuiPreferences preferences) {
         return new LinkedFileViewModel(
-                linkedFile,
-                entry,
-                databaseContext,
-                taskExecutor,
-                dialogService,
-                preferences);
+                linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
     }
 
     public BooleanProperty isOfflinePdfProperty() {
@@ -166,13 +173,18 @@ public String getDescriptionAndLink() {
 
     public String getTruncatedDescriptionAndLink() {
         if (StringUtil.isBlank(linkedFile.getDescription())) {
-            return ControlHelper.truncateString(linkedFile.getLink(), -1, "...",
-                    ControlHelper.EllipsisPosition.CENTER);
+            return ControlHelper.truncateString(
+                    linkedFile.getLink(), -1, "...", ControlHelper.EllipsisPosition.CENTER);
         } else {
-            return ControlHelper.truncateString(linkedFile.getDescription(), -1, "...",
-                    ControlHelper.EllipsisPosition.CENTER) + " (" +
-                    ControlHelper.truncateString(linkedFile.getLink(), -1, "...",
-                    ControlHelper.EllipsisPosition.CENTER) + ")";
+            return ControlHelper.truncateString(
+                            linkedFile.getDescription(),
+                            -1,
+                            "...",
+                            ControlHelper.EllipsisPosition.CENTER)
+                    + " ("
+                    + ControlHelper.truncateString(
+                            linkedFile.getLink(), -1, "...", ControlHelper.EllipsisPosition.CENTER)
+                    + ")";
         }
     }
 
@@ -181,14 +193,18 @@ public Optional<Path> findIn(List<Path> directories) {
     }
 
     public JabRefIcon getTypeIcon() {
-        return ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFile, false, preferences.getExternalApplicationsPreferences())
-                                .map(ExternalFileType::getIcon)
-                                .orElse(IconTheme.JabRefIcons.FILE);
+        return ExternalFileTypes.getExternalFileTypeByLinkedFile(
+                        linkedFile, false, preferences.getExternalApplicationsPreferences())
+                .map(ExternalFileType::getIcon)
+                .orElse(IconTheme.JabRefIcons.FILE);
     }
 
     public ObjectBinding<Node> typeIconProperty() {
         if (linkedFileIconBinding == null) {
-            linkedFileIconBinding = Bindings.createObjectBinding(() -> this.getTypeIcon().getGraphicNode(), linkedFile.fileTypeProperty());
+            linkedFileIconBinding =
+                    Bindings.createObjectBinding(
+                            () -> this.getTypeIcon().getGraphicNode(),
+                            linkedFile.fileTypeProperty());
         }
 
         return linkedFileIconBinding;
@@ -212,30 +228,46 @@ public Observable[] getObservables() {
 
     public void open() {
         try {
-            Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFile, true, preferences.getExternalApplicationsPreferences());
-            boolean successful = NativeDesktop.openExternalFileAnyFormat(databaseContext, preferences.getExternalApplicationsPreferences(), preferences.getFilePreferences(), linkedFile.getLink(), type);
+            Optional<ExternalFileType> type =
+                    ExternalFileTypes.getExternalFileTypeByLinkedFile(
+                            linkedFile, true, preferences.getExternalApplicationsPreferences());
+            boolean successful =
+                    NativeDesktop.openExternalFileAnyFormat(
+                            databaseContext,
+                            preferences.getExternalApplicationsPreferences(),
+                            preferences.getFilePreferences(),
+                            linkedFile.getLink(),
+                            type);
             if (!successful) {
-                dialogService.showErrorDialogAndWait(Localization.lang("File not found"), Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
+                dialogService.showErrorDialogAndWait(
+                        Localization.lang("File not found"),
+                        Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
             }
         } catch (IOException e) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Error opening file '%0'", linkedFile.getLink()), e);
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Error opening file '%0'", linkedFile.getLink()), e);
         }
     }
 
     public void openFolder() {
         try {
             if (!linkedFile.isOnlineLink()) {
-                Optional<Path> resolvedPath = FileUtil.find(
-                        databaseContext,
-                        linkedFile.getLink(),
-                        preferences.getFilePreferences());
+                Optional<Path> resolvedPath =
+                        FileUtil.find(
+                                databaseContext,
+                                linkedFile.getLink(),
+                                preferences.getFilePreferences());
                 if (resolvedPath.isPresent()) {
-                    NativeDesktop.openFolderAndSelectFile(resolvedPath.get(), preferences.getExternalApplicationsPreferences(), dialogService);
+                    NativeDesktop.openFolderAndSelectFile(
+                            resolvedPath.get(),
+                            preferences.getExternalApplicationsPreferences(),
+                            dialogService);
                 } else {
                     dialogService.showErrorDialogAndWait(Localization.lang("File not found"));
                 }
             } else {
-                dialogService.showErrorDialogAndWait(Localization.lang("Cannot open folder as the file is an online link."));
+                dialogService.showErrorDialogAndWait(
+                        Localization.lang("Cannot open folder as the file is an online link."));
             }
         } catch (IOException ex) {
             LOGGER.debug("Cannot open folder", ex);
@@ -249,10 +281,11 @@ public void renameToSuggestion() {
     public void askForNameAndRename() {
         String oldFile = this.linkedFile.getLink();
         Path oldFilePath = Path.of(oldFile);
-        Optional<String> askedFileName = dialogService.showInputDialogWithDefaultAndWait(
-                Localization.lang("Rename file"),
-                Localization.lang("New Filename"),
-                oldFilePath.getFileName().toString());
+        Optional<String> askedFileName =
+                dialogService.showInputDialogWithDefaultAndWait(
+                        Localization.lang("Rename file"),
+                        Localization.lang("New Filename"),
+                        oldFilePath.getFileName().toString());
         askedFileName.ifPresent(this::renameFileToName);
     }
 
@@ -266,19 +299,23 @@ public void renameFileToName(String targetFileName) {
         if (file.isPresent()) {
             performRenameWithConflictCheck(targetFileName);
         } else {
-            dialogService.showErrorDialogAndWait(Localization.lang("File not found"), Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("File not found"),
+                    Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
         }
     }
 
     private void performRenameWithConflictCheck(String targetFileName) {
-        Optional<Path> existingFile = linkedFileHandler.findExistingFile(linkedFile, entry, targetFileName);
+        Optional<Path> existingFile =
+                linkedFileHandler.findExistingFile(linkedFile, entry, targetFileName);
         boolean overwriteFile = false;
 
         if (existingFile.isPresent()) {
-            overwriteFile = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("File exists"),
-                    Localization.lang("'%0' exists. Overwrite file?", targetFileName),
-                    Localization.lang("Overwrite"));
+            overwriteFile =
+                    dialogService.showConfirmationDialogAndWait(
+                            Localization.lang("File exists"),
+                            Localization.lang("'%0' exists. Overwrite file?", targetFileName),
+                            Localization.lang("Overwrite"));
 
             if (!overwriteFile) {
                 return;
@@ -288,7 +325,10 @@ private void performRenameWithConflictCheck(String targetFileName) {
         try {
             linkedFileHandler.renameToName(targetFileName, overwriteFile);
         } catch (IOException e) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Rename failed"), Localization.lang("JabRef cannot access the file because it is being used by another process."));
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Rename failed"),
+                    Localization.lang(
+                            "JabRef cannot access the file because it is being used by another process."));
         }
     }
 
@@ -299,9 +339,12 @@ public void moveToDefaultDirectory() {
         }
 
         // Get target folder
-        Optional<Path> fileDir = databaseContext.getFirstExistingFileDir(preferences.getFilePreferences());
+        Optional<Path> fileDir =
+                databaseContext.getFirstExistingFileDir(preferences.getFilePreferences());
         if (fileDir.isEmpty()) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Move file"), Localization.lang("File directory is not set or does not exist!"));
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Move file"),
+                    Localization.lang("File directory is not set or does not exist!"));
             return;
         }
 
@@ -318,7 +361,9 @@ public void moveToDefaultDirectory() {
             }
         } else {
             // File doesn't exist, so we can't move it.
-            dialogService.showErrorDialogAndWait(Localization.lang("File not found"), Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("File not found"),
+                    Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
         }
     }
 
@@ -349,26 +394,31 @@ public boolean isGeneratedPathSameAsOriginal() {
         }
 
         // append File directory pattern if exits
-        String targetDirectoryName = FileUtil.createDirNameFromPattern(
-                databaseContext.getDatabase(),
-                entry,
-                filePreferences.getFileDirectoryPattern());
+        String targetDirectoryName =
+                FileUtil.createDirNameFromPattern(
+                        databaseContext.getDatabase(),
+                        entry,
+                        filePreferences.getFileDirectoryPattern());
 
         Optional<Path> targetDir = baseDir.map(dir -> dir.resolve(targetDirectoryName));
 
-        Optional<Path> currentDir = linkedFile.findIn(databaseContext, preferences.getFilePreferences()).map(Path::getParent);
+        Optional<Path> currentDir =
+                linkedFile
+                        .findIn(databaseContext, preferences.getFilePreferences())
+                        .map(Path::getParent);
         if (currentDir.isEmpty()) {
             // Could not find file
             return false;
         }
 
-        BiPredicate<Path, Path> equality = (fileA, fileB) -> {
-            try {
-                return Files.isSameFile(fileA, fileB);
-            } catch (IOException e) {
-                return false;
-            }
-        };
+        BiPredicate<Path, Path> equality =
+                (fileA, fileB) -> {
+                    try {
+                        return Files.isSameFile(fileA, fileB);
+                    } catch (IOException e) {
+                        return false;
+                    }
+                };
         return OptionalUtil.equals(targetDir, currentDir, equality);
     }
 
@@ -385,19 +435,27 @@ public void moveToDefaultDirectoryAndRename() {
      * successfully, does not exist in the first place, or the user choose to remove it)
      */
     public boolean delete() {
-        DeleteFileAction deleteFileAction = new DeleteFileAction(dialogService, preferences.getFilePreferences(), databaseContext, null, List.of(this));
+        DeleteFileAction deleteFileAction =
+                new DeleteFileAction(
+                        dialogService,
+                        preferences.getFilePreferences(),
+                        databaseContext,
+                        null,
+                        List.of(this));
         deleteFileAction.execute();
         return deleteFileAction.isSuccess();
     }
 
     public void edit() {
-        Optional<LinkedFile> editedFile = dialogService.showCustomDialogAndWait(new LinkedFileEditDialog(this.linkedFile));
-        editedFile.ifPresent(file -> {
-            this.linkedFile.setLink(file.getLink());
-            this.linkedFile.setDescription(file.getDescription());
-            this.linkedFile.setFileType(file.getFileType());
-            this.linkedFile.setSourceURL(file.getSourceUrl());
-        });
+        Optional<LinkedFile> editedFile =
+                dialogService.showCustomDialogAndWait(new LinkedFileEditDialog(this.linkedFile));
+        editedFile.ifPresent(
+                file -> {
+                    this.linkedFile.setLink(file.getLink());
+                    this.linkedFile.setDescription(file.getDescription());
+                    this.linkedFile.setFileType(file.getFileType());
+                    this.linkedFile.setSourceURL(file.getSourceUrl());
+                });
     }
 
     /**
@@ -405,23 +463,26 @@ public void edit() {
      */
     public void redownload() {
         LOGGER.info("Redownloading file from {}", linkedFile.getSourceUrl());
-        if (linkedFile.getSourceUrl().isEmpty() || !LinkedFile.isOnlineLink(linkedFile.getSourceUrl())) {
-            throw new UnsupportedOperationException("In order to download the file, the source url has to be an online link");
+        if (linkedFile.getSourceUrl().isEmpty()
+                || !LinkedFile.isOnlineLink(linkedFile.getSourceUrl())) {
+            throw new UnsupportedOperationException(
+                    "In order to download the file, the source url has to be an online link");
         }
 
         String fileName = Path.of(linkedFile.getLink()).getFileName().toString();
 
-        DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(
-                databaseContext,
-                entry,
-                linkedFile,
-                linkedFile.getSourceUrl(),
-                dialogService,
-                preferences.getExternalApplicationsPreferences(),
-                preferences.getFilePreferences(),
-                taskExecutor,
-                fileName,
-                true);
+        DownloadLinkedFileAction downloadLinkedFileAction =
+                new DownloadLinkedFileAction(
+                        databaseContext,
+                        entry,
+                        linkedFile,
+                        linkedFile.getSourceUrl(),
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences(),
+                        preferences.getFilePreferences(),
+                        taskExecutor,
+                        fileName,
+                        true);
         downloadProgress.bind(downloadLinkedFileAction.downloadProgress());
         downloadLinkedFileAction.execute();
     }
@@ -429,20 +490,22 @@ public void redownload() {
     public void download(boolean keepHtmlLink) {
         LOGGER.info("Downloading file from {}", linkedFile.getSourceUrl());
         if (!linkedFile.isOnlineLink()) {
-            throw new UnsupportedOperationException("In order to download the file it has to be an online link");
+            throw new UnsupportedOperationException(
+                    "In order to download the file it has to be an online link");
         }
 
-        DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(
-                databaseContext,
-                entry,
-                linkedFile,
-                linkedFile.getLink(),
-                dialogService,
-                preferences.getExternalApplicationsPreferences(),
-                preferences.getFilePreferences(),
-                taskExecutor,
-                "",
-                keepHtmlLink);
+        DownloadLinkedFileAction downloadLinkedFileAction =
+                new DownloadLinkedFileAction(
+                        databaseContext,
+                        entry,
+                        linkedFile,
+                        linkedFile.getLink(),
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences(),
+                        preferences.getFilePreferences(),
+                        taskExecutor,
+                        "",
+                        keepHtmlLink);
         downloadProgress.bind(downloadLinkedFileAction.downloadProgress());
         downloadLinkedFileAction.execute();
     }
@@ -456,29 +519,59 @@ public ValidationStatus fileExistsValidationStatus() {
     }
 
     public void parsePdfMetadataAndShowMergeDialog() {
-        linkedFile.findIn(databaseContext, preferences.getFilePreferences()).ifPresent(filePath -> {
-            MultiMergeEntriesView dialog = new MultiMergeEntriesView(preferences, taskExecutor);
-            dialog.setTitle(Localization.lang("Merge PDF metadata"));
-            dialog.addSource(Localization.lang("Entry"), entry);
-            dialog.addSource(Localization.lang("Verbatim"), wrapImporterToSupplier(new PdfVerbatimBibTextImporter(preferences.getImportFormatPreferences()), filePath));
-            dialog.addSource(Localization.lang("Embedded"), wrapImporterToSupplier(new PdfEmbeddedBibFileImporter(preferences.getImportFormatPreferences()), filePath));
-            if (preferences.getGrobidPreferences().isGrobidEnabled()) {
-                dialog.addSource("Grobid", wrapImporterToSupplier(new PdfGrobidImporter(preferences.getImportFormatPreferences()), filePath));
-            }
-            dialog.addSource(Localization.lang("XMP metadata"), wrapImporterToSupplier(new PdfXmpImporter(preferences.getXmpPreferences()), filePath));
-            dialog.addSource(Localization.lang("Content"), wrapImporterToSupplier(new PdfContentImporter(), filePath));
-            dialogService.showCustomDialogAndWait(dialog).ifPresent(newEntry -> {
-                databaseContext.getDatabase().removeEntry(entry);
-                databaseContext.getDatabase().insertEntry(newEntry);
-            });
-        });
+        linkedFile
+                .findIn(databaseContext, preferences.getFilePreferences())
+                .ifPresent(
+                        filePath -> {
+                            MultiMergeEntriesView dialog =
+                                    new MultiMergeEntriesView(preferences, taskExecutor);
+                            dialog.setTitle(Localization.lang("Merge PDF metadata"));
+                            dialog.addSource(Localization.lang("Entry"), entry);
+                            dialog.addSource(
+                                    Localization.lang("Verbatim"),
+                                    wrapImporterToSupplier(
+                                            new PdfVerbatimBibTextImporter(
+                                                    preferences.getImportFormatPreferences()),
+                                            filePath));
+                            dialog.addSource(
+                                    Localization.lang("Embedded"),
+                                    wrapImporterToSupplier(
+                                            new PdfEmbeddedBibFileImporter(
+                                                    preferences.getImportFormatPreferences()),
+                                            filePath));
+                            if (preferences.getGrobidPreferences().isGrobidEnabled()) {
+                                dialog.addSource(
+                                        "Grobid",
+                                        wrapImporterToSupplier(
+                                                new PdfGrobidImporter(
+                                                        preferences.getImportFormatPreferences()),
+                                                filePath));
+                            }
+                            dialog.addSource(
+                                    Localization.lang("XMP metadata"),
+                                    wrapImporterToSupplier(
+                                            new PdfXmpImporter(preferences.getXmpPreferences()),
+                                            filePath));
+                            dialog.addSource(
+                                    Localization.lang("Content"),
+                                    wrapImporterToSupplier(new PdfContentImporter(), filePath));
+                            dialogService
+                                    .showCustomDialogAndWait(dialog)
+                                    .ifPresent(
+                                            newEntry -> {
+                                                databaseContext.getDatabase().removeEntry(entry);
+                                                databaseContext.getDatabase().insertEntry(newEntry);
+                                            });
+                        });
     }
 
     private Supplier<BibEntry> wrapImporterToSupplier(Importer importer, Path filePath) {
         return () -> {
             try {
                 ParserResult parserResult = importer.importDatabase(filePath);
-                if (parserResult.isInvalid() || parserResult.isEmpty() || !parserResult.getDatabase().hasEntries()) {
+                if (parserResult.isInvalid()
+                        || parserResult.isEmpty()
+                        || !parserResult.getDatabase().hasEntries()) {
                     return null;
                 }
                 return parserResult.getDatabase().getEntries().getFirst();
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
index 5a95b3e42f27..a775b34edc50 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
@@ -1,8 +1,10 @@
 package org.jabref.gui.fieldeditors;
 
-import java.util.Optional;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.optional.ObservableOptionalValue;
 
-import javax.swing.undo.UndoManager;
+import jakarta.inject.Inject;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleObjectProperty;
@@ -60,10 +62,9 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.optional.ObservableOptionalValue;
-import jakarta.inject.Inject;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
 
 public class LinkedFilesEditor extends HBox implements FieldEditorFX {
 
@@ -85,21 +86,21 @@ public class LinkedFilesEditor extends HBox implements FieldEditorFX {
 
     private LinkedFilesEditorViewModel viewModel;
 
-    private ObservableOptionalValue<BibEntry> bibEntry = EasyBind.wrapNullable(new SimpleObjectProperty<>());
+    private ObservableOptionalValue<BibEntry> bibEntry =
+            EasyBind.wrapNullable(new SimpleObjectProperty<>());
     private final UiThreadObservableList<LinkedFileViewModel> decoratedModelList;
 
-    public LinkedFilesEditor(Field field,
-                             BibDatabaseContext databaseContext,
-                             SuggestionProvider<?> suggestionProvider,
-                             FieldCheckers fieldCheckers) {
+    public LinkedFilesEditor(
+            Field field,
+            BibDatabaseContext databaseContext,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers) {
         this.field = field;
         this.databaseContext = databaseContext;
         this.suggestionProvider = suggestionProvider;
         this.fieldCheckers = fieldCheckers;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
 
         decoratedModelList = new UiThreadObservableList<>(viewModel.filesProperty());
         Bindings.bindContentBidirectional(listView.itemsProperty().get(), decoratedModelList);
@@ -107,15 +108,16 @@ public LinkedFilesEditor(Field field,
 
     @FXML
     private void initialize() {
-        this.viewModel = new LinkedFilesEditorViewModel(
-                field,
-                suggestionProvider,
-                dialogService,
-                databaseContext,
-                taskExecutor,
-                fieldCheckers,
-                preferences,
-                undoManager);
+        this.viewModel =
+                new LinkedFilesEditorViewModel(
+                        field,
+                        suggestionProvider,
+                        dialogService,
+                        databaseContext,
+                        taskExecutor,
+                        fieldCheckers,
+                        preferences,
+                        undoManager);
 
         new ViewModelListCellFactory<LinkedFileViewModel>()
                 .withStringTooltip(LinkedFileViewModel::getDescriptionAndLink)
@@ -136,17 +138,20 @@ private void initialize() {
     }
 
     private void handleOnDragOver(LinkedFileViewModel originalItem, DragEvent event) {
-        if ((event.getGestureSource() != originalItem) && event.getDragboard().hasContent(DragAndDropDataFormats.LINKED_FILE)) {
+        if ((event.getGestureSource() != originalItem)
+                && event.getDragboard().hasContent(DragAndDropDataFormats.LINKED_FILE)) {
             event.acceptTransferModes(TransferMode.MOVE);
         }
     }
 
-    private void handleOnDragDetected(@SuppressWarnings("unused") LinkedFileViewModel linkedFile, MouseEvent event) {
+    private void handleOnDragDetected(
+            @SuppressWarnings("unused") LinkedFileViewModel linkedFile, MouseEvent event) {
         LinkedFile selectedItem = listView.getSelectionModel().getSelectedItem().getFile();
         if (selectedItem != null) {
             ClipboardContent content = new ClipboardContent();
             Dragboard dragboard = listView.startDragAndDrop(TransferMode.MOVE);
-            // We have to use the model class here, as the content of the dragboard must be serializable
+            // We have to use the model class here, as the content of the dragboard must be
+            // serializable
             content.put(DragAndDropDataFormats.LINKED_FILE, selectedItem);
             dragboard.setContent(content);
         }
@@ -160,7 +165,8 @@ private void handleOnDragDropped(LinkedFileViewModel originalItem, DragEvent eve
         ObservableList<LinkedFileViewModel> items = listView.itemsProperty().get();
 
         if (dragboard.hasContent(DragAndDropDataFormats.LINKED_FILE)) {
-            LinkedFile linkedFile = (LinkedFile) dragboard.getContent(DragAndDropDataFormats.LINKED_FILE);
+            LinkedFile linkedFile =
+                    (LinkedFile) dragboard.getContent(DragAndDropDataFormats.LINKED_FILE);
             LinkedFileViewModel transferredItem = null;
             int draggedIdx = 0;
             for (int i = 0; i < items.size(); i++) {
@@ -189,7 +195,9 @@ private Node createFileDisplay(LinkedFileViewModel linkedFile) {
         Text link = new Text();
         link.textProperty().bind(linkedFile.linkProperty());
         link.getStyleClass().setAll("file-row-text");
-        EasyBind.subscribe(linkedFile.isAutomaticallyFoundProperty(), found -> link.pseudoClassStateChanged(opacity, found));
+        EasyBind.subscribe(
+                linkedFile.isAutomaticallyFoundProperty(),
+                found -> link.pseudoClassStateChanged(opacity, found));
 
         Text desc = new Text();
         desc.textProperty().bind(linkedFile.descriptionProperty());
@@ -204,70 +212,97 @@ private Node createFileDisplay(LinkedFileViewModel linkedFile) {
         label.textProperty().bind(linkedFile.linkProperty());
         label.getStyleClass().setAll("file-row-text");
         label.textOverrunProperty().setValue(OverrunStyle.LEADING_ELLIPSIS);
-        EasyBind.subscribe(linkedFile.isAutomaticallyFoundProperty(), found -> label.pseudoClassStateChanged(opacity, found));
+        EasyBind.subscribe(
+                linkedFile.isAutomaticallyFoundProperty(),
+                found -> label.pseudoClassStateChanged(opacity, found));
 
         HBox info = new HBox(8);
         HBox.setHgrow(info, Priority.ALWAYS);
-        info.setStyle("-fx-padding: 0.5em 0 0.5em 0;"); // To align with buttons below which also have 0.5em padding
+        info.setStyle(
+                "-fx-padding: 0.5em 0 0.5em 0;"); // To align with buttons below which also have
+                                                  // 0.5em padding
         info.getChildren().setAll(label, progressIndicator);
 
         Button acceptAutoLinkedFile = IconTheme.JabRefIcons.AUTO_LINKED_FILE.asButton();
-        acceptAutoLinkedFile.setTooltip(new Tooltip(Localization.lang("This file was found automatically. Do you want to link it to this entry?")));
+        acceptAutoLinkedFile.setTooltip(
+                new Tooltip(
+                        Localization.lang(
+                                "This file was found automatically. Do you want to link it to this entry?")));
         acceptAutoLinkedFile.visibleProperty().bind(linkedFile.isAutomaticallyFoundProperty());
         acceptAutoLinkedFile.managedProperty().bind(linkedFile.isAutomaticallyFoundProperty());
         acceptAutoLinkedFile.setOnAction(event -> linkedFile.acceptAsLinked());
         acceptAutoLinkedFile.getStyleClass().setAll("icon-button");
 
         Button writeMetadataToPdf = IconTheme.JabRefIcons.PDF_METADATA_WRITE.asButton();
-        writeMetadataToPdf.setTooltip(new Tooltip(Localization.lang("Write BibTeX to PDF (XMP and embedded)")));
+        writeMetadataToPdf.setTooltip(
+                new Tooltip(Localization.lang("Write BibTeX to PDF (XMP and embedded)")));
         writeMetadataToPdf.visibleProperty().bind(linkedFile.isOfflinePdfProperty());
         writeMetadataToPdf.getStyleClass().setAll("icon-button");
-        WriteMetadataToSinglePdfAction writeMetadataToSinglePdfAction = new WriteMetadataToSinglePdfAction(
-                linkedFile.getFile(),
-                bibEntry.getValueOrElse(new BibEntry()),
-                databaseContext, dialogService, preferences.getFieldPreferences(),
-                preferences.getFilePreferences(), preferences.getXmpPreferences(), abbreviationRepository, bibEntryTypesManager,
-                taskExecutor
-        );
-        writeMetadataToPdf.disableProperty().bind(writeMetadataToSinglePdfAction.executableProperty().not());
+        WriteMetadataToSinglePdfAction writeMetadataToSinglePdfAction =
+                new WriteMetadataToSinglePdfAction(
+                        linkedFile.getFile(),
+                        bibEntry.getValueOrElse(new BibEntry()),
+                        databaseContext,
+                        dialogService,
+                        preferences.getFieldPreferences(),
+                        preferences.getFilePreferences(),
+                        preferences.getXmpPreferences(),
+                        abbreviationRepository,
+                        bibEntryTypesManager,
+                        taskExecutor);
+        writeMetadataToPdf
+                .disableProperty()
+                .bind(writeMetadataToSinglePdfAction.executableProperty().not());
         writeMetadataToPdf.setOnAction(event -> writeMetadataToSinglePdfAction.execute());
 
         Button parsePdfMetadata = IconTheme.JabRefIcons.PDF_METADATA_READ.asButton();
         parsePdfMetadata.setTooltip(new Tooltip(Localization.lang("Parse Metadata from PDF.")));
         parsePdfMetadata.visibleProperty().bind(linkedFile.isOfflinePdfProperty());
-        parsePdfMetadata.setOnAction(event -> {
-            GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferences.getGrobidPreferences());
-            linkedFile.parsePdfMetadataAndShowMergeDialog();
-        });
+        parsePdfMetadata.setOnAction(
+                event -> {
+                    GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(
+                            dialogService, preferences.getGrobidPreferences());
+                    linkedFile.parsePdfMetadataAndShowMergeDialog();
+                });
         parsePdfMetadata.getStyleClass().setAll("icon-button");
 
         HBox container = new HBox(2);
         container.setPrefHeight(Double.NEGATIVE_INFINITY);
         container.maxWidthProperty().bind(listView.widthProperty().subtract(20d));
-        container.getChildren().addAll(acceptAutoLinkedFile, info, writeMetadataToPdf, parsePdfMetadata);
+        container
+                .getChildren()
+                .addAll(acceptAutoLinkedFile, info, writeMetadataToPdf, parsePdfMetadata);
 
         return container;
     }
 
     private void setUpKeyBindings() {
-        listView.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            Optional<KeyBinding> keyBinding = preferences.getKeyBindingRepository().mapToKeyBinding(event);
-            if (keyBinding.isPresent()) {
-                switch (keyBinding.get()) {
-                    case DELETE_ENTRY:
-                        deleteAttachedFilesWithConfirmation();
-                        event.consume();
-                        break;
-                    default:
-                        // Pass other keys to children
-                }
-            }
-        });
+        listView.addEventFilter(
+                KeyEvent.KEY_PRESSED,
+                event -> {
+                    Optional<KeyBinding> keyBinding =
+                            preferences.getKeyBindingRepository().mapToKeyBinding(event);
+                    if (keyBinding.isPresent()) {
+                        switch (keyBinding.get()) {
+                            case DELETE_ENTRY:
+                                deleteAttachedFilesWithConfirmation();
+                                event.consume();
+                                break;
+                            default:
+                                // Pass other keys to children
+                        }
+                    }
+                });
     }
 
     private void deleteAttachedFilesWithConfirmation() {
-        new DeleteFileAction(dialogService, preferences.getFilePreferences(), databaseContext,
-                viewModel, listView.getSelectionModel().getSelectedItems()).execute();
+        new DeleteFileAction(
+                        dialogService,
+                        preferences.getFilePreferences(),
+                        databaseContext,
+                        viewModel,
+                        listView.getSelectionModel().getSelectedItems())
+                .execute();
     }
 
     public LinkedFilesEditorViewModel getViewModel() {
@@ -287,9 +322,12 @@ public Parent getNode() {
 
     @FXML
     private void addNewFile() {
-        dialogService.showCustomDialogAndWait(new LinkedFileEditDialog()).ifPresent(newLinkedFile -> {
-            viewModel.addNewLinkedFile(newLinkedFile);
-        });
+        dialogService
+                .showCustomDialogAndWait(new LinkedFileEditDialog())
+                .ifPresent(
+                        newLinkedFile -> {
+                            viewModel.addNewLinkedFile(newLinkedFile);
+                        });
     }
 
     @FXML
@@ -318,22 +356,69 @@ private ContextMenu createContextMenuForFile(LinkedFileViewModel linkedFile) {
         ContextMenu menu = new ContextMenu();
         ActionFactory factory = new ActionFactory();
 
-        menu.getItems().addAll(
-                factory.createMenuItem(StandardActions.EDIT_FILE_LINK, new ContextAction(StandardActions.EDIT_FILE_LINK, linkedFile, preferences)),
-                new SeparatorMenuItem(),
-                factory.createMenuItem(StandardActions.OPEN_FILE, new ContextAction(StandardActions.OPEN_FILE, linkedFile, preferences)),
-                factory.createMenuItem(StandardActions.OPEN_FOLDER, new ContextAction(StandardActions.OPEN_FOLDER, linkedFile, preferences)),
-                new SeparatorMenuItem(),
-                factory.createMenuItem(StandardActions.DOWNLOAD_FILE, new ContextAction(StandardActions.DOWNLOAD_FILE, linkedFile, preferences)),
-                factory.createMenuItem(StandardActions.RENAME_FILE_TO_PATTERN, new ContextAction(StandardActions.RENAME_FILE_TO_PATTERN, linkedFile, preferences)),
-                factory.createMenuItem(StandardActions.RENAME_FILE_TO_NAME, new ContextAction(StandardActions.RENAME_FILE_TO_NAME, linkedFile, preferences)),
-                factory.createMenuItem(StandardActions.MOVE_FILE_TO_FOLDER, new ContextAction(StandardActions.MOVE_FILE_TO_FOLDER, linkedFile, preferences)),
-                factory.createMenuItem(StandardActions.MOVE_FILE_TO_FOLDER_AND_RENAME, new ContextAction(StandardActions.MOVE_FILE_TO_FOLDER_AND_RENAME, linkedFile, preferences)),
-                factory.createMenuItem(StandardActions.COPY_FILE_TO_FOLDER, new CopySingleFileAction(linkedFile.getFile(), dialogService, databaseContext, preferences.getFilePreferences())),
-                factory.createMenuItem(StandardActions.REDOWNLOAD_FILE, new ContextAction(StandardActions.REDOWNLOAD_FILE, linkedFile, preferences)),
-                factory.createMenuItem(StandardActions.REMOVE_LINK, new ContextAction(StandardActions.REMOVE_LINK, linkedFile, preferences)),
-                factory.createMenuItem(StandardActions.DELETE_FILE, new ContextAction(StandardActions.DELETE_FILE, linkedFile, preferences))
-        );
+        menu.getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.EDIT_FILE_LINK,
+                                new ContextAction(
+                                        StandardActions.EDIT_FILE_LINK, linkedFile, preferences)),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.OPEN_FILE,
+                                new ContextAction(
+                                        StandardActions.OPEN_FILE, linkedFile, preferences)),
+                        factory.createMenuItem(
+                                StandardActions.OPEN_FOLDER,
+                                new ContextAction(
+                                        StandardActions.OPEN_FOLDER, linkedFile, preferences)),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.DOWNLOAD_FILE,
+                                new ContextAction(
+                                        StandardActions.DOWNLOAD_FILE, linkedFile, preferences)),
+                        factory.createMenuItem(
+                                StandardActions.RENAME_FILE_TO_PATTERN,
+                                new ContextAction(
+                                        StandardActions.RENAME_FILE_TO_PATTERN,
+                                        linkedFile,
+                                        preferences)),
+                        factory.createMenuItem(
+                                StandardActions.RENAME_FILE_TO_NAME,
+                                new ContextAction(
+                                        StandardActions.RENAME_FILE_TO_NAME,
+                                        linkedFile,
+                                        preferences)),
+                        factory.createMenuItem(
+                                StandardActions.MOVE_FILE_TO_FOLDER,
+                                new ContextAction(
+                                        StandardActions.MOVE_FILE_TO_FOLDER,
+                                        linkedFile,
+                                        preferences)),
+                        factory.createMenuItem(
+                                StandardActions.MOVE_FILE_TO_FOLDER_AND_RENAME,
+                                new ContextAction(
+                                        StandardActions.MOVE_FILE_TO_FOLDER_AND_RENAME,
+                                        linkedFile,
+                                        preferences)),
+                        factory.createMenuItem(
+                                StandardActions.COPY_FILE_TO_FOLDER,
+                                new CopySingleFileAction(
+                                        linkedFile.getFile(),
+                                        dialogService,
+                                        databaseContext,
+                                        preferences.getFilePreferences())),
+                        factory.createMenuItem(
+                                StandardActions.REDOWNLOAD_FILE,
+                                new ContextAction(
+                                        StandardActions.REDOWNLOAD_FILE, linkedFile, preferences)),
+                        factory.createMenuItem(
+                                StandardActions.REMOVE_LINK,
+                                new ContextAction(
+                                        StandardActions.REMOVE_LINK, linkedFile, preferences)),
+                        factory.createMenuItem(
+                                StandardActions.DELETE_FILE,
+                                new ContextAction(
+                                        StandardActions.DELETE_FILE, linkedFile, preferences)));
 
         return menu;
     }
@@ -343,32 +428,78 @@ private class ContextAction extends SimpleCommand {
         private final StandardActions command;
         private final LinkedFileViewModel linkedFile;
 
-        public ContextAction(StandardActions command, LinkedFileViewModel linkedFile, CliPreferences preferences) {
+        public ContextAction(
+                StandardActions command,
+                LinkedFileViewModel linkedFile,
+                CliPreferences preferences) {
             this.command = command;
             this.linkedFile = linkedFile;
 
             this.executable.bind(
                     switch (command) {
-                        case RENAME_FILE_TO_PATTERN -> Bindings.createBooleanBinding(
-                                () -> !linkedFile.getFile().isOnlineLink()
-                                        && linkedFile.getFile().findIn(databaseContext, preferences.getFilePreferences()).isPresent()
-                                        && !linkedFile.isGeneratedNameSameAsOriginal(),
-                                linkedFile.getFile().linkProperty(), bibEntry.getValue().map(BibEntry::getFieldsObservable).orElse(null));
-                        case MOVE_FILE_TO_FOLDER, MOVE_FILE_TO_FOLDER_AND_RENAME -> Bindings.createBooleanBinding(
-                                () -> !linkedFile.getFile().isOnlineLink()
-                                        && linkedFile.getFile().findIn(databaseContext, preferences.getFilePreferences()).isPresent()
-                                        && !linkedFile.isGeneratedPathSameAsOriginal(),
-                                linkedFile.getFile().linkProperty(), bibEntry.getValue().map(BibEntry::getFieldsObservable).orElse(null));
-                        case DOWNLOAD_FILE -> Bindings.createBooleanBinding(
-                                () -> linkedFile.getFile().isOnlineLink(),
-                                linkedFile.getFile().linkProperty(), bibEntry.getValue().map(BibEntry::getFieldsObservable).orElse(null));
-                        case REDOWNLOAD_FILE -> Bindings.createBooleanBinding(
-                                () -> !linkedFile.getFile().getSourceUrl().isEmpty(),
-                                linkedFile.getFile().sourceUrlProperty(), bibEntry.getValue().map(BibEntry::getFieldsObservable).orElse(null));
-                        case OPEN_FILE, OPEN_FOLDER, RENAME_FILE_TO_NAME, DELETE_FILE -> Bindings.createBooleanBinding(
-                                () -> !linkedFile.getFile().isOnlineLink()
-                                        && linkedFile.getFile().findIn(databaseContext, preferences.getFilePreferences()).isPresent(),
-                                linkedFile.getFile().linkProperty(), bibEntry.getValue().map(BibEntry::getFieldsObservable).orElse(null));
+                        case RENAME_FILE_TO_PATTERN ->
+                                Bindings.createBooleanBinding(
+                                        () ->
+                                                !linkedFile.getFile().isOnlineLink()
+                                                        && linkedFile
+                                                                .getFile()
+                                                                .findIn(
+                                                                        databaseContext,
+                                                                        preferences
+                                                                                .getFilePreferences())
+                                                                .isPresent()
+                                                        && !linkedFile
+                                                                .isGeneratedNameSameAsOriginal(),
+                                        linkedFile.getFile().linkProperty(),
+                                        bibEntry.getValue()
+                                                .map(BibEntry::getFieldsObservable)
+                                                .orElse(null));
+                        case MOVE_FILE_TO_FOLDER, MOVE_FILE_TO_FOLDER_AND_RENAME ->
+                                Bindings.createBooleanBinding(
+                                        () ->
+                                                !linkedFile.getFile().isOnlineLink()
+                                                        && linkedFile
+                                                                .getFile()
+                                                                .findIn(
+                                                                        databaseContext,
+                                                                        preferences
+                                                                                .getFilePreferences())
+                                                                .isPresent()
+                                                        && !linkedFile
+                                                                .isGeneratedPathSameAsOriginal(),
+                                        linkedFile.getFile().linkProperty(),
+                                        bibEntry.getValue()
+                                                .map(BibEntry::getFieldsObservable)
+                                                .orElse(null));
+                        case DOWNLOAD_FILE ->
+                                Bindings.createBooleanBinding(
+                                        () -> linkedFile.getFile().isOnlineLink(),
+                                        linkedFile.getFile().linkProperty(),
+                                        bibEntry.getValue()
+                                                .map(BibEntry::getFieldsObservable)
+                                                .orElse(null));
+                        case REDOWNLOAD_FILE ->
+                                Bindings.createBooleanBinding(
+                                        () -> !linkedFile.getFile().getSourceUrl().isEmpty(),
+                                        linkedFile.getFile().sourceUrlProperty(),
+                                        bibEntry.getValue()
+                                                .map(BibEntry::getFieldsObservable)
+                                                .orElse(null));
+                        case OPEN_FILE, OPEN_FOLDER, RENAME_FILE_TO_NAME, DELETE_FILE ->
+                                Bindings.createBooleanBinding(
+                                        () ->
+                                                !linkedFile.getFile().isOnlineLink()
+                                                        && linkedFile
+                                                                .getFile()
+                                                                .findIn(
+                                                                        databaseContext,
+                                                                        preferences
+                                                                                .getFilePreferences())
+                                                                .isPresent(),
+                                        linkedFile.getFile().linkProperty(),
+                                        bibEntry.getValue()
+                                                .map(BibEntry::getFieldsObservable)
+                                                .orElse(null));
                         default -> BindingsHelper.constantOf(true);
                     });
         }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
index 540e5603d366..1f4ff63bcdfe 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
@@ -1,18 +1,5 @@
 package org.jabref.gui.fieldeditors;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
@@ -47,27 +34,43 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
+
 public class LinkedFilesEditorViewModel extends AbstractEditorViewModel {
     private static final Logger LOGGER = LoggerFactory.getLogger(LinkedFilesEditorViewModel.class);
 
-    private final ListProperty<LinkedFileViewModel> files = new SimpleListProperty<>(FXCollections.observableArrayList(LinkedFileViewModel::getObservables));
+    private final ListProperty<LinkedFileViewModel> files =
+            new SimpleListProperty<>(
+                    FXCollections.observableArrayList(LinkedFileViewModel::getObservables));
     private final BooleanProperty fulltextLookupInProgress = new SimpleBooleanProperty(false);
     private final DialogService dialogService;
     private final BibDatabaseContext databaseContext;
     private final TaskExecutor taskExecutor;
     private final GuiPreferences preferences;
 
-    public LinkedFilesEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider,
-                                      DialogService dialogService,
-                                      BibDatabaseContext databaseContext,
-                                      TaskExecutor taskExecutor,
-                                      FieldCheckers fieldCheckers,
-                                      GuiPreferences preferences,
-                                      UndoManager undoManager) {
+    public LinkedFilesEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            DialogService dialogService,
+            BibDatabaseContext databaseContext,
+            TaskExecutor taskExecutor,
+            FieldCheckers fieldCheckers,
+            GuiPreferences preferences,
+            UndoManager undoManager) {
 
         super(field, suggestionProvider, fieldCheckers, undoManager);
 
@@ -85,10 +88,11 @@ public LinkedFilesEditorViewModel(Field field, SuggestionProvider<?> suggestionP
 
     private static String getStringRepresentation(List<LinkedFileViewModel> files) {
         // Only serialize linked files, not the ones that are automatically found
-        List<LinkedFile> filesToSerialize = files.stream()
-                                                 .filter(file -> !file.isAutomaticallyFound())
-                                                 .map(LinkedFileViewModel::getFile)
-                                                 .collect(Collectors.toList());
+        List<LinkedFile> filesToSerialize =
+                files.stream()
+                        .filter(file -> !file.isAutomaticallyFound())
+                        .map(LinkedFileViewModel::getFile)
+                        .collect(Collectors.toList());
 
         return FileFieldWriter.getStringRepresentation(filesToSerialize);
     }
@@ -99,37 +103,41 @@ private static String getStringRepresentation(List<LinkedFileViewModel> files) {
      *
      * TODO: Move this method to {@link LinkedFile} as soon as {@link CustomExternalFileType} lives in model.
      */
-    public static LinkedFile fromFile(Path file, List<Path> fileDirectories, ExternalApplicationsPreferences externalApplicationsPreferences) {
+    public static LinkedFile fromFile(
+            Path file,
+            List<Path> fileDirectories,
+            ExternalApplicationsPreferences externalApplicationsPreferences) {
         String fileExtension = FileUtil.getFileExtension(file).orElse("");
-        ExternalFileType suggestedFileType = ExternalFileTypes.getExternalFileTypeByExt(fileExtension, externalApplicationsPreferences)
-                                                              .orElse(new UnknownExternalFileType(fileExtension));
+        ExternalFileType suggestedFileType =
+                ExternalFileTypes.getExternalFileTypeByExt(
+                                fileExtension, externalApplicationsPreferences)
+                        .orElse(new UnknownExternalFileType(fileExtension));
         Path relativePath = FileUtil.relativize(file, fileDirectories);
         return new LinkedFile("", relativePath, suggestedFileType.getName());
     }
 
-    public LinkedFileViewModel fromFile(Path file, ExternalApplicationsPreferences externalApplicationsPreferences) {
-        List<Path> fileDirectories = databaseContext.getFileDirectories(preferences.getFilePreferences());
+    public LinkedFileViewModel fromFile(
+            Path file, ExternalApplicationsPreferences externalApplicationsPreferences) {
+        List<Path> fileDirectories =
+                databaseContext.getFileDirectories(preferences.getFilePreferences());
 
         LinkedFile linkedFile = fromFile(file, fileDirectories, externalApplicationsPreferences);
         return new LinkedFileViewModel(
-                linkedFile,
-                entry,
-                databaseContext,
-                taskExecutor,
-                dialogService,
-                preferences);
+                linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
     }
 
     private List<LinkedFileViewModel> parseToFileViewModel(String stringValue) {
         return FileFieldParser.parse(stringValue).stream()
-                              .map(linkedFile -> new LinkedFileViewModel(
-                                      linkedFile,
-                                      entry,
-                                      databaseContext,
-                                      taskExecutor,
-                                      dialogService,
-                                      preferences))
-                              .collect(Collectors.toList());
+                .map(
+                        linkedFile ->
+                                new LinkedFileViewModel(
+                                        linkedFile,
+                                        entry,
+                                        databaseContext,
+                                        taskExecutor,
+                                        dialogService,
+                                        preferences))
+                .collect(Collectors.toList());
     }
 
     public ObservableList<LinkedFileViewModel> getFiles() {
@@ -141,23 +149,34 @@ public ListProperty<LinkedFileViewModel> filesProperty() {
     }
 
     public void addNewFile() {
-        Path workingDirectory = databaseContext.getFirstExistingFileDir(preferences.getFilePreferences())
-                                               .orElse(preferences.getFilePreferences().getWorkingDirectory());
+        Path workingDirectory =
+                databaseContext
+                        .getFirstExistingFileDir(preferences.getFilePreferences())
+                        .orElse(preferences.getFilePreferences().getWorkingDirectory());
 
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(workingDirectory)
-                .build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .withInitialDirectory(workingDirectory)
+                        .build();
 
-        List<Path> fileDirectories = databaseContext.getFileDirectories(preferences.getFilePreferences());
-        List<Path> selectedFiles = dialogService.showFileOpenDialogAndGetMultipleFiles(fileDialogConfiguration);
+        List<Path> fileDirectories =
+                databaseContext.getFileDirectories(preferences.getFilePreferences());
+        List<Path> selectedFiles =
+                dialogService.showFileOpenDialogAndGetMultipleFiles(fileDialogConfiguration);
 
         for (Path fileToAdd : selectedFiles) {
             if (FileUtil.detectBadFileName(fileToAdd.toString())) {
-                String newFilename = FileNameCleaner.cleanFileName(fileToAdd.getFileName().toString());
-
-                boolean correctButtonPressed = dialogService.showConfirmationDialogAndWait(Localization.lang("File \"%0\" cannot be added!", fileToAdd.getFileName()),
-                        Localization.lang("Illegal characters in the file name detected.\nFile will be renamed to \"%0\" and added.", newFilename),
-                        Localization.lang("Rename and add"));
+                String newFilename =
+                        FileNameCleaner.cleanFileName(fileToAdd.getFileName().toString());
+
+                boolean correctButtonPressed =
+                        dialogService.showConfirmationDialogAndWait(
+                                Localization.lang(
+                                        "File \"%0\" cannot be added!", fileToAdd.getFileName()),
+                                Localization.lang(
+                                        "Illegal characters in the file name detected.\nFile will be renamed to \"%0\" and added.",
+                                        newFilename),
+                                Localization.lang("Rename and add"));
 
                 if (correctButtonPressed) {
                     Path correctPath = fileToAdd.resolveSibling(newFilename);
@@ -176,17 +195,22 @@ public void addNewFile() {
     }
 
     public void addNewLinkedFile(LinkedFile linkedFile) {
-        files.add(new LinkedFileViewModel(
-                linkedFile,
-                entry,
-                databaseContext,
-                taskExecutor,
-                dialogService,
-                preferences));
+        files.add(
+                new LinkedFileViewModel(
+                        linkedFile,
+                        entry,
+                        databaseContext,
+                        taskExecutor,
+                        dialogService,
+                        preferences));
     }
 
     private void addNewLinkedFile(Path correctPath, List<Path> fileDirectories) {
-        LinkedFile newLinkedFile = fromFile(correctPath, fileDirectories, preferences.getExternalApplicationsPreferences());
+        LinkedFile newLinkedFile =
+                fromFile(
+                        correctPath,
+                        fileDirectories,
+                        preferences.getExternalApplicationsPreferences());
         addNewLinkedFile(newLinkedFile);
     }
 
@@ -196,14 +220,15 @@ public void bindToEntry(BibEntry entry) {
 
         if ((entry != null) && preferences.getEntryEditorPreferences().autoLinkFilesEnabled()) {
             LOGGER.debug("Auto-linking files for entry {}", entry);
-            BackgroundTask<List<LinkedFileViewModel>> findAssociatedNotLinkedFiles = BackgroundTask
-                    .wrap(() -> findAssociatedNotLinkedFiles(entry))
-                    .onSuccess(list -> {
-                        if (!list.isEmpty()) {
-                            LOGGER.debug("Found non-associated files:", list);
-                            files.addAll(list);
-                        }
-                    });
+            BackgroundTask<List<LinkedFileViewModel>> findAssociatedNotLinkedFiles =
+                    BackgroundTask.wrap(() -> findAssociatedNotLinkedFiles(entry))
+                            .onSuccess(
+                                    list -> {
+                                        if (!list.isEmpty()) {
+                                            LOGGER.debug("Found non-associated files:", list);
+                                            files.addAll(list);
+                                        }
+                                    });
             taskExecutor.execute(findAssociatedNotLinkedFiles);
         }
     }
@@ -214,21 +239,23 @@ public void bindToEntry(BibEntry entry) {
     private List<LinkedFileViewModel> findAssociatedNotLinkedFiles(BibEntry entry) {
         List<LinkedFileViewModel> result = new ArrayList<>();
 
-        AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(
-                databaseContext,
-                preferences.getExternalApplicationsPreferences(),
-                preferences.getFilePreferences(),
-                preferences.getAutoLinkPreferences());
+        AutoSetFileLinksUtil util =
+                new AutoSetFileLinksUtil(
+                        databaseContext,
+                        preferences.getExternalApplicationsPreferences(),
+                        preferences.getFilePreferences(),
+                        preferences.getAutoLinkPreferences());
         try {
             List<LinkedFile> linkedFiles = util.findAssociatedNotLinkedFiles(entry);
             for (LinkedFile linkedFile : linkedFiles) {
-                LinkedFileViewModel newLinkedFile = new LinkedFileViewModel(
-                        linkedFile,
-                        entry,
-                        databaseContext,
-                        taskExecutor,
-                        dialogService,
-                        preferences);
+                LinkedFileViewModel newLinkedFile =
+                        new LinkedFileViewModel(
+                                linkedFile,
+                                entry,
+                                databaseContext,
+                                taskExecutor,
+                                dialogService,
+                                preferences);
                 newLinkedFile.markAsAutomaticallyFound();
                 result.add(newLinkedFile);
             }
@@ -236,7 +263,8 @@ private List<LinkedFileViewModel> findAssociatedNotLinkedFiles(BibEntry entry) {
             dialogService.showErrorDialogAndWait("Error accessing the file system", e);
         }
 
-        LOGGER.trace("Found {} associated files for entry {}", result.size(), entry.getCitationKey());
+        LOGGER.trace(
+                "Found {} associated files for entry {}", result.size(), entry.getCitationKey());
         return result;
     }
 
@@ -246,51 +274,52 @@ public boolean downloadFile(String urlText) {
             addFromURLAndDownload(url);
             return true;
         } catch (MalformedURLException exception) {
-            dialogService.showErrorDialogAndWait(
-                    Localization.lang("Invalid URL"),
-                    exception);
+            dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), exception);
             return false;
         }
     }
 
     public void fetchFulltext() {
-        FulltextFetchers fetcher = new FulltextFetchers(
-                preferences.getImportFormatPreferences(),
-                preferences.getImporterPreferences());
+        FulltextFetchers fetcher =
+                new FulltextFetchers(
+                        preferences.getImportFormatPreferences(),
+                        preferences.getImporterPreferences());
         Optional<String> urlField = entry.getField(StandardField.URL);
         boolean download_success = false;
         if (urlField.isPresent()) {
             download_success = downloadFile(urlField.get());
         }
         if (urlField.isEmpty() || !download_success) {
-            BackgroundTask
-                .wrap(() -> fetcher.findFullTextPDF(entry))
-                .onRunning(() -> fulltextLookupInProgress.setValue(true))
-                .onFinished(() -> fulltextLookupInProgress.setValue(false))
-                .onSuccess(url -> {
-                    if (url.isPresent()) {
-                        addFromURLAndDownload(url.get());
-                    } else {
-                        dialogService.notify(Localization.lang("No full text document found"));
-                    }
-                })
-                .executeWith(taskExecutor);
+            BackgroundTask.wrap(() -> fetcher.findFullTextPDF(entry))
+                    .onRunning(() -> fulltextLookupInProgress.setValue(true))
+                    .onFinished(() -> fulltextLookupInProgress.setValue(false))
+                    .onSuccess(
+                            url -> {
+                                if (url.isPresent()) {
+                                    addFromURLAndDownload(url.get());
+                                } else {
+                                    dialogService.notify(
+                                            Localization.lang("No full text document found"));
+                                }
+                            })
+                    .executeWith(taskExecutor);
         }
     }
 
     public void addFromURL() {
         AttachFileFromURLAction.getUrlForDownloadFromClipBoardOrEntry(dialogService, entry)
-                               .ifPresent(this::downloadFile);
+                .ifPresent(this::downloadFile);
     }
 
     private void addFromURLAndDownload(URL url) {
-        LinkedFileViewModel onlineFile = new LinkedFileViewModel(
-                new LinkedFile(url, ""),
-                entry,
-                databaseContext,
-                taskExecutor,
-                dialogService,
-                preferences);
+        LinkedFileViewModel onlineFile =
+                new LinkedFileViewModel(
+                        new LinkedFile(url, ""),
+                        entry,
+                        databaseContext,
+                        taskExecutor,
+                        dialogService,
+                        preferences);
         files.add(onlineFile);
         onlineFile.download(true);
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/MarkdownEditor.java b/src/main/java/org/jabref/gui/fieldeditors/MarkdownEditor.java
index 891757d43ca0..6e3f1cda45af 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/MarkdownEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/MarkdownEditor.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
-import javax.swing.undo.UndoManager;
+import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
 
 import javafx.scene.control.TextInputControl;
 
@@ -12,14 +12,30 @@
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.field.Field;
 
-import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
+import javax.swing.undo.UndoManager;
 
 public class MarkdownEditor extends SimpleEditor {
 
-    private final FlexmarkHtmlConverter flexmarkHtmlConverter = FlexmarkHtmlConverter.builder().build();
-
-    public MarkdownEditor(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, GuiPreferences preferences, UndoManager undoManager, UndoAction undoAction, RedoAction redoAction) {
-        super(field, suggestionProvider, fieldCheckers, preferences, true, undoManager, undoAction, redoAction);
+    private final FlexmarkHtmlConverter flexmarkHtmlConverter =
+            FlexmarkHtmlConverter.builder().build();
+
+    public MarkdownEditor(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            GuiPreferences preferences,
+            UndoManager undoManager,
+            UndoAction undoAction,
+            RedoAction redoAction) {
+        super(
+                field,
+                suggestionProvider,
+                fieldCheckers,
+                preferences,
+                true,
+                undoManager,
+                undoAction,
+                redoAction);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java b/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java
index 01927ce52890..ecf249acc297 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java
@@ -1,6 +1,8 @@
 package org.jabref.gui.fieldeditors;
 
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
@@ -16,8 +18,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+import javax.swing.undo.UndoManager;
 
 public class OwnerEditor extends HBox implements FieldEditorFX {
 
@@ -28,19 +29,22 @@ public class OwnerEditor extends HBox implements FieldEditorFX {
     @Inject private KeyBindingRepository keyBindingRepository;
     @Inject private UndoManager undoManager;
 
-    public OwnerEditor(Field field,
-                       SuggestionProvider<?> suggestionProvider,
-                       FieldCheckers fieldCheckers,
-                       UndoAction undoAction,
-                       RedoAction redoAction) {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+    public OwnerEditor(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoAction undoAction,
+            RedoAction redoAction) {
+        ViewLoader.view(this).root(this).load();
 
-        this.viewModel = new OwnerEditorViewModel(field, suggestionProvider, preferences, fieldCheckers, undoManager);
-        establishBinding(textArea, viewModel.textProperty(), keyBindingRepository, undoAction, redoAction);
+        this.viewModel =
+                new OwnerEditorViewModel(
+                        field, suggestionProvider, preferences, fieldCheckers, undoManager);
+        establishBinding(
+                textArea, viewModel.textProperty(), keyBindingRepository, undoAction, redoAction);
         textArea.initContextMenu(EditorMenus.getNameMenu(textArea), keyBindingRepository);
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
+        new EditorValidator(preferences)
+                .configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
     }
 
     public OwnerEditorViewModel getViewModel() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/OwnerEditorViewModel.java
index 5334c20b7318..86c958f10a54 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/OwnerEditorViewModel.java
@@ -1,20 +1,21 @@
 package org.jabref.gui.fieldeditors;
 
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.model.entry.field.Field;
 
+import javax.swing.undo.UndoManager;
+
 public class OwnerEditorViewModel extends AbstractEditorViewModel {
     private final CliPreferences preferences;
 
-    public OwnerEditorViewModel(Field field,
-                                SuggestionProvider<?> suggestionProvider,
-                                CliPreferences preferences,
-                                FieldCheckers fieldCheckers,
-                                UndoManager undoManager) {
+    public OwnerEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            CliPreferences preferences,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
         this.preferences = preferences;
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
index 8a15574dee40..d0edfaa75ce3 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.scene.Parent;
 import javafx.scene.control.TextInputControl;
@@ -18,7 +18,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.injection.Injector;
+import javax.swing.undo.UndoManager;
 
 public class PersonsEditor extends HBox implements FieldEditorFX {
 
@@ -26,24 +26,39 @@ public class PersonsEditor extends HBox implements FieldEditorFX {
     private final TextInputControl textInput;
     private final UiThreadStringProperty decoratedStringProperty;
 
-    public PersonsEditor(final Field field,
-                         final SuggestionProvider<?> suggestionProvider,
-                         final FieldCheckers fieldCheckers,
-                         final boolean isMultiLine,
-                         final UndoManager undoManager,
-                         UndoAction undoAction,
-                         RedoAction redoAction) {
+    public PersonsEditor(
+            final Field field,
+            final SuggestionProvider<?> suggestionProvider,
+            final FieldCheckers fieldCheckers,
+            final boolean isMultiLine,
+            final UndoManager undoManager,
+            UndoAction undoAction,
+            RedoAction redoAction) {
         GuiPreferences preferences = Injector.instantiateModelOrService(GuiPreferences.class);
         KeyBindingRepository keyBindingRepository = preferences.getKeyBindingRepository();
 
-        this.viewModel = new PersonsEditorViewModel(field, suggestionProvider, preferences.getAutoCompletePreferences(), fieldCheckers, undoManager);
+        this.viewModel =
+                new PersonsEditorViewModel(
+                        field,
+                        suggestionProvider,
+                        preferences.getAutoCompletePreferences(),
+                        fieldCheckers,
+                        undoManager);
         textInput = isMultiLine ? new EditorTextArea() : new EditorTextField();
         decoratedStringProperty = new UiThreadStringProperty(viewModel.textProperty());
-        establishBinding(textInput, decoratedStringProperty, keyBindingRepository, undoAction, redoAction);
-        ((ContextMenuAddable) textInput).initContextMenu(EditorMenus.getNameMenu(textInput), keyBindingRepository);
+        establishBinding(
+                textInput, decoratedStringProperty, keyBindingRepository, undoAction, redoAction);
+        ((ContextMenuAddable) textInput)
+                .initContextMenu(EditorMenus.getNameMenu(textInput), keyBindingRepository);
         this.getChildren().add(textInput);
-        AutoCompletionTextInputBinding.autoComplete(textInput, viewModel::complete, viewModel.getAutoCompletionConverter(), viewModel.getAutoCompletionStrategy());
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textInput);
+        AutoCompletionTextInputBinding.autoComplete(
+                textInput,
+                viewModel::complete,
+                viewModel.getAutoCompletionConverter(),
+                viewModel.getAutoCompletionStrategy());
+        new EditorValidator(preferences)
+                .configureValidation(
+                        viewModel.getFieldValidator().getValidationStatus(), textInput);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java
index fb995bef63f0..6f7026142886 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java
@@ -1,11 +1,8 @@
 package org.jabref.gui.fieldeditors;
 
-import java.util.Collection;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.util.StringConverter;
 
+import org.controlsfx.control.textfield.AutoCompletionBinding;
 import org.jabref.gui.autocompleter.AppendPersonNamesStrategy;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.autocompleter.AutoCompletionStrategy;
@@ -15,13 +12,20 @@
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.field.Field;
 
-import org.controlsfx.control.textfield.AutoCompletionBinding;
+import java.util.Collection;
+
+import javax.swing.undo.UndoManager;
 
 public class PersonsEditorViewModel extends AbstractEditorViewModel {
 
     private final AutoCompletePreferences preferences;
 
-    public PersonsEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, AutoCompletePreferences preferences, FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public PersonsEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            AutoCompletePreferences preferences,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
         this.preferences = preferences;
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PopOverUtil.java b/src/main/java/org/jabref/gui/fieldeditors/PopOverUtil.java
index 4989adf09181..9c63fb97487a 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PopOverUtil.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PopOverUtil.java
@@ -1,10 +1,9 @@
 package org.jabref.gui.fieldeditors;
 
-import java.util.Optional;
-
 import javafx.scene.control.Button;
 import javafx.scene.control.ProgressIndicator;
 
+import org.controlsfx.control.PopOver;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.fieldeditors.journalinfo.JournalInfoView;
 import org.jabref.logic.l10n.Localization;
@@ -13,11 +12,12 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-import org.controlsfx.control.PopOver;
+import java.util.Optional;
 
 public class PopOverUtil {
 
-    public static void showJournalInfo(Button button, BibEntry entry, DialogService dialogService, TaskExecutor taskExecutor) {
+    public static void showJournalInfo(
+            Button button, BibEntry entry, DialogService dialogService, TaskExecutor taskExecutor) {
         Optional<String> optionalIssn = entry.getField(StandardField.ISSN);
         Optional<String> optionalJournalName = entry.getFieldOrAlias(StandardField.JOURNAL);
 
@@ -32,21 +32,31 @@ public static void showJournalInfo(Button button, BibEntry entry, DialogService
             popOver.setArrowSize(0);
             popOver.show(button, 0);
 
-            BackgroundTask
-                    .wrap(() -> new JournalInfoView().populateJournalInformation(optionalIssn.orElse(""), optionalJournalName.orElse("")))
-                    .onSuccess(updatedNode -> {
-                        popOver.setContentNode(updatedNode);
-                        popOver.show(button, 0);
-                    })
-                    .onFailure(exception -> {
-                        popOver.hide();
-                        String message = Localization.lang("Error while fetching journal information: %0",
-                                exception.getMessage());
-                        dialogService.notify(message);
-                    })
+            BackgroundTask.wrap(
+                            () ->
+                                    new JournalInfoView()
+                                            .populateJournalInformation(
+                                                    optionalIssn.orElse(""),
+                                                    optionalJournalName.orElse("")))
+                    .onSuccess(
+                            updatedNode -> {
+                                popOver.setContentNode(updatedNode);
+                                popOver.show(button, 0);
+                            })
+                    .onFailure(
+                            exception -> {
+                                popOver.hide();
+                                String message =
+                                        Localization.lang(
+                                                "Error while fetching journal information: %0",
+                                                exception.getMessage());
+                                dialogService.notify(message);
+                            })
                     .executeWith(taskExecutor);
         } else {
-            dialogService.notify(Localization.lang("ISSN or journal name required for fetching journal information"));
+            dialogService.notify(
+                    Localization.lang(
+                            "ISSN or journal name required for fetching journal information"));
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java b/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java
index 89a6464d843f..06e7d15f30ce 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.fieldeditors;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.Parent;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.layout.HBox;
@@ -18,40 +16,55 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
+import javax.swing.undo.UndoManager;
+
 public class SimpleEditor extends HBox implements FieldEditorFX {
 
     private final SimpleEditorViewModel viewModel;
     private final TextInputControl textInput;
     private final boolean isMultiLine;
 
-    public SimpleEditor(final Field field,
-                        final SuggestionProvider<?> suggestionProvider,
-                        final FieldCheckers fieldCheckers,
-                        final GuiPreferences preferences,
-                        final boolean isMultiLine,
-                        final UndoManager undoManager,
-                        UndoAction undoAction,
-                        RedoAction redoAction) {
-        this.viewModel = new SimpleEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager);
+    public SimpleEditor(
+            final Field field,
+            final SuggestionProvider<?> suggestionProvider,
+            final FieldCheckers fieldCheckers,
+            final GuiPreferences preferences,
+            final boolean isMultiLine,
+            final UndoManager undoManager,
+            UndoAction undoAction,
+            RedoAction redoAction) {
+        this.viewModel =
+                new SimpleEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager);
         this.isMultiLine = isMultiLine;
 
         textInput = createTextInputControl();
         HBox.setHgrow(textInput, Priority.ALWAYS);
 
-        establishBinding(textInput, viewModel.textProperty(), preferences.getKeyBindingRepository(), undoAction, redoAction);
+        establishBinding(
+                textInput,
+                viewModel.textProperty(),
+                preferences.getKeyBindingRepository(),
+                undoAction,
+                redoAction);
 
-        ((ContextMenuAddable) textInput).initContextMenu(new DefaultMenu(textInput), preferences.getKeyBindingRepository());
+        ((ContextMenuAddable) textInput)
+                .initContextMenu(new DefaultMenu(textInput), preferences.getKeyBindingRepository());
         this.getChildren().add(textInput);
 
         if (!isMultiLine) {
-            AutoCompletionTextInputBinding<?> autoCompleter = AutoCompletionTextInputBinding.autoComplete(textInput, viewModel::complete, viewModel.getAutoCompletionStrategy());
+            AutoCompletionTextInputBinding<?> autoCompleter =
+                    AutoCompletionTextInputBinding.autoComplete(
+                            textInput, viewModel::complete, viewModel.getAutoCompletionStrategy());
             if (suggestionProvider instanceof ContentSelectorSuggestionProvider) {
-                // If content selector values are present, then we want to show the auto complete suggestions immediately on focus
+                // If content selector values are present, then we want to show the auto complete
+                // suggestions immediately on focus
                 autoCompleter.setShowOnFocus(true);
             }
         }
 
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textInput);
+        new EditorValidator(preferences)
+                .configureValidation(
+                        viewModel.getFieldValidator().getValidationStatus(), textInput);
     }
 
     protected TextInputControl createTextInputControl() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java
index acae084f6fc5..b93395e94b98 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java
@@ -1,16 +1,20 @@
 package org.jabref.gui.fieldeditors;
 
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.autocompleter.AppendWordsStrategy;
 import org.jabref.gui.autocompleter.AutoCompletionStrategy;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.field.Field;
 
+import javax.swing.undo.UndoManager;
+
 public class SimpleEditorViewModel extends AbstractEditorViewModel {
 
-    public SimpleEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public SimpleEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
     }
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java b/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java
index c1a54103ac65..5eb84020d8ae 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.fieldeditors;
 
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.frame.ExternalApplicationsPreferences;
+
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
@@ -8,17 +11,14 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.frame.ExternalApplicationsPreferences;
-
 public class URLUtil {
     private static final String URL_EXP = "^(https?|ftp)://.+";
 
     // Detect Google search URL
-    private static final String GOOGLE_SEARCH_EXP = "^https?://(?:www\\.)?google\\.[\\.a-z]+?/url.*";
+    private static final String GOOGLE_SEARCH_EXP =
+            "^https?://(?:www\\.)?google\\.[\\.a-z]+?/url.*";
 
-    private URLUtil() {
-    }
+    private URLUtil() {}
 
     /**
      * Cleans URLs returned by Google search.
@@ -92,7 +92,8 @@ public static boolean isURL(String url) {
      * @param link The link
      * @return The suffix, excluding the dot (e.g. "pdf")
      */
-    public static Optional<String> getSuffix(final String link, ExternalApplicationsPreferences externalApplicationsPreferences) {
+    public static Optional<String> getSuffix(
+            final String link, ExternalApplicationsPreferences externalApplicationsPreferences) {
         String strippedLink = link;
         try {
             // Try to strip the query string, if any, to get the correct suffix:
diff --git a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
index 0951f3921d26..a97777ab8d86 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
@@ -1,9 +1,8 @@
 package org.jabref.gui.fieldeditors;
 
-import java.util.List;
-import java.util.function.Supplier;
+import com.airhacks.afterburner.views.ViewLoader;
 
-import javax.swing.undo.UndoManager;
+import jakarta.inject.Inject;
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -24,8 +23,10 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+import java.util.List;
+import java.util.function.Supplier;
+
+import javax.swing.undo.UndoManager;
 
 public class UrlEditor extends HBox implements FieldEditorFX {
 
@@ -37,26 +38,40 @@ public class UrlEditor extends HBox implements FieldEditorFX {
     @Inject private KeyBindingRepository keyBindingRepository;
     @Inject private UndoManager undoManager;
 
-    public UrlEditor(Field field,
-                     SuggestionProvider<?> suggestionProvider,
-                     FieldCheckers fieldCheckers,
-                     UndoAction undoAction,
-                     RedoAction redoAction) {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-
-        this.viewModel = new UrlEditorViewModel(field, suggestionProvider, dialogService, preferences, fieldCheckers, undoManager);
-
-        establishBinding(textArea, viewModel.textProperty(), keyBindingRepository, undoAction, redoAction);
+    public UrlEditor(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoAction undoAction,
+            RedoAction redoAction) {
+        ViewLoader.view(this).root(this).load();
+
+        this.viewModel =
+                new UrlEditorViewModel(
+                        field,
+                        suggestionProvider,
+                        dialogService,
+                        preferences,
+                        fieldCheckers,
+                        undoManager);
+
+        establishBinding(
+                textArea, viewModel.textProperty(), keyBindingRepository, undoAction, redoAction);
 
         Supplier<List<MenuItem>> contextMenuSupplier = EditorMenus.getCleanupUrlMenu(textArea);
         textArea.initContextMenu(contextMenuSupplier, preferences.getKeyBindingRepository());
 
         // init paste handler for UrlEditor to format pasted url link in textArea
-        textArea.setPasteActionHandler(() -> textArea.setText(new CleanupUrlFormatter().format(new TrimWhitespaceFormatter().format(textArea.getText()))));
-
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
+        textArea.setPasteActionHandler(
+                () ->
+                        textArea.setText(
+                                new CleanupUrlFormatter()
+                                        .format(
+                                                new TrimWhitespaceFormatter()
+                                                        .format(textArea.getText()))));
+
+        new EditorValidator(preferences)
+                .configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
     }
 
     public UrlEditorViewModel getViewModel() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java
index dceea6a52653..50074fd4e11c 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
-import java.io.IOException;
-
-import javax.swing.undo.UndoManager;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -16,25 +14,28 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.strings.StringUtil;
 
-import com.tobiasdiez.easybind.EasyBind;
+import java.io.IOException;
+
+import javax.swing.undo.UndoManager;
 
 public class UrlEditorViewModel extends AbstractEditorViewModel {
     private final DialogService dialogService;
     private final GuiPreferences preferences;
     private final BooleanProperty validUrlIsNotPresent = new SimpleBooleanProperty(true);
 
-    public UrlEditorViewModel(Field field,
-                              SuggestionProvider<?> suggestionProvider,
-                              DialogService dialogService,
-                              GuiPreferences preferences,
-                              FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public UrlEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
         this.dialogService = dialogService;
         this.preferences = preferences;
 
         validUrlIsNotPresent.bind(
-                EasyBind.map(text, input -> StringUtil.isBlank(input) || !URLUtil.isURL(input))
-        );
+                EasyBind.map(text, input -> StringUtil.isBlank(input) || !URLUtil.isURL(input)));
     }
 
     public boolean isValidUrlIsNotPresent() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java b/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java
index 36af99d6c5cf..6413d1303a33 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.fieldeditors;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Optional;
-
-import javax.xml.transform.TransformerException;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.logic.FilePreferences;
@@ -21,16 +15,22 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.LinkedFile;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import javax.xml.transform.TransformerException;
+
 /**
  * Writes XMP metadata to the selected file according to the linking entry
  */
 public class WriteMetadataToSinglePdfAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(WriteMetadataToSinglePdfAction.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(WriteMetadataToSinglePdfAction.class);
 
     private final LinkedFile linkedFile;
     private final BibEntry entry;
@@ -43,16 +43,17 @@ public class WriteMetadataToSinglePdfAction extends SimpleCommand {
     private final FilePreferences filePreferences;
     private final XmpPreferences xmpPreferences;
 
-    public WriteMetadataToSinglePdfAction(LinkedFile linkedFile,
-                                          BibEntry entry,
-                                          BibDatabaseContext databaseContext,
-                                          DialogService dialogService,
-                                          FieldPreferences fieldPreferences,
-                                          FilePreferences filePreferences,
-                                          XmpPreferences xmpPreferences,
-                                          JournalAbbreviationRepository abbreviationRepository,
-                                          BibEntryTypesManager bibEntryTypesManager,
-                                          TaskExecutor taskExecutor) {
+    public WriteMetadataToSinglePdfAction(
+            LinkedFile linkedFile,
+            BibEntry entry,
+            BibDatabaseContext databaseContext,
+            DialogService dialogService,
+            FieldPreferences fieldPreferences,
+            FilePreferences filePreferences,
+            XmpPreferences xmpPreferences,
+            JournalAbbreviationRepository abbreviationRepository,
+            BibEntryTypesManager bibEntryTypesManager,
+            TaskExecutor taskExecutor) {
         this.linkedFile = linkedFile;
         this.entry = entry;
         this.fieldPreferences = fieldPreferences;
@@ -67,46 +68,64 @@ public WriteMetadataToSinglePdfAction(LinkedFile linkedFile,
 
     @Override
     public void execute() {
-        BackgroundTask<Void> writeTask = BackgroundTask.wrap(() -> {
-            Optional<Path> file = linkedFile.findIn(databaseContext, filePreferences);
-            if (file.isEmpty()) {
-                dialogService.notify(Localization.lang("Failed to write metadata, file %1 not found.", file.map(Path::toString).orElse("")));
-            } else {
-                    try {
-                        writeMetadataToFile(file.get(), entry, databaseContext, abbreviationRepository, bibEntryTypesManager, fieldPreferences, filePreferences, xmpPreferences);
-                        dialogService.notify(Localization.lang("Success! Finished writing metadata."));
-                    } catch (IOException | TransformerException ex) {
-                        dialogService.notify(Localization.lang("Error while writing metadata. See the error log for details."));
-                        LOGGER.error("Error while writing metadata to {}", file.map(Path::toString).orElse(""), ex);
-                }
-            }
-            return null;
-        });
-        writeTask
-                .onRunning(() -> setExecutable(false))
-                .onFinished(() -> setExecutable(true));
+        BackgroundTask<Void> writeTask =
+                BackgroundTask.wrap(
+                        () -> {
+                            Optional<Path> file =
+                                    linkedFile.findIn(databaseContext, filePreferences);
+                            if (file.isEmpty()) {
+                                dialogService.notify(
+                                        Localization.lang(
+                                                "Failed to write metadata, file %1 not found.",
+                                                file.map(Path::toString).orElse("")));
+                            } else {
+                                try {
+                                    writeMetadataToFile(
+                                            file.get(),
+                                            entry,
+                                            databaseContext,
+                                            abbreviationRepository,
+                                            bibEntryTypesManager,
+                                            fieldPreferences,
+                                            filePreferences,
+                                            xmpPreferences);
+                                    dialogService.notify(
+                                            Localization.lang(
+                                                    "Success! Finished writing metadata."));
+                                } catch (IOException | TransformerException ex) {
+                                    dialogService.notify(
+                                            Localization.lang(
+                                                    "Error while writing metadata. See the error log for details."));
+                                    LOGGER.error(
+                                            "Error while writing metadata to {}",
+                                            file.map(Path::toString).orElse(""),
+                                            ex);
+                                }
+                            }
+                            return null;
+                        });
+        writeTask.onRunning(() -> setExecutable(false)).onFinished(() -> setExecutable(true));
         taskExecutor.execute(writeTask);
     }
 
-    public static synchronized void writeMetadataToFile(Path file,
-                                                        BibEntry entry,
-                                                        BibDatabaseContext databaseContext,
-                                                        JournalAbbreviationRepository abbreviationRepository,
-                                                        BibEntryTypesManager bibEntryTypesManager,
-                                                        FieldPreferences fieldPreferences,
-                                                        FilePreferences filePreferences,
-                                                        XmpPreferences xmpPreferences) throws Exception {
-        // Similar code can be found at {@link org.jabref.gui.exporter.WriteMetadataToPdfAction.writeMetadataToFile}
+    public static synchronized void writeMetadataToFile(
+            Path file,
+            BibEntry entry,
+            BibDatabaseContext databaseContext,
+            JournalAbbreviationRepository abbreviationRepository,
+            BibEntryTypesManager bibEntryTypesManager,
+            FieldPreferences fieldPreferences,
+            FilePreferences filePreferences,
+            XmpPreferences xmpPreferences)
+            throws Exception {
+        // Similar code can be found at {@link
+        // org.jabref.gui.exporter.WriteMetadataToPdfAction.writeMetadataToFile}
         new XmpUtilWriter(xmpPreferences).writeXmp(file, entry, databaseContext.getDatabase());
 
-        EmbeddedBibFilePdfExporter embeddedBibExporter = new EmbeddedBibFilePdfExporter(
-                databaseContext.getMode(),
-                bibEntryTypesManager,
-                fieldPreferences);
+        EmbeddedBibFilePdfExporter embeddedBibExporter =
+                new EmbeddedBibFilePdfExporter(
+                        databaseContext.getMode(), bibEntryTypesManager, fieldPreferences);
         embeddedBibExporter.exportToFileByPath(
-                databaseContext,
-                filePreferences,
-                file,
-                abbreviationRepository);
+                databaseContext, filePreferences, file, abbreviationRepository);
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java
index c5f95b72fa89..7e67e289a78c 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.fieldeditors.contextmenu;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Supplier;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
@@ -14,7 +12,9 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
-import com.tobiasdiez.easybind.EasyBind;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Supplier;
 
 public class DefaultMenu implements Supplier<List<MenuItem>> {
 
@@ -45,9 +45,16 @@ private static Menu getCaseChangeMenu(TextInputControl textInputControl) {
 
         for (final Formatter caseChanger : Formatters.getCaseChangers()) {
             MenuItem menuItem = new MenuItem(caseChanger.getName());
-            EasyBind.subscribe(textInputControl.textProperty(), value -> menuItem.setDisable(StringUtil.isNullOrEmpty(value)));
-            menuItem.setOnAction(event ->
-                    textInputControl.textProperty().set(caseChanger.format(textInputControl.textProperty().get())));
+            EasyBind.subscribe(
+                    textInputControl.textProperty(),
+                    value -> menuItem.setDisable(StringUtil.isNullOrEmpty(value)));
+            menuItem.setOnAction(
+                    event ->
+                            textInputControl
+                                    .textProperty()
+                                    .set(
+                                            caseChanger.format(
+                                                    textInputControl.textProperty().get())));
             submenu.getItems().add(menuItem);
         }
 
@@ -59,9 +66,14 @@ private static Menu getConversionMenu(TextInputControl textInputControl) {
 
         for (Formatter converter : Formatters.getConverters()) {
             MenuItem menuItem = new MenuItem(converter.getName());
-            EasyBind.subscribe(textInputControl.textProperty(), value -> menuItem.setDisable(StringUtil.isNullOrEmpty(value)));
-            menuItem.setOnAction(event ->
-                    textInputControl.textProperty().set(converter.format(textInputControl.textProperty().get())));
+            EasyBind.subscribe(
+                    textInputControl.textProperty(),
+                    value -> menuItem.setDisable(StringUtil.isNullOrEmpty(value)));
+            menuItem.setOnAction(
+                    event ->
+                            textInputControl
+                                    .textProperty()
+                                    .set(converter.format(textInputControl.textProperty().get())));
             submenu.getItems().add(menuItem);
         }
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorContextAction.java b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorContextAction.java
index 4aee5fa948a7..d08d2df9accf 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorContextAction.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorContextAction.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.fieldeditors.contextmenu;
 
-import java.util.List;
+import com.sun.javafx.scene.control.Properties;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -16,7 +16,7 @@
 import org.jabref.gui.util.BindingsHelper;
 import org.jabref.logic.os.OS;
 
-import com.sun.javafx.scene.control.Properties;
+import java.util.List;
 
 public class EditorContextAction extends SimpleCommand {
 
@@ -30,17 +30,37 @@ public EditorContextAction(StandardActions command, TextInputControl textInputCo
         this.textInputControl = textInputControl;
 
         BooleanProperty editableBinding = textInputControl.editableProperty();
-        BooleanBinding hasTextBinding = Bindings.createBooleanBinding(() -> textInputControl.getLength() > 0, textInputControl.textProperty());
-        BooleanBinding hasStringInClipboardBinding = (BooleanBinding) BindingsHelper.constantOf(Clipboard.getSystemClipboard().hasString());
-        BooleanBinding hasSelectionBinding = Bindings.createBooleanBinding(() -> textInputControl.getSelection().getLength() > 0, textInputControl.selectionProperty());
-        BooleanBinding allSelectedBinding = Bindings.createBooleanBinding(() -> textInputControl.getSelection().getLength() == textInputControl.getLength());
-        BooleanBinding maskTextBinding = (BooleanBinding) BindingsHelper.constantOf(textInputControl instanceof PasswordField); // (maskText("A") != "A");
-        BooleanBinding undoableBinding = Bindings.createBooleanBinding(textInputControl::isUndoable, textInputControl.undoableProperty());
-        BooleanBinding redoableBinding = Bindings.createBooleanBinding(textInputControl::isRedoable, textInputControl.redoableProperty());
+        BooleanBinding hasTextBinding =
+                Bindings.createBooleanBinding(
+                        () -> textInputControl.getLength() > 0, textInputControl.textProperty());
+        BooleanBinding hasStringInClipboardBinding =
+                (BooleanBinding)
+                        BindingsHelper.constantOf(Clipboard.getSystemClipboard().hasString());
+        BooleanBinding hasSelectionBinding =
+                Bindings.createBooleanBinding(
+                        () -> textInputControl.getSelection().getLength() > 0,
+                        textInputControl.selectionProperty());
+        BooleanBinding allSelectedBinding =
+                Bindings.createBooleanBinding(
+                        () ->
+                                textInputControl.getSelection().getLength()
+                                        == textInputControl.getLength());
+        BooleanBinding maskTextBinding =
+                (BooleanBinding)
+                        BindingsHelper.constantOf(
+                                textInputControl
+                                        instanceof PasswordField); // (maskText("A") != "A");
+        BooleanBinding undoableBinding =
+                Bindings.createBooleanBinding(
+                        textInputControl::isUndoable, textInputControl.undoableProperty());
+        BooleanBinding redoableBinding =
+                Bindings.createBooleanBinding(
+                        textInputControl::isRedoable, textInputControl.redoableProperty());
 
         this.executable.bind(
                 switch (command) {
-                    case COPY -> editableBinding.and(maskTextBinding.not()).and(hasSelectionBinding);
+                    case COPY ->
+                            editableBinding.and(maskTextBinding.not()).and(hasSelectionBinding);
                     case CUT -> maskTextBinding.not().and(hasSelectionBinding);
                     case PASTE -> editableBinding.and(hasStringInClipboardBinding);
                     case DELETE -> editableBinding.and(hasSelectionBinding);
@@ -77,17 +97,27 @@ public void execute() {
     public static List<MenuItem> getDefaultContextMenuItems(TextInputControl textInputControl) {
         ActionFactory factory = new ActionFactory();
 
-        MenuItem selectAllMenuItem = factory.createMenuItem(StandardActions.SELECT_ALL,
-                new EditorContextAction(StandardActions.SELECT_ALL, textInputControl));
+        MenuItem selectAllMenuItem =
+                factory.createMenuItem(
+                        StandardActions.SELECT_ALL,
+                        new EditorContextAction(StandardActions.SELECT_ALL, textInputControl));
         if (SHOW_HANDLES) {
             selectAllMenuItem.getProperties().put("refreshMenu", Boolean.TRUE);
         }
 
         return List.of(
-                factory.createMenuItem(StandardActions.CUT, new EditorContextAction(StandardActions.CUT, textInputControl)),
-                factory.createMenuItem(StandardActions.COPY, new EditorContextAction(StandardActions.COPY, textInputControl)),
-                factory.createMenuItem(StandardActions.PASTE, new EditorContextAction(StandardActions.PASTE, textInputControl)),
-                factory.createMenuItem(StandardActions.DELETE, new EditorContextAction(StandardActions.DELETE, textInputControl)),
+                factory.createMenuItem(
+                        StandardActions.CUT,
+                        new EditorContextAction(StandardActions.CUT, textInputControl)),
+                factory.createMenuItem(
+                        StandardActions.COPY,
+                        new EditorContextAction(StandardActions.COPY, textInputControl)),
+                factory.createMenuItem(
+                        StandardActions.PASTE,
+                        new EditorContextAction(StandardActions.PASTE, textInputControl)),
+                factory.createMenuItem(
+                        StandardActions.DELETE,
+                        new EditorContextAction(StandardActions.DELETE, textInputControl)),
                 selectAllMenuItem);
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
index 4c02920b76e9..26e9a18c6109 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
@@ -1,8 +1,7 @@
 package org.jabref.gui.fieldeditors.contextmenu;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Supplier;
+import com.airhacks.afterburner.injection.Injector;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
@@ -19,8 +18,9 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
-import com.airhacks.afterburner.injection.Injector;
-import com.tobiasdiez.easybind.EasyBind;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
 
 /**
  * Provides context menus for the text fields of the entry editor. Note that we use {@link Supplier} to prevent an early
@@ -38,9 +38,15 @@ public class EditorMenus {
      */
     public static Supplier<List<MenuItem>> getNameMenu(final TextInputControl textInput) {
         return () -> {
-            MenuItem normalizeNames = new MenuItem(Localization.lang("Normalize to BibTeX name format"));
-            EasyBind.subscribe(textInput.textProperty(), value -> normalizeNames.setDisable(StringUtil.isNullOrEmpty(value)));
-            normalizeNames.setOnAction(event -> textInput.setText(new NormalizeNamesFormatter().format(textInput.getText())));
+            MenuItem normalizeNames =
+                    new MenuItem(Localization.lang("Normalize to BibTeX name format"));
+            EasyBind.subscribe(
+                    textInput.textProperty(),
+                    value -> normalizeNames.setDisable(StringUtil.isNullOrEmpty(value)));
+            normalizeNames.setOnAction(
+                    event ->
+                            textInput.setText(
+                                    new NormalizeNamesFormatter().format(textInput.getText())));
             List<MenuItem> menuItems = new ArrayList<>(6);
             menuItems.add(normalizeNames);
             menuItems.addAll(new DefaultMenu(textInput).get());
@@ -54,12 +60,28 @@ public static Supplier<List<MenuItem>> getNameMenu(final TextInputControl textIn
      * @param textArea text-area that this menu will be connected to
      * @return menu containing items of the default menu and an item for copying a DOI/DOI URL
      */
-    public static Supplier<List<MenuItem>> getDOIMenu(TextArea textArea, DialogService dialogService) {
+    public static Supplier<List<MenuItem>> getDOIMenu(
+            TextArea textArea, DialogService dialogService) {
         return () -> {
             ActionFactory factory = new ActionFactory();
-            ClipBoardManager clipBoardManager = Injector.instantiateModelOrService(ClipBoardManager.class);
-            MenuItem copyDoiMenuItem = factory.createMenuItem(StandardActions.COPY_DOI, new CopyDoiUrlAction(textArea, StandardActions.COPY_DOI, dialogService, clipBoardManager));
-            MenuItem copyDoiUrlMenuItem = factory.createMenuItem(StandardActions.COPY_DOI_URL, new CopyDoiUrlAction(textArea, StandardActions.COPY_DOI_URL, dialogService, clipBoardManager));
+            ClipBoardManager clipBoardManager =
+                    Injector.instantiateModelOrService(ClipBoardManager.class);
+            MenuItem copyDoiMenuItem =
+                    factory.createMenuItem(
+                            StandardActions.COPY_DOI,
+                            new CopyDoiUrlAction(
+                                    textArea,
+                                    StandardActions.COPY_DOI,
+                                    dialogService,
+                                    clipBoardManager));
+            MenuItem copyDoiUrlMenuItem =
+                    factory.createMenuItem(
+                            StandardActions.COPY_DOI_URL,
+                            new CopyDoiUrlAction(
+                                    textArea,
+                                    StandardActions.COPY_DOI_URL,
+                                    dialogService,
+                                    clipBoardManager));
             List<MenuItem> menuItems = new ArrayList<>();
             menuItems.add(copyDoiMenuItem);
             menuItems.add(copyDoiUrlMenuItem);
@@ -79,7 +101,9 @@ public static Supplier<List<MenuItem>> getCleanupUrlMenu(TextArea textArea) {
         return () -> {
             MenuItem cleanupURL = new MenuItem(Localization.lang("Cleanup URL link"));
             cleanupURL.setDisable(textArea.textProperty().isEmpty().get());
-            cleanupURL.setOnAction(event -> textArea.setText(new CleanupUrlFormatter().format(textArea.getText())));
+            cleanupURL.setOnAction(
+                    event ->
+                            textArea.setText(new CleanupUrlFormatter().format(textArea.getText())));
             List<MenuItem> menuItems = new ArrayList<>();
             menuItems.add(cleanupURL);
             return menuItems;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java
index 6fd3b673019c..c458b7505ba7 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.fieldeditors.contextmenu;
 
-import java.util.Objects;
-import java.util.Optional;
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
@@ -20,7 +19,8 @@
 import org.jabref.logic.protectedterms.ProtectedTermsList;
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 
-import com.airhacks.afterburner.injection.Injector;
+import java.util.Objects;
+import java.util.Optional;
 
 class ProtectedTermsMenu extends Menu {
 
@@ -28,34 +28,36 @@ class ProtectedTermsMenu extends Menu {
     private final TextInputControl textInputControl;
     private final ActionFactory factory = new ActionFactory();
 
-    private final Action protectSelectionActionInformation = new Action() {
-        @Override
-        public String getText() {
-            return Localization.lang("Protect selection");
-        }
+    private final Action protectSelectionActionInformation =
+            new Action() {
+                @Override
+                public String getText() {
+                    return Localization.lang("Protect selection");
+                }
 
-        @Override
-        public Optional<JabRefIcon> getIcon() {
-            return Optional.of(IconTheme.JabRefIcons.PROTECT_STRING);
-        }
+                @Override
+                public Optional<JabRefIcon> getIcon() {
+                    return Optional.of(IconTheme.JabRefIcons.PROTECT_STRING);
+                }
 
-        @Override
-        public String getDescription() {
-            return Localization.lang("Add {} around selected text");
-        }
-    };
+                @Override
+                public String getDescription() {
+                    return Localization.lang("Add {} around selected text");
+                }
+            };
 
-    private final Action unprotectSelectionActionInformation = new Action() {
-        @Override
-        public String getText() {
-            return Localization.lang("Unprotect selection");
-        }
+    private final Action unprotectSelectionActionInformation =
+            new Action() {
+                @Override
+                public String getText() {
+                    return Localization.lang("Unprotect selection");
+                }
 
-        @Override
-        public String getDescription() {
-            return Localization.lang("Remove all {} in selected text");
-        }
-    };
+                @Override
+                public String getDescription() {
+                    return Localization.lang("Remove all {} in selected text");
+                }
+            };
 
     private class ProtectSelectionAction extends SimpleCommand {
         ProtectSelectionAction() {
@@ -67,7 +69,8 @@ public void execute() {
             String selectedText = textInputControl.getSelectedText();
             String firstStr = "{";
             String lastStr = "}";
-            // If the selected text contains spaces at the beginning and end, then add spaces before or after the brackets
+            // If the selected text contains spaces at the beginning and end, then add spaces before
+            // or after the brackets
             if (selectedText.startsWith(" ")) {
                 firstStr = " {";
             }
@@ -139,22 +142,38 @@ public void execute() {
     public ProtectedTermsMenu(final TextInputControl textInputControl) {
         super(Localization.lang("Protect terms"));
         this.textInputControl = textInputControl;
-        FORMATTER = new ProtectTermsFormatter(Injector.instantiateModelOrService(ProtectedTermsLoader.class));
-
-        getItems().addAll(factory.createMenuItem(protectSelectionActionInformation, new ProtectSelectionAction()),
-                getExternalFilesMenu(),
-                new SeparatorMenuItem(),
-                factory.createMenuItem(() -> Localization.lang("Format field"), new FormatFieldAction()),
-                factory.createMenuItem(unprotectSelectionActionInformation, new UnprotectSelectionAction()));
+        FORMATTER =
+                new ProtectTermsFormatter(
+                        Injector.instantiateModelOrService(ProtectedTermsLoader.class));
+
+        getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                protectSelectionActionInformation, new ProtectSelectionAction()),
+                        getExternalFilesMenu(),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                () -> Localization.lang("Format field"), new FormatFieldAction()),
+                        factory.createMenuItem(
+                                unprotectSelectionActionInformation,
+                                new UnprotectSelectionAction()));
     }
 
     private Menu getExternalFilesMenu() {
-        Menu protectedTermsMenu = factory.createSubMenu(() -> Localization.lang("Add selected text to list"));
-        ProtectedTermsLoader loader = Injector.instantiateModelOrService(ProtectedTermsLoader.class);
+        Menu protectedTermsMenu =
+                factory.createSubMenu(() -> Localization.lang("Add selected text to list"));
+        ProtectedTermsLoader loader =
+                Injector.instantiateModelOrService(ProtectedTermsLoader.class);
         loader.getProtectedTermsLists().stream()
-              .filter(list -> !list.isInternalList())
-              .forEach(list -> protectedTermsMenu.getItems().add(
-                      factory.createMenuItem(list::getDescription, new AddToProtectedTermsAction(list))));
+                .filter(list -> !list.isInternalList())
+                .forEach(
+                        list ->
+                                protectedTermsMenu
+                                        .getItems()
+                                        .add(
+                                                factory.createMenuItem(
+                                                        list::getDescription,
+                                                        new AddToProtectedTermsAction(list))));
 
         if (protectedTermsMenu.getItems().isEmpty()) {
             MenuItem emptyItem = new MenuItem(Localization.lang("No list enabled"));
diff --git a/src/main/java/org/jabref/gui/fieldeditors/identifier/BaseIdentifierEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/identifier/BaseIdentifierEditorViewModel.java
index 5367ebfa4295..6be8b1c02c8b 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/BaseIdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/BaseIdentifierEditorViewModel.java
@@ -1,9 +1,6 @@
 package org.jabref.gui.fieldeditors.identifier;
 
-import java.io.IOException;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -25,30 +22,38 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.identifier.Identifier;
-
-import com.tobiasdiez.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class BaseIdentifierEditorViewModel<T extends Identifier> extends AbstractEditorViewModel {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BaseIdentifierEditorViewModel.class);
+import java.io.IOException;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
+
+public abstract class BaseIdentifierEditorViewModel<T extends Identifier>
+        extends AbstractEditorViewModel {
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(BaseIdentifierEditorViewModel.class);
     protected BooleanProperty isInvalidIdentifier = new SimpleBooleanProperty();
     protected final BooleanProperty identifierLookupInProgress = new SimpleBooleanProperty(false);
     protected final BooleanProperty canLookupIdentifier = new SimpleBooleanProperty(true);
-    protected final BooleanProperty canFetchBibliographyInformationById = new SimpleBooleanProperty();
+    protected final BooleanProperty canFetchBibliographyInformationById =
+            new SimpleBooleanProperty();
     protected IdentifierParser identifierParser;
-    protected final ObjectProperty<Optional<T>> identifier = new SimpleObjectProperty<>(Optional.empty());
+    protected final ObjectProperty<Optional<T>> identifier =
+            new SimpleObjectProperty<>(Optional.empty());
     protected DialogService dialogService;
     protected TaskExecutor taskExecutor;
     protected GuiPreferences preferences;
 
-    public BaseIdentifierEditorViewModel(Field field,
-                                         SuggestionProvider<?> suggestionProvider,
-                                         FieldCheckers fieldCheckers,
-                                         DialogService dialogService,
-                                         TaskExecutor taskExecutor,
-                                         GuiPreferences preferences,
-                                         UndoManager undoManager) {
+    public BaseIdentifierEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            DialogService dialogService,
+            TaskExecutor taskExecutor,
+            GuiPreferences preferences,
+            UndoManager undoManager) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
@@ -62,7 +67,8 @@ public BaseIdentifierEditorViewModel(Field field,
      * <p>
      * <b>NOTE: This method MUST be called by all the implementation view models in their principal constructor</b>
      * */
-    protected final void configure(boolean canFetchBibliographyInformationById, boolean canLookupIdentifier) {
+    protected final void configure(
+            boolean canFetchBibliographyInformationById, boolean canLookupIdentifier) {
         this.canLookupIdentifier.set(canLookupIdentifier);
         this.canFetchBibliographyInformationById.set(canFetchBibliographyInformationById);
     }
@@ -79,13 +85,21 @@ protected Optional<T> updateIdentifier() {
     protected void handleIdentifierFetchingError(Exception exception, IdFetcher<T> fetcher) {
         LOGGER.error("Error while fetching identifier", exception);
         if (exception instanceof FetcherClientException) {
-            dialogService.showInformationDialogAndWait(Localization.lang("Look up %0", fetcher.getName()), Localization.lang("No data was found for the identifier"));
+            dialogService.showInformationDialogAndWait(
+                    Localization.lang("Look up %0", fetcher.getName()),
+                    Localization.lang("No data was found for the identifier"));
         } else if (exception instanceof FetcherServerException) {
-            dialogService.showInformationDialogAndWait(Localization.lang("Look up %0", fetcher.getName()), Localization.lang("Server not available"));
+            dialogService.showInformationDialogAndWait(
+                    Localization.lang("Look up %0", fetcher.getName()),
+                    Localization.lang("Server not available"));
         } else if (exception.getCause() != null) {
-            dialogService.showWarningDialogAndWait(Localization.lang("Look up %0", fetcher.getName()), Localization.lang("Error occurred %0", exception.getCause().getMessage()));
+            dialogService.showWarningDialogAndWait(
+                    Localization.lang("Look up %0", fetcher.getName()),
+                    Localization.lang("Error occurred %0", exception.getCause().getMessage()));
         } else {
-            dialogService.showWarningDialogAndWait(Localization.lang("Look up %0", fetcher.getName()), Localization.lang("Error occurred %0", exception.getCause().getMessage()));
+            dialogService.showWarningDialogAndWait(
+                    Localization.lang("Look up %0", fetcher.getName()),
+                    Localization.lang("Error occurred %0", exception.getCause().getMessage()));
         }
     }
 
@@ -122,7 +136,9 @@ public BooleanProperty identifierLookupInProgressProperty() {
     }
 
     public void fetchBibliographyInformation(BibEntry bibEntry) {
-        LOGGER.warn("Unable to fetch bibliography information using the '{}' identifier", field.getDisplayName());
+        LOGGER.warn(
+                "Unable to fetch bibliography information using the '{}' identifier",
+                field.getDisplayName());
     }
 
     public void lookupIdentifier(BibEntry bibEntry) {
@@ -130,14 +146,19 @@ public void lookupIdentifier(BibEntry bibEntry) {
     }
 
     public void openExternalLink() {
-        identifier.get().flatMap(Identifier::getExternalURI).ifPresent(url -> {
-                    try {
-                        NativeDesktop.openBrowser(url, preferences.getExternalApplicationsPreferences());
-                    } catch (IOException ex) {
-                        dialogService.showErrorDialogAndWait(Localization.lang("Unable to open link."), ex);
-                    }
-                }
-        );
+        identifier
+                .get()
+                .flatMap(Identifier::getExternalURI)
+                .ifPresent(
+                        url -> {
+                            try {
+                                NativeDesktop.openBrowser(
+                                        url, preferences.getExternalApplicationsPreferences());
+                            } catch (IOException ex) {
+                                dialogService.showErrorDialogAndWait(
+                                        Localization.lang("Unable to open link."), ex);
+                            }
+                        });
     }
 
     @Override
@@ -145,6 +166,7 @@ public void bindToEntry(BibEntry entry) {
         super.bindToEntry(entry);
         identifierParser = new IdentifierParser(entry);
         EasyBind.subscribe(textProperty(), ignored -> updateIdentifier());
-        EasyBind.subscribe(identifier, newIdentifier -> isInvalidIdentifier.set(newIdentifier.isEmpty()));
+        EasyBind.subscribe(
+                identifier, newIdentifier -> isInvalidIdentifier.set(newIdentifier.isEmpty()));
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/identifier/DoiIdentifierEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/identifier/DoiIdentifierEditorViewModel.java
index 7b86f1f2966e..3461a22b4377 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/DoiIdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/DoiIdentifierEditorViewModel.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.fieldeditors.identifier;
 
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProvider;
@@ -16,24 +14,33 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.swing.undo.UndoManager;
+
 public class DoiIdentifierEditorViewModel extends BaseIdentifierEditorViewModel<DOI> {
     public static final Logger LOGGER = LoggerFactory.getLogger(DoiIdentifierEditorViewModel.class);
 
     private final UndoManager undoManager;
     private final StateManager stateManager;
 
-    public DoiIdentifierEditorViewModel(SuggestionProvider<?> suggestionProvider,
-                                        FieldCheckers fieldCheckers,
-                                        DialogService dialogService,
-                                        TaskExecutor taskExecutor,
-                                        GuiPreferences preferences,
-                                        UndoManager undoManager,
-                                        StateManager stateManager) {
-        super(StandardField.DOI, suggestionProvider, fieldCheckers, dialogService, taskExecutor, preferences, undoManager);
+    public DoiIdentifierEditorViewModel(
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            DialogService dialogService,
+            TaskExecutor taskExecutor,
+            GuiPreferences preferences,
+            UndoManager undoManager,
+            StateManager stateManager) {
+        super(
+                StandardField.DOI,
+                suggestionProvider,
+                fieldCheckers,
+                dialogService,
+                taskExecutor,
+                preferences,
+                undoManager);
         this.undoManager = undoManager;
         this.stateManager = stateManager;
         configure(true, true);
@@ -44,29 +51,42 @@ public void lookupIdentifier(BibEntry bibEntry) {
         CrossRef doiFetcher = new CrossRef();
 
         BackgroundTask.wrap(() -> doiFetcher.findIdentifier(entry))
-            .onRunning(() -> identifierLookupInProgress.setValue(true))
-            .onFinished(() -> identifierLookupInProgress.setValue(false))
-            .onSuccess(identifier -> {
-                if (identifier.isPresent()) {
-                    entry.setField(field, identifier.get().getNormalized());
-                } else {
-                    dialogService.notify(Localization.lang("No %0 found", field.getDisplayName()));
-                }
-            }).onFailure(e -> handleIdentifierFetchingError(e, doiFetcher)).executeWith(taskExecutor);
+                .onRunning(() -> identifierLookupInProgress.setValue(true))
+                .onFinished(() -> identifierLookupInProgress.setValue(false))
+                .onSuccess(
+                        identifier -> {
+                            if (identifier.isPresent()) {
+                                entry.setField(field, identifier.get().getNormalized());
+                            } else {
+                                dialogService.notify(
+                                        Localization.lang("No %0 found", field.getDisplayName()));
+                            }
+                        })
+                .onFailure(e -> handleIdentifierFetchingError(e, doiFetcher))
+                .executeWith(taskExecutor);
     }
 
     @Override
     public void fetchBibliographyInformation(BibEntry bibEntry) {
-        stateManager.getActiveDatabase().ifPresentOrElse(
-                databaseContext -> new FetchAndMergeEntry(databaseContext, taskExecutor, preferences, dialogService, undoManager)
-                        .fetchAndMerge(entry, field),
-                () -> dialogService.notify(Localization.lang("No library selected"))
-        );
+        stateManager
+                .getActiveDatabase()
+                .ifPresentOrElse(
+                        databaseContext ->
+                                new FetchAndMergeEntry(
+                                                databaseContext,
+                                                taskExecutor,
+                                                preferences,
+                                                dialogService,
+                                                undoManager)
+                                        .fetchAndMerge(entry, field),
+                        () -> dialogService.notify(Localization.lang("No library selected")));
     }
 
     @Override
     public void openExternalLink() {
-        identifier.get().map(DOI::getDOI)
-                  .ifPresent(s -> NativeDesktop.openCustomDoi(s, preferences, dialogService));
+        identifier
+                .get()
+                .map(DOI::getDOI)
+                .ifPresent(s -> NativeDesktop.openCustomDoi(s, preferences, dialogService));
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/identifier/EprintIdentifierEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/identifier/EprintIdentifierEditorViewModel.java
index b567fa279190..e6e6fa209fa3 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/EprintIdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/EprintIdentifierEditorViewModel.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.fieldeditors.identifier;
 
-import javax.swing.undo.UndoManager;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.collections.MapChangeListener;
 import javafx.collections.WeakMapChangeListener;
@@ -17,46 +17,64 @@
 import org.jabref.model.entry.identifier.ArXivIdentifier;
 import org.jabref.model.entry.identifier.EprintIdentifier;
 
-import com.tobiasdiez.easybind.EasyBind;
+import javax.swing.undo.UndoManager;
 
-public class EprintIdentifierEditorViewModel extends BaseIdentifierEditorViewModel<EprintIdentifier> {
+public class EprintIdentifierEditorViewModel
+        extends BaseIdentifierEditorViewModel<EprintIdentifier> {
 
-    // The following listener will be wrapped in a weak reference change listener, thus it will be garbage collected
+    // The following listener will be wrapped in a weak reference change listener, thus it will be
+    // garbage collected
     // automatically once this object is disposed.
     // https://en.wikipedia.org/wiki/Lapsed_listener_problem
-    private MapChangeListener<Field, String> eprintTypeFieldListener = change -> {
-        Field changedField = change.getKey();
-        if (StandardField.EPRINTTYPE == changedField) {
-            updateIdentifier();
-        }
-    };
-
-    public EprintIdentifierEditorViewModel(SuggestionProvider<?> suggestionProvider,
-                                           FieldCheckers fieldCheckers,
-                                           DialogService dialogService,
-                                           TaskExecutor taskExecutor,
-                                           GuiPreferences preferences,
-                                           UndoManager undoManager) {
-        super(StandardField.EPRINT, suggestionProvider, fieldCheckers, dialogService, taskExecutor, preferences, undoManager);
-        configure(false, false);
-        EasyBind.subscribe(identifier, newIdentifier -> {
-            newIdentifier.ifPresent(id -> {
-                // TODO: We already have a common superclass between ArXivIdentifier and ARK. This could be refactored further.
-                if (id instanceof ArXivIdentifier) {
-                    configure(true, false);
-                } else if (id instanceof ARK) {
-                    configure(false, false);
+    private MapChangeListener<Field, String> eprintTypeFieldListener =
+            change -> {
+                Field changedField = change.getKey();
+                if (StandardField.EPRINTTYPE == changedField) {
+                    updateIdentifier();
                 }
-            });
-        });
+            };
+
+    public EprintIdentifierEditorViewModel(
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            DialogService dialogService,
+            TaskExecutor taskExecutor,
+            GuiPreferences preferences,
+            UndoManager undoManager) {
+        super(
+                StandardField.EPRINT,
+                suggestionProvider,
+                fieldCheckers,
+                dialogService,
+                taskExecutor,
+                preferences,
+                undoManager);
+        configure(false, false);
+        EasyBind.subscribe(
+                identifier,
+                newIdentifier -> {
+                    newIdentifier.ifPresent(
+                            id -> {
+                                // TODO: We already have a common superclass between ArXivIdentifier
+                                // and ARK. This could be refactored further.
+                                if (id instanceof ArXivIdentifier) {
+                                    configure(true, false);
+                                } else if (id instanceof ARK) {
+                                    configure(false, false);
+                                }
+                            });
+                });
     }
 
     @Override
     public void bindToEntry(BibEntry entry) {
         super.bindToEntry(entry);
-        // Unlike other identifiers (they only depend on their own field value), eprint  depends on eprinttype thus
-        // its identity changes whenever the eprinttype field changes .e.g. If eprinttype equals 'arxiv' then the eprint identity
+        // Unlike other identifiers (they only depend on their own field value), eprint  depends on
+        // eprinttype thus
+        // its identity changes whenever the eprinttype field changes .e.g. If eprinttype equals
+        // 'arxiv' then the eprint identity
         // will be of type ArXivIdentifier and if it equals 'ark' then it switches to type ARK.
-        entry.getFieldsObservable().addListener(new WeakMapChangeListener<>(eprintTypeFieldListener));
+        entry.getFieldsObservable()
+                .addListener(new WeakMapChangeListener<>(eprintTypeFieldListener));
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/identifier/ISBNIdentifierEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/identifier/ISBNIdentifierEditorViewModel.java
index 99daab73f22d..6782bb0c39b6 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/ISBNIdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/ISBNIdentifierEditorViewModel.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.fieldeditors.identifier;
 
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProvider;
@@ -14,18 +12,28 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.ISBN;
 
+import javax.swing.undo.UndoManager;
+
 public class ISBNIdentifierEditorViewModel extends BaseIdentifierEditorViewModel<ISBN> {
     private final UndoManager undoManager;
     private final StateManager stateManager;
 
-    public ISBNIdentifierEditorViewModel(SuggestionProvider<?> suggestionProvider,
-                                         FieldCheckers fieldCheckers,
-                                         DialogService dialogService,
-                                         TaskExecutor taskExecutor,
-                                         GuiPreferences preferences,
-                                         UndoManager undoManager,
-                                         StateManager stateManager) {
-        super(StandardField.ISBN, suggestionProvider, fieldCheckers, dialogService, taskExecutor, preferences, undoManager);
+    public ISBNIdentifierEditorViewModel(
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            DialogService dialogService,
+            TaskExecutor taskExecutor,
+            GuiPreferences preferences,
+            UndoManager undoManager,
+            StateManager stateManager) {
+        super(
+                StandardField.ISBN,
+                suggestionProvider,
+                fieldCheckers,
+                dialogService,
+                taskExecutor,
+                preferences,
+                undoManager);
         this.undoManager = undoManager;
         this.stateManager = stateManager;
         configure(true, false);
@@ -33,10 +41,17 @@ public ISBNIdentifierEditorViewModel(SuggestionProvider<?> suggestionProvider,
 
     @Override
     public void fetchBibliographyInformation(BibEntry bibEntry) {
-        stateManager.getActiveDatabase().ifPresentOrElse(
-                databaseContext -> new FetchAndMergeEntry(databaseContext, taskExecutor, preferences, dialogService, undoManager)
-                        .fetchAndMerge(entry, field),
-                () -> dialogService.notify(Localization.lang("No library selected"))
-        );
+        stateManager
+                .getActiveDatabase()
+                .ifPresentOrElse(
+                        databaseContext ->
+                                new FetchAndMergeEntry(
+                                                databaseContext,
+                                                taskExecutor,
+                                                preferences,
+                                                dialogService,
+                                                undoManager)
+                                        .fetchAndMerge(entry, field),
+                        () -> dialogService.notify(Localization.lang("No library selected")));
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java b/src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java
index f0c308f91797..515c9a34cd86 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java
@@ -1,8 +1,13 @@
 package org.jabref.gui.fieldeditors.identifier;
 
-import java.util.Optional;
+import static org.jabref.model.entry.field.StandardField.DOI;
+import static org.jabref.model.entry.field.StandardField.EPRINT;
+import static org.jabref.model.entry.field.StandardField.ISBN;
 
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.injection.Injector;
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
@@ -25,13 +30,9 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.injection.Injector;
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+import java.util.Optional;
 
-import static org.jabref.model.entry.field.StandardField.DOI;
-import static org.jabref.model.entry.field.StandardField.EPRINT;
-import static org.jabref.model.entry.field.StandardField.ISBN;
+import javax.swing.undo.UndoManager;
 
 public class IdentifierEditor extends HBox implements FieldEditorFX {
 
@@ -48,9 +49,8 @@ public class IdentifierEditor extends HBox implements FieldEditorFX {
 
     private Optional<BibEntry> entry = Optional.empty();
 
-    public IdentifierEditor(Field field,
-                            SuggestionProvider<?> suggestionProvider,
-                            FieldCheckers fieldCheckers) {
+    public IdentifierEditor(
+            Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
 
         // Viewloader must be called after the viewmodel is loaded,
         // but we need the injected vars to create the viewmodels.
@@ -58,36 +58,65 @@ public IdentifierEditor(Field field,
 
         switch (field) {
             case DOI ->
-                    this.viewModel = new DoiIdentifierEditorViewModel(suggestionProvider, fieldCheckers, dialogService, taskExecutor, preferences, undoManager, stateManager);
+                    this.viewModel =
+                            new DoiIdentifierEditorViewModel(
+                                    suggestionProvider,
+                                    fieldCheckers,
+                                    dialogService,
+                                    taskExecutor,
+                                    preferences,
+                                    undoManager,
+                                    stateManager);
             case ISBN ->
-                    this.viewModel = new ISBNIdentifierEditorViewModel(suggestionProvider, fieldCheckers, dialogService, taskExecutor, preferences, undoManager, stateManager);
+                    this.viewModel =
+                            new ISBNIdentifierEditorViewModel(
+                                    suggestionProvider,
+                                    fieldCheckers,
+                                    dialogService,
+                                    taskExecutor,
+                                    preferences,
+                                    undoManager,
+                                    stateManager);
             case EPRINT ->
-                    this.viewModel = new EprintIdentifierEditorViewModel(suggestionProvider, fieldCheckers, dialogService, taskExecutor, preferences, undoManager);
+                    this.viewModel =
+                            new EprintIdentifierEditorViewModel(
+                                    suggestionProvider,
+                                    fieldCheckers,
+                                    dialogService,
+                                    taskExecutor,
+                                    preferences,
+                                    undoManager);
             // TODO: Add support for PMID
             case null, default -> {
                 assert field != null;
-                throw new IllegalStateException("Unable to instantiate a view model for identifier field editor '%s'".formatted(field.getDisplayName()));
+                throw new IllegalStateException(
+                        "Unable to instantiate a view model for identifier field editor '%s'"
+                                .formatted(field.getDisplayName()));
             }
         }
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
 
         textArea.textProperty().bindBidirectional(viewModel.textProperty());
 
         fetchInformationByIdentifierButton.setTooltip(
-                new Tooltip(Localization.lang("Get bibliographic data from %0", field.getDisplayName())));
+                new Tooltip(
+                        Localization.lang(
+                                "Get bibliographic data from %0", field.getDisplayName())));
         lookupIdentifierButton.setTooltip(
                 new Tooltip(Localization.lang("Look up %0", field.getDisplayName())));
 
         if (field.equals(DOI)) {
-            textArea.initContextMenu(EditorMenus.getDOIMenu(textArea, dialogService), preferences.getKeyBindingRepository());
+            textArea.initContextMenu(
+                    EditorMenus.getDOIMenu(textArea, dialogService),
+                    preferences.getKeyBindingRepository());
         } else {
-            textArea.initContextMenu(new DefaultMenu(textArea), preferences.getKeyBindingRepository());
+            textArea.initContextMenu(
+                    new DefaultMenu(textArea), preferences.getKeyBindingRepository());
         }
 
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
+        new EditorValidator(preferences)
+                .configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
     }
 
     public BaseIdentifierEditorViewModel<?> getViewModel() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoView.java b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoView.java
index 24712ff4a3b8..5e3a6ac6206d 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoView.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoView.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.fieldeditors.journalinfo;
 
-import java.util.Objects;
+import com.airhacks.afterburner.views.ViewLoader;
 
 import javafx.fxml.FXML;
 import javafx.scene.Node;
@@ -11,7 +11,7 @@
 import org.jabref.architecture.AllowedToUseClassGetResource;
 import org.jabref.logic.importer.FetcherException;
 
-import com.airhacks.afterburner.views.ViewLoader;
+import java.util.Objects;
 
 @AllowedToUseClassGetResource("JavaFX internally handles the passed URLs properly.")
 public class JournalInfoView extends VBox {
@@ -31,11 +31,12 @@ public class JournalInfoView extends VBox {
     public JournalInfoView() {
         this.viewModel = new JournalInfoViewModel();
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
 
-        this.getStylesheets().add(Objects.requireNonNull(JournalInfoView.class.getResource("JournalInfo.css")).toExternalForm());
+        this.getStylesheets()
+                .add(
+                        Objects.requireNonNull(JournalInfoView.class.getResource("JournalInfo.css"))
+                                .toExternalForm());
 
         title.textProperty().bind(viewModel.titleProperty());
         categories.textProperty().bind(viewModel.categoriesProperty());
@@ -45,7 +46,8 @@ public JournalInfoView() {
         bindChartProperties();
     }
 
-    public Node populateJournalInformation(String issn, String journalName) throws FetcherException {
+    public Node populateJournalInformation(String issn, String journalName)
+            throws FetcherException {
         viewModel.populateJournalInformation(issn, journalName);
         return this;
     }
@@ -59,7 +61,8 @@ private void bindChartProperties() {
         citableDocsPrevious3YearsChart.setData(viewModel.getCitableDocsPrevious3YearsData());
         citesOutgoingChart.setData(viewModel.getCitesOutgoingData());
         citesOutgoingPerDocChart.setData(viewModel.getCitesOutgoingPerDocData());
-        citesIncomingByRecentlyPublishedChart.setData(viewModel.getCitesIncomingByRecentlyPublishedData());
+        citesIncomingByRecentlyPublishedChart.setData(
+                viewModel.getCitesIncomingByRecentlyPublishedData());
         docsThisYearChart.setData(viewModel.getDocsThisYearData());
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoViewModel.java
index 671bcc3024b5..ea713a3fc52c 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoViewModel.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.fieldeditors.journalinfo;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -16,6 +11,11 @@
 import org.jabref.logic.importer.fetcher.JournalInformationFetcher;
 import org.jabref.logic.journals.JournalInformation;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class JournalInfoViewModel extends AbstractViewModel {
     private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper();
     private final ReadOnlyStringWrapper country = new ReadOnlyStringWrapper();
@@ -24,33 +24,46 @@ public class JournalInfoViewModel extends AbstractViewModel {
     private final ReadOnlyStringWrapper scimagoId = new ReadOnlyStringWrapper();
     private final ReadOnlyStringWrapper hIndex = new ReadOnlyStringWrapper();
     private final ReadOnlyStringWrapper issn = new ReadOnlyStringWrapper();
-    private final ObservableList<XYChart.Series<String, Double>> sjrData = FXCollections.observableArrayList();
-    private final ObservableList<XYChart.Series<String, Double>> snipData = FXCollections.observableArrayList();
-    private final ObservableList<XYChart.Series<String, Double>> citableDocsPrevious3YearsData = FXCollections.observableArrayList();
-    private final ObservableList<XYChart.Series<String, Double>> citesOutgoingData = FXCollections.observableArrayList();
-    private final ObservableList<XYChart.Series<String, Double>> citesOutgoingPerDocData = FXCollections.observableArrayList();
-    private final ObservableList<XYChart.Series<String, Double>> citesIncomingByRecentlyPublishedData = FXCollections.observableArrayList();
-    private final ObservableList<XYChart.Series<String, Double>> docsThisYearData = FXCollections.observableArrayList();
-
-    public void populateJournalInformation(String issn, String journalName) throws FetcherException {
-        Optional<JournalInformation> journalInformationOptional = new JournalInformationFetcher().getJournalInformation(issn, journalName);
-
-        journalInformationOptional.ifPresent(journalInformation -> {
-            setTitle(journalInformation.title());
-            setCountry(journalInformation.country());
-            setCategories(getFormattedCategories(journalInformation));
-            setPublisher(getFormattedPublisher(journalInformation));
-            setScimagoId(journalInformation.scimagoId());
-            sethIndex(journalInformation.hIndex());
-            setIssn(journalInformation.issn());
-            sjrData.add(convertToSeries(journalInformation.sjrArray()));
-            snipData.add(convertToSeries(journalInformation.snipArray()));
-            citableDocsPrevious3YearsData.add(convertToSeries(journalInformation.citableDocsPrevious3Years()));
-            citesOutgoingData.add(convertToSeries(journalInformation.citesOutgoing()));
-            citesOutgoingPerDocData.add(convertToSeries(journalInformation.citesOutgoingPerDoc()));
-            citesIncomingByRecentlyPublishedData.add(convertToSeries(journalInformation.citesIncomingByRecentlyPublished()));
-            docsThisYearData.add(convertToSeries(journalInformation.docsThisYear()));
-        });
+    private final ObservableList<XYChart.Series<String, Double>> sjrData =
+            FXCollections.observableArrayList();
+    private final ObservableList<XYChart.Series<String, Double>> snipData =
+            FXCollections.observableArrayList();
+    private final ObservableList<XYChart.Series<String, Double>> citableDocsPrevious3YearsData =
+            FXCollections.observableArrayList();
+    private final ObservableList<XYChart.Series<String, Double>> citesOutgoingData =
+            FXCollections.observableArrayList();
+    private final ObservableList<XYChart.Series<String, Double>> citesOutgoingPerDocData =
+            FXCollections.observableArrayList();
+    private final ObservableList<XYChart.Series<String, Double>>
+            citesIncomingByRecentlyPublishedData = FXCollections.observableArrayList();
+    private final ObservableList<XYChart.Series<String, Double>> docsThisYearData =
+            FXCollections.observableArrayList();
+
+    public void populateJournalInformation(String issn, String journalName)
+            throws FetcherException {
+        Optional<JournalInformation> journalInformationOptional =
+                new JournalInformationFetcher().getJournalInformation(issn, journalName);
+
+        journalInformationOptional.ifPresent(
+                journalInformation -> {
+                    setTitle(journalInformation.title());
+                    setCountry(journalInformation.country());
+                    setCategories(getFormattedCategories(journalInformation));
+                    setPublisher(getFormattedPublisher(journalInformation));
+                    setScimagoId(journalInformation.scimagoId());
+                    sethIndex(journalInformation.hIndex());
+                    setIssn(journalInformation.issn());
+                    sjrData.add(convertToSeries(journalInformation.sjrArray()));
+                    snipData.add(convertToSeries(journalInformation.snipArray()));
+                    citableDocsPrevious3YearsData.add(
+                            convertToSeries(journalInformation.citableDocsPrevious3Years()));
+                    citesOutgoingData.add(convertToSeries(journalInformation.citesOutgoing()));
+                    citesOutgoingPerDocData.add(
+                            convertToSeries(journalInformation.citesOutgoingPerDoc()));
+                    citesIncomingByRecentlyPublishedData.add(
+                            convertToSeries(journalInformation.citesIncomingByRecentlyPublished()));
+                    docsThisYearData.add(convertToSeries(journalInformation.docsThisYear()));
+                });
     }
 
     public String getTitle() {
@@ -157,7 +170,8 @@ public ObservableList<XYChart.Series<String, Double>> getCitesOutgoingPerDocData
         return citesOutgoingPerDocData;
     }
 
-    public ObservableList<XYChart.Series<String, Double>> getCitesIncomingByRecentlyPublishedData() {
+    public ObservableList<XYChart.Series<String, Double>>
+            getCitesIncomingByRecentlyPublishedData() {
         return citesIncomingByRecentlyPublishedData;
     }
 
@@ -168,15 +182,15 @@ public ObservableList<XYChart.Series<String, Double>> getDocsThisYearData() {
     public XYChart.Series<String, Double> convertToSeries(List<Pair<Integer, Double>> data) {
         XYChart.Series<String, Double> series = new XYChart.Series<>();
         data.stream()
-            .map(pair -> new XYChart.Data<>(pair.getKey().toString(), pair.getValue()))
-            .forEach(series.getData()::add);
+                .map(pair -> new XYChart.Data<>(pair.getKey().toString(), pair.getValue()))
+                .forEach(series.getData()::add);
         return series;
     }
 
     private static String getFormattedCategories(JournalInformation journalInformation) {
         return Arrays.stream(journalInformation.categories().split(","))
-                     .map(String::trim)
-                     .collect(Collectors.joining("\n"));
+                .map(String::trim)
+                .collect(Collectors.joining("\n"));
     }
 
     private static String getFormattedPublisher(JournalInformation journalInformation) {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/MonthEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/MonthEditorViewModel.java
index 01fc59e37192..f6a4d48ffb11 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/MonthEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/MonthEditorViewModel.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.fieldeditors.optioneditors;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.util.StringConverter;
 
 import org.jabref.gui.autocompleter.SuggestionProvider;
@@ -14,10 +9,20 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.swing.undo.UndoManager;
+
 public class MonthEditorViewModel extends OptionEditorViewModel<Month> {
     private BibDatabaseMode databaseMode;
 
-    public MonthEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, BibDatabaseMode databaseMode, FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public MonthEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            BibDatabaseMode databaseMode,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
         this.databaseMode = databaseMode;
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/OptionEditor.java b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/OptionEditor.java
index 2cf488335045..a8bdb5d4b444 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/OptionEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/OptionEditor.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.fieldeditors.optioneditors;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
 import javafx.scene.control.ComboBox;
@@ -11,8 +13,6 @@
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.model.entry.BibEntry;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
 /**
  * Field editor that provides various pre-defined options as a drop-down combobox.
  */
@@ -22,22 +22,27 @@ public class OptionEditor<T> extends HBox implements FieldEditorFX {
     @FXML private ComboBox<T> comboBox;
 
     public OptionEditor(OptionEditorViewModel<T> viewModel) {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
 
         this.viewModel = viewModel;
 
         comboBox.setConverter(viewModel.getStringConverter());
-        comboBox.setCellFactory(new ViewModelListCellFactory<T>().withText(viewModel::convertToDisplayText));
+        comboBox.setCellFactory(
+                new ViewModelListCellFactory<T>().withText(viewModel::convertToDisplayText));
         comboBox.getItems().setAll(viewModel.getItems());
         comboBox.getEditor().textProperty().bindBidirectional(viewModel.textProperty());
 
-        comboBox.getEditor().setOnContextMenuRequested(event -> {
-            ContextMenu contextMenu = new ContextMenu();
-            contextMenu.getItems().setAll(EditorContextAction.getDefaultContextMenuItems(comboBox.getEditor()));
-            contextMenu.show(comboBox, event.getScreenX(), event.getScreenY());
-        });
+        comboBox.getEditor()
+                .setOnContextMenuRequested(
+                        event -> {
+                            ContextMenu contextMenu = new ContextMenu();
+                            contextMenu
+                                    .getItems()
+                                    .setAll(
+                                            EditorContextAction.getDefaultContextMenuItems(
+                                                    comboBox.getEditor()));
+                            contextMenu.show(comboBox, event.getScreenX(), event.getScreenY());
+                        });
     }
 
     public OptionEditorViewModel<T> getViewModel() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/OptionEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/OptionEditorViewModel.java
index e365781cfb51..3505d6a0df98 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/OptionEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/OptionEditorViewModel.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.fieldeditors.optioneditors;
 
-import java.util.Collection;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.util.StringConverter;
 
 import org.jabref.gui.autocompleter.SuggestionProvider;
@@ -11,9 +7,17 @@
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.field.Field;
 
+import java.util.Collection;
+
+import javax.swing.undo.UndoManager;
+
 public abstract class OptionEditorViewModel<T> extends AbstractEditorViewModel {
 
-    public OptionEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public OptionEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
     }
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/CustomFieldEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/CustomFieldEditorViewModel.java
index 09524b2e23d8..b266982049d2 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/CustomFieldEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/CustomFieldEditorViewModel.java
@@ -1,19 +1,23 @@
 package org.jabref.gui.fieldeditors.optioneditors.mapbased;
 
+import org.jabref.gui.autocompleter.SuggestionProvider;
+import org.jabref.logic.integrity.FieldCheckers;
+import org.jabref.model.entry.field.Field;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.swing.undo.UndoManager;
 
-import org.jabref.gui.autocompleter.SuggestionProvider;
-import org.jabref.logic.integrity.FieldCheckers;
-import org.jabref.model.entry.field.Field;
-
 public class CustomFieldEditorViewModel extends StringMapBasedEditorViewModel {
 
-    public CustomFieldEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider,
-                                      FieldCheckers fieldCheckers, UndoManager undoManager, List<String> selectorValues) {
+    public CustomFieldEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager,
+            List<String> selectorValues) {
         super(field, suggestionProvider, fieldCheckers, undoManager, getMap(selectorValues));
     }
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/EditorTypeEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/EditorTypeEditorViewModel.java
index 960572f0079d..062725c38c7b 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/EditorTypeEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/EditorTypeEditorViewModel.java
@@ -1,24 +1,33 @@
 package org.jabref.gui.fieldeditors.optioneditors.mapbased;
 
-import java.util.Map;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 
+import java.util.Map;
+
+import javax.swing.undo.UndoManager;
+
 public class EditorTypeEditorViewModel extends StringMapBasedEditorViewModel {
 
-    public EditorTypeEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager) {
-        super(field, suggestionProvider, fieldCheckers, undoManager, Map.of(
-                "editor", Localization.lang("Editor"),
-                "compiler", Localization.lang("Compiler"),
-                "founder", Localization.lang("Founder"),
-                "continuator", Localization.lang("Continuator"),
-                "redactor", Localization.lang("Redactor"),
-                "reviser", Localization.lang("Reviser"),
-                "collaborator", Localization.lang("Collaborator")));
+    public EditorTypeEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager) {
+        super(
+                field,
+                suggestionProvider,
+                fieldCheckers,
+                undoManager,
+                Map.of(
+                        "editor", Localization.lang("Editor"),
+                        "compiler", Localization.lang("Compiler"),
+                        "founder", Localization.lang("Founder"),
+                        "continuator", Localization.lang("Continuator"),
+                        "redactor", Localization.lang("Redactor"),
+                        "reviser", Localization.lang("Reviser"),
+                        "collaborator", Localization.lang("Collaborator")));
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/GenderEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/GenderEditorViewModel.java
index 496b949bca44..0eeb613b353a 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/GenderEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/GenderEditorViewModel.java
@@ -1,24 +1,33 @@
 package org.jabref.gui.fieldeditors.optioneditors.mapbased;
 
-import java.util.Map;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 
+import java.util.Map;
+
+import javax.swing.undo.UndoManager;
+
 public class GenderEditorViewModel extends StringMapBasedEditorViewModel {
 
-    public GenderEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager) {
-        super(field, suggestionProvider, fieldCheckers, undoManager, Map.of(
-                "sf", Localization.lang("Female name"),
-                "sm", Localization.lang("Male name"),
-                "sn", Localization.lang("Neuter name"),
-                "pf", Localization.lang("Female names"),
-                "pm", Localization.lang("Male names"),
-                "pn", Localization.lang("Neuter names"),
-                "pp", Localization.lang("Mixed names")));
+    public GenderEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager) {
+        super(
+                field,
+                suggestionProvider,
+                fieldCheckers,
+                undoManager,
+                Map.of(
+                        "sf", Localization.lang("Female name"),
+                        "sm", Localization.lang("Male name"),
+                        "sn", Localization.lang("Neuter name"),
+                        "pf", Localization.lang("Female names"),
+                        "pm", Localization.lang("Male names"),
+                        "pn", Localization.lang("Neuter names"),
+                        "pp", Localization.lang("Mixed names")));
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/MapBasedEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/MapBasedEditorViewModel.java
index 95a00ac2180a..40670deff3b9 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/MapBasedEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/MapBasedEditorViewModel.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.fieldeditors.optioneditors.mapbased;
 
-import java.util.Collection;
-
-import javax.swing.undo.UndoManager;
+import com.google.common.collect.BiMap;
 
 import javafx.util.StringConverter;
 
@@ -10,11 +8,13 @@
 import org.jabref.gui.fieldeditors.optioneditors.OptionEditorViewModel;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.field.Field;
-
-import com.google.common.collect.BiMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collection;
+
+import javax.swing.undo.UndoManager;
+
 /**
  * View model for a field editor that shows various options backed by a map.
  */
@@ -22,7 +22,11 @@ public abstract class MapBasedEditorViewModel<T> extends OptionEditorViewModel<T
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MapBasedEditorViewModel.class);
 
-    public MapBasedEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public MapBasedEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
     }
 
@@ -63,7 +67,10 @@ protected T getValueFromString(String string) {
         try {
             return (T) string;
         } catch (ClassCastException ex) {
-            LOGGER.error("Could not cast string to type %1$s. Try overriding the method in a subclass and provide a conversion from string to the concrete type %1$s".formatted(string.getClass()), ex);
+            LOGGER.error(
+                    "Could not cast string to type %1$s. Try overriding the method in a subclass and provide a conversion from string to the concrete type %1$s"
+                            .formatted(string.getClass()),
+                    ex);
         }
         return null;
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/PaginationEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/PaginationEditorViewModel.java
index 81864bbe575d..463e5c8f3d6d 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/PaginationEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/PaginationEditorViewModel.java
@@ -1,24 +1,33 @@
 package org.jabref.gui.fieldeditors.optioneditors.mapbased;
 
-import java.util.Map;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 
+import java.util.Map;
+
+import javax.swing.undo.UndoManager;
+
 public class PaginationEditorViewModel extends StringMapBasedEditorViewModel {
 
-    public PaginationEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager) {
-        super(field, suggestionProvider, fieldCheckers, undoManager, Map.of(
-                "page", Localization.lang("Page"),
-                "column", Localization.lang("Column"),
-                "line", Localization.lang("Line"),
-                "verse", Localization.lang("Verse"),
-                "section", Localization.lang("Section"),
-                "paragraph", Localization.lang("Paragraph"),
-                "none", Localization.lang("None")));
+    public PaginationEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager) {
+        super(
+                field,
+                suggestionProvider,
+                fieldCheckers,
+                undoManager,
+                Map.of(
+                        "page", Localization.lang("Page"),
+                        "column", Localization.lang("Column"),
+                        "line", Localization.lang("Line"),
+                        "verse", Localization.lang("Verse"),
+                        "section", Localization.lang("Section"),
+                        "paragraph", Localization.lang("Paragraph"),
+                        "none", Localization.lang("None")));
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/PatentTypeEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/PatentTypeEditorViewModel.java
index c602e1db665e..20d6ffb528aa 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/PatentTypeEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/PatentTypeEditorViewModel.java
@@ -1,18 +1,22 @@
 package org.jabref.gui.fieldeditors.optioneditors.mapbased;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.swing.undo.UndoManager;
+
 public class PatentTypeEditorViewModel extends StringMapBasedEditorViewModel {
 
-    public PatentTypeEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public PatentTypeEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager) {
         super(field, suggestionProvider, fieldCheckers, undoManager, getMap());
     }
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/StringMapBasedEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/StringMapBasedEditorViewModel.java
index 9a6d6a7ae5eb..8ddfcfefbca0 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/StringMapBasedEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/StringMapBasedEditorViewModel.java
@@ -1,21 +1,26 @@
 package org.jabref.gui.fieldeditors.optioneditors.mapbased;
 
-import java.util.Map;
-
-import javax.swing.undo.UndoManager;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.field.Field;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import java.util.Map;
+
+import javax.swing.undo.UndoManager;
 
 public abstract class StringMapBasedEditorViewModel extends MapBasedEditorViewModel<String> {
 
     private BiMap<String, String> itemMap;
 
-    public StringMapBasedEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager, Map<String, String> entries) {
+    public StringMapBasedEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager,
+            Map<String, String> entries) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
 
         itemMap = HashBiMap.create(entries);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/TypeEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/TypeEditorViewModel.java
index 5b9b75f12433..d75f711a240c 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/TypeEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/TypeEditorViewModel.java
@@ -1,26 +1,35 @@
 package org.jabref.gui.fieldeditors.optioneditors.mapbased;
 
-import java.util.Map;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 
+import java.util.Map;
+
+import javax.swing.undo.UndoManager;
+
 public class TypeEditorViewModel extends StringMapBasedEditorViewModel {
 
-    public TypeEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager) {
-        super(field, suggestionProvider, fieldCheckers, undoManager, Map.of(
-                "mathesis", Localization.lang("Master's thesis"),
-                "phdthesis", Localization.lang("PhD thesis"),
-                "candthesis", Localization.lang("Candidate thesis"),
-                "bathesis", Localization.lang("Bachelor's thesis"),
-                "techreport", Localization.lang("Technical report"),
-                "resreport", Localization.lang("Research report"),
-                "software", Localization.lang("Software"),
-                "datacd", Localization.lang("Data CD"),
-                "audiocd", Localization.lang("Audio CD")));
+    public TypeEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager) {
+        super(
+                field,
+                suggestionProvider,
+                fieldCheckers,
+                undoManager,
+                Map.of(
+                        "mathesis", Localization.lang("Master's thesis"),
+                        "phdthesis", Localization.lang("PhD thesis"),
+                        "candthesis", Localization.lang("Candidate thesis"),
+                        "bathesis", Localization.lang("Bachelor's thesis"),
+                        "techreport", Localization.lang("Technical report"),
+                        "resreport", Localization.lang("Research report"),
+                        "software", Localization.lang("Software"),
+                        "datacd", Localization.lang("Data CD"),
+                        "audiocd", Localization.lang("Audio CD")));
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/YesNoEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/YesNoEditorViewModel.java
index 856f5372a799..664966b428d7 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/YesNoEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/optioneditors/mapbased/YesNoEditorViewModel.java
@@ -1,24 +1,32 @@
 package org.jabref.gui.fieldeditors.optioneditors.mapbased;
 
-import java.util.Map;
-
-import javax.swing.undo.UndoManager;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.field.Field;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import java.util.Map;
+
+import javax.swing.undo.UndoManager;
 
 public class YesNoEditorViewModel extends StringMapBasedEditorViewModel {
 
     private BiMap<String, String> itemMap = HashBiMap.create(2);
 
-    public YesNoEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager) {
-        super(field, suggestionProvider, fieldCheckers, undoManager, Map.of(
-                "yes", "Yes",
-                "no", "No"
-        ));
+    public YesNoEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            UndoManager undoManager) {
+        super(
+                field,
+                suggestionProvider,
+                fieldCheckers,
+                undoManager,
+                Map.of(
+                        "yes", "Yes",
+                        "no", "No"));
     }
 }
diff --git a/src/main/java/org/jabref/gui/frame/ExternalApplicationsPreferences.java b/src/main/java/org/jabref/gui/frame/ExternalApplicationsPreferences.java
index b2d7587afb1a..693d7eae0c01 100644
--- a/src/main/java/org/jabref/gui/frame/ExternalApplicationsPreferences.java
+++ b/src/main/java/org/jabref/gui/frame/ExternalApplicationsPreferences.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.frame;
 
-import java.util.Comparator;
-import java.util.Set;
-import java.util.TreeSet;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -16,6 +12,10 @@
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.logic.push.CitationCommandString;
 
+import java.util.Comparator;
+import java.util.Set;
+import java.util.TreeSet;
+
 public class ExternalApplicationsPreferences {
 
     private final StringProperty eMailSubject;
@@ -29,21 +29,25 @@ public class ExternalApplicationsPreferences {
     private final BooleanProperty useCustomFileBrowser;
     private final StringProperty customFileBrowserCommand;
     private final StringProperty kindleEmail;
-    private final ObservableSet<ExternalFileType> externalFileTypes = FXCollections.observableSet(new TreeSet<>(Comparator.comparing(ExternalFileType::getName)));
-
-    public ExternalApplicationsPreferences(String eMailSubject,
-                                           boolean shouldAutoOpenEmailAttachmentsFolder,
-                                           CitationCommandString citeCommand,
-                                           CitationCommandString defaultCiteCommand,
-                                           Set<ExternalFileType> externalFileTypes,
-                                           boolean useCustomTerminal,
-                                           String customTerminalCommand,
-                                           boolean useCustomFileBrowser,
-                                           String customFileBrowserCommand,
-                                           String kindleEmail) {
+    private final ObservableSet<ExternalFileType> externalFileTypes =
+            FXCollections.observableSet(
+                    new TreeSet<>(Comparator.comparing(ExternalFileType::getName)));
+
+    public ExternalApplicationsPreferences(
+            String eMailSubject,
+            boolean shouldAutoOpenEmailAttachmentsFolder,
+            CitationCommandString citeCommand,
+            CitationCommandString defaultCiteCommand,
+            Set<ExternalFileType> externalFileTypes,
+            boolean useCustomTerminal,
+            String customTerminalCommand,
+            boolean useCustomFileBrowser,
+            String customFileBrowserCommand,
+            String kindleEmail) {
 
         this.eMailSubject = new SimpleStringProperty(eMailSubject);
-        this.shouldAutoOpenEmailAttachmentsFolder = new SimpleBooleanProperty(shouldAutoOpenEmailAttachmentsFolder);
+        this.shouldAutoOpenEmailAttachmentsFolder =
+                new SimpleBooleanProperty(shouldAutoOpenEmailAttachmentsFolder);
         this.citeCommand = new SimpleObjectProperty<>(citeCommand);
         this.defaultCiteCommand = new SimpleObjectProperty<>(defaultCiteCommand);
         this.externalFileTypes.addAll(externalFileTypes);
diff --git a/src/main/java/org/jabref/gui/frame/FileHistoryMenu.java b/src/main/java/org/jabref/gui/frame/FileHistoryMenu.java
index 14124c83d554..740180363c53 100644
--- a/src/main/java/org/jabref/gui/frame/FileHistoryMenu.java
+++ b/src/main/java/org/jabref/gui/frame/FileHistoryMenu.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.frame;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-
 import javafx.beans.InvalidationListener;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
@@ -14,6 +11,9 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.io.FileHistory;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
+
 public class FileHistoryMenu extends Menu {
 
     protected final MenuItem clearRecentLibraries;
@@ -21,7 +21,10 @@ public class FileHistoryMenu extends Menu {
     private final DialogService dialogService;
     private final OpenDatabaseAction openDatabaseAction;
 
-    public FileHistoryMenu(FileHistory fileHistory, DialogService dialogService, OpenDatabaseAction openDatabaseAction) {
+    public FileHistoryMenu(
+            FileHistory fileHistory,
+            DialogService dialogService,
+            OpenDatabaseAction openDatabaseAction) {
         setText(Localization.lang("Recent libraries"));
 
         this.clearRecentLibraries = new MenuItem();
@@ -73,20 +76,20 @@ private void setItems() {
         for (int index = 0; index < history.size(); index++) {
             addItem(history.get(index), index + 1);
         }
-        getItems().addAll(
-                new SeparatorMenuItem(),
-                clearRecentLibraries
-        );
+        getItems().addAll(new SeparatorMenuItem(), clearRecentLibraries);
     }
 
     private void addItem(Path file, int num) {
         String number = Integer.toString(num);
         MenuItem item = new MenuItem(number + ". " + file);
-        // By default mnemonic parsing is set to true for anything that is Labeled, if an underscore character
-        // is present, it would create a key combination ALT+the succeeding character (at least for Windows OS)
+        // By default mnemonic parsing is set to true for anything that is Labeled, if an underscore
+        // character
+        // is present, it would create a key combination ALT+the succeeding character (at least for
+        // Windows OS)
         // and the underscore character will be parsed (deleted).
         // i.e if the file name was called "bib_test.bib", a key combination "ALT+t" will be created
-        // so to avoid this, mnemonic parsing should be set to false to print normally the underscore character.
+        // so to avoid this, mnemonic parsing should be set to false to print normally the
+        // underscore character.
         item.setMnemonicParsing(false);
         item.setOnAction(event -> openFile(file));
         getItems().add(item);
diff --git a/src/main/java/org/jabref/gui/frame/FrameDndHandler.java b/src/main/java/org/jabref/gui/frame/FrameDndHandler.java
index 424b35124884..b6a3f414031f 100644
--- a/src/main/java/org/jabref/gui/frame/FrameDndHandler.java
+++ b/src/main/java/org/jabref/gui/frame/FrameDndHandler.java
@@ -1,11 +1,6 @@
 package org.jabref.gui.frame;
 
-import java.io.File;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.scene.Node;
 import javafx.scene.Scene;
@@ -24,11 +19,16 @@
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.groups.GroupTreeNode;
-
-import com.tobiasdiez.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
 public class FrameDndHandler {
     private static final Logger LOGGER = LoggerFactory.getLogger(FrameDndHandler.class);
 
@@ -37,10 +37,11 @@ public class FrameDndHandler {
     private final Supplier<OpenDatabaseAction> openDatabaseAction;
     private final StateManager stateManager;
 
-    public FrameDndHandler(TabPane tabPane,
-                           Supplier<Scene> scene,
-                           Supplier<OpenDatabaseAction> openDatabaseAction,
-                           StateManager stateManager) {
+    public FrameDndHandler(
+            TabPane tabPane,
+            Supplier<Scene> scene,
+            Supplier<OpenDatabaseAction> openDatabaseAction,
+            StateManager stateManager) {
         this.tabPane = tabPane;
         this.scene = scene;
         this.openDatabaseAction = openDatabaseAction;
@@ -53,28 +54,46 @@ void initDragAndDrop() {
         Tab dndIndicator = new Tab(Localization.lang("Open files..."), null);
         dndIndicator.getStyleClass().add("drop");
 
-        EasyBind.subscribe(tabPane.skinProperty(), skin -> {
-            if (!(skin instanceof TabPaneSkin)) {
-                return;
-            }
-            // Add drag and drop listeners to JabRefFrame
-            scene.get().setOnDragOver(event -> onSceneDragOver(event, dndIndicator));
-            scene.get().setOnDragEntered(event -> {
-                // It is necessary to setOnDragOver for newly opened tabs
-                // drag'n'drop on tabs covered dnd on tabbedPane, so dnd on tabs should contain all dnds on tabbedPane
-                for (Node destinationTabNode : tabPane.lookupAll(".tab")) {
-                    destinationTabNode.setOnDragOver(tabDragEvent -> onTabDragOver(event, tabDragEvent, dndIndicator));
-                    destinationTabNode.setOnDragExited(tabDragEvent -> tabPane.getTabs().remove(dndIndicator));
-                    destinationTabNode.setOnDragDropped(tabDragEvent -> onTabDragDropped(destinationTabNode, tabDragEvent, dndIndicator));
-                }
-                event.consume();
-            });
-            scene.get().setOnDragExited(event -> tabPane.getTabs().remove(dndIndicator));
-            scene.get().setOnDragDropped(event -> onSceneDragDropped(event, dndIndicator));
-        });
+        EasyBind.subscribe(
+                tabPane.skinProperty(),
+                skin -> {
+                    if (!(skin instanceof TabPaneSkin)) {
+                        return;
+                    }
+                    // Add drag and drop listeners to JabRefFrame
+                    scene.get().setOnDragOver(event -> onSceneDragOver(event, dndIndicator));
+                    scene.get()
+                            .setOnDragEntered(
+                                    event -> {
+                                        // It is necessary to setOnDragOver for newly opened tabs
+                                        // drag'n'drop on tabs covered dnd on tabbedPane, so dnd on
+                                        // tabs should contain all dnds on tabbedPane
+                                        for (Node destinationTabNode : tabPane.lookupAll(".tab")) {
+                                            destinationTabNode.setOnDragOver(
+                                                    tabDragEvent ->
+                                                            onTabDragOver(
+                                                                    event,
+                                                                    tabDragEvent,
+                                                                    dndIndicator));
+                                            destinationTabNode.setOnDragExited(
+                                                    tabDragEvent ->
+                                                            tabPane.getTabs().remove(dndIndicator));
+                                            destinationTabNode.setOnDragDropped(
+                                                    tabDragEvent ->
+                                                            onTabDragDropped(
+                                                                    destinationTabNode,
+                                                                    tabDragEvent,
+                                                                    dndIndicator));
+                                        }
+                                        event.consume();
+                                    });
+                    scene.get().setOnDragExited(event -> tabPane.getTabs().remove(dndIndicator));
+                    scene.get().setOnDragDropped(event -> onSceneDragDropped(event, dndIndicator));
+                });
     }
 
-    private void onTabDragDropped(Node destinationTabNode, DragEvent tabDragEvent, Tab dndIndicator) {
+    private void onTabDragDropped(
+            Node destinationTabNode, DragEvent tabDragEvent, Tab dndIndicator) {
         Dragboard dragboard = tabDragEvent.getDragboard();
 
         if (hasBibFiles(dragboard)) {
@@ -92,8 +111,8 @@ private void onTabDragDropped(Node destinationTabNode, DragEvent tabDragEvent, T
 
             LibraryTab destinationLibraryTab = null;
             for (Tab libraryTab : tabPane.getTabs()) {
-                if (libraryTab.getId().equals(destinationTabNode.getId()) &&
-                        !tabPane.getSelectionModel().getSelectedItem().equals(libraryTab)) {
+                if (libraryTab.getId().equals(destinationTabNode.getId())
+                        && !tabPane.getSelectionModel().getSelectedItem().equals(libraryTab)) {
                     destinationLibraryTab = (LibraryTab) libraryTab;
                     break;
                 }
@@ -105,9 +124,10 @@ private void onTabDragDropped(Node destinationTabNode, DragEvent tabDragEvent, T
             }
 
             if (hasEntries(dragboard)) {
-                List<BibEntry> entryCopies = stateManager.getLocalDragboard().getBibEntries()
-                                                         .stream().map(entry -> (BibEntry) entry.clone())
-                                                         .toList();
+                List<BibEntry> entryCopies =
+                        stateManager.getLocalDragboard().getBibEntries().stream()
+                                .map(entry -> (BibEntry) entry.clone())
+                                .toList();
                 destinationLibraryTab.dropEntry(entryCopies);
             } else if (hasGroups(dragboard)) {
                 dropGroups(dragboard, destinationLibraryTab);
@@ -122,21 +142,16 @@ private void dropGroups(Dragboard dragboard, LibraryTab destinationLibraryTab) {
 
         copyRootNode(destinationLibraryTab);
 
-        GroupTreeNode destinationLibraryGroupRoot = destinationLibraryTab
-                .getBibDatabaseContext()
-                .getMetaData()
-                .getGroups().get();
+        GroupTreeNode destinationLibraryGroupRoot =
+                destinationLibraryTab.getBibDatabaseContext().getMetaData().getGroups().get();
 
-        GroupTreeNode groupsTreeNode = stateManager.getActiveDatabase().get()
-                                                   .getMetaData()
-                                                   .getGroups()
-                                                   .get();
+        GroupTreeNode groupsTreeNode =
+                stateManager.getActiveDatabase().get().getMetaData().getGroups().get();
 
         for (String pathToSource : groupPathToSources) {
-            GroupTreeNode groupTreeNodeToCopy = groupsTreeNode
-                    .getChildByPath(pathToSource)
-                    .get();
-            copyGroupTreeNode(destinationLibraryTab, destinationLibraryGroupRoot, groupTreeNodeToCopy);
+            GroupTreeNode groupTreeNodeToCopy = groupsTreeNode.getChildByPath(pathToSource).get();
+            copyGroupTreeNode(
+                    destinationLibraryTab, destinationLibraryGroupRoot, groupTreeNodeToCopy);
         }
     }
 
@@ -189,30 +204,32 @@ private void onSceneDragDropped(DragEvent event, Tab dndIndicator) {
 
     private void copyRootNode(LibraryTab destinationLibraryTab) {
         if (destinationLibraryTab.getBibDatabaseContext().getMetaData().getGroups().isPresent()
-            && stateManager.getActiveDatabase().isEmpty()) {
+                && stateManager.getActiveDatabase().isEmpty()) {
             return;
         }
 
         // a root (all entries) GroupTreeNode
-        GroupTreeNode currentLibraryGroupRoot = stateManager.getActiveDatabase().get()
-                                                            .getMetaData()
-                                                            .getGroups()
-                                                            .get()
-                                                            .copyNode();
+        GroupTreeNode currentLibraryGroupRoot =
+                stateManager.getActiveDatabase().get().getMetaData().getGroups().get().copyNode();
 
         // add currentLibraryGroupRoot to the Library if it does not have a root.
-        destinationLibraryTab.getBibDatabaseContext()
-                             .getMetaData()
-                             .setGroups(currentLibraryGroupRoot);
+        destinationLibraryTab
+                .getBibDatabaseContext()
+                .getMetaData()
+                .setGroups(currentLibraryGroupRoot);
     }
 
-    private void copyGroupTreeNode(LibraryTab destinationLibraryTab, GroupTreeNode parent, GroupTreeNode groupTreeNodeToCopy) {
+    private void copyGroupTreeNode(
+            LibraryTab destinationLibraryTab,
+            GroupTreeNode parent,
+            GroupTreeNode groupTreeNodeToCopy) {
         if (stateManager.getActiveDatabase().isEmpty()) {
             return;
         }
 
         List<BibEntry> allEntries = stateManager.getActiveDatabase().get().getEntries();
-        // add groupTreeNodeToCopy to the parent-- in the first run that will the source/main GroupTreeNode
+        // add groupTreeNodeToCopy to the parent-- in the first run that will the source/main
+        // GroupTreeNode
         GroupTreeNode copiedNode = parent.addSubgroup(groupTreeNodeToCopy.copyNode().getGroup());
         // add all entries of a groupTreeNode to the new library.
         destinationLibraryTab.dropEntry(groupTreeNodeToCopy.getEntriesInGroup(allEntries));
@@ -235,7 +252,10 @@ private List<Path> getBibFiles(Dragboard dragboard) {
         if (!dragboard.hasFiles()) {
             return Collections.emptyList();
         } else {
-            return dragboard.getFiles().stream().map(File::toPath).filter(FileUtil::isBibFile).collect(Collectors.toList());
+            return dragboard.getFiles().stream()
+                    .map(File::toPath)
+                    .filter(FileUtil::isBibFile)
+                    .collect(Collectors.toList());
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/frame/JabRefFrame.java b/src/main/java/org/jabref/gui/frame/JabRefFrame.java
index d38d511fe58d..97ee79081a75 100644
--- a/src/main/java/org/jabref/gui/frame/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/frame/JabRefFrame.java
@@ -1,12 +1,9 @@
 package org.jabref.gui.frame;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Supplier;
+import com.airhacks.afterburner.injection.Injector;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.EasyObservableList;
+import com.tobiasdiez.easybind.Subscription;
 
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
@@ -24,6 +21,7 @@
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 
+import org.fxmisc.richtext.CodeArea;
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
@@ -55,16 +53,18 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import com.airhacks.afterburner.injection.Injector;
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.EasyObservableList;
-import com.tobiasdiez.easybind.Subscription;
-import org.fxmisc.richtext.CodeArea;
 import org.jspecify.annotations.NonNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Supplier;
+
 /**
  * Represents the inner frame of the JabRef window
  */
@@ -83,7 +83,8 @@ public class JabRefFrame extends BorderPane implements LibraryTabContainer, UiMe
     private final FileHistoryMenu fileHistory;
     private final FrameDndHandler frameDndHandler;
 
-    @SuppressWarnings({"FieldCanBeLocal"}) private EasyObservableList<BibDatabaseContext> openDatabaseList;
+    @SuppressWarnings({"FieldCanBeLocal"})
+    private EasyObservableList<BibDatabaseContext> openDatabaseList;
 
     private final Stage mainStage;
     private final StateManager stateManager;
@@ -101,17 +102,18 @@ public class JabRefFrame extends BorderPane implements LibraryTabContainer, UiMe
 
     private Subscription dividerSubscription;
 
-    public JabRefFrame(Stage mainStage,
-                       DialogService dialogService,
-                       FileUpdateMonitor fileUpdateMonitor,
-                       GuiPreferences preferences,
-                       AiService aiService,
-                       ChatHistoryService chatHistoryService,
-                       StateManager stateManager,
-                       CountingUndoManager undoManager,
-                       BibEntryTypesManager entryTypesManager,
-                       ClipBoardManager clipBoardManager,
-                       TaskExecutor taskExecutor) {
+    public JabRefFrame(
+            Stage mainStage,
+            DialogService dialogService,
+            FileUpdateMonitor fileUpdateMonitor,
+            GuiPreferences preferences,
+            AiService aiService,
+            ChatHistoryService chatHistoryService,
+            StateManager stateManager,
+            CountingUndoManager undoManager,
+            BibEntryTypesManager entryTypesManager,
+            ClipBoardManager clipBoardManager,
+            TaskExecutor taskExecutor) {
         this.mainStage = mainStage;
         this.dialogService = dialogService;
         this.fileUpdateMonitor = fileUpdateMonitor;
@@ -127,63 +129,64 @@ public JabRefFrame(Stage mainStage,
         setId("frame");
 
         // Create components
-        this.viewModel = new JabRefFrameViewModel(
-                preferences,
-                aiService,
-                stateManager,
-                dialogService,
-                this,
-                entryTypesManager,
-                fileUpdateMonitor,
-                undoManager,
-                clipBoardManager,
-                taskExecutor);
+        this.viewModel =
+                new JabRefFrameViewModel(
+                        preferences,
+                        aiService,
+                        stateManager,
+                        dialogService,
+                        this,
+                        entryTypesManager,
+                        fileUpdateMonitor,
+                        undoManager,
+                        clipBoardManager,
+                        taskExecutor);
         Injector.setModelOrService(UiMessageHandler.class, viewModel);
 
-        this.frameDndHandler = new FrameDndHandler(
-                tabbedPane,
-                mainStage::getScene,
-                this::getOpenDatabaseAction,
-                stateManager);
-
-        this.globalSearchBar = new GlobalSearchBar(
-                this,
-                stateManager,
-                this.preferences,
-                undoManager,
-                dialogService,
-                SearchType.NORMAL_SEARCH);
-
-        this.sidePane = new SidePane(
-                this,
-                this.preferences,
-                chatHistoryService,
-                Injector.instantiateModelOrService(JournalAbbreviationRepository.class),
-                taskExecutor,
-                dialogService,
-                stateManager,
-                fileUpdateMonitor,
-                entryTypesManager,
-                clipBoardManager,
-                undoManager);
-
-        this.pushToApplicationCommand = new PushToApplicationCommand(
-                stateManager,
-                dialogService,
-                this.preferences,
-                taskExecutor);
-
-        this.fileHistory = new FileHistoryMenu(
-                this.preferences.getLastFilesOpenedPreferences().getFileHistory(),
-                dialogService,
-                getOpenDatabaseAction());
-        this.setOnKeyTyped(key -> {
-            if (this.fileHistory.isShowing()) {
-                if (this.fileHistory.openFileByKey(key)) {
-                    this.fileHistory.getParentMenu().hide();
-                }
-            }
-        });
+        this.frameDndHandler =
+                new FrameDndHandler(
+                        tabbedPane, mainStage::getScene, this::getOpenDatabaseAction, stateManager);
+
+        this.globalSearchBar =
+                new GlobalSearchBar(
+                        this,
+                        stateManager,
+                        this.preferences,
+                        undoManager,
+                        dialogService,
+                        SearchType.NORMAL_SEARCH);
+
+        this.sidePane =
+                new SidePane(
+                        this,
+                        this.preferences,
+                        chatHistoryService,
+                        Injector.instantiateModelOrService(JournalAbbreviationRepository.class),
+                        taskExecutor,
+                        dialogService,
+                        stateManager,
+                        fileUpdateMonitor,
+                        entryTypesManager,
+                        clipBoardManager,
+                        undoManager);
+
+        this.pushToApplicationCommand =
+                new PushToApplicationCommand(
+                        stateManager, dialogService, this.preferences, taskExecutor);
+
+        this.fileHistory =
+                new FileHistoryMenu(
+                        this.preferences.getLastFilesOpenedPreferences().getFileHistory(),
+                        dialogService,
+                        getOpenDatabaseAction());
+        this.setOnKeyTyped(
+                key -> {
+                    if (this.fileHistory.isShowing()) {
+                        if (this.fileHistory.openFileByKey(key)) {
+                            this.fileHistory.getParentMenu().hide();
+                        }
+                    }
+                });
 
         initLayout();
         initKeyBindings();
@@ -192,36 +195,38 @@ public JabRefFrame(Stage mainStage,
     }
 
     private void initLayout() {
-        MainToolBar mainToolBar = new MainToolBar(
-                this,
-                pushToApplicationCommand,
-                globalSearchBar,
-                dialogService,
-                stateManager,
-                preferences,
-                aiService,
-                fileUpdateMonitor,
-                taskExecutor,
-                entryTypesManager,
-                clipBoardManager,
-                undoManager);
-
-        MainMenu mainMenu = new MainMenu(
-                this,
-                fileHistory,
-                sidePane,
-                pushToApplicationCommand,
-                preferences,
-                stateManager,
-                fileUpdateMonitor,
-                taskExecutor,
-                dialogService,
-                Injector.instantiateModelOrService(JournalAbbreviationRepository.class),
-                entryTypesManager,
-                undoManager,
-                clipBoardManager,
-                this::getOpenDatabaseAction,
-                aiService);
+        MainToolBar mainToolBar =
+                new MainToolBar(
+                        this,
+                        pushToApplicationCommand,
+                        globalSearchBar,
+                        dialogService,
+                        stateManager,
+                        preferences,
+                        aiService,
+                        fileUpdateMonitor,
+                        taskExecutor,
+                        entryTypesManager,
+                        clipBoardManager,
+                        undoManager);
+
+        MainMenu mainMenu =
+                new MainMenu(
+                        this,
+                        fileHistory,
+                        sidePane,
+                        pushToApplicationCommand,
+                        preferences,
+                        stateManager,
+                        fileUpdateMonitor,
+                        taskExecutor,
+                        dialogService,
+                        Injector.instantiateModelOrService(JournalAbbreviationRepository.class),
+                        entryTypesManager,
+                        undoManager,
+                        clipBoardManager,
+                        this::getOpenDatabaseAction,
+                        aiService);
 
         VBox head = new VBox(mainMenu, mainToolBar);
         head.setSpacing(0d);
@@ -251,79 +256,147 @@ private void updateSidePane() {
 
     public void updateDividerPosition() {
         if (mainStage.isShowing() && !sidePane.getChildren().isEmpty()) {
-            splitPane.setDividerPositions(preferences.getGuiPreferences().getSidePaneWidth() / splitPane.getWidth());
-            dividerSubscription = EasyBind.listen(sidePane.widthProperty(), (obs, old, newVal) -> preferences.getGuiPreferences().setSidePaneWidth(newVal.doubleValue()));
+            splitPane.setDividerPositions(
+                    preferences.getGuiPreferences().getSidePaneWidth() / splitPane.getWidth());
+            dividerSubscription =
+                    EasyBind.listen(
+                            sidePane.widthProperty(),
+                            (obs, old, newVal) ->
+                                    preferences
+                                            .getGuiPreferences()
+                                            .setSidePaneWidth(newVal.doubleValue()));
         }
     }
 
     private void initKeyBindings() {
-        addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            Optional<KeyBinding> keyBinding = preferences.getKeyBindingRepository().mapToKeyBinding(event);
-            if (keyBinding.isPresent()) {
-                switch (keyBinding.get()) {
-                    case FOCUS_ENTRY_TABLE:
-                        getCurrentLibraryTab().getMainTable().requestFocus();
-                        event.consume();
-                        break;
-                    case FOCUS_GROUP_LIST:
-                        sidePane.getSidePaneComponent(SidePaneType.GROUPS).requestFocus();
-                        event.consume();
-                    break;
-                    case NEXT_LIBRARY:
-                        tabbedPane.getSelectionModel().selectNext();
-                        event.consume();
-                        break;
-                    case PREVIOUS_LIBRARY:
-                        tabbedPane.getSelectionModel().selectPrevious();
-                        event.consume();
-                        break;
-                    case SEARCH:
-                        globalSearchBar.requestFocus();
-                        break;
-                    case OPEN_GLOBAL_SEARCH_DIALOG:
-                        globalSearchBar.openGlobalSearchDialog();
-                        break;
-                    case NEW_ARTICLE:
-                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.Article, dialogService, preferences, stateManager).execute();
-                        break;
-                    case NEW_BOOK:
-                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.Book, dialogService, preferences, stateManager).execute();
-                        break;
-                    case NEW_INBOOK:
-                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.InBook, dialogService, preferences, stateManager).execute();
-                        break;
-                    case NEW_MASTERSTHESIS:
-                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.MastersThesis, dialogService, preferences, stateManager).execute();
-                        break;
-                    case NEW_PHDTHESIS:
-                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.PhdThesis, dialogService, preferences, stateManager).execute();
-                        break;
-                    case NEW_PROCEEDINGS:
-                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.Proceedings, dialogService, preferences, stateManager).execute();
-                        break;
-                    case NEW_TECHREPORT:
-                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.TechReport, dialogService, preferences, stateManager).execute();
-                        break;
-                    case NEW_UNPUBLISHED:
-                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.Unpublished, dialogService, preferences, stateManager).execute();
-                        break;
-                    case NEW_INPROCEEDINGS:
-                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.InProceedings, dialogService, preferences, stateManager).execute();
-                        break;
-                    case PASTE:
-                        if (OS.OS_X) { // Workaround for a jdk issue that executes paste twice when using cmd+v in a TextField
-                            // Extra workaround for CodeArea, which does not inherit from TextInputControl
-                            if (!(stateManager.getFocusOwner().isPresent() && (stateManager.getFocusOwner().get() instanceof CodeArea))) {
+        addEventFilter(
+                KeyEvent.KEY_PRESSED,
+                event -> {
+                    Optional<KeyBinding> keyBinding =
+                            preferences.getKeyBindingRepository().mapToKeyBinding(event);
+                    if (keyBinding.isPresent()) {
+                        switch (keyBinding.get()) {
+                            case FOCUS_ENTRY_TABLE:
+                                getCurrentLibraryTab().getMainTable().requestFocus();
                                 event.consume();
                                 break;
-                            }
-                            break;
+                            case FOCUS_GROUP_LIST:
+                                sidePane.getSidePaneComponent(SidePaneType.GROUPS).requestFocus();
+                                event.consume();
+                                break;
+                            case NEXT_LIBRARY:
+                                tabbedPane.getSelectionModel().selectNext();
+                                event.consume();
+                                break;
+                            case PREVIOUS_LIBRARY:
+                                tabbedPane.getSelectionModel().selectPrevious();
+                                event.consume();
+                                break;
+                            case SEARCH:
+                                globalSearchBar.requestFocus();
+                                break;
+                            case OPEN_GLOBAL_SEARCH_DIALOG:
+                                globalSearchBar.openGlobalSearchDialog();
+                                break;
+                            case NEW_ARTICLE:
+                                new NewEntryAction(
+                                                this::getCurrentLibraryTab,
+                                                StandardEntryType.Article,
+                                                dialogService,
+                                                preferences,
+                                                stateManager)
+                                        .execute();
+                                break;
+                            case NEW_BOOK:
+                                new NewEntryAction(
+                                                this::getCurrentLibraryTab,
+                                                StandardEntryType.Book,
+                                                dialogService,
+                                                preferences,
+                                                stateManager)
+                                        .execute();
+                                break;
+                            case NEW_INBOOK:
+                                new NewEntryAction(
+                                                this::getCurrentLibraryTab,
+                                                StandardEntryType.InBook,
+                                                dialogService,
+                                                preferences,
+                                                stateManager)
+                                        .execute();
+                                break;
+                            case NEW_MASTERSTHESIS:
+                                new NewEntryAction(
+                                                this::getCurrentLibraryTab,
+                                                StandardEntryType.MastersThesis,
+                                                dialogService,
+                                                preferences,
+                                                stateManager)
+                                        .execute();
+                                break;
+                            case NEW_PHDTHESIS:
+                                new NewEntryAction(
+                                                this::getCurrentLibraryTab,
+                                                StandardEntryType.PhdThesis,
+                                                dialogService,
+                                                preferences,
+                                                stateManager)
+                                        .execute();
+                                break;
+                            case NEW_PROCEEDINGS:
+                                new NewEntryAction(
+                                                this::getCurrentLibraryTab,
+                                                StandardEntryType.Proceedings,
+                                                dialogService,
+                                                preferences,
+                                                stateManager)
+                                        .execute();
+                                break;
+                            case NEW_TECHREPORT:
+                                new NewEntryAction(
+                                                this::getCurrentLibraryTab,
+                                                StandardEntryType.TechReport,
+                                                dialogService,
+                                                preferences,
+                                                stateManager)
+                                        .execute();
+                                break;
+                            case NEW_UNPUBLISHED:
+                                new NewEntryAction(
+                                                this::getCurrentLibraryTab,
+                                                StandardEntryType.Unpublished,
+                                                dialogService,
+                                                preferences,
+                                                stateManager)
+                                        .execute();
+                                break;
+                            case NEW_INPROCEEDINGS:
+                                new NewEntryAction(
+                                                this::getCurrentLibraryTab,
+                                                StandardEntryType.InProceedings,
+                                                dialogService,
+                                                preferences,
+                                                stateManager)
+                                        .execute();
+                                break;
+                            case PASTE:
+                                if (OS.OS_X) { // Workaround for a jdk issue that executes paste
+                                               // twice when using cmd+v in a TextField
+                                    // Extra workaround for CodeArea, which does not inherit from
+                                    // TextInputControl
+                                    if (!(stateManager.getFocusOwner().isPresent()
+                                            && (stateManager.getFocusOwner().get()
+                                                    instanceof CodeArea))) {
+                                        event.consume();
+                                        break;
+                                    }
+                                    break;
+                                }
+                                break;
+                            default:
                         }
-                        break;
-                    default:
-                }
-            }
-        });
+                    }
+                });
     }
 
     private void initBindings() {
@@ -331,69 +404,98 @@ private void initBindings() {
         FilteredList<Tab> filteredTabs = new FilteredList<>(tabbedPane.getTabs());
         filteredTabs.setPredicate(LibraryTab.class::isInstance);
 
-        // This variable cannot be inlined, since otherwise the list created by EasyBind is being garbage collected
-        openDatabaseList = EasyBind.map(filteredTabs, tab -> ((LibraryTab) tab).getBibDatabaseContext());
+        // This variable cannot be inlined, since otherwise the list created by EasyBind is being
+        // garbage collected
+        openDatabaseList =
+                EasyBind.map(filteredTabs, tab -> ((LibraryTab) tab).getBibDatabaseContext());
         EasyBind.bindContent(stateManager.getOpenDatabases(), openDatabaseList);
 
-        // the binding for stateManager.activeDatabaseProperty() is at org.jabref.gui.LibraryTab.onDatabaseLoadingSucceed
+        // the binding for stateManager.activeDatabaseProperty() is at
+        // org.jabref.gui.LibraryTab.onDatabaseLoadingSucceed
 
         // Subscribe to the search
-        EasyBind.subscribe(stateManager.activeSearchQuery(SearchType.NORMAL_SEARCH), query -> {
-            if (getCurrentLibraryTab() != null) {
-                getCurrentLibraryTab().searchQueryProperty().set(query);
-            }
-        });
+        EasyBind.subscribe(
+                stateManager.activeSearchQuery(SearchType.NORMAL_SEARCH),
+                query -> {
+                    if (getCurrentLibraryTab() != null) {
+                        getCurrentLibraryTab().searchQueryProperty().set(query);
+                    }
+                });
 
         // Wait for the scene to be created, otherwise focusOwnerProperty is not provided
-        Platform.runLater(() -> stateManager.focusOwnerProperty().bind(
-                EasyBind.map(mainStage.getScene().focusOwnerProperty(), Optional::ofNullable)));
-
-        EasyBind.subscribe(tabbedPane.getSelectionModel().selectedItemProperty(), selectedTab -> {
-            if (selectedTab instanceof LibraryTab libraryTab) {
-                stateManager.setActiveDatabase(libraryTab.getBibDatabaseContext());
-                stateManager.activeTabProperty().set(Optional.of(libraryTab));
-            } else if (selectedTab == null) {
-                // All databases are closed
-                stateManager.setActiveDatabase(null);
-                stateManager.activeTabProperty().set(Optional.empty());
-            }
-        });
+        Platform.runLater(
+                () ->
+                        stateManager
+                                .focusOwnerProperty()
+                                .bind(
+                                        EasyBind.map(
+                                                mainStage.getScene().focusOwnerProperty(),
+                                                Optional::ofNullable)));
+
+        EasyBind.subscribe(
+                tabbedPane.getSelectionModel().selectedItemProperty(),
+                selectedTab -> {
+                    if (selectedTab instanceof LibraryTab libraryTab) {
+                        stateManager.setActiveDatabase(libraryTab.getBibDatabaseContext());
+                        stateManager.activeTabProperty().set(Optional.of(libraryTab));
+                    } else if (selectedTab == null) {
+                        // All databases are closed
+                        stateManager.setActiveDatabase(null);
+                        stateManager.activeTabProperty().set(Optional.empty());
+                    }
+                });
 
         /*
          * The following state listener makes sure focus is registered with the
          * correct database when the user switches tabs. Without this,
          * cut/paste/copy operations would sometimes occur in the wrong tab.
          */
-        EasyBind.subscribe(tabbedPane.getSelectionModel().selectedItemProperty(), tab -> {
-            if (!(tab instanceof LibraryTab libraryTab)) {
-                stateManager.setSelectedEntries(Collections.emptyList());
-                mainStage.titleProperty().unbind();
-                mainStage.setTitle(FRAME_TITLE);
-                return;
-            }
-
-            // Poor-mans binding to global state
-            stateManager.setSelectedEntries(libraryTab.getSelectedEntries());
-
-            // Update active search query when switching between databases
-            if (preferences.getSearchPreferences().shouldKeepSearchString()) {
-                libraryTab.searchQueryProperty().set(stateManager.activeSearchQuery(SearchType.NORMAL_SEARCH).get());
-            } else {
-                stateManager.activeSearchQuery(SearchType.NORMAL_SEARCH).set(libraryTab.searchQueryProperty().get());
-            }
-            stateManager.searchResultSize(SearchType.NORMAL_SEARCH).bind(libraryTab.resultSizeProperty());
-
-            // Update search autocompleter with information for the correct database:
-            globalSearchBar.setAutoCompleter(libraryTab.getAutoCompleter());
-
-            libraryTab.getMainTable().requestFocus();
+        EasyBind.subscribe(
+                tabbedPane.getSelectionModel().selectedItemProperty(),
+                tab -> {
+                    if (!(tab instanceof LibraryTab libraryTab)) {
+                        stateManager.setSelectedEntries(Collections.emptyList());
+                        mainStage.titleProperty().unbind();
+                        mainStage.setTitle(FRAME_TITLE);
+                        return;
+                    }
 
-            // Set window title - copy tab title
-            StringBinding windowTitle = Bindings.createStringBinding(
-                    () -> libraryTab.textProperty().getValue() + " – " + FRAME_TITLE, // not a minus, but codepoint 2013
-                    libraryTab.textProperty());
-            mainStage.titleProperty().bind(windowTitle);
-        });
+                    // Poor-mans binding to global state
+                    stateManager.setSelectedEntries(libraryTab.getSelectedEntries());
+
+                    // Update active search query when switching between databases
+                    if (preferences.getSearchPreferences().shouldKeepSearchString()) {
+                        libraryTab
+                                .searchQueryProperty()
+                                .set(
+                                        stateManager
+                                                .activeSearchQuery(SearchType.NORMAL_SEARCH)
+                                                .get());
+                    } else {
+                        stateManager
+                                .activeSearchQuery(SearchType.NORMAL_SEARCH)
+                                .set(libraryTab.searchQueryProperty().get());
+                    }
+                    stateManager
+                            .searchResultSize(SearchType.NORMAL_SEARCH)
+                            .bind(libraryTab.resultSizeProperty());
+
+                    // Update search autocompleter with information for the correct database:
+                    globalSearchBar.setAutoCompleter(libraryTab.getAutoCompleter());
+
+                    libraryTab.getMainTable().requestFocus();
+
+                    // Set window title - copy tab title
+                    StringBinding windowTitle =
+                            Bindings.createStringBinding(
+                                    () ->
+                                            libraryTab.textProperty().getValue()
+                                                    + " – "
+                                                    + FRAME_TITLE, // not a minus, but codepoint
+                                                                   // 2013
+                                    libraryTab.textProperty());
+                    mainStage.titleProperty().bind(windowTitle);
+                });
     }
 
     /* ************************************************************************
@@ -407,9 +509,9 @@ private void initBindings() {
      */
     public @NonNull List<LibraryTab> getLibraryTabs() {
         return tabbedPane.getTabs().stream()
-                         .filter(LibraryTab.class::isInstance)
-                         .map(LibraryTab.class::cast)
-                         .toList();
+                .filter(LibraryTab.class::isInstance)
+                .map(LibraryTab.class::cast)
+                .toList();
     }
 
     /**
@@ -433,17 +535,18 @@ public void showLibraryTab(@NonNull LibraryTab libraryTab) {
      */
     public void addTab(@NonNull BibDatabaseContext databaseContext, boolean raisePanel) {
         Objects.requireNonNull(databaseContext);
-        LibraryTab libraryTab = LibraryTab.createLibraryTab(
-                databaseContext,
-                this,
-                dialogService,
-                preferences,
-                stateManager,
-                fileUpdateMonitor,
-                entryTypesManager,
-                undoManager,
-                clipBoardManager,
-                taskExecutor);
+        LibraryTab libraryTab =
+                LibraryTab.createLibraryTab(
+                        databaseContext,
+                        this,
+                        dialogService,
+                        preferences,
+                        stateManager,
+                        fileUpdateMonitor,
+                        entryTypesManager,
+                        undoManager,
+                        clipBoardManager,
+                        taskExecutor);
         addTab(libraryTab, raisePanel);
     }
 
@@ -461,14 +564,32 @@ private ContextMenu createTabContextMenuFor(LibraryTab tab) {
         ContextMenu contextMenu = new ContextMenu();
         ActionFactory factory = new ActionFactory();
 
-        contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new LibraryPropertiesAction(tab::getBibDatabaseContext, stateManager)),
-                factory.createMenuItem(StandardActions.OPEN_DATABASE_FOLDER, new OpenDatabaseFolder(tab::getBibDatabaseContext)),
-                factory.createMenuItem(StandardActions.OPEN_CONSOLE, new OpenConsoleAction(tab::getBibDatabaseContext, stateManager, preferences, dialogService)),
-                new SeparatorMenuItem(),
-                factory.createMenuItem(StandardActions.CLOSE_LIBRARY, new CloseDatabaseAction(this, tab, stateManager)),
-                factory.createMenuItem(StandardActions.CLOSE_OTHER_LIBRARIES, new CloseOthersDatabaseAction(tab)),
-                factory.createMenuItem(StandardActions.CLOSE_ALL_LIBRARIES, new CloseAllDatabaseAction()));
+        contextMenu
+                .getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.LIBRARY_PROPERTIES,
+                                new LibraryPropertiesAction(
+                                        tab::getBibDatabaseContext, stateManager)),
+                        factory.createMenuItem(
+                                StandardActions.OPEN_DATABASE_FOLDER,
+                                new OpenDatabaseFolder(tab::getBibDatabaseContext)),
+                        factory.createMenuItem(
+                                StandardActions.OPEN_CONSOLE,
+                                new OpenConsoleAction(
+                                        tab::getBibDatabaseContext,
+                                        stateManager,
+                                        preferences,
+                                        dialogService)),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.CLOSE_LIBRARY,
+                                new CloseDatabaseAction(this, tab, stateManager)),
+                        factory.createMenuItem(
+                                StandardActions.CLOSE_OTHER_LIBRARIES,
+                                new CloseOthersDatabaseAction(tab)),
+                        factory.createMenuItem(
+                                StandardActions.CLOSE_ALL_LIBRARIES, new CloseAllDatabaseAction()));
 
         return contextMenu;
     }
@@ -483,10 +604,8 @@ public boolean closeTab(LibraryTab tab) {
 
     public boolean closeTabs(@NonNull List<LibraryTab> tabs) {
         // Only accept library tabs that are shown in the tab container
-        List<LibraryTab> toClose = tabs.stream()
-                .distinct()
-                .filter(getLibraryTabs()::contains)
-                .toList();
+        List<LibraryTab> toClose =
+                tabs.stream().distinct().filter(getLibraryTabs()::contains).toList();
 
         if (toClose.isEmpty()) {
             // Nothing to do
@@ -553,7 +672,7 @@ public void handleUiCommands(List<UiCommand> uiCommands) {
     /**
      * The action concerned with closing the window.
      */
-    static protected class CloseAction extends SimpleCommand {
+    protected static class CloseAction extends SimpleCommand {
 
         private final JabRefFrame frame;
 
@@ -569,12 +688,15 @@ public void execute() {
         }
     }
 
-    static protected class CloseDatabaseAction extends SimpleCommand {
+    protected static class CloseDatabaseAction extends SimpleCommand {
 
         private final LibraryTabContainer tabContainer;
         private final LibraryTab libraryTab;
 
-        public CloseDatabaseAction(LibraryTabContainer tabContainer, LibraryTab libraryTab, StateManager stateManager) {
+        public CloseDatabaseAction(
+                LibraryTabContainer tabContainer,
+                LibraryTab libraryTab,
+                StateManager stateManager) {
             this.tabContainer = tabContainer;
             this.libraryTab = libraryTab;
             this.executable.bind(ActionHelper.needsDatabase(stateManager));
@@ -589,17 +711,18 @@ public CloseDatabaseAction(LibraryTabContainer tabContainer, StateManager stateM
 
         @Override
         public void execute() {
-            Platform.runLater(() -> {
-                if (libraryTab == null) {
-                    if (tabContainer.getCurrentLibraryTab() == null) {
-                        LOGGER.error("No library tab to close");
-                        return;
-                    }
-                    tabContainer.closeTab(tabContainer.getCurrentLibraryTab());
-                } else {
-                    tabContainer.closeTab(libraryTab);
-                }
-            });
+            Platform.runLater(
+                    () -> {
+                        if (libraryTab == null) {
+                            if (tabContainer.getCurrentLibraryTab() == null) {
+                                LOGGER.error("No library tab to close");
+                                return;
+                            }
+                            tabContainer.closeTab(tabContainer.getCurrentLibraryTab());
+                        } else {
+                            tabContainer.closeTab(libraryTab);
+                        }
+                    });
         }
     }
 
@@ -644,13 +767,19 @@ public OpenDatabaseFolder(Supplier<BibDatabaseContext> databaseContext) {
 
         @Override
         public void execute() {
-            Optional.of(databaseContext.get()).flatMap(BibDatabaseContext::getDatabasePath).ifPresent(path -> {
-                try {
-                    NativeDesktop.openFolderAndSelectFile(path, preferences.getExternalApplicationsPreferences(), dialogService);
-                } catch (IOException e) {
-                    LOGGER.info("Could not open folder", e);
-                }
-            });
+            Optional.of(databaseContext.get())
+                    .flatMap(BibDatabaseContext::getDatabasePath)
+                    .ifPresent(
+                            path -> {
+                                try {
+                                    NativeDesktop.openFolderAndSelectFile(
+                                            path,
+                                            preferences.getExternalApplicationsPreferences(),
+                                            dialogService);
+                                } catch (IOException e) {
+                                    LOGGER.info("Could not open folder", e);
+                                }
+                            });
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/frame/JabRefFrameViewModel.java b/src/main/java/org/jabref/gui/frame/JabRefFrameViewModel.java
index dceb39f05ccc..d4e1e9563d0e 100644
--- a/src/main/java/org/jabref/gui/frame/JabRefFrameViewModel.java
+++ b/src/main/java/org/jabref/gui/frame/JabRefFrameViewModel.java
@@ -1,17 +1,5 @@
 package org.jabref.gui.frame;
 
-import java.nio.file.Path;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableBooleanValue;
 import javafx.scene.control.ButtonType;
@@ -41,10 +29,21 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.file.Path;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
+
 public class JabRefFrameViewModel implements UiMessageHandler {
     private static final Logger LOGGER = LoggerFactory.getLogger(JabRefFrameViewModel.class);
 
@@ -59,16 +58,17 @@ public class JabRefFrameViewModel implements UiMessageHandler {
     private final ClipBoardManager clipBoardManager;
     private final TaskExecutor taskExecutor;
 
-    public JabRefFrameViewModel(GuiPreferences preferences,
-                                AiService aiService,
-                                StateManager stateManager,
-                                DialogService dialogService,
-                                LibraryTabContainer tabContainer,
-                                BibEntryTypesManager entryTypesManager,
-                                FileUpdateMonitor fileUpdateMonitor,
-                                UndoManager undoManager,
-                                ClipBoardManager clipBoardManager,
-                                TaskExecutor taskExecutor) {
+    public JabRefFrameViewModel(
+            GuiPreferences preferences,
+            AiService aiService,
+            StateManager stateManager,
+            DialogService dialogService,
+            LibraryTabContainer tabContainer,
+            BibEntryTypesManager entryTypesManager,
+            FileUpdateMonitor fileUpdateMonitor,
+            UndoManager undoManager,
+            ClipBoardManager clipBoardManager,
+            TaskExecutor taskExecutor) {
         this.preferences = preferences;
         this.aiService = aiService;
         this.stateManager = stateManager;
@@ -83,7 +83,8 @@ public JabRefFrameViewModel(GuiPreferences preferences,
 
     void storeLastOpenedFiles(List<Path> filenames, Path focusedDatabase) {
         if (preferences.getWorkspacePreferences().shouldOpenLastEdited()) {
-            // Here we store the names of all current files. If there is no current file, we remove any
+            // Here we store the names of all current files. If there is no current file, we remove
+            // any
             // previously stored filename.
             if (filenames.isEmpty()) {
                 preferences.getLastFilesOpenedPreferences().getLastFilesOpened().clear();
@@ -103,34 +104,42 @@ public boolean close() {
         // Ask if the user really wants to close, if there are still background tasks running
         // The background tasks may make changes themselves that need saving.
         if (stateManager.getAnyTasksThatWillNotBeRecoveredRunning().getValue()) {
-            Optional<ButtonType> shouldClose = dialogService.showBackgroundProgressDialogAndWait(
-                    Localization.lang("Please wait..."),
-                    Localization.lang("Waiting for background tasks to finish. Quit anyway?"),
-                    stateManager);
+            Optional<ButtonType> shouldClose =
+                    dialogService.showBackgroundProgressDialogAndWait(
+                            Localization.lang("Please wait..."),
+                            Localization.lang(
+                                    "Waiting for background tasks to finish. Quit anyway?"),
+                            stateManager);
             if (!(shouldClose.isPresent() && (shouldClose.get() == ButtonType.YES))) {
                 return false;
             }
         }
 
         // Read the opened and focused databases before closing them
-        List<Path> openedLibraries = tabContainer.getLibraryTabs().stream()
-                                          .map(LibraryTab::getBibDatabaseContext)
-                                          .map(BibDatabaseContext::getDatabasePath)
-                                          .flatMap(Optional::stream)
-                                          .toList();
-        Path focusedLibraries = Optional.ofNullable(tabContainer.getCurrentLibraryTab())
-                                        .map(LibraryTab::getBibDatabaseContext)
-                                        .flatMap(BibDatabaseContext::getDatabasePath)
-                                        .orElse(null);
-
-        // Then ask if the user really wants to close, if the library has not been saved since last save.
+        List<Path> openedLibraries =
+                tabContainer.getLibraryTabs().stream()
+                        .map(LibraryTab::getBibDatabaseContext)
+                        .map(BibDatabaseContext::getDatabasePath)
+                        .flatMap(Optional::stream)
+                        .toList();
+        Path focusedLibraries =
+                Optional.ofNullable(tabContainer.getCurrentLibraryTab())
+                        .map(LibraryTab::getBibDatabaseContext)
+                        .flatMap(BibDatabaseContext::getDatabasePath)
+                        .orElse(null);
+
+        // Then ask if the user really wants to close, if the library has not been saved since last
+        // save.
         if (!tabContainer.closeTabs(tabContainer.getLibraryTabs())) {
             return false;
         }
 
-        storeLastOpenedFiles(openedLibraries, focusedLibraries); // store only if successfully having closed the libraries
+        storeLastOpenedFiles(
+                openedLibraries,
+                focusedLibraries); // store only if successfully having closed the libraries
 
-        ProcessingLibraryDialog processingLibraryDialog = new ProcessingLibraryDialog(dialogService);
+        ProcessingLibraryDialog processingLibraryDialog =
+                new ProcessingLibraryDialog(dialogService);
         processingLibraryDialog.showAndWait(tabContainer.getLibraryTabs());
 
         return true;
@@ -162,47 +171,53 @@ public void handleUiCommands(List<UiCommand> uiCommands) {
 
         // Handle automatically setting file links
         uiCommands.stream()
-                  .filter(UiCommand.AutoSetFileLinks.class::isInstance).findAny()
-                  .map(UiCommand.AutoSetFileLinks.class::cast)
-                  .ifPresent(autoSetFileLinks -> autoSetFileLinks(autoSetFileLinks.parserResults()));
+                .filter(UiCommand.AutoSetFileLinks.class::isInstance)
+                .findAny()
+                .map(UiCommand.AutoSetFileLinks.class::cast)
+                .ifPresent(autoSetFileLinks -> autoSetFileLinks(autoSetFileLinks.parserResults()));
 
         // Handle jumpToEntry
         // Needs to go last, because it requires all libraries opened
         uiCommands.stream()
-                  .filter(UiCommand.JumpToEntryKey.class::isInstance)
-                  .map(UiCommand.JumpToEntryKey.class::cast)
-                  .map(UiCommand.JumpToEntryKey::citationKey)
-                  .filter(Objects::nonNull)
-                  .findAny().ifPresent(entryKey -> {
-                      LOGGER.debug("Jump to entry {} requested", entryKey);
-                      // tabs must be present and contents async loaded for an entry to be selected
-                      waitForLoadingFinished(() -> jumpToEntry(entryKey));
-                  });
+                .filter(UiCommand.JumpToEntryKey.class::isInstance)
+                .map(UiCommand.JumpToEntryKey.class::cast)
+                .map(UiCommand.JumpToEntryKey::citationKey)
+                .filter(Objects::nonNull)
+                .findAny()
+                .ifPresent(
+                        entryKey -> {
+                            LOGGER.debug("Jump to entry {} requested", entryKey);
+                            // tabs must be present and contents async loaded for an entry to be
+                            // selected
+                            waitForLoadingFinished(() -> jumpToEntry(entryKey));
+                        });
     }
 
     private void openDatabases(List<ParserResult> parserResults) {
         final List<ParserResult> toOpenTab = new ArrayList<>();
 
         // Remove invalid databases
-        List<ParserResult> invalidDatabases = parserResults.stream()
-                                                           .filter(ParserResult::isInvalid)
-                                                           .toList();
+        List<ParserResult> invalidDatabases =
+                parserResults.stream().filter(ParserResult::isInvalid).toList();
         final List<ParserResult> failed = new ArrayList<>(invalidDatabases);
         parserResults.removeAll(invalidDatabases);
 
         // passed file (we take the first one) should be focused
-        Path focusedFile = parserResults.stream()
-                                        .findFirst()
-                                        .flatMap(ParserResult::getPath)
-                                        .orElse(preferences.getLastFilesOpenedPreferences()
-                                                           .getLastFocusedFile())
-                                        .toAbsolutePath();
+        Path focusedFile =
+                parserResults.stream()
+                        .findFirst()
+                        .flatMap(ParserResult::getPath)
+                        .orElse(preferences.getLastFilesOpenedPreferences().getLastFocusedFile())
+                        .toAbsolutePath();
 
         // Add all bibDatabases databases to the frame:
         boolean first = false;
         for (ParserResult parserResult : parserResults) {
             // Define focused tab
-            if (parserResult.getPath().filter(path -> path.toAbsolutePath().equals(focusedFile)).isPresent()) {
+            if (parserResult
+                    .getPath()
+                    .filter(path -> path.toAbsolutePath().equals(focusedFile))
+                    .isPresent()) {
                 first = true;
             }
 
@@ -220,11 +235,10 @@ private void openDatabases(List<ParserResult> parserResults) {
                             undoManager,
                             clipBoardManager,
                             taskExecutor);
-                } catch (
-                        SQLException |
-                        DatabaseNotSupportedException |
-                        InvalidDBMSConnectionPropertiesException |
-                        NotASharedDatabaseException e) {
+                } catch (SQLException
+                        | DatabaseNotSupportedException
+                        | InvalidDBMSConnectionPropertiesException
+                        | NotASharedDatabaseException e) {
                     LOGGER.error("Connection error", e);
                     dialogService.showErrorDialogAndWait(
                             Localization.lang("Connection error"),
@@ -249,16 +263,23 @@ private void openDatabases(List<ParserResult> parserResults) {
         }
 
         for (ParserResult parserResult : failed) {
-            String message = Localization.lang("Error opening file '%0'",
-                    parserResult.getPath().map(Path::toString).orElse("(File name unknown)")) + "\n" +
-                    parserResult.getErrorMessage();
+            String message =
+                    Localization.lang(
+                                    "Error opening file '%0'",
+                                    parserResult
+                                            .getPath()
+                                            .map(Path::toString)
+                                            .orElse("(File name unknown)"))
+                            + "\n"
+                            + parserResult.getErrorMessage();
             dialogService.showErrorDialogAndWait(Localization.lang("Error opening file"), message);
         }
 
         // Display warnings, if any
         for (ParserResult parserResult : parserResults) {
             if (parserResult.hasWarnings()) {
-                ParserResultWarningDialog.showParserResultWarningDialog(parserResult, dialogService);
+                ParserResultWarningDialog.showParserResultWarningDialog(
+                        parserResult, dialogService);
                 getLibraryTab(parserResult).ifPresent(tabContainer::showLibraryTab);
             }
         }
@@ -268,20 +289,21 @@ private void openDatabases(List<ParserResult> parserResults) {
         // if we found new entry types that can be imported, or checking
         // if the database contents should be modified due to new features
         // in this version of JabRef.
-        parserResults.forEach(pr -> {
-            OpenDatabaseAction.performPostOpenActions(pr, dialogService, preferences);
-            if (pr.getChangedOnMigration()) {
-                getLibraryTab(pr).ifPresent(LibraryTab::markBaseChanged);
-            }
-        });
+        parserResults.forEach(
+                pr -> {
+                    OpenDatabaseAction.performPostOpenActions(pr, dialogService, preferences);
+                    if (pr.getChangedOnMigration()) {
+                        getLibraryTab(pr).ifPresent(LibraryTab::markBaseChanged);
+                    }
+                });
 
         LOGGER.debug("Finished adding panels");
     }
 
     private Optional<LibraryTab> getLibraryTab(ParserResult parserResult) {
         return tabContainer.getLibraryTabs().stream()
-                           .filter(tab -> parserResult.getDatabase().equals(tab.getDatabase()))
-                           .findAny();
+                .filter(tab -> parserResult.getDatabase().equals(tab.getDatabase()))
+                .findAny();
     }
 
     /**
@@ -301,11 +323,14 @@ private void addParserResult(ParserResult parserResult, boolean raisePanel) {
             }
         } else {
             // only add tab if library is not already open
-            Optional<LibraryTab> libraryTab = tabContainer.getLibraryTabs().stream()
-                                                          .filter(p -> p.getBibDatabaseContext()
-                                                                        .getDatabasePath()
-                                                                        .equals(parserResult.getPath()))
-                                                          .findFirst();
+            Optional<LibraryTab> libraryTab =
+                    tabContainer.getLibraryTabs().stream()
+                            .filter(
+                                    p ->
+                                            p.getBibDatabaseContext()
+                                                    .getDatabasePath()
+                                                    .equals(parserResult.getPath()))
+                            .findFirst();
 
             if (libraryTab.isPresent()) {
                 tabContainer.showLibraryTab(libraryTab.get());
@@ -322,60 +347,66 @@ private void waitForLoadingFinished(Runnable runnable) {
 
         CompletableFuture<Void> future = new CompletableFuture<>();
 
-        List<ObservableBooleanValue> loadings = tabContainer.getLibraryTabs().stream()
-                                                            .map(LibraryTab::getLoading)
-                                                            .collect(Collectors.toList());
+        List<ObservableBooleanValue> loadings =
+                tabContainer.getLibraryTabs().stream()
+                        .map(LibraryTab::getLoading)
+                        .collect(Collectors.toList());
 
         // Create a listener for each observable
-        ChangeListener<Boolean> listener = (observable, oldValue, newValue) -> {
-            if (observable != null) {
-                loadings.remove(observable);
-            }
-            if (LOGGER.isTraceEnabled()) {
-                LOGGER.trace("Count of loading tabs: {}", loadings.size());
-                LOGGER.trace("Count of loading tabs really true: {}", loadings.stream().filter(ObservableBooleanValue::get).count());
-            }
-            for (ObservableBooleanValue obs : loadings) {
-                if (obs.get()) {
-                    // Exit the listener if any of the observables is still true
-                    return;
-                }
-            }
-            // All observables are false, complete the future
-            LOGGER.trace("Future completed");
-            future.complete(null);
-        };
+        ChangeListener<Boolean> listener =
+                (observable, oldValue, newValue) -> {
+                    if (observable != null) {
+                        loadings.remove(observable);
+                    }
+                    if (LOGGER.isTraceEnabled()) {
+                        LOGGER.trace("Count of loading tabs: {}", loadings.size());
+                        LOGGER.trace(
+                                "Count of loading tabs really true: {}",
+                                loadings.stream().filter(ObservableBooleanValue::get).count());
+                    }
+                    for (ObservableBooleanValue obs : loadings) {
+                        if (obs.get()) {
+                            // Exit the listener if any of the observables is still true
+                            return;
+                        }
+                    }
+                    // All observables are false, complete the future
+                    LOGGER.trace("Future completed");
+                    future.complete(null);
+                };
 
         for (ObservableBooleanValue obs : loadings) {
             obs.addListener(listener);
         }
 
         LOGGER.trace("Fire once");
-        // Due to concurrency, it might be that the observables are already false, so we trigger one evaluation
+        // Due to concurrency, it might be that the observables are already false, so we trigger one
+        // evaluation
         listener.changed(null, null, false);
         LOGGER.trace("Waiting for state changes...");
 
-        future.thenRun(() -> {
-            LOGGER.debug("All tabs loaded. Jumping to entry.");
-            for (ObservableBooleanValue obs : loadings) {
-                obs.removeListener(listener);
-            }
-            runnable.run();
-        });
+        future.thenRun(
+                () -> {
+                    LOGGER.debug("All tabs loaded. Jumping to entry.");
+                    for (ObservableBooleanValue obs : loadings) {
+                        obs.removeListener(listener);
+                    }
+                    runnable.run();
+                });
     }
 
     private void jumpToEntry(String entryKey) {
         // check current library tab first
         LibraryTab currentLibraryTab = tabContainer.getCurrentLibraryTab();
-        List<LibraryTab> sortedTabs = tabContainer.getLibraryTabs().stream()
-                                                  .sorted(Comparator.comparing(tab -> tab != currentLibraryTab))
-                                                  .toList();
+        List<LibraryTab> sortedTabs =
+                tabContainer.getLibraryTabs().stream()
+                        .sorted(Comparator.comparing(tab -> tab != currentLibraryTab))
+                        .toList();
         for (LibraryTab libraryTab : sortedTabs) {
-            Optional<BibEntry> bibEntry = libraryTab.getDatabase()
-                                                    .getEntries().stream()
-                                                    .filter(entry -> entry.getCitationKey().orElse("")
-                                                                          .equals(entryKey))
-                                                    .findAny();
+            Optional<BibEntry> bibEntry =
+                    libraryTab.getDatabase().getEntries().stream()
+                            .filter(entry -> entry.getCitationKey().orElse("").equals(entryKey))
+                            .findAny();
             if (bibEntry.isPresent()) {
                 LOGGER.debug("Found entry {} in library tab {}", entryKey, libraryTab);
                 libraryTab.clearAndSelect(bibEntry.get());
@@ -387,7 +418,9 @@ private void jumpToEntry(String entryKey) {
         LOGGER.trace("End of loop");
 
         if (stateManager.getSelectedEntries().isEmpty()) {
-            dialogService.notify(Localization.lang("Citation key '%0' to select not found in open libraries.", entryKey));
+            dialogService.notify(
+                    Localization.lang(
+                            "Citation key '%0' to select not found in open libraries.", entryKey));
         }
     }
 
@@ -399,7 +432,9 @@ private void jumpToEntry(String entryKey) {
      */
     void addImportedEntries(final LibraryTab tab, final ParserResult parserResult) {
         BackgroundTask<ParserResult> task = BackgroundTask.wrap(() -> parserResult);
-        ImportCleanup cleanup = ImportCleanup.targeting(tab.getBibDatabaseContext().getMode(), preferences.getFieldPreferences());
+        ImportCleanup cleanup =
+                ImportCleanup.targeting(
+                        tab.getBibDatabaseContext().getMode(), preferences.getFieldPreferences());
         cleanup.doPostCleanup(parserResult.getDatabase().getEntries());
         ImportEntriesDialog dialog = new ImportEntriesDialog(tab.getBibDatabaseContext(), task);
         dialog.setTitle(Localization.lang("Import"));
@@ -408,7 +443,13 @@ void addImportedEntries(final LibraryTab tab, final ParserResult parserResult) {
 
     void autoSetFileLinks(List<ParserResult> loaded) {
         for (ParserResult parserResult : loaded) {
-            new AutoLinkFilesAction(dialogService, preferences, stateManager, undoManager, (UiTaskExecutor) taskExecutor).execute();
+            new AutoLinkFilesAction(
+                            dialogService,
+                            preferences,
+                            stateManager,
+                            undoManager,
+                            (UiTaskExecutor) taskExecutor)
+                    .execute();
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/frame/MainMenu.java b/src/main/java/org/jabref/gui/frame/MainMenu.java
index 96ab72d70d4c..f9cee5a14c63 100644
--- a/src/main/java/org/jabref/gui/frame/MainMenu.java
+++ b/src/main/java/org/jabref/gui/frame/MainMenu.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.frame;
 
-import java.util.function.Supplier;
-
 import javafx.event.ActionEvent;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuBar;
@@ -85,6 +83,8 @@
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.util.FileUpdateMonitor;
 
+import java.util.function.Supplier;
+
 public class MainMenu extends MenuBar {
     private final JabRefFrame frame;
     private final FileHistoryMenu fileHistoryMenu;
@@ -102,21 +102,22 @@ public class MainMenu extends MenuBar {
     private final Supplier<OpenDatabaseAction> openDatabaseActionSupplier;
     private final AiService aiService;
 
-    public MainMenu(JabRefFrame frame,
-                    FileHistoryMenu fileHistoryMenu,
-                    SidePane sidePane,
-                    PushToApplicationCommand pushToApplicationCommand,
-                    GuiPreferences preferences,
-                    StateManager stateManager,
-                    FileUpdateMonitor fileUpdateMonitor,
-                    TaskExecutor taskExecutor,
-                    DialogService dialogService,
-                    JournalAbbreviationRepository abbreviationRepository,
-                    BibEntryTypesManager entryTypesManager,
-                    CountingUndoManager undoManager,
-                    ClipBoardManager clipBoardManager,
-                    Supplier<OpenDatabaseAction> openDatabaseActionSupplier,
-                    AiService aiService) {
+    public MainMenu(
+            JabRefFrame frame,
+            FileHistoryMenu fileHistoryMenu,
+            SidePane sidePane,
+            PushToApplicationCommand pushToApplicationCommand,
+            GuiPreferences preferences,
+            StateManager stateManager,
+            FileUpdateMonitor fileUpdateMonitor,
+            TaskExecutor taskExecutor,
+            DialogService dialogService,
+            JournalAbbreviationRepository abbreviationRepository,
+            BibEntryTypesManager entryTypesManager,
+            CountingUndoManager undoManager,
+            ClipBoardManager clipBoardManager,
+            Supplier<OpenDatabaseAction> openDatabaseActionSupplier,
+            AiService aiService) {
         this.frame = frame;
         this.fileHistoryMenu = fileHistoryMenu;
         this.sidePane = sidePane;
@@ -147,245 +148,694 @@ private void createMenu() {
         Menu tools = new Menu(Localization.lang("Tools"));
         Menu help = new Menu(Localization.lang("Help"));
 
-        file.getItems().addAll(
-                factory.createMenuItem(StandardActions.NEW_LIBRARY, new NewDatabaseAction(frame, preferences)),
-                factory.createMenuItem(StandardActions.OPEN_LIBRARY, openDatabaseActionSupplier.get()),
-                fileHistoryMenu,
-                factory.createMenuItem(StandardActions.SAVE_LIBRARY, new SaveAction(SaveAction.SaveMethod.SAVE, frame::getCurrentLibraryTab, dialogService, preferences, stateManager)),
-                factory.createMenuItem(StandardActions.SAVE_LIBRARY_AS, new SaveAction(SaveAction.SaveMethod.SAVE_AS, frame::getCurrentLibraryTab, dialogService, preferences, stateManager)),
-                factory.createMenuItem(StandardActions.SAVE_ALL, new SaveAllAction(frame::getLibraryTabs, preferences, dialogService)),
-                factory.createMenuItem(StandardActions.CLOSE_LIBRARY, new JabRefFrame.CloseDatabaseAction(frame, stateManager)),
-
-                new SeparatorMenuItem(),
-
-                factory.createSubMenu(StandardActions.IMPORT,
-                        factory.createMenuItem(StandardActions.IMPORT_INTO_CURRENT_LIBRARY, new ImportCommand(frame, ImportCommand.ImportMethod.TO_EXISTING, preferences, stateManager, fileUpdateMonitor, taskExecutor, dialogService)),
-                        factory.createMenuItem(StandardActions.IMPORT_INTO_NEW_LIBRARY, new ImportCommand(frame, ImportCommand.ImportMethod.AS_NEW, preferences, stateManager, fileUpdateMonitor, taskExecutor, dialogService))),
-
-                factory.createSubMenu(StandardActions.EXPORT,
-                        factory.createMenuItem(StandardActions.EXPORT_ALL, new ExportCommand(ExportCommand.ExportMethod.EXPORT_ALL, frame::getCurrentLibraryTab, stateManager, dialogService, preferences, entryTypesManager, abbreviationRepository, taskExecutor)),
-                        factory.createMenuItem(StandardActions.EXPORT_SELECTED, new ExportCommand(ExportCommand.ExportMethod.EXPORT_SELECTED, frame::getCurrentLibraryTab, stateManager, dialogService, preferences, entryTypesManager, abbreviationRepository, taskExecutor)),
-                        factory.createMenuItem(StandardActions.SAVE_SELECTED_AS_PLAIN_BIBTEX, new SaveAction(SaveAction.SaveMethod.SAVE_SELECTED, frame::getCurrentLibraryTab, dialogService, preferences, stateManager))),
-
-                new SeparatorMenuItem(),
-
-                factory.createSubMenu(StandardActions.REMOTE_DB,
-                        factory.createMenuItem(StandardActions.CONNECT_TO_SHARED_DB, new ConnectToSharedDatabaseCommand(frame, dialogService)),
-                        factory.createMenuItem(StandardActions.PULL_CHANGES_FROM_SHARED_DB, new PullChangesFromSharedAction(stateManager))),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(frame, dialogService)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.QUIT, new JabRefFrame.CloseAction(frame))
-        );
-
-        edit.getItems().addAll(
-                factory.createMenuItem(StandardActions.UNDO, new UndoAction(frame::getCurrentLibraryTab, undoManager, dialogService, stateManager)),
-                factory.createMenuItem(StandardActions.REDO, new RedoAction(frame::getCurrentLibraryTab, undoManager, dialogService, stateManager)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT, frame::getCurrentLibraryTab, stateManager, undoManager)),
-
-                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, frame::getCurrentLibraryTab, stateManager, undoManager)),
-                factory.createSubMenu(StandardActions.COPY_MORE,
-                        factory.createMenuItem(StandardActions.COPY_TITLE, new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository)),
-                        factory.createMenuItem(StandardActions.COPY_KEY, new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository)),
-                        factory.createMenuItem(StandardActions.COPY_CITE_KEY, new CopyMoreAction(StandardActions.COPY_CITE_KEY, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository)),
-                        factory.createMenuItem(StandardActions.COPY_KEY_AND_TITLE, new CopyMoreAction(StandardActions.COPY_KEY_AND_TITLE, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository)),
-                        factory.createMenuItem(StandardActions.COPY_KEY_AND_LINK, new CopyMoreAction(StandardActions.COPY_KEY_AND_LINK, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository)),
-                        factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, clipBoardManager, taskExecutor, preferences, abbreviationRepository)),
-                        factory.createMenuItem(StandardActions.EXPORT_SELECTED_TO_CLIPBOARD, new ExportToClipboardAction(dialogService, stateManager, clipBoardManager, taskExecutor, preferences))),
-
-                factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE, frame::getCurrentLibraryTab, stateManager, undoManager)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.REPLACE_ALL, new ReplaceStringAction(frame::getCurrentLibraryTab, stateManager, dialogService)),
-                factory.createMenuItem(StandardActions.GENERATE_CITE_KEYS, new GenerateCitationKeyAction(frame::getCurrentLibraryTab, dialogService, stateManager, taskExecutor, preferences, undoManager)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.MANAGE_KEYWORDS, new ManageKeywordsAction(stateManager)),
-                factory.createMenuItem(StandardActions.AUTOMATIC_FIELD_EDITOR, new AutomaticFieldEditorAction(stateManager, dialogService, undoManager)));
+        file.getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.NEW_LIBRARY,
+                                new NewDatabaseAction(frame, preferences)),
+                        factory.createMenuItem(
+                                StandardActions.OPEN_LIBRARY, openDatabaseActionSupplier.get()),
+                        fileHistoryMenu,
+                        factory.createMenuItem(
+                                StandardActions.SAVE_LIBRARY,
+                                new SaveAction(
+                                        SaveAction.SaveMethod.SAVE,
+                                        frame::getCurrentLibraryTab,
+                                        dialogService,
+                                        preferences,
+                                        stateManager)),
+                        factory.createMenuItem(
+                                StandardActions.SAVE_LIBRARY_AS,
+                                new SaveAction(
+                                        SaveAction.SaveMethod.SAVE_AS,
+                                        frame::getCurrentLibraryTab,
+                                        dialogService,
+                                        preferences,
+                                        stateManager)),
+                        factory.createMenuItem(
+                                StandardActions.SAVE_ALL,
+                                new SaveAllAction(
+                                        frame::getLibraryTabs, preferences, dialogService)),
+                        factory.createMenuItem(
+                                StandardActions.CLOSE_LIBRARY,
+                                new JabRefFrame.CloseDatabaseAction(frame, stateManager)),
+                        new SeparatorMenuItem(),
+                        factory.createSubMenu(
+                                StandardActions.IMPORT,
+                                factory.createMenuItem(
+                                        StandardActions.IMPORT_INTO_CURRENT_LIBRARY,
+                                        new ImportCommand(
+                                                frame,
+                                                ImportCommand.ImportMethod.TO_EXISTING,
+                                                preferences,
+                                                stateManager,
+                                                fileUpdateMonitor,
+                                                taskExecutor,
+                                                dialogService)),
+                                factory.createMenuItem(
+                                        StandardActions.IMPORT_INTO_NEW_LIBRARY,
+                                        new ImportCommand(
+                                                frame,
+                                                ImportCommand.ImportMethod.AS_NEW,
+                                                preferences,
+                                                stateManager,
+                                                fileUpdateMonitor,
+                                                taskExecutor,
+                                                dialogService))),
+                        factory.createSubMenu(
+                                StandardActions.EXPORT,
+                                factory.createMenuItem(
+                                        StandardActions.EXPORT_ALL,
+                                        new ExportCommand(
+                                                ExportCommand.ExportMethod.EXPORT_ALL,
+                                                frame::getCurrentLibraryTab,
+                                                stateManager,
+                                                dialogService,
+                                                preferences,
+                                                entryTypesManager,
+                                                abbreviationRepository,
+                                                taskExecutor)),
+                                factory.createMenuItem(
+                                        StandardActions.EXPORT_SELECTED,
+                                        new ExportCommand(
+                                                ExportCommand.ExportMethod.EXPORT_SELECTED,
+                                                frame::getCurrentLibraryTab,
+                                                stateManager,
+                                                dialogService,
+                                                preferences,
+                                                entryTypesManager,
+                                                abbreviationRepository,
+                                                taskExecutor)),
+                                factory.createMenuItem(
+                                        StandardActions.SAVE_SELECTED_AS_PLAIN_BIBTEX,
+                                        new SaveAction(
+                                                SaveAction.SaveMethod.SAVE_SELECTED,
+                                                frame::getCurrentLibraryTab,
+                                                dialogService,
+                                                preferences,
+                                                stateManager))),
+                        new SeparatorMenuItem(),
+                        factory.createSubMenu(
+                                StandardActions.REMOTE_DB,
+                                factory.createMenuItem(
+                                        StandardActions.CONNECT_TO_SHARED_DB,
+                                        new ConnectToSharedDatabaseCommand(frame, dialogService)),
+                                factory.createMenuItem(
+                                        StandardActions.PULL_CHANGES_FROM_SHARED_DB,
+                                        new PullChangesFromSharedAction(stateManager))),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.SHOW_PREFS,
+                                new ShowPreferencesAction(frame, dialogService)),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.QUIT, new JabRefFrame.CloseAction(frame)));
+
+        edit.getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.UNDO,
+                                new UndoAction(
+                                        frame::getCurrentLibraryTab,
+                                        undoManager,
+                                        dialogService,
+                                        stateManager)),
+                        factory.createMenuItem(
+                                StandardActions.REDO,
+                                new RedoAction(
+                                        frame::getCurrentLibraryTab,
+                                        undoManager,
+                                        dialogService,
+                                        stateManager)),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.CUT,
+                                new EditAction(
+                                        StandardActions.CUT,
+                                        frame::getCurrentLibraryTab,
+                                        stateManager,
+                                        undoManager)),
+                        factory.createMenuItem(
+                                StandardActions.COPY,
+                                new EditAction(
+                                        StandardActions.COPY,
+                                        frame::getCurrentLibraryTab,
+                                        stateManager,
+                                        undoManager)),
+                        factory.createSubMenu(
+                                StandardActions.COPY_MORE,
+                                factory.createMenuItem(
+                                        StandardActions.COPY_TITLE,
+                                        new CopyMoreAction(
+                                                StandardActions.COPY_TITLE,
+                                                dialogService,
+                                                stateManager,
+                                                clipBoardManager,
+                                                preferences,
+                                                abbreviationRepository)),
+                                factory.createMenuItem(
+                                        StandardActions.COPY_KEY,
+                                        new CopyMoreAction(
+                                                StandardActions.COPY_KEY,
+                                                dialogService,
+                                                stateManager,
+                                                clipBoardManager,
+                                                preferences,
+                                                abbreviationRepository)),
+                                factory.createMenuItem(
+                                        StandardActions.COPY_CITE_KEY,
+                                        new CopyMoreAction(
+                                                StandardActions.COPY_CITE_KEY,
+                                                dialogService,
+                                                stateManager,
+                                                clipBoardManager,
+                                                preferences,
+                                                abbreviationRepository)),
+                                factory.createMenuItem(
+                                        StandardActions.COPY_KEY_AND_TITLE,
+                                        new CopyMoreAction(
+                                                StandardActions.COPY_KEY_AND_TITLE,
+                                                dialogService,
+                                                stateManager,
+                                                clipBoardManager,
+                                                preferences,
+                                                abbreviationRepository)),
+                                factory.createMenuItem(
+                                        StandardActions.COPY_KEY_AND_LINK,
+                                        new CopyMoreAction(
+                                                StandardActions.COPY_KEY_AND_LINK,
+                                                dialogService,
+                                                stateManager,
+                                                clipBoardManager,
+                                                preferences,
+                                                abbreviationRepository)),
+                                factory.createMenuItem(
+                                        StandardActions.COPY_CITATION_PREVIEW,
+                                        new CopyCitationAction(
+                                                CitationStyleOutputFormat.HTML,
+                                                dialogService,
+                                                stateManager,
+                                                clipBoardManager,
+                                                taskExecutor,
+                                                preferences,
+                                                abbreviationRepository)),
+                                factory.createMenuItem(
+                                        StandardActions.EXPORT_SELECTED_TO_CLIPBOARD,
+                                        new ExportToClipboardAction(
+                                                dialogService,
+                                                stateManager,
+                                                clipBoardManager,
+                                                taskExecutor,
+                                                preferences))),
+                        factory.createMenuItem(
+                                StandardActions.PASTE,
+                                new EditAction(
+                                        StandardActions.PASTE,
+                                        frame::getCurrentLibraryTab,
+                                        stateManager,
+                                        undoManager)),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.REPLACE_ALL,
+                                new ReplaceStringAction(
+                                        frame::getCurrentLibraryTab, stateManager, dialogService)),
+                        factory.createMenuItem(
+                                StandardActions.GENERATE_CITE_KEYS,
+                                new GenerateCitationKeyAction(
+                                        frame::getCurrentLibraryTab,
+                                        dialogService,
+                                        stateManager,
+                                        taskExecutor,
+                                        preferences,
+                                        undoManager)),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.MANAGE_KEYWORDS,
+                                new ManageKeywordsAction(stateManager)),
+                        factory.createMenuItem(
+                                StandardActions.AUTOMATIC_FIELD_EDITOR,
+                                new AutomaticFieldEditorAction(
+                                        stateManager, dialogService, undoManager)));
         SeparatorMenuItem specialFieldsSeparator = new SeparatorMenuItem();
-        specialFieldsSeparator.visibleProperty().bind(preferences.getSpecialFieldsPreferences().specialFieldsEnabledProperty());
-
-        edit.getItems().addAll(
-                specialFieldsSeparator,
-                // ToDo: SpecialField needs the active BasePanel to mark it as changed.
-                //  Refactor BasePanel, should mark the BibDatabaseContext or the UndoManager as dirty instead!
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.RANKING, factory, frame::getCurrentLibraryTab, dialogService, preferences, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.RELEVANCE, factory, frame::getCurrentLibraryTab, dialogService, preferences, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.QUALITY, factory, frame::getCurrentLibraryTab, dialogService, preferences, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.PRINTED, factory, frame::getCurrentLibraryTab, dialogService, preferences, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.PRIORITY, factory, frame::getCurrentLibraryTab, dialogService, preferences, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.READ_STATUS, factory, frame::getCurrentLibraryTab, dialogService, preferences, undoManager, stateManager));
-        edit.addEventHandler(ActionEvent.ACTION, event -> {
-            // Work around for mac only issue, where cmd+v on a dialogue triggers the paste action of menu item, resulting in addition of the pasted content in the MainTable.
-            // If the mainscreen is not focused, the actions captured by menu are consumed.
-            if (OS.OS_X && !frame.getMainStage().focusedProperty().get()) {
-                event.consume();
-            }
-        });
-
-        MenuItem newEntryFromPlainTextOnline = factory.createMenuItem(StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT_ONLINE, new ExtractBibtexActionOnline(dialogService, preferences, stateManager, true));
-        library.getItems().addAll(
-                factory.createMenuItem(StandardActions.NEW_ENTRY, new NewEntryAction(frame::getCurrentLibraryTab, dialogService, preferences, stateManager)),
-                newEntryFromPlainTextOnline,
-                factory.createMenuItem(StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT_OFFLINE, new ExtractBibtexActionOffline(dialogService, stateManager)),
-                factory.createMenuItem(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, frame::getCurrentLibraryTab, stateManager, undoManager)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new LibraryPropertiesAction(stateManager))
-        );
-
-        quality.getItems().addAll(
-                factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(frame::getCurrentLibraryTab, dialogService, stateManager, preferences, entryTypesManager, taskExecutor)),
-                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(dialogService, stateManager, undoManager, preferences)),
-                factory.createMenuItem(StandardActions.CHECK_INTEGRITY, new IntegrityCheckAction(frame::getCurrentLibraryTab, preferences, dialogService, stateManager, (UiTaskExecutor) taskExecutor, abbreviationRepository)),
-                factory.createMenuItem(StandardActions.CLEANUP_ENTRIES, new CleanupAction(frame::getCurrentLibraryTab, preferences, dialogService, stateManager, taskExecutor, undoManager)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.SET_FILE_LINKS, new AutoLinkFilesAction(dialogService, preferences, stateManager, undoManager, (UiTaskExecutor) taskExecutor)),
-
-                new SeparatorMenuItem(),
-
-                factory.createSubMenu(StandardActions.ABBREVIATE,
-                        factory.createMenuItem(StandardActions.ABBREVIATE_DEFAULT, new AbbreviateAction(StandardActions.ABBREVIATE_DEFAULT, frame::getCurrentLibraryTab, dialogService, stateManager, preferences.getJournalAbbreviationPreferences(), abbreviationRepository, taskExecutor, undoManager)),
-                        factory.createMenuItem(StandardActions.ABBREVIATE_DOTLESS, new AbbreviateAction(StandardActions.ABBREVIATE_DOTLESS, frame::getCurrentLibraryTab, dialogService, stateManager, preferences.getJournalAbbreviationPreferences(), abbreviationRepository, taskExecutor, undoManager)),
-                        factory.createMenuItem(StandardActions.ABBREVIATE_SHORTEST_UNIQUE, new AbbreviateAction(StandardActions.ABBREVIATE_SHORTEST_UNIQUE, frame::getCurrentLibraryTab, dialogService, stateManager, preferences.getJournalAbbreviationPreferences(), abbreviationRepository, taskExecutor, undoManager))),
-
-                factory.createMenuItem(StandardActions.UNABBREVIATE, new AbbreviateAction(StandardActions.UNABBREVIATE, frame::getCurrentLibraryTab, dialogService, stateManager, preferences.getJournalAbbreviationPreferences(), abbreviationRepository, taskExecutor, undoManager))
-        );
+        specialFieldsSeparator
+                .visibleProperty()
+                .bind(preferences.getSpecialFieldsPreferences().specialFieldsEnabledProperty());
+
+        edit.getItems()
+                .addAll(
+                        specialFieldsSeparator,
+                        // ToDo: SpecialField needs the active BasePanel to mark it as changed.
+                        //  Refactor BasePanel, should mark the BibDatabaseContext or the
+                        // UndoManager as dirty instead!
+                        SpecialFieldMenuItemFactory.createSpecialFieldMenu(
+                                SpecialField.RANKING,
+                                factory,
+                                frame::getCurrentLibraryTab,
+                                dialogService,
+                                preferences,
+                                undoManager,
+                                stateManager),
+                        SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(
+                                SpecialField.RELEVANCE,
+                                factory,
+                                frame::getCurrentLibraryTab,
+                                dialogService,
+                                preferences,
+                                undoManager,
+                                stateManager),
+                        SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(
+                                SpecialField.QUALITY,
+                                factory,
+                                frame::getCurrentLibraryTab,
+                                dialogService,
+                                preferences,
+                                undoManager,
+                                stateManager),
+                        SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(
+                                SpecialField.PRINTED,
+                                factory,
+                                frame::getCurrentLibraryTab,
+                                dialogService,
+                                preferences,
+                                undoManager,
+                                stateManager),
+                        SpecialFieldMenuItemFactory.createSpecialFieldMenu(
+                                SpecialField.PRIORITY,
+                                factory,
+                                frame::getCurrentLibraryTab,
+                                dialogService,
+                                preferences,
+                                undoManager,
+                                stateManager),
+                        SpecialFieldMenuItemFactory.createSpecialFieldMenu(
+                                SpecialField.READ_STATUS,
+                                factory,
+                                frame::getCurrentLibraryTab,
+                                dialogService,
+                                preferences,
+                                undoManager,
+                                stateManager));
+        edit.addEventHandler(
+                ActionEvent.ACTION,
+                event -> {
+                    // Work around for mac only issue, where cmd+v on a dialogue triggers the paste
+                    // action of menu item, resulting in addition of the pasted content in the
+                    // MainTable.
+                    // If the mainscreen is not focused, the actions captured by menu are consumed.
+                    if (OS.OS_X && !frame.getMainStage().focusedProperty().get()) {
+                        event.consume();
+                    }
+                });
+
+        MenuItem newEntryFromPlainTextOnline =
+                factory.createMenuItem(
+                        StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT_ONLINE,
+                        new ExtractBibtexActionOnline(
+                                dialogService, preferences, stateManager, true));
+        library.getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.NEW_ENTRY,
+                                new NewEntryAction(
+                                        frame::getCurrentLibraryTab,
+                                        dialogService,
+                                        preferences,
+                                        stateManager)),
+                        newEntryFromPlainTextOnline,
+                        factory.createMenuItem(
+                                StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT_OFFLINE,
+                                new ExtractBibtexActionOffline(dialogService, stateManager)),
+                        factory.createMenuItem(
+                                StandardActions.DELETE_ENTRY,
+                                new EditAction(
+                                        StandardActions.DELETE_ENTRY,
+                                        frame::getCurrentLibraryTab,
+                                        stateManager,
+                                        undoManager)),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.LIBRARY_PROPERTIES,
+                                new LibraryPropertiesAction(stateManager)));
+
+        quality.getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.FIND_DUPLICATES,
+                                new DuplicateSearch(
+                                        frame::getCurrentLibraryTab,
+                                        dialogService,
+                                        stateManager,
+                                        preferences,
+                                        entryTypesManager,
+                                        taskExecutor)),
+                        factory.createMenuItem(
+                                StandardActions.MERGE_ENTRIES,
+                                new MergeEntriesAction(
+                                        dialogService, stateManager, undoManager, preferences)),
+                        factory.createMenuItem(
+                                StandardActions.CHECK_INTEGRITY,
+                                new IntegrityCheckAction(
+                                        frame::getCurrentLibraryTab,
+                                        preferences,
+                                        dialogService,
+                                        stateManager,
+                                        (UiTaskExecutor) taskExecutor,
+                                        abbreviationRepository)),
+                        factory.createMenuItem(
+                                StandardActions.CLEANUP_ENTRIES,
+                                new CleanupAction(
+                                        frame::getCurrentLibraryTab,
+                                        preferences,
+                                        dialogService,
+                                        stateManager,
+                                        taskExecutor,
+                                        undoManager)),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.SET_FILE_LINKS,
+                                new AutoLinkFilesAction(
+                                        dialogService,
+                                        preferences,
+                                        stateManager,
+                                        undoManager,
+                                        (UiTaskExecutor) taskExecutor)),
+                        new SeparatorMenuItem(),
+                        factory.createSubMenu(
+                                StandardActions.ABBREVIATE,
+                                factory.createMenuItem(
+                                        StandardActions.ABBREVIATE_DEFAULT,
+                                        new AbbreviateAction(
+                                                StandardActions.ABBREVIATE_DEFAULT,
+                                                frame::getCurrentLibraryTab,
+                                                dialogService,
+                                                stateManager,
+                                                preferences.getJournalAbbreviationPreferences(),
+                                                abbreviationRepository,
+                                                taskExecutor,
+                                                undoManager)),
+                                factory.createMenuItem(
+                                        StandardActions.ABBREVIATE_DOTLESS,
+                                        new AbbreviateAction(
+                                                StandardActions.ABBREVIATE_DOTLESS,
+                                                frame::getCurrentLibraryTab,
+                                                dialogService,
+                                                stateManager,
+                                                preferences.getJournalAbbreviationPreferences(),
+                                                abbreviationRepository,
+                                                taskExecutor,
+                                                undoManager)),
+                                factory.createMenuItem(
+                                        StandardActions.ABBREVIATE_SHORTEST_UNIQUE,
+                                        new AbbreviateAction(
+                                                StandardActions.ABBREVIATE_SHORTEST_UNIQUE,
+                                                frame::getCurrentLibraryTab,
+                                                dialogService,
+                                                stateManager,
+                                                preferences.getJournalAbbreviationPreferences(),
+                                                abbreviationRepository,
+                                                taskExecutor,
+                                                undoManager))),
+                        factory.createMenuItem(
+                                StandardActions.UNABBREVIATE,
+                                new AbbreviateAction(
+                                        StandardActions.UNABBREVIATE,
+                                        frame::getCurrentLibraryTab,
+                                        dialogService,
+                                        stateManager,
+                                        preferences.getJournalAbbreviationPreferences(),
+                                        abbreviationRepository,
+                                        taskExecutor,
+                                        undoManager)));
 
         Menu lookupIdentifiers = factory.createSubMenu(StandardActions.LOOKUP_DOC_IDENTIFIER);
-        for (IdFetcher<?> fetcher : WebFetchers.getIdFetchers(preferences.getImportFormatPreferences())) {
-            LookupIdentifierAction<?> identifierAction = new LookupIdentifierAction<>(fetcher, stateManager, undoManager, dialogService, taskExecutor);
-            lookupIdentifiers.getItems().add(factory.createMenuItem(identifierAction.getAction(), identifierAction));
+        for (IdFetcher<?> fetcher :
+                WebFetchers.getIdFetchers(preferences.getImportFormatPreferences())) {
+            LookupIdentifierAction<?> identifierAction =
+                    new LookupIdentifierAction<>(
+                            fetcher, stateManager, undoManager, dialogService, taskExecutor);
+            lookupIdentifiers
+                    .getItems()
+                    .add(factory.createMenuItem(identifierAction.getAction(), identifierAction));
         }
 
-        lookup.getItems().addAll(
-                lookupIdentifiers,
-                factory.createMenuItem(StandardActions.DOWNLOAD_FULL_TEXT, new DownloadFullTextAction(dialogService, stateManager, preferences, (UiTaskExecutor) taskExecutor)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.FIND_UNLINKED_FILES, new FindUnlinkedFilesAction(dialogService, stateManager))
-        );
+        lookup.getItems()
+                .addAll(
+                        lookupIdentifiers,
+                        factory.createMenuItem(
+                                StandardActions.DOWNLOAD_FULL_TEXT,
+                                new DownloadFullTextAction(
+                                        dialogService,
+                                        stateManager,
+                                        preferences,
+                                        (UiTaskExecutor) taskExecutor)),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.FIND_UNLINKED_FILES,
+                                new FindUnlinkedFilesAction(dialogService, stateManager)));
 
-        final MenuItem pushToApplicationMenuItem = factory.createMenuItem(pushToApplicationCommand.getAction(), pushToApplicationCommand);
+        final MenuItem pushToApplicationMenuItem =
+                factory.createMenuItem(
+                        pushToApplicationCommand.getAction(), pushToApplicationCommand);
         pushToApplicationCommand.registerReconfigurable(pushToApplicationMenuItem);
 
-        tools.getItems().addAll(
-                factory.createMenuItem(StandardActions.PARSE_LATEX, new ParseLatexAction(stateManager)),
-                factory.createMenuItem(StandardActions.NEW_SUB_LIBRARY_FROM_AUX, new NewSubLibraryAction(frame, stateManager, dialogService)),
-                factory.createMenuItem(StandardActions.NEW_LIBRARY_FROM_PDF_ONLINE, new NewLibraryFromPdfActionOnline(frame, stateManager, dialogService, preferences, taskExecutor)),
-                factory.createMenuItem(StandardActions.NEW_LIBRARY_FROM_PDF_OFFLINE, new NewLibraryFromPdfActionOffline(frame, stateManager, dialogService, preferences, taskExecutor)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.WRITE_METADATA_TO_PDF,
-                        new WriteMetadataToLinkedPdfsAction(dialogService, preferences.getFieldPreferences(), preferences.getFilePreferences(), preferences.getXmpPreferences(), entryTypesManager, abbreviationRepository, taskExecutor, stateManager)),
-                factory.createMenuItem(StandardActions.COPY_LINKED_FILES, new CopyFilesAction(dialogService, preferences, stateManager, (UiTaskExecutor) taskExecutor)), // we know at this point that this is a UITaskExecutor
-
-                new SeparatorMenuItem(),
-
-                createSendSubMenu(factory, dialogService, stateManager, preferences),
-                pushToApplicationMenuItem,
-
-                new SeparatorMenuItem(),
-
-                // Systematic Literature Review (SLR)
-                factory.createMenuItem(StandardActions.START_NEW_STUDY, new StartNewStudyAction(frame, openDatabaseActionSupplier, fileUpdateMonitor, taskExecutor, preferences, stateManager, dialogService)),
-                factory.createMenuItem(StandardActions.EDIT_EXISTING_STUDY, new EditExistingStudyAction(dialogService, stateManager)),
-                factory.createMenuItem(StandardActions.UPDATE_SEARCH_RESULTS_OF_STUDY, new ExistingStudySearchAction(frame, openDatabaseActionSupplier, dialogService, fileUpdateMonitor, taskExecutor, preferences, stateManager)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.REBUILD_FULLTEXT_SEARCH_INDEX, new RebuildFulltextSearchIndexAction(stateManager, frame::getCurrentLibraryTab, dialogService, preferences)),
-                factory.createMenuItem(StandardActions.CLEAR_EMBEDDINGS_CACHE, new ClearEmbeddingsAction(stateManager, dialogService, aiService, taskExecutor)),
-
-                new SeparatorMenuItem(),
+        tools.getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.PARSE_LATEX, new ParseLatexAction(stateManager)),
+                        factory.createMenuItem(
+                                StandardActions.NEW_SUB_LIBRARY_FROM_AUX,
+                                new NewSubLibraryAction(frame, stateManager, dialogService)),
+                        factory.createMenuItem(
+                                StandardActions.NEW_LIBRARY_FROM_PDF_ONLINE,
+                                new NewLibraryFromPdfActionOnline(
+                                        frame,
+                                        stateManager,
+                                        dialogService,
+                                        preferences,
+                                        taskExecutor)),
+                        factory.createMenuItem(
+                                StandardActions.NEW_LIBRARY_FROM_PDF_OFFLINE,
+                                new NewLibraryFromPdfActionOffline(
+                                        frame,
+                                        stateManager,
+                                        dialogService,
+                                        preferences,
+                                        taskExecutor)),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.WRITE_METADATA_TO_PDF,
+                                new WriteMetadataToLinkedPdfsAction(
+                                        dialogService,
+                                        preferences.getFieldPreferences(),
+                                        preferences.getFilePreferences(),
+                                        preferences.getXmpPreferences(),
+                                        entryTypesManager,
+                                        abbreviationRepository,
+                                        taskExecutor,
+                                        stateManager)),
+                        factory.createMenuItem(
+                                StandardActions.COPY_LINKED_FILES,
+                                new CopyFilesAction(
+                                        dialogService,
+                                        preferences,
+                                        stateManager,
+                                        (UiTaskExecutor)
+                                                taskExecutor)), // we know at this point that this
+                                                                // is a UITaskExecutor
+                        new SeparatorMenuItem(),
+                        createSendSubMenu(factory, dialogService, stateManager, preferences),
+                        pushToApplicationMenuItem,
+                        new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.REDOWNLOAD_MISSING_FILES, new RedownloadMissingFilesAction(stateManager, dialogService, preferences.getExternalApplicationsPreferences(), preferences.getFilePreferences(), taskExecutor))
-        );
+                        // Systematic Literature Review (SLR)
+                        factory.createMenuItem(
+                                StandardActions.START_NEW_STUDY,
+                                new StartNewStudyAction(
+                                        frame,
+                                        openDatabaseActionSupplier,
+                                        fileUpdateMonitor,
+                                        taskExecutor,
+                                        preferences,
+                                        stateManager,
+                                        dialogService)),
+                        factory.createMenuItem(
+                                StandardActions.EDIT_EXISTING_STUDY,
+                                new EditExistingStudyAction(dialogService, stateManager)),
+                        factory.createMenuItem(
+                                StandardActions.UPDATE_SEARCH_RESULTS_OF_STUDY,
+                                new ExistingStudySearchAction(
+                                        frame,
+                                        openDatabaseActionSupplier,
+                                        dialogService,
+                                        fileUpdateMonitor,
+                                        taskExecutor,
+                                        preferences,
+                                        stateManager)),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.REBUILD_FULLTEXT_SEARCH_INDEX,
+                                new RebuildFulltextSearchIndexAction(
+                                        stateManager,
+                                        frame::getCurrentLibraryTab,
+                                        dialogService,
+                                        preferences)),
+                        factory.createMenuItem(
+                                StandardActions.CLEAR_EMBEDDINGS_CACHE,
+                                new ClearEmbeddingsAction(
+                                        stateManager, dialogService, aiService, taskExecutor)),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.REDOWNLOAD_MISSING_FILES,
+                                new RedownloadMissingFilesAction(
+                                        stateManager,
+                                        dialogService,
+                                        preferences.getExternalApplicationsPreferences(),
+                                        preferences.getFilePreferences(),
+                                        taskExecutor)));
 
         SidePaneType webSearchPane = SidePaneType.WEB_SEARCH;
         SidePaneType groupsPane = SidePaneType.GROUPS;
         SidePaneType openOfficePane = SidePaneType.OPEN_OFFICE;
-        view.getItems().addAll(
-                factory.createCheckMenuItem(webSearchPane.getToggleAction(), sidePane.getToggleCommandFor(webSearchPane), sidePane.paneVisibleBinding(webSearchPane)),
-                factory.createCheckMenuItem(groupsPane.getToggleAction(), sidePane.getToggleCommandFor(groupsPane), sidePane.paneVisibleBinding(groupsPane)),
-                factory.createCheckMenuItem(openOfficePane.getToggleAction(), sidePane.getToggleCommandFor(openOfficePane), sidePane.paneVisibleBinding(openOfficePane)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.NEXT_PREVIEW_STYLE, new PreviewSwitchAction(PreviewSwitchAction.Direction.NEXT, frame::getCurrentLibraryTab, stateManager)),
-                factory.createMenuItem(StandardActions.PREVIOUS_PREVIEW_STYLE, new PreviewSwitchAction(PreviewSwitchAction.Direction.PREVIOUS, frame::getCurrentLibraryTab, stateManager)),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.SHOW_PDF_VIEWER, new ShowDocumentViewerAction(stateManager, preferences)),
-                factory.createMenuItem(StandardActions.EDIT_ENTRY, new OpenEntryEditorAction(frame::getCurrentLibraryTab, stateManager)),
-                factory.createMenuItem(StandardActions.OPEN_CONSOLE, new OpenConsoleAction(stateManager, preferences, dialogService))
-        );
-
-        help.getItems().addAll(
-                factory.createMenuItem(StandardActions.HELP, new HelpAction(HelpFile.CONTENTS, dialogService, preferences.getExternalApplicationsPreferences())),
-                factory.createMenuItem(StandardActions.OPEN_FORUM, new OpenBrowserAction("http://discourse.jabref.org/", dialogService, preferences.getExternalApplicationsPreferences())),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.ERROR_CONSOLE, new ErrorConsoleAction()),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.DONATE, new OpenBrowserAction("https://donations.jabref.org", dialogService, preferences.getExternalApplicationsPreferences())),
-                factory.createMenuItem(StandardActions.SEARCH_FOR_UPDATES, new SearchForUpdateAction(preferences, dialogService, taskExecutor)),
-                factory.createSubMenu(StandardActions.WEB_MENU,
-                        factory.createMenuItem(StandardActions.OPEN_WEBPAGE, new OpenBrowserAction("https://jabref.org/", dialogService, preferences.getExternalApplicationsPreferences())),
-                        factory.createMenuItem(StandardActions.OPEN_BLOG, new OpenBrowserAction("https://blog.jabref.org/", dialogService, preferences.getExternalApplicationsPreferences())),
-                        factory.createMenuItem(StandardActions.OPEN_FACEBOOK, new OpenBrowserAction("https://www.facebook.com/JabRef/", dialogService, preferences.getExternalApplicationsPreferences())),
-                        factory.createMenuItem(StandardActions.OPEN_TWITTER, new OpenBrowserAction("https://twitter.com/jabref_org", dialogService, preferences.getExternalApplicationsPreferences())),
-                        factory.createMenuItem(StandardActions.OPEN_GITHUB, new OpenBrowserAction("https://github.com/JabRef/jabref", dialogService, preferences.getExternalApplicationsPreferences())),
-
+        view.getItems()
+                .addAll(
+                        factory.createCheckMenuItem(
+                                webSearchPane.getToggleAction(),
+                                sidePane.getToggleCommandFor(webSearchPane),
+                                sidePane.paneVisibleBinding(webSearchPane)),
+                        factory.createCheckMenuItem(
+                                groupsPane.getToggleAction(),
+                                sidePane.getToggleCommandFor(groupsPane),
+                                sidePane.paneVisibleBinding(groupsPane)),
+                        factory.createCheckMenuItem(
+                                openOfficePane.getToggleAction(),
+                                sidePane.getToggleCommandFor(openOfficePane),
+                                sidePane.paneVisibleBinding(openOfficePane)),
                         new SeparatorMenuItem(),
-
-                        factory.createMenuItem(StandardActions.OPEN_DEV_VERSION_LINK, new OpenBrowserAction("https://builds.jabref.org/master/", dialogService, preferences.getExternalApplicationsPreferences())),
-                        factory.createMenuItem(StandardActions.OPEN_CHANGELOG, new OpenBrowserAction("https://github.com/JabRef/jabref/blob/main/CHANGELOG.md", dialogService, preferences.getExternalApplicationsPreferences()))
-                ),
-                factory.createMenuItem(StandardActions.ABOUT, new AboutAction())
-        );
+                        factory.createMenuItem(
+                                StandardActions.NEXT_PREVIEW_STYLE,
+                                new PreviewSwitchAction(
+                                        PreviewSwitchAction.Direction.NEXT,
+                                        frame::getCurrentLibraryTab,
+                                        stateManager)),
+                        factory.createMenuItem(
+                                StandardActions.PREVIOUS_PREVIEW_STYLE,
+                                new PreviewSwitchAction(
+                                        PreviewSwitchAction.Direction.PREVIOUS,
+                                        frame::getCurrentLibraryTab,
+                                        stateManager)),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.SHOW_PDF_VIEWER,
+                                new ShowDocumentViewerAction(stateManager, preferences)),
+                        factory.createMenuItem(
+                                StandardActions.EDIT_ENTRY,
+                                new OpenEntryEditorAction(
+                                        frame::getCurrentLibraryTab, stateManager)),
+                        factory.createMenuItem(
+                                StandardActions.OPEN_CONSOLE,
+                                new OpenConsoleAction(stateManager, preferences, dialogService)));
+
+        help.getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.HELP,
+                                new HelpAction(
+                                        HelpFile.CONTENTS,
+                                        dialogService,
+                                        preferences.getExternalApplicationsPreferences())),
+                        factory.createMenuItem(
+                                StandardActions.OPEN_FORUM,
+                                new OpenBrowserAction(
+                                        "http://discourse.jabref.org/",
+                                        dialogService,
+                                        preferences.getExternalApplicationsPreferences())),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.ERROR_CONSOLE, new ErrorConsoleAction()),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.DONATE,
+                                new OpenBrowserAction(
+                                        "https://donations.jabref.org",
+                                        dialogService,
+                                        preferences.getExternalApplicationsPreferences())),
+                        factory.createMenuItem(
+                                StandardActions.SEARCH_FOR_UPDATES,
+                                new SearchForUpdateAction(
+                                        preferences, dialogService, taskExecutor)),
+                        factory.createSubMenu(
+                                StandardActions.WEB_MENU,
+                                factory.createMenuItem(
+                                        StandardActions.OPEN_WEBPAGE,
+                                        new OpenBrowserAction(
+                                                "https://jabref.org/",
+                                                dialogService,
+                                                preferences.getExternalApplicationsPreferences())),
+                                factory.createMenuItem(
+                                        StandardActions.OPEN_BLOG,
+                                        new OpenBrowserAction(
+                                                "https://blog.jabref.org/",
+                                                dialogService,
+                                                preferences.getExternalApplicationsPreferences())),
+                                factory.createMenuItem(
+                                        StandardActions.OPEN_FACEBOOK,
+                                        new OpenBrowserAction(
+                                                "https://www.facebook.com/JabRef/",
+                                                dialogService,
+                                                preferences.getExternalApplicationsPreferences())),
+                                factory.createMenuItem(
+                                        StandardActions.OPEN_TWITTER,
+                                        new OpenBrowserAction(
+                                                "https://twitter.com/jabref_org",
+                                                dialogService,
+                                                preferences.getExternalApplicationsPreferences())),
+                                factory.createMenuItem(
+                                        StandardActions.OPEN_GITHUB,
+                                        new OpenBrowserAction(
+                                                "https://github.com/JabRef/jabref",
+                                                dialogService,
+                                                preferences.getExternalApplicationsPreferences())),
+                                new SeparatorMenuItem(),
+                                factory.createMenuItem(
+                                        StandardActions.OPEN_DEV_VERSION_LINK,
+                                        new OpenBrowserAction(
+                                                "https://builds.jabref.org/master/",
+                                                dialogService,
+                                                preferences.getExternalApplicationsPreferences())),
+                                factory.createMenuItem(
+                                        StandardActions.OPEN_CHANGELOG,
+                                        new OpenBrowserAction(
+                                                "https://github.com/JabRef/jabref/blob/main/CHANGELOG.md",
+                                                dialogService,
+                                                preferences.getExternalApplicationsPreferences()))),
+                        factory.createMenuItem(StandardActions.ABOUT, new AboutAction()));
 
         // @formatter:on
         getStyleClass().add("mainMenu");
-        getMenus().addAll(
-                file,
-                edit,
-                library,
-                quality,
-                lookup,
-                tools,
-                view,
-                help);
+        getMenus().addAll(file, edit, library, quality, lookup, tools, view, help);
         setUseSystemMenuBar(true);
     }
 
-    private Menu createSendSubMenu(ActionFactory factory,
-                                   DialogService dialogService,
-                                   StateManager stateManager,
-                                   GuiPreferences preferences) {
+    private Menu createSendSubMenu(
+            ActionFactory factory,
+            DialogService dialogService,
+            StateManager stateManager,
+            GuiPreferences preferences) {
         Menu sendMenu = factory.createMenu(StandardActions.SEND);
-        sendMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new SendAsStandardEmailAction(dialogService, preferences, stateManager, entryTypesManager, taskExecutor)),
-                factory.createMenuItem(StandardActions.SEND_TO_KINDLE, new SendAsKindleEmailAction(dialogService, preferences, stateManager, taskExecutor))
-        );
+        sendMenu.getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.SEND_AS_EMAIL,
+                                new SendAsStandardEmailAction(
+                                        dialogService,
+                                        preferences,
+                                        stateManager,
+                                        entryTypesManager,
+                                        taskExecutor)),
+                        factory.createMenuItem(
+                                StandardActions.SEND_TO_KINDLE,
+                                new SendAsKindleEmailAction(
+                                        dialogService, preferences, stateManager, taskExecutor)));
 
         return sendMenu;
     }
diff --git a/src/main/java/org/jabref/gui/frame/MainToolBar.java b/src/main/java/org/jabref/gui/frame/MainToolBar.java
index e07467e2c3d1..534698dfcfe4 100644
--- a/src/main/java/org/jabref/gui/frame/MainToolBar.java
+++ b/src/main/java/org/jabref/gui/frame/MainToolBar.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.frame;
 
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.Subscription;
+
 import javafx.concurrent.Task;
 import javafx.geometry.Orientation;
 import javafx.scene.Group;
@@ -13,6 +16,8 @@
 import javafx.scene.layout.Region;
 import javafx.scene.shape.Rectangle;
 
+import org.controlsfx.control.PopOver;
+import org.controlsfx.control.TaskProgressView;
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
@@ -45,11 +50,6 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.FileUpdateMonitor;
 
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.Subscription;
-import org.controlsfx.control.PopOver;
-import org.controlsfx.control.TaskProgressView;
-
 public class MainToolBar extends ToolBar {
     private final LibraryTabContainer frame;
     private final PushToApplicationCommand pushToApplicationCommand;
@@ -68,18 +68,19 @@ public class MainToolBar extends ToolBar {
     private PopOver progressViewPopOver;
     private Subscription taskProgressSubscription;
 
-    public MainToolBar(LibraryTabContainer tabContainer,
-                       PushToApplicationCommand pushToApplicationCommand,
-                       GlobalSearchBar globalSearchBar,
-                       DialogService dialogService,
-                       StateManager stateManager,
-                       GuiPreferences preferences,
-                       AiService aiService,
-                       FileUpdateMonitor fileUpdateMonitor,
-                       TaskExecutor taskExecutor,
-                       BibEntryTypesManager entryTypesManager,
-                       ClipBoardManager clipBoardManager,
-                       CountingUndoManager undoManager) {
+    public MainToolBar(
+            LibraryTabContainer tabContainer,
+            PushToApplicationCommand pushToApplicationCommand,
+            GlobalSearchBar globalSearchBar,
+            DialogService dialogService,
+            StateManager stateManager,
+            GuiPreferences preferences,
+            AiService aiService,
+            FileUpdateMonitor fileUpdateMonitor,
+            TaskExecutor taskExecutor,
+            BibEntryTypesManager entryTypesManager,
+            ClipBoardManager clipBoardManager,
+            CountingUndoManager undoManager) {
         this.frame = tabContainer;
         this.pushToApplicationCommand = pushToApplicationCommand;
         this.globalSearchBar = globalSearchBar;
@@ -102,59 +103,146 @@ private void createToolBar() {
         final Region leftSpacer = new Region();
         final Region rightSpacer = new Region();
 
-        final Button pushToApplicationButton = factory.createIconButton(pushToApplicationCommand.getAction(), pushToApplicationCommand);
+        final Button pushToApplicationButton =
+                factory.createIconButton(
+                        pushToApplicationCommand.getAction(), pushToApplicationCommand);
         pushToApplicationCommand.registerReconfigurable(pushToApplicationButton);
 
         // Setup Toolbar
 
         // The action itself asks the user if it is OK to use Grobid (in some cases).
-        // Therefore, the condition of enablement is "only" if a library is opened. (Parameter "false")
-        Button newEntryFromPlainTextOnlineButton = factory.createIconButton(StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT, new ExtractBibtexActionOnline(dialogService, preferences, stateManager, false));
-
-        getItems().addAll(
-                new HBox(
-                        factory.createIconButton(StandardActions.NEW_LIBRARY, new NewDatabaseAction(frame, preferences)),
-                        factory.createIconButton(StandardActions.OPEN_LIBRARY, new OpenDatabaseAction(frame, preferences, aiService, dialogService, stateManager, fileUpdateMonitor, entryTypesManager, undoManager, clipBoardManager, taskExecutor)),
-                        factory.createIconButton(StandardActions.SAVE_LIBRARY, new SaveAction(SaveAction.SaveMethod.SAVE, frame::getCurrentLibraryTab, dialogService, preferences, stateManager))),
-
-                leftSpacer,
-
-                globalSearchBar,
-
-                rightSpacer,
-
-                new HBox(
-                        factory.createIconButton(StandardActions.NEW_ARTICLE, new NewEntryAction(frame::getCurrentLibraryTab, StandardEntryType.Article, dialogService, preferences, stateManager)),
-                        factory.createIconButton(StandardActions.NEW_ENTRY, new NewEntryAction(frame::getCurrentLibraryTab, dialogService, preferences, stateManager)),
-                        createNewEntryFromIdButton(),
-                        newEntryFromPlainTextOnlineButton,
-                        factory.createIconButton(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, frame::getCurrentLibraryTab, stateManager, undoManager))),
-
-                new Separator(Orientation.VERTICAL),
-
-                new HBox(
-                        factory.createIconButton(StandardActions.UNDO, new UndoAction(frame::getCurrentLibraryTab, undoManager, dialogService, stateManager)),
-                        factory.createIconButton(StandardActions.REDO, new RedoAction(frame::getCurrentLibraryTab, undoManager, dialogService, stateManager)),
-                        factory.createIconButton(StandardActions.CUT, new EditAction(StandardActions.CUT, frame::getCurrentLibraryTab, stateManager, undoManager)),
-                        factory.createIconButton(StandardActions.COPY, new EditAction(StandardActions.COPY, frame::getCurrentLibraryTab, stateManager, undoManager)),
-                        factory.createIconButton(StandardActions.PASTE, new EditAction(StandardActions.PASTE, frame::getCurrentLibraryTab, stateManager, undoManager))),
-
-                new Separator(Orientation.VERTICAL),
-
-                new HBox(
-                        pushToApplicationButton,
-                        factory.createIconButton(StandardActions.GENERATE_CITE_KEYS, new GenerateCitationKeyAction(frame::getCurrentLibraryTab, dialogService, stateManager, taskExecutor, preferences, undoManager)),
-                        factory.createIconButton(StandardActions.CLEANUP_ENTRIES, new CleanupAction(frame::getCurrentLibraryTab, preferences, dialogService, stateManager, taskExecutor, undoManager))),
-
-                new Separator(Orientation.VERTICAL),
-
-                new HBox(
-                        createTaskIndicator()),
-
-                new Separator(Orientation.VERTICAL),
-
-                new HBox(
-                        factory.createIconButton(StandardActions.OPEN_GITHUB, new OpenBrowserAction("https://github.com/JabRef/jabref", dialogService, preferences.getExternalApplicationsPreferences()))));
+        // Therefore, the condition of enablement is "only" if a library is opened. (Parameter
+        // "false")
+        Button newEntryFromPlainTextOnlineButton =
+                factory.createIconButton(
+                        StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT,
+                        new ExtractBibtexActionOnline(
+                                dialogService, preferences, stateManager, false));
+
+        getItems()
+                .addAll(
+                        new HBox(
+                                factory.createIconButton(
+                                        StandardActions.NEW_LIBRARY,
+                                        new NewDatabaseAction(frame, preferences)),
+                                factory.createIconButton(
+                                        StandardActions.OPEN_LIBRARY,
+                                        new OpenDatabaseAction(
+                                                frame,
+                                                preferences,
+                                                aiService,
+                                                dialogService,
+                                                stateManager,
+                                                fileUpdateMonitor,
+                                                entryTypesManager,
+                                                undoManager,
+                                                clipBoardManager,
+                                                taskExecutor)),
+                                factory.createIconButton(
+                                        StandardActions.SAVE_LIBRARY,
+                                        new SaveAction(
+                                                SaveAction.SaveMethod.SAVE,
+                                                frame::getCurrentLibraryTab,
+                                                dialogService,
+                                                preferences,
+                                                stateManager))),
+                        leftSpacer,
+                        globalSearchBar,
+                        rightSpacer,
+                        new HBox(
+                                factory.createIconButton(
+                                        StandardActions.NEW_ARTICLE,
+                                        new NewEntryAction(
+                                                frame::getCurrentLibraryTab,
+                                                StandardEntryType.Article,
+                                                dialogService,
+                                                preferences,
+                                                stateManager)),
+                                factory.createIconButton(
+                                        StandardActions.NEW_ENTRY,
+                                        new NewEntryAction(
+                                                frame::getCurrentLibraryTab,
+                                                dialogService,
+                                                preferences,
+                                                stateManager)),
+                                createNewEntryFromIdButton(),
+                                newEntryFromPlainTextOnlineButton,
+                                factory.createIconButton(
+                                        StandardActions.DELETE_ENTRY,
+                                        new EditAction(
+                                                StandardActions.DELETE_ENTRY,
+                                                frame::getCurrentLibraryTab,
+                                                stateManager,
+                                                undoManager))),
+                        new Separator(Orientation.VERTICAL),
+                        new HBox(
+                                factory.createIconButton(
+                                        StandardActions.UNDO,
+                                        new UndoAction(
+                                                frame::getCurrentLibraryTab,
+                                                undoManager,
+                                                dialogService,
+                                                stateManager)),
+                                factory.createIconButton(
+                                        StandardActions.REDO,
+                                        new RedoAction(
+                                                frame::getCurrentLibraryTab,
+                                                undoManager,
+                                                dialogService,
+                                                stateManager)),
+                                factory.createIconButton(
+                                        StandardActions.CUT,
+                                        new EditAction(
+                                                StandardActions.CUT,
+                                                frame::getCurrentLibraryTab,
+                                                stateManager,
+                                                undoManager)),
+                                factory.createIconButton(
+                                        StandardActions.COPY,
+                                        new EditAction(
+                                                StandardActions.COPY,
+                                                frame::getCurrentLibraryTab,
+                                                stateManager,
+                                                undoManager)),
+                                factory.createIconButton(
+                                        StandardActions.PASTE,
+                                        new EditAction(
+                                                StandardActions.PASTE,
+                                                frame::getCurrentLibraryTab,
+                                                stateManager,
+                                                undoManager))),
+                        new Separator(Orientation.VERTICAL),
+                        new HBox(
+                                pushToApplicationButton,
+                                factory.createIconButton(
+                                        StandardActions.GENERATE_CITE_KEYS,
+                                        new GenerateCitationKeyAction(
+                                                frame::getCurrentLibraryTab,
+                                                dialogService,
+                                                stateManager,
+                                                taskExecutor,
+                                                preferences,
+                                                undoManager)),
+                                factory.createIconButton(
+                                        StandardActions.CLEANUP_ENTRIES,
+                                        new CleanupAction(
+                                                frame::getCurrentLibraryTab,
+                                                preferences,
+                                                dialogService,
+                                                stateManager,
+                                                taskExecutor,
+                                                undoManager))),
+                        new Separator(Orientation.VERTICAL),
+                        new HBox(createTaskIndicator()),
+                        new Separator(Orientation.VERTICAL),
+                        new HBox(
+                                factory.createIconButton(
+                                        StandardActions.OPEN_GITHUB,
+                                        new OpenBrowserAction(
+                                                "https://github.com/JabRef/jabref",
+                                                dialogService,
+                                                preferences
+                                                        .getExternalApplicationsPreferences()))));
 
         leftSpacer.setPrefWidth(50);
         leftSpacer.setMinWidth(Region.USE_PREF_SIZE);
@@ -172,24 +260,31 @@ Button createNewEntryFromIdButton() {
         newEntryFromIdButton.getStyleClass().setAll("icon-button");
         newEntryFromIdButton.setFocusTraversable(false);
         newEntryFromIdButton.disableProperty().bind(ActionHelper.needsDatabase(stateManager).not());
-        newEntryFromIdButton.setOnMouseClicked(event -> {
-            GenerateEntryFromIdDialog entryFromId = new GenerateEntryFromIdDialog(frame.getCurrentLibraryTab(), dialogService, preferences, taskExecutor, stateManager);
-
-            if (entryFromIdPopOver == null) {
-                entryFromIdPopOver = new PopOver(entryFromId.getDialogPane());
-                entryFromIdPopOver.setTitle(Localization.lang("Import by ID"));
-                entryFromIdPopOver.setArrowLocation(PopOver.ArrowLocation.TOP_CENTER);
-                entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
-                entryFromIdPopOver.show(newEntryFromIdButton);
-                entryFromId.setEntryFromIdPopOver(entryFromIdPopOver);
-            } else if (entryFromIdPopOver.isShowing()) {
-                entryFromIdPopOver.hide();
-            } else {
-                entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
-                entryFromIdPopOver.show(newEntryFromIdButton);
-                entryFromId.setEntryFromIdPopOver(entryFromIdPopOver);
-            }
-        });
+        newEntryFromIdButton.setOnMouseClicked(
+                event -> {
+                    GenerateEntryFromIdDialog entryFromId =
+                            new GenerateEntryFromIdDialog(
+                                    frame.getCurrentLibraryTab(),
+                                    dialogService,
+                                    preferences,
+                                    taskExecutor,
+                                    stateManager);
+
+                    if (entryFromIdPopOver == null) {
+                        entryFromIdPopOver = new PopOver(entryFromId.getDialogPane());
+                        entryFromIdPopOver.setTitle(Localization.lang("Import by ID"));
+                        entryFromIdPopOver.setArrowLocation(PopOver.ArrowLocation.TOP_CENTER);
+                        entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
+                        entryFromIdPopOver.show(newEntryFromIdButton);
+                        entryFromId.setEntryFromIdPopOver(entryFromIdPopOver);
+                    } else if (entryFromIdPopOver.isShowing()) {
+                        entryFromIdPopOver.hide();
+                    } else {
+                        entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
+                        entryFromIdPopOver.show(newEntryFromIdButton);
+                        entryFromId.setEntryFromIdPopOver(entryFromIdPopOver);
+                    }
+                });
         newEntryFromIdButton.setTooltip(new Tooltip(Localization.lang("Import by ID")));
 
         return newEntryFromIdButton;
@@ -203,49 +298,65 @@ Group createTaskIndicator() {
         Tooltip someTasksRunning = new Tooltip(Localization.lang("Background Tasks are running"));
         Tooltip noTasksRunning = new Tooltip(Localization.lang("Background Tasks are done"));
         indicator.setTooltip(noTasksRunning);
-        stateManager.getAnyTaskRunning().addListener((observable, oldValue, newValue) -> {
-            if (newValue) {
-                indicator.setTooltip(someTasksRunning);
-            } else {
-                indicator.setTooltip(noTasksRunning);
-            }
-        });
+        stateManager
+                .getAnyTaskRunning()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            if (newValue) {
+                                indicator.setTooltip(someTasksRunning);
+                            } else {
+                                indicator.setTooltip(noTasksRunning);
+                            }
+                        });
 
         // The label of the indicator cannot be removed with styling. Therefore,
         // hide it and clip it to a square of (width x width) each time width is updated.
-        indicator.widthProperty().addListener((observable, oldValue, newValue) -> {
-            // The indeterminate spinner is wider than the determinate spinner.
-            // We must make sure they are the same width for the clipping to result in a square of the same size always.
-            if (!indicator.isIndeterminate()) {
-                indicator.setPrefWidth(newValue.doubleValue());
-            }
-            if (newValue.doubleValue() > 0) {
-                Rectangle clip = new Rectangle(newValue.doubleValue(), newValue.doubleValue());
-                indicator.setClip(clip);
-            }
-        });
-
-        indicator.setOnMouseClicked(event -> {
-            if ((progressViewPopOver != null) && (progressViewPopOver.isShowing())) {
-                progressViewPopOver.hide();
-                taskProgressSubscription.unsubscribe();
-                return;
-            }
-
-            TaskProgressView<Task<?>> taskProgressView = new TaskProgressView<>();
-            taskProgressSubscription = EasyBind.bindContent(taskProgressView.getTasks(), stateManager.getRunningBackgroundTasks());
-            taskProgressView.setRetainTasks(false);
-            taskProgressView.setGraphicFactory(task -> ThemeManager.getDownloadIconTitleMap.getOrDefault(task.getTitle(), null));
-
-            if (progressViewPopOver == null) {
-                progressViewPopOver = new PopOver(taskProgressView);
-                progressViewPopOver.setTitle(Localization.lang("Background Tasks"));
-                progressViewPopOver.setArrowLocation(PopOver.ArrowLocation.RIGHT_TOP);
-            }
-
-            progressViewPopOver.setContentNode(taskProgressView);
-            progressViewPopOver.show(indicator);
-        });
+        indicator
+                .widthProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            // The indeterminate spinner is wider than the determinate spinner.
+                            // We must make sure they are the same width for the clipping to result
+                            // in a square of the same size always.
+                            if (!indicator.isIndeterminate()) {
+                                indicator.setPrefWidth(newValue.doubleValue());
+                            }
+                            if (newValue.doubleValue() > 0) {
+                                Rectangle clip =
+                                        new Rectangle(
+                                                newValue.doubleValue(), newValue.doubleValue());
+                                indicator.setClip(clip);
+                            }
+                        });
+
+        indicator.setOnMouseClicked(
+                event -> {
+                    if ((progressViewPopOver != null) && (progressViewPopOver.isShowing())) {
+                        progressViewPopOver.hide();
+                        taskProgressSubscription.unsubscribe();
+                        return;
+                    }
+
+                    TaskProgressView<Task<?>> taskProgressView = new TaskProgressView<>();
+                    taskProgressSubscription =
+                            EasyBind.bindContent(
+                                    taskProgressView.getTasks(),
+                                    stateManager.getRunningBackgroundTasks());
+                    taskProgressView.setRetainTasks(false);
+                    taskProgressView.setGraphicFactory(
+                            task ->
+                                    ThemeManager.getDownloadIconTitleMap.getOrDefault(
+                                            task.getTitle(), null));
+
+                    if (progressViewPopOver == null) {
+                        progressViewPopOver = new PopOver(taskProgressView);
+                        progressViewPopOver.setTitle(Localization.lang("Background Tasks"));
+                        progressViewPopOver.setArrowLocation(PopOver.ArrowLocation.RIGHT_TOP);
+                    }
+
+                    progressViewPopOver.setContentNode(taskProgressView);
+                    progressViewPopOver.show(indicator);
+                });
 
         return new Group(indicator);
     }
diff --git a/src/main/java/org/jabref/gui/frame/OpenConsoleAction.java b/src/main/java/org/jabref/gui/frame/OpenConsoleAction.java
index c29c86a5d027..dc51b823fa55 100644
--- a/src/main/java/org/jabref/gui/frame/OpenConsoleAction.java
+++ b/src/main/java/org/jabref/gui/frame/OpenConsoleAction.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.frame;
 
-import java.io.IOException;
-import java.util.Optional;
-import java.util.function.Supplier;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
@@ -11,10 +7,13 @@
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.model.database.BibDatabaseContext;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.Optional;
+import java.util.function.Supplier;
+
 public class OpenConsoleAction extends SimpleCommand {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OpenConsoleAction.class);
@@ -29,7 +28,11 @@ public class OpenConsoleAction extends SimpleCommand {
      * {@link #OpenConsoleAction(StateManager, GuiPreferences, DialogService)} if not supplying
      * another database.
      */
-    public OpenConsoleAction(Supplier<BibDatabaseContext> databaseContext, StateManager stateManager, GuiPreferences preferences, DialogService dialogService) {
+    public OpenConsoleAction(
+            Supplier<BibDatabaseContext> databaseContext,
+            StateManager stateManager,
+            GuiPreferences preferences,
+            DialogService dialogService) {
         this.databaseContext = databaseContext;
         this.stateManager = stateManager;
         this.preferences = preferences;
@@ -41,18 +44,23 @@ public OpenConsoleAction(Supplier<BibDatabaseContext> databaseContext, StateMana
     /**
      * Using this constructor will result in executing the command on the active database.
      */
-    public OpenConsoleAction(StateManager stateManager, GuiPreferences preferences, DialogService dialogService) {
+    public OpenConsoleAction(
+            StateManager stateManager, GuiPreferences preferences, DialogService dialogService) {
         this(() -> null, stateManager, preferences, dialogService);
     }
 
     @Override
     public void execute() {
-        Optional.ofNullable(databaseContext.get()).or(stateManager::getActiveDatabase).flatMap(BibDatabaseContext::getDatabasePath).ifPresent(path -> {
-            try {
-                NativeDesktop.openConsole(path, preferences, dialogService);
-            } catch (IOException e) {
-                LOGGER.info("Could not open console", e);
-            }
-        });
+        Optional.ofNullable(databaseContext.get())
+                .or(stateManager::getActiveDatabase)
+                .flatMap(BibDatabaseContext::getDatabasePath)
+                .ifPresent(
+                        path -> {
+                            try {
+                                NativeDesktop.openConsole(path, preferences, dialogService);
+                            } catch (IOException e) {
+                                LOGGER.info("Could not open console", e);
+                            }
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/frame/ProcessingLibraryDialog.java b/src/main/java/org/jabref/gui/frame/ProcessingLibraryDialog.java
index 72ccfbba08fd..b2f7ac2c550a 100644
--- a/src/main/java/org/jabref/gui/frame/ProcessingLibraryDialog.java
+++ b/src/main/java/org/jabref/gui/frame/ProcessingLibraryDialog.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.frame;
 
-import java.util.List;
-
 import javafx.concurrent.Task;
 
 import org.jabref.gui.DialogService;
@@ -9,6 +7,8 @@
 import org.jabref.gui.util.UiTaskExecutor;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.List;
+
 /**
  * Dialog shown when <em>closing</em> of application needs to wait for a save operation to finish.
  */
@@ -22,26 +22,26 @@ public ProcessingLibraryDialog(DialogService dialogService) {
 
     public void showAndWait(List<LibraryTab> libraryTabs) {
         if (libraryTabs.stream().anyMatch(tab -> tab.isSaving())) {
-            Task<Void> waitForSaveFinished = new Task<>() {
-                @Override
-                protected Void call() throws Exception {
-                    while (libraryTabs.stream().anyMatch(tab -> tab.isSaving())) {
-                        if (isCancelled()) {
+            Task<Void> waitForSaveFinished =
+                    new Task<>() {
+                        @Override
+                        protected Void call() throws Exception {
+                            while (libraryTabs.stream().anyMatch(tab -> tab.isSaving())) {
+                                if (isCancelled()) {
+                                    return null;
+                                } else {
+                                    Thread.sleep(100);
+                                }
+                            }
                             return null;
-                        } else {
-                            Thread.sleep(100);
                         }
-                    }
-                    return null;
-                }
-            };
+                    };
 
             UiTaskExecutor.runInJavaFXThread(waitForSaveFinished);
             dialogService.showProgressDialogAndWait(
                     Localization.lang("Please wait..."),
                     Localization.lang("Waiting for save operation to finish..."),
-                    waitForSaveFinished
-            );
+                    waitForSaveFinished);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/frame/SendAsEMailAction.java b/src/main/java/org/jabref/gui/frame/SendAsEMailAction.java
index 194fc4c4a200..d27edb712c8c 100644
--- a/src/main/java/org/jabref/gui/frame/SendAsEMailAction.java
+++ b/src/main/java/org/jabref/gui/frame/SendAsEMailAction.java
@@ -1,13 +1,5 @@
 package org.jabref.gui.frame;
 
-import java.awt.Desktop;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
@@ -20,10 +12,17 @@
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.awt.Desktop;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Sends the selected entry as email
  * <p>
@@ -43,10 +42,11 @@ public abstract class SendAsEMailAction extends SimpleCommand {
     private final StateManager stateManager;
     private final TaskExecutor taskExecutor;
 
-    public SendAsEMailAction(DialogService dialogService,
-                             GuiPreferences preferences,
-                             StateManager stateManager,
-                             TaskExecutor taskExecutor) {
+    public SendAsEMailAction(
+            DialogService dialogService,
+            GuiPreferences preferences,
+            StateManager stateManager,
+            TaskExecutor taskExecutor) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.stateManager = stateManager;
@@ -56,13 +56,14 @@ public SendAsEMailAction(DialogService dialogService,
     @Override
     public void execute() {
         BackgroundTask.wrap(this::sendEmail)
-                      .onSuccess(dialogService::notify)
-                      .onFailure(e -> {
-                          String message = Localization.lang("Error creating email");
-                          LOGGER.warn(message, e);
-                          dialogService.notify(message);
-                      })
-                      .executeWith(taskExecutor);
+                .onSuccess(dialogService::notify)
+                .onFailure(
+                        e -> {
+                            String message = Localization.lang("Error creating email");
+                            LOGGER.warn(message, e);
+                            dialogService.notify(message);
+                        })
+                .executeWith(taskExecutor);
     }
 
     private String sendEmail() throws Exception {
@@ -102,17 +103,26 @@ private URI getUriMailTo(List<BibEntry> entries) throws URISyntaxException {
     private List<String> getAttachments(List<BibEntry> entries) {
         // open folders is needed to indirectly support email programs, which cannot handle
         //   the unofficial "mailto:attachment" property
-        boolean openFolders = preferences.getExternalApplicationsPreferences().shouldAutoOpenEmailAttachmentsFolder();
+        boolean openFolders =
+                preferences
+                        .getExternalApplicationsPreferences()
+                        .shouldAutoOpenEmailAttachmentsFolder();
 
         BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get();
-        List<Path> fileList = FileUtil.getListOfLinkedFiles(entries, databaseContext.getFileDirectories(preferences.getFilePreferences()));
+        List<Path> fileList =
+                FileUtil.getListOfLinkedFiles(
+                        entries,
+                        databaseContext.getFileDirectories(preferences.getFilePreferences()));
 
         List<String> attachments = new ArrayList<>();
         for (Path path : fileList) {
             attachments.add(path.toAbsolutePath().toString());
             if (openFolders) {
                 try {
-                    NativeDesktop.openFolderAndSelectFile(path.toAbsolutePath(), preferences.getExternalApplicationsPreferences(), dialogService);
+                    NativeDesktop.openFolderAndSelectFile(
+                            path.toAbsolutePath(),
+                            preferences.getExternalApplicationsPreferences(),
+                            dialogService);
                 } catch (IOException e) {
                     LOGGER.debug("Cannot open file", e);
                 }
diff --git a/src/main/java/org/jabref/gui/frame/SendAsKindleEmailAction.java b/src/main/java/org/jabref/gui/frame/SendAsKindleEmailAction.java
index 23df424a3c93..6080cf20024d 100644
--- a/src/main/java/org/jabref/gui/frame/SendAsKindleEmailAction.java
+++ b/src/main/java/org/jabref/gui/frame/SendAsKindleEmailAction.java
@@ -14,10 +14,16 @@
 public class SendAsKindleEmailAction extends SendAsEMailAction {
     private final GuiPreferences preferences;
 
-    public SendAsKindleEmailAction(DialogService dialogService, GuiPreferences preferences, StateManager stateManager, TaskExecutor taskExecutor) {
+    public SendAsKindleEmailAction(
+            DialogService dialogService,
+            GuiPreferences preferences,
+            StateManager stateManager,
+            TaskExecutor taskExecutor) {
         super(dialogService, preferences, stateManager, taskExecutor);
         this.preferences = preferences;
-        this.executable.bind(ActionHelper.needsEntriesSelected(stateManager).and(ActionHelper.hasLinkedFileForSelectedEntries(stateManager)));
+        this.executable.bind(
+                ActionHelper.needsEntriesSelected(stateManager)
+                        .and(ActionHelper.hasLinkedFileForSelectedEntries(stateManager)));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/frame/SendAsStandardEmailAction.java b/src/main/java/org/jabref/gui/frame/SendAsStandardEmailAction.java
index 3e379f9533af..bdd059bf80b3 100644
--- a/src/main/java/org/jabref/gui/frame/SendAsStandardEmailAction.java
+++ b/src/main/java/org/jabref/gui/frame/SendAsStandardEmailAction.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.frame;
 
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.List;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
@@ -16,10 +12,13 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.List;
+
 /**
  * Sends the selected entries to any specifiable email
  * by populating the email body
@@ -30,11 +29,12 @@ public class SendAsStandardEmailAction extends SendAsEMailAction {
     private final StateManager stateManager;
     private final BibEntryTypesManager entryTypesManager;
 
-    public SendAsStandardEmailAction(DialogService dialogService,
-                                     GuiPreferences preferences,
-                                     StateManager stateManager,
-                                     BibEntryTypesManager entryTypesManager,
-                                     TaskExecutor taskExecutor) {
+    public SendAsStandardEmailAction(
+            DialogService dialogService,
+            GuiPreferences preferences,
+            StateManager stateManager,
+            BibEntryTypesManager entryTypesManager,
+            TaskExecutor taskExecutor) {
         super(dialogService, preferences, stateManager, taskExecutor);
         this.preferences = preferences;
         this.stateManager = stateManager;
@@ -59,7 +59,9 @@ protected String getBody() {
         StringWriter rawEntries = new StringWriter();
         BibWriter bibWriter = new BibWriter(rawEntries, OS.NEWLINE);
 
-        BibEntryWriter bibtexEntryWriter = new BibEntryWriter(new FieldWriter(preferences.getFieldPreferences()), entryTypesManager);
+        BibEntryWriter bibtexEntryWriter =
+                new BibEntryWriter(
+                        new FieldWriter(preferences.getFieldPreferences()), entryTypesManager);
 
         for (BibEntry entry : entries) {
             try {
diff --git a/src/main/java/org/jabref/gui/frame/SidePanePreferences.java b/src/main/java/org/jabref/gui/frame/SidePanePreferences.java
index 86c6751d6593..64730a7b1c38 100644
--- a/src/main/java/org/jabref/gui/frame/SidePanePreferences.java
+++ b/src/main/java/org/jabref/gui/frame/SidePanePreferences.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.frame;
 
-import java.util.Map;
-import java.util.Set;
-
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.collections.FXCollections;
@@ -11,14 +8,18 @@
 
 import org.jabref.gui.sidepane.SidePaneType;
 
+import java.util.Map;
+import java.util.Set;
+
 public class SidePanePreferences {
     private final ObservableSet<SidePaneType> visiblePanes;
     private final ObservableMap<SidePaneType, Integer> preferredPositions;
     private final IntegerProperty webSearchFetcherSelected;
 
-    public SidePanePreferences(Set<SidePaneType> visiblePanes,
-                               Map<SidePaneType, Integer> preferredPositions,
-                               int webSearchFetcherSelected) {
+    public SidePanePreferences(
+            Set<SidePaneType> visiblePanes,
+            Map<SidePaneType, Integer> preferredPositions,
+            int webSearchFetcherSelected) {
         this.visiblePanes = FXCollections.observableSet(visiblePanes);
         this.preferredPositions = FXCollections.observableMap(preferredPositions);
         this.webSearchFetcherSelected = new SimpleIntegerProperty(webSearchFetcherSelected);
diff --git a/src/main/java/org/jabref/gui/frame/UiMessageHandler.java b/src/main/java/org/jabref/gui/frame/UiMessageHandler.java
index 38a41d7d83cb..dd3a60bf104e 100644
--- a/src/main/java/org/jabref/gui/frame/UiMessageHandler.java
+++ b/src/main/java/org/jabref/gui/frame/UiMessageHandler.java
@@ -1,9 +1,9 @@
 package org.jabref.gui.frame;
 
-import java.util.List;
-
 import org.jabref.logic.UiCommand;
 
+import java.util.List;
+
 /**
  * Specifies an interface that can process either cli or remote commands to the ui
  *
diff --git a/src/main/java/org/jabref/gui/groups/GroupColorPicker.java b/src/main/java/org/jabref/gui/groups/GroupColorPicker.java
index 78fcafe65cf6..40ee2349853b 100644
--- a/src/main/java/org/jabref/gui/groups/GroupColorPicker.java
+++ b/src/main/java/org/jabref/gui/groups/GroupColorPicker.java
@@ -1,12 +1,12 @@
 package org.jabref.gui.groups;
 
-import java.util.List;
-
 import javafx.scene.paint.Color;
 
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
+import java.util.List;
+
 @NullMarked
 public class GroupColorPicker {
 
diff --git a/src/main/java/org/jabref/gui/groups/GroupDescriptions.java b/src/main/java/org/jabref/gui/groups/GroupDescriptions.java
index 5023f77e5f01..ff5273e3d5fe 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDescriptions.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDescriptions.java
@@ -8,10 +8,10 @@
 
 public class GroupDescriptions {
 
-    private GroupDescriptions() {
-    }
+    private GroupDescriptions() {}
 
-    public static String getShortDescriptionKeywordGroup(KeywordGroup keywordGroup, boolean showDynamic) {
+    public static String getShortDescriptionKeywordGroup(
+            KeywordGroup keywordGroup, boolean showDynamic) {
         StringBuilder sb = new StringBuilder();
         sb.append("<b>");
         if (showDynamic) {
@@ -43,7 +43,10 @@ public static String getShortDescriptionKeywordGroup(KeywordGroup keywordGroup,
 
     public static String getShortDescriptionExplicitGroup(ExplicitGroup explicitGroup) {
         StringBuilder sb = new StringBuilder();
-        sb.append("<b>").append(explicitGroup.getName()).append("</b> - ").append(Localization.lang("static group"));
+        sb.append("<b>")
+                .append(explicitGroup.getName())
+                .append("</b> - ")
+                .append(Localization.lang("static group"));
         switch (explicitGroup.getHierarchicalContext()) {
             case INCLUDING:
                 sb.append(", ").append(Localization.lang("includes subgroups"));
@@ -73,7 +76,9 @@ public static String getShortDescription(SearchGroup searchGroup, boolean showDy
         sb.append(Localization.lang("dynamic group"));
         sb.append(" (");
         sb.append(Localization.lang("search expression"));
-        sb.append(" <b>").append(StringUtil.quoteForHTML(searchGroup.getSearchExpression())).append("</b>)");
+        sb.append(" <b>")
+                .append(StringUtil.quoteForHTML(searchGroup.getSearchExpression()))
+                .append("</b>)");
         switch (searchGroup.getHierarchicalContext()) {
             case INCLUDING:
                 sb.append(", ").append(Localization.lang("includes subgroups"));
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogHeader.java b/src/main/java/org/jabref/gui/groups/GroupDialogHeader.java
index 0cf5d92b173b..e272ce634b2b 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogHeader.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogHeader.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.groups;
 
 public enum GroupDialogHeader {
-    GROUP, SUBGROUP
+    GROUP,
+    SUBGROUP
 }
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index c1f537248ead..e7fe9891950d 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.groups;
 
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.ServiceLoader;
+import com.airhacks.afterburner.views.ViewLoader;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+import jakarta.inject.Inject;
 
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
@@ -29,6 +29,10 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 
+import org.controlsfx.control.GridCell;
+import org.controlsfx.control.GridView;
+import org.controlsfx.control.PopOver;
+import org.controlsfx.control.textfield.CustomTextField;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
@@ -47,19 +51,17 @@
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import jakarta.inject.Inject;
-import org.controlsfx.control.GridCell;
-import org.controlsfx.control.GridView;
-import org.controlsfx.control.PopOver;
-import org.controlsfx.control.textfield.CustomTextField;
 import org.jspecify.annotations.Nullable;
 import org.kordamp.ikonli.Ikon;
 import org.kordamp.ikonli.IkonProvider;
 import org.kordamp.ikonli.javafx.FontIcon;
 
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.ServiceLoader;
+
 public class GroupDialogView extends BaseDialog<AbstractGroup> {
 
     private static boolean useAutoColoring = false;
@@ -98,8 +100,10 @@ public class GroupDialogView extends BaseDialog<AbstractGroup> {
 
     @FXML private TextField texGroupFilePath;
 
-    private final EnumMap<GroupHierarchyType, String> hierarchyText = new EnumMap<>(GroupHierarchyType.class);
-    private final EnumMap<GroupHierarchyType, String> hierarchyToolTip = new EnumMap<>(GroupHierarchyType.class);
+    private final EnumMap<GroupHierarchyType, String> hierarchyText =
+            new EnumMap<>(GroupHierarchyType.class);
+    private final EnumMap<GroupHierarchyType, String> hierarchyToolTip =
+            new EnumMap<>(GroupHierarchyType.class);
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
@@ -114,17 +118,16 @@ public class GroupDialogView extends BaseDialog<AbstractGroup> {
     @Inject private GuiPreferences preferences;
     @Inject private StateManager stateManager;
 
-    public GroupDialogView(BibDatabaseContext currentDatabase,
-                           @Nullable GroupTreeNode parentNode,
-                           @Nullable AbstractGroup editedGroup,
-                           GroupDialogHeader groupDialogHeader) {
+    public GroupDialogView(
+            BibDatabaseContext currentDatabase,
+            @Nullable GroupTreeNode parentNode,
+            @Nullable AbstractGroup editedGroup,
+            GroupDialogHeader groupDialogHeader) {
         this.currentDatabase = currentDatabase;
         this.parentNode = parentNode;
         this.editedGroup = editedGroup;
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         if (editedGroup == null) {
             if (groupDialogHeader == GroupDialogHeader.GROUP) {
@@ -143,19 +146,24 @@ public GroupDialogView(BibDatabaseContext currentDatabase,
         final Button helpButton = (Button) getDialogPane().lookupButton(helpButtonType);
 
         ActionFactory actionFactory = new ActionFactory();
-        HelpAction helpAction = new HelpAction(HelpFile.GROUPS, dialogService, preferences.getExternalApplicationsPreferences());
-        actionFactory.configureIconButton(
-                StandardActions.HELP_GROUPS,
-                helpAction,
-                helpButton);
+        HelpAction helpAction =
+                new HelpAction(
+                        HelpFile.GROUPS,
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences());
+        actionFactory.configureIconButton(StandardActions.HELP_GROUPS, helpAction, helpButton);
 
         // Consume the dialog close event, but execute the help action
-        helpButton.addEventFilter(ActionEvent.ACTION, event -> {
-            helpAction.execute();
-            event.consume();
-        });
+        helpButton.addEventFilter(
+                ActionEvent.ACTION,
+                event -> {
+                    helpAction.execute();
+                    event.consume();
+                });
 
-        confirmDialogButton.disableProperty().bind(viewModel.validationStatus().validProperty().not());
+        confirmDialogButton
+                .disableProperty()
+                .bind(viewModel.validationStatus().validProperty().not());
         // handle validation before closing dialog and calling resultConverter
         confirmDialogButton.addEventFilter(ActionEvent.ACTION, viewModel::validationHandler);
     }
@@ -170,16 +178,33 @@ public GroupDialogView(BibDatabaseContext currentDatabase,
 
     @FXML
     public void initialize() {
-        viewModel = new GroupDialogViewModel(dialogService, currentDatabase, preferences, editedGroup, parentNode, fileUpdateMonitor, stateManager);
+        viewModel =
+                new GroupDialogViewModel(
+                        dialogService,
+                        currentDatabase,
+                        preferences,
+                        editedGroup,
+                        parentNode,
+                        fileUpdateMonitor,
+                        stateManager);
 
         setResultConverter(viewModel::resultConverter);
 
         hierarchyText.put(GroupHierarchyType.INCLUDING, Localization.lang("Union"));
-        hierarchyToolTip.put(GroupHierarchyType.INCLUDING, Localization.lang("Include subgroups: When selected, view entries contained in this group or its subgroups"));
+        hierarchyToolTip.put(
+                GroupHierarchyType.INCLUDING,
+                Localization.lang(
+                        "Include subgroups: When selected, view entries contained in this group or its subgroups"));
         hierarchyText.put(GroupHierarchyType.REFINING, Localization.lang("Intersection"));
-        hierarchyToolTip.put(GroupHierarchyType.REFINING, Localization.lang("Refine supergroup: When selected, view entries contained in both this group and its supergroup"));
+        hierarchyToolTip.put(
+                GroupHierarchyType.REFINING,
+                Localization.lang(
+                        "Refine supergroup: When selected, view entries contained in both this group and its supergroup"));
         hierarchyText.put(GroupHierarchyType.INDEPENDENT, Localization.lang("Independent"));
-        hierarchyToolTip.put(GroupHierarchyType.INDEPENDENT, Localization.lang("Independent group: When selected, view only this group's entries"));
+        hierarchyToolTip.put(
+                GroupHierarchyType.INDEPENDENT,
+                Localization.lang(
+                        "Independent group: When selected, view only this group's entries"));
 
         nameField.textProperty().bindBidirectional(viewModel.nameProperty());
         descriptionField.textProperty().bindBidirectional(viewModel.descriptionProperty());
@@ -191,7 +216,9 @@ public void initialize() {
                 .withText(hierarchyText::get)
                 .withStringTooltip(hierarchyToolTip::get)
                 .install(hierarchicalContextCombo);
-        hierarchicalContextCombo.valueProperty().bindBidirectional(viewModel.groupHierarchySelectedProperty());
+        hierarchicalContextCombo
+                .valueProperty()
+                .bindBidirectional(viewModel.groupHierarchySelectedProperty());
 
         explicitRadioButton.selectedProperty().bindBidirectional(viewModel.typeExplicitProperty());
         keywordsRadioButton.selectedProperty().bindBidirectional(viewModel.typeKeywordsProperty());
@@ -199,53 +226,96 @@ public void initialize() {
         autoRadioButton.selectedProperty().bindBidirectional(viewModel.typeAutoProperty());
         texRadioButton.selectedProperty().bindBidirectional(viewModel.typeTexProperty());
 
-        keywordGroupSearchTerm.textProperty().bindBidirectional(viewModel.keywordGroupSearchTermProperty());
-        keywordGroupSearchField.textProperty().bindBidirectional(viewModel.keywordGroupSearchFieldProperty());
-        keywordGroupCaseSensitive.selectedProperty().bindBidirectional(viewModel.keywordGroupCaseSensitiveProperty());
-        keywordGroupRegex.selectedProperty().bindBidirectional(viewModel.keywordGroupRegexProperty());
-
-        searchGroupSearchTerm.textProperty().bindBidirectional(viewModel.searchGroupSearchTermProperty());
-
-        autoGroupKeywordsOption.selectedProperty().bindBidirectional(viewModel.autoGroupKeywordsOptionProperty());
-        autoGroupKeywordsField.textProperty().bindBidirectional(viewModel.autoGroupKeywordsFieldProperty());
-        autoGroupKeywordsDeliminator.textProperty().bindBidirectional(viewModel.autoGroupKeywordsDeliminatorProperty());
-        autoGroupKeywordsHierarchicalDeliminator.textProperty().bindBidirectional(viewModel.autoGroupKeywordsHierarchicalDeliminatorProperty());
-        autoGroupPersonsOption.selectedProperty().bindBidirectional(viewModel.autoGroupPersonsOptionProperty());
-        autoGroupPersonsField.textProperty().bindBidirectional(viewModel.autoGroupPersonsFieldProperty());
+        keywordGroupSearchTerm
+                .textProperty()
+                .bindBidirectional(viewModel.keywordGroupSearchTermProperty());
+        keywordGroupSearchField
+                .textProperty()
+                .bindBidirectional(viewModel.keywordGroupSearchFieldProperty());
+        keywordGroupCaseSensitive
+                .selectedProperty()
+                .bindBidirectional(viewModel.keywordGroupCaseSensitiveProperty());
+        keywordGroupRegex
+                .selectedProperty()
+                .bindBidirectional(viewModel.keywordGroupRegexProperty());
+
+        searchGroupSearchTerm
+                .textProperty()
+                .bindBidirectional(viewModel.searchGroupSearchTermProperty());
+
+        autoGroupKeywordsOption
+                .selectedProperty()
+                .bindBidirectional(viewModel.autoGroupKeywordsOptionProperty());
+        autoGroupKeywordsField
+                .textProperty()
+                .bindBidirectional(viewModel.autoGroupKeywordsFieldProperty());
+        autoGroupKeywordsDeliminator
+                .textProperty()
+                .bindBidirectional(viewModel.autoGroupKeywordsDeliminatorProperty());
+        autoGroupKeywordsHierarchicalDeliminator
+                .textProperty()
+                .bindBidirectional(viewModel.autoGroupKeywordsHierarchicalDeliminatorProperty());
+        autoGroupPersonsOption
+                .selectedProperty()
+                .bindBidirectional(viewModel.autoGroupPersonsOptionProperty());
+        autoGroupPersonsField
+                .textProperty()
+                .bindBidirectional(viewModel.autoGroupPersonsFieldProperty());
 
         texGroupFilePath.textProperty().bindBidirectional(viewModel.texGroupFilePathProperty());
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        Platform.runLater(() -> {
-            validationVisualizer.initVisualization(viewModel.nameValidationStatus(), nameField);
-            validationVisualizer.initVisualization(viewModel.nameContainsDelimiterValidationStatus(), nameField, false);
-            validationVisualizer.initVisualization(viewModel.sameNameValidationStatus(), nameField);
-            validationVisualizer.initVisualization(viewModel.searchSearchTermEmptyValidationStatus(), searchGroupSearchTerm);
-            validationVisualizer.initVisualization(viewModel.keywordRegexValidationStatus(), keywordGroupSearchTerm);
-            validationVisualizer.initVisualization(viewModel.keywordSearchTermEmptyValidationStatus(), keywordGroupSearchTerm);
-            validationVisualizer.initVisualization(viewModel.keywordFieldEmptyValidationStatus(), keywordGroupSearchField);
-            validationVisualizer.initVisualization(viewModel.texGroupFilePathValidatonStatus(), texGroupFilePath);
-            nameField.requestFocus();
-        });
+        Platform.runLater(
+                () -> {
+                    validationVisualizer.initVisualization(
+                            viewModel.nameValidationStatus(), nameField);
+                    validationVisualizer.initVisualization(
+                            viewModel.nameContainsDelimiterValidationStatus(), nameField, false);
+                    validationVisualizer.initVisualization(
+                            viewModel.sameNameValidationStatus(), nameField);
+                    validationVisualizer.initVisualization(
+                            viewModel.searchSearchTermEmptyValidationStatus(),
+                            searchGroupSearchTerm);
+                    validationVisualizer.initVisualization(
+                            viewModel.keywordRegexValidationStatus(), keywordGroupSearchTerm);
+                    validationVisualizer.initVisualization(
+                            viewModel.keywordSearchTermEmptyValidationStatus(),
+                            keywordGroupSearchTerm);
+                    validationVisualizer.initVisualization(
+                            viewModel.keywordFieldEmptyValidationStatus(), keywordGroupSearchField);
+                    validationVisualizer.initVisualization(
+                            viewModel.texGroupFilePathValidatonStatus(), texGroupFilePath);
+                    nameField.requestFocus();
+                });
 
         autoColorCheckbox.setSelected(useAutoColoring);
-        autoColorCheckbox.setOnAction(event -> {
-            useAutoColoring = autoColorCheckbox.isSelected();
-            if (!autoColorCheckbox.isSelected()) {
-                return;
-            }
-            if (parentNode == null) {
-                viewModel.colorFieldProperty().setValue(IconTheme.getDefaultGroupColor());
-                return;
-            }
-            List<Color> colorsOfSiblings = parentNode.getChildren().stream().map(child -> child.getGroup().getColor())
-                                                     .flatMap(Optional::stream)
-                                                     .toList();
-            Optional<Color> parentColor = parentGroup().getColor();
-            Color color;
-            color = parentColor.map(value -> GroupColorPicker.generateColor(colorsOfSiblings, value)).orElseGet(() -> GroupColorPicker.generateColor(colorsOfSiblings));
-            viewModel.colorFieldProperty().setValue(color);
-        });
+        autoColorCheckbox.setOnAction(
+                event -> {
+                    useAutoColoring = autoColorCheckbox.isSelected();
+                    if (!autoColorCheckbox.isSelected()) {
+                        return;
+                    }
+                    if (parentNode == null) {
+                        viewModel.colorFieldProperty().setValue(IconTheme.getDefaultGroupColor());
+                        return;
+                    }
+                    List<Color> colorsOfSiblings =
+                            parentNode.getChildren().stream()
+                                    .map(child -> child.getGroup().getColor())
+                                    .flatMap(Optional::stream)
+                                    .toList();
+                    Optional<Color> parentColor = parentGroup().getColor();
+                    Color color;
+                    color =
+                            parentColor
+                                    .map(
+                                            value ->
+                                                    GroupColorPicker.generateColor(
+                                                            colorsOfSiblings, value))
+                                    .orElseGet(
+                                            () -> GroupColorPicker.generateColor(colorsOfSiblings));
+                    viewModel.colorFieldProperty().setValue(color);
+                });
     }
 
     @FXML
@@ -258,7 +328,8 @@ private void openIconPicker() {
         ObservableList<Ikon> ikonList = FXCollections.observableArrayList();
         FilteredList<Ikon> filteredList = new FilteredList<>(ikonList);
 
-        for (IkonProvider provider : ServiceLoader.load(IkonProvider.class.getModule().getLayer(), IkonProvider.class)) {
+        for (IkonProvider provider :
+                ServiceLoader.load(IkonProvider.class.getModule().getLayer(), IkonProvider.class)) {
             if (provider.getClass() != JabrefIconProvider.class) {
                 ikonList.addAll(EnumSet.allOf(provider.getIkon()));
             }
@@ -267,9 +338,16 @@ private void openIconPicker() {
         CustomTextField searchBox = new CustomTextField();
         searchBox.setPromptText(Localization.lang("Search") + "...");
         searchBox.setLeft(IconTheme.JabRefIcons.SEARCH.getGraphicNode());
-        searchBox.textProperty().addListener((obs, oldValue, newValue) ->
-                filteredList.setPredicate(ikon -> newValue.isEmpty() || ikon.getDescription().toLowerCase()
-                                                                            .contains(newValue.toLowerCase())));
+        searchBox
+                .textProperty()
+                .addListener(
+                        (obs, oldValue, newValue) ->
+                                filteredList.setPredicate(
+                                        ikon ->
+                                                newValue.isEmpty()
+                                                        || ikon.getDescription()
+                                                                .toLowerCase()
+                                                                .contains(newValue.toLowerCase())));
 
         GridView<Ikon> ikonGridView = new GridView<>(FXCollections.observableArrayList());
         ikonGridView.setCellFactory(gridView -> new IkonliCell());
@@ -284,9 +362,10 @@ private void openIconPicker() {
         // Necessary because of a bug in controlsfx GridView
         // https://github.com/controlsfx/controlsfx/issues/1400
         // The issue is closed, but still appears here
-        Platform.runLater(() -> {
-            ikonGridView.setItems(filteredList);
-        });
+        Platform.runLater(
+                () -> {
+                    ikonGridView.setItems(filteredList);
+                });
 
         PopOver popOver = new PopOver(vBox);
         popOver.setDetachable(false);
@@ -310,13 +389,23 @@ protected void updateItem(Ikon ikon, boolean empty) {
                 setGraphic(fontIcon);
                 setAlignment(Pos.BASELINE_CENTER);
                 setPadding(new Insets(1));
-                setBorder(new Border(new BorderStroke(Color.BLACK, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderStroke.THIN)));
-
-                setOnMouseClicked(event -> {
-                    iconField.textProperty().setValue(String.valueOf(fontIcon.getIconCode()));
-                    PopOver stage = (PopOver) this.getGridView().getParent().getScene().getWindow();
-                    stage.hide();
-                });
+                setBorder(
+                        new Border(
+                                new BorderStroke(
+                                        Color.BLACK,
+                                        BorderStrokeStyle.SOLID,
+                                        CornerRadii.EMPTY,
+                                        BorderStroke.THIN)));
+
+                setOnMouseClicked(
+                        event -> {
+                            iconField
+                                    .textProperty()
+                                    .setValue(String.valueOf(fontIcon.getIconCode()));
+                            PopOver stage =
+                                    (PopOver) this.getGridView().getParent().getScene().getWindow();
+                            stage.hide();
+                        });
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
index 1c36289b9dbb..923d2bb9b61c 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
@@ -1,14 +1,10 @@
 package org.jabref.gui.groups;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
+import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -54,14 +50,18 @@
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
 import org.jspecify.annotations.Nullable;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
 public class GroupDialogViewModel {
     // Basic Settings
     private final StringProperty nameProperty = new SimpleStringProperty("");
@@ -69,8 +69,10 @@ public class GroupDialogViewModel {
     private final StringProperty iconProperty = new SimpleStringProperty("");
     private final BooleanProperty colorUseProperty = new SimpleBooleanProperty();
     private final ObjectProperty<Color> colorProperty = new SimpleObjectProperty<>();
-    private final ListProperty<GroupHierarchyType> groupHierarchyListProperty = new SimpleListProperty<>();
-    private final ObjectProperty<GroupHierarchyType> groupHierarchySelectedProperty = new SimpleObjectProperty<>();
+    private final ListProperty<GroupHierarchyType> groupHierarchyListProperty =
+            new SimpleListProperty<>();
+    private final ObjectProperty<GroupHierarchyType> groupHierarchySelectedProperty =
+            new SimpleObjectProperty<>();
 
     // Type
     private final BooleanProperty typeExplicitProperty = new SimpleBooleanProperty();
@@ -86,12 +88,14 @@ public class GroupDialogViewModel {
     private final BooleanProperty keywordGroupRegexProperty = new SimpleBooleanProperty();
 
     private final StringProperty searchGroupSearchTermProperty = new SimpleStringProperty("");
-    private final ObjectProperty<EnumSet<SearchFlags>> searchFlagsProperty = new SimpleObjectProperty<>(EnumSet.noneOf(SearchFlags.class));
+    private final ObjectProperty<EnumSet<SearchFlags>> searchFlagsProperty =
+            new SimpleObjectProperty<>(EnumSet.noneOf(SearchFlags.class));
 
     private final BooleanProperty autoGroupKeywordsOptionProperty = new SimpleBooleanProperty();
     private final StringProperty autoGroupKeywordsFieldProperty = new SimpleStringProperty("");
     private final StringProperty autoGroupKeywordsDelimiterProperty = new SimpleStringProperty("");
-    private final StringProperty autoGroupKeywordsHierarchicalDelimiterProperty = new SimpleStringProperty("");
+    private final StringProperty autoGroupKeywordsHierarchicalDelimiterProperty =
+            new SimpleStringProperty("");
     private final BooleanProperty autoGroupPersonsOptionProperty = new SimpleBooleanProperty();
     private final StringProperty autoGroupPersonsFieldProperty = new SimpleStringProperty("");
 
@@ -115,13 +119,14 @@ public class GroupDialogViewModel {
     private final FileUpdateMonitor fileUpdateMonitor;
     private final StateManager stateManager;
 
-    public GroupDialogViewModel(DialogService dialogService,
-                                BibDatabaseContext currentDatabase,
-                                GuiPreferences preferences,
-                                @Nullable AbstractGroup editedGroup,
-                                @Nullable GroupTreeNode parentNode,
-                                FileUpdateMonitor fileUpdateMonitor,
-                                StateManager stateManager) {
+    public GroupDialogViewModel(
+            DialogService dialogService,
+            BibDatabaseContext currentDatabase,
+            GuiPreferences preferences,
+            @Nullable AbstractGroup editedGroup,
+            @Nullable GroupTreeNode parentNode,
+            FileUpdateMonitor fileUpdateMonitor,
+            StateManager stateManager) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.currentDatabase = currentDatabase;
@@ -137,129 +142,167 @@ public GroupDialogViewModel(DialogService dialogService,
     private void setupValidation() {
         validator = new CompositeValidator();
 
-        nameValidator = new FunctionBasedValidator<>(
-                nameProperty,
-                StringUtil::isNotBlank,
-                ValidationMessage.error(Localization.lang("Please enter a name for the group.")));
-
-        nameContainsDelimiterValidator = new FunctionBasedValidator<>(
-                nameProperty,
-                name -> !name.contains(Character.toString(preferences.getBibEntryPreferences().getKeywordSeparator())),
-                ValidationMessage.warning(
-                        Localization.lang(
-                                "The group name contains the keyword separator \"%0\" and thus probably does not work as expected.",
-                                Character.toString(preferences.getBibEntryPreferences().getKeywordSeparator())
-                        )));
-
-        sameNameValidator = new FunctionBasedValidator<>(
-                nameProperty,
-                name -> {
-                    Optional<GroupTreeNode> rootGroup = currentDatabase.getMetaData().getGroups();
-                    if (rootGroup.isPresent()) {
-                        int groupsWithSameName = rootGroup.get().findChildrenSatisfying(group -> group.getName().equals(name)).size();
-                        if ((editedGroup == null) && (groupsWithSameName > 0)) {
-                            // New group but there is already one group with the same name
-                            return false;
-                        }
-
-                        // Edit group, changed name to something that is already present
-                        return (editedGroup == null) || editedGroup.getName().equals(name) || (groupsWithSameName <= 0);
-                    }
-                    return true;
-                },
-                ValidationMessage.warning(
-                        Localization.lang("There already exists a group with the same name.\nIf you use it, it will inherit all entries from this other group.")
-                )
-        );
-
-        keywordRegexValidator = new FunctionBasedValidator<>(
-                keywordGroupSearchTermProperty,
-                input -> {
-                    if (!keywordGroupRegexProperty.getValue()) {
-                        return true;
+        nameValidator =
+                new FunctionBasedValidator<>(
+                        nameProperty,
+                        StringUtil::isNotBlank,
+                        ValidationMessage.error(
+                                Localization.lang("Please enter a name for the group.")));
+
+        nameContainsDelimiterValidator =
+                new FunctionBasedValidator<>(
+                        nameProperty,
+                        name ->
+                                !name.contains(
+                                        Character.toString(
+                                                preferences
+                                                        .getBibEntryPreferences()
+                                                        .getKeywordSeparator())),
+                        ValidationMessage.warning(
+                                Localization.lang(
+                                        "The group name contains the keyword separator \"%0\" and thus probably does not work as expected.",
+                                        Character.toString(
+                                                preferences
+                                                        .getBibEntryPreferences()
+                                                        .getKeywordSeparator()))));
+
+        sameNameValidator =
+                new FunctionBasedValidator<>(
+                        nameProperty,
+                        name -> {
+                            Optional<GroupTreeNode> rootGroup =
+                                    currentDatabase.getMetaData().getGroups();
+                            if (rootGroup.isPresent()) {
+                                int groupsWithSameName =
+                                        rootGroup
+                                                .get()
+                                                .findChildrenSatisfying(
+                                                        group -> group.getName().equals(name))
+                                                .size();
+                                if ((editedGroup == null) && (groupsWithSameName > 0)) {
+                                    // New group but there is already one group with the same name
+                                    return false;
+                                }
+
+                                // Edit group, changed name to something that is already present
+                                return (editedGroup == null)
+                                        || editedGroup.getName().equals(name)
+                                        || (groupsWithSameName <= 0);
+                            }
+                            return true;
+                        },
+                        ValidationMessage.warning(
+                                Localization.lang(
+                                        "There already exists a group with the same name.\nIf you use it, it will inherit all entries from this other group.")));
+
+        keywordRegexValidator =
+                new FunctionBasedValidator<>(
+                        keywordGroupSearchTermProperty,
+                        input -> {
+                            if (!keywordGroupRegexProperty.getValue()) {
+                                return true;
+                            }
+
+                            if (StringUtil.isNullOrEmpty(input)) {
+                                return false;
+                            }
+
+                            try {
+                                Pattern.compile(input);
+                                return true;
+                            } catch (PatternSyntaxException ignored) {
+                                return false;
+                            }
+                        },
+                        ValidationMessage.error(
+                                "%s > %n %s %n %n %s"
+                                        .formatted(
+                                                Localization.lang("Searching for a keyword"),
+                                                Localization.lang("Keywords"),
+                                                Localization.lang("Invalid regular expression."))));
+
+        keywordFieldEmptyValidator =
+                new FunctionBasedValidator<>(
+                        keywordGroupSearchFieldProperty,
+                        StringUtil::isNotBlank,
+                        ValidationMessage.error(
+                                Localization.lang(
+                                        "Please enter a field name to search for a keyword.")));
+
+        keywordSearchTermEmptyValidator =
+                new FunctionBasedValidator<>(
+                        keywordGroupSearchTermProperty,
+                        input -> !StringUtil.isNullOrEmpty(input),
+                        ValidationMessage.error(
+                                "%s > %n %s %n %n %s"
+                                        .formatted(
+                                                Localization.lang("Searching for a keyword"),
+                                                Localization.lang("Keywords"),
+                                                Localization.lang("Search term is empty."))));
+
+        searchSearchTermEmptyValidator =
+                new FunctionBasedValidator<>(
+                        searchGroupSearchTermProperty,
+                        input -> !StringUtil.isNullOrEmpty(input),
+                        ValidationMessage.error(
+                                "%s > %n %s"
+                                        .formatted(
+                                                Localization.lang("Free search expression"),
+                                                Localization.lang("Search term is empty."))));
+
+        texGroupFilePathValidator =
+                new FunctionBasedValidator<>(
+                        texGroupFilePathProperty,
+                        input -> {
+                            if (StringUtil.isBlank(input)) {
+                                return false;
+                            } else {
+                                Path inputPath = getAbsoluteTexGroupPath(input);
+                                if (!inputPath.isAbsolute() || !Files.isRegularFile(inputPath)) {
+                                    return false;
+                                }
+                                return FileUtil.getFileExtension(input)
+                                        .map("aux"::equalsIgnoreCase)
+                                        .orElse(false);
+                            }
+                        },
+                        ValidationMessage.error(
+                                Localization.lang("Please provide a valid aux file.")));
+
+        typeSearchProperty.addListener(
+                (obs, _oldValue, isSelected) -> {
+                    if (isSelected) {
+                        validator.addValidators(searchSearchTermEmptyValidator);
+                    } else {
+                        validator.removeValidators(searchSearchTermEmptyValidator);
                     }
-
-                    if (StringUtil.isNullOrEmpty(input)) {
-                        return false;
+                });
+
+        typeKeywordsProperty.addListener(
+                (obs, _oldValue, isSelected) -> {
+                    if (isSelected) {
+                        validator.addValidators(
+                                keywordFieldEmptyValidator,
+                                keywordRegexValidator,
+                                keywordSearchTermEmptyValidator);
+                    } else {
+                        validator.removeValidators(
+                                keywordFieldEmptyValidator,
+                                keywordRegexValidator,
+                                keywordSearchTermEmptyValidator);
                     }
+                });
 
-                    try {
-                        Pattern.compile(input);
-                        return true;
-                    } catch (PatternSyntaxException ignored) {
-                        return false;
-                    }
-                },
-                ValidationMessage.error("%s > %n %s %n %n %s".formatted(
-                        Localization.lang("Searching for a keyword"),
-                        Localization.lang("Keywords"),
-                        Localization.lang("Invalid regular expression."))));
-
-        keywordFieldEmptyValidator = new FunctionBasedValidator<>(
-                keywordGroupSearchFieldProperty,
-                StringUtil::isNotBlank,
-                ValidationMessage.error(Localization.lang("Please enter a field name to search for a keyword.")));
-
-        keywordSearchTermEmptyValidator = new FunctionBasedValidator<>(
-                keywordGroupSearchTermProperty,
-                input -> !StringUtil.isNullOrEmpty(input),
-                ValidationMessage.error("%s > %n %s %n %n %s".formatted(
-                        Localization.lang("Searching for a keyword"),
-                        Localization.lang("Keywords"),
-                        Localization.lang("Search term is empty.")
-                )));
-
-        searchSearchTermEmptyValidator = new FunctionBasedValidator<>(
-                searchGroupSearchTermProperty,
-                input -> !StringUtil.isNullOrEmpty(input),
-                ValidationMessage.error("%s > %n %s".formatted(
-                        Localization.lang("Free search expression"),
-                        Localization.lang("Search term is empty."))));
-
-        texGroupFilePathValidator = new FunctionBasedValidator<>(
-                texGroupFilePathProperty,
-                input -> {
-                    if (StringUtil.isBlank(input)) {
-                        return false;
+        typeTexProperty.addListener(
+                (obs, oldValue, isSelected) -> {
+                    if (isSelected) {
+                        validator.addValidators(texGroupFilePathValidator);
                     } else {
-                        Path inputPath = getAbsoluteTexGroupPath(input);
-                        if (!inputPath.isAbsolute() || !Files.isRegularFile(inputPath)) {
-                            return false;
-                        }
-                        return FileUtil.getFileExtension(input)
-                                .map("aux"::equalsIgnoreCase)
-                                .orElse(false);
+                        validator.removeValidators(texGroupFilePathValidator);
                     }
-                },
-                ValidationMessage.error(Localization.lang("Please provide a valid aux file.")));
-
-        typeSearchProperty.addListener((obs, _oldValue, isSelected) -> {
-            if (isSelected) {
-                validator.addValidators(searchSearchTermEmptyValidator);
-            } else {
-                validator.removeValidators(searchSearchTermEmptyValidator);
-            }
-        });
-
-        typeKeywordsProperty.addListener((obs, _oldValue, isSelected) -> {
-            if (isSelected) {
-                validator.addValidators(keywordFieldEmptyValidator, keywordRegexValidator, keywordSearchTermEmptyValidator);
-            } else {
-                validator.removeValidators(keywordFieldEmptyValidator, keywordRegexValidator, keywordSearchTermEmptyValidator);
-            }
-        });
-
-        typeTexProperty.addListener((obs, oldValue, isSelected) -> {
-            if (isSelected) {
-                validator.addValidators(texGroupFilePathValidator);
-            } else {
-                validator.removeValidators(texGroupFilePathValidator);
-            }
-        });
+                });
 
-        validator.addValidators(nameValidator,
-                nameContainsDelimiterValidator,
-                sameNameValidator);
+        validator.addValidators(nameValidator, nameContainsDelimiterValidator, sameNameValidator);
     }
 
     /**
@@ -269,14 +312,18 @@ private void setupValidation() {
      * @return an absolute path if LatexFileDirectory exists; otherwise, returns input
      */
     private Path getAbsoluteTexGroupPath(String input) {
-        Optional<Path> latexFileDirectory = currentDatabase.getMetaData().getLatexFileDirectory(preferences.getFilePreferences().getUserAndHost());
+        Optional<Path> latexFileDirectory =
+                currentDatabase
+                        .getMetaData()
+                        .getLatexFileDirectory(preferences.getFilePreferences().getUserAndHost());
         return latexFileDirectory.map(path -> path.resolve(input)).orElse(Path.of(input));
     }
 
     public void validationHandler(Event event) {
         ValidationStatus validationStatus = validator.getValidationStatus();
         if (validationStatus.getHighestMessage().isPresent()) {
-            dialogService.showErrorDialogAndWait(validationStatus.getHighestMessage().get().getMessage());
+            dialogService.showErrorDialogAndWait(
+                    validationStatus.getHighestMessage().get().getMessage());
             // consume the event to prevent the dialog to close
             event.consume();
         }
@@ -291,50 +338,64 @@ public AbstractGroup resultConverter(ButtonType button) {
         try {
             String groupName = nameProperty.getValue().trim();
             if (typeExplicitProperty.getValue()) {
-                resultingGroup = new ExplicitGroup(
-                        groupName,
-                        groupHierarchySelectedProperty.getValue(),
-                        preferences.getBibEntryPreferences().getKeywordSeparator());
+                resultingGroup =
+                        new ExplicitGroup(
+                                groupName,
+                                groupHierarchySelectedProperty.getValue(),
+                                preferences.getBibEntryPreferences().getKeywordSeparator());
             } else if (typeKeywordsProperty.getValue()) {
                 if (keywordGroupRegexProperty.getValue()) {
-                    resultingGroup = new RegexKeywordGroup(
-                            groupName,
-                            groupHierarchySelectedProperty.getValue(),
-                            FieldFactory.parseField(keywordGroupSearchFieldProperty.getValue().trim()),
-                            keywordGroupSearchTermProperty.getValue().trim(),
-                            keywordGroupCaseSensitiveProperty.getValue());
+                    resultingGroup =
+                            new RegexKeywordGroup(
+                                    groupName,
+                                    groupHierarchySelectedProperty.getValue(),
+                                    FieldFactory.parseField(
+                                            keywordGroupSearchFieldProperty.getValue().trim()),
+                                    keywordGroupSearchTermProperty.getValue().trim(),
+                                    keywordGroupCaseSensitiveProperty.getValue());
                 } else {
-                    resultingGroup = new WordKeywordGroup(
-                            groupName,
-                            groupHierarchySelectedProperty.getValue(),
-                            FieldFactory.parseField(keywordGroupSearchFieldProperty.getValue().trim()),
-                            keywordGroupSearchTermProperty.getValue().trim(),
-                            keywordGroupCaseSensitiveProperty.getValue(),
-                            preferences.getBibEntryPreferences().getKeywordSeparator(),
-                            false);
+                    resultingGroup =
+                            new WordKeywordGroup(
+                                    groupName,
+                                    groupHierarchySelectedProperty.getValue(),
+                                    FieldFactory.parseField(
+                                            keywordGroupSearchFieldProperty.getValue().trim()),
+                                    keywordGroupSearchTermProperty.getValue().trim(),
+                                    keywordGroupCaseSensitiveProperty.getValue(),
+                                    preferences.getBibEntryPreferences().getKeywordSeparator(),
+                                    false);
                 }
             } else if (typeSearchProperty.getValue()) {
-                resultingGroup = new SearchGroup(
-                        groupName,
-                        groupHierarchySelectedProperty.getValue(),
-                        searchGroupSearchTermProperty.getValue().trim(),
-                        searchFlagsProperty.getValue());
+                resultingGroup =
+                        new SearchGroup(
+                                groupName,
+                                groupHierarchySelectedProperty.getValue(),
+                                searchGroupSearchTermProperty.getValue().trim(),
+                                searchFlagsProperty.getValue());
 
                 if (currentDatabase.getMetaData().getGroupSearchSyntaxVersion().isEmpty()) {
-                    // If the syntax version for search groups is not present, it indicates that the groups
-                    // have not been migrated to the new syntax, or this is the first search group in the library.
+                    // If the syntax version for search groups is not present, it indicates that the
+                    // groups
+                    // have not been migrated to the new syntax, or this is the first search group
+                    // in the library.
                     // If this is the first search group, set the syntax version to the new version.
-                    // Otherwise, it means that the user did not accept the migration to the new version.
+                    // Otherwise, it means that the user did not accept the migration to the new
+                    // version.
                     Optional<GroupTreeNode> groups = currentDatabase.getMetaData().getGroups();
                     if (groups.filter(this::groupOrSubgroupIsSearchGroup).isEmpty()) {
-                        currentDatabase.getMetaData().setGroupSearchSyntaxVersion(SearchGroupsMigrationAction.VERSION_6_0_ALPHA);
+                        currentDatabase
+                                .getMetaData()
+                                .setGroupSearchSyntaxVersion(
+                                        SearchGroupsMigrationAction.VERSION_6_0_ALPHA);
                     }
                 }
 
-                Optional<LuceneManager> luceneManager = stateManager.getLuceneManager(currentDatabase);
+                Optional<LuceneManager> luceneManager =
+                        stateManager.getLuceneManager(currentDatabase);
                 if (luceneManager.isPresent()) {
                     SearchGroup searchGroup = (SearchGroup) resultingGroup;
-                    searchGroup.setMatchedEntries(luceneManager.get().search(searchGroup.getQuery()).getMatchedEntries());
+                    searchGroup.setMatchedEntries(
+                            luceneManager.get().search(searchGroup.getQuery()).getMatchedEntries());
                 }
             } else if (typeAutoProperty.getValue()) {
                 if (autoGroupKeywordsOptionProperty.getValue()) {
@@ -347,34 +408,43 @@ public AbstractGroup resultConverter(ButtonType button) {
                         delimiter = autoGroupKeywordsDelimiterProperty.getValue().charAt(0);
                     }
                     if (!autoGroupKeywordsHierarchicalDelimiterProperty.getValue().isEmpty()) {
-                        hierarDelimiter = autoGroupKeywordsHierarchicalDelimiterProperty.getValue().charAt(0);
+                        hierarDelimiter =
+                                autoGroupKeywordsHierarchicalDelimiterProperty.getValue().charAt(0);
                     }
-                    resultingGroup = new AutomaticKeywordGroup(
-                            groupName,
-                            groupHierarchySelectedProperty.getValue(),
-                            FieldFactory.parseField(autoGroupKeywordsFieldProperty.getValue().trim()),
-                            delimiter,
-                            hierarDelimiter);
+                    resultingGroup =
+                            new AutomaticKeywordGroup(
+                                    groupName,
+                                    groupHierarchySelectedProperty.getValue(),
+                                    FieldFactory.parseField(
+                                            autoGroupKeywordsFieldProperty.getValue().trim()),
+                                    delimiter,
+                                    hierarDelimiter);
                 } else {
-                    resultingGroup = new AutomaticPersonsGroup(
-                            groupName,
-                            groupHierarchySelectedProperty.getValue(),
-                            FieldFactory.parseField(autoGroupPersonsFieldProperty.getValue().trim()));
+                    resultingGroup =
+                            new AutomaticPersonsGroup(
+                                    groupName,
+                                    groupHierarchySelectedProperty.getValue(),
+                                    FieldFactory.parseField(
+                                            autoGroupPersonsFieldProperty.getValue().trim()));
                 }
             } else if (typeTexProperty.getValue()) {
-                resultingGroup = TexGroup.create(
-                        groupName,
-                        groupHierarchySelectedProperty.getValue(),
-                        Path.of(texGroupFilePathProperty.getValue().trim()),
-                        new DefaultAuxParser(new BibDatabase()),
-                        fileUpdateMonitor,
-                        currentDatabase.getMetaData());
+                resultingGroup =
+                        TexGroup.create(
+                                groupName,
+                                groupHierarchySelectedProperty.getValue(),
+                                Path.of(texGroupFilePathProperty.getValue().trim()),
+                                new DefaultAuxParser(new BibDatabase()),
+                                fileUpdateMonitor,
+                                currentDatabase.getMetaData());
             }
 
             if (resultingGroup != null) {
-                preferences.getGroupsPreferences().setDefaultHierarchicalContext(groupHierarchySelectedProperty.getValue());
+                preferences
+                        .getGroupsPreferences()
+                        .setDefaultHierarchicalContext(groupHierarchySelectedProperty.getValue());
 
-                resultingGroup.setColor(colorUseProperty.getValue() ? colorProperty.getValue() : null);
+                resultingGroup.setColor(
+                        colorUseProperty.getValue() ? colorProperty.getValue() : null);
                 resultingGroup.setDescription(descriptionProperty.getValue());
                 resultingGroup.setIconName(iconProperty.getValue());
                 return resultingGroup;
@@ -388,23 +458,34 @@ public AbstractGroup resultConverter(ButtonType button) {
     }
 
     public void setValues() {
-        groupHierarchyListProperty.setValue(FXCollections.observableArrayList(GroupHierarchyType.values()));
+        groupHierarchyListProperty.setValue(
+                FXCollections.observableArrayList(GroupHierarchyType.values()));
 
         if (editedGroup == null) {
             // creating new group -> defaults!
-            // TODO: Create default group (via org.jabref.logic.groups.DefaultGroupsFactory) and use values
+            // TODO: Create default group (via org.jabref.logic.groups.DefaultGroupsFactory) and use
+            // values
 
             colorUseProperty.setValue(false);
             colorProperty.setValue(determineColor());
             if (parentNode != null) {
-                parentNode.getGroup()
-                          .getIconName()
-                          .filter(iconName -> !iconName.equals(DefaultGroupsFactory.ALL_ENTRIES_GROUP_DEFAULT_ICON))
-                          .ifPresent(iconProperty::setValue);
-                parentNode.getGroup().getColor().ifPresent(color -> colorUseProperty.setValue(true));
+                parentNode
+                        .getGroup()
+                        .getIconName()
+                        .filter(
+                                iconName ->
+                                        !iconName.equals(
+                                                DefaultGroupsFactory
+                                                        .ALL_ENTRIES_GROUP_DEFAULT_ICON))
+                        .ifPresent(iconProperty::setValue);
+                parentNode
+                        .getGroup()
+                        .getColor()
+                        .ifPresent(color -> colorUseProperty.setValue(true));
             }
             typeExplicitProperty.setValue(true);
-            groupHierarchySelectedProperty.setValue(preferences.getGroupsPreferences().getDefaultHierarchicalContext());
+            groupHierarchySelectedProperty.setValue(
+                    preferences.getGroupsPreferences().getDefaultHierarchicalContext());
             autoGroupKeywordsOptionProperty.setValue(Boolean.TRUE);
         } else {
             nameProperty.setValue(editedGroup.getName());
@@ -444,8 +525,10 @@ public void setValues() {
                 if (editedGroup.getClass() == AutomaticKeywordGroup.class) {
                     AutomaticKeywordGroup group = (AutomaticKeywordGroup) editedGroup;
                     autoGroupKeywordsOptionProperty.setValue(Boolean.TRUE);
-                    autoGroupKeywordsDelimiterProperty.setValue(group.getKeywordDelimiter().toString());
-                    autoGroupKeywordsHierarchicalDelimiterProperty.setValue(group.getKeywordHierarchicalDelimiter().toString());
+                    autoGroupKeywordsDelimiterProperty.setValue(
+                            group.getKeywordDelimiter().toString());
+                    autoGroupKeywordsHierarchicalDelimiterProperty.setValue(
+                            group.getKeywordHierarchicalDelimiter().toString());
                     autoGroupKeywordsFieldProperty.setValue(group.getField().getName());
                 } else if (editedGroup.getClass() == AutomaticPersonsGroup.class) {
                     AutomaticPersonsGroup group = (AutomaticPersonsGroup) editedGroup;
@@ -466,33 +549,53 @@ private Color determineColor() {
         if (parentNode == null) {
             color = GroupColorPicker.generateColor(List.of());
         } else {
-            List<Color> colorsOfSiblings = parentNode.getChildren().stream().map(child -> child.getGroup().getColor())
-                                                     .flatMap(Optional::stream)
-                                                     .toList();
+            List<Color> colorsOfSiblings =
+                    parentNode.getChildren().stream()
+                            .map(child -> child.getGroup().getColor())
+                            .flatMap(Optional::stream)
+                            .toList();
             Optional<Color> parentColor = parentNode.getGroup().getColor();
-            color = parentColor.map(value -> GroupColorPicker.generateColor(colorsOfSiblings, value))
-                               .orElseGet(() -> GroupColorPicker.generateColor(colorsOfSiblings));
+            color =
+                    parentColor
+                            .map(value -> GroupColorPicker.generateColor(colorsOfSiblings, value))
+                            .orElseGet(() -> GroupColorPicker.generateColor(colorsOfSiblings));
         }
         return color;
     }
 
     public void texGroupBrowse() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.AUX)
-                .withDefaultExtension(StandardFileType.AUX)
-                .withInitialDirectory(currentDatabase.getMetaData()
-                                                     .getLatexFileDirectory(preferences.getFilePreferences().getUserAndHost())
-                                                     .orElse(FileUtil.getInitialDirectory(currentDatabase, preferences.getFilePreferences().getWorkingDirectory()))).build();
-        dialogService.showFileOpenDialog(fileDialogConfiguration)
-                     .ifPresent(file -> texGroupFilePathProperty.setValue(
-                             FileUtil.relativize(file.toAbsolutePath(), getFileDirectoriesAsPaths()).toString()
-                     ));
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(StandardFileType.AUX)
+                        .withDefaultExtension(StandardFileType.AUX)
+                        .withInitialDirectory(
+                                currentDatabase
+                                        .getMetaData()
+                                        .getLatexFileDirectory(
+                                                preferences.getFilePreferences().getUserAndHost())
+                                        .orElse(
+                                                FileUtil.getInitialDirectory(
+                                                        currentDatabase,
+                                                        preferences
+                                                                .getFilePreferences()
+                                                                .getWorkingDirectory())))
+                        .build();
+        dialogService
+                .showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(
+                        file ->
+                                texGroupFilePathProperty.setValue(
+                                        FileUtil.relativize(
+                                                        file.toAbsolutePath(),
+                                                        getFileDirectoriesAsPaths())
+                                                .toString()));
     }
 
     private List<Path> getFileDirectoriesAsPaths() {
         List<Path> fileDirs = new ArrayList<>();
         MetaData metaData = currentDatabase.getMetaData();
-        metaData.getLatexFileDirectory(preferences.getFilePreferences().getUserAndHost()).ifPresent(fileDirs::add);
+        metaData.getLatexFileDirectory(preferences.getFilePreferences().getUserAndHost())
+                .ifPresent(fileDirs::add);
 
         return fileDirs;
     }
diff --git a/src/main/java/org/jabref/gui/groups/GroupModeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupModeViewModel.java
index 6813de6227e1..f2d53be31fce 100644
--- a/src/main/java/org/jabref/gui/groups/GroupModeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupModeViewModel.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.groups;
 
-import java.util.Set;
-
 import javafx.scene.Node;
 import javafx.scene.control.Tooltip;
 
 import org.jabref.gui.icon.IconTheme.JabRefIcons;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Set;
+
 public class GroupModeViewModel {
 
     private final Set<GroupViewMode> mode;
diff --git a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
index cc64665235f4..0eadaf174f51 100644
--- a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
@@ -1,9 +1,10 @@
 package org.jabref.gui.groups;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import com.google.common.eventbus.Subscribe;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.EasyObservableList;
+
+import io.github.adr.linked.ADR;
 
 import javafx.beans.InvalidationListener;
 import javafx.beans.WeakInvalidationListener;
@@ -52,10 +53,10 @@
 import org.jabref.model.search.event.IndexStartedEvent;
 import org.jabref.model.strings.StringUtil;
 
-import com.google.common.eventbus.Subscribe;
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.EasyObservableList;
-import io.github.adr.linked.ADR;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 public class GroupNodeViewModel {
 
@@ -65,8 +66,10 @@ public class GroupNodeViewModel {
     private final BibDatabaseContext databaseContext;
     private final StateManager stateManager;
     private final GroupTreeNode groupNode;
+
     @ADR(38)
     private final ObservableSet<String> matchedEntries = FXCollections.observableSet();
+
     private final SimpleBooleanProperty hasChildren;
     private final SimpleBooleanProperty expandedProperty = new SimpleBooleanProperty();
     private final BooleanBinding anySelectedEntriesMatched;
@@ -74,12 +77,20 @@ public class GroupNodeViewModel {
     private final TaskExecutor taskExecutor;
     private final CustomLocalDragboard localDragBoard;
     private final GuiPreferences preferences;
+
     @SuppressWarnings("FieldCanBeLocal")
     private final ObservableList<BibEntry> entriesList;
+
     @SuppressWarnings("FieldCanBeLocal")
     private final InvalidationListener onInvalidatedGroup = listener -> refreshGroup();
 
-    public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager stateManager, TaskExecutor taskExecutor, GroupTreeNode groupNode, CustomLocalDragboard localDragBoard, GuiPreferences preferences) {
+    public GroupNodeViewModel(
+            BibDatabaseContext databaseContext,
+            StateManager stateManager,
+            TaskExecutor taskExecutor,
+            GroupTreeNode groupNode,
+            CustomLocalDragboard localDragBoard,
+            GuiPreferences preferences) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
         this.stateManager = Objects.requireNonNull(stateManager);
@@ -90,56 +101,111 @@ public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager state
         displayName = new LatexToUnicodeFormatter().format(groupNode.getName());
         isRoot = groupNode.isRoot();
         if (groupNode.getGroup() instanceof AutomaticGroup automaticGroup) {
-            children = automaticGroup.createSubgroups(this.databaseContext.getDatabase().getEntries())
-                                     .stream()
-                                     .map(this::toViewModel)
-                                     .sorted((group1, group2) -> group1.getDisplayName().compareToIgnoreCase(group2.getDisplayName()))
-                                     .collect(Collectors.toCollection(FXCollections::observableArrayList));
+            children =
+                    automaticGroup
+                            .createSubgroups(this.databaseContext.getDatabase().getEntries())
+                            .stream()
+                            .map(this::toViewModel)
+                            .sorted(
+                                    (group1, group2) ->
+                                            group1.getDisplayName()
+                                                    .compareToIgnoreCase(group2.getDisplayName()))
+                            .collect(Collectors.toCollection(FXCollections::observableArrayList));
         } else {
             children = EasyBind.mapBacked(groupNode.getChildren(), this::toViewModel);
         }
         if (groupNode.getGroup() instanceof TexGroup) {
-            databaseContext.getMetaData().groupsBinding().addListener(new WeakInvalidationListener(onInvalidatedGroup));
+            databaseContext
+                    .getMetaData()
+                    .groupsBinding()
+                    .addListener(new WeakInvalidationListener(onInvalidatedGroup));
         } else if (groupNode.getGroup() instanceof SearchGroup searchGroup) {
-            stateManager.getLuceneManager(databaseContext).ifPresent(luceneManager -> {
-                BackgroundTask.wrap(() -> {
-                    searchGroup.setMatchedEntries(luceneManager.search(searchGroup.getQuery()).getMatchedEntries());
-                }).onSuccess(success -> {
-                    refreshGroup();
-                    databaseContext.getMetaData().groupsBinding().invalidate();
-                }).executeWith(taskExecutor);
-            });
+            stateManager
+                    .getLuceneManager(databaseContext)
+                    .ifPresent(
+                            luceneManager -> {
+                                BackgroundTask.wrap(
+                                                () -> {
+                                                    searchGroup.setMatchedEntries(
+                                                            luceneManager
+                                                                    .search(searchGroup.getQuery())
+                                                                    .getMatchedEntries());
+                                                })
+                                        .onSuccess(
+                                                success -> {
+                                                    refreshGroup();
+                                                    databaseContext
+                                                            .getMetaData()
+                                                            .groupsBinding()
+                                                            .invalidate();
+                                                })
+                                        .executeWith(taskExecutor);
+                            });
         }
 
         hasChildren = new SimpleBooleanProperty();
         hasChildren.bind(Bindings.isNotEmpty(children));
-        EasyBind.subscribe(preferences.getGroupsPreferences().displayGroupCountProperty(), shouldDisplay -> updateMatchedEntries());
+        EasyBind.subscribe(
+                preferences.getGroupsPreferences().displayGroupCountProperty(),
+                shouldDisplay -> updateMatchedEntries());
         expandedProperty.set(groupNode.getGroup().isExpanded());
-        expandedProperty.addListener((observable, oldValue, newValue) -> groupNode.getGroup().setExpanded(newValue));
+        expandedProperty.addListener(
+                (observable, oldValue, newValue) -> groupNode.getGroup().setExpanded(newValue));
 
         // Register listener
-        // The wrapper created by the FXCollections will set a weak listener on the wrapped list. This weak listener gets garbage collected. Hence, we need to maintain a reference to this list.
+        // The wrapper created by the FXCollections will set a weak listener on the wrapped list.
+        // This weak listener gets garbage collected. Hence, we need to maintain a reference to this
+        // list.
         entriesList = databaseContext.getDatabase().getEntries();
         entriesList.addListener(this::onDatabaseChanged);
 
-        EasyObservableList<Boolean> selectedEntriesMatchStatus = EasyBind.map(stateManager.getSelectedEntries(), groupNode::matches);
+        EasyObservableList<Boolean> selectedEntriesMatchStatus =
+                EasyBind.map(stateManager.getSelectedEntries(), groupNode::matches);
         anySelectedEntriesMatched = selectedEntriesMatchStatus.anyMatch(matched -> matched);
         // 'all' returns 'true' for empty streams, so this has to be checked explicitly
-        allSelectedEntriesMatched = selectedEntriesMatchStatus.isEmptyBinding().not().and(selectedEntriesMatchStatus.allMatch(matched -> matched));
+        allSelectedEntriesMatched =
+                selectedEntriesMatchStatus
+                        .isEmptyBinding()
+                        .not()
+                        .and(selectedEntriesMatchStatus.allMatch(matched -> matched));
 
         this.databaseContext.getDatabase().registerListener(new LuceneIndexListener());
     }
 
-    public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager stateManager, TaskExecutor taskExecutor, AbstractGroup group, CustomLocalDragboard localDragboard, GuiPreferences preferences) {
-        this(databaseContext, stateManager, taskExecutor, new GroupTreeNode(group), localDragboard, preferences);
-    }
-
-    static GroupNodeViewModel getAllEntriesGroup(BibDatabaseContext newDatabase, StateManager stateManager, TaskExecutor taskExecutor, CustomLocalDragboard localDragBoard, GuiPreferences preferences) {
-        return new GroupNodeViewModel(newDatabase, stateManager, taskExecutor, DefaultGroupsFactory.getAllEntriesGroup(), localDragBoard, preferences);
+    public GroupNodeViewModel(
+            BibDatabaseContext databaseContext,
+            StateManager stateManager,
+            TaskExecutor taskExecutor,
+            AbstractGroup group,
+            CustomLocalDragboard localDragboard,
+            GuiPreferences preferences) {
+        this(
+                databaseContext,
+                stateManager,
+                taskExecutor,
+                new GroupTreeNode(group),
+                localDragboard,
+                preferences);
+    }
+
+    static GroupNodeViewModel getAllEntriesGroup(
+            BibDatabaseContext newDatabase,
+            StateManager stateManager,
+            TaskExecutor taskExecutor,
+            CustomLocalDragboard localDragBoard,
+            GuiPreferences preferences) {
+        return new GroupNodeViewModel(
+                newDatabase,
+                stateManager,
+                taskExecutor,
+                DefaultGroupsFactory.getAllEntriesGroup(),
+                localDragBoard,
+                preferences);
     }
 
     private GroupNodeViewModel toViewModel(GroupTreeNode child) {
-        return new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, child, localDragBoard, preferences);
+        return new GroupNodeViewModel(
+                databaseContext, stateManager, taskExecutor, child, localDragBoard, preferences);
     }
 
     public List<FieldChange> addEntriesToGroup(List<BibEntry> entries) {
@@ -158,7 +224,8 @@ public List<FieldChange> addEntriesToGroup(List<BibEntry> entries) {
         return changes;
         // TODO: Store undo
         // if (!undo.isEmpty()) {
-        // groupSelector.concludeAssignment(UndoableChangeEntriesOfGroup.getUndoableEdit(target, undo), target.getNode(), assignedEntries);
+        // groupSelector.concludeAssignment(UndoableChangeEntriesOfGroup.getUndoableEdit(target,
+        // undo), target.getNode(), assignedEntries);
     }
 
     public SimpleBooleanProperty expandedProperty() {
@@ -209,15 +276,24 @@ public boolean equals(Object o) {
 
     @Override
     public String toString() {
-        return "GroupNodeViewModel{" +
-                "displayName='" + displayName + '\'' +
-                ", isRoot=" + isRoot +
-                ", icon='" + getIcon() + '\'' +
-                ", children=" + children +
-                ", databaseContext=" + databaseContext +
-                ", groupNode=" + groupNode +
-                ", matchedEntries=" + matchedEntries +
-                '}';
+        return "GroupNodeViewModel{"
+                + "displayName='"
+                + displayName
+                + '\''
+                + ", isRoot="
+                + isRoot
+                + ", icon='"
+                + getIcon()
+                + '\''
+                + ", children="
+                + children
+                + ", databaseContext="
+                + databaseContext
+                + ", groupNode="
+                + groupNode
+                + ", matchedEntries="
+                + matchedEntries
+                + '}';
     }
 
     @Override
@@ -227,8 +303,7 @@ public int hashCode() {
 
     public JabRefIcon getIcon() {
         Optional<String> iconName = groupNode.getGroup().getIconName();
-        return iconName.flatMap(this::parseIcon)
-                       .orElseGet(this::createDefaultIcon);
+        return iconName.flatMap(this::parseIcon).orElseGet(this::createDefaultIcon);
     }
 
     private JabRefIcon createDefaultIcon() {
@@ -261,7 +336,8 @@ private void onDatabaseChanged(ListChangeListener.Change<? extends BibEntry> cha
             if (change.wasPermutated()) {
                 // Nothing to do, as permutation doesn't change matched entries
             } else if (change.wasUpdated()) {
-                for (BibEntry changedEntry : change.getList().subList(change.getFrom(), change.getTo())) {
+                for (BibEntry changedEntry :
+                        change.getList().subList(change.getFrom(), change.getTo())) {
                     if (groupNode.matches(changedEntry)) {
                         // ADR-0038
                         matchedEntries.add(changedEntry.getId());
@@ -286,28 +362,32 @@ private void onDatabaseChanged(ListChangeListener.Change<? extends BibEntry> cha
     }
 
     private void refreshGroup() {
-        UiTaskExecutor.runInJavaFXThread(() -> {
-            updateMatchedEntries(); // Update the entries matched by the group
-            // "Re-add" to the selected groups if it were selected, this refreshes the entries the user views
-            ObservableList<GroupTreeNode> selectedGroups = this.stateManager.getSelectedGroups(this.databaseContext);
-            if (selectedGroups.remove(this.groupNode)) {
-                selectedGroups.add(this.groupNode);
-            }
-        });
+        UiTaskExecutor.runInJavaFXThread(
+                () -> {
+                    updateMatchedEntries(); // Update the entries matched by the group
+                    // "Re-add" to the selected groups if it were selected, this refreshes the
+                    // entries the user views
+                    ObservableList<GroupTreeNode> selectedGroups =
+                            this.stateManager.getSelectedGroups(this.databaseContext);
+                    if (selectedGroups.remove(this.groupNode)) {
+                        selectedGroups.add(this.groupNode);
+                    }
+                });
     }
 
     private void updateMatchedEntries() {
         // We calculate the new hit value
-        // We could be more intelligent and try to figure out the new number of hits based on the entry change
+        // We could be more intelligent and try to figure out the new number of hits based on the
+        // entry change
         // for example, a previously matched entry gets removed -> hits = hits - 1
         if (preferences.getGroupsPreferences().shouldDisplayGroupCount()) {
-            BackgroundTask
-                    .wrap(() -> groupNode.findMatches(databaseContext.getDatabase()))
-                    .onSuccess(entries -> {
-                        matchedEntries.clear();
-                        // ADR-0038
-                        entries.forEach(entry -> matchedEntries.add(entry.getId()));
-                    })
+            BackgroundTask.wrap(() -> groupNode.findMatches(databaseContext.getDatabase()))
+                    .onSuccess(
+                            entries -> {
+                                matchedEntries.clear();
+                                // ADR-0038
+                                entries.forEach(entry -> matchedEntries.add(entry.getId()));
+                            })
                     .executeWith(taskExecutor);
         }
     }
@@ -321,7 +401,8 @@ void toggleExpansion() {
     }
 
     boolean isMatchedBy(String searchString) {
-        return StringUtil.isBlank(searchString) || StringUtil.containsIgnoreCase(getDisplayName(), searchString);
+        return StringUtil.isBlank(searchString)
+                || StringUtil.containsIgnoreCase(getDisplayName(), searchString);
     }
 
     public Color getColor() {
@@ -346,19 +427,23 @@ public Optional<GroupNodeViewModel> getChildByPath(String pathToSource) {
     public boolean acceptableDrop(Dragboard dragboard) {
         // TODO: we should also check isNodeDescendant
         boolean canDropOtherGroup = dragboard.hasContent(DragAndDropDataFormats.GROUP);
-        boolean canDropEntries = localDragBoard.hasBibEntries() && (groupNode.getGroup() instanceof GroupEntryChanger);
+        boolean canDropEntries =
+                localDragBoard.hasBibEntries()
+                        && (groupNode.getGroup() instanceof GroupEntryChanger);
         return canDropOtherGroup || canDropEntries;
     }
 
     public void moveTo(GroupNodeViewModel target) {
         // TODO: Add undo and display message
-        // MoveGroupChange undo = new MoveGroupChange(((GroupTreeNodeViewModel)source.getParent()).getNode(),
+        // MoveGroupChange undo = new
+        // MoveGroupChange(((GroupTreeNodeViewModel)source.getParent()).getNode(),
         //        source.getNode().getPositionInParent(), target.getNode(), target.getChildCount());
 
         getGroupNode().moveTo(target.getGroupNode());
         // panel.getUndoManager().addEdit(new UndoableMoveGroup(this.groupsRoot, moveChange));
         // panel.markBaseChanged();
-        // frame.output(Localization.lang("Moved group \"%0\".", node.getNode().getGroup().getName()));
+        // frame.output(Localization.lang("Moved group \"%0\".",
+        // node.getNode().getGroup().getName()));
     }
 
     public void moveTo(GroupTreeNode target, int targetIndex) {
@@ -416,10 +501,14 @@ public boolean canAddEntriesIn() {
         } else if (group instanceof ExplicitGroup) {
             return true;
         } else if (group instanceof LastNameGroup || group instanceof RegexKeywordGroup) {
-            return groupNode.getParent()
-                            .map(GroupTreeNode::getGroup)
-                            .map(groupParent -> groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup)
-                            .orElse(false);
+            return groupNode
+                    .getParent()
+                    .map(GroupTreeNode::getGroup)
+                    .map(
+                            groupParent ->
+                                    groupParent instanceof AutomaticKeywordGroup
+                                            || groupParent instanceof AutomaticPersonsGroup)
+                    .orElse(false);
         } else if (group instanceof KeywordGroup) {
             // also covers WordKeywordGroup
             return true;
@@ -432,7 +521,9 @@ public boolean canAddEntriesIn() {
         } else if (group instanceof TexGroup) {
             return false;
         } else {
-            throw new UnsupportedOperationException("canAddEntriesIn method not yet implemented in group: " + group.getClass().getName());
+            throw new UnsupportedOperationException(
+                    "canAddEntriesIn method not yet implemented in group: "
+                            + group.getClass().getName());
         }
     }
 
@@ -444,10 +535,14 @@ public boolean canBeDragged() {
             return true;
         } else if (group instanceof KeywordGroup) {
             // KeywordGroup is parent of LastNameGroup, RegexKeywordGroup and WordKeywordGroup
-            return groupNode.getParent()
-                            .map(GroupTreeNode::getGroup)
-                            .map(groupParent -> !(groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup))
-                            .orElse(false);
+            return groupNode
+                    .getParent()
+                    .map(GroupTreeNode::getGroup)
+                    .map(
+                            groupParent ->
+                                    !(groupParent instanceof AutomaticKeywordGroup
+                                            || groupParent instanceof AutomaticPersonsGroup))
+                    .orElse(false);
         } else if (group instanceof SearchGroup) {
             return true;
         } else if (group instanceof AutomaticKeywordGroup) {
@@ -457,7 +552,9 @@ public boolean canBeDragged() {
         } else if (group instanceof TexGroup) {
             return true;
         } else {
-            throw new UnsupportedOperationException("canBeDragged method not yet implemented in group: " + group.getClass().getName());
+            throw new UnsupportedOperationException(
+                    "canBeDragged method not yet implemented in group: "
+                            + group.getClass().getName());
         }
     }
 
@@ -469,10 +566,14 @@ public boolean canAddGroupsIn() {
             return true;
         } else if (group instanceof KeywordGroup) {
             // KeywordGroup is parent of LastNameGroup, RegexKeywordGroup and WordKeywordGroup
-            return groupNode.getParent()
-                            .map(GroupTreeNode::getGroup)
-                            .map(groupParent -> !(groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup))
-                            .orElse(false);
+            return groupNode
+                    .getParent()
+                    .map(GroupTreeNode::getGroup)
+                    .map(
+                            groupParent ->
+                                    !(groupParent instanceof AutomaticKeywordGroup
+                                            || groupParent instanceof AutomaticPersonsGroup))
+                    .orElse(false);
         } else if (group instanceof SearchGroup) {
             return true;
         } else if (group instanceof AutomaticKeywordGroup) {
@@ -482,7 +583,9 @@ public boolean canAddGroupsIn() {
         } else if (group instanceof TexGroup) {
             return true;
         } else {
-            throw new UnsupportedOperationException("canAddGroupsIn method not yet implemented in group: " + group.getClass().getName());
+            throw new UnsupportedOperationException(
+                    "canAddGroupsIn method not yet implemented in group: "
+                            + group.getClass().getName());
         }
     }
 
@@ -494,10 +597,14 @@ public boolean canRemove() {
             return true;
         } else if (group instanceof KeywordGroup) {
             // KeywordGroup is parent of LastNameGroup, RegexKeywordGroup and WordKeywordGroup
-            return groupNode.getParent()
-                            .map(GroupTreeNode::getGroup)
-                            .map(groupParent -> !(groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup))
-                            .orElse(false);
+            return groupNode
+                    .getParent()
+                    .map(GroupTreeNode::getGroup)
+                    .map(
+                            groupParent ->
+                                    !(groupParent instanceof AutomaticKeywordGroup
+                                            || groupParent instanceof AutomaticPersonsGroup))
+                    .orElse(false);
         } else if (group instanceof SearchGroup) {
             return true;
         } else if (group instanceof AutomaticKeywordGroup) {
@@ -507,7 +614,8 @@ public boolean canRemove() {
         } else if (group instanceof TexGroup) {
             return true;
         } else {
-            throw new UnsupportedOperationException("canRemove method not yet implemented in group: " + group.getClass().getName());
+            throw new UnsupportedOperationException(
+                    "canRemove method not yet implemented in group: " + group.getClass().getName());
         }
     }
 
@@ -519,10 +627,14 @@ public boolean isEditable() {
             return true;
         } else if (group instanceof KeywordGroup) {
             // KeywordGroup is parent of LastNameGroup, RegexKeywordGroup and WordKeywordGroup
-            return groupNode.getParent()
-                            .map(GroupTreeNode::getGroup)
-                            .map(groupParent -> !(groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup))
-                            .orElse(false);
+            return groupNode
+                    .getParent()
+                    .map(GroupTreeNode::getGroup)
+                    .map(
+                            groupParent ->
+                                    !(groupParent instanceof AutomaticKeywordGroup
+                                            || groupParent instanceof AutomaticPersonsGroup))
+                    .orElse(false);
         } else if (group instanceof SearchGroup) {
             return true;
         } else if (group instanceof AutomaticKeywordGroup) {
@@ -532,7 +644,9 @@ public boolean isEditable() {
         } else if (group instanceof TexGroup) {
             return true;
         } else {
-            throw new UnsupportedOperationException("isEditable method not yet implemented in group: " + group.getClass().getName());
+            throw new UnsupportedOperationException(
+                    "isEditable method not yet implemented in group: "
+                            + group.getClass().getName());
         }
     }
 
@@ -540,35 +654,63 @@ class LuceneIndexListener {
         @Subscribe
         public void listen(IndexStartedEvent event) {
             if (groupNode.getGroup() instanceof SearchGroup searchGroup) {
-                stateManager.getLuceneManager(databaseContext).ifPresent(luceneManager -> {
-                    BackgroundTask.wrap(() -> {
-                        searchGroup.setMatchedEntries(luceneManager.search(searchGroup.getQuery()).getMatchedEntries());
-                    }).onSuccess(success -> {
-                        refreshGroup();
-                        databaseContext.getMetaData().groupsBinding().invalidate();
-                    }).executeWith(taskExecutor);
-                });
+                stateManager
+                        .getLuceneManager(databaseContext)
+                        .ifPresent(
+                                luceneManager -> {
+                                    BackgroundTask.wrap(
+                                                    () -> {
+                                                        searchGroup.setMatchedEntries(
+                                                                luceneManager
+                                                                        .search(
+                                                                                searchGroup
+                                                                                        .getQuery())
+                                                                        .getMatchedEntries());
+                                                    })
+                                            .onSuccess(
+                                                    success -> {
+                                                        refreshGroup();
+                                                        databaseContext
+                                                                .getMetaData()
+                                                                .groupsBinding()
+                                                                .invalidate();
+                                                    })
+                                            .executeWith(taskExecutor);
+                                });
             }
         }
 
         @Subscribe
         public void listen(IndexAddedOrUpdatedEvent event) {
             if (groupNode.getGroup() instanceof SearchGroup searchGroup) {
-                stateManager.getLuceneManager(databaseContext).ifPresent(luceneManager -> {
-                    BackgroundTask.wrap(() -> {
-                        for (BibEntry entry : event.entries()) {
-                            searchGroup.updateMatches(entry, luceneManager.isEntryMatched(entry, searchGroup.getQuery()));
-                        }
-                    }).onFinished(() -> {
-                        for (BibEntry entry : event.entries()) {
-                            if (groupNode.matches(entry)) {
-                                matchedEntries.add(entry.getId());
-                            } else {
-                                matchedEntries.remove(entry.getId());
-                            }
-                        }
-                    }).executeWith(taskExecutor);
-                });
+                stateManager
+                        .getLuceneManager(databaseContext)
+                        .ifPresent(
+                                luceneManager -> {
+                                    BackgroundTask.wrap(
+                                                    () -> {
+                                                        for (BibEntry entry : event.entries()) {
+                                                            searchGroup.updateMatches(
+                                                                    entry,
+                                                                    luceneManager.isEntryMatched(
+                                                                            entry,
+                                                                            searchGroup
+                                                                                    .getQuery()));
+                                                        }
+                                                    })
+                                            .onFinished(
+                                                    () -> {
+                                                        for (BibEntry entry : event.entries()) {
+                                                            if (groupNode.matches(entry)) {
+                                                                matchedEntries.add(entry.getId());
+                                                            } else {
+                                                                matchedEntries.remove(
+                                                                        entry.getId());
+                                                            }
+                                                        }
+                                                    })
+                                            .executeWith(taskExecutor);
+                                });
             }
         }
 
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
index 38f9c532988c..1153f80340e7 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
@@ -1,12 +1,5 @@
 package org.jabref.gui.groups;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-
-import javax.swing.undo.AbstractUndoableEdit;
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
@@ -18,6 +11,13 @@
 import org.jabref.model.groups.KeywordGroup;
 import org.jabref.model.groups.SearchGroup;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import javax.swing.undo.AbstractUndoableEdit;
+import javax.swing.undo.UndoManager;
+
 public class GroupTreeNodeViewModel {
     private final GroupTreeNode node;
 
@@ -50,32 +50,38 @@ public String getDescription() {
         AbstractGroup group = node.getGroup();
         String shortDescription = "";
         boolean showDynamic = true;
-        shortDescription = switch (group) {
-            case ExplicitGroup explicitGroup ->
-                    GroupDescriptions.getShortDescriptionExplicitGroup(explicitGroup);
-            case KeywordGroup keywordGroup ->
-                    GroupDescriptions.getShortDescriptionKeywordGroup(keywordGroup, showDynamic);
-            case SearchGroup searchGroup ->
-                    GroupDescriptions.getShortDescription(searchGroup, showDynamic);
-            case null,
-                 default ->
-                    GroupDescriptions.getShortDescriptionAllEntriesGroup();
-        };
+        shortDescription =
+                switch (group) {
+                    case ExplicitGroup explicitGroup ->
+                            GroupDescriptions.getShortDescriptionExplicitGroup(explicitGroup);
+                    case KeywordGroup keywordGroup ->
+                            GroupDescriptions.getShortDescriptionKeywordGroup(
+                                    keywordGroup, showDynamic);
+                    case SearchGroup searchGroup ->
+                            GroupDescriptions.getShortDescription(searchGroup, showDynamic);
+                    case null, default -> GroupDescriptions.getShortDescriptionAllEntriesGroup();
+                };
         return "<html>" + shortDescription + "</html>";
     }
 
     public boolean canAddEntries(List<BibEntry> entries) {
-        return (getNode().getGroup() instanceof GroupEntryChanger) && !getNode().getGroup().containsAll(entries);
+        return (getNode().getGroup() instanceof GroupEntryChanger)
+                && !getNode().getGroup().containsAll(entries);
     }
 
     public boolean canRemoveEntries(List<BibEntry> entries) {
-        return (getNode().getGroup() instanceof GroupEntryChanger) && getNode().getGroup().containsAny(entries);
+        return (getNode().getGroup() instanceof GroupEntryChanger)
+                && getNode().getGroup().containsAny(entries);
     }
 
     public void sortChildrenByName(boolean recursive) {
-        getNode().sortChildren(
-                (node1, node2) -> node1.getGroup().getName().compareToIgnoreCase(node2.getGroup().getName()),
-                recursive);
+        getNode()
+                .sortChildren(
+                        (node1, node2) ->
+                                node1.getGroup()
+                                        .getName()
+                                        .compareToIgnoreCase(node2.getGroup().getName()),
+                        recursive);
     }
 
     @Override
@@ -156,7 +162,8 @@ public void changeEntriesTo(List<BibEntry> entries, UndoManager undoManager) {
 
         // Remember undo information
         if (!changesRemove.isEmpty()) {
-            AbstractUndoableEdit undoRemove = UndoableChangeEntriesOfGroup.getUndoableEdit(this, changesRemove);
+            AbstractUndoableEdit undoRemove =
+                    UndoableChangeEntriesOfGroup.getUndoableEdit(this, changesRemove);
             if (!changesAdd.isEmpty() && (undoRemove != null)) {
                 // we removed and added entries
                 undoRemove.addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(this, changesAdd));
@@ -179,10 +186,11 @@ public void addNewGroup(AbstractGroup newGroup, CountingUndoManager undoManager)
         GroupTreeNode newNode = GroupTreeNode.fromGroup(newGroup);
         this.getNode().addChild(newNode);
 
-        UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(
-                this,
-                new GroupTreeNodeViewModel(newNode),
-                UndoableAddOrRemoveGroup.ADD_NODE);
+        UndoableAddOrRemoveGroup undo =
+                new UndoableAddOrRemoveGroup(
+                        this,
+                        new GroupTreeNodeViewModel(newNode),
+                        UndoableAddOrRemoveGroup.ADD_NODE);
         undoManager.addEdit(undo);
     }
 
@@ -194,6 +202,8 @@ public List<FieldChange> addEntriesToGroup(List<BibEntry> entries) {
     }
 
     public void subscribeToDescendantChanged(Consumer<GroupTreeNodeViewModel> subscriber) {
-        getNode().subscribeToDescendantChanged(node -> subscriber.accept(new GroupTreeNodeViewModel(node)));
+        getNode()
+                .subscribeToDescendantChanged(
+                        node -> subscriber.accept(new GroupTreeNodeViewModel(node)));
     }
 }
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeView.java b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
index a28919ef26e2..9c06fc9a4e89 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
@@ -1,15 +1,6 @@
 package org.jabref.gui.groups;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.text.DecimalFormat;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
@@ -43,6 +34,8 @@
 import javafx.scene.layout.StackPane;
 import javafx.scene.text.Text;
 
+import org.controlsfx.control.textfield.CustomTextField;
+import org.controlsfx.control.textfield.TextFields;
 import org.jabref.architecture.AllowedToUseClassGetResource;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.DragAndDropDataFormats;
@@ -62,23 +55,33 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntry;
-
-import com.tobiasdiez.easybind.EasyBind;
-import org.controlsfx.control.textfield.CustomTextField;
-import org.controlsfx.control.textfield.TextFields;
 import org.reactfx.util.FxTimer;
 import org.reactfx.util.Timer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.text.DecimalFormat;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 @AllowedToUseClassGetResource("JavaFX internally handles the passed URLs properly.")
 public class GroupTreeView extends BorderPane {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GroupTreeView.class);
-    private static final PseudoClass PSEUDOCLASS_ANYSELECTED = PseudoClass.getPseudoClass("any-selected");
-    private static final PseudoClass PSEUDOCLASS_ALLSELECTED = PseudoClass.getPseudoClass("all-selected");
+    private static final PseudoClass PSEUDOCLASS_ANYSELECTED =
+            PseudoClass.getPseudoClass("any-selected");
+    private static final PseudoClass PSEUDOCLASS_ALLSELECTED =
+            PseudoClass.getPseudoClass("all-selected");
     private static final PseudoClass PSEUDOCLASS_ROOTELEMENT = PseudoClass.getPseudoClass("root");
-    private static final PseudoClass PSEUDOCLASS_SUBELEMENT = PseudoClass.getPseudoClass("sub"); // > 1 deep
+    private static final PseudoClass PSEUDOCLASS_SUBELEMENT =
+            PseudoClass.getPseudoClass("sub"); // > 1 deep
 
     private final StateManager stateManager;
     private final DialogService dialogService;
@@ -104,12 +107,12 @@ public class GroupTreeView extends BorderPane {
     /**
      * Note: This panel is deliberately not created in fxml, since parsing equivalent fxml takes about 500 msecs
      */
-    public GroupTreeView(TaskExecutor taskExecutor,
-                         StateManager stateManager,
-                         GuiPreferences preferences,
-                         DialogService dialogService,
-                         ChatHistoryService chatHistoryService
-    ) {
+    public GroupTreeView(
+            TaskExecutor taskExecutor,
+            StateManager stateManager,
+            GuiPreferences preferences,
+            DialogService dialogService,
+            ChatHistoryService chatHistoryService) {
         this.taskExecutor = taskExecutor;
         this.stateManager = stateManager;
         this.preferences = preferences;
@@ -117,7 +120,10 @@ public GroupTreeView(TaskExecutor taskExecutor,
         this.chatHistoryService = chatHistoryService;
 
         createNodes();
-        this.getStylesheets().add(Objects.requireNonNull(GroupTreeView.class.getResource("GroupTree.css")).toExternalForm());
+        this.getStylesheets()
+                .add(
+                        Objects.requireNonNull(GroupTreeView.class.getResource("GroupTree.css"))
+                                .toExternalForm());
         initialize();
     }
 
@@ -164,45 +170,63 @@ private void createNodes() {
 
     private void initialize() {
         this.localDragboard = stateManager.getLocalDragboard();
-        viewModel = new GroupTreeViewModel(stateManager, dialogService, chatHistoryService, preferences, taskExecutor, localDragboard);
+        viewModel =
+                new GroupTreeViewModel(
+                        stateManager,
+                        dialogService,
+                        chatHistoryService,
+                        preferences,
+                        taskExecutor,
+                        localDragboard);
 
         // Set-up groups tree
         groupTree.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
         dragExpansionHandler = new DragExpansionHandler();
 
         // Set-up bindings
-        Platform.runLater(() ->
-                BindingsHelper.bindContentBidirectional(
-                        groupTree.getSelectionModel().getSelectedItems(),
-                        viewModel.selectedGroupsProperty(),
-                        newSelectedGroups -> {
-                            groupTree.getSelectionModel().clearSelection();
-                            newSelectedGroups.forEach(this::selectNode);
-                        },
-                        this::updateSelection
-                ));
-
-        // We try to prevent publishing changes in the search field directly to the search task that takes some time
+        Platform.runLater(
+                () ->
+                        BindingsHelper.bindContentBidirectional(
+                                groupTree.getSelectionModel().getSelectedItems(),
+                                viewModel.selectedGroupsProperty(),
+                                newSelectedGroups -> {
+                                    groupTree.getSelectionModel().clearSelection();
+                                    newSelectedGroups.forEach(this::selectNode);
+                                },
+                                this::updateSelection));
+
+        // We try to prevent publishing changes in the search field directly to the search task that
+        // takes some time
         // for larger group structures.
-        final Timer searchTask = FxTimer.create(Duration.ofMillis(400), () -> {
-            LOGGER.debug("Run group search {}", searchField.getText());
-            viewModel.filterTextProperty().setValue(searchField.textProperty().getValue());
-        });
-        searchField.textProperty().addListener((observable, oldValue, newValue) -> searchTask.restart());
-
-        groupTree.rootProperty().bind(
-                EasyBind.map(viewModel.rootGroupProperty(),
-                        group -> {
-                            if (group == null) {
-                                return null;
-                            } else {
-                                return new RecursiveTreeItem<>(
-                                        group,
-                                        GroupNodeViewModel::getChildren,
-                                        GroupNodeViewModel::expandedProperty,
-                                        viewModel.filterPredicateProperty());
-                            }
-                        }));
+        final Timer searchTask =
+                FxTimer.create(
+                        Duration.ofMillis(400),
+                        () -> {
+                            LOGGER.debug("Run group search {}", searchField.getText());
+                            viewModel
+                                    .filterTextProperty()
+                                    .setValue(searchField.textProperty().getValue());
+                        });
+        searchField
+                .textProperty()
+                .addListener((observable, oldValue, newValue) -> searchTask.restart());
+
+        groupTree
+                .rootProperty()
+                .bind(
+                        EasyBind.map(
+                                viewModel.rootGroupProperty(),
+                                group -> {
+                                    if (group == null) {
+                                        return null;
+                                    } else {
+                                        return new RecursiveTreeItem<>(
+                                                group,
+                                                GroupNodeViewModel::getChildren,
+                                                GroupNodeViewModel::expandedProperty,
+                                                viewModel.filterPredicateProperty());
+                                    }
+                                }));
 
         // Icon and group name
         new ViewModelTreeTableCellFactory<GroupNodeViewModel>()
@@ -219,38 +243,66 @@ private void initialize() {
         // Arrow indicating expanded status
         new ViewModelTreeTableCellFactory<GroupNodeViewModel>()
                 .withGraphic(this::getArrowCell)
-                .withOnMouseClickedEvent(group -> event -> {
-                    group.toggleExpansion();
-                    event.consume();
-                })
+                .withOnMouseClickedEvent(
+                        group ->
+                                event -> {
+                                    group.toggleExpansion();
+                                    event.consume();
+                                })
                 .install(expansionNodeColumn);
 
         new ViewModelTreeTableRowFactory<GroupNodeViewModel>()
                 .withContextMenu(this::createContextMenuForGroup)
-                .withEventFilter(MouseEvent.MOUSE_PRESSED, (row, event) -> {
-                    if (((MouseEvent) event).getButton() == MouseButton.SECONDARY && !stateManager.getSelectedEntries().isEmpty()) {
-                        // Prevent right-click to select group whe we have selected entries
-                        event.consume();
-                    } else if (event.getTarget() instanceof StackPane pane) {
-                        if (pane.getStyleClass().contains("arrow") || pane.getStyleClass().contains("tree-disclosure-node")) {
-                            event.consume();
-                        }
-                    }
-                })
-                .withCustomInitializer(row -> {
-                    // Remove disclosure node since we display custom version in separate column
-                    // Simply setting to null is not enough since it would be replaced by the default node on every change
-                    row.setDisclosureNode(null);
-                    row.disclosureNodeProperty().addListener((observable, oldValue, newValue) -> row.setDisclosureNode(null));
-                })
+                .withEventFilter(
+                        MouseEvent.MOUSE_PRESSED,
+                        (row, event) -> {
+                            if (((MouseEvent) event).getButton() == MouseButton.SECONDARY
+                                    && !stateManager.getSelectedEntries().isEmpty()) {
+                                // Prevent right-click to select group whe we have selected entries
+                                event.consume();
+                            } else if (event.getTarget() instanceof StackPane pane) {
+                                if (pane.getStyleClass().contains("arrow")
+                                        || pane.getStyleClass().contains("tree-disclosure-node")) {
+                                    event.consume();
+                                }
+                            }
+                        })
+                .withCustomInitializer(
+                        row -> {
+                            // Remove disclosure node since we display custom version in separate
+                            // column
+                            // Simply setting to null is not enough since it would be replaced by
+                            // the default node on every change
+                            row.setDisclosureNode(null);
+                            row.disclosureNodeProperty()
+                                    .addListener(
+                                            (observable, oldValue, newValue) ->
+                                                    row.setDisclosureNode(null));
+                        })
                 .setOnDragDetected(this::handleOnDragDetected)
                 .setOnDragDropped(this::handleOnDragDropped)
                 .setOnDragExited(this::handleOnDragExited)
                 .setOnDragOver(this::handleOnDragOver)
-                .withPseudoClass(PSEUDOCLASS_ROOTELEMENT, row -> Bindings.createBooleanBinding(
-                        () -> (row != null) && (groupTree.getRoot() != null) && (row.getItem() == groupTree.getRoot().getValue()), row.treeItemProperty()))
-                .withPseudoClass(PSEUDOCLASS_SUBELEMENT, row -> Bindings.createBooleanBinding(
-                        () -> (row != null) && (groupTree.getTreeItemLevel(row.getTreeItem()) > 1), row.treeItemProperty()))
+                .withPseudoClass(
+                        PSEUDOCLASS_ROOTELEMENT,
+                        row ->
+                                Bindings.createBooleanBinding(
+                                        () ->
+                                                (row != null)
+                                                        && (groupTree.getRoot() != null)
+                                                        && (row.getItem()
+                                                                == groupTree.getRoot().getValue()),
+                                        row.treeItemProperty()))
+                .withPseudoClass(
+                        PSEUDOCLASS_SUBELEMENT,
+                        row ->
+                                Bindings.createBooleanBinding(
+                                        () ->
+                                                (row != null)
+                                                        && (groupTree.getTreeItemLevel(
+                                                                        row.getTreeItem())
+                                                                > 1),
+                                        row.treeItemProperty()))
                 .install(groupTree);
 
         setupDragScrolling();
@@ -274,13 +326,14 @@ private StackPane createNumberCell(GroupNodeViewModel group) {
         final StackPane node = new StackPane();
         node.getStyleClass().add("hits");
         if (!group.isRoot()) {
-            BindingsHelper.includePseudoClassWhen(node, PSEUDOCLASS_ANYSELECTED,
-                    group.anySelectedEntriesMatchedProperty());
-            BindingsHelper.includePseudoClassWhen(node, PSEUDOCLASS_ALLSELECTED,
-                    group.allSelectedEntriesMatchedProperty());
+            BindingsHelper.includePseudoClassWhen(
+                    node, PSEUDOCLASS_ANYSELECTED, group.anySelectedEntriesMatchedProperty());
+            BindingsHelper.includePseudoClassWhen(
+                    node, PSEUDOCLASS_ALLSELECTED, group.allSelectedEntriesMatchedProperty());
         }
         Text text = new Text();
-        EasyBind.subscribe(preferences.getGroupsPreferences().displayGroupCountProperty(),
+        EasyBind.subscribe(
+                preferences.getGroupsPreferences().displayGroupCountProperty(),
                 shouldDisplayGroupCount -> {
                     if (text.textProperty().isBound()) {
                         text.textProperty().unbind();
@@ -288,7 +341,11 @@ private StackPane createNumberCell(GroupNodeViewModel group) {
                     }
 
                     if (shouldDisplayGroupCount) {
-                        text.textProperty().bind(group.getHits().map(Number::intValue).map(this::getFormattedNumber));
+                        text.textProperty()
+                                .bind(
+                                        group.getHits()
+                                                .map(Number::intValue)
+                                                .map(this::getFormattedNumber));
                         Tooltip tooltip = new Tooltip();
                         tooltip.textProperty().bind(group.getHits().asString());
                         Tooltip.install(text, tooltip);
@@ -296,34 +353,47 @@ private StackPane createNumberCell(GroupNodeViewModel group) {
                 });
         text.getStyleClass().setAll("text");
 
-        text.styleProperty().bind(Bindings.createStringBinding(() -> {
-            double reducedFontSize;
-            double font_size = preferences.getWorkspacePreferences().getMainFontSize();
-            // For each breaking point, the font size is reduced 0.20 em to fix issue 8797
-            if (font_size > 26.0) {
-                reducedFontSize = 0.25;
-            } else if (font_size > 22.0) {
-                reducedFontSize = 0.35;
-            } else if (font_size > 18.0) {
-                reducedFontSize = 0.55;
-            } else {
-                reducedFontSize = 0.75;
-            }
-            return "-fx-font-size: %fem;".formatted(reducedFontSize);
-        }, preferences.getWorkspacePreferences().mainFontSizeProperty()));
+        text.styleProperty()
+                .bind(
+                        Bindings.createStringBinding(
+                                () -> {
+                                    double reducedFontSize;
+                                    double font_size =
+                                            preferences.getWorkspacePreferences().getMainFontSize();
+                                    // For each breaking point, the font size is reduced 0.20 em to
+                                    // fix issue 8797
+                                    if (font_size > 26.0) {
+                                        reducedFontSize = 0.25;
+                                    } else if (font_size > 22.0) {
+                                        reducedFontSize = 0.35;
+                                    } else if (font_size > 18.0) {
+                                        reducedFontSize = 0.55;
+                                    } else {
+                                        reducedFontSize = 0.75;
+                                    }
+                                    return "-fx-font-size: %fem;".formatted(reducedFontSize);
+                                },
+                                preferences.getWorkspacePreferences().mainFontSizeProperty()));
 
         node.getChildren().add(text);
         node.setMaxWidth(Control.USE_PREF_SIZE);
         return node;
     }
 
-    private void handleOnDragExited(TreeTableRow<GroupNodeViewModel> row, GroupNodeViewModel fieldViewModel, DragEvent dragEvent) {
+    private void handleOnDragExited(
+            TreeTableRow<GroupNodeViewModel> row,
+            GroupNodeViewModel fieldViewModel,
+            DragEvent dragEvent) {
         ControlHelper.removeDroppingPseudoClasses(row);
     }
 
-    private void handleOnDragDetected(TreeTableRow<GroupNodeViewModel> row, GroupNodeViewModel groupViewModel, MouseEvent event) {
+    private void handleOnDragDetected(
+            TreeTableRow<GroupNodeViewModel> row,
+            GroupNodeViewModel groupViewModel,
+            MouseEvent event) {
         List<String> groupsToMove = new ArrayList<>();
-        for (TreeItem<GroupNodeViewModel> selectedItem : row.getTreeTableView().getSelectionModel().getSelectedItems()) {
+        for (TreeItem<GroupNodeViewModel> selectedItem :
+                row.getTreeTableView().getSelectionModel().getSelectedItems()) {
             if ((selectedItem != null) && (selectedItem.getValue() != null)) {
                 groupsToMove.add(selectedItem.getValue().getPath());
             }
@@ -343,19 +413,25 @@ private void handleOnDragDetected(TreeTableRow<GroupNodeViewModel> row, GroupNod
         event.consume();
     }
 
-    private void handleOnDragDropped(TreeTableRow<GroupNodeViewModel> row, GroupNodeViewModel originalItem, DragEvent event) {
+    private void handleOnDragDropped(
+            TreeTableRow<GroupNodeViewModel> row,
+            GroupNodeViewModel originalItem,
+            DragEvent event) {
         Dragboard dragboard = event.getDragboard();
         boolean success = false;
 
         if (dragboard.hasContent(DragAndDropDataFormats.GROUP) && row.getItem().canAddGroupsIn()) {
-            List<String> pathToSources = (List<String>) dragboard.getContent(DragAndDropDataFormats.GROUP);
+            List<String> pathToSources =
+                    (List<String>) dragboard.getContent(DragAndDropDataFormats.GROUP);
             List<GroupNodeViewModel> changedGroups = new LinkedList<>();
             for (String pathToSource : pathToSources) {
-                Optional<GroupNodeViewModel> source = viewModel
-                        .rootGroupProperty().get()
-                        .getChildByPath(pathToSource);
+                Optional<GroupNodeViewModel> source =
+                        viewModel.rootGroupProperty().get().getChildByPath(pathToSource);
                 if (source.isPresent() && source.get().canBeDragged()) {
-                    source.get().draggedOn(row.getItem(), ControlHelper.getDroppingMouseLocation(row, event));
+                    source.get()
+                            .draggedOn(
+                                    row.getItem(),
+                                    ControlHelper.getDroppingMouseLocation(row, event));
                     changedGroups.add(source.get());
                     success = true;
                 }
@@ -376,9 +452,14 @@ private void handleOnDragDropped(TreeTableRow<GroupNodeViewModel> row, GroupNode
         event.consume();
     }
 
-    private void handleOnDragOver(TreeTableRow<GroupNodeViewModel> row, GroupNodeViewModel originalItem, DragEvent event) {
+    private void handleOnDragOver(
+            TreeTableRow<GroupNodeViewModel> row,
+            GroupNodeViewModel originalItem,
+            DragEvent event) {
         Dragboard dragboard = event.getDragboard();
-        if ((event.getGestureSource() != row) && (row.getItem() != null) && row.getItem().acceptableDrop(dragboard)) {
+        if ((event.getGestureSource() != row)
+                && (row.getItem() != null)
+                && row.getItem().acceptableDrop(dragboard)) {
             event.acceptTransferModes(TransferMode.MOVE, TransferMode.LINK);
 
             // expand node and all children on drag over
@@ -396,7 +477,11 @@ private void updateSelection(List<TreeItem<GroupNodeViewModel>> newSelectedGroup
         if ((newSelectedGroups == null) || newSelectedGroups.isEmpty()) {
             viewModel.selectedGroupsProperty().clear();
         } else {
-            List<GroupNodeViewModel> list = newSelectedGroups.stream().filter(model -> (model != null) && (model.getValue() != null)).map(TreeItem::getValue).collect(Collectors.toList());
+            List<GroupNodeViewModel> list =
+                    newSelectedGroups.stream()
+                            .filter(model -> (model != null) && (model.getValue() != null))
+                            .map(TreeItem::getValue)
+                            .collect(Collectors.toList());
             viewModel.selectedGroupsProperty().setAll(list);
         }
     }
@@ -407,24 +492,25 @@ private void selectNode(GroupNodeViewModel value) {
 
     private void selectNode(GroupNodeViewModel value, boolean expandParents) {
         getTreeItemByValue(value)
-                .ifPresent(treeItem -> {
-                    if (expandParents) {
-                        TreeItem<GroupNodeViewModel> parent = treeItem.getParent();
-                        while (parent != null) {
-                            parent.setExpanded(true);
-                            parent = parent.getParent();
-                        }
-                    }
-                    groupTree.getSelectionModel().select(treeItem);
-                });
+                .ifPresent(
+                        treeItem -> {
+                            if (expandParents) {
+                                TreeItem<GroupNodeViewModel> parent = treeItem.getParent();
+                                while (parent != null) {
+                                    parent.setExpanded(true);
+                                    parent = parent.getParent();
+                                }
+                            }
+                            groupTree.getSelectionModel().select(treeItem);
+                        });
     }
 
     private Optional<TreeItem<GroupNodeViewModel>> getTreeItemByValue(GroupNodeViewModel value) {
         return getTreeItemByValue(groupTree.getRoot(), value);
     }
 
-    private Optional<TreeItem<GroupNodeViewModel>> getTreeItemByValue(TreeItem<GroupNodeViewModel> root,
-                                                                      GroupNodeViewModel value) {
+    private Optional<TreeItem<GroupNodeViewModel>> getTreeItemByValue(
+            TreeItem<GroupNodeViewModel> root, GroupNodeViewModel value) {
         if (root == null) {
             return Optional.empty();
         }
@@ -445,47 +531,60 @@ private Optional<TreeItem<GroupNodeViewModel>> getTreeItemByValue(TreeItem<Group
     }
 
     private void setupDragScrolling() {
-        // see http://programmingtipsandtraps.blogspot.com/2015/10/drag-and-drop-in-treetableview-with.html
+        // see
+        // http://programmingtipsandtraps.blogspot.com/2015/10/drag-and-drop-in-treetableview-with.html
 
         // timer used to implement scrolling
-        scrollTimer = FxTimer.createPeriodic(Duration.ofMillis(100), () ->
-                getVerticalScrollbar().ifPresent(scrollBar -> {
-                    double newValue = scrollBar.getValue() + scrollVelocity;
-                    newValue = Math.min(newValue, 1d);
-                    newValue = Math.max(newValue, 0d);
-                    scrollBar.setValue(newValue);
-                }));
+        scrollTimer =
+                FxTimer.createPeriodic(
+                        Duration.ofMillis(100),
+                        () ->
+                                getVerticalScrollbar()
+                                        .ifPresent(
+                                                scrollBar -> {
+                                                    double newValue =
+                                                            scrollBar.getValue() + scrollVelocity;
+                                                    newValue = Math.min(newValue, 1d);
+                                                    newValue = Math.max(newValue, 0d);
+                                                    scrollBar.setValue(newValue);
+                                                }));
 
         // Start
-        groupTree.setOnDragEntered(event -> {
-            initScrolling();
-            scrollTimer.restart();
-        });
+        groupTree.setOnDragEntered(
+                event -> {
+                    initScrolling();
+                    scrollTimer.restart();
+                });
 
         // During dragging
-        groupTree.setOnDragOver(event -> {
-            boolean scrollingUp = event.getY() < upperBorder;
-            boolean scrollingDown = event.getY() > lowerBorder;
-
-            if (!scrollingUp && !scrollingDown) {
-                scrollVelocity = 0;
-                return;
-            }
+        groupTree.setOnDragOver(
+                event -> {
+                    boolean scrollingUp = event.getY() < upperBorder;
+                    boolean scrollingDown = event.getY() > lowerBorder;
+
+                    if (!scrollingUp && !scrollingDown) {
+                        scrollVelocity = 0;
+                        return;
+                    }
 
-            double distanceFromNonScrollableInsideArea;
-            if (scrollingUp) {
-                distanceFromNonScrollableInsideArea = scrollableAreaHeight - event.getY();
-            } else {
-                distanceFromNonScrollableInsideArea = scrollableAreaHeight - (groupTree.getHeight() - event.getY());
-            }
+                    double distanceFromNonScrollableInsideArea;
+                    if (scrollingUp) {
+                        distanceFromNonScrollableInsideArea = scrollableAreaHeight - event.getY();
+                    } else {
+                        distanceFromNonScrollableInsideArea =
+                                scrollableAreaHeight - (groupTree.getHeight() - event.getY());
+                    }
 
-            // part "(1+x)" of formula "speed = 20px/s (1+x)" (proposed by https://github.com/JabRef/jabref/issues/9754#issuecomment-1766864908)
-            // / 10.0 is because of the 100 milliseconds above. (it is 20px per second, 10.0 * 100.0 ms = 1 second)
-            scrollVelocity = (baseFactor * (1.0 + distanceFromNonScrollableInsideArea)) / 10.0;
-            if (scrollingUp) {
-                scrollVelocity = -scrollVelocity;
-            }
-        });
+                    // part "(1+x)" of formula "speed = 20px/s (1+x)" (proposed by
+                    // https://github.com/JabRef/jabref/issues/9754#issuecomment-1766864908)
+                    // / 10.0 is because of the 100 milliseconds above. (it is 20px per second, 10.0
+                    // * 100.0 ms = 1 second)
+                    scrollVelocity =
+                            (baseFactor * (1.0 + distanceFromNonScrollableInsideArea)) / 10.0;
+                    if (scrollingUp) {
+                        scrollVelocity = -scrollVelocity;
+                    }
+                });
 
         // Stop
         groupTree.setOnScroll(event -> scrollTimer.stop());
@@ -502,10 +601,12 @@ private void initScrolling() {
             return;
         }
 
-        double heightOfOneNode = groupTree.getChildrenUnmodifiable().getFirst().getLayoutBounds().getHeight();
+        double heightOfOneNode =
+                groupTree.getChildrenUnmodifiable().getFirst().getLayoutBounds().getHeight();
         // heightOfOneNode is the size of text. We need including surroundings.
         // We found no way to get this. We can only do a heuristics here.
-        // 2.0 is backed by measurement using the screen ruler utility (https://learn.microsoft.com/en-us/windows/powertoys/screen-ruler)
+        // 2.0 is backed by measurement using the screen ruler utility
+        // (https://learn.microsoft.com/en-us/windows/powertoys/screen-ruler)
         heightOfOneNode = heightOfOneNode * 2.0;
 
         // At most scroll area is three entries large
@@ -513,8 +614,10 @@ private void initScrolling() {
         upperBorder = scrollableAreaHeight;
         lowerBorder = groupTree.getHeight() - scrollableAreaHeight;
 
-        // 20 is derived from "speed = 20px/s (1+x)" (proposed by https://github.com/JabRef/jabref/issues/9754#issuecomment-1766864908)
-        // (1.0 / groupTree.getHeight()) is the factor to convert from px to fraction of total height
+        // 20 is derived from "speed = 20px/s (1+x)" (proposed by
+        // https://github.com/JabRef/jabref/issues/9754#issuecomment-1766864908)
+        // (1.0 / groupTree.getHeight()) is the factor to convert from px to fraction of total
+        // height
         double totalHeight = heightOfOneNode * numberOfShownGroups;
         baseFactor = 20.0 * (1.0 / totalHeight);
     }
@@ -539,34 +642,71 @@ private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) {
 
         MenuItem removeGroup;
         if (group.hasSubgroups() && group.canAddGroupsIn() && !group.isRoot()) {
-            removeGroup = new Menu(Localization.lang("Remove group"), null,
-                    factory.createMenuItem(StandardActions.GROUP_REMOVE_KEEP_SUBGROUPS,
-                            new GroupTreeView.ContextAction(StandardActions.GROUP_REMOVE_KEEP_SUBGROUPS, group)),
-                    factory.createMenuItem(StandardActions.GROUP_REMOVE_WITH_SUBGROUPS,
-                            new GroupTreeView.ContextAction(StandardActions.GROUP_REMOVE_WITH_SUBGROUPS, group))
-            );
+            removeGroup =
+                    new Menu(
+                            Localization.lang("Remove group"),
+                            null,
+                            factory.createMenuItem(
+                                    StandardActions.GROUP_REMOVE_KEEP_SUBGROUPS,
+                                    new GroupTreeView.ContextAction(
+                                            StandardActions.GROUP_REMOVE_KEEP_SUBGROUPS, group)),
+                            factory.createMenuItem(
+                                    StandardActions.GROUP_REMOVE_WITH_SUBGROUPS,
+                                    new GroupTreeView.ContextAction(
+                                            StandardActions.GROUP_REMOVE_WITH_SUBGROUPS, group)));
         } else {
-            removeGroup = factory.createMenuItem(StandardActions.GROUP_REMOVE, new GroupTreeView.ContextAction(StandardActions.GROUP_REMOVE, group));
+            removeGroup =
+                    factory.createMenuItem(
+                            StandardActions.GROUP_REMOVE,
+                            new GroupTreeView.ContextAction(StandardActions.GROUP_REMOVE, group));
         }
 
         if (preferences.getAiPreferences().getEnableAi()) {
-            contextMenu.getItems().add(factory.createMenuItem(StandardActions.GROUP_CHAT, new ContextAction(StandardActions.GROUP_CHAT, group)));
+            contextMenu
+                    .getItems()
+                    .add(
+                            factory.createMenuItem(
+                                    StandardActions.GROUP_CHAT,
+                                    new ContextAction(StandardActions.GROUP_CHAT, group)));
         }
 
-        contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.GROUP_EDIT, new ContextAction(StandardActions.GROUP_EDIT, group)),
-                removeGroup,
-                new SeparatorMenuItem(),
-                factory.createMenuItem(StandardActions.GROUP_SUBGROUP_ADD, new ContextAction(StandardActions.GROUP_SUBGROUP_ADD, group)),
-                factory.createMenuItem(StandardActions.GROUP_SUBGROUP_REMOVE, new ContextAction(StandardActions.GROUP_SUBGROUP_REMOVE, group)),
-                factory.createMenuItem(StandardActions.GROUP_SUBGROUP_SORT, new ContextAction(StandardActions.GROUP_SUBGROUP_SORT, group)),
-                factory.createMenuItem(StandardActions.GROUP_SUBGROUP_SORT_REVERSE, new ContextAction(StandardActions.GROUP_SUBGROUP_SORT_REVERSE, group)),
-                factory.createMenuItem(StandardActions.GROUP_SUBGROUP_SORT_ENTRIES, new ContextAction(StandardActions.GROUP_SUBGROUP_SORT_ENTRIES, group)),
-                factory.createMenuItem(StandardActions.GROUP_SUBGROUP_SORT_ENTRIES_REVERSE, new ContextAction(StandardActions.GROUP_SUBGROUP_SORT_ENTRIES_REVERSE, group)),
-                new SeparatorMenuItem(),
-                factory.createMenuItem(StandardActions.GROUP_ENTRIES_ADD, new ContextAction(StandardActions.GROUP_ENTRIES_ADD, group)),
-                factory.createMenuItem(StandardActions.GROUP_ENTRIES_REMOVE, new ContextAction(StandardActions.GROUP_ENTRIES_REMOVE, group))
-        );
+        contextMenu
+                .getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.GROUP_EDIT,
+                                new ContextAction(StandardActions.GROUP_EDIT, group)),
+                        removeGroup,
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.GROUP_SUBGROUP_ADD,
+                                new ContextAction(StandardActions.GROUP_SUBGROUP_ADD, group)),
+                        factory.createMenuItem(
+                                StandardActions.GROUP_SUBGROUP_REMOVE,
+                                new ContextAction(StandardActions.GROUP_SUBGROUP_REMOVE, group)),
+                        factory.createMenuItem(
+                                StandardActions.GROUP_SUBGROUP_SORT,
+                                new ContextAction(StandardActions.GROUP_SUBGROUP_SORT, group)),
+                        factory.createMenuItem(
+                                StandardActions.GROUP_SUBGROUP_SORT_REVERSE,
+                                new ContextAction(
+                                        StandardActions.GROUP_SUBGROUP_SORT_REVERSE, group)),
+                        factory.createMenuItem(
+                                StandardActions.GROUP_SUBGROUP_SORT_ENTRIES,
+                                new ContextAction(
+                                        StandardActions.GROUP_SUBGROUP_SORT_ENTRIES, group)),
+                        factory.createMenuItem(
+                                StandardActions.GROUP_SUBGROUP_SORT_ENTRIES_REVERSE,
+                                new ContextAction(
+                                        StandardActions.GROUP_SUBGROUP_SORT_ENTRIES_REVERSE,
+                                        group)),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.GROUP_ENTRIES_ADD,
+                                new ContextAction(StandardActions.GROUP_ENTRIES_ADD, group)),
+                        factory.createMenuItem(
+                                StandardActions.GROUP_ENTRIES_REMOVE,
+                                new ContextAction(StandardActions.GROUP_ENTRIES_REMOVE, group)));
 
         contextMenu.getItems().forEach(item -> item.setGraphic(null));
         contextMenu.getStyleClass().add("context-menu");
@@ -592,7 +732,9 @@ private String getFormattedNumber(int hits) {
     //  Workaround taken from https://github.com/controlsfx/controlsfx/issues/330
     private void setupClearButtonField(CustomTextField customTextField) {
         try {
-            Method m = TextFields.class.getDeclaredMethod("setupClearButtonField", TextField.class, ObjectProperty.class);
+            Method m =
+                    TextFields.class.getDeclaredMethod(
+                            "setupClearButtonField", TextField.class, ObjectProperty.class);
             m.setAccessible(true);
             m.invoke(null, customTextField, customTextField.rightProperty());
         } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
@@ -633,47 +775,47 @@ public ContextAction(StandardActions command, GroupNodeViewModel group) {
             this.command = command;
             this.group = group;
 
-            this.executable.bind(BindingsHelper.constantOf(
-                    switch (command) {
-                        case GROUP_EDIT ->
-                                group.isEditable();
-                        case GROUP_REMOVE, GROUP_REMOVE_WITH_SUBGROUPS, GROUP_REMOVE_KEEP_SUBGROUPS ->
-                                group.isEditable() && group.canRemove();
-                        case GROUP_SUBGROUP_ADD ->
-                                group.isEditable() && group.canAddGroupsIn()
-                                        || group.isRoot();
-                        case GROUP_SUBGROUP_REMOVE ->
-                                group.isEditable() && group.hasSubgroups() && group.canRemove()
-                                        || group.isRoot();
-                        case GROUP_SUBGROUP_SORT ->
-                                group.isEditable() && group.hasSubgroups() && group.canAddEntriesIn()
-                                        || group.isRoot();
-                        case GROUP_ENTRIES_ADD, GROUP_ENTRIES_REMOVE ->
-                                group.canAddEntriesIn();
-                        default ->
-                                true;
-                    }));
+            this.executable.bind(
+                    BindingsHelper.constantOf(
+                            switch (command) {
+                                case GROUP_EDIT -> group.isEditable();
+                                case GROUP_REMOVE,
+                                                GROUP_REMOVE_WITH_SUBGROUPS,
+                                                GROUP_REMOVE_KEEP_SUBGROUPS ->
+                                        group.isEditable() && group.canRemove();
+                                case GROUP_SUBGROUP_ADD ->
+                                        group.isEditable() && group.canAddGroupsIn()
+                                                || group.isRoot();
+                                case GROUP_SUBGROUP_REMOVE ->
+                                        group.isEditable()
+                                                        && group.hasSubgroups()
+                                                        && group.canRemove()
+                                                || group.isRoot();
+                                case GROUP_SUBGROUP_SORT ->
+                                        group.isEditable()
+                                                        && group.hasSubgroups()
+                                                        && group.canAddEntriesIn()
+                                                || group.isRoot();
+                                case GROUP_ENTRIES_ADD, GROUP_ENTRIES_REMOVE ->
+                                        group.canAddEntriesIn();
+                                default -> true;
+                            }));
         }
 
         @Override
         public void execute() {
             switch (command) {
-                case GROUP_REMOVE ->
-                        viewModel.removeGroupNoSubgroups(group);
-                case GROUP_REMOVE_KEEP_SUBGROUPS ->
-                        viewModel.removeGroupKeepSubgroups(group);
-                case GROUP_REMOVE_WITH_SUBGROUPS ->
-                        viewModel.removeGroupAndSubgroups(group);
+                case GROUP_REMOVE -> viewModel.removeGroupNoSubgroups(group);
+                case GROUP_REMOVE_KEEP_SUBGROUPS -> viewModel.removeGroupKeepSubgroups(group);
+                case GROUP_REMOVE_WITH_SUBGROUPS -> viewModel.removeGroupAndSubgroups(group);
                 case GROUP_EDIT -> {
                     viewModel.editGroup(group);
                     groupTree.refresh();
                 }
-                case GROUP_CHAT ->
-                    viewModel.chatWithGroup(group);
+                case GROUP_CHAT -> viewModel.chatWithGroup(group);
                 case GROUP_SUBGROUP_ADD ->
                         viewModel.addNewSubgroup(group, GroupDialogHeader.SUBGROUP);
-                case GROUP_SUBGROUP_REMOVE ->
-                        viewModel.removeSubgroups(group);
+                case GROUP_SUBGROUP_REMOVE -> viewModel.removeSubgroups(group);
                 case GROUP_SUBGROUP_SORT ->
                         viewModel.sortAlphabeticallyRecursive(group.getGroupNode());
                 case GROUP_SUBGROUP_SORT_REVERSE ->
@@ -682,10 +824,8 @@ public void execute() {
                         viewModel.sortEntriesRecursive(group.getGroupNode());
                 case GROUP_SUBGROUP_SORT_ENTRIES_REVERSE ->
                         viewModel.sortReverseEntriesRecursive(group.getGroupNode());
-                case GROUP_ENTRIES_ADD ->
-                        viewModel.addSelectedEntries(group);
-                case GROUP_ENTRIES_REMOVE ->
-                        viewModel.removeSelectedEntries(group);
+                case GROUP_ENTRIES_ADD -> viewModel.addSelectedEntries(group);
+                case GROUP_ENTRIES_REMOVE -> viewModel.removeSelectedEntries(group);
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
index 94e4b06aec3c..fb58d70b21db 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
@@ -1,13 +1,9 @@
 package org.jabref.gui.groups;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
+import com.airhacks.afterburner.injection.Injector;
+import com.tobiasdiez.easybind.EasyBind;
+
+import dev.langchain4j.data.message.ChatMessage;
 
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -44,41 +40,58 @@
 import org.jabref.model.groups.WordKeywordGroup;
 import org.jabref.model.metadata.MetaData;
 
-import com.airhacks.afterburner.injection.Injector;
-import com.tobiasdiez.easybind.EasyBind;
-import dev.langchain4j.data.message.ChatMessage;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 public class GroupTreeViewModel extends AbstractViewModel {
 
     private final ObjectProperty<GroupNodeViewModel> rootGroup = new SimpleObjectProperty<>();
-    private final ListProperty<GroupNodeViewModel> selectedGroups = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<GroupNodeViewModel> selectedGroups =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
     private final StateManager stateManager;
     private final DialogService dialogService;
     private final ChatHistoryService chatHistoryService;
     private final GuiPreferences preferences;
     private final TaskExecutor taskExecutor;
     private final CustomLocalDragboard localDragboard;
-    private final ObjectProperty<Predicate<GroupNodeViewModel>> filterPredicate = new SimpleObjectProperty<>();
+    private final ObjectProperty<Predicate<GroupNodeViewModel>> filterPredicate =
+            new SimpleObjectProperty<>();
     private final StringProperty filterText = new SimpleStringProperty();
-    private final Comparator<GroupTreeNode> compAlphabetIgnoreCase = (GroupTreeNode v1, GroupTreeNode v2) -> v1
-            .getName()
-            .compareToIgnoreCase(v2.getName());
-    private final Comparator<GroupTreeNode> compAlphabetIgnoreCaseReverse = (GroupTreeNode v1, GroupTreeNode v2) -> v2
-            .getName()
-            .compareToIgnoreCase(v1.getName());
-    private final Comparator<GroupTreeNode> compEntries = (GroupTreeNode v1, GroupTreeNode v2) -> {
-        int numChildren1 = v1.getEntriesInGroup(this.currentDatabase.get().getEntries()).size();
-        int numChildren2 = v2.getEntriesInGroup(this.currentDatabase.get().getEntries()).size();
-        return Integer.compare(numChildren2, numChildren1);
-    };
-    private final Comparator<GroupTreeNode> compEntriesReverse = (GroupTreeNode v1, GroupTreeNode v2) -> {
-        int numChildren1 = v1.getEntriesInGroup(this.currentDatabase.get().getEntries()).size();
-        int numChildren2 = v2.getEntriesInGroup(this.currentDatabase.get().getEntries()).size();
-        return Integer.compare(numChildren1, numChildren2);
-    };
+    private final Comparator<GroupTreeNode> compAlphabetIgnoreCase =
+            (GroupTreeNode v1, GroupTreeNode v2) -> v1.getName().compareToIgnoreCase(v2.getName());
+    private final Comparator<GroupTreeNode> compAlphabetIgnoreCaseReverse =
+            (GroupTreeNode v1, GroupTreeNode v2) -> v2.getName().compareToIgnoreCase(v1.getName());
+    private final Comparator<GroupTreeNode> compEntries =
+            (GroupTreeNode v1, GroupTreeNode v2) -> {
+                int numChildren1 =
+                        v1.getEntriesInGroup(this.currentDatabase.get().getEntries()).size();
+                int numChildren2 =
+                        v2.getEntriesInGroup(this.currentDatabase.get().getEntries()).size();
+                return Integer.compare(numChildren2, numChildren1);
+            };
+    private final Comparator<GroupTreeNode> compEntriesReverse =
+            (GroupTreeNode v1, GroupTreeNode v2) -> {
+                int numChildren1 =
+                        v1.getEntriesInGroup(this.currentDatabase.get().getEntries()).size();
+                int numChildren2 =
+                        v2.getEntriesInGroup(this.currentDatabase.get().getEntries()).size();
+                return Integer.compare(numChildren1, numChildren2);
+            };
     private Optional<BibDatabaseContext> currentDatabase = Optional.empty();
 
-    public GroupTreeViewModel(StateManager stateManager, DialogService dialogService, ChatHistoryService chatHistoryService, GuiPreferences preferences, TaskExecutor taskExecutor, CustomLocalDragboard localDragboard) {
+    public GroupTreeViewModel(
+            StateManager stateManager,
+            DialogService dialogService,
+            ChatHistoryService chatHistoryService,
+            GuiPreferences preferences,
+            TaskExecutor taskExecutor,
+            CustomLocalDragboard localDragboard) {
         this.stateManager = Objects.requireNonNull(stateManager);
         this.dialogService = Objects.requireNonNull(dialogService);
         this.chatHistoryService = Objects.requireNonNull(chatHistoryService);
@@ -124,13 +137,18 @@ private void onSelectedGroupChanged(ObservableList<GroupNodeViewModel> newValue)
             return;
         }
 
-        currentDatabase.ifPresent(database -> {
-            if ((newValue == null) || newValue.isEmpty()) {
-                stateManager.clearSelectedGroups(database);
-            } else {
-                stateManager.setSelectedGroups(database, newValue.stream().map(GroupNodeViewModel::getGroupNode).collect(Collectors.toList()));
-            }
-        });
+        currentDatabase.ifPresent(
+                database -> {
+                    if ((newValue == null) || newValue.isEmpty()) {
+                        stateManager.clearSelectedGroups(database);
+                    } else {
+                        stateManager.setSelectedGroups(
+                                database,
+                                newValue.stream()
+                                        .map(GroupNodeViewModel::getGroupNode)
+                                        .collect(Collectors.toList()));
+                    }
+                });
     }
 
     /**
@@ -140,7 +158,9 @@ public void addNewGroupToRoot() {
         if (currentDatabase.isPresent()) {
             addNewSubgroup(rootGroup.get(), GroupDialogHeader.GROUP);
         } else {
-            dialogService.showWarningDialogAndWait(Localization.lang("Cannot create group"), Localization.lang("Cannot create group. Please create a library first."));
+            dialogService.showWarningDialogAndWait(
+                    Localization.lang("Cannot create group"),
+                    Localization.lang("Cannot create group. Please create a library first."));
         }
     }
 
@@ -150,20 +170,44 @@ public void addNewGroupToRoot() {
      */
     private void onActiveDatabaseChanged(Optional<BibDatabaseContext> newDatabase) {
         if (newDatabase.isPresent()) {
-            GroupNodeViewModel newRoot = newDatabase
-                    .map(BibDatabaseContext::getMetaData)
-                    .flatMap(MetaData::getGroups)
-                    .map(root -> new GroupNodeViewModel(newDatabase.get(), stateManager, taskExecutor, root, localDragboard, preferences))
-                    .orElse(GroupNodeViewModel.getAllEntriesGroup(newDatabase.get(), stateManager, taskExecutor, localDragboard, preferences));
+            GroupNodeViewModel newRoot =
+                    newDatabase
+                            .map(BibDatabaseContext::getMetaData)
+                            .flatMap(MetaData::getGroups)
+                            .map(
+                                    root ->
+                                            new GroupNodeViewModel(
+                                                    newDatabase.get(),
+                                                    stateManager,
+                                                    taskExecutor,
+                                                    root,
+                                                    localDragboard,
+                                                    preferences))
+                            .orElse(
+                                    GroupNodeViewModel.getAllEntriesGroup(
+                                            newDatabase.get(),
+                                            stateManager,
+                                            taskExecutor,
+                                            localDragboard,
+                                            preferences));
 
             rootGroup.setValue(newRoot);
             if (stateManager.getSelectedGroups(newDatabase.get()).isEmpty()) {
-                stateManager.setSelectedGroups(newDatabase.get(), Collections.singletonList(newRoot.getGroupNode()));
+                stateManager.setSelectedGroups(
+                        newDatabase.get(), Collections.singletonList(newRoot.getGroupNode()));
             }
             selectedGroups.setAll(
                     stateManager.getSelectedGroups(newDatabase.get()).stream()
-                                .map(selectedGroup -> new GroupNodeViewModel(newDatabase.get(), stateManager, taskExecutor, selectedGroup, localDragboard, preferences))
-                                .collect(Collectors.toList()));
+                            .map(
+                                    selectedGroup ->
+                                            new GroupNodeViewModel(
+                                                    newDatabase.get(),
+                                                    stateManager,
+                                                    taskExecutor,
+                                                    selectedGroup,
+                                                    localDragboard,
+                                                    preferences))
+                            .collect(Collectors.toList()));
         } else {
             rootGroup.setValue(null);
         }
@@ -174,31 +218,47 @@ private void onActiveDatabaseChanged(Optional<BibDatabaseContext> newDatabase) {
      * Opens "New Group Dialog" and adds the resulting group as subgroup to the specified group
      */
     public void addNewSubgroup(GroupNodeViewModel parent, GroupDialogHeader groupDialogHeader) {
-        currentDatabase.ifPresent(database -> {
-            Optional<AbstractGroup> newGroup = dialogService.showCustomDialogAndWait(new GroupDialogView(
-                    database,
-                    parent.getGroupNode(),
-                    null,
-                    groupDialogHeader));
-
-            newGroup.ifPresent(group -> {
-                GroupTreeNode newSubgroup = parent.addSubgroup(group);
-                selectedGroups.setAll(new GroupNodeViewModel(database, stateManager, taskExecutor, newSubgroup, localDragboard, preferences));
-
-                // TODO: Add undo
-                // UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(parent, new GroupTreeNodeViewModel(newGroupNode), UndoableAddOrRemoveGroup.ADD_NODE);
-                // panel.getUndoManager().addEdit(undo);
-
-                // TODO: Expand parent to make new group visible
-                // parent.expand();
-                dialogService.notify(Localization.lang("Added group \"%0\".", group.getName()));
-                writeGroupChangesToMetaData();
-            });
-        });
+        currentDatabase.ifPresent(
+                database -> {
+                    Optional<AbstractGroup> newGroup =
+                            dialogService.showCustomDialogAndWait(
+                                    new GroupDialogView(
+                                            database,
+                                            parent.getGroupNode(),
+                                            null,
+                                            groupDialogHeader));
+
+                    newGroup.ifPresent(
+                            group -> {
+                                GroupTreeNode newSubgroup = parent.addSubgroup(group);
+                                selectedGroups.setAll(
+                                        new GroupNodeViewModel(
+                                                database,
+                                                stateManager,
+                                                taskExecutor,
+                                                newSubgroup,
+                                                localDragboard,
+                                                preferences));
+
+                                // TODO: Add undo
+                                // UndoableAddOrRemoveGroup undo = new
+                                // UndoableAddOrRemoveGroup(parent, new
+                                // GroupTreeNodeViewModel(newGroupNode),
+                                // UndoableAddOrRemoveGroup.ADD_NODE);
+                                // panel.getUndoManager().addEdit(undo);
+
+                                // TODO: Expand parent to make new group visible
+                                // parent.expand();
+                                dialogService.notify(
+                                        Localization.lang("Added group \"%0\".", group.getName()));
+                                writeGroupChangesToMetaData();
+                            });
+                });
     }
 
     public void writeGroupChangesToMetaData() {
-        currentDatabase.ifPresent(database -> database.getMetaData().setGroups(rootGroup.get().getGroupNode()));
+        currentDatabase.ifPresent(
+                database -> database.getMetaData().setGroups(rootGroup.get().getGroupNode()));
     }
 
     private boolean isGroupTypeEqual(AbstractGroup oldGroup, AbstractGroup newGroup) {
@@ -214,43 +274,68 @@ private boolean isGroupTypeEqual(AbstractGroup oldGroup, AbstractGroup newGroup)
      * @return true if just trivial modifications (e.g. color or description) or the relevant group properties are equal, false otherwise
      */
     boolean onlyMinorChanges(AbstractGroup oldGroup, AbstractGroup newGroup) {
-        // we need to use getclass here because we have different subclass inheritance e.g. ExplicitGroup is a subclass of WordKeyWordGroup
+        // we need to use getclass here because we have different subclass inheritance e.g.
+        // ExplicitGroup is a subclass of WordKeyWordGroup
         if (oldGroup.getClass() == WordKeywordGroup.class) {
             WordKeywordGroup oldWordKeywordGroup = (WordKeywordGroup) oldGroup;
             WordKeywordGroup newWordKeywordGroup = (WordKeywordGroup) newGroup;
 
-            return Objects.equals(oldWordKeywordGroup.getSearchField().getName(), newWordKeywordGroup.getSearchField().getName())
-                    && Objects.equals(oldWordKeywordGroup.getSearchExpression(), newWordKeywordGroup.getSearchExpression())
-                    && Objects.equals(oldWordKeywordGroup.isCaseSensitive(), newWordKeywordGroup.isCaseSensitive());
+            return Objects.equals(
+                            oldWordKeywordGroup.getSearchField().getName(),
+                            newWordKeywordGroup.getSearchField().getName())
+                    && Objects.equals(
+                            oldWordKeywordGroup.getSearchExpression(),
+                            newWordKeywordGroup.getSearchExpression())
+                    && Objects.equals(
+                            oldWordKeywordGroup.isCaseSensitive(),
+                            newWordKeywordGroup.isCaseSensitive());
         } else if (oldGroup.getClass() == RegexKeywordGroup.class) {
             RegexKeywordGroup oldRegexKeywordGroup = (RegexKeywordGroup) oldGroup;
             RegexKeywordGroup newRegexKeywordGroup = (RegexKeywordGroup) newGroup;
 
-            return Objects.equals(oldRegexKeywordGroup.getSearchField().getName(), newRegexKeywordGroup.getSearchField().getName())
-                    && Objects.equals(oldRegexKeywordGroup.getSearchExpression(), newRegexKeywordGroup.getSearchExpression())
-                    && Objects.equals(oldRegexKeywordGroup.isCaseSensitive(), newRegexKeywordGroup.isCaseSensitive());
+            return Objects.equals(
+                            oldRegexKeywordGroup.getSearchField().getName(),
+                            newRegexKeywordGroup.getSearchField().getName())
+                    && Objects.equals(
+                            oldRegexKeywordGroup.getSearchExpression(),
+                            newRegexKeywordGroup.getSearchExpression())
+                    && Objects.equals(
+                            oldRegexKeywordGroup.isCaseSensitive(),
+                            newRegexKeywordGroup.isCaseSensitive());
         } else if (oldGroup.getClass() == SearchGroup.class) {
             SearchGroup oldSearchGroup = (SearchGroup) oldGroup;
             SearchGroup newSearchGroup = (SearchGroup) newGroup;
 
-            return Objects.equals(oldSearchGroup.getSearchExpression(), newSearchGroup.getSearchExpression())
-                    && Objects.equals(oldSearchGroup.getSearchFlags(), newSearchGroup.getSearchFlags());
+            return Objects.equals(
+                            oldSearchGroup.getSearchExpression(),
+                            newSearchGroup.getSearchExpression())
+                    && Objects.equals(
+                            oldSearchGroup.getSearchFlags(), newSearchGroup.getSearchFlags());
         } else if (oldGroup.getClass() == AutomaticKeywordGroup.class) {
             AutomaticKeywordGroup oldAutomaticKeywordGroup = (AutomaticKeywordGroup) oldGroup;
             AutomaticKeywordGroup newAutomaticKeywordGroup = (AutomaticKeywordGroup) oldGroup;
 
-            return Objects.equals(oldAutomaticKeywordGroup.getKeywordDelimiter(), newAutomaticKeywordGroup.getKeywordDelimiter())
-                    && Objects.equals(oldAutomaticKeywordGroup.getKeywordHierarchicalDelimiter(), newAutomaticKeywordGroup.getKeywordHierarchicalDelimiter())
-                    && Objects.equals(oldAutomaticKeywordGroup.getField().getName(), newAutomaticKeywordGroup.getField().getName());
+            return Objects.equals(
+                            oldAutomaticKeywordGroup.getKeywordDelimiter(),
+                            newAutomaticKeywordGroup.getKeywordDelimiter())
+                    && Objects.equals(
+                            oldAutomaticKeywordGroup.getKeywordHierarchicalDelimiter(),
+                            newAutomaticKeywordGroup.getKeywordHierarchicalDelimiter())
+                    && Objects.equals(
+                            oldAutomaticKeywordGroup.getField().getName(),
+                            newAutomaticKeywordGroup.getField().getName());
         } else if (oldGroup.getClass() == AutomaticPersonsGroup.class) {
             AutomaticPersonsGroup oldAutomaticPersonsGroup = (AutomaticPersonsGroup) oldGroup;
             AutomaticPersonsGroup newAutomaticPersonsGroup = (AutomaticPersonsGroup) newGroup;
 
-            return Objects.equals(oldAutomaticPersonsGroup.getField().getName(), newAutomaticPersonsGroup.getField().getName());
+            return Objects.equals(
+                    oldAutomaticPersonsGroup.getField().getName(),
+                    newAutomaticPersonsGroup.getField().getName());
         } else if (oldGroup.getClass() == TexGroup.class) {
             TexGroup oldTexGroup = (TexGroup) oldGroup;
             TexGroup newTexGroup = (TexGroup) newGroup;
-            return Objects.equals(oldTexGroup.getFilePath().toString(), newTexGroup.getFilePath().toString());
+            return Objects.equals(
+                    oldTexGroup.getFilePath().toString(), newTexGroup.getFilePath().toString());
         }
         return true;
     }
@@ -259,136 +344,200 @@ boolean onlyMinorChanges(AbstractGroup oldGroup, AbstractGroup newGroup) {
      * Opens "Edit Group Dialog" and changes the given group to the edited one.
      */
     public void editGroup(GroupNodeViewModel oldGroup) {
-        currentDatabase.ifPresent(database -> {
-            Optional<AbstractGroup> newGroup = dialogService.showCustomDialogAndWait(new GroupDialogView(
-                    database,
-                    oldGroup.getGroupNode().getParent().orElse(null),
-                    oldGroup.getGroupNode().getGroup(),
-                    GroupDialogHeader.SUBGROUP));
-
-            newGroup.ifPresent(group -> {
-                AbstractGroup oldGroupDef = oldGroup.getGroupNode().getGroup();
-                String oldGroupName = oldGroupDef.getName();
-
-                boolean groupTypeEqual = isGroupTypeEqual(oldGroupDef, group);
-                boolean onlyMinorModifications = groupTypeEqual && onlyMinorChanges(oldGroupDef, group);
-
-                // dialog already warns us about this if the new group is named like another existing group
-                // We need to check if only the name changed as this is relevant for the entry's group field
-                if (groupTypeEqual && !group.getName().equals(oldGroupName) && onlyMinorModifications) {
-                    int groupsWithSameName = 0;
-                    Optional<GroupTreeNode> databaseRootGroup = currentDatabase.get().getMetaData().getGroups();
-                    if (databaseRootGroup.isPresent()) {
-                        // we need to check the old name for duplicates. If the new group name occurs more than once, it won't matter
-                        groupsWithSameName = databaseRootGroup.get().findChildrenSatisfying(g -> g.getName().equals(oldGroupName)).size();
-                    }
-                    // We found more than 2 groups, so we cannot simply remove old assignment
-                    boolean removePreviousAssignments = groupsWithSameName < 2;
-
-                    oldGroup.getGroupNode().setGroup(
-                            group,
-                            true,
-                            removePreviousAssignments,
-                            database.getEntries());
-
-                    dialogService.notify(Localization.lang("Modified group \"%0\".", group.getName()));
-                    writeGroupChangesToMetaData();
-                    // This is ugly, but we have no proper update mechanism in place to propagate the changes, so redraw everything
-                    refresh();
-                    return;
-                }
-
-                if (groupTypeEqual && onlyMinorChanges(oldGroup.getGroupNode().getGroup(), group)) {
-                    oldGroup.getGroupNode().setGroup(
-                            group,
-                            true,
-                            true,
-                            database.getEntries());
-
-                    writeGroupChangesToMetaData();
-                    refresh();
-                    return;
-                }
-
-                // Major modifications
-
-                String content = Localization.lang("Assign the original group's entries to this group?");
-                ButtonType keepAssignments = new ButtonType(Localization.lang("Assign"), ButtonBar.ButtonData.YES);
-                ButtonType removeAssignments = new ButtonType(Localization.lang("Do not assign"), ButtonBar.ButtonData.NO);
-                ButtonType cancel = new ButtonType(Localization.lang("Cancel"), ButtonBar.ButtonData.CANCEL_CLOSE);
-
-                if (newGroup.get().getClass() == WordKeywordGroup.class) {
-                    content = content + "\n\n" +
-                            Localization.lang("(Note: If original entries lack keywords to qualify for the new group configuration, confirming here will add them)");
-                }
-                Optional<ButtonType> previousAssignments = dialogService.showCustomButtonDialogAndWait(Alert.AlertType.WARNING,
-                        Localization.lang("Change of Grouping Method"),
-                        content,
-                        keepAssignments,
-                        removeAssignments,
-                        cancel);
-                boolean removePreviousAssignments = (oldGroup.getGroupNode().getGroup() instanceof ExplicitGroup)
-                        && (group instanceof ExplicitGroup);
-
-                int groupsWithSameName = 0;
-                Optional<GroupTreeNode> databaseRootGroup = currentDatabase.get().getMetaData().getGroups();
-                if (databaseRootGroup.isPresent()) {
-                    String name = oldGroup.getGroupNode().getGroup().getName();
-                    groupsWithSameName = databaseRootGroup.get().findChildrenSatisfying(g -> g.getName().equals(name)).size();
-                }
-                // okay we found more than 2 groups with the same name
-                // If we only found one we can still do it
-                if (groupsWithSameName >= 2) {
-                    removePreviousAssignments = false;
-                }
-
-                if (previousAssignments.isPresent() && (previousAssignments.get().getButtonData() == ButtonBar.ButtonData.YES)) {
-                    oldGroup.getGroupNode().setGroup(
-                            group,
-                            true,
-                            removePreviousAssignments,
-                            database.getEntries());
-                } else if (previousAssignments.isPresent() && (previousAssignments.get().getButtonData() == ButtonBar.ButtonData.NO)) {
-                    oldGroup.getGroupNode().setGroup(
-                            group,
-                            false,
-                            removePreviousAssignments,
-                            database.getEntries());
-                } else if (previousAssignments.isPresent() && (previousAssignments.get().getButtonData() == ButtonBar.ButtonData.CANCEL_CLOSE)) {
-                    return;
-                }
-
-                // stateManager.getEntriesInCurrentDatabase());
-
-                // TODO: Add undo
-                // Store undo information.
-                // AbstractUndoableEdit undoAddPreviousEntries = null;
-                // UndoableModifyGroup undo = new UndoableModifyGroup(GroupSelector.this, groupsRoot, node, newGroup);
-                // if (undoAddPreviousEntries == null) {
-                //    panel.getUndoManager().addEdit(undo);
-                // } else {
-                //    NamedCompound nc = new NamedCompound("Modify Group");
-                //    nc.addEdit(undo);
-                //    nc.addEdit(undoAddPreviousEntries);
-                //    nc.end();/
-                //      panel.getUndoManager().addEdit(nc);
-                // }
-                // if (!addChange.isEmpty()) {
-                //    undoAddPreviousEntries = UndoableChangeEntriesOfGroup.getUndoableEdit(null, addChange);
-                // }
-
-                dialogService.notify(Localization.lang("Modified group \"%0\".", group.getName()));
-                writeGroupChangesToMetaData();
-                // This is ugly, but we have no proper update mechanism in place to propagate the changes, so redraw everything
-                refresh();
-            });
-        });
+        currentDatabase.ifPresent(
+                database -> {
+                    Optional<AbstractGroup> newGroup =
+                            dialogService.showCustomDialogAndWait(
+                                    new GroupDialogView(
+                                            database,
+                                            oldGroup.getGroupNode().getParent().orElse(null),
+                                            oldGroup.getGroupNode().getGroup(),
+                                            GroupDialogHeader.SUBGROUP));
+
+                    newGroup.ifPresent(
+                            group -> {
+                                AbstractGroup oldGroupDef = oldGroup.getGroupNode().getGroup();
+                                String oldGroupName = oldGroupDef.getName();
+
+                                boolean groupTypeEqual = isGroupTypeEqual(oldGroupDef, group);
+                                boolean onlyMinorModifications =
+                                        groupTypeEqual && onlyMinorChanges(oldGroupDef, group);
+
+                                // dialog already warns us about this if the new group is named like
+                                // another existing group
+                                // We need to check if only the name changed as this is relevant for
+                                // the entry's group field
+                                if (groupTypeEqual
+                                        && !group.getName().equals(oldGroupName)
+                                        && onlyMinorModifications) {
+                                    int groupsWithSameName = 0;
+                                    Optional<GroupTreeNode> databaseRootGroup =
+                                            currentDatabase.get().getMetaData().getGroups();
+                                    if (databaseRootGroup.isPresent()) {
+                                        // we need to check the old name for duplicates. If the new
+                                        // group name occurs more than once, it won't matter
+                                        groupsWithSameName =
+                                                databaseRootGroup
+                                                        .get()
+                                                        .findChildrenSatisfying(
+                                                                g ->
+                                                                        g.getName()
+                                                                                .equals(
+                                                                                        oldGroupName))
+                                                        .size();
+                                    }
+                                    // We found more than 2 groups, so we cannot simply remove old
+                                    // assignment
+                                    boolean removePreviousAssignments = groupsWithSameName < 2;
+
+                                    oldGroup.getGroupNode()
+                                            .setGroup(
+                                                    group,
+                                                    true,
+                                                    removePreviousAssignments,
+                                                    database.getEntries());
+
+                                    dialogService.notify(
+                                            Localization.lang(
+                                                    "Modified group \"%0\".", group.getName()));
+                                    writeGroupChangesToMetaData();
+                                    // This is ugly, but we have no proper update mechanism in place
+                                    // to propagate the changes, so redraw everything
+                                    refresh();
+                                    return;
+                                }
+
+                                if (groupTypeEqual
+                                        && onlyMinorChanges(
+                                                oldGroup.getGroupNode().getGroup(), group)) {
+                                    oldGroup.getGroupNode()
+                                            .setGroup(group, true, true, database.getEntries());
+
+                                    writeGroupChangesToMetaData();
+                                    refresh();
+                                    return;
+                                }
+
+                                // Major modifications
+
+                                String content =
+                                        Localization.lang(
+                                                "Assign the original group's entries to this group?");
+                                ButtonType keepAssignments =
+                                        new ButtonType(
+                                                Localization.lang("Assign"),
+                                                ButtonBar.ButtonData.YES);
+                                ButtonType removeAssignments =
+                                        new ButtonType(
+                                                Localization.lang("Do not assign"),
+                                                ButtonBar.ButtonData.NO);
+                                ButtonType cancel =
+                                        new ButtonType(
+                                                Localization.lang("Cancel"),
+                                                ButtonBar.ButtonData.CANCEL_CLOSE);
+
+                                if (newGroup.get().getClass() == WordKeywordGroup.class) {
+                                    content =
+                                            content
+                                                    + "\n\n"
+                                                    + Localization.lang(
+                                                            "(Note: If original entries lack keywords to qualify for the new group configuration, confirming here will add them)");
+                                }
+                                Optional<ButtonType> previousAssignments =
+                                        dialogService.showCustomButtonDialogAndWait(
+                                                Alert.AlertType.WARNING,
+                                                Localization.lang("Change of Grouping Method"),
+                                                content,
+                                                keepAssignments,
+                                                removeAssignments,
+                                                cancel);
+                                boolean removePreviousAssignments =
+                                        (oldGroup.getGroupNode().getGroup()
+                                                        instanceof ExplicitGroup)
+                                                && (group instanceof ExplicitGroup);
+
+                                int groupsWithSameName = 0;
+                                Optional<GroupTreeNode> databaseRootGroup =
+                                        currentDatabase.get().getMetaData().getGroups();
+                                if (databaseRootGroup.isPresent()) {
+                                    String name = oldGroup.getGroupNode().getGroup().getName();
+                                    groupsWithSameName =
+                                            databaseRootGroup
+                                                    .get()
+                                                    .findChildrenSatisfying(
+                                                            g -> g.getName().equals(name))
+                                                    .size();
+                                }
+                                // okay we found more than 2 groups with the same name
+                                // If we only found one we can still do it
+                                if (groupsWithSameName >= 2) {
+                                    removePreviousAssignments = false;
+                                }
+
+                                if (previousAssignments.isPresent()
+                                        && (previousAssignments.get().getButtonData()
+                                                == ButtonBar.ButtonData.YES)) {
+                                    oldGroup.getGroupNode()
+                                            .setGroup(
+                                                    group,
+                                                    true,
+                                                    removePreviousAssignments,
+                                                    database.getEntries());
+                                } else if (previousAssignments.isPresent()
+                                        && (previousAssignments.get().getButtonData()
+                                                == ButtonBar.ButtonData.NO)) {
+                                    oldGroup.getGroupNode()
+                                            .setGroup(
+                                                    group,
+                                                    false,
+                                                    removePreviousAssignments,
+                                                    database.getEntries());
+                                } else if (previousAssignments.isPresent()
+                                        && (previousAssignments.get().getButtonData()
+                                                == ButtonBar.ButtonData.CANCEL_CLOSE)) {
+                                    return;
+                                }
+
+                                // stateManager.getEntriesInCurrentDatabase());
+
+                                // TODO: Add undo
+                                // Store undo information.
+                                // AbstractUndoableEdit undoAddPreviousEntries = null;
+                                // UndoableModifyGroup undo = new
+                                // UndoableModifyGroup(GroupSelector.this, groupsRoot, node,
+                                // newGroup);
+                                // if (undoAddPreviousEntries == null) {
+                                //    panel.getUndoManager().addEdit(undo);
+                                // } else {
+                                //    NamedCompound nc = new NamedCompound("Modify Group");
+                                //    nc.addEdit(undo);
+                                //    nc.addEdit(undoAddPreviousEntries);
+                                //    nc.end();/
+                                //      panel.getUndoManager().addEdit(nc);
+                                // }
+                                // if (!addChange.isEmpty()) {
+                                //    undoAddPreviousEntries =
+                                // UndoableChangeEntriesOfGroup.getUndoableEdit(null, addChange);
+                                // }
+
+                                dialogService.notify(
+                                        Localization.lang(
+                                                "Modified group \"%0\".", group.getName()));
+                                writeGroupChangesToMetaData();
+                                // This is ugly, but we have no proper update mechanism in place to
+                                // propagate the changes, so redraw everything
+                                refresh();
+                            });
+                });
     }
 
     public void chatWithGroup(GroupNodeViewModel group) {
-        // This should probably be done some other way. Please don't blame, it's just a thing to make it quick and fast.
+        // This should probably be done some other way. Please don't blame, it's just a thing to
+        // make it quick and fast.
         if (currentDatabase.isEmpty()) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Unable to chat with group"), Localization.lang("No library is selected."));
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Unable to chat with group"),
+                    Localization.lang("No library is selected."));
             return;
         }
 
@@ -396,32 +545,45 @@ public void chatWithGroup(GroupNodeViewModel group) {
 
         // We localize the name here, because it is used as the title of the window.
         // See documentation for {@link AiChatGuardedComponent#name}.
-        StringProperty nameProperty = new SimpleStringProperty(Localization.lang("Group %0", groupNameProperty.get()));
-        groupNameProperty.addListener((obs, oldValue, newValue) -> nameProperty.setValue(Localization.lang("Group %0", groupNameProperty.get())));
-
-        ObservableList<ChatMessage> chatHistory = chatHistoryService.getChatHistoryForGroup(group.getGroupNode());
-        ObservableList<BibEntry> bibEntries = FXCollections.observableArrayList(group.getGroupNode().findMatches(currentDatabase.get().getDatabase()));
+        StringProperty nameProperty =
+                new SimpleStringProperty(Localization.lang("Group %0", groupNameProperty.get()));
+        groupNameProperty.addListener(
+                (obs, oldValue, newValue) ->
+                        nameProperty.setValue(
+                                Localization.lang("Group %0", groupNameProperty.get())));
+
+        ObservableList<ChatMessage> chatHistory =
+                chatHistoryService.getChatHistoryForGroup(group.getGroupNode());
+        ObservableList<BibEntry> bibEntries =
+                FXCollections.observableArrayList(
+                        group.getGroupNode().findMatches(currentDatabase.get().getDatabase()));
 
         openAiChat(nameProperty, chatHistory, currentDatabase.get(), bibEntries);
     }
 
-    private void openAiChat(StringProperty name, ObservableList<ChatMessage> chatHistory, BibDatabaseContext bibDatabaseContext, ObservableList<BibEntry> entries) {
-        Optional<AiChatWindow> existingWindow = stateManager.getAiChatWindows().stream().filter(window -> window.getChatName().equals(name.get())).findFirst();
+    private void openAiChat(
+            StringProperty name,
+            ObservableList<ChatMessage> chatHistory,
+            BibDatabaseContext bibDatabaseContext,
+            ObservableList<BibEntry> entries) {
+        Optional<AiChatWindow> existingWindow =
+                stateManager.getAiChatWindows().stream()
+                        .filter(window -> window.getChatName().equals(name.get()))
+                        .findFirst();
 
         if (existingWindow.isPresent()) {
             existingWindow.get().requestFocus();
         } else {
-            AiChatWindow aiChatWindow = new AiChatWindow(
-                    Injector.instantiateModelOrService(AiService.class),
-                    dialogService,
-                    preferences.getAiPreferences(),
-                    preferences.getExternalApplicationsPreferences(),
-                    taskExecutor
-            );
-
-            aiChatWindow.setOnCloseRequest(event ->
-                    stateManager.getAiChatWindows().remove(aiChatWindow)
-            );
+            AiChatWindow aiChatWindow =
+                    new AiChatWindow(
+                            Injector.instantiateModelOrService(AiService.class),
+                            dialogService,
+                            preferences.getAiPreferences(),
+                            preferences.getExternalApplicationsPreferences(),
+                            taskExecutor);
+
+            aiChatWindow.setOnCloseRequest(
+                    event -> stateManager.getAiChatWindows().remove(aiChatWindow));
 
             stateManager.getAiChatWindows().add(aiChatWindow);
             dialogService.showCustomWindow(aiChatWindow);
@@ -431,18 +593,23 @@ private void openAiChat(StringProperty name, ObservableList<ChatMessage> chatHis
     }
 
     public void removeSubgroups(GroupNodeViewModel group) {
-        boolean confirmation = dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Remove subgroups"),
-                Localization.lang("Remove all subgroups of \"%0\"?", group.getDisplayName()));
+        boolean confirmation =
+                dialogService.showConfirmationDialogAndWait(
+                        Localization.lang("Remove subgroups"),
+                        Localization.lang(
+                                "Remove all subgroups of \"%0\"?", group.getDisplayName()));
         if (confirmation) {
             /// TODO: Add undo
-            // final UndoableModifySubtree undo = new UndoableModifySubtree(getGroupTreeRoot(), node, "Remove subgroups");
+            // final UndoableModifySubtree undo = new UndoableModifySubtree(getGroupTreeRoot(),
+            // node, "Remove subgroups");
             // panel.getUndoManager().addEdit(undo);
             for (GroupNodeViewModel child : group.getChildren()) {
                 removeGroupsAndSubGroupsFromEntries(child);
             }
             group.getGroupNode().removeAllChildren();
-            dialogService.notify(Localization.lang("Removed all subgroups of group \"%0\".", group.getDisplayName()));
+            dialogService.notify(
+                    Localization.lang(
+                            "Removed all subgroups of group \"%0\".", group.getDisplayName()));
             writeGroupChangesToMetaData();
         }
     }
@@ -450,35 +617,48 @@ public void removeSubgroups(GroupNodeViewModel group) {
     public void removeGroupKeepSubgroups(GroupNodeViewModel group) {
         boolean confirmed;
         if (selectedGroups.size() <= 1) {
-            confirmed = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("Remove group"),
-                    Localization.lang("Remove group \"%0\" and keep its subgroups?", group.getDisplayName()),
-                    Localization.lang("Remove"));
+            confirmed =
+                    dialogService.showConfirmationDialogAndWait(
+                            Localization.lang("Remove group"),
+                            Localization.lang(
+                                    "Remove group \"%0\" and keep its subgroups?",
+                                    group.getDisplayName()),
+                            Localization.lang("Remove"));
         } else {
-            confirmed = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("Remove groups"),
-                    Localization.lang("Remove all selected groups and keep their subgroups?"),
-                    Localization.lang("Remove all"));
+            confirmed =
+                    dialogService.showConfirmationDialogAndWait(
+                            Localization.lang("Remove groups"),
+                            Localization.lang(
+                                    "Remove all selected groups and keep their subgroups?"),
+                            Localization.lang("Remove all"));
         }
 
         if (confirmed) {
             // TODO: Add undo
-            // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node, UndoableAddOrRemoveGroup.REMOVE_NODE_KEEP_CHILDREN);
+            // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node,
+            // UndoableAddOrRemoveGroup.REMOVE_NODE_KEEP_CHILDREN);
             // panel.getUndoManager().addEdit(undo);
 
             List<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(selectedGroups);
-            selectedGroupNodes.forEach(eachNode -> {
-                GroupTreeNode groupNode = eachNode.getGroupNode();
-
-                groupNode.getParent()
-                         .ifPresent(parent -> groupNode.moveAllChildrenTo(parent, parent.getIndexOfChild(groupNode).get()));
-                groupNode.removeFromParent();
-            });
+            selectedGroupNodes.forEach(
+                    eachNode -> {
+                        GroupTreeNode groupNode = eachNode.getGroupNode();
+
+                        groupNode
+                                .getParent()
+                                .ifPresent(
+                                        parent ->
+                                                groupNode.moveAllChildrenTo(
+                                                        parent,
+                                                        parent.getIndexOfChild(groupNode).get()));
+                        groupNode.removeFromParent();
+                    });
 
             if (selectedGroupNodes.size() > 1) {
                 dialogService.notify(Localization.lang("Removed all selected groups."));
             } else {
-                dialogService.notify(Localization.lang("Removed group \"%0\".", group.getDisplayName()));
+                dialogService.notify(
+                        Localization.lang("Removed group \"%0\".", group.getDisplayName()));
             }
             writeGroupChangesToMetaData();
         }
@@ -490,32 +670,41 @@ public void removeGroupKeepSubgroups(GroupNodeViewModel group) {
     public void removeGroupAndSubgroups(GroupNodeViewModel group) {
         boolean confirmed;
         if (selectedGroups.size() <= 1) {
-            confirmed = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("Remove group and subgroups"),
-                    Localization.lang("Remove group \"%0\" and its subgroups?", group.getDisplayName()),
-                    Localization.lang("Remove"));
+            confirmed =
+                    dialogService.showConfirmationDialogAndWait(
+                            Localization.lang("Remove group and subgroups"),
+                            Localization.lang(
+                                    "Remove group \"%0\" and its subgroups?",
+                                    group.getDisplayName()),
+                            Localization.lang("Remove"));
         } else {
-            confirmed = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("Remove groups and subgroups"),
-                    Localization.lang("Remove all selected groups and their subgroups?"),
-                    Localization.lang("Remove all"));
+            confirmed =
+                    dialogService.showConfirmationDialogAndWait(
+                            Localization.lang("Remove groups and subgroups"),
+                            Localization.lang("Remove all selected groups and their subgroups?"),
+                            Localization.lang("Remove all"));
         }
 
         if (confirmed) {
             // TODO: Add undo
-            // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node, UndoableAddOrRemoveGroup.REMOVE_NODE_AND_CHILDREN);
+            // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node,
+            // UndoableAddOrRemoveGroup.REMOVE_NODE_AND_CHILDREN);
             // panel.getUndoManager().addEdit(undo);
 
             ArrayList<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(selectedGroups);
-            selectedGroupNodes.forEach(eachNode -> {
-                removeGroupsAndSubGroupsFromEntries(eachNode);
-                eachNode.getGroupNode().removeFromParent();
-            });
+            selectedGroupNodes.forEach(
+                    eachNode -> {
+                        removeGroupsAndSubGroupsFromEntries(eachNode);
+                        eachNode.getGroupNode().removeFromParent();
+                    });
 
             if (selectedGroupNodes.size() > 1) {
-                dialogService.notify(Localization.lang("Removed all selected groups and their subgroups."));
+                dialogService.notify(
+                        Localization.lang("Removed all selected groups and their subgroups."));
             } else {
-                dialogService.notify(Localization.lang("Removed group \"%0\" and its subgroups.", group.getDisplayName()));
+                dialogService.notify(
+                        Localization.lang(
+                                "Removed group \"%0\" and its subgroups.", group.getDisplayName()));
             }
             writeGroupChangesToMetaData();
         }
@@ -527,32 +716,37 @@ public void removeGroupAndSubgroups(GroupNodeViewModel group) {
     public void removeGroupNoSubgroups(GroupNodeViewModel group) {
         boolean confirmed;
         if (selectedGroups.size() <= 1) {
-            confirmed = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("Remove group"),
-                    Localization.lang("Remove group \"%0\"?", group.getDisplayName()),
-                    Localization.lang("Remove"));
+            confirmed =
+                    dialogService.showConfirmationDialogAndWait(
+                            Localization.lang("Remove group"),
+                            Localization.lang("Remove group \"%0\"?", group.getDisplayName()),
+                            Localization.lang("Remove"));
         } else {
-            confirmed = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("Remove groups and subgroups"),
-                    Localization.lang("Remove all selected groups and their subgroups?"),
-                    Localization.lang("Remove all"));
+            confirmed =
+                    dialogService.showConfirmationDialogAndWait(
+                            Localization.lang("Remove groups and subgroups"),
+                            Localization.lang("Remove all selected groups and their subgroups?"),
+                            Localization.lang("Remove all"));
         }
 
         if (confirmed) {
             // TODO: Add undo
-            // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node, UndoableAddOrRemoveGroup.REMOVE_NODE_WITHOUT_CHILDREN);
+            // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node,
+            // UndoableAddOrRemoveGroup.REMOVE_NODE_WITHOUT_CHILDREN);
             // panel.getUndoManager().addEdit(undo);
 
             ArrayList<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(selectedGroups);
-            selectedGroupNodes.forEach(eachNode -> {
-                removeGroupsAndSubGroupsFromEntries(eachNode);
-                eachNode.getGroupNode().removeFromParent();
-            });
+            selectedGroupNodes.forEach(
+                    eachNode -> {
+                        removeGroupsAndSubGroupsFromEntries(eachNode);
+                        eachNode.getGroupNode().removeFromParent();
+                    });
 
             if (selectedGroupNodes.size() > 1) {
                 dialogService.notify(Localization.lang("Removed all selected groups."));
             } else {
-                dialogService.notify(Localization.lang("Removed group \"%0\".", group.getDisplayName()));
+                dialogService.notify(
+                        Localization.lang("Removed group \"%0\".", group.getDisplayName()));
             }
             writeGroupChangesToMetaData();
         }
@@ -569,10 +763,16 @@ void removeGroupsAndSubGroupsFromEntries(GroupNodeViewModel group) {
             String name = group.getGroupNode().getGroup().getName();
             Optional<GroupTreeNode> rootGroup = currentDatabase.get().getMetaData().getGroups();
             if (rootGroup.isPresent()) {
-                groupsWithSameName = rootGroup.get().findChildrenSatisfying(g -> g.getName().equals(name)).size();
+                groupsWithSameName =
+                        rootGroup
+                                .get()
+                                .findChildrenSatisfying(g -> g.getName().equals(name))
+                                .size();
             }
             if (groupsWithSameName < 2) {
-                List<BibEntry> entriesInGroup = group.getGroupNode().getEntriesInGroup(this.currentDatabase.get().getEntries());
+                List<BibEntry> entriesInGroup =
+                        group.getGroupNode()
+                                .getEntriesInGroup(this.currentDatabase.get().getEntries());
                 group.getGroupNode().removeEntriesFromGroup(entriesInGroup);
             }
         }
@@ -580,14 +780,17 @@ void removeGroupsAndSubGroupsFromEntries(GroupNodeViewModel group) {
 
     public void addSelectedEntries(GroupNodeViewModel group) {
         // TODO: Warn
-        // if (!WarnAssignmentSideEffects.warnAssignmentSideEffects(node.getNode().getGroup(), panel.frame())) {
+        // if (!WarnAssignmentSideEffects.warnAssignmentSideEffects(node.getNode().getGroup(),
+        // panel.frame())) {
         //    return; // user aborted operation
 
         group.getGroupNode().addEntriesToGroup(stateManager.getSelectedEntries());
 
         // TODO: Add undo
-        // NamedCompound undoAll = new NamedCompound(Localization.lang("change assignment of entries"));
-        // if (!undoAdd.isEmpty()) { undo.addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(node, undoAdd)); }
+        // NamedCompound undoAll = new NamedCompound(Localization.lang("change assignment of
+        // entries"));
+        // if (!undoAdd.isEmpty()) { undo.addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(node,
+        // undoAdd)); }
         // panel.getUndoManager().addEdit(undoAll);
 
         // TODO Display massages
@@ -601,21 +804,24 @@ public void addSelectedEntries(GroupNodeViewModel group) {
         // if (assignedEntries == 1) {
         //    frame.output(Localization.lang("Assigned 1 entry to group \"%0\".", groupName));
         // } else {
-        //    frame.output(Localization.lang("Assigned %0 entries to group \"%1\".", String.valueOf(assignedEntries),
+        //    frame.output(Localization.lang("Assigned %0 entries to group \"%1\".",
+        // String.valueOf(assignedEntries),
         //            groupName));
         // }
     }
 
     public void removeSelectedEntries(GroupNodeViewModel group) {
         // TODO: warn if assignment has undesired side effects (modifies a field != keywords)
-        // if (!WarnAssignmentSideEffects.warnAssignmentSideEffects(mNode.getNode().getGroup(), mPanel.frame())) {
+        // if (!WarnAssignmentSideEffects.warnAssignmentSideEffects(mNode.getNode().getGroup(),
+        // mPanel.frame())) {
         //    return; // user aborted operation
 
         group.getGroupNode().removeEntriesFromGroup(stateManager.getSelectedEntries());
 
         // TODO: Add undo
         // if (!undo.isEmpty()) {
-        //    mPanel.getUndoManager().addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(mNode, undo));
+        //    mPanel.getUndoManager().addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(mNode,
+        // undo));
     }
 
     public void sortAlphabeticallyRecursive(GroupTreeNode group) {
diff --git a/src/main/java/org/jabref/gui/groups/GroupViewMode.java b/src/main/java/org/jabref/gui/groups/GroupViewMode.java
index 23784615fa33..783542c3a196 100644
--- a/src/main/java/org/jabref/gui/groups/GroupViewMode.java
+++ b/src/main/java/org/jabref/gui/groups/GroupViewMode.java
@@ -1,3 +1,7 @@
 package org.jabref.gui.groups;
 
-public enum GroupViewMode { INTERSECTION, FILTER, INVERT }
+public enum GroupViewMode {
+    INTERSECTION,
+    FILTER,
+    INVERT
+}
diff --git a/src/main/java/org/jabref/gui/groups/GroupsPreferences.java b/src/main/java/org/jabref/gui/groups/GroupsPreferences.java
index 9c71262b4de8..9d4c10f235d8 100644
--- a/src/main/java/org/jabref/gui/groups/GroupsPreferences.java
+++ b/src/main/java/org/jabref/gui/groups/GroupsPreferences.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.groups;
 
-import java.util.EnumSet;
+import com.google.common.annotations.VisibleForTesting;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -12,7 +12,7 @@
 
 import org.jabref.model.groups.GroupHierarchyType;
 
-import com.google.common.annotations.VisibleForTesting;
+import java.util.EnumSet;
 
 public class GroupsPreferences {
 
@@ -21,12 +21,13 @@ public class GroupsPreferences {
     private final BooleanProperty shouldDisplayGroupCount;
     private final ObjectProperty<GroupHierarchyType> defaultHierarchicalContext;
 
-    public GroupsPreferences(boolean viewModeIntersection,
-                             boolean viewModeFilter,
-                             boolean viewModeInvert,
-                             boolean shouldAutoAssignGroup,
-                             boolean shouldDisplayGroupCount,
-                             GroupHierarchyType defaultHierarchicalContext) {
+    public GroupsPreferences(
+            boolean viewModeIntersection,
+            boolean viewModeFilter,
+            boolean viewModeInvert,
+            boolean shouldAutoAssignGroup,
+            boolean shouldDisplayGroupCount,
+            GroupHierarchyType defaultHierarchicalContext) {
 
         this.groupViewMode = new SimpleSetProperty<>(FXCollections.observableSet());
         this.shouldAutoAssignGroup = new SimpleBooleanProperty(shouldAutoAssignGroup);
@@ -45,10 +46,11 @@ public GroupsPreferences(boolean viewModeIntersection,
     }
 
     @VisibleForTesting
-    public GroupsPreferences(EnumSet<GroupViewMode> groupViewMode,
-                             boolean shouldAutoAssignGroup,
-                             boolean shouldDisplayGroupCount,
-                             GroupHierarchyType defaultHierarchicalContext) {
+    public GroupsPreferences(
+            EnumSet<GroupViewMode> groupViewMode,
+            boolean shouldAutoAssignGroup,
+            boolean shouldDisplayGroupCount,
+            GroupHierarchyType defaultHierarchicalContext) {
         this.groupViewMode = new SimpleSetProperty<>(FXCollections.observableSet(groupViewMode));
         this.shouldAutoAssignGroup = new SimpleBooleanProperty(shouldAutoAssignGroup);
         this.shouldDisplayGroupCount = new SimpleBooleanProperty(shouldDisplayGroupCount);
diff --git a/src/main/java/org/jabref/gui/groups/MoveGroupChange.java b/src/main/java/org/jabref/gui/groups/MoveGroupChange.java
index e52f9cbef8d7..5c11490630dd 100644
--- a/src/main/java/org/jabref/gui/groups/MoveGroupChange.java
+++ b/src/main/java/org/jabref/gui/groups/MoveGroupChange.java
@@ -13,7 +13,11 @@ public class MoveGroupChange {
      * @param newParent     The new parent node to which the node will be moved.
      * @param newChildIndex The child index at newParent to which the node will be moved.
      */
-    public MoveGroupChange(GroupTreeNode oldParent, int oldChildIndex, GroupTreeNode newParent, int newChildIndex) {
+    public MoveGroupChange(
+            GroupTreeNode oldParent,
+            int oldChildIndex,
+            GroupTreeNode newParent,
+            int newChildIndex) {
         this.oldParent = oldParent;
         this.oldChildIndex = oldChildIndex;
         this.newParent = newParent;
diff --git a/src/main/java/org/jabref/gui/groups/UndoableAddOrRemoveGroup.java b/src/main/java/org/jabref/gui/groups/UndoableAddOrRemoveGroup.java
index 08ff81550f40..7ccbb9572f4a 100644
--- a/src/main/java/org/jabref/gui/groups/UndoableAddOrRemoveGroup.java
+++ b/src/main/java/org/jabref/gui/groups/UndoableAddOrRemoveGroup.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.groups;
 
-import java.util.List;
-
 import org.jabref.gui.undo.AbstractUndoableJabRefEdit;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.groups.GroupTreeNode;
 
+import java.util.List;
+
 public class UndoableAddOrRemoveGroup extends AbstractUndoableJabRefEdit {
 
     /**
@@ -63,17 +63,17 @@ public class UndoableAddOrRemoveGroup extends AbstractUndoableJabRefEdit {
      *            then call this constructor. When removing, you first have to
      *            call this constructor, then remove the node.
      */
-    public UndoableAddOrRemoveGroup(GroupTreeNodeViewModel groupsRoot,
-                                    GroupTreeNodeViewModel editedNode, int editType) {
+    public UndoableAddOrRemoveGroup(
+            GroupTreeNodeViewModel groupsRoot, GroupTreeNodeViewModel editedNode, int editType) {
         m_groupsRootHandle = groupsRoot;
         m_editType = editType;
         m_subtreeRootChildCount = editedNode.getChildren().size();
         // storing a backup of the whole subtree is not required when children
         // are kept
-        m_subtreeBackup = editType != UndoableAddOrRemoveGroup.REMOVE_NODE_KEEP_CHILDREN ?
-                editedNode.getNode()
-                          .copySubtree()
-                : GroupTreeNode.fromGroup(editedNode.getNode().getGroup().deepCopy());
+        m_subtreeBackup =
+                editType != UndoableAddOrRemoveGroup.REMOVE_NODE_KEEP_CHILDREN
+                        ? editedNode.getNode().copySubtree()
+                        : GroupTreeNode.fromGroup(editedNode.getNode().getGroup().deepCopy());
         // remember path to edited node. this cannot be stored as a reference,
         // because the reference itself might change. the method below is more
         // robust.
@@ -122,8 +122,7 @@ private void doOperation(boolean undo) {
                 case REMOVE_NODE_KEEP_CHILDREN:
                     // move all children to newNode, then add newNode
                     GroupTreeNode newNode = m_subtreeBackup.copySubtree();
-                    for (int i = childIndex; i < (childIndex
-                            + m_subtreeRootChildCount); ++i) {
+                    for (int i = childIndex; i < (childIndex + m_subtreeRootChildCount); ++i) {
                         cursor.getChildAt(childIndex).get().moveTo(newNode);
                     }
                     newNode.moveTo(cursor, childIndex);
@@ -141,8 +140,7 @@ private void doOperation(boolean undo) {
                     break;
                 case REMOVE_NODE_KEEP_CHILDREN:
                     // remove node, then insert all children
-                    GroupTreeNode removedNode = cursor
-                            .getChildAt(childIndex).get();
+                    GroupTreeNode removedNode = cursor.getChildAt(childIndex).get();
                     cursor.removeChild(childIndex);
                     while (removedNode.getNumberOfChildren() > 0) {
                         removedNode.getFirstChild().get().moveTo(cursor, childIndex);
diff --git a/src/main/java/org/jabref/gui/groups/UndoableChangeEntriesOfGroup.java b/src/main/java/org/jabref/gui/groups/UndoableChangeEntriesOfGroup.java
index 3f4b36b63516..e9015dcaee35 100644
--- a/src/main/java/org/jabref/gui/groups/UndoableChangeEntriesOfGroup.java
+++ b/src/main/java/org/jabref/gui/groups/UndoableChangeEntriesOfGroup.java
@@ -1,22 +1,23 @@
 package org.jabref.gui.groups;
 
-import java.util.List;
-
-import javax.swing.undo.AbstractUndoableEdit;
-
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.FieldChange;
 
+import java.util.List;
+
+import javax.swing.undo.AbstractUndoableEdit;
+
 public class UndoableChangeEntriesOfGroup {
 
-    private UndoableChangeEntriesOfGroup() {
-    }
+    private UndoableChangeEntriesOfGroup() {}
 
-    public static AbstractUndoableEdit getUndoableEdit(GroupTreeNodeViewModel node, List<FieldChange> changes) {
+    public static AbstractUndoableEdit getUndoableEdit(
+            GroupTreeNodeViewModel node, List<FieldChange> changes) {
         boolean hasEntryChanges = false;
-        NamedCompound entryChangeCompound = new NamedCompound(Localization.lang("change entries of group"));
+        NamedCompound entryChangeCompound =
+                new NamedCompound(Localization.lang("change entries of group"));
         for (FieldChange fieldChange : changes) {
             hasEntryChanges = true;
             entryChangeCompound.addEdit(new UndoableFieldChange(fieldChange));
diff --git a/src/main/java/org/jabref/gui/groups/UndoableModifySubtree.java b/src/main/java/org/jabref/gui/groups/UndoableModifySubtree.java
index 8f92c7172598..00405f1be0c9 100644
--- a/src/main/java/org/jabref/gui/groups/UndoableModifySubtree.java
+++ b/src/main/java/org/jabref/gui/groups/UndoableModifySubtree.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.groups;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.jabref.gui.undo.AbstractUndoableJabRefEdit;
 import org.jabref.model.groups.GroupTreeNode;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class UndoableModifySubtree extends AbstractUndoableJabRefEdit {
 
     /**
@@ -30,8 +30,8 @@ public class UndoableModifySubtree extends AbstractUndoableJabRefEdit {
     /**
      * @param subtree The root node of the subtree that was modified (this node may not be modified, it is just used as a convenience handle).
      */
-    public UndoableModifySubtree(GroupTreeNodeViewModel groupRoot,
-                                 GroupTreeNodeViewModel subtree, String name) {
+    public UndoableModifySubtree(
+            GroupTreeNodeViewModel groupRoot, GroupTreeNodeViewModel subtree, String name) {
         m_subtreeBackup = subtree.getNode().copySubtree();
         m_groupRoot = groupRoot.getNode();
         m_subtreeRootPath = subtree.getNode().getIndexedPathFromRoot();
@@ -49,7 +49,8 @@ public void undo() {
         // remember modified children for redo
         m_modifiedSubtree.clear();
         // get node to edit
-        final GroupTreeNode subtreeRoot = m_groupRoot.getDescendant(m_subtreeRootPath).get(); // TODO: NULL
+        final GroupTreeNode subtreeRoot =
+                m_groupRoot.getDescendant(m_subtreeRootPath).get(); // TODO: NULL
         m_modifiedSubtree.addAll(subtreeRoot.getChildren());
         // keep subtree handle, but restore everything else from backup
         subtreeRoot.removeAllChildren();
@@ -61,7 +62,8 @@ public void undo() {
     @Override
     public void redo() {
         super.redo();
-        final GroupTreeNode subtreeRoot = m_groupRoot.getDescendant(m_subtreeRootPath).get(); // TODO: NULL
+        final GroupTreeNode subtreeRoot =
+                m_groupRoot.getDescendant(m_subtreeRootPath).get(); // TODO: NULL
         subtreeRoot.removeAllChildren();
         for (GroupTreeNode modifiedNode : m_modifiedSubtree) {
             modifiedNode.moveTo(subtreeRoot);
diff --git a/src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java b/src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java
index c4f367d31f78..1dd3e9997439 100644
--- a/src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java
+++ b/src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java
@@ -1,12 +1,12 @@
 package org.jabref.gui.groups;
 
-import java.util.List;
-import java.util.Objects;
-
 import org.jabref.gui.undo.AbstractUndoableJabRefEdit;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.groups.GroupTreeNode;
 
+import java.util.List;
+import java.util.Objects;
+
 class UndoableMoveGroup extends AbstractUndoableJabRefEdit {
 
     private final GroupTreeNodeViewModel root;
diff --git a/src/main/java/org/jabref/gui/help/AboutAction.java b/src/main/java/org/jabref/gui/help/AboutAction.java
index 9cc3a5447ee8..5c0a6dea96f9 100644
--- a/src/main/java/org/jabref/gui/help/AboutAction.java
+++ b/src/main/java/org/jabref/gui/help/AboutAction.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.help;
 
+import com.airhacks.afterburner.injection.Injector;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.SimpleCommand;
 
-import com.airhacks.afterburner.injection.Injector;
-
 public class AboutAction extends SimpleCommand {
 
     private final AboutDialogView aboutDialogView;
diff --git a/src/main/java/org/jabref/gui/help/AboutDialogView.java b/src/main/java/org/jabref/gui/help/AboutDialogView.java
index 82e735656c2a..a8335d54331b 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogView.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogView.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.help;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.TextArea;
@@ -12,9 +16,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BuildInfo;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class AboutDialogView extends BaseDialog<Void> {
 
     @FXML private ButtonType copyVersionButton;
@@ -30,11 +31,10 @@ public class AboutDialogView extends BaseDialog<Void> {
     public AboutDialogView() {
         this.setTitle(Localization.lang("About JabRef"));
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
-        ControlHelper.setAction(copyVersionButton, getDialogPane(), event -> copyVersionToClipboard());
+        ControlHelper.setAction(
+                copyVersionButton, getDialogPane(), event -> copyVersionToClipboard());
     }
 
     public AboutDialogViewModel getViewModel() {
@@ -43,7 +43,8 @@ public AboutDialogViewModel getViewModel() {
 
     @FXML
     private void initialize() {
-        viewModel = new AboutDialogViewModel(dialogService, preferences, clipBoardManager, buildInfo);
+        viewModel =
+                new AboutDialogViewModel(dialogService, preferences, clipBoardManager, buildInfo);
 
         textAreaVersions.setText(viewModel.getVersionInfo());
         this.setResizable(false);
diff --git a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
index 44beaf93ab62..3885eb57c4d2 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
@@ -1,9 +1,6 @@
 package org.jabref.gui.help;
 
-import java.io.IOException;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.stream.Collectors;
+import com.google.common.collect.Lists;
 
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
@@ -17,20 +14,26 @@
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BuildInfo;
-
-import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 public class AboutDialogViewModel extends AbstractViewModel {
 
     private static final String HOMEPAGE_URL = "https://www.jabref.org";
     private static final String DONATION_URL = "https://donations.jabref.org";
-    private static final String LIBRARIES_URL = "https://github.com/JabRef/jabref/blob/main/external-libraries.md";
+    private static final String LIBRARIES_URL =
+            "https://github.com/JabRef/jabref/blob/main/external-libraries.md";
     private static final String GITHUB_URL = "https://github.com/JabRef/jabref";
     private static final String LICENSE_URL = "https://github.com/JabRef/jabref/blob/main/LICENSE";
-    private static final String CONTRIBUTORS_URL = "https://github.com/JabRef/jabref/graphs/contributors";
-    private static final String PRIVACY_POLICY_URL = "https://github.com/JabRef/jabref/blob/main/PRIVACY.md";
+    private static final String CONTRIBUTORS_URL =
+            "https://github.com/JabRef/jabref/graphs/contributors";
+    private static final String PRIVACY_POLICY_URL =
+            "https://github.com/JabRef/jabref/blob/main/PRIVACY.md";
     private final String changelogUrl;
     private final String versionInfo;
     private final ReadOnlyStringWrapper environmentInfo = new ReadOnlyStringWrapper();
@@ -44,7 +47,11 @@ public class AboutDialogViewModel extends AbstractViewModel {
     private final ReadOnlyStringWrapper developmentVersion = new ReadOnlyStringWrapper();
     private final ClipBoardManager clipBoardManager;
 
-    public AboutDialogViewModel(DialogService dialogService, GuiPreferences preferences, ClipBoardManager clipBoardManager, BuildInfo buildInfo) {
+    public AboutDialogViewModel(
+            DialogService dialogService,
+            GuiPreferences preferences,
+            ClipBoardManager clipBoardManager,
+            BuildInfo buildInfo) {
         this.dialogService = Objects.requireNonNull(dialogService);
         this.preferences = Objects.requireNonNull(preferences);
         this.clipBoardManager = Objects.requireNonNull(clipBoardManager);
@@ -55,18 +62,29 @@ public AboutDialogViewModel(DialogService dialogService, GuiPreferences preferen
             isDevelopmentVersion.set(false);
         } else {
             isDevelopmentVersion.set(true);
-            String dev = Lists.newArrayList(version).stream().filter(string -> !string.equals(version[0])).collect(
-                    Collectors.joining("--"));
+            String dev =
+                    Lists.newArrayList(version).stream()
+                            .filter(string -> !string.equals(version[0]))
+                            .collect(Collectors.joining("--"));
             developmentVersion.set(dev);
         }
         maintainers.set(buildInfo.maintainers);
         license.set(Localization.lang("License") + ":");
         changelogUrl = buildInfo.version.getChangelogUrl();
 
-        String javafx_version = System.getProperty("javafx.runtime.version", BuildInfo.UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
-
-        versionInfo = "JabRef %s%n%s %s %s %nJava %s %nJavaFX %s".formatted(buildInfo.version, BuildInfo.OS,
-                BuildInfo.OS_VERSION, BuildInfo.OS_ARCH, BuildInfo.JAVA_VERSION, javafx_version);
+        String javafx_version =
+                System.getProperty("javafx.runtime.version", BuildInfo.UNKNOWN_VERSION)
+                        .toLowerCase(Locale.ROOT);
+
+        versionInfo =
+                "JabRef %s%n%s %s %s %nJava %s %nJavaFX %s"
+                        .formatted(
+                                buildInfo.version,
+                                BuildInfo.OS,
+                                BuildInfo.OS_VERSION,
+                                BuildInfo.OS_ARCH,
+                                BuildInfo.JAVA_VERSION,
+                                javafx_version);
     }
 
     public String getDevelopmentVersion() {
diff --git a/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java b/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java
index a27ffacee40e..a4fd2ad96e54 100644
--- a/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java
+++ b/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.help;
 
+import com.airhacks.afterburner.injection.Injector;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.errorconsole.ErrorConsoleView;
 
-import com.airhacks.afterburner.injection.Injector;
-
 /**
  * Such an error console can be
  * useful in getting complete bug reports, especially from Windows users,
diff --git a/src/main/java/org/jabref/gui/help/HelpAction.java b/src/main/java/org/jabref/gui/help/HelpAction.java
index fba12d479fc6..0c59206ce895 100644
--- a/src/main/java/org/jabref/gui/help/HelpAction.java
+++ b/src/main/java/org/jabref/gui/help/HelpAction.java
@@ -16,7 +16,10 @@ public class HelpAction extends SimpleCommand {
     private final DialogService dialogService;
     private final ExternalApplicationsPreferences externalApplicationPreferences;
 
-    public HelpAction(HelpFile helpPage, DialogService dialogService, ExternalApplicationsPreferences externalApplicationsPreferences) {
+    public HelpAction(
+            HelpFile helpPage,
+            DialogService dialogService,
+            ExternalApplicationsPreferences externalApplicationsPreferences) {
         this.helpPage = helpPage;
         this.dialogService = dialogService;
         this.externalApplicationPreferences = externalApplicationsPreferences;
@@ -25,8 +28,8 @@ public HelpAction(HelpFile helpPage, DialogService dialogService, ExternalApplic
     void openHelpPage(HelpFile helpPage) {
         StringBuilder sb = new StringBuilder("https://docs.jabref.org/");
         sb.append(helpPage.getPageName());
-        NativeDesktop.openBrowserShowPopup(sb.toString(), dialogService, externalApplicationPreferences
-        );
+        NativeDesktop.openBrowserShowPopup(
+                sb.toString(), dialogService, externalApplicationPreferences);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/help/NewVersionDialog.java b/src/main/java/org/jabref/gui/help/NewVersionDialog.java
index 02242e49ebbb..f755dc5cb581 100644
--- a/src/main/java/org/jabref/gui/help/NewVersionDialog.java
+++ b/src/main/java/org/jabref/gui/help/NewVersionDialog.java
@@ -16,38 +16,60 @@
 
 public class NewVersionDialog extends BaseDialog<Boolean> {
 
-    public NewVersionDialog(Version currentVersion,
-                            Version latestVersion,
-                            DialogService dialogService,
-                            ExternalApplicationsPreferences externalApplicationsPreferences) {
+    public NewVersionDialog(
+            Version currentVersion,
+            Version latestVersion,
+            DialogService dialogService,
+            ExternalApplicationsPreferences externalApplicationsPreferences) {
         this.setTitle(Localization.lang("New version available"));
 
-        ButtonType btnIgnoreUpdate = new ButtonType(Localization.lang("Ignore this update"), ButtonBar.ButtonData.CANCEL_CLOSE);
-        ButtonType btnDownloadUpdate = new ButtonType(Localization.lang("Download update"), ButtonBar.ButtonData.APPLY);
-        ButtonType btnRemindMeLater = new ButtonType(Localization.lang("Remind me later"), ButtonBar.ButtonData.CANCEL_CLOSE);
-        this.getDialogPane().getButtonTypes().addAll(btnIgnoreUpdate, btnDownloadUpdate, btnRemindMeLater);
-        this.setResultConverter(button -> {
-            if (button == btnIgnoreUpdate) {
-                return false;
-            } else if (button == btnDownloadUpdate) {
-                NativeDesktop.openBrowserShowPopup(Version.JABREF_DOWNLOAD_URL, dialogService, externalApplicationsPreferences);
-            }
-            return true;
-        });
+        ButtonType btnIgnoreUpdate =
+                new ButtonType(
+                        Localization.lang("Ignore this update"), ButtonBar.ButtonData.CANCEL_CLOSE);
+        ButtonType btnDownloadUpdate =
+                new ButtonType(Localization.lang("Download update"), ButtonBar.ButtonData.APPLY);
+        ButtonType btnRemindMeLater =
+                new ButtonType(
+                        Localization.lang("Remind me later"), ButtonBar.ButtonData.CANCEL_CLOSE);
+        this.getDialogPane()
+                .getButtonTypes()
+                .addAll(btnIgnoreUpdate, btnDownloadUpdate, btnRemindMeLater);
+        this.setResultConverter(
+                button -> {
+                    if (button == btnIgnoreUpdate) {
+                        return false;
+                    } else if (button == btnDownloadUpdate) {
+                        NativeDesktop.openBrowserShowPopup(
+                                Version.JABREF_DOWNLOAD_URL,
+                                dialogService,
+                                externalApplicationsPreferences);
+                    }
+                    return true;
+                });
         Button defaultButton = (Button) this.getDialogPane().lookupButton(btnDownloadUpdate);
         defaultButton.setDefaultButton(true);
 
-        Hyperlink lblMoreInformation = new Hyperlink(Localization.lang("To see what is new view the changelog."));
-        lblMoreInformation.setOnAction(event ->
-                NativeDesktop.openBrowserShowPopup(latestVersion.getChangelogUrl(), dialogService, externalApplicationsPreferences)
-        );
+        Hyperlink lblMoreInformation =
+                new Hyperlink(Localization.lang("To see what is new view the changelog."));
+        lblMoreInformation.setOnAction(
+                event ->
+                        NativeDesktop.openBrowserShowPopup(
+                                latestVersion.getChangelogUrl(),
+                                dialogService,
+                                externalApplicationsPreferences));
 
-        VBox container = new VBox(
-                new Label(Localization.lang("A new version of JabRef has been released.")),
-                new Label(Localization.lang("Installed version") + ": " + currentVersion.getFullVersion()),
-                new Label(Localization.lang("Latest version") + ": " + latestVersion.getFullVersion()),
-                lblMoreInformation
-        );
+        VBox container =
+                new VBox(
+                        new Label(Localization.lang("A new version of JabRef has been released.")),
+                        new Label(
+                                Localization.lang("Installed version")
+                                        + ": "
+                                        + currentVersion.getFullVersion()),
+                        new Label(
+                                Localization.lang("Latest version")
+                                        + ": "
+                                        + latestVersion.getFullVersion()),
+                        lblMoreInformation);
         getDialogPane().setContent(container);
         getDialogPane().setPrefWidth(450);
     }
diff --git a/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java b/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
index 85edd1234859..077a1fdf2adc 100644
--- a/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
+++ b/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
@@ -1,22 +1,21 @@
 package org.jabref.gui.help;
 
+import com.airhacks.afterburner.injection.Injector;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.logic.util.TaskExecutor;
 
-import com.airhacks.afterburner.injection.Injector;
-
 public class SearchForUpdateAction extends SimpleCommand {
 
     private final GuiPreferences preferences;
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
 
-    public SearchForUpdateAction(GuiPreferences preferences,
-                                 DialogService dialogService,
-                                 TaskExecutor taskExecutor) {
+    public SearchForUpdateAction(
+            GuiPreferences preferences, DialogService dialogService, TaskExecutor taskExecutor) {
         this.preferences = preferences;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
diff --git a/src/main/java/org/jabref/gui/help/VersionWorker.java b/src/main/java/org/jabref/gui/help/VersionWorker.java
index a68781ef4a43..eaecf61e9769 100644
--- a/src/main/java/org/jabref/gui/help/VersionWorker.java
+++ b/src/main/java/org/jabref/gui/help/VersionWorker.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.help;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.gui.preferences.GuiPreferences;
@@ -14,10 +8,15 @@
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.logic.util.Version;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+
 /**
  * This worker checks if there is a new version of JabRef available. If there is it will display a dialog to the user
  * offering him multiple options to proceed (see changelog, go to the download page, ignore this version, and remind
@@ -40,10 +39,11 @@ public class VersionWorker {
     private final InternalPreferences internalPreferences;
     private final ExternalApplicationsPreferences externalApplicationsPreferences;
 
-    public VersionWorker(Version installedVersion,
-                         DialogService dialogService,
-                         TaskExecutor taskExecutor,
-                         GuiPreferences preferences) {
+    public VersionWorker(
+            Version installedVersion,
+            DialogService dialogService,
+            TaskExecutor taskExecutor,
+            GuiPreferences preferences) {
         this.installedVersion = Objects.requireNonNull(installedVersion);
         this.dialogService = Objects.requireNonNull(dialogService);
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
@@ -62,16 +62,16 @@ private Optional<Version> getNewVersion() throws IOException {
 
     public void checkForNewVersionAsync() {
         BackgroundTask.wrap(this::getNewVersion)
-                      .onSuccess(version -> showUpdateInfo(version, true))
-                      .onFailure(exception -> showConnectionError(exception, true))
-                      .executeWith(taskExecutor);
+                .onSuccess(version -> showUpdateInfo(version, true))
+                .onFailure(exception -> showConnectionError(exception, true))
+                .executeWith(taskExecutor);
     }
 
     public void checkForNewVersionDelayed() {
         BackgroundTask.wrap(this::getNewVersion)
-                      .onSuccess(version -> showUpdateInfo(version, false))
-                      .onFailure(exception -> showConnectionError(exception, false))
-                      .scheduleWith(taskExecutor, 30, TimeUnit.SECONDS);
+                .onSuccess(version -> showUpdateInfo(version, false))
+                .onFailure(exception -> showConnectionError(exception, false))
+                .scheduleWith(taskExecutor, 30, TimeUnit.SECONDS);
     }
 
     /**
@@ -80,8 +80,11 @@ public void checkForNewVersionDelayed() {
     private void showConnectionError(Exception exception, boolean manualExecution) {
         if (manualExecution) {
             String couldNotConnect = Localization.lang("Could not connect to the update server.");
-            String tryLater = Localization.lang("Please try again later and/or check your network connection.");
-            dialogService.showErrorDialogAndWait(Localization.lang("Error"), couldNotConnect + "\n" + tryLater, exception);
+            String tryLater =
+                    Localization.lang(
+                            "Please try again later and/or check your network connection.");
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Error"), couldNotConnect + "\n" + tryLater, exception);
         }
         LOGGER.debug("Could not connect to the update server.", exception);
     }
@@ -91,16 +94,24 @@ private void showConnectionError(Exception exception, boolean manualExecution) {
      * Shows a "New Version" Dialog to the user if there is.
      */
     private void showUpdateInfo(Optional<Version> newerVersion, boolean manualExecution) {
-        // no new version could be found, only respect the ignored version on automated version checks
-        if (newerVersion.isEmpty() || (newerVersion.get().equals(internalPreferences.getIgnoredVersion()) && !manualExecution)) {
+        // no new version could be found, only respect the ignored version on automated version
+        // checks
+        if (newerVersion.isEmpty()
+                || (newerVersion.get().equals(internalPreferences.getIgnoredVersion())
+                        && !manualExecution)) {
             if (manualExecution) {
                 dialogService.notify(Localization.lang("JabRef is up-to-date."));
             }
         } else {
             // notify the user about a newer version
-            if (dialogService.showCustomDialogAndWait(
-                    new NewVersionDialog(installedVersion, newerVersion.get(), dialogService, externalApplicationsPreferences))
-                             .orElse(true)) {
+            if (dialogService
+                    .showCustomDialogAndWait(
+                            new NewVersionDialog(
+                                    installedVersion,
+                                    newerVersion.get(),
+                                    dialogService,
+                                    externalApplicationsPreferences))
+                    .orElse(true)) {
                 internalPreferences.setIgnoredVersion(newerVersion.get());
             }
         }
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index 0cd333668963..749090120b92 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -1,20 +1,6 @@
 package org.jabref.gui.icon;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.ServiceLoader;
-import java.util.Set;
+import static java.util.EnumSet.allOf;
 
 import javafx.scene.Node;
 import javafx.scene.control.Button;
@@ -23,7 +9,6 @@
 import javafx.scene.paint.Color;
 
 import org.jabref.architecture.AllowedToUseClassGetResource;
-
 import org.kordamp.ikonli.Ikon;
 import org.kordamp.ikonli.IkonProvider;
 import org.kordamp.ikonli.materialdesign2.MaterialDesignA;
@@ -50,7 +35,21 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static java.util.EnumSet.allOf;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.ServiceLoader;
+import java.util.Set;
 
 @AllowedToUseClassGetResource("JavaFX internally handles the passed URLs properly.")
 public class IconTheme {
@@ -59,7 +58,9 @@ public class IconTheme {
     public static final Color SELECTED_COLOR = Color.web("#50618F");
     private static final String DEFAULT_ICON_PATH = "/images/external/red.png";
     private static final Logger LOGGER = LoggerFactory.getLogger(IconTheme.class);
-    private static final Map<String, String> KEY_TO_ICON = readIconThemeFile(IconTheme.class.getResource("/images/Icons.properties"), "/images/external/");
+    private static final Map<String, String> KEY_TO_ICON =
+            readIconThemeFile(
+                    IconTheme.class.getResource("/images/Icons.properties"), "/images/external/");
     private static final Set<Ikon> ICON_NAMES = new HashSet<>();
 
     public static Color getDefaultGroupColor() {
@@ -70,8 +71,10 @@ public static Optional<JabRefIcon> findIcon(String code, Color color) {
         if (ICON_NAMES.isEmpty()) {
             loadAllIkons();
         }
-        return ICON_NAMES.stream().filter(icon -> icon.toString().equals(code.toUpperCase(Locale.ENGLISH)))
-                         .map(internalMat -> new InternalMaterialDesignIcon(internalMat).withColor(color)).findFirst();
+        return ICON_NAMES.stream()
+                .filter(icon -> icon.toString().equals(code.toUpperCase(Locale.ENGLISH)))
+                .map(internalMat -> new InternalMaterialDesignIcon(internalMat).withColor(color))
+                .findFirst();
     }
 
     public static Image getJabRefImage() {
@@ -107,10 +110,14 @@ private static Image getImageFX(String name) {
     public static URL getIconUrl(String name) {
         String key = Objects.requireNonNull(name, "icon name");
         if (!KEY_TO_ICON.containsKey(key)) {
-            LOGGER.warn("Could not find icon url by name {}, so falling back on default icon {}", name, DEFAULT_ICON_PATH);
+            LOGGER.warn(
+                    "Could not find icon url by name {}, so falling back on default icon {}",
+                    name,
+                    DEFAULT_ICON_PATH);
         }
         String path = KEY_TO_ICON.getOrDefault(key, DEFAULT_ICON_PATH);
-        return Objects.requireNonNull(IconTheme.class.getResource(path), "Path must not be null for key " + key);
+        return Objects.requireNonNull(
+                IconTheme.class.getResource(path), "Path must not be null for key " + key);
     }
 
     /**
@@ -130,8 +137,9 @@ private static Map<String, String> readIconThemeFile(URL url, String prefix) {
 
         Map<String, String> result = new HashMap<>();
 
-        try (BufferedReader in = new BufferedReader(
-                new InputStreamReader(url.openStream(), StandardCharsets.ISO_8859_1))) {
+        try (BufferedReader in =
+                new BufferedReader(
+                        new InputStreamReader(url.openStream(), StandardCharsets.ISO_8859_1))) {
             String line;
             while ((line = in.readLine()) != null) {
                 if (!line.contains("=")) {
@@ -163,7 +171,6 @@ public static List<Image> getLogoSetFX() {
     }
 
     public enum JabRefIcons implements JabRefIcon {
-
         ADD(MaterialDesignP.PLUS_CIRCLE_OUTLINE),
         ADD_FILLED(MaterialDesignP.PLUS_CIRCLE),
         ADD_NOBOX(MaterialDesignP.PLUS),
@@ -215,11 +222,36 @@ public enum JabRefIcons implements JabRefIcon {
         PRIORITY_LOW(Color.rgb(111, 204, 117), MaterialDesignF.FLAG),
         PRINTED(MaterialDesignP.PRINTER),
         RANKING(MaterialDesignS.STAR),
-        RANK1(MaterialDesignS.STAR, MaterialDesignS.STAR_OUTLINE, MaterialDesignS.STAR_OUTLINE, MaterialDesignS.STAR_OUTLINE, MaterialDesignS.STAR_OUTLINE),
-        RANK2(MaterialDesignS.STAR, MaterialDesignS.STAR, MaterialDesignS.STAR_OUTLINE, MaterialDesignS.STAR_OUTLINE, MaterialDesignS.STAR_OUTLINE),
-        RANK3(MaterialDesignS.STAR, MaterialDesignS.STAR, MaterialDesignS.STAR, MaterialDesignS.STAR_OUTLINE, MaterialDesignS.STAR_OUTLINE),
-        RANK4(MaterialDesignS.STAR, MaterialDesignS.STAR, MaterialDesignS.STAR, MaterialDesignS.STAR, MaterialDesignS.STAR_OUTLINE),
-        RANK5(MaterialDesignS.STAR, MaterialDesignS.STAR, MaterialDesignS.STAR, MaterialDesignS.STAR, MaterialDesignS.STAR),
+        RANK1(
+                MaterialDesignS.STAR,
+                MaterialDesignS.STAR_OUTLINE,
+                MaterialDesignS.STAR_OUTLINE,
+                MaterialDesignS.STAR_OUTLINE,
+                MaterialDesignS.STAR_OUTLINE),
+        RANK2(
+                MaterialDesignS.STAR,
+                MaterialDesignS.STAR,
+                MaterialDesignS.STAR_OUTLINE,
+                MaterialDesignS.STAR_OUTLINE,
+                MaterialDesignS.STAR_OUTLINE),
+        RANK3(
+                MaterialDesignS.STAR,
+                MaterialDesignS.STAR,
+                MaterialDesignS.STAR,
+                MaterialDesignS.STAR_OUTLINE,
+                MaterialDesignS.STAR_OUTLINE),
+        RANK4(
+                MaterialDesignS.STAR,
+                MaterialDesignS.STAR,
+                MaterialDesignS.STAR,
+                MaterialDesignS.STAR,
+                MaterialDesignS.STAR_OUTLINE),
+        RANK5(
+                MaterialDesignS.STAR,
+                MaterialDesignS.STAR,
+                MaterialDesignS.STAR,
+                MaterialDesignS.STAR,
+                MaterialDesignS.STAR),
         WWW(MaterialDesignW.WEB),
         GROUP_INCLUDING(MaterialDesignF.FILTER_OUTLINE),
         GROUP_REFINING(MaterialDesignF.FILTER),
diff --git a/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java b/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
index 3205426df650..cf182b029a31 100644
--- a/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
+++ b/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
@@ -1,18 +1,17 @@
 package org.jabref.gui.icon;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import javafx.scene.Node;
 import javafx.scene.paint.Color;
 
 import org.jabref.gui.util.ColorUtil;
-
 import org.kordamp.ikonli.Ikon;
 import org.kordamp.ikonli.javafx.FontIcon;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class InternalMaterialDesignIcon implements JabRefIcon {
 
     private final List<Ikon> icons;
@@ -34,7 +33,11 @@ public InternalMaterialDesignIcon(Ikon... icons) {
 
     public InternalMaterialDesignIcon(List<Ikon> icons) {
         this.icons = icons;
-        this.unicode = icons.stream().map(Ikon::getCode).map(String::valueOf).collect(Collectors.joining());
+        this.unicode =
+                icons.stream()
+                        .map(Ikon::getCode)
+                        .map(String::valueOf)
+                        .collect(Collectors.joining());
         this.color = Optional.empty();
     }
 
@@ -45,9 +48,13 @@ public Node getGraphicNode() {
         fontIcon.getStyleClass().add("glyph-icon");
 
         // Override the default color from the css files
-        color.ifPresent(color -> fontIcon.setStyle(fontIcon.getStyle() +
-                "-fx-fill: %s;".formatted(ColorUtil.toRGBCode(color)) +
-                "-fx-icon-color: %s;".formatted(ColorUtil.toRGBCode(color))));
+        color.ifPresent(
+                color ->
+                        fontIcon.setStyle(
+                                fontIcon.getStyle()
+                                        + "-fx-fill: %s;".formatted(ColorUtil.toRGBCode(color))
+                                        + "-fx-icon-color: %s;"
+                                                .formatted(ColorUtil.toRGBCode(color))));
 
         return fontIcon;
     }
diff --git a/src/main/java/org/jabref/gui/icon/JabRefIconView.java b/src/main/java/org/jabref/gui/icon/JabRefIconView.java
index ed0f4e54b293..207201239513 100644
--- a/src/main/java/org/jabref/gui/icon/JabRefIconView.java
+++ b/src/main/java/org/jabref/gui/icon/JabRefIconView.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.icon;
 
+import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.css.Size;
 import javafx.css.SizeUnits;
 
 import org.jabref.gui.icon.IconTheme.JabRefIcons;
-
-import com.tobiasdiez.easybind.EasyBind;
 import org.kordamp.ikonli.javafx.FontIcon;
 
 public class JabRefIconView extends FontIcon {
@@ -17,6 +17,7 @@ public class JabRefIconView extends FontIcon {
      * (e.g. validation that parameter passed to "icon" is indeed of type {@link IconTheme.JabRefIcons}).
      */
     private final ObjectProperty<IconTheme.JabRefIcons> glyph;
+
     private final ObjectProperty<Number> glyphSize;
 
     public JabRefIconView(JabRefIcons icon, int size) {
diff --git a/src/main/java/org/jabref/gui/icon/JabRefIkonHandler.java b/src/main/java/org/jabref/gui/icon/JabRefIkonHandler.java
index b09703d91898..381672963224 100644
--- a/src/main/java/org/jabref/gui/icon/JabRefIkonHandler.java
+++ b/src/main/java/org/jabref/gui/icon/JabRefIkonHandler.java
@@ -1,13 +1,12 @@
 package org.jabref.gui.icon;
 
-import java.io.InputStream;
-import java.net.URL;
-
 import org.jabref.architecture.AllowedToUseClassGetResource;
-
 import org.kordamp.ikonli.AbstractIkonHandler;
 import org.kordamp.ikonli.Ikon;
 
+import java.io.InputStream;
+import java.net.URL;
+
 @AllowedToUseClassGetResource("JavaFX internally handles the passed URLs properly.")
 public class JabRefIkonHandler extends AbstractIkonHandler {
 
diff --git a/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java b/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java
index 3dd28d6d2427..c2bd5502ffb1 100644
--- a/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java
+++ b/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java
@@ -14,7 +14,6 @@
  * @see <a href="https://materialdesignicons.com/custom">Material Design Icon custom page</a>
  */
 public enum JabRefMaterialDesignIcon implements Ikon {
-
     TEX_STUDIO("jab-texstudio", '\ue900'),
     TEX_MAKER("jab-textmaker", '\ue901'),
     EMACS("jab-emacs", '\ue902'),
diff --git a/src/main/java/org/jabref/gui/importer/BibEntryTypePrefsAndFileViewModel.java b/src/main/java/org/jabref/gui/importer/BibEntryTypePrefsAndFileViewModel.java
index 27735d96c4a5..7cc3dc530ec4 100644
--- a/src/main/java/org/jabref/gui/importer/BibEntryTypePrefsAndFileViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/BibEntryTypePrefsAndFileViewModel.java
@@ -4,15 +4,16 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntryType;
 
-public record BibEntryTypePrefsAndFileViewModel(BibEntryType customTypeFromPreferences, BibEntryType customTypeFromFile) {
+public record BibEntryTypePrefsAndFileViewModel(
+        BibEntryType customTypeFromPreferences, BibEntryType customTypeFromFile) {
     /**
      * Used to render in the UI. This is different from {@link BibEntryType#toString()}, because this is the serialization the user expects
      */
     @Override
     public String toString() {
-        return Localization.lang("%0 (from file)\n%1 (current setting)",
+        return Localization.lang(
+                "%0 (from file)\n%1 (current setting)",
                 MetaDataSerializer.serializeCustomEntryTypes(customTypeFromFile),
                 MetaDataSerializer.serializeCustomEntryTypes(customTypeFromPreferences));
     }
 }
-
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index 581be1802dab..051ce63f70a0 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.importer;
 
-import java.util.Optional;
-
+import org.controlsfx.control.PopOver;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
@@ -18,11 +17,11 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import org.controlsfx.control.PopOver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Optional;
+
 public class GenerateEntryFromIdAction extends SimpleCommand {
     private static final Logger LOGGER = LoggerFactory.getLogger(GenerateEntryFromIdAction.class);
 
@@ -35,14 +34,15 @@ public class GenerateEntryFromIdAction extends SimpleCommand {
     private final StateManager stateManager;
     private final FileUpdateMonitor fileUpdateMonitor;
 
-    public GenerateEntryFromIdAction(LibraryTab libraryTab,
-                                     DialogService dialogService,
-                                     GuiPreferences preferences,
-                                     TaskExecutor taskExecutor,
-                                     PopOver entryFromIdPopOver,
-                                     String identifier,
-                                     StateManager stateManager,
-                                     FileUpdateMonitor fileUpdateMonitor) {
+    public GenerateEntryFromIdAction(
+            LibraryTab libraryTab,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            TaskExecutor taskExecutor,
+            PopOver entryFromIdPopOver,
+            String identifier,
+            StateManager stateManager,
+            FileUpdateMonitor fileUpdateMonitor) {
         this.libraryTab = libraryTab;
         this.dialogService = dialogService;
         this.preferences = preferences;
@@ -58,46 +58,67 @@ public void execute() {
         BackgroundTask<Optional<BibEntry>> backgroundTask = searchAndImportEntryInBackground();
         backgroundTask.titleProperty().set(Localization.lang("Import by ID"));
         backgroundTask.showToUser(true);
-        backgroundTask.onRunning(() -> {
-            entryFromIdPopOver.hide();
-            dialogService.notify("%s".formatted(backgroundTask.messageProperty().get()));
-        });
-        backgroundTask.onFailure(exception -> {
-            String fetcherExceptionMessage = exception.getMessage();
+        backgroundTask.onRunning(
+                () -> {
+                    entryFromIdPopOver.hide();
+                    dialogService.notify("%s".formatted(backgroundTask.messageProperty().get()));
+                });
+        backgroundTask.onFailure(
+                exception -> {
+                    String fetcherExceptionMessage = exception.getMessage();
 
-            String msg;
-            if (exception instanceof FetcherClientException) {
-                msg = Localization.lang("Bibliographic data not found. Cause is likely the client side. Please check connection and identifier for correctness.") + "\n" + fetcherExceptionMessage;
-            } else if (exception instanceof FetcherServerException) {
-                msg = Localization.lang("Bibliographic data not found. Cause is likely the server side. Please try again later.") + "\n" + fetcherExceptionMessage;
-            } else {
-                msg = Localization.lang("Error message %0", fetcherExceptionMessage);
-            }
+                    String msg;
+                    if (exception instanceof FetcherClientException) {
+                        msg =
+                                Localization.lang(
+                                                "Bibliographic data not found. Cause is likely the client side. Please check connection and identifier for correctness.")
+                                        + "\n"
+                                        + fetcherExceptionMessage;
+                    } else if (exception instanceof FetcherServerException) {
+                        msg =
+                                Localization.lang(
+                                                "Bibliographic data not found. Cause is likely the server side. Please try again later.")
+                                        + "\n"
+                                        + fetcherExceptionMessage;
+                    } else {
+                        msg = Localization.lang("Error message %0", fetcherExceptionMessage);
+                    }
 
-            LOGGER.info(fetcherExceptionMessage, exception);
+                    LOGGER.info(fetcherExceptionMessage, exception);
 
-            if (dialogService.showConfirmationDialogAndWait(Localization.lang("Failed to import by ID"), msg, Localization.lang("Add entry manually"))) {
-                // add entry manually
-                new NewEntryAction(() -> libraryTab, StandardEntryType.Article, dialogService,
-                        preferences, stateManager).execute();
-            }
-        });
-        backgroundTask.onSuccess(result -> {
-            if (result.isPresent()) {
-                final BibEntry entry = result.get();
-                ImportHandler handler = new ImportHandler(
-                        libraryTab.getBibDatabaseContext(),
-                        preferences,
-                        fileUpdateMonitor,
-                        libraryTab.getUndoManager(),
-                        stateManager,
-                        dialogService,
-                        taskExecutor);
-                handler.importEntryWithDuplicateCheck(libraryTab.getBibDatabaseContext(), entry);
-            } else {
-                dialogService.notify("No entry found or import canceled");
-            }
-        });
+                    if (dialogService.showConfirmationDialogAndWait(
+                            Localization.lang("Failed to import by ID"),
+                            msg,
+                            Localization.lang("Add entry manually"))) {
+                        // add entry manually
+                        new NewEntryAction(
+                                        () -> libraryTab,
+                                        StandardEntryType.Article,
+                                        dialogService,
+                                        preferences,
+                                        stateManager)
+                                .execute();
+                    }
+                });
+        backgroundTask.onSuccess(
+                result -> {
+                    if (result.isPresent()) {
+                        final BibEntry entry = result.get();
+                        ImportHandler handler =
+                                new ImportHandler(
+                                        libraryTab.getBibDatabaseContext(),
+                                        preferences,
+                                        fileUpdateMonitor,
+                                        libraryTab.getUndoManager(),
+                                        stateManager,
+                                        dialogService,
+                                        taskExecutor);
+                        handler.importEntryWithDuplicateCheck(
+                                libraryTab.getBibDatabaseContext(), entry);
+                    } else {
+                        dialogService.notify("No entry found or import canceled");
+                    }
+                });
         backgroundTask.executeWith(taskExecutor);
     }
 
@@ -109,7 +130,8 @@ public Optional<BibEntry> call() throws FetcherException {
                     return Optional.empty();
                 }
                 updateMessage(Localization.lang("Searching..."));
-                return new CompositeIdFetcher(preferences.getImportFormatPreferences()).performSearchById(identifier);
+                return new CompositeIdFetcher(preferences.getImportFormatPreferences())
+                        .performSearchById(identifier);
             }
         };
     }
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
index 953563730459..3c06779e7746 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -1,10 +1,15 @@
 package org.jabref.gui.importer;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.TextField;
 
+import org.controlsfx.control.PopOver;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
@@ -14,10 +19,6 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.util.FileUpdateMonitor;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-import org.controlsfx.control.PopOver;
-
 public class GenerateEntryFromIdDialog {
 
     @FXML DialogPane dialogPane;
@@ -34,7 +35,12 @@ public class GenerateEntryFromIdDialog {
 
     private PopOver entryFromIdPopOver;
 
-    public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogService, GuiPreferences preferences, TaskExecutor taskExecutor, StateManager stateManager) {
+    public GenerateEntryFromIdDialog(
+            LibraryTab libraryTab,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            TaskExecutor taskExecutor,
+            StateManager stateManager) {
         ViewLoader.view(this).load();
         this.preferences = preferences;
         this.dialogService = dialogService;
@@ -45,7 +51,8 @@ public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogServ
         this.generateButton.setDefaultButton(true);
     }
 
-    @FXML private void generateEntry() {
+    @FXML
+    private void generateEntry() {
         if (idTextField.getText().isEmpty()) {
             dialogService.notify(Localization.lang("Enter a valid ID"));
             return;
@@ -53,16 +60,16 @@ public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogServ
 
         this.idTextField.requestFocus();
 
-        GenerateEntryFromIdAction generateEntryFromIdAction = new GenerateEntryFromIdAction(
-                libraryTab,
-                dialogService,
-                preferences,
-                taskExecutor,
-                entryFromIdPopOver,
-                idTextField.getText(),
-                stateManager,
-                fileUpdateMonitor
-        );
+        GenerateEntryFromIdAction generateEntryFromIdAction =
+                new GenerateEntryFromIdAction(
+                        libraryTab,
+                        dialogService,
+                        preferences,
+                        taskExecutor,
+                        entryFromIdPopOver,
+                        idTextField.getText(),
+                        stateManager,
+                        fileUpdateMonitor);
         generateEntryFromIdAction.execute();
     }
 
diff --git a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
index b049e104c320..fe32ddc6de78 100644
--- a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
+++ b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
@@ -18,18 +18,21 @@ public class GrobidOptInDialogHelper {
      * @param dialogService the DialogService to use
      * @return if the user enabled Grobid, either in the past or after being asked by the dialog.
      */
-    public static boolean showAndWaitIfUserIsUndecided(DialogService dialogService, GrobidPreferences preferences) {
+    public static boolean showAndWaitIfUserIsUndecided(
+            DialogService dialogService, GrobidPreferences preferences) {
         if (preferences.isGrobidEnabled()) {
             return true;
         }
         if (preferences.isGrobidOptOut()) {
             return false;
         }
-        boolean grobidEnabled = dialogService.showConfirmationDialogWithOptOutAndWait(
-                Localization.lang("Remote services"),
-                Localization.lang("Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results."),
-                Localization.lang("Do not ask again"),
-                optOut -> preferences.setGrobidOptOut(optOut));
+        boolean grobidEnabled =
+                dialogService.showConfirmationDialogWithOptOutAndWait(
+                        Localization.lang("Remote services"),
+                        Localization.lang(
+                                "Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results."),
+                        Localization.lang("Do not ask again"),
+                        optOut -> preferences.setGrobidOptOut(optOut));
         preferences.setGrobidEnabled(grobidEnabled);
         return grobidEnabled;
     }
diff --git a/src/main/java/org/jabref/gui/importer/ImportCommand.java b/src/main/java/org/jabref/gui/importer/ImportCommand.java
index 55469924eb92..0a85bd2b1b0a 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCommand.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCommand.java
@@ -1,13 +1,6 @@
 package org.jabref.gui.importer;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.SortedSet;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
 
 import javafx.stage.FileChooser;
 
@@ -33,11 +26,17 @@
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.SortedSet;
 
 /**
  * Perform an import action
@@ -45,7 +44,10 @@
 public class ImportCommand extends SimpleCommand {
     private static final Logger LOGGER = LoggerFactory.getLogger(ImportCommand.class);
 
-    public enum ImportMethod { AS_NEW, TO_EXISTING }
+    public enum ImportMethod {
+        AS_NEW,
+        TO_EXISTING
+    }
 
     private final LibraryTabContainer tabContainer;
     private final ImportMethod importMethod;
@@ -55,13 +57,14 @@ public enum ImportMethod { AS_NEW, TO_EXISTING }
     private final FileUpdateMonitor fileUpdateMonitor;
     private final TaskExecutor taskExecutor;
 
-    public ImportCommand(LibraryTabContainer tabContainer,
-                         ImportMethod importMethod,
-                         CliPreferences preferences,
-                         StateManager stateManager,
-                         FileUpdateMonitor fileUpdateMonitor,
-                         TaskExecutor taskExecutor,
-                         DialogService dialogService) {
+    public ImportCommand(
+            LibraryTabContainer tabContainer,
+            ImportMethod importMethod,
+            CliPreferences preferences,
+            StateManager stateManager,
+            FileUpdateMonitor fileUpdateMonitor,
+            TaskExecutor taskExecutor,
+            DialogService dialogService) {
         this.tabContainer = tabContainer;
         this.importMethod = importMethod;
         this.preferences = preferences;
@@ -76,48 +79,72 @@ public ImportCommand(LibraryTabContainer tabContainer,
 
     @Override
     public void execute() {
-        ImportFormatReader importFormatReader = new ImportFormatReader(
-                preferences.getImporterPreferences(),
-                preferences.getImportFormatPreferences(),
-                preferences.getCitationKeyPatternPreferences(),
-                fileUpdateMonitor
-        );
+        ImportFormatReader importFormatReader =
+                new ImportFormatReader(
+                        preferences.getImporterPreferences(),
+                        preferences.getImportFormatPreferences(),
+                        preferences.getCitationKeyPatternPreferences(),
+                        fileUpdateMonitor);
         SortedSet<Importer> importers = importFormatReader.getImportFormats();
 
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(FileFilterConverter.ANY_FILE)
-                .addExtensionFilter(FileFilterConverter.forAllImporters(importers))
-                .addExtensionFilter(FileFilterConverter.importerToExtensionFilter(importers))
-                .withInitialDirectory(preferences.getImporterPreferences().getImportWorkingDirectory())
-                .build();
-        dialogService.showFileOpenDialog(fileDialogConfiguration)
-                     .ifPresent(path -> importSingleFile(path, importers, fileDialogConfiguration.getSelectedExtensionFilter()));
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(FileFilterConverter.ANY_FILE)
+                        .addExtensionFilter(FileFilterConverter.forAllImporters(importers))
+                        .addExtensionFilter(
+                                FileFilterConverter.importerToExtensionFilter(importers))
+                        .withInitialDirectory(
+                                preferences.getImporterPreferences().getImportWorkingDirectory())
+                        .build();
+        dialogService
+                .showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(
+                        path ->
+                                importSingleFile(
+                                        path,
+                                        importers,
+                                        fileDialogConfiguration.getSelectedExtensionFilter()));
     }
 
-    private void importSingleFile(Path file, SortedSet<Importer> importers, FileChooser.ExtensionFilter selectedExtensionFilter) {
+    private void importSingleFile(
+            Path file,
+            SortedSet<Importer> importers,
+            FileChooser.ExtensionFilter selectedExtensionFilter) {
         if (!Files.exists(file)) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Import"),
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Import"),
                     Localization.lang("File not found") + ": '" + file.getFileName() + "'.");
 
             return;
         }
 
-        Optional<Importer> format = FileFilterConverter.getImporter(selectedExtensionFilter, importers);
-        BackgroundTask<ParserResult> task = BackgroundTask.wrap(
-                () -> doImport(Collections.singletonList(file), format.orElse(null)));
+        Optional<Importer> format =
+                FileFilterConverter.getImporter(selectedExtensionFilter, importers);
+        BackgroundTask<ParserResult> task =
+                BackgroundTask.wrap(
+                        () -> doImport(Collections.singletonList(file), format.orElse(null)));
 
         if (importMethod == ImportMethod.AS_NEW) {
-            task.onSuccess(parserResult -> {
-                    tabContainer.addTab(parserResult.getDatabaseContext(), true);
-                    dialogService.notify(Localization.lang("Imported entries") + ": " + parserResult.getDatabase().getEntries().size());
-                })
-                .onFailure(ex -> {
-                    LOGGER.error("Error importing", ex);
-                    dialogService.notify(Localization.lang("Error importing. See the error log for details."));
-                })
-                .executeWith(taskExecutor);
+            task.onSuccess(
+                            parserResult -> {
+                                tabContainer.addTab(parserResult.getDatabaseContext(), true);
+                                dialogService.notify(
+                                        Localization.lang("Imported entries")
+                                                + ": "
+                                                + parserResult.getDatabase().getEntries().size());
+                            })
+                    .onFailure(
+                            ex -> {
+                                LOGGER.error("Error importing", ex);
+                                dialogService.notify(
+                                        Localization.lang(
+                                                "Error importing. See the error log for details."));
+                            })
+                    .executeWith(taskExecutor);
         } else {
-            ImportEntriesDialog dialog = new ImportEntriesDialog(tabContainer.getCurrentLibraryTab().getBibDatabaseContext(), task);
+            ImportEntriesDialog dialog =
+                    new ImportEntriesDialog(
+                            tabContainer.getCurrentLibraryTab().getBibDatabaseContext(), task);
             dialog.setTitle(Localization.lang("Import"));
             dialogService.showCustomDialogAndWait(dialog);
         }
@@ -133,52 +160,74 @@ private ParserResult doImport(List<Path> files, Importer importFormat) throws IO
         Optional<Importer> importer = Optional.ofNullable(importFormat);
         // We import all files and collect their results
         List<ImportFormatReader.UnknownFormatImport> imports = new ArrayList<>();
-        ImportFormatReader importFormatReader = new ImportFormatReader(
-                preferences.getImporterPreferences(),
-                preferences.getImportFormatPreferences(),
-                preferences.getCitationKeyPatternPreferences(),
-                fileUpdateMonitor
-        );
+        ImportFormatReader importFormatReader =
+                new ImportFormatReader(
+                        preferences.getImporterPreferences(),
+                        preferences.getImportFormatPreferences(),
+                        preferences.getCitationKeyPatternPreferences(),
+                        fileUpdateMonitor);
         for (Path filename : files) {
             try {
                 if (importer.isEmpty()) {
                     // Unknown format
-                    UiTaskExecutor.runAndWaitInJavaFXThread(() -> {
-                        if (FileUtil.isPDFFile(filename) && GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferences.getGrobidPreferences())) {
-                            importFormatReader.reset();
-                        }
-                        dialogService.notify(Localization.lang("Importing file %0 as unknown format", filename.getFileName().toString()));
-                    });
+                    UiTaskExecutor.runAndWaitInJavaFXThread(
+                            () -> {
+                                if (FileUtil.isPDFFile(filename)
+                                        && GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(
+                                                dialogService,
+                                                preferences.getGrobidPreferences())) {
+                                    importFormatReader.reset();
+                                }
+                                dialogService.notify(
+                                        Localization.lang(
+                                                "Importing file %0 as unknown format",
+                                                filename.getFileName().toString()));
+                            });
                     // This import method never throws an IOException
-                    imports.add(importFormatReader.importUnknownFormat(filename, fileUpdateMonitor));
+                    imports.add(
+                            importFormatReader.importUnknownFormat(filename, fileUpdateMonitor));
                 } else {
-                    UiTaskExecutor.runAndWaitInJavaFXThread(() -> {
-                        if (((importer.get() instanceof PdfGrobidImporter)
-                                || (importer.get() instanceof PdfMergeMetadataImporter))
-                                && GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferences.getGrobidPreferences())) {
-                            importFormatReader.reset();
-                        }
-                        dialogService.notify(Localization.lang("Importing in %0 format", importer.get().getName()) + "...");
-                    });
+                    UiTaskExecutor.runAndWaitInJavaFXThread(
+                            () -> {
+                                if (((importer.get() instanceof PdfGrobidImporter)
+                                                || (importer.get()
+                                                        instanceof PdfMergeMetadataImporter))
+                                        && GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(
+                                                dialogService,
+                                                preferences.getGrobidPreferences())) {
+                                    importFormatReader.reset();
+                                }
+                                dialogService.notify(
+                                        Localization.lang(
+                                                        "Importing in %0 format",
+                                                        importer.get().getName())
+                                                + "...");
+                            });
                     // Specific importer
                     ParserResult pr = importer.get().importDatabase(filename);
-                    imports.add(new ImportFormatReader.UnknownFormatImport(importer.get().getName(), pr));
+                    imports.add(
+                            new ImportFormatReader.UnknownFormatImport(
+                                    importer.get().getName(), pr));
                 }
             } catch (ImportException ex) {
                 UiTaskExecutor.runAndWaitInJavaFXThread(
-                        () -> dialogService.showWarningDialogAndWait(
-                                Localization.lang("Import error"),
-                                Localization.lang("Please check your library file for wrong syntax.")
-                                + "\n\n"
-                                + ex.getLocalizedMessage()));
+                        () ->
+                                dialogService.showWarningDialogAndWait(
+                                        Localization.lang("Import error"),
+                                        Localization.lang(
+                                                        "Please check your library file for wrong syntax.")
+                                                + "\n\n"
+                                                + ex.getLocalizedMessage()));
             }
         }
 
         if (imports.isEmpty()) {
             UiTaskExecutor.runAndWaitInJavaFXThread(
-                    () -> dialogService.showWarningDialogAndWait(
-                            Localization.lang("Import error"),
-                            Localization.lang("No entries found. Please make sure you are using the correct import filter.")));
+                    () ->
+                            dialogService.showWarningDialogAndWait(
+                                    Localization.lang("Import error"),
+                                    Localization.lang(
+                                            "No entries found. Please make sure you are using the correct import filter.")));
 
             return new ParserResult();
         }
@@ -202,17 +251,26 @@ public ParserResult mergeImportResults(List<ImportFormatReader.UnknownFormatImpo
 
             if (ImportFormatReader.BIBTEX_FORMAT.equals(importResult.format())) {
                 // additional treatment of BibTeX
-                new DatabaseMerger(preferences.getBibEntryPreferences().getKeywordSeparator()).mergeMetaData(
-                        result.getMetaData(),
-                        parserResult.getMetaData(),
-                        importResult.parserResult().getPath().map(path -> path.getFileName().toString()).orElse("unknown"),
-                        parserResult.getDatabase().getEntries());
+                new DatabaseMerger(preferences.getBibEntryPreferences().getKeywordSeparator())
+                        .mergeMetaData(
+                                result.getMetaData(),
+                                parserResult.getMetaData(),
+                                importResult
+                                        .parserResult()
+                                        .getPath()
+                                        .map(path -> path.getFileName().toString())
+                                        .orElse("unknown"),
+                                parserResult.getDatabase().getEntries());
             }
-            // TODO: collect errors into ParserResult, because they are currently ignored (see caller of this method)
+            // TODO: collect errors into ParserResult, because they are currently ignored (see
+            // caller of this method)
         }
 
         // set timestamp and owner
-        UpdateField.setAutomaticFields(resultDatabase.getEntries(), preferences.getOwnerPreferences(), preferences.getTimestampPreferences()); // set timestamp and owner
+        UpdateField.setAutomaticFields(
+                resultDatabase.getEntries(),
+                preferences.getOwnerPreferences(),
+                preferences.getTimestampPreferences()); // set timestamp and owner
 
         return result;
     }
diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java
index 849478abb0b6..7266dcf5fc7a 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java
@@ -1,6 +1,8 @@
 package org.jabref.gui.importer;
 
-import java.util.List;
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
 
 import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
@@ -8,15 +10,14 @@
 import javafx.scene.control.cell.CheckBoxListCell;
 import javafx.scene.layout.VBox;
 
+import org.controlsfx.control.CheckListView;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntryType;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-import org.controlsfx.control.CheckListView;
+import java.util.List;
 
 public class ImportCustomEntryTypesDialog extends BaseDialog<Void> {
 
@@ -35,20 +36,24 @@ public ImportCustomEntryTypesDialog(BibDatabaseMode mode, List<BibEntryType> cus
         this.mode = mode;
         this.customEntryTypes = customEntryTypes;
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
-        setResultConverter(btn -> {
-            if (btn == ButtonType.OK) {
-                viewModel.importBibEntryTypes(
-                        unknownEntryTypesCheckList.getCheckModel().getCheckedItems(),
-                        differentCustomizationCheckList.getCheckModel().getCheckedItems().stream()
-                                .map(BibEntryTypePrefsAndFileViewModel::customTypeFromPreferences)
-                                .toList());
-            }
-            return null;
-        });
+        setResultConverter(
+                btn -> {
+                    if (btn == ButtonType.OK) {
+                        viewModel.importBibEntryTypes(
+                                unknownEntryTypesCheckList.getCheckModel().getCheckedItems(),
+                                differentCustomizationCheckList
+                                        .getCheckModel()
+                                        .getCheckedItems()
+                                        .stream()
+                                        .map(
+                                                BibEntryTypePrefsAndFileViewModel
+                                                        ::customTypeFromPreferences)
+                                        .toList());
+                    }
+                    return null;
+                });
 
         setTitle(Localization.lang("Custom entry types"));
     }
@@ -56,16 +61,25 @@ public ImportCustomEntryTypesDialog(BibDatabaseMode mode, List<BibEntryType> cus
     @FXML
     public void initialize() {
         viewModel = new ImportCustomEntryTypesDialogViewModel(mode, customEntryTypes, preferences);
-        boxDifferentCustomization.visibleProperty().bind(Bindings.isNotEmpty(viewModel.differentCustomizations()));
-        boxDifferentCustomization.managedProperty().bind(Bindings.isNotEmpty(viewModel.differentCustomizations()));
+        boxDifferentCustomization
+                .visibleProperty()
+                .bind(Bindings.isNotEmpty(viewModel.differentCustomizations()));
+        boxDifferentCustomization
+                .managedProperty()
+                .bind(Bindings.isNotEmpty(viewModel.differentCustomizations()));
         unknownEntryTypesCheckList.setItems(viewModel.newTypes());
-        unknownEntryTypesCheckList.setCellFactory(listView -> new CheckBoxListCell<>(unknownEntryTypesCheckList::getItemBooleanProperty) {
-            @Override
-            public void updateItem(BibEntryType bibEntryType, boolean empty) {
-                super.updateItem(bibEntryType, empty);
-                setText(bibEntryType == null ? "" : bibEntryType.getType().getDisplayName());
-            }
-        });
+        unknownEntryTypesCheckList.setCellFactory(
+                listView ->
+                        new CheckBoxListCell<>(unknownEntryTypesCheckList::getItemBooleanProperty) {
+                            @Override
+                            public void updateItem(BibEntryType bibEntryType, boolean empty) {
+                                super.updateItem(bibEntryType, empty);
+                                setText(
+                                        bibEntryType == null
+                                                ? ""
+                                                : bibEntryType.getType().getDisplayName());
+                            }
+                        });
         differentCustomizationCheckList.setItems(viewModel.differentCustomizations());
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java
index b7aa3063effd..b9d5645a2c29 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.importer;
 
-import java.util.List;
-import java.util.Optional;
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -11,35 +10,44 @@
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.types.EntryTypeFactory;
-
-import com.airhacks.afterburner.injection.Injector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Optional;
+
 public class ImportCustomEntryTypesDialogViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ImportCustomEntryTypesDialogViewModel.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(ImportCustomEntryTypesDialogViewModel.class);
 
     private final BibDatabaseMode mode;
     private final CliPreferences preferences;
 
     private final ObservableList<BibEntryType> newTypes = FXCollections.observableArrayList();
-    private final ObservableList<BibEntryTypePrefsAndFileViewModel> differentCustomizationTypes = FXCollections.observableArrayList();
+    private final ObservableList<BibEntryTypePrefsAndFileViewModel> differentCustomizationTypes =
+            FXCollections.observableArrayList();
 
-    public ImportCustomEntryTypesDialogViewModel(BibDatabaseMode mode, List<BibEntryType> entryTypes, CliPreferences preferences) {
+    public ImportCustomEntryTypesDialogViewModel(
+            BibDatabaseMode mode, List<BibEntryType> entryTypes, CliPreferences preferences) {
         this.mode = mode;
         this.preferences = preferences;
 
-        BibEntryTypesManager entryTypesManager = Injector.instantiateModelOrService(BibEntryTypesManager.class);
+        BibEntryTypesManager entryTypesManager =
+                Injector.instantiateModelOrService(BibEntryTypesManager.class);
         for (BibEntryType customType : entryTypes) {
-            Optional<BibEntryType> currentlyStoredType = entryTypesManager.enrich(customType.getType(), mode);
+            Optional<BibEntryType> currentlyStoredType =
+                    entryTypesManager.enrich(customType.getType(), mode);
             if (currentlyStoredType.isEmpty()) {
                 newTypes.add(customType);
             } else {
-                if (!EntryTypeFactory.nameAndFieldsAreEqual(customType, currentlyStoredType.get())) {
+                if (!EntryTypeFactory.nameAndFieldsAreEqual(
+                        customType, currentlyStoredType.get())) {
                     LOGGER.info("currently stored type:    {}", currentlyStoredType.get());
                     LOGGER.info("type provided by library: {}", customType);
-                    differentCustomizationTypes.add(new BibEntryTypePrefsAndFileViewModel(currentlyStoredType.get(), customType));
+                    differentCustomizationTypes.add(
+                            new BibEntryTypePrefsAndFileViewModel(
+                                    currentlyStoredType.get(), customType));
                 }
             }
         }
@@ -53,14 +61,19 @@ public ObservableList<BibEntryTypePrefsAndFileViewModel> differentCustomizations
         return this.differentCustomizationTypes;
     }
 
-    public void importBibEntryTypes(List<BibEntryType> checkedUnknownEntryTypes, List<BibEntryType> checkedDifferentEntryTypes) {
-        BibEntryTypesManager entryTypesManager = Injector.instantiateModelOrService(BibEntryTypesManager.class);
+    public void importBibEntryTypes(
+            List<BibEntryType> checkedUnknownEntryTypes,
+            List<BibEntryType> checkedDifferentEntryTypes) {
+        BibEntryTypesManager entryTypesManager =
+                Injector.instantiateModelOrService(BibEntryTypesManager.class);
         if (!checkedUnknownEntryTypes.isEmpty()) {
-            checkedUnknownEntryTypes.forEach(type -> entryTypesManager.addCustomOrModifiedType(type, mode));
+            checkedUnknownEntryTypes.forEach(
+                    type -> entryTypesManager.addCustomOrModifiedType(type, mode));
             preferences.storeCustomEntryTypesRepository(entryTypesManager);
         }
         if (!checkedDifferentEntryTypes.isEmpty()) {
-            checkedUnknownEntryTypes.forEach(type -> entryTypesManager.addCustomOrModifiedType(type, mode));
+            checkedUnknownEntryTypes.forEach(
+                    type -> entryTypesManager.addCustomOrModifiedType(type, mode));
             preferences.storeCustomEntryTypesRepository(entryTypesManager);
         }
     }
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index 46298d897a17..5468625322ed 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -1,8 +1,9 @@
 package org.jabref.gui.importer;
 
-import java.util.Optional;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
 
-import javax.swing.undo.UndoManager;
+import jakarta.inject.Inject;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -27,6 +28,8 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 
+import org.controlsfx.control.CheckListView;
+import org.fxmisc.richtext.CodeArea;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.entryeditor.citationrelationtab.BibEntryView;
@@ -46,11 +49,9 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
-import org.controlsfx.control.CheckListView;
-import org.fxmisc.richtext.CodeArea;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
 
 public class ImportEntriesDialog extends BaseDialog<Boolean> {
 
@@ -86,30 +87,43 @@ public class ImportEntriesDialog extends BaseDialog<Boolean> {
     public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserResult> task) {
         this.database = database;
         this.task = task;
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
-        BooleanBinding booleanBind = Bindings.isEmpty(entriesListView.getCheckModel().getCheckedItems());
+        BooleanBinding booleanBind =
+                Bindings.isEmpty(entriesListView.getCheckModel().getCheckedItems());
         Button btn = (Button) this.getDialogPane().lookupButton(importButton);
         btn.disableProperty().bind(booleanBind);
 
-        downloadLinkedOnlineFiles.setSelected(preferences.getFilePreferences().shouldDownloadLinkedFiles());
+        downloadLinkedOnlineFiles.setSelected(
+                preferences.getFilePreferences().shouldDownloadLinkedFiles());
 
-        setResultConverter(button -> {
-            if (button == importButton) {
-                viewModel.importEntries(entriesListView.getCheckModel().getCheckedItems(), downloadLinkedOnlineFiles.isSelected());
-            } else {
-                dialogService.notify(Localization.lang("Import canceled"));
-            }
+        setResultConverter(
+                button -> {
+                    if (button == importButton) {
+                        viewModel.importEntries(
+                                entriesListView.getCheckModel().getCheckedItems(),
+                                downloadLinkedOnlineFiles.isSelected());
+                    } else {
+                        dialogService.notify(Localization.lang("Import canceled"));
+                    }
 
-            return false;
-        });
+                    return false;
+                });
     }
 
     @FXML
     private void initialize() {
-        viewModel = new ImportEntriesViewModel(task, taskExecutor, database, dialogService, undoManager, preferences, stateManager, entryTypesManager, fileUpdateMonitor);
+        viewModel =
+                new ImportEntriesViewModel(
+                        task,
+                        taskExecutor,
+                        database,
+                        dialogService,
+                        undoManager,
+                        preferences,
+                        stateManager,
+                        entryTypesManager,
+                        fileUpdateMonitor);
         Label placeholder = new Label();
         placeholder.textProperty().bind(viewModel.messageProperty());
         entriesListView.setPlaceholder(placeholder);
@@ -118,69 +132,103 @@ private void initialize() {
         libraryListView.setEditable(false);
         libraryListView.getItems().addAll(stateManager.getOpenDatabases());
         new ViewModelListCellFactory<BibDatabaseContext>()
-                .withText(database -> {
-                    Optional<String> dbOpt = Optional.empty();
-                    if (database.getDatabasePath().isPresent()) {
-                        dbOpt = FileUtil.getUniquePathFragment(stateManager.collectAllDatabasePaths(), database.getDatabasePath().get());
-                    }
-                    if (database.getLocation() == DatabaseLocation.SHARED) {
-                        return database.getDBMSSynchronizer().getDBName() + " [" + Localization.lang("shared") + "]";
-                    }
+                .withText(
+                        database -> {
+                            Optional<String> dbOpt = Optional.empty();
+                            if (database.getDatabasePath().isPresent()) {
+                                dbOpt =
+                                        FileUtil.getUniquePathFragment(
+                                                stateManager.collectAllDatabasePaths(),
+                                                database.getDatabasePath().get());
+                            }
+                            if (database.getLocation() == DatabaseLocation.SHARED) {
+                                return database.getDBMSSynchronizer().getDBName()
+                                        + " ["
+                                        + Localization.lang("shared")
+                                        + "]";
+                            }
 
-                    return dbOpt.orElseGet(() -> Localization.lang("untitled"));
-                })
+                            return dbOpt.orElseGet(() -> Localization.lang("untitled"));
+                        })
                 .install(libraryListView);
-        viewModel.selectedDbProperty().bind(libraryListView.getSelectionModel().selectedItemProperty());
-        stateManager.getActiveDatabase().ifPresent(database1 -> libraryListView.getSelectionModel().select(database1));
+        viewModel
+                .selectedDbProperty()
+                .bind(libraryListView.getSelectionModel().selectedItemProperty());
+        stateManager
+                .getActiveDatabase()
+                .ifPresent(database1 -> libraryListView.getSelectionModel().select(database1));
 
         PseudoClass entrySelected = PseudoClass.getPseudoClass("selected");
         new ViewModelListCellFactory<BibEntry>()
-                .withGraphic(entry -> {
-                    ToggleButton addToggle = IconTheme.JabRefIcons.ADD.asToggleButton();
-                    EasyBind.subscribe(addToggle.selectedProperty(), selected -> {
-                        if (selected) {
-                            addToggle.setGraphic(IconTheme.JabRefIcons.ADD_FILLED.withColor(IconTheme.SELECTED_COLOR).getGraphicNode());
-                        } else {
-                            addToggle.setGraphic(IconTheme.JabRefIcons.ADD.getGraphicNode());
-                        }
-                    });
-                    addToggle.getStyleClass().add("addEntryButton");
-                    addToggle.selectedProperty().bindBidirectional(entriesListView.getItemBooleanProperty(entry));
-                    HBox separator = new HBox();
-                    HBox.setHgrow(separator, Priority.SOMETIMES);
-                    Node entryNode = BibEntryView.getEntryNode(entry);
-                    HBox.setHgrow(entryNode, Priority.ALWAYS);
-                    HBox container = new HBox(entryNode, separator, addToggle);
-                    container.getStyleClass().add("entry-container");
-                    container.prefWidthProperty().bind(entriesListView.widthProperty().subtract(25));
-
-                    BackgroundTask.wrap(() -> viewModel.hasDuplicate(entry)).onSuccess(duplicateFound -> {
-                        if (duplicateFound) {
-                            Node icon = IconTheme.JabRefIcons.ERROR.getGraphicNode();
-                            Tooltip tooltip = new Tooltip(Localization.lang("Possible duplicate of existing entry. Will be resolved on import."));
-                            Tooltip.install(icon, tooltip);
-                            container.getChildren().add(icon);
-                        }
-                    }).executeWith(taskExecutor);
-
-                    /*
-                    inserted the if-statement here, since a Platform.runLater() call did not work.
-                    also tried to move it to the end of the initialize method, but it did not select the entry.
-                    */
-                    if (entriesListView.getItems().size() == 1) {
-                        selectAllNewEntries();
-                    }
+                .withGraphic(
+                        entry -> {
+                            ToggleButton addToggle = IconTheme.JabRefIcons.ADD.asToggleButton();
+                            EasyBind.subscribe(
+                                    addToggle.selectedProperty(),
+                                    selected -> {
+                                        if (selected) {
+                                            addToggle.setGraphic(
+                                                    IconTheme.JabRefIcons.ADD_FILLED
+                                                            .withColor(IconTheme.SELECTED_COLOR)
+                                                            .getGraphicNode());
+                                        } else {
+                                            addToggle.setGraphic(
+                                                    IconTheme.JabRefIcons.ADD.getGraphicNode());
+                                        }
+                                    });
+                            addToggle.getStyleClass().add("addEntryButton");
+                            addToggle
+                                    .selectedProperty()
+                                    .bindBidirectional(
+                                            entriesListView.getItemBooleanProperty(entry));
+                            HBox separator = new HBox();
+                            HBox.setHgrow(separator, Priority.SOMETIMES);
+                            Node entryNode = BibEntryView.getEntryNode(entry);
+                            HBox.setHgrow(entryNode, Priority.ALWAYS);
+                            HBox container = new HBox(entryNode, separator, addToggle);
+                            container.getStyleClass().add("entry-container");
+                            container
+                                    .prefWidthProperty()
+                                    .bind(entriesListView.widthProperty().subtract(25));
+
+                            BackgroundTask.wrap(() -> viewModel.hasDuplicate(entry))
+                                    .onSuccess(
+                                            duplicateFound -> {
+                                                if (duplicateFound) {
+                                                    Node icon =
+                                                            IconTheme.JabRefIcons.ERROR
+                                                                    .getGraphicNode();
+                                                    Tooltip tooltip =
+                                                            new Tooltip(
+                                                                    Localization.lang(
+                                                                            "Possible duplicate of existing entry. Will be resolved on import."));
+                                                    Tooltip.install(icon, tooltip);
+                                                    container.getChildren().add(icon);
+                                                }
+                                            })
+                                    .executeWith(taskExecutor);
+
+                            /*
+                            inserted the if-statement here, since a Platform.runLater() call did not work.
+                            also tried to move it to the end of the initialize method, but it did not select the entry.
+                            */
+                            if (entriesListView.getItems().size() == 1) {
+                                selectAllNewEntries();
+                            }
 
-                    return container;
-                })
-                .withOnMouseClickedEvent((entry, event) -> {
-                    entriesListView.getCheckModel().toggleCheckState(entry);
-                    displayBibTeX(entry, viewModel.getSourceString(entry));
-                })
+                            return container;
+                        })
+                .withOnMouseClickedEvent(
+                        (entry, event) -> {
+                            entriesListView.getCheckModel().toggleCheckState(entry);
+                            displayBibTeX(entry, viewModel.getSourceString(entry));
+                        })
                 .withPseudoClass(entrySelected, entriesListView::getItemBooleanProperty)
                 .install(entriesListView);
 
-        selectedItems.textProperty().bind(Bindings.size(entriesListView.getCheckModel().getCheckedItems()).asString());
+        selectedItems
+                .textProperty()
+                .bind(Bindings.size(entriesListView.getCheckModel().getCheckedItems()).asString());
         totalItems.textProperty().bind(Bindings.size(entriesListView.getItems()).asString());
         entriesListView.setSelectionModel(new NoSelectionModel<>());
         initBibTeX();
@@ -199,12 +247,21 @@ private void displayBibTeX(BibEntry entry, String bibTeX) {
 
     private void initBibTeX() {
         bibTeXDataLabel.setText(Localization.lang("%0 source", "BibTeX"));
-        bibTeXData.setBorder(new Border(new BorderStroke(Color.GREY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
+        bibTeXData.setBorder(
+                new Border(
+                        new BorderStroke(
+                                Color.GREY,
+                                BorderStrokeStyle.SOLID,
+                                CornerRadii.EMPTY,
+                                BorderWidths.DEFAULT)));
         bibTeXData.setPadding(new Insets(5.0));
-        showEntryInformation.selectedProperty().addListener((observableValue, old_val, new_val) -> {
-            bibTeXDataBox.setVisible(new_val);
-            bibTeXDataBox.setManaged(new_val);
-        });
+        showEntryInformation
+                .selectedProperty()
+                .addListener(
+                        (observableValue, old_val, new_val) -> {
+                            bibTeXDataBox.setVisible(new_val);
+                            bibTeXDataBox.setManaged(new_val);
+                        });
     }
 
     public void unselectAll() {
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
index 383483154561..5ba08bacbf3b 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -1,12 +1,5 @@
 package org.jabref.gui.importer;
 
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -33,10 +26,16 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.List;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
+
 public class ImportEntriesViewModel extends AbstractViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImportEntriesViewModel.class);
@@ -58,15 +57,16 @@ public class ImportEntriesViewModel extends AbstractViewModel {
      * @param databaseContext the database to import into
      * @param task            the task executed for parsing the selected files(s).
      */
-    public ImportEntriesViewModel(BackgroundTask<ParserResult> task,
-                                  TaskExecutor taskExecutor,
-                                  BibDatabaseContext databaseContext,
-                                  DialogService dialogService,
-                                  UndoManager undoManager,
-                                  GuiPreferences preferences,
-                                  StateManager stateManager,
-                                  BibEntryTypesManager entryTypesManager,
-                                  FileUpdateMonitor fileUpdateMonitor) {
+    public ImportEntriesViewModel(
+            BackgroundTask<ParserResult> task,
+            TaskExecutor taskExecutor,
+            BibDatabaseContext databaseContext,
+            DialogService dialogService,
+            UndoManager undoManager,
+            GuiPreferences preferences,
+            StateManager stateManager,
+            BibEntryTypesManager entryTypesManager,
+            FileUpdateMonitor fileUpdateMonitor) {
         this.taskExecutor = taskExecutor;
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
@@ -80,18 +80,25 @@ public ImportEntriesViewModel(BackgroundTask<ParserResult> task,
         this.message.bind(task.messageProperty());
         this.selectedDb = new SimpleObjectProperty<>();
 
-        task.onSuccess(parserResult -> {
-            // store the complete parser result (to import groups, ... later on)
-            this.parserResult = parserResult;
-            // fill in the list for the user, where one can select the entries to import
-            entries.addAll(parserResult.getDatabase().getEntries());
-            if (entries.isEmpty()) {
-                task.updateMessage(Localization.lang("No entries corresponding to given query"));
-            }
-        }).onFailure(ex -> {
-            LOGGER.error("Error importing", ex);
-            dialogService.showErrorDialogAndWait(ex);
-        }).executeWith(taskExecutor);
+        task.onSuccess(
+                        parserResult -> {
+                            // store the complete parser result (to import groups, ... later on)
+                            this.parserResult = parserResult;
+                            // fill in the list for the user, where one can select the entries to
+                            // import
+                            entries.addAll(parserResult.getDatabase().getEntries());
+                            if (entries.isEmpty()) {
+                                task.updateMessage(
+                                        Localization.lang(
+                                                "No entries corresponding to given query"));
+                            }
+                        })
+                .onFailure(
+                        ex -> {
+                            LOGGER.error("Error importing", ex);
+                            dialogService.showErrorDialogAndWait(ex);
+                        })
+                .executeWith(taskExecutor);
     }
 
     public String getMessage() {
@@ -115,9 +122,13 @@ public ObservableList<BibEntry> getEntries() {
     }
 
     public boolean hasDuplicate(BibEntry entry) {
-        return findInternalDuplicate(entry).isPresent() ||
-                new DuplicateCheck(entryTypesManager)
-                .containsDuplicate(selectedDb.getValue().getDatabase(), entry, selectedDb.getValue().getMode()).isPresent();
+        return findInternalDuplicate(entry).isPresent()
+                || new DuplicateCheck(entryTypesManager)
+                        .containsDuplicate(
+                                selectedDb.getValue().getDatabase(),
+                                entry,
+                                selectedDb.getValue().getMode())
+                        .isPresent();
     }
 
     public String getSourceString(BibEntry entry) {
@@ -125,7 +136,8 @@ public String getSourceString(BibEntry entry) {
         BibWriter bibWriter = new BibWriter(writer, OS.NEWLINE);
         FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(preferences.getFieldPreferences());
         try {
-            new BibEntryWriter(fieldWriter, entryTypesManager).write(entry, bibWriter, selectedDb.getValue().getMode());
+            new BibEntryWriter(fieldWriter, entryTypesManager)
+                    .write(entry, bibWriter, selectedDb.getValue().getMode());
         } catch (IOException ioException) {
             return "";
         }
@@ -141,27 +153,31 @@ public void importEntries(List<BibEntry> entriesToImport, boolean shouldDownload
         // Remember the selection in the dialog
         preferences.getFilePreferences().setDownloadLinkedFiles(shouldDownloadFiles);
 
-        new DatabaseMerger(preferences.getBibEntryPreferences().getKeywordSeparator()).mergeStrings(
-                databaseContext.getDatabase(),
-                parserResult.getDatabase());
-        new DatabaseMerger(preferences.getBibEntryPreferences().getKeywordSeparator()).mergeMetaData(
-                databaseContext.getMetaData(),
-                parserResult.getMetaData(),
-                parserResult.getPath().map(path -> path.getFileName().toString()).orElse("unknown"),
-                parserResult.getDatabase().getEntries());
+        new DatabaseMerger(preferences.getBibEntryPreferences().getKeywordSeparator())
+                .mergeStrings(databaseContext.getDatabase(), parserResult.getDatabase());
+        new DatabaseMerger(preferences.getBibEntryPreferences().getKeywordSeparator())
+                .mergeMetaData(
+                        databaseContext.getMetaData(),
+                        parserResult.getMetaData(),
+                        parserResult
+                                .getPath()
+                                .map(path -> path.getFileName().toString())
+                                .orElse("unknown"),
+                        parserResult.getDatabase().getEntries());
 
         buildImportHandlerThenImportEntries(entriesToImport);
     }
 
     private void buildImportHandlerThenImportEntries(List<BibEntry> entriesToImport) {
-        ImportHandler importHandler = new ImportHandler(
-                selectedDb.getValue(),
-                preferences,
-                fileUpdateMonitor,
-                undoManager,
-                stateManager,
-                dialogService,
-                taskExecutor);
+        ImportHandler importHandler =
+                new ImportHandler(
+                        selectedDb.getValue(),
+                        preferences,
+                        fileUpdateMonitor,
+                        undoManager,
+                        stateManager,
+                        dialogService,
+                        taskExecutor);
         importHandler.importEntriesWithDuplicateCheck(selectedDb.getValue(), entriesToImport);
     }
 
@@ -176,7 +192,8 @@ private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
             if (othEntry.equals(entry)) {
                 continue; // Don't compare the entry to itself
             }
-            if (new DuplicateCheck(entryTypesManager).isDuplicate(entry, othEntry, databaseContext.getMode())) {
+            if (new DuplicateCheck(entryTypesManager)
+                    .isDuplicate(entry, othEntry, databaseContext.getMode())) {
                 return Optional.of(othEntry);
             }
         }
diff --git a/src/main/java/org/jabref/gui/importer/NewEntryAction.java b/src/main/java/org/jabref/gui/importer/NewEntryAction.java
index 1da8291e9f20..ae4db2df80b7 100644
--- a/src/main/java/org/jabref/gui/importer/NewEntryAction.java
+++ b/src/main/java/org/jabref/gui/importer/NewEntryAction.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.importer;
 
-import java.util.Optional;
-import java.util.function.Supplier;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
@@ -12,10 +9,12 @@
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.EntryType;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Optional;
+import java.util.function.Supplier;
+
 public class NewEntryAction extends SimpleCommand {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NewEntryAction.class);
@@ -31,7 +30,11 @@ public class NewEntryAction extends SimpleCommand {
 
     private final GuiPreferences preferences;
 
-    public NewEntryAction(Supplier<LibraryTab> tabSupplier, DialogService dialogService, GuiPreferences preferences, StateManager stateManager) {
+    public NewEntryAction(
+            Supplier<LibraryTab> tabSupplier,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            StateManager stateManager) {
         this.tabSupplier = tabSupplier;
         this.dialogService = dialogService;
         this.preferences = preferences;
@@ -41,7 +44,12 @@ public NewEntryAction(Supplier<LibraryTab> tabSupplier, DialogService dialogServ
         this.executable.bind(ActionHelper.needsDatabase(stateManager));
     }
 
-    public NewEntryAction(Supplier<LibraryTab> tabSupplier, EntryType type, DialogService dialogService, GuiPreferences preferences, StateManager stateManager) {
+    public NewEntryAction(
+            Supplier<LibraryTab> tabSupplier,
+            EntryType type,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            StateManager stateManager) {
         this(tabSupplier, dialogService, preferences, stateManager);
         this.type = Optional.ofNullable(type);
     }
@@ -56,8 +64,10 @@ public void execute() {
         if (type.isPresent()) {
             tabSupplier.get().insertEntry(new BibEntry(type.get()));
         } else {
-            EntryTypeView typeChoiceDialog = new EntryTypeView(tabSupplier.get(), dialogService, preferences);
-            EntryType selectedType = dialogService.showCustomDialogAndWait(typeChoiceDialog).orElse(null);
+            EntryTypeView typeChoiceDialog =
+                    new EntryTypeView(tabSupplier.get(), dialogService, preferences);
+            EntryType selectedType =
+                    dialogService.showCustomDialogAndWait(typeChoiceDialog).orElse(null);
             if (selectedType == null) {
                 return;
             }
diff --git a/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java b/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java
index 63ae19877bdf..45b381a8f433 100644
--- a/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java
@@ -1,27 +1,26 @@
 package org.jabref.gui.importer;
 
-import java.util.List;
-import java.util.Objects;
-
 import org.jabref.gui.DialogService;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.List;
+import java.util.Objects;
+
 /**
  * Class for generating a dialog showing warnings from ParserResult
  */
 public class ParserResultWarningDialog {
 
-    private ParserResultWarningDialog() {
-    }
+    private ParserResultWarningDialog() {}
 
     /**
      * Shows a dialog with the warnings from an import or open of a file
      *
      * @param parserResult   - ParserResult for the current import/open
      */
-    public static void showParserResultWarningDialog(final ParserResult parserResult,
-                                                     final DialogService dialogService) {
+    public static void showParserResultWarningDialog(
+            final ParserResult parserResult, final DialogService dialogService) {
         Objects.requireNonNull(parserResult);
         // Return if no warnings
         if (!parserResult.hasWarnings()) {
@@ -42,7 +41,11 @@ public static void showParserResultWarningDialog(final ParserResult parserResult
         if (parserResult.getPath().isEmpty()) {
             dialogTitle = Localization.lang("Warnings");
         } else {
-            dialogTitle = Localization.lang("Warnings") + " (" + parserResult.getPath().get().getFileName() + ")";
+            dialogTitle =
+                    Localization.lang("Warnings")
+                            + " ("
+                            + parserResult.getPath().get().getFileName()
+                            + ")";
         }
 
         // Show dialog
diff --git a/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java b/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
index 68b086f4ba8a..1504cc3417ad 100644
--- a/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.importer.actions;
 
-import java.util.List;
-import java.util.stream.Collectors;
+import com.airhacks.afterburner.injection.Injector;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.importer.ImportCustomEntryTypesDialog;
@@ -12,7 +11,8 @@
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypesManager;
 
-import com.airhacks.afterburner.injection.Injector;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * This action checks whether any new custom entry types were loaded from this
@@ -22,27 +22,36 @@ public class CheckForNewEntryTypesAction implements GUIPostOpenAction {
 
     @Override
     public boolean isActionNecessary(ParserResult parserResult, CliPreferences preferences) {
-        return !getListOfUnknownAndUnequalCustomizations(parserResult, preferences.getLibraryPreferences()).isEmpty();
+        return !getListOfUnknownAndUnequalCustomizations(
+                        parserResult, preferences.getLibraryPreferences())
+                .isEmpty();
     }
 
     @Override
-    public void performAction(ParserResult parserResult, DialogService dialogService, CliPreferences preferencesService) {
+    public void performAction(
+            ParserResult parserResult,
+            DialogService dialogService,
+            CliPreferences preferencesService) {
         LibraryPreferences preferences = preferencesService.getLibraryPreferences();
         BibDatabaseMode mode = getBibDatabaseModeFromParserResult(parserResult, preferences);
-        dialogService.showCustomDialogAndWait(new ImportCustomEntryTypesDialog(mode, getListOfUnknownAndUnequalCustomizations(parserResult, preferences)));
+        dialogService.showCustomDialogAndWait(
+                new ImportCustomEntryTypesDialog(
+                        mode, getListOfUnknownAndUnequalCustomizations(parserResult, preferences)));
     }
 
-    private List<BibEntryType> getListOfUnknownAndUnequalCustomizations(ParserResult parserResult, LibraryPreferences preferences) {
+    private List<BibEntryType> getListOfUnknownAndUnequalCustomizations(
+            ParserResult parserResult, LibraryPreferences preferences) {
         BibDatabaseMode mode = getBibDatabaseModeFromParserResult(parserResult, preferences);
-        BibEntryTypesManager entryTypesManager = Injector.instantiateModelOrService(BibEntryTypesManager.class);
+        BibEntryTypesManager entryTypesManager =
+                Injector.instantiateModelOrService(BibEntryTypesManager.class);
 
-        return parserResult.getEntryTypes()
-                           .stream()
-                           .filter(type -> entryTypesManager.isDifferentCustomOrModifiedType(type, mode))
-                           .collect(Collectors.toList());
+        return parserResult.getEntryTypes().stream()
+                .filter(type -> entryTypesManager.isDifferentCustomOrModifiedType(type, mode))
+                .collect(Collectors.toList());
     }
 
-    private BibDatabaseMode getBibDatabaseModeFromParserResult(ParserResult parserResult, LibraryPreferences preferences) {
+    private BibDatabaseMode getBibDatabaseModeFromParserResult(
+            ParserResult parserResult, LibraryPreferences preferences) {
         return parserResult.getMetaData().getMode().orElse(preferences.getDefaultBibDatabaseMode());
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentAction.java b/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentAction.java
index 9ccec061d234..080d75813b11 100644
--- a/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentAction.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.importer.actions;
 
-import java.util.List;
-
 import org.jabref.gui.DialogService;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.migrations.MergeReviewIntoCommentMigration;
 import org.jabref.model.entry.BibEntry;
 
+import java.util.List;
+
 public class MergeReviewIntoCommentAction implements GUIPostOpenAction {
 
     @Override
@@ -16,12 +16,15 @@ public boolean isActionNecessary(ParserResult parserResult, CliPreferences prefe
     }
 
     @Override
-    public void performAction(ParserResult parserResult, DialogService dialogService, CliPreferences preferences) {
+    public void performAction(
+            ParserResult parserResult, DialogService dialogService, CliPreferences preferences) {
         MergeReviewIntoCommentMigration migration = new MergeReviewIntoCommentMigration();
 
         migration.performMigration(parserResult);
         List<BibEntry> conflicts = MergeReviewIntoCommentMigration.collectConflicts(parserResult);
-        if (!conflicts.isEmpty() && new MergeReviewIntoCommentConfirmationDialog(dialogService).askUserForMerge(conflicts)) {
+        if (!conflicts.isEmpty()
+                && new MergeReviewIntoCommentConfirmationDialog(dialogService)
+                        .askUserForMerge(conflicts)) {
             migration.performConflictingMigration(parserResult);
         }
     }
diff --git a/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentConfirmationDialog.java b/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentConfirmationDialog.java
index ece4bb4e079b..fc26de573b30 100644
--- a/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentConfirmationDialog.java
+++ b/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentConfirmationDialog.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.importer.actions;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import org.jabref.gui.DialogService;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class MergeReviewIntoCommentConfirmationDialog {
 
     private final DialogService dialogService;
@@ -17,22 +17,27 @@ public MergeReviewIntoCommentConfirmationDialog(DialogService dialogService) {
     }
 
     public boolean askUserForMerge(List<BibEntry> conflicts) {
-        String bibKeys = conflicts
-                .stream()
-                .map(BibEntry::getCitationKey)
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .collect(Collectors.joining(",\n"));
-
-        String content = bibKeys + " " +
-                Localization.lang("has/have both a 'Comment' and a 'Review' field.") + "\n" +
-                Localization.lang("Since the 'Review' field was deprecated in JabRef 4.2, these two fields are about to be merged into the 'Comment' field.") + "\n" +
-                Localization.lang("The conflicting fields of these entries will be merged into the 'Comment' field.");
+        String bibKeys =
+                conflicts.stream()
+                        .map(BibEntry::getCitationKey)
+                        .filter(Optional::isPresent)
+                        .map(Optional::get)
+                        .collect(Collectors.joining(",\n"));
+
+        String content =
+                bibKeys
+                        + " "
+                        + Localization.lang("has/have both a 'Comment' and a 'Review' field.")
+                        + "\n"
+                        + Localization.lang(
+                                "Since the 'Review' field was deprecated in JabRef 4.2, these two fields are about to be merged into the 'Comment' field.")
+                        + "\n"
+                        + Localization.lang(
+                                "The conflicting fields of these entries will be merged into the 'Comment' field.");
 
         return dialogService.showConfirmationDialogAndWait(
                 Localization.lang("Review Field Migration"),
                 content,
-                Localization.lang("Merge fields")
-        );
+                Localization.lang("Merge fields"));
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
index d30c7d79a3de..6419c4c557eb 100644
--- a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
@@ -1,17 +1,5 @@
 package org.jabref.gui.importer.actions;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
@@ -39,10 +27,21 @@
 import org.jabref.logic.util.io.FileHistory;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
+
 // The action concerned with opening an existing database.
 public class OpenDatabaseAction extends SimpleCommand {
 
@@ -50,14 +49,15 @@ public class OpenDatabaseAction extends SimpleCommand {
 
     // List of actions that may need to be called after opening the file. Such as
     // upgrade actions etc. that may depend on the JabRef version that wrote the file:
-    private static final List<GUIPostOpenAction> POST_OPEN_ACTIONS = List.of(
-            // Migrations:
-            // Warning for migrating the Review into the Comment field
-            new MergeReviewIntoCommentAction(),
-            // Check for new custom entry types loaded from the BIB file:
-            new CheckForNewEntryTypesAction(),
-            // Migrate search groups from Search.g4 to Lucene syntax
-            new SearchGroupsMigrationAction());
+    private static final List<GUIPostOpenAction> POST_OPEN_ACTIONS =
+            List.of(
+                    // Migrations:
+                    // Warning for migrating the Review into the Comment field
+                    new MergeReviewIntoCommentAction(),
+                    // Check for new custom entry types loaded from the BIB file:
+                    new CheckForNewEntryTypesAction(),
+                    // Migrate search groups from Search.g4 to Lucene syntax
+                    new SearchGroupsMigrationAction());
 
     private final LibraryTabContainer tabContainer;
     private final GuiPreferences preferences;
@@ -70,16 +70,17 @@ public class OpenDatabaseAction extends SimpleCommand {
     private final ClipBoardManager clipboardManager;
     private final TaskExecutor taskExecutor;
 
-    public OpenDatabaseAction(LibraryTabContainer tabContainer,
-                              GuiPreferences preferences,
-                              AiService aiService,
-                              DialogService dialogService,
-                              StateManager stateManager,
-                              FileUpdateMonitor fileUpdateMonitor,
-                              BibEntryTypesManager entryTypesManager,
-                              CountingUndoManager undoManager,
-                              ClipBoardManager clipBoardManager,
-                              TaskExecutor taskExecutor) {
+    public OpenDatabaseAction(
+            LibraryTabContainer tabContainer,
+            GuiPreferences preferences,
+            AiService aiService,
+            DialogService dialogService,
+            StateManager stateManager,
+            FileUpdateMonitor fileUpdateMonitor,
+            BibEntryTypesManager entryTypesManager,
+            CountingUndoManager undoManager,
+            ClipBoardManager clipBoardManager,
+            TaskExecutor taskExecutor) {
         this.tabContainer = tabContainer;
         this.preferences = preferences;
         this.aiService = aiService;
@@ -92,7 +93,8 @@ public OpenDatabaseAction(LibraryTabContainer tabContainer,
         this.taskExecutor = taskExecutor;
     }
 
-    public static void performPostOpenActions(ParserResult result, DialogService dialogService, CliPreferences preferences) {
+    public static void performPostOpenActions(
+            ParserResult result, DialogService dialogService, CliPreferences preferences) {
         for (GUIPostOpenAction action : OpenDatabaseAction.POST_OPEN_ACTIONS) {
             if (action.isActionNecessary(result, preferences)) {
                 action.performAction(result, dialogService, preferences);
@@ -102,13 +104,15 @@ public static void performPostOpenActions(ParserResult result, DialogService dia
 
     @Override
     public void execute() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.BIBTEX_DB)
-                .withDefaultExtension(StandardFileType.BIBTEX_DB)
-                .withInitialDirectory(getInitialDirectory())
-                .build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(StandardFileType.BIBTEX_DB)
+                        .withDefaultExtension(StandardFileType.BIBTEX_DB)
+                        .withInitialDirectory(getInitialDirectory())
+                        .build();
 
-        List<Path> filesToOpen = dialogService.showFileOpenDialogAndGetMultipleFiles(fileDialogConfiguration);
+        List<Path> filesToOpen =
+                dialogService.showFileOpenDialogAndGetMultipleFiles(fileDialogConfiguration);
         openFiles(new ArrayList<>(filesToOpen));
     }
 
@@ -119,8 +123,11 @@ private Path getInitialDirectory() {
         if (tabContainer.getLibraryTabs().isEmpty()) {
             return preferences.getFilePreferences().getWorkingDirectory();
         } else {
-            Optional<Path> databasePath = tabContainer.getCurrentLibraryTab().getBibDatabaseContext().getDatabasePath();
-            return databasePath.map(Path::getParent).orElse(preferences.getFilePreferences().getWorkingDirectory());
+            Optional<Path> databasePath =
+                    tabContainer.getCurrentLibraryTab().getBibDatabaseContext().getDatabasePath();
+            return databasePath
+                    .map(Path::getParent)
+                    .orElse(preferences.getFilePreferences().getWorkingDirectory());
         }
     }
 
@@ -150,7 +157,11 @@ public void openFiles(List<Path> filesToOpen) {
             Path file = iterator.next();
             for (LibraryTab libraryTab : tabContainer.getLibraryTabs()) {
                 if ((libraryTab.getBibDatabaseContext().getDatabasePath().isPresent())
-                        && libraryTab.getBibDatabaseContext().getDatabasePath().get().equals(file)) {
+                        && libraryTab
+                                .getBibDatabaseContext()
+                                .getDatabasePath()
+                                .get()
+                                .equals(file)) {
                     iterator.remove();
                     removed++;
                     // See if we removed the final one. If so, we must perhaps
@@ -168,11 +179,13 @@ public void openFiles(List<Path> filesToOpen) {
         // locking until the file is loaded.
         if (!filesToOpen.isEmpty()) {
             FileHistory fileHistory = preferences.getLastFilesOpenedPreferences().getFileHistory();
-            filesToOpen.forEach(theFile -> {
-                // This method will execute the concrete file opening and loading in a background thread
-                openTheFile(theFile);
-                fileHistory.newFile(theFile);
-            });
+            filesToOpen.forEach(
+                    theFile -> {
+                        // This method will execute the concrete file opening and loading in a
+                        // background thread
+                        openTheFile(theFile);
+                        fileHistory.newFile(theFile);
+                    });
         } else if (toRaise != null && tabContainer.getCurrentLibraryTab() == null) {
             // If no files are remaining to open, this could mean that a file was
             // already open. If so, we may have to raise the correct tab:
@@ -196,18 +209,19 @@ private void openTheFile(Path file) {
 
         BackgroundTask<ParserResult> backgroundTask = BackgroundTask.wrap(() -> loadDatabase(file));
         // The backgroundTask is executed within the method createLibraryTab
-        LibraryTab newTab = LibraryTab.createLibraryTab(
-                backgroundTask,
-                file,
-                dialogService,
-                preferences,
-                stateManager,
-                tabContainer,
-                fileUpdateMonitor,
-                entryTypesManager,
-                undoManager,
-                clipboardManager,
-                taskExecutor);
+        LibraryTab newTab =
+                LibraryTab.createLibraryTab(
+                        backgroundTask,
+                        file,
+                        dialogService,
+                        preferences,
+                        stateManager,
+                        tabContainer,
+                        fileUpdateMonitor,
+                        entryTypesManager,
+                        undoManager,
+                        clipboardManager,
+                        taskExecutor);
         tabContainer.addTab(newTab, true);
     }
 
@@ -222,24 +236,38 @@ private ParserResult loadDatabase(Path file) throws Exception {
         ParserResult parserResult = null;
         if (BackupManager.backupFileDiffers(fileToLoad, backupDir)) {
             // In case the backup differs, ask the user what to do.
-            // In case the user opted for restoring a backup, the content of the backup is contained in parserResult.
-            parserResult = BackupUIManager.showRestoreBackupDialog(dialogService, fileToLoad, preferences, fileUpdateMonitor, undoManager, stateManager)
-                                          .orElse(null);
+            // In case the user opted for restoring a backup, the content of the backup is contained
+            // in parserResult.
+            parserResult =
+                    BackupUIManager.showRestoreBackupDialog(
+                                    dialogService,
+                                    fileToLoad,
+                                    preferences,
+                                    fileUpdateMonitor,
+                                    undoManager,
+                                    stateManager)
+                            .orElse(null);
         }
 
         try {
             if (parserResult == null) {
                 // No backup was restored, do the "normal" loading
-                parserResult = OpenDatabase.loadDatabase(fileToLoad,
-                        preferences.getImportFormatPreferences(),
-                        fileUpdateMonitor);
+                parserResult =
+                        OpenDatabase.loadDatabase(
+                                fileToLoad,
+                                preferences.getImportFormatPreferences(),
+                                fileUpdateMonitor);
             }
 
             if (parserResult.hasWarnings()) {
-                String content = Localization.lang("Please check your library file for wrong syntax.")
-                        + "\n\n" + parserResult.getErrorMessage();
-                UiTaskExecutor.runInJavaFXThread(() ->
-                        dialogService.showWarningDialogAndWait(Localization.lang("Open library error"), content));
+                String content =
+                        Localization.lang("Please check your library file for wrong syntax.")
+                                + "\n\n"
+                                + parserResult.getErrorMessage();
+                UiTaskExecutor.runInJavaFXThread(
+                        () ->
+                                dialogService.showWarningDialogAndWait(
+                                        Localization.lang("Open library error"), content));
             }
         } catch (IOException e) {
             parserResult = ParserResult.fromError(e);
@@ -247,36 +275,8 @@ private ParserResult loadDatabase(Path file) throws Exception {
         }
 
         if (parserResult.getDatabase().isShared()) {
-                         openSharedDatabase(
-                                 parserResult,
-                                 tabContainer,
-                                 dialogService,
-                                 preferences,
-                                 aiService,
-                                 stateManager,
-                                 entryTypesManager,
-                                 fileUpdateMonitor,
-                                 undoManager,
-                                 clipboardManager,
-                                 taskExecutor);
-        }
-        return parserResult;
-    }
-
-    public static void openSharedDatabase(ParserResult parserResult,
-                                          LibraryTabContainer tabContainer,
-                                          DialogService dialogService,
-                                          GuiPreferences preferences,
-                                          AiService aiService,
-                                          StateManager stateManager,
-                                          BibEntryTypesManager entryTypesManager,
-                                          FileUpdateMonitor fileUpdateMonitor,
-                                          UndoManager undoManager,
-                                          ClipBoardManager clipBoardManager,
-                                          TaskExecutor taskExecutor)
-            throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException, NotASharedDatabaseException {
-        try {
-            new SharedDatabaseUIManager(
+            openSharedDatabase(
+                    parserResult,
                     tabContainer,
                     dialogService,
                     preferences,
@@ -285,11 +285,45 @@ public static void openSharedDatabase(ParserResult parserResult,
                     entryTypesManager,
                     fileUpdateMonitor,
                     undoManager,
-                    clipBoardManager,
-                    taskExecutor)
+                    clipboardManager,
+                    taskExecutor);
+        }
+        return parserResult;
+    }
+
+    public static void openSharedDatabase(
+            ParserResult parserResult,
+            LibraryTabContainer tabContainer,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            AiService aiService,
+            StateManager stateManager,
+            BibEntryTypesManager entryTypesManager,
+            FileUpdateMonitor fileUpdateMonitor,
+            UndoManager undoManager,
+            ClipBoardManager clipBoardManager,
+            TaskExecutor taskExecutor)
+            throws SQLException,
+                    DatabaseNotSupportedException,
+                    InvalidDBMSConnectionPropertiesException,
+                    NotASharedDatabaseException {
+        try {
+            new SharedDatabaseUIManager(
+                            tabContainer,
+                            dialogService,
+                            preferences,
+                            aiService,
+                            stateManager,
+                            entryTypesManager,
+                            fileUpdateMonitor,
+                            undoManager,
+                            clipBoardManager,
+                            taskExecutor)
                     .openSharedDatabaseFromParserResult(parserResult);
-        } catch (SQLException | DatabaseNotSupportedException | InvalidDBMSConnectionPropertiesException |
-                 NotASharedDatabaseException e) {
+        } catch (SQLException
+                | DatabaseNotSupportedException
+                | InvalidDBMSConnectionPropertiesException
+                | NotASharedDatabaseException e) {
             parserResult.getDatabaseContext().clearDatabasePath(); // do not open the original file
             parserResult.getDatabase().clearSharedDatabaseID();
 
diff --git a/src/main/java/org/jabref/gui/importer/actions/SearchGroupsMigrationAction.java b/src/main/java/org/jabref/gui/importer/actions/SearchGroupsMigrationAction.java
index 9e2ca086ab6b..80a3f0d2d228 100644
--- a/src/main/java/org/jabref/gui/importer/actions/SearchGroupsMigrationAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/SearchGroupsMigrationAction.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.importer.actions;
 
-import java.nio.file.Path;
-import java.util.Optional;
-
+import org.antlr.v4.runtime.misc.ParseCancellationException;
 import org.jabref.gui.DialogService;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
@@ -13,7 +11,8 @@
 import org.jabref.model.groups.SearchGroup;
 import org.jabref.model.search.SearchFlags;
 
-import org.antlr.v4.runtime.misc.ParseCancellationException;
+import java.nio.file.Path;
+import java.util.Optional;
 
 /**
  * This action checks whether the syntax for SearchGroups is the new one.
@@ -22,13 +21,15 @@
 public class SearchGroupsMigrationAction implements GUIPostOpenAction {
 
     // We cannot have this constant in `Version.java` because of recursion errors
-    // Thus, we keep it here, because it is (currently) used only in the context of groups migration.
+    // Thus, we keep it here, because it is (currently) used only in the context of groups
+    // migration.
     public static final Version VERSION_6_0_ALPHA = Version.parse("6.0-alpha");
 
     @Override
     public boolean isActionNecessary(ParserResult parserResult, CliPreferences preferences) {
         if (parserResult.getMetaData().getGroupSearchSyntaxVersion().isPresent()) {
-            // Currently the presence of any version is enough to know that no migration is necessary
+            // Currently the presence of any version is enough to know that no migration is
+            // necessary
             return false;
         }
 
@@ -49,14 +50,23 @@ private boolean groupOrSubgroupIsSearchGroup(GroupTreeNode groupTreeNode) {
     }
 
     @Override
-    public void performAction(ParserResult parserResult, DialogService dialogService, CliPreferences preferences) {
-        if (!dialogService.showConfirmationDialogAndWait(Localization.lang("Search groups migration of %0", parserResult.getPath().map(Path::toString).orElse("")),
-                Localization.lang("The search groups syntax is outdated. Do you want to migrate to the new syntax?"),
-                Localization.lang("Migrate"), Localization.lang("Keep as is"))) {
+    public void performAction(
+            ParserResult parserResult, DialogService dialogService, CliPreferences preferences) {
+        if (!dialogService.showConfirmationDialogAndWait(
+                Localization.lang(
+                        "Search groups migration of %0",
+                        parserResult.getPath().map(Path::toString).orElse("")),
+                Localization.lang(
+                        "The search groups syntax is outdated. Do you want to migrate to the new syntax?"),
+                Localization.lang("Migrate"),
+                Localization.lang("Keep as is"))) {
             return;
         }
 
-        parserResult.getMetaData().getGroups().ifPresent(groupTreeNode -> migrateGroups(groupTreeNode, dialogService));
+        parserResult
+                .getMetaData()
+                .getGroups()
+                .ifPresent(groupTreeNode -> migrateGroups(groupTreeNode, dialogService));
         parserResult.getMetaData().setGroupSearchSyntaxVersion(VERSION_6_0_ALPHA);
         parserResult.setChangedOnMigration(true);
     }
@@ -64,13 +74,21 @@ public void performAction(ParserResult parserResult, DialogService dialogService
     private void migrateGroups(GroupTreeNode node, DialogService dialogService) {
         if (node.getGroup() instanceof SearchGroup searchGroup) {
             try {
-                String luceneSearchExpression = SearchToLuceneMigration.migrateToLuceneSyntax(searchGroup.getSearchExpression(), searchGroup.getSearchFlags().contains(SearchFlags.REGULAR_EXPRESSION));
+                String luceneSearchExpression =
+                        SearchToLuceneMigration.migrateToLuceneSyntax(
+                                searchGroup.getSearchExpression(),
+                                searchGroup
+                                        .getSearchFlags()
+                                        .contains(SearchFlags.REGULAR_EXPRESSION));
                 searchGroup.setSearchExpression(luceneSearchExpression);
             } catch (ParseCancellationException e) {
-                Optional<String> luceneSearchExpression = dialogService.showInputDialogWithDefaultAndWait(
-                        Localization.lang("Search group migration failed"),
-                        Localization.lang("The search group '%0' could not be migrated. Please enter the new search expression.", searchGroup.getName()),
-                        searchGroup.getSearchExpression());
+                Optional<String> luceneSearchExpression =
+                        dialogService.showInputDialogWithDefaultAndWait(
+                                Localization.lang("Search group migration failed"),
+                                Localization.lang(
+                                        "The search group '%0' could not be migrated. Please enter the new search expression.",
+                                        searchGroup.getName()),
+                                searchGroup.getSearchExpression());
                 luceneSearchExpression.ifPresent(searchGroup::setSearchExpression);
             }
         }
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java b/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java
index 953020e6c61e..0ad228acdf70 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java
@@ -1,9 +1,7 @@
 package org.jabref.gui.importer.fetcher;
 
-import java.util.List;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
@@ -21,12 +19,13 @@
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.identifier.Identifier;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
+import java.util.List;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
 
 public class LookupIdentifierAction<T extends Identifier> extends SimpleCommand {
 
@@ -38,27 +37,34 @@ public class LookupIdentifierAction<T extends Identifier> extends SimpleCommand
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
 
-    public LookupIdentifierAction(IdFetcher<T> fetcher,
-                                  StateManager stateManager,
-                                  UndoManager undoManager,
-                                  DialogService dialogService,
-                                  TaskExecutor taskExecutor) {
+    public LookupIdentifierAction(
+            IdFetcher<T> fetcher,
+            StateManager stateManager,
+            UndoManager undoManager,
+            DialogService dialogService,
+            TaskExecutor taskExecutor) {
         this.fetcher = fetcher;
         this.stateManager = stateManager;
         this.undoManager = undoManager;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
 
-        this.executable.bind(needsDatabase(this.stateManager).and(needsEntriesSelected(this.stateManager)));
-        this.statusMessage.bind(BindingsHelper.ifThenElse(executable, "", Localization.lang("This operation requires one or more entries to be selected.")));
+        this.executable.bind(
+                needsDatabase(this.stateManager).and(needsEntriesSelected(this.stateManager)));
+        this.statusMessage.bind(
+                BindingsHelper.ifThenElse(
+                        executable,
+                        "",
+                        Localization.lang(
+                                "This operation requires one or more entries to be selected.")));
     }
 
     @Override
     public void execute() {
         try {
             BackgroundTask.wrap(() -> lookupIdentifiers(stateManager.getSelectedEntries()))
-                          .onSuccess(dialogService::notify)
-                          .executeWith(taskExecutor);
+                    .onSuccess(dialogService::notify)
+                    .executeWith(taskExecutor);
         } catch (Exception e) {
             LOGGER.error("Problem running ID Worker", e);
         }
@@ -70,13 +76,19 @@ public Action getAction() {
 
     private String lookupIdentifiers(List<BibEntry> bibEntries) {
         String totalCount = Integer.toString(bibEntries.size());
-        NamedCompound namedCompound = new NamedCompound(Localization.lang("Look up %0", fetcher.getIdentifierName()));
+        NamedCompound namedCompound =
+                new NamedCompound(Localization.lang("Look up %0", fetcher.getIdentifierName()));
         int count = 0;
         int foundCount = 0;
         for (BibEntry bibEntry : bibEntries) {
             count++;
-            final String statusMessage = Localization.lang("Looking up %0... - entry %1 out of %2 - found %3",
-                    fetcher.getIdentifierName(), Integer.toString(count), totalCount, Integer.toString(foundCount));
+            final String statusMessage =
+                    Localization.lang(
+                            "Looking up %0... - entry %1 out of %2 - found %3",
+                            fetcher.getIdentifierName(),
+                            Integer.toString(count),
+                            totalCount,
+                            Integer.toString(foundCount));
             UiTaskExecutor.runInJavaFXThread(() -> dialogService.notify(statusMessage));
             Optional<T> identifier = Optional.empty();
             try {
@@ -85,12 +97,20 @@ private String lookupIdentifiers(List<BibEntry> bibEntries) {
                 LOGGER.error("Could not fetch {}", fetcher.getIdentifierName(), e);
             }
             if (identifier.isPresent() && !bibEntry.hasField(identifier.get().getDefaultField())) {
-                Optional<FieldChange> fieldChange = bibEntry.setField(identifier.get().getDefaultField(), identifier.get().getNormalized());
+                Optional<FieldChange> fieldChange =
+                        bibEntry.setField(
+                                identifier.get().getDefaultField(),
+                                identifier.get().getNormalized());
                 if (fieldChange.isPresent()) {
                     namedCompound.addEdit(new UndoableFieldChange(fieldChange.get()));
                     foundCount++;
-                    final String nextStatusMessage = Localization.lang("Looking up %0... - entry %1 out of %2 - found %3",
-                            fetcher.getIdentifierName(), Integer.toString(count), totalCount, Integer.toString(foundCount));
+                    final String nextStatusMessage =
+                            Localization.lang(
+                                    "Looking up %0... - entry %1 out of %2 - found %3",
+                                    fetcher.getIdentifierName(),
+                                    Integer.toString(count),
+                                    totalCount,
+                                    Integer.toString(foundCount));
                     UiTaskExecutor.runInJavaFXThread(() -> dialogService.notify(nextStatusMessage));
                 }
             }
@@ -99,6 +119,8 @@ private String lookupIdentifiers(List<BibEntry> bibEntries) {
         if (foundCount > 0) {
             UiTaskExecutor.runInJavaFXThread(() -> undoManager.addEdit(namedCompound));
         }
-        return Localization.lang("Determined %0 for %1 entries", fetcher.getIdentifierName(), Integer.toString(foundCount));
+        return Localization.lang(
+                "Determined %0 for %1 entries",
+                fetcher.getIdentifierName(), Integer.toString(foundCount));
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java
index d0da1c301024..bfdfbff83128 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.importer.fetcher;
 
+import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.beans.binding.BooleanExpression;
 import javafx.css.PseudoClass;
 import javafx.scene.control.Button;
@@ -24,8 +26,6 @@
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.logic.l10n.Localization;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class WebSearchPaneView extends VBox {
 
     private static final PseudoClass QUERY_INVALID = PseudoClass.getPseudoClass("invalid");
@@ -34,7 +34,8 @@ public class WebSearchPaneView extends VBox {
     private final GuiPreferences preferences;
     private final DialogService dialogService;
 
-    public WebSearchPaneView(GuiPreferences preferences, DialogService dialogService, StateManager stateManager) {
+    public WebSearchPaneView(
+            GuiPreferences preferences, DialogService dialogService, StateManager stateManager) {
         this.preferences = preferences;
         this.dialogService = dialogService;
         this.viewModel = new WebSearchPaneViewModel(preferences, dialogService, stateManager);
@@ -69,18 +70,27 @@ private void initialize() {
      * Allows triggering search on pressing enter
      */
     private void enableEnterToTriggerSearch(TextField query) {
-        query.setOnKeyPressed(event -> {
-            if (event.getCode() == KeyCode.ENTER) {
-                viewModel.search();
-            }
-        });
+        query.setOnKeyPressed(
+                event -> {
+                    if (event.getCode() == KeyCode.ENTER) {
+                        viewModel.search();
+                    }
+                });
     }
 
     private void addQueryValidationHints(TextField query) {
-        EasyBind.subscribe(viewModel.queryValidationStatus().validProperty(),
+        EasyBind.subscribe(
+                viewModel.queryValidationStatus().validProperty(),
                 valid -> {
-                    if (!valid && viewModel.queryValidationStatus().getHighestMessage().isPresent()) {
-                        query.setTooltip(new Tooltip(viewModel.queryValidationStatus().getHighestMessage().get().getMessage()));
+                    if (!valid
+                            && viewModel.queryValidationStatus().getHighestMessage().isPresent()) {
+                        query.setTooltip(
+                                new Tooltip(
+                                        viewModel
+                                                .queryValidationStatus()
+                                                .getHighestMessage()
+                                                .get()
+                                                .getMessage()));
                         query.pseudoClassStateChanged(QUERY_INVALID, true);
                     } else {
                         query.setTooltip(null);
@@ -93,7 +103,8 @@ private void addQueryValidationHints(TextField query) {
      * Create button that triggers search
      */
     private Button createSearchButton() {
-        BooleanExpression importerEnabled = preferences.getImporterPreferences().importerEnabledProperty();
+        BooleanExpression importerEnabled =
+                preferences.getImporterPreferences().importerEnabledProperty();
         Button search = new Button(Localization.lang("Search"));
         search.setDefaultButton(false);
         search.setOnAction(event -> viewModel.search());
@@ -108,14 +119,22 @@ private Button createSearchButton() {
     private StackPane createHelpButtonContainer() {
         StackPane helpButtonContainer = new StackPane();
         ActionFactory factory = new ActionFactory();
-        EasyBind.subscribe(viewModel.selectedFetcherProperty(), fetcher -> {
-            if ((fetcher != null) && fetcher.getHelpPage().isPresent()) {
-                Button helpButton = factory.createIconButton(StandardActions.HELP, new HelpAction(fetcher.getHelpPage().get(), dialogService, preferences.getExternalApplicationsPreferences()));
-                helpButtonContainer.getChildren().setAll(helpButton);
-            } else {
-                helpButtonContainer.getChildren().clear();
-            }
-        });
+        EasyBind.subscribe(
+                viewModel.selectedFetcherProperty(),
+                fetcher -> {
+                    if ((fetcher != null) && fetcher.getHelpPage().isPresent()) {
+                        Button helpButton =
+                                factory.createIconButton(
+                                        StandardActions.HELP,
+                                        new HelpAction(
+                                                fetcher.getHelpPage().get(),
+                                                dialogService,
+                                                preferences.getExternalApplicationsPreferences()));
+                        helpButtonContainer.getChildren().setAll(helpButton);
+                    } else {
+                        helpButtonContainer.getChildren().clear();
+                    }
+                });
         return helpButtonContainer;
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
index 9057d8078b86..42f8b3e482eb 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
@@ -1,6 +1,13 @@
 package org.jabref.gui.importer.fetcher;
 
-import java.util.concurrent.Callable;
+import static org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer.NO_EXPLICIT_FIELD;
+
+import com.tobiasdiez.easybind.EasyBind;
+
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -11,6 +18,10 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
+import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;
+import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser;
+import org.apache.lucene.queryparser.flexible.standard.parser.ParseException;
+import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.frame.SidePanePreferences;
@@ -25,22 +36,13 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.OptionalUtil;
 
-import com.tobiasdiez.easybind.EasyBind;
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
-import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;
-import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser;
-import org.apache.lucene.queryparser.flexible.standard.parser.ParseException;
-import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
-
-import static org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer.NO_EXPLICIT_FIELD;
+import java.util.concurrent.Callable;
 
 public class WebSearchPaneViewModel {
 
     private final ObjectProperty<SearchBasedFetcher> selectedFetcher = new SimpleObjectProperty<>();
-    private final ListProperty<SearchBasedFetcher> fetchers = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<SearchBasedFetcher> fetchers =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
     private final StringProperty query = new SimpleStringProperty();
     private final DialogService dialogService;
     private final GuiPreferences preferences;
@@ -49,14 +51,16 @@ public class WebSearchPaneViewModel {
     private final Validator searchQueryValidator;
     private final SyntaxParser parser = new StandardSyntaxParser();
 
-    public WebSearchPaneViewModel(GuiPreferences preferences, DialogService dialogService, StateManager stateManager) {
+    public WebSearchPaneViewModel(
+            GuiPreferences preferences, DialogService dialogService, StateManager stateManager) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.preferences = preferences;
 
-        fetchers.setAll(WebFetchers.getSearchBasedFetchers(
-                preferences.getImportFormatPreferences(),
-                preferences.getImporterPreferences()));
+        fetchers.setAll(
+                WebFetchers.getSearchBasedFetchers(
+                        preferences.getImportFormatPreferences(),
+                        preferences.getImporterPreferences()));
 
         // Choose last-selected fetcher as default
         SidePanePreferences sidePanePreferences = preferences.getSidePanePreferences();
@@ -66,39 +70,48 @@ public WebSearchPaneViewModel(GuiPreferences preferences, DialogService dialogSe
         } else {
             selectedFetcherProperty().setValue(fetchers.get(defaultFetcherIndex));
         }
-        EasyBind.subscribe(selectedFetcherProperty(), newFetcher -> {
-            int newIndex = fetchers.indexOf(newFetcher);
-            sidePanePreferences.setWebSearchFetcherSelected(newIndex);
-        });
-
-        searchQueryValidator = new FunctionBasedValidator<>(
-                query,
-                queryText -> {
-                    if (StringUtil.isBlank(queryText)) {
-                        // in case user did not enter something, it is treated as valid (to avoid UI WTFs)
-                        return null;
-                    }
-
-                    if (CompositeIdFetcher.containsValidId(queryText)) {
-                        // in case the query contains any ID, it is treated as valid
-                        return null;
-                    }
-
-                    try {
-                        parser.parse(queryText, NO_EXPLICIT_FIELD);
-                        return null;
-                    } catch (ParseException e) {
-                        String element = e.currentToken.image;
-                        int position = e.currentToken.beginColumn;
-                        if (element == null) {
-                            return ValidationMessage.error(Localization.lang("Invalid query. Check position %0.", position));
-                        } else {
-                            return ValidationMessage.error(Localization.lang("Invalid query element '%0' at position %1", element, position));
-                        }
-                    } catch (QueryNodeParseException e) {
-                        return ValidationMessage.error("");
-                    }
+        EasyBind.subscribe(
+                selectedFetcherProperty(),
+                newFetcher -> {
+                    int newIndex = fetchers.indexOf(newFetcher);
+                    sidePanePreferences.setWebSearchFetcherSelected(newIndex);
                 });
+
+        searchQueryValidator =
+                new FunctionBasedValidator<>(
+                        query,
+                        queryText -> {
+                            if (StringUtil.isBlank(queryText)) {
+                                // in case user did not enter something, it is treated as valid (to
+                                // avoid UI WTFs)
+                                return null;
+                            }
+
+                            if (CompositeIdFetcher.containsValidId(queryText)) {
+                                // in case the query contains any ID, it is treated as valid
+                                return null;
+                            }
+
+                            try {
+                                parser.parse(queryText, NO_EXPLICIT_FIELD);
+                                return null;
+                            } catch (ParseException e) {
+                                String element = e.currentToken.image;
+                                int position = e.currentToken.beginColumn;
+                                if (element == null) {
+                                    return ValidationMessage.error(
+                                            Localization.lang(
+                                                    "Invalid query. Check position %0.", position));
+                                } else {
+                                    return ValidationMessage.error(
+                                            Localization.lang(
+                                                    "Invalid query element '%0' at position %1",
+                                                    element, position));
+                                }
+                            } catch (QueryNodeParseException e) {
+                                return ValidationMessage.error("");
+                            }
+                        });
     }
 
     public ObservableList<SearchBasedFetcher> getFetchers() {
@@ -139,7 +152,8 @@ public void search() {
             return;
         }
         if (stateManager.getActiveDatabase().isEmpty()) {
-            dialogService.notify(Localization.lang("Please open or start a new library before searching"));
+            dialogService.notify(
+                    Localization.lang("Please open or start a new library before searching"));
             return;
         }
 
@@ -150,19 +164,27 @@ public void search() {
         String fetcherName = activeFetcher.getName();
 
         if (CompositeIdFetcher.containsValidId(query)) {
-            CompositeIdFetcher compositeIdFetcher = new CompositeIdFetcher(preferences.getImportFormatPreferences());
-            parserResultCallable = () -> new ParserResult(OptionalUtil.toList(compositeIdFetcher.performSearchById(query)));
+            CompositeIdFetcher compositeIdFetcher =
+                    new CompositeIdFetcher(preferences.getImportFormatPreferences());
+            parserResultCallable =
+                    () ->
+                            new ParserResult(
+                                    OptionalUtil.toList(
+                                            compositeIdFetcher.performSearchById(query)));
             fetcherName = Localization.lang("Identifier-based Web Search");
         } else {
-            // Exceptions are handled below at "task.onFailure(dialogService::showErrorDialogAndWait)"
+            // Exceptions are handled below at
+            // "task.onFailure(dialogService::showErrorDialogAndWait)"
             parserResultCallable = () -> new ParserResult(activeFetcher.performSearch(query));
         }
 
-        BackgroundTask<ParserResult> task = BackgroundTask.wrap(parserResultCallable)
-                                                          .withInitialMessage(Localization.lang("Processing \"%0\"...", query));
+        BackgroundTask<ParserResult> task =
+                BackgroundTask.wrap(parserResultCallable)
+                        .withInitialMessage(Localization.lang("Processing \"%0\"...", query));
         task.onFailure(dialogService::showErrorDialogAndWait);
 
-        ImportEntriesDialog dialog = new ImportEntriesDialog(stateManager.getActiveDatabase().get(), task);
+        ImportEntriesDialog dialog =
+                new ImportEntriesDialog(stateManager.getActiveDatabase().get(), task);
         dialog.setTitle(fetcherName);
         dialogService.showCustomDialogAndWait(dialog);
     }
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
index 506dee530fba..6ee267bba854 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.integrity;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Supplier;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
 
 import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
@@ -20,7 +18,9 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
 
 public class IntegrityCheckAction extends SimpleCommand {
 
@@ -31,12 +31,13 @@ public class IntegrityCheckAction extends SimpleCommand {
     private final StateManager stateManager;
     private final JournalAbbreviationRepository abbreviationRepository;
 
-    public IntegrityCheckAction(Supplier<LibraryTab> tabSupplier,
-                                GuiPreferences preferences,
-                                DialogService dialogService,
-                                StateManager stateManager,
-                                UiTaskExecutor taskExecutor,
-                                JournalAbbreviationRepository abbreviationRepository) {
+    public IntegrityCheckAction(
+            Supplier<LibraryTab> tabSupplier,
+            GuiPreferences preferences,
+            DialogService dialogService,
+            StateManager stateManager,
+            UiTaskExecutor taskExecutor,
+            JournalAbbreviationRepository abbreviationRepository) {
         this.tabSupplier = tabSupplier;
         this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
@@ -48,40 +49,52 @@ public IntegrityCheckAction(Supplier<LibraryTab> tabSupplier,
 
     @Override
     public void execute() {
-        BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null"));
-        IntegrityCheck check = new IntegrityCheck(database,
-                preferences.getFilePreferences(),
-                preferences.getCitationKeyPatternPreferences(),
-                abbreviationRepository,
-                preferences.getEntryEditorPreferences().shouldAllowIntegerEditionBibtex());
+        BibDatabaseContext database =
+                stateManager
+                        .getActiveDatabase()
+                        .orElseThrow(() -> new NullPointerException("Database null"));
+        IntegrityCheck check =
+                new IntegrityCheck(
+                        database,
+                        preferences.getFilePreferences(),
+                        preferences.getCitationKeyPatternPreferences(),
+                        abbreviationRepository,
+                        preferences.getEntryEditorPreferences().shouldAllowIntegerEditionBibtex());
 
-        Task<List<IntegrityMessage>> task = new Task<>() {
-            @Override
-            protected List<IntegrityMessage> call() {
-                ObservableList<BibEntry> entries = database.getDatabase().getEntries();
-                List<IntegrityMessage> result = new ArrayList<>(check.checkDatabase(database.getDatabase()));
-                for (int i = 0; i < entries.size(); i++) {
-                    if (isCancelled()) {
-                        break;
-                    }
+        Task<List<IntegrityMessage>> task =
+                new Task<>() {
+                    @Override
+                    protected List<IntegrityMessage> call() {
+                        ObservableList<BibEntry> entries = database.getDatabase().getEntries();
+                        List<IntegrityMessage> result =
+                                new ArrayList<>(check.checkDatabase(database.getDatabase()));
+                        for (int i = 0; i < entries.size(); i++) {
+                            if (isCancelled()) {
+                                break;
+                            }
 
-                    BibEntry entry = entries.get(i);
-                    result.addAll(check.checkEntry(entry));
-                    updateProgress(i, entries.size());
-                }
+                            BibEntry entry = entries.get(i);
+                            result.addAll(check.checkEntry(entry));
+                            updateProgress(i, entries.size());
+                        }
 
-                return result;
-            }
-        };
-        task.setOnSucceeded(value -> {
-            List<IntegrityMessage> messages = task.getValue();
-            if (messages.isEmpty()) {
-                dialogService.notify(Localization.lang("No problems found."));
-            } else {
-                dialogService.showCustomDialogAndWait(new IntegrityCheckDialog(messages, tabSupplier.get()));
-            }
-        });
-        task.setOnFailed(event -> dialogService.showErrorDialogAndWait("Integrity check failed.", task.getException()));
+                        return result;
+                    }
+                };
+        task.setOnSucceeded(
+                value -> {
+                    List<IntegrityMessage> messages = task.getValue();
+                    if (messages.isEmpty()) {
+                        dialogService.notify(Localization.lang("No problems found."));
+                    } else {
+                        dialogService.showCustomDialogAndWait(
+                                new IntegrityCheckDialog(messages, tabSupplier.get()));
+                    }
+                });
+        task.setOnFailed(
+                event ->
+                        dialogService.showErrorDialogAndWait(
+                                "Integrity check failed.", task.getException()));
 
         dialogService.showProgressDialog(
                 Localization.lang("Checking integrity..."),
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index 00b3cc32bc91..3254f480ce38 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -1,7 +1,8 @@
 package org.jabref.gui.integrity;
 
-import java.util.List;
-import java.util.function.Function;
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
 
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.ListChangeListener;
@@ -13,6 +14,7 @@
 import javafx.scene.input.MouseButton;
 import javafx.stage.Modality;
 
+import org.controlsfx.control.table.TableFilter;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
@@ -20,9 +22,8 @@
 import org.jabref.logic.integrity.IntegrityMessage;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-import org.controlsfx.control.table.TableFilter;
+import java.util.List;
+import java.util.function.Function;
 
 public class IntegrityCheckDialog extends BaseDialog<Void> {
 
@@ -47,17 +48,19 @@ public IntegrityCheckDialog(List<IntegrityMessage> messages, LibraryTab libraryT
         this.setTitle(Localization.lang("Check integrity"));
         this.initModality(Modality.NONE);
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         themeManager.updateFontStyle(getDialogPane().getScene());
     }
 
     private void onSelectionChanged(ListChangeListener.Change<? extends IntegrityMessage> change) {
         if (change.next()) {
-            change.getAddedSubList().stream().findFirst().ifPresent(message ->
-                    libraryTab.editEntryAndFocusField(message.entry(), message.field()));
+            change.getAddedSubList().stream()
+                    .findFirst()
+                    .ifPresent(
+                            message ->
+                                    libraryTab.editEntryAndFocusField(
+                                            message.entry(), message.field()));
         }
     }
 
@@ -71,49 +74,64 @@ private void initialize() {
 
         messagesTable.getSelectionModel().getSelectedItems().addListener(this::onSelectionChanged);
         messagesTable.setItems(viewModel.getMessages());
-        keyColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().entry().getCitationKey().orElse("")));
-        fieldColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().field().getDisplayName()));
-        messageColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().message()));
+        keyColumn.setCellValueFactory(
+                row ->
+                        new ReadOnlyStringWrapper(
+                                row.getValue().entry().getCitationKey().orElse("")));
+        fieldColumn.setCellValueFactory(
+                row -> new ReadOnlyStringWrapper(row.getValue().field().getDisplayName()));
+        messageColumn.setCellValueFactory(
+                row -> new ReadOnlyStringWrapper(row.getValue().message()));
 
         new ValueTableCellFactory<IntegrityMessage, String>()
                 .withText(Function.identity())
                 .withTooltip(Function.identity())
                 .install(messageColumn);
 
-        tableFilter = TableFilter.forTableView(messagesTable)
-                                 .apply();
+        tableFilter = TableFilter.forTableView(messagesTable).apply();
 
         addMessageColumnFilter(keyColumn, keyFilterButton);
         addMessageColumnFilter(fieldColumn, fieldFilterButton);
         addMessageColumnFilter(messageColumn, messageFilterButton);
     }
 
-    private void addMessageColumnFilter(TableColumn<IntegrityMessage, String> messageColumn, MenuButton messageFilterButton) {
-        tableFilter.getColumnFilter(messageColumn).ifPresent(columnFilter -> {
-            ContextMenu messageContextMenu = messageColumn.getContextMenu();
-            if (messageContextMenu != null) {
-                messageFilterButton.setContextMenu(messageContextMenu);
-                messageFilterButton.setOnMouseClicked(event -> {
-                    if (event.getButton() == MouseButton.PRIMARY) {
-                        if (messageContextMenu.isShowing()) {
-                            messageContextMenu.setX(event.getScreenX());
-                            messageContextMenu.setY(event.getScreenY());
-                        } else {
-                            messageContextMenu.show(messageFilterButton, event.getScreenX(), event.getScreenY());
-                        }
-                    }
-                });
-            }
-        });
+    private void addMessageColumnFilter(
+            TableColumn<IntegrityMessage, String> messageColumn, MenuButton messageFilterButton) {
+        tableFilter
+                .getColumnFilter(messageColumn)
+                .ifPresent(
+                        columnFilter -> {
+                            ContextMenu messageContextMenu = messageColumn.getContextMenu();
+                            if (messageContextMenu != null) {
+                                messageFilterButton.setContextMenu(messageContextMenu);
+                                messageFilterButton.setOnMouseClicked(
+                                        event -> {
+                                            if (event.getButton() == MouseButton.PRIMARY) {
+                                                if (messageContextMenu.isShowing()) {
+                                                    messageContextMenu.setX(event.getScreenX());
+                                                    messageContextMenu.setY(event.getScreenY());
+                                                } else {
+                                                    messageContextMenu.show(
+                                                            messageFilterButton,
+                                                            event.getScreenX(),
+                                                            event.getScreenY());
+                                                }
+                                            }
+                                        });
+                            }
+                        });
     }
 
     public void clearFilters() {
         if (tableFilter != null) {
             tableFilter.resetFilter();
-            messagesTable.getColumns().forEach(column -> {
-                tableFilter.selectAllValues(column);
-                column.setGraphic(null);
-            });
+            messagesTable
+                    .getColumns()
+                    .forEach(
+                            column -> {
+                                tableFilter.selectAllValues(column);
+                                column.setGraphic(null);
+                            });
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
index 1313417642ef..0e3c83c643c9 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.integrity;
 
-import java.util.List;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.logic.integrity.IntegrityMessage;
 
+import java.util.List;
+
 public class IntegrityCheckDialogViewModel extends AbstractViewModel {
 
     private final ObservableList<IntegrityMessage> messages;
diff --git a/src/main/java/org/jabref/gui/journals/AbbreviateAction.java b/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
index 528c62688cf8..1b05cd37573e 100644
--- a/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
+++ b/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
@@ -1,15 +1,5 @@
 package org.jabref.gui.journals;
 
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
@@ -26,10 +16,19 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.FieldFactory;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
+
 /**
  * Converts journal full names to either iso or medline abbreviations for all selected entries.
  */
@@ -48,14 +47,15 @@ public class AbbreviateAction extends SimpleCommand {
 
     private AbbreviationType abbreviationType;
 
-    public AbbreviateAction(StandardActions action,
-                            Supplier<LibraryTab> tabSupplier,
-                            DialogService dialogService,
-                            StateManager stateManager,
-                            JournalAbbreviationPreferences abbreviationPreferences,
-                            JournalAbbreviationRepository abbreviationRepository,
-                            TaskExecutor taskExecutor,
-                            UndoManager undoManager) {
+    public AbbreviateAction(
+            StandardActions action,
+            Supplier<LibraryTab> tabSupplier,
+            DialogService dialogService,
+            StateManager stateManager,
+            JournalAbbreviationPreferences abbreviationPreferences,
+            JournalAbbreviationRepository abbreviationRepository,
+            TaskExecutor taskExecutor,
+            UndoManager undoManager) {
         this.action = action;
         this.tabSupplier = tabSupplier;
         this.dialogService = dialogService;
@@ -81,47 +81,84 @@ public void execute() {
                 || (action == StandardActions.ABBREVIATE_DOTLESS)
                 || (action == StandardActions.ABBREVIATE_SHORTEST_UNIQUE)) {
             dialogService.notify(Localization.lang("Abbreviating..."));
-            stateManager.getActiveDatabase().ifPresent(databaseContext ->
-                    BackgroundTask.wrap(() -> abbreviate(stateManager.getActiveDatabase().get(), stateManager.getSelectedEntries()))
-                                  .onSuccess(dialogService::notify)
-                                  .executeWith(taskExecutor));
+            stateManager
+                    .getActiveDatabase()
+                    .ifPresent(
+                            databaseContext ->
+                                    BackgroundTask.wrap(
+                                                    () ->
+                                                            abbreviate(
+                                                                    stateManager
+                                                                            .getActiveDatabase()
+                                                                            .get(),
+                                                                    stateManager
+                                                                            .getSelectedEntries()))
+                                            .onSuccess(dialogService::notify)
+                                            .executeWith(taskExecutor));
         } else if (action == StandardActions.UNABBREVIATE) {
             dialogService.notify(Localization.lang("Unabbreviating..."));
-            stateManager.getActiveDatabase().ifPresent(databaseContext ->
-                    BackgroundTask.wrap(() -> unabbreviate(stateManager.getActiveDatabase().get(), stateManager.getSelectedEntries()))
-                                  .onSuccess(dialogService::notify)
-                                  .executeWith(taskExecutor));
+            stateManager
+                    .getActiveDatabase()
+                    .ifPresent(
+                            databaseContext ->
+                                    BackgroundTask.wrap(
+                                                    () ->
+                                                            unabbreviate(
+                                                                    stateManager
+                                                                            .getActiveDatabase()
+                                                                            .get(),
+                                                                    stateManager
+                                                                            .getSelectedEntries()))
+                                            .onSuccess(dialogService::notify)
+                                            .executeWith(taskExecutor));
         } else {
             LOGGER.debug("Unknown action: {}", action.name());
         }
     }
 
     private String abbreviate(BibDatabaseContext databaseContext, List<BibEntry> entries) {
-        UndoableAbbreviator undoableAbbreviator = new UndoableAbbreviator(
-                abbreviationRepository,
-                abbreviationType,
-                journalAbbreviationPreferences.shouldUseFJournalField());
+        UndoableAbbreviator undoableAbbreviator =
+                new UndoableAbbreviator(
+                        abbreviationRepository,
+                        abbreviationType,
+                        journalAbbreviationPreferences.shouldUseFJournalField());
 
         NamedCompound ce = new NamedCompound(Localization.lang("Abbreviate journal names"));
 
         // Collect all callables to execute in one collection.
-        Set<Callable<Boolean>> tasks = entries.stream().<Callable<Boolean>>map(entry -> () ->
-                FieldFactory.getJournalNameFields().stream().anyMatch(journalField ->
-                        undoableAbbreviator.abbreviate(databaseContext.getDatabase(), entry, journalField, ce)))
-                .collect(Collectors.toSet());
+        Set<Callable<Boolean>> tasks =
+                entries.stream()
+                        .<Callable<Boolean>>map(
+                                entry ->
+                                        () ->
+                                                FieldFactory.getJournalNameFields().stream()
+                                                        .anyMatch(
+                                                                journalField ->
+                                                                        undoableAbbreviator
+                                                                                .abbreviate(
+                                                                                        databaseContext
+                                                                                                .getDatabase(),
+                                                                                        entry,
+                                                                                        journalField,
+                                                                                        ce)))
+                        .collect(Collectors.toSet());
 
         // Execute the callables and wait for the results.
         List<Future<Boolean>> futures = HeadlessExecutorService.INSTANCE.executeAll(tasks);
 
         // Evaluate the results of the callables.
-        long count = futures.stream().filter(future -> {
-            try {
-                return future.get();
-            } catch (InterruptedException | ExecutionException exception) {
-                LOGGER.error("Unable to retrieve value.", exception);
-                return false;
-            }
-        }).count();
+        long count =
+                futures.stream()
+                        .filter(
+                                future -> {
+                                    try {
+                                        return future.get();
+                                    } catch (InterruptedException | ExecutionException exception) {
+                                        LOGGER.error("Unable to retrieve value.", exception);
+                                        return false;
+                                    }
+                                })
+                        .count();
 
         if (count == 0) {
             return Localization.lang("No journal names could be abbreviated.");
@@ -134,12 +171,27 @@ private String abbreviate(BibDatabaseContext databaseContext, List<BibEntry> ent
     }
 
     private String unabbreviate(BibDatabaseContext databaseContext, List<BibEntry> entries) {
-        UndoableUnabbreviator undoableAbbreviator = new UndoableUnabbreviator(abbreviationRepository);
+        UndoableUnabbreviator undoableAbbreviator =
+                new UndoableUnabbreviator(abbreviationRepository);
 
         NamedCompound ce = new NamedCompound(Localization.lang("Unabbreviate journal names"));
-        int count = entries.stream().mapToInt(entry ->
-                (int) FieldFactory.getJournalNameFields().stream().filter(journalField ->
-                        undoableAbbreviator.unabbreviate(databaseContext.getDatabase(), entry, journalField, ce)).count()).sum();
+        int count =
+                entries.stream()
+                        .mapToInt(
+                                entry ->
+                                        (int)
+                                                FieldFactory.getJournalNameFields().stream()
+                                                        .filter(
+                                                                journalField ->
+                                                                        undoableAbbreviator
+                                                                                .unabbreviate(
+                                                                                        databaseContext
+                                                                                                .getDatabase(),
+                                                                                        entry,
+                                                                                        journalField,
+                                                                                        ce))
+                                                        .count())
+                        .sum();
         if (count == 0) {
             return Localization.lang("No journal names could be unabbreviated.");
         }
diff --git a/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java b/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java
index f330a30f0e80..b2239d661603 100644
--- a/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java
+++ b/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.journals;
 
-import javax.swing.undo.CompoundEdit;
-
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.logic.journals.Abbreviation;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
@@ -11,6 +9,8 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 
+import javax.swing.undo.CompoundEdit;
+
 // Undo redo stuff
 public class UndoableAbbreviator {
 
@@ -18,7 +18,10 @@ public class UndoableAbbreviator {
     private final AbbreviationType abbreviationType;
     private final boolean useFJournalField;
 
-    public UndoableAbbreviator(JournalAbbreviationRepository journalAbbreviationRepository, AbbreviationType abbreviationType, boolean useFJournalField) {
+    public UndoableAbbreviator(
+            JournalAbbreviationRepository journalAbbreviationRepository,
+            AbbreviationType abbreviationType,
+            boolean useFJournalField) {
         this.journalAbbreviationRepository = journalAbbreviationRepository;
         this.abbreviationType = abbreviationType;
         this.useFJournalField = useFJournalField;
@@ -33,7 +36,8 @@ public UndoableAbbreviator(JournalAbbreviationRepository journalAbbreviationRepo
      * @param ce        If the entry is changed, add an edit to this compound.
      * @return true if the entry was changed, false otherwise.
      */
-    public boolean abbreviate(BibDatabase database, BibEntry entry, Field fieldName, CompoundEdit ce) {
+    public boolean abbreviate(
+            BibDatabase database, BibEntry entry, Field fieldName, CompoundEdit ce) {
         if (!entry.hasField(fieldName)) {
             return false;
         }
@@ -56,9 +60,13 @@ public boolean abbreviate(BibDatabase database, BibEntry entry, Field fieldName,
         }
 
         // Store full name into fjournal but only if it exists
-        if (useFJournalField && (StandardField.JOURNAL == fieldName || StandardField.JOURNALTITLE == fieldName)) {
+        if (useFJournalField
+                && (StandardField.JOURNAL == fieldName
+                        || StandardField.JOURNALTITLE == fieldName)) {
             entry.setField(AMSField.FJOURNAL, abbreviation.getName());
-            ce.addEdit(new UndoableFieldChange(entry, AMSField.FJOURNAL, null, abbreviation.getName()));
+            ce.addEdit(
+                    new UndoableFieldChange(
+                            entry, AMSField.FJOURNAL, null, abbreviation.getName()));
         }
 
         entry.setField(fieldName, newText);
@@ -68,14 +76,12 @@ public boolean abbreviate(BibDatabase database, BibEntry entry, Field fieldName,
 
     private String getAbbreviatedName(Abbreviation text) {
         return switch (abbreviationType) {
-            case DEFAULT ->
-                    text.getAbbreviation();
-            case DOTLESS ->
-                    text.getDotlessAbbreviation();
-            case SHORTEST_UNIQUE ->
-                    text.getShortestUniqueAbbreviation();
+            case DEFAULT -> text.getAbbreviation();
+            case DOTLESS -> text.getDotlessAbbreviation();
+            case SHORTEST_UNIQUE -> text.getShortestUniqueAbbreviation();
             default ->
-                    throw new IllegalStateException("Unexpected value: %s".formatted(abbreviationType));
+                    throw new IllegalStateException(
+                            "Unexpected value: %s".formatted(abbreviationType));
         };
     }
 }
diff --git a/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java b/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java
index acb101aef583..1be8795d7f6c 100644
--- a/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java
+++ b/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.journals;
 
-import javax.swing.undo.CompoundEdit;
-
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.logic.journals.Abbreviation;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
@@ -11,6 +9,8 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 
+import javax.swing.undo.CompoundEdit;
+
 public class UndoableUnabbreviator {
 
     private final JournalAbbreviationRepository journalAbbreviationRepository;
@@ -27,7 +27,8 @@ public UndoableUnabbreviator(JournalAbbreviationRepository journalAbbreviationRe
      * @param ce    If the entry is changed, add an edit to this compound.
      * @return true if the entry was changed, false otherwise.
      */
-    public boolean unabbreviate(BibDatabase database, BibEntry entry, Field field, CompoundEdit ce) {
+    public boolean unabbreviate(
+            BibDatabase database, BibEntry entry, Field field, CompoundEdit ce) {
         if (!entry.hasField(field)) {
             return false;
         }
@@ -58,7 +59,8 @@ public boolean unabbreviate(BibDatabase database, BibEntry entry, Field field, C
     }
 
     public boolean restoreFromFJournal(BibEntry entry, Field field, CompoundEdit ce) {
-        if ((StandardField.JOURNAL != field && StandardField.JOURNALTITLE != field) || !entry.hasField(AMSField.FJOURNAL)) {
+        if ((StandardField.JOURNAL != field && StandardField.JOURNALTITLE != field)
+                || !entry.hasField(AMSField.FJOURNAL)) {
             return false;
         }
 
diff --git a/src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java
index 8c199b02c971..4245f3ccbc8a 100644
--- a/src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java
+++ b/src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java
@@ -2,110 +2,120 @@
 
 import javafx.scene.input.KeyEvent;
 
-import org.jabref.logic.util.strings.StringManipulator;
-import org.jabref.model.util.ResultingStringState;
-
 import org.fxmisc.richtext.CodeArea;
 import org.fxmisc.richtext.NavigationActions;
+import org.jabref.logic.util.strings.StringManipulator;
+import org.jabref.model.util.ResultingStringState;
 
 public class CodeAreaKeyBindings {
 
-    public static void call(CodeArea codeArea, KeyEvent event, KeyBindingRepository keyBindingRepository) {
-        keyBindingRepository.mapToKeyBinding(event).ifPresent(binding -> {
-            switch (binding) {
-                case EDITOR_DELETE -> {
-                    codeArea.deleteNextChar();
-                    event.consume();
-                }
-                case EDITOR_BACKWARD -> {
-                    codeArea.previousChar(NavigationActions.SelectionPolicy.CLEAR);
-                    event.consume();
-                }
-                case EDITOR_FORWARD -> {
-                    codeArea.nextChar(NavigationActions.SelectionPolicy.CLEAR);
-                    event.consume();
-                }
-                case EDITOR_WORD_BACKWARD -> {
-                    codeArea.wordBreaksBackwards(2, NavigationActions.SelectionPolicy.CLEAR);
-                    event.consume();
-                }
-                case EDITOR_WORD_FORWARD -> {
-                    codeArea.wordBreaksForwards(2, NavigationActions.SelectionPolicy.CLEAR);
-                    event.consume();
-                }
-                case EDITOR_BEGINNING_DOC -> {
-                    codeArea.start(NavigationActions.SelectionPolicy.CLEAR);
-                    event.consume();
-                }
-                case EDITOR_UP -> {
-                    codeArea.paragraphStart(NavigationActions.SelectionPolicy.CLEAR);
-                    event.consume();
-                }
-                case EDITOR_BEGINNING -> {
-                    codeArea.lineStart(NavigationActions.SelectionPolicy.CLEAR);
-                    event.consume();
-                }
-                case EDITOR_END_DOC -> {
-                    codeArea.end(NavigationActions.SelectionPolicy.CLEAR);
-                    event.consume();
-                }
-                case EDITOR_DOWN -> {
-                    codeArea.paragraphEnd(NavigationActions.SelectionPolicy.CLEAR);
-                    event.consume();
-                }
-                case EDITOR_END -> {
-                    codeArea.lineEnd(NavigationActions.SelectionPolicy.CLEAR);
-                    event.consume();
-                }
-                case EDITOR_CAPITALIZE -> {
-                    int pos = codeArea.getCaretPosition();
-                    String text = codeArea.getText(0, codeArea.getText().length());
-                    ResultingStringState res = StringManipulator.capitalize(pos, text);
-                    codeArea.replaceText(res.text);
-                    codeArea.displaceCaret(res.caretPosition);
-                    event.consume();
-                }
-                case EDITOR_LOWERCASE -> {
-                    int pos = codeArea.getCaretPosition();
-                    String text = codeArea.getText(0, codeArea.getText().length());
-                    ResultingStringState res = StringManipulator.lowercase(pos, text);
-                    codeArea.replaceText(res.text);
-                    codeArea.displaceCaret(res.caretPosition);
-                    event.consume();
-                }
-                case EDITOR_UPPERCASE -> {
-                    int pos = codeArea.getCaretPosition();
-                    String text = codeArea.getText(0, codeArea.getText().length());
-                    ResultingStringState res = StringManipulator.uppercase(pos, text);
-                    codeArea.clear();
-                    codeArea.replaceText(res.text);
-                    codeArea.displaceCaret(res.caretPosition);
-                    event.consume();
-                }
-                case EDITOR_KILL_LINE -> {
-                    int pos = codeArea.getCaretPosition();
-                    codeArea.replaceText(codeArea.getText(0, pos));
-                    codeArea.displaceCaret(pos);
-                    event.consume();
-                }
-                case EDITOR_KILL_WORD -> {
-                    int pos = codeArea.getCaretPosition();
-                    String text = codeArea.getText(0, codeArea.getText().length());
-                    ResultingStringState res = StringManipulator.killWord(pos, text);
-                    codeArea.replaceText(res.text);
-                    codeArea.displaceCaret(res.caretPosition);
-                    event.consume();
-                }
-                case EDITOR_KILL_WORD_BACKWARD -> {
-                    int pos = codeArea.getCaretPosition();
-                    String text = codeArea.getText(0, codeArea.getText().length());
-                    ResultingStringState res = StringManipulator.backwardKillWord(pos, text);
-                    codeArea.replaceText(res.text);
-                    codeArea.displaceCaret(res.caretPosition);
-                    event.consume();
-                }
-            }
-        });
+    public static void call(
+            CodeArea codeArea, KeyEvent event, KeyBindingRepository keyBindingRepository) {
+        keyBindingRepository
+                .mapToKeyBinding(event)
+                .ifPresent(
+                        binding -> {
+                            switch (binding) {
+                                case EDITOR_DELETE -> {
+                                    codeArea.deleteNextChar();
+                                    event.consume();
+                                }
+                                case EDITOR_BACKWARD -> {
+                                    codeArea.previousChar(NavigationActions.SelectionPolicy.CLEAR);
+                                    event.consume();
+                                }
+                                case EDITOR_FORWARD -> {
+                                    codeArea.nextChar(NavigationActions.SelectionPolicy.CLEAR);
+                                    event.consume();
+                                }
+                                case EDITOR_WORD_BACKWARD -> {
+                                    codeArea.wordBreaksBackwards(
+                                            2, NavigationActions.SelectionPolicy.CLEAR);
+                                    event.consume();
+                                }
+                                case EDITOR_WORD_FORWARD -> {
+                                    codeArea.wordBreaksForwards(
+                                            2, NavigationActions.SelectionPolicy.CLEAR);
+                                    event.consume();
+                                }
+                                case EDITOR_BEGINNING_DOC -> {
+                                    codeArea.start(NavigationActions.SelectionPolicy.CLEAR);
+                                    event.consume();
+                                }
+                                case EDITOR_UP -> {
+                                    codeArea.paragraphStart(
+                                            NavigationActions.SelectionPolicy.CLEAR);
+                                    event.consume();
+                                }
+                                case EDITOR_BEGINNING -> {
+                                    codeArea.lineStart(NavigationActions.SelectionPolicy.CLEAR);
+                                    event.consume();
+                                }
+                                case EDITOR_END_DOC -> {
+                                    codeArea.end(NavigationActions.SelectionPolicy.CLEAR);
+                                    event.consume();
+                                }
+                                case EDITOR_DOWN -> {
+                                    codeArea.paragraphEnd(NavigationActions.SelectionPolicy.CLEAR);
+                                    event.consume();
+                                }
+                                case EDITOR_END -> {
+                                    codeArea.lineEnd(NavigationActions.SelectionPolicy.CLEAR);
+                                    event.consume();
+                                }
+                                case EDITOR_CAPITALIZE -> {
+                                    int pos = codeArea.getCaretPosition();
+                                    String text = codeArea.getText(0, codeArea.getText().length());
+                                    ResultingStringState res =
+                                            StringManipulator.capitalize(pos, text);
+                                    codeArea.replaceText(res.text);
+                                    codeArea.displaceCaret(res.caretPosition);
+                                    event.consume();
+                                }
+                                case EDITOR_LOWERCASE -> {
+                                    int pos = codeArea.getCaretPosition();
+                                    String text = codeArea.getText(0, codeArea.getText().length());
+                                    ResultingStringState res =
+                                            StringManipulator.lowercase(pos, text);
+                                    codeArea.replaceText(res.text);
+                                    codeArea.displaceCaret(res.caretPosition);
+                                    event.consume();
+                                }
+                                case EDITOR_UPPERCASE -> {
+                                    int pos = codeArea.getCaretPosition();
+                                    String text = codeArea.getText(0, codeArea.getText().length());
+                                    ResultingStringState res =
+                                            StringManipulator.uppercase(pos, text);
+                                    codeArea.clear();
+                                    codeArea.replaceText(res.text);
+                                    codeArea.displaceCaret(res.caretPosition);
+                                    event.consume();
+                                }
+                                case EDITOR_KILL_LINE -> {
+                                    int pos = codeArea.getCaretPosition();
+                                    codeArea.replaceText(codeArea.getText(0, pos));
+                                    codeArea.displaceCaret(pos);
+                                    event.consume();
+                                }
+                                case EDITOR_KILL_WORD -> {
+                                    int pos = codeArea.getCaretPosition();
+                                    String text = codeArea.getText(0, codeArea.getText().length());
+                                    ResultingStringState res =
+                                            StringManipulator.killWord(pos, text);
+                                    codeArea.replaceText(res.text);
+                                    codeArea.displaceCaret(res.caretPosition);
+                                    event.consume();
+                                }
+                                case EDITOR_KILL_WORD_BACKWARD -> {
+                                    int pos = codeArea.getCaretPosition();
+                                    String text = codeArea.getText(0, codeArea.getText().length());
+                                    ResultingStringState res =
+                                            StringManipulator.backwardKillWord(pos, text);
+                                    codeArea.replaceText(res.text);
+                                    codeArea.displaceCaret(res.caretPosition);
+                                    event.consume();
+                                }
+                            }
+                        });
     }
 }
-
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
index d0cb61003387..2fdddb4db784 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -8,126 +8,456 @@
 public enum KeyBinding {
     EDITOR_DELETE("Delete", Localization.lang("Delete text"), "", KeyBindingCategory.EDITOR),
     // DELETE BACKWARDS = Rubout
-    EDITOR_BACKWARD("Move caret left", Localization.lang("Move caret left"), "", KeyBindingCategory.EDITOR),
-    EDITOR_FORWARD("Move caret right", Localization.lang("Move caret right"), "", KeyBindingCategory.EDITOR),
-    EDITOR_WORD_BACKWARD("Move caret to previous word", Localization.lang("Move caret to previous word"), "", KeyBindingCategory.EDITOR),
-    EDITOR_WORD_FORWARD("Move caret to next word", Localization.lang("Move caret to next word"), "", KeyBindingCategory.EDITOR),
-    EDITOR_BEGINNING("Move caret to beginning of line", Localization.lang("Move caret to beginning of line"), "", KeyBindingCategory.EDITOR),
-    EDITOR_END("Move caret to  of line", Localization.lang("Move caret to end of line"), "", KeyBindingCategory.EDITOR),
-    EDITOR_BEGINNING_DOC("Move caret to beginning of text", Localization.lang("Move the caret to the beginning of text"), "", KeyBindingCategory.EDITOR),
-    EDITOR_END_DOC("Move caret to end of text", Localization.lang("Move the caret to the end of text"), "", KeyBindingCategory.EDITOR),
-    EDITOR_UP("Move caret up", Localization.lang("Move the caret up"), "", KeyBindingCategory.EDITOR),
-    EDITOR_DOWN("Move caret down", Localization.lang("Move the caret down"), "", KeyBindingCategory.EDITOR),
-    EDITOR_CAPITALIZE("Capitalize word", Localization.lang("Capitalize current word"), "", KeyBindingCategory.EDITOR),
-    EDITOR_LOWERCASE("Lowercase word", Localization.lang("Make current word lowercase"), "", KeyBindingCategory.EDITOR),
-    EDITOR_UPPERCASE("Uppercase word", Localization.lang("Make current word uppercase"), "", KeyBindingCategory.EDITOR),
-    EDITOR_KILL_LINE("Remove all characters caret to end of line", Localization.lang("Remove line after caret"), "", KeyBindingCategory.EDITOR),
-    EDITOR_KILL_WORD("Remove characters until next word", Localization.lang("Remove characters until next word"), "", KeyBindingCategory.EDITOR),
-    EDITOR_KILL_WORD_BACKWARD("Characters until previous word", Localization.lang("Remove the current word backwards"), "", KeyBindingCategory.EDITOR),
+    EDITOR_BACKWARD(
+            "Move caret left", Localization.lang("Move caret left"), "", KeyBindingCategory.EDITOR),
+    EDITOR_FORWARD(
+            "Move caret right",
+            Localization.lang("Move caret right"),
+            "",
+            KeyBindingCategory.EDITOR),
+    EDITOR_WORD_BACKWARD(
+            "Move caret to previous word",
+            Localization.lang("Move caret to previous word"),
+            "",
+            KeyBindingCategory.EDITOR),
+    EDITOR_WORD_FORWARD(
+            "Move caret to next word",
+            Localization.lang("Move caret to next word"),
+            "",
+            KeyBindingCategory.EDITOR),
+    EDITOR_BEGINNING(
+            "Move caret to beginning of line",
+            Localization.lang("Move caret to beginning of line"),
+            "",
+            KeyBindingCategory.EDITOR),
+    EDITOR_END(
+            "Move caret to  of line",
+            Localization.lang("Move caret to end of line"),
+            "",
+            KeyBindingCategory.EDITOR),
+    EDITOR_BEGINNING_DOC(
+            "Move caret to beginning of text",
+            Localization.lang("Move the caret to the beginning of text"),
+            "",
+            KeyBindingCategory.EDITOR),
+    EDITOR_END_DOC(
+            "Move caret to end of text",
+            Localization.lang("Move the caret to the end of text"),
+            "",
+            KeyBindingCategory.EDITOR),
+    EDITOR_UP(
+            "Move caret up", Localization.lang("Move the caret up"), "", KeyBindingCategory.EDITOR),
+    EDITOR_DOWN(
+            "Move caret down",
+            Localization.lang("Move the caret down"),
+            "",
+            KeyBindingCategory.EDITOR),
+    EDITOR_CAPITALIZE(
+            "Capitalize word",
+            Localization.lang("Capitalize current word"),
+            "",
+            KeyBindingCategory.EDITOR),
+    EDITOR_LOWERCASE(
+            "Lowercase word",
+            Localization.lang("Make current word lowercase"),
+            "",
+            KeyBindingCategory.EDITOR),
+    EDITOR_UPPERCASE(
+            "Uppercase word",
+            Localization.lang("Make current word uppercase"),
+            "",
+            KeyBindingCategory.EDITOR),
+    EDITOR_KILL_LINE(
+            "Remove all characters caret to end of line",
+            Localization.lang("Remove line after caret"),
+            "",
+            KeyBindingCategory.EDITOR),
+    EDITOR_KILL_WORD(
+            "Remove characters until next word",
+            Localization.lang("Remove characters until next word"),
+            "",
+            KeyBindingCategory.EDITOR),
+    EDITOR_KILL_WORD_BACKWARD(
+            "Characters until previous word",
+            Localization.lang("Remove the current word backwards"),
+            "",
+            KeyBindingCategory.EDITOR),
 
-    ABBREVIATE("Abbreviate", Localization.lang("Abbreviate journal names"), "ctrl+alt+A", KeyBindingCategory.TOOLS),
-    AUTOGENERATE_CITATION_KEYS("Autogenerate citation keys", Localization.lang("Autogenerate citation keys"), "ctrl+G", KeyBindingCategory.QUALITY),
+    ABBREVIATE(
+            "Abbreviate",
+            Localization.lang("Abbreviate journal names"),
+            "ctrl+alt+A",
+            KeyBindingCategory.TOOLS),
+    AUTOGENERATE_CITATION_KEYS(
+            "Autogenerate citation keys",
+            Localization.lang("Autogenerate citation keys"),
+            "ctrl+G",
+            KeyBindingCategory.QUALITY),
     ACCEPT("Accept", Localization.lang("Accept"), "ctrl+ENTER", KeyBindingCategory.EDIT),
-    AUTOMATICALLY_LINK_FILES("Automatically link files", Localization.lang("Automatically set file links"), "F7", KeyBindingCategory.QUALITY),
-    CHECK_INTEGRITY("Check integrity", Localization.lang("Check integrity"), "ctrl+F8", KeyBindingCategory.QUALITY),
+    AUTOMATICALLY_LINK_FILES(
+            "Automatically link files",
+            Localization.lang("Automatically set file links"),
+            "F7",
+            KeyBindingCategory.QUALITY),
+    CHECK_INTEGRITY(
+            "Check integrity",
+            Localization.lang("Check integrity"),
+            "ctrl+F8",
+            KeyBindingCategory.QUALITY),
     CLEANUP("Cleanup", Localization.lang("Cleanup entries"), "alt+F8", KeyBindingCategory.QUALITY),
-    CLOSE_DATABASE("Close library", Localization.lang("Close library"), "ctrl+W", KeyBindingCategory.FILE),
+    CLOSE_DATABASE(
+            "Close library", Localization.lang("Close library"), "ctrl+W", KeyBindingCategory.FILE),
     CLOSE("Close dialog", Localization.lang("Close dialog"), "Esc", KeyBindingCategory.VIEW),
     COPY("Copy", Localization.lang("Copy"), "ctrl+C", KeyBindingCategory.EDIT),
-    COPY_TITLE("Copy title", Localization.lang("Copy title"), "ctrl+shift+alt+T", KeyBindingCategory.EDIT),
+    COPY_TITLE(
+            "Copy title",
+            Localization.lang("Copy title"),
+            "ctrl+shift+alt+T",
+            KeyBindingCategory.EDIT),
 
-    // We migrated from "Copy \\cite{citation key}" to "Copy citation key with configured cite command", therefore we keep the "old string" for backwards comppatibility
-    COPY_CITE_CITATION_KEY("Copy \\cite{citation key}", Localization.lang("Copy citation key with configured cite command"), "ctrl+K", KeyBindingCategory.EDIT),
+    // We migrated from "Copy \\cite{citation key}" to "Copy citation key with configured cite
+    // command", therefore we keep the "old string" for backwards comppatibility
+    COPY_CITE_CITATION_KEY(
+            "Copy \\cite{citation key}",
+            Localization.lang("Copy citation key with configured cite command"),
+            "ctrl+K",
+            KeyBindingCategory.EDIT),
 
-    COPY_CITATION_KEY("Copy citation key", Localization.lang("Copy citation key"), "ctrl+shift+K", KeyBindingCategory.EDIT),
-    COPY_CITATION_KEY_AND_TITLE("Copy citation key and title", Localization.lang("Copy citation key and title"), "ctrl+shift+alt+K", KeyBindingCategory.EDIT),
-    COPY_CITATION_KEY_AND_LINK("Copy citation key and link", Localization.lang("Copy citation key and link"), "ctrl+alt+K", KeyBindingCategory.EDIT),
-    COPY_PREVIEW("Copy preview", Localization.lang("Copy preview"), "ctrl+shift+C", KeyBindingCategory.VIEW),
+    COPY_CITATION_KEY(
+            "Copy citation key",
+            Localization.lang("Copy citation key"),
+            "ctrl+shift+K",
+            KeyBindingCategory.EDIT),
+    COPY_CITATION_KEY_AND_TITLE(
+            "Copy citation key and title",
+            Localization.lang("Copy citation key and title"),
+            "ctrl+shift+alt+K",
+            KeyBindingCategory.EDIT),
+    COPY_CITATION_KEY_AND_LINK(
+            "Copy citation key and link",
+            Localization.lang("Copy citation key and link"),
+            "ctrl+alt+K",
+            KeyBindingCategory.EDIT),
+    COPY_PREVIEW(
+            "Copy preview",
+            Localization.lang("Copy preview"),
+            "ctrl+shift+C",
+            KeyBindingCategory.VIEW),
     CUT("Cut", Localization.lang("Cut"), "ctrl+X", KeyBindingCategory.EDIT),
-    // We have to put Entry Editor Previous before, because otherwise the decrease font size is found first
-    ENTRY_EDITOR_PREVIOUS_PANEL_2("Entry editor, previous panel 2", Localization.lang("Entry editor, previous panel 2"), "ctrl+MINUS", KeyBindingCategory.VIEW),
-    DELETE_ENTRY("Delete entry", Localization.lang("Delete entry"), "DELETE", KeyBindingCategory.BIBTEX),
-    DEFAULT_DIALOG_ACTION("Execute default action in dialog", Localization.lang("Execute default action in dialog"), "ctrl+ENTER", KeyBindingCategory.VIEW),
-    DOWNLOAD_FULL_TEXT("Download full text documents", Localization.lang("Download full text documents"), "alt+F7", KeyBindingCategory.QUALITY),
-    OPEN_CLOSE_ENTRY_EDITOR("Open / close entry editor", Localization.lang("Open / close entry editor"), "ctrl+E", KeyBindingCategory.VIEW),
+    // We have to put Entry Editor Previous before, because otherwise the decrease font size is
+    // found first
+    ENTRY_EDITOR_PREVIOUS_PANEL_2(
+            "Entry editor, previous panel 2",
+            Localization.lang("Entry editor, previous panel 2"),
+            "ctrl+MINUS",
+            KeyBindingCategory.VIEW),
+    DELETE_ENTRY(
+            "Delete entry", Localization.lang("Delete entry"), "DELETE", KeyBindingCategory.BIBTEX),
+    DEFAULT_DIALOG_ACTION(
+            "Execute default action in dialog",
+            Localization.lang("Execute default action in dialog"),
+            "ctrl+ENTER",
+            KeyBindingCategory.VIEW),
+    DOWNLOAD_FULL_TEXT(
+            "Download full text documents",
+            Localization.lang("Download full text documents"),
+            "alt+F7",
+            KeyBindingCategory.QUALITY),
+    OPEN_CLOSE_ENTRY_EDITOR(
+            "Open / close entry editor",
+            Localization.lang("Open / close entry editor"),
+            "ctrl+E",
+            KeyBindingCategory.VIEW),
     EXPORT("Export", Localization.lang("Export"), "ctrl+alt+e", KeyBindingCategory.FILE),
-    EXPORT_SELECTED("Export Selected", Localization.lang("Export selected entries"), "ctrl+shift+e", KeyBindingCategory.FILE),
-    EDIT_STRINGS("Edit strings", Localization.lang("Edit strings"), "ctrl+T", KeyBindingCategory.BIBTEX),
-    ENTRY_EDITOR_NEXT_ENTRY("Entry editor, next entry", Localization.lang("Entry editor, next entry"), "alt+DOWN", KeyBindingCategory.VIEW),
-    ENTRY_EDITOR_NEXT_PANEL("Entry editor, next panel", Localization.lang("Entry editor, next panel"), "ctrl+TAB", KeyBindingCategory.VIEW),
-    ENTRY_EDITOR_NEXT_PANEL_2("Entry editor, next panel 2", Localization.lang("Entry editor, next panel 2"), "ctrl+PLUS", KeyBindingCategory.VIEW),
-    ENTRY_EDITOR_PREVIOUS_ENTRY("Entry editor, previous entry", Localization.lang("Entry editor, previous entry"), "alt+UP", KeyBindingCategory.VIEW),
-    ENTRY_EDITOR_PREVIOUS_PANEL("Entry editor, previous panel", Localization.lang("Entry editor, previous panel"), "ctrl+shift+TAB", KeyBindingCategory.VIEW),
-    FILE_LIST_EDITOR_MOVE_ENTRY_DOWN("File list editor, move entry down", Localization.lang("File list editor, move entry down"), "ctrl+DOWN", KeyBindingCategory.VIEW),
-    FILE_LIST_EDITOR_MOVE_ENTRY_UP("File list editor, move entry up", Localization.lang("File list editor, move entry up"), "ctrl+UP", KeyBindingCategory.VIEW),
-    FIND_UNLINKED_FILES("Search for unlinked local files", Localization.lang("Search for unlinked local files"), "shift+F7", KeyBindingCategory.QUALITY),
-    FOCUS_ENTRY_TABLE("Focus entry table", Localization.lang("Focus entry table"), "alt+1", KeyBindingCategory.VIEW),
-    FOCUS_GROUP_LIST("Focus group list", Localization.lang("Focus group list"), "alt+s", KeyBindingCategory.VIEW),
+    EXPORT_SELECTED(
+            "Export Selected",
+            Localization.lang("Export selected entries"),
+            "ctrl+shift+e",
+            KeyBindingCategory.FILE),
+    EDIT_STRINGS(
+            "Edit strings", Localization.lang("Edit strings"), "ctrl+T", KeyBindingCategory.BIBTEX),
+    ENTRY_EDITOR_NEXT_ENTRY(
+            "Entry editor, next entry",
+            Localization.lang("Entry editor, next entry"),
+            "alt+DOWN",
+            KeyBindingCategory.VIEW),
+    ENTRY_EDITOR_NEXT_PANEL(
+            "Entry editor, next panel",
+            Localization.lang("Entry editor, next panel"),
+            "ctrl+TAB",
+            KeyBindingCategory.VIEW),
+    ENTRY_EDITOR_NEXT_PANEL_2(
+            "Entry editor, next panel 2",
+            Localization.lang("Entry editor, next panel 2"),
+            "ctrl+PLUS",
+            KeyBindingCategory.VIEW),
+    ENTRY_EDITOR_PREVIOUS_ENTRY(
+            "Entry editor, previous entry",
+            Localization.lang("Entry editor, previous entry"),
+            "alt+UP",
+            KeyBindingCategory.VIEW),
+    ENTRY_EDITOR_PREVIOUS_PANEL(
+            "Entry editor, previous panel",
+            Localization.lang("Entry editor, previous panel"),
+            "ctrl+shift+TAB",
+            KeyBindingCategory.VIEW),
+    FILE_LIST_EDITOR_MOVE_ENTRY_DOWN(
+            "File list editor, move entry down",
+            Localization.lang("File list editor, move entry down"),
+            "ctrl+DOWN",
+            KeyBindingCategory.VIEW),
+    FILE_LIST_EDITOR_MOVE_ENTRY_UP(
+            "File list editor, move entry up",
+            Localization.lang("File list editor, move entry up"),
+            "ctrl+UP",
+            KeyBindingCategory.VIEW),
+    FIND_UNLINKED_FILES(
+            "Search for unlinked local files",
+            Localization.lang("Search for unlinked local files"),
+            "shift+F7",
+            KeyBindingCategory.QUALITY),
+    FOCUS_ENTRY_TABLE(
+            "Focus entry table",
+            Localization.lang("Focus entry table"),
+            "alt+1",
+            KeyBindingCategory.VIEW),
+    FOCUS_GROUP_LIST(
+            "Focus group list",
+            Localization.lang("Focus group list"),
+            "alt+s",
+            KeyBindingCategory.VIEW),
     HELP("Help", Localization.lang("Help"), "F1", KeyBindingCategory.FILE),
-    IMPORT_INTO_CURRENT_DATABASE("Import into current library", Localization.lang("Import into current library"), "ctrl+I", KeyBindingCategory.FILE),
-    IMPORT_INTO_NEW_DATABASE("Import into new library", Localization.lang("Import into new library"), "ctrl+alt+I", KeyBindingCategory.FILE),
-    MERGE_ENTRIES("Merge entries", Localization.lang("Merge entries"), "ctrl+M", KeyBindingCategory.TOOLS),
+    IMPORT_INTO_CURRENT_DATABASE(
+            "Import into current library",
+            Localization.lang("Import into current library"),
+            "ctrl+I",
+            KeyBindingCategory.FILE),
+    IMPORT_INTO_NEW_DATABASE(
+            "Import into new library",
+            Localization.lang("Import into new library"),
+            "ctrl+alt+I",
+            KeyBindingCategory.FILE),
+    MERGE_ENTRIES(
+            "Merge entries",
+            Localization.lang("Merge entries"),
+            "ctrl+M",
+            KeyBindingCategory.TOOLS),
 
-    NEW_ARTICLE("New article", Localization.lang("New article"), "ctrl+shift+A", KeyBindingCategory.BIBTEX),
+    NEW_ARTICLE(
+            "New article",
+            Localization.lang("New article"),
+            "ctrl+shift+A",
+            KeyBindingCategory.BIBTEX),
     NEW_BOOK("New book", Localization.lang("New book"), "ctrl+shift+B", KeyBindingCategory.BIBTEX),
     NEW_ENTRY("New entry", Localization.lang("New entry"), "ctrl+N", KeyBindingCategory.BIBTEX),
-    NEW_ENTRY_FROM_PLAIN_TEXT_ONLINE("New entry from plain text", Localization.lang("New entry from plain text (online)"), "ctrl+shift+N", KeyBindingCategory.BIBTEX),
-    NEW_INBOOK("New inbook", Localization.lang("New inbook"), "ctrl+shift+I", KeyBindingCategory.BIBTEX),
-    NEW_MASTERSTHESIS("New mastersthesis", Localization.lang("New mastersthesis"), "ctrl+shift+M", KeyBindingCategory.BIBTEX),
-    NEW_PHDTHESIS("New phdthesis", Localization.lang("New phdthesis"), "ctrl+shift+T", KeyBindingCategory.BIBTEX),
-    NEW_PROCEEDINGS("New proceedings", Localization.lang("New proceedings"), "ctrl+shift+P", KeyBindingCategory.BIBTEX),
-    NEW_UNPUBLISHED("New unpublished", Localization.lang("New unpublished"), "ctrl+shift+U", KeyBindingCategory.BIBTEX),
-    NEW_TECHREPORT("New technical report", Localization.lang("New technical report"), "", KeyBindingCategory.BIBTEX),
-    NEW_INPROCEEDINGS("New inproceesings", Localization.lang("New inproceedings"), "", KeyBindingCategory.BIBTEX),
+    NEW_ENTRY_FROM_PLAIN_TEXT_ONLINE(
+            "New entry from plain text",
+            Localization.lang("New entry from plain text (online)"),
+            "ctrl+shift+N",
+            KeyBindingCategory.BIBTEX),
+    NEW_INBOOK(
+            "New inbook",
+            Localization.lang("New inbook"),
+            "ctrl+shift+I",
+            KeyBindingCategory.BIBTEX),
+    NEW_MASTERSTHESIS(
+            "New mastersthesis",
+            Localization.lang("New mastersthesis"),
+            "ctrl+shift+M",
+            KeyBindingCategory.BIBTEX),
+    NEW_PHDTHESIS(
+            "New phdthesis",
+            Localization.lang("New phdthesis"),
+            "ctrl+shift+T",
+            KeyBindingCategory.BIBTEX),
+    NEW_PROCEEDINGS(
+            "New proceedings",
+            Localization.lang("New proceedings"),
+            "ctrl+shift+P",
+            KeyBindingCategory.BIBTEX),
+    NEW_UNPUBLISHED(
+            "New unpublished",
+            Localization.lang("New unpublished"),
+            "ctrl+shift+U",
+            KeyBindingCategory.BIBTEX),
+    NEW_TECHREPORT(
+            "New technical report",
+            Localization.lang("New technical report"),
+            "",
+            KeyBindingCategory.BIBTEX),
+    NEW_INPROCEEDINGS(
+            "New inproceesings",
+            Localization.lang("New inproceedings"),
+            "",
+            KeyBindingCategory.BIBTEX),
 
-    NEXT_PREVIEW_LAYOUT("Next preview layout", Localization.lang("Next preview layout"), "F9", KeyBindingCategory.VIEW),
-    NEXT_LIBRARY("Next library", Localization.lang("Next library"), "ctrl+PAGE_DOWN", KeyBindingCategory.VIEW),
-    OPEN_CONSOLE("Open terminal here", Localization.lang("Open terminal here"), "ctrl+shift+L", KeyBindingCategory.TOOLS),
-    OPEN_DATABASE("Open library", Localization.lang("Open library"), "ctrl+O", KeyBindingCategory.FILE),
+    NEXT_PREVIEW_LAYOUT(
+            "Next preview layout",
+            Localization.lang("Next preview layout"),
+            "F9",
+            KeyBindingCategory.VIEW),
+    NEXT_LIBRARY(
+            "Next library",
+            Localization.lang("Next library"),
+            "ctrl+PAGE_DOWN",
+            KeyBindingCategory.VIEW),
+    OPEN_CONSOLE(
+            "Open terminal here",
+            Localization.lang("Open terminal here"),
+            "ctrl+shift+L",
+            KeyBindingCategory.TOOLS),
+    OPEN_DATABASE(
+            "Open library", Localization.lang("Open library"), "ctrl+O", KeyBindingCategory.FILE),
     OPEN_FILE("Open file", Localization.lang("Open file"), "F4", KeyBindingCategory.TOOLS),
-    OPEN_FOLDER("Open folder", Localization.lang("Open folder"), "ctrl+shift+O", KeyBindingCategory.TOOLS),
-    OPEN_OPEN_OFFICE_LIBRE_OFFICE_CONNECTION("Open OpenOffice/LibreOffice connection", Localization.lang("Open OpenOffice/LibreOffice connection"), "alt+0", KeyBindingCategory.TOOLS),
+    OPEN_FOLDER(
+            "Open folder",
+            Localization.lang("Open folder"),
+            "ctrl+shift+O",
+            KeyBindingCategory.TOOLS),
+    OPEN_OPEN_OFFICE_LIBRE_OFFICE_CONNECTION(
+            "Open OpenOffice/LibreOffice connection",
+            Localization.lang("Open OpenOffice/LibreOffice connection"),
+            "alt+0",
+            KeyBindingCategory.TOOLS),
     SHOW_PREFS("Preferences", Localization.lang("Preferences"), "ctrl+,", KeyBindingCategory.FILE),
-    OPEN_URL_OR_DOI("Open URL or DOI", Localization.lang("Open URL or DOI"), "F3", KeyBindingCategory.TOOLS),
+    OPEN_URL_OR_DOI(
+            "Open URL or DOI",
+            Localization.lang("Open URL or DOI"),
+            "F3",
+            KeyBindingCategory.TOOLS),
     PASTE("Paste", Localization.lang("Paste"), "ctrl+V", KeyBindingCategory.EDIT),
-    PULL_CHANGES_FROM_SHARED_DATABASE("Pull changes from shared database", Localization.lang("Pull changes from shared database"), "ctrl+shift+R", KeyBindingCategory.FILE),
-    PREVIOUS_PREVIEW_LAYOUT("Previous preview layout", Localization.lang("Previous preview layout"), "shift+F9", KeyBindingCategory.VIEW),
-    PREVIOUS_LIBRARY("Previous library", Localization.lang("Previous library"), "ctrl+PAGE_UP", KeyBindingCategory.VIEW),
-    SCROLL_TO_NEXT_MATCH_CATEGORY("Scroll to next match category", Localization.lang("Scroll to next match category"), "right", KeyBindingCategory.VIEW),
-    SCROLL_TO_PREVIOUS_MATCH_CATEGORY("Scroll to previous match category", Localization.lang("Scroll to previous match category"), "left", KeyBindingCategory.VIEW),
-    PUSH_TO_APPLICATION("Push to application", Localization.lang("Push to application"), "ctrl+L", KeyBindingCategory.TOOLS),
+    PULL_CHANGES_FROM_SHARED_DATABASE(
+            "Pull changes from shared database",
+            Localization.lang("Pull changes from shared database"),
+            "ctrl+shift+R",
+            KeyBindingCategory.FILE),
+    PREVIOUS_PREVIEW_LAYOUT(
+            "Previous preview layout",
+            Localization.lang("Previous preview layout"),
+            "shift+F9",
+            KeyBindingCategory.VIEW),
+    PREVIOUS_LIBRARY(
+            "Previous library",
+            Localization.lang("Previous library"),
+            "ctrl+PAGE_UP",
+            KeyBindingCategory.VIEW),
+    SCROLL_TO_NEXT_MATCH_CATEGORY(
+            "Scroll to next match category",
+            Localization.lang("Scroll to next match category"),
+            "right",
+            KeyBindingCategory.VIEW),
+    SCROLL_TO_PREVIOUS_MATCH_CATEGORY(
+            "Scroll to previous match category",
+            Localization.lang("Scroll to previous match category"),
+            "left",
+            KeyBindingCategory.VIEW),
+    PUSH_TO_APPLICATION(
+            "Push to application",
+            Localization.lang("Push to application"),
+            "ctrl+L",
+            KeyBindingCategory.TOOLS),
     QUIT_JABREF("Quit JabRef", Localization.lang("Quit JabRef"), "ctrl+Q", KeyBindingCategory.FILE),
     REDO("Redo", Localization.lang("Redo"), "ctrl+Y", KeyBindingCategory.EDIT),
-    REFRESH_OO("Refresh OO", Localization.lang("Refresh OpenOffice/LibreOffice"), "ctrl+alt+O", KeyBindingCategory.TOOLS),
-    REPLACE_STRING("Replace string", Localization.lang("Replace string"), "ctrl+R", KeyBindingCategory.SEARCH),
-    RESOLVE_DUPLICATE_CITATION_KEYS("Resolve duplicate citation keys", Localization.lang("Resolve duplicate citation keys"), "ctrl+shift+D", KeyBindingCategory.BIBTEX),
+    REFRESH_OO(
+            "Refresh OO",
+            Localization.lang("Refresh OpenOffice/LibreOffice"),
+            "ctrl+alt+O",
+            KeyBindingCategory.TOOLS),
+    REPLACE_STRING(
+            "Replace string",
+            Localization.lang("Replace string"),
+            "ctrl+R",
+            KeyBindingCategory.SEARCH),
+    RESOLVE_DUPLICATE_CITATION_KEYS(
+            "Resolve duplicate citation keys",
+            Localization.lang("Resolve duplicate citation keys"),
+            "ctrl+shift+D",
+            KeyBindingCategory.BIBTEX),
     SAVE_ALL("Save all", Localization.lang("Save all"), "ctrl+alt+S", KeyBindingCategory.FILE),
-    SAVE_DATABASE("Save library", Localization.lang("Save library"), "ctrl+S", KeyBindingCategory.FILE),
-    SAVE_DATABASE_AS("Save library as ...", Localization.lang("Save library as..."), "ctrl+shift+S", KeyBindingCategory.FILE),
+    SAVE_DATABASE(
+            "Save library", Localization.lang("Save library"), "ctrl+S", KeyBindingCategory.FILE),
+    SAVE_DATABASE_AS(
+            "Save library as ...",
+            Localization.lang("Save library as..."),
+            "ctrl+shift+S",
+            KeyBindingCategory.FILE),
     SEARCH("Search", Localization.lang("Search"), "ctrl+F", KeyBindingCategory.SEARCH),
-    OPEN_GLOBAL_SEARCH_DIALOG("Open global search window", Localization.lang("Open global search window"), "ctrl+shift+F", KeyBindingCategory.SEARCH),
+    OPEN_GLOBAL_SEARCH_DIALOG(
+            "Open global search window",
+            Localization.lang("Open global search window"),
+            "ctrl+shift+F",
+            KeyBindingCategory.SEARCH),
     SELECT_ALL("Select all", Localization.lang("Select all"), "ctrl+A", KeyBindingCategory.EDIT),
-    SELECT_FIRST_ENTRY("Select first entry", Localization.lang("Select first entry"), "HOME", KeyBindingCategory.EDIT),
-    SELECT_LAST_ENTRY("Select last entry", Localization.lang("Select last entry"), "END", KeyBindingCategory.EDIT),
-    STRING_DIALOG_ADD_STRING("String dialog, add string", Localization.lang("String dialog, add string"), "ctrl+N", KeyBindingCategory.FILE),
-    STRING_DIALOG_REMOVE_STRING("String dialog, remove string", Localization.lang("String dialog, remove string"), "shift+DELETE", KeyBindingCategory.FILE),
-    SYNCHRONIZE_FILES("Synchronize files", Localization.lang("Synchronize files"), "ctrl+shift+F7", KeyBindingCategory.QUALITY),
-    TOGGLE_GROUPS_INTERFACE("Toggle groups interface", Localization.lang("Toggle groups interface"), "alt+3", KeyBindingCategory.VIEW),
-    UNABBREVIATE("Unabbreviate", Localization.lang("Unabbreviate"), "ctrl+alt+shift+A", KeyBindingCategory.TOOLS),
+    SELECT_FIRST_ENTRY(
+            "Select first entry",
+            Localization.lang("Select first entry"),
+            "HOME",
+            KeyBindingCategory.EDIT),
+    SELECT_LAST_ENTRY(
+            "Select last entry",
+            Localization.lang("Select last entry"),
+            "END",
+            KeyBindingCategory.EDIT),
+    STRING_DIALOG_ADD_STRING(
+            "String dialog, add string",
+            Localization.lang("String dialog, add string"),
+            "ctrl+N",
+            KeyBindingCategory.FILE),
+    STRING_DIALOG_REMOVE_STRING(
+            "String dialog, remove string",
+            Localization.lang("String dialog, remove string"),
+            "shift+DELETE",
+            KeyBindingCategory.FILE),
+    SYNCHRONIZE_FILES(
+            "Synchronize files",
+            Localization.lang("Synchronize files"),
+            "ctrl+shift+F7",
+            KeyBindingCategory.QUALITY),
+    TOGGLE_GROUPS_INTERFACE(
+            "Toggle groups interface",
+            Localization.lang("Toggle groups interface"),
+            "alt+3",
+            KeyBindingCategory.VIEW),
+    UNABBREVIATE(
+            "Unabbreviate",
+            Localization.lang("Unabbreviate"),
+            "ctrl+alt+shift+A",
+            KeyBindingCategory.TOOLS),
     UNDO("Undo", Localization.lang("Undo"), "ctrl+Z", KeyBindingCategory.EDIT),
     WEB_SEARCH("Web search", Localization.lang("Web search"), "alt+4", KeyBindingCategory.SEARCH),
-    WRITE_METADATA_TO_PDF("Write metadata to PDF files", Localization.lang("Write metadata to PDF files"), "F6", KeyBindingCategory.TOOLS),
-    CLEAR_SEARCH("Clear search", Localization.lang("Clear search"), "Esc", KeyBindingCategory.SEARCH),
-    CLEAR_READ_STATUS("Clear read status", Localization.lang("Clear read status"), "", KeyBindingCategory.EDIT),
-    READ("Set read status to read", Localization.lang("Set read status to read"), "", KeyBindingCategory.EDIT),
-    SKIMMED("Set read status to skimmed", Localization.lang("Set read status to skimmed"), "", KeyBindingCategory.EDIT);
+    WRITE_METADATA_TO_PDF(
+            "Write metadata to PDF files",
+            Localization.lang("Write metadata to PDF files"),
+            "F6",
+            KeyBindingCategory.TOOLS),
+    CLEAR_SEARCH(
+            "Clear search", Localization.lang("Clear search"), "Esc", KeyBindingCategory.SEARCH),
+    CLEAR_READ_STATUS(
+            "Clear read status",
+            Localization.lang("Clear read status"),
+            "",
+            KeyBindingCategory.EDIT),
+    READ(
+            "Set read status to read",
+            Localization.lang("Set read status to read"),
+            "",
+            KeyBindingCategory.EDIT),
+    SKIMMED(
+            "Set read status to skimmed",
+            Localization.lang("Set read status to skimmed"),
+            "",
+            KeyBindingCategory.EDIT);
 
     private final String constant;
     private final String localization;
     private final String defaultBinding;
     private final KeyBindingCategory category;
 
-    KeyBinding(String constantName, String localization, String defaultKeyBinding, KeyBindingCategory category) {
+    KeyBinding(
+            String constantName,
+            String localization,
+            String defaultKeyBinding,
+            KeyBindingCategory category) {
         this.constant = constantName;
         this.localization = localization;
         this.defaultBinding = defaultKeyBinding;
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java
index ae8cb0b673f1..04e28765c11b 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingCategory.java
@@ -4,7 +4,6 @@
 import org.jabref.model.database.BibDatabaseMode;
 
 public enum KeyBindingCategory {
-
     FILE(Localization.lang("File")),
     EDIT(Localization.lang("Edit")),
     SEARCH(Localization.lang("Search")),
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
index 82183dd74be1..a039d1685a0b 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
@@ -1,5 +1,14 @@
 package org.jabref.gui.keyboard;
 
+import javafx.beans.property.MapProperty;
+import javafx.beans.property.SimpleMapProperty;
+import javafx.collections.FXCollections;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyCombination;
+import javafx.scene.input.KeyEvent;
+
+import org.jabref.logic.os.OS;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -11,15 +20,6 @@
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
-import javafx.beans.property.MapProperty;
-import javafx.beans.property.SimpleMapProperty;
-import javafx.collections.FXCollections;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyCombination;
-import javafx.scene.input.KeyEvent;
-
-import org.jabref.logic.os.OS;
-
 /**
  * Handles keyboard shortcuts. Including checking whether a keybinding matches.
  * See {@link #matches}.
@@ -40,9 +40,14 @@ public KeyBindingRepository(SortedMap<KeyBinding, String> bindings) {
     }
 
     public KeyBindingRepository(List<String> bindNames, List<String> bindings) {
-        this.bindings = new SimpleMapProperty<>(FXCollections.observableMap(new TreeMap<>(Comparator.comparing(KeyBinding::getLocalization))));
-
-        if ((bindNames.isEmpty()) || (bindings.isEmpty()) || (bindNames.size() != bindings.size())) {
+        this.bindings =
+                new SimpleMapProperty<>(
+                        FXCollections.observableMap(
+                                new TreeMap<>(Comparator.comparing(KeyBinding::getLocalization))));
+
+        if ((bindNames.isEmpty())
+                || (bindings.isEmpty())
+                || (bindNames.size() != bindings.size())) {
             // Use default key bindings
             for (KeyBinding keyBinding : KeyBinding.values()) {
                 put(keyBinding, keyBinding.getDefaultKeyBinding());
@@ -61,7 +66,8 @@ public KeyBindingRepository(List<String> bindNames, List<String> bindings) {
      * @param keyEvent    as KeEvent
      * @return true if matching, else false
      */
-    public static boolean checkKeyCombinationEquality(KeyCombination combination, KeyEvent keyEvent) {
+    public static boolean checkKeyCombinationEquality(
+            KeyCombination combination, KeyEvent keyEvent) {
         KeyCode code = keyEvent.getCode();
         if (code == KeyCode.UNDEFINED) {
             return false;
@@ -103,7 +109,9 @@ public void put(String key, String value) {
     }
 
     private Optional<KeyBinding> getKeyBinding(String key) {
-        return Arrays.stream(KeyBinding.values()).filter(b -> b.getConstant().equals(key)).findFirst();
+        return Arrays.stream(KeyBinding.values())
+                .filter(b -> b.getConstant().equals(key))
+                .findFirst();
     }
 
     public void resetToDefault(String key) {
@@ -137,8 +145,8 @@ public Optional<KeyBinding> mapToKeyBinding(KeyEvent keyEvent) {
      */
     private Set<KeyBinding> mapToKeyBindings(KeyEvent keyEvent) {
         return Arrays.stream(KeyBinding.values())
-                     .filter(binding -> checkKeyCombinationEquality(binding, keyEvent))
-                     .collect(Collectors.toSet());
+                .filter(binding -> checkKeyCombinationEquality(binding, keyEvent))
+                .collect(Collectors.toSet());
     }
 
     /**
@@ -147,9 +155,7 @@ private Set<KeyBinding> mapToKeyBindings(KeyEvent keyEvent) {
      * Used if a keyboard shortcut leads to multiple actions (e.g., ESC for closing a dialog and clearing the search).
      */
     public boolean matches(KeyEvent event, KeyBinding keyBinding) {
-        return mapToKeyBindings(event)
-                .stream()
-                .anyMatch(binding -> binding == keyBinding);
+        return mapToKeyBindings(event).stream().anyMatch(binding -> binding == keyBinding);
     }
 
     public Optional<KeyCombination> getKeyCombination(KeyBinding bindName) {
@@ -171,8 +177,9 @@ public Optional<KeyCombination> getKeyCombination(KeyBinding bindName) {
      * @return true if matching, else false
      */
     public boolean checkKeyCombinationEquality(KeyBinding binding, KeyEvent keyEvent) {
-        return getKeyCombination(binding).filter(combination -> checkKeyCombinationEquality(combination, keyEvent))
-                                         .isPresent();
+        return getKeyCombination(binding)
+                .filter(combination -> checkKeyCombinationEquality(combination, keyEvent))
+                .isPresent();
     }
 
     public List<String> getBindNames() {
diff --git a/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java
index 7140fefe4a62..5238fbb52faa 100644
--- a/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java
+++ b/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java
@@ -9,87 +9,107 @@
 
 public class TextInputKeyBindings {
 
-    public static void call(Scene scene, KeyEvent event, KeyBindingRepository keyBindingRepository) {
+    public static void call(
+            Scene scene, KeyEvent event, KeyBindingRepository keyBindingRepository) {
         if (scene.focusOwnerProperty().get() instanceof TextInputControl focusedTextField) {
-            keyBindingRepository.mapToKeyBinding(event).ifPresent(binding -> {
-                switch (binding) {
-                    case EDITOR_DELETE -> {
-                        focusedTextField.deleteNextChar();
-                        event.consume();
-                    }
-                    case EDITOR_BACKWARD -> {
-                        focusedTextField.backward();
-                        event.consume();
-                    }
-                    case EDITOR_FORWARD -> {
-                        focusedTextField.forward();
-                        event.consume();
-                    }
-                    case EDITOR_WORD_BACKWARD -> {
-                        focusedTextField.previousWord();
-                        event.consume();
-                    }
-                    case EDITOR_WORD_FORWARD -> {
-                        focusedTextField.nextWord();
-                        event.consume();
-                    }
-                    case EDITOR_BEGINNING, EDITOR_UP, EDITOR_BEGINNING_DOC -> {
-                        focusedTextField.home();
-                        event.consume();
-                    }
-                    case EDITOR_END, EDITOR_DOWN, EDITOR_END_DOC -> {
-                        focusedTextField.end();
-                        event.consume();
-                    }
-                    case EDITOR_CAPITALIZE -> {
-                        int pos = focusedTextField.getCaretPosition();
-                        String text = focusedTextField.getText(0, focusedTextField.getText().length());
-                        ResultingStringState res = StringManipulator.capitalize(pos, text);
-                        focusedTextField.setText(res.text);
-                        focusedTextField.positionCaret(res.caretPosition);
-                        event.consume();
-                    }
-                    case EDITOR_LOWERCASE -> {
-                        int pos = focusedTextField.getCaretPosition();
-                        String text = focusedTextField.getText(0, focusedTextField.getText().length());
-                        ResultingStringState res = StringManipulator.lowercase(pos, text);
-                        focusedTextField.setText(res.text);
-                        focusedTextField.positionCaret(res.caretPosition);
-                        event.consume();
-                    }
-                    case EDITOR_UPPERCASE -> {
-                        int pos = focusedTextField.getCaretPosition();
-                        String text = focusedTextField.getText(0, focusedTextField.getText().length());
-                        ResultingStringState res = StringManipulator.uppercase(pos, text);
-                        focusedTextField.setText(res.text);
-                        focusedTextField.positionCaret(res.caretPosition);
-                        event.consume();
-                    }
-                    case EDITOR_KILL_LINE -> {
-                        int pos = focusedTextField.getCaretPosition();
-                        focusedTextField.setText(focusedTextField.getText(0, pos));
-                        focusedTextField.positionCaret(pos);
-                        event.consume();
-                    }
-                    case EDITOR_KILL_WORD -> {
-                        int pos = focusedTextField.getCaretPosition();
-                        String text = focusedTextField.getText(0, focusedTextField.getText().length());
-                        ResultingStringState res = StringManipulator.killWord(pos, text);
-                        focusedTextField.setText(res.text);
-                        focusedTextField.positionCaret(res.caretPosition);
-                        event.consume();
-                    }
-                    case EDITOR_KILL_WORD_BACKWARD -> {
-                        int pos = focusedTextField.getCaretPosition();
-                        String text = focusedTextField.getText(0, focusedTextField.getText().length());
-                        ResultingStringState res = StringManipulator.backwardKillWord(pos, text);
-                        focusedTextField.setText(res.text);
-                        focusedTextField.positionCaret(res.caretPosition);
-                        event.consume();
-                    }
-                    // CLEAR_SEARCH is handled at org.jabref.gui.search.SearchTextField
-                }
-            });
+            keyBindingRepository
+                    .mapToKeyBinding(event)
+                    .ifPresent(
+                            binding -> {
+                                switch (binding) {
+                                    case EDITOR_DELETE -> {
+                                        focusedTextField.deleteNextChar();
+                                        event.consume();
+                                    }
+                                    case EDITOR_BACKWARD -> {
+                                        focusedTextField.backward();
+                                        event.consume();
+                                    }
+                                    case EDITOR_FORWARD -> {
+                                        focusedTextField.forward();
+                                        event.consume();
+                                    }
+                                    case EDITOR_WORD_BACKWARD -> {
+                                        focusedTextField.previousWord();
+                                        event.consume();
+                                    }
+                                    case EDITOR_WORD_FORWARD -> {
+                                        focusedTextField.nextWord();
+                                        event.consume();
+                                    }
+                                    case EDITOR_BEGINNING, EDITOR_UP, EDITOR_BEGINNING_DOC -> {
+                                        focusedTextField.home();
+                                        event.consume();
+                                    }
+                                    case EDITOR_END, EDITOR_DOWN, EDITOR_END_DOC -> {
+                                        focusedTextField.end();
+                                        event.consume();
+                                    }
+                                    case EDITOR_CAPITALIZE -> {
+                                        int pos = focusedTextField.getCaretPosition();
+                                        String text =
+                                                focusedTextField.getText(
+                                                        0, focusedTextField.getText().length());
+                                        ResultingStringState res =
+                                                StringManipulator.capitalize(pos, text);
+                                        focusedTextField.setText(res.text);
+                                        focusedTextField.positionCaret(res.caretPosition);
+                                        event.consume();
+                                    }
+                                    case EDITOR_LOWERCASE -> {
+                                        int pos = focusedTextField.getCaretPosition();
+                                        String text =
+                                                focusedTextField.getText(
+                                                        0, focusedTextField.getText().length());
+                                        ResultingStringState res =
+                                                StringManipulator.lowercase(pos, text);
+                                        focusedTextField.setText(res.text);
+                                        focusedTextField.positionCaret(res.caretPosition);
+                                        event.consume();
+                                    }
+                                    case EDITOR_UPPERCASE -> {
+                                        int pos = focusedTextField.getCaretPosition();
+                                        String text =
+                                                focusedTextField.getText(
+                                                        0, focusedTextField.getText().length());
+                                        ResultingStringState res =
+                                                StringManipulator.uppercase(pos, text);
+                                        focusedTextField.setText(res.text);
+                                        focusedTextField.positionCaret(res.caretPosition);
+                                        event.consume();
+                                    }
+                                    case EDITOR_KILL_LINE -> {
+                                        int pos = focusedTextField.getCaretPosition();
+                                        focusedTextField.setText(focusedTextField.getText(0, pos));
+                                        focusedTextField.positionCaret(pos);
+                                        event.consume();
+                                    }
+                                    case EDITOR_KILL_WORD -> {
+                                        int pos = focusedTextField.getCaretPosition();
+                                        String text =
+                                                focusedTextField.getText(
+                                                        0, focusedTextField.getText().length());
+                                        ResultingStringState res =
+                                                StringManipulator.killWord(pos, text);
+                                        focusedTextField.setText(res.text);
+                                        focusedTextField.positionCaret(res.caretPosition);
+                                        event.consume();
+                                    }
+                                    case EDITOR_KILL_WORD_BACKWARD -> {
+                                        int pos = focusedTextField.getCaretPosition();
+                                        String text =
+                                                focusedTextField.getText(
+                                                        0, focusedTextField.getText().length());
+                                        ResultingStringState res =
+                                                StringManipulator.backwardKillWord(pos, text);
+                                        focusedTextField.setText(res.text);
+                                        focusedTextField.positionCaret(res.caretPosition);
+                                        event.consume();
+                                    }
+                                        // CLEAR_SEARCH is handled at
+                                        // org.jabref.gui.search.SearchTextField
+                                }
+                            });
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java b/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java
index f967733b32c2..4755393d899d 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java
@@ -1,14 +1,15 @@
 package org.jabref.gui.libraryproperties;
 
+import jakarta.inject.Inject;
+
 import javafx.scene.Node;
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.DialogService;
 import org.jabref.model.database.BibDatabaseContext;
 
-import jakarta.inject.Inject;
-
-public abstract class AbstractPropertiesTabView<T extends PropertiesTabViewModel> extends VBox implements PropertiesTab {
+public abstract class AbstractPropertiesTabView<T extends PropertiesTabViewModel> extends VBox
+        implements PropertiesTab {
 
     @Inject protected DialogService dialogService;
 
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesAction.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesAction.java
index 1632c696d433..8e83b4cd175c 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesAction.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesAction.java
@@ -1,17 +1,17 @@
 package org.jabref.gui.libraryproperties;
 
-import java.util.function.Supplier;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+
+import com.airhacks.afterburner.injection.Injector;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.model.database.BibDatabaseContext;
-
-import com.airhacks.afterburner.injection.Injector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import java.util.function.Supplier;
 
 public class LibraryPropertiesAction extends SimpleCommand {
     private static final Logger LOGGER = LoggerFactory.getLogger(LibraryPropertiesAction.class);
@@ -24,7 +24,8 @@ public LibraryPropertiesAction(StateManager stateManager) {
         this.executable.bind(needsDatabase(stateManager));
     }
 
-    public LibraryPropertiesAction(Supplier<BibDatabaseContext> databaseContext, StateManager stateManager) {
+    public LibraryPropertiesAction(
+            Supplier<BibDatabaseContext> databaseContext, StateManager stateManager) {
         this.stateManager = stateManager;
         this.alternateDatabase = databaseContext;
     }
@@ -34,10 +35,12 @@ public void execute() {
         DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
 
         if (alternateDatabase != null) {
-            dialogService.showCustomDialogAndWait(new LibraryPropertiesView(alternateDatabase.get()));
+            dialogService.showCustomDialogAndWait(
+                    new LibraryPropertiesView(alternateDatabase.get()));
         } else {
             if (stateManager.getActiveDatabase().isPresent()) {
-                dialogService.showCustomDialogAndWait(new LibraryPropertiesView(stateManager.getActiveDatabase().get()));
+                dialogService.showCustomDialogAndWait(
+                        new LibraryPropertiesView(stateManager.getActiveDatabase().get()));
             } else {
                 LOGGER.warn("No library selected.");
             }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java
index 5286d4fbfbf6..606deede3587 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.libraryproperties;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ScrollPane;
@@ -12,9 +16,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class LibraryPropertiesView extends BaseDialog<LibraryPropertiesViewModel> {
 
     @FXML private TabPane tabPane;
@@ -28,14 +29,16 @@ public class LibraryPropertiesView extends BaseDialog<LibraryPropertiesViewModel
     public LibraryPropertiesView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
-        ControlHelper.setAction(saveButton, getDialogPane(), event -> savePreferencesAndCloseDialog());
+        ControlHelper.setAction(
+                saveButton, getDialogPane(), event -> savePreferencesAndCloseDialog());
 
         if (databaseContext.getDatabasePath().isPresent()) {
-            setTitle(Localization.lang("%0 - Library properties", databaseContext.getDatabasePath().get().getFileName()));
+            setTitle(
+                    Localization.lang(
+                            "%0 - Library properties",
+                            databaseContext.getDatabasePath().get().getFileName()));
         } else {
             setTitle(Localization.lang("Library properties"));
         }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java
index 9939528cc362..cce6379c3537 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.libraryproperties;
 
-import java.util.List;
-
 import org.jabref.gui.libraryproperties.constants.ConstantsPropertiesView;
 import org.jabref.gui.libraryproperties.contentselectors.ContentSelectorView;
 import org.jabref.gui.libraryproperties.general.GeneralPropertiesView;
@@ -10,19 +8,21 @@
 import org.jabref.gui.libraryproperties.saving.SavingPropertiesView;
 import org.jabref.model.database.BibDatabaseContext;
 
+import java.util.List;
+
 public class LibraryPropertiesViewModel {
 
     private final List<PropertiesTab> propertiesTabs;
 
     public LibraryPropertiesViewModel(BibDatabaseContext databaseContext) {
-        propertiesTabs = List.of(
-                new GeneralPropertiesView(databaseContext),
-                new SavingPropertiesView(databaseContext),
-                new KeyPatternPropertiesView(databaseContext),
-                new ConstantsPropertiesView(databaseContext),
-                new ContentSelectorView(databaseContext),
-                new PreamblePropertiesView(databaseContext)
-        );
+        propertiesTabs =
+                List.of(
+                        new GeneralPropertiesView(databaseContext),
+                        new SavingPropertiesView(databaseContext),
+                        new KeyPatternPropertiesView(databaseContext),
+                        new ConstantsPropertiesView(databaseContext),
+                        new ContentSelectorView(databaseContext),
+                        new PreamblePropertiesView(databaseContext));
     }
 
     public void setValues() {
diff --git a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsItemModel.java b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsItemModel.java
index fb262a59e802..6af1283f5119 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsItemModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsItemModel.java
@@ -1,6 +1,10 @@
 package org.jabref.gui.libraryproperties.constants;
 
-import java.util.regex.Pattern;
+import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -8,15 +12,11 @@
 
 import org.jabref.logic.l10n.Localization;
 
-import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
+import java.util.regex.Pattern;
 
 public class ConstantsItemModel {
 
-    private final static Pattern IS_NUMBER = Pattern.compile("-?\\d+(\\.\\d+)?");
+    private static final Pattern IS_NUMBER = Pattern.compile("-?\\d+(\\.\\d+)?");
 
     private final StringProperty labelProperty = new SimpleStringProperty();
     private final StringProperty contentProperty = new SimpleStringProperty();
@@ -29,8 +29,11 @@ public ConstantsItemModel(String label, String content) {
         this.labelProperty.setValue(label);
         this.contentProperty.setValue(content);
 
-        labelValidator = new FunctionBasedValidator<>(this.labelProperty, ConstantsItemModel::validateLabel);
-        contentValidator = new FunctionBasedValidator<>(this.contentProperty, ConstantsItemModel::validateContent);
+        labelValidator =
+                new FunctionBasedValidator<>(this.labelProperty, ConstantsItemModel::validateLabel);
+        contentValidator =
+                new FunctionBasedValidator<>(
+                        this.contentProperty, ConstantsItemModel::validateContent);
         combinedValidator = new CompositeValidator(labelValidator, contentValidator);
     }
 
@@ -68,11 +71,14 @@ private static ValidationMessage validateLabel(String input) {
         } else if (input.trim().isEmpty()) {
             return ValidationMessage.error(Localization.lang("Please enter the string's label"));
         } else if (IS_NUMBER.matcher(input).matches()) {
-            return ValidationMessage.error(Localization.lang("The label of the string cannot be a number."));
+            return ValidationMessage.error(
+                    Localization.lang("The label of the string cannot be a number."));
         } else if (input.contains("#")) {
-            return ValidationMessage.error(Localization.lang("The label of the string cannot contain the '#' character."));
+            return ValidationMessage.error(
+                    Localization.lang("The label of the string cannot contain the '#' character."));
         } else if (input.contains(" ")) {
-            return ValidationMessage.error(Localization.lang("The label of the string cannot contain spaces."));
+            return ValidationMessage.error(
+                    Localization.lang("The label of the string cannot contain spaces."));
         } else {
             return null; // everything is ok
         }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
index f9e1008f0f2d..2de9bc2c3e45 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
@@ -1,6 +1,8 @@
 package org.jabref.gui.libraryproperties.constants;
 
-import java.util.Optional;
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -19,10 +21,10 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+import java.util.Optional;
 
-public class ConstantsPropertiesView extends AbstractPropertiesTabView<ConstantsPropertiesViewModel> implements PropertiesTab {
+public class ConstantsPropertiesView extends AbstractPropertiesTabView<ConstantsPropertiesViewModel>
+        implements PropertiesTab {
 
     @FXML private TableView<ConstantsItemModel> stringsList;
     @FXML private TableColumn<ConstantsItemModel, String> labelColumn;
@@ -36,9 +38,7 @@ public class ConstantsPropertiesView extends AbstractPropertiesTabView<Constants
     public ConstantsPropertiesView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -47,7 +47,11 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new ConstantsPropertiesViewModel(databaseContext, dialogService, preferences.getExternalApplicationsPreferences());
+        this.viewModel =
+                new ConstantsPropertiesViewModel(
+                        databaseContext,
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences());
 
         addStringButton.setTooltip(new Tooltip(Localization.lang("New string")));
 
@@ -58,31 +62,34 @@ public void initialize() {
         new ViewModelTextFieldTableCellVisualizationFactory<ConstantsItemModel, String>()
                 .withValidation(ConstantsItemModel::labelValidation)
                 .install(labelColumn, new DefaultStringConverter());
-        labelColumn.setOnEditCommit((TableColumn.CellEditEvent<ConstantsItemModel, String> cellEvent) -> {
-
-            var tableView = cellEvent.getTableView();
-            ConstantsItemModel cellItem = tableView.getItems()
-                                                   .get(cellEvent.getTablePosition().getRow());
-
-            Optional<ConstantsItemModel> existingItem = viewModel.labelAlreadyExists(cellEvent.getNewValue());
-
-            if (existingItem.isPresent() && !existingItem.get().equals(cellItem)) {
-                dialogService.showErrorDialogAndWait(Localization.lang(
-                        "A string with the label '%0' already exists.",
-                        cellEvent.getNewValue()));
-                cellItem.setLabel(cellEvent.getOldValue());
-            } else {
-                cellItem.setLabel(cellEvent.getNewValue());
-            }
-
-            // Resort the entries based on the keys and set the focus to the newly-created entry
-            viewModel.resortStrings();
-            var selectionModel = tableView.getSelectionModel();
-            selectionModel.select(cellItem);
-            selectionModel.focus(selectionModel.getSelectedIndex());
-            tableView.refresh();
-            tableView.scrollTo(cellItem);
-        });
+        labelColumn.setOnEditCommit(
+                (TableColumn.CellEditEvent<ConstantsItemModel, String> cellEvent) -> {
+                    var tableView = cellEvent.getTableView();
+                    ConstantsItemModel cellItem =
+                            tableView.getItems().get(cellEvent.getTablePosition().getRow());
+
+                    Optional<ConstantsItemModel> existingItem =
+                            viewModel.labelAlreadyExists(cellEvent.getNewValue());
+
+                    if (existingItem.isPresent() && !existingItem.get().equals(cellItem)) {
+                        dialogService.showErrorDialogAndWait(
+                                Localization.lang(
+                                        "A string with the label '%0' already exists.",
+                                        cellEvent.getNewValue()));
+                        cellItem.setLabel(cellEvent.getOldValue());
+                    } else {
+                        cellItem.setLabel(cellEvent.getNewValue());
+                    }
+
+                    // Resort the entries based on the keys and set the focus to the newly-created
+                    // entry
+                    viewModel.resortStrings();
+                    var selectionModel = tableView.getSelectionModel();
+                    selectionModel.select(cellItem);
+                    selectionModel.focus(selectionModel.getSelectedIndex());
+                    tableView.refresh();
+                    tableView.scrollTo(cellItem);
+                });
 
         contentColumn.setSortable(true);
         contentColumn.setReorderable(false);
@@ -90,8 +97,9 @@ public void initialize() {
         new ViewModelTextFieldTableCellVisualizationFactory<ConstantsItemModel, String>()
                 .withValidation(ConstantsItemModel::contentValidation)
                 .install(contentColumn, new DefaultStringConverter());
-        contentColumn.setOnEditCommit((TableColumn.CellEditEvent<ConstantsItemModel, String> cell) ->
-                cell.getRowValue().setContent(cell.getNewValue()));
+        contentColumn.setOnEditCommit(
+                (TableColumn.CellEditEvent<ConstantsItemModel, String> cell) ->
+                        cell.getRowValue().setContent(cell.getNewValue()));
 
         actionsColumn.setSortable(false);
         actionsColumn.setReorderable(false);
@@ -99,8 +107,11 @@ public void initialize() {
         new ValueTableCellFactory<ConstantsItemModel, String>()
                 .withGraphic(label -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
                 .withTooltip(label -> Localization.lang("Remove string %0", label))
-                .withOnMouseClickedEvent(item -> evt ->
-                        viewModel.removeString(stringsList.getFocusModel().getFocusedItem()))
+                .withOnMouseClickedEvent(
+                        item ->
+                                evt ->
+                                        viewModel.removeString(
+                                                stringsList.getFocusModel().getFocusedItem()))
                 .install(actionsColumn);
 
         stringsList.itemsProperty().bindBidirectional(viewModel.stringsListProperty());
diff --git a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
index 3d84596e872e..213634a600cb 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
@@ -1,9 +1,6 @@
 package org.jabref.gui.libraryproperties.constants;
 
-import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -22,7 +19,10 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibtexString;
 
-import com.tobiasdiez.easybind.EasyBind;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
 
 public class ConstantsPropertiesViewModel implements PropertiesTabViewModel {
 
@@ -38,22 +38,28 @@ public class ConstantsPropertiesViewModel implements PropertiesTabViewModel {
     private final DialogService dialogService;
     private final ExternalApplicationsPreferences externalApplicationsPreferences;
 
-    public ConstantsPropertiesViewModel(BibDatabaseContext databaseContext, DialogService dialogService, ExternalApplicationsPreferences externalApplicationsPreferences) {
+    public ConstantsPropertiesViewModel(
+            BibDatabaseContext databaseContext,
+            DialogService dialogService,
+            ExternalApplicationsPreferences externalApplicationsPreferences) {
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
         this.externalApplicationsPreferences = externalApplicationsPreferences;
 
         ObservableList<ObservableValue<Boolean>> allValidProperty =
-                EasyBind.map(stringsListProperty, ConstantsItemModel::combinedValidationValidProperty);
-        validProperty.bind(EasyBind.combine(allValidProperty, stream -> stream.allMatch(valid -> valid)));
+                EasyBind.map(
+                        stringsListProperty, ConstantsItemModel::combinedValidationValidProperty);
+        validProperty.bind(
+                EasyBind.combine(allValidProperty, stream -> stream.allMatch(valid -> valid)));
     }
 
     @Override
     public void setValues() {
-        stringsListProperty.addAll(databaseContext.getDatabase().getStringValues().stream()
-                                                  .sorted(new BibtexStringComparator(false))
-                                                  .map(this::convertFromBibTexString)
-                                                  .toList());
+        stringsListProperty.addAll(
+                databaseContext.getDatabase().getStringValues().stream()
+                        .sorted(new BibtexStringComparator(false))
+                        .map(this::convertFromBibTexString)
+                        .toList());
     }
 
     public void addNewString() {
@@ -77,7 +83,8 @@ public void removeString(ConstantsItemModel item) {
 
     public void resortStrings() {
         // Resort the strings list in the same order as setValues() does
-        stringsListProperty.sort(Comparator.comparing(c -> c.labelProperty().get().toLowerCase(Locale.ROOT)));
+        stringsListProperty.sort(
+                Comparator.comparing(c -> c.labelProperty().get().toLowerCase(Locale.ROOT)));
     }
 
     private ConstantsItemModel convertFromBibTexString(BibtexString bibtexString) {
@@ -86,9 +93,8 @@ private ConstantsItemModel convertFromBibTexString(BibtexString bibtexString) {
 
     @Override
     public void storeSettings() {
-        List<BibtexString> strings = stringsListProperty.stream()
-                                                        .map(this::fromBibtexStringViewModel)
-                                                        .toList();
+        List<BibtexString> strings =
+                stringsListProperty.stream().map(this::fromBibtexStringViewModel).toList();
         databaseContext.getDatabase().setStrings(strings);
     }
 
@@ -100,12 +106,13 @@ private BibtexString fromBibtexStringViewModel(ConstantsItemModel viewModel) {
 
     public Optional<ConstantsItemModel> labelAlreadyExists(String label) {
         return stringsListProperty.stream()
-                                  .filter(item -> item.labelProperty().getValue().equals(label))
-                                  .findFirst();
+                .filter(item -> item.labelProperty().getValue().equals(label))
+                .findFirst();
     }
 
     public void openHelpPage() {
-        new HelpAction(HelpFile.STRING_EDITOR, dialogService, externalApplicationsPreferences).execute();
+        new HelpAction(HelpFile.STRING_EDITOR, dialogService, externalApplicationsPreferences)
+                .execute();
     }
 
     public ListProperty<ConstantsItemModel> stringsListProperty() {
diff --git a/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorView.java b/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorView.java
index 90f354b71ce3..628539b4c701 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorView.java
@@ -1,7 +1,9 @@
 package org.jabref.gui.libraryproperties.contentselectors;
 
-import java.util.Optional;
-import java.util.function.Supplier;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import jakarta.inject.Inject;
 
 import javafx.beans.property.ListProperty;
 import javafx.fxml.FXML;
@@ -16,9 +18,8 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
+import java.util.Optional;
+import java.util.function.Supplier;
 
 public class ContentSelectorView extends AbstractPropertiesTabView<ContentSelectorViewModel> {
 
@@ -35,9 +36,7 @@ public class ContentSelectorView extends AbstractPropertiesTabView<ContentSelect
     public ContentSelectorView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -55,7 +54,9 @@ public void initialize() {
 
     private void initFieldNameComponents() {
         initListView(fieldsListView, viewModel::getFieldNamesBackingList);
-        viewModel.selectedFieldProperty().bind(fieldsListView.getSelectionModel().selectedItemProperty());
+        viewModel
+                .selectedFieldProperty()
+                .bind(fieldsListView.getSelectionModel().selectedItemProperty());
         new ViewModelListCellFactory<Field>()
                 .withText(Field::getDisplayName)
                 .install(fieldsListView);
@@ -65,7 +66,9 @@ private void initFieldNameComponents() {
 
     private void initKeywordsComponents() {
         initListView(keywordsListView, viewModel::getKeywordsBackingList);
-        viewModel.selectedKeywordProperty().bind(keywordsListView.getSelectionModel().selectedItemProperty());
+        viewModel
+                .selectedKeywordProperty()
+                .bind(keywordsListView.getSelectionModel().selectedItemProperty());
         addKeywordButton.disableProperty().bind(viewModel.isFieldNameListEmpty());
         removeKeywordButton.disableProperty().bind(viewModel.isNoKeywordSelected());
     }
@@ -94,7 +97,8 @@ private void removeKeyword() {
         }
     }
 
-    private <T> void initListView(ListView<T> listViewToInit, Supplier<ListProperty<T>> backingList) {
+    private <T> void initListView(
+            ListView<T> listViewToInit, Supplier<ListProperty<T>> backingList) {
         listViewToInit.itemsProperty().bind(backingList.get());
         listViewToInit.getSelectionModel().selectFirst();
     }
@@ -104,6 +108,7 @@ private Optional<Field> getSelectedField() {
     }
 
     private Optional<String> getSelectedKeyword() {
-        return Optional.of(keywordsListView.getSelectionModel()).map(SelectionModel::getSelectedItem);
+        return Optional.of(keywordsListView.getSelectionModel())
+                .map(SelectionModel::getSelectedItem);
     }
 }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModel.java
index 2f59c1490cb7..abde8b8b1548 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModel.java
@@ -1,13 +1,5 @@
 package org.jabref.gui.libraryproperties.contentselectors;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ListProperty;
@@ -29,6 +21,14 @@
 import org.jabref.model.metadata.ContentSelectors;
 import org.jabref.model.metadata.MetaData;
 
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 public class ContentSelectorViewModel implements PropertiesTabViewModel {
 
     private final MetaData metaData;
@@ -38,8 +38,10 @@ public class ContentSelectorViewModel implements PropertiesTabViewModel {
     // The map from each field to its predefined strings ("keywords") that can be selected
     private Map<Field, List<String>> fieldKeywordsMap = new HashMap<>();
 
-    private final ListProperty<Field> fields = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ListProperty<String> keywords = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<Field> fields =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<String> keywords =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
     private final ObjectProperty<Field> selectedField = new SimpleObjectProperty<>();
     private final StringProperty selectedKeyword = new SimpleStringProperty();
 
@@ -51,7 +53,9 @@ public class ContentSelectorViewModel implements PropertiesTabViewModel {
     @Override
     public void setValues() {
         // Populate field names keyword map
-        fieldKeywordsMap = ContentSelectors.getFieldKeywordsMap(metaData.getContentSelectors().getContentSelectors());
+        fieldKeywordsMap =
+                ContentSelectors.getFieldKeywordsMap(
+                        metaData.getContentSelectors().getContentSelectors());
 
         // Populate Field names list
         List<Field> existingFields = new ArrayList<>(fieldKeywordsMap.keySet());
@@ -69,12 +73,17 @@ public void storeSettings() {
 
         if (ContentSelectors.isDefaultMap(fieldKeywordsMap)) {
             // Remove all fields of the content selector
-            fieldNamesToRemove = metaData.getContentSelectorsSorted().stream().map(ContentSelector::getField).toList();
+            fieldNamesToRemove =
+                    metaData.getContentSelectorsSorted().stream()
+                            .map(ContentSelector::getField)
+                            .toList();
         } else {
             fieldNamesToRemove = determineFieldsToRemove();
         }
 
-        fieldKeywordsMap.forEach((field, keywords) -> updateMetaDataContentSelector(metaDataFields, field, keywords));
+        fieldKeywordsMap.forEach(
+                (field, keywords) ->
+                        updateMetaDataContentSelector(metaDataFields, field, keywords));
         fieldNamesToRemove.forEach(metaData::clearContentSelectors);
     }
 
@@ -107,18 +116,23 @@ BooleanBinding isNoKeywordSelected() {
     }
 
     void showInputFieldNameDialog() {
-        dialogService.showEditableChoiceDialogAndWait(Localization.lang("Add new field name"),
-                             Localization.lang("Field name"),
-                             Localization.lang("Add"),
-                             FXCollections.observableArrayList(FieldFactory.getStandardFieldsWithCitationKey()),
-                             FieldsUtil.FIELD_STRING_CONVERTER)
-                     .ifPresent(this::addFieldIfUnique);
+        dialogService
+                .showEditableChoiceDialogAndWait(
+                        Localization.lang("Add new field name"),
+                        Localization.lang("Field name"),
+                        Localization.lang("Add"),
+                        FXCollections.observableArrayList(
+                                FieldFactory.getStandardFieldsWithCitationKey()),
+                        FieldsUtil.FIELD_STRING_CONVERTER)
+                .ifPresent(this::addFieldIfUnique);
     }
 
     private void addFieldIfUnique(Field fieldToAdd) {
         boolean exists = fieldKeywordsMap.containsKey(fieldToAdd);
         if (exists) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Field name \"%0\" already exists", fieldToAdd.getDisplayName()));
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang(
+                            "Field name \"%0\" already exists", fieldToAdd.getDisplayName()));
             return;
         }
 
@@ -132,10 +146,12 @@ void showRemoveFieldNameConfirmationDialog(Field fieldToRemove) {
             return;
         }
 
-        boolean deleteConfirmed = dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Remove field name"),
-                Localization.lang("Are you sure you want to remove field name: \"%0\"?", fieldToRemove.getDisplayName())
-        );
+        boolean deleteConfirmed =
+                dialogService.showConfirmationDialogAndWait(
+                        Localization.lang("Remove field name"),
+                        Localization.lang(
+                                "Are you sure you want to remove field name: \"%0\"?",
+                                fieldToRemove.getDisplayName()));
 
         if (deleteConfirmed) {
             removeFieldName(fieldToRemove);
@@ -155,14 +171,17 @@ void populateKeywords(Field selectedField) {
     }
 
     void showInputKeywordDialog(Field selectedField) {
-        dialogService.showInputDialogAndWait(Localization.lang("Add new keyword"), Localization.lang("Keyword:"))
-                     .ifPresent(newKeyword -> addKeywordIfUnique(selectedField, newKeyword));
+        dialogService
+                .showInputDialogAndWait(
+                        Localization.lang("Add new keyword"), Localization.lang("Keyword:"))
+                .ifPresent(newKeyword -> addKeywordIfUnique(selectedField, newKeyword));
     }
 
     private void addKeywordIfUnique(Field field, String keywordToAdd) {
         boolean exists = fieldKeywordsMap.get(field).contains(keywordToAdd);
         if (exists) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Keyword \"%0\" already exists", keywordToAdd));
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Keyword \"%0\" already exists", keywordToAdd));
             return;
         }
 
@@ -174,7 +193,12 @@ private void addKeywordIfUnique(Field field, String keywordToAdd) {
     }
 
     void showRemoveKeywordConfirmationDialog(Field field, String keywordToRemove) {
-        boolean deleteConfirmed = dialogService.showConfirmationDialogAndWait(Localization.lang("Remove keyword"), Localization.lang("Are you sure you want to remove keyword: \"%0\"?", keywordToRemove));
+        boolean deleteConfirmed =
+                dialogService.showConfirmationDialogAndWait(
+                        Localization.lang("Remove keyword"),
+                        Localization.lang(
+                                "Are you sure you want to remove keyword: \"%0\"?",
+                                keywordToRemove));
         if (deleteConfirmed) {
             removeKeyword(field, keywordToRemove);
         }
@@ -197,19 +221,27 @@ private List<Field> determineFieldsToRemove() {
         Set<Field> newlyAddedKeywords = fieldKeywordsMap.keySet();
 
         // Remove all content selectors that are not in the new list
-        List<Field> result = new ArrayList(metaData.getContentSelectors().getFieldsWithSelectors().stream()
-                                                   .filter(field -> !newlyAddedKeywords.contains(field))
-                                                   .toList());
+        List<Field> result =
+                new ArrayList(
+                        metaData.getContentSelectors().getFieldsWithSelectors().stream()
+                                .filter(field -> !newlyAddedKeywords.contains(field))
+                                .toList());
         // Remove all unset default fields
-        result.addAll(fieldKeywordsMap.entrySet()
-                                      .stream()
-                                      .filter(entry -> ContentSelectors.DEFAULT_FIELD_NAMES.contains(entry.getKey()) && entry.getValue().isEmpty()).map(Map.Entry::getKey)
-                                      .toList());
+        result.addAll(
+                fieldKeywordsMap.entrySet().stream()
+                        .filter(
+                                entry ->
+                                        ContentSelectors.DEFAULT_FIELD_NAMES.contains(
+                                                        entry.getKey())
+                                                && entry.getValue().isEmpty())
+                        .map(Map.Entry::getKey)
+                        .toList());
 
         return result;
     }
 
-    private void updateMetaDataContentSelector(List<Field> existingFields, Field field, List<String> keywords) {
+    private void updateMetaDataContentSelector(
+            List<Field> existingFields, Field field, List<String> keywords) {
         boolean fieldNameDoNotExists = !existingFields.contains(field);
         if (fieldNameDoNotExists) {
             metaData.addContentSelector(new ContentSelector(field, keywords));
diff --git a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java
index 0999708a5743..199fc1e38b98 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java
@@ -1,6 +1,8 @@
 package org.jabref.gui.libraryproperties.general;
 
-import java.nio.charset.Charset;
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.ComboBox;
@@ -13,8 +15,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+import java.nio.charset.Charset;
 
 public class GeneralPropertiesView extends AbstractPropertiesTabView<GeneralPropertiesViewModel> {
     @FXML private ComboBox<Charset> encoding;
@@ -28,9 +29,7 @@ public class GeneralPropertiesView extends AbstractPropertiesTabView<GeneralProp
     public GeneralPropertiesView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -39,11 +38,10 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new GeneralPropertiesViewModel(databaseContext, dialogService, preferences);
+        this.viewModel =
+                new GeneralPropertiesViewModel(databaseContext, dialogService, preferences);
 
-        new ViewModelListCellFactory<Charset>()
-                .withText(Charset::displayName)
-                .install(encoding);
+        new ViewModelListCellFactory<Charset>().withText(Charset::displayName).install(encoding);
         encoding.disableProperty().bind(viewModel.encodingDisableProperty());
         encoding.itemsProperty().bind(viewModel.encodingsProperty());
         encoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
@@ -54,8 +52,12 @@ public void initialize() {
         databaseMode.itemsProperty().bind(viewModel.databaseModesProperty());
         databaseMode.valueProperty().bindBidirectional(viewModel.selectedDatabaseModeProperty());
 
-        generalFileDirectory.textProperty().bindBidirectional(viewModel.generalFileDirectoryPropertyProperty());
-        userSpecificFileDirectory.textProperty().bindBidirectional(viewModel.userSpecificFileDirectoryProperty());
+        generalFileDirectory
+                .textProperty()
+                .bindBidirectional(viewModel.generalFileDirectoryPropertyProperty());
+        userSpecificFileDirectory
+                .textProperty()
+                .bindBidirectional(viewModel.userSpecificFileDirectoryProperty());
         laTexFileDirectory.textProperty().bindBidirectional(viewModel.laTexFileDirectoryProperty());
     }
 
diff --git a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java
index b42af859eadc..78adf076bce5 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.libraryproperties.general;
 
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -24,13 +20,21 @@
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.metadata.MetaData;
 
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+
 public class GeneralPropertiesViewModel implements PropertiesTabViewModel {
 
     private final BooleanProperty encodingDisableProperty = new SimpleBooleanProperty();
-    private final ListProperty<Charset> encodingsProperty = new SimpleListProperty<>(FXCollections.observableArrayList(Encodings.getCharsets()));
-    private final ObjectProperty<Charset> selectedEncodingProperty = new SimpleObjectProperty<>(Encodings.getCharsets().getFirst());
-    private final ListProperty<BibDatabaseMode> databaseModesProperty = new SimpleListProperty<>(FXCollections.observableArrayList(BibDatabaseMode.values()));
-    private final SimpleObjectProperty<BibDatabaseMode> selectedDatabaseModeProperty = new SimpleObjectProperty<>(BibDatabaseMode.BIBLATEX);
+    private final ListProperty<Charset> encodingsProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList(Encodings.getCharsets()));
+    private final ObjectProperty<Charset> selectedEncodingProperty =
+            new SimpleObjectProperty<>(Encodings.getCharsets().getFirst());
+    private final ListProperty<BibDatabaseMode> databaseModesProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList(BibDatabaseMode.values()));
+    private final SimpleObjectProperty<BibDatabaseMode> selectedDatabaseModeProperty =
+            new SimpleObjectProperty<>(BibDatabaseMode.BIBLATEX);
     private final StringProperty generalFileDirectoryProperty = new SimpleStringProperty("");
     private final StringProperty userSpecificFileDirectoryProperty = new SimpleStringProperty("");
     private final StringProperty laTexFileDirectoryProperty = new SimpleStringProperty("");
@@ -42,26 +46,39 @@ public class GeneralPropertiesViewModel implements PropertiesTabViewModel {
     private final MetaData metaData;
     private final DirectoryDialogConfiguration directoryDialogConfiguration;
 
-    GeneralPropertiesViewModel(BibDatabaseContext databaseContext, DialogService dialogService, CliPreferences preferences) {
+    GeneralPropertiesViewModel(
+            BibDatabaseContext databaseContext,
+            DialogService dialogService,
+            CliPreferences preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.databaseContext = databaseContext;
         this.metaData = databaseContext.getMetaData();
 
-        this.directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory()).build();
+        this.directoryDialogConfiguration =
+                new DirectoryDialogConfiguration.Builder()
+                        .withInitialDirectory(
+                                preferences.getFilePreferences().getWorkingDirectory())
+                        .build();
     }
 
     @Override
     public void setValues() {
         boolean isShared = databaseContext.getLocation() == DatabaseLocation.SHARED;
-        encodingDisableProperty.setValue(isShared); // the encoding of shared database is always UTF-8
+        encodingDisableProperty.setValue(
+                isShared); // the encoding of shared database is always UTF-8
 
         selectedEncodingProperty.setValue(metaData.getEncoding().orElse(StandardCharsets.UTF_8));
         selectedDatabaseModeProperty.setValue(metaData.getMode().orElse(BibDatabaseMode.BIBLATEX));
         generalFileDirectoryProperty.setValue(metaData.getDefaultFileDirectory().orElse("").trim());
-        userSpecificFileDirectoryProperty.setValue(metaData.getUserFileDirectory(preferences.getFilePreferences().getUserAndHost()).orElse("").trim());
-        laTexFileDirectoryProperty.setValue(metaData.getLatexFileDirectory(preferences.getFilePreferences().getUserAndHost()).map(Path::toString).orElse(""));
+        userSpecificFileDirectoryProperty.setValue(
+                metaData.getUserFileDirectory(preferences.getFilePreferences().getUserAndHost())
+                        .orElse("")
+                        .trim());
+        laTexFileDirectoryProperty.setValue(
+                metaData.getLatexFileDirectory(preferences.getFilePreferences().getUserAndHost())
+                        .map(Path::toString)
+                        .orElse(""));
     }
 
     @Override
@@ -82,32 +99,46 @@ public void storeSettings() {
         if (userSpecificFileDirectory.isEmpty()) {
             newMetaData.clearUserFileDirectory(preferences.getFilePreferences().getUserAndHost());
         } else {
-            newMetaData.setUserFileDirectory(preferences.getFilePreferences().getUserAndHost(), userSpecificFileDirectory);
+            newMetaData.setUserFileDirectory(
+                    preferences.getFilePreferences().getUserAndHost(), userSpecificFileDirectory);
         }
 
         String latexFileDirectory = laTexFileDirectoryProperty.getValue();
         if (latexFileDirectory.isEmpty()) {
             newMetaData.clearLatexFileDirectory(preferences.getFilePreferences().getUserAndHost());
         } else {
-            newMetaData.setLatexFileDirectory(preferences.getFilePreferences().getUserAndHost(), Path.of(latexFileDirectory));
+            newMetaData.setLatexFileDirectory(
+                    preferences.getFilePreferences().getUserAndHost(), Path.of(latexFileDirectory));
         }
 
         databaseContext.setMetaData(newMetaData);
     }
 
     public void browseGeneralDir() {
-        dialogService.showDirectorySelectionDialog(directoryDialogConfiguration)
-                     .ifPresent(dir -> generalFileDirectoryProperty.setValue(dir.toAbsolutePath().toString()));
+        dialogService
+                .showDirectorySelectionDialog(directoryDialogConfiguration)
+                .ifPresent(
+                        dir ->
+                                generalFileDirectoryProperty.setValue(
+                                        dir.toAbsolutePath().toString()));
     }
 
     public void browseUserDir() {
-        dialogService.showDirectorySelectionDialog(directoryDialogConfiguration)
-                     .ifPresent(dir -> userSpecificFileDirectoryProperty.setValue(dir.toAbsolutePath().toString()));
+        dialogService
+                .showDirectorySelectionDialog(directoryDialogConfiguration)
+                .ifPresent(
+                        dir ->
+                                userSpecificFileDirectoryProperty.setValue(
+                                        dir.toAbsolutePath().toString()));
     }
 
     public void browseLatexDir() {
-        dialogService.showDirectorySelectionDialog(directoryDialogConfiguration)
-                     .ifPresent(dir -> laTexFileDirectoryProperty.setValue(dir.toAbsolutePath().toString()));
+        dialogService
+                .showDirectorySelectionDialog(directoryDialogConfiguration)
+                .ifPresent(
+                        dir ->
+                                laTexFileDirectoryProperty.setValue(
+                                        dir.toAbsolutePath().toString()));
     }
 
     public BooleanProperty encodingDisableProperty() {
diff --git a/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java
index e391efb5370b..1c3addc9d9c3 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.libraryproperties.keypattern;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 
@@ -15,10 +19,8 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
-public class KeyPatternPropertiesView extends AbstractPropertiesTabView<KeyPatternPropertiesViewModel> implements PropertiesTab {
+public class KeyPatternPropertiesView
+        extends AbstractPropertiesTabView<KeyPatternPropertiesViewModel> implements PropertiesTab {
 
     @FXML private Button keyPatternHelp;
     @FXML private CitationKeyPatternsPanel bibtexKeyPatternTable;
@@ -29,9 +31,7 @@ public class KeyPatternPropertiesView extends AbstractPropertiesTabView<KeyPatte
     public KeyPatternPropertiesView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -42,21 +42,39 @@ public String getTabName() {
     public void initialize() {
         this.viewModel = new KeyPatternPropertiesViewModel(databaseContext, preferences);
 
-        bibtexKeyPatternTable.patternListProperty().bindBidirectional(viewModel.patternListProperty());
-        bibtexKeyPatternTable.defaultKeyPatternProperty().bindBidirectional(viewModel.defaultKeyPatternProperty());
+        bibtexKeyPatternTable
+                .patternListProperty()
+                .bindBidirectional(viewModel.patternListProperty());
+        bibtexKeyPatternTable
+                .defaultKeyPatternProperty()
+                .bindBidirectional(viewModel.defaultKeyPatternProperty());
 
         ActionFactory actionFactory = new ActionFactory();
-        actionFactory.configureIconButton(StandardActions.HELP_KEY_PATTERNS, new HelpAction(HelpFile.CITATION_KEY_PATTERN, dialogService, preferences.getExternalApplicationsPreferences()), keyPatternHelp);
+        actionFactory.configureIconButton(
+                StandardActions.HELP_KEY_PATTERNS,
+                new HelpAction(
+                        HelpFile.CITATION_KEY_PATTERN,
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences()),
+                keyPatternHelp);
     }
 
     @Override
     public void setValues() {
         viewModel.setValues();
         bibtexKeyPatternTable.setValues(
-                bibEntryTypesManager.getAllTypes(databaseContext.getMetaData().getMode()
-                                                                .orElse(preferences.getLibraryPreferences()
-                                                                                   .getDefaultBibDatabaseMode())),
-                databaseContext.getMetaData().getCiteKeyPatterns(preferences.getCitationKeyPatternPreferences().getKeyPatterns()));
+                bibEntryTypesManager.getAllTypes(
+                        databaseContext
+                                .getMetaData()
+                                .getMode()
+                                .orElse(
+                                        preferences
+                                                .getLibraryPreferences()
+                                                .getDefaultBibDatabaseMode())),
+                databaseContext
+                        .getMetaData()
+                        .getCiteKeyPatterns(
+                                preferences.getCitationKeyPatternPreferences().getKeyPatterns()));
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesViewModel.java
index 0ee72445c808..c5b5d7855a47 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesViewModel.java
@@ -15,17 +15,23 @@
 
 public class KeyPatternPropertiesViewModel implements PropertiesTabViewModel {
 
-    // The list and the default properties are being overwritten by the bound properties of the tableView, but to
-    // prevent an NPE on storing the preferences before lazy-loading of the setValues, they need to be initialized.
-    private final ListProperty<CitationKeyPatternsPanelItemModel> patternListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<CitationKeyPatternsPanelItemModel> defaultKeyPatternProperty = new SimpleObjectProperty<>(
-            new CitationKeyPatternsPanelItemModel(new CitationKeyPatternsPanelViewModel.DefaultEntryType(), ""));
+    // The list and the default properties are being overwritten by the bound properties of the
+    // tableView, but to
+    // prevent an NPE on storing the preferences before lazy-loading of the setValues, they need to
+    // be initialized.
+    private final ListProperty<CitationKeyPatternsPanelItemModel> patternListProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<CitationKeyPatternsPanelItemModel> defaultKeyPatternProperty =
+            new SimpleObjectProperty<>(
+                    new CitationKeyPatternsPanelItemModel(
+                            new CitationKeyPatternsPanelViewModel.DefaultEntryType(), ""));
 
     private final CliPreferences preferences;
 
     private final BibDatabaseContext databaseContext;
 
-    public KeyPatternPropertiesViewModel(BibDatabaseContext databaseContext, CliPreferences preferences) {
+    public KeyPatternPropertiesViewModel(
+            BibDatabaseContext databaseContext, CliPreferences preferences) {
         this.databaseContext = databaseContext;
         this.preferences = preferences;
     }
@@ -37,19 +43,23 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        DatabaseCitationKeyPatterns newKeyPattern = new DatabaseCitationKeyPatterns(preferences.getCitationKeyPatternPreferences().getKeyPatterns());
+        DatabaseCitationKeyPatterns newKeyPattern =
+                new DatabaseCitationKeyPatterns(
+                        preferences.getCitationKeyPatternPreferences().getKeyPatterns());
 
-        patternListProperty.forEach(item -> {
-            String patternString = item.getPattern();
-            if (!"default".equals(item.getEntryType().getName())) {
-                if (!patternString.trim().isEmpty()) {
-                    newKeyPattern.addCitationKeyPattern(item.getEntryType(), patternString);
-                }
-            }
-        });
+        patternListProperty.forEach(
+                item -> {
+                    String patternString = item.getPattern();
+                    if (!"default".equals(item.getEntryType().getName())) {
+                        if (!patternString.trim().isEmpty()) {
+                            newKeyPattern.addCitationKeyPattern(item.getEntryType(), patternString);
+                        }
+                    }
+                });
 
         if (!defaultKeyPatternProperty.getValue().getPattern().trim().isEmpty()) {
-            // we do not trim the value at the assignment to enable users to have spaces at the beginning and
+            // we do not trim the value at the assignment to enable users to have spaces at the
+            // beginning and
             // at the end of the pattern
             newKeyPattern.setDefaultValue(defaultKeyPatternProperty.getValue().getPattern());
         }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesView.java
index 36a5f106fe05..566c65eb67dd 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesView.java
@@ -1,6 +1,8 @@
 package org.jabref.gui.libraryproperties.preamble;
 
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.TextArea;
@@ -9,8 +11,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+import javax.swing.undo.UndoManager;
 
 public class PreamblePropertiesView extends AbstractPropertiesTabView<PreamblePropertiesViewModel> {
     @FXML private TextArea preamble;
@@ -20,9 +21,7 @@ public class PreamblePropertiesView extends AbstractPropertiesTabView<PreamblePr
     public PreamblePropertiesView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesViewModel.java
index 5ac3f81b9519..1382a96b663f 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesViewModel.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.libraryproperties.preamble;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
@@ -9,6 +7,8 @@
 import org.jabref.gui.undo.UndoablePreambleChange;
 import org.jabref.model.database.BibDatabaseContext;
 
+import javax.swing.undo.UndoManager;
+
 public class PreamblePropertiesViewModel implements PropertiesTabViewModel {
     private final StringProperty preambleProperty = new SimpleStringProperty("");
 
@@ -29,7 +29,11 @@ public void setValues() {
     public void storeSettings() {
         String newPreamble = preambleProperty.getValue();
         if (!databaseContext.getDatabase().getPreamble().orElse("").equals(newPreamble)) {
-            undoManager.addEdit(new UndoablePreambleChange(databaseContext.getDatabase(), databaseContext.getDatabase().getPreamble().orElse(null), newPreamble));
+            undoManager.addEdit(
+                    new UndoablePreambleChange(
+                            databaseContext.getDatabase(),
+                            databaseContext.getDatabase().getPreamble().orElse(null),
+                            newPreamble));
             databaseContext.getDatabase().setPreamble(newPreamble);
         }
     }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java
index c1b481662f2d..413ff741f7a4 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.libraryproperties.saving;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 
@@ -11,10 +15,8 @@
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
-public class SavingPropertiesView extends AbstractPropertiesTabView<SavingPropertiesViewModel> implements PropertiesTab {
+public class SavingPropertiesView extends AbstractPropertiesTabView<SavingPropertiesViewModel>
+        implements PropertiesTab {
 
     @FXML private CheckBox protect;
     @FXML private SaveOrderConfigPanel saveOrderConfigPanel;
@@ -25,9 +27,7 @@ public class SavingPropertiesView extends AbstractPropertiesTabView<SavingProper
     public SavingPropertiesView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -41,13 +41,25 @@ public void initialize() {
         protect.disableProperty().bind(viewModel.protectDisableProperty());
         protect.selectedProperty().bindBidirectional(viewModel.libraryProtectedProperty());
 
-        saveOrderConfigPanel.saveInOriginalProperty().bindBidirectional(viewModel.saveInOriginalProperty());
-        saveOrderConfigPanel.saveInTableOrderProperty().bindBidirectional(viewModel.saveInTableOrderProperty());
-        saveOrderConfigPanel.saveInSpecifiedOrderProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
+        saveOrderConfigPanel
+                .saveInOriginalProperty()
+                .bindBidirectional(viewModel.saveInOriginalProperty());
+        saveOrderConfigPanel
+                .saveInTableOrderProperty()
+                .bindBidirectional(viewModel.saveInTableOrderProperty());
+        saveOrderConfigPanel
+                .saveInSpecifiedOrderProperty()
+                .bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
         saveOrderConfigPanel.sortableFieldsProperty().bind(viewModel.sortableFieldsProperty());
-        saveOrderConfigPanel.sortCriteriaProperty().bindBidirectional(viewModel.sortCriteriaProperty());
+        saveOrderConfigPanel
+                .sortCriteriaProperty()
+                .bindBidirectional(viewModel.sortCriteriaProperty());
 
-        fieldFormatterCleanupsPanel.cleanupsDisableProperty().bindBidirectional(viewModel.cleanupsDisableProperty());
-        fieldFormatterCleanupsPanel.cleanupsProperty().bindBidirectional(viewModel.cleanupsProperty());
+        fieldFormatterCleanupsPanel
+                .cleanupsDisableProperty()
+                .bindBidirectional(viewModel.cleanupsDisableProperty());
+        fieldFormatterCleanupsPanel
+                .cleanupsProperty()
+                .bindBidirectional(viewModel.cleanupsProperty());
     }
 }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
index e2701a309c3c..ee73e07c7b68 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.libraryproperties.saving;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -25,15 +20,23 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.SaveOrder;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
 public class SavingPropertiesViewModel implements PropertiesTabViewModel {
 
-    private static final SaveOrder UI_DEFAULT_SAVE_ORDER = new SaveOrder(SaveOrder.OrderType.ORIGINAL, List.of(
-            new SaveOrder.SortCriterion(StandardField.AUTHOR),
-            new SaveOrder.SortCriterion(StandardField.YEAR),
-            new SaveOrder.SortCriterion(StandardField.TITLE),
-            // Pro users generate their citation keys well. They can just delete the above three proposals and get a well-sorted library.
-            new SaveOrder.SortCriterion(InternalField.KEY_FIELD)
-    ));
+    private static final SaveOrder UI_DEFAULT_SAVE_ORDER =
+            new SaveOrder(
+                    SaveOrder.OrderType.ORIGINAL,
+                    List.of(
+                            new SaveOrder.SortCriterion(StandardField.AUTHOR),
+                            new SaveOrder.SortCriterion(StandardField.YEAR),
+                            new SaveOrder.SortCriterion(StandardField.TITLE),
+                            // Pro users generate their citation keys well. They can just delete the
+                            // above three proposals and get a well-sorted library.
+                            new SaveOrder.SortCriterion(InternalField.KEY_FIELD)));
 
     private final BooleanProperty protectDisableProperty = new SimpleBooleanProperty();
     private final BooleanProperty libraryProtectedProperty = new SimpleBooleanProperty();
@@ -42,19 +45,23 @@ public class SavingPropertiesViewModel implements PropertiesTabViewModel {
     private final BooleanProperty saveInOriginalProperty = new SimpleBooleanProperty();
     private final BooleanProperty saveInTableOrderProperty = new SimpleBooleanProperty();
     private final BooleanProperty saveInSpecifiedOrderProperty = new SimpleBooleanProperty();
-    private final ListProperty<Field> sortableFieldsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ListProperty<SortCriterionViewModel> sortCriteriaProperty = new SimpleListProperty<>(FXCollections.observableArrayList(new ArrayList<>()));
+    private final ListProperty<Field> sortableFieldsProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<SortCriterionViewModel> sortCriteriaProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList(new ArrayList<>()));
 
     // FieldFormatterCleanupsPanel
     private final BooleanProperty cleanupsDisableProperty = new SimpleBooleanProperty();
-    private final ListProperty<FieldFormatterCleanup> cleanupsProperty = new SimpleListProperty<>(FXCollections.emptyObservableList());
+    private final ListProperty<FieldFormatterCleanup> cleanupsProperty =
+            new SimpleListProperty<>(FXCollections.emptyObservableList());
 
     private final BibDatabaseContext databaseContext;
     private final MetaData initialMetaData;
     private final SaveOrder saveOrder;
     private final CliPreferences preferences;
 
-    public SavingPropertiesViewModel(BibDatabaseContext databaseContext, CliPreferences preferences) {
+    public SavingPropertiesViewModel(
+            BibDatabaseContext databaseContext, CliPreferences preferences) {
         this.databaseContext = databaseContext;
         this.preferences = preferences;
         this.initialMetaData = databaseContext.getMetaData();
@@ -83,21 +90,28 @@ public void setValues() {
 
         sortableFieldsProperty.addAll(FieldFactory.getStandardFieldsWithCitationKey());
         sortCriteriaProperty.clear();
-        sortCriteriaProperty.addAll(saveOrder.getSortCriteria().stream()
-                                             .map(SortCriterionViewModel::new)
-                                             .toList());
+        sortCriteriaProperty.addAll(
+                saveOrder.getSortCriteria().stream().map(SortCriterionViewModel::new).toList());
 
         // FieldFormatterCleanupsPanel, included via <?import ...> in FXML
 
         Optional<FieldFormatterCleanups> saveActions = initialMetaData.getSaveActions();
-        saveActions.ifPresentOrElse(value -> {
-            cleanupsDisableProperty.setValue(!value.isEnabled());
-            cleanupsProperty.setValue(FXCollections.observableArrayList(value.getConfiguredActions()));
-        }, () -> {
-            CleanupPreferences defaultPreset = preferences.getDefaultCleanupPreset();
-            cleanupsDisableProperty.setValue(!defaultPreset.getFieldFormatterCleanups().isEnabled());
-            cleanupsProperty.setValue(FXCollections.observableArrayList(defaultPreset.getFieldFormatterCleanups().getConfiguredActions()));
-        });
+        saveActions.ifPresentOrElse(
+                value -> {
+                    cleanupsDisableProperty.setValue(!value.isEnabled());
+                    cleanupsProperty.setValue(
+                            FXCollections.observableArrayList(value.getConfiguredActions()));
+                },
+                () -> {
+                    CleanupPreferences defaultPreset = preferences.getDefaultCleanupPreset();
+                    cleanupsDisableProperty.setValue(
+                            !defaultPreset.getFieldFormatterCleanups().isEnabled());
+                    cleanupsProperty.setValue(
+                            FXCollections.observableArrayList(
+                                    defaultPreset
+                                            .getFieldFormatterCleanups()
+                                            .getConfiguredActions()));
+                });
     }
 
     @Override
@@ -110,11 +124,12 @@ public void storeSettings() {
             newMetaData.markAsNotProtected();
         }
 
-        FieldFormatterCleanups fieldFormatterCleanups = new FieldFormatterCleanups(
-                !cleanupsDisableProperty().getValue(),
-                cleanupsProperty());
+        FieldFormatterCleanups fieldFormatterCleanups =
+                new FieldFormatterCleanups(
+                        !cleanupsDisableProperty().getValue(), cleanupsProperty());
 
-        if (FieldFormatterCleanups.DEFAULT_SAVE_ACTIONS.equals(fieldFormatterCleanups.getConfiguredActions())) {
+        if (FieldFormatterCleanups.DEFAULT_SAVE_ACTIONS.equals(
+                fieldFormatterCleanups.getConfiguredActions())) {
             newMetaData.clearSaveActions();
         } else {
             // if all actions have been removed, remove the save actions from the MetaData
@@ -125,9 +140,14 @@ public void storeSettings() {
             }
         }
 
-        SaveOrder newSaveOrder = new SaveOrder(
-                SaveOrder.OrderType.fromBooleans(saveInSpecifiedOrderProperty.getValue(), saveInOriginalProperty.getValue()),
-                sortCriteriaProperty.stream().map(SortCriterionViewModel::getCriterion).toList());
+        SaveOrder newSaveOrder =
+                new SaveOrder(
+                        SaveOrder.OrderType.fromBooleans(
+                                saveInSpecifiedOrderProperty.getValue(),
+                                saveInOriginalProperty.getValue()),
+                        sortCriteriaProperty.stream()
+                                .map(SortCriterionViewModel::getCriterion)
+                                .toList());
 
         if (!newSaveOrder.equals(saveOrder)) {
             if (newSaveOrder.equals(SaveOrder.getDefaultSaveOrder())) {
diff --git a/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java b/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java
index e9036bceffb8..4a5e20c8e48e 100644
--- a/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.linkedfile;
 
-import java.nio.file.Path;
-import java.util.Optional;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
@@ -19,6 +16,9 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 
+import java.nio.file.Path;
+import java.util.Optional;
+
 public class AttachFileAction extends SimpleCommand {
 
     private final LibraryTab libraryTab;
@@ -27,11 +27,12 @@ public class AttachFileAction extends SimpleCommand {
     private final FilePreferences filePreferences;
     private final ExternalApplicationsPreferences externalApplicationsPreferences;
 
-    public AttachFileAction(LibraryTab libraryTab,
-                            DialogService dialogService,
-                            StateManager stateManager,
-                            FilePreferences filePreferences,
-                            ExternalApplicationsPreferences externalApplicationsPreferences) {
+    public AttachFileAction(
+            LibraryTab libraryTab,
+            DialogService dialogService,
+            StateManager stateManager,
+            FilePreferences filePreferences,
+            ExternalApplicationsPreferences externalApplicationsPreferences) {
         this.libraryTab = libraryTab;
         this.stateManager = stateManager;
         this.dialogService = dialogService;
@@ -49,7 +50,8 @@ public void execute() {
         }
 
         if (stateManager.getSelectedEntries().size() != 1) {
-            dialogService.notify(Localization.lang("This operation requires exactly one item to be selected."));
+            dialogService.notify(
+                    Localization.lang("This operation requires exactly one item to be selected."));
             return;
         }
 
@@ -57,30 +59,42 @@ public void execute() {
 
         BibEntry entry = stateManager.getSelectedEntries().getFirst();
 
-        Path workingDirectory = databaseContext.getFirstExistingFileDir(filePreferences)
-                                               .orElse(filePreferences.getWorkingDirectory());
+        Path workingDirectory =
+                databaseContext
+                        .getFirstExistingFileDir(filePreferences)
+                        .orElse(filePreferences.getWorkingDirectory());
 
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(workingDirectory)
-                .build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .withInitialDirectory(workingDirectory)
+                        .build();
 
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(newFile -> {
-            LinkedFile linkedFile = LinkedFilesEditorViewModel.fromFile(
-                    newFile,
-                    databaseContext.getFileDirectories(filePreferences),
-                    externalApplicationsPreferences);
+        dialogService
+                .showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(
+                        newFile -> {
+                            LinkedFile linkedFile =
+                                    LinkedFilesEditorViewModel.fromFile(
+                                            newFile,
+                                            databaseContext.getFileDirectories(filePreferences),
+                                            externalApplicationsPreferences);
 
-            LinkedFileEditDialog dialog = new LinkedFileEditDialog(linkedFile);
+                            LinkedFileEditDialog dialog = new LinkedFileEditDialog(linkedFile);
 
-            dialogService.showCustomDialogAndWait(dialog)
-                  .ifPresent(editedLinkedFile -> {
-                      Optional<FieldChange> fieldChange = entry.addFile(editedLinkedFile);
-                      fieldChange.ifPresent(change -> {
-                          UndoableFieldChange ce = new UndoableFieldChange(change);
-                          libraryTab.getUndoManager().addEdit(ce);
-                          libraryTab.markBaseChanged();
-                      });
-                  });
-        });
+                            dialogService
+                                    .showCustomDialogAndWait(dialog)
+                                    .ifPresent(
+                                            editedLinkedFile -> {
+                                                Optional<FieldChange> fieldChange =
+                                                        entry.addFile(editedLinkedFile);
+                                                fieldChange.ifPresent(
+                                                        change -> {
+                                                            UndoableFieldChange ce =
+                                                                    new UndoableFieldChange(change);
+                                                            libraryTab.getUndoManager().addEdit(ce);
+                                                            libraryTab.markBaseChanged();
+                                                        });
+                                            });
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/linkedfile/AttachFileFromURLAction.java b/src/main/java/org/jabref/gui/linkedfile/AttachFileFromURLAction.java
index 61ec0f65ed45..dc38d6c2b710 100644
--- a/src/main/java/org/jabref/gui/linkedfile/AttachFileFromURLAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/AttachFileFromURLAction.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.linkedfile;
 
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Optional;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
@@ -19,6 +14,11 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
 
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Optional;
+
 public class AttachFileFromURLAction extends SimpleCommand {
 
     private final StateManager stateManager;
@@ -26,10 +26,11 @@ public class AttachFileFromURLAction extends SimpleCommand {
     private final GuiPreferences preferences;
     private final TaskExecutor taskExecutor;
 
-    public AttachFileFromURLAction(DialogService dialogService,
-                                   StateManager stateManager,
-                                   TaskExecutor taskExecutor,
-                                   GuiPreferences preferences) {
+    public AttachFileFromURLAction(
+            DialogService dialogService,
+            StateManager stateManager,
+            TaskExecutor taskExecutor,
+            GuiPreferences preferences) {
         this.stateManager = stateManager;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
@@ -46,7 +47,8 @@ public void execute() {
         }
 
         if (stateManager.getSelectedEntries().size() != 1) {
-            dialogService.notify(Localization.lang("This operation requires exactly one item to be selected."));
+            dialogService.notify(
+                    Localization.lang("This operation requires exactly one item to be selected."));
             return;
         }
 
@@ -54,7 +56,8 @@ public void execute() {
 
         BibEntry entry = stateManager.getSelectedEntries().getFirst();
 
-        Optional<String> urlforDownload = getUrlForDownloadFromClipBoardOrEntry(dialogService, entry);
+        Optional<String> urlforDownload =
+                getUrlForDownloadFromClipBoardOrEntry(dialogService, entry);
 
         if (urlforDownload.isEmpty()) {
             return;
@@ -62,32 +65,46 @@ public void execute() {
 
         try {
             URL url = URI.create(urlforDownload.get()).toURL();
-            LinkedFileViewModel onlineFile = new LinkedFileViewModel(
-                             new LinkedFile(url, ""),
-                             entry,
-                             databaseContext,
-                             taskExecutor,
-                             dialogService,
-                    preferences);
+            LinkedFileViewModel onlineFile =
+                    new LinkedFileViewModel(
+                            new LinkedFile(url, ""),
+                            entry,
+                            databaseContext,
+                            taskExecutor,
+                            dialogService,
+                            preferences);
             onlineFile.download(true);
         } catch (MalformedURLException exception) {
             dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), exception);
         }
     }
 
-    public static Optional<String> getUrlForDownloadFromClipBoardOrEntry(DialogService dialogService, BibEntry entry) {
+    public static Optional<String> getUrlForDownloadFromClipBoardOrEntry(
+            DialogService dialogService, BibEntry entry) {
         String clipText = ClipBoardManager.getContents();
         Optional<String> urlText;
         String urlField = entry.getField(StandardField.URL).orElse("");
-        if (clipText.startsWith("http://") || clipText.startsWith("https://") || clipText.startsWith("ftp://")) {
-            urlText = dialogService.showInputDialogWithDefaultAndWait(
-                    Localization.lang("Download file"), Localization.lang("Enter URL to download"), clipText);
-        } else if (urlField.startsWith("http://") || urlField.startsWith("https://") || urlField.startsWith("ftp://")) {
-            urlText = dialogService.showInputDialogWithDefaultAndWait(
-                    Localization.lang("Download file"), Localization.lang("Enter URL to download"), urlField);
+        if (clipText.startsWith("http://")
+                || clipText.startsWith("https://")
+                || clipText.startsWith("ftp://")) {
+            urlText =
+                    dialogService.showInputDialogWithDefaultAndWait(
+                            Localization.lang("Download file"),
+                            Localization.lang("Enter URL to download"),
+                            clipText);
+        } else if (urlField.startsWith("http://")
+                || urlField.startsWith("https://")
+                || urlField.startsWith("ftp://")) {
+            urlText =
+                    dialogService.showInputDialogWithDefaultAndWait(
+                            Localization.lang("Download file"),
+                            Localization.lang("Enter URL to download"),
+                            urlField);
         } else {
-            urlText = dialogService.showInputDialogAndWait(
-                    Localization.lang("Download file"), Localization.lang("Enter URL to download"));
+            urlText =
+                    dialogService.showInputDialogAndWait(
+                            Localization.lang("Download file"),
+                            Localization.lang("Enter URL to download"));
         }
         return urlText;
     }
diff --git a/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java b/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java
index 6925cbd88d5c..e058772791c9 100644
--- a/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.linkedfile;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
-
 import javafx.collections.FXCollections;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
@@ -26,12 +20,17 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
-
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+
 @NullMarked
 public class DeleteFileAction extends SimpleCommand {
 
@@ -44,11 +43,12 @@ public class DeleteFileAction extends SimpleCommand {
     private final List<LinkedFileViewModel> filesToDelete;
     private boolean success = false;
 
-    public DeleteFileAction(DialogService dialogService,
-                            FilePreferences filePreferences,
-                            BibDatabaseContext databaseContext,
-                            @Nullable LinkedFilesEditorViewModel viewModel,
-                            List<LinkedFileViewModel> filesToDelete) {
+    public DeleteFileAction(
+            DialogService dialogService,
+            FilePreferences filePreferences,
+            BibDatabaseContext databaseContext,
+            @Nullable LinkedFilesEditorViewModel viewModel,
+            List<LinkedFileViewModel> filesToDelete) {
         this.dialogService = dialogService;
         this.filePreferences = filePreferences;
         this.databaseContext = databaseContext;
@@ -59,10 +59,11 @@ public DeleteFileAction(DialogService dialogService,
     /**
      * Called when the user wants to delete a complete entry.
      */
-    public DeleteFileAction(DialogService dialogService,
-                            FilePreferences filePreferences,
-                            BibDatabaseContext databaseContext,
-                            List<LinkedFileViewModel> filesToDelete) {
+    public DeleteFileAction(
+            DialogService dialogService,
+            FilePreferences filePreferences,
+            BibDatabaseContext databaseContext,
+            List<LinkedFileViewModel> filesToDelete) {
         this(dialogService, filePreferences, databaseContext, null, filesToDelete);
     }
 
@@ -73,7 +74,8 @@ private boolean deletionOfCompleteEntry() {
     @Override
     public void execute() {
         if (filesToDelete.isEmpty()) {
-            dialogService.notify(Localization.lang("This operation requires selected linked files."));
+            dialogService.notify(
+                    Localization.lang("This operation requires selected linked files."));
             return;
         }
 
@@ -98,7 +100,8 @@ public void execute() {
                 Path path = file.get();
                 dialogTitle = Localization.lang("Delete '%0'", path.getFileName().toString());
             } else {
-                dialogService.notify(Localization.lang("Error accessing file '%0'.", linkedFile.getLink()));
+                dialogService.notify(
+                        Localization.lang("Error accessing file '%0'.", linkedFile.getLink()));
                 // Deleting a non-existing file is a success
                 success = true;
                 return;
@@ -115,10 +118,16 @@ public void execute() {
         }
         ButtonType deleteFromDisk = new ButtonType(label);
 
-        ButtonType removeFromEntry = new ButtonType(Localization.lang("Keep file(s)"), ButtonBar.ButtonData.YES);
+        ButtonType removeFromEntry =
+                new ButtonType(Localization.lang("Keep file(s)"), ButtonBar.ButtonData.YES);
 
-        Optional<ButtonType> buttonType = dialogService.showCustomDialogAndWait(
-                dialogTitle, dialogPane, removeFromEntry, deleteFromDisk, ButtonType.CANCEL);
+        Optional<ButtonType> buttonType =
+                dialogService.showCustomDialogAndWait(
+                        dialogTitle,
+                        dialogPane,
+                        removeFromEntry,
+                        deleteFromDisk,
+                        ButtonType.CANCEL);
 
         if (buttonType.isPresent()) {
             ButtonType theButtonType = buttonType.get();
@@ -135,11 +144,13 @@ private DialogPane createDeleteFilesDialog(String description) {
         warning.setGlyphSize(24.0);
         Label header = new Label(description, warning);
         header.setWrapText(true);
-        header.setStyle("""
+        header.setStyle(
+                """
                 -fx-padding: 10px;
                 -fx-background-color: -fx-background;""");
 
-        ListView<LinkedFileViewModel> filesToDeleteList = new ListView<>(FXCollections.observableArrayList(filesToDelete));
+        ListView<LinkedFileViewModel> filesToDeleteList =
+                new ListView<>(FXCollections.observableArrayList(filesToDelete));
         new ViewModelListCellFactory<LinkedFileViewModel>()
                 .withText(item -> item.getFile().getLink())
                 .install(filesToDeleteList);
@@ -179,7 +190,8 @@ private void deleteFileHelper(BibDatabaseContext databaseContext, LinkedFile lin
 
         if (file.isEmpty()) {
             LOGGER.warn("Could not find file {}", linkedFile.getLink());
-            dialogService.notify(Localization.lang("Error accessing file '%0'.", linkedFile.getLink()));
+            dialogService.notify(
+                    Localization.lang("Error accessing file '%0'.", linkedFile.getLink()));
             // Deleting a non-existing file is a success
             success = true;
             return;
@@ -199,7 +211,9 @@ private void deleteFileHelper(BibDatabaseContext databaseContext, LinkedFile lin
             success = true;
         } catch (IOException ex) {
             success = false;
-            dialogService.showErrorDialogAndWait(Localization.lang("Cannot delete file '%0'", theFile), Localization.lang("File permission error"));
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Cannot delete file '%0'", theFile),
+                    Localization.lang("File permission error"));
             LOGGER.warn("Error while deleting: {}", linkedFile, ex);
         }
     }
diff --git a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
index 47402708ad45..27df6fa035bd 100644
--- a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
@@ -1,21 +1,13 @@
 package org.jabref.gui.linkedfile;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import javax.net.ssl.SSLHandshakeException;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ReadOnlyDoubleProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 
+import kong.unirest.core.UnirestException;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.externalfiletype.ExternalFileType;
@@ -37,12 +29,21 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-
-import com.tobiasdiez.easybind.EasyBind;
-import kong.unirest.core.UnirestException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import javax.net.ssl.SSLHandshakeException;
+
 public class DownloadLinkedFileAction extends SimpleCommand {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DownloadLinkedFileAction.class);
@@ -62,16 +63,17 @@ public class DownloadLinkedFileAction extends SimpleCommand {
     private final DoubleProperty downloadProgress = new SimpleDoubleProperty();
     private final LinkedFileHandler linkedFileHandler;
 
-    public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
-                                    BibEntry entry,
-                                    LinkedFile linkedFile,
-                                    String downloadUrl,
-                                    DialogService dialogService,
-                                    ExternalApplicationsPreferences externalApplicationsPreferences,
-                                    FilePreferences filePreferences,
-                                    TaskExecutor taskExecutor,
-                                    String suggestedName,
-                                    boolean keepHtmlLink) {
+    public DownloadLinkedFileAction(
+            BibDatabaseContext databaseContext,
+            BibEntry entry,
+            LinkedFile linkedFile,
+            String downloadUrl,
+            DialogService dialogService,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            FilePreferences filePreferences,
+            TaskExecutor taskExecutor,
+            String suggestedName,
+            boolean keepHtmlLink) {
         this.databaseContext = databaseContext;
         this.entry = entry;
         this.linkedFile = linkedFile;
@@ -83,21 +85,24 @@ public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
         this.taskExecutor = taskExecutor;
         this.keepHtmlLink = keepHtmlLink;
 
-        this.linkedFileHandler = new LinkedFileHandler(linkedFile, entry, databaseContext, filePreferences);
+        this.linkedFileHandler =
+                new LinkedFileHandler(linkedFile, entry, databaseContext, filePreferences);
     }
 
     /**
      * Downloads the given linked file to the first existing file directory. It keeps HTML files as URLs.
      */
-    public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
-                                    BibEntry entry,
-                                    LinkedFile linkedFile,
-                                    String downloadUrl,
-                                    DialogService dialogService,
-                                    ExternalApplicationsPreferences externalApplicationsPreferences,
-                                    FilePreferences filePreferences,
-                                    TaskExecutor taskExecutor) {
-        this(databaseContext,
+    public DownloadLinkedFileAction(
+            BibDatabaseContext databaseContext,
+            BibEntry entry,
+            LinkedFile linkedFile,
+            String downloadUrl,
+            DialogService dialogService,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            FilePreferences filePreferences,
+            TaskExecutor taskExecutor) {
+        this(
+                databaseContext,
                 entry,
                 linkedFile,
                 downloadUrl,
@@ -113,12 +118,15 @@ public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
     public void execute() {
         LOGGER.info("Downloading file from {}", downloadUrl);
         if (downloadUrl.isEmpty() || !LinkedFile.isOnlineLink(downloadUrl)) {
-            throw new UnsupportedOperationException("In order to download the file, the url has to be an online link");
+            throw new UnsupportedOperationException(
+                    "In order to download the file, the url has to be an online link");
         }
 
         Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(filePreferences);
         if (targetDirectory.isEmpty()) {
-            LOGGER.warn("File directory not available while downloading {}. Storing as URL in file field.", downloadUrl);
+            LOGGER.warn(
+                    "File directory not available while downloading {}. Storing as URL in file field.",
+                    downloadUrl);
             return;
         }
 
@@ -139,9 +147,16 @@ private void doDownload(Path targetDirectory, URLDownload urlDownload) {
         downloadProgress.bind(downloadTask.workDonePercentageProperty());
 
         downloadTask.titleProperty().set(Localization.lang("Downloading"));
-        entry.getCitationKey().ifPresentOrElse(
-                citationkey -> downloadTask.messageProperty().set(Localization.lang("Fulltext for %0", citationkey)),
-                () -> downloadTask.messageProperty().set(Localization.lang("Fulltext for a new entry")));
+        entry.getCitationKey()
+                .ifPresentOrElse(
+                        citationkey ->
+                                downloadTask
+                                        .messageProperty()
+                                        .set(Localization.lang("Fulltext for %0", citationkey)),
+                        () ->
+                                downloadTask
+                                        .messageProperty()
+                                        .set(Localization.lang("Fulltext for a new entry")));
         downloadTask.showToUser(true);
 
         downloadTask.onFailure(ex -> onFailure(urlDownload, ex));
@@ -159,7 +174,9 @@ private void onSuccess(Path targetDirectory, Path downloadedFile) {
         boolean isDuplicate;
         boolean isHtml;
         try {
-            isDuplicate = FileNameUniqueness.isDuplicatedFile(targetDirectory, downloadedFile.getFileName(), dialogService::notify);
+            isDuplicate =
+                    FileNameUniqueness.isDuplicatedFile(
+                            targetDirectory, downloadedFile.getFileName(), dialogService::notify);
         } catch (IOException e) {
             LOGGER.error("FileNameUniqueness.isDuplicatedFile failed", e);
             return;
@@ -167,20 +184,28 @@ private void onSuccess(Path targetDirectory, Path downloadedFile) {
 
         if (isDuplicate) {
             // We do not add duplicate files.
-            // The downloaded file was deleted in {@link org.jabref.logic.util.io.FileNameUniqueness.isDuplicatedFile]}
-            LOGGER.info("File {} already exists in target directory {}.", downloadedFile.getFileName(), targetDirectory);
+            // The downloaded file was deleted in {@link
+            // org.jabref.logic.util.io.FileNameUniqueness.isDuplicatedFile]}
+            LOGGER.info(
+                    "File {} already exists in target directory {}.",
+                    downloadedFile.getFileName(),
+                    targetDirectory);
             return;
         }
 
-        // we need to call LinkedFileViewModel#fromFile, because we need to make the path relative to the configured directories
-        LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(
-                downloadedFile,
-                databaseContext.getFileDirectories(filePreferences),
-                externalApplicationsPreferences);
+        // we need to call LinkedFileViewModel#fromFile, because we need to make the path relative
+        // to the configured directories
+        LinkedFile newLinkedFile =
+                LinkedFilesEditorViewModel.fromFile(
+                        downloadedFile,
+                        databaseContext.getFileDirectories(filePreferences),
+                        externalApplicationsPreferences);
         if (newLinkedFile.getDescription().isEmpty() && !linkedFile.getDescription().isEmpty()) {
             newLinkedFile.setDescription((linkedFile.getDescription()));
         }
-        if (linkedFile.getSourceUrl().isEmpty() && LinkedFile.isOnlineLink(linkedFile.getLink()) && filePreferences.shouldKeepDownloadUrl()) {
+        if (linkedFile.getSourceUrl().isEmpty()
+                && LinkedFile.isOnlineLink(linkedFile.getLink())
+                && filePreferences.shouldKeepDownloadUrl()) {
             newLinkedFile.setSourceURL(linkedFile.getLink());
         } else if (filePreferences.shouldKeepDownloadUrl()) {
             newLinkedFile.setSourceURL(linkedFile.getSourceUrl());
@@ -189,9 +214,12 @@ private void onSuccess(Path targetDirectory, Path downloadedFile) {
         isHtml = newLinkedFile.getFileType().equals(StandardExternalFileType.URL.getName());
         if (isHtml) {
             if (this.keepHtmlLink) {
-                dialogService.notify(Localization.lang("Download '%0' was a HTML file. Keeping URL.", downloadUrl));
+                dialogService.notify(
+                        Localization.lang(
+                                "Download '%0' was a HTML file. Keeping URL.", downloadUrl));
             } else {
-                dialogService.notify(Localization.lang("Download '%0' was a HTML file. Removed.", downloadUrl));
+                dialogService.notify(
+                        Localization.lang("Download '%0' was a HTML file. Removed.", downloadUrl));
                 List<LinkedFile> newFiles = new ArrayList<>(entry.getFiles());
                 newFiles.remove(linkedFile);
                 entry.setFiles(newFiles);
@@ -213,7 +241,11 @@ private void onFailure(URLDownload urlDownload, Exception ex) {
         } else {
             String fetcherExceptionMessage = ex.getLocalizedMessage();
             String failedTitle = Localization.lang("Failed to download from URL");
-            dialogService.showErrorDialogAndWait(failedTitle, Localization.lang("Please check the URL and try again.\nURL: %0\nDetails: %1", urlDownload.getSource(), fetcherExceptionMessage));
+            dialogService.showErrorDialogAndWait(
+                    failedTitle,
+                    Localization.lang(
+                            "Please check the URL and try again.\nURL: %0\nDetails: %1",
+                            urlDownload.getSource(), fetcherExceptionMessage));
         }
     }
 
@@ -222,8 +254,10 @@ private boolean checkSSLHandshake(URLDownload urlDownload) {
             urlDownload.canBeReached();
         } catch (UnirestException ex) {
             if (ex.getCause() instanceof SSLHandshakeException) {
-                if (dialogService.showConfirmationDialogAndWait(Localization.lang("Download file"),
-                        Localization.lang("Unable to find valid certification path to requested target(%0), download anyway?",
+                if (dialogService.showConfirmationDialogAndWait(
+                        Localization.lang("Download file"),
+                        Localization.lang(
+                                "Unable to find valid certification path to requested target(%0), download anyway?",
                                 urlDownload.getSource().toString()))) {
                     return true;
                 } else {
@@ -239,28 +273,40 @@ private boolean checkSSLHandshake(URLDownload urlDownload) {
         return true;
     }
 
-    private BackgroundTask<Path> prepareDownloadTask(Path targetDirectory, URLDownload urlDownload) {
-        return BackgroundTask
-                .wrap(() -> {
-                    String suggestedName;
-                    if (this.suggestedName.isEmpty()) {
-                        Optional<ExternalFileType> suggestedType = inferFileType(urlDownload);
-                        ExternalFileType externalFileType = suggestedType.orElse(StandardExternalFileType.PDF);
-                        suggestedName = linkedFileHandler.getSuggestedFileName(externalFileType.getExtension());
-                    } else {
-                        suggestedName = this.suggestedName;
-                    }
-                    String fulltextDir = FileUtil.createDirNameFromPattern(databaseContext.getDatabase(), entry, filePreferences.getFileDirectoryPattern());
-                    suggestedName = FileNameUniqueness.getNonOverWritingFileName(targetDirectory.resolve(fulltextDir), suggestedName);
-
-                    return targetDirectory.resolve(fulltextDir).resolve(suggestedName);
-                })
+    private BackgroundTask<Path> prepareDownloadTask(
+            Path targetDirectory, URLDownload urlDownload) {
+        return BackgroundTask.wrap(
+                        () -> {
+                            String suggestedName;
+                            if (this.suggestedName.isEmpty()) {
+                                Optional<ExternalFileType> suggestedType =
+                                        inferFileType(urlDownload);
+                                ExternalFileType externalFileType =
+                                        suggestedType.orElse(StandardExternalFileType.PDF);
+                                suggestedName =
+                                        linkedFileHandler.getSuggestedFileName(
+                                                externalFileType.getExtension());
+                            } else {
+                                suggestedName = this.suggestedName;
+                            }
+                            String fulltextDir =
+                                    FileUtil.createDirNameFromPattern(
+                                            databaseContext.getDatabase(),
+                                            entry,
+                                            filePreferences.getFileDirectoryPattern());
+                            suggestedName =
+                                    FileNameUniqueness.getNonOverWritingFileName(
+                                            targetDirectory.resolve(fulltextDir), suggestedName);
+
+                            return targetDirectory.resolve(fulltextDir).resolve(suggestedName);
+                        })
                 .then(destination -> new FileDownloadTask(urlDownload.getSource(), destination))
                 .onFailure(ex -> LOGGER.error("Error in download", ex))
-                .onFinished(() -> {
-                    downloadProgress.unbind();
-                    downloadProgress.set(1);
-                });
+                .onFinished(
+                        () -> {
+                            downloadProgress.unbind();
+                            downloadProgress.set(1);
+                        });
     }
 
     private Optional<ExternalFileType> inferFileType(URLDownload urlDownload) {
@@ -274,16 +320,22 @@ private Optional<ExternalFileType> inferFileType(URLDownload urlDownload) {
     }
 
     private Optional<ExternalFileType> inferFileTypeFromMimeType(URLDownload urlDownload) {
-        return urlDownload.getMimeType()
-                          .flatMap(mimeType -> {
-                              LOGGER.debug("MIME Type suggested: {}", mimeType);
-                              return ExternalFileTypes.getExternalFileTypeByMimeType(mimeType, externalApplicationsPreferences);
-                          });
+        return urlDownload
+                .getMimeType()
+                .flatMap(
+                        mimeType -> {
+                            LOGGER.debug("MIME Type suggested: {}", mimeType);
+                            return ExternalFileTypes.getExternalFileTypeByMimeType(
+                                    mimeType, externalApplicationsPreferences);
+                        });
     }
 
     private Optional<ExternalFileType> inferFileTypeFromURL(String url) {
         return URLUtil.getSuffix(url, externalApplicationsPreferences)
-                      .flatMap(extension -> ExternalFileTypes.getExternalFileTypeByExt(extension, externalApplicationsPreferences));
+                .flatMap(
+                        extension ->
+                                ExternalFileTypes.getExternalFileTypeByExt(
+                                        extension, externalApplicationsPreferences));
     }
 
     public ReadOnlyDoubleProperty downloadProgress() {
@@ -305,7 +357,9 @@ public Path call() throws Exception {
             try (ProgressInputStream inputStream = download.asInputStream()) {
                 EasyBind.subscribe(
                         inputStream.totalNumBytesReadProperty(),
-                        bytesRead -> updateProgress(bytesRead.longValue(), inputStream.getMaxNumBytes()));
+                        bytesRead ->
+                                updateProgress(
+                                        bytesRead.longValue(), inputStream.getMaxNumBytes()));
                 // Make sure directory exists since otherwise copy fails
                 Files.createDirectories(destination.getParent());
                 Files.copy(inputStream, destination, StandardCopyOption.REPLACE_EXISTING);
diff --git a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialog.java b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialog.java
index f6290544bc73..9d7cb0334754 100644
--- a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialog.java
+++ b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialog.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.linkedfile;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
+
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
@@ -16,12 +20,10 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.LinkedFile;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class LinkedFileEditDialog extends BaseDialog<LinkedFile> {
 
-    private static final ButtonType ADD_BUTTON = new ButtonType(Localization.lang("Add"), ButtonType.OK.getButtonData());
+    private static final ButtonType ADD_BUTTON =
+            new ButtonType(Localization.lang("Add"), ButtonType.OK.getButtonData());
     private static final ButtonType EDIT_BUTTON = ButtonType.APPLY;
 
     @FXML private TextField link;
@@ -55,26 +57,31 @@ public LinkedFileEditDialog(LinkedFile linkedFile) {
     }
 
     private void initializeDialog(String title, ButtonType primaryButtonType) {
-        ViewLoader.view(this)
-                  .load()
-                  .setAsContent(this.getDialogPane());
+        ViewLoader.view(this).load().setAsContent(this.getDialogPane());
 
         this.setTitle(title);
         this.setResizable(false);
         this.getDialogPane().getButtonTypes().setAll(ButtonType.CANCEL, primaryButtonType);
 
-        this.setResultConverter(button -> {
-            if (button == primaryButtonType) {
-                return viewModel.getNewLinkedFile();
-            } else {
-                return null;
-            }
-        });
+        this.setResultConverter(
+                button -> {
+                    if (button == primaryButtonType) {
+                        return viewModel.getNewLinkedFile();
+                    } else {
+                        return null;
+                    }
+                });
     }
 
     @FXML
     private void initialize() {
-        viewModel = new LinkedFileEditDialogViewModel(linkedFile, stateManager.getActiveDatabase().get(), dialogService, preferences.getExternalApplicationsPreferences(), preferences.getFilePreferences());
+        viewModel =
+                new LinkedFileEditDialogViewModel(
+                        linkedFile,
+                        stateManager.getActiveDatabase().get(),
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences(),
+                        preferences.getFilePreferences());
 
         fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
         new ViewModelListCellFactory<ExternalFileType>()
diff --git a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogViewModel.java b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogViewModel.java
index cd31283742c2..a27cc46143f2 100644
--- a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogViewModel.java
@@ -1,10 +1,7 @@
 package org.jabref.gui.linkedfile;
 
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.nio.file.Path;
-import java.util.Optional;
-import java.util.regex.Pattern;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.optional.ObservableOptionalValue;
 
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -26,8 +23,11 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
 
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.optional.ObservableOptionalValue;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.regex.Pattern;
 
 public class LinkedFileEditDialogViewModel extends AbstractViewModel {
 
@@ -35,24 +35,29 @@ public class LinkedFileEditDialogViewModel extends AbstractViewModel {
     private final StringProperty link = new SimpleStringProperty("");
     private final StringProperty description = new SimpleStringProperty("");
     private final StringProperty sourceUrl = new SimpleStringProperty("");
-    private final ListProperty<ExternalFileType> allExternalFileTypes = new SimpleListProperty<>(FXCollections.emptyObservableList());
-    private final ObjectProperty<ExternalFileType> selectedExternalFileType = new SimpleObjectProperty<>();
+    private final ListProperty<ExternalFileType> allExternalFileTypes =
+            new SimpleListProperty<>(FXCollections.emptyObservableList());
+    private final ObjectProperty<ExternalFileType> selectedExternalFileType =
+            new SimpleObjectProperty<>();
     private final ObservableOptionalValue<ExternalFileType> monadicSelectedExternalFileType;
     private final BibDatabaseContext database;
     private final DialogService dialogService;
     private final ExternalApplicationsPreferences externalApplicationsPreferences;
     private final FilePreferences filePreferences;
 
-    public LinkedFileEditDialogViewModel(LinkedFile linkedFile,
-                                         BibDatabaseContext database,
-                                         DialogService dialogService,
-                                         ExternalApplicationsPreferences externalApplicationsPreferences,
-                                         FilePreferences filePreferences) {
+    public LinkedFileEditDialogViewModel(
+            LinkedFile linkedFile,
+            BibDatabaseContext database,
+            DialogService dialogService,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            FilePreferences filePreferences) {
         this.database = database;
         this.dialogService = dialogService;
         this.filePreferences = filePreferences;
         this.externalApplicationsPreferences = externalApplicationsPreferences;
-        allExternalFileTypes.set(FXCollections.observableArrayList(externalApplicationsPreferences.getExternalFileTypes()));
+        allExternalFileTypes.set(
+                FXCollections.observableArrayList(
+                        externalApplicationsPreferences.getExternalFileTypes()));
 
         monadicSelectedExternalFileType = EasyBind.wrapNullable(selectedExternalFileType);
         setValues(linkedFile);
@@ -63,13 +68,13 @@ private void setExternalFileTypeByExtension(String link) {
             // Check if this looks like a remote link:
             if (REMOTE_LINK_PATTERN.matcher(link).matches()) {
                 ExternalFileTypes.getExternalFileTypeByExt("html", externalApplicationsPreferences)
-                                 .ifPresent(selectedExternalFileType::setValue);
+                        .ifPresent(selectedExternalFileType::setValue);
             }
 
             // Try to guess the file type:
             String theLink = link.trim();
             ExternalFileTypes.getExternalFileTypeForName(theLink, externalApplicationsPreferences)
-                             .ifPresent(selectedExternalFileType::setValue);
+                    .ifPresent(selectedExternalFileType::setValue);
         }
     }
 
@@ -81,18 +86,22 @@ public void openBrowseDialog() {
         Path workingDir = file.orElse(filePreferences.getWorkingDirectory());
         String fileName = Path.of(fileText).getFileName().toString();
 
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(workingDir)
-                .withInitialFileName(fileName)
-                .build();
-
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(path -> {
-            // Store the directory for next time:
-            filePreferences.setWorkingDirectory(path);
-            link.set(relativize(path));
-
-            setExternalFileTypeByExtension(link.getValueSafe());
-        });
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .withInitialDirectory(workingDir)
+                        .withInitialFileName(fileName)
+                        .build();
+
+        dialogService
+                .showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(
+                        path -> {
+                            // Store the directory for next time:
+                            filePreferences.setWorkingDirectory(path);
+                            link.set(relativize(path));
+
+                            setExternalFileTypeByExtension(link.getValueSafe());
+                        });
     }
 
     public void setValues(LinkedFile linkedFile) {
@@ -106,7 +115,9 @@ public void setValues(LinkedFile linkedFile) {
         }
 
         // See what is a reasonable selection for the type combobox:
-        Optional<ExternalFileType> fileType = ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFile, false, externalApplicationsPreferences);
+        Optional<ExternalFileType> fileType =
+                ExternalFileTypes.getExternalFileTypeByLinkedFile(
+                        linkedFile, false, externalApplicationsPreferences);
         if (fileType.isPresent() && !(fileType.get() instanceof UnknownExternalFileType)) {
             selectedExternalFileType.setValue(fileType.get());
         } else if ((linkedFile.getLink() != null) && (!linkedFile.getLink().isEmpty())) {
@@ -135,16 +146,26 @@ public ObjectProperty<ExternalFileType> selectedExternalFileTypeProperty() {
     }
 
     public LinkedFile getNewLinkedFile() {
-        String fileType = monadicSelectedExternalFileType.getValue().map(ExternalFileType::toString).orElse("");
+        String fileType =
+                monadicSelectedExternalFileType
+                        .getValue()
+                        .map(ExternalFileType::toString)
+                        .orElse("");
 
         if (LinkedFile.isOnlineLink(link.getValue())) {
             try {
-                return new LinkedFile(description.getValue(), URI.create(link.getValue()).toURL(), fileType, sourceUrl.getValue());
+                return new LinkedFile(
+                        description.getValue(),
+                        URI.create(link.getValue()).toURL(),
+                        fileType,
+                        sourceUrl.getValue());
             } catch (MalformedURLException e) {
-                return new LinkedFile(description.getValue(), link.getValue(), fileType, sourceUrl.getValue());
+                return new LinkedFile(
+                        description.getValue(), link.getValue(), fileType, sourceUrl.getValue());
             }
         }
-        return new LinkedFile(description.getValue(), Path.of(link.getValue()), fileType, sourceUrl.getValue());
+        return new LinkedFile(
+                description.getValue(), Path.of(link.getValue()), fileType, sourceUrl.getValue());
     }
 
     private String relativize(Path filePath) {
diff --git a/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java b/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java
index ac12f783c7e4..eaff2577dd14 100644
--- a/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.linkedfile;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Optional;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
@@ -13,15 +11,17 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
 
 public class RedownloadMissingFilesAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(RedownloadMissingFilesAction.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(RedownloadMissingFilesAction.class);
 
     private final StateManager stateManager;
     private final DialogService dialogService;
@@ -31,11 +31,12 @@ public class RedownloadMissingFilesAction extends SimpleCommand {
 
     private BibDatabaseContext databaseContext;
 
-    public RedownloadMissingFilesAction(StateManager stateManager,
-                                        DialogService dialogService,
-                                        ExternalApplicationsPreferences externalApplicationsPreferences,
-                                        FilePreferences filePreferences,
-                                        TaskExecutor taskExecutor) {
+    public RedownloadMissingFilesAction(
+            StateManager stateManager,
+            DialogService dialogService,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            FilePreferences filePreferences,
+            TaskExecutor taskExecutor) {
         this.stateManager = stateManager;
         this.dialogService = dialogService;
         this.externalApplicationsPreferences = externalApplicationsPreferences;
@@ -49,9 +50,10 @@ public RedownloadMissingFilesAction(StateManager stateManager,
     public void execute() {
         if (stateManager.getActiveDatabase().isPresent()) {
             databaseContext = stateManager.getActiveDatabase().get();
-            boolean confirm = dialogService.showConfirmationDialogAndWait(
-                    Localization.lang("Redownload missing files"),
-                    Localization.lang("Redownload missing files for current library?"));
+            boolean confirm =
+                    dialogService.showConfirmationDialogAndWait(
+                            Localization.lang("Redownload missing files"),
+                            Localization.lang("Redownload missing files for current library?"));
             if (!confirm) {
                 return;
             }
@@ -64,31 +66,45 @@ public void execute() {
      */
     private void redownloadMissing(BibDatabaseContext databaseContext) {
         LOGGER.info("Redownloading missing files");
-        databaseContext.getEntries().forEach(entry -> {
-            entry.getFiles().forEach(linkedFile -> {
-                if (linkedFile.isOnlineLink() || linkedFile.getSourceUrl().isEmpty()) {
-                    return;
-                }
+        databaseContext
+                .getEntries()
+                .forEach(
+                        entry -> {
+                            entry.getFiles()
+                                    .forEach(
+                                            linkedFile -> {
+                                                if (linkedFile.isOnlineLink()
+                                                        || linkedFile.getSourceUrl().isEmpty()) {
+                                                    return;
+                                                }
 
-                Optional<Path> path = FileUtil.find(this.databaseContext, linkedFile.getLink(), filePreferences);
-                if (path.isPresent() && Files.exists(path.get())) {
-                    return;
-                }
-                String fileName = Path.of(linkedFile.getLink()).getFileName().toString();
+                                                Optional<Path> path =
+                                                        FileUtil.find(
+                                                                this.databaseContext,
+                                                                linkedFile.getLink(),
+                                                                filePreferences);
+                                                if (path.isPresent() && Files.exists(path.get())) {
+                                                    return;
+                                                }
+                                                String fileName =
+                                                        Path.of(linkedFile.getLink())
+                                                                .getFileName()
+                                                                .toString();
 
-                DownloadLinkedFileAction downloadAction = new DownloadLinkedFileAction(
-                        this.databaseContext,
-                        entry,
-                        linkedFile,
-                        linkedFile.getSourceUrl(),
-                        dialogService,
-                        externalApplicationsPreferences,
-                        filePreferences,
-                        taskExecutor,
-                        fileName,
-                        true);
-                downloadAction.execute();
-            });
-        });
+                                                DownloadLinkedFileAction downloadAction =
+                                                        new DownloadLinkedFileAction(
+                                                                this.databaseContext,
+                                                                entry,
+                                                                linkedFile,
+                                                                linkedFile.getSourceUrl(),
+                                                                dialogService,
+                                                                externalApplicationsPreferences,
+                                                                filePreferences,
+                                                                taskExecutor,
+                                                                fileName,
+                                                                true);
+                                                downloadAction.execute();
+                                            });
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/logging/GuiWriter.java b/src/main/java/org/jabref/gui/logging/GuiWriter.java
index 4dff37ad4f3b..3af81425699b 100644
--- a/src/main/java/org/jabref/gui/logging/GuiWriter.java
+++ b/src/main/java/org/jabref/gui/logging/GuiWriter.java
@@ -1,16 +1,15 @@
 package org.jabref.gui.logging;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.Map;
-
 import org.jabref.logic.logging.LogMessages;
-
 import org.tinylog.core.LogEntry;
 import org.tinylog.core.LogEntryValue;
 import org.tinylog.writers.AbstractFormatPatternWriter;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Map;
+
 public class GuiWriter extends AbstractFormatPatternWriter {
 
     public GuiWriter(final Map<String, String> properties) {
@@ -32,10 +31,8 @@ public void write(LogEntry logEntry) throws Exception {
     }
 
     @Override
-    public void flush() throws Exception {
-    }
+    public void flush() throws Exception {}
 
     @Override
-    public void close() throws Exception {
-    }
+    public void close() throws Exception {}
 }
diff --git a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
index aa8fdc38ec38..4439a3486438 100644
--- a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
+++ b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
@@ -1,14 +1,8 @@
 package org.jabref.gui.maintable;
 
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.EasyBinding;
+import com.tobiasdiez.easybind.optional.OptionalBinding;
 
 import javafx.beans.Observable;
 import javafx.beans.binding.Binding;
@@ -37,15 +31,22 @@
 import org.jabref.model.groups.AbstractGroup;
 import org.jabref.model.groups.GroupTreeNode;
 
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.EasyBinding;
-import com.tobiasdiez.easybind.optional.OptionalBinding;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 public class BibEntryTableViewModel {
     private final BibEntry entry;
     private final ObservableValue<MainTableFieldValueFormatter> fieldValueFormatter;
     private final Map<OrFields, ObservableValue<String>> fieldValues = new HashMap<>();
-    private final Map<SpecialField, OptionalBinding<SpecialFieldValueViewModel>> specialFieldValues = new HashMap<>();
+    private final Map<SpecialField, OptionalBinding<SpecialFieldValueViewModel>>
+            specialFieldValues = new HashMap<>();
     private final EasyBinding<List<LinkedFile>> linkedFiles;
     private final EasyBinding<Map<Field, String>> linkedIdentifiers;
     private final Binding<List<AbstractGroup>> matchedGroups;
@@ -56,14 +57,21 @@ public class BibEntryTableViewModel {
     private final BooleanProperty isVisibleBySearch = new SimpleBooleanProperty(true);
     private final BooleanProperty isMatchedByGroup = new SimpleBooleanProperty(true);
     private final BooleanProperty isVisibleByGroup = new SimpleBooleanProperty(true);
-    private final ObjectProperty<MatchCategory> matchCategory = new SimpleObjectProperty<>(MatchCategory.MATCHING_SEARCH_AND_GROUPS);
+    private final ObjectProperty<MatchCategory> matchCategory =
+            new SimpleObjectProperty<>(MatchCategory.MATCHING_SEARCH_AND_GROUPS);
 
-    public BibEntryTableViewModel(BibEntry entry, BibDatabaseContext bibDatabaseContext, ObservableValue<MainTableFieldValueFormatter> fieldValueFormatter) {
+    public BibEntryTableViewModel(
+            BibEntry entry,
+            BibDatabaseContext bibDatabaseContext,
+            ObservableValue<MainTableFieldValueFormatter> fieldValueFormatter) {
         this.entry = entry;
         this.bibDatabaseContext = bibDatabaseContext;
         this.fieldValueFormatter = fieldValueFormatter;
 
-        this.linkedFiles = getField(StandardField.FILE).mapOpt(FileFieldParser::parse).orElseOpt(Collections.emptyList());
+        this.linkedFiles =
+                getField(StandardField.FILE)
+                        .mapOpt(FileFieldParser::parse)
+                        .orElseOpt(Collections.emptyList());
         this.linkedIdentifiers = createLinkedIdentifiersBinding(entry);
         this.matchedGroups = createMatchedGroupsBinding(bibDatabaseContext, entry);
     }
@@ -90,15 +98,28 @@ public BibEntry getEntry() {
         return entry;
     }
 
-    private static Binding<List<AbstractGroup>> createMatchedGroupsBinding(BibDatabaseContext database, BibEntry entry) {
-        return new UiThreadBinding<>(EasyBind.combine(entry.getFieldBinding(StandardField.GROUPS), database.getMetaData().groupsBinding(),
-                (a, b) ->
-                        database.getMetaData().getGroups().map(groupTreeNode ->
-                                        groupTreeNode.getMatchingGroups(entry).stream()
-                                                     .map(GroupTreeNode::getGroup)
-                                                     .filter(Predicate.not(Predicate.isEqual(groupTreeNode.getGroup())))
-                                                     .collect(Collectors.toList()))
-                                .orElse(Collections.emptyList())));
+    private static Binding<List<AbstractGroup>> createMatchedGroupsBinding(
+            BibDatabaseContext database, BibEntry entry) {
+        return new UiThreadBinding<>(
+                EasyBind.combine(
+                        entry.getFieldBinding(StandardField.GROUPS),
+                        database.getMetaData().groupsBinding(),
+                        (a, b) ->
+                                database.getMetaData()
+                                        .getGroups()
+                                        .map(
+                                                groupTreeNode ->
+                                                        groupTreeNode
+                                                                .getMatchingGroups(entry)
+                                                                .stream()
+                                                                .map(GroupTreeNode::getGroup)
+                                                                .filter(
+                                                                        Predicate.not(
+                                                                                Predicate.isEqual(
+                                                                                        groupTreeNode
+                                                                                                .getGroup())))
+                                                                .collect(Collectors.toList()))
+                                        .orElse(Collections.emptyList())));
     }
 
     public OptionalBinding<String> getField(Field field) {
@@ -117,23 +138,41 @@ public ObservableValue<List<AbstractGroup>> getMatchedGroups() {
         return matchedGroups;
     }
 
-    public ObservableValue<Optional<SpecialFieldValueViewModel>> getSpecialField(SpecialField field) {
+    public ObservableValue<Optional<SpecialFieldValueViewModel>> getSpecialField(
+            SpecialField field) {
         OptionalBinding<SpecialFieldValueViewModel> value = specialFieldValues.get(field);
         // Fetch possibly updated value from BibEntry entry
         Optional<String> currentValue = this.entry.getField(field);
         if (value != null) {
             if (currentValue.isEmpty() && value.getValue().isEmpty()) {
-                var zeroValue = getField(field).flatMapOpt(fieldValue -> field.parseValue("CLEAR_RANK").map(SpecialFieldValueViewModel::new));
+                var zeroValue =
+                        getField(field)
+                                .flatMapOpt(
+                                        fieldValue ->
+                                                field.parseValue("CLEAR_RANK")
+                                                        .map(SpecialFieldValueViewModel::new));
                 specialFieldValues.put(field, zeroValue);
                 return zeroValue;
-            } else if (value.getValue().isEmpty() || !value.getValue().get().getValue().getFieldValue().equals(currentValue)) {
-                // specialFieldValues value and BibEntry value differ => Set specialFieldValues value to BibEntry value
-                value = getField(field).flatMapOpt(fieldValue -> field.parseValue(fieldValue).map(SpecialFieldValueViewModel::new));
+            } else if (value.getValue().isEmpty()
+                    || !value.getValue().get().getValue().getFieldValue().equals(currentValue)) {
+                // specialFieldValues value and BibEntry value differ => Set specialFieldValues
+                // value to BibEntry value
+                value =
+                        getField(field)
+                                .flatMapOpt(
+                                        fieldValue ->
+                                                field.parseValue(fieldValue)
+                                                        .map(SpecialFieldValueViewModel::new));
                 specialFieldValues.put(field, value);
                 return value;
             }
         } else {
-            value = getField(field).flatMapOpt(fieldValue -> field.parseValue(fieldValue).map(SpecialFieldValueViewModel::new));
+            value =
+                    getField(field)
+                            .flatMapOpt(
+                                    fieldValue ->
+                                            field.parseValue(fieldValue)
+                                                    .map(SpecialFieldValueViewModel::new));
             specialFieldValues.put(field, value);
         }
         return value;
@@ -148,15 +187,17 @@ public ObservableValue<String> getFields(OrFields fields) {
         ArrayList<Observable> observables = new ArrayList<>(List.of(entry.getObservables()));
         observables.add(fieldValueFormatter);
 
-        value = Bindings.createStringBinding(() ->
-                        fieldValueFormatter.getValue().formatFieldsValues(fields, entry),
-                observables.toArray(Observable[]::new));
+        value =
+                Bindings.createStringBinding(
+                        () -> fieldValueFormatter.getValue().formatFieldsValues(fields, entry),
+                        observables.toArray(Observable[]::new));
         fieldValues.put(fields, value);
         return value;
     }
 
     public StringProperty bibDatabasePathProperty() {
-        return new ReadOnlyStringWrapper(bibDatabaseContext.getDatabasePath().map(Path::toString).orElse(""));
+        return new ReadOnlyStringWrapper(
+                bibDatabaseContext.getDatabasePath().map(Path::toString).orElse(""));
     }
 
     public BibDatabaseContext getBibDatabaseContext() {
diff --git a/src/main/java/org/jabref/gui/maintable/CellFactory.java b/src/main/java/org/jabref/gui/maintable/CellFactory.java
index 19abeff7f004..5f85623c6b41 100644
--- a/src/main/java/org/jabref/gui/maintable/CellFactory.java
+++ b/src/main/java/org/jabref/gui/maintable/CellFactory.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.maintable;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.Node;
 
 import org.jabref.gui.externalfiletype.ExternalFileType;
@@ -17,6 +12,11 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.swing.undo.UndoManager;
+
 public class CellFactory {
 
     private final Map<Field, JabRefIcon> TABLE_ICONS = new HashMap<>();
@@ -55,42 +55,49 @@ public CellFactory(GuiPreferences preferences, UndoManager undoManager) {
         // icon.setToolTipText(Localization.lang("Open file"));
         TABLE_ICONS.put(StandardField.FILE, icon);
 
-        for (ExternalFileType fileType : preferences.getExternalApplicationsPreferences().getExternalFileTypes()) {
+        for (ExternalFileType fileType :
+                preferences.getExternalApplicationsPreferences().getExternalFileTypes()) {
             icon = fileType.getIcon();
             // icon.setToolTipText(Localization.lang("Open %0 file", fileType.getName()));
             TABLE_ICONS.put(fileType.getField(), icon);
         }
 
-        SpecialFieldViewModel relevanceViewModel = new SpecialFieldViewModel(SpecialField.RELEVANCE, preferences, undoManager);
+        SpecialFieldViewModel relevanceViewModel =
+                new SpecialFieldViewModel(SpecialField.RELEVANCE, preferences, undoManager);
         icon = relevanceViewModel.getIcon();
         // icon.setToolTipText(relevanceViewModel.getLocalization());
         TABLE_ICONS.put(SpecialField.RELEVANCE, icon);
 
-        SpecialFieldViewModel qualityViewModel = new SpecialFieldViewModel(SpecialField.QUALITY, preferences, undoManager);
+        SpecialFieldViewModel qualityViewModel =
+                new SpecialFieldViewModel(SpecialField.QUALITY, preferences, undoManager);
         icon = qualityViewModel.getIcon();
         // icon.setToolTipText(qualityViewModel.getLocalization());
         TABLE_ICONS.put(SpecialField.QUALITY, icon);
 
         // Ranking item in the menu uses one star
-        SpecialFieldViewModel rankViewModel = new SpecialFieldViewModel(SpecialField.RANKING, preferences, undoManager);
+        SpecialFieldViewModel rankViewModel =
+                new SpecialFieldViewModel(SpecialField.RANKING, preferences, undoManager);
         icon = rankViewModel.getIcon();
         // icon.setToolTipText(rankViewModel.getLocalization());
         TABLE_ICONS.put(SpecialField.RANKING, icon);
 
         // Priority icon used for the menu
-        SpecialFieldViewModel priorityViewModel = new SpecialFieldViewModel(SpecialField.PRIORITY, preferences, undoManager);
+        SpecialFieldViewModel priorityViewModel =
+                new SpecialFieldViewModel(SpecialField.PRIORITY, preferences, undoManager);
         icon = priorityViewModel.getIcon();
         // icon.setToolTipText(priorityViewModel.getLocalization());
         TABLE_ICONS.put(SpecialField.PRIORITY, icon);
 
         // Read icon used for menu
-        SpecialFieldViewModel readViewModel = new SpecialFieldViewModel(SpecialField.READ_STATUS, preferences, undoManager);
+        SpecialFieldViewModel readViewModel =
+                new SpecialFieldViewModel(SpecialField.READ_STATUS, preferences, undoManager);
         icon = readViewModel.getIcon();
         // icon.setToolTipText(readViewModel.getLocalization());
         TABLE_ICONS.put(SpecialField.READ_STATUS, icon);
 
         // Print icon used for menu
-        SpecialFieldViewModel printedViewModel = new SpecialFieldViewModel(SpecialField.PRINTED, preferences, undoManager);
+        SpecialFieldViewModel printedViewModel =
+                new SpecialFieldViewModel(SpecialField.PRINTED, preferences, undoManager);
         icon = printedViewModel.getIcon();
         // icon.setToolTipText(printedViewModel.getLocalization());
         TABLE_ICONS.put(SpecialField.PRINTED, icon);
@@ -102,7 +109,8 @@ public Node getTableIcon(Field field) {
             // LOGGER.info("Error: no table icon defined for type '" + field + "'.");
             return null;
         } else {
-            // node should be generated for each call, as nodes can be added to the scene graph only once
+            // node should be generated for each call, as nodes can be added to the scene graph only
+            // once
             return icon.getGraphicNode();
         }
     }
diff --git a/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java b/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
index ca000f2ce283..740d3520591c 100644
--- a/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
+++ b/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
@@ -1,20 +1,21 @@
 package org.jabref.gui.maintable;
 
-import java.util.List;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
+import java.util.List;
+
 public class ColumnPreferences {
 
     public static final double DEFAULT_COLUMN_WIDTH = 100;
-    public static final double ICON_COLUMN_WIDTH = 16 + 12; // add some additional space to improve appearance
+    public static final double ICON_COLUMN_WIDTH =
+            16 + 12; // add some additional space to improve appearance
 
     private final ObservableList<MainTableColumnModel> columns;
     private final ObservableList<MainTableColumnModel> columnSortOrder;
 
-    public ColumnPreferences(List<MainTableColumnModel> columns,
-                             List<MainTableColumnModel> columnSortOrder) {
+    public ColumnPreferences(
+            List<MainTableColumnModel> columns, List<MainTableColumnModel> columnSortOrder) {
         this.columns = FXCollections.observableArrayList(columns);
         this.columnSortOrder = FXCollections.observableArrayList(columnSortOrder);
     }
diff --git a/src/main/java/org/jabref/gui/maintable/ExtractReferencesAction.java b/src/main/java/org/jabref/gui/maintable/ExtractReferencesAction.java
index b4aa68fd3210..0520b1c95c6d 100644
--- a/src/main/java/org/jabref/gui/maintable/ExtractReferencesAction.java
+++ b/src/main/java/org/jabref/gui/maintable/ExtractReferencesAction.java
@@ -1,14 +1,5 @@
 package org.jabref.gui.maintable;
 
-import java.nio.file.Path;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
-import java.util.StringJoiner;
-import java.util.concurrent.Callable;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
@@ -25,10 +16,18 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
-
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 
+import java.nio.file.Path;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+import java.util.StringJoiner;
+import java.util.concurrent.Callable;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * SIDE EFFECT: Sets the "cites" field of the entry having the linked files
  *
@@ -50,9 +49,8 @@ public class ExtractReferencesAction extends SimpleCommand {
 
     private final BibliographyFromPdfImporter bibliographyFromPdfImporter;
 
-    public ExtractReferencesAction(DialogService dialogService,
-                                   StateManager stateManager,
-                                   CliPreferences preferences) {
+    public ExtractReferencesAction(
+            DialogService dialogService, StateManager stateManager, CliPreferences preferences) {
         this(dialogService, stateManager, preferences, null, null);
     }
 
@@ -62,23 +60,24 @@ public ExtractReferencesAction(DialogService dialogService,
      * @param entry the entry to handle (can be null)
      * @param linkedFile the linked file (can be null)
      */
-    private ExtractReferencesAction(@NonNull DialogService dialogService,
-                                    @NonNull StateManager stateManager,
-                                    @NonNull CliPreferences preferences,
-                                    @Nullable BibEntry entry,
-                                    @Nullable LinkedFile linkedFile) {
+    private ExtractReferencesAction(
+            @NonNull DialogService dialogService,
+            @NonNull StateManager stateManager,
+            @NonNull CliPreferences preferences,
+            @Nullable BibEntry entry,
+            @Nullable LinkedFile linkedFile) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.preferences = preferences;
         this.entry = entry;
         this.linkedFile = linkedFile;
-        bibliographyFromPdfImporter = new BibliographyFromPdfImporter(preferences.getCitationKeyPatternPreferences());
+        bibliographyFromPdfImporter =
+                new BibliographyFromPdfImporter(preferences.getCitationKeyPatternPreferences());
 
         if (this.linkedFile == null) {
             this.executable.bind(
                     ActionHelper.needsEntriesSelected(stateManager)
-                                .and(ActionHelper.hasLinkedFileForSelectedEntries(stateManager))
-            );
+                            .and(ActionHelper.hasLinkedFileForSelectedEntries(stateManager)));
         } else {
             this.setExecutable(true);
         }
@@ -90,48 +89,65 @@ public void execute() {
     }
 
     private void extractReferences() {
-        stateManager.getActiveDatabase().ifPresent(databaseContext -> {
-            List<BibEntry> selectedEntries;
-            if (entry == null) {
-                selectedEntries = stateManager.getSelectedEntries();
-            } else {
-                selectedEntries = List.of(entry);
-            }
+        stateManager
+                .getActiveDatabase()
+                .ifPresent(
+                        databaseContext -> {
+                            List<BibEntry> selectedEntries;
+                            if (entry == null) {
+                                selectedEntries = stateManager.getSelectedEntries();
+                            } else {
+                                selectedEntries = List.of(entry);
+                            }
 
-            boolean online = this.preferences.getGrobidPreferences().isGrobidEnabled();
-            Callable<ParserResult> parserResultCallable;
-            if (online) {
-                Optional<Callable<ParserResult>> parserResultCallableOnline = getParserResultCallableOnline(databaseContext, selectedEntries);
-                if (parserResultCallableOnline.isEmpty()) {
-                    return;
-                }
-                parserResultCallable = parserResultCallableOnline.get();
-            } else {
-                parserResultCallable = getParserResultCallableOffline(databaseContext, selectedEntries);
-            }
-            BackgroundTask<ParserResult> task = BackgroundTask.wrap(parserResultCallable)
-                                                              .withInitialMessage(Localization.lang("Processing PDF(s)"));
+                            boolean online =
+                                    this.preferences.getGrobidPreferences().isGrobidEnabled();
+                            Callable<ParserResult> parserResultCallable;
+                            if (online) {
+                                Optional<Callable<ParserResult>> parserResultCallableOnline =
+                                        getParserResultCallableOnline(
+                                                databaseContext, selectedEntries);
+                                if (parserResultCallableOnline.isEmpty()) {
+                                    return;
+                                }
+                                parserResultCallable = parserResultCallableOnline.get();
+                            } else {
+                                parserResultCallable =
+                                        getParserResultCallableOffline(
+                                                databaseContext, selectedEntries);
+                            }
+                            BackgroundTask<ParserResult> task =
+                                    BackgroundTask.wrap(parserResultCallable)
+                                            .withInitialMessage(
+                                                    Localization.lang("Processing PDF(s)"));
 
-            task.onFailure(dialogService::showErrorDialogAndWait);
+                            task.onFailure(dialogService::showErrorDialogAndWait);
 
-            ImportEntriesDialog dialog = new ImportEntriesDialog(stateManager.getActiveDatabase().get(), task);
-            String title;
-            if (online) {
-                title = Localization.lang("Extract References (online)");
-            } else {
-                title = Localization.lang("Extract References (offline)");
-            }
-            dialog.setTitle(title);
-            dialogService.showCustomDialogAndWait(dialog);
-        });
+                            ImportEntriesDialog dialog =
+                                    new ImportEntriesDialog(
+                                            stateManager.getActiveDatabase().get(), task);
+                            String title;
+                            if (online) {
+                                title = Localization.lang("Extract References (online)");
+                            } else {
+                                title = Localization.lang("Extract References (offline)");
+                            }
+                            dialog.setTitle(title);
+                            dialogService.showCustomDialogAndWait(dialog);
+                        });
     }
 
-    private @NonNull Callable<ParserResult> getParserResultCallableOffline(BibDatabaseContext databaseContext, List<BibEntry> selectedEntries) {
+    private @NonNull Callable<ParserResult> getParserResultCallableOffline(
+            BibDatabaseContext databaseContext, List<BibEntry> selectedEntries) {
         return () -> {
             BibEntry currentEntry = selectedEntries.getFirst();
-            List<Path> fileList = FileUtil.getListOfLinkedFiles(selectedEntries, databaseContext.getFileDirectories(preferences.getFilePreferences()));
+            List<Path> fileList =
+                    FileUtil.getListOfLinkedFiles(
+                            selectedEntries,
+                            databaseContext.getFileDirectories(preferences.getFilePreferences()));
 
-            // We need to have ParserResult handled at the importer, because it imports the meta data (library type, encoding, ...)
+            // We need to have ParserResult handled at the importer, because it imports the meta
+            // data (library type, encoding, ...)
             ParserResult result = bibliographyFromPdfImporter.importDatabase(fileList.getFirst());
 
             // subsequent files are just appended to result
@@ -144,7 +160,11 @@ private void extractReferences() {
             selectedEntriesIterator.next(); // skip first entry
             while (selectedEntriesIterator.hasNext()) {
                 currentEntry = selectedEntriesIterator.next();
-                fileList = FileUtil.getListOfLinkedFiles(List.of(currentEntry), databaseContext.getFileDirectories(preferences.getFilePreferences()));
+                fileList =
+                        FileUtil.getListOfLinkedFiles(
+                                List.of(currentEntry),
+                                databaseContext.getFileDirectories(
+                                        preferences.getFilePreferences()));
                 fileListIterator = fileList.iterator();
                 extractReferences(fileListIterator, result, currentEntry);
             }
@@ -153,9 +173,15 @@ private void extractReferences() {
         };
     }
 
-    private void extractReferences(Iterator<Path> fileListIterator, ParserResult result, BibEntry currentEntry) {
+    private void extractReferences(
+            Iterator<Path> fileListIterator, ParserResult result, BibEntry currentEntry) {
         while (fileListIterator.hasNext()) {
-            result.getDatabase().insertEntries(bibliographyFromPdfImporter.importDatabase(fileListIterator.next()).getDatabase().getEntries());
+            result.getDatabase()
+                    .insertEntries(
+                            bibliographyFromPdfImporter
+                                    .importDatabase(fileListIterator.next())
+                                    .getDatabase()
+                                    .getEntries());
         }
 
         String cites = getCites(result.getDatabase().getEntries(), currentEntry);
@@ -181,14 +207,17 @@ private static String getCites(List<BibEntry> entries, BibEntry currentEntry) {
             } else {
                 // No key present -> generate one based on
                 //   the citation key of the entry holding the files and
-                //   the number of the current entry (extracted from the reference; fallback: current number of the entry (count variable))
+                //   the number of the current entry (extracted from the reference; fallback:
+                // current number of the entry (count variable))
 
                 String sourceCitationKey = currentEntry.getCitationKey().orElse("unknown");
                 String newCitationKey;
                 // Could happen if no author and no year is present
-                // We use the number of the comment field (because there is no other way to get the number reliable)
+                // We use the number of the comment field (because there is no other way to get the
+                // number reliable)
                 Pattern pattern = Pattern.compile("^\\[(\\d+)\\]");
-                Matcher matcher = pattern.matcher(importedEntry.getField(StandardField.COMMENT).orElse(""));
+                Matcher matcher =
+                        pattern.matcher(importedEntry.getField(StandardField.COMMENT).orElse(""));
                 if (matcher.hasMatch()) {
                     newCitationKey = sourceCitationKey + "-" + matcher.group(1);
                 } else {
@@ -202,18 +231,31 @@ private static String getCites(List<BibEntry> entries, BibEntry currentEntry) {
         return cites.toString();
     }
 
-    private Optional<Callable<ParserResult>> getParserResultCallableOnline(BibDatabaseContext databaseContext, List<BibEntry> selectedEntries) {
-        List<Path> fileList = FileUtil.getListOfLinkedFiles(selectedEntries, databaseContext.getFileDirectories(preferences.getFilePreferences()));
+    private Optional<Callable<ParserResult>> getParserResultCallableOnline(
+            BibDatabaseContext databaseContext, List<BibEntry> selectedEntries) {
+        List<Path> fileList =
+                FileUtil.getListOfLinkedFiles(
+                        selectedEntries,
+                        databaseContext.getFileDirectories(preferences.getFilePreferences()));
         if (fileList.size() > FILES_LIMIT) {
-            boolean continueOpening = dialogService.showConfirmationDialogAndWait(Localization.lang("Processing a large number of files"),
-                    Localization.lang("You are about to process %0 files. Continue?", fileList.size()),
-                    Localization.lang("Continue"), Localization.lang("Cancel"));
+            boolean continueOpening =
+                    dialogService.showConfirmationDialogAndWait(
+                            Localization.lang("Processing a large number of files"),
+                            Localization.lang(
+                                    "You are about to process %0 files. Continue?",
+                                    fileList.size()),
+                            Localization.lang("Continue"),
+                            Localization.lang("Cancel"));
             if (!continueOpening) {
                 return Optional.empty();
             }
         }
-        return Optional.of(() -> new ParserResult(
-                new GrobidService(this.preferences.getGrobidPreferences()).processReferences(fileList, preferences.getImportFormatPreferences())
-        ));
+        return Optional.of(
+                () ->
+                        new ParserResult(
+                                new GrobidService(this.preferences.getGrobidPreferences())
+                                        .processReferences(
+                                                fileList,
+                                                preferences.getImportFormatPreferences())));
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 4a94fd56b5f8..e52fb4ba9576 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -1,14 +1,7 @@
 package org.jabref.gui.maintable;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.injection.Injector;
+import com.google.common.eventbus.Subscribe;
 
 import javafx.collections.ListChangeListener;
 import javafx.css.PseudoClass;
@@ -54,20 +47,31 @@
 import org.jabref.model.database.event.EntriesAddedEvent;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
-
-import com.airhacks.afterburner.injection.Injector;
-import com.google.common.eventbus.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
+
 @AllowedToUseClassGetResource("JavaFX internally handles the passed URLs properly.")
 public class MainTable extends TableView<BibEntryTableViewModel> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MainTable.class);
-    private static final PseudoClass MATCHING_SEARCH_AND_GROUPS = PseudoClass.getPseudoClass("matching-search-and-groups");
-    private static final PseudoClass MATCHING_SEARCH_NOT_GROUPS = PseudoClass.getPseudoClass("matching-search-not-groups");
-    private static final PseudoClass MATCHING_GROUPS_NOT_SEARCH = PseudoClass.getPseudoClass("matching-groups-not-search");
-    private static final PseudoClass NOT_MATCHING_SEARCH_AND_GROUPS = PseudoClass.getPseudoClass("not-matching-search-and-groups");
+    private static final PseudoClass MATCHING_SEARCH_AND_GROUPS =
+            PseudoClass.getPseudoClass("matching-search-and-groups");
+    private static final PseudoClass MATCHING_SEARCH_NOT_GROUPS =
+            PseudoClass.getPseudoClass("matching-search-not-groups");
+    private static final PseudoClass MATCHING_GROUPS_NOT_SEARCH =
+            PseudoClass.getPseudoClass("matching-groups-not-search");
+    private static final PseudoClass NOT_MATCHING_SEARCH_AND_GROUPS =
+            PseudoClass.getPseudoClass("not-matching-search-and-groups");
 
     private final LibraryTab libraryTab;
     private final StateManager stateManager;
@@ -83,18 +87,19 @@ public class MainTable extends TableView<BibEntryTableViewModel> {
     private long lastKeyPressTime;
     private String columnSearchTerm;
 
-    public MainTable(MainTableDataModel model,
-                     LibraryTab libraryTab,
-                     LibraryTabContainer tabContainer,
-                     BibDatabaseContext database,
-                     GuiPreferences preferences,
-                     DialogService dialogService,
-                     StateManager stateManager,
-                     KeyBindingRepository keyBindingRepository,
-                     ClipBoardManager clipBoardManager,
-                     BibEntryTypesManager entryTypesManager,
-                     TaskExecutor taskExecutor,
-                     ImportHandler importHandler) {
+    public MainTable(
+            MainTableDataModel model,
+            LibraryTab libraryTab,
+            LibraryTabContainer tabContainer,
+            BibDatabaseContext database,
+            GuiPreferences preferences,
+            DialogService dialogService,
+            StateManager stateManager,
+            KeyBindingRepository keyBindingRepository,
+            ClipBoardManager clipBoardManager,
+            BibEntryTypesManager entryTypesManager,
+            TaskExecutor taskExecutor,
+            ImportHandler importHandler) {
         super();
 
         this.libraryTab = libraryTab;
@@ -105,7 +110,11 @@ public MainTable(MainTableDataModel model,
         this.undoManager = libraryTab.getUndoManager();
         this.filePreferences = preferences.getFilePreferences();
         this.importHandler = importHandler;
-        this.clipboardContentGenerator = new ClipboardContentGenerator(preferences.getPreviewPreferences(), preferences.getLayoutFormatterPreferences(), Injector.instantiateModelOrService(JournalAbbreviationRepository.class));
+        this.clipboardContentGenerator =
+                new ClipboardContentGenerator(
+                        preferences.getPreviewPreferences(),
+                        preferences.getLayoutFormatterPreferences(),
+                        Injector.instantiateModelOrService(JournalAbbreviationRepository.class));
 
         MainTablePreferences mainTablePreferences = preferences.getMainTablePreferences();
 
@@ -116,39 +125,61 @@ public MainTable(MainTableDataModel model,
 
         this.getStyleClass().add("main-table");
 
-        MainTableColumnFactory mainTableColumnFactory = new MainTableColumnFactory(
-                database,
-                preferences,
-                preferences.getMainTableColumnPreferences(),
-                undoManager,
-                dialogService,
-                stateManager,
-                taskExecutor);
+        MainTableColumnFactory mainTableColumnFactory =
+                new MainTableColumnFactory(
+                        database,
+                        preferences,
+                        preferences.getMainTableColumnPreferences(),
+                        undoManager,
+                        dialogService,
+                        stateManager,
+                        taskExecutor);
 
         this.getColumns().addAll(mainTableColumnFactory.createColumns());
         this.getColumns().removeIf(LibraryColumn.class::isInstance);
 
         new ViewModelTableRowFactory<BibEntryTableViewModel>()
-                .withOnMouseClickedEvent((entry, event) -> {
-                    if (event.getClickCount() == 2) {
-                        libraryTab.showAndEdit(entry.getEntry());
-                    }
-                })
-                .withContextMenu(entry -> RightClickMenu.create(entry,
-                        keyBindingRepository,
-                        libraryTab,
-                        dialogService,
-                        stateManager,
-                        preferences,
-                        undoManager,
-                        clipBoardManager,
-                        taskExecutor,
-                        Injector.instantiateModelOrService(JournalAbbreviationRepository.class),
-                        entryTypesManager))
-                .withPseudoClass(MATCHING_SEARCH_AND_GROUPS, entry -> entry.matchCategory().isEqualTo(MatchCategory.MATCHING_SEARCH_AND_GROUPS))
-                .withPseudoClass(MATCHING_SEARCH_NOT_GROUPS, entry -> entry.matchCategory().isEqualTo(MatchCategory.MATCHING_SEARCH_NOT_GROUPS))
-                .withPseudoClass(MATCHING_GROUPS_NOT_SEARCH, entry -> entry.matchCategory().isEqualTo(MatchCategory.MATCHING_GROUPS_NOT_SEARCH))
-                .withPseudoClass(NOT_MATCHING_SEARCH_AND_GROUPS, entry -> entry.matchCategory().isEqualTo(MatchCategory.NOT_MATCHING_SEARCH_AND_GROUPS))
+                .withOnMouseClickedEvent(
+                        (entry, event) -> {
+                            if (event.getClickCount() == 2) {
+                                libraryTab.showAndEdit(entry.getEntry());
+                            }
+                        })
+                .withContextMenu(
+                        entry ->
+                                RightClickMenu.create(
+                                        entry,
+                                        keyBindingRepository,
+                                        libraryTab,
+                                        dialogService,
+                                        stateManager,
+                                        preferences,
+                                        undoManager,
+                                        clipBoardManager,
+                                        taskExecutor,
+                                        Injector.instantiateModelOrService(
+                                                JournalAbbreviationRepository.class),
+                                        entryTypesManager))
+                .withPseudoClass(
+                        MATCHING_SEARCH_AND_GROUPS,
+                        entry ->
+                                entry.matchCategory()
+                                        .isEqualTo(MatchCategory.MATCHING_SEARCH_AND_GROUPS))
+                .withPseudoClass(
+                        MATCHING_SEARCH_NOT_GROUPS,
+                        entry ->
+                                entry.matchCategory()
+                                        .isEqualTo(MatchCategory.MATCHING_SEARCH_NOT_GROUPS))
+                .withPseudoClass(
+                        MATCHING_GROUPS_NOT_SEARCH,
+                        entry ->
+                                entry.matchCategory()
+                                        .isEqualTo(MatchCategory.MATCHING_GROUPS_NOT_SEARCH))
+                .withPseudoClass(
+                        NOT_MATCHING_SEARCH_AND_GROUPS,
+                        entry ->
+                                entry.matchCategory()
+                                        .isEqualTo(MatchCategory.NOT_MATCHING_SEARCH_AND_GROUPS))
                 .setOnDragDetected(this::handleOnDragDetected)
                 .setOnDragDropped(this::handleOnDragDropped)
                 .setOnDragOver(this::handleOnDragOver)
@@ -158,23 +189,36 @@ public MainTable(MainTableDataModel model,
 
         this.getSortOrder().clear();
 
-        // force match category column to be the first sort order, (match_category column is always the first column)
+        // force match category column to be the first sort order, (match_category column is always
+        // the first column)
         this.getSortOrder().addFirst(getColumns().getFirst());
-        this.getSortOrder().addListener((ListChangeListener<TableColumn<BibEntryTableViewModel, ?>>) change -> {
-                if (!this.getSortOrder().getFirst().equals(getColumns().getFirst())) {
-                    this.getSortOrder().addFirst(getColumns().getFirst());
-                }
-            });
-
-        mainTablePreferences.getColumnPreferences().getColumnSortOrder().forEach(columnModel ->
-                this.getColumns().stream()
-                    .map(column -> (MainTableColumn<?>) column)
-                    .filter(column -> column.getModel().equals(columnModel))
-                    .findFirst()
-                    .ifPresent(column -> {
-                        LOGGER.trace("Adding sort order for col {} ", column);
-                        this.getSortOrder().add(column);
-                    }));
+        this.getSortOrder()
+                .addListener(
+                        (ListChangeListener<TableColumn<BibEntryTableViewModel, ?>>)
+                                change -> {
+                                    if (!this.getSortOrder()
+                                            .getFirst()
+                                            .equals(getColumns().getFirst())) {
+                                        this.getSortOrder().addFirst(getColumns().getFirst());
+                                    }
+                                });
+
+        mainTablePreferences
+                .getColumnPreferences()
+                .getColumnSortOrder()
+                .forEach(
+                        columnModel ->
+                                this.getColumns().stream()
+                                        .map(column -> (MainTableColumn<?>) column)
+                                        .filter(column -> column.getModel().equals(columnModel))
+                                        .findFirst()
+                                        .ifPresent(
+                                                column -> {
+                                                    LOGGER.trace(
+                                                            "Adding sort order for col {} ",
+                                                            column);
+                                                    this.getSortOrder().add(column);
+                                                }));
 
         if (mainTablePreferences.getResizeColumnsToFit()) {
             this.setColumnResizePolicy(new SmartConstrainedResizePolicy());
@@ -188,22 +232,25 @@ public MainTable(MainTableDataModel model,
         model.getEntriesFilteredAndSorted().comparatorProperty().bind(this.comparatorProperty());
 
         // Store visual state
-        new PersistenceVisualStateTable(this, mainTablePreferences.getColumnPreferences()).addListeners();
+        new PersistenceVisualStateTable(this, mainTablePreferences.getColumnPreferences())
+                .addListeners();
 
         setupKeyBindings(keyBindingRepository);
 
-        this.setOnKeyTyped(key -> {
-            if (this.getSortOrder().size() <= 1) {
-                return;
-            }
-            // skip match category column
-            this.jumpToSearchKey(getSortOrder().get(1), key);
-        });
+        this.setOnKeyTyped(
+                key -> {
+                    if (this.getSortOrder().size() <= 1) {
+                        return;
+                    }
+                    // skip match category column
+                    this.jumpToSearchKey(getSortOrder().get(1), key);
+                });
 
         database.getDatabase().registerListener(this);
 
         // Enable the header right-click menu.
-        new MainTableHeaderContextMenu(this, mainTableColumnFactory, tabContainer, dialogService).show(true);
+        new MainTableHeaderContextMenu(this, mainTableColumnFactory, tabContainer, dialogService)
+                .show(true);
     }
 
     /**
@@ -213,8 +260,12 @@ public MainTable(MainTableDataModel model,
      * @param sortedColumn The sorted column in {@link MainTable}
      * @param keyEvent     The pressed character
      */
-    private void jumpToSearchKey(TableColumn<BibEntryTableViewModel, ?> sortedColumn, KeyEvent keyEvent) {
-        if (keyEvent.isAltDown() || keyEvent.isControlDown() || keyEvent.isMetaDown() || keyEvent.isShiftDown()) {
+    private void jumpToSearchKey(
+            TableColumn<BibEntryTableViewModel, ?> sortedColumn, KeyEvent keyEvent) {
+        if (keyEvent.isAltDown()
+                || keyEvent.isControlDown()
+                || keyEvent.isMetaDown()
+                || keyEvent.isShiftDown()) {
             return;
         }
         if ((keyEvent.getCharacter() == null) || (sortedColumn == null)) {
@@ -230,17 +281,23 @@ private void jumpToSearchKey(TableColumn<BibEntryTableViewModel, ?> sortedColumn
         lastKeyPressTime = System.currentTimeMillis();
 
         this.getItems().stream()
-            .filter(item -> Optional.ofNullable(sortedColumn.getCellObservableValue(item).getValue())
-                                    .map(Object::toString)
-                                    .orElse("")
-                                    .toLowerCase()
-                                    .startsWith(columnSearchTerm))
-            .findFirst()
-            .ifPresent(item -> {
-                getSelectionModel().clearSelection();
-                getSelectionModel().select(item);
-                scrollTo(item);
-            });
+                .filter(
+                        item ->
+                                Optional.ofNullable(
+                                                sortedColumn
+                                                        .getCellObservableValue(item)
+                                                        .getValue())
+                                        .map(Object::toString)
+                                        .orElse("")
+                                        .toLowerCase()
+                                        .startsWith(columnSearchTerm))
+                .findFirst()
+                .ifPresent(
+                        item -> {
+                            getSelectionModel().clearSelection();
+                            getSelectionModel().select(item);
+                            scrollTo(item);
+                        });
     }
 
     @Subscribe
@@ -250,10 +307,12 @@ public void listen(EntriesAddedEvent event) {
 
     public void clearAndSelect(BibEntry bibEntry) {
         getSelectionModel().clearSelection();
-        findEntry(bibEntry).ifPresent(entry -> {
-            getSelectionModel().select(entry);
-            scrollTo(entry);
-        });
+        findEntry(bibEntry)
+                .ifPresent(
+                        entry -> {
+                            getSelectionModel().select(entry);
+                            scrollTo(entry);
+                        });
     }
 
     private void scrollToNextMatchCategory() {
@@ -296,60 +355,67 @@ private void scrollToPreviousMatchCategory() {
     }
 
     private void setupKeyBindings(KeyBindingRepository keyBindings) {
-        EditAction pasteAction = new EditAction(StandardActions.PASTE, () -> libraryTab, stateManager, undoManager);
-        EditAction copyAction = new EditAction(StandardActions.COPY, () -> libraryTab, stateManager, undoManager);
-        EditAction cutAction = new EditAction(StandardActions.CUT, () -> libraryTab, stateManager, undoManager);
-        EditAction deleteAction = new EditAction(StandardActions.DELETE_ENTRY, () -> libraryTab, stateManager, undoManager);
-
-        this.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            if (event.getCode() == KeyCode.ENTER) {
-                getSelectedEntries().stream()
-                                    .findFirst()
-                                    .ifPresent(libraryTab::showAndEdit);
-                event.consume();
-                return;
-            }
-
-            Optional<KeyBinding> keyBinding = keyBindings.mapToKeyBinding(event);
-            if (keyBinding.isPresent()) {
-                switch (keyBinding.get()) {
-                    case SELECT_FIRST_ENTRY:
-                        clearAndSelectFirst();
+        EditAction pasteAction =
+                new EditAction(StandardActions.PASTE, () -> libraryTab, stateManager, undoManager);
+        EditAction copyAction =
+                new EditAction(StandardActions.COPY, () -> libraryTab, stateManager, undoManager);
+        EditAction cutAction =
+                new EditAction(StandardActions.CUT, () -> libraryTab, stateManager, undoManager);
+        EditAction deleteAction =
+                new EditAction(
+                        StandardActions.DELETE_ENTRY, () -> libraryTab, stateManager, undoManager);
+
+        this.addEventFilter(
+                KeyEvent.KEY_PRESSED,
+                event -> {
+                    if (event.getCode() == KeyCode.ENTER) {
+                        getSelectedEntries().stream()
+                                .findFirst()
+                                .ifPresent(libraryTab::showAndEdit);
                         event.consume();
-                        break;
-                    case SELECT_LAST_ENTRY:
-                        clearAndSelectLast();
-                        event.consume();
-                        break;
-                    case PASTE:
-                        pasteAction.execute();
-                        event.consume();
-                        break;
-                    case COPY:
-                        copyAction.execute();
-                        event.consume();
-                        break;
-                    case CUT:
-                        cutAction.execute();
-                        event.consume();
-                        break;
-                    case DELETE_ENTRY:
-                        deleteAction.execute();
-                        event.consume();
-                        break;
-                    case SCROLL_TO_NEXT_MATCH_CATEGORY:
-                        scrollToNextMatchCategory();
-                        event.consume();
-                        break;
-                    case SCROLL_TO_PREVIOUS_MATCH_CATEGORY:
-                         scrollToPreviousMatchCategory();
-                        event.consume();
-                        break;
-                    default:
-                        // Pass other keys to parent
-                }
-            }
-        });
+                        return;
+                    }
+
+                    Optional<KeyBinding> keyBinding = keyBindings.mapToKeyBinding(event);
+                    if (keyBinding.isPresent()) {
+                        switch (keyBinding.get()) {
+                            case SELECT_FIRST_ENTRY:
+                                clearAndSelectFirst();
+                                event.consume();
+                                break;
+                            case SELECT_LAST_ENTRY:
+                                clearAndSelectLast();
+                                event.consume();
+                                break;
+                            case PASTE:
+                                pasteAction.execute();
+                                event.consume();
+                                break;
+                            case COPY:
+                                copyAction.execute();
+                                event.consume();
+                                break;
+                            case CUT:
+                                cutAction.execute();
+                                event.consume();
+                                break;
+                            case DELETE_ENTRY:
+                                deleteAction.execute();
+                                event.consume();
+                                break;
+                            case SCROLL_TO_NEXT_MATCH_CATEGORY:
+                                scrollToNextMatchCategory();
+                                event.consume();
+                                break;
+                            case SCROLL_TO_PREVIOUS_MATCH_CATEGORY:
+                                scrollToPreviousMatchCategory();
+                                event.consume();
+                                break;
+                            default:
+                                // Pass other keys to parent
+                        }
+                    }
+                });
     }
 
     public void clearAndSelectFirst() {
@@ -364,7 +430,8 @@ private void clearAndSelectLast() {
         scrollTo(getItems().size() - 1);
     }
 
-    private void handleOnDragOver(TableRow<BibEntryTableViewModel> row, BibEntryTableViewModel item, DragEvent event) {
+    private void handleOnDragOver(
+            TableRow<BibEntryTableViewModel> row, BibEntryTableViewModel item, DragEvent event) {
         if (event.getDragboard().hasFiles()) {
             event.acceptTransferModes(TransferMode.ANY);
             ControlHelper.setDroppingPseudoClasses(row, event);
@@ -379,28 +446,44 @@ private void handleOnDragOverTableView(DragEvent event) {
         event.consume();
     }
 
-    private void handleOnDragEntered(TableRow<BibEntryTableViewModel> row, BibEntryTableViewModel entry, MouseDragEvent event) {
-        // Support the following gesture to select entries: click on one row -> hold mouse button -> move over other rows
-        // We need to select all items between the starting row and the row where the user currently hovers the mouse over
-        // It is not enough to just select the currently hovered row since then sometimes rows are not marked selected if the user moves to fast
+    private void handleOnDragEntered(
+            TableRow<BibEntryTableViewModel> row,
+            BibEntryTableViewModel entry,
+            MouseDragEvent event) {
+        // Support the following gesture to select entries: click on one row -> hold mouse button ->
+        // move over other rows
+        // We need to select all items between the starting row and the row where the user currently
+        // hovers the mouse over
+        // It is not enough to just select the currently hovered row since then sometimes rows are
+        // not marked selected if the user moves to fast
         @SuppressWarnings("unchecked")
-        TableRow<BibEntryTableViewModel> sourceRow = (TableRow<BibEntryTableViewModel>) event.getGestureSource();
+        TableRow<BibEntryTableViewModel> sourceRow =
+                (TableRow<BibEntryTableViewModel>) event.getGestureSource();
         getSelectionModel().selectRange(sourceRow.getIndex(), row.getIndex());
     }
 
-    private void handleOnDragExited(TableRow<BibEntryTableViewModel> row, BibEntryTableViewModel entry, DragEvent dragEvent) {
+    private void handleOnDragExited(
+            TableRow<BibEntryTableViewModel> row,
+            BibEntryTableViewModel entry,
+            DragEvent dragEvent) {
         ControlHelper.removeDroppingPseudoClasses(row);
     }
 
-    private void handleOnDragDetected(TableRow<BibEntryTableViewModel> row, BibEntryTableViewModel entry, MouseEvent event) {
+    private void handleOnDragDetected(
+            TableRow<BibEntryTableViewModel> row, BibEntryTableViewModel entry, MouseEvent event) {
         // Start drag'n'drop
         row.startFullDrag();
 
-        List<BibEntry> entries = getSelectionModel().getSelectedItems().stream().map(BibEntryTableViewModel::getEntry).collect(Collectors.toList());
+        List<BibEntry> entries =
+                getSelectionModel().getSelectedItems().stream()
+                        .map(BibEntryTableViewModel::getEntry)
+                        .collect(Collectors.toList());
 
         ClipboardContent content;
         try {
-            content = clipboardContentGenerator.generate(entries, CitationStyleOutputFormat.HTML, database);
+            content =
+                    clipboardContentGenerator.generate(
+                            entries, CitationStyleOutputFormat.HTML, database);
         } catch (IOException e) {
             LOGGER.warn("Could not generate clipboard content. Falling back to empty clipboard", e);
             content = new ClipboardContent();
@@ -419,18 +502,25 @@ private void handleOnDragDetected(TableRow<BibEntryTableViewModel> row, BibEntry
         event.consume();
     }
 
-    private void handleOnDragDropped(TableRow<BibEntryTableViewModel> row, BibEntryTableViewModel target, DragEvent event) {
+    private void handleOnDragDropped(
+            TableRow<BibEntryTableViewModel> row, BibEntryTableViewModel target, DragEvent event) {
         boolean success = false;
 
         if (event.getDragboard().hasFiles()) {
-            List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).collect(Collectors.toList());
+            List<Path> files =
+                    event.getDragboard().getFiles().stream()
+                            .map(File::toPath)
+                            .collect(Collectors.toList());
 
             // Different actions depending on where the user releases the drop in the target row
             // Bottom + top -> import entries
             // Center -> link files to entry
             // Depending on the pressed modifier, move/copy/link files to drop target
             switch (ControlHelper.getDroppingMouseLocation(row, event)) {
-                case TOP, BOTTOM -> importHandler.importFilesInBackground(files, database, filePreferences).executeWith(taskExecutor);
+                case TOP, BOTTOM ->
+                        importHandler
+                                .importFilesInBackground(files, database, filePreferences)
+                                .executeWith(taskExecutor);
                 case CENTER -> {
                     BibEntry entry = target.getEntry();
                     switch (event.getTransferMode()) {
@@ -440,11 +530,17 @@ private void handleOnDragDropped(TableRow<BibEntryTableViewModel> row, BibEntryT
                         }
                         case MOVE -> {
                             LOGGER.debug("Mode MOVE"); // alt on win
-                            importHandler.getLinker().moveFilesToFileDirRenameAndAddToEntry(entry, files, libraryTab.getLuceneManager());
+                            importHandler
+                                    .getLinker()
+                                    .moveFilesToFileDirRenameAndAddToEntry(
+                                            entry, files, libraryTab.getLuceneManager());
                         }
                         case COPY -> {
                             LOGGER.debug("Mode Copy"); // ctrl on win
-                            importHandler.getLinker().copyFilesToFileDirAndAddToEntry(entry, files, libraryTab.getLuceneManager());
+                            importHandler
+                                    .getLinker()
+                                    .copyFilesToFileDirAndAddToEntry(
+                                            entry, files, libraryTab.getLuceneManager());
                         }
                     }
                 }
@@ -462,7 +558,9 @@ private void handleOnDragDroppedTableView(DragEvent event) {
 
         if (event.getDragboard().hasFiles()) {
             List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).toList();
-            importHandler.importFilesInBackground(files, this.database, filePreferences).executeWith(taskExecutor);
+            importHandler
+                    .importFilesInBackground(files, this.database, filePreferences)
+                    .executeWith(taskExecutor);
             success = true;
         }
 
@@ -479,17 +577,14 @@ public MainTableDataModel getTableModel() {
     }
 
     public List<BibEntry> getSelectedEntries() {
-        return getSelectionModel()
-                .getSelectedItems()
-                .stream()
+        return getSelectionModel().getSelectedItems().stream()
                 .map(BibEntryTableViewModel::getEntry)
                 .collect(Collectors.toList());
     }
 
     private Optional<BibEntryTableViewModel> findEntry(BibEntry entry) {
-        return model.getEntriesFilteredAndSorted()
-                    .stream()
-                    .filter(viewModel -> viewModel.getEntry().equals(entry))
-                    .findFirst();
+        return model.getEntriesFilteredAndSorted().stream()
+                .filter(viewModel -> viewModel.getEntry().equals(entry))
+                .findFirst();
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
index bd592f6b22ca..98b63627d19d 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
@@ -1,13 +1,6 @@
 package org.jabref.gui.maintable;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.geometry.Insets;
@@ -45,11 +38,18 @@
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.groups.AbstractGroup;
-
-import com.airhacks.afterburner.injection.Injector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
+
 public class MainTableColumnFactory {
 
     public static final String STYLE_ICON_COLUMN = "column-icon";
@@ -65,13 +65,14 @@ public class MainTableColumnFactory {
     private final StateManager stateManager;
     private final MainTableTooltip tooltip;
 
-    public MainTableColumnFactory(BibDatabaseContext database,
-                                  GuiPreferences preferences,
-                                  ColumnPreferences abstractColumnPrefs,
-                                  UndoManager undoManager,
-                                  DialogService dialogService,
-                                  StateManager stateManager,
-                                  TaskExecutor taskExecutor) {
+    public MainTableColumnFactory(
+            BibDatabaseContext database,
+            GuiPreferences preferences,
+            ColumnPreferences abstractColumnPrefs,
+            UndoManager undoManager,
+            DialogService dialogService,
+            StateManager stateManager,
+            TaskExecutor taskExecutor) {
         this.database = Objects.requireNonNull(database);
         this.preferences = Objects.requireNonNull(preferences);
         this.columnPreferences = abstractColumnPrefs;
@@ -81,7 +82,9 @@ public MainTableColumnFactory(BibDatabaseContext database,
         this.undoManager = undoManager;
         this.stateManager = stateManager;
         ThemeManager themeManager = Injector.instantiateModelOrService(ThemeManager.class);
-        this.tooltip = new MainTableTooltip(database, dialogService, preferences, themeManager, taskExecutor);
+        this.tooltip =
+                new MainTableTooltip(
+                        database, dialogService, preferences, themeManager, taskExecutor);
     }
 
     public TableColumn<BibEntryTableViewModel, ?> createColumn(MainTableColumnModel column) {
@@ -119,7 +122,9 @@ public MainTableColumnFactory(BibDatabaseContext database,
                     if (field instanceof SpecialField) {
                         returnColumn = createSpecialFieldColumn(column);
                     } else {
-                        LOGGER.warn("Special field type '{}' is unknown. Using normal column type.", column.getQualifier());
+                        LOGGER.warn(
+                                "Special field type '{}' is unknown. Using normal column type.",
+                                column.getQualifier());
                         returnColumn = createFieldColumn(column, tooltip);
                     }
                 }
@@ -137,7 +142,9 @@ public MainTableColumnFactory(BibDatabaseContext database,
     public List<TableColumn<BibEntryTableViewModel, ?>> createColumns() {
         List<TableColumn<BibEntryTableViewModel, ?>> columns = new ArrayList<>();
 
-        columns.add(createMatchCategoryColumn(new MainTableColumnModel(MainTableColumnModel.Type.MATCH_CATEGORY)));
+        columns.add(
+                createMatchCategoryColumn(
+                        new MainTableColumnModel(MainTableColumnModel.Type.MATCH_CATEGORY)));
         columnPreferences.getColumns().forEach(column -> columns.add(createColumn(column)));
         return columns;
     }
@@ -154,8 +161,10 @@ public static void setExactWidth(TableColumn<?, ?> column, double width) {
      * in the floating mode. The order of the {@link MatchCategory} enum constants
      * determines the sorting order.</p>
      */
-    private TableColumn<BibEntryTableViewModel, MatchCategory> createMatchCategoryColumn(MainTableColumnModel columnModel) {
-        TableColumn<BibEntryTableViewModel, MatchCategory> column = new MainTableColumn<>(columnModel);
+    private TableColumn<BibEntryTableViewModel, MatchCategory> createMatchCategoryColumn(
+            MainTableColumnModel columnModel) {
+        TableColumn<BibEntryTableViewModel, MatchCategory> column =
+                new MainTableColumn<>(columnModel);
         column.setCellValueFactory(cellData -> cellData.getValue().matchCategory());
         column.setSortable(true);
         column.setSortType(TableColumn.SortType.ASCENDING);
@@ -163,33 +172,45 @@ private TableColumn<BibEntryTableViewModel, MatchCategory> createMatchCategoryCo
         return column;
     }
 
-    private TableColumn<BibEntryTableViewModel, Number> createScoreColumn(MainTableColumnModel columnModel) {
+    private TableColumn<BibEntryTableViewModel, Number> createScoreColumn(
+            MainTableColumnModel columnModel) {
         TableColumn<BibEntryTableViewModel, Number> column = new MainTableColumn<>(columnModel);
         Node header = new Text(Localization.lang("Score"));
         header.getStyleClass().add("mainTable-header");
-        Tooltip.install(header, new Tooltip(MainTableColumnModel.Type.MATCH_SCORE.getDisplayName()));
+        Tooltip.install(
+                header, new Tooltip(MainTableColumnModel.Type.MATCH_SCORE.getDisplayName()));
         column.setGraphic(header);
         column.setStyle("-fx-alignment: CENTER-RIGHT;");
         column.setCellValueFactory(cellData -> cellData.getValue().searchScoreProperty());
-        new ValueTableCellFactory<BibEntryTableViewModel, Number>().withText(String::valueOf).install(column);
+        new ValueTableCellFactory<BibEntryTableViewModel, Number>()
+                .withText(String::valueOf)
+                .install(column);
         column.setSortable(true);
         column.setReorderable(false);
-        column.visibleProperty().bind(stateManager.activeSearchQuery(SearchType.NORMAL_SEARCH).isPresent());
+        column.visibleProperty()
+                .bind(stateManager.activeSearchQuery(SearchType.NORMAL_SEARCH).isPresent());
         return column;
     }
 
     /**
      * Creates a column with a continuous number
      */
-    private TableColumn<BibEntryTableViewModel, String> createIndexColumn(MainTableColumnModel columnModel) {
+    private TableColumn<BibEntryTableViewModel, String> createIndexColumn(
+            MainTableColumnModel columnModel) {
         TableColumn<BibEntryTableViewModel, String> column = new MainTableColumn<>(columnModel);
         Node header = new Text("#");
         header.getStyleClass().add("mainTable-header");
         Tooltip.install(header, new Tooltip(MainTableColumnModel.Type.INDEX.getDisplayName()));
         column.setGraphic(header);
         column.setStyle("-fx-alignment: CENTER-RIGHT;");
-        column.setCellValueFactory(cellData -> new ReadOnlyObjectWrapper<>(
-                String.valueOf(cellData.getTableView().getItems().indexOf(cellData.getValue()) + 1)));
+        column.setCellValueFactory(
+                cellData ->
+                        new ReadOnlyObjectWrapper<>(
+                                String.valueOf(
+                                        cellData.getTableView()
+                                                        .getItems()
+                                                        .indexOf(cellData.getValue())
+                                                + 1)));
         new ValueTableCellFactory<BibEntryTableViewModel, String>()
                 .withText(text -> text)
                 .install(column);
@@ -200,8 +221,10 @@ private TableColumn<BibEntryTableViewModel, String> createIndexColumn(MainTableC
     /**
      * Creates a column for group color bars.
      */
-    private TableColumn<BibEntryTableViewModel, ?> createGroupColumn(MainTableColumnModel columnModel) {
-        TableColumn<BibEntryTableViewModel, List<AbstractGroup>> column = new MainTableColumn<>(columnModel);
+    private TableColumn<BibEntryTableViewModel, ?> createGroupColumn(
+            MainTableColumnModel columnModel) {
+        TableColumn<BibEntryTableViewModel, List<AbstractGroup>> column =
+                new MainTableColumn<>(columnModel);
         Node headerGraphic = IconTheme.JabRefIcons.DEFAULT_GROUP_ICON.getGraphicNode();
         Tooltip.install(headerGraphic, new Tooltip(Localization.lang("Group color")));
         column.setGraphic(headerGraphic);
@@ -220,10 +243,13 @@ private TableColumn<BibEntryTableViewModel, String> createIndexColumn(MainTableC
     /**
      * Creates a column for group icons
      */
-    private TableColumn<BibEntryTableViewModel, ?> createGroupIconColumn(MainTableColumnModel columnModel) {
-        TableColumn<BibEntryTableViewModel, List<AbstractGroup>> column = new MainTableColumn<>(columnModel);
+    private TableColumn<BibEntryTableViewModel, ?> createGroupIconColumn(
+            MainTableColumnModel columnModel) {
+        TableColumn<BibEntryTableViewModel, List<AbstractGroup>> column =
+                new MainTableColumn<>(columnModel);
         Node headerGraphic = IconTheme.JabRefIcons.DEFAULT_GROUP_ICON_COLUMN.getGraphicNode();
-        Tooltip.install(headerGraphic, new Tooltip(MainTableColumnModel.Type.GROUP_ICONS.getDisplayName()));
+        Tooltip.install(
+                headerGraphic, new Tooltip(MainTableColumnModel.Type.GROUP_ICONS.getDisplayName()));
         column.setGraphic(headerGraphic);
         column.getStyleClass().add(STYLE_ICON_COLUMN);
         column.setResizable(true);
@@ -236,10 +262,10 @@ private TableColumn<BibEntryTableViewModel, String> createIndexColumn(MainTableC
         return column;
     }
 
-    private Node createGroupColorRegion(BibEntryTableViewModel entry, List<AbstractGroup> matchedGroups) {
-        List<Color> groupColors = matchedGroups.stream()
-                                               .flatMap(group -> group.getColor().stream())
-                                               .toList();
+    private Node createGroupColorRegion(
+            BibEntryTableViewModel entry, List<AbstractGroup> matchedGroups) {
+        List<Color> groupColors =
+                matchedGroups.stream().flatMap(group -> group.getColor().stream()).toList();
 
         if (!groupColors.isEmpty()) {
             HBox container = new HBox();
@@ -248,33 +274,48 @@ private Node createGroupColorRegion(BibEntryTableViewModel entry, List<AbstractG
             container.setAlignment(Pos.CENTER_LEFT);
             container.setPadding(new Insets(0, 2, 0, 2));
 
-            groupColors.stream().distinct().forEach(groupColor -> {
-                Rectangle groupRectangle = new Rectangle();
-                groupRectangle.getStyleClass().add("groupColumnBackground");
-                groupRectangle.setWidth(3);
-                groupRectangle.setHeight(18);
-                groupRectangle.setFill(groupColor);
-                groupRectangle.setStrokeWidth(1);
-                container.getChildren().add(groupRectangle);
-            });
+            groupColors.stream()
+                    .distinct()
+                    .forEach(
+                            groupColor -> {
+                                Rectangle groupRectangle = new Rectangle();
+                                groupRectangle.getStyleClass().add("groupColumnBackground");
+                                groupRectangle.setWidth(3);
+                                groupRectangle.setHeight(18);
+                                groupRectangle.setFill(groupColor);
+                                groupRectangle.setStrokeWidth(1);
+                                container.getChildren().add(groupRectangle);
+                            });
 
-            String matchedGroupsString = matchedGroups.stream()
-                                                      .distinct()
-                                                      .map(AbstractGroup::getName)
-                                                      .collect(Collectors.joining(", "));
-            Tooltip tooltip = new Tooltip(Localization.lang("Entry is contained in the following groups:") + "\n" + matchedGroupsString);
+            String matchedGroupsString =
+                    matchedGroups.stream()
+                            .distinct()
+                            .map(AbstractGroup::getName)
+                            .collect(Collectors.joining(", "));
+            Tooltip tooltip =
+                    new Tooltip(
+                            Localization.lang("Entry is contained in the following groups:")
+                                    + "\n"
+                                    + matchedGroupsString);
             Tooltip.install(container, tooltip);
             return container;
         }
         return new Pane();
     }
 
-    private Node createGroupIconRegion(BibEntryTableViewModel entry, List<AbstractGroup> matchedGroups) {
-        List<JabRefIcon> groupIcons = matchedGroups.stream()
-                                                   .filter(abstractGroup -> abstractGroup.getIconName().isPresent())
-                                                   .flatMap(group -> IconTheme.findIcon(group.getIconName().get(), group.getColor().orElse(IconTheme.getDefaultGroupColor())).stream()
-                                                   )
-                                                   .toList();
+    private Node createGroupIconRegion(
+            BibEntryTableViewModel entry, List<AbstractGroup> matchedGroups) {
+        List<JabRefIcon> groupIcons =
+                matchedGroups.stream()
+                        .filter(abstractGroup -> abstractGroup.getIconName().isPresent())
+                        .flatMap(
+                                group ->
+                                        IconTheme.findIcon(
+                                                group.getIconName().get(),
+                                                group.getColor()
+                                                        .orElse(IconTheme.getDefaultGroupColor()))
+                                                .stream())
+                        .toList();
         if (!groupIcons.isEmpty()) {
             HBox container = new HBox();
             container.setSpacing(2);
@@ -282,15 +323,23 @@ private Node createGroupIconRegion(BibEntryTableViewModel entry, List<AbstractGr
             container.setAlignment(Pos.CENTER_LEFT);
             container.setPadding(new Insets(0, 2, 0, 2));
 
-            groupIcons.stream().distinct().forEach(groupIcon -> {
-                container.getChildren().add(groupIcon.getGraphicNode());
-            });
+            groupIcons.stream()
+                    .distinct()
+                    .forEach(
+                            groupIcon -> {
+                                container.getChildren().add(groupIcon.getGraphicNode());
+                            });
 
-            String matchedGroupsString = matchedGroups.stream()
-                                                      .distinct()
-                                                      .map(AbstractGroup::getName)
-                                                      .collect(Collectors.joining(", "));
-            Tooltip tooltip = new Tooltip(Localization.lang("Entry is contained in the following groups:") + "\n" + matchedGroupsString);
+            String matchedGroupsString =
+                    matchedGroups.stream()
+                            .distinct()
+                            .map(AbstractGroup::getName)
+                            .collect(Collectors.joining(", "));
+            Tooltip tooltip =
+                    new Tooltip(
+                            Localization.lang("Entry is contained in the following groups:")
+                                    + "\n"
+                                    + matchedGroupsString);
             Tooltip.install(container, tooltip);
             return container;
         }
@@ -300,21 +349,25 @@ private Node createGroupIconRegion(BibEntryTableViewModel entry, List<AbstractGr
     /**
      * Creates a text column to display any standard field.
      */
-    private TableColumn<BibEntryTableViewModel, ?> createFieldColumn(MainTableColumnModel columnModel, MainTableTooltip tooltip) {
+    private TableColumn<BibEntryTableViewModel, ?> createFieldColumn(
+            MainTableColumnModel columnModel, MainTableTooltip tooltip) {
         return new FieldColumn(columnModel, tooltip);
     }
 
     /**
      * Creates a clickable icons column for DOIs, URLs, URIs and EPrints.
      */
-    private TableColumn<BibEntryTableViewModel, Map<Field, String>> createIdentifierColumn(MainTableColumnModel columnModel) {
-        return new LinkedIdentifierColumn(columnModel, cellFactory, database, dialogService, preferences, stateManager);
+    private TableColumn<BibEntryTableViewModel, Map<Field, String>> createIdentifierColumn(
+            MainTableColumnModel columnModel) {
+        return new LinkedIdentifierColumn(
+                columnModel, cellFactory, database, dialogService, preferences, stateManager);
     }
 
     /**
      * Creates a column that displays a {@link SpecialField}
      */
-    private TableColumn<BibEntryTableViewModel, Optional<SpecialFieldValueViewModel>> createSpecialFieldColumn(MainTableColumnModel columnModel) {
+    private TableColumn<BibEntryTableViewModel, Optional<SpecialFieldValueViewModel>>
+            createSpecialFieldColumn(MainTableColumnModel columnModel) {
         return new SpecialFieldColumn(columnModel, preferences, undoManager);
     }
 
@@ -322,19 +375,18 @@ private TableColumn<BibEntryTableViewModel, Optional<SpecialFieldValueViewModel>
      * Creates a column for all the linked files. Instead of creating a column for a single file type, like {@link
      * #createExtraFileColumn(MainTableColumnModel)} createExtraFileColumn} does, this creates one single column collecting all file links.
      */
-    private TableColumn<BibEntryTableViewModel, List<LinkedFile>> createFilesColumn(MainTableColumnModel columnModel) {
-        return new FileColumn(columnModel,
-                database,
-                dialogService,
-                preferences,
-                taskExecutor);
+    private TableColumn<BibEntryTableViewModel, List<LinkedFile>> createFilesColumn(
+            MainTableColumnModel columnModel) {
+        return new FileColumn(columnModel, database, dialogService, preferences, taskExecutor);
     }
 
     /**
      * Creates a column for all the linked files of a single file type.
      */
-    private TableColumn<BibEntryTableViewModel, List<LinkedFile>> createExtraFileColumn(MainTableColumnModel columnModel) {
-        return new FileColumn(columnModel,
+    private TableColumn<BibEntryTableViewModel, List<LinkedFile>> createExtraFileColumn(
+            MainTableColumnModel columnModel) {
+        return new FileColumn(
+                columnModel,
                 database,
                 dialogService,
                 preferences,
@@ -345,7 +397,8 @@ private TableColumn<BibEntryTableViewModel, List<LinkedFile>> createExtraFileCol
     /**
      * Create library column containing the Filename of the library's bib file
      */
-    private TableColumn<BibEntryTableViewModel, String> createLibraryColumn(MainTableColumnModel columnModel) {
+    private TableColumn<BibEntryTableViewModel, String> createLibraryColumn(
+            MainTableColumnModel columnModel) {
         return new LibraryColumn(columnModel);
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
index d0d5f7366dec..8a50913b1f56 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
@@ -1,10 +1,6 @@
 package org.jabref.gui.maintable;
 
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Objects;
-
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -20,11 +16,15 @@
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.metadata.SaveOrder;
-
-import com.airhacks.afterburner.injection.Injector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Objects;
+
+import javax.swing.undo.UndoManager;
+
 /**
  * Represents the full internal name of a column in the main table. Consists of two parts: The type of the column and a qualifier, like the
  * field name to be displayed in the column.
@@ -34,6 +34,7 @@ public class MainTableColumnModel {
     public static final Character COLUMNS_QUALIFIER_DELIMITER = ':';
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MainTableColumnModel.class);
+
     public enum Type {
         MATCH_CATEGORY("match_category"), // Not localized, because this column is always hidden
         MATCH_SCORE("match_score", Localization.lang("Match score")),
@@ -48,11 +49,12 @@ public enum Type {
         SPECIALFIELD("special", Localization.lang("Special")),
         LIBRARY_NAME("library", Localization.lang("Library"));
 
-
-        public static final EnumSet<Type> ICON_COLUMNS = EnumSet.of(EXTRAFILE, FILES, GROUPS, GROUP_ICONS, LINKED_IDENTIFIER);
+        public static final EnumSet<Type> ICON_COLUMNS =
+                EnumSet.of(EXTRAFILE, FILES, GROUPS, GROUP_ICONS, LINKED_IDENTIFIER);
 
         private final String name;
         private final String displayName;
+
         Type(String name) {
             this.name = name;
             this.displayName = name;
@@ -85,7 +87,8 @@ public static Type fromString(String text) {
     private final ObjectProperty<Type> typeProperty = new SimpleObjectProperty<>();
     private final StringProperty qualifierProperty = new SimpleStringProperty();
     private final DoubleProperty widthProperty = new SimpleDoubleProperty();
-    private final ObjectProperty<TableColumn.SortType> sortTypeProperty = new SimpleObjectProperty<>();
+    private final ObjectProperty<TableColumn.SortType> sortTypeProperty =
+            new SimpleObjectProperty<>();
 
     private final CliPreferences preferences;
     private final UndoManager undoManager;
@@ -147,19 +150,27 @@ public String getName() {
         if (qualifierProperty.getValue().isBlank()) {
             return typeProperty.getValue().getName();
         } else {
-            return typeProperty.getValue().getName() + COLUMNS_QUALIFIER_DELIMITER + qualifierProperty.getValue();
+            return typeProperty.getValue().getName()
+                    + COLUMNS_QUALIFIER_DELIMITER
+                    + qualifierProperty.getValue();
         }
     }
 
     public String getDisplayName() {
-        if ((Type.ICON_COLUMNS.contains(typeProperty.getValue()) && qualifierProperty.getValue().isBlank())
-                || (typeProperty.getValue() == Type.INDEX) || typeProperty.getValue() == Type.MATCH_SCORE) {
+        if ((Type.ICON_COLUMNS.contains(typeProperty.getValue())
+                        && qualifierProperty.getValue().isBlank())
+                || (typeProperty.getValue() == Type.INDEX)
+                || typeProperty.getValue() == Type.MATCH_SCORE) {
             return typeProperty.getValue().getDisplayName();
         } else {
-            // In case an OrField is used, `FieldFactory.parseField` returns UnknownField, which leads to
+            // In case an OrField is used, `FieldFactory.parseField` returns UnknownField, which
+            // leads to
             // "author/editor(Custom)" instead of "author/editor" in the output
 
-            return FieldsUtil.getNameWithType(FieldFactory.parseField(qualifierProperty.getValue()), preferences, undoManager);
+            return FieldsUtil.getNameWithType(
+                    FieldFactory.parseField(qualifierProperty.getValue()),
+                    preferences,
+                    undoManager);
         }
     }
 
@@ -234,11 +245,10 @@ public static MainTableColumnModel parse(String rawColumnName) {
         Type type = Type.fromString(splittedName[0]);
         String qualifier = "";
 
-        if ((type == Type.NORMALFIELD)
-                || (type == Type.SPECIALFIELD)
-                || (type == Type.EXTRAFILE)) {
+        if ((type == Type.NORMALFIELD) || (type == Type.SPECIALFIELD) || (type == Type.EXTRAFILE)) {
             if (splittedName.length == 1) {
-                qualifier = splittedName[0]; // By default the rawColumnName is parsed as NORMALFIELD
+                qualifier =
+                        splittedName[0]; // By default the rawColumnName is parsed as NORMALFIELD
             } else {
                 qualifier = splittedName[1];
             }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
index 5339d4220b76..a163f0266af4 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
@@ -1,7 +1,8 @@
 package org.jabref.gui.maintable;
 
-import java.util.List;
-import java.util.Optional;
+import com.google.common.eventbus.Subscribe;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.Subscription;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.IntegerProperty;
@@ -35,18 +36,18 @@
 import org.jabref.model.search.event.IndexStartedEvent;
 import org.jabref.model.search.matchers.MatcherSet;
 import org.jabref.model.search.matchers.MatcherSets;
-
-import com.google.common.eventbus.Subscribe;
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.Subscription;
 import org.jspecify.annotations.Nullable;
 
+import java.util.List;
+import java.util.Optional;
+
 public class MainTableDataModel {
 
     private final ObservableList<BibEntryTableViewModel> entriesViewModel;
     private final FilteredList<BibEntryTableViewModel> entriesFiltered;
     private final SortedList<BibEntryTableViewModel> entriesFilteredAndSorted;
-    private final ObjectProperty<MainTableFieldValueFormatter> fieldValueFormatter = new SimpleObjectProperty<>();
+    private final ObjectProperty<MainTableFieldValueFormatter> fieldValueFormatter =
+            new SimpleObjectProperty<>();
     private final GroupsPreferences groupsPreferences;
     private final SearchPreferences searchPreferences;
     private final NameDisplayPreferences nameDisplayPreferences;
@@ -63,14 +64,15 @@ public class MainTableDataModel {
 
     private Optional<MatcherSet> groupsMatcher;
 
-    public MainTableDataModel(BibDatabaseContext context,
-                              GuiPreferences preferences,
-                              TaskExecutor taskExecutor,
-                              StateManager stateManager,
-                              @Nullable LuceneManager luceneManager,
-                              ListProperty<GroupTreeNode> selectedGroupsProperty,
-                              OptionalObjectProperty<SearchQuery> searchQueryProperty,
-                              IntegerProperty resultSizeProperty) {
+    public MainTableDataModel(
+            BibDatabaseContext context,
+            GuiPreferences preferences,
+            TaskExecutor taskExecutor,
+            StateManager stateManager,
+            @Nullable LuceneManager luceneManager,
+            ListProperty<GroupTreeNode> selectedGroupsProperty,
+            OptionalObjectProperty<SearchQuery> searchQueryProperty,
+            IntegerProperty resultSizeProperty) {
         this.groupsPreferences = preferences.getGroupsPreferences();
         this.searchPreferences = preferences.getSearchPreferences();
         this.nameDisplayPreferences = preferences.getNameDisplayPreferences();
@@ -85,56 +87,93 @@ public MainTableDataModel(BibDatabaseContext context,
         this.bibDatabaseContext.getDatabase().registerListener(indexUpdatedListener);
         resetFieldFormatter();
 
-        ObservableList<BibEntry> allEntries = BindingsHelper.forUI(context.getDatabase().getEntries());
-        entriesViewModel = EasyBind.mapBacked(allEntries, entry -> new BibEntryTableViewModel(entry, bibDatabaseContext, fieldValueFormatter), false);
+        ObservableList<BibEntry> allEntries =
+                BindingsHelper.forUI(context.getDatabase().getEntries());
+        entriesViewModel =
+                EasyBind.mapBacked(
+                        allEntries,
+                        entry ->
+                                new BibEntryTableViewModel(
+                                        entry, bibDatabaseContext, fieldValueFormatter),
+                        false);
         entriesFiltered = new FilteredList<>(entriesViewModel, BibEntryTableViewModel::isVisible);
 
-        searchQuerySubscription = EasyBind.listen(searchQueryProperty, (observable, oldValue, newValue) -> updateSearchMatches(newValue));
-        searchDisplayModeSubscription = EasyBind.listen(searchPreferences.searchDisplayModeProperty(), (observable, oldValue, newValue) -> updateSearchDisplayMode(newValue));
-        selectedGroupsSubscription = EasyBind.listen(selectedGroupsProperty, (observable, oldValue, newValue) -> updateGroupMatches(newValue));
-        groupViewModeSubscription = EasyBind.listen(preferences.getGroupsPreferences().groupViewModeProperty(), observable -> updateGroupMatches(selectedGroupsProperty.get()));
+        searchQuerySubscription =
+                EasyBind.listen(
+                        searchQueryProperty,
+                        (observable, oldValue, newValue) -> updateSearchMatches(newValue));
+        searchDisplayModeSubscription =
+                EasyBind.listen(
+                        searchPreferences.searchDisplayModeProperty(),
+                        (observable, oldValue, newValue) -> updateSearchDisplayMode(newValue));
+        selectedGroupsSubscription =
+                EasyBind.listen(
+                        selectedGroupsProperty,
+                        (observable, oldValue, newValue) -> updateGroupMatches(newValue));
+        groupViewModeSubscription =
+                EasyBind.listen(
+                        preferences.getGroupsPreferences().groupViewModeProperty(),
+                        observable -> updateGroupMatches(selectedGroupsProperty.get()));
 
-        resultSizeProperty.bind(Bindings.size(entriesFiltered.filtered(entry -> entry.matchCategory().isEqualTo(MatchCategory.MATCHING_SEARCH_AND_GROUPS).get())));
+        resultSizeProperty.bind(
+                Bindings.size(
+                        entriesFiltered.filtered(
+                                entry ->
+                                        entry.matchCategory()
+                                                .isEqualTo(MatchCategory.MATCHING_SEARCH_AND_GROUPS)
+                                                .get())));
         // We need to wrap the list since otherwise sorting in the table does not work
         entriesFilteredAndSorted = new SortedList<>(entriesFiltered);
     }
 
     private void updateSearchMatches(Optional<SearchQuery> query) {
-        BackgroundTask.wrap(() -> {
-            if (query.isPresent()) {
-                SearchResults results = luceneManager.search(query.get());
-                setSearchMatches(results);
-            } else {
-                clearSearchMatches();
-            }
-        }).onSuccess(result -> FilteredListProxy.refilterListReflection(entriesFiltered)).executeWith(taskExecutor);
+        BackgroundTask.wrap(
+                        () -> {
+                            if (query.isPresent()) {
+                                SearchResults results = luceneManager.search(query.get());
+                                setSearchMatches(results);
+                            } else {
+                                clearSearchMatches();
+                            }
+                        })
+                .onSuccess(result -> FilteredListProxy.refilterListReflection(entriesFiltered))
+                .executeWith(taskExecutor);
     }
 
     private void setSearchMatches(SearchResults results) {
-        boolean isFloatingMode = searchPreferences.getSearchDisplayMode() == SearchDisplayMode.FLOAT;
-        entriesViewModel.forEach(entry -> {
-            entry.searchScoreProperty().set(results.getSearchScoreForEntry(entry.getEntry()));
-            entry.hasFullTextResultsProperty().set(results.hasFulltextResults(entry.getEntry()));
-            updateEntrySearchMatch(entry, entry.searchScoreProperty().get() > 0, isFloatingMode);
-        });
+        boolean isFloatingMode =
+                searchPreferences.getSearchDisplayMode() == SearchDisplayMode.FLOAT;
+        entriesViewModel.forEach(
+                entry -> {
+                    entry.searchScoreProperty()
+                            .set(results.getSearchScoreForEntry(entry.getEntry()));
+                    entry.hasFullTextResultsProperty()
+                            .set(results.hasFulltextResults(entry.getEntry()));
+                    updateEntrySearchMatch(
+                            entry, entry.searchScoreProperty().get() > 0, isFloatingMode);
+                });
     }
 
     private void clearSearchMatches() {
-        boolean isFloatingMode = searchPreferences.getSearchDisplayMode() == SearchDisplayMode.FLOAT;
-        entriesViewModel.forEach(entry -> {
-            entry.searchScoreProperty().set(0);
-            entry.hasFullTextResultsProperty().set(false);
-            updateEntrySearchMatch(entry, true, isFloatingMode);
-        });
+        boolean isFloatingMode =
+                searchPreferences.getSearchDisplayMode() == SearchDisplayMode.FLOAT;
+        entriesViewModel.forEach(
+                entry -> {
+                    entry.searchScoreProperty().set(0);
+                    entry.hasFullTextResultsProperty().set(false);
+                    updateEntrySearchMatch(entry, true, isFloatingMode);
+                });
     }
 
-    private static void updateEntrySearchMatch(BibEntryTableViewModel entry, boolean isMatched, boolean isFloatingMode) {
+    private static void updateEntrySearchMatch(
+            BibEntryTableViewModel entry, boolean isMatched, boolean isFloatingMode) {
         entry.isMatchedBySearch().set(isMatched);
         entry.updateMatchCategory();
         setEntrySearchVisibility(entry, isMatched, isFloatingMode);
     }
 
-    private static void setEntrySearchVisibility(BibEntryTableViewModel entry, boolean isMatched, boolean isFloatingMode) {
+    private static void setEntrySearchVisibility(
+            BibEntryTableViewModel entry, boolean isMatched, boolean isFloatingMode) {
         if (isMatched) {
             entry.isVisibleBySearch().set(true);
         } else {
@@ -143,24 +182,53 @@ private static void setEntrySearchVisibility(BibEntryTableViewModel entry, boole
     }
 
     private void updateSearchDisplayMode(SearchDisplayMode mode) {
-        BackgroundTask.wrap(() -> {
-            boolean isFloatingMode = mode == SearchDisplayMode.FLOAT;
-            entriesViewModel.forEach(entry -> setEntrySearchVisibility(entry, entry.isMatchedBySearch().get(), isFloatingMode));
-        }).onSuccess(result -> FilteredListProxy.refilterListReflection(entriesFiltered)).executeWith(taskExecutor);
+        BackgroundTask.wrap(
+                        () -> {
+                            boolean isFloatingMode = mode == SearchDisplayMode.FLOAT;
+                            entriesViewModel.forEach(
+                                    entry ->
+                                            setEntrySearchVisibility(
+                                                    entry,
+                                                    entry.isMatchedBySearch().get(),
+                                                    isFloatingMode));
+                        })
+                .onSuccess(result -> FilteredListProxy.refilterListReflection(entriesFiltered))
+                .executeWith(taskExecutor);
     }
 
     private void updateGroupMatches(ObservableList<GroupTreeNode> groups) {
-        BackgroundTask.wrap(() -> {
-            groupsMatcher = createGroupMatcher(groups, groupsPreferences);
-            boolean isInvertMode = groupsPreferences.getGroupViewMode().contains(GroupViewMode.INVERT);
-            boolean isFloatingMode = !groupsPreferences.getGroupViewMode().contains(GroupViewMode.FILTER);
-            entriesViewModel.forEach(entry -> updateEntryGroupMatch(entry, groupsMatcher, isInvertMode, isFloatingMode));
-        }).onSuccess(result -> FilteredListProxy.refilterListReflection(entriesFiltered)).executeWith(taskExecutor);
+        BackgroundTask.wrap(
+                        () -> {
+                            groupsMatcher = createGroupMatcher(groups, groupsPreferences);
+                            boolean isInvertMode =
+                                    groupsPreferences
+                                            .getGroupViewMode()
+                                            .contains(GroupViewMode.INVERT);
+                            boolean isFloatingMode =
+                                    !groupsPreferences
+                                            .getGroupViewMode()
+                                            .contains(GroupViewMode.FILTER);
+                            entriesViewModel.forEach(
+                                    entry ->
+                                            updateEntryGroupMatch(
+                                                    entry,
+                                                    groupsMatcher,
+                                                    isInvertMode,
+                                                    isFloatingMode));
+                        })
+                .onSuccess(result -> FilteredListProxy.refilterListReflection(entriesFiltered))
+                .executeWith(taskExecutor);
     }
 
-    private void updateEntryGroupMatch(BibEntryTableViewModel entry, Optional<MatcherSet> groupsMatcher, boolean isInvertMode, boolean isFloatingMode) {
-        boolean isMatched = groupsMatcher.map(matcher -> matcher.isMatch(entry.getEntry()) ^ isInvertMode)
-                                         .orElse(true);
+    private void updateEntryGroupMatch(
+            BibEntryTableViewModel entry,
+            Optional<MatcherSet> groupsMatcher,
+            boolean isInvertMode,
+            boolean isFloatingMode) {
+        boolean isMatched =
+                groupsMatcher
+                        .map(matcher -> matcher.isMatch(entry.getEntry()) ^ isInvertMode)
+                        .orElse(true);
         entry.isMatchedByGroup().set(isMatched);
         entry.updateMatchCategory();
         if (isMatched) {
@@ -170,16 +238,18 @@ private void updateEntryGroupMatch(BibEntryTableViewModel entry, Optional<Matche
         }
     }
 
-    private static Optional<MatcherSet> createGroupMatcher(List<GroupTreeNode> selectedGroups, GroupsPreferences groupsPreferences) {
+    private static Optional<MatcherSet> createGroupMatcher(
+            List<GroupTreeNode> selectedGroups, GroupsPreferences groupsPreferences) {
         if ((selectedGroups == null) || selectedGroups.isEmpty()) {
             // No selected group, show all entries
             return Optional.empty();
         }
 
-        final MatcherSet searchRules = MatcherSets.build(
-                groupsPreferences.getGroupViewMode().contains(GroupViewMode.INTERSECTION)
-                        ? MatcherSets.MatcherType.AND
-                        : MatcherSets.MatcherType.OR);
+        final MatcherSet searchRules =
+                MatcherSets.build(
+                        groupsPreferences.getGroupViewMode().contains(GroupViewMode.INTERSECTION)
+                                ? MatcherSets.MatcherType.AND
+                                : MatcherSets.MatcherType.OR);
 
         for (GroupTreeNode node : selectedGroups) {
             searchRules.addRule(node.getSearchMatcher());
@@ -201,43 +271,105 @@ public SortedList<BibEntryTableViewModel> getEntriesFilteredAndSorted() {
     }
 
     public void resetFieldFormatter() {
-        this.fieldValueFormatter.setValue(new MainTableFieldValueFormatter(nameDisplayPreferences, bibDatabaseContext));
+        this.fieldValueFormatter.setValue(
+                new MainTableFieldValueFormatter(nameDisplayPreferences, bibDatabaseContext));
     }
 
     class LuceneIndexListener {
         @Subscribe
         public void listen(IndexAddedOrUpdatedEvent indexAddedOrUpdatedEvent) {
-            indexAddedOrUpdatedEvent.entries().forEach(entry -> {
-                BackgroundTask.wrap(() -> {
-                    int index = bibDatabaseContext.getDatabase().indexOf(entry);
-                    if (index >= 0) {
-                        BibEntryTableViewModel viewModel = entriesViewModel.get(index);
-                        boolean isFloatingMode = searchPreferences.getSearchDisplayMode() == SearchDisplayMode.FLOAT;
-                        boolean isMatched = true;
-                        if (searchQueryProperty.get().isPresent()) {
-                            SearchQuery searchQuery = searchQueryProperty.get().get();
-                            String newSearchExpression = "+" + SearchFieldConstants.ENTRY_ID + ":" + entry.getId() + " +" + searchQuery.getSearchExpression();
-                            SearchQuery entryQuery = new SearchQuery(newSearchExpression, searchQuery.getSearchFlags());
-                            SearchResults results = luceneManager.search(entryQuery);
-
-                            viewModel.searchScoreProperty().set(results.getSearchScoreForEntry(entry));
-                            viewModel.hasFullTextResultsProperty().set(results.hasFulltextResults(entry));
-                            isMatched = viewModel.searchScoreProperty().get() > 0;
-                        } else {
-                            viewModel.searchScoreProperty().set(0);
-                            viewModel.hasFullTextResultsProperty().set(false);
-                        }
-
-                        updateEntrySearchMatch(viewModel, isMatched, isFloatingMode);
-                        updateEntryGroupMatch(viewModel, groupsMatcher, groupsPreferences.getGroupViewMode().contains(GroupViewMode.INVERT), !groupsPreferences.getGroupViewMode().contains(GroupViewMode.FILTER));
-                    }
-                    return index;
-                }).onSuccess(index -> {
-                    if (index >= 0) {
-                        FilteredListProxy.refilterListReflection(entriesFiltered, index, index + 1);
-                    }
-                }).executeWith(taskExecutor);
-            });
+            indexAddedOrUpdatedEvent
+                    .entries()
+                    .forEach(
+                            entry -> {
+                                BackgroundTask.wrap(
+                                                () -> {
+                                                    int index =
+                                                            bibDatabaseContext
+                                                                    .getDatabase()
+                                                                    .indexOf(entry);
+                                                    if (index >= 0) {
+                                                        BibEntryTableViewModel viewModel =
+                                                                entriesViewModel.get(index);
+                                                        boolean isFloatingMode =
+                                                                searchPreferences
+                                                                                .getSearchDisplayMode()
+                                                                        == SearchDisplayMode.FLOAT;
+                                                        boolean isMatched = true;
+                                                        if (searchQueryProperty.get().isPresent()) {
+                                                            SearchQuery searchQuery =
+                                                                    searchQueryProperty.get().get();
+                                                            String newSearchExpression =
+                                                                    "+"
+                                                                            + SearchFieldConstants
+                                                                                    .ENTRY_ID
+                                                                            + ":"
+                                                                            + entry.getId()
+                                                                            + " +"
+                                                                            + searchQuery
+                                                                                    .getSearchExpression();
+                                                            SearchQuery entryQuery =
+                                                                    new SearchQuery(
+                                                                            newSearchExpression,
+                                                                            searchQuery
+                                                                                    .getSearchFlags());
+                                                            SearchResults results =
+                                                                    luceneManager.search(
+                                                                            entryQuery);
+
+                                                            viewModel
+                                                                    .searchScoreProperty()
+                                                                    .set(
+                                                                            results
+                                                                                    .getSearchScoreForEntry(
+                                                                                            entry));
+                                                            viewModel
+                                                                    .hasFullTextResultsProperty()
+                                                                    .set(
+                                                                            results
+                                                                                    .hasFulltextResults(
+                                                                                            entry));
+                                                            isMatched =
+                                                                    viewModel
+                                                                                    .searchScoreProperty()
+                                                                                    .get()
+                                                                            > 0;
+                                                        } else {
+                                                            viewModel.searchScoreProperty().set(0);
+                                                            viewModel
+                                                                    .hasFullTextResultsProperty()
+                                                                    .set(false);
+                                                        }
+
+                                                        updateEntrySearchMatch(
+                                                                viewModel,
+                                                                isMatched,
+                                                                isFloatingMode);
+                                                        updateEntryGroupMatch(
+                                                                viewModel,
+                                                                groupsMatcher,
+                                                                groupsPreferences
+                                                                        .getGroupViewMode()
+                                                                        .contains(
+                                                                                GroupViewMode
+                                                                                        .INVERT),
+                                                                !groupsPreferences
+                                                                        .getGroupViewMode()
+                                                                        .contains(
+                                                                                GroupViewMode
+                                                                                        .FILTER));
+                                                    }
+                                                    return index;
+                                                })
+                                        .onSuccess(
+                                                index -> {
+                                                    if (index >= 0) {
+                                                        FilteredListProxy.refilterListReflection(
+                                                                entriesFiltered, index, index + 1);
+                                                    }
+                                                })
+                                        .executeWith(taskExecutor);
+                            });
         }
 
         @Subscribe
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java b/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
index 33841527a34f..91a4f02ad0e0 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.maintable;
 
-import java.util.Optional;
+import static org.jabref.gui.maintable.NameDisplayPreferences.AbbreviationStyle;
+import static org.jabref.gui.maintable.NameDisplayPreferences.DisplayStyle;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
@@ -10,15 +11,15 @@
 import org.jabref.model.entry.field.FieldProperty;
 import org.jabref.model.entry.field.OrFields;
 
-import static org.jabref.gui.maintable.NameDisplayPreferences.AbbreviationStyle;
-import static org.jabref.gui.maintable.NameDisplayPreferences.DisplayStyle;
+import java.util.Optional;
 
 public class MainTableFieldValueFormatter {
     private final DisplayStyle displayStyle;
     private final AbbreviationStyle abbreviationStyle;
     private final BibDatabase bibDatabase;
 
-    public MainTableFieldValueFormatter(NameDisplayPreferences nameDisplayPreferences, BibDatabaseContext bibDatabaseContext) {
+    public MainTableFieldValueFormatter(
+            NameDisplayPreferences nameDisplayPreferences, BibDatabaseContext bibDatabaseContext) {
         this.displayStyle = nameDisplayPreferences.getDisplayStyle();
         this.abbreviationStyle = nameDisplayPreferences.getAbbreviationStyle();
         this.bibDatabase = bibDatabaseContext.getDatabase();
@@ -34,14 +35,16 @@ public MainTableFieldValueFormatter(NameDisplayPreferences nameDisplayPreference
      */
     public String formatFieldsValues(final OrFields fields, final BibEntry entry) {
         for (Field field : fields.getFields()) {
-            if (field.getProperties().contains(FieldProperty.PERSON_NAMES) && (displayStyle != DisplayStyle.AS_IS)) {
+            if (field.getProperties().contains(FieldProperty.PERSON_NAMES)
+                    && (displayStyle != DisplayStyle.AS_IS)) {
                 Optional<String> name = entry.getResolvedFieldOrAlias(field, bibDatabase);
 
                 if (name.isPresent()) {
                     return formatFieldWithAuthorValue(name.get());
                 }
             } else {
-                Optional<String> content = entry.getResolvedFieldOrAliasLatexFree(field, bibDatabase);
+                Optional<String> content =
+                        entry.getResolvedFieldOrAliasLatexFree(field, bibDatabase);
 
                 if (content.isPresent()) {
                     return content.get();
@@ -66,19 +69,21 @@ private String formatFieldWithAuthorValue(final String nameToFormat) {
         AuthorList authors = AuthorList.parse(nameToFormat);
 
         if (((displayStyle == DisplayStyle.FIRSTNAME_LASTNAME)
-                || (displayStyle == DisplayStyle.LASTNAME_FIRSTNAME))
+                        || (displayStyle == DisplayStyle.LASTNAME_FIRSTNAME))
                 && (abbreviationStyle == AbbreviationStyle.LASTNAME_ONLY)) {
             return authors.latexFree().getAsLastNames(false);
         }
 
         return switch (displayStyle) {
             default -> nameToFormat;
-            case FIRSTNAME_LASTNAME -> authors.latexFree().getAsFirstLastNames(
-                    abbreviationStyle == AbbreviationStyle.FULL,
-                    false);
-            case LASTNAME_FIRSTNAME -> authors.latexFree().getAsLastFirstNames(
-                    abbreviationStyle == AbbreviationStyle.FULL,
-                    false);
+            case FIRSTNAME_LASTNAME ->
+                    authors.latexFree()
+                            .getAsFirstLastNames(
+                                    abbreviationStyle == AbbreviationStyle.FULL, false);
+            case LASTNAME_FIRSTNAME ->
+                    authors.latexFree()
+                            .getAsLastFirstNames(
+                                    abbreviationStyle == AbbreviationStyle.FULL, false);
             case NATBIB -> authors.latexFree().getAsNatbib();
         };
     }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableHeaderContextMenu.java b/src/main/java/org/jabref/gui/maintable/MainTableHeaderContextMenu.java
index 7cfe366ff12e..7b78d718bddb 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableHeaderContextMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableHeaderContextMenu.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.maintable;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javafx.collections.ObservableList;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
@@ -20,6 +17,9 @@
 import org.jabref.gui.preferences.table.TableTab;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MainTableHeaderContextMenu extends ContextMenu {
 
     private static final int OUT_OF_BOUNDS = -1;
@@ -28,10 +28,11 @@ public class MainTableHeaderContextMenu extends ContextMenu {
     private final LibraryTabContainer tabContainer;
     private final DialogService dialogService;
 
-    public MainTableHeaderContextMenu(MainTable mainTable,
-                                      MainTableColumnFactory factory,
-                                      LibraryTabContainer tabContainer,
-                                      DialogService dialogService) {
+    public MainTableHeaderContextMenu(
+            MainTable mainTable,
+            MainTableColumnFactory factory,
+            LibraryTabContainer tabContainer,
+            DialogService dialogService) {
         super();
         this.tabContainer = tabContainer;
         this.mainTable = mainTable;
@@ -45,16 +46,18 @@ public MainTableHeaderContextMenu(MainTable mainTable,
      * Handles showing the menu in the cursors position when right-clicked.
      */
     public void show(boolean show) {
-        // TODO: 20/10/2022 unknown bug where issue does not show unless parameter is passed through this method.
-        mainTable.setOnContextMenuRequested(event -> {
-            // Display the menu if header is clicked, otherwise, remove from display.
-            if (!(event.getTarget() instanceof StackPane) && show) {
-                this.show(mainTable, event.getScreenX(), event.getScreenY());
-            } else if (this.isShowing()) {
-                this.hide();
-            }
-            event.consume();
-        });
+        // TODO: 20/10/2022 unknown bug where issue does not show unless parameter is passed through
+        // this method.
+        mainTable.setOnContextMenuRequested(
+                event -> {
+                    // Display the menu if header is clicked, otherwise, remove from display.
+                    if (!(event.getTarget() instanceof StackPane) && show) {
+                        this.show(mainTable, event.getScreenX(), event.getScreenY());
+                    } else if (this.isShowing()) {
+                        this.hide();
+                    }
+                    event.consume();
+                });
     }
 
     /**
@@ -67,7 +70,8 @@ private void constructItems() {
 
         // Populate the menu with currently used fields
         for (TableColumn<BibEntryTableViewModel, ?> column : mainTable.getColumns()) {
-            if (((MainTableColumn<?>) column).getModel().getType() == MainTableColumnModel.Type.MATCH_CATEGORY) {
+            if (((MainTableColumn<?>) column).getModel().getType()
+                    == MainTableColumnModel.Type.MATCH_CATEGORY) {
                 continue;
             }
             // Append only if the column has not already been added (a common column)
@@ -77,7 +81,11 @@ private void constructItems() {
             // Remove from remaining common columns pool
             MainTableColumn<?> searchCol = (MainTableColumn<?>) column;
             if (isACommonColumn(searchCol)) {
-                commonColumns.removeIf(tableCol -> ((MainTableColumn<?>) tableCol).getModel().equals(searchCol.getModel()));
+                commonColumns.removeIf(
+                        tableCol ->
+                                ((MainTableColumn<?>) tableCol)
+                                        .getModel()
+                                        .equals(searchCol.getModel()));
             }
         }
 
@@ -93,16 +101,18 @@ private void constructItems() {
 
         this.getItems().add(new SeparatorMenuItem());
         ActionFactory actionfactory = new ActionFactory();
-        MenuItem showMoreItem = actionfactory.createMenuItem(
-                StandardActions.SHOW_PREFS.withText(Localization.lang("More options...")),
-                new ShowPreferencesAction(tabContainer, TableTab.class, dialogService));
+        MenuItem showMoreItem =
+                actionfactory.createMenuItem(
+                        StandardActions.SHOW_PREFS.withText(Localization.lang("More options...")),
+                        new ShowPreferencesAction(tabContainer, TableTab.class, dialogService));
         this.getItems().add(showMoreItem);
     }
 
     /**
      * Creates an item for the menu constructed with the name/visibility of the table column.
      */
-    private RightClickMenuItem createMenuItem(TableColumn<BibEntryTableViewModel, ?> column, boolean isDisplaying) {
+    private RightClickMenuItem createMenuItem(
+            TableColumn<BibEntryTableViewModel, ?> column, boolean isDisplaying) {
         // Gets display name and constructs Radio Menu Item.
         MainTableColumn<?> tableColumn = (MainTableColumn<?>) column;
         String displayName = tableColumn.getDisplayName();
@@ -139,7 +149,13 @@ private void addColumn(MainTableColumn<?> tableColumn, int index) {
      * Removes the column from the MainTable to remove visibility.
      */
     private void removeColumn(MainTableColumn<?> tableColumn) {
-        mainTable.getColumns().removeIf(tableCol -> ((MainTableColumn<?>) tableCol).getModel().equals(tableColumn.getModel()));
+        mainTable
+                .getColumns()
+                .removeIf(
+                        tableCol ->
+                                ((MainTableColumn<?>) tableCol)
+                                        .getModel()
+                                        .equals(tableColumn.getModel()));
     }
 
     /**
@@ -152,8 +168,10 @@ private boolean isACommonColumn(MainTableColumn<?> tableColumn) {
     /**
      * Determines if a list of TableColumns contains the searched column.
      */
-    private boolean isColumnInList(MainTableColumn<?> searchColumn, List<TableColumn<BibEntryTableViewModel, ?>> tableColumns) {
-        for (TableColumn<BibEntryTableViewModel, ?> column: tableColumns) {
+    private boolean isColumnInList(
+            MainTableColumn<?> searchColumn,
+            List<TableColumn<BibEntryTableViewModel, ?>> tableColumns) {
+        for (TableColumn<BibEntryTableViewModel, ?> column : tableColumns) {
             MainTableColumnModel model = ((MainTableColumn<?>) column).getModel();
             if (model.equals(searchColumn.getModel())) {
                 return true;
@@ -182,18 +200,31 @@ private boolean isColumnInList(MainTableColumn<?> searchColumn, List<TableColumn
         commonColumns.add(new MainTableColumnModel(MainTableColumnModel.Type.GROUP_ICONS));
         commonColumns.add(new MainTableColumnModel(MainTableColumnModel.Type.FILES));
         commonColumns.add(new MainTableColumnModel(MainTableColumnModel.Type.LINKED_IDENTIFIER));
-        commonColumns.add(new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, entryTypeQualifier));
-        commonColumns.add(new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, authorEditQualifier));
-        commonColumns.add(new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, titleQualifier));
-        commonColumns.add(new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, yearQualifier));
-        commonColumns.add(new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, journalBookQualifier));
-        commonColumns.add(new MainTableColumnModel(MainTableColumnModel.Type.SPECIALFIELD, rankQualifier));
-        commonColumns.add(new MainTableColumnModel(MainTableColumnModel.Type.SPECIALFIELD, readStatusQualifier));
-        commonColumns.add(new MainTableColumnModel(MainTableColumnModel.Type.SPECIALFIELD, priorityQualifier));
+        commonColumns.add(
+                new MainTableColumnModel(
+                        MainTableColumnModel.Type.NORMALFIELD, entryTypeQualifier));
+        commonColumns.add(
+                new MainTableColumnModel(
+                        MainTableColumnModel.Type.NORMALFIELD, authorEditQualifier));
+        commonColumns.add(
+                new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, titleQualifier));
+        commonColumns.add(
+                new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, yearQualifier));
+        commonColumns.add(
+                new MainTableColumnModel(
+                        MainTableColumnModel.Type.NORMALFIELD, journalBookQualifier));
+        commonColumns.add(
+                new MainTableColumnModel(MainTableColumnModel.Type.SPECIALFIELD, rankQualifier));
+        commonColumns.add(
+                new MainTableColumnModel(
+                        MainTableColumnModel.Type.SPECIALFIELD, readStatusQualifier));
+        commonColumns.add(
+                new MainTableColumnModel(
+                        MainTableColumnModel.Type.SPECIALFIELD, priorityQualifier));
 
         // Create the Table Columns from the models using factory methods.
         List<TableColumn<BibEntryTableViewModel, ?>> commonTableColumns = new ArrayList<>();
-        for (MainTableColumnModel columnModel: commonColumns) {
+        for (MainTableColumnModel columnModel : commonColumns) {
             TableColumn<BibEntryTableViewModel, ?> tableColumn = factory.createColumn(columnModel);
             commonTableColumns.add(tableColumn);
         }
@@ -216,16 +247,17 @@ private class RightClickMenuItem extends RadioMenuItem {
             setIndex(OUT_OF_BOUNDS);
 
             // Set action to toggle visibility from main table when item is clicked
-            this.setOnAction(event -> {
-                if (isVisibleInTable()) {
-                    setIndex(obtainIndexOfColumn(column));
-                    removeColumn(column);
-                } else {
-                    addColumn(column, this.index);
-                    setIndex(obtainIndexOfColumn(column));
-                }
-                setVisibleInTable(!this.visibleInTable);
-            });
+            this.setOnAction(
+                    event -> {
+                        if (isVisibleInTable()) {
+                            setIndex(obtainIndexOfColumn(column));
+                            removeColumn(column);
+                        } else {
+                            addColumn(column, this.index);
+                            setIndex(obtainIndexOfColumn(column));
+                        }
+                        setVisibleInTable(!this.visibleInTable);
+                    });
         }
 
         public void setIndex(int index) {
diff --git a/src/main/java/org/jabref/gui/maintable/MainTablePreferences.java b/src/main/java/org/jabref/gui/maintable/MainTablePreferences.java
index f2f42a625036..4aee66780995 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTablePreferences.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTablePreferences.java
@@ -8,9 +8,10 @@ public class MainTablePreferences {
     private final BooleanProperty resizeColumnsToFit = new SimpleBooleanProperty();
     private final BooleanProperty extraFileColumnsEnabled = new SimpleBooleanProperty();
 
-    public MainTablePreferences(ColumnPreferences columnPreferences,
-                                boolean resizeColumnsToFit,
-                                boolean extraFileColumnsEnabled) {
+    public MainTablePreferences(
+            ColumnPreferences columnPreferences,
+            boolean resizeColumnsToFit,
+            boolean extraFileColumnsEnabled) {
         this.columnPreferences = columnPreferences;
         this.resizeColumnsToFit.set(resizeColumnsToFit);
         this.extraFileColumnsEnabled.set(extraFileColumnsEnabled);
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java b/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java
index 941f96dcbd36..fb102001cbbe 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableTooltip.java
@@ -20,9 +20,16 @@ public class MainTableTooltip extends Tooltip {
     private final VBox tooltipContent = new VBox();
     private final Label fieldValueLabel = new Label();
 
-    public MainTableTooltip(BibDatabaseContext databaseContext, DialogService dialogService, GuiPreferences preferences, ThemeManager themeManager, TaskExecutor taskExecutor) {
+    public MainTableTooltip(
+            BibDatabaseContext databaseContext,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            ThemeManager themeManager,
+            TaskExecutor taskExecutor) {
         this.preferences = preferences;
-        this.preview = new PreviewViewer(databaseContext, dialogService, preferences, themeManager, taskExecutor);
+        this.preview =
+                new PreviewViewer(
+                        databaseContext, dialogService, preferences, themeManager, taskExecutor);
         this.setShowDelay(Duration.seconds(1));
         this.tooltipContent.getChildren().addAll(fieldValueLabel, preview);
     }
diff --git a/src/main/java/org/jabref/gui/maintable/NameDisplayPreferences.java b/src/main/java/org/jabref/gui/maintable/NameDisplayPreferences.java
index 8ffc1b2032f1..300cd0335d96 100644
--- a/src/main/java/org/jabref/gui/maintable/NameDisplayPreferences.java
+++ b/src/main/java/org/jabref/gui/maintable/NameDisplayPreferences.java
@@ -6,18 +6,23 @@
 public class NameDisplayPreferences {
 
     public enum DisplayStyle {
-        NATBIB, AS_IS, FIRSTNAME_LASTNAME, LASTNAME_FIRSTNAME
+        NATBIB,
+        AS_IS,
+        FIRSTNAME_LASTNAME,
+        LASTNAME_FIRSTNAME
     }
 
     public enum AbbreviationStyle {
-        NONE, LASTNAME_ONLY, FULL
+        NONE,
+        LASTNAME_ONLY,
+        FULL
     }
 
     private final ObjectProperty<DisplayStyle> displayStyle = new SimpleObjectProperty<>();
-    private final ObjectProperty<AbbreviationStyle> abbreviationStyle = new SimpleObjectProperty<>();
+    private final ObjectProperty<AbbreviationStyle> abbreviationStyle =
+            new SimpleObjectProperty<>();
 
-    public NameDisplayPreferences(DisplayStyle displayStyle,
-                                  AbbreviationStyle abbreviationStyle) {
+    public NameDisplayPreferences(DisplayStyle displayStyle, AbbreviationStyle abbreviationStyle) {
         this.displayStyle.set(displayStyle);
         this.abbreviationStyle.set(abbreviationStyle);
     }
diff --git a/src/main/java/org/jabref/gui/maintable/NewLibraryFromPdfAction.java b/src/main/java/org/jabref/gui/maintable/NewLibraryFromPdfAction.java
index 96336a575740..449e98c3345d 100644
--- a/src/main/java/org/jabref/gui/maintable/NewLibraryFromPdfAction.java
+++ b/src/main/java/org/jabref/gui/maintable/NewLibraryFromPdfAction.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.maintable;
 
-import java.nio.file.Path;
-import java.util.concurrent.Callable;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
@@ -15,10 +12,12 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.file.Path;
+import java.util.concurrent.Callable;
+
 /**
  * Similar to {@link ExtractReferencesAction}. This action creates a new library, the other action "just" appends to the current library
  *
@@ -54,26 +53,36 @@ public NewLibraryFromPdfAction(
     public void execute() {
         final FileDialogConfiguration.Builder builder = new FileDialogConfiguration.Builder();
         builder.withDefaultExtension(StandardFileType.PDF);
-        // Sensible default for the directory to start browsing is the directory of the currently opened library. The pdf storage dir seems not to be feasible, because extracting references from a PDF itself can be done by the context menu of the respective entry.
-        stateManager.getActiveDatabase()
-                    .flatMap(BibDatabaseContext::getDatabasePath)
-                    .ifPresent(path -> builder.withInitialDirectory(path.getParent()));
+        // Sensible default for the directory to start browsing is the directory of the currently
+        // opened library. The pdf storage dir seems not to be feasible, because extracting
+        // references from a PDF itself can be done by the context menu of the respective entry.
+        stateManager
+                .getActiveDatabase()
+                .flatMap(BibDatabaseContext::getDatabasePath)
+                .ifPresent(path -> builder.withInitialDirectory(path.getParent()));
         FileDialogConfiguration fileDialogConfiguration = builder.build();
 
         LOGGER.trace("Opening file dialog with configuration: {}", fileDialogConfiguration);
 
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(path -> {
-            LOGGER.trace("Selected file: {}", path);
-            Callable<ParserResult> parserResultCallable = getParserResultCallable(path);
-            BackgroundTask.wrap(parserResultCallable)
-                          .withInitialMessage(Localization.lang("Processing PDF(s)"))
-                          .onFailure(dialogService::showErrorDialogAndWait)
-                          .onSuccess(result -> {
-                              LOGGER.trace("Finished processing PDF(s): {}", result);
-                              libraryTabContainer.addTab(result.getDatabaseContext(), true);
-                          })
-                          .executeWith(taskExecutor);
-        });
+        dialogService
+                .showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(
+                        path -> {
+                            LOGGER.trace("Selected file: {}", path);
+                            Callable<ParserResult> parserResultCallable =
+                                    getParserResultCallable(path);
+                            BackgroundTask.wrap(parserResultCallable)
+                                    .withInitialMessage(Localization.lang("Processing PDF(s)"))
+                                    .onFailure(dialogService::showErrorDialogAndWait)
+                                    .onSuccess(
+                                            result -> {
+                                                LOGGER.trace(
+                                                        "Finished processing PDF(s): {}", result);
+                                                libraryTabContainer.addTab(
+                                                        result.getDatabaseContext(), true);
+                                            })
+                                    .executeWith(taskExecutor);
+                        });
     }
 
     protected abstract Callable<ParserResult> getParserResultCallable(Path path);
diff --git a/src/main/java/org/jabref/gui/maintable/NewLibraryFromPdfActionOffline.java b/src/main/java/org/jabref/gui/maintable/NewLibraryFromPdfActionOffline.java
index e6b3180d4e74..9ddeb644d12c 100644
--- a/src/main/java/org/jabref/gui/maintable/NewLibraryFromPdfActionOffline.java
+++ b/src/main/java/org/jabref/gui/maintable/NewLibraryFromPdfActionOffline.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.maintable;
 
-import java.nio.file.Path;
-import java.util.concurrent.Callable;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
@@ -11,14 +8,23 @@
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.util.TaskExecutor;
 
+import java.nio.file.Path;
+import java.util.concurrent.Callable;
+
 public class NewLibraryFromPdfActionOffline extends NewLibraryFromPdfAction {
 
     private final BibliographyFromPdfImporter bibliographyFromPdfImporter;
 
-    public NewLibraryFromPdfActionOffline(LibraryTabContainer libraryTabContainer, StateManager stateManager, DialogService dialogService, CliPreferences preferences, TaskExecutor taskExecutor) {
+    public NewLibraryFromPdfActionOffline(
+            LibraryTabContainer libraryTabContainer,
+            StateManager stateManager,
+            DialogService dialogService,
+            CliPreferences preferences,
+            TaskExecutor taskExecutor) {
         super(libraryTabContainer, stateManager, dialogService, preferences, taskExecutor);
 
-        // Use the importer keeping the numbers (instead of generating keys; which is the other constructor)
+        // Use the importer keeping the numbers (instead of generating keys; which is the other
+        // constructor)
         this.bibliographyFromPdfImporter = new BibliographyFromPdfImporter();
     }
 
diff --git a/src/main/java/org/jabref/gui/maintable/NewLibraryFromPdfActionOnline.java b/src/main/java/org/jabref/gui/maintable/NewLibraryFromPdfActionOnline.java
index 3b8c2fc0f5d3..7b8761b32f49 100644
--- a/src/main/java/org/jabref/gui/maintable/NewLibraryFromPdfActionOnline.java
+++ b/src/main/java/org/jabref/gui/maintable/NewLibraryFromPdfActionOnline.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.maintable;
 
-import java.nio.file.Path;
-import java.util.concurrent.Callable;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
@@ -11,15 +8,25 @@
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.util.TaskExecutor;
 
+import java.nio.file.Path;
+import java.util.concurrent.Callable;
+
 public class NewLibraryFromPdfActionOnline extends NewLibraryFromPdfAction {
 
-    public NewLibraryFromPdfActionOnline(LibraryTabContainer libraryTabContainer, StateManager stateManager, DialogService dialogService, CliPreferences preferences, TaskExecutor taskExecutor) {
+    public NewLibraryFromPdfActionOnline(
+            LibraryTabContainer libraryTabContainer,
+            StateManager stateManager,
+            DialogService dialogService,
+            CliPreferences preferences,
+            TaskExecutor taskExecutor) {
         super(libraryTabContainer, stateManager, dialogService, preferences, taskExecutor);
     }
 
     @Override
     protected Callable<ParserResult> getParserResultCallable(Path path) {
-        return () -> new ParserResult(
-                new GrobidService(this.preferences.getGrobidPreferences()).processReferences(path, preferences.getImportFormatPreferences()));
+        return () ->
+                new ParserResult(
+                        new GrobidService(this.preferences.getGrobidPreferences())
+                                .processReferences(path, preferences.getImportFormatPreferences()));
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/OpenExternalFileAction.java b/src/main/java/org/jabref/gui/maintable/OpenExternalFileAction.java
index 01265c3a1d07..66c1803bdb48 100644
--- a/src/main/java/org/jabref/gui/maintable/OpenExternalFileAction.java
+++ b/src/main/java/org/jabref/gui/maintable/OpenExternalFileAction.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.maintable;
 
-import java.util.LinkedList;
-import java.util.List;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
@@ -14,6 +11,9 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 
+import java.util.LinkedList;
+import java.util.List;
+
 public class OpenExternalFileAction extends SimpleCommand {
 
     private final int FILES_LIMIT = 10;
@@ -26,19 +26,21 @@ public class OpenExternalFileAction extends SimpleCommand {
     private final LinkedFile linkedFile;
     private final TaskExecutor taskExecutor;
 
-    public OpenExternalFileAction(DialogService dialogService,
-                                  StateManager stateManager,
-                                  GuiPreferences preferences,
-                                  TaskExecutor taskExecutor) {
+    public OpenExternalFileAction(
+            DialogService dialogService,
+            StateManager stateManager,
+            GuiPreferences preferences,
+            TaskExecutor taskExecutor) {
         this(dialogService, stateManager, preferences, null, null, taskExecutor);
     }
 
-    public OpenExternalFileAction(DialogService dialogService,
-                                  StateManager stateManager,
-                                  GuiPreferences preferences,
-                                  BibEntry entry,
-                                  LinkedFile linkedFile,
-                                  TaskExecutor taskExecutor) {
+    public OpenExternalFileAction(
+            DialogService dialogService,
+            StateManager stateManager,
+            GuiPreferences preferences,
+            BibEntry entry,
+            LinkedFile linkedFile,
+            TaskExecutor taskExecutor) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.preferences = preferences;
@@ -47,9 +49,9 @@ public OpenExternalFileAction(DialogService dialogService,
         this.taskExecutor = taskExecutor;
 
         if (this.linkedFile == null) {
-            this.executable.bind(ActionHelper.hasLinkedFileForSelectedEntries(stateManager)
-                                             .and(ActionHelper.needsEntriesSelected(stateManager))
-            );
+            this.executable.bind(
+                    ActionHelper.hasLinkedFileForSelectedEntries(stateManager)
+                            .and(ActionHelper.needsEntriesSelected(stateManager)));
         } else {
             this.setExecutable(true);
         }
@@ -62,48 +64,61 @@ public OpenExternalFileAction(DialogService dialogService,
      */
     @Override
     public void execute() {
-        stateManager.getActiveDatabase().ifPresent(databaseContext -> {
-            if (entry == null) {
-                final List<BibEntry> selectedEntries = stateManager.getSelectedEntries();
+        stateManager
+                .getActiveDatabase()
+                .ifPresent(
+                        databaseContext -> {
+                            if (entry == null) {
+                                final List<BibEntry> selectedEntries =
+                                        stateManager.getSelectedEntries();
 
-                List<LinkedFileViewModel> linkedFileViewModelList = new LinkedList<>();
-                LinkedFileViewModel linkedFileViewModel;
+                                List<LinkedFileViewModel> linkedFileViewModelList =
+                                        new LinkedList<>();
+                                LinkedFileViewModel linkedFileViewModel;
 
-                for (BibEntry entry : selectedEntries) {
-                    for (LinkedFile linkedFile : entry.getFiles()) {
-                        linkedFileViewModel = new LinkedFileViewModel(
-                                linkedFile,
-                                entry,
-                                databaseContext,
-                                taskExecutor,
-                                dialogService,
-                                preferences);
+                                for (BibEntry entry : selectedEntries) {
+                                    for (LinkedFile linkedFile : entry.getFiles()) {
+                                        linkedFileViewModel =
+                                                new LinkedFileViewModel(
+                                                        linkedFile,
+                                                        entry,
+                                                        databaseContext,
+                                                        taskExecutor,
+                                                        dialogService,
+                                                        preferences);
 
-                        linkedFileViewModelList.add(linkedFileViewModel);
-                    }
-                }
+                                        linkedFileViewModelList.add(linkedFileViewModel);
+                                    }
+                                }
 
-                // ask the user when detecting # of files > FILES_LIMIT
-                if (linkedFileViewModelList.size() > FILES_LIMIT) {
-                    boolean continueOpening = dialogService.showConfirmationDialogAndWait(Localization.lang("Opening large number of files"),
-                            Localization.lang("You are about to open %0 files. Continue?", linkedFileViewModelList.size()),
-                            Localization.lang("Continue"), Localization.lang("Cancel"));
-                    if (!continueOpening) {
-                        return;
-                    }
-                }
+                                // ask the user when detecting # of files > FILES_LIMIT
+                                if (linkedFileViewModelList.size() > FILES_LIMIT) {
+                                    boolean continueOpening =
+                                            dialogService.showConfirmationDialogAndWait(
+                                                    Localization.lang(
+                                                            "Opening large number of files"),
+                                                    Localization.lang(
+                                                            "You are about to open %0 files. Continue?",
+                                                            linkedFileViewModelList.size()),
+                                                    Localization.lang("Continue"),
+                                                    Localization.lang("Cancel"));
+                                    if (!continueOpening) {
+                                        return;
+                                    }
+                                }
 
-                linkedFileViewModelList.forEach(LinkedFileViewModel::open);
-            } else {
-                LinkedFileViewModel linkedFileViewModel = new LinkedFileViewModel(
-                        linkedFile,
-                        entry,
-                        databaseContext,
-                        taskExecutor,
-                        dialogService,
-                        preferences);
-                linkedFileViewModel.open();
-            }
-        });
+                                linkedFileViewModelList.forEach(LinkedFileViewModel::open);
+                            } else {
+                                LinkedFileViewModel linkedFileViewModel =
+                                        new LinkedFileViewModel(
+                                                linkedFile,
+                                                entry,
+                                                databaseContext,
+                                                taskExecutor,
+                                                dialogService,
+                                                preferences);
+                                linkedFileViewModel.open();
+                            }
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java b/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java
index 8d3e362405c4..c50b6762223f 100644
--- a/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java
+++ b/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java
@@ -20,19 +20,21 @@ public class OpenFolderAction extends SimpleCommand {
     private final LinkedFile linkedFile;
     private final TaskExecutor taskExecutor;
 
-    public OpenFolderAction(DialogService dialogService,
-                            StateManager stateManager,
-                            GuiPreferences preferences,
-                            TaskExecutor taskExecutor) {
+    public OpenFolderAction(
+            DialogService dialogService,
+            StateManager stateManager,
+            GuiPreferences preferences,
+            TaskExecutor taskExecutor) {
         this(dialogService, stateManager, preferences, null, null, taskExecutor);
     }
 
-    public OpenFolderAction(DialogService dialogService,
-                            StateManager stateManager,
-                            GuiPreferences preferences,
-                            BibEntry entry,
-                            LinkedFile linkedFile,
-                            TaskExecutor taskExecutor) {
+    public OpenFolderAction(
+            DialogService dialogService,
+            StateManager stateManager,
+            GuiPreferences preferences,
+            BibEntry entry,
+            LinkedFile linkedFile,
+            TaskExecutor taskExecutor) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.preferences = preferences;
@@ -41,7 +43,8 @@ public OpenFolderAction(DialogService dialogService,
         this.taskExecutor = taskExecutor;
 
         if (this.linkedFile == null) {
-            this.executable.bind(ActionHelper.isFilePresentForSelectedEntry(stateManager, preferences));
+            this.executable.bind(
+                    ActionHelper.isFilePresentForSelectedEntry(stateManager, preferences));
         } else {
             this.setExecutable(true);
         }
@@ -49,28 +52,36 @@ public OpenFolderAction(DialogService dialogService,
 
     @Override
     public void execute() {
-            stateManager.getActiveDatabase().ifPresent(databaseContext -> {
-                if (entry == null) {
-                    stateManager.getSelectedEntries().stream().filter(entry -> !entry.getFiles().isEmpty()).forEach(entry -> {
-                        LinkedFileViewModel linkedFileViewModel = new LinkedFileViewModel(
-                                entry.getFiles().getFirst(),
-                                entry,
-                                databaseContext,
-                                taskExecutor,
-                                dialogService,
-                                preferences);
-                        linkedFileViewModel.openFolder();
-                    });
-                } else {
-                    LinkedFileViewModel linkedFileViewModel = new LinkedFileViewModel(
-                            linkedFile,
-                            entry,
-                            databaseContext,
-                            taskExecutor,
-                            dialogService,
-                            preferences);
-                    linkedFileViewModel.openFolder();
-                }
-            });
+        stateManager
+                .getActiveDatabase()
+                .ifPresent(
+                        databaseContext -> {
+                            if (entry == null) {
+                                stateManager.getSelectedEntries().stream()
+                                        .filter(entry -> !entry.getFiles().isEmpty())
+                                        .forEach(
+                                                entry -> {
+                                                    LinkedFileViewModel linkedFileViewModel =
+                                                            new LinkedFileViewModel(
+                                                                    entry.getFiles().getFirst(),
+                                                                    entry,
+                                                                    databaseContext,
+                                                                    taskExecutor,
+                                                                    dialogService,
+                                                                    preferences);
+                                                    linkedFileViewModel.openFolder();
+                                                });
+                            } else {
+                                LinkedFileViewModel linkedFileViewModel =
+                                        new LinkedFileViewModel(
+                                                linkedFile,
+                                                entry,
+                                                databaseContext,
+                                                taskExecutor,
+                                                dialogService,
+                                                preferences);
+                                linkedFileViewModel.openFolder();
+                            }
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/OpenUrlAction.java b/src/main/java/org/jabref/gui/maintable/OpenUrlAction.java
index 48778884953a..9acef4d29cd5 100644
--- a/src/main/java/org/jabref/gui/maintable/OpenUrlAction.java
+++ b/src/main/java/org/jabref/gui/maintable/OpenUrlAction.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.maintable;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-
 import javafx.beans.binding.BooleanExpression;
 
 import org.jabref.gui.DialogService;
@@ -17,67 +13,91 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 
+import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
+
 public class OpenUrlAction extends SimpleCommand {
 
     private final DialogService dialogService;
     private final StateManager stateManager;
     private final GuiPreferences preferences;
 
-    public OpenUrlAction(DialogService dialogService, StateManager stateManager, GuiPreferences preferences) {
+    public OpenUrlAction(
+            DialogService dialogService, StateManager stateManager, GuiPreferences preferences) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.preferences = preferences;
 
-        BooleanExpression fieldIsSet = ActionHelper.isAnyFieldSetForSelectedEntry(
-                List.of(StandardField.URL, StandardField.DOI, StandardField.URI, StandardField.EPRINT),
-                stateManager);
+        BooleanExpression fieldIsSet =
+                ActionHelper.isAnyFieldSetForSelectedEntry(
+                        List.of(
+                                StandardField.URL,
+                                StandardField.DOI,
+                                StandardField.URI,
+                                StandardField.EPRINT),
+                        stateManager);
         this.executable.bind(ActionHelper.needsEntriesSelected(1, stateManager).and(fieldIsSet));
     }
 
     @Override
     public void execute() {
-        stateManager.getActiveDatabase().ifPresent(databaseContext -> {
-            final List<BibEntry> entries = stateManager.getSelectedEntries();
+        stateManager
+                .getActiveDatabase()
+                .ifPresent(
+                        databaseContext -> {
+                            final List<BibEntry> entries = stateManager.getSelectedEntries();
 
-            if (entries.size() != 1) {
-                dialogService.notify(Localization.lang("This operation requires exactly one item to be selected."));
-                return;
-            }
+                            if (entries.size() != 1) {
+                                dialogService.notify(
+                                        Localization.lang(
+                                                "This operation requires exactly one item to be selected."));
+                                return;
+                            }
 
-            BibEntry entry = entries.getFirst();
+                            BibEntry entry = entries.getFirst();
 
-            // ToDo: Create dialog or menu to chose which one to open
-            // URL - DOI - DOI - EPRINT
-            Optional<String> link = entry.getField(StandardField.EPRINT);
-            Field field = StandardField.EPRINT;
-            if (entry.hasField(StandardField.URI)) {
-                link = entry.getField(StandardField.URI);
-                field = StandardField.URI;
-            }
-            if (entry.hasField(StandardField.ISBN)) {
-                link = entry.getField(StandardField.ISBN);
-                field = StandardField.ISBN;
-            }
-            if (entry.hasField(StandardField.DOI)) {
-                link = entry.getField(StandardField.DOI);
-                field = StandardField.DOI;
-            }
-            if (entry.hasField(StandardField.URL)) {
-                link = entry.getField(StandardField.URL);
-                field = StandardField.URL;
-            }
+                            // ToDo: Create dialog or menu to chose which one to open
+                            // URL - DOI - DOI - EPRINT
+                            Optional<String> link = entry.getField(StandardField.EPRINT);
+                            Field field = StandardField.EPRINT;
+                            if (entry.hasField(StandardField.URI)) {
+                                link = entry.getField(StandardField.URI);
+                                field = StandardField.URI;
+                            }
+                            if (entry.hasField(StandardField.ISBN)) {
+                                link = entry.getField(StandardField.ISBN);
+                                field = StandardField.ISBN;
+                            }
+                            if (entry.hasField(StandardField.DOI)) {
+                                link = entry.getField(StandardField.DOI);
+                                field = StandardField.DOI;
+                            }
+                            if (entry.hasField(StandardField.URL)) {
+                                link = entry.getField(StandardField.URL);
+                                field = StandardField.URL;
+                            }
 
-            if (link.isPresent()) {
-                try {
-                    if (field.equals(StandardField.DOI) && preferences.getDOIPreferences().isUseCustom()) {
-                        NativeDesktop.openCustomDoi(link.get(), preferences, dialogService);
-                    } else {
-                        NativeDesktop.openExternalViewer(databaseContext, preferences, link.get(), field, dialogService, entry);
-                    }
-                } catch (IOException e) {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Unable to open link."), e);
-                }
-            }
-        });
+                            if (link.isPresent()) {
+                                try {
+                                    if (field.equals(StandardField.DOI)
+                                            && preferences.getDOIPreferences().isUseCustom()) {
+                                        NativeDesktop.openCustomDoi(
+                                                link.get(), preferences, dialogService);
+                                    } else {
+                                        NativeDesktop.openExternalViewer(
+                                                databaseContext,
+                                                preferences,
+                                                link.get(),
+                                                field,
+                                                dialogService,
+                                                entry);
+                                    }
+                                } catch (IOException e) {
+                                    dialogService.showErrorDialogAndWait(
+                                            Localization.lang("Unable to open link."), e);
+                                }
+                            }
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java b/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
index d31f8574212d..acd38522db64 100644
--- a/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
+++ b/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.maintable;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 import javafx.beans.InvalidationListener;
 import javafx.collections.ListChangeListener;
 import javafx.scene.control.TableColumn;
@@ -10,10 +7,12 @@
 
 import org.jabref.gui.maintable.columns.MainTableColumn;
 import org.jabref.logic.preferences.JabRefCliPreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * Keep track of changes made to the columns (reordering, resorting, resizing).
  */
@@ -24,24 +23,30 @@ public class PersistenceVisualStateTable {
     protected final TableView<BibEntryTableViewModel> table;
     protected final ColumnPreferences preferences;
 
-    public PersistenceVisualStateTable(TableView<BibEntryTableViewModel> table, ColumnPreferences preferences) {
+    public PersistenceVisualStateTable(
+            TableView<BibEntryTableViewModel> table, ColumnPreferences preferences) {
         this.table = table;
         this.preferences = preferences;
     }
 
     public void addListeners() {
         table.getColumns().addListener((InvalidationListener) obs -> updateColumns());
-        table.getSortOrder().addListener((ListChangeListener<? super TableColumn<BibEntryTableViewModel, ?>>) obs -> updateSortOrder());
+        table.getSortOrder()
+                .addListener(
+                        (ListChangeListener<? super TableColumn<BibEntryTableViewModel, ?>>)
+                                obs -> updateSortOrder());
 
-        // As we store the ColumnModels of the MainTable, we need to add the listener to the ColumnModel properties,
+        // As we store the ColumnModels of the MainTable, we need to add the listener to the
+        // ColumnModel properties,
         // since the value is bound to the model after the listener to the column itself is called.
 
         table.getColumns().stream()
-             .map(col -> ((MainTableColumn<?>) col).getModel())
-             .forEach(model -> {
-                 model.widthProperty().addListener(obs -> updateColumns());
-                 model.sortTypeProperty().addListener(obs -> updateColumns());
-             });
+                .map(col -> ((MainTableColumn<?>) col).getModel())
+                .forEach(
+                        model -> {
+                            model.widthProperty().addListener(obs -> updateColumns());
+                            model.sortTypeProperty().addListener(obs -> updateColumns());
+                        });
     }
 
     /**
@@ -66,11 +71,12 @@ private void updateSortOrder() {
         preferences.setColumnSortOrder(toList(table.getSortOrder()));
     }
 
-    private List<MainTableColumnModel> toList(List<TableColumn<BibEntryTableViewModel, ?>> columns) {
+    private List<MainTableColumnModel> toList(
+            List<TableColumn<BibEntryTableViewModel, ?>> columns) {
         return columns.stream()
-                      .filter(col -> col instanceof MainTableColumn<?>)
-                      .map(column -> ((MainTableColumn<?>) column).getModel())
-                      .filter(model -> model.getType() != MainTableColumnModel.Type.MATCH_CATEGORY)
-                      .collect(Collectors.toList());
+                .filter(col -> col instanceof MainTableColumn<?>)
+                .map(column -> ((MainTableColumn<?>) column).getModel())
+                .filter(model -> model.getType() != MainTableColumnModel.Type.MATCH_CATEGORY)
+                .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
index 66430e8770e4..89e681390d92 100644
--- a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.maintable;
 
-import javax.swing.undo.UndoManager;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Menu;
@@ -35,123 +35,350 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.SpecialField;
 
-import com.tobiasdiez.easybind.EasyBind;
+import javax.swing.undo.UndoManager;
 
 public class RightClickMenu {
 
-    public static ContextMenu create(BibEntryTableViewModel entry,
-                                     KeyBindingRepository keyBindingRepository,
-                                     LibraryTab libraryTab,
-                                     DialogService dialogService,
-                                     StateManager stateManager,
-                                     GuiPreferences preferences,
-                                     UndoManager undoManager,
-                                     ClipBoardManager clipBoardManager,
-                                     TaskExecutor taskExecutor,
-                                     JournalAbbreviationRepository abbreviationRepository,
-                                     BibEntryTypesManager entryTypesManager) {
+    public static ContextMenu create(
+            BibEntryTableViewModel entry,
+            KeyBindingRepository keyBindingRepository,
+            LibraryTab libraryTab,
+            DialogService dialogService,
+            StateManager stateManager,
+            GuiPreferences preferences,
+            UndoManager undoManager,
+            ClipBoardManager clipBoardManager,
+            TaskExecutor taskExecutor,
+            JournalAbbreviationRepository abbreviationRepository,
+            BibEntryTypesManager entryTypesManager) {
         ActionFactory factory = new ActionFactory();
         ContextMenu contextMenu = new ContextMenu();
 
-        ExtractReferencesAction extractReferencesAction = new ExtractReferencesAction(dialogService, stateManager, preferences);
-        // Two menu items required, because of menu item display. Action checks preference internal what to do
-        MenuItem extractFileReferencesOnline = factory.createMenuItem(StandardActions.EXTRACT_FILE_REFERENCES_ONLINE, extractReferencesAction);
-        MenuItem extractFileReferencesOffline = factory.createMenuItem(StandardActions.EXTRACT_FILE_REFERENCES_OFFLINE, extractReferencesAction);
-
-        contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, () -> libraryTab, stateManager, undoManager)),
-                createCopySubMenu(factory, dialogService, stateManager, preferences, clipBoardManager, abbreviationRepository, taskExecutor),
-                factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE, () -> libraryTab, stateManager, undoManager)),
-                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT, () -> libraryTab, stateManager, undoManager)),
-                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(dialogService, stateManager, undoManager, preferences)),
-                factory.createMenuItem(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, () -> libraryTab, stateManager, undoManager)),
-
-                new SeparatorMenuItem(),
-
-                createSendSubMenu(factory, dialogService, stateManager, preferences, entryTypesManager, taskExecutor),
-
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.RANKING, factory, () -> libraryTab, dialogService, preferences, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.RELEVANCE, factory, () -> libraryTab, dialogService, preferences, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.QUALITY, factory, () -> libraryTab, dialogService, preferences, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.PRINTED, factory, () -> libraryTab, dialogService, preferences, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.PRIORITY, factory, () -> libraryTab, dialogService, preferences, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.READ_STATUS, factory, () -> libraryTab, dialogService, preferences, undoManager, stateManager),
-
-                new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.ATTACH_FILE, new AttachFileAction(libraryTab, dialogService, stateManager, preferences.getFilePreferences(), preferences.getExternalApplicationsPreferences())),
-                factory.createMenuItem(StandardActions.ATTACH_FILE_FROM_URL, new AttachFileFromURLAction(dialogService, stateManager, taskExecutor, preferences)),
-                factory.createMenuItem(StandardActions.OPEN_FOLDER, new OpenFolderAction(dialogService, stateManager, preferences, taskExecutor)),
-                factory.createMenuItem(StandardActions.OPEN_EXTERNAL_FILE, new OpenExternalFileAction(dialogService, stateManager, preferences, taskExecutor)),
-                extractFileReferencesOnline,
-                extractFileReferencesOffline,
-
-                factory.createMenuItem(StandardActions.OPEN_URL, new OpenUrlAction(dialogService, stateManager, preferences)),
-                factory.createMenuItem(StandardActions.SEARCH_SHORTSCIENCE, new SearchShortScienceAction(dialogService, stateManager, preferences)),
-
-                new SeparatorMenuItem(),
+        ExtractReferencesAction extractReferencesAction =
+                new ExtractReferencesAction(dialogService, stateManager, preferences);
+        // Two menu items required, because of menu item display. Action checks preference internal
+        // what to do
+        MenuItem extractFileReferencesOnline =
+                factory.createMenuItem(
+                        StandardActions.EXTRACT_FILE_REFERENCES_ONLINE, extractReferencesAction);
+        MenuItem extractFileReferencesOffline =
+                factory.createMenuItem(
+                        StandardActions.EXTRACT_FILE_REFERENCES_OFFLINE, extractReferencesAction);
 
-                new ChangeEntryTypeMenu(libraryTab.getSelectedEntries(), libraryTab.getBibDatabaseContext(), undoManager, entryTypesManager).asSubMenu(),
-                factory.createMenuItem(StandardActions.MERGE_WITH_FETCHED_ENTRY, new MergeWithFetchedEntryAction(dialogService, stateManager, taskExecutor, preferences, undoManager))
-        );
+        contextMenu
+                .getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.COPY,
+                                new EditAction(
+                                        StandardActions.COPY,
+                                        () -> libraryTab,
+                                        stateManager,
+                                        undoManager)),
+                        createCopySubMenu(
+                                factory,
+                                dialogService,
+                                stateManager,
+                                preferences,
+                                clipBoardManager,
+                                abbreviationRepository,
+                                taskExecutor),
+                        factory.createMenuItem(
+                                StandardActions.PASTE,
+                                new EditAction(
+                                        StandardActions.PASTE,
+                                        () -> libraryTab,
+                                        stateManager,
+                                        undoManager)),
+                        factory.createMenuItem(
+                                StandardActions.CUT,
+                                new EditAction(
+                                        StandardActions.CUT,
+                                        () -> libraryTab,
+                                        stateManager,
+                                        undoManager)),
+                        factory.createMenuItem(
+                                StandardActions.MERGE_ENTRIES,
+                                new MergeEntriesAction(
+                                        dialogService, stateManager, undoManager, preferences)),
+                        factory.createMenuItem(
+                                StandardActions.DELETE_ENTRY,
+                                new EditAction(
+                                        StandardActions.DELETE_ENTRY,
+                                        () -> libraryTab,
+                                        stateManager,
+                                        undoManager)),
+                        new SeparatorMenuItem(),
+                        createSendSubMenu(
+                                factory,
+                                dialogService,
+                                stateManager,
+                                preferences,
+                                entryTypesManager,
+                                taskExecutor),
+                        SpecialFieldMenuItemFactory.createSpecialFieldMenu(
+                                SpecialField.RANKING,
+                                factory,
+                                () -> libraryTab,
+                                dialogService,
+                                preferences,
+                                undoManager,
+                                stateManager),
+                        SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(
+                                SpecialField.RELEVANCE,
+                                factory,
+                                () -> libraryTab,
+                                dialogService,
+                                preferences,
+                                undoManager,
+                                stateManager),
+                        SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(
+                                SpecialField.QUALITY,
+                                factory,
+                                () -> libraryTab,
+                                dialogService,
+                                preferences,
+                                undoManager,
+                                stateManager),
+                        SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(
+                                SpecialField.PRINTED,
+                                factory,
+                                () -> libraryTab,
+                                dialogService,
+                                preferences,
+                                undoManager,
+                                stateManager),
+                        SpecialFieldMenuItemFactory.createSpecialFieldMenu(
+                                SpecialField.PRIORITY,
+                                factory,
+                                () -> libraryTab,
+                                dialogService,
+                                preferences,
+                                undoManager,
+                                stateManager),
+                        SpecialFieldMenuItemFactory.createSpecialFieldMenu(
+                                SpecialField.READ_STATUS,
+                                factory,
+                                () -> libraryTab,
+                                dialogService,
+                                preferences,
+                                undoManager,
+                                stateManager),
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.ATTACH_FILE,
+                                new AttachFileAction(
+                                        libraryTab,
+                                        dialogService,
+                                        stateManager,
+                                        preferences.getFilePreferences(),
+                                        preferences.getExternalApplicationsPreferences())),
+                        factory.createMenuItem(
+                                StandardActions.ATTACH_FILE_FROM_URL,
+                                new AttachFileFromURLAction(
+                                        dialogService, stateManager, taskExecutor, preferences)),
+                        factory.createMenuItem(
+                                StandardActions.OPEN_FOLDER,
+                                new OpenFolderAction(
+                                        dialogService, stateManager, preferences, taskExecutor)),
+                        factory.createMenuItem(
+                                StandardActions.OPEN_EXTERNAL_FILE,
+                                new OpenExternalFileAction(
+                                        dialogService, stateManager, preferences, taskExecutor)),
+                        extractFileReferencesOnline,
+                        extractFileReferencesOffline,
+                        factory.createMenuItem(
+                                StandardActions.OPEN_URL,
+                                new OpenUrlAction(dialogService, stateManager, preferences)),
+                        factory.createMenuItem(
+                                StandardActions.SEARCH_SHORTSCIENCE,
+                                new SearchShortScienceAction(
+                                        dialogService, stateManager, preferences)),
+                        new SeparatorMenuItem(),
+                        new ChangeEntryTypeMenu(
+                                        libraryTab.getSelectedEntries(),
+                                        libraryTab.getBibDatabaseContext(),
+                                        undoManager,
+                                        entryTypesManager)
+                                .asSubMenu(),
+                        factory.createMenuItem(
+                                StandardActions.MERGE_WITH_FETCHED_ENTRY,
+                                new MergeWithFetchedEntryAction(
+                                        dialogService,
+                                        stateManager,
+                                        taskExecutor,
+                                        preferences,
+                                        undoManager)));
 
-        EasyBind.subscribe(preferences.getGrobidPreferences().grobidEnabledProperty(), enabled -> {
-            extractFileReferencesOnline.setVisible(enabled);
-            extractFileReferencesOffline.setVisible(!enabled);
-        });
+        EasyBind.subscribe(
+                preferences.getGrobidPreferences().grobidEnabledProperty(),
+                enabled -> {
+                    extractFileReferencesOnline.setVisible(enabled);
+                    extractFileReferencesOffline.setVisible(!enabled);
+                });
 
         return contextMenu;
     }
 
-    private static Menu createCopySubMenu(ActionFactory factory,
-                                          DialogService dialogService,
-                                          StateManager stateManager,
-                                          GuiPreferences preferences,
-                                          ClipBoardManager clipBoardManager,
-                                          JournalAbbreviationRepository abbreviationRepository,
-                                          TaskExecutor taskExecutor) {
+    private static Menu createCopySubMenu(
+            ActionFactory factory,
+            DialogService dialogService,
+            StateManager stateManager,
+            GuiPreferences preferences,
+            ClipBoardManager clipBoardManager,
+            JournalAbbreviationRepository abbreviationRepository,
+            TaskExecutor taskExecutor) {
         Menu copySpecialMenu = factory.createMenu(StandardActions.COPY_MORE);
 
-        copySpecialMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.COPY_TITLE, new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository)),
-                factory.createMenuItem(StandardActions.COPY_KEY, new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository)),
-                factory.createMenuItem(StandardActions.COPY_CITE_KEY, new CopyMoreAction(StandardActions.COPY_CITE_KEY, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository)),
-                factory.createMenuItem(StandardActions.COPY_KEY_AND_TITLE, new CopyMoreAction(StandardActions.COPY_KEY_AND_TITLE, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository)),
-                factory.createMenuItem(StandardActions.COPY_KEY_AND_LINK, new CopyMoreAction(StandardActions.COPY_KEY_AND_LINK, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository)),
-                factory.createMenuItem(StandardActions.COPY_DOI, new CopyMoreAction(StandardActions.COPY_DOI, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository)),
-                factory.createMenuItem(StandardActions.COPY_DOI_URL, new CopyMoreAction(StandardActions.COPY_DOI_URL, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository)),
-                new SeparatorMenuItem()
-        );
+        copySpecialMenu
+                .getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.COPY_TITLE,
+                                new CopyMoreAction(
+                                        StandardActions.COPY_TITLE,
+                                        dialogService,
+                                        stateManager,
+                                        clipBoardManager,
+                                        preferences,
+                                        abbreviationRepository)),
+                        factory.createMenuItem(
+                                StandardActions.COPY_KEY,
+                                new CopyMoreAction(
+                                        StandardActions.COPY_KEY,
+                                        dialogService,
+                                        stateManager,
+                                        clipBoardManager,
+                                        preferences,
+                                        abbreviationRepository)),
+                        factory.createMenuItem(
+                                StandardActions.COPY_CITE_KEY,
+                                new CopyMoreAction(
+                                        StandardActions.COPY_CITE_KEY,
+                                        dialogService,
+                                        stateManager,
+                                        clipBoardManager,
+                                        preferences,
+                                        abbreviationRepository)),
+                        factory.createMenuItem(
+                                StandardActions.COPY_KEY_AND_TITLE,
+                                new CopyMoreAction(
+                                        StandardActions.COPY_KEY_AND_TITLE,
+                                        dialogService,
+                                        stateManager,
+                                        clipBoardManager,
+                                        preferences,
+                                        abbreviationRepository)),
+                        factory.createMenuItem(
+                                StandardActions.COPY_KEY_AND_LINK,
+                                new CopyMoreAction(
+                                        StandardActions.COPY_KEY_AND_LINK,
+                                        dialogService,
+                                        stateManager,
+                                        clipBoardManager,
+                                        preferences,
+                                        abbreviationRepository)),
+                        factory.createMenuItem(
+                                StandardActions.COPY_DOI,
+                                new CopyMoreAction(
+                                        StandardActions.COPY_DOI,
+                                        dialogService,
+                                        stateManager,
+                                        clipBoardManager,
+                                        preferences,
+                                        abbreviationRepository)),
+                        factory.createMenuItem(
+                                StandardActions.COPY_DOI_URL,
+                                new CopyMoreAction(
+                                        StandardActions.COPY_DOI_URL,
+                                        dialogService,
+                                        stateManager,
+                                        clipBoardManager,
+                                        preferences,
+                                        abbreviationRepository)),
+                        new SeparatorMenuItem());
 
         // the submenu will behave dependent on what style is currently selected (citation/preview)
         PreviewPreferences previewPreferences = preferences.getPreviewPreferences();
         if (previewPreferences.getSelectedPreviewLayout() instanceof CitationStylePreviewLayout) {
-            copySpecialMenu.getItems().addAll(
-                    factory.createMenuItem(StandardActions.COPY_CITATION_HTML, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, clipBoardManager, taskExecutor, preferences, abbreviationRepository)),
-                    factory.createMenuItem(StandardActions.COPY_CITATION_TEXT, new CopyCitationAction(CitationStyleOutputFormat.TEXT, dialogService, stateManager, clipBoardManager, taskExecutor, preferences, abbreviationRepository)));
+            copySpecialMenu
+                    .getItems()
+                    .addAll(
+                            factory.createMenuItem(
+                                    StandardActions.COPY_CITATION_HTML,
+                                    new CopyCitationAction(
+                                            CitationStyleOutputFormat.HTML,
+                                            dialogService,
+                                            stateManager,
+                                            clipBoardManager,
+                                            taskExecutor,
+                                            preferences,
+                                            abbreviationRepository)),
+                            factory.createMenuItem(
+                                    StandardActions.COPY_CITATION_TEXT,
+                                    new CopyCitationAction(
+                                            CitationStyleOutputFormat.TEXT,
+                                            dialogService,
+                                            stateManager,
+                                            clipBoardManager,
+                                            taskExecutor,
+                                            preferences,
+                                            abbreviationRepository)));
         } else {
-            copySpecialMenu.getItems().add(factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, clipBoardManager, taskExecutor, preferences, abbreviationRepository)));
+            copySpecialMenu
+                    .getItems()
+                    .add(
+                            factory.createMenuItem(
+                                    StandardActions.COPY_CITATION_PREVIEW,
+                                    new CopyCitationAction(
+                                            CitationStyleOutputFormat.HTML,
+                                            dialogService,
+                                            stateManager,
+                                            clipBoardManager,
+                                            taskExecutor,
+                                            preferences,
+                                            abbreviationRepository)));
         }
 
-        copySpecialMenu.getItems().addAll(
-                new SeparatorMenuItem(),
-                factory.createMenuItem(StandardActions.EXPORT_TO_CLIPBOARD, new ExportToClipboardAction(dialogService, stateManager, clipBoardManager, taskExecutor, preferences)));
+        copySpecialMenu
+                .getItems()
+                .addAll(
+                        new SeparatorMenuItem(),
+                        factory.createMenuItem(
+                                StandardActions.EXPORT_TO_CLIPBOARD,
+                                new ExportToClipboardAction(
+                                        dialogService,
+                                        stateManager,
+                                        clipBoardManager,
+                                        taskExecutor,
+                                        preferences)));
 
         return copySpecialMenu;
     }
 
-    private static Menu createSendSubMenu(ActionFactory factory,
-                                          DialogService dialogService,
-                                          StateManager stateManager,
-                                          GuiPreferences preferences,
-                                          BibEntryTypesManager entryTypesManager,
-                                          TaskExecutor taskExecutor) {
+    private static Menu createSendSubMenu(
+            ActionFactory factory,
+            DialogService dialogService,
+            StateManager stateManager,
+            GuiPreferences preferences,
+            BibEntryTypesManager entryTypesManager,
+            TaskExecutor taskExecutor) {
         Menu sendMenu = factory.createMenu(StandardActions.SEND);
-        sendMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new SendAsStandardEmailAction(dialogService, preferences, stateManager, entryTypesManager, taskExecutor)),
-                factory.createMenuItem(StandardActions.SEND_TO_KINDLE, new SendAsKindleEmailAction(dialogService, preferences, stateManager, taskExecutor)),
-                new SeparatorMenuItem()
-        );
+        sendMenu.getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.SEND_AS_EMAIL,
+                                new SendAsStandardEmailAction(
+                                        dialogService,
+                                        preferences,
+                                        stateManager,
+                                        entryTypesManager,
+                                        taskExecutor)),
+                        factory.createMenuItem(
+                                StandardActions.SEND_TO_KINDLE,
+                                new SendAsKindleEmailAction(
+                                        dialogService, preferences, stateManager, taskExecutor)),
+                        new SeparatorMenuItem());
 
         return sendMenu;
     }
diff --git a/src/main/java/org/jabref/gui/maintable/SearchShortScienceAction.java b/src/main/java/org/jabref/gui/maintable/SearchShortScienceAction.java
index 4b6a251c4ffc..622f5c189943 100644
--- a/src/main/java/org/jabref/gui/maintable/SearchShortScienceAction.java
+++ b/src/main/java/org/jabref/gui/maintable/SearchShortScienceAction.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.maintable;
 
-import java.io.IOException;
-import java.util.List;
+import static org.jabref.gui.actions.ActionHelper.isFieldSetForSelectedEntry;
+import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
 
 import javafx.beans.binding.BooleanExpression;
 
@@ -15,39 +15,57 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-import static org.jabref.gui.actions.ActionHelper.isFieldSetForSelectedEntry;
-import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
+import java.io.IOException;
+import java.util.List;
 
 public class SearchShortScienceAction extends SimpleCommand {
     private final DialogService dialogService;
     private final StateManager stateManager;
     private final GuiPreferences preferences;
 
-    public SearchShortScienceAction(DialogService dialogService, StateManager stateManager, GuiPreferences preferences) {
+    public SearchShortScienceAction(
+            DialogService dialogService, StateManager stateManager, GuiPreferences preferences) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.preferences = preferences;
 
-        BooleanExpression fieldIsSet = isFieldSetForSelectedEntry(StandardField.TITLE, stateManager);
+        BooleanExpression fieldIsSet =
+                isFieldSetForSelectedEntry(StandardField.TITLE, stateManager);
         this.executable.bind(needsEntriesSelected(1, stateManager).and(fieldIsSet));
     }
 
     @Override
     public void execute() {
-        stateManager.getActiveDatabase().ifPresent(databaseContext -> {
-            final List<BibEntry> bibEntries = stateManager.getSelectedEntries();
-
-            if (bibEntries.size() != 1) {
-                dialogService.notify(Localization.lang("This operation requires exactly one item to be selected."));
-                return;
-            }
-            ExternalLinkCreator.getShortScienceSearchURL(bibEntries.getFirst()).ifPresent(url -> {
-                try {
-                    NativeDesktop.openExternalViewer(databaseContext, preferences, url, StandardField.URL, dialogService, bibEntries.getFirst());
-                } catch (IOException ex) {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Unable to open ShortScience."), ex);
-                }
-            });
-        });
+        stateManager
+                .getActiveDatabase()
+                .ifPresent(
+                        databaseContext -> {
+                            final List<BibEntry> bibEntries = stateManager.getSelectedEntries();
+
+                            if (bibEntries.size() != 1) {
+                                dialogService.notify(
+                                        Localization.lang(
+                                                "This operation requires exactly one item to be selected."));
+                                return;
+                            }
+                            ExternalLinkCreator.getShortScienceSearchURL(bibEntries.getFirst())
+                                    .ifPresent(
+                                            url -> {
+                                                try {
+                                                    NativeDesktop.openExternalViewer(
+                                                            databaseContext,
+                                                            preferences,
+                                                            url,
+                                                            StandardField.URL,
+                                                            dialogService,
+                                                            bibEntries.getFirst());
+                                                } catch (IOException ex) {
+                                                    dialogService.showErrorDialogAndWait(
+                                                            Localization.lang(
+                                                                    "Unable to open ShortScience."),
+                                                            ex);
+                                                }
+                                            });
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/SmartConstrainedResizePolicy.java b/src/main/java/org/jabref/gui/maintable/SmartConstrainedResizePolicy.java
index 4096455c7658..047d77719071 100644
--- a/src/main/java/org/jabref/gui/maintable/SmartConstrainedResizePolicy.java
+++ b/src/main/java/org/jabref/gui/maintable/SmartConstrainedResizePolicy.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.maintable;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.List;
-
 import javafx.scene.control.ResizeFeaturesBase;
 import javafx.scene.control.TableColumnBase;
 import javafx.scene.control.TableView;
@@ -13,6 +8,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.List;
+
 /**
  * This resize policy is almost the same as {@link TableView#CONSTRAINED_RESIZE_POLICY}
  * We make sure that the width of all columns sums up to the total width of the table.
@@ -20,7 +20,8 @@
  */
 public class SmartConstrainedResizePolicy implements Callback<TableView.ResizeFeatures, Boolean> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SmartConstrainedResizePolicy.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(SmartConstrainedResizePolicy.class);
 
     @Override
     public Boolean call(TableView.ResizeFeatures prop) {
@@ -34,17 +35,20 @@ public Boolean call(TableView.ResizeFeatures prop) {
     private Boolean initColumnSize(TableView<?> table) {
         double tableWidth = getContentWidth(table);
         List<? extends TableColumnBase<?, ?>> visibleLeafColumns = table.getVisibleLeafColumns();
-        double totalWidth = visibleLeafColumns.stream().mapToDouble(TableColumnBase::getWidth).sum();
+        double totalWidth =
+                visibleLeafColumns.stream().mapToDouble(TableColumnBase::getWidth).sum();
 
         if (Math.abs(totalWidth - tableWidth) > 1) {
-            double totalPrefWidth = visibleLeafColumns.stream().mapToDouble(TableColumnBase::getPrefWidth).sum();
+            double totalPrefWidth =
+                    visibleLeafColumns.stream().mapToDouble(TableColumnBase::getPrefWidth).sum();
             double currPrefWidth = 0;
             if (totalPrefWidth > 0) {
                 for (TableColumnBase col : visibleLeafColumns) {
                     double share = col.getPrefWidth() / totalPrefWidth;
                     double newSize = tableWidth * share;
 
-                    // Just to make sure that we are staying under the total table width (due to rounding errors)
+                    // Just to make sure that we are staying under the total table width (due to
+                    // rounding errors)
                     currPrefWidth += newSize;
                     if (currPrefWidth > tableWidth) {
                         newSize -= currPrefWidth - tableWidth;
@@ -64,10 +68,14 @@ private void resize(TableColumnBase column, double delta) {
         try {
             // TODO: reflective access, should be removed
             Class<?> clazz = Class.forName("javafx.scene.control.TableUtil");
-            Method constrainedResize = clazz.getDeclaredMethod("resize", TableColumnBase.class, double.class);
+            Method constrainedResize =
+                    clazz.getDeclaredMethod("resize", TableColumnBase.class, double.class);
             constrainedResize.setAccessible(true);
             constrainedResize.invoke(null, column, delta);
-        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException | ClassNotFoundException e) {
+        } catch (NoSuchMethodException
+                | IllegalAccessException
+                | InvocationTargetException
+                | ClassNotFoundException e) {
             LOGGER.error("Could not invoke resize in TableUtil", e);
         }
     }
@@ -75,22 +83,34 @@ private void resize(TableColumnBase column, double delta) {
     private Boolean constrainedResize(TableView.ResizeFeatures<?> prop) {
         TableView<?> table = prop.getTable();
         List<? extends TableColumnBase<?, ?>> visibleLeafColumns = table.getVisibleLeafColumns();
-        return constrainedResize(prop,
-                false,
-                getContentWidth(table) - 2,
-                visibleLeafColumns);
+        return constrainedResize(prop, false, getContentWidth(table) - 2, visibleLeafColumns);
     }
 
-    private Boolean constrainedResize(TableView.ResizeFeatures prop, Boolean isFirstRun, Double contentWidth, List<? extends TableColumnBase<?, ?>> visibleLeafColumns) {
+    private Boolean constrainedResize(
+            TableView.ResizeFeatures prop,
+            Boolean isFirstRun,
+            Double contentWidth,
+            List<? extends TableColumnBase<?, ?>> visibleLeafColumns) {
         // We have to use reflection since TableUtil is not visible to us
         try {
             // TODO: reflective access, should be removed
             Class<?> clazz = Class.forName("javafx.scene.control.TableUtil");
-            Method constrainedResize = clazz.getDeclaredMethod("constrainedResize", ResizeFeaturesBase.class, Boolean.TYPE, Double.TYPE, List.class);
+            Method constrainedResize =
+                    clazz.getDeclaredMethod(
+                            "constrainedResize",
+                            ResizeFeaturesBase.class,
+                            Boolean.TYPE,
+                            Double.TYPE,
+                            List.class);
             constrainedResize.setAccessible(true);
-            Object returnValue = constrainedResize.invoke(null, prop, isFirstRun, contentWidth, visibleLeafColumns);
+            Object returnValue =
+                    constrainedResize.invoke(
+                            null, prop, isFirstRun, contentWidth, visibleLeafColumns);
             return (Boolean) returnValue;
-        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException | ClassNotFoundException e) {
+        } catch (NoSuchMethodException
+                | IllegalAccessException
+                | InvocationTargetException
+                | ClassNotFoundException e) {
             LOGGER.error("Could not invoke constrainedResize in TableUtil", e);
             return false;
         }
diff --git a/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java b/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java
index e272467f409d..23aa3da3c245 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.maintable.columns;
 
+import com.google.common.collect.MoreCollectors;
+
 import javafx.beans.value.ObservableValue;
 import javafx.scene.control.Tooltip;
 
@@ -13,8 +15,6 @@
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.UnknownField;
 
-import com.google.common.collect.MoreCollectors;
-
 /**
  * A column that displays the text-value of the field
  */
diff --git a/src/main/java/org/jabref/gui/maintable/columns/FileColumn.java b/src/main/java/org/jabref/gui/maintable/columns/FileColumn.java
index ce1fc758ef30..73eafbf5e818 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/FileColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/FileColumn.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.maintable.columns;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
 import javafx.scene.Node;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
@@ -26,6 +22,10 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
  * A column that draws a clickable symbol for either all the files of a defined file type
  * or a joined column with all the files of any type
@@ -40,11 +40,12 @@ public class FileColumn extends MainTableColumn<List<LinkedFile>> {
     /**
      * Creates a joined column for all the linked files.
      */
-    public FileColumn(MainTableColumnModel model,
-                      BibDatabaseContext database,
-                      DialogService dialogService,
-                      GuiPreferences preferences,
-                      TaskExecutor taskExecutor) {
+    public FileColumn(
+            MainTableColumnModel model,
+            BibDatabaseContext database,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            TaskExecutor taskExecutor) {
         super(model);
         this.database = Objects.requireNonNull(database);
         this.dialogService = dialogService;
@@ -61,30 +62,36 @@ public FileColumn(MainTableColumnModel model,
                 .withGraphic(this::createFileIcon)
                 .withTooltip(this::createFileTooltip)
                 .withMenu(this::createFileMenu)
-                .withOnMouseClickedEvent((entry, linkedFiles) -> event -> {
-                    if ((event.getButton() == MouseButton.PRIMARY) && (linkedFiles.size() == 1)) {
-                        // Only one linked file -> open directly
-                        LinkedFileViewModel linkedFileViewModel = new LinkedFileViewModel(linkedFiles.getFirst(),
-                                entry.getEntry(),
-                                database,
-                                taskExecutor,
-                                dialogService,
-                                preferences);
-                        linkedFileViewModel.open();
-                    }
-                })
+                .withOnMouseClickedEvent(
+                        (entry, linkedFiles) ->
+                                event -> {
+                                    if ((event.getButton() == MouseButton.PRIMARY)
+                                            && (linkedFiles.size() == 1)) {
+                                        // Only one linked file -> open directly
+                                        LinkedFileViewModel linkedFileViewModel =
+                                                new LinkedFileViewModel(
+                                                        linkedFiles.getFirst(),
+                                                        entry.getEntry(),
+                                                        database,
+                                                        taskExecutor,
+                                                        dialogService,
+                                                        preferences);
+                                        linkedFileViewModel.open();
+                                    }
+                                })
                 .install(this);
     }
 
     /**
      * Creates a column for all the linked files of a single file type.
      */
-    public FileColumn(MainTableColumnModel model,
-                      BibDatabaseContext database,
-                      DialogService dialogService,
-                      GuiPreferences preferences,
-                      String fileType,
-                      TaskExecutor taskExecutor) {
+    public FileColumn(
+            MainTableColumnModel model,
+            BibDatabaseContext database,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            String fileType,
+            TaskExecutor taskExecutor) {
         super(model);
         this.database = Objects.requireNonNull(database);
         this.dialogService = dialogService;
@@ -93,13 +100,25 @@ public FileColumn(MainTableColumnModel model,
 
         setCommonSettings();
 
-        this.setGraphic(ExternalFileTypes.getExternalFileTypeByName(fileType, preferences.getExternalApplicationsPreferences())
-                                         .map(ExternalFileType::getIcon).orElse(IconTheme.JabRefIcons.FILE)
-                                         .getGraphicNode());
+        this.setGraphic(
+                ExternalFileTypes.getExternalFileTypeByName(
+                                fileType, preferences.getExternalApplicationsPreferences())
+                        .map(ExternalFileType::getIcon)
+                        .orElse(IconTheme.JabRefIcons.FILE)
+                        .getGraphicNode());
 
         new ValueTableCellFactory<BibEntryTableViewModel, List<LinkedFile>>()
-                .withGraphic((entry, linkedFiles) -> createFileIcon(entry, linkedFiles.stream().filter(linkedFile ->
-                                linkedFile.getFileType().equalsIgnoreCase(fileType)).collect(Collectors.toList())))
+                .withGraphic(
+                        (entry, linkedFiles) ->
+                                createFileIcon(
+                                        entry,
+                                        linkedFiles.stream()
+                                                .filter(
+                                                        linkedFile ->
+                                                                linkedFile
+                                                                        .getFileType()
+                                                                        .equalsIgnoreCase(fileType))
+                                                .collect(Collectors.toList())))
                 .install(this);
     }
 
@@ -125,15 +144,19 @@ private ContextMenu createFileMenu(BibEntryTableViewModel entry, List<LinkedFile
         ContextMenu contextMenu = new ContextMenu();
 
         for (LinkedFile linkedFile : linkedFiles) {
-            LinkedFileViewModel linkedFileViewModel = new LinkedFileViewModel(linkedFile,
-                    entry.getEntry(),
-                    database,
-                    taskExecutor,
-                    dialogService,
-                    preferences);
-
-            MenuItem menuItem = new MenuItem(linkedFileViewModel.getTruncatedDescriptionAndLink(),
-                    linkedFileViewModel.getTypeIcon().getGraphicNode());
+            LinkedFileViewModel linkedFileViewModel =
+                    new LinkedFileViewModel(
+                            linkedFile,
+                            entry.getEntry(),
+                            database,
+                            taskExecutor,
+                            dialogService,
+                            preferences);
+
+            MenuItem menuItem =
+                    new MenuItem(
+                            linkedFileViewModel.getTruncatedDescriptionAndLink(),
+                            linkedFileViewModel.getTypeIcon().getGraphicNode());
             menuItem.setOnAction(event -> linkedFileViewModel.open());
             contextMenu.getItems().add(menuItem);
         }
@@ -148,10 +171,13 @@ private Node createFileIcon(BibEntryTableViewModel entry, List<LinkedFile> linke
         if (linkedFiles.size() > 1) {
             return IconTheme.JabRefIcons.FILE_MULTIPLE.getGraphicNode();
         } else if (linkedFiles.size() == 1) {
-            return ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFiles.getFirst(), true, preferences.getExternalApplicationsPreferences())
-                                    .map(ExternalFileType::getIcon)
-                                    .orElse(IconTheme.JabRefIcons.FILE)
-                                    .getGraphicNode();
+            return ExternalFileTypes.getExternalFileTypeByLinkedFile(
+                            linkedFiles.getFirst(),
+                            true,
+                            preferences.getExternalApplicationsPreferences())
+                    .map(ExternalFileType::getIcon)
+                    .orElse(IconTheme.JabRefIcons.FILE)
+                    .getGraphicNode();
         } else {
             return null;
         }
diff --git a/src/main/java/org/jabref/gui/maintable/columns/LibraryColumn.java b/src/main/java/org/jabref/gui/maintable/columns/LibraryColumn.java
index a02359c42b91..266a01a4df2c 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/LibraryColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/LibraryColumn.java
@@ -13,8 +13,9 @@ public LibraryColumn(MainTableColumnModel model) {
         super(model);
 
         setText(Localization.lang("Library"));
-        new ValueTableCellFactory<BibEntryTableViewModel, String>().withText(FileUtil::getBaseName)
-                                                                   .install(this);
+        new ValueTableCellFactory<BibEntryTableViewModel, String>()
+                .withText(FileUtil::getBaseName)
+                .install(this);
         setCellValueFactory(param -> param.getValue().bibDatabasePathProperty());
     }
 
diff --git a/src/main/java/org/jabref/gui/maintable/columns/LinkedIdentifierColumn.java b/src/main/java/org/jabref/gui/maintable/columns/LinkedIdentifierColumn.java
index 22aa68e43f43..eda8c69224ce 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/LinkedIdentifierColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/LinkedIdentifierColumn.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.maintable.columns;
 
-import java.io.IOException;
-import java.util.Map;
-
 import javafx.scene.Node;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
@@ -26,6 +23,9 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.field.Field;
 
+import java.io.IOException;
+import java.util.Map;
+
 /**
  * A clickable icons column for DOIs, URLs, URIs and EPrints.
  */
@@ -36,12 +36,13 @@ public class LinkedIdentifierColumn extends MainTableColumn<Map<Field, String>>
     private final DialogService dialogService;
     private final GuiPreferences preferences;
 
-    public LinkedIdentifierColumn(MainTableColumnModel model,
-                                  CellFactory cellFactory,
-                                  BibDatabaseContext database,
-                                  DialogService dialogService,
-                                  GuiPreferences preferences,
-                                  StateManager stateManager) {
+    public LinkedIdentifierColumn(
+            MainTableColumnModel model,
+            CellFactory cellFactory,
+            BibDatabaseContext database,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            StateManager stateManager) {
         super(model);
         this.database = database;
         this.cellFactory = cellFactory;
@@ -59,12 +60,16 @@ public LinkedIdentifierColumn(MainTableColumnModel model,
                 .withGraphic(this::createIdentifierGraphic)
                 .withTooltip(this::createIdentifierTooltip)
                 .withMenu(this::createIdentifierMenu)
-                .withOnMouseClickedEvent((entry, linkedFiles) -> event -> {
-                    // If we only have one identifer, open directly
-                    if ((linkedFiles.size() == 1) && (event.getButton() == MouseButton.PRIMARY)) {
-                       new OpenUrlAction(dialogService, stateManager, preferences).execute();
-                    }
-                })
+                .withOnMouseClickedEvent(
+                        (entry, linkedFiles) ->
+                                event -> {
+                                    // If we only have one identifer, open directly
+                                    if ((linkedFiles.size() == 1)
+                                            && (event.getButton() == MouseButton.PRIMARY)) {
+                                        new OpenUrlAction(dialogService, stateManager, preferences)
+                                                .execute();
+                                    }
+                                })
                 .install(this);
     }
 
@@ -80,31 +85,56 @@ private Node createIdentifierGraphic(Map<Field, String> values) {
 
     private String createIdentifierTooltip(Map<Field, String> values) {
         StringBuilder identifiers = new StringBuilder();
-        values.keySet().forEach(field -> identifiers.append(field.getDisplayName()).append(": ").append(values.get(field)).append("\n"));
+        values.keySet()
+                .forEach(
+                        field ->
+                                identifiers
+                                        .append(field.getDisplayName())
+                                        .append(": ")
+                                        .append(values.get(field))
+                                        .append("\n"));
         return identifiers.toString();
     }
 
-    private ContextMenu createIdentifierMenu(BibEntryTableViewModel entry, Map<Field, String> values) {
+    private ContextMenu createIdentifierMenu(
+            BibEntryTableViewModel entry, Map<Field, String> values) {
         ContextMenu contextMenu = new ContextMenu();
 
         if (values.size() <= 1) {
             return null;
         }
 
-        values.keySet().forEach(field -> {
-            MenuItem menuItem = new MenuItem(field.getDisplayName() + ": " +
-                    ControlHelper.truncateString(values.get(field), -1, "...", ControlHelper.EllipsisPosition.CENTER),
-                    cellFactory.getTableIcon(field));
-            menuItem.setOnAction(event -> {
-                try {
-                    NativeDesktop.openExternalViewer(database, preferences, values.get(field), field, dialogService, entry.getEntry());
-                } catch (IOException e) {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Unable to open link."), e);
-                }
-                event.consume();
-            });
-            contextMenu.getItems().add(menuItem);
-        });
+        values.keySet()
+                .forEach(
+                        field -> {
+                            MenuItem menuItem =
+                                    new MenuItem(
+                                            field.getDisplayName()
+                                                    + ": "
+                                                    + ControlHelper.truncateString(
+                                                            values.get(field),
+                                                            -1,
+                                                            "...",
+                                                            ControlHelper.EllipsisPosition.CENTER),
+                                            cellFactory.getTableIcon(field));
+                            menuItem.setOnAction(
+                                    event -> {
+                                        try {
+                                            NativeDesktop.openExternalViewer(
+                                                    database,
+                                                    preferences,
+                                                    values.get(field),
+                                                    field,
+                                                    dialogService,
+                                                    entry.getEntry());
+                                        } catch (IOException e) {
+                                            dialogService.showErrorDialogAndWait(
+                                                    Localization.lang("Unable to open link."), e);
+                                        }
+                                        event.consume();
+                                    });
+                            contextMenu.getItems().add(menuItem);
+                        });
 
         return contextMenu;
     }
diff --git a/src/main/java/org/jabref/gui/maintable/columns/SpecialFieldColumn.java b/src/main/java/org/jabref/gui/maintable/columns/SpecialFieldColumn.java
index 27266e8f8e57..770ec0b0ed20 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/SpecialFieldColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/SpecialFieldColumn.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.maintable.columns;
 
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.scene.Node;
 import javafx.scene.control.ContextMenu;
@@ -11,6 +9,7 @@
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 
+import org.controlsfx.control.Rating;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.maintable.BibEntryTableViewModel;
 import org.jabref.gui.maintable.ColumnPreferences;
@@ -28,8 +27,9 @@
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.SpecialFieldValue;
 
-import com.tobiasdiez.easybind.EasyBind;
-import org.controlsfx.control.Rating;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
 
 /**
  * A column that displays a SpecialField
@@ -39,13 +39,15 @@ public class SpecialFieldColumn extends MainTableColumn<Optional<SpecialFieldVal
     private final CliPreferences preferences;
     private final UndoManager undoManager;
 
-    public SpecialFieldColumn(MainTableColumnModel model, CliPreferences preferences, UndoManager undoManager) {
+    public SpecialFieldColumn(
+            MainTableColumnModel model, CliPreferences preferences, UndoManager undoManager) {
         super(model);
         this.preferences = preferences;
         this.undoManager = undoManager;
 
         SpecialField specialField = (SpecialField) FieldFactory.parseField(model.getQualifier());
-        SpecialFieldViewModel specialFieldViewModel = new SpecialFieldViewModel(specialField, preferences, undoManager);
+        SpecialFieldViewModel specialFieldViewModel =
+                new SpecialFieldViewModel(specialField, preferences, undoManager);
 
         Node headerGraphic = specialFieldViewModel.getIcon().getGraphicNode();
         Tooltip.install(headerGraphic, new Tooltip(specialFieldViewModel.getLocalization()));
@@ -53,7 +55,8 @@ public SpecialFieldColumn(MainTableColumnModel model, CliPreferences preferences
         this.getStyleClass().add(MainTableColumnFactory.STYLE_ICON_COLUMN);
 
         if (specialField == SpecialField.RANKING) {
-            MainTableColumnFactory.setExactWidth(this, SpecialFieldsPreferences.COLUMN_RANKING_WIDTH);
+            MainTableColumnFactory.setExactWidth(
+                    this, SpecialFieldsPreferences.COLUMN_RANKING_WIDTH);
             this.setResizable(false);
             new OptionalValueTableCellFactory<BibEntryTableViewModel, SpecialFieldValueViewModel>()
                     .withGraphic(this::createSpecialRating)
@@ -63,18 +66,29 @@ public SpecialFieldColumn(MainTableColumnModel model, CliPreferences preferences
             this.setResizable(false);
 
             if (specialField.isSingleValueField()) {
-                new OptionalValueTableCellFactory<BibEntryTableViewModel, SpecialFieldValueViewModel>()
-                        .withGraphic((entry, value) -> createSpecialFieldIcon(value, specialFieldViewModel))
-                        .withOnMouseClickedEvent((entry, value) -> event -> {
-                            if (event.getButton() == MouseButton.PRIMARY) {
-                                specialFieldViewModel.toggle(entry.getEntry());
-                            }
-                        })
+                new OptionalValueTableCellFactory<
+                                BibEntryTableViewModel, SpecialFieldValueViewModel>()
+                        .withGraphic(
+                                (entry, value) ->
+                                        createSpecialFieldIcon(value, specialFieldViewModel))
+                        .withOnMouseClickedEvent(
+                                (entry, value) ->
+                                        event -> {
+                                            if (event.getButton() == MouseButton.PRIMARY) {
+                                                specialFieldViewModel.toggle(entry.getEntry());
+                                            }
+                                        })
                         .install(this);
             } else {
-                new OptionalValueTableCellFactory<BibEntryTableViewModel, SpecialFieldValueViewModel>()
-                        .withGraphic((entry, value) -> createSpecialFieldIcon(value, specialFieldViewModel))
-                        .withMenu((entry, value) -> createSpecialFieldMenu(entry.getEntry(), specialFieldViewModel))
+                new OptionalValueTableCellFactory<
+                                BibEntryTableViewModel, SpecialFieldValueViewModel>()
+                        .withGraphic(
+                                (entry, value) ->
+                                        createSpecialFieldIcon(value, specialFieldViewModel))
+                        .withMenu(
+                                (entry, value) ->
+                                        createSpecialFieldMenu(
+                                                entry.getEntry(), specialFieldViewModel))
                         .install(this);
             }
         }
@@ -90,7 +104,8 @@ public SpecialFieldColumn(MainTableColumnModel model, CliPreferences preferences
         this.setSortable(true);
     }
 
-    private Rating createSpecialRating(BibEntryTableViewModel entry, Optional<SpecialFieldValueViewModel> value) {
+    private Rating createSpecialRating(
+            BibEntryTableViewModel entry, Optional<SpecialFieldValueViewModel> value) {
         Rating ranking = new Rating();
 
         if (value.isPresent()) {
@@ -99,18 +114,24 @@ private Rating createSpecialRating(BibEntryTableViewModel entry, Optional<Specia
             ranking.setRating(0);
         }
 
-        ranking.addEventFilter(MouseEvent.MOUSE_CLICKED, event -> {
-            if (event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2) {
-                ranking.setRating(0);
-                event.consume();
-            } else if (event.getButton() == MouseButton.SECONDARY) {
-                event.consume();
-            }
-        });
-
-        EasyBind.subscribe(ranking.ratingProperty(), rating ->
-                new SpecialFieldViewModel(SpecialField.RANKING, preferences, undoManager)
-                        .setSpecialFieldValue(entry.getEntry(), SpecialFieldValue.getRating(rating.intValue())));
+        ranking.addEventFilter(
+                MouseEvent.MOUSE_CLICKED,
+                event -> {
+                    if (event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2) {
+                        ranking.setRating(0);
+                        event.consume();
+                    } else if (event.getButton() == MouseButton.SECONDARY) {
+                        event.consume();
+                    }
+                });
+
+        EasyBind.subscribe(
+                ranking.ratingProperty(),
+                rating ->
+                        new SpecialFieldViewModel(SpecialField.RANKING, preferences, undoManager)
+                                .setSpecialFieldValue(
+                                        entry.getEntry(),
+                                        SpecialFieldValue.getRating(rating.intValue())));
 
         return ranking;
     }
@@ -119,21 +140,28 @@ private ContextMenu createSpecialFieldMenu(BibEntry entry, SpecialFieldViewModel
         ContextMenu contextMenu = new ContextMenu();
 
         for (SpecialFieldValueViewModel value : specialField.getValues()) {
-            MenuItem menuItem = new MenuItem(value.getMenuString(), value.getIcon().map(JabRefIcon::getGraphicNode).orElse(null));
-            menuItem.setOnAction(event -> specialField.setSpecialFieldValue(entry, value.getValue()));
+            MenuItem menuItem =
+                    new MenuItem(
+                            value.getMenuString(),
+                            value.getIcon().map(JabRefIcon::getGraphicNode).orElse(null));
+            menuItem.setOnAction(
+                    event -> specialField.setSpecialFieldValue(entry, value.getValue()));
             contextMenu.getItems().add(menuItem);
         }
 
         return contextMenu;
     }
 
-    private Node createSpecialFieldIcon(Optional<SpecialFieldValueViewModel> fieldValue, SpecialFieldViewModel specialField) {
-        return fieldValue.flatMap(SpecialFieldValueViewModel::getIcon)
-                         .map(JabRefIcon::getGraphicNode)
-                         .orElseGet(() -> {
-                             Node node = specialField.getEmptyIcon().getGraphicNode();
-                             node.getStyleClass().add("empty-special-field");
-                             return node;
-                         });
+    private Node createSpecialFieldIcon(
+            Optional<SpecialFieldValueViewModel> fieldValue, SpecialFieldViewModel specialField) {
+        return fieldValue
+                .flatMap(SpecialFieldValueViewModel::getIcon)
+                .map(JabRefIcon::getGraphicNode)
+                .orElseGet(
+                        () -> {
+                            Node node = specialField.getEmptyIcon().getGraphicNode();
+                            node.getStyleClass().add("empty-special-field");
+                            return node;
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/menus/ChangeEntryTypeAction.java b/src/main/java/org/jabref/gui/menus/ChangeEntryTypeAction.java
index 8d7a70f3e9e8..0dd1e26a9222 100644
--- a/src/main/java/org/jabref/gui/menus/ChangeEntryTypeAction.java
+++ b/src/main/java/org/jabref/gui/menus/ChangeEntryTypeAction.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.menus;
 
-import java.util.List;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableChangeType;
@@ -11,6 +7,10 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.EntryType;
 
+import java.util.List;
+
+import javax.swing.undo.UndoManager;
+
 public class ChangeEntryTypeAction extends SimpleCommand {
 
     private final EntryType type;
@@ -26,8 +26,12 @@ public ChangeEntryTypeAction(EntryType type, List<BibEntry> entries, UndoManager
     @Override
     public void execute() {
         NamedCompound compound = new NamedCompound(Localization.lang("Change entry type"));
-        entries.forEach(e -> e.setType(type)
-                              .ifPresent(change -> compound.addEdit(new UndoableChangeType(change))));
+        entries.forEach(
+                e ->
+                        e.setType(type)
+                                .ifPresent(
+                                        change ->
+                                                compound.addEdit(new UndoableChangeType(change))));
         undoManager.addEdit(compound);
     }
 }
diff --git a/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java b/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java
index 4ad7dbe3cb27..15f51fab6ec5 100644
--- a/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java
+++ b/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.menus;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.ContextMenu;
@@ -23,6 +17,12 @@
 import org.jabref.model.entry.types.BibtexEntryTypeDefinitions;
 import org.jabref.model.entry.types.IEEETranEntryTypeDefinitions;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
+
 public class ChangeEntryTypeMenu {
 
     private final List<BibEntry> entries;
@@ -31,10 +31,11 @@ public class ChangeEntryTypeMenu {
     private final ActionFactory factory;
     private final BibEntryTypesManager entryTypesManager;
 
-    public ChangeEntryTypeMenu(List<BibEntry> entries,
-                               BibDatabaseContext bibDatabaseContext,
-                               UndoManager undoManager,
-                               BibEntryTypesManager entryTypesManager) {
+    public ChangeEntryTypeMenu(
+            List<BibEntry> entries,
+            BibDatabaseContext bibDatabaseContext,
+            UndoManager undoManager,
+            BibEntryTypesManager entryTypesManager) {
         this.entries = entries;
         this.bibDatabaseContext = bibDatabaseContext;
         this.undoManager = undoManager;
@@ -54,43 +55,57 @@ public Menu asSubMenu() {
         return menu;
     }
 
-    private ObservableList<MenuItem> getMenuItems(List<BibEntry> entries, BibDatabaseContext bibDatabaseContext, UndoManager undoManager) {
+    private ObservableList<MenuItem> getMenuItems(
+            List<BibEntry> entries,
+            BibDatabaseContext bibDatabaseContext,
+            UndoManager undoManager) {
         ObservableList<MenuItem> items = FXCollections.observableArrayList();
 
         if (bibDatabaseContext.isBiblatexMode()) {
             // Default BibLaTeX
-            items.addAll(fromEntryTypes(entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX), entries, undoManager));
+            items.addAll(
+                    fromEntryTypes(
+                            entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX),
+                            entries,
+                            undoManager));
 
             // Custom types
-            createSubMenu(Localization.lang("Custom"), entryTypesManager.getAllCustomTypes(BibDatabaseMode.BIBLATEX), entries, undoManager)
-                    .ifPresent(subMenu ->
-                            items.addAll(new SeparatorMenuItem(),
-                            subMenu
-                    ));
+            createSubMenu(
+                            Localization.lang("Custom"),
+                            entryTypesManager.getAllCustomTypes(BibDatabaseMode.BIBLATEX),
+                            entries,
+                            undoManager)
+                    .ifPresent(subMenu -> items.addAll(new SeparatorMenuItem(), subMenu));
         } else {
             // Default BibTeX
-            createSubMenu(BibDatabaseMode.BIBTEX.getFormattedName(), BibtexEntryTypeDefinitions.ALL, entries, undoManager)
+            createSubMenu(
+                            BibDatabaseMode.BIBTEX.getFormattedName(),
+                            BibtexEntryTypeDefinitions.ALL,
+                            entries,
+                            undoManager)
                     .ifPresent(items::add);
 
             // IEEETran
             createSubMenu("IEEETran", IEEETranEntryTypeDefinitions.ALL, entries, undoManager)
-                    .ifPresent(subMenu -> items.addAll(
-                            new SeparatorMenuItem(),
-                            subMenu
-                    ));
+                    .ifPresent(subMenu -> items.addAll(new SeparatorMenuItem(), subMenu));
 
             // Custom types
-            createSubMenu(Localization.lang("Custom"), entryTypesManager.getAllCustomTypes(BibDatabaseMode.BIBTEX), entries, undoManager)
-                    .ifPresent(subMenu -> items.addAll(
-                            new SeparatorMenuItem(),
-                            subMenu
-                    ));
+            createSubMenu(
+                            Localization.lang("Custom"),
+                            entryTypesManager.getAllCustomTypes(BibDatabaseMode.BIBTEX),
+                            entries,
+                            undoManager)
+                    .ifPresent(subMenu -> items.addAll(new SeparatorMenuItem(), subMenu));
         }
 
         return items;
     }
 
-    private Optional<Menu> createSubMenu(String text, List<BibEntryType> entryTypes, List<BibEntry> entries, UndoManager undoManager) {
+    private Optional<Menu> createSubMenu(
+            String text,
+            List<BibEntryType> entryTypes,
+            List<BibEntry> entries,
+            UndoManager undoManager) {
         Menu subMenu = null;
 
         if (!entryTypes.isEmpty()) {
@@ -101,10 +116,15 @@ private Optional<Menu> createSubMenu(String text, List<BibEntryType> entryTypes,
         return Optional.ofNullable(subMenu);
     }
 
-    private List<MenuItem> fromEntryTypes(Collection<BibEntryType> types, List<BibEntry> entries, UndoManager undoManager) {
+    private List<MenuItem> fromEntryTypes(
+            Collection<BibEntryType> types, List<BibEntry> entries, UndoManager undoManager) {
         return types.stream()
-                    .map(BibEntryType::getType)
-                    .map(type -> factory.createMenuItem(type::getDisplayName, new ChangeEntryTypeAction(type, entries, undoManager)))
-                    .toList();
+                .map(BibEntryType::getType)
+                .map(
+                        type ->
+                                factory.createMenuItem(
+                                        type::getDisplayName,
+                                        new ChangeEntryTypeAction(type, entries, undoManager)))
+                .toList();
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java b/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java
index 06c6c0cd1f77..35de4247341e 100644
--- a/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java
+++ b/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java
@@ -1,24 +1,28 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
+import com.github.difflib.DiffUtils;
+import com.github.difflib.patch.AbstractDelta;
 
 import javafx.scene.text.Text;
 
-import com.github.difflib.DiffUtils;
-import com.github.difflib.patch.AbstractDelta;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class DiffHighlighting {
 
-    private DiffHighlighting() {
-    }
+    private DiffHighlighting() {}
 
-    public static List<Text> generateDiffHighlighting(String baseString, String modifiedString, String separator) {
+    public static List<Text> generateDiffHighlighting(
+            String baseString, String modifiedString, String separator) {
         List<String> baseStringSplit = Arrays.asList(baseString.split(separator));
         List<String> modifiedStringSplit = Arrays.asList(modifiedString.split(separator));
-        List<AbstractDelta<String>> deltaList = DiffUtils.diff(baseStringSplit, modifiedStringSplit).getDeltas();
-        List<Text> result = baseStringSplit.stream().map(text -> forUnchanged(text + separator)).collect(Collectors.toList());
+        List<AbstractDelta<String>> deltaList =
+                DiffUtils.diff(baseStringSplit, modifiedStringSplit).getDeltas();
+        List<Text> result =
+                baseStringSplit.stream()
+                        .map(text -> forUnchanged(text + separator))
+                        .collect(Collectors.toList());
         for (AbstractDelta<String> delta : deltaList.reversed()) {
             int startPos = delta.getSource().getPosition();
             List<String> lines = delta.getSource().getLines();
@@ -29,8 +33,12 @@ public static List<Text> generateDiffHighlighting(String baseString, String modi
                         result.set(startPos + offset, forRemoved(line + separator));
                         offset++;
                     }
-                    result.set(startPos + offset - 1, forRemoved(baseStringSplit.get((startPos + offset) - 1) + separator));
-                    result.add(startPos + offset, forAdded(String.join(separator, delta.getTarget().getLines())));
+                    result.set(
+                            startPos + offset - 1,
+                            forRemoved(baseStringSplit.get((startPos + offset) - 1) + separator));
+                    result.add(
+                            startPos + offset,
+                            forAdded(String.join(separator, delta.getTarget().getLines())));
                     break;
                 case DELETE:
                     for (String line : lines) {
@@ -39,7 +47,9 @@ public static List<Text> generateDiffHighlighting(String baseString, String modi
                     }
                     break;
                 case INSERT:
-                    result.add(delta.getSource().getPosition(), forAdded(String.join(separator, delta.getTarget().getLines())));
+                    result.add(
+                            delta.getSource().getPosition(),
+                            forAdded(String.join(separator, delta.getTarget().getLines())));
                     break;
                 default:
                     break;
diff --git a/src/main/java/org/jabref/gui/mergeentries/DiffHighlightingEllipsingTextFlow.java b/src/main/java/org/jabref/gui/mergeentries/DiffHighlightingEllipsingTextFlow.java
index 50970efb814c..44d2b86b4dfa 100644
--- a/src/main/java/org/jabref/gui/mergeentries/DiffHighlightingEllipsingTextFlow.java
+++ b/src/main/java/org/jabref/gui/mergeentries/DiffHighlightingEllipsingTextFlow.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.List;
+import com.tobiasdiez.easybind.EasyObservableValue;
 
 import javafx.beans.DefaultProperty;
 import javafx.beans.property.ObjectProperty;
@@ -13,23 +13,27 @@
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
 
-import com.tobiasdiez.easybind.EasyObservableValue;
+import java.util.List;
 
 @DefaultProperty("children")
 public class DiffHighlightingEllipsingTextFlow extends TextFlow {
 
-    private final static String DEFAULT_ELLIPSIS_STRING = "...";
+    private static final String DEFAULT_ELLIPSIS_STRING = "...";
     private StringProperty ellipsisString;
 
     private final ObservableList<Node> allChildren = FXCollections.observableArrayList();
-    private final ChangeListener<Number> sizeChangeListener = (observableValue, number, t1) -> adjustText();
+    private final ChangeListener<Number> sizeChangeListener =
+            (observableValue, number, t1) -> adjustText();
     private final ListChangeListener<Node> listChangeListener = this::adjustChildren;
 
     private final String fullText;
     private final EasyObservableValue<String> comparisonString;
     private final ObjectProperty<DiffMode> diffMode;
 
-    public DiffHighlightingEllipsingTextFlow(String fullText, EasyObservableValue<String> comparisonString, ObjectProperty<DiffMode> diffMode) {
+    public DiffHighlightingEllipsingTextFlow(
+            String fullText,
+            EasyObservableValue<String> comparisonString,
+            ObjectProperty<DiffMode> diffMode) {
         this.fullText = fullText;
         allChildren.addListener(listChangeListener);
         widthProperty().addListener(sizeChangeListener);
@@ -89,7 +93,8 @@ private boolean fillUntilOverflowing() {
                     // all Texts are displayed, let's make sure all chars are as well
                     Node lastChildAsShown = super.getChildren().get(super.getChildren().size() - 1);
                     Node lastChild = allChildren.getLast();
-                    if (lastChildAsShown instanceof Text text && text.getText().length() < ((Text) lastChild).getText().length()) {
+                    if (lastChildAsShown instanceof Text text
+                            && text.getText().length() < ((Text) lastChild).getText().length()) {
                         text.setText(((Text) lastChild).getText());
                     } else {
                         // nothing to fill the space with
@@ -106,12 +111,15 @@ private boolean fillUntilOverflowing() {
 
     private boolean ellipseUntilTextFits() {
         while (getHeight() > getMaxHeight() || getWidth() > getMaxWidth()) {
-            Text lastChildAsShown = (Text) super.getChildren().remove(super.getChildren().size() - 1);
-            while (getEllipsisString().equals(lastChildAsShown.getText()) || "".equals(lastChildAsShown.getText())) {
+            Text lastChildAsShown =
+                    (Text) super.getChildren().remove(super.getChildren().size() - 1);
+            while (getEllipsisString().equals(lastChildAsShown.getText())
+                    || "".equals(lastChildAsShown.getText())) {
                 if (super.getChildren().isEmpty()) {
                     return false;
                 }
-                lastChildAsShown = (Text) super.getChildren().remove(super.getChildren().size() - 1);
+                lastChildAsShown =
+                        (Text) super.getChildren().remove(super.getChildren().size() - 1);
             }
             Text shortenedChild = new Text(ellipseString(lastChildAsShown.getText()));
             shortenedChild.getStyleClass().addAll(lastChildAsShown.getStyleClass());
@@ -124,16 +132,23 @@ private boolean ellipseUntilTextFits() {
     public void highlightDiff() {
         allChildren.clear();
         if (comparisonString.get() != null && !comparisonString.get().equals(fullText)) {
-            final List<Text> highlightedText = switch (diffMode.getValue()) {
-                case PLAIN -> {
-                    Text text = new Text(fullText);
-                    text.getStyleClass().add("text-unchanged");
-                    yield List.of(text);
-                }
-                case WORD -> DiffHighlighting.generateDiffHighlighting(comparisonString.get(), fullText, " ");
-                case CHARACTER -> DiffHighlighting.generateDiffHighlighting(comparisonString.get(), fullText, "");
-                default -> throw new UnsupportedOperationException("Not implemented " + diffMode.getValue());
-            };
+            final List<Text> highlightedText =
+                    switch (diffMode.getValue()) {
+                        case PLAIN -> {
+                            Text text = new Text(fullText);
+                            text.getStyleClass().add("text-unchanged");
+                            yield List.of(text);
+                        }
+                        case WORD ->
+                                DiffHighlighting.generateDiffHighlighting(
+                                        comparisonString.get(), fullText, " ");
+                        case CHARACTER ->
+                                DiffHighlighting.generateDiffHighlighting(
+                                        comparisonString.get(), fullText, "");
+                        default ->
+                                throw new UnsupportedOperationException(
+                                        "Not implemented " + diffMode.getValue());
+                    };
             allChildren.addAll(highlightedText);
         } else {
             Text text = new Text(fullText);
diff --git a/src/main/java/org/jabref/gui/mergeentries/DiffMode.java b/src/main/java/org/jabref/gui/mergeentries/DiffMode.java
index de05daebb10e..b46f0b4f4b1b 100644
--- a/src/main/java/org/jabref/gui/mergeentries/DiffMode.java
+++ b/src/main/java/org/jabref/gui/mergeentries/DiffMode.java
@@ -3,7 +3,6 @@
 import org.jabref.logic.l10n.Localization;
 
 public enum DiffMode {
-
     PLAIN(Localization.lang("None")),
     WORD(Localization.lang("Word by word")),
     CHARACTER(Localization.lang("Character by character")),
diff --git a/src/main/java/org/jabref/gui/mergeentries/EntriesMergeResult.java b/src/main/java/org/jabref/gui/mergeentries/EntriesMergeResult.java
index b134b11688a0..737b20eaed1e 100644
--- a/src/main/java/org/jabref/gui/mergeentries/EntriesMergeResult.java
+++ b/src/main/java/org/jabref/gui/mergeentries/EntriesMergeResult.java
@@ -3,6 +3,8 @@
 import org.jabref.model.entry.BibEntry;
 
 public record EntriesMergeResult(
-        BibEntry originalLeftEntry, BibEntry originalRightEntry, BibEntry newLeftEntry, BibEntry newRightEntry, BibEntry mergedEntry
-) {
-}
+        BibEntry originalLeftEntry,
+        BibEntry originalRightEntry,
+        BibEntry newLeftEntry,
+        BibEntry newRightEntry,
+        BibEntry mergedEntry) {}
diff --git a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
index dbe205a24c48..8b3ec6b80423 100644
--- a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
+++ b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
@@ -1,15 +1,5 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.undo.NamedCompound;
@@ -31,16 +21,26 @@
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryType;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.swing.undo.UndoManager;
+
 /**
  * Class for fetching and merging bibliographic information
  */
 public class FetchAndMergeEntry {
 
-    public static List<Field> SUPPORTED_FIELDS = Arrays.asList(StandardField.DOI, StandardField.EPRINT, StandardField.ISBN);
+    public static List<Field> SUPPORTED_FIELDS =
+            Arrays.asList(StandardField.DOI, StandardField.EPRINT, StandardField.ISBN);
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FetchAndMergeEntry.class);
     private final DialogService dialogService;
@@ -49,11 +49,12 @@ public class FetchAndMergeEntry {
     private final TaskExecutor taskExecutor;
     private final GuiPreferences preferences;
 
-    public FetchAndMergeEntry(BibDatabaseContext bibDatabaseContext,
-                              TaskExecutor taskExecutor,
-                              GuiPreferences preferences,
-                              DialogService dialogService,
-                              UndoManager undoManager) {
+    public FetchAndMergeEntry(
+            BibDatabaseContext bibDatabaseContext,
+            TaskExecutor taskExecutor,
+            GuiPreferences preferences,
+            DialogService dialogService,
+            UndoManager undoManager) {
         this.bibDatabaseContext = bibDatabaseContext;
         this.taskExecutor = taskExecutor;
         this.preferences = preferences;
@@ -73,30 +74,58 @@ public void fetchAndMerge(BibEntry entry, List<Field> fields) {
         for (Field field : fields) {
             Optional<String> fieldContent = entry.getField(field);
             if (fieldContent.isPresent()) {
-                Optional<IdBasedFetcher> fetcher = WebFetchers.getIdBasedFetcherForField(field, preferences.getImportFormatPreferences());
+                Optional<IdBasedFetcher> fetcher =
+                        WebFetchers.getIdBasedFetcherForField(
+                                field, preferences.getImportFormatPreferences());
                 if (fetcher.isPresent()) {
                     BackgroundTask.wrap(() -> fetcher.get().performSearchById(fieldContent.get()))
-                                  .onSuccess(fetchedEntry -> {
-                                      ImportCleanup cleanup = ImportCleanup.targeting(bibDatabaseContext.getMode(), preferences.getFieldPreferences());
-                                      String type = field.getDisplayName();
-                                      if (fetchedEntry.isPresent()) {
-                                          cleanup.doPostCleanup(fetchedEntry.get());
-                                          showMergeDialog(entry, fetchedEntry.get(), fetcher.get());
-                                      } else {
-                                          dialogService.notify(Localization.lang("Cannot get info based on given %0: %1", type, fieldContent.get()));
-                                      }
-                                  })
-                                  .onFailure(exception -> {
-                                      LOGGER.error("Error while fetching bibliographic information", exception);
-                                      if (exception instanceof FetcherClientException) {
-                                          dialogService.showInformationDialogAndWait(Localization.lang("Fetching information using %0", fetcher.get().getName()), Localization.lang("No data was found for the identifier"));
-                                      } else if (exception instanceof FetcherServerException) {
-                                          dialogService.showInformationDialogAndWait(Localization.lang("Fetching information using %0", fetcher.get().getName()), Localization.lang("Server not available"));
-                                      } else {
-                                          dialogService.showInformationDialogAndWait(Localization.lang("Fetching information using %0", fetcher.get().getName()), Localization.lang("Error occurred %0", exception.getMessage()));
-                                      }
-                                  })
-                                  .executeWith(taskExecutor);
+                            .onSuccess(
+                                    fetchedEntry -> {
+                                        ImportCleanup cleanup =
+                                                ImportCleanup.targeting(
+                                                        bibDatabaseContext.getMode(),
+                                                        preferences.getFieldPreferences());
+                                        String type = field.getDisplayName();
+                                        if (fetchedEntry.isPresent()) {
+                                            cleanup.doPostCleanup(fetchedEntry.get());
+                                            showMergeDialog(
+                                                    entry, fetchedEntry.get(), fetcher.get());
+                                        } else {
+                                            dialogService.notify(
+                                                    Localization.lang(
+                                                            "Cannot get info based on given %0: %1",
+                                                            type, fieldContent.get()));
+                                        }
+                                    })
+                            .onFailure(
+                                    exception -> {
+                                        LOGGER.error(
+                                                "Error while fetching bibliographic information",
+                                                exception);
+                                        if (exception instanceof FetcherClientException) {
+                                            dialogService.showInformationDialogAndWait(
+                                                    Localization.lang(
+                                                            "Fetching information using %0",
+                                                            fetcher.get().getName()),
+                                                    Localization.lang(
+                                                            "No data was found for the identifier"));
+                                        } else if (exception instanceof FetcherServerException) {
+                                            dialogService.showInformationDialogAndWait(
+                                                    Localization.lang(
+                                                            "Fetching information using %0",
+                                                            fetcher.get().getName()),
+                                                    Localization.lang("Server not available"));
+                                        } else {
+                                            dialogService.showInformationDialogAndWait(
+                                                    Localization.lang(
+                                                            "Fetching information using %0",
+                                                            fetcher.get().getName()),
+                                                    Localization.lang(
+                                                            "Error occurred %0",
+                                                            exception.getMessage()));
+                                        }
+                                    })
+                            .executeWith(taskExecutor);
                 }
             } else {
                 dialogService.notify(Localization.lang("No %0 found", field.getDisplayName()));
@@ -104,15 +133,21 @@ public void fetchAndMerge(BibEntry entry, List<Field> fields) {
         }
     }
 
-    private void showMergeDialog(BibEntry originalEntry, BibEntry fetchedEntry, WebFetcher fetcher) {
-        MergeEntriesDialog dialog = new MergeEntriesDialog(originalEntry, fetchedEntry, preferences);
+    private void showMergeDialog(
+            BibEntry originalEntry, BibEntry fetchedEntry, WebFetcher fetcher) {
+        MergeEntriesDialog dialog =
+                new MergeEntriesDialog(originalEntry, fetchedEntry, preferences);
         dialog.setTitle(Localization.lang("Merge entry with %0 information", fetcher.getName()));
         dialog.setLeftHeaderText(Localization.lang("Original entry"));
         dialog.setRightHeaderText(Localization.lang("Entry from %0", fetcher.getName()));
-        Optional<BibEntry> mergedEntry = dialogService.showCustomDialogAndWait(dialog).map(EntriesMergeResult::mergedEntry);
+        Optional<BibEntry> mergedEntry =
+                dialogService.showCustomDialogAndWait(dialog).map(EntriesMergeResult::mergedEntry);
 
         if (mergedEntry.isPresent()) {
-            NamedCompound ce = new NamedCompound(Localization.lang("Merge entry with %0 information", fetcher.getName()));
+            NamedCompound ce =
+                    new NamedCompound(
+                            Localization.lang(
+                                    "Merge entry with %0 information", fetcher.getName()));
 
             // Updated the original entry with the new fields
             Set<Field> jointFields = new TreeSet<>(Comparator.comparing(Field::getName));
@@ -136,9 +171,14 @@ private void showMergeDialog(BibEntry originalEntry, BibEntry fetchedEntry, WebF
                 Optional<String> originalString = originalEntry.getField(field);
                 Optional<String> mergedString = mergedEntry.get().getField(field);
                 if (originalString.isEmpty() || !originalString.equals(mergedString)) {
-                    originalEntry.setField(field, mergedString.get()); // mergedString always present
-                    ce.addEdit(new UndoableFieldChange(originalEntry, field, originalString.orElse(null),
-                            mergedString.get()));
+                    originalEntry.setField(
+                            field, mergedString.get()); // mergedString always present
+                    ce.addEdit(
+                            new UndoableFieldChange(
+                                    originalEntry,
+                                    field,
+                                    originalString.orElse(null),
+                                    mergedString.get()));
                     edited = true;
                 }
             }
@@ -148,7 +188,12 @@ private void showMergeDialog(BibEntry originalEntry, BibEntry fetchedEntry, WebF
                 if (!jointFields.contains(field) && !FieldFactory.isInternalField(field)) {
                     Optional<String> originalString = originalEntry.getField(field);
                     originalEntry.clearField(field);
-                    ce.addEdit(new UndoableFieldChange(originalEntry, field, originalString.get(), null)); // originalString always present
+                    ce.addEdit(
+                            new UndoableFieldChange(
+                                    originalEntry,
+                                    field,
+                                    originalString.get(),
+                                    null)); // originalString always present
                     edited = true;
                 }
             }
@@ -156,7 +201,8 @@ private void showMergeDialog(BibEntry originalEntry, BibEntry fetchedEntry, WebF
             if (edited) {
                 ce.end();
                 undoManager.addEdit(ce);
-                dialogService.notify(Localization.lang("Updated entry with info from %0", fetcher.getName()));
+                dialogService.notify(
+                        Localization.lang("Updated entry with info from %0", fetcher.getName()));
             } else {
                 dialogService.notify(Localization.lang("No information added"));
             }
@@ -167,19 +213,32 @@ private void showMergeDialog(BibEntry originalEntry, BibEntry fetchedEntry, WebF
 
     public void fetchAndMerge(BibEntry entry, EntryBasedFetcher fetcher) {
         BackgroundTask.wrap(() -> fetcher.performSearch(entry).stream().findFirst())
-                      .onSuccess(fetchedEntry -> {
-                          if (fetchedEntry.isPresent()) {
-                              ImportCleanup cleanup = ImportCleanup.targeting(bibDatabaseContext.getMode(), preferences.getFieldPreferences());
-                              cleanup.doPostCleanup(fetchedEntry.get());
-                              showMergeDialog(entry, fetchedEntry.get(), fetcher);
-                          } else {
-                              dialogService.notify(Localization.lang("Could not find any bibliographic information."));
-                          }
-                      })
-                      .onFailure(exception -> {
-                          LOGGER.error("Error while fetching entry with {} ", fetcher.getName(), exception);
-                          dialogService.showErrorDialogAndWait(Localization.lang("Error while fetching from %0", fetcher.getName()), exception);
-                      })
-                      .executeWith(taskExecutor);
+                .onSuccess(
+                        fetchedEntry -> {
+                            if (fetchedEntry.isPresent()) {
+                                ImportCleanup cleanup =
+                                        ImportCleanup.targeting(
+                                                bibDatabaseContext.getMode(),
+                                                preferences.getFieldPreferences());
+                                cleanup.doPostCleanup(fetchedEntry.get());
+                                showMergeDialog(entry, fetchedEntry.get(), fetcher);
+                            } else {
+                                dialogService.notify(
+                                        Localization.lang(
+                                                "Could not find any bibliographic information."));
+                            }
+                        })
+                .onFailure(
+                        exception -> {
+                            LOGGER.error(
+                                    "Error while fetching entry with {} ",
+                                    fetcher.getName(),
+                                    exception);
+                            dialogService.showErrorDialogAndWait(
+                                    Localization.lang(
+                                            "Error while fetching from %0", fetcher.getName()),
+                                    exception);
+                        })
+                .executeWith(taskExecutor);
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeDialogPreferences.java b/src/main/java/org/jabref/gui/mergeentries/MergeDialogPreferences.java
index 15709455d69c..c5432ed7825b 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeDialogPreferences.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeDialogPreferences.java
@@ -14,15 +14,17 @@ public class MergeDialogPreferences {
     private final BooleanProperty mergeHighlightWords;
     private final BooleanProperty mergeShowChangedFieldsOnly;
     private final BooleanProperty mergeApplyToAllEntries;
-    private final ObjectProperty<DuplicateResolverDialog.DuplicateResolverResult> allEntriesDuplicateResolverDecision;
-
-    public MergeDialogPreferences(DiffMode mergeDiffMode,
-                                  boolean mergeShouldShowDiff,
-                                  boolean mergeShouldShowUnifiedDiff,
-                                  boolean mergeHighlightWords,
-                                  boolean mergeShowChangedFieldsOnly,
-                                  boolean mergeApplyToAllEntries,
-                                  DuplicateResolverDialog.DuplicateResolverResult allEntriesDuplicateResolverDecision) {
+    private final ObjectProperty<DuplicateResolverDialog.DuplicateResolverResult>
+            allEntriesDuplicateResolverDecision;
+
+    public MergeDialogPreferences(
+            DiffMode mergeDiffMode,
+            boolean mergeShouldShowDiff,
+            boolean mergeShouldShowUnifiedDiff,
+            boolean mergeHighlightWords,
+            boolean mergeShowChangedFieldsOnly,
+            boolean mergeApplyToAllEntries,
+            DuplicateResolverDialog.DuplicateResolverResult allEntriesDuplicateResolverDecision) {
         this.mergeDiffMode = new SimpleObjectProperty<>(mergeDiffMode);
         this.mergeShouldShowDiff = new SimpleBooleanProperty(mergeShouldShowDiff);
         this.mergeShouldShowUnifiedDiff = new SimpleBooleanProperty(mergeShouldShowUnifiedDiff);
@@ -30,7 +32,8 @@ public MergeDialogPreferences(DiffMode mergeDiffMode,
 
         this.mergeShowChangedFieldsOnly = new SimpleBooleanProperty(mergeShowChangedFieldsOnly);
         this.mergeApplyToAllEntries = new SimpleBooleanProperty(mergeApplyToAllEntries);
-        this.allEntriesDuplicateResolverDecision = new SimpleObjectProperty<>(allEntriesDuplicateResolverDecision);
+        this.allEntriesDuplicateResolverDecision =
+                new SimpleObjectProperty<>(allEntriesDuplicateResolverDecision);
     }
 
     public DiffMode getMergeDiffMode() {
@@ -105,15 +108,18 @@ public void setIsMergeApplyToAllEntries(boolean applyToAllEntries) {
         this.mergeApplyToAllEntries.setValue(applyToAllEntries);
     }
 
-    public void setAllEntriesDuplicateResolverDecision(DuplicateResolverDialog.DuplicateResolverResult allEntriesDuplicateResolverDecision) {
+    public void setAllEntriesDuplicateResolverDecision(
+            DuplicateResolverDialog.DuplicateResolverResult allEntriesDuplicateResolverDecision) {
         this.allEntriesDuplicateResolverDecision.setValue(allEntriesDuplicateResolverDecision);
     }
 
-    public DuplicateResolverDialog.DuplicateResolverResult getAllEntriesDuplicateResolverDecision() {
+    public DuplicateResolverDialog.DuplicateResolverResult
+            getAllEntriesDuplicateResolverDecision() {
         return allEntriesDuplicateResolverDecision.get();
     }
 
-    public ObjectProperty<DuplicateResolverDialog.DuplicateResolverResult> allEntriesDuplicateResolverDecisionProperty() {
+    public ObjectProperty<DuplicateResolverDialog.DuplicateResolverResult>
+            allEntriesDuplicateResolverDecisionProperty() {
         return allEntriesDuplicateResolverDecision;
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
index 82c7b07c95f5..aca832b8db0f 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.List;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
@@ -15,6 +10,11 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
 
+import java.util.List;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
+
 public class MergeEntriesAction extends SimpleCommand {
     private static final int NUMBER_OF_ENTRIES_NEEDED = 2;
     private final DialogService dialogService;
@@ -22,13 +22,18 @@ public class MergeEntriesAction extends SimpleCommand {
     private final UndoManager undoManager;
     private final GuiPreferences preferences;
 
-    public MergeEntriesAction(DialogService dialogService, StateManager stateManager, UndoManager undoManager, GuiPreferences preferences) {
+    public MergeEntriesAction(
+            DialogService dialogService,
+            StateManager stateManager,
+            UndoManager undoManager,
+            GuiPreferences preferences) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.undoManager = undoManager;
         this.preferences = preferences;
 
-        this.executable.bind(ActionHelper.needsEntriesSelected(NUMBER_OF_ENTRIES_NEEDED, stateManager));
+        this.executable.bind(
+                ActionHelper.needsEntriesSelected(NUMBER_OF_ENTRIES_NEEDED, stateManager));
     }
 
     @Override
@@ -54,7 +59,8 @@ public void execute() {
         // compare two entries
         BibEntry first;
         BibEntry second;
-        EntryComparator entryComparator = new EntryComparator(false, false, InternalField.KEY_FIELD);
+        EntryComparator entryComparator =
+                new EntryComparator(false, false, InternalField.KEY_FIELD);
         if (entryComparator.compare(one, two) <= 0) {
             first = one;
             second = two;
@@ -67,10 +73,13 @@ public void execute() {
         dialog.setTitle(Localization.lang("Merge entries"));
 
         Optional<EntriesMergeResult> mergeResultOpt = dialogService.showCustomDialogAndWait(dialog);
-        mergeResultOpt.ifPresentOrElse(entriesMergeResult -> {
-            new MergeTwoEntriesAction(entriesMergeResult, stateManager, undoManager).execute();
+        mergeResultOpt.ifPresentOrElse(
+                entriesMergeResult -> {
+                    new MergeTwoEntriesAction(entriesMergeResult, stateManager, undoManager)
+                            .execute();
 
-            dialogService.notify(Localization.lang("Merged entries"));
-        }, () -> dialogService.notify(Localization.lang("Canceled merging entries")));
+                    dialogService.notify(Localization.lang("Merged entries"));
+                },
+                () -> dialogService.notify(Localization.lang("Canceled merging entries")));
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
index 9613b457991b..81f415b671ba 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
@@ -33,16 +33,23 @@ private void init() {
         this.getDialogPane().setContent(threeWayMergeView);
 
         // Create buttons
-        ButtonType replaceEntries = new ButtonType(Localization.lang("Merge entries"), ButtonBar.ButtonData.OK_DONE);
+        ButtonType replaceEntries =
+                new ButtonType(Localization.lang("Merge entries"), ButtonBar.ButtonData.OK_DONE);
         this.getDialogPane().getButtonTypes().setAll(ButtonType.CANCEL, replaceEntries);
-        this.setResultConverter(buttonType -> {
-            threeWayMergeView.saveConfiguration();
-            if (buttonType.equals(replaceEntries)) {
-                return new EntriesMergeResult(one, two, threeWayMergeView.getLeftEntry(), threeWayMergeView.getRightEntry(), threeWayMergeView.getMergedEntry());
-            } else {
-                return null;
-            }
-        });
+        this.setResultConverter(
+                buttonType -> {
+                    threeWayMergeView.saveConfiguration();
+                    if (buttonType.equals(replaceEntries)) {
+                        return new EntriesMergeResult(
+                                one,
+                                two,
+                                threeWayMergeView.getLeftEntry(),
+                                threeWayMergeView.getRightEntry(),
+                                threeWayMergeView.getMergedEntry());
+                    } else {
+                        return null;
+                    }
+                });
     }
 
     public void setLeftHeaderText(String leftHeaderText) {
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeResult.java b/src/main/java/org/jabref/gui/mergeentries/MergeResult.java
index 6db5a7a60e5a..a91af4d0083f 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeResult.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeResult.java
@@ -2,7 +2,4 @@
 
 import org.jabref.model.entry.BibEntry;
 
-public record MergeResult(
-        BibEntry leftEntry, BibEntry rightEntry, BibEntry mergedEntry
-) {
-}
+public record MergeResult(BibEntry leftEntry, BibEntry rightEntry, BibEntry mergedEntry) {}
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeTwoEntriesAction.java b/src/main/java/org/jabref/gui/mergeentries/MergeTwoEntriesAction.java
index 7ece7d1c8f5d..47f7fe668b6a 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeTwoEntriesAction.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeTwoEntriesAction.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.undo.NamedCompound;
@@ -14,12 +9,20 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 
+import java.util.Arrays;
+import java.util.List;
+
+import javax.swing.undo.UndoManager;
+
 public class MergeTwoEntriesAction extends SimpleCommand {
     private final EntriesMergeResult entriesMergeResult;
     private final StateManager stateManager;
     private final UndoManager undoManager;
 
-    public MergeTwoEntriesAction(EntriesMergeResult entriesMergeResult, StateManager stateManager, UndoManager undoManager) {
+    public MergeTwoEntriesAction(
+            EntriesMergeResult entriesMergeResult,
+            StateManager stateManager,
+            UndoManager undoManager) {
         this.entriesMergeResult = entriesMergeResult;
         this.stateManager = stateManager;
         this.undoManager = undoManager;
@@ -32,13 +35,19 @@ public void execute() {
         }
 
         BibDatabase database = stateManager.getActiveDatabase().get().getDatabase();
-        List<BibEntry> entriesToRemove = Arrays.asList(entriesMergeResult.originalLeftEntry(), entriesMergeResult.originalRightEntry());
+        List<BibEntry> entriesToRemove =
+                Arrays.asList(
+                        entriesMergeResult.originalLeftEntry(),
+                        entriesMergeResult.originalRightEntry());
 
         database.insertEntry(entriesMergeResult.mergedEntry());
         database.removeEntries(entriesToRemove);
 
         NamedCompound ce = new NamedCompound(Localization.lang("Merge entries"));
-        ce.addEdit(new UndoableInsertEntries(stateManager.getActiveDatabase().get().getDatabase(), entriesMergeResult.mergedEntry()));
+        ce.addEdit(
+                new UndoableInsertEntries(
+                        stateManager.getActiveDatabase().get().getDatabase(),
+                        entriesMergeResult.mergedEntry()));
         ce.addEdit(new UndoableRemoveEntries(database, entriesToRemove));
         ce.end();
 
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java b/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java
index 743b0aac9005..1b993c0f2dbf 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.mergeentries;
 
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
@@ -13,6 +11,8 @@
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.StandardField;
 
+import javax.swing.undo.UndoManager;
+
 public class MergeWithFetchedEntryAction extends SimpleCommand {
 
     private final DialogService dialogService;
@@ -21,19 +21,23 @@ public class MergeWithFetchedEntryAction extends SimpleCommand {
     private final UndoManager undoManager;
     private final TaskExecutor taskExecutor;
 
-    public MergeWithFetchedEntryAction(DialogService dialogService,
-                                       StateManager stateManager,
-                                       TaskExecutor taskExecutor,
-                                       GuiPreferences preferences,
-                                       UndoManager undoManager) {
+    public MergeWithFetchedEntryAction(
+            DialogService dialogService,
+            StateManager stateManager,
+            TaskExecutor taskExecutor,
+            GuiPreferences preferences,
+            UndoManager undoManager) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
         this.preferences = preferences;
         this.undoManager = undoManager;
 
-        this.executable.bind(ActionHelper.needsEntriesSelected(1, stateManager)
-                                         .and(ActionHelper.isAnyFieldSetForSelectedEntry(FetchAndMergeEntry.SUPPORTED_FIELDS, stateManager)));
+        this.executable.bind(
+                ActionHelper.needsEntriesSelected(1, stateManager)
+                        .and(
+                                ActionHelper.isAnyFieldSetForSelectedEntry(
+                                        FetchAndMergeEntry.SUPPORTED_FIELDS, stateManager)));
     }
 
     @Override
@@ -44,11 +48,23 @@ public void execute() {
 
         if (stateManager.getSelectedEntries().size() != 1) {
             dialogService.showInformationDialogAndWait(
-                    Localization.lang("Merge entry with %0 information", new OrFields(StandardField.DOI, StandardField.ISBN, StandardField.EPRINT).getDisplayName()),
+                    Localization.lang(
+                            "Merge entry with %0 information",
+                            new OrFields(
+                                            StandardField.DOI,
+                                            StandardField.ISBN,
+                                            StandardField.EPRINT)
+                                    .getDisplayName()),
                     Localization.lang("This operation requires exactly one item to be selected."));
         }
 
         BibEntry originalEntry = stateManager.getSelectedEntries().getFirst();
-        new FetchAndMergeEntry(stateManager.getActiveDatabase().get(), taskExecutor, preferences, dialogService, undoManager).fetchAndMerge(originalEntry);
+        new FetchAndMergeEntry(
+                        stateManager.getActiveDatabase().get(),
+                        taskExecutor,
+                        preferences,
+                        dialogService,
+                        undoManager)
+                .fetchAndMerge(originalEntry);
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesView.java b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesView.java
index 1dfebf65705c..1fdf73ac84f6 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesView.java
@@ -1,10 +1,8 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.function.Supplier;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.EasyObservableValue;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
@@ -49,13 +47,15 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.StandardField;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.EasyObservableValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.function.Supplier;
+
 public class MultiMergeEntriesView extends BaseDialog<BibEntry> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MultiMergeEntriesView.class);
@@ -85,39 +85,55 @@ public class MultiMergeEntriesView extends BaseDialog<BibEntry> {
 
     private final GuiPreferences preferences;
 
-    public MultiMergeEntriesView(GuiPreferences preferences,
-                                 TaskExecutor taskExecutor) {
+    public MultiMergeEntriesView(GuiPreferences preferences, TaskExecutor taskExecutor) {
         this.preferences = preferences;
         this.taskExecutor = taskExecutor;
 
         viewModel = new MultiMergeEntriesViewModel();
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
-        ButtonType mergeEntries = new ButtonType(Localization.lang("Merge entries"), ButtonBar.ButtonData.OK_DONE);
+        ButtonType mergeEntries =
+                new ButtonType(Localization.lang("Merge entries"), ButtonBar.ButtonData.OK_DONE);
         this.getDialogPane().getButtonTypes().setAll(ButtonType.CANCEL, mergeEntries);
         this.setResultConverter(viewModel::resultConverter);
 
-        viewModel.entriesProperty().addListener((ListChangeListener<MultiMergeEntriesViewModel.EntrySource>) c -> {
-            while (c.next()) {
-                if (c.wasAdded()) {
-                    for (MultiMergeEntriesViewModel.EntrySource entrySourceColumn : c.getAddedSubList()) {
-                        addColumn(entrySourceColumn);
-                    }
-                }
-            }
-        });
-
-        viewModel.mergedEntryProperty().get().getFieldsObservable().addListener((MapChangeListener<Field, String>) change -> {
-            if (change.wasAdded() && !fieldRows.containsKey(change.getKey())) {
-                FieldRow fieldRow = new FieldRow(
-                        change.getKey(),
-                        viewModel.mergedEntryProperty().get().getFields().size() - 1);
-                fieldRows.put(change.getKey(), fieldRow);
-            }
-        });
+        viewModel
+                .entriesProperty()
+                .addListener(
+                        (ListChangeListener<MultiMergeEntriesViewModel.EntrySource>)
+                                c -> {
+                                    while (c.next()) {
+                                        if (c.wasAdded()) {
+                                            for (MultiMergeEntriesViewModel.EntrySource
+                                                    entrySourceColumn : c.getAddedSubList()) {
+                                                addColumn(entrySourceColumn);
+                                            }
+                                        }
+                                    }
+                                });
+
+        viewModel
+                .mergedEntryProperty()
+                .get()
+                .getFieldsObservable()
+                .addListener(
+                        (MapChangeListener<Field, String>)
+                                change -> {
+                                    if (change.wasAdded()
+                                            && !fieldRows.containsKey(change.getKey())) {
+                                        FieldRow fieldRow =
+                                                new FieldRow(
+                                                        change.getKey(),
+                                                        viewModel
+                                                                        .mergedEntryProperty()
+                                                                        .get()
+                                                                        .getFields()
+                                                                        .size()
+                                                                - 1);
+                                        fieldRows.put(change.getKey(), fieldRow);
+                                    }
+                                });
     }
 
     @FXML
@@ -126,26 +142,34 @@ public void initialize() {
         leftScrollPane.vvalueProperty().bindBidirectional(centerScrollPane.vvalueProperty());
         rightScrollPane.vvalueProperty().bindBidirectional(centerScrollPane.vvalueProperty());
 
-        viewModel.failedSuppliersProperty().addListener((obs, oldValue, newValue) ->
-                failedSuppliers.setText(viewModel.failedSuppliersProperty().get().isEmpty() ? "" : Localization.lang(
-                        "Could not extract Metadata from: %0",
-                        String.join(", ", viewModel.failedSuppliersProperty())
-                ))
-        );
+        viewModel
+                .failedSuppliersProperty()
+                .addListener(
+                        (obs, oldValue, newValue) ->
+                                failedSuppliers.setText(
+                                        viewModel.failedSuppliersProperty().get().isEmpty()
+                                                ? ""
+                                                : Localization.lang(
+                                                        "Could not extract Metadata from: %0",
+                                                        String.join(
+                                                                ", ",
+                                                                viewModel
+                                                                        .failedSuppliersProperty()))));
 
         fillDiffModes();
     }
 
     private void fillDiffModes() {
-        diffMode.setItems(FXCollections.observableList(List.of(
-                DiffMode.PLAIN,
-                DiffMode.WORD,
-                DiffMode.CHARACTER)));
+        diffMode.setItems(
+                FXCollections.observableList(
+                        List.of(DiffMode.PLAIN, DiffMode.WORD, DiffMode.CHARACTER)));
         new ViewModelListCellFactory<DiffMode>()
                 .withText(DiffMode::getDisplayText)
                 .install(diffMode);
         diffMode.setValue(preferences.getMergeDialogPreferences().getMergeDiffMode());
-        EasyBind.subscribe(this.diffMode.valueProperty(), mode -> preferences.getMergeDialogPreferences().setMergeDiffMode(mode));
+        EasyBind.subscribe(
+                this.diffMode.valueProperty(),
+                mode -> preferences.getMergeDialogPreferences().setMergeDiffMode(mode));
     }
 
     private void addColumn(MultiMergeEntriesViewModel.EntrySource entrySourceColumn) {
@@ -168,16 +192,20 @@ private void addColumn(MultiMergeEntriesViewModel.EntrySource entrySourceColumn)
             writeBibEntryToColumn(entrySourceColumn, columnIndex);
         } else {
             header.setDisable(true);
-            entrySourceColumn.isLoadingProperty().addListener((observable, oldValue, newValue) -> {
-                if (!newValue && entrySourceColumn.entryProperty().get() != null) {
-                    writeBibEntryToColumn(entrySourceColumn, columnIndex);
-                    header.setDisable(false);
-                }
-            });
+            entrySourceColumn
+                    .isLoadingProperty()
+                    .addListener(
+                            (observable, oldValue, newValue) -> {
+                                if (!newValue && entrySourceColumn.entryProperty().get() != null) {
+                                    writeBibEntryToColumn(entrySourceColumn, columnIndex);
+                                    header.setDisable(false);
+                                }
+                            });
         }
     }
 
-    private ToggleButton generateEntryHeader(MultiMergeEntriesViewModel.EntrySource column, int columnIndex) {
+    private ToggleButton generateEntryHeader(
+            MultiMergeEntriesViewModel.EntrySource column, int columnIndex) {
         ToggleButton header = new ToggleButton();
         header.setToggleGroup(headerToggleGroup);
         header.textProperty().bind(column.titleProperty());
@@ -192,16 +220,18 @@ private ToggleButton generateEntryHeader(MultiMergeEntriesViewModel.EntrySource
             progressIndicator.visibleProperty().bind(column.isLoadingProperty());
         }
 
-        column.isLoadingProperty().addListener((obs, oldValue, newValue) -> {
-            if (!newValue) {
-                header.setGraphic(null);
-                if (column.entryProperty().get() == null) {
-                    header.setMinWidth(0);
-                    header.setMaxWidth(0);
-                    header.setVisible(false);
-                }
-            }
-        });
+        column.isLoadingProperty()
+                .addListener(
+                        (obs, oldValue, newValue) -> {
+                            if (!newValue) {
+                                header.setGraphic(null);
+                                if (column.entryProperty().get() == null) {
+                                    header.setMinWidth(0);
+                                    header.setMaxWidth(0);
+                                    header.setVisible(false);
+                                }
+                            }
+                        });
 
         return header;
     }
@@ -212,8 +242,10 @@ private ToggleButton generateEntryHeader(MultiMergeEntriesViewModel.EntrySource
      * @param entrySourceColumn the entry to write
      * @param columnIndex       the index of the column to write this entry to
      */
-    private void writeBibEntryToColumn(MultiMergeEntriesViewModel.EntrySource entrySourceColumn, int columnIndex) {
-        for (Map.Entry<Field, String> entry : entrySourceColumn.entryProperty().get().getFieldsObservable().entrySet()) {
+    private void writeBibEntryToColumn(
+            MultiMergeEntriesViewModel.EntrySource entrySourceColumn, int columnIndex) {
+        for (Map.Entry<Field, String> entry :
+                entrySourceColumn.entryProperty().get().getFieldsObservable().entrySet()) {
             Field key = entry.getKey();
             String value = entry.getValue();
             Cell cell = new Cell(value, key, columnIndex);
@@ -229,17 +261,30 @@ private void writeBibEntryToColumn(MultiMergeEntriesViewModel.EntrySource entryS
      * @param column       the column this button is heading
      */
     private void setupSourceButtonAction(ToggleButton sourceButton, int column) {
-        sourceButton.selectedProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue) {
-                optionsGrid.getChildrenUnmodifiable().stream()
-                           .filter(node -> GridPane.getColumnIndex(node) == column)
-                           .filter(HBox.class::isInstance)
-                           .forEach(hbox -> ((HBox) hbox).getChildrenUnmodifiable().stream()
-                                                         .filter(ToggleButton.class::isInstance)
-                                                         .forEach(toggleButton -> ((ToggleButton) toggleButton).setSelected(true)));
-                sourceButton.setSelected(true);
-            }
-        });
+        sourceButton
+                .selectedProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            if (newValue) {
+                                optionsGrid.getChildrenUnmodifiable().stream()
+                                        .filter(node -> GridPane.getColumnIndex(node) == column)
+                                        .filter(HBox.class::isInstance)
+                                        .forEach(
+                                                hbox ->
+                                                        ((HBox) hbox)
+                                                                .getChildrenUnmodifiable().stream()
+                                                                        .filter(
+                                                                                ToggleButton.class
+                                                                                        ::isInstance)
+                                                                        .forEach(
+                                                                                toggleButton ->
+                                                                                        ((ToggleButton)
+                                                                                                        toggleButton)
+                                                                                                .setSelected(
+                                                                                                        true)));
+                                sourceButton.setSelected(true);
+                            }
+                        });
     }
 
     /**
@@ -252,7 +297,8 @@ private boolean isMultilineField(Field field) {
         if (field.equals(StandardField.DOI)) {
             return false;
         }
-        return FieldFactory.isMultiLineField(field, preferences.getFieldPreferences().getNonWrappableFields());
+        return FieldFactory.isMultiLineField(
+                field, preferences.getFieldPreferences().getNonWrappableFields());
     }
 
     private class Cell extends HBox {
@@ -266,71 +312,96 @@ public Cell(String content, Field field, int columnIndex) {
             If this is not explicitly done on the JavaFX thread, the bindings to the text fields don't work properly.
             The text only shows up after one text in that same row is selected by the user.
              */
-            UiTaskExecutor.runInJavaFXThread(() -> {
-
-                FieldRow row = fieldRows.get(field);
-
-                prefWidthProperty().bind(((Region) supplierHeader.getChildren().get(columnIndex)).widthProperty());
-                setMinWidth(Control.USE_PREF_SIZE);
-                setMaxWidth(Control.USE_PREF_SIZE);
-                prefHeightProperty().bind(((Region) fieldEditor.getChildren().get(row.rowIndex)).heightProperty());
-                setMinHeight(Control.USE_PREF_SIZE);
-                setMaxHeight(Control.USE_PREF_SIZE);
-
-                // Button
-                ToggleButton cellButton = new ToggleButton();
-                cellButton.prefHeightProperty().bind(heightProperty());
-                cellButton.setMinHeight(Control.USE_PREF_SIZE);
-                cellButton.setMaxHeight(Control.USE_PREF_SIZE);
-                cellButton.setGraphicTextGap(0);
-                getChildren().add(cellButton);
-                cellButton.maxWidthProperty().bind(widthProperty());
-                HBox.setHgrow(cellButton, Priority.ALWAYS);
-
-                // Text
-                DiffHighlightingEllipsingTextFlow buttonText = new DiffHighlightingEllipsingTextFlow(content, viewModel.mergedEntryProperty().get().getFieldBinding(field).asOrdinary(), diffMode.valueProperty());
-
-                buttonText.maxWidthProperty().bind(widthProperty().add(-10));
-                buttonText.maxHeightProperty().bind(heightProperty());
-                cellButton.setGraphic(buttonText);
-                cellButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-                cellButton.setContentDisplay(ContentDisplay.CENTER);
-
-                // Tooltip
-                Tooltip buttonTooltip = new Tooltip(content);
-                buttonTooltip.setWrapText(true);
-                buttonTooltip.prefWidthProperty().bind(widthProperty());
-                buttonTooltip.setTextAlignment(TextAlignment.LEFT);
-                cellButton.setTooltip(buttonTooltip);
-
-                cellButton.setToggleGroup(row.toggleGroup);
-                if (row.toggleGroup.getSelectedToggle() == null) {
-                    cellButton.setSelected(true);
-                }
-
-                if (field.equals(StandardField.DOI)) {
-                    Button doiButton = IconTheme.JabRefIcons.LOOKUP_IDENTIFIER.asButton();
-                    HBox.setHgrow(doiButton, Priority.NEVER);
-                    doiButton.prefHeightProperty().bind(cellButton.heightProperty());
-                    doiButton.setMinHeight(Control.USE_PREF_SIZE);
-                    doiButton.setMaxHeight(Control.USE_PREF_SIZE);
-
-                    getChildren().add(doiButton);
-
-                    doiButton.setOnAction(event -> {
-                        DoiFetcher doiFetcher = new DoiFetcher(preferences.getImportFormatPreferences());
-                        doiButton.setDisable(true);
-                        addSource(Localization.lang("From DOI"), () -> {
-                            try {
-                                return doiFetcher.performSearchById(content).get();
-                            } catch (FetcherException | NoSuchElementException e) {
-                                LOGGER.warn("Failed to fetch BibEntry for DOI {}", content, e);
-                                return null;
-                            }
-                        });
+            UiTaskExecutor.runInJavaFXThread(
+                    () -> {
+                        FieldRow row = fieldRows.get(field);
+
+                        prefWidthProperty()
+                                .bind(
+                                        ((Region) supplierHeader.getChildren().get(columnIndex))
+                                                .widthProperty());
+                        setMinWidth(Control.USE_PREF_SIZE);
+                        setMaxWidth(Control.USE_PREF_SIZE);
+                        prefHeightProperty()
+                                .bind(
+                                        ((Region) fieldEditor.getChildren().get(row.rowIndex))
+                                                .heightProperty());
+                        setMinHeight(Control.USE_PREF_SIZE);
+                        setMaxHeight(Control.USE_PREF_SIZE);
+
+                        // Button
+                        ToggleButton cellButton = new ToggleButton();
+                        cellButton.prefHeightProperty().bind(heightProperty());
+                        cellButton.setMinHeight(Control.USE_PREF_SIZE);
+                        cellButton.setMaxHeight(Control.USE_PREF_SIZE);
+                        cellButton.setGraphicTextGap(0);
+                        getChildren().add(cellButton);
+                        cellButton.maxWidthProperty().bind(widthProperty());
+                        HBox.setHgrow(cellButton, Priority.ALWAYS);
+
+                        // Text
+                        DiffHighlightingEllipsingTextFlow buttonText =
+                                new DiffHighlightingEllipsingTextFlow(
+                                        content,
+                                        viewModel
+                                                .mergedEntryProperty()
+                                                .get()
+                                                .getFieldBinding(field)
+                                                .asOrdinary(),
+                                        diffMode.valueProperty());
+
+                        buttonText.maxWidthProperty().bind(widthProperty().add(-10));
+                        buttonText.maxHeightProperty().bind(heightProperty());
+                        cellButton.setGraphic(buttonText);
+                        cellButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+                        cellButton.setContentDisplay(ContentDisplay.CENTER);
+
+                        // Tooltip
+                        Tooltip buttonTooltip = new Tooltip(content);
+                        buttonTooltip.setWrapText(true);
+                        buttonTooltip.prefWidthProperty().bind(widthProperty());
+                        buttonTooltip.setTextAlignment(TextAlignment.LEFT);
+                        cellButton.setTooltip(buttonTooltip);
+
+                        cellButton.setToggleGroup(row.toggleGroup);
+                        if (row.toggleGroup.getSelectedToggle() == null) {
+                            cellButton.setSelected(true);
+                        }
+
+                        if (field.equals(StandardField.DOI)) {
+                            Button doiButton = IconTheme.JabRefIcons.LOOKUP_IDENTIFIER.asButton();
+                            HBox.setHgrow(doiButton, Priority.NEVER);
+                            doiButton.prefHeightProperty().bind(cellButton.heightProperty());
+                            doiButton.setMinHeight(Control.USE_PREF_SIZE);
+                            doiButton.setMaxHeight(Control.USE_PREF_SIZE);
+
+                            getChildren().add(doiButton);
+
+                            doiButton.setOnAction(
+                                    event -> {
+                                        DoiFetcher doiFetcher =
+                                                new DoiFetcher(
+                                                        preferences.getImportFormatPreferences());
+                                        doiButton.setDisable(true);
+                                        addSource(
+                                                Localization.lang("From DOI"),
+                                                () -> {
+                                                    try {
+                                                        return doiFetcher
+                                                                .performSearchById(content)
+                                                                .get();
+                                                    } catch (FetcherException
+                                                            | NoSuchElementException e) {
+                                                        LOGGER.warn(
+                                                                "Failed to fetch BibEntry for DOI {}",
+                                                                content,
+                                                                e);
+                                                        return null;
+                                                    }
+                                                });
+                                    });
+                        }
                     });
-                }
-            });
         }
 
         public String getContent() {
@@ -343,7 +414,8 @@ public void addSource(String title, BibEntry entry) {
     }
 
     public void addSource(String title, Supplier<BibEntry> supplier) {
-        viewModel.addSource(new MultiMergeEntriesViewModel.EntrySource(title, supplier, taskExecutor));
+        viewModel.addSource(
+                new MultiMergeEntriesViewModel.EntrySource(title, supplier, taskExecutor));
     }
 
     private class FieldRow {
@@ -353,8 +425,10 @@ private class FieldRow {
 
         private final int rowIndex;
 
-        // Reference needs to be kept, since java garbage collection would otherwise destroy the subscription
-        @SuppressWarnings("FieldCanBeLocal") private EasyObservableValue<String> fieldBinding;
+        // Reference needs to be kept, since java garbage collection would otherwise destroy the
+        // subscription
+        @SuppressWarnings("FieldCanBeLocal")
+        private EasyObservableValue<String> fieldBinding;
 
         public FieldRow(Field field, int rowIndex) {
             this.rowIndex = rowIndex;
@@ -370,16 +444,28 @@ public FieldRow(Field field, int rowIndex) {
 
             addRow(field);
 
-            fieldEditorCell.addEventFilter(KeyEvent.KEY_PRESSED, event -> toggleGroup.selectToggle(null));
-
-            toggleGroup.selectedToggleProperty().addListener((obs, oldValue, newValue) -> {
-                if (newValue == null) {
-                    viewModel.mergedEntryProperty().get().setField(field, "");
-                } else {
-                    viewModel.mergedEntryProperty().get().setField(field, ((DiffHighlightingEllipsingTextFlow) ((ToggleButton) newValue).getGraphic()).getFullText());
-                    headerToggleGroup.selectToggle(null);
-                }
-            });
+            fieldEditorCell.addEventFilter(
+                    KeyEvent.KEY_PRESSED, event -> toggleGroup.selectToggle(null));
+
+            toggleGroup
+                    .selectedToggleProperty()
+                    .addListener(
+                            (obs, oldValue, newValue) -> {
+                                if (newValue == null) {
+                                    viewModel.mergedEntryProperty().get().setField(field, "");
+                                } else {
+                                    viewModel
+                                            .mergedEntryProperty()
+                                            .get()
+                                            .setField(
+                                                    field,
+                                                    ((DiffHighlightingEllipsingTextFlow)
+                                                                    ((ToggleButton) newValue)
+                                                                            .getGraphic())
+                                                            .getFullText());
+                                    headerToggleGroup.selectToggle(null);
+                                }
+                            });
         }
 
         /**
@@ -390,7 +476,8 @@ public FieldRow(Field field, int rowIndex) {
         private void addRow(Field field) {
             VBox.setVgrow(fieldEditorCell, Priority.ALWAYS);
 
-            fieldBinding = viewModel.mergedEntryProperty().get().getFieldBinding(field).asOrdinary();
+            fieldBinding =
+                    viewModel.mergedEntryProperty().get().getFieldBinding(field).asOrdinary();
             BindingsHelper.bindBidirectional(
                     fieldEditorCell.textProperty(),
                     fieldBinding,
diff --git a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesViewModel.java b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesViewModel.java
index e75bc054bef1..899e4699c628 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesViewModel.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesViewModel.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.Map;
-import java.util.function.Supplier;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -20,26 +17,32 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
+import java.util.Map;
+import java.util.function.Supplier;
+
 public class MultiMergeEntriesViewModel extends AbstractViewModel {
 
-    private final ListProperty<EntrySource> entries = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<EntrySource> entries =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
 
     private final ObjectProperty<BibEntry> mergedEntry = new SimpleObjectProperty<>(new BibEntry());
 
-    private final ListProperty<String> failedSuppliers = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<String> failedSuppliers =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
 
     public void addSource(EntrySource entrySource) {
         if (!entrySource.isLoading.getValue()) {
             updateFields(entrySource.entry.get());
         } else {
-            entrySource.isLoading.addListener((observable, oldValue, newValue) -> {
-                if (!newValue) {
-                    updateFields(entrySource.entry.get());
-                    if (entrySource.entryProperty().get() == null) {
-                        failedSuppliers.add(entrySource.titleProperty().get());
-                    }
-                }
-            });
+            entrySource.isLoading.addListener(
+                    (observable, oldValue, newValue) -> {
+                        if (!newValue) {
+                            updateFields(entrySource.entry.get());
+                            if (entrySource.entryProperty().get() == null) {
+                                failedSuppliers.add(entrySource.titleProperty().get());
+                            }
+                        }
+                    });
         }
         entries.add(entrySource);
     }
@@ -80,16 +83,18 @@ public static class EntrySource {
         private final ObjectProperty<BibEntry> entry = new SimpleObjectProperty<>();
         private final BooleanProperty isLoading = new SimpleBooleanProperty(false);
 
-        public EntrySource(String title, Supplier<BibEntry> entrySupplier, TaskExecutor taskExecutor) {
+        public EntrySource(
+                String title, Supplier<BibEntry> entrySupplier, TaskExecutor taskExecutor) {
             this.title.set(title);
             isLoading.set(true);
 
             BackgroundTask.wrap(entrySupplier::get)
-                          .onSuccess(value -> {
-                              entry.set(value);
-                              isLoading.set(false);
-                          })
-                          .executeWith(taskExecutor);
+                    .onSuccess(
+                            value -> {
+                                entry.set(value);
+                                isLoading.set(false);
+                            })
+                    .executeWith(taskExecutor);
         }
 
         public EntrySource(String title, BibEntry entry) {
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java
index e74420f9fa4e..1bbe140e502e 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java
@@ -1,11 +1,14 @@
 package org.jabref.gui.mergeentries.newmergedialog;
 
+import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.GridPane;
 
+import org.fxmisc.richtext.StyleClassedTextArea;
 import org.jabref.gui.mergeentries.newmergedialog.FieldRowViewModel.Selection;
 import org.jabref.gui.mergeentries.newmergedialog.cell.FieldNameCell;
 import org.jabref.gui.mergeentries.newmergedialog.cell.FieldValueCell;
@@ -19,9 +22,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.strings.StringUtil;
-
-import com.tobiasdiez.easybind.EasyBind;
-import org.fxmisc.richtext.StyleClassedTextArea;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,35 +43,50 @@ public class FieldRowView {
 
     private GridPane parent;
 
-    public FieldRowView(Field field, BibEntry leftEntry, BibEntry rightEntry, BibEntry mergedEntry, FieldMergerFactory fieldMergerFactory, GuiPreferences preferences, int rowIndex) {
-        viewModel = new FieldRowViewModel(field, leftEntry, rightEntry, mergedEntry, fieldMergerFactory);
+    public FieldRowView(
+            Field field,
+            BibEntry leftEntry,
+            BibEntry rightEntry,
+            BibEntry mergedEntry,
+            FieldMergerFactory fieldMergerFactory,
+            GuiPreferences preferences,
+            int rowIndex) {
+        viewModel =
+                new FieldRowViewModel(
+                        field, leftEntry, rightEntry, mergedEntry, fieldMergerFactory);
 
         fieldNameCell = new FieldNameCell(field.getDisplayName(), rowIndex);
         leftValueCell = new FieldValueCell(viewModel.getLeftFieldValue(), rowIndex, preferences);
         rightValueCell = new FieldValueCell(viewModel.getRightFieldValue(), rowIndex, preferences);
         mergedValueCell = new MergedFieldCell(viewModel.getMergedFieldValue(), rowIndex);
 
-        // As a workaround we need to have a reference to the parent grid pane to be able to show/hide the row.
+        // As a workaround we need to have a reference to the parent grid pane to be able to
+        // show/hide the row.
         // This won't be necessary when https://bugs.openjdk.org/browse/JDK-8136901 is fixed.
-        leftValueCell.parentProperty().addListener(e -> {
-            if (leftValueCell.getParent() instanceof GridPane grid) {
-                parent = grid;
-            }
-        });
+        leftValueCell
+                .parentProperty()
+                .addListener(
+                        e -> {
+                            if (leftValueCell.getParent() instanceof GridPane grid) {
+                                parent = grid;
+                            }
+                        });
 
         if (FieldMergerFactory.canMerge(field)) {
             ToggleMergeUnmergeButton toggleMergeUnmergeButton = new ToggleMergeUnmergeButton(field);
             toggleMergeUnmergeButton.setCanMerge(!viewModel.hasEqualLeftAndRightValues());
             fieldNameCell.addSideButton(toggleMergeUnmergeButton);
 
-            EasyBind.listen(toggleMergeUnmergeButton.fieldStateProperty(), ((observableValue, old, fieldState) -> {
-                LOGGER.debug("Field merge state is {} for field {}", fieldState, field);
-                if (fieldState == ToggleMergeUnmergeButton.FieldState.MERGED) {
-                    viewModel.mergeFields();
-                } else {
-                    viewModel.unmergeFields();
-                }
-            }));
+            EasyBind.listen(
+                    toggleMergeUnmergeButton.fieldStateProperty(),
+                    ((observableValue, old, fieldState) -> {
+                        LOGGER.debug("Field merge state is {} for field {}", fieldState, field);
+                        if (fieldState == ToggleMergeUnmergeButton.FieldState.MERGED) {
+                            viewModel.mergeFields();
+                        } else {
+                            viewModel.unmergeFields();
+                        }
+                    }));
         }
 
         toggleGroup.getToggles().addAll(leftValueCell, rightValueCell);
@@ -80,43 +95,53 @@ public FieldRowView(Field field, BibEntry leftEntry, BibEntry rightEntry, BibEnt
         leftValueCell.textProperty().bindBidirectional(viewModel.leftFieldValueProperty());
         rightValueCell.textProperty().bindBidirectional(viewModel.rightFieldValueProperty());
 
-        EasyBind.subscribe(viewModel.selectionProperty(), selection -> {
-            if (selection == Selection.LEFT) {
-                toggleGroup.selectToggle(leftValueCell);
-            } else if (selection == Selection.RIGHT) {
-                toggleGroup.selectToggle(rightValueCell);
-            } else if (selection == Selection.NONE) {
-                toggleGroup.selectToggle(null);
-            }
-        });
-
-        EasyBind.subscribe(toggleGroup.selectedToggleProperty(), selectedToggle -> {
-            if (selectedToggle == leftValueCell) {
-                selectLeftValue();
-            } else if (selectedToggle == rightValueCell) {
-                selectRightValue();
-            } else {
-                selectNone();
-            }
-        });
+        EasyBind.subscribe(
+                viewModel.selectionProperty(),
+                selection -> {
+                    if (selection == Selection.LEFT) {
+                        toggleGroup.selectToggle(leftValueCell);
+                    } else if (selection == Selection.RIGHT) {
+                        toggleGroup.selectToggle(rightValueCell);
+                    } else if (selection == Selection.NONE) {
+                        toggleGroup.selectToggle(null);
+                    }
+                });
+
+        EasyBind.subscribe(
+                toggleGroup.selectedToggleProperty(),
+                selectedToggle -> {
+                    if (selectedToggle == leftValueCell) {
+                        selectLeftValue();
+                    } else if (selectedToggle == rightValueCell) {
+                        selectRightValue();
+                    } else {
+                        selectNone();
+                    }
+                });
 
         // Hide rightValueCell and extend leftValueCell to 2 columns when fields are merged
-        EasyBind.subscribe(viewModel.isFieldsMergedProperty(), isFieldsMerged -> {
-            if (isFieldsMerged) {
-                rightValueCell.setVisible(false);
-                GridPane.setColumnSpan(leftValueCell, 2);
-            } else {
-                rightValueCell.setVisible(true);
-                GridPane.setColumnSpan(leftValueCell, 1);
-            }
-        });
-
-        EasyBind.listen(viewModel.hasEqualLeftAndRightBinding(), (obs, old, isEqual) -> {
-            if (isEqual) {
-                LOGGER.debug("Left and right values are equal, LEFT==RIGHT=={}", viewModel.getLeftFieldValue());
-                hideDiff();
-            }
-        });
+        EasyBind.subscribe(
+                viewModel.isFieldsMergedProperty(),
+                isFieldsMerged -> {
+                    if (isFieldsMerged) {
+                        rightValueCell.setVisible(false);
+                        GridPane.setColumnSpan(leftValueCell, 2);
+                    } else {
+                        rightValueCell.setVisible(true);
+                        GridPane.setColumnSpan(leftValueCell, 1);
+                    }
+                });
+
+        EasyBind.listen(
+                viewModel.hasEqualLeftAndRightBinding(),
+                (obs, old, isEqual) -> {
+                    if (isEqual) {
+                        LOGGER.debug(
+                                "Left and right values are equal, LEFT==RIGHT=={}",
+                                viewModel.getLeftFieldValue());
+                        hideDiff();
+                    }
+                });
     }
 
     public void selectLeftValue() {
@@ -156,7 +181,9 @@ public MergedFieldCell getMergedValueCell() {
     }
 
     public void showDiff(ShowDiffConfig diffConfig) {
-        if (!rightValueCell.isVisible() || StringUtil.isNullOrEmpty(viewModel.getLeftFieldValue()) || StringUtil.isNullOrEmpty(viewModel.getRightFieldValue())) {
+        if (!rightValueCell.isVisible()
+                || StringUtil.isNullOrEmpty(viewModel.getLeftFieldValue())
+                || StringUtil.isNullOrEmpty(viewModel.getRightFieldValue())) {
             return;
         }
         LOGGER.debug("Showing diffs...");
@@ -167,23 +194,28 @@ public void showDiff(ShowDiffConfig diffConfig) {
         hideDiff();
         if (shouldShowDiffs.get()) {
             if (diffConfig.diffView() == ThreeWayMergeToolbar.DiffView.UNIFIED) {
-                new UnifiedDiffHighlighter(leftLabel, rightLabel, diffConfig.diffHighlightingMethod()).highlight();
+                new UnifiedDiffHighlighter(
+                                leftLabel, rightLabel, diffConfig.diffHighlightingMethod())
+                        .highlight();
             } else {
-                new SplitDiffHighlighter(leftLabel, rightLabel, diffConfig.diffHighlightingMethod()).highlight();
+                new SplitDiffHighlighter(leftLabel, rightLabel, diffConfig.diffHighlightingMethod())
+                        .highlight();
             }
         }
     }
 
     public void hide() {
         if (parent != null) {
-            parent.getChildren().removeAll(leftValueCell, rightValueCell, mergedValueCell, fieldNameCell);
+            parent.getChildren()
+                    .removeAll(leftValueCell, rightValueCell, mergedValueCell, fieldNameCell);
         }
     }
 
     public void show() {
         if (parent != null) {
             if (!parent.getChildren().contains(leftValueCell)) {
-                parent.getChildren().addAll(leftValueCell, rightValueCell, mergedValueCell, fieldNameCell);
+                parent.getChildren()
+                        .addAll(leftValueCell, rightValueCell, mergedValueCell, fieldNameCell);
             }
         }
     }
@@ -210,6 +242,16 @@ public boolean hasEqualLeftAndRightValues() {
 
     @Override
     public String toString() {
-        return "FieldRowView [shouldShowDiffs=" + shouldShowDiffs.get() + ", fieldNameCell=" + fieldNameCell + ", leftValueCell=" + leftValueCell + ", rightValueCell=" + rightValueCell + ", mergedValueCell=" + mergedValueCell + "]";
+        return "FieldRowView [shouldShowDiffs="
+                + shouldShowDiffs.get()
+                + ", fieldNameCell="
+                + fieldNameCell
+                + ", leftValueCell="
+                + leftValueCell
+                + ", rightValueCell="
+                + rightValueCell
+                + ", mergedValueCell="
+                + mergedValueCell
+                + "]";
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowViewModel.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowViewModel.java
index 46886d9bee18..44f3dea25fde 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowViewModel.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowViewModel.java
@@ -1,9 +1,6 @@
 package org.jabref.gui.mergeentries.newmergedialog;
 
-import javax.swing.undo.AbstractUndoableEdit;
-import javax.swing.undo.CannotRedoException;
-import javax.swing.undo.CannotUndoException;
-import javax.swing.undo.CompoundEdit;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -21,11 +18,14 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.strings.StringUtil;
-
-import com.tobiasdiez.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.swing.undo.AbstractUndoableEdit;
+import javax.swing.undo.CannotRedoException;
+import javax.swing.undo.CannotUndoException;
+import javax.swing.undo.CompoundEdit;
+
 public class FieldRowViewModel {
     public enum Selection {
         LEFT,
@@ -60,7 +60,12 @@ public enum Selection {
 
     private final CompoundEdit fieldsMergedEdit = new CompoundEdit();
 
-    public FieldRowViewModel(Field field, BibEntry leftEntry, BibEntry rightEntry, BibEntry mergedEntry, FieldMergerFactory fieldMergerFactory) {
+    public FieldRowViewModel(
+            Field field,
+            BibEntry leftEntry,
+            BibEntry rightEntry,
+            BibEntry mergedEntry,
+            FieldMergerFactory fieldMergerFactory) {
         this.field = field;
         this.leftEntry = leftEntry;
         this.rightEntry = rightEntry;
@@ -75,47 +80,69 @@ public FieldRowViewModel(Field field, BibEntry leftEntry, BibEntry rightEntry, B
             setRightFieldValue(rightEntry.getField(field).orElse(""));
         }
 
-        EasyBind.listen(leftFieldValueProperty(), (obs, old, leftValue) -> leftEntry.setField(field, leftValue));
-        EasyBind.listen(rightFieldValueProperty(), (obs, old, rightValue) -> rightEntry.setField(field, rightValue));
-        EasyBind.listen(mergedFieldValueProperty(), (obs, old, mergedFieldValue) -> {
-            if (field.equals(InternalField.TYPE_HEADER)) {
-                getMergedEntry().setType(EntryTypeFactory.parse(mergedFieldValue));
-            } else {
-                getMergedEntry().setField(field, mergedFieldValue);
-            }
-        });
-
-        hasEqualLeftAndRight = Bindings.createBooleanBinding(this::hasEqualLeftAndRightValues, leftFieldValueProperty(), rightFieldValueProperty());
+        EasyBind.listen(
+                leftFieldValueProperty(),
+                (obs, old, leftValue) -> leftEntry.setField(field, leftValue));
+        EasyBind.listen(
+                rightFieldValueProperty(),
+                (obs, old, rightValue) -> rightEntry.setField(field, rightValue));
+        EasyBind.listen(
+                mergedFieldValueProperty(),
+                (obs, old, mergedFieldValue) -> {
+                    if (field.equals(InternalField.TYPE_HEADER)) {
+                        getMergedEntry().setType(EntryTypeFactory.parse(mergedFieldValue));
+                    } else {
+                        getMergedEntry().setField(field, mergedFieldValue);
+                    }
+                });
+
+        hasEqualLeftAndRight =
+                Bindings.createBooleanBinding(
+                        this::hasEqualLeftAndRightValues,
+                        leftFieldValueProperty(),
+                        rightFieldValueProperty());
 
         selectNonEmptyValue();
 
-        EasyBind.listen(isFieldsMergedProperty(), (obs, old, areFieldsMerged) -> {
-            LOGGER.debug("Field are merged: {}", areFieldsMerged);
-            if (areFieldsMerged) {
-                selectLeftValue();
-            } else {
-                selectNonEmptyValue();
-            }
-        });
-
-        EasyBind.subscribe(selectionProperty(), selection -> {
-            LOGGER.debug("Selecting {}' value for field {}", selection, field.getDisplayName());
-            switch (selection) {
-                case LEFT -> EasyBind.subscribe(leftFieldValueProperty(), this::setMergedFieldValue);
-                case RIGHT -> EasyBind.subscribe(rightFieldValueProperty(), this::setMergedFieldValue);
-            }
-        });
-
-        EasyBind.subscribe(mergedFieldValueProperty(), mergedValue -> {
-            LOGGER.debug("Merged value is {} for field {}", mergedValue, field.getDisplayName());
-            if (mergedValue.equals(getLeftFieldValue())) {
-                selectLeftValue();
-            } else if (getMergedFieldValue().equals(getRightFieldValue())) {
-                selectRightValue();
-            } else {
-                selectNone();
-            }
-        });
+        EasyBind.listen(
+                isFieldsMergedProperty(),
+                (obs, old, areFieldsMerged) -> {
+                    LOGGER.debug("Field are merged: {}", areFieldsMerged);
+                    if (areFieldsMerged) {
+                        selectLeftValue();
+                    } else {
+                        selectNonEmptyValue();
+                    }
+                });
+
+        EasyBind.subscribe(
+                selectionProperty(),
+                selection -> {
+                    LOGGER.debug(
+                            "Selecting {}' value for field {}", selection, field.getDisplayName());
+                    switch (selection) {
+                        case LEFT ->
+                                EasyBind.subscribe(
+                                        leftFieldValueProperty(), this::setMergedFieldValue);
+                        case RIGHT ->
+                                EasyBind.subscribe(
+                                        rightFieldValueProperty(), this::setMergedFieldValue);
+                    }
+                });
+
+        EasyBind.subscribe(
+                mergedFieldValueProperty(),
+                mergedValue -> {
+                    LOGGER.debug(
+                            "Merged value is {} for field {}", mergedValue, field.getDisplayName());
+                    if (mergedValue.equals(getLeftFieldValue())) {
+                        selectLeftValue();
+                    } else if (getMergedFieldValue().equals(getRightFieldValue())) {
+                        selectRightValue();
+                    } else {
+                        selectNone();
+                    }
+                });
 
         EasyBind.subscribe(hasEqualLeftAndRightBinding(), this::setIsFieldsMerged);
     }
@@ -178,7 +205,8 @@ public void mergeFields() {
         if (fieldsMergedEdit.canRedo()) {
             fieldsMergedEdit.redo();
         } else {
-            fieldsMergedEdit.addEdit(new MergeFieldsUndo(oldLeftFieldValue, oldRightFieldValue, mergedFields));
+            fieldsMergedEdit.addEdit(
+                    new MergeFieldsUndo(oldLeftFieldValue, oldRightFieldValue, mergedFields));
             fieldsMergedEdit.end();
         }
     }
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/GroupDiffMode.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/GroupDiffMode.java
index e9e79069e017..e9d28c53a940 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/GroupDiffMode.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/GroupDiffMode.java
@@ -5,7 +5,7 @@ public class GroupDiffMode implements DiffMethod {
     private final String separator;
 
     public GroupDiffMode(String separator) {
-       this.separator = separator;
+        this.separator = separator;
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java
index 500cf583ed2b..be73e7221ac4 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java
@@ -14,7 +14,14 @@ public class PersonsNameFieldRowView extends FieldRowView {
     private final AuthorList leftEntryNames;
     private final AuthorList rightEntryNames;
 
-    public PersonsNameFieldRowView(Field field, BibEntry leftEntry, BibEntry rightEntry, BibEntry mergedEntry, FieldMergerFactory fieldMergerFactory, GuiPreferences preferences, int rowIndex) {
+    public PersonsNameFieldRowView(
+            Field field,
+            BibEntry leftEntry,
+            BibEntry rightEntry,
+            BibEntry mergedEntry,
+            FieldMergerFactory fieldMergerFactory,
+            GuiPreferences preferences,
+            int rowIndex) {
         super(field, leftEntry, rightEntry, mergedEntry, fieldMergerFactory, preferences, rowIndex);
         assert field.getProperties().contains(FieldProperty.PERSON_NAMES);
 
@@ -29,7 +36,11 @@ public PersonsNameFieldRowView(Field field, BibEntry leftEntry, BibEntry rightEn
     }
 
     private void showPersonsNamesAreTheSameInfo() {
-        InfoButton infoButton = new InfoButton(Localization.lang("The %0s are the same. However, the order of field content differs", viewModel.getField().getName()));
+        InfoButton infoButton =
+                new InfoButton(
+                        Localization.lang(
+                                "The %0s are the same. However, the order of field content differs",
+                                viewModel.getField().getName()));
         getFieldNameCell().addSideButton(infoButton);
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ShowDiffConfig.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ShowDiffConfig.java
index 0f36d9ad5d2d..5f70ac0db73e 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ShowDiffConfig.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ShowDiffConfig.java
@@ -2,7 +2,4 @@
 
 import org.jabref.gui.mergeentries.newmergedialog.toolbar.ThreeWayMergeToolbar.DiffView;
 
-public record ShowDiffConfig(
-        DiffView diffView,
-        DiffMethod diffHighlightingMethod) {
-}
+public record ShowDiffConfig(DiffView diffView, DiffMethod diffHighlightingMethod) {}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeHeaderView.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeHeaderView.java
index 9dcf32414eb0..199c6c8631d6 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeHeaderView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeHeaderView.java
@@ -25,19 +25,16 @@ public ThreeWayMergeHeaderView(String leftHeader, String rightHeader) {
         this.rightHeaderCell = new HeaderCell(rightHeader);
         this.mergedHeaderCell = new HeaderCell(Localization.lang("Merged entry"));
 
-        addRow(0,
-               new HeaderCell(""),
-               leftHeaderCell,
-               rightHeaderCell,
-               mergedHeaderCell
-        );
+        addRow(0, new HeaderCell(""), leftHeaderCell, rightHeaderCell, mergedHeaderCell);
 
         setPrefHeight(Control.USE_COMPUTED_SIZE);
         setMaxHeight(Control.USE_PREF_SIZE);
         setMinHeight(Control.USE_PREF_SIZE);
 
-        // The fields grid pane is contained within a scroll pane, thus it doesn't allocate the full available width. In
-        // fact, it uses the available width minus the size of the scrollbar which is 8. This leads to header columns being
+        // The fields grid pane is contained within a scroll pane, thus it doesn't allocate the full
+        // available width. In
+        // fact, it uses the available width minus the size of the scrollbar which is 8. This leads
+        // to header columns being
         // always wider than fields columns. This hack should fix it.
         setPadding(new Insets(0, 8, 0, 0));
     }
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java
index b4d36e34e601..2ee5f3001e82 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.mergeentries.newmergedialog;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.ColumnConstraints;
 import javafx.scene.layout.GridPane;
@@ -20,6 +17,9 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldProperty;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @AllowedToUseClassGetResource("JavaFX internally handles the passed URLs properly.")
 public class ThreeWayMergeView extends VBox {
     public static final int GRID_COLUMN_MIN_WIDTH = 250;
@@ -28,9 +28,12 @@ public class ThreeWayMergeView extends VBox {
     public static final String RIGHT_DEFAULT_HEADER = Localization.lang("Right Entry");
 
     private final ColumnConstraints fieldNameColumnConstraints = new ColumnConstraints(150);
-    private final ColumnConstraints leftEntryColumnConstraints = new ColumnConstraints(GRID_COLUMN_MIN_WIDTH, 256, Double.MAX_VALUE);
-    private final ColumnConstraints rightEntryColumnConstraints = new ColumnConstraints(GRID_COLUMN_MIN_WIDTH, 256, Double.MAX_VALUE);
-    private final ColumnConstraints mergedEntryColumnConstraints = new ColumnConstraints(GRID_COLUMN_MIN_WIDTH, 256, Double.MAX_VALUE);
+    private final ColumnConstraints leftEntryColumnConstraints =
+            new ColumnConstraints(GRID_COLUMN_MIN_WIDTH, 256, Double.MAX_VALUE);
+    private final ColumnConstraints rightEntryColumnConstraints =
+            new ColumnConstraints(GRID_COLUMN_MIN_WIDTH, 256, Double.MAX_VALUE);
+    private final ColumnConstraints mergedEntryColumnConstraints =
+            new ColumnConstraints(GRID_COLUMN_MIN_WIDTH, 256, Double.MAX_VALUE);
     private final ThreeWayMergeToolbar toolbar;
     private final ThreeWayMergeHeaderView headerView;
     private final ScrollPane scrollPane;
@@ -44,13 +47,25 @@ public class ThreeWayMergeView extends VBox {
     private final FieldMergerFactory fieldMergerFactory;
     private final String keywordSeparator;
 
-    public ThreeWayMergeView(BibEntry leftEntry, BibEntry rightEntry, String leftHeader, String rightHeader, GuiPreferences preferences) {
+    public ThreeWayMergeView(
+            BibEntry leftEntry,
+            BibEntry rightEntry,
+            String leftHeader,
+            String rightHeader,
+            GuiPreferences preferences) {
         this.preferences = preferences;
 
-        getStylesheets().add(ThreeWayMergeView.class.getResource("ThreeWayMergeView.css").toExternalForm());
-        viewModel = new ThreeWayMergeViewModel((BibEntry) leftEntry.clone(), (BibEntry) rightEntry.clone(), leftHeader, rightHeader);
+        getStylesheets()
+                .add(ThreeWayMergeView.class.getResource("ThreeWayMergeView.css").toExternalForm());
+        viewModel =
+                new ThreeWayMergeViewModel(
+                        (BibEntry) leftEntry.clone(),
+                        (BibEntry) rightEntry.clone(),
+                        leftHeader,
+                        rightHeader);
         this.fieldMergerFactory = new FieldMergerFactory(preferences.getBibEntryPreferences());
-        this.keywordSeparator = preferences.getBibEntryPreferences().getKeywordSeparator().toString();
+        this.keywordSeparator =
+                preferences.getBibEntryPreferences().getKeywordSeparator().toString();
 
         mergeGridPane = new GridPane();
         scrollPane = new ScrollPane();
@@ -101,10 +116,16 @@ private void showOrHideEqualFields() {
     private void updateDiff() {
         if (toolbar.shouldShowDiffs()) {
             for (FieldRowView row : fieldRows) {
-                if ("Groups".equals(row.getFieldNameCell().getText()) && (row.getLeftValueCell().getText().contains(keywordSeparator) || row.getRightValueCell().getText().contains(keywordSeparator))) {
-                    row.showDiff(new ShowDiffConfig(toolbar.getDiffView(), new GroupDiffMode(keywordSeparator)));
+                if ("Groups".equals(row.getFieldNameCell().getText())
+                        && (row.getLeftValueCell().getText().contains(keywordSeparator)
+                                || row.getRightValueCell().getText().contains(keywordSeparator))) {
+                    row.showDiff(
+                            new ShowDiffConfig(
+                                    toolbar.getDiffView(), new GroupDiffMode(keywordSeparator)));
                 } else {
-                    row.showDiff(new ShowDiffConfig(toolbar.getDiffView(), toolbar.getDiffHighlightingMethod()));
+                    row.showDiff(
+                            new ShowDiffConfig(
+                                    toolbar.getDiffView(), toolbar.getDiffHighlightingMethod()));
                 }
             }
         } else {
@@ -113,10 +134,13 @@ private void updateDiff() {
     }
 
     private void initializeHeaderView() {
-        headerView.getColumnConstraints().addAll(fieldNameColumnConstraints,
-                                                 leftEntryColumnConstraints,
-                                                 rightEntryColumnConstraints,
-                                                 mergedEntryColumnConstraints);
+        headerView
+                .getColumnConstraints()
+                .addAll(
+                        fieldNameColumnConstraints,
+                        leftEntryColumnConstraints,
+                        rightEntryColumnConstraints,
+                        mergedEntryColumnConstraints);
     }
 
     private void initializeScrollPane() {
@@ -133,7 +157,13 @@ private void initializeColumnConstraints() {
     }
 
     private void initializeMergeGridPane() {
-        mergeGridPane.getColumnConstraints().addAll(fieldNameColumnConstraints, leftEntryColumnConstraints, rightEntryColumnConstraints, mergedEntryColumnConstraints);
+        mergeGridPane
+                .getColumnConstraints()
+                .addAll(
+                        fieldNameColumnConstraints,
+                        leftEntryColumnConstraints,
+                        rightEntryColumnConstraints,
+                        mergedEntryColumnConstraints);
 
         for (int fieldIndex = 0; fieldIndex < viewModel.numberOfVisibleFields(); fieldIndex++) {
             addRow(fieldIndex);
@@ -151,9 +181,25 @@ private void addRow(int fieldIndex) {
 
         FieldRowView fieldRow;
         if (field.getProperties().contains(FieldProperty.PERSON_NAMES)) {
-            fieldRow = new PersonsNameFieldRowView(field, getLeftEntry(), getRightEntry(), getMergedEntry(), fieldMergerFactory, preferences, fieldIndex);
+            fieldRow =
+                    new PersonsNameFieldRowView(
+                            field,
+                            getLeftEntry(),
+                            getRightEntry(),
+                            getMergedEntry(),
+                            fieldMergerFactory,
+                            preferences,
+                            fieldIndex);
         } else {
-            fieldRow = new FieldRowView(field, getLeftEntry(), getRightEntry(), getMergedEntry(), fieldMergerFactory, preferences, fieldIndex);
+            fieldRow =
+                    new FieldRowView(
+                            field,
+                            getLeftEntry(),
+                            getRightEntry(),
+                            getMergedEntry(),
+                            fieldMergerFactory,
+                            preferences,
+                            fieldIndex);
         }
 
         fieldRows.add(fieldIndex, fieldRow);
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeViewModel.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeViewModel.java
index 9c5b35419058..a30f91287ad3 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeViewModel.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeViewModel.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.mergeentries.newmergedialog;
 
-import java.util.Comparator;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -19,6 +13,12 @@
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.InternalField;
 
+import java.util.Comparator;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 public class ThreeWayMergeViewModel extends AbstractViewModel {
 
     private final ObjectProperty<BibEntry> leftEntry = new SimpleObjectProperty<>();
@@ -29,7 +29,8 @@ public class ThreeWayMergeViewModel extends AbstractViewModel {
 
     private final ObservableList<Field> visibleFields = FXCollections.observableArrayList();
 
-    public ThreeWayMergeViewModel(BibEntry leftEntry, BibEntry rightEntry, String leftHeader, String rightHeader) {
+    public ThreeWayMergeViewModel(
+            BibEntry leftEntry, BibEntry rightEntry, String leftHeader, String rightHeader) {
         Objects.requireNonNull(leftEntry, "Left entry is required");
         Objects.requireNonNull(rightEntry, "Right entry is required");
         Objects.requireNonNull(leftHeader, "Left header entry is required");
@@ -42,9 +43,9 @@ public ThreeWayMergeViewModel(BibEntry leftEntry, BibEntry rightEntry, String le
 
         mergedEntry.set(new BibEntry());
 
-        setVisibleFields(Stream.concat(
-                leftEntry.getFields().stream(),
-                rightEntry.getFields().stream()).collect(Collectors.toSet()));
+        setVisibleFields(
+                Stream.concat(leftEntry.getFields().stream(), rightEntry.getFields().stream())
+                        .collect(Collectors.toSet()));
     }
 
     public StringProperty leftHeaderProperty() {
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/CopyFieldValueCommand.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/CopyFieldValueCommand.java
index 5f8293f18a3b..680ba84dd104 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/CopyFieldValueCommand.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/CopyFieldValueCommand.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.mergeentries.newmergedialog.cell;
 
-import java.util.Objects;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.actions.SimpleCommand;
 
+import java.util.Objects;
+
 public class CopyFieldValueCommand extends SimpleCommand {
     private final String fieldValue;
     private final ClipBoardManager clipBoardManager;
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldValueCell.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldValueCell.java
index d93b6d4f45fe..6bef122f5a2c 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldValueCell.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldValueCell.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.mergeentries.newmergedialog.cell;
 
+import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.css.PseudoClass;
@@ -19,6 +21,8 @@
 import javafx.scene.layout.Priority;
 import javafx.scene.paint.Color;
 
+import org.fxmisc.flowless.VirtualizedScrollPane;
+import org.fxmisc.richtext.StyleClassedTextArea;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.fieldeditors.URLUtil;
 import org.jabref.gui.icon.IconTheme;
@@ -26,10 +30,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.strings.StringUtil;
-
-import com.tobiasdiez.easybind.EasyBind;
-import org.fxmisc.flowless.VirtualizedScrollPane;
-import org.fxmisc.richtext.StyleClassedTextArea;
 import org.kordamp.ikonli.javafx.FontIcon;
 import org.kordamp.ikonli.materialdesign2.MaterialDesignC;
 import org.slf4j.Logger;
@@ -51,7 +51,8 @@ public class FieldValueCell extends ThreeWayMergeCell implements Toggle {
     private final ActionFactory factory;
 
     private final StyleClassedTextArea label = new StyleClassedTextArea();
-    private final VirtualizedScrollPane<StyleClassedTextArea> scrollPane = new VirtualizedScrollPane<>(label);
+    private final VirtualizedScrollPane<StyleClassedTextArea> scrollPane =
+            new VirtualizedScrollPane<>(label);
     HBox labelBox = new HBox(scrollPane);
 
     private final HBox selectionBox = new HBox();
@@ -65,10 +66,12 @@ public FieldValueCell(String text, int rowIndex, GuiPreferences preferences) {
         this.factory = new ActionFactory();
         this.viewModel = new FieldValueCellViewModel(text);
 
-        EasyBind.listen(viewModel.selectedProperty(), (observable, old, isSelected) -> {
-            pseudoClassStateChanged(SELECTED_PSEUDO_CLASS, isSelected);
-            getToggleGroup().selectToggle(FieldValueCell.this);
-        });
+        EasyBind.listen(
+                viewModel.selectedProperty(),
+                (observable, old, isSelected) -> {
+                    pseudoClassStateChanged(SELECTED_PSEUDO_CLASS, isSelected);
+                    getToggleGroup().selectToggle(FieldValueCell.this);
+                });
 
         viewModel.fieldValueProperty().bind(textProperty());
 
@@ -81,11 +84,12 @@ private void initialize() {
         initializeLabel();
         initializeSelectionBox();
         initializeActions();
-        setOnMouseClicked(e -> {
-            if (!isDisabled()) {
-                setSelected(true);
-            }
-        });
+        setOnMouseClicked(
+                e -> {
+                    if (!isDisabled()) {
+                        setSelected(true);
+                    }
+                });
 
         selectionBox.getChildren().addAll(labelBox, actionsContainer);
         getChildren().setAll(selectionBox);
@@ -105,10 +109,12 @@ private void initializeLabel() {
         label.prefHeightProperty().bind(label.totalHeightEstimateProperty().orElseConst(-1d));
 
         // Fix text area consuming scroll events before they reach the outer scrollable
-        label.addEventFilter(ScrollEvent.SCROLL, e -> {
-            e.consume();
-            FieldValueCell.this.fireEvent(e.copyFor(e.getSource(), FieldValueCell.this));
-        });
+        label.addEventFilter(
+                ScrollEvent.SCROLL,
+                e -> {
+                    e.consume();
+                    FieldValueCell.this.fireEvent(e.copyFor(e.getSource(), FieldValueCell.this));
+                });
     }
 
     private void initializeActions() {
@@ -130,7 +136,9 @@ private Button createCopyButton() {
         FontIcon copyIcon = FontIcon.of(MaterialDesignC.CONTENT_COPY);
         copyIcon.getStyleClass().add("action-icon");
 
-        Button copyButton = factory.createIconButton(() -> Localization.lang("Copy"), new CopyFieldValueCommand(getText()));
+        Button copyButton =
+                factory.createIconButton(
+                        () -> Localization.lang("Copy"), new CopyFieldValueCommand(getText()));
         copyButton.setGraphic(copyIcon);
         copyButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
         copyButton.setMaxHeight(Double.MAX_VALUE);
@@ -143,12 +151,23 @@ public Button createOpenLinkButton() {
         Node openLinkIcon = IconTheme.JabRefIcons.OPEN_LINK.getGraphicNode();
         openLinkIcon.getStyleClass().add("action-icon");
 
-        Button openLinkButton = factory.createIconButton(() -> Localization.lang("Open Link"), new OpenExternalLinkAction(getText(), preferences.getExternalApplicationsPreferences()));
+        Button openLinkButton =
+                factory.createIconButton(
+                        () -> Localization.lang("Open Link"),
+                        new OpenExternalLinkAction(
+                                getText(), preferences.getExternalApplicationsPreferences()));
         openLinkButton.setGraphic(openLinkIcon);
         openLinkButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
         openLinkButton.setMaxHeight(Double.MAX_VALUE);
 
-        openLinkButton.visibleProperty().bind(EasyBind.map(textProperty(), input -> StringUtil.isNotBlank(input) && (URLUtil.isURL(input) || DOI.isValid(input))));
+        openLinkButton
+                .visibleProperty()
+                .bind(
+                        EasyBind.map(
+                                textProperty(),
+                                input ->
+                                        StringUtil.isNotBlank(input)
+                                                && (URLUtil.isURL(input) || DOI.isValid(input))));
 
         return openLinkButton;
     }
@@ -159,17 +178,19 @@ private void initializeScrollPane() {
     }
 
     private void preventTextSelectionViaMouseEvents() {
-        label.addEventFilter(MouseEvent.ANY, e -> {
-            if ((e.getEventType() == MouseEvent.MOUSE_DRAGGED) ||
-                    (e.getEventType() == MouseEvent.DRAG_DETECTED) ||
-                    (e.getEventType() == MouseEvent.MOUSE_ENTERED)) {
-                e.consume();
-            } else if (e.getEventType() == MouseEvent.MOUSE_PRESSED) {
-                if (e.getClickCount() > 1) {
-                    e.consume();
-                }
-            }
-        });
+        label.addEventFilter(
+                MouseEvent.ANY,
+                e -> {
+                    if ((e.getEventType() == MouseEvent.MOUSE_DRAGGED)
+                            || (e.getEventType() == MouseEvent.DRAG_DETECTED)
+                            || (e.getEventType() == MouseEvent.MOUSE_ENTERED)) {
+                        e.consume();
+                    } else if (e.getEventType() == MouseEvent.MOUSE_PRESSED) {
+                        if (e.getClickCount() > 1) {
+                            e.consume();
+                        }
+                    }
+                });
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldValueCellViewModel.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldValueCellViewModel.java
index 7587d1e261b2..d95536d2a734 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldValueCellViewModel.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldValueCellViewModel.java
@@ -10,7 +10,8 @@
 
 public class FieldValueCellViewModel {
     private final StringProperty fieldValue = new SimpleStringProperty();
-    private final BooleanProperty selected = new SimpleBooleanProperty(FieldValueCell.class, "selected");
+    private final BooleanProperty selected =
+            new SimpleBooleanProperty(FieldValueCell.class, "selected");
     private final ObjectProperty<ToggleGroup> toggleGroup = new SimpleObjectProperty<>();
 
     public FieldValueCellViewModel(String text) {
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/HeaderCell.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/HeaderCell.java
index 70ca433229ad..16568ed77f8a 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/HeaderCell.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/HeaderCell.java
@@ -23,6 +23,11 @@ private void initialize() {
 
     private void initializeLabel() {
         label.textProperty().bind(textProperty());
-        label.setPadding(new Insets(getPadding().getTop(), getPadding().getRight(), getPadding().getBottom(), 16));
+        label.setPadding(
+                new Insets(
+                        getPadding().getTop(),
+                        getPadding().getRight(),
+                        getPadding().getBottom(),
+                        16));
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/MergedFieldCell.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/MergedFieldCell.java
index 89c591ee0acd..12999f9beb99 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/MergedFieldCell.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/MergedFieldCell.java
@@ -6,9 +6,8 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 
-import org.jabref.gui.util.BindingsHelper;
-
 import org.fxmisc.richtext.StyleClassedTextArea;
+import org.jabref.gui.util.BindingsHelper;
 
 public class MergedFieldCell extends ThreeWayMergeCell {
     private static final String DEFAULT_STYLE_CLASS = "merged-field";
@@ -27,10 +26,11 @@ private void initialize() {
     }
 
     private void initializeTextArea() {
-        BindingsHelper.bindBidirectional(textArea.textProperty(),
-                                         textProperty(),
-                                         textArea::replaceText,
-                                         textProperty()::setValue);
+        BindingsHelper.bindBidirectional(
+                textArea.textProperty(),
+                textProperty(),
+                textArea::replaceText,
+                textProperty()::setValue);
 
         setAlignment(Pos.CENTER);
         textArea.setWrapText(true);
@@ -38,9 +38,11 @@ private void initializeTextArea() {
         textArea.setPadding(new Insets(8));
         HBox.setHgrow(textArea, Priority.ALWAYS);
 
-        textArea.addEventFilter(ScrollEvent.SCROLL, e -> {
-            e.consume();
-            MergedFieldCell.this.fireEvent(e.copyFor(e.getSource(), MergedFieldCell.this));
-        });
+        textArea.addEventFilter(
+                ScrollEvent.SCROLL,
+                e -> {
+                    e.consume();
+                    MergedFieldCell.this.fireEvent(e.copyFor(e.getSource(), MergedFieldCell.this));
+                });
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/OpenExternalLinkAction.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/OpenExternalLinkAction.java
index b751d9c2f09d..8ddb85d86706 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/OpenExternalLinkAction.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/OpenExternalLinkAction.java
@@ -1,16 +1,15 @@
 package org.jabref.gui.mergeentries.newmergedialog.cell;
 
-import java.io.IOException;
-import java.net.URI;
-
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.model.entry.identifier.DOI;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.URI;
+
 /**
  * A command for opening DOIs and URLs. This was created primarily for simplifying {@link FieldValueCell}.
  */
@@ -21,7 +20,8 @@ public class OpenExternalLinkAction extends SimpleCommand {
 
     private final String urlOrDoi;
 
-    public OpenExternalLinkAction(String urlOrDoi, ExternalApplicationsPreferences externalApplicationsPreferences) {
+    public OpenExternalLinkAction(
+            String urlOrDoi, ExternalApplicationsPreferences externalApplicationsPreferences) {
         this.externalApplicationPreferences = externalApplicationsPreferences;
         this.urlOrDoi = urlOrDoi;
     }
@@ -32,15 +32,12 @@ public void execute() {
             if (DOI.isValid(urlOrDoi)) {
                 NativeDesktop.openBrowser(
                         DOI.parse(urlOrDoi)
-                           .flatMap(DOI::getExternalURI)
-                           .map(URI::toString)
-                           .orElse(""),
-                        externalApplicationPreferences
-
-                );
+                                .flatMap(DOI::getExternalURI)
+                                .map(URI::toString)
+                                .orElse(""),
+                        externalApplicationPreferences);
             } else {
-                NativeDesktop.openBrowser(urlOrDoi, externalApplicationPreferences
-        );
+                NativeDesktop.openBrowser(urlOrDoi, externalApplicationPreferences);
             }
         } catch (IOException e) {
             LOGGER.warn("Cannot open the given external link '{}'", urlOrDoi, e);
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/ThreeWayMergeCell.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/ThreeWayMergeCell.java
index 1c9df85a6bdd..b64e4a19ebdd 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/ThreeWayMergeCell.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/ThreeWayMergeCell.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.mergeentries.newmergedialog.cell;
 
+import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.beans.property.StringProperty;
 import javafx.css.PseudoClass;
 import javafx.scene.layout.HBox;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public abstract class ThreeWayMergeCell extends HBox {
     public static final String ODD_PSEUDO_CLASS = "odd";
     public static final String EVEN_PSEUDO_CLASS = "even";
@@ -18,12 +18,16 @@ public ThreeWayMergeCell(String text, int rowIndex) {
         getStyleClass().add(DEFAULT_STYLE_CLASS);
         viewModel = new ThreeWayMergeCellViewModel(text, rowIndex);
 
-        EasyBind.subscribe(viewModel.oddProperty(), isOdd -> {
-            pseudoClassStateChanged(PseudoClass.getPseudoClass(ODD_PSEUDO_CLASS), isOdd);
-        });
-        EasyBind.subscribe(viewModel.evenProperty(), isEven -> {
-            pseudoClassStateChanged(PseudoClass.getPseudoClass(EVEN_PSEUDO_CLASS), isEven);
-        });
+        EasyBind.subscribe(
+                viewModel.oddProperty(),
+                isOdd -> {
+                    pseudoClassStateChanged(PseudoClass.getPseudoClass(ODD_PSEUDO_CLASS), isOdd);
+                });
+        EasyBind.subscribe(
+                viewModel.evenProperty(),
+                isEven -> {
+                    pseudoClassStateChanged(PseudoClass.getPseudoClass(EVEN_PSEUDO_CLASS), isEven);
+                });
     }
 
     public String getText() {
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/ThreeWayMergeCellViewModel.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/ThreeWayMergeCellViewModel.java
index e5674a602512..f1de30a25203 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/ThreeWayMergeCellViewModel.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/ThreeWayMergeCellViewModel.java
@@ -1,14 +1,14 @@
 package org.jabref.gui.mergeentries.newmergedialog.cell;
 
+import static org.jabref.gui.mergeentries.newmergedialog.cell.ThreeWayMergeCell.HEADER_ROW;
+
+import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
-import com.tobiasdiez.easybind.EasyBind;
-
-import static org.jabref.gui.mergeentries.newmergedialog.cell.ThreeWayMergeCell.HEADER_ROW;
-
 public class ThreeWayMergeCellViewModel {
     private final StringProperty text = new SimpleStringProperty();
     private final BooleanProperty odd = new SimpleBooleanProperty(ThreeWayMergeCell.class, "odd");
@@ -24,13 +24,17 @@ public ThreeWayMergeCellViewModel(String text, int rowIndex) {
             }
         }
 
-        EasyBind.subscribe(odd, isOdd -> {
-            setEven(!isOdd);
-        });
-
-        EasyBind.subscribe(even, isEven -> {
-            setOdd(!isEven);
-        });
+        EasyBind.subscribe(
+                odd,
+                isOdd -> {
+                    setEven(!isOdd);
+                });
+
+        EasyBind.subscribe(
+                even,
+                isEven -> {
+                    setOdd(!isEven);
+                });
     }
 
     public String getText() {
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/sidebuttons/InfoButton.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/sidebuttons/InfoButton.java
index 8994bf000372..1e4622b78c97 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/sidebuttons/InfoButton.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/sidebuttons/InfoButton.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.mergeentries.newmergedialog.cell.sidebuttons;
 
-import java.util.Optional;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
@@ -12,23 +12,24 @@
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 
-import com.tobiasdiez.easybind.EasyBind;
+import java.util.Optional;
 
 public class InfoButton extends Button {
     private final StringProperty infoMessage = new SimpleStringProperty();
     private final ActionFactory actionFactory = new ActionFactory();
 
-    private final Action mergeAction = new Action() {
-        @Override
-        public Optional<JabRefIcon> getIcon() {
-            return Optional.of(IconTheme.JabRefIcons.INTEGRITY_INFO);
-        }
+    private final Action mergeAction =
+            new Action() {
+                @Override
+                public Optional<JabRefIcon> getIcon() {
+                    return Optional.of(IconTheme.JabRefIcons.INTEGRITY_INFO);
+                }
 
-        @Override
-        public String getText() {
-            return infoMessage.get();
-        }
-    };
+                @Override
+                public String getText() {
+                    return infoMessage.get();
+                }
+            };
 
     public InfoButton(String infoMessage) {
         this.infoMessage.setValue(infoMessage);
@@ -40,11 +41,14 @@ private void configureButton() {
         setMaxHeight(Double.MAX_VALUE);
         setFocusTraversable(false);
 
-        actionFactory.configureIconButton(mergeAction, new SimpleCommand() {
-            @Override
-            public void execute() {
-                // The info button is not meant to be clickable that's why this is empty
-            }
-        }, this);
+        actionFactory.configureIconButton(
+                mergeAction,
+                new SimpleCommand() {
+                    @Override
+                    public void execute() {
+                        // The info button is not meant to be clickable that's why this is empty
+                    }
+                },
+                this);
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/sidebuttons/ToggleMergeUnmergeButton.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/sidebuttons/ToggleMergeUnmergeButton.java
index c3048e0eb174..cf21164a65ec 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/sidebuttons/ToggleMergeUnmergeButton.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/sidebuttons/ToggleMergeUnmergeButton.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.mergeentries.newmergedialog.cell.sidebuttons;
 
-import java.util.Optional;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -16,8 +14,11 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 
+import java.util.Optional;
+
 public class ToggleMergeUnmergeButton extends Button {
-    private final ObjectProperty<FieldState> fieldState = new SimpleObjectProperty<>(FieldState.UNMERGED);
+    private final ObjectProperty<FieldState> fieldState =
+            new SimpleObjectProperty<>(FieldState.UNMERGED);
     private final BooleanProperty canMerge = new SimpleBooleanProperty(Boolean.TRUE);
 
     private final ActionFactory actionFactory = new ActionFactory();
@@ -71,29 +72,31 @@ public void setCanMerge(boolean value) {
     }
 
     private class ToggleMergeCommand extends SimpleCommand {
-        private final Action mergeAction = new Action() {
-            @Override
-            public Optional<JabRefIcon> getIcon() {
-                return Optional.of(IconTheme.JabRefIcons.MERGE_GROUPS);
-            }
-
-            @Override
-            public String getText() {
-                return Localization.lang("Merge %0", field.getDisplayName());
-            }
-        };
-
-        private final Action unmergeAction = new Action() {
-            @Override
-            public Optional<JabRefIcon> getIcon() {
-                return Optional.of(IconTheme.JabRefIcons.UNDO);
-            }
-
-            @Override
-            public String getText() {
-                return Localization.lang("Unmerge %0", field.getDisplayName());
-            }
-        };
+        private final Action mergeAction =
+                new Action() {
+                    @Override
+                    public Optional<JabRefIcon> getIcon() {
+                        return Optional.of(IconTheme.JabRefIcons.MERGE_GROUPS);
+                    }
+
+                    @Override
+                    public String getText() {
+                        return Localization.lang("Merge %0", field.getDisplayName());
+                    }
+                };
+
+        private final Action unmergeAction =
+                new Action() {
+                    @Override
+                    public Optional<JabRefIcon> getIcon() {
+                        return Optional.of(IconTheme.JabRefIcons.UNDO);
+                    }
+
+                    @Override
+                    public String getText() {
+                        return Localization.lang("Unmerge %0", field.getDisplayName());
+                    }
+                };
 
         @Override
         public void execute() {
@@ -108,6 +111,7 @@ public void execute() {
     }
 
     public enum FieldState {
-        MERGED, UNMERGED
+        MERGED,
+        UNMERGED
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/DiffHighlighter.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/DiffHighlighter.java
index 0e69aed2c1ca..40f7f87af06f 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/DiffHighlighter.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/DiffHighlighter.java
@@ -1,20 +1,22 @@
 package org.jabref.gui.mergeentries.newmergedialog.diffhighlighter;
 
+import org.fxmisc.richtext.StyleClassedTextArea;
+import org.jabref.gui.mergeentries.newmergedialog.DiffMethod;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
-import org.jabref.gui.mergeentries.newmergedialog.DiffMethod;
-
-import org.fxmisc.richtext.StyleClassedTextArea;
-
 public abstract sealed class DiffHighlighter permits SplitDiffHighlighter, UnifiedDiffHighlighter {
     protected final StyleClassedTextArea sourceTextview;
     protected final StyleClassedTextArea targetTextview;
 
     protected DiffMethod diffMethod;
 
-    public DiffHighlighter(StyleClassedTextArea sourceTextview, StyleClassedTextArea targetTextview, DiffMethod diffMethod) {
+    public DiffHighlighter(
+            StyleClassedTextArea sourceTextview,
+            StyleClassedTextArea targetTextview,
+            DiffMethod diffMethod) {
         Objects.requireNonNull(sourceTextview, "source text view MUST NOT be null.");
         Objects.requireNonNull(targetTextview, "target text view MUST NOT be null.");
 
@@ -42,7 +44,9 @@ public String getSeparator() {
     }
 
     public enum BasicDiffMethod implements DiffMethod {
-        WORDS(" "), CHARS(""), COMMA(",");
+        WORDS(" "),
+        CHARS(""),
+        COMMA(",");
 
         private final String separator;
 
@@ -61,12 +65,10 @@ protected String join(List<String> stringList) {
     }
 
     enum ChangeType {
-        ADDITION, DELETION, CHANGE_DELETION
+        ADDITION,
+        DELETION,
+        CHANGE_DELETION
     }
 
-    record Change(
-            int position,
-            int spanSize,
-            ChangeType type) {
-    }
+    record Change(int position, int spanSize, ChangeType type) {}
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/SplitDiffHighlighter.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/SplitDiffHighlighter.java
index f5194732eda5..e517ffc1e35f 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/SplitDiffHighlighter.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/SplitDiffHighlighter.java
@@ -1,12 +1,12 @@
 package org.jabref.gui.mergeentries.newmergedialog.diffhighlighter;
 
-import java.util.List;
-
-import org.jabref.gui.mergeentries.newmergedialog.DiffMethod;
-
 import com.github.difflib.DiffUtils;
 import com.github.difflib.patch.AbstractDelta;
+
 import org.fxmisc.richtext.StyleClassedTextArea;
+import org.jabref.gui.mergeentries.newmergedialog.DiffMethod;
+
+import java.util.List;
 
 /**
  * A diff highlighter in which changes are split between source and target text view.
@@ -14,7 +14,10 @@
  */
 public final class SplitDiffHighlighter extends DiffHighlighter {
 
-    public SplitDiffHighlighter(StyleClassedTextArea sourceTextview, StyleClassedTextArea targetTextview, DiffMethod diffMethod) {
+    public SplitDiffHighlighter(
+            StyleClassedTextArea sourceTextview,
+            StyleClassedTextArea targetTextview,
+            DiffMethod diffMethod) {
         super(sourceTextview, targetTextview, diffMethod);
     }
 
@@ -29,7 +32,8 @@ public void highlight() {
         List<String> sourceTokens = splitString(sourceContent);
         List<String> targetTokens = splitString(targetContent);
 
-        List<AbstractDelta<String>> deltaList = DiffUtils.diff(sourceTokens, targetTokens).getDeltas();
+        List<AbstractDelta<String>> deltaList =
+                DiffUtils.diff(sourceTokens, targetTokens).getDeltas();
 
         for (AbstractDelta<String> delta : deltaList) {
             int affectedSourceTokensPosition = delta.getSource().getPosition();
@@ -37,28 +41,52 @@ public void highlight() {
 
             List<String> affectedTokensInSource = delta.getSource().getLines();
             List<String> affectedTokensInTarget = delta.getTarget().getLines();
-            int joinedSourceTokensLength = affectedTokensInSource.stream()
-                    .map(String::length)
-                    .reduce(Integer::sum)
-                    .map(value -> value + (getSeparator().length() * (affectedTokensInSource.size() - 1)))
-                    .orElse(0);
+            int joinedSourceTokensLength =
+                    affectedTokensInSource.stream()
+                            .map(String::length)
+                            .reduce(Integer::sum)
+                            .map(
+                                    value ->
+                                            value
+                                                    + (getSeparator().length()
+                                                            * (affectedTokensInSource.size() - 1)))
+                            .orElse(0);
 
-            int joinedTargetTokensLength = affectedTokensInTarget.stream()
-                    .map(String::length)
-                    .reduce(Integer::sum)
-                    .map(value -> value + (getSeparator().length() * (affectedTokensInTarget.size() - 1)))
-                    .orElse(0);
-            int affectedSourceTokensPositionInText = getPositionInText(affectedSourceTokensPosition, sourceTokens);
-            int affectedTargetTokensPositionInText = getPositionInText(affectedTargetTokensPosition, targetTokens);
+            int joinedTargetTokensLength =
+                    affectedTokensInTarget.stream()
+                            .map(String::length)
+                            .reduce(Integer::sum)
+                            .map(
+                                    value ->
+                                            value
+                                                    + (getSeparator().length()
+                                                            * (affectedTokensInTarget.size() - 1)))
+                            .orElse(0);
+            int affectedSourceTokensPositionInText =
+                    getPositionInText(affectedSourceTokensPosition, sourceTokens);
+            int affectedTargetTokensPositionInText =
+                    getPositionInText(affectedTargetTokensPosition, targetTokens);
             switch (delta.getType()) {
                 case CHANGE -> {
-                    sourceTextview.setStyleClass(affectedSourceTokensPositionInText, affectedSourceTokensPositionInText + joinedSourceTokensLength, "deletion");
-                    targetTextview.setStyleClass(affectedTargetTokensPositionInText, affectedTargetTokensPositionInText + joinedTargetTokensLength, "updated");
+                    sourceTextview.setStyleClass(
+                            affectedSourceTokensPositionInText,
+                            affectedSourceTokensPositionInText + joinedSourceTokensLength,
+                            "deletion");
+                    targetTextview.setStyleClass(
+                            affectedTargetTokensPositionInText,
+                            affectedTargetTokensPositionInText + joinedTargetTokensLength,
+                            "updated");
                 }
                 case DELETE ->
-                        sourceTextview.setStyleClass(affectedSourceTokensPositionInText, affectedSourceTokensPositionInText + joinedSourceTokensLength, "deletion");
+                        sourceTextview.setStyleClass(
+                                affectedSourceTokensPositionInText,
+                                affectedSourceTokensPositionInText + joinedSourceTokensLength,
+                                "deletion");
                 case INSERT ->
-                        targetTextview.setStyleClass(affectedTargetTokensPositionInText, affectedTargetTokensPositionInText + joinedTargetTokensLength, "addition");
+                        targetTextview.setStyleClass(
+                                affectedTargetTokensPositionInText,
+                                affectedTargetTokensPositionInText + joinedTargetTokensLength,
+                                "addition");
             }
         }
     }
@@ -67,7 +95,9 @@ public int getPositionInText(int positionInTokenList, List<String> tokenList) {
         if (positionInTokenList == 0) {
             return 0;
         } else {
-            return tokenList.stream().limit(positionInTokenList).map(String::length)
+            return tokenList.stream()
+                    .limit(positionInTokenList)
+                    .map(String::length)
                     .reduce(Integer::sum)
                     .map(value -> value + (getSeparator().length() * positionInTokenList))
                     .orElse(0);
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/UnifiedDiffHighlighter.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/UnifiedDiffHighlighter.java
index c15e0420f3bb..d9672d06094c 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/UnifiedDiffHighlighter.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/UnifiedDiffHighlighter.java
@@ -1,15 +1,15 @@
 package org.jabref.gui.mergeentries.newmergedialog.diffhighlighter;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import org.jabref.gui.mergeentries.newmergedialog.DiffMethod;
-
 import com.github.difflib.DiffUtils;
 import com.github.difflib.patch.AbstractDelta;
 import com.github.difflib.patch.DeltaType;
+
 import org.fxmisc.richtext.StyleClassedTextArea;
+import org.jabref.gui.mergeentries.newmergedialog.DiffMethod;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 
 /**
  * A diff highlighter in which differences of type {@link DeltaType#CHANGE} are unified and represented by an insertion
@@ -17,7 +17,10 @@
  */
 public final class UnifiedDiffHighlighter extends DiffHighlighter {
 
-    public UnifiedDiffHighlighter(StyleClassedTextArea sourceTextview, StyleClassedTextArea targetTextview, DiffMethod diffMethod) {
+    public UnifiedDiffHighlighter(
+            StyleClassedTextArea sourceTextview,
+            StyleClassedTextArea targetTextview,
+            DiffMethod diffMethod) {
         super(sourceTextview, targetTextview, diffMethod);
     }
 
@@ -33,7 +36,8 @@ public void highlight() {
         List<String> targetWords = splitString(targetContent);
         List<String> unifiedWords = new ArrayList<>(targetWords);
 
-        List<AbstractDelta<String>> deltaList = DiffUtils.diff(sourceWords, targetWords).getDeltas();
+        List<AbstractDelta<String>> deltaList =
+                DiffUtils.diff(sourceWords, targetWords).getDeltas();
 
         List<Change> changeList = new ArrayList<>();
 
@@ -50,7 +54,9 @@ public void highlight() {
                     unifiedWords.add(deletionPoint, join(deltaSourceWords));
 
                     changeList.add(new Change(deletionPoint, 1, ChangeType.CHANGE_DELETION));
-                    changeList.add(new Change(insertionPoint, deltaTargetWords.size(), ChangeType.ADDITION));
+                    changeList.add(
+                            new Change(
+                                    insertionPoint, deltaTargetWords.size(), ChangeType.ADDITION));
                     deletionCount++;
                 }
                 case DELETE -> {
@@ -62,7 +68,11 @@ public void highlight() {
                 }
                 case INSERT -> {
                     int insertionPoint = delta.getTarget().getPosition() + deletionCount;
-                    changeList.add(new Change(insertionPoint, delta.getTarget().getLines().size(), ChangeType.ADDITION));
+                    changeList.add(
+                            new Change(
+                                    insertionPoint,
+                                    delta.getTarget().getLines().size(),
+                                    ChangeType.ADDITION));
                 }
             }
         }
@@ -76,19 +86,24 @@ public void highlight() {
                 appendToTextArea(targetTextview, getSeparator() + word, "unchanged");
             } else {
                 Change change = changeAtPosition.get();
-                List<String> changeWords = unifiedWords.subList(change.position(), change.position() + change.spanSize());
+                List<String> changeWords =
+                        unifiedWords.subList(
+                                change.position(), change.position() + change.spanSize());
 
                 if (change.type() == ChangeType.DELETION) {
-                    appendToTextArea(targetTextview, getSeparator() + join(changeWords), "deletion");
+                    appendToTextArea(
+                            targetTextview, getSeparator() + join(changeWords), "deletion");
                 } else if (change.type() == ChangeType.ADDITION) {
                     if (changeInProgress) {
                         appendToTextArea(targetTextview, join(changeWords), "addition");
                         changeInProgress = false;
                     } else {
-                        appendToTextArea(targetTextview, getSeparator() + join(changeWords), "addition");
+                        appendToTextArea(
+                                targetTextview, getSeparator() + join(changeWords), "addition");
                     }
                 } else if (change.type() == ChangeType.CHANGE_DELETION) {
-                    appendToTextArea(targetTextview, getSeparator() + join(changeWords), "deletion");
+                    appendToTextArea(
+                            targetTextview, getSeparator() + join(changeWords), "deletion");
                     changeInProgress = true;
                 }
                 position = (position + changeWords.size()) - 1;
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FieldMergerFactory.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FieldMergerFactory.java
index 221ce61c7f89..ba9981135058 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FieldMergerFactory.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FieldMergerFactory.java
@@ -21,11 +21,16 @@ public FieldMerger create(Field field) {
         } else if (field == StandardField.FILE) {
             return new FileMerger();
         } else {
-            throw new IllegalArgumentException("No implementation found for merging the given field: " + field.getDisplayName());
+            throw new IllegalArgumentException(
+                    "No implementation found for merging the given field: "
+                            + field.getDisplayName());
         }
     }
 
     public static boolean canMerge(Field field) {
-        return field == StandardField.GROUPS || field == StandardField.KEYWORDS || field == StandardField.COMMENT || field == StandardField.FILE;
+        return field == StandardField.GROUPS
+                || field == StandardField.KEYWORDS
+                || field == StandardField.COMMENT
+                || field == StandardField.FILE;
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FileMerger.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FileMerger.java
index 91063b931f11..0d710e8f42b9 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FileMerger.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FileMerger.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.mergeentries.newmergedialog.fieldsmerger;
 
-import java.util.List;
-
 import org.jabref.logic.bibtex.FileFieldWriter;
 import org.jabref.logic.importer.util.FileFieldParser;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.List;
+
 /**
  * A merger for the {@link StandardField#FILE} field
  * */
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/GroupMerger.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/GroupMerger.java
index 2b892fcd31a5..f202bda6a81c 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/GroupMerger.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/GroupMerger.java
@@ -1,12 +1,12 @@
 package org.jabref.gui.mergeentries.newmergedialog.fieldsmerger;
 
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.strings.StringUtil;
+
 import java.util.Arrays;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.strings.StringUtil;
-
 /**
  * A merger for the {@link StandardField#GROUPS} field
  * */
@@ -24,8 +24,8 @@ public String merge(String groupsA, String groupsB) {
             return groupsA;
         } else {
             return Arrays.stream(GROUPS_SEPARATOR_REGEX.split(groupsA + GROUPS_SEPARATOR + groupsB))
-                         .distinct()
-                         .collect(Collectors.joining(GROUPS_SEPARATOR));
+                    .distinct()
+                    .collect(Collectors.joining(GROUPS_SEPARATOR));
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/KeywordMerger.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/KeywordMerger.java
index 2a453106a6ff..4c64dcea9574 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/KeywordMerger.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/KeywordMerger.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.mergeentries.newmergedialog.fieldsmerger;
 
-import java.util.Objects;
-
 import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.KeywordList;
 import org.jabref.model.entry.field.StandardField;
 
+import java.util.Objects;
+
 /**
  * A merger for the {@link StandardField#KEYWORDS} field
  * */
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.java
index 2afea487bf34..56ab3e47a418 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.java
@@ -1,5 +1,12 @@
 package org.jabref.gui.mergeentries.newmergedialog.toolbar;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.google.common.base.Enums;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.EasyBinding;
+
+import jakarta.inject.Inject;
+
 import javafx.beans.binding.BooleanExpression;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -20,42 +27,26 @@
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.google.common.base.Enums;
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.EasyBinding;
-import jakarta.inject.Inject;
-
 public class ThreeWayMergeToolbar extends AnchorPane {
-    @FXML
-    private RadioButton highlightCharactersRadioButtons;
+    @FXML private RadioButton highlightCharactersRadioButtons;
 
-    @FXML
-    private RadioButton highlightWordsRadioButton;
+    @FXML private RadioButton highlightWordsRadioButton;
 
-    @FXML
-    private ToggleGroup diffHighlightingMethodToggleGroup;
+    @FXML private ToggleGroup diffHighlightingMethodToggleGroup;
 
-    @FXML
-    private ComboBox<DiffView> diffViewComboBox;
+    @FXML private ComboBox<DiffView> diffViewComboBox;
 
-    @FXML
-    private ComboBox<PlainTextOrDiff> plainTextOrDiffComboBox;
+    @FXML private ComboBox<PlainTextOrDiff> plainTextOrDiffComboBox;
 
-    @FXML
-    private Button selectLeftEntryValuesButton;
+    @FXML private Button selectLeftEntryValuesButton;
 
-    @FXML
-    private Button selectRightEntryValuesButton;
+    @FXML private Button selectRightEntryValuesButton;
 
-    @FXML
-    private CheckBox onlyShowChangedFieldsCheck;
+    @FXML private CheckBox onlyShowChangedFieldsCheck;
 
-    @FXML
-    private CheckBox applyToAllEntriesCheck;
+    @FXML private CheckBox applyToAllEntriesCheck;
 
-    @Inject
-    private GuiPreferences preferences;
+    @Inject private GuiPreferences preferences;
 
     private final ObjectProperty<DiffMethod> diffHighlightingMethod = new SimpleObjectProperty<>();
     private final BooleanProperty onlyShowChangedFields = new SimpleBooleanProperty();
@@ -63,58 +54,74 @@ public class ThreeWayMergeToolbar extends AnchorPane {
     private EasyBinding<Boolean> showDiff;
 
     public ThreeWayMergeToolbar() {
-        ViewLoader.view(this)
-                .root(this)
-                .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @FXML
     public void initialize() {
-        showDiff = EasyBind.map(plainTextOrDiffComboBox.valueProperty(), plainTextOrDiff -> plainTextOrDiff == PlainTextOrDiff.Diff);
+        showDiff =
+                EasyBind.map(
+                        plainTextOrDiffComboBox.valueProperty(),
+                        plainTextOrDiff -> plainTextOrDiff == PlainTextOrDiff.Diff);
         plainTextOrDiffComboBox.getItems().addAll(PlainTextOrDiff.values());
 
-        plainTextOrDiffComboBox.setConverter(new StringConverter<>() {
-            @Override
-            public String toString(PlainTextOrDiff plainTextOrDiff) {
-                return plainTextOrDiff.getValue();
-            }
+        plainTextOrDiffComboBox.setConverter(
+                new StringConverter<>() {
+                    @Override
+                    public String toString(PlainTextOrDiff plainTextOrDiff) {
+                        return plainTextOrDiff.getValue();
+                    }
 
-            @Override
-            public PlainTextOrDiff fromString(String string) {
-                return PlainTextOrDiff.fromString(string);
-            }
-        });
+                    @Override
+                    public PlainTextOrDiff fromString(String string) {
+                        return PlainTextOrDiff.fromString(string);
+                    }
+                });
 
         diffViewComboBox.disableProperty().bind(notShowDiffProperty());
         diffViewComboBox.getItems().addAll(DiffView.values());
 
-        diffViewComboBox.setConverter(new StringConverter<>() {
-            @Override
-            public String toString(DiffView diffView) {
-                return diffView.getValue();
-            }
+        diffViewComboBox.setConverter(
+                new StringConverter<>() {
+                    @Override
+                    public String toString(DiffView diffView) {
+                        return diffView.getValue();
+                    }
 
-            @Override
-            public DiffView fromString(String string) {
-                return DiffView.fromString(string);
-            }
-        });
+                    @Override
+                    public DiffView fromString(String string) {
+                        return DiffView.fromString(string);
+                    }
+                });
 
         highlightWordsRadioButton.disableProperty().bind(notShowDiffProperty());
         highlightCharactersRadioButtons.disableProperty().bind(notShowDiffProperty());
 
-        diffHighlightingMethodToggleGroup.selectedToggleProperty().addListener((observable -> {
-            if (diffHighlightingMethodToggleGroup.getSelectedToggle().equals(highlightCharactersRadioButtons)) {
-                diffHighlightingMethod.set(BasicDiffMethod.CHARS);
-            } else {
-                diffHighlightingMethod.set(BasicDiffMethod.WORDS);
-            }
-        }));
-
-        onlyShowChangedFieldsCheck.selectedProperty().bindBidirectional(preferences.getMergeDialogPreferences().mergeShowChangedFieldOnlyProperty());
+        diffHighlightingMethodToggleGroup
+                .selectedToggleProperty()
+                .addListener(
+                        (observable -> {
+                            if (diffHighlightingMethodToggleGroup
+                                    .getSelectedToggle()
+                                    .equals(highlightCharactersRadioButtons)) {
+                                diffHighlightingMethod.set(BasicDiffMethod.CHARS);
+                            } else {
+                                diffHighlightingMethod.set(BasicDiffMethod.WORDS);
+                            }
+                        }));
+
+        onlyShowChangedFieldsCheck
+                .selectedProperty()
+                .bindBidirectional(
+                        preferences
+                                .getMergeDialogPreferences()
+                                .mergeShowChangedFieldOnlyProperty());
         onlyShowChangedFields.bind(onlyShowChangedFieldsCheck.selectedProperty());
 
-        applyToAllEntriesCheck.selectedProperty().bindBidirectional(preferences.getMergeDialogPreferences().mergeApplyToAllEntriesProperty());
+        applyToAllEntriesCheck
+                .selectedProperty()
+                .bindBidirectional(
+                        preferences.getMergeDialogPreferences().mergeApplyToAllEntriesProperty());
         applyToAllEntries.bind(applyToAllEntriesCheck.selectedProperty());
 
         loadSavedConfiguration();
@@ -123,21 +130,39 @@ public DiffView fromString(String string) {
     private void loadSavedConfiguration() {
         MergeDialogPreferences mergeDialogPreferences = preferences.getMergeDialogPreferences();
 
-        PlainTextOrDiff plainTextOrDiffPreference = mergeDialogPreferences.getMergeShouldShowDiff() ? PlainTextOrDiff.Diff : PlainTextOrDiff.PLAIN_TEXT;
+        PlainTextOrDiff plainTextOrDiffPreference =
+                mergeDialogPreferences.getMergeShouldShowDiff()
+                        ? PlainTextOrDiff.Diff
+                        : PlainTextOrDiff.PLAIN_TEXT;
         plainTextOrDiffComboBox.getSelectionModel().select(plainTextOrDiffPreference);
 
-        DiffView diffViewPreference = mergeDialogPreferences.getMergeShouldShowUnifiedDiff() ? DiffView.UNIFIED : DiffView.SPLIT;
+        DiffView diffViewPreference =
+                mergeDialogPreferences.getMergeShouldShowUnifiedDiff()
+                        ? DiffView.UNIFIED
+                        : DiffView.SPLIT;
         diffViewComboBox.getSelectionModel().select(diffViewPreference);
 
-        diffHighlightingMethodToggleGroup.selectToggle(mergeDialogPreferences.getMergeHighlightWords() ? highlightWordsRadioButton : highlightCharactersRadioButtons);
+        diffHighlightingMethodToggleGroup.selectToggle(
+                mergeDialogPreferences.getMergeHighlightWords()
+                        ? highlightWordsRadioButton
+                        : highlightCharactersRadioButtons);
     }
 
     public void saveToolbarConfiguration() {
-        preferences.getMergeDialogPreferences().setMergeShouldShowDiff(plainTextOrDiffComboBox.getValue() == PlainTextOrDiff.Diff);
-        preferences.getMergeDialogPreferences().setMergeShouldShowUnifiedDiff(diffViewComboBox.getValue() == DiffView.UNIFIED);
-
-        boolean highlightWordsRadioButtonValue = diffHighlightingMethodToggleGroup.getSelectedToggle().equals(highlightWordsRadioButton);
-        preferences.getMergeDialogPreferences().setMergeHighlightWords(highlightWordsRadioButtonValue);
+        preferences
+                .getMergeDialogPreferences()
+                .setMergeShouldShowDiff(plainTextOrDiffComboBox.getValue() == PlainTextOrDiff.Diff);
+        preferences
+                .getMergeDialogPreferences()
+                .setMergeShouldShowUnifiedDiff(diffViewComboBox.getValue() == DiffView.UNIFIED);
+
+        boolean highlightWordsRadioButtonValue =
+                diffHighlightingMethodToggleGroup
+                        .getSelectedToggle()
+                        .equals(highlightWordsRadioButton);
+        preferences
+                .getMergeDialogPreferences()
+                .setMergeHighlightWords(highlightWordsRadioButtonValue);
     }
 
     public ObjectProperty<DiffView> diffViewProperty() {
@@ -157,7 +182,9 @@ public EasyBinding<Boolean> showDiffProperty() {
     }
 
     public void setShowDiff(boolean showDiff) {
-        plainTextOrDiffComboBox.valueProperty().set(showDiff ? PlainTextOrDiff.Diff : PlainTextOrDiff.PLAIN_TEXT);
+        plainTextOrDiffComboBox
+                .valueProperty()
+                .set(showDiff ? PlainTextOrDiff.Diff : PlainTextOrDiff.PLAIN_TEXT);
     }
 
     public BooleanProperty hideEqualFieldsProperty() {
@@ -205,7 +232,8 @@ public void setOnSelectRightEntryValuesButtonClicked(Runnable onClick) {
     }
 
     public enum PlainTextOrDiff {
-        PLAIN_TEXT(Localization.lang("Plain Text")), Diff(Localization.lang("Show Diff"));
+        PLAIN_TEXT(Localization.lang("Plain Text")),
+        Diff(Localization.lang("Show Diff"));
 
         private final String value;
 
diff --git a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java
index 18029ee5f403..18b69ec0b0ea 100644
--- a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.openoffice;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.RadioButton;
@@ -9,8 +11,6 @@
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
 public class AdvancedCiteDialogView extends BaseDialog<AdvancedCiteDialogViewModel> {
 
     @FXML private TextField pageInfo;
@@ -20,16 +20,15 @@ public class AdvancedCiteDialogView extends BaseDialog<AdvancedCiteDialogViewMod
     private AdvancedCiteDialogViewModel viewModel;
 
     public AdvancedCiteDialogView() {
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
-
-        setResultConverter(btn -> {
-            if (btn == ButtonType.OK) {
-                return viewModel;
-            }
-            return null;
-        });
+        ViewLoader.view(this).load().setAsDialogPane(this);
+
+        setResultConverter(
+                btn -> {
+                    if (btn == ButtonType.OK) {
+                        return viewModel;
+                    }
+                    return null;
+                });
 
         setTitle(Localization.lang("Cite special"));
     }
diff --git a/src/main/java/org/jabref/gui/openoffice/Bootstrap.java b/src/main/java/org/jabref/gui/openoffice/Bootstrap.java
index e3aa27fae0f5..795953c55476 100644
--- a/src/main/java/org/jabref/gui/openoffice/Bootstrap.java
+++ b/src/main/java/org/jabref/gui/openoffice/Bootstrap.java
@@ -20,19 +20,6 @@
 
 package org.jabref.gui.openoffice;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Random;
-
 import com.sun.star.bridge.UnoUrlResolver;
 import com.sun.star.bridge.XUnoUrlResolver;
 import com.sun.star.comp.helper.BootstrapException;
@@ -50,46 +37,65 @@
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Random;
+
 /** Bootstrap offers functionality to obtain a context or simply
-  * a service manager.
-  * The service manager can create a few basic services, whose implementations  are:
-  * <ul>
-  * <li>com.sun.star.comp.loader.JavaLoader</li>
-  * <li>com.sun.star.comp.urlresolver.UrlResolver</li>
-  * <li>com.sun.star.comp.bridgefactory.BridgeFactory</li>
-  * <li>com.sun.star.comp.connections.Connector</li>
-  * <li>com.sun.star.comp.connections.Acceptor</li>
-  * <li>com.sun.star.comp.servicemanager.ServiceManager</li>
-  * </ul>
-  *
-  * Other services can be inserted into the service manager by
-  * using its XSet interface:
-  * <pre>
-  *     XSet xSet = UnoRuntime.queryInterface( XSet.class, aMultiComponentFactory );
-  *     // insert the service manager
-  *     xSet.insert( aSingleComponentFactory );
-  * </pre>
-*/
+ * a service manager.
+ * The service manager can create a few basic services, whose implementations  are:
+ * <ul>
+ * <li>com.sun.star.comp.loader.JavaLoader</li>
+ * <li>com.sun.star.comp.urlresolver.UrlResolver</li>
+ * <li>com.sun.star.comp.bridgefactory.BridgeFactory</li>
+ * <li>com.sun.star.comp.connections.Connector</li>
+ * <li>com.sun.star.comp.connections.Acceptor</li>
+ * <li>com.sun.star.comp.servicemanager.ServiceManager</li>
+ * </ul>
+ *
+ * Other services can be inserted into the service manager by
+ * using its XSet interface:
+ * <pre>
+ *     XSet xSet = UnoRuntime.queryInterface( XSet.class, aMultiComponentFactory );
+ *     // insert the service manager
+ *     xSet.insert( aSingleComponentFactory );
+ * </pre>
+ */
 public class Bootstrap {
 
     private static final Random RANDOM_PIPE_NAME = new Random();
     private static boolean M_LOADED_JUH = false;
 
-    private static void insertBasicFactories(XSet xSet, XImplementationLoader xImpLoader) throws Exception {
+    private static void insertBasicFactories(XSet xSet, XImplementationLoader xImpLoader)
+            throws Exception {
         // insert the factory of the loader
         xSet.insert(xImpLoader.activate("com.sun.star.comp.loader.JavaLoader", null, null, null));
 
         // insert the factory of the URLResolver
-        xSet.insert(xImpLoader.activate("com.sun.star.comp.urlresolver.UrlResolver", null, null, null));
+        xSet.insert(
+                xImpLoader.activate("com.sun.star.comp.urlresolver.UrlResolver", null, null, null));
 
         // insert the bridgefactory
-        xSet.insert(xImpLoader.activate("com.sun.star.comp.bridgefactory.BridgeFactory", null, null, null));
+        xSet.insert(
+                xImpLoader.activate(
+                        "com.sun.star.comp.bridgefactory.BridgeFactory", null, null, null));
 
         // insert the connector
-        xSet.insert(xImpLoader.activate("com.sun.star.comp.connections.Connector", null, null, null));
+        xSet.insert(
+                xImpLoader.activate("com.sun.star.comp.connections.Connector", null, null, null));
 
         // insert the acceptor
-        xSet.insert(xImpLoader.activate("com.sun.star.comp.connections.Acceptor", null, null, null));
+        xSet.insert(
+                xImpLoader.activate("com.sun.star.comp.connections.Acceptor", null, null, null));
     }
 
     /**
@@ -120,7 +126,8 @@ public static String[] getDefaultOptions() {
      * @return a new context.
      * @throws Exception if things go awry.
      */
-    public static XComponentContext createInitialComponentContext(Hashtable<String, Object> context_entries) throws Exception {
+    public static XComponentContext createInitialComponentContext(
+            Hashtable<String, Object> context_entries) throws Exception {
         return createInitialComponentContext((Map<String, Object>) context_entries);
     }
 
@@ -131,10 +138,12 @@ public static XComponentContext createInitialComponentContext(Hashtable<String,
      * @return a new context.
      * @throws Exception if things go awry.
      */
-    public static XComponentContext createInitialComponentContext(Map<String, Object> context_entries) throws Exception {
+    public static XComponentContext createInitialComponentContext(
+            Map<String, Object> context_entries) throws Exception {
         ServiceManager xSMgr = new ServiceManager();
 
-        XImplementationLoader xImpLoader = UnoRuntime.queryInterface(XImplementationLoader.class, new JavaLoader());
+        XImplementationLoader xImpLoader =
+                UnoRuntime.queryInterface(XImplementationLoader.class, new JavaLoader());
         XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xImpLoader);
         Object[] args = new Object[] {xSMgr};
         xInit.initialize(args);
@@ -144,7 +153,9 @@ public static XComponentContext createInitialComponentContext(Map<String, Object
             context_entries = new HashMap<>(1);
         }
         // add smgr
-        context_entries.put("/singletons/com.sun.star.lang.theServiceManager", new ComponentContextEntry(null, xSMgr));
+        context_entries.put(
+                "/singletons/com.sun.star.lang.theServiceManager",
+                new ComponentContextEntry(null, xSMgr));
         // ... xxx todo: add standard entries
         XComponentContext xContext = new ComponentContext(context_entries, null);
 
@@ -166,7 +177,9 @@ public static XComponentContext createInitialComponentContext(Map<String, Object
      * @throws Exception if things go awry.
      */
     public static XMultiServiceFactory createSimpleServiceManager() throws Exception {
-        return UnoRuntime.queryInterface(XMultiServiceFactory.class, createInitialComponentContext((Map<String, Object>) null).getServiceManager());
+        return UnoRuntime.queryInterface(
+                XMultiServiceFactory.class,
+                createInitialComponentContext((Map<String, Object>) null).getServiceManager());
     }
 
     /**
@@ -190,8 +203,10 @@ public static XComponentContext defaultBootstrap_InitialComponentContext() throw
      * @return a freshly bootstrapped component context.
      * @throws Exception if things go awry.
      */
-    public static XComponentContext defaultBootstrap_InitialComponentContext(String ini_file, Hashtable<String, String> bootstrap_parameters) throws Exception {
-        return defaultBootstrap_InitialComponentContext(ini_file, (Map<String, String>) bootstrap_parameters);
+    public static XComponentContext defaultBootstrap_InitialComponentContext(
+            String ini_file, Hashtable<String, String> bootstrap_parameters) throws Exception {
+        return defaultBootstrap_InitialComponentContext(
+                ini_file, (Map<String, String>) bootstrap_parameters);
     }
 
     /**
@@ -205,7 +220,8 @@ public static XComponentContext defaultBootstrap_InitialComponentContext(String
      * @return a freshly bootstrapped component context.
      * @throws Exception if things go awry.
      */
-    public static XComponentContext defaultBootstrap_InitialComponentContext(String ini_file, Map<String, String> bootstrap_parameters) throws Exception {
+    public static XComponentContext defaultBootstrap_InitialComponentContext(
+            String ini_file, Map<String, String> bootstrap_parameters) throws Exception {
         // jni convenience: easier to iterate over array than calling Hashtable
         String pairs[] = null;
         if (null != bootstrap_parameters) {
@@ -243,10 +259,13 @@ public static XComponentContext defaultBootstrap_InitialComponentContext(String
             }
             M_LOADED_JUH = true;
         }
-        return UnoRuntime.queryInterface(XComponentContext.class, cppuhelper_bootstrap(ini_file, pairs, Bootstrap.class.getClassLoader()));
+        return UnoRuntime.queryInterface(
+                XComponentContext.class,
+                cppuhelper_bootstrap(ini_file, pairs, Bootstrap.class.getClassLoader()));
     }
 
-    private static native Object cppuhelper_bootstrap(String ini_file, String bootstrap_parameters[], ClassLoader loader) throws Exception;
+    private static native Object cppuhelper_bootstrap(
+            String ini_file, String bootstrap_parameters[], ClassLoader loader) throws Exception;
 
     /**
      * Bootstraps the component context from a UNO installation.
@@ -269,19 +288,22 @@ public static XComponentContext bootstrap(Path ooPath) throws BootstrapException
      * @see #getDefaultOptions()
      * @since LibreOffice 5.1
      */
-    public static XComponentContext bootstrap(String[] argArray, Path path) throws BootstrapException {
+    public static XComponentContext bootstrap(String[] argArray, Path path)
+            throws BootstrapException {
 
         XComponentContext xContext = null;
 
         try {
             // create default local component context
-            XComponentContext xLocalContext = createInitialComponentContext((Map<String, Object>) null);
+            XComponentContext xLocalContext =
+                    createInitialComponentContext((Map<String, Object>) null);
             if (xLocalContext == null) {
                 throw new BootstrapException("no local component context!");
             }
 
             // create call with arguments
-            // We need a socket, pipe does not work. https://api.libreoffice.org/examples/examples.html
+            // We need a socket, pipe does not work.
+            // https://api.libreoffice.org/examples/examples.html
             String[] cmdArray = new String[argArray.length + 2];
             cmdArray[0] = path.toAbsolutePath().toString();
             cmdArray[1] = "--accept=socket,host=localhost,port=2083" + ";urp;";
@@ -303,7 +325,8 @@ public static XComponentContext bootstrap(String[] argArray, Path path) throws B
             XUnoUrlResolver xUrlResolver = UnoUrlResolver.create(xLocalContext);
 
             // connection string
-            String sConnect = "uno:socket,host=localhost,port=2083" + ";urp;StarOffice.ComponentContext";
+            String sConnect =
+                    "uno:socket,host=localhost,port=2083" + ";urp;StarOffice.ComponentContext";
 
             // wait until office is started
             for (int i = 0; ; ++i) {
@@ -340,7 +363,8 @@ private static void pipe(final InputStream in, final PrintStream out, final Stri
             @Override
             public void run() {
                 try {
-                    BufferedReader r = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
+                    BufferedReader r =
+                            new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
 
                     for (; ; ) {
                         String s = r.readLine();
diff --git a/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java b/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java
index c29f24c84245..7cb762734860 100644
--- a/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java
@@ -18,7 +18,10 @@ public CitationEntryViewModel(String refMarkName, String citation, String extraI
     }
 
     public CitationEntryViewModel(CitationEntry citationEntry) {
-        this(citationEntry.getRefMarkName(), citationEntry.getContext(), citationEntry.getPageInfo().orElse(""));
+        this(
+                citationEntry.getRefMarkName(),
+                citationEntry.getContext(),
+                citationEntry.getPageInfo().orElse(""));
     }
 
     public CitationEntry toCitationEntry() {
diff --git a/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java b/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
index 65cdd357de94..0e9d38e2261c 100644
--- a/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
+++ b/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.openoffice;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
@@ -14,6 +9,11 @@
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.strings.StringUtil;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * Tools for automatically detecting OpenOffice or LibreOffice installations.
  */
@@ -22,7 +22,8 @@ public class DetectOpenOfficeInstallation {
     private final OpenOfficePreferences openOfficePreferences;
     private final DialogService dialogService;
 
-    public DetectOpenOfficeInstallation(OpenOfficePreferences openOfficePreferences, DialogService dialogService) {
+    public DetectOpenOfficeInstallation(
+            OpenOfficePreferences openOfficePreferences, DialogService dialogService) {
         this.dialogService = dialogService;
         this.openOfficePreferences = openOfficePreferences;
     }
@@ -32,11 +33,14 @@ public boolean isExecutablePathDefined() {
     }
 
     public Optional<Path> selectInstallationPath() {
-        dialogService.showInformationDialogAndWait(Localization.lang("Could not find OpenOffice/LibreOffice installation"),
-                Localization.lang("Unable to autodetect OpenOffice/LibreOffice installation. Please choose the installation directory manually."));
-        DirectoryDialogConfiguration dirDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(NativeDesktop.get().getApplicationDirectory())
-                .build();
+        dialogService.showInformationDialogAndWait(
+                Localization.lang("Could not find OpenOffice/LibreOffice installation"),
+                Localization.lang(
+                        "Unable to autodetect OpenOffice/LibreOffice installation. Please choose the installation directory manually."));
+        DirectoryDialogConfiguration dirDialogConfiguration =
+                new DirectoryDialogConfiguration.Builder()
+                        .withInitialDirectory(NativeDesktop.get().getApplicationDirectory())
+                        .build();
         return dialogService.showDirectorySelectionDialog(dirDialogConfiguration);
     }
 
@@ -49,7 +53,8 @@ private boolean checkAutoDetectedPaths(OpenOfficePreferences openOfficePreferenc
         if (OS.LINUX && (System.getenv("FLATPAK_SANDBOX_DIR") != null)) {
             executablePath = OpenOfficePreferences.DEFAULT_LINUX_FLATPAK_EXEC_PATH;
         }
-        return !StringUtil.isNullOrEmpty(executablePath) && Files.isRegularFile(Path.of(executablePath));
+        return !StringUtil.isNullOrEmpty(executablePath)
+                && Files.isRegularFile(Path.of(executablePath));
     }
 
     public boolean setOpenOfficePreferences(Path installDir) {
@@ -82,7 +87,8 @@ public Optional<Path> chooseAmongInstallations(List<Path> installDirs) {
 
         return dialogService.showChoiceDialogAndWait(
                 Localization.lang("Choose OpenOffice/LibreOffice executable"),
-                Localization.lang("Found more than one OpenOffice/LibreOffice executable.") + "\n"
+                Localization.lang("Found more than one OpenOffice/LibreOffice executable.")
+                        + "\n"
                         + Localization.lang("Please choose which one to connect to:"),
                 Localization.lang("Use selected instance"),
                 installDirs);
diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
index 986c971c9d0d..3597e484ffb5 100644
--- a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.openoffice;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
+
 import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.control.ButtonType;
@@ -16,9 +20,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class ManageCitationsDialogView extends BaseDialog<Void> {
 
     private static final String HTML_BOLD_END_TAG = "</b>";
@@ -37,16 +38,15 @@ public class ManageCitationsDialogView extends BaseDialog<Void> {
     public ManageCitationsDialogView(OOBibBase ooBase) {
         this.ooBase = ooBase;
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
-        setResultConverter(btn -> {
-            if (btn == ButtonType.OK) {
-                viewModel.storeSettings();
-            }
-            return null;
-        });
+        setResultConverter(
+                btn -> {
+                    if (btn == ButtonType.OK) {
+                        viewModel.storeSettings();
+                    }
+                    return null;
+                });
 
         setTitle(Localization.lang("Manage citations"));
     }
@@ -56,7 +56,9 @@ private void initialize() {
         viewModel = new ManageCitationsDialogViewModel(ooBase, dialogService);
 
         citation.setCellValueFactory(cellData -> cellData.getValue().citationProperty());
-        new ValueTableCellFactory<CitationEntryViewModel, String>().withGraphic(this::getText).install(citation);
+        new ValueTableCellFactory<CitationEntryViewModel, String>()
+                .withGraphic(this::getText)
+                .install(citation);
 
         extraInfo.setCellValueFactory(cellData -> cellData.getValue().extraInformationProperty());
         extraInfo.setEditable(true);
@@ -65,15 +67,21 @@ private void initialize() {
 
         citationsTableView.itemsProperty().bindBidirectional(viewModel.citationsProperty());
 
-        extraInfo.setOnEditCommit((CellEditEvent<CitationEntryViewModel, String> cell) ->
-                cell.getRowValue().setExtraInfo(cell.getNewValue()));
+        extraInfo.setOnEditCommit(
+                (CellEditEvent<CitationEntryViewModel, String> cell) ->
+                        cell.getRowValue().setExtraInfo(cell.getNewValue()));
         extraInfo.setCellFactory(TextFieldTableCell.forTableColumn());
     }
 
     private Node getText(String citationContext) {
-        String inBetween = StringUtil.substringBetween(citationContext, HTML_BOLD_START_TAG, HTML_BOLD_END_TAG);
+        String inBetween =
+                StringUtil.substringBetween(
+                        citationContext, HTML_BOLD_START_TAG, HTML_BOLD_END_TAG);
         String start = citationContext.substring(0, citationContext.indexOf(HTML_BOLD_START_TAG));
-        String end = citationContext.substring(citationContext.lastIndexOf(HTML_BOLD_END_TAG) + HTML_BOLD_END_TAG.length());
+        String end =
+                citationContext.substring(
+                        citationContext.lastIndexOf(HTML_BOLD_END_TAG)
+                                + HTML_BOLD_END_TAG.length());
 
         Text startText = new Text(start);
         Text inBetweenText = new Text(inBetween);
diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
index 697212fde54b..d4301a516510 100644
--- a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.openoffice;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
@@ -11,10 +7,15 @@
 import org.jabref.gui.DialogService;
 import org.jabref.model.openoffice.CitationEntry;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class ManageCitationsDialogViewModel {
 
     public final boolean failedToGetCitationEntries;
-    private final ListProperty<CitationEntryViewModel> citations = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<CitationEntryViewModel> citations =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
     private final OOBibBase ooBase;
     private final DialogService dialogService;
 
@@ -35,7 +36,10 @@ public ManageCitationsDialogViewModel(OOBibBase ooBase, DialogService dialogServ
     }
 
     public void storeSettings() {
-        List<CitationEntry> citationEntries = citations.stream().map(CitationEntryViewModel::toCitationEntry).collect(Collectors.toList());
+        List<CitationEntry> citationEntries =
+                citations.stream()
+                        .map(CitationEntryViewModel::toCitationEntry)
+                        .collect(Collectors.toList());
         ooBase.guiActionApplyCitationEntries(citationEntries);
     }
 
@@ -43,4 +47,3 @@ public ListProperty<CitationEntryViewModel> citationsProperty() {
         return citations;
     }
 }
-
diff --git a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
index 637c729a720a..6552b4493f71 100644
--- a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
+++ b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
@@ -1,14 +1,16 @@
 package org.jabref.gui.openoffice;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
+import com.airhacks.afterburner.injection.Injector;
+import com.sun.star.beans.IllegalTypeException;
+import com.sun.star.beans.NotRemoveableException;
+import com.sun.star.beans.PropertyVetoException;
+import com.sun.star.comp.helper.BootstrapException;
+import com.sun.star.container.NoSuchElementException;
+import com.sun.star.lang.DisposedException;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.uno.Exception;
 
 import org.jabref.gui.DialogService;
 import org.jabref.logic.JabRefException;
@@ -45,21 +47,19 @@
 import org.jabref.model.openoffice.uno.UnoUndo;
 import org.jabref.model.openoffice.util.OOResult;
 import org.jabref.model.openoffice.util.OOVoidResult;
-
-import com.airhacks.afterburner.injection.Injector;
-import com.sun.star.beans.IllegalTypeException;
-import com.sun.star.beans.NotRemoveableException;
-import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.comp.helper.BootstrapException;
-import com.sun.star.container.NoSuchElementException;
-import com.sun.star.lang.DisposedException;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.uno.Exception;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
 /**
  * Class for manipulating the Bibliography of the currently started document in OpenOffice.
  */
@@ -75,10 +75,9 @@ public class OOBibBase {
 
     private CSLCitationOOAdapter cslCitationOOAdapter;
 
-    public OOBibBase(Path loPath, DialogService dialogService, OpenOfficePreferences openOfficePreferences)
-            throws
-            BootstrapException,
-            CreationException {
+    public OOBibBase(
+            Path loPath, DialogService dialogService, OpenOfficePreferences openOfficePreferences)
+            throws BootstrapException, CreationException {
 
         this.dialogService = dialogService;
         this.connection = new OOBibBaseConnect(loPath, dialogService);
@@ -86,12 +85,14 @@ public OOBibBase(Path loPath, DialogService dialogService, OpenOfficePreferences
         this.alwaysAddCitedOnPages = openOfficePreferences.getAlwaysAddCitedOnPages();
     }
 
-    private void initializeCitationAdapter(XTextDocument doc) throws WrappedTargetException, NoSuchElementException {
+    private void initializeCitationAdapter(XTextDocument doc)
+            throws WrappedTargetException, NoSuchElementException {
         this.cslCitationOOAdapter = new CSLCitationOOAdapter(doc);
         this.cslCitationOOAdapter.readAndUpdateExistingMarks();
     }
 
-    public void guiActionSelectDocument(boolean autoSelectForSingle) throws WrappedTargetException, NoSuchElementException {
+    public void guiActionSelectDocument(boolean autoSelectForSingle)
+            throws WrappedTargetException, NoSuchElementException {
         final String errorTitle = Localization.lang("Problem connecting");
 
         try {
@@ -101,17 +102,17 @@ public void guiActionSelectDocument(boolean autoSelectForSingle) throws WrappedT
             OOError.from(ex).showErrorDialog(dialogService);
         } catch (DisposedException ex) {
             OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
-        } catch (WrappedTargetException
-                 | IndexOutOfBoundsException
-                 | NoSuchElementException ex) {
+        } catch (WrappedTargetException | IndexOutOfBoundsException | NoSuchElementException ex) {
             LOGGER.warn("Problem connecting", ex);
             OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         }
 
         if (this.isConnectedToDocument()) {
             initializeCitationAdapter(this.getXTextDocument().get());
-            dialogService.notify(Localization.lang("Connected to document") + ": "
-                    + this.getCurrentDocumentTitle().orElse(""));
+            dialogService.notify(
+                    Localization.lang("Connected to document")
+                            + ": "
+                            + this.getCurrentDocumentTitle().orElse(""));
         }
     }
 
@@ -160,10 +161,11 @@ void showDialog(String errorTitle, OOError err) {
     }
 
     OOVoidResult<OOError> collectResults(String errorTitle, List<OOVoidResult<OOError>> results) {
-        String msg = results.stream()
-                            .filter(OOVoidResult::isError)
-                            .map(e -> e.getError().getLocalizedMessage())
-                            .collect(Collectors.joining("\n\n"));
+        String msg =
+                results.stream()
+                        .filter(OOVoidResult::isError)
+                        .map(e -> e.getError().getLocalizedMessage())
+                        .collect(Collectors.joining("\n\n"));
         if (msg.isEmpty()) {
             return OOVoidResult.ok();
         } else {
@@ -192,7 +194,8 @@ final boolean testDialog(String errorTitle, OOVoidResult<OOError>... results) {
     /**
      * Get the cursor positioned by the user for inserting text.
      */
-    OOResult<XTextCursor, OOError> getUserCursorForTextInsertion(XTextDocument doc, String errorTitle) {
+    OOResult<XTextCursor, OOError> getUserCursorForTextInsertion(
+            XTextDocument doc, String errorTitle) {
         // Get the cursor positioned by the user.
         XTextCursor cursor = UnoCursor.getViewCursor(doc).orElse(null);
 
@@ -202,9 +205,12 @@ OOResult<XTextCursor, OOError> getUserCursorForTextInsertion(XTextDocument doc,
             cursor.getStart();
         } catch (com.sun.star.uno.RuntimeException ex) {
             String msg =
-                    Localization.lang("Please move the cursor"
-                            + " to the location for the new citation.") + "\n"
-                            + Localization.lang("I cannot insert to the cursor's current location.");
+                    Localization.lang(
+                                    "Please move the cursor"
+                                            + " to the location for the new citation.")
+                            + "\n"
+                            + Localization.lang(
+                                    "I cannot insert to the cursor's current location.");
             return OOResult.error(new OOError(errorTitle, msg, ex));
         }
         return OOResult.ok(cursor);
@@ -213,13 +219,15 @@ OOResult<XTextCursor, OOError> getUserCursorForTextInsertion(XTextDocument doc,
     /**
      * This may move the view cursor.
      */
-    OOResult<FunctionalTextViewCursor, OOError> getFunctionalTextViewCursor(XTextDocument doc, String errorTitle) {
+    OOResult<FunctionalTextViewCursor, OOError> getFunctionalTextViewCursor(
+            XTextDocument doc, String errorTitle) {
         String messageOnFailureToObtain =
                 Localization.lang("Please move the cursor into the document text.")
                         + "\n"
-                        + Localization.lang("To get the visual positions of your citations"
-                        + " I need to move the cursor around,"
-                        + " but could not get it.");
+                        + Localization.lang(
+                                "To get the visual positions of your citations"
+                                        + " I need to move the cursor around,"
+                                        + " but could not get it.");
         OOResult<FunctionalTextViewCursor, String> result = FunctionalTextViewCursor.get(doc);
         if (result.isError()) {
             LOGGER.warn(result.getError());
@@ -227,16 +235,15 @@ OOResult<FunctionalTextViewCursor, OOError> getFunctionalTextViewCursor(XTextDoc
         return result.mapError(detail -> new OOError(errorTitle, messageOnFailureToObtain));
     }
 
-    private static OOVoidResult<OOError> checkRangeOverlaps(XTextDocument doc, OOFrontend frontend) {
+    private static OOVoidResult<OOError> checkRangeOverlaps(
+            XTextDocument doc, OOFrontend frontend) {
         final String errorTitle = "Overlapping ranges";
         boolean requireSeparation = false;
         int maxReportedOverlaps = 10;
         try {
-            return frontend.checkRangeOverlaps(doc,
-                                   new ArrayList<>(),
-                                   requireSeparation,
-                                   maxReportedOverlaps)
-                           .mapError(OOError::from);
+            return frontend.checkRangeOverlaps(
+                            doc, new ArrayList<>(), requireSeparation, maxReportedOverlaps)
+                    .mapError(OOError::from);
         } catch (NoDocumentException ex) {
             return OOVoidResult.error(OOError.from(ex).setTitle(errorTitle));
         } catch (WrappedTargetException ex) {
@@ -244,7 +251,8 @@ private static OOVoidResult<OOError> checkRangeOverlaps(XTextDocument doc, OOFro
         }
     }
 
-    private static OOVoidResult<OOError> checkRangeOverlapsWithCursor(XTextDocument doc, OOFrontend frontend) {
+    private static OOVoidResult<OOError> checkRangeOverlapsWithCursor(
+            XTextDocument doc, OOFrontend frontend) {
         final String errorTitle = "Ranges overlapping with cursor";
 
         List<RangeForOverlapCheck<CitationGroupId>> userRanges;
@@ -253,9 +261,7 @@ private static OOVoidResult<OOError> checkRangeOverlapsWithCursor(XTextDocument
         boolean requireSeparation = false;
         OOVoidResult<JabRefException> res;
         try {
-            res = frontend.checkRangeOverlapsWithCursor(doc,
-                    userRanges,
-                    requireSeparation);
+            res = frontend.checkRangeOverlapsWithCursor(doc, userRanges, requireSeparation);
         } catch (NoDocumentException ex) {
             return OOVoidResult.error(OOError.from(ex).setTitle(errorTitle));
         } catch (WrappedTargetException ex) {
@@ -265,7 +271,8 @@ private static OOVoidResult<OOError> checkRangeOverlapsWithCursor(XTextDocument
         if (res.isError()) {
             final String xtitle = Localization.lang("The cursor is in a protected area.");
             return OOVoidResult.error(
-                    new OOError(xtitle, xtitle + "\n" + res.getError().getLocalizedMessage() + "\n"));
+                    new OOError(
+                            xtitle, xtitle + "\n" + res.getError().getLocalizedMessage() + "\n"));
         }
         return res.mapError(OOError::from);
     }
@@ -284,24 +291,32 @@ private static OOVoidResult<OOError> checkIfOpenOfficeIsRecordingChanges(XTextDo
             if (recordingChanges || (nRedlines > 0)) {
                 String msg = "";
                 if (recordingChanges) {
-                    msg += Localization.lang("Cannot work with"
-                            + " [Edit]/[Track Changes]/[Record] turned on.");
+                    msg +=
+                            Localization.lang(
+                                    "Cannot work with"
+                                            + " [Edit]/[Track Changes]/[Record] turned on.");
                 }
                 if (nRedlines > 0) {
                     if (recordingChanges) {
                         msg += "\n";
                     }
-                    msg += Localization.lang("Changes by JabRef"
-                            + " could result in unexpected interactions with"
-                            + " recorded changes.");
+                    msg +=
+                            Localization.lang(
+                                    "Changes by JabRef"
+                                            + " could result in unexpected interactions with"
+                                            + " recorded changes.");
                     msg += "\n";
-                    msg += Localization.lang("Use [Edit]/[Track Changes]/[Manage] to resolve them first.");
+                    msg +=
+                            Localization.lang(
+                                    "Use [Edit]/[Track Changes]/[Manage] to resolve them first.");
                 }
                 return OOVoidResult.error(new OOError(errorTitle, msg));
             }
         } catch (WrappedTargetException ex) {
-            String msg = Localization.lang("Error while checking if Writer"
-                    + " is recording changes or has recorded changes.");
+            String msg =
+                    Localization.lang(
+                            "Error while checking if Writer"
+                                    + " is recording changes or has recorded changes.");
             return OOVoidResult.error(new OOError(errorTitle, msg, ex));
         }
         return OOVoidResult.ok();
@@ -321,14 +336,12 @@ OOResult<OOFrontend, OOError> getFrontend(XTextDocument doc) {
             return OOResult.ok(new OOFrontend(doc));
         } catch (NoDocumentException ex) {
             return OOResult.error(OOError.from(ex).setTitle(errorTitle));
-        } catch (WrappedTargetException
-                 | RuntimeException ex) {
+        } catch (WrappedTargetException | RuntimeException ex) {
             return OOResult.error(OOError.fromMisc(ex).setTitle(errorTitle));
         }
     }
 
-    OOVoidResult<OOError> databaseIsRequired(List<BibDatabase> databases,
-                                             Supplier<OOError> fun) {
+    OOVoidResult<OOError> databaseIsRequired(List<BibDatabase> databases, Supplier<OOError> fun) {
         if (databases == null || databases.isEmpty()) {
             return OOVoidResult.error(fun.get());
         } else {
@@ -336,8 +349,8 @@ OOVoidResult<OOError> databaseIsRequired(List<BibDatabase> databases,
         }
     }
 
-    OOVoidResult<OOError> selectedBibEntryIsRequired(List<BibEntry> entries,
-                                                     Supplier<OOError> fun) {
+    OOVoidResult<OOError> selectedBibEntryIsRequired(
+            List<BibEntry> entries, Supplier<OOError> fun) {
         if (entries == null || entries.isEmpty()) {
             return OOVoidResult.error(fun.get());
         } else {
@@ -348,31 +361,38 @@ OOVoidResult<OOError> selectedBibEntryIsRequired(List<BibEntry> entries,
     /*
      * Checks existence and also checks if it is not an internal name.
      */
-    private OOVoidResult<OOError> checkStyleExistsInTheDocument(String familyName,
-                                                                String styleName,
-                                                                XTextDocument doc,
-                                                                String labelInJstyleFile,
-                                                                String pathToStyleFile)
-            throws
-            WrappedTargetException {
+    private OOVoidResult<OOError> checkStyleExistsInTheDocument(
+            String familyName,
+            String styleName,
+            XTextDocument doc,
+            String labelInJstyleFile,
+            String pathToStyleFile)
+            throws WrappedTargetException {
 
         Optional<String> internalName = UnoStyle.getInternalNameOfStyle(doc, familyName, styleName);
 
         if (internalName.isEmpty()) {
             String msg =
                     switch (familyName) {
-                        case UnoStyle.PARAGRAPH_STYLES -> Localization.lang("The %0 paragraph style '%1' is missing from the document",
-                                labelInJstyleFile,
-                                styleName);
-                        case UnoStyle.CHARACTER_STYLES -> Localization.lang("The %0 character style '%1' is missing from the document",
-                                labelInJstyleFile,
-                                styleName);
-                        default -> throw new IllegalArgumentException("Expected " + UnoStyle.CHARACTER_STYLES
-                                + " or " + UnoStyle.PARAGRAPH_STYLES
-                                + " for familyName");
-                    }
+                                case UnoStyle.PARAGRAPH_STYLES ->
+                                        Localization.lang(
+                                                "The %0 paragraph style '%1' is missing from the document",
+                                                labelInJstyleFile, styleName);
+                                case UnoStyle.CHARACTER_STYLES ->
+                                        Localization.lang(
+                                                "The %0 character style '%1' is missing from the document",
+                                                labelInJstyleFile, styleName);
+                                default ->
+                                        throw new IllegalArgumentException(
+                                                "Expected "
+                                                        + UnoStyle.CHARACTER_STYLES
+                                                        + " or "
+                                                        + UnoStyle.PARAGRAPH_STYLES
+                                                        + " for familyName");
+                            }
                             + "\n"
-                            + Localization.lang("Please create it in the document or change in the file:")
+                            + Localization.lang(
+                                    "Please create it in the document or change in the file:")
                             + "\n"
                             + pathToStyleFile;
             return OOVoidResult.error(new OOError("StyleIsNotKnown", msg));
@@ -381,21 +401,26 @@ private OOVoidResult<OOError> checkStyleExistsInTheDocument(String familyName,
         if (!internalName.get().equals(styleName)) {
             String msg =
                     switch (familyName) {
-                        case UnoStyle.PARAGRAPH_STYLES -> Localization.lang("The %0 paragraph style '%1' is a display name for '%2'.",
-                                labelInJstyleFile,
-                                styleName,
-                                internalName.get());
-                        case UnoStyle.CHARACTER_STYLES -> Localization.lang("The %0 character style '%1' is a display name for '%2'.",
-                                labelInJstyleFile,
-                                styleName,
-                                internalName.get());
-                        default -> throw new IllegalArgumentException("Expected " + UnoStyle.CHARACTER_STYLES
-                                + " or " + UnoStyle.PARAGRAPH_STYLES
-                                + " for familyName");
-                    }
+                                case UnoStyle.PARAGRAPH_STYLES ->
+                                        Localization.lang(
+                                                "The %0 paragraph style '%1' is a display name for '%2'.",
+                                                labelInJstyleFile, styleName, internalName.get());
+                                case UnoStyle.CHARACTER_STYLES ->
+                                        Localization.lang(
+                                                "The %0 character style '%1' is a display name for '%2'.",
+                                                labelInJstyleFile, styleName, internalName.get());
+                                default ->
+                                        throw new IllegalArgumentException(
+                                                "Expected "
+                                                        + UnoStyle.CHARACTER_STYLES
+                                                        + " or "
+                                                        + UnoStyle.PARAGRAPH_STYLES
+                                                        + " for familyName");
+                            }
                             + "\n"
-                            + Localization.lang("Please use the latter in the style file below"
-                            + " to avoid localization problems.")
+                            + Localization.lang(
+                                    "Please use the latter in the style file below"
+                                            + " to avoid localization problems.")
                             + "\n"
                             + pathToStyleFile;
             return OOVoidResult.error(new OOError("StyleNameIsNotInternal", msg));
@@ -408,27 +433,36 @@ public OOVoidResult<OOError> checkStylesExistInTheDocument(JStyle jStyle, XTextD
 
         List<OOVoidResult<OOError>> results = new ArrayList<>();
         try {
-            results.add(checkStyleExistsInTheDocument(UnoStyle.PARAGRAPH_STYLES,
-                    jStyle.getReferenceHeaderParagraphFormat(),
-                    doc,
-                    "ReferenceHeaderParagraphFormat",
-                    pathToStyleFile));
-            results.add(checkStyleExistsInTheDocument(UnoStyle.PARAGRAPH_STYLES,
-                    jStyle.getReferenceParagraphFormat(),
-                    doc,
-                    "ReferenceParagraphFormat",
-                    pathToStyleFile));
+            results.add(
+                    checkStyleExistsInTheDocument(
+                            UnoStyle.PARAGRAPH_STYLES,
+                            jStyle.getReferenceHeaderParagraphFormat(),
+                            doc,
+                            "ReferenceHeaderParagraphFormat",
+                            pathToStyleFile));
+            results.add(
+                    checkStyleExistsInTheDocument(
+                            UnoStyle.PARAGRAPH_STYLES,
+                            jStyle.getReferenceParagraphFormat(),
+                            doc,
+                            "ReferenceParagraphFormat",
+                            pathToStyleFile));
             if (jStyle.isFormatCitations()) {
-                results.add(checkStyleExistsInTheDocument(UnoStyle.CHARACTER_STYLES,
-                        jStyle.getCitationCharacterFormat(),
-                        doc,
-                        "CitationCharacterFormat",
-                        pathToStyleFile));
+                results.add(
+                        checkStyleExistsInTheDocument(
+                                UnoStyle.CHARACTER_STYLES,
+                                jStyle.getCitationCharacterFormat(),
+                                doc,
+                                "CitationCharacterFormat",
+                                pathToStyleFile));
             }
         } catch (WrappedTargetException ex) {
-            results.add(OOVoidResult.error(new OOError("Other error in checkStyleExistsInTheDocument",
-                    ex.getMessage(),
-                    ex)));
+            results.add(
+                    OOVoidResult.error(
+                            new OOError(
+                                    "Other error in checkStyleExistsInTheDocument",
+                                    ex.getMessage(),
+                                    ex)));
         }
 
         return collectResults("checkStyleExistsInTheDocument failed", results);
@@ -506,9 +540,9 @@ public void guiActionApplyCitationEntries(List<CitationEntry> citationEntries) {
         } catch (DisposedException ex) {
             OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } catch (PropertyVetoException
-                 | IllegalTypeException
-                 | WrappedTargetException
-                 | com.sun.star.lang.IllegalArgumentException ex) {
+                | IllegalTypeException
+                | WrappedTargetException
+                | com.sun.star.lang.IllegalArgumentException ex) {
             LOGGER.warn(errorTitle, ex);
             OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         }
@@ -530,18 +564,20 @@ public void guiActionApplyCitationEntries(List<CitationEntry> citationEntries) {
      * @param pageInfo     A single page-info for these entries. Attributed to the last entry.
      * @param syncOptions  Indicates whether in-text citations should be refreshed in the document. Optional.empty() indicates no refresh. Otherwise provides options for refreshing the reference list.
      */
-    public void guiActionInsertEntry(List<BibEntry> entries,
-                                     BibDatabaseContext bibDatabaseContext,
-                                     BibEntryTypesManager bibEntryTypesManager,
-                                     OOStyle style,
-                                     CitationType citationType,
-                                     String pageInfo,
-                                     Optional<Update.SyncOptions> syncOptions) {
+    public void guiActionInsertEntry(
+            List<BibEntry> entries,
+            BibDatabaseContext bibDatabaseContext,
+            BibEntryTypesManager bibEntryTypesManager,
+            OOStyle style,
+            CitationType citationType,
+            String pageInfo,
+            Optional<Update.SyncOptions> syncOptions) {
 
         final String errorTitle = "Could not insert citation";
 
         OOResult<XTextDocument, OOError> odoc = getXTextDocument();
-        if (testDialog(errorTitle,
+        if (testDialog(
+                errorTitle,
                 odoc.asVoidResult(),
                 styleIsRequired(style),
                 selectedBibEntryIsRequired(entries, OOError::noEntriesSelectedForCitation))) {
@@ -564,7 +600,8 @@ public void guiActionInsertEntry(List<BibEntry> entries,
         }
 
         if (style instanceof JStyle jStyle) {
-            if (testDialog(errorTitle,
+            if (testDialog(
+                    errorTitle,
                     checkStylesExistInTheDocument(jStyle, doc),
                     checkIfOpenOfficeIsRecordingChanges(doc))) {
                 return;
@@ -577,8 +614,11 @@ public void guiActionInsertEntry(List<BibEntry> entries,
         OOResult<FunctionalTextViewCursor, OOError> fcursor = null;
         if (syncOptions.isPresent()) {
             fcursor = getFunctionalTextViewCursor(doc, errorTitle);
-            if (testDialog(errorTitle, fcursor.asVoidResult()) || testDialog(databaseIsRequired(syncOptions.get().databases,
-                    OOError::noDataBaseIsOpenForSyncingAfterCitation))) {
+            if (testDialog(errorTitle, fcursor.asVoidResult())
+                    || testDialog(
+                            databaseIsRequired(
+                                    syncOptions.get().databases,
+                                    OOError::noDataBaseIsOpenForSyncingAfterCitation))) {
                 return;
             }
         }
@@ -595,21 +635,33 @@ public void guiActionInsertEntry(List<BibEntry> entries,
 
                 if (citationType == CitationType.AUTHORYEAR_PAR) {
                     // "Cite" button
-                    this.cslCitationOOAdapter.insertCitation(cursor.get(), citationStyle, entries, bibDatabaseContext, bibEntryTypesManager);
+                    this.cslCitationOOAdapter.insertCitation(
+                            cursor.get(),
+                            citationStyle,
+                            entries,
+                            bibDatabaseContext,
+                            bibEntryTypesManager);
                 } else if (citationType == CitationType.AUTHORYEAR_INTEXT) {
                     // "Cite in-text" button
-                    this.cslCitationOOAdapter.insertInTextCitation(cursor.get(), citationStyle, entries, bibDatabaseContext, bibEntryTypesManager);
+                    this.cslCitationOOAdapter.insertInTextCitation(
+                            cursor.get(),
+                            citationStyle,
+                            entries,
+                            bibDatabaseContext,
+                            bibEntryTypesManager);
                 } else if (citationType == CitationType.INVISIBLE_CIT) {
                     // "Insert empty citation"
                     this.cslCitationOOAdapter.insertEmpty(cursor.get(), citationStyle, entries);
                 }
 
                 // If "Automatically sync bibliography when inserting citations" is enabled
-                syncOptions.ifPresent(options -> guiActionUpdateDocument(options.databases, citationStyle));
+                syncOptions.ifPresent(
+                        options -> guiActionUpdateDocument(options.databases, citationStyle));
             } else if (style instanceof JStyle jStyle) {
                 // Handle insertion of JStyle citations
 
-                EditInsert.insertCitationGroup(doc,
+                EditInsert.insertCitationGroup(
+                        doc,
                         frontend.get(),
                         cursor.get(),
                         entries,
@@ -627,11 +679,11 @@ public void guiActionInsertEntry(List<BibEntry> entries,
         } catch (DisposedException ex) {
             OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } catch (CreationException
-                 | WrappedTargetException
-                 | IOException
-                 | PropertyVetoException
-                 | IllegalTypeException
-                 | NotRemoveableException ex) {
+                | WrappedTargetException
+                | IOException
+                | PropertyVetoException
+                | IllegalTypeException
+                | NotRemoveableException ex) {
             LOGGER.warn("Could not insert entry", ex);
             OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } catch (Exception e) {
@@ -649,7 +701,8 @@ public void guiActionMergeCitationGroups(List<BibDatabase> databases, OOStyle st
 
         if (style instanceof JStyle jStyle) {
             OOResult<XTextDocument, OOError> odoc = getXTextDocument();
-            if (testDialog(errorTitle,
+            if (testDialog(
+                    errorTitle,
                     odoc.asVoidResult(),
                     styleIsRequired(jStyle),
                     databaseIsRequired(databases, OOError::noDataBaseIsOpen))) {
@@ -657,9 +710,11 @@ public void guiActionMergeCitationGroups(List<BibDatabase> databases, OOStyle st
             }
             XTextDocument doc = odoc.get();
 
-            OOResult<FunctionalTextViewCursor, OOError> fcursor = getFunctionalTextViewCursor(doc, errorTitle);
+            OOResult<FunctionalTextViewCursor, OOError> fcursor =
+                    getFunctionalTextViewCursor(doc, errorTitle);
 
-            if (testDialog(errorTitle,
+            if (testDialog(
+                    errorTitle,
                     fcursor.asVoidResult(),
                     checkStylesExistInTheDocument(jStyle, doc),
                     checkIfOpenOfficeIsRecordingChanges(doc))) {
@@ -681,11 +736,11 @@ public void guiActionMergeCitationGroups(List<BibDatabase> databases, OOStyle st
             } catch (DisposedException ex) {
                 OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
             } catch (CreationException
-                     | IllegalTypeException
-                     | NotRemoveableException
-                     | PropertyVetoException
-                     | WrappedTargetException
-                     | com.sun.star.lang.IllegalArgumentException ex) {
+                    | IllegalTypeException
+                    | NotRemoveableException
+                    | PropertyVetoException
+                    | WrappedTargetException
+                    | com.sun.star.lang.IllegalArgumentException ex) {
                 LOGGER.warn("Problem combining cite markers", ex);
                 OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
             } finally {
@@ -705,7 +760,8 @@ public void guiActionSeparateCitations(List<BibDatabase> databases, OOStyle styl
 
         if (style instanceof JStyle jStyle) {
             OOResult<XTextDocument, OOError> odoc = getXTextDocument();
-            if (testDialog(errorTitle,
+            if (testDialog(
+                    errorTitle,
                     odoc.asVoidResult(),
                     styleIsRequired(jStyle),
                     databaseIsRequired(databases, OOError::noDataBaseIsOpen))) {
@@ -713,9 +769,11 @@ public void guiActionSeparateCitations(List<BibDatabase> databases, OOStyle styl
             }
 
             XTextDocument doc = odoc.get();
-            OOResult<FunctionalTextViewCursor, OOError> fcursor = getFunctionalTextViewCursor(doc, errorTitle);
+            OOResult<FunctionalTextViewCursor, OOError> fcursor =
+                    getFunctionalTextViewCursor(doc, errorTitle);
 
-            if (testDialog(errorTitle,
+            if (testDialog(
+                    errorTitle,
                     fcursor.asVoidResult(),
                     checkStylesExistInTheDocument(jStyle, doc),
                     checkIfOpenOfficeIsRecordingChanges(doc))) {
@@ -726,7 +784,8 @@ public void guiActionSeparateCitations(List<BibDatabase> databases, OOStyle styl
                 UnoUndo.enterUndoContext(doc, "Separate citations");
 
                 OOFrontend frontend = new OOFrontend(doc);
-                boolean madeModifications = EditSeparate.separateCitations(doc, frontend, databases, jStyle);
+                boolean madeModifications =
+                        EditSeparate.separateCitations(doc, frontend, databases, jStyle);
                 if (madeModifications) {
                     UnoCrossRef.refresh(doc);
                     Update.SyncOptions syncOptions = new Update.SyncOptions(databases);
@@ -737,11 +796,11 @@ public void guiActionSeparateCitations(List<BibDatabase> databases, OOStyle styl
             } catch (DisposedException ex) {
                 OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
             } catch (CreationException
-                     | IllegalTypeException
-                     | NotRemoveableException
-                     | PropertyVetoException
-                     | WrappedTargetException
-                     | com.sun.star.lang.IllegalArgumentException ex) {
+                    | IllegalTypeException
+                    | NotRemoveableException
+                    | PropertyVetoException
+                    | WrappedTargetException
+                    | com.sun.star.lang.IllegalArgumentException ex) {
                 LOGGER.warn("Problem during separating cite markers", ex);
                 OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
             } finally {
@@ -758,12 +817,14 @@ public void guiActionSeparateCitations(List<BibDatabase> databases, OOStyle styl
      *
      * @param returnPartialResult If there are some unresolved keys, shall we return an otherwise nonempty result, or Optional.empty()?
      */
-    public Optional<BibDatabase> exportCitedHelper(List<BibDatabase> databases, boolean returnPartialResult) {
+    public Optional<BibDatabase> exportCitedHelper(
+            List<BibDatabase> databases, boolean returnPartialResult) {
         final Optional<BibDatabase> FAIL = Optional.empty();
         final String errorTitle = Localization.lang("Unable to generate new library");
 
         OOResult<XTextDocument, OOError> odoc = getXTextDocument();
-        if (testDialog(errorTitle,
+        if (testDialog(
+                errorTitle,
                 odoc.asVoidResult(),
                 databaseIsRequired(databases, OOError::noDataBaseIsOpenForExport))) {
             return FAIL;
@@ -785,9 +846,10 @@ public Optional<BibDatabase> exportCitedHelper(List<BibDatabase> databases, bool
             if (!result.newDatabase.hasEntries()) {
                 dialogService.showErrorDialogAndWait(
                         Localization.lang("Unable to generate new library"),
-                        Localization.lang("Your OpenOffice/LibreOffice document references"
-                                + " no citation keys"
-                                + " which could also be found in your current library."));
+                        Localization.lang(
+                                "Your OpenOffice/LibreOffice document references"
+                                        + " no citation keys"
+                                        + " which could also be found in your current library."));
                 return FAIL;
             }
 
@@ -795,7 +857,8 @@ public Optional<BibDatabase> exportCitedHelper(List<BibDatabase> databases, bool
             if (!unresolvedKeys.isEmpty()) {
                 dialogService.showErrorDialogAndWait(
                         Localization.lang("Unable to generate new library"),
-                        Localization.lang("Your OpenOffice/LibreOffice document references"
+                        Localization.lang(
+                                "Your OpenOffice/LibreOffice document references"
                                         + " at least %0 citation keys"
                                         + " which could not be found in your current library."
                                         + " Some of these are %1.",
@@ -812,8 +875,7 @@ public Optional<BibDatabase> exportCitedHelper(List<BibDatabase> databases, bool
             OOError.from(ex).showErrorDialog(dialogService);
         } catch (DisposedException ex) {
             OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
-        } catch (WrappedTargetException
-                 | com.sun.star.lang.IllegalArgumentException ex) {
+        } catch (WrappedTargetException | com.sun.star.lang.IllegalArgumentException ex) {
             LOGGER.warn("Problem generating new database.", ex);
             OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         }
@@ -832,17 +894,17 @@ public void guiActionUpdateDocument(List<BibDatabase> databases, OOStyle style)
             try {
 
                 OOResult<XTextDocument, OOError> odoc = getXTextDocument();
-                if (testDialog(errorTitle,
-                        odoc.asVoidResult(),
-                        styleIsRequired(jStyle))) {
+                if (testDialog(errorTitle, odoc.asVoidResult(), styleIsRequired(jStyle))) {
                     return;
                 }
 
                 XTextDocument doc = odoc.get();
 
-                OOResult<FunctionalTextViewCursor, OOError> fcursor = getFunctionalTextViewCursor(doc, errorTitle);
+                OOResult<FunctionalTextViewCursor, OOError> fcursor =
+                        getFunctionalTextViewCursor(doc, errorTitle);
 
-                if (testDialog(errorTitle,
+                if (testDialog(
+                        errorTitle,
                         fcursor.asVoidResult(),
                         checkStylesExistInTheDocument(jStyle, doc),
                         checkIfOpenOfficeIsRecordingChanges(doc))) {
@@ -861,19 +923,25 @@ public void guiActionUpdateDocument(List<BibDatabase> databases, OOStyle style)
                     Update.SyncOptions syncOptions = new Update.SyncOptions(databases);
                     syncOptions
                             .setUpdateBibliography(true)
-                            .setAlwaysAddCitedOnPages(this.alwaysAddCitedOnPages); // TODO: Provide option to user: this is always false
-
-                    unresolvedKeys = Update.synchronizeDocument(doc, frontend, jStyle, fcursor.get(), syncOptions);
+                            .setAlwaysAddCitedOnPages(
+                                    this
+                                            .alwaysAddCitedOnPages); // TODO: Provide option to
+                                                                     // user: this is always false
+
+                    unresolvedKeys =
+                            Update.synchronizeDocument(
+                                    doc, frontend, jStyle, fcursor.get(), syncOptions);
                 } finally {
                     UnoUndo.leaveUndoContext(doc);
                     fcursor.get().restore(doc);
                 }
 
                 if (!unresolvedKeys.isEmpty()) {
-                    String msg = Localization.lang(
-                            "Your OpenOffice/LibreOffice document references the citation key '%0',"
-                                    + " which could not be found in your current library.",
-                            unresolvedKeys.getFirst());
+                    String msg =
+                            Localization.lang(
+                                    "Your OpenOffice/LibreOffice document references the citation key '%0',"
+                                            + " which could not be found in your current library.",
+                                    unresolvedKeys.getFirst());
                     dialogService.showErrorDialogAndWait(errorTitle, msg);
                 }
             } catch (NoDocumentException ex) {
@@ -881,8 +949,8 @@ public void guiActionUpdateDocument(List<BibDatabase> databases, OOStyle style)
             } catch (DisposedException ex) {
                 OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
             } catch (CreationException
-                     | WrappedTargetException
-                     | com.sun.star.lang.IllegalArgumentException ex) {
+                    | WrappedTargetException
+                    | com.sun.star.lang.IllegalArgumentException ex) {
                 LOGGER.warn("Could not update JStyle bibliography", ex);
                 OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
             }
@@ -898,9 +966,11 @@ public void guiActionUpdateDocument(List<BibDatabase> databases, OOStyle style)
 
                 XTextDocument doc = odoc.get();
 
-                OOResult<FunctionalTextViewCursor, OOError> fcursor = getFunctionalTextViewCursor(doc, errorTitle);
+                OOResult<FunctionalTextViewCursor, OOError> fcursor =
+                        getFunctionalTextViewCursor(doc, errorTitle);
 
-                if (testDialog(errorTitle,
+                if (testDialog(
+                        errorTitle,
                         fcursor.asVoidResult(),
                         checkIfOpenOfficeIsRecordingChanges(doc))) {
                     return;
@@ -925,8 +995,7 @@ public void guiActionUpdateDocument(List<BibDatabase> databases, OOStyle style)
                     if (citedEntries.isEmpty()) {
                         dialogService.showInformationDialogAndWait(
                                 Localization.lang("Bibliography"),
-                                Localization.lang("No cited entries found in the document.")
-                        );
+                                Localization.lang("No cited entries found in the document."));
                         return;
                     }
 
@@ -934,17 +1003,22 @@ public void guiActionUpdateDocument(List<BibDatabase> databases, OOStyle style)
                     BibDatabase bibDatabase = new BibDatabase(citedEntries);
                     BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(bibDatabase);
 
-                    cslUpdateBibliography.rebuildCSLBibliography(doc, cslCitationOOAdapter, citedEntries, citationStyle, bibDatabaseContext, Injector.instantiateModelOrService(BibEntryTypesManager.class));
-                } catch (NoDocumentException
-                         | NoSuchElementException e) {
+                    cslUpdateBibliography.rebuildCSLBibliography(
+                            doc,
+                            cslCitationOOAdapter,
+                            citedEntries,
+                            citationStyle,
+                            bibDatabaseContext,
+                            Injector.instantiateModelOrService(BibEntryTypesManager.class));
+                } catch (NoDocumentException | NoSuchElementException e) {
                     throw new RuntimeException(e);
                 } finally {
                     UnoUndo.leaveUndoContext(doc);
                     fcursor.get().restore(doc);
                 }
             } catch (CreationException
-                     | WrappedTargetException
-                     | com.sun.star.lang.IllegalArgumentException ex) {
+                    | WrappedTargetException
+                    | com.sun.star.lang.IllegalArgumentException ex) {
                 LOGGER.warn("Could not update CSL bibliography", ex);
                 OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
             }
diff --git a/src/main/java/org/jabref/gui/openoffice/OOBibBaseConnect.java b/src/main/java/org/jabref/gui/openoffice/OOBibBaseConnect.java
index 38dc36ad40e5..59544972c344 100644
--- a/src/main/java/org/jabref/gui/openoffice/OOBibBaseConnect.java
+++ b/src/main/java/org/jabref/gui/openoffice/OOBibBaseConnect.java
@@ -1,19 +1,6 @@
 package org.jabref.gui.openoffice;
 
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import org.jabref.gui.DialogService;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.openoffice.NoDocumentFoundException;
-import org.jabref.model.openoffice.uno.CreationException;
-import org.jabref.model.openoffice.uno.NoDocumentException;
-import org.jabref.model.openoffice.uno.UnoCast;
-import org.jabref.model.openoffice.uno.UnoTextDocument;
-import org.jabref.model.openoffice.util.OOResult;
+import static com.sun.star.uno.UnoRuntime.queryInterface;
 
 import com.sun.star.bridge.XBridge;
 import com.sun.star.bridge.XBridgeFactory;
@@ -27,10 +14,23 @@
 import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XComponentContext;
+
+import org.jabref.gui.DialogService;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.openoffice.NoDocumentFoundException;
+import org.jabref.model.openoffice.uno.CreationException;
+import org.jabref.model.openoffice.uno.NoDocumentException;
+import org.jabref.model.openoffice.uno.UnoCast;
+import org.jabref.model.openoffice.uno.UnoTextDocument;
+import org.jabref.model.openoffice.util.OOResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.sun.star.uno.UnoRuntime.queryInterface;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * Establish connection to a document opened in OpenOffice or LibreOffice.
@@ -50,18 +50,13 @@ public class OOBibBaseConnect {
     private XTextDocument xTextDocument;
 
     public OOBibBaseConnect(Path loPath, DialogService dialogService)
-            throws
-            BootstrapException,
-            CreationException {
+            throws BootstrapException, CreationException {
 
         this.dialogService = dialogService;
         this.xDesktop = simpleBootstrap(loPath);
     }
 
-    private XDesktop simpleBootstrap(Path loPath)
-            throws
-            CreationException,
-            BootstrapException {
+    private XDesktop simpleBootstrap(Path loPath) throws CreationException, BootstrapException {
 
         // Get the office component context:
         XComponentContext context = Bootstrap.bootstrap(loPath);
@@ -84,9 +79,11 @@ private XDesktop simpleBootstrap(Path loPath)
     public static void closeOfficeConnection() {
         try {
             // get the bridge factory from the local service manager
-            XBridgeFactory bridgeFactory = queryInterface(XBridgeFactory.class,
-                                                          Bootstrap.createSimpleServiceManager()
-                    .createInstance("com.sun.star.bridge.BridgeFactory"));
+            XBridgeFactory bridgeFactory =
+                    queryInterface(
+                            XBridgeFactory.class,
+                            Bootstrap.createSimpleServiceManager()
+                                    .createInstance("com.sun.star.bridge.BridgeFactory"));
 
             if (bridgeFactory != null) {
                 for (XBridge bridge : bridgeFactory.getExistingBridges()) {
@@ -100,9 +97,7 @@ public static void closeOfficeConnection() {
     }
 
     private static List<XTextDocument> getTextDocuments(XDesktop desktop)
-            throws
-            NoSuchElementException,
-            WrappedTargetException {
+            throws NoSuchElementException, WrappedTargetException {
 
         List<XTextDocument> result = new ArrayList<>();
 
@@ -123,8 +118,8 @@ private static List<XTextDocument> getTextDocuments(XDesktop desktop)
      *
      * @return Null if no document was selected. Otherwise the document selected.
      */
-    private static XTextDocument selectDocumentDialog(List<XTextDocument> list,
-                                                      DialogService dialogService) {
+    private static XTextDocument selectDocumentDialog(
+            List<XTextDocument> list, DialogService dialogService) {
 
         class DocumentTitleViewModel {
 
@@ -146,23 +141,20 @@ public String toString() {
             }
         }
 
-        List<DocumentTitleViewModel> viewModel = list.stream()
-                                                      .map(DocumentTitleViewModel::new)
-                                                      .collect(Collectors.toList());
+        List<DocumentTitleViewModel> viewModel =
+                list.stream().map(DocumentTitleViewModel::new).collect(Collectors.toList());
 
         // This whole method is part of a background task when
         // auto-detecting instances, so we need to show dialog in FX
         // thread
         Optional<DocumentTitleViewModel> selectedDocument =
-                dialogService
-                        .showChoiceDialogAndWait(Localization.lang("Select document"),
-                                Localization.lang("Found documents:"),
-                                Localization.lang("Use selected document"),
-                                viewModel);
-
-        return selectedDocument
-                .map(DocumentTitleViewModel::getXtextDocument)
-                .orElse(null);
+                dialogService.showChoiceDialogAndWait(
+                        Localization.lang("Select document"),
+                        Localization.lang("Found documents:"),
+                        Localization.lang("Use selected document"),
+                        viewModel);
+
+        return selectedDocument.map(DocumentTitleViewModel::getXtextDocument).orElse(null);
     }
 
     /**
@@ -177,10 +169,7 @@ public String toString() {
      * Finally initializes this.xTextDocument with the selected document and parts extracted.
      */
     public void selectDocument(boolean autoSelectForSingle)
-            throws
-            NoDocumentFoundException,
-            NoSuchElementException,
-            WrappedTargetException {
+            throws NoDocumentFoundException, NoSuchElementException, WrappedTargetException {
 
         XTextDocument selected;
         List<XTextDocument> textDocumentList = getTextDocuments(this.xDesktop);
@@ -189,8 +178,7 @@ public void selectDocument(boolean autoSelectForSingle)
         } else if ((textDocumentList.size() == 1) && autoSelectForSingle) {
             selected = textDocumentList.getFirst(); // Get the only one
         } else { // Bring up a dialog
-            selected = OOBibBaseConnect.selectDocumentDialog(textDocumentList,
-                    this.dialogService);
+            selected = OOBibBaseConnect.selectDocumentDialog(textDocumentList, this.dialogService);
         }
 
         if (selected == null) {
@@ -236,9 +224,7 @@ public boolean isDocumentConnectionMissing() {
     /**
      * Either return a valid XTextDocument or throw NoDocumentException.
      */
-    public XTextDocument getXTextDocumentOrThrow()
-            throws
-            NoDocumentException {
+    public XTextDocument getXTextDocumentOrThrow() throws NoDocumentException {
         if (isDocumentConnectionMissing()) {
             throw new NoDocumentException("Not connected to document");
         }
diff --git a/src/main/java/org/jabref/gui/openoffice/OOError.java b/src/main/java/org/jabref/gui/openoffice/OOError.java
index c8ad7ef53aaf..be0e8a62ec50 100644
--- a/src/main/java/org/jabref/gui/openoffice/OOError.java
+++ b/src/main/java/org/jabref/gui/openoffice/OOError.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.openoffice;
 
+import com.sun.star.lang.DisposedException;
+
 import org.jabref.gui.DialogService;
 import org.jabref.logic.JabRefException;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.openoffice.NoDocumentFoundException;
 import org.jabref.model.openoffice.uno.NoDocumentException;
 
-import com.sun.star.lang.DisposedException;
-
 class OOError extends JabRefException {
 
     private String localizedTitle;
@@ -40,19 +40,17 @@ public void showErrorDialog(DialogService dialogService) {
      */
 
     public static OOError from(JabRefException err) {
-        return new OOError(
-                Localization.lang("JabRefException"),
-                err.getLocalizedMessage(),
-                err);
+        return new OOError(Localization.lang("JabRefException"), err.getLocalizedMessage(), err);
     }
 
     // For DisposedException
     public static OOError from(DisposedException err) {
         return new OOError(
                 Localization.lang("Connection lost"),
-                Localization.lang("Connection to OpenOffice/LibreOffice has been lost."
-                        + " Please make sure OpenOffice/LibreOffice is running,"
-                        + " and try to reconnect."),
+                Localization.lang(
+                        "Connection to OpenOffice/LibreOffice has been lost."
+                                + " Please make sure OpenOffice/LibreOffice is running,"
+                                + " and try to reconnect."),
                 err);
     }
 
@@ -60,10 +58,11 @@ public static OOError from(DisposedException err) {
     public static OOError from(NoDocumentException err) {
         return new OOError(
                 Localization.lang("Not connected to document"),
-                Localization.lang("Not connected to any Writer document."
-                        + " Please make sure a document is open,"
-                        + " and use the 'Select Writer document' button"
-                        + " to connect to it."),
+                Localization.lang(
+                        "Not connected to any Writer document."
+                                + " Please make sure a document is open,"
+                                + " and use the 'Select Writer document' button"
+                                + " to connect to it."),
                 err);
     }
 
@@ -71,18 +70,16 @@ public static OOError from(NoDocumentException err) {
     public static OOError from(NoDocumentFoundException err) {
         return new OOError(
                 Localization.lang("No Writer documents found"),
-                Localization.lang("Could not connect to any Writer document."
-                        + " Please make sure a document is open"
-                        + " before using the 'Select Writer document' button"
-                        + " to connect to it."),
+                Localization.lang(
+                        "Could not connect to any Writer document."
+                                + " Please make sure a document is open"
+                                + " before using the 'Select Writer document' button"
+                                + " to connect to it."),
                 err);
     }
 
     public static OOError fromMisc(Exception err) {
-        return new OOError(
-                "Exception",
-                err.getMessage(),
-                err);
+        return new OOError("Exception", err.getMessage(), err);
     }
 
     /*
@@ -122,18 +119,21 @@ public static OOError noDataBaseIsOpen() {
 
     // noValidStyleSelected
     public static OOError noValidStyleSelected() {
-        return new OOError(Localization.lang("No valid style file defined"),
+        return new OOError(
+                Localization.lang("No valid style file defined"),
                 Localization.lang("No bibliography style is selected for citation.")
                         + "\n"
                         + Localization.lang("Select one before citing.")
                         + "\n"
-                        + Localization.lang("You must select either a valid style file,"
-                        + " or use one of the default styles."));
+                        + Localization.lang(
+                                "You must select either a valid style file,"
+                                        + " or use one of the default styles."));
     }
 
     // noEntriesSelectedForCitation
     public static OOError noEntriesSelectedForCitation() {
-        return new OOError(Localization.lang("No entries selected for citation"),
+        return new OOError(
+                Localization.lang("No entries selected for citation"),
                 Localization.lang("No bibliography entries are selected for citation.")
                         + "\n"
                         + Localization.lang("Select some before citing."));
diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
index 267526d0ad76..37d4c363df5f 100644
--- a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
+++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -1,12 +1,9 @@
 package org.jabref.gui.openoffice;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
+import com.sun.star.comp.helper.BootstrapException;
+import com.sun.star.container.NoSuchElementException;
+import com.sun.star.lang.WrappedTargetException;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.concurrent.Task;
@@ -63,14 +60,17 @@
 import org.jabref.model.openoffice.style.CitationType;
 import org.jabref.model.openoffice.uno.CreationException;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import com.sun.star.comp.helper.BootstrapException;
-import com.sun.star.container.NoSuchElementException;
-import com.sun.star.lang.WrappedTargetException;
-import com.tobiasdiez.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
+
 /**
  * Pane to manage the interaction between JabRef and OpenOffice.
  */
@@ -112,20 +112,21 @@ public class OpenOfficePanel {
 
     private final SimpleObjectProperty<OOStyle> currentStyleProperty;
 
-    public OpenOfficePanel(LibraryTabContainer tabContainer,
-                           GuiPreferences preferences,
-                           OpenOfficePreferences openOfficePreferences,
-                           ExternalApplicationsPreferences externalApplicationsPreferences,
-                           LayoutFormatterPreferences layoutFormatterPreferences,
-                           CitationKeyPatternPreferences citationKeyPatternPreferences,
-                           JournalAbbreviationRepository abbreviationRepository,
-                           UiTaskExecutor taskExecutor,
-                           DialogService dialogService,
-                           StateManager stateManager,
-                           FileUpdateMonitor fileUpdateMonitor,
-                           BibEntryTypesManager entryTypesManager,
-                           ClipBoardManager clipBoardManager,
-                           UndoManager undoManager) {
+    public OpenOfficePanel(
+            LibraryTabContainer tabContainer,
+            GuiPreferences preferences,
+            OpenOfficePreferences openOfficePreferences,
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            LayoutFormatterPreferences layoutFormatterPreferences,
+            CitationKeyPatternPreferences citationKeyPatternPreferences,
+            JournalAbbreviationRepository abbreviationRepository,
+            UiTaskExecutor taskExecutor,
+            DialogService dialogService,
+            StateManager stateManager,
+            FileUpdateMonitor fileUpdateMonitor,
+            BibEntryTypesManager entryTypesManager,
+            ClipBoardManager clipBoardManager,
+            UndoManager undoManager) {
         this.tabContainer = tabContainer;
         this.fileUpdateMonitor = fileUpdateMonitor;
         this.entryTypesManager = entryTypesManager;
@@ -151,7 +152,13 @@ public OpenOfficePanel(LibraryTabContainer tabContainer,
         manualConnect.setTooltip(new Tooltip(Localization.lang("Manual connect")));
         manualConnect.setMaxWidth(Double.MAX_VALUE);
 
-        help = factory.createIconButton(StandardActions.HELP, new HelpAction(HelpFile.OPENOFFICE_LIBREOFFICE, dialogService, externalApplicationsPreferences));
+        help =
+                factory.createIconButton(
+                        StandardActions.HELP,
+                        new HelpAction(
+                                HelpFile.OPENOFFICE_LIBREOFFICE,
+                                dialogService,
+                                externalApplicationsPreferences));
         help.setMaxWidth(Double.MAX_VALUE);
 
         selectDocument = new Button();
@@ -161,13 +168,13 @@ public OpenOfficePanel(LibraryTabContainer tabContainer,
 
         update = new Button();
         update.setGraphic(IconTheme.JabRefIcons.ADD_OR_MAKE_BIBLIOGRAPHY.getGraphicNode());
-        update.setTooltip(new Tooltip(Localization.lang("Sync OpenOffice/LibreOffice bibliography")));
+        update.setTooltip(
+                new Tooltip(Localization.lang("Sync OpenOffice/LibreOffice bibliography")));
         update.setMaxWidth(Double.MAX_VALUE);
 
-        loader = new StyleLoader(
-                openOfficePreferences,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        loader =
+                new StyleLoader(
+                        openOfficePreferences, layoutFormatterPreferences, abbreviationRepository);
 
         currentStyleProperty = new SimpleObjectProperty<>(currentStyle);
 
@@ -196,9 +203,13 @@ private boolean getOrUpdateTheStyle(String title) {
                     jStyle.ensureUpToDate();
                 } catch (IOException ex) {
                     LOGGER.warn("Unable to reload style file '{}'", jStyle.getPath(), ex);
-                    String msg = Localization.lang("Unable to reload style file")
-                            + "'" + jStyle.getPath() + "'"
-                            + "\n" + ex.getMessage();
+                    String msg =
+                            Localization.lang("Unable to reload style file")
+                                    + "'"
+                                    + jStyle.getPath()
+                                    + "'"
+                                    + "\n"
+                                    + ex.getMessage();
                     new OOError(title, msg, ex).showErrorDialog(dialogService);
                     return FAIL;
                 }
@@ -214,64 +225,87 @@ private void initPanel() {
         connect.setOnAction(e -> connectAutomatically());
         manualConnect.setOnAction(e -> connectManually());
 
-        selectDocument.setTooltip(new Tooltip(Localization.lang("Select which open Writer document to work on")));
-        selectDocument.setOnAction(e -> {
-            try {
-                ooBase.guiActionSelectDocument(false);
-            } catch (WrappedTargetException
-                     | NoSuchElementException ex) {
-                throw new RuntimeException(ex);
-            }
-        });
+        selectDocument.setTooltip(
+                new Tooltip(Localization.lang("Select which open Writer document to work on")));
+        selectDocument.setOnAction(
+                e -> {
+                    try {
+                        ooBase.guiActionSelectDocument(false);
+                    } catch (WrappedTargetException | NoSuchElementException ex) {
+                        throw new RuntimeException(ex);
+                    }
+                });
 
         setStyleFile.setMaxWidth(Double.MAX_VALUE);
-        setStyleFile.setOnAction(event -> {
-            StyleSelectDialogView styleDialog = new StyleSelectDialogView(loader);
-            dialogService.showCustomDialogAndWait(styleDialog)
-                         .ifPresent(selectedStyle -> {
-                             currentStyle = selectedStyle;
-                             currentStyleProperty.set(currentStyle);
-
-                             if (currentStyle instanceof JStyle jStyle) {
-                                 try {
-                                     jStyle.ensureUpToDate();
-                                 } catch (IOException e) {
-                                     LOGGER.warn("Unable to reload style file '{}'", jStyle.getPath(), e);
-                                 }
-                                 dialogService.notify(Localization.lang("Currently selected JStyle: '%0'", jStyle.getName()));
-                             } else if (currentStyle instanceof CitationStyle cslStyle) {
-                                 dialogService.notify(Localization.lang("Currently selected CSL Style: '%0'", cslStyle.getName()));
-                             }
-                             updateButtonAvailability();
-                         });
-        });
-
-        pushEntries.setTooltip(new Tooltip(Localization.lang("Cite selected entries between parenthesis")));
+        setStyleFile.setOnAction(
+                event -> {
+                    StyleSelectDialogView styleDialog = new StyleSelectDialogView(loader);
+                    dialogService
+                            .showCustomDialogAndWait(styleDialog)
+                            .ifPresent(
+                                    selectedStyle -> {
+                                        currentStyle = selectedStyle;
+                                        currentStyleProperty.set(currentStyle);
+
+                                        if (currentStyle instanceof JStyle jStyle) {
+                                            try {
+                                                jStyle.ensureUpToDate();
+                                            } catch (IOException e) {
+                                                LOGGER.warn(
+                                                        "Unable to reload style file '{}'",
+                                                        jStyle.getPath(),
+                                                        e);
+                                            }
+                                            dialogService.notify(
+                                                    Localization.lang(
+                                                            "Currently selected JStyle: '%0'",
+                                                            jStyle.getName()));
+                                        } else if (currentStyle instanceof CitationStyle cslStyle) {
+                                            dialogService.notify(
+                                                    Localization.lang(
+                                                            "Currently selected CSL Style: '%0'",
+                                                            cslStyle.getName()));
+                                        }
+                                        updateButtonAvailability();
+                                    });
+                });
+
+        pushEntries.setTooltip(
+                new Tooltip(Localization.lang("Cite selected entries between parenthesis")));
         pushEntries.setOnAction(e -> pushEntries(CitationType.AUTHORYEAR_PAR, false));
         pushEntries.setMaxWidth(Double.MAX_VALUE);
-        pushEntriesInt.setTooltip(new Tooltip(Localization.lang("Cite selected entries with in-text citation")));
+        pushEntriesInt.setTooltip(
+                new Tooltip(Localization.lang("Cite selected entries with in-text citation")));
         pushEntriesInt.setOnAction(e -> pushEntries(CitationType.AUTHORYEAR_INTEXT, false));
         pushEntriesInt.setMaxWidth(Double.MAX_VALUE);
-        pushEntriesEmpty.setTooltip(new Tooltip(Localization.lang("Insert a citation without text (the entry will appear in the reference list)")));
+        pushEntriesEmpty.setTooltip(
+                new Tooltip(
+                        Localization.lang(
+                                "Insert a citation without text (the entry will appear in the reference list)")));
         pushEntriesEmpty.setOnAction(e -> pushEntries(CitationType.INVISIBLE_CIT, false));
         pushEntriesEmpty.setMaxWidth(Double.MAX_VALUE);
-        pushEntriesAdvanced.setTooltip(new Tooltip(Localization.lang("Cite selected entries with extra information")));
+        pushEntriesAdvanced.setTooltip(
+                new Tooltip(Localization.lang("Cite selected entries with extra information")));
         pushEntriesAdvanced.setOnAction(e -> pushEntries(CitationType.AUTHORYEAR_INTEXT, true));
         pushEntriesAdvanced.setMaxWidth(Double.MAX_VALUE);
 
         update.setTooltip(new Tooltip(Localization.lang("Make/Sync bibliography")));
 
-        update.setOnAction(event -> {
-            String title = Localization.lang("Could not update bibliography");
-            if (getOrUpdateTheStyle(title)) {
-                return;
-            }
-            List<BibDatabase> databases = getBaseList();
-            ooBase.guiActionUpdateDocument(databases, currentStyle);
-        });
+        update.setOnAction(
+                event -> {
+                    String title = Localization.lang("Could not update bibliography");
+                    if (getOrUpdateTheStyle(title)) {
+                        return;
+                    }
+                    List<BibDatabase> databases = getBaseList();
+                    ooBase.guiActionUpdateDocument(databases, currentStyle);
+                });
 
         merge.setMaxWidth(Double.MAX_VALUE);
-        merge.setTooltip(new Tooltip(Localization.lang("Combine pairs of citations that are separated by spaces only")));
+        merge.setTooltip(
+                new Tooltip(
+                        Localization.lang(
+                                "Combine pairs of citations that are separated by spaces only")));
         merge.setOnAction(e -> ooBase.guiActionMergeCitationGroups(getBaseList(), currentStyle));
 
         unmerge.setMaxWidth(Double.MAX_VALUE);
@@ -283,12 +317,13 @@ private void initPanel() {
         settingsB.setContextMenu(settingsMenu);
         settingsB.setOnAction(e -> settingsMenu.show(settingsB, Side.BOTTOM, 0, 0));
         manageCitations.setMaxWidth(Double.MAX_VALUE);
-        manageCitations.setOnAction(e -> {
-            ManageCitationsDialogView dialog = new ManageCitationsDialogView(ooBase);
-            if (dialog.isOkToShowThisDialog()) {
-                dialogService.showCustomDialogAndWait(dialog);
-            }
-        });
+        manageCitations.setOnAction(
+                e -> {
+                    ManageCitationsDialogView dialog = new ManageCitationsDialogView(ooBase);
+                    if (dialog.isOkToShowThisDialog()) {
+                        dialogService.showCustomDialogAndWait(dialog);
+                    }
+                });
 
         exportCitations.setMaxWidth(Double.MAX_VALUE);
         exportCitations.setOnAction(event -> exportEntries());
@@ -315,20 +350,22 @@ private void initPanel() {
     private void exportEntries() {
         List<BibDatabase> databases = getBaseList();
         boolean returnPartialResult = false;
-        Optional<BibDatabase> newDatabase = ooBase.exportCitedHelper(databases, returnPartialResult);
+        Optional<BibDatabase> newDatabase =
+                ooBase.exportCitedHelper(databases, returnPartialResult);
         if (newDatabase.isPresent()) {
             BibDatabaseContext databaseContext = new BibDatabaseContext(newDatabase.get());
-            LibraryTab libraryTab = LibraryTab.createLibraryTab(
-                    databaseContext,
-                    tabContainer,
-                    dialogService,
-                    preferences,
-                    stateManager,
-                    fileUpdateMonitor,
-                    entryTypesManager,
-                    undoManager,
-                    clipBoardManager,
-                    taskExecutor);
+            LibraryTab libraryTab =
+                    LibraryTab.createLibraryTab(
+                            databaseContext,
+                            tabContainer,
+                            dialogService,
+                            preferences,
+                            stateManager,
+                            fileUpdateMonitor,
+                            entryTypesManager,
+                            undoManager,
+                            clipBoardManager,
+                            taskExecutor);
             tabContainer.addTab(libraryTab, true);
         }
     }
@@ -340,64 +377,98 @@ private List<BibDatabase> getBaseList() {
                 databases.add(database.getDatabase());
             }
         } else {
-            databases.add(stateManager.getActiveDatabase()
-                                      .map(BibDatabaseContext::getDatabase)
-                                      .orElse(new BibDatabase()));
+            databases.add(
+                    stateManager
+                            .getActiveDatabase()
+                            .map(BibDatabaseContext::getDatabase)
+                            .orElse(new BibDatabase()));
         }
 
         return databases;
     }
 
     private void connectAutomatically() {
-        DetectOpenOfficeInstallation officeInstallation = new DetectOpenOfficeInstallation(openOfficePreferences, dialogService);
+        DetectOpenOfficeInstallation officeInstallation =
+                new DetectOpenOfficeInstallation(openOfficePreferences, dialogService);
 
         if (officeInstallation.isExecutablePathDefined()) {
             connect();
         } else {
-            Task<List<Path>> taskConnectIfInstalled = new Task<>() {
-                @Override
-                protected List<Path> call() {
-                    return OpenOfficeFileSearch.detectInstallations();
-                }
-            };
-
-            taskConnectIfInstalled.setOnSucceeded(evt -> {
-                List<Path> installations = new ArrayList<>(taskConnectIfInstalled.getValue());
-                if (installations.isEmpty()) {
-                    officeInstallation.selectInstallationPath().ifPresent(installations::add);
-                }
-                Optional<Path> chosenInstallationDirectory = officeInstallation.chooseAmongInstallations(installations);
-                if (chosenInstallationDirectory.isPresent() && officeInstallation.setOpenOfficePreferences(chosenInstallationDirectory.get())) {
-                    connect();
-                }
-            });
-
-            taskConnectIfInstalled.setOnFailed(value -> dialogService.showErrorDialogAndWait(Localization.lang("Autodetection failed"), Localization.lang("Autodetection failed"), taskConnectIfInstalled.getException()));
-
-            dialogService.showProgressDialog(Localization.lang("Autodetecting paths..."), Localization.lang("Autodetecting paths..."), taskConnectIfInstalled);
+            Task<List<Path>> taskConnectIfInstalled =
+                    new Task<>() {
+                        @Override
+                        protected List<Path> call() {
+                            return OpenOfficeFileSearch.detectInstallations();
+                        }
+                    };
+
+            taskConnectIfInstalled.setOnSucceeded(
+                    evt -> {
+                        List<Path> installations =
+                                new ArrayList<>(taskConnectIfInstalled.getValue());
+                        if (installations.isEmpty()) {
+                            officeInstallation
+                                    .selectInstallationPath()
+                                    .ifPresent(installations::add);
+                        }
+                        Optional<Path> chosenInstallationDirectory =
+                                officeInstallation.chooseAmongInstallations(installations);
+                        if (chosenInstallationDirectory.isPresent()
+                                && officeInstallation.setOpenOfficePreferences(
+                                        chosenInstallationDirectory.get())) {
+                            connect();
+                        }
+                    });
+
+            taskConnectIfInstalled.setOnFailed(
+                    value ->
+                            dialogService.showErrorDialogAndWait(
+                                    Localization.lang("Autodetection failed"),
+                                    Localization.lang("Autodetection failed"),
+                                    taskConnectIfInstalled.getException()));
+
+            dialogService.showProgressDialog(
+                    Localization.lang("Autodetecting paths..."),
+                    Localization.lang("Autodetecting paths..."),
+                    taskConnectIfInstalled);
             taskExecutor.execute(taskConnectIfInstalled);
         }
     }
 
     private void connectManually() {
-        var fileDialogConfiguration = new DirectoryDialogConfiguration.Builder().withInitialDirectory(System.getProperty("user.home")).build();
-        Optional<Path> selectedPath = dialogService.showDirectorySelectionDialog(fileDialogConfiguration);
+        var fileDialogConfiguration =
+                new DirectoryDialogConfiguration.Builder()
+                        .withInitialDirectory(System.getProperty("user.home"))
+                        .build();
+        Optional<Path> selectedPath =
+                dialogService.showDirectorySelectionDialog(fileDialogConfiguration);
 
-        DetectOpenOfficeInstallation officeInstallation = new DetectOpenOfficeInstallation(openOfficePreferences, dialogService);
+        DetectOpenOfficeInstallation officeInstallation =
+                new DetectOpenOfficeInstallation(openOfficePreferences, dialogService);
 
         if (selectedPath.isPresent()) {
-            BackgroundTask.wrap(() -> officeInstallation.setOpenOfficePreferences(selectedPath.get()))
-                          .withInitialMessage("Searching for executable")
-                          .onFailure(dialogService::showErrorDialogAndWait).onSuccess(value -> {
-                              if (value) {
-                                  connect();
-                              } else {
-                                  dialogService.showErrorDialogAndWait(Localization.lang("Could not connect to running OpenOffice/LibreOffice."), Localization.lang("If connecting manually, please verify program and library paths."));
-                              }
-                          })
-                          .executeWith(taskExecutor);
+            BackgroundTask.wrap(
+                            () -> officeInstallation.setOpenOfficePreferences(selectedPath.get()))
+                    .withInitialMessage("Searching for executable")
+                    .onFailure(dialogService::showErrorDialogAndWait)
+                    .onSuccess(
+                            value -> {
+                                if (value) {
+                                    connect();
+                                } else {
+                                    dialogService.showErrorDialogAndWait(
+                                            Localization.lang(
+                                                    "Could not connect to running OpenOffice/LibreOffice."),
+                                            Localization.lang(
+                                                    "If connecting manually, please verify program and library paths."));
+                                }
+                            })
+                    .executeWith(taskExecutor);
         } else {
-            dialogService.showErrorDialogAndWait(Localization.lang("Could not connect to running OpenOffice/LibreOffice."), Localization.lang("If connecting manually, please verify program and library paths."));
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Could not connect to running OpenOffice/LibreOffice."),
+                    Localization.lang(
+                            "If connecting manually, please verify program and library paths."));
         }
     }
 
@@ -424,61 +495,87 @@ private void updateButtonAvailability() {
     }
 
     private void connect() {
-        Task<OOBibBase> connectTask = new Task<>() {
-            @Override
-            protected OOBibBase call() throws BootstrapException, CreationException {
-                updateProgress(ProgressBar.INDETERMINATE_PROGRESS, ProgressBar.INDETERMINATE_PROGRESS);
-
-                Path path = Path.of(openOfficePreferences.getExecutablePath());
-                return createBibBase(path);
-            }
-        };
-
-        connectTask.setOnSucceeded(value -> {
-            ooBase = connectTask.getValue();
-
-            try {
-                ooBase.guiActionSelectDocument(true);
-            } catch (WrappedTargetException
-                     | NoSuchElementException e) {
-                throw new RuntimeException(e);
-            }
-
-            // Enable actions that depend on a connection
-            updateButtonAvailability();
-        });
+        Task<OOBibBase> connectTask =
+                new Task<>() {
+                    @Override
+                    protected OOBibBase call() throws BootstrapException, CreationException {
+                        updateProgress(
+                                ProgressBar.INDETERMINATE_PROGRESS,
+                                ProgressBar.INDETERMINATE_PROGRESS);
+
+                        Path path = Path.of(openOfficePreferences.getExecutablePath());
+                        return createBibBase(path);
+                    }
+                };
 
-        connectTask.setOnFailed(value -> {
-            Throwable ex = connectTask.getException();
-            LOGGER.error("autodetect failed", ex);
-            switch (ex) {
-                case UnsatisfiedLinkError unsatisfiedLinkError -> {
-                    LOGGER.warn("Could not connect to running OpenOffice/LibreOffice", unsatisfiedLinkError);
+        connectTask.setOnSucceeded(
+                value -> {
+                    ooBase = connectTask.getValue();
 
-                    dialogService.showErrorDialogAndWait(Localization.lang("Unable to connect. One possible reason is that JabRef "
-                            + "and OpenOffice/LibreOffice are not both running in either 32 bit mode or 64 bit mode."));
-                }
-                case IOException ioException -> {
-                    LOGGER.warn("Could not connect to running OpenOffice/LibreOffice", ioException);
+                    try {
+                        ooBase.guiActionSelectDocument(true);
+                    } catch (WrappedTargetException | NoSuchElementException e) {
+                        throw new RuntimeException(e);
+                    }
 
-                    dialogService.showErrorDialogAndWait(Localization.lang("Could not connect to running OpenOffice/LibreOffice."),
-                            Localization.lang("Could not connect to running OpenOffice/LibreOffice.")
-                                    + "\n"
-                                    + Localization.lang("Make sure you have installed OpenOffice/LibreOffice with Java support.") + "\n"
-                                    + Localization.lang("If connecting manually, please verify program and library paths.") + "\n" + "\n" + Localization.lang("Error message:"),
-                            ex);
-                }
-                case BootstrapException bootstrapEx -> {
-                    LOGGER.error("Exception boostrap cause", bootstrapEx.getTargetException());
-                    dialogService.showErrorDialogAndWait("Bootstrap error", bootstrapEx.getTargetException());
-                }
-                case null,
-                     default ->
-                        dialogService.showErrorDialogAndWait(Localization.lang("Autodetection failed"), Localization.lang("Autodetection failed"), ex);
-            }
-        });
+                    // Enable actions that depend on a connection
+                    updateButtonAvailability();
+                });
+
+        connectTask.setOnFailed(
+                value -> {
+                    Throwable ex = connectTask.getException();
+                    LOGGER.error("autodetect failed", ex);
+                    switch (ex) {
+                        case UnsatisfiedLinkError unsatisfiedLinkError -> {
+                            LOGGER.warn(
+                                    "Could not connect to running OpenOffice/LibreOffice",
+                                    unsatisfiedLinkError);
+
+                            dialogService.showErrorDialogAndWait(
+                                    Localization.lang(
+                                            "Unable to connect. One possible reason is that JabRef "
+                                                    + "and OpenOffice/LibreOffice are not both running in either 32 bit mode or 64 bit mode."));
+                        }
+                        case IOException ioException -> {
+                            LOGGER.warn(
+                                    "Could not connect to running OpenOffice/LibreOffice",
+                                    ioException);
+
+                            dialogService.showErrorDialogAndWait(
+                                    Localization.lang(
+                                            "Could not connect to running OpenOffice/LibreOffice."),
+                                    Localization.lang(
+                                                    "Could not connect to running OpenOffice/LibreOffice.")
+                                            + "\n"
+                                            + Localization.lang(
+                                                    "Make sure you have installed OpenOffice/LibreOffice with Java support.")
+                                            + "\n"
+                                            + Localization.lang(
+                                                    "If connecting manually, please verify program and library paths.")
+                                            + "\n"
+                                            + "\n"
+                                            + Localization.lang("Error message:"),
+                                    ex);
+                        }
+                        case BootstrapException bootstrapEx -> {
+                            LOGGER.error(
+                                    "Exception boostrap cause", bootstrapEx.getTargetException());
+                            dialogService.showErrorDialogAndWait(
+                                    "Bootstrap error", bootstrapEx.getTargetException());
+                        }
+                        case null, default ->
+                                dialogService.showErrorDialogAndWait(
+                                        Localization.lang("Autodetection failed"),
+                                        Localization.lang("Autodetection failed"),
+                                        ex);
+                    }
+                });
 
-        dialogService.showProgressDialog(Localization.lang("Autodetecting paths..."), Localization.lang("Autodetecting paths..."), connectTask);
+        dialogService.showProgressDialog(
+                Localization.lang("Autodetecting paths..."),
+                Localization.lang("Autodetecting paths..."),
+                connectTask);
         taskExecutor.execute(connectTask);
     }
 
@@ -496,9 +593,7 @@ private static CitationType citationTypeFromOptions(boolean withText, boolean in
         if (!withText) {
             return CitationType.INVISIBLE_CIT;
         }
-        return inParenthesis
-                ? CitationType.AUTHORYEAR_PAR
-                : CitationType.AUTHORYEAR_INTEXT;
+        return inParenthesis ? CitationType.AUTHORYEAR_PAR : CitationType.AUTHORYEAR_INTEXT;
     }
 
     private void pushEntries(CitationType citationType, boolean addPageInfo) {
@@ -508,8 +603,8 @@ private void pushEntries(CitationType citationType, boolean addPageInfo) {
 
         if (activeDatabase.isEmpty() || (activeDatabase.get().getDatabase() == null)) {
             OOError.noDataBaseIsOpenForCiting()
-                   .setTitle(errorDialogTitle)
-                   .showErrorDialog(dialogService);
+                    .setTitle(errorDialogTitle)
+                    .showErrorDialog(dialogService);
             return;
         }
 
@@ -519,8 +614,8 @@ private void pushEntries(CitationType citationType, boolean addPageInfo) {
 
         if (entries.isEmpty()) {
             OOError.noEntriesSelectedForCitation()
-                   .setTitle(errorDialogTitle)
-                   .showErrorDialog(dialogService);
+                    .setTitle(errorDialogTitle)
+                    .showErrorDialog(dialogService);
             return;
         }
 
@@ -532,13 +627,15 @@ private void pushEntries(CitationType citationType, boolean addPageInfo) {
         if (addPageInfo) {
             boolean withText = citationType.withText();
 
-            Optional<AdvancedCiteDialogViewModel> citeDialogViewModel = dialogService.showCustomDialogAndWait(new AdvancedCiteDialogView());
+            Optional<AdvancedCiteDialogViewModel> citeDialogViewModel =
+                    dialogService.showCustomDialogAndWait(new AdvancedCiteDialogView());
             if (citeDialogViewModel.isPresent()) {
                 AdvancedCiteDialogViewModel model = citeDialogViewModel.get();
                 if (!model.pageInfoProperty().getValue().isEmpty()) {
                     pageInfo = model.pageInfoProperty().getValue();
                 }
-                citationType = citationTypeFromOptions(withText, model.citeInParProperty().getValue());
+                citationType =
+                        citationTypeFromOptions(withText, model.citeInParProperty().getValue());
             } else {
                 // user canceled
                 return;
@@ -555,11 +652,13 @@ private void pushEntries(CitationType citationType, boolean addPageInfo) {
                         ? Optional.of(new Update.SyncOptions(getBaseList()))
                         : Optional.empty();
 
-        // Sync options are non-null only when "Automatically sync bibliography when inserting citations" is enabled
+        // Sync options are non-null only when "Automatically sync bibliography when inserting
+        // citations" is enabled
         if (syncOptions.isPresent() && openOfficePreferences.getSyncWhenCiting()) {
             syncOptions.get().setUpdateBibliography(true);
         }
-        ooBase.guiActionInsertEntry(entries,
+        ooBase.guiActionInsertEntry(
+                entries,
                 bibDatabaseContext,
                 entryTypesManager,
                 currentStyle,
@@ -591,10 +690,13 @@ private boolean checkThatEntriesHaveKeys(List<BibEntry> entries) {
         }
 
         // Ask if keys should be generated
-        boolean citePressed = dialogService.showConfirmationDialogAndWait(Localization.lang("Cite"),
-                Localization.lang("Cannot cite entries without citation keys. Generate keys now?"),
-                Localization.lang("Generate keys"),
-                Localization.lang("Cancel"));
+        boolean citePressed =
+                dialogService.showConfirmationDialogAndWait(
+                        Localization.lang("Cite"),
+                        Localization.lang(
+                                "Cannot cite entries without citation keys. Generate keys now?"),
+                        Localization.lang("Generate keys"),
+                        Localization.lang("Cancel"));
 
         Optional<BibDatabaseContext> databaseContext = stateManager.getActiveDatabase();
         if (citePressed && databaseContext.isPresent()) {
@@ -605,7 +707,8 @@ private boolean checkThatEntriesHaveKeys(List<BibEntry> entries) {
                     // Generate key
                     new CitationKeyGenerator(databaseContext.get(), citationKeyPatternPreferences)
                             .generateAndSetKey(entry)
-                            .ifPresent(change -> undoCompound.addEdit(new UndoableKeyChange(change)));
+                            .ifPresent(
+                                    change -> undoCompound.addEdit(new UndoableKeyChange(change)));
                 }
             }
             undoCompound.end();
@@ -622,33 +725,51 @@ private boolean checkThatEntriesHaveKeys(List<BibEntry> entries) {
     private ContextMenu createSettingsPopup() {
         ContextMenu contextMenu = new ContextMenu();
 
-        CheckMenuItem autoSync = new CheckMenuItem(Localization.lang("Automatically sync bibliography when inserting citations"));
+        CheckMenuItem autoSync =
+                new CheckMenuItem(
+                        Localization.lang(
+                                "Automatically sync bibliography when inserting citations"));
         autoSync.selectedProperty().set(openOfficePreferences.getSyncWhenCiting());
 
-        CheckMenuItem alwaysAddCitedOnPagesText = new CheckMenuItem(Localization.lang("Automatically add \"Cited on pages...\" at the end of bibliographic entries"));
-        alwaysAddCitedOnPagesText.selectedProperty().set(openOfficePreferences.getAlwaysAddCitedOnPages());
-        alwaysAddCitedOnPagesText.setOnAction(e -> openOfficePreferences.setAlwaysAddCitedOnPages(alwaysAddCitedOnPagesText.isSelected()));
-
-        EasyBind.listen(currentStyleProperty, (obs, oldValue, newValue) -> {
-            switch (newValue) {
-                case JStyle ignored -> {
-                    if (!contextMenu.getItems().contains(alwaysAddCitedOnPagesText)) {
-                        contextMenu.getItems().add(1, alwaysAddCitedOnPagesText);
+        CheckMenuItem alwaysAddCitedOnPagesText =
+                new CheckMenuItem(
+                        Localization.lang(
+                                "Automatically add \"Cited on pages...\" at the end of bibliographic entries"));
+        alwaysAddCitedOnPagesText
+                .selectedProperty()
+                .set(openOfficePreferences.getAlwaysAddCitedOnPages());
+        alwaysAddCitedOnPagesText.setOnAction(
+                e ->
+                        openOfficePreferences.setAlwaysAddCitedOnPages(
+                                alwaysAddCitedOnPagesText.isSelected()));
+
+        EasyBind.listen(
+                currentStyleProperty,
+                (obs, oldValue, newValue) -> {
+                    switch (newValue) {
+                        case JStyle ignored -> {
+                            if (!contextMenu.getItems().contains(alwaysAddCitedOnPagesText)) {
+                                contextMenu.getItems().add(1, alwaysAddCitedOnPagesText);
+                            }
+                        }
+                        case CitationStyle ignored ->
+                                contextMenu.getItems().remove(alwaysAddCitedOnPagesText);
+                        default -> {}
                     }
-                }
-                case CitationStyle ignored ->
-                        contextMenu.getItems().remove(alwaysAddCitedOnPagesText);
-                default -> { }
-            }
-        });
+                });
 
         ToggleGroup toggleGroup = new ToggleGroup();
-        RadioMenuItem useActiveBase = new RadioMenuItem(Localization.lang("Look up BibTeX entries in the active tab only"));
-        RadioMenuItem useAllBases = new RadioMenuItem(Localization.lang("Look up BibTeX entries in all open libraries"));
+        RadioMenuItem useActiveBase =
+                new RadioMenuItem(
+                        Localization.lang("Look up BibTeX entries in the active tab only"));
+        RadioMenuItem useAllBases =
+                new RadioMenuItem(
+                        Localization.lang("Look up BibTeX entries in all open libraries"));
         useActiveBase.setToggleGroup(toggleGroup);
         useAllBases.setToggleGroup(toggleGroup);
 
-        MenuItem clearConnectionSettings = new MenuItem(Localization.lang("Clear connection settings"));
+        MenuItem clearConnectionSettings =
+                new MenuItem(Localization.lang("Clear connection settings"));
 
         if (openOfficePreferences.getUseAllDatabases()) {
             useAllBases.setSelected(true);
@@ -657,20 +778,25 @@ private ContextMenu createSettingsPopup() {
         }
 
         autoSync.setOnAction(e -> openOfficePreferences.setSyncWhenCiting(autoSync.isSelected()));
-        useAllBases.setOnAction(e -> openOfficePreferences.setUseAllDatabases(useAllBases.isSelected()));
-        useActiveBase.setOnAction(e -> openOfficePreferences.setUseAllDatabases(!useActiveBase.isSelected()));
-        clearConnectionSettings.setOnAction(e -> {
-            openOfficePreferences.clearConnectionSettings();
-            dialogService.notify(Localization.lang("Cleared connection settings"));
-        });
-
-        contextMenu.getItems().addAll(
-                autoSync,
-                new SeparatorMenuItem(),
-                useActiveBase,
-                useAllBases,
-                new SeparatorMenuItem(),
-                clearConnectionSettings);
+        useAllBases.setOnAction(
+                e -> openOfficePreferences.setUseAllDatabases(useAllBases.isSelected()));
+        useActiveBase.setOnAction(
+                e -> openOfficePreferences.setUseAllDatabases(!useActiveBase.isSelected()));
+        clearConnectionSettings.setOnAction(
+                e -> {
+                    openOfficePreferences.clearConnectionSettings();
+                    dialogService.notify(Localization.lang("Cleared connection settings"));
+                });
+
+        contextMenu
+                .getItems()
+                .addAll(
+                        autoSync,
+                        new SeparatorMenuItem(),
+                        useActiveBase,
+                        useAllBases,
+                        new SeparatorMenuItem(),
+                        clearConnectionSettings);
 
         if (currentStyle instanceof JStyle) {
             contextMenu.getItems().add(1, alwaysAddCitedOnPagesText);
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
index e907147c684a..2f2b50d8e4ba 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
@@ -1,8 +1,9 @@
 package org.jabref.gui.openoffice;
 
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.IntStream;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import jakarta.inject.Inject;
 
 import javafx.application.Platform;
 import javafx.collections.ListChangeListener;
@@ -19,6 +20,7 @@
 import javafx.scene.control.TableView;
 import javafx.scene.layout.VBox;
 
+import org.controlsfx.control.textfield.CustomTextField;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preferences.GuiPreferences;
@@ -42,10 +44,9 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.types.StandardEntryType;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
-import org.controlsfx.control.textfield.CustomTextField;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.IntStream;
 
 public class StyleSelectDialogView extends BaseDialog<OOStyle> {
 
@@ -80,23 +81,24 @@ public class StyleSelectDialogView extends BaseDialog<OOStyle> {
     public StyleSelectDialogView(StyleLoader loader) {
         this.loader = loader;
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
-
-        setResultConverter(button -> {
-            if (button == ButtonType.OK) {
-                viewModel.storePrefs();
-                return viewModel.getSelectedStyle();
-            }
-            return null;
-        });
+        ViewLoader.view(this).load().setAsDialogPane(this);
+
+        setResultConverter(
+                button -> {
+                    if (button == ButtonType.OK) {
+                        viewModel.storePrefs();
+                        return viewModel.getSelectedStyle();
+                    }
+                    return null;
+                });
         setTitle(Localization.lang("Style selection"));
     }
 
     @FXML
     private void initialize() {
-        viewModel = new StyleSelectDialogViewModel(dialogService, loader, preferences, taskExecutor, bibEntryTypesManager);
+        viewModel =
+                new StyleSelectDialogViewModel(
+                        dialogService, loader, preferences, taskExecutor, bibEntryTypesManager);
 
         availableListView.setItems(viewModel.getAvailableLayouts());
         new ViewModelListCellFactory<CitationStylePreviewLayout>()
@@ -105,14 +107,22 @@ private void initialize() {
 
         this.setOnShown(this::onDialogShown);
 
-        availableListView.getItems().addListener((ListChangeListener<CitationStylePreviewLayout>) c -> {
-            if (c.next() && c.wasAdded() && !initialScrollPerformed.get()) {
-                Platform.runLater(this::scrollToCurrentStyle);
-            }
-        });
-
-        availableListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) ->
-                viewModel.selectedLayoutProperty().set(newValue));
+        availableListView
+                .getItems()
+                .addListener(
+                        (ListChangeListener<CitationStylePreviewLayout>)
+                                c -> {
+                                    if (c.next() && c.wasAdded() && !initialScrollPerformed.get()) {
+                                        Platform.runLater(this::scrollToCurrentStyle);
+                                    }
+                                });
+
+        availableListView
+                .getSelectionModel()
+                .selectedItemProperty()
+                .addListener(
+                        (observable, oldValue, newValue) ->
+                                viewModel.selectedLayoutProperty().set(newValue));
 
         PreviewViewer cslPreviewViewer = initializePreviewViewer(TestEntry.getTestEntry());
         EasyBind.subscribe(viewModel.selectedLayoutProperty(), cslPreviewViewer::setLayout);
@@ -130,12 +140,13 @@ private void initialize() {
         colDeleteIcon.setCellValueFactory(cellData -> cellData.getValue().internalStyleProperty());
 
         new ValueTableCellFactory<StyleSelectItemViewModel, Boolean>()
-                .withGraphic(internalStyle -> {
-                    if (!internalStyle) {
-                        return IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode();
-                    }
-                    return null;
-                })
+                .withGraphic(
+                        internalStyle -> {
+                            if (!internalStyle) {
+                                return IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode();
+                            }
+                            return null;
+                        })
                 .withOnMouseClickedEvent(item -> evt -> viewModel.deleteStyle())
                 .withTooltip(item -> Localization.lang("Remove style"))
                 .install(colDeleteIcon);
@@ -143,50 +154,72 @@ private void initialize() {
         edit.setOnAction(e -> viewModel.editStyle());
 
         new ViewModelTableRowFactory<StyleSelectItemViewModel>()
-                .withOnMouseClickedEvent((item, event) -> {
-                    if (event.getClickCount() == 2) {
-                        viewModel.viewStyle(item);
-                    }
-                })
+                .withOnMouseClickedEvent(
+                        (item, event) -> {
+                            if (event.getClickCount() == 2) {
+                                viewModel.viewStyle(item);
+                            }
+                        })
                 .withContextMenu(item -> createContextMenu())
                 .install(tvStyles);
 
-        tvStyles.getSelectionModel().selectedItemProperty().addListener((observable, oldvalue, newvalue) -> {
-            if (newvalue == null) {
-                viewModel.selectedItemProperty().setValue(oldvalue);
-            } else {
-                viewModel.selectedItemProperty().setValue(newvalue);
-            }
-        });
+        tvStyles.getSelectionModel()
+                .selectedItemProperty()
+                .addListener(
+                        (observable, oldvalue, newvalue) -> {
+                            if (newvalue == null) {
+                                viewModel.selectedItemProperty().setValue(oldvalue);
+                            } else {
+                                viewModel.selectedItemProperty().setValue(newvalue);
+                            }
+                        });
 
         tvStyles.setItems(viewModel.stylesProperty());
 
         add.setGraphic(IconTheme.JabRefIcons.ADD.getGraphicNode());
 
-        EasyBind.subscribe(viewModel.selectedItemProperty(), style -> {
-            if (viewModel.getSelectedStyle() instanceof JStyle) {
-                tvStyles.getSelectionModel().select(style);
-                previewArticle.setLayout(new TextBasedPreviewLayout(style.getJStyle().getReferenceFormat(StandardEntryType.Article)));
-                previewBook.setLayout(new TextBasedPreviewLayout(style.getJStyle().getReferenceFormat(StandardEntryType.Book)));
-            }
-        });
+        EasyBind.subscribe(
+                viewModel.selectedItemProperty(),
+                style -> {
+                    if (viewModel.getSelectedStyle() instanceof JStyle) {
+                        tvStyles.getSelectionModel().select(style);
+                        previewArticle.setLayout(
+                                new TextBasedPreviewLayout(
+                                        style.getJStyle()
+                                                .getReferenceFormat(StandardEntryType.Article)));
+                        previewBook.setLayout(
+                                new TextBasedPreviewLayout(
+                                        style.getJStyle()
+                                                .getReferenceFormat(StandardEntryType.Book)));
+                    }
+                });
 
         availableListView.setItems(viewModel.getAvailableLayouts());
-        searchBox.textProperty().addListener((observable, oldValue, newValue) ->
-                viewModel.setAvailableLayoutsFilter(newValue));
+        searchBox
+                .textProperty()
+                .addListener(
+                        (observable, oldValue, newValue) ->
+                                viewModel.setAvailableLayoutsFilter(newValue));
 
         viewModel.setSelectedTab(tabPane.getSelectionModel().getSelectedItem());
-        tabPane.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-            viewModel.setSelectedTab(newValue);
-        });
-
-        availableListView.setOnMouseClicked(event -> {
-            if (event.getClickCount() == 2) {
-                viewModel.handleCslStyleSelection(); // Only CSL styles can be selected with a double click, JStyles show a style description instead
-                this.setResult(viewModel.getSelectedStyle());
-                this.close();
-            }
-        });
+        tabPane.getSelectionModel()
+                .selectedItemProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            viewModel.setSelectedTab(newValue);
+                        });
+
+        availableListView.setOnMouseClicked(
+                event -> {
+                    if (event.getClickCount() == 2) {
+                        viewModel
+                                .handleCslStyleSelection(); // Only CSL styles can be selected with
+                                                            // a double click, JStyles show a style
+                                                            // description instead
+                        this.setResult(viewModel.getSelectedStyle());
+                        this.close();
+                    }
+                });
 
         OOStyle currentStyle = preferences.getOpenOfficePreferences().getCurrentStyle();
         if (currentStyle instanceof JStyle) {
@@ -196,9 +229,12 @@ private void initialize() {
         }
 
         viewModel.setSelectedTab(tabPane.getSelectionModel().getSelectedItem());
-        tabPane.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-            viewModel.setSelectedTab(newValue);
-        });
+        tabPane.getSelectionModel()
+                .selectedItemProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            viewModel.setSelectedTab(newValue);
+                        });
 
         updateCurrentStyleLabel();
     }
@@ -215,7 +251,13 @@ private void addStyleFile() {
     }
 
     private PreviewViewer initializePreviewViewer(BibEntry entry) {
-        PreviewViewer viewer = new PreviewViewer(new BibDatabaseContext(), dialogService, preferences, themeManager, taskExecutor);
+        PreviewViewer viewer =
+                new PreviewViewer(
+                        new BibDatabaseContext(),
+                        dialogService,
+                        preferences,
+                        themeManager,
+                        taskExecutor);
         viewer.setEntry(entry);
         return viewer;
     }
@@ -242,19 +284,23 @@ private void scrollToCurrentStyle() {
 
         OOStyle currentStyle = preferences.getOpenOfficePreferences().getCurrentStyle();
         if (currentStyle instanceof CitationStyle currentCitationStyle) {
-            findIndexOfCurrentStyle(currentCitationStyle).ifPresent(index -> {
-                int itemsPerPage = calculateItemsPerPage();
-                int totalItems = availableListView.getItems().size();
-                int scrollToIndex = Math.max(0, Math.min(index, totalItems - itemsPerPage));
-
-                availableListView.scrollTo(scrollToIndex);
-                availableListView.getSelectionModel().select(index);
-
-                Platform.runLater(() -> {
-                    availableListView.scrollTo(Math.max(0, index - 1));
-                    availableListView.scrollTo(index);
-                });
-            });
+            findIndexOfCurrentStyle(currentCitationStyle)
+                    .ifPresent(
+                            index -> {
+                                int itemsPerPage = calculateItemsPerPage();
+                                int totalItems = availableListView.getItems().size();
+                                int scrollToIndex =
+                                        Math.max(0, Math.min(index, totalItems - itemsPerPage));
+
+                                availableListView.scrollTo(scrollToIndex);
+                                availableListView.getSelectionModel().select(index);
+
+                                Platform.runLater(
+                                        () -> {
+                                            availableListView.scrollTo(Math.max(0, index - 1));
+                                            availableListView.scrollTo(index);
+                                        });
+                            });
         }
     }
 
@@ -265,8 +311,14 @@ private int calculateItemsPerPage() {
 
     private Optional<Integer> findIndexOfCurrentStyle(CitationStyle currentStyle) {
         return IntStream.range(0, availableListView.getItems().size())
-                        .boxed()
-                        .filter(i -> availableListView.getItems().get(i).getFilePath().equals(currentStyle.getFilePath()))
-                        .findFirst();
+                .boxed()
+                .filter(
+                        i ->
+                                availableListView
+                                        .getItems()
+                                        .get(i)
+                                        .getFilePath()
+                                        .equals(currentStyle.getFilePath()))
+                .findFirst();
     }
 }
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
index 82befda6b059..11f31075af3c 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.openoffice;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleListProperty;
@@ -40,6 +34,12 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class StyleSelectDialogViewModel {
 
     private final DialogService dialogService;
@@ -47,18 +47,24 @@ public class StyleSelectDialogViewModel {
     private final ExternalApplicationsPreferences externalApplicationsPreferences;
     private final FilePreferences filePreferences;
     private final OpenOfficePreferences openOfficePreferences;
-    private final ListProperty<StyleSelectItemViewModel> styles = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<StyleSelectItemViewModel> selectedItem = new SimpleObjectProperty<>();
-    private final ObservableList<CitationStylePreviewLayout> availableLayouts = FXCollections.observableArrayList();
-    private final ObjectProperty<CitationStylePreviewLayout> selectedLayoutProperty = new SimpleObjectProperty<>();
-    private final FilteredList<CitationStylePreviewLayout> filteredAvailableLayouts = new FilteredList<>(availableLayouts);
+    private final ListProperty<StyleSelectItemViewModel> styles =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<StyleSelectItemViewModel> selectedItem =
+            new SimpleObjectProperty<>();
+    private final ObservableList<CitationStylePreviewLayout> availableLayouts =
+            FXCollections.observableArrayList();
+    private final ObjectProperty<CitationStylePreviewLayout> selectedLayoutProperty =
+            new SimpleObjectProperty<>();
+    private final FilteredList<CitationStylePreviewLayout> filteredAvailableLayouts =
+            new FilteredList<>(availableLayouts);
     private final ObjectProperty<Tab> selectedTab = new SimpleObjectProperty<>();
 
-    public StyleSelectDialogViewModel(DialogService dialogService,
-                                      StyleLoader styleLoader,
-                                      GuiPreferences preferences,
-                                      TaskExecutor taskExecutor,
-                                      BibEntryTypesManager bibEntryTypesManager) {
+    public StyleSelectDialogViewModel(
+            DialogService dialogService,
+            StyleLoader styleLoader,
+            GuiPreferences preferences,
+            TaskExecutor taskExecutor,
+            BibEntryTypesManager bibEntryTypesManager) {
         this.dialogService = dialogService;
         this.externalApplicationsPreferences = preferences.getExternalApplicationsPreferences();
         this.filePreferences = preferences.getFilePreferences();
@@ -74,22 +80,43 @@ public StyleSelectDialogViewModel(DialogService dialogService,
         }
 
         BackgroundTask.wrap(CitationStyle::discoverCitationStyles)
-                      .onSuccess(styles -> {
-                          List<CitationStylePreviewLayout> layouts = styles.stream()
-                                                                           .map(style -> new CitationStylePreviewLayout(style, bibEntryTypesManager))
-                                                                           .collect(Collectors.toList());
-                          availableLayouts.setAll(layouts);
-
-                          if (currentStyle instanceof CitationStyle citationStyle) {
-                              selectedLayoutProperty.set(availableLayouts.stream().filter(csl -> csl.getFilePath().equals(citationStyle.getFilePath())).findFirst().orElse(availableLayouts.getFirst()));
-                          }
-                      })
-                      .onFailure(ex -> dialogService.showErrorDialogAndWait("Error discovering citation styles", ex))
-                      .executeWith(taskExecutor);
+                .onSuccess(
+                        styles -> {
+                            List<CitationStylePreviewLayout> layouts =
+                                    styles.stream()
+                                            .map(
+                                                    style ->
+                                                            new CitationStylePreviewLayout(
+                                                                    style, bibEntryTypesManager))
+                                            .collect(Collectors.toList());
+                            availableLayouts.setAll(layouts);
+
+                            if (currentStyle instanceof CitationStyle citationStyle) {
+                                selectedLayoutProperty.set(
+                                        availableLayouts.stream()
+                                                .filter(
+                                                        csl ->
+                                                                csl.getFilePath()
+                                                                        .equals(
+                                                                                citationStyle
+                                                                                        .getFilePath()))
+                                                .findFirst()
+                                                .orElse(availableLayouts.getFirst()));
+                            }
+                        })
+                .onFailure(
+                        ex ->
+                                dialogService.showErrorDialogAndWait(
+                                        "Error discovering citation styles", ex))
+                .executeWith(taskExecutor);
     }
 
     public StyleSelectItemViewModel fromOOBibStyle(JStyle style) {
-        return new StyleSelectItemViewModel(style.getName(), String.join(", ", style.getJournals()), style.isInternalStyle() ? Localization.lang("Internal style") : style.getPath(), style);
+        return new StyleSelectItemViewModel(
+                style.getName(),
+                String.join(", ", style.getJournals()),
+                style.isInternalStyle() ? Localization.lang("Internal style") : style.getPath(),
+                style);
     }
 
     public JStyle toJStyle(StyleSelectItemViewModel item) {
@@ -97,25 +124,36 @@ public JStyle toJStyle(StyleSelectItemViewModel item) {
     }
 
     public void addStyleFile() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(Localization.lang("Style file"), StandardFileType.JSTYLE)
-                .withDefaultExtension(Localization.lang("Style file"), StandardFileType.JSTYLE)
-                .withInitialDirectory(filePreferences.getWorkingDirectory())
-                .build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(
+                                Localization.lang("Style file"), StandardFileType.JSTYLE)
+                        .withDefaultExtension(
+                                Localization.lang("Style file"), StandardFileType.JSTYLE)
+                        .withInitialDirectory(filePreferences.getWorkingDirectory())
+                        .build();
         Optional<Path> path = dialogService.showFileOpenDialog(fileDialogConfiguration);
-        path.map(Path::toAbsolutePath).map(Path::toString).ifPresent(stylePath -> {
-            if (styleLoader.addStyleIfValid(stylePath)) {
-                openOfficePreferences.setCurrentJStyle(stylePath);
-                styles.setAll(loadStyles());
-                selectedItem.setValue(getStyleOrDefault(stylePath));
-            } else {
-                dialogService.showErrorDialogAndWait(Localization.lang("Invalid style selected"), Localization.lang("You must select a valid style file. Your style is probably missing a line for the type \"default\"."));
-            }
-        });
+        path.map(Path::toAbsolutePath)
+                .map(Path::toString)
+                .ifPresent(
+                        stylePath -> {
+                            if (styleLoader.addStyleIfValid(stylePath)) {
+                                openOfficePreferences.setCurrentJStyle(stylePath);
+                                styles.setAll(loadStyles());
+                                selectedItem.setValue(getStyleOrDefault(stylePath));
+                            } else {
+                                dialogService.showErrorDialogAndWait(
+                                        Localization.lang("Invalid style selected"),
+                                        Localization.lang(
+                                                "You must select a valid style file. Your style is probably missing a line for the type \"default\"."));
+                            }
+                        });
     }
 
     public List<StyleSelectItemViewModel> loadStyles() {
-        return styleLoader.getStyles().stream().map(this::fromOOBibStyle).collect(Collectors.toList());
+        return styleLoader.getStyles().stream()
+                .map(this::fromOOBibStyle)
+                .collect(Collectors.toList());
     }
 
     public ListProperty<StyleSelectItemViewModel> stylesProperty() {
@@ -135,11 +173,17 @@ public ObjectProperty<StyleSelectItemViewModel> selectedItemProperty() {
 
     public void editStyle() {
         JStyle jStyle = selectedItem.getValue().getJStyle();
-        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt("jstyle", externalApplicationsPreferences);
+        Optional<ExternalFileType> type =
+                ExternalFileTypes.getExternalFileTypeByExt(
+                        "jstyle", externalApplicationsPreferences);
         try {
-            NativeDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), externalApplicationsPreferences, filePreferences, jStyle.getPath(), type);
-        } catch (
-                IOException e) {
+            NativeDesktop.openExternalFileAnyFormat(
+                    new BibDatabaseContext(),
+                    externalApplicationsPreferences,
+                    filePreferences,
+                    jStyle.getPath(),
+                    type);
+        } catch (IOException e) {
             dialogService.showErrorDialogAndWait(e);
         }
     }
@@ -156,11 +200,12 @@ public void viewStyle(StyleSelectItemViewModel item) {
     }
 
     public void storePrefs() {
-        List<String> externalStyles = styles.stream()
-                                            .map(this::toJStyle)
-                                            .filter(style -> !style.isInternalStyle())
-                                            .map(JStyle::getPath)
-                                            .collect(Collectors.toList());
+        List<String> externalStyles =
+                styles.stream()
+                        .map(this::toJStyle)
+                        .filter(style -> !style.isInternalStyle())
+                        .map(JStyle::getPath)
+                        .collect(Collectors.toList());
 
         openOfficePreferences.setExternalStyles(externalStyles);
 
@@ -174,7 +219,10 @@ public void storePrefs() {
     }
 
     private StyleSelectItemViewModel getStyleOrDefault(String stylePath) {
-        return styles.stream().filter(style -> style.getStylePath().equals(stylePath)).findFirst().orElse(styles.getFirst());
+        return styles.stream()
+                .filter(style -> style.getStylePath().equals(stylePath))
+                .findFirst()
+                .orElse(styles.getFirst());
     }
 
     public ObservableList<CitationStylePreviewLayout> getAvailableLayouts() {
@@ -186,8 +234,12 @@ public ObjectProperty<CitationStylePreviewLayout> selectedLayoutProperty() {
     }
 
     public void setAvailableLayoutsFilter(String searchTerm) {
-        filteredAvailableLayouts.setPredicate(layout ->
-                searchTerm.isEmpty() || layout.getDisplayName().toLowerCase().contains(searchTerm.toLowerCase()));
+        filteredAvailableLayouts.setPredicate(
+                layout ->
+                        searchTerm.isEmpty()
+                                || layout.getDisplayName()
+                                        .toLowerCase()
+                                        .contains(searchTerm.toLowerCase()));
     }
 
     public Tab getSelectedTab() {
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java
index a562f645bba3..3feaaed417bc 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java
@@ -16,7 +16,8 @@ public class StyleSelectItemViewModel {
     private final StringProperty name = new SimpleStringProperty("");
     private final StringProperty journals = new SimpleStringProperty("");
     private final StringProperty file = new SimpleStringProperty("");
-    private final ObjectProperty<Node> icon = new SimpleObjectProperty<>(IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode());
+    private final ObjectProperty<Node> icon =
+            new SimpleObjectProperty<>(IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode());
     private final JStyle jStyle;
     private final BooleanProperty internalStyle = new SimpleBooleanProperty();
 
diff --git a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
index 0cca01f40ced..109df48a8a72 100644
--- a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.preferences;
 
-import java.util.List;
+import jakarta.inject.Inject;
 
 import javafx.scene.Node;
 import javafx.scene.layout.VBox;
@@ -8,9 +8,10 @@
 import org.jabref.gui.DialogService;
 import org.jabref.logic.util.TaskExecutor;
 
-import jakarta.inject.Inject;
+import java.util.List;
 
-public abstract class AbstractPreferenceTabView<T extends PreferenceTabViewModel> extends VBox implements PreferencesTab {
+public abstract class AbstractPreferenceTabView<T extends PreferenceTabViewModel> extends VBox
+        implements PreferencesTab {
 
     @Inject protected TaskExecutor taskExecutor;
     @Inject protected DialogService dialogService;
diff --git a/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java b/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java
index d3cfb4de424a..3f1a16618a95 100644
--- a/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java
+++ b/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java
@@ -1,17 +1,7 @@
 package org.jabref.gui.preferences;
 
-import java.io.File;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.SequencedMap;
-import java.util.Set;
-import java.util.stream.Collectors;
+import com.airhacks.afterburner.injection.Injector;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.InvalidationListener;
 import javafx.collections.ListChangeListener;
@@ -69,12 +59,22 @@
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.model.strings.StringUtil;
-
-import com.airhacks.afterburner.injection.Injector;
-import com.tobiasdiez.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.SequencedMap;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 public class JabRefGuiPreferences extends JabRefCliPreferences implements GuiPreferences {
 
     // Public because needed for pref migration
@@ -114,7 +114,8 @@ public class JabRefGuiPreferences extends JabRefCliPreferences implements GuiPre
     private static final String MAIN_WINDOW_HEIGHT = "mainWindowSizeY";
     private static final String WINDOW_MAXIMISED = "windowMaximised";
     private static final String SIDE_PANE_WIDTH = "sidePaneWidthFX";
-    private static final String SIDE_PANE_COMPONENT_PREFERRED_POSITIONS = "sidePaneComponentPreferredPositions";
+    private static final String SIDE_PANE_COMPONENT_PREFERRED_POSITIONS =
+            "sidePaneComponentPreferredPositions";
     private static final String SIDE_PANE_COMPONENT_NAMES = "sidePaneComponentNames";
     // endregion
 
@@ -153,7 +154,8 @@ public class JabRefGuiPreferences extends JabRefCliPreferences implements GuiPre
     private static final String EXTERNAL_FILE_TYPES = "externalFileTypes";
     private static final String CONSOLE_COMMAND = "consoleCommand";
     private static final String USE_DEFAULT_CONSOLE_APPLICATION = "useDefaultConsoleApplication";
-    private static final String USE_DEFAULT_FILE_BROWSER_APPLICATION = "userDefaultFileBrowserApplication";
+    private static final String USE_DEFAULT_FILE_BROWSER_APPLICATION =
+            "userDefaultFileBrowserApplication";
     private static final String CITE_COMMAND = "citeCommand";
     private static final String EMAIL_SUBJECT = "emailSubject";
     private static final String KINDLE_EMAIL = "kindleEmail";
@@ -208,8 +210,10 @@ public class JabRefGuiPreferences extends JabRefCliPreferences implements GuiPre
 
     private static final String ID_ENTRY_GENERATOR = "idEntryGenerator";
     private static final String SELECTED_SLR_CATALOGS = "selectedSlrCatalogs";
-    private static final String UNLINKED_FILES_SELECTED_EXTENSION = "unlinkedFilesSelectedExtension";
-    private static final String UNLINKED_FILES_SELECTED_DATE_RANGE = "unlinkedFilesSelectedDateRange";
+    private static final String UNLINKED_FILES_SELECTED_EXTENSION =
+            "unlinkedFilesSelectedExtension";
+    private static final String UNLINKED_FILES_SELECTED_DATE_RANGE =
+            "unlinkedFilesSelectedDateRange";
     private static final String UNLINKED_FILES_SELECTED_SORT = "unlinkedFilesSelectedSort";
 
     private static JabRefGuiPreferences singleton;
@@ -235,7 +239,8 @@ public class JabRefGuiPreferences extends JabRefCliPreferences implements GuiPre
     private JabRefGuiPreferences() {
         super();
 
-        defaults.put(JOURNAL_POPUP, EntryEditorPreferences.JournalPopupEnabled.FIRST_START.toString());
+        defaults.put(
+                JOURNAL_POPUP, EntryEditorPreferences.JournalPopupEnabled.FIRST_START.toString());
 
         defaults.put(ENTRY_EDITOR_HEIGHT, 0.65);
         defaults.put(ENTRY_EDITOR_PREVIEW_DIVIDER_POS, 0.5);
@@ -247,15 +252,23 @@ private JabRefGuiPreferences() {
         defaults.put(MERGE_ENTRIES_HIGHLIGHT_WORDS, Boolean.TRUE);
         defaults.put(MERGE_SHOW_ONLY_CHANGED_FIELDS, Boolean.FALSE);
         defaults.put(MERGE_APPLY_TO_ALL_ENTRIES, Boolean.FALSE);
-        defaults.put(DUPLICATE_RESOLVER_DECISION_RESULT_ALL_ENTRIES, DuplicateResolverDialog.DuplicateResolverResult.BREAK.name());
+        defaults.put(
+                DUPLICATE_RESOLVER_DECISION_RESULT_ALL_ENTRIES,
+                DuplicateResolverDialog.DuplicateResolverResult.BREAK.name());
         // endregion
 
         // region autoCompletePreferences
         defaults.put(AUTO_COMPLETE, Boolean.FALSE);
         defaults.put(AUTOCOMPLETER_FIRSTNAME_MODE, AutoCompleteFirstNameMode.BOTH.name());
-        defaults.put(AUTOCOMPLETER_FIRST_LAST, Boolean.FALSE); // "Autocomplete names in 'Firstname Lastname' format only"
-        defaults.put(AUTOCOMPLETER_LAST_FIRST, Boolean.FALSE); // "Autocomplete names in 'Lastname, Firstname' format only"
-        defaults.put(AUTOCOMPLETER_COMPLETE_FIELDS, "author;editor;title;journal;publisher;keywords;crossref;related;entryset");
+        defaults.put(
+                AUTOCOMPLETER_FIRST_LAST,
+                Boolean.FALSE); // "Autocomplete names in 'Firstname Lastname' format only"
+        defaults.put(
+                AUTOCOMPLETER_LAST_FIRST,
+                Boolean.FALSE); // "Autocomplete names in 'Lastname, Firstname' format only"
+        defaults.put(
+                AUTOCOMPLETER_COMPLETE_FIELDS,
+                "author;editor;title;journal;publisher;keywords;crossref;related;entryset");
         // endregion
 
         // region workspace
@@ -289,7 +302,9 @@ private JabRefGuiPreferences() {
         defaults.put(USE_DEFAULT_CONSOLE_APPLICATION, Boolean.TRUE);
         defaults.put(USE_DEFAULT_FILE_BROWSER_APPLICATION, Boolean.TRUE);
         if (OS.WINDOWS) {
-            defaults.put(CONSOLE_COMMAND, "C:\\Program Files\\ConEmu\\ConEmu64.exe /single /dir \"%DIR\"");
+            defaults.put(
+                    CONSOLE_COMMAND,
+                    "C:\\Program Files\\ConEmu\\ConEmu64.exe /single /dir \"%DIR\"");
             defaults.put(FILE_BROWSER_COMMAND, "explorer.exe /select, \"%DIR\"");
         } else {
             defaults.put(CONSOLE_COMMAND, "");
@@ -320,25 +335,26 @@ private JabRefGuiPreferences() {
         defaults.put(CYCLE_PREVIEW_POS, 0);
         defaults.put(PREVIEW_AS_TAB, Boolean.FALSE);
         defaults.put(PREVIEW_IN_ENTRY_TABLE_TOOLTIP, Boolean.FALSE);
-        defaults.put(PREVIEW_STYLE,
-                "<font face=\"sans-serif\">" +
-                        "<b>\\bibtextype</b><a name=\"\\citationkey\">\\begin{citationkey} (\\citationkey)</a>\\end{citationkey}__NEWLINE__" +
-                        "\\begin{author}<BR><BR>\\format[Authors(LastFirst, FullName,Sep= / ,LastSep= / ),HTMLChars]{\\author}\\end{author}__NEWLINE__" +
-                        "\\begin{editor & !author}<BR><BR>\\format[Authors(LastFirst,FullName,Sep= / ,LastSep= / ),HTMLChars]{\\editor} (\\format[IfPlural(Eds.,Ed.)]{\\editor})\\end{editor & !author}__NEWLINE__" +
-                        "\\begin{title}<BR><b>\\format[HTMLChars]{\\title}</b> \\end{title}__NEWLINE__" +
-                        "<BR>\\begin{date}\\date\\end{date}\\begin{edition}, \\edition. edition\\end{edition}__NEWLINE__" +
-                        "\\begin{editor & author}<BR><BR>\\format[Authors(LastFirst,FullName,Sep= / ,LastSep= / ),HTMLChars]{\\editor} (\\format[IfPlural(Eds.,Ed.)]{\\editor})\\end{editor & author}__NEWLINE__" +
-                        "\\begin{booktitle}<BR><i>\\format[HTMLChars]{\\booktitle}</i>\\end{booktitle}__NEWLINE__" +
-                        "\\begin{chapter} \\format[HTMLChars]{\\chapter}<BR>\\end{chapter}" +
-                        "\\begin{editor & !author}<BR>\\end{editor & !author}\\begin{!editor}<BR>\\end{!editor}\\begin{journal}<BR><i>\\format[HTMLChars]{\\journal}</i> \\end{journal} \\begin{volume}, Vol. \\volume\\end{volume}\\begin{series}<BR>\\format[HTMLChars]{\\series}\\end{series}\\begin{number}, No. \\format[HTMLChars]{\\number}\\end{number}__NEWLINE__" +
-                        "\\begin{school} \\format[HTMLChars]{\\school}, \\end{school}__NEWLINE__" +
-                        "\\begin{institution} <em>\\format[HTMLChars]{\\institution}, </em>\\end{institution}__NEWLINE__" +
-                        "\\begin{publisher}<BR>\\format[HTMLChars]{\\publisher}\\end{publisher}\\begin{location}: \\format[HTMLChars]{\\location} \\end{location}__NEWLINE__" +
-                        "\\begin{pages}<BR> p. \\format[FormatPagesForHTML]{\\pages}\\end{pages}__NEWLINE__" +
-                        "\\begin{abstract}<BR><BR><b>Abstract: </b>\\format[HTMLChars]{\\abstract} \\end{abstract}__NEWLINE__" +
-                        "\\begin{owncitation}<BR><BR><b>Own citation: </b>\\format[HTMLChars]{\\owncitation} \\end{owncitation}__NEWLINE__" +
-                        "\\begin{comment}<BR><BR><b>Comment: </b>\\format[Markdown,HTMLChars(keepCurlyBraces)]{\\comment}\\end{comment}__NEWLINE__" +
-                        "</font>__NEWLINE__");
+        defaults.put(
+                PREVIEW_STYLE,
+                "<font face=\"sans-serif\">"
+                        + "<b>\\bibtextype</b><a name=\"\\citationkey\">\\begin{citationkey} (\\citationkey)</a>\\end{citationkey}__NEWLINE__"
+                        + "\\begin{author}<BR><BR>\\format[Authors(LastFirst, FullName,Sep= / ,LastSep= / ),HTMLChars]{\\author}\\end{author}__NEWLINE__"
+                        + "\\begin{editor & !author}<BR><BR>\\format[Authors(LastFirst,FullName,Sep= / ,LastSep= / ),HTMLChars]{\\editor} (\\format[IfPlural(Eds.,Ed.)]{\\editor})\\end{editor & !author}__NEWLINE__"
+                        + "\\begin{title}<BR><b>\\format[HTMLChars]{\\title}</b> \\end{title}__NEWLINE__"
+                        + "<BR>\\begin{date}\\date\\end{date}\\begin{edition}, \\edition. edition\\end{edition}__NEWLINE__"
+                        + "\\begin{editor & author}<BR><BR>\\format[Authors(LastFirst,FullName,Sep= / ,LastSep= / ),HTMLChars]{\\editor} (\\format[IfPlural(Eds.,Ed.)]{\\editor})\\end{editor & author}__NEWLINE__"
+                        + "\\begin{booktitle}<BR><i>\\format[HTMLChars]{\\booktitle}</i>\\end{booktitle}__NEWLINE__"
+                        + "\\begin{chapter} \\format[HTMLChars]{\\chapter}<BR>\\end{chapter}"
+                        + "\\begin{editor & !author}<BR>\\end{editor & !author}\\begin{!editor}<BR>\\end{!editor}\\begin{journal}<BR><i>\\format[HTMLChars]{\\journal}</i> \\end{journal} \\begin{volume}, Vol. \\volume\\end{volume}\\begin{series}<BR>\\format[HTMLChars]{\\series}\\end{series}\\begin{number}, No. \\format[HTMLChars]{\\number}\\end{number}__NEWLINE__"
+                        + "\\begin{school} \\format[HTMLChars]{\\school}, \\end{school}__NEWLINE__"
+                        + "\\begin{institution} <em>\\format[HTMLChars]{\\institution}, </em>\\end{institution}__NEWLINE__"
+                        + "\\begin{publisher}<BR>\\format[HTMLChars]{\\publisher}\\end{publisher}\\begin{location}: \\format[HTMLChars]{\\location} \\end{location}__NEWLINE__"
+                        + "\\begin{pages}<BR> p. \\format[FormatPagesForHTML]{\\pages}\\end{pages}__NEWLINE__"
+                        + "\\begin{abstract}<BR><BR><b>Abstract: </b>\\format[HTMLChars]{\\abstract} \\end{abstract}__NEWLINE__"
+                        + "\\begin{owncitation}<BR><BR><b>Own citation: </b>\\format[HTMLChars]{\\owncitation} \\end{owncitation}__NEWLINE__"
+                        + "\\begin{comment}<BR><BR><b>Comment: </b>\\format[Markdown,HTMLChars(keepCurlyBraces)]{\\comment}\\end{comment}__NEWLINE__"
+                        + "</font>__NEWLINE__");
         // endregion
 
         // region NameDisplayPreferences
@@ -373,7 +389,9 @@ private JabRefGuiPreferences() {
 
         // region: Main table, main table column, and search dialog column preferences
         defaults.put(EXTRA_FILE_COLUMNS, Boolean.FALSE);
-        defaults.put(COLUMN_NAMES, "search_score;groups;group_icons;files;linked_id;field:entrytype;field:author/editor;field:title;field:year;field:journal/booktitle;special:ranking;special:readstatus;special:priority");
+        defaults.put(
+                COLUMN_NAMES,
+                "search_score;groups;group_icons;files;linked_id;field:entrytype;field:author/editor;field:title;field:year;field:journal/booktitle;special:ranking;special:readstatus;special:priority");
         defaults.put(COLUMN_WIDTHS, "50;28;40;28;28;75;300;470;60;130;50;50;50");
 
         defaults.put(SIDE_PANE_COMPONENT_NAMES, "");
@@ -408,40 +426,73 @@ public EntryEditorPreferences getEntryEditorPreferences() {
             return entryEditorPreferences;
         }
 
-        entryEditorPreferences = new EntryEditorPreferences(
-                getEntryEditorTabs(),
-                getDefaultEntryEditorTabs(),
-                getBoolean(AUTO_OPEN_FORM),
-                getBoolean(SHOW_RECOMMENDATIONS),
-                getBoolean(SHOW_AI_SUMMARY),
-                getBoolean(SHOW_AI_CHAT),
-                getBoolean(SHOW_LATEX_CITATIONS),
-                getBoolean(DEFAULT_SHOW_SOURCE),
-                getBoolean(VALIDATE_IN_ENTRY_EDITOR),
-                getBoolean(ALLOW_INTEGER_EDITION_BIBTEX),
-                getDouble(ENTRY_EDITOR_HEIGHT),
-                getBoolean(AUTOLINK_FILES_ENABLED),
-                EntryEditorPreferences.JournalPopupEnabled.fromString(get(JOURNAL_POPUP)),
-                getBoolean(SHOW_SCITE_TAB),
-                getBoolean(SHOW_USER_COMMENTS_FIELDS),
-                getDouble(ENTRY_EDITOR_PREVIEW_DIVIDER_POS));
-
-        EasyBind.listen(entryEditorPreferences.entryEditorTabs(), (obs, oldValue, newValue) -> storeEntryEditorTabs(newValue));
+        entryEditorPreferences =
+                new EntryEditorPreferences(
+                        getEntryEditorTabs(),
+                        getDefaultEntryEditorTabs(),
+                        getBoolean(AUTO_OPEN_FORM),
+                        getBoolean(SHOW_RECOMMENDATIONS),
+                        getBoolean(SHOW_AI_SUMMARY),
+                        getBoolean(SHOW_AI_CHAT),
+                        getBoolean(SHOW_LATEX_CITATIONS),
+                        getBoolean(DEFAULT_SHOW_SOURCE),
+                        getBoolean(VALIDATE_IN_ENTRY_EDITOR),
+                        getBoolean(ALLOW_INTEGER_EDITION_BIBTEX),
+                        getDouble(ENTRY_EDITOR_HEIGHT),
+                        getBoolean(AUTOLINK_FILES_ENABLED),
+                        EntryEditorPreferences.JournalPopupEnabled.fromString(get(JOURNAL_POPUP)),
+                        getBoolean(SHOW_SCITE_TAB),
+                        getBoolean(SHOW_USER_COMMENTS_FIELDS),
+                        getDouble(ENTRY_EDITOR_PREVIEW_DIVIDER_POS));
+
+        EasyBind.listen(
+                entryEditorPreferences.entryEditorTabs(),
+                (obs, oldValue, newValue) -> storeEntryEditorTabs(newValue));
         // defaultEntryEditorTabs are read-only
-        EasyBind.listen(entryEditorPreferences.shouldOpenOnNewEntryProperty(), (obs, oldValue, newValue) -> putBoolean(AUTO_OPEN_FORM, newValue));
-        EasyBind.listen(entryEditorPreferences.shouldShowRecommendationsTabProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_RECOMMENDATIONS, newValue));
-        EasyBind.listen(entryEditorPreferences.shouldShowAiSummaryTabProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_AI_SUMMARY, newValue));
-        EasyBind.listen(entryEditorPreferences.shouldShowAiChatTabProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_AI_CHAT, newValue));
-        EasyBind.listen(entryEditorPreferences.shouldShowLatexCitationsTabProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_LATEX_CITATIONS, newValue));
-        EasyBind.listen(entryEditorPreferences.showSourceTabByDefaultProperty(), (obs, oldValue, newValue) -> putBoolean(DEFAULT_SHOW_SOURCE, newValue));
-        EasyBind.listen(entryEditorPreferences.enableValidationProperty(), (obs, oldValue, newValue) -> putBoolean(VALIDATE_IN_ENTRY_EDITOR, newValue));
-        EasyBind.listen(entryEditorPreferences.allowIntegerEditionBibtexProperty(), (obs, oldValue, newValue) -> putBoolean(ALLOW_INTEGER_EDITION_BIBTEX, newValue));
-        EasyBind.listen(entryEditorPreferences.dividerPositionProperty(), (obs, oldValue, newValue) -> putDouble(ENTRY_EDITOR_HEIGHT, newValue.doubleValue()));
-        EasyBind.listen(entryEditorPreferences.autoLinkEnabledProperty(), (obs, oldValue, newValue) -> putBoolean(AUTOLINK_FILES_ENABLED, newValue));
-        EasyBind.listen(entryEditorPreferences.enableJournalPopupProperty(), (obs, oldValue, newValue) -> put(JOURNAL_POPUP, newValue.toString()));
-        EasyBind.listen(entryEditorPreferences.shouldShowLSciteTabProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_SCITE_TAB, newValue));
-        EasyBind.listen(entryEditorPreferences.showUserCommentsFieldsProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_USER_COMMENTS_FIELDS, newValue));
-        EasyBind.listen(entryEditorPreferences.previewWidthDividerPositionProperty(), (obs, oldValue, newValue) -> putDouble(ENTRY_EDITOR_PREVIEW_DIVIDER_POS, newValue.doubleValue()));
+        EasyBind.listen(
+                entryEditorPreferences.shouldOpenOnNewEntryProperty(),
+                (obs, oldValue, newValue) -> putBoolean(AUTO_OPEN_FORM, newValue));
+        EasyBind.listen(
+                entryEditorPreferences.shouldShowRecommendationsTabProperty(),
+                (obs, oldValue, newValue) -> putBoolean(SHOW_RECOMMENDATIONS, newValue));
+        EasyBind.listen(
+                entryEditorPreferences.shouldShowAiSummaryTabProperty(),
+                (obs, oldValue, newValue) -> putBoolean(SHOW_AI_SUMMARY, newValue));
+        EasyBind.listen(
+                entryEditorPreferences.shouldShowAiChatTabProperty(),
+                (obs, oldValue, newValue) -> putBoolean(SHOW_AI_CHAT, newValue));
+        EasyBind.listen(
+                entryEditorPreferences.shouldShowLatexCitationsTabProperty(),
+                (obs, oldValue, newValue) -> putBoolean(SHOW_LATEX_CITATIONS, newValue));
+        EasyBind.listen(
+                entryEditorPreferences.showSourceTabByDefaultProperty(),
+                (obs, oldValue, newValue) -> putBoolean(DEFAULT_SHOW_SOURCE, newValue));
+        EasyBind.listen(
+                entryEditorPreferences.enableValidationProperty(),
+                (obs, oldValue, newValue) -> putBoolean(VALIDATE_IN_ENTRY_EDITOR, newValue));
+        EasyBind.listen(
+                entryEditorPreferences.allowIntegerEditionBibtexProperty(),
+                (obs, oldValue, newValue) -> putBoolean(ALLOW_INTEGER_EDITION_BIBTEX, newValue));
+        EasyBind.listen(
+                entryEditorPreferences.dividerPositionProperty(),
+                (obs, oldValue, newValue) ->
+                        putDouble(ENTRY_EDITOR_HEIGHT, newValue.doubleValue()));
+        EasyBind.listen(
+                entryEditorPreferences.autoLinkEnabledProperty(),
+                (obs, oldValue, newValue) -> putBoolean(AUTOLINK_FILES_ENABLED, newValue));
+        EasyBind.listen(
+                entryEditorPreferences.enableJournalPopupProperty(),
+                (obs, oldValue, newValue) -> put(JOURNAL_POPUP, newValue.toString()));
+        EasyBind.listen(
+                entryEditorPreferences.shouldShowLSciteTabProperty(),
+                (obs, oldValue, newValue) -> putBoolean(SHOW_SCITE_TAB, newValue));
+        EasyBind.listen(
+                entryEditorPreferences.showUserCommentsFieldsProperty(),
+                (obs, oldValue, newValue) -> putBoolean(SHOW_USER_COMMENTS_FIELDS, newValue));
+        EasyBind.listen(
+                entryEditorPreferences.previewWidthDividerPositionProperty(),
+                (obs, oldValue, newValue) ->
+                        putDouble(ENTRY_EDITOR_PREVIEW_DIVIDER_POS, newValue.doubleValue()));
         return entryEditorPreferences;
     }
 
@@ -474,11 +525,16 @@ private Map<String, Set<Field>> getEntryEditorTabs() {
      */
     private void storeEntryEditorTabs(Map<String, Set<Field>> customTabs) {
         String[] names = customTabs.keySet().toArray(String[]::new);
-        String[] fields = customTabs.values().stream()
-                                    .map(set -> set.stream()
-                                                   .map(Field::getName)
-                                                   .collect(Collectors.joining(STRINGLIST_DELIMITER.toString())))
-                                    .toArray(String[]::new);
+        String[] fields =
+                customTabs.values().stream()
+                        .map(
+                                set ->
+                                        set.stream()
+                                                .map(Field::getName)
+                                                .collect(
+                                                        Collectors.joining(
+                                                                STRINGLIST_DELIMITER.toString())))
+                        .toArray(String[]::new);
 
         for (int i = 0; i < customTabs.size(); i++) {
             put(CUSTOM_TAB_NAME + i, names[i]);
@@ -504,11 +560,15 @@ private SequencedMap<String, Set<Field>> getDefaultEntryEditorTabs() {
                 break;
             }
 
-            customTabsMap.put(name, FieldFactory.parseFieldList((String) defaults.get(CUSTOM_TAB_FIELDS + "_def" + defNumber)));
+            customTabsMap.put(
+                    name,
+                    FieldFactory.parseFieldList(
+                            (String) defaults.get(CUSTOM_TAB_FIELDS + "_def" + defNumber)));
             defNumber++;
         }
         return customTabsMap;
     }
+
     // endregion
 
     @Override
@@ -517,23 +577,40 @@ public MergeDialogPreferences getMergeDialogPreferences() {
             return mergeDialogPreferences;
         }
 
-        mergeDialogPreferences = new MergeDialogPreferences(
-                DiffMode.parse(get(MERGE_ENTRIES_DIFF_MODE)),
-                getBoolean(MERGE_ENTRIES_SHOULD_SHOW_DIFF),
-                getBoolean(MERGE_ENTRIES_SHOULD_SHOW_UNIFIED_DIFF),
-                getBoolean(MERGE_ENTRIES_HIGHLIGHT_WORDS),
-                getBoolean(MERGE_SHOW_ONLY_CHANGED_FIELDS),
-                getBoolean(MERGE_APPLY_TO_ALL_ENTRIES),
-                DuplicateResolverDialog.DuplicateResolverResult.parse(get(DUPLICATE_RESOLVER_DECISION_RESULT_ALL_ENTRIES))
-        );
-
-        EasyBind.listen(mergeDialogPreferences.mergeDiffModeProperty(), (obs, oldValue, newValue) -> put(MERGE_ENTRIES_DIFF_MODE, newValue.name()));
-        EasyBind.listen(mergeDialogPreferences.mergeShouldShowDiffProperty(), (obs, oldValue, newValue) -> putBoolean(MERGE_ENTRIES_SHOULD_SHOW_DIFF, newValue));
-        EasyBind.listen(mergeDialogPreferences.mergeShouldShowUnifiedDiffProperty(), (obs, oldValue, newValue) -> putBoolean(MERGE_ENTRIES_SHOULD_SHOW_UNIFIED_DIFF, newValue));
-        EasyBind.listen(mergeDialogPreferences.mergeHighlightWordsProperty(), (obs, oldValue, newValue) -> putBoolean(MERGE_ENTRIES_HIGHLIGHT_WORDS, newValue));
-        EasyBind.listen(mergeDialogPreferences.mergeShowChangedFieldOnlyProperty(), (obs, oldValue, newValue) -> putBoolean(MERGE_SHOW_ONLY_CHANGED_FIELDS, newValue));
-        EasyBind.listen(mergeDialogPreferences.mergeApplyToAllEntriesProperty(), (obs, oldValue, newValue) -> putBoolean(MERGE_APPLY_TO_ALL_ENTRIES, newValue));
-        EasyBind.listen(mergeDialogPreferences.allEntriesDuplicateResolverDecisionProperty(), (obs, oldValue, newValue) -> put(DUPLICATE_RESOLVER_DECISION_RESULT_ALL_ENTRIES, newValue.name()));
+        mergeDialogPreferences =
+                new MergeDialogPreferences(
+                        DiffMode.parse(get(MERGE_ENTRIES_DIFF_MODE)),
+                        getBoolean(MERGE_ENTRIES_SHOULD_SHOW_DIFF),
+                        getBoolean(MERGE_ENTRIES_SHOULD_SHOW_UNIFIED_DIFF),
+                        getBoolean(MERGE_ENTRIES_HIGHLIGHT_WORDS),
+                        getBoolean(MERGE_SHOW_ONLY_CHANGED_FIELDS),
+                        getBoolean(MERGE_APPLY_TO_ALL_ENTRIES),
+                        DuplicateResolverDialog.DuplicateResolverResult.parse(
+                                get(DUPLICATE_RESOLVER_DECISION_RESULT_ALL_ENTRIES)));
+
+        EasyBind.listen(
+                mergeDialogPreferences.mergeDiffModeProperty(),
+                (obs, oldValue, newValue) -> put(MERGE_ENTRIES_DIFF_MODE, newValue.name()));
+        EasyBind.listen(
+                mergeDialogPreferences.mergeShouldShowDiffProperty(),
+                (obs, oldValue, newValue) -> putBoolean(MERGE_ENTRIES_SHOULD_SHOW_DIFF, newValue));
+        EasyBind.listen(
+                mergeDialogPreferences.mergeShouldShowUnifiedDiffProperty(),
+                (obs, oldValue, newValue) ->
+                        putBoolean(MERGE_ENTRIES_SHOULD_SHOW_UNIFIED_DIFF, newValue));
+        EasyBind.listen(
+                mergeDialogPreferences.mergeHighlightWordsProperty(),
+                (obs, oldValue, newValue) -> putBoolean(MERGE_ENTRIES_HIGHLIGHT_WORDS, newValue));
+        EasyBind.listen(
+                mergeDialogPreferences.mergeShowChangedFieldOnlyProperty(),
+                (obs, oldValue, newValue) -> putBoolean(MERGE_SHOW_ONLY_CHANGED_FIELDS, newValue));
+        EasyBind.listen(
+                mergeDialogPreferences.mergeApplyToAllEntriesProperty(),
+                (obs, oldValue, newValue) -> putBoolean(MERGE_APPLY_TO_ALL_ENTRIES, newValue));
+        EasyBind.listen(
+                mergeDialogPreferences.allEntriesDuplicateResolverDecisionProperty(),
+                (obs, oldValue, newValue) ->
+                        put(DUPLICATE_RESOLVER_DECISION_RESULT_ALL_ENTRIES, newValue.name()));
 
         return mergeDialogPreferences;
     }
@@ -551,31 +628,47 @@ public AutoCompletePreferences getAutoCompletePreferences() {
             nameFormat = AutoCompletePreferences.NameFormat.FIRST_LAST;
         }
 
-        autoCompletePreferences = new AutoCompletePreferences(
-                getBoolean(AUTO_COMPLETE),
-                AutoCompleteFirstNameMode.parse(get(AUTOCOMPLETER_FIRSTNAME_MODE)),
-                nameFormat,
-                getStringList(AUTOCOMPLETER_COMPLETE_FIELDS).stream().map(FieldFactory::parseField).collect(Collectors.toSet())
-        );
-
-        EasyBind.listen(autoCompletePreferences.autoCompleteProperty(), (obs, oldValue, newValue) -> putBoolean(AUTO_COMPLETE, newValue));
-        EasyBind.listen(autoCompletePreferences.firstNameModeProperty(), (obs, oldValue, newValue) -> put(AUTOCOMPLETER_FIRSTNAME_MODE, newValue.name()));
-        autoCompletePreferences.getCompleteFields().addListener((SetChangeListener<Field>) c ->
-                putStringList(AUTOCOMPLETER_COMPLETE_FIELDS, autoCompletePreferences.getCompleteFields().stream()
-                                                                                    .map(Field::getName)
-                                                                                    .collect(Collectors.toList())));
-        EasyBind.listen(autoCompletePreferences.nameFormatProperty(), (obs, oldValue, newValue) -> {
-            if (autoCompletePreferences.getNameFormat() == AutoCompletePreferences.NameFormat.BOTH) {
-                putBoolean(AUTOCOMPLETER_LAST_FIRST, false);
-                putBoolean(AUTOCOMPLETER_FIRST_LAST, false);
-            } else if (autoCompletePreferences.getNameFormat() == AutoCompletePreferences.NameFormat.LAST_FIRST) {
-                putBoolean(AUTOCOMPLETER_LAST_FIRST, true);
-                putBoolean(AUTOCOMPLETER_FIRST_LAST, false);
-            } else {
-                putBoolean(AUTOCOMPLETER_LAST_FIRST, false);
-                putBoolean(AUTOCOMPLETER_FIRST_LAST, true);
-            }
-        });
+        autoCompletePreferences =
+                new AutoCompletePreferences(
+                        getBoolean(AUTO_COMPLETE),
+                        AutoCompleteFirstNameMode.parse(get(AUTOCOMPLETER_FIRSTNAME_MODE)),
+                        nameFormat,
+                        getStringList(AUTOCOMPLETER_COMPLETE_FIELDS).stream()
+                                .map(FieldFactory::parseField)
+                                .collect(Collectors.toSet()));
+
+        EasyBind.listen(
+                autoCompletePreferences.autoCompleteProperty(),
+                (obs, oldValue, newValue) -> putBoolean(AUTO_COMPLETE, newValue));
+        EasyBind.listen(
+                autoCompletePreferences.firstNameModeProperty(),
+                (obs, oldValue, newValue) -> put(AUTOCOMPLETER_FIRSTNAME_MODE, newValue.name()));
+        autoCompletePreferences
+                .getCompleteFields()
+                .addListener(
+                        (SetChangeListener<Field>)
+                                c ->
+                                        putStringList(
+                                                AUTOCOMPLETER_COMPLETE_FIELDS,
+                                                autoCompletePreferences.getCompleteFields().stream()
+                                                        .map(Field::getName)
+                                                        .collect(Collectors.toList())));
+        EasyBind.listen(
+                autoCompletePreferences.nameFormatProperty(),
+                (obs, oldValue, newValue) -> {
+                    if (autoCompletePreferences.getNameFormat()
+                            == AutoCompletePreferences.NameFormat.BOTH) {
+                        putBoolean(AUTOCOMPLETER_LAST_FIRST, false);
+                        putBoolean(AUTOCOMPLETER_FIRST_LAST, false);
+                    } else if (autoCompletePreferences.getNameFormat()
+                            == AutoCompletePreferences.NameFormat.LAST_FIRST) {
+                        putBoolean(AUTOCOMPLETER_LAST_FIRST, true);
+                        putBoolean(AUTOCOMPLETER_FIRST_LAST, false);
+                    } else {
+                        putBoolean(AUTOCOMPLETER_LAST_FIRST, false);
+                        putBoolean(AUTOCOMPLETER_FIRST_LAST, true);
+                    }
+                });
 
         return autoCompletePreferences;
     }
@@ -586,23 +679,38 @@ public CoreGuiPreferences getGuiPreferences() {
             return coreGuiPreferences;
         }
 
-        coreGuiPreferences = new CoreGuiPreferences(
-                getDouble(MAIN_WINDOW_POS_X),
-                getDouble(MAIN_WINDOW_POS_Y),
-                getDouble(MAIN_WINDOW_WIDTH),
-                getDouble(MAIN_WINDOW_HEIGHT),
-                getBoolean(WINDOW_MAXIMISED),
-                get(ID_ENTRY_GENERATOR),
-                getDouble(SIDE_PANE_WIDTH));
-
-        EasyBind.listen(coreGuiPreferences.positionXProperty(), (obs, oldValue, newValue) -> putDouble(MAIN_WINDOW_POS_X, newValue.doubleValue()));
-        EasyBind.listen(coreGuiPreferences.positionYProperty(), (obs, oldValue, newValue) -> putDouble(MAIN_WINDOW_POS_Y, newValue.doubleValue()));
-        EasyBind.listen(coreGuiPreferences.sizeXProperty(), (obs, oldValue, newValue) -> putDouble(MAIN_WINDOW_WIDTH, newValue.doubleValue()));
-        EasyBind.listen(coreGuiPreferences.sizeYProperty(), (obs, oldValue, newValue) -> putDouble(MAIN_WINDOW_HEIGHT, newValue.doubleValue()));
-        EasyBind.listen(coreGuiPreferences.windowMaximisedProperty(), (obs, oldValue, newValue) -> putBoolean(WINDOW_MAXIMISED, newValue));
-        EasyBind.listen(coreGuiPreferences.sidePaneWidthProperty(), (obs, oldValue, newValue) -> putDouble(SIDE_PANE_WIDTH, newValue.doubleValue()));
-
-        EasyBind.listen(coreGuiPreferences.lastSelectedIdBasedFetcherProperty(), (obs, oldValue, newValue) -> put(ID_ENTRY_GENERATOR, newValue));
+        coreGuiPreferences =
+                new CoreGuiPreferences(
+                        getDouble(MAIN_WINDOW_POS_X),
+                        getDouble(MAIN_WINDOW_POS_Y),
+                        getDouble(MAIN_WINDOW_WIDTH),
+                        getDouble(MAIN_WINDOW_HEIGHT),
+                        getBoolean(WINDOW_MAXIMISED),
+                        get(ID_ENTRY_GENERATOR),
+                        getDouble(SIDE_PANE_WIDTH));
+
+        EasyBind.listen(
+                coreGuiPreferences.positionXProperty(),
+                (obs, oldValue, newValue) -> putDouble(MAIN_WINDOW_POS_X, newValue.doubleValue()));
+        EasyBind.listen(
+                coreGuiPreferences.positionYProperty(),
+                (obs, oldValue, newValue) -> putDouble(MAIN_WINDOW_POS_Y, newValue.doubleValue()));
+        EasyBind.listen(
+                coreGuiPreferences.sizeXProperty(),
+                (obs, oldValue, newValue) -> putDouble(MAIN_WINDOW_WIDTH, newValue.doubleValue()));
+        EasyBind.listen(
+                coreGuiPreferences.sizeYProperty(),
+                (obs, oldValue, newValue) -> putDouble(MAIN_WINDOW_HEIGHT, newValue.doubleValue()));
+        EasyBind.listen(
+                coreGuiPreferences.windowMaximisedProperty(),
+                (obs, oldValue, newValue) -> putBoolean(WINDOW_MAXIMISED, newValue));
+        EasyBind.listen(
+                coreGuiPreferences.sidePaneWidthProperty(),
+                (obs, oldValue, newValue) -> putDouble(SIDE_PANE_WIDTH, newValue.doubleValue()));
+
+        EasyBind.listen(
+                coreGuiPreferences.lastSelectedIdBasedFetcherProperty(),
+                (obs, oldValue, newValue) -> put(ID_ENTRY_GENERATOR, newValue));
 
         return coreGuiPreferences;
     }
@@ -615,37 +723,63 @@ public WorkspacePreferences getWorkspacePreferences() {
             return workspacePreferences;
         }
 
-        workspacePreferences = new WorkspacePreferences(
-                getLanguage(),
-                getBoolean(OVERRIDE_DEFAULT_FONT_SIZE),
-                getInt(MAIN_FONT_SIZE),
-                (Integer) defaults.get(MAIN_FONT_SIZE),
-                new Theme(get(THEME)),
-                getBoolean(THEME_SYNC_OS),
-                getBoolean(OPEN_LAST_EDITED),
-                getBoolean(SHOW_ADVANCED_HINTS),
-                getBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION),
-                getBoolean(CONFIRM_DELETE),
-                getStringList(SELECTED_SLR_CATALOGS));
-
-        EasyBind.listen(workspacePreferences.languageProperty(), (obs, oldValue, newValue) -> {
-            put(LANGUAGE, newValue.getId());
-            if (oldValue != newValue) {
-                setLanguageDependentDefaultValues();
-                Localization.setLanguage(newValue);
-            }
-        });
-
-        EasyBind.listen(workspacePreferences.shouldOverrideDefaultFontSizeProperty(), (obs, oldValue, newValue) -> putBoolean(OVERRIDE_DEFAULT_FONT_SIZE, newValue));
-        EasyBind.listen(workspacePreferences.mainFontSizeProperty(), (obs, oldValue, newValue) -> putInt(MAIN_FONT_SIZE, newValue));
-        EasyBind.listen(workspacePreferences.themeProperty(), (obs, oldValue, newValue) -> put(THEME, newValue.getName()));
-        EasyBind.listen(workspacePreferences.themeSyncOsProperty(), (obs, oldValue, newValue) -> putBoolean(THEME_SYNC_OS, newValue));
-        EasyBind.listen(workspacePreferences.openLastEditedProperty(), (obs, oldValue, newValue) -> putBoolean(OPEN_LAST_EDITED, newValue));
-        EasyBind.listen(workspacePreferences.showAdvancedHintsProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_ADVANCED_HINTS, newValue));
-        EasyBind.listen(workspacePreferences.warnAboutDuplicatesInInspectionProperty(), (obs, oldValue, newValue) -> putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue));
-        EasyBind.listen(workspacePreferences.confirmDeleteProperty(), (obs, oldValue, newValue) -> putBoolean(CONFIRM_DELETE, newValue));
-        workspacePreferences.getSelectedSlrCatalogs().addListener((ListChangeListener<String>) change ->
-                putStringList(SELECTED_SLR_CATALOGS, workspacePreferences.getSelectedSlrCatalogs()));
+        workspacePreferences =
+                new WorkspacePreferences(
+                        getLanguage(),
+                        getBoolean(OVERRIDE_DEFAULT_FONT_SIZE),
+                        getInt(MAIN_FONT_SIZE),
+                        (Integer) defaults.get(MAIN_FONT_SIZE),
+                        new Theme(get(THEME)),
+                        getBoolean(THEME_SYNC_OS),
+                        getBoolean(OPEN_LAST_EDITED),
+                        getBoolean(SHOW_ADVANCED_HINTS),
+                        getBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION),
+                        getBoolean(CONFIRM_DELETE),
+                        getStringList(SELECTED_SLR_CATALOGS));
+
+        EasyBind.listen(
+                workspacePreferences.languageProperty(),
+                (obs, oldValue, newValue) -> {
+                    put(LANGUAGE, newValue.getId());
+                    if (oldValue != newValue) {
+                        setLanguageDependentDefaultValues();
+                        Localization.setLanguage(newValue);
+                    }
+                });
+
+        EasyBind.listen(
+                workspacePreferences.shouldOverrideDefaultFontSizeProperty(),
+                (obs, oldValue, newValue) -> putBoolean(OVERRIDE_DEFAULT_FONT_SIZE, newValue));
+        EasyBind.listen(
+                workspacePreferences.mainFontSizeProperty(),
+                (obs, oldValue, newValue) -> putInt(MAIN_FONT_SIZE, newValue));
+        EasyBind.listen(
+                workspacePreferences.themeProperty(),
+                (obs, oldValue, newValue) -> put(THEME, newValue.getName()));
+        EasyBind.listen(
+                workspacePreferences.themeSyncOsProperty(),
+                (obs, oldValue, newValue) -> putBoolean(THEME_SYNC_OS, newValue));
+        EasyBind.listen(
+                workspacePreferences.openLastEditedProperty(),
+                (obs, oldValue, newValue) -> putBoolean(OPEN_LAST_EDITED, newValue));
+        EasyBind.listen(
+                workspacePreferences.showAdvancedHintsProperty(),
+                (obs, oldValue, newValue) -> putBoolean(SHOW_ADVANCED_HINTS, newValue));
+        EasyBind.listen(
+                workspacePreferences.warnAboutDuplicatesInInspectionProperty(),
+                (obs, oldValue, newValue) ->
+                        putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue));
+        EasyBind.listen(
+                workspacePreferences.confirmDeleteProperty(),
+                (obs, oldValue, newValue) -> putBoolean(CONFIRM_DELETE, newValue));
+        workspacePreferences
+                .getSelectedSlrCatalogs()
+                .addListener(
+                        (ListChangeListener<String>)
+                                change ->
+                                        putStringList(
+                                                SELECTED_SLR_CATALOGS,
+                                                workspacePreferences.getSelectedSlrCatalogs()));
         return workspacePreferences;
     }
 
@@ -655,15 +789,22 @@ public UnlinkedFilesDialogPreferences getUnlinkedFilesDialogPreferences() {
             return unlinkedFilesDialogPreferences;
         }
 
-        unlinkedFilesDialogPreferences = new UnlinkedFilesDialogPreferences(
-                get(UNLINKED_FILES_SELECTED_EXTENSION),
-                DateRange.parse(get(UNLINKED_FILES_SELECTED_DATE_RANGE)),
-                ExternalFileSorter.parse(get(UNLINKED_FILES_SELECTED_SORT))
-        );
-
-        EasyBind.listen(unlinkedFilesDialogPreferences.unlinkedFilesSelectedExtensionProperty(), (obs, oldValue, newValue) -> put(UNLINKED_FILES_SELECTED_EXTENSION, newValue));
-        EasyBind.listen(unlinkedFilesDialogPreferences.unlinkedFilesSelectedDateRangeProperty(), (obs, oldValue, newValue) -> put(UNLINKED_FILES_SELECTED_DATE_RANGE, newValue.name()));
-        EasyBind.listen(unlinkedFilesDialogPreferences.unlinkedFilesSelectedSortProperty(), (obs, oldValue, newValue) -> put(UNLINKED_FILES_SELECTED_SORT, newValue.name()));
+        unlinkedFilesDialogPreferences =
+                new UnlinkedFilesDialogPreferences(
+                        get(UNLINKED_FILES_SELECTED_EXTENSION),
+                        DateRange.parse(get(UNLINKED_FILES_SELECTED_DATE_RANGE)),
+                        ExternalFileSorter.parse(get(UNLINKED_FILES_SELECTED_SORT)));
+
+        EasyBind.listen(
+                unlinkedFilesDialogPreferences.unlinkedFilesSelectedExtensionProperty(),
+                (obs, oldValue, newValue) -> put(UNLINKED_FILES_SELECTED_EXTENSION, newValue));
+        EasyBind.listen(
+                unlinkedFilesDialogPreferences.unlinkedFilesSelectedDateRangeProperty(),
+                (obs, oldValue, newValue) ->
+                        put(UNLINKED_FILES_SELECTED_DATE_RANGE, newValue.name()));
+        EasyBind.listen(
+                unlinkedFilesDialogPreferences.unlinkedFilesSelectedSortProperty(),
+                (obs, oldValue, newValue) -> put(UNLINKED_FILES_SELECTED_SORT, newValue.name()));
 
         return unlinkedFilesDialogPreferences;
     }
@@ -675,16 +816,28 @@ public SidePanePreferences getSidePanePreferences() {
             return sidePanePreferences;
         }
 
-        sidePanePreferences = new SidePanePreferences(
-                getVisibleSidePanes(),
-                getSidePanePreferredPositions(),
-                getInt(SELECTED_FETCHER_INDEX));
-
-        sidePanePreferences.visiblePanes().addListener((InvalidationListener) listener ->
-                storeVisibleSidePanes(sidePanePreferences.visiblePanes()));
-        sidePanePreferences.getPreferredPositions().addListener((InvalidationListener) listener ->
-                storeSidePanePreferredPositions(sidePanePreferences.getPreferredPositions()));
-        EasyBind.listen(sidePanePreferences.webSearchFetcherSelectedProperty(), (obs, oldValue, newValue) -> putInt(SELECTED_FETCHER_INDEX, newValue));
+        sidePanePreferences =
+                new SidePanePreferences(
+                        getVisibleSidePanes(),
+                        getSidePanePreferredPositions(),
+                        getInt(SELECTED_FETCHER_INDEX));
+
+        sidePanePreferences
+                .visiblePanes()
+                .addListener(
+                        (InvalidationListener)
+                                listener ->
+                                        storeVisibleSidePanes(sidePanePreferences.visiblePanes()));
+        sidePanePreferences
+                .getPreferredPositions()
+                .addListener(
+                        (InvalidationListener)
+                                listener ->
+                                        storeSidePanePreferredPositions(
+                                                sidePanePreferences.getPreferredPositions()));
+        EasyBind.listen(
+                sidePanePreferences.webSearchFetcherSelectedProperty(),
+                (obs, oldValue, newValue) -> putInt(SELECTED_FETCHER_INDEX, newValue));
 
         return sidePanePreferences;
     }
@@ -732,17 +885,20 @@ private Map<SidePaneType, Integer> getSidePanePreferredPositions() {
 
     private void storeSidePanePreferredPositions(Map<SidePaneType, Integer> preferredPositions) {
         // Split the map into a pair of parallel String lists suitable for storage
-        List<String> names = preferredPositions.keySet().stream()
-                                               .map(Enum::toString)
-                                               .collect(Collectors.toList());
+        List<String> names =
+                preferredPositions.keySet().stream()
+                        .map(Enum::toString)
+                        .collect(Collectors.toList());
 
-        List<String> positions = preferredPositions.values().stream()
-                                                   .map(integer -> Integer.toString(integer))
-                                                   .collect(Collectors.toList());
+        List<String> positions =
+                preferredPositions.values().stream()
+                        .map(integer -> Integer.toString(integer))
+                        .collect(Collectors.toList());
 
         putStringList(SIDE_PANE_COMPONENT_NAMES, names);
         putStringList(SIDE_PANE_COMPONENT_PREFERRED_POSITIONS, positions);
     }
+
     // endregion
 
     @Override
@@ -751,35 +907,54 @@ public ExternalApplicationsPreferences getExternalApplicationsPreferences() {
             return externalApplicationsPreferences;
         }
 
-        externalApplicationsPreferences = new ExternalApplicationsPreferences(
-                get(EMAIL_SUBJECT),
-                getBoolean(OPEN_FOLDERS_OF_ATTACHED_FILES),
-                CitationCommandString.from(get(CITE_COMMAND)),
-                CitationCommandString.from((String) defaults.get(CITE_COMMAND)),
-                ExternalFileTypes.fromString(get(EXTERNAL_FILE_TYPES)),
-                !getBoolean(USE_DEFAULT_CONSOLE_APPLICATION), // mind the !
-                get(CONSOLE_COMMAND),
-                !getBoolean(USE_DEFAULT_FILE_BROWSER_APPLICATION), // mind the !
-                get(FILE_BROWSER_COMMAND),
-                get(KINDLE_EMAIL));
-
-        EasyBind.listen(externalApplicationsPreferences.eMailSubjectProperty(),
+        externalApplicationsPreferences =
+                new ExternalApplicationsPreferences(
+                        get(EMAIL_SUBJECT),
+                        getBoolean(OPEN_FOLDERS_OF_ATTACHED_FILES),
+                        CitationCommandString.from(get(CITE_COMMAND)),
+                        CitationCommandString.from((String) defaults.get(CITE_COMMAND)),
+                        ExternalFileTypes.fromString(get(EXTERNAL_FILE_TYPES)),
+                        !getBoolean(USE_DEFAULT_CONSOLE_APPLICATION), // mind the !
+                        get(CONSOLE_COMMAND),
+                        !getBoolean(USE_DEFAULT_FILE_BROWSER_APPLICATION), // mind the !
+                        get(FILE_BROWSER_COMMAND),
+                        get(KINDLE_EMAIL));
+
+        EasyBind.listen(
+                externalApplicationsPreferences.eMailSubjectProperty(),
                 (obs, oldValue, newValue) -> put(EMAIL_SUBJECT, newValue));
-        EasyBind.listen(externalApplicationsPreferences.autoOpenEmailAttachmentsFolderProperty(),
+        EasyBind.listen(
+                externalApplicationsPreferences.autoOpenEmailAttachmentsFolderProperty(),
                 (obs, oldValue, newValue) -> putBoolean(OPEN_FOLDERS_OF_ATTACHED_FILES, newValue));
-        EasyBind.listen(externalApplicationsPreferences.citeCommandProperty(),
+        EasyBind.listen(
+                externalApplicationsPreferences.citeCommandProperty(),
                 (obs, oldValue, newValue) -> put(CITE_COMMAND, newValue.toString()));
-        EasyBind.listen(externalApplicationsPreferences.useCustomTerminalProperty(),
-                (obs, oldValue, newValue) -> putBoolean(USE_DEFAULT_CONSOLE_APPLICATION, !newValue)); // mind the !
-        externalApplicationsPreferences.getExternalFileTypes().addListener((SetChangeListener<ExternalFileType>) c ->
-                put(EXTERNAL_FILE_TYPES, ExternalFileTypes.toStringList(externalApplicationsPreferences.getExternalFileTypes())));
-        EasyBind.listen(externalApplicationsPreferences.customTerminalCommandProperty(),
+        EasyBind.listen(
+                externalApplicationsPreferences.useCustomTerminalProperty(),
+                (obs, oldValue, newValue) ->
+                        putBoolean(USE_DEFAULT_CONSOLE_APPLICATION, !newValue)); // mind the !
+        externalApplicationsPreferences
+                .getExternalFileTypes()
+                .addListener(
+                        (SetChangeListener<ExternalFileType>)
+                                c ->
+                                        put(
+                                                EXTERNAL_FILE_TYPES,
+                                                ExternalFileTypes.toStringList(
+                                                        externalApplicationsPreferences
+                                                                .getExternalFileTypes())));
+        EasyBind.listen(
+                externalApplicationsPreferences.customTerminalCommandProperty(),
                 (obs, oldValue, newValue) -> put(CONSOLE_COMMAND, newValue));
-        EasyBind.listen(externalApplicationsPreferences.useCustomFileBrowserProperty(),
-                (obs, oldValue, newValue) -> putBoolean(USE_DEFAULT_FILE_BROWSER_APPLICATION, !newValue)); // mind the !
-        EasyBind.listen(externalApplicationsPreferences.customFileBrowserCommandProperty(),
+        EasyBind.listen(
+                externalApplicationsPreferences.useCustomFileBrowserProperty(),
+                (obs, oldValue, newValue) ->
+                        putBoolean(USE_DEFAULT_FILE_BROWSER_APPLICATION, !newValue)); // mind the !
+        EasyBind.listen(
+                externalApplicationsPreferences.customFileBrowserCommandProperty(),
                 (obs, oldValue, newValue) -> put(FILE_BROWSER_COMMAND, newValue));
-        EasyBind.listen(externalApplicationsPreferences.kindleEmailProperty(),
+        EasyBind.listen(
+                externalApplicationsPreferences.kindleEmailProperty(),
                 (obs, oldValue, newValue) -> put(KINDLE_EMAIL, newValue));
 
         return externalApplicationsPreferences;
@@ -790,23 +965,45 @@ public GroupsPreferences getGroupsPreferences() {
             return groupsPreferences;
         }
 
-        groupsPreferences = new GroupsPreferences(
-                getBoolean(GROUP_VIEW_INTERSECTION),
-                getBoolean(GROUP_VIEW_FILTER),
-                getBoolean(GROUP_VIEW_INVERT),
-                getBoolean(AUTO_ASSIGN_GROUP),
-                getBoolean(DISPLAY_GROUP_COUNT),
-                GroupHierarchyType.valueOf(get(DEFAULT_HIERARCHICAL_CONTEXT))
-        );
-
-        groupsPreferences.groupViewModeProperty().addListener((SetChangeListener<GroupViewMode>) change -> {
-            putBoolean(GROUP_VIEW_INTERSECTION, groupsPreferences.groupViewModeProperty().contains(GroupViewMode.INTERSECTION));
-            putBoolean(GROUP_VIEW_FILTER, groupsPreferences.groupViewModeProperty().contains(GroupViewMode.FILTER));
-            putBoolean(GROUP_VIEW_INVERT, groupsPreferences.groupViewModeProperty().contains(GroupViewMode.INVERT));
-        });
-        EasyBind.listen(groupsPreferences.autoAssignGroupProperty(), (obs, oldValue, newValue) -> putBoolean(AUTO_ASSIGN_GROUP, newValue));
-        EasyBind.listen(groupsPreferences.displayGroupCountProperty(), (obs, oldValue, newValue) -> putBoolean(DISPLAY_GROUP_COUNT, newValue));
-        EasyBind.listen(groupsPreferences.defaultHierarchicalContextProperty(), (obs, oldValue, newValue) -> put(DEFAULT_HIERARCHICAL_CONTEXT, newValue.name()));
+        groupsPreferences =
+                new GroupsPreferences(
+                        getBoolean(GROUP_VIEW_INTERSECTION),
+                        getBoolean(GROUP_VIEW_FILTER),
+                        getBoolean(GROUP_VIEW_INVERT),
+                        getBoolean(AUTO_ASSIGN_GROUP),
+                        getBoolean(DISPLAY_GROUP_COUNT),
+                        GroupHierarchyType.valueOf(get(DEFAULT_HIERARCHICAL_CONTEXT)));
+
+        groupsPreferences
+                .groupViewModeProperty()
+                .addListener(
+                        (SetChangeListener<GroupViewMode>)
+                                change -> {
+                                    putBoolean(
+                                            GROUP_VIEW_INTERSECTION,
+                                            groupsPreferences
+                                                    .groupViewModeProperty()
+                                                    .contains(GroupViewMode.INTERSECTION));
+                                    putBoolean(
+                                            GROUP_VIEW_FILTER,
+                                            groupsPreferences
+                                                    .groupViewModeProperty()
+                                                    .contains(GroupViewMode.FILTER));
+                                    putBoolean(
+                                            GROUP_VIEW_INVERT,
+                                            groupsPreferences
+                                                    .groupViewModeProperty()
+                                                    .contains(GroupViewMode.INVERT));
+                                });
+        EasyBind.listen(
+                groupsPreferences.autoAssignGroupProperty(),
+                (obs, oldValue, newValue) -> putBoolean(AUTO_ASSIGN_GROUP, newValue));
+        EasyBind.listen(
+                groupsPreferences.displayGroupCountProperty(),
+                (obs, oldValue, newValue) -> putBoolean(DISPLAY_GROUP_COUNT, newValue));
+        EasyBind.listen(
+                groupsPreferences.defaultHierarchicalContextProperty(),
+                (obs, oldValue, newValue) -> put(DEFAULT_HIERARCHICAL_CONTEXT, newValue.name()));
 
         return groupsPreferences;
     }
@@ -818,7 +1015,9 @@ public SpecialFieldsPreferences getSpecialFieldsPreferences() {
 
         specialFieldsPreferences = new SpecialFieldsPreferences(getBoolean(SPECIALFIELDSENABLED));
 
-        EasyBind.listen(specialFieldsPreferences.specialFieldsEnabledProperty(), (obs, oldValue, newValue) -> putBoolean(SPECIALFIELDSENABLED, newValue));
+        EasyBind.listen(
+                specialFieldsPreferences.specialFieldsEnabledProperty(),
+                (obs, oldValue, newValue) -> putBoolean(SPECIALFIELDSENABLED, newValue));
 
         return specialFieldsPreferences;
     }
@@ -832,32 +1031,51 @@ public PreviewPreferences getPreviewPreferences() {
         String style = get(PREVIEW_STYLE);
         List<PreviewLayout> layouts = getPreviewLayouts(style);
 
-        this.previewPreferences = new PreviewPreferences(
-                layouts,
-                getPreviewCyclePosition(layouts),
-                new TextBasedPreviewLayout(
-                        style,
-                        getLayoutFormatterPreferences(),
-                        Injector.instantiateModelOrService(JournalAbbreviationRepository.class)),
-                (String) defaults.get(PREVIEW_STYLE),
-                getBoolean(PREVIEW_AS_TAB),
-                getBoolean(PREVIEW_IN_ENTRY_TABLE_TOOLTIP),
-                getStringList(PREVIEW_BST_LAYOUT_PATHS).stream()
-                                                       .map(Path::of)
-                                                       .collect(Collectors.toList())
-        );
-
-        previewPreferences.getLayoutCycle().addListener((InvalidationListener) c -> storePreviewLayouts(previewPreferences.getLayoutCycle()));
-        EasyBind.listen(previewPreferences.layoutCyclePositionProperty(), (obs, oldValue, newValue) -> putInt(CYCLE_PREVIEW_POS, newValue));
-        EasyBind.listen(previewPreferences.customPreviewLayoutProperty(), (obs, oldValue, newValue) -> put(PREVIEW_STYLE, newValue.getText()));
-        EasyBind.listen(previewPreferences.showPreviewAsExtraTabProperty(), (obs, oldValue, newValue) -> putBoolean(PREVIEW_AS_TAB, newValue));
-        EasyBind.listen(previewPreferences.showPreviewEntryTableTooltip(), (obs, oldValue, newValue) -> putBoolean(PREVIEW_IN_ENTRY_TABLE_TOOLTIP, newValue));
-        previewPreferences.getBstPreviewLayoutPaths().addListener((InvalidationListener) c -> storeBstPaths(previewPreferences.getBstPreviewLayoutPaths()));
+        this.previewPreferences =
+                new PreviewPreferences(
+                        layouts,
+                        getPreviewCyclePosition(layouts),
+                        new TextBasedPreviewLayout(
+                                style,
+                                getLayoutFormatterPreferences(),
+                                Injector.instantiateModelOrService(
+                                        JournalAbbreviationRepository.class)),
+                        (String) defaults.get(PREVIEW_STYLE),
+                        getBoolean(PREVIEW_AS_TAB),
+                        getBoolean(PREVIEW_IN_ENTRY_TABLE_TOOLTIP),
+                        getStringList(PREVIEW_BST_LAYOUT_PATHS).stream()
+                                .map(Path::of)
+                                .collect(Collectors.toList()));
+
+        previewPreferences
+                .getLayoutCycle()
+                .addListener(
+                        (InvalidationListener)
+                                c -> storePreviewLayouts(previewPreferences.getLayoutCycle()));
+        EasyBind.listen(
+                previewPreferences.layoutCyclePositionProperty(),
+                (obs, oldValue, newValue) -> putInt(CYCLE_PREVIEW_POS, newValue));
+        EasyBind.listen(
+                previewPreferences.customPreviewLayoutProperty(),
+                (obs, oldValue, newValue) -> put(PREVIEW_STYLE, newValue.getText()));
+        EasyBind.listen(
+                previewPreferences.showPreviewAsExtraTabProperty(),
+                (obs, oldValue, newValue) -> putBoolean(PREVIEW_AS_TAB, newValue));
+        EasyBind.listen(
+                previewPreferences.showPreviewEntryTableTooltip(),
+                (obs, oldValue, newValue) -> putBoolean(PREVIEW_IN_ENTRY_TABLE_TOOLTIP, newValue));
+        previewPreferences
+                .getBstPreviewLayoutPaths()
+                .addListener(
+                        (InvalidationListener)
+                                c -> storeBstPaths(previewPreferences.getBstPreviewLayoutPaths()));
         return this.previewPreferences;
     }
 
     private void storeBstPaths(List<Path> bstPaths) {
-        putStringList(PREVIEW_BST_LAYOUT_PATHS, bstPaths.stream().map(Path::toAbsolutePath).map(Path::toString).toList());
+        putStringList(
+                PREVIEW_BST_LAYOUT_PATHS,
+                bstPaths.stream().map(Path::toAbsolutePath).map(Path::toString).toList());
     }
 
     private List<PreviewLayout> getPreviewLayouts(String style) {
@@ -869,39 +1087,54 @@ private List<PreviewLayout> getPreviewLayouts(String style) {
         }
 
         return cycle.stream()
-                    .map(layout -> {
-                        if (CitationStyle.isCitationStyleFile(layout)) {
-                            BibEntryTypesManager entryTypesManager = Injector.instantiateModelOrService(BibEntryTypesManager.class);
-                            return CitationStyle.createCitationStyleFromFile(layout)
-                                                .map(file -> (PreviewLayout) new CitationStylePreviewLayout(file, entryTypesManager))
-                                                .orElse(null);
-                        }
-                        if (BstPreviewLayout.isBstStyleFile(layout)) {
-                            return getStringList(PREVIEW_BST_LAYOUT_PATHS).stream()
-                                                                          .filter(path -> path.endsWith(layout)).map(Path::of)
-                                                                          .map(BstPreviewLayout::new)
-                                                                          .findFirst()
-                                                                          .orElse(null);
-                        } else {
-                            return new TextBasedPreviewLayout(
-                                    style,
-                                    getLayoutFormatterPreferences(),
-                                    Injector.instantiateModelOrService(JournalAbbreviationRepository.class));
-                        }
-                    }).filter(Objects::nonNull)
-                    .collect(Collectors.toList());
+                .map(
+                        layout -> {
+                            if (CitationStyle.isCitationStyleFile(layout)) {
+                                BibEntryTypesManager entryTypesManager =
+                                        Injector.instantiateModelOrService(
+                                                BibEntryTypesManager.class);
+                                return CitationStyle.createCitationStyleFromFile(layout)
+                                        .map(
+                                                file ->
+                                                        (PreviewLayout)
+                                                                new CitationStylePreviewLayout(
+                                                                        file, entryTypesManager))
+                                        .orElse(null);
+                            }
+                            if (BstPreviewLayout.isBstStyleFile(layout)) {
+                                return getStringList(PREVIEW_BST_LAYOUT_PATHS).stream()
+                                        .filter(path -> path.endsWith(layout))
+                                        .map(Path::of)
+                                        .map(BstPreviewLayout::new)
+                                        .findFirst()
+                                        .orElse(null);
+                            } else {
+                                return new TextBasedPreviewLayout(
+                                        style,
+                                        getLayoutFormatterPreferences(),
+                                        Injector.instantiateModelOrService(
+                                                JournalAbbreviationRepository.class));
+                            }
+                        })
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
     }
 
     private void storePreviewLayouts(ObservableList<PreviewLayout> previewCycle) {
-        putStringList(CYCLE_PREVIEW, previewCycle.stream()
-                                                 .map(layout -> {
-                                                     if (layout instanceof CitationStylePreviewLayout citationStyleLayout) {
-                                                         return citationStyleLayout.getFilePath();
-                                                     } else {
-                                                         return layout.getDisplayName();
-                                                     }
-                                                 }).collect(Collectors.toList())
-        );
+        putStringList(
+                CYCLE_PREVIEW,
+                previewCycle.stream()
+                        .map(
+                                layout -> {
+                                    if (layout
+                                            instanceof
+                                            CitationStylePreviewLayout citationStyleLayout) {
+                                        return citationStyleLayout.getFilePath();
+                                    } else {
+                                        return layout.getDisplayName();
+                                    }
+                                })
+                        .collect(Collectors.toList()));
     }
 
     private int getPreviewCyclePosition(List<PreviewLayout> layouts) {
@@ -912,6 +1145,7 @@ private int getPreviewCyclePosition(List<PreviewLayout> layouts) {
             return 0; // fallback if stored position is no longer valid
         }
     }
+
     // endregion
 
     // region PushToApplicationPreferences
@@ -922,52 +1156,57 @@ public PushToApplicationPreferences getPushToApplicationPreferences() {
         }
 
         Map<String, String> applicationCommands = new HashMap<>();
-        // getEmptyIsDefault is used to ensure that an installation of a tool leads to the new path (instead of leaving the empty one)
-        // Reason: empty string is returned by org.jabref.gui.desktop.os.Windows.detectProgramPath if program is not found. That path is stored in the preferences.
+        // getEmptyIsDefault is used to ensure that an installation of a tool leads to the new path
+        // (instead of leaving the empty one)
+        // Reason: empty string is returned by org.jabref.gui.desktop.os.Windows.detectProgramPath
+        // if program is not found. That path is stored in the preferences.
         applicationCommands.put(PushToApplications.EMACS, getEmptyIsDefault(PUSH_EMACS_PATH));
         applicationCommands.put(PushToApplications.LYX, getEmptyIsDefault(PUSH_LYXPIPE));
         applicationCommands.put(PushToApplications.TEXMAKER, getEmptyIsDefault(PUSH_TEXMAKER_PATH));
-        applicationCommands.put(PushToApplications.TEXSTUDIO, getEmptyIsDefault(PUSH_TEXSTUDIO_PATH));
+        applicationCommands.put(
+                PushToApplications.TEXSTUDIO, getEmptyIsDefault(PUSH_TEXSTUDIO_PATH));
         applicationCommands.put(PushToApplications.TEXWORKS, getEmptyIsDefault(PUSH_TEXWORKS_PATH));
         applicationCommands.put(PushToApplications.VIM, getEmptyIsDefault(PUSH_VIM));
         applicationCommands.put(PushToApplications.WIN_EDT, getEmptyIsDefault(PUSH_WINEDT_PATH));
-        applicationCommands.put(PushToApplications.SUBLIME_TEXT, getEmptyIsDefault(PUSH_SUBLIME_TEXT_PATH));
-
-        pushToApplicationPreferences = new PushToApplicationPreferences(
-                get(PUSH_TO_APPLICATION),
-                applicationCommands,
-                get(PUSH_EMACS_ADDITIONAL_PARAMETERS),
-                get(PUSH_VIM_SERVER)
-        );
-
-        EasyBind.listen(pushToApplicationPreferences.activeApplicationNameProperty(), (obs, oldValue, newValue) -> put(PUSH_TO_APPLICATION, newValue));
-        pushToApplicationPreferences.getCommandPaths().addListener((obs, oldValue, newValue) -> storePushToApplicationPath(newValue));
-        EasyBind.listen(pushToApplicationPreferences.emacsArgumentsProperty(), (obs, oldValue, newValue) -> put(PUSH_EMACS_ADDITIONAL_PARAMETERS, newValue));
-        EasyBind.listen(pushToApplicationPreferences.vimServerProperty(), (obs, oldValue, newValue) -> put(PUSH_VIM_SERVER, newValue));
+        applicationCommands.put(
+                PushToApplications.SUBLIME_TEXT, getEmptyIsDefault(PUSH_SUBLIME_TEXT_PATH));
+
+        pushToApplicationPreferences =
+                new PushToApplicationPreferences(
+                        get(PUSH_TO_APPLICATION),
+                        applicationCommands,
+                        get(PUSH_EMACS_ADDITIONAL_PARAMETERS),
+                        get(PUSH_VIM_SERVER));
+
+        EasyBind.listen(
+                pushToApplicationPreferences.activeApplicationNameProperty(),
+                (obs, oldValue, newValue) -> put(PUSH_TO_APPLICATION, newValue));
+        pushToApplicationPreferences
+                .getCommandPaths()
+                .addListener((obs, oldValue, newValue) -> storePushToApplicationPath(newValue));
+        EasyBind.listen(
+                pushToApplicationPreferences.emacsArgumentsProperty(),
+                (obs, oldValue, newValue) -> put(PUSH_EMACS_ADDITIONAL_PARAMETERS, newValue));
+        EasyBind.listen(
+                pushToApplicationPreferences.vimServerProperty(),
+                (obs, oldValue, newValue) -> put(PUSH_VIM_SERVER, newValue));
         return pushToApplicationPreferences;
     }
 
     private void storePushToApplicationPath(Map<String, String> commandPair) {
-        commandPair.forEach((key, value) -> {
-            switch (key) {
-                case PushToApplications.EMACS ->
-                        put(PUSH_EMACS_PATH, value);
-                case PushToApplications.LYX ->
-                        put(PUSH_LYXPIPE, value);
-                case PushToApplications.TEXMAKER ->
-                        put(PUSH_TEXMAKER_PATH, value);
-                case PushToApplications.TEXSTUDIO ->
-                        put(PUSH_TEXSTUDIO_PATH, value);
-                case PushToApplications.TEXWORKS ->
-                        put(PUSH_TEXWORKS_PATH, value);
-                case PushToApplications.VIM ->
-                        put(PUSH_VIM, value);
-                case PushToApplications.WIN_EDT ->
-                        put(PUSH_WINEDT_PATH, value);
-                case PushToApplications.SUBLIME_TEXT ->
-                        put(PUSH_SUBLIME_TEXT_PATH, value);
-            }
-        });
+        commandPair.forEach(
+                (key, value) -> {
+                    switch (key) {
+                        case PushToApplications.EMACS -> put(PUSH_EMACS_PATH, value);
+                        case PushToApplications.LYX -> put(PUSH_LYXPIPE, value);
+                        case PushToApplications.TEXMAKER -> put(PUSH_TEXMAKER_PATH, value);
+                        case PushToApplications.TEXSTUDIO -> put(PUSH_TEXSTUDIO_PATH, value);
+                        case PushToApplications.TEXWORKS -> put(PUSH_TEXWORKS_PATH, value);
+                        case PushToApplications.VIM -> put(PUSH_VIM, value);
+                        case PushToApplications.WIN_EDT -> put(PUSH_WINEDT_PATH, value);
+                        case PushToApplications.SUBLIME_TEXT -> put(PUSH_SUBLIME_TEXT_PATH, value);
+                    }
+                });
     }
 
     // endregion
@@ -980,25 +1219,36 @@ public NameDisplayPreferences getNameDisplayPreferences() {
             return nameDisplayPreferences;
         }
 
-        nameDisplayPreferences = new NameDisplayPreferences(
-                getNameDisplayStyle(),
-                getNameAbbreviationStyle());
-
-        EasyBind.listen(nameDisplayPreferences.displayStyleProperty(), (obs, oldValue, newValue) -> {
-            putBoolean(NAMES_NATBIB, newValue == NameDisplayPreferences.DisplayStyle.NATBIB);
-            putBoolean(NAMES_AS_IS, newValue == NameDisplayPreferences.DisplayStyle.AS_IS);
-            putBoolean(NAMES_FIRST_LAST, newValue == NameDisplayPreferences.DisplayStyle.FIRSTNAME_LASTNAME);
-        });
-        EasyBind.listen(nameDisplayPreferences.abbreviationStyleProperty(), (obs, oldValue, newValue) -> {
-            putBoolean(ABBR_AUTHOR_NAMES, newValue == NameDisplayPreferences.AbbreviationStyle.FULL);
-            putBoolean(NAMES_LAST_ONLY, newValue == NameDisplayPreferences.AbbreviationStyle.LASTNAME_ONLY);
-        });
+        nameDisplayPreferences =
+                new NameDisplayPreferences(getNameDisplayStyle(), getNameAbbreviationStyle());
+
+        EasyBind.listen(
+                nameDisplayPreferences.displayStyleProperty(),
+                (obs, oldValue, newValue) -> {
+                    putBoolean(
+                            NAMES_NATBIB, newValue == NameDisplayPreferences.DisplayStyle.NATBIB);
+                    putBoolean(NAMES_AS_IS, newValue == NameDisplayPreferences.DisplayStyle.AS_IS);
+                    putBoolean(
+                            NAMES_FIRST_LAST,
+                            newValue == NameDisplayPreferences.DisplayStyle.FIRSTNAME_LASTNAME);
+                });
+        EasyBind.listen(
+                nameDisplayPreferences.abbreviationStyleProperty(),
+                (obs, oldValue, newValue) -> {
+                    putBoolean(
+                            ABBR_AUTHOR_NAMES,
+                            newValue == NameDisplayPreferences.AbbreviationStyle.FULL);
+                    putBoolean(
+                            NAMES_LAST_ONLY,
+                            newValue == NameDisplayPreferences.AbbreviationStyle.LASTNAME_ONLY);
+                });
 
         return nameDisplayPreferences;
     }
 
     private NameDisplayPreferences.AbbreviationStyle getNameAbbreviationStyle() {
-        NameDisplayPreferences.AbbreviationStyle abbreviationStyle = NameDisplayPreferences.AbbreviationStyle.NONE; // default
+        NameDisplayPreferences.AbbreviationStyle abbreviationStyle =
+                NameDisplayPreferences.AbbreviationStyle.NONE; // default
         if (getBoolean(ABBR_AUTHOR_NAMES)) {
             abbreviationStyle = NameDisplayPreferences.AbbreviationStyle.FULL;
         } else if (getBoolean(NAMES_LAST_ONLY)) {
@@ -1008,7 +1258,8 @@ private NameDisplayPreferences.AbbreviationStyle getNameAbbreviationStyle() {
     }
 
     private NameDisplayPreferences.DisplayStyle getNameDisplayStyle() {
-        NameDisplayPreferences.DisplayStyle displayStyle = NameDisplayPreferences.DisplayStyle.LASTNAME_FIRSTNAME; // default
+        NameDisplayPreferences.DisplayStyle displayStyle =
+                NameDisplayPreferences.DisplayStyle.LASTNAME_FIRSTNAME; // default
         if (getBoolean(NAMES_NATBIB)) {
             displayStyle = NameDisplayPreferences.DisplayStyle.NATBIB;
         } else if (getBoolean(NAMES_AS_IS)) {
@@ -1028,14 +1279,17 @@ public MainTablePreferences getMainTablePreferences() {
             return mainTablePreferences;
         }
 
-        mainTablePreferences = new MainTablePreferences(
-                getMainTableColumnPreferences(),
-                getBoolean(AUTO_RESIZE_MODE),
-                getBoolean(EXTRA_FILE_COLUMNS));
+        mainTablePreferences =
+                new MainTablePreferences(
+                        getMainTableColumnPreferences(),
+                        getBoolean(AUTO_RESIZE_MODE),
+                        getBoolean(EXTRA_FILE_COLUMNS));
 
-        EasyBind.listen(mainTablePreferences.resizeColumnsToFitProperty(),
+        EasyBind.listen(
+                mainTablePreferences.resizeColumnsToFitProperty(),
                 (obs, oldValue, newValue) -> putBoolean(AUTO_RESIZE_MODE, newValue));
-        EasyBind.listen(mainTablePreferences.extraFileColumnsEnabledProperty(),
+        EasyBind.listen(
+                mainTablePreferences.extraFileColumnsEnabledProperty(),
                 (obs, oldValue, newValue) -> putBoolean(EXTRA_FILE_COLUMNS, newValue));
 
         return mainTablePreferences;
@@ -1046,17 +1300,41 @@ public ColumnPreferences getMainTableColumnPreferences() {
             return mainTableColumnPreferences;
         }
 
-        List<MainTableColumnModel> columns = getColumns(COLUMN_NAMES, COLUMN_WIDTHS, COLUMN_SORT_TYPES, ColumnPreferences.DEFAULT_COLUMN_WIDTH);
+        List<MainTableColumnModel> columns =
+                getColumns(
+                        COLUMN_NAMES,
+                        COLUMN_WIDTHS,
+                        COLUMN_SORT_TYPES,
+                        ColumnPreferences.DEFAULT_COLUMN_WIDTH);
         List<MainTableColumnModel> columnSortOrder = getColumnSortOrder(COLUMN_SORT_ORDER, columns);
         mainTableColumnPreferences = new ColumnPreferences(columns, columnSortOrder);
 
-        mainTableColumnPreferences.getColumns().addListener((InvalidationListener) change -> {
-            putStringList(COLUMN_NAMES, getColumnNamesAsStringList(mainTableColumnPreferences));
-            putStringList(COLUMN_WIDTHS, getColumnWidthsAsStringList(mainTableColumnPreferences));
-            putStringList(COLUMN_SORT_TYPES, getColumnSortTypesAsStringList(mainTableColumnPreferences));
-        });
-        mainTableColumnPreferences.getColumnSortOrder().addListener((InvalidationListener) change ->
-                putStringList(COLUMN_SORT_ORDER, getColumnSortOrderAsStringList(mainTableColumnPreferences)));
+        mainTableColumnPreferences
+                .getColumns()
+                .addListener(
+                        (InvalidationListener)
+                                change -> {
+                                    putStringList(
+                                            COLUMN_NAMES,
+                                            getColumnNamesAsStringList(mainTableColumnPreferences));
+                                    putStringList(
+                                            COLUMN_WIDTHS,
+                                            getColumnWidthsAsStringList(
+                                                    mainTableColumnPreferences));
+                                    putStringList(
+                                            COLUMN_SORT_TYPES,
+                                            getColumnSortTypesAsStringList(
+                                                    mainTableColumnPreferences));
+                                });
+        mainTableColumnPreferences
+                .getColumnSortOrder()
+                .addListener(
+                        (InvalidationListener)
+                                change ->
+                                        putStringList(
+                                                COLUMN_SORT_ORDER,
+                                                getColumnSortOrderAsStringList(
+                                                        mainTableColumnPreferences)));
 
         return mainTableColumnPreferences;
     }
@@ -1066,40 +1344,72 @@ public ColumnPreferences getSearchDialogColumnPreferences() {
             return searchDialogColumnPreferences;
         }
 
-        List<MainTableColumnModel> columns = getColumns(COLUMN_NAMES, SEARCH_DIALOG_COLUMN_WIDTHS, SEARCH_DIALOG_COLUMN_SORT_TYPES, ColumnPreferences.DEFAULT_COLUMN_WIDTH);
-        List<MainTableColumnModel> columnSortOrder = getColumnSortOrder(SEARCH_DIALOG_COLUMN_SORT_ORDER, columns);
+        List<MainTableColumnModel> columns =
+                getColumns(
+                        COLUMN_NAMES,
+                        SEARCH_DIALOG_COLUMN_WIDTHS,
+                        SEARCH_DIALOG_COLUMN_SORT_TYPES,
+                        ColumnPreferences.DEFAULT_COLUMN_WIDTH);
+        List<MainTableColumnModel> columnSortOrder =
+                getColumnSortOrder(SEARCH_DIALOG_COLUMN_SORT_ORDER, columns);
         searchDialogColumnPreferences = new ColumnPreferences(columns, columnSortOrder);
 
-        searchDialogColumnPreferences.getColumns().addListener((InvalidationListener) change -> {
-            // MainTable and SearchResultTable use the same set of columnNames
-            // putStringList(SEARCH_DIALOG_COLUMN_NAMES, getColumnNamesAsStringList(columnPreferences));
-            putStringList(SEARCH_DIALOG_COLUMN_WIDTHS, getColumnWidthsAsStringList(searchDialogColumnPreferences));
-            putStringList(SEARCH_DIALOG_COLUMN_SORT_TYPES, getColumnSortTypesAsStringList(searchDialogColumnPreferences));
-        });
-        searchDialogColumnPreferences.getColumnSortOrder().addListener((InvalidationListener) change ->
-                putStringList(SEARCH_DIALOG_COLUMN_SORT_ORDER, getColumnSortOrderAsStringList(searchDialogColumnPreferences)));
+        searchDialogColumnPreferences
+                .getColumns()
+                .addListener(
+                        (InvalidationListener)
+                                change -> {
+                                    // MainTable and SearchResultTable use the same set of
+                                    // columnNames
+                                    // putStringList(SEARCH_DIALOG_COLUMN_NAMES,
+                                    // getColumnNamesAsStringList(columnPreferences));
+                                    putStringList(
+                                            SEARCH_DIALOG_COLUMN_WIDTHS,
+                                            getColumnWidthsAsStringList(
+                                                    searchDialogColumnPreferences));
+                                    putStringList(
+                                            SEARCH_DIALOG_COLUMN_SORT_TYPES,
+                                            getColumnSortTypesAsStringList(
+                                                    searchDialogColumnPreferences));
+                                });
+        searchDialogColumnPreferences
+                .getColumnSortOrder()
+                .addListener(
+                        (InvalidationListener)
+                                change ->
+                                        putStringList(
+                                                SEARCH_DIALOG_COLUMN_SORT_ORDER,
+                                                getColumnSortOrderAsStringList(
+                                                        searchDialogColumnPreferences)));
 
         return searchDialogColumnPreferences;
     }
 
     // --- Generic column handling ---
     @SuppressWarnings("SameParameterValue")
-    private List<MainTableColumnModel> getColumns(String columnNamesList, String columnWidthList, String sortTypeList, double defaultWidth) {
+    private List<MainTableColumnModel> getColumns(
+            String columnNamesList,
+            String columnWidthList,
+            String sortTypeList,
+            double defaultWidth) {
         List<String> columnNames = getStringList(columnNamesList);
-        List<Double> columnWidths = getStringList(columnWidthList)
-                .stream()
-                .map(string -> {
-                    try {
-                        return Double.parseDouble(string);
-                    } catch (NumberFormatException e) {
-                        LOGGER.error("Exception while parsing column widths. Choosing default.", e);
-                        return defaultWidth;
-                    }
-                }).toList();
-
-        List<TableColumn.SortType> columnSortTypes = getStringList(sortTypeList)
-                .stream()
-                .map(TableColumn.SortType::valueOf).toList();
+        List<Double> columnWidths =
+                getStringList(columnWidthList).stream()
+                        .map(
+                                string -> {
+                                    try {
+                                        return Double.parseDouble(string);
+                                    } catch (NumberFormatException e) {
+                                        LOGGER.error(
+                                                "Exception while parsing column widths. Choosing default.",
+                                                e);
+                                        return defaultWidth;
+                                    }
+                                })
+                        .toList();
+
+        List<TableColumn.SortType> columnSortTypes =
+                getStringList(sortTypeList).stream().map(TableColumn.SortType::valueOf).toList();
 
         List<MainTableColumnModel> columns = new ArrayList<>();
         for (int i = 0; i < columnNames.size(); i++) {
@@ -1118,38 +1428,44 @@ private List<MainTableColumnModel> getColumns(String columnNamesList, String col
         return columns;
     }
 
-    private List<MainTableColumnModel> getColumnSortOrder(String sortOrderList, List<MainTableColumnModel> tableColumns) {
+    private List<MainTableColumnModel> getColumnSortOrder(
+            String sortOrderList, List<MainTableColumnModel> tableColumns) {
         List<MainTableColumnModel> columnsOrdered = new ArrayList<>();
-        getStringList(sortOrderList).forEach(columnName -> tableColumns.stream().filter(column -> column.getName().equals(columnName))
-                                                                       .findFirst()
-                                                                       .ifPresent(columnsOrdered::add));
+        getStringList(sortOrderList)
+                .forEach(
+                        columnName ->
+                                tableColumns.stream()
+                                        .filter(column -> column.getName().equals(columnName))
+                                        .findFirst()
+                                        .ifPresent(columnsOrdered::add));
 
         return columnsOrdered;
     }
 
     private static List<String> getColumnNamesAsStringList(ColumnPreferences columnPreferences) {
-        return columnPreferences.getColumns().stream()
-                                .map(MainTableColumnModel::getName)
-                                .toList();
+        return columnPreferences.getColumns().stream().map(MainTableColumnModel::getName).toList();
     }
 
     private static List<String> getColumnWidthsAsStringList(ColumnPreferences columnPreferences) {
         return columnPreferences.getColumns().stream()
-                                .map(column -> column.widthProperty().getValue().toString())
-                                .toList();
+                .map(column -> column.widthProperty().getValue().toString())
+                .toList();
     }
 
-    private static List<String> getColumnSortTypesAsStringList(ColumnPreferences columnPreferences) {
+    private static List<String> getColumnSortTypesAsStringList(
+            ColumnPreferences columnPreferences) {
         return columnPreferences.getColumns().stream()
-                                .map(column -> column.sortTypeProperty().getValue().toString())
-                                .toList();
+                .map(column -> column.sortTypeProperty().getValue().toString())
+                .toList();
     }
 
-    private static List<String> getColumnSortOrderAsStringList(ColumnPreferences columnPreferences) {
+    private static List<String> getColumnSortOrderAsStringList(
+            ColumnPreferences columnPreferences) {
         return columnPreferences.getColumnSortOrder().stream()
-                                .map(MainTableColumnModel::getName)
-                                .collect(Collectors.toList());
+                .map(MainTableColumnModel::getName)
+                .collect(Collectors.toList());
     }
+
     // endregion
 
     /**
@@ -1165,18 +1481,18 @@ private SelfContainedSaveOrder getSelfContainedTableSaveOrder() {
     @Override
     public SelfContainedSaveConfiguration getSelfContainedExportConfiguration() {
         SaveOrder exportSaveOrder = getExportSaveOrder();
-        SelfContainedSaveOrder saveOrder = switch (exportSaveOrder.getOrderType()) {
-            case TABLE ->
-                    this.getSelfContainedTableSaveOrder();
-            case SPECIFIED ->
-                    SelfContainedSaveOrder.of(exportSaveOrder);
-            case ORIGINAL ->
-                    SaveOrder.getDefaultSaveOrder();
-        };
+        SelfContainedSaveOrder saveOrder =
+                switch (exportSaveOrder.getOrderType()) {
+                    case TABLE -> this.getSelfContainedTableSaveOrder();
+                    case SPECIFIED -> SelfContainedSaveOrder.of(exportSaveOrder);
+                    case ORIGINAL -> SaveOrder.getDefaultSaveOrder();
+                };
 
         return new SelfContainedSaveConfiguration(
-                saveOrder, false, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, getLibraryPreferences()
-                .shouldAlwaysReformatOnSave());
+                saveOrder,
+                false,
+                BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
+                getLibraryPreferences().shouldAlwaysReformatOnSave());
     }
 
     @Override
@@ -1185,12 +1501,15 @@ public KeyBindingRepository getKeyBindingRepository() {
             return keyBindingRepository;
         }
 
-        keyBindingRepository = new KeyBindingRepository(getStringList(BIND_NAMES), getStringList(BINDINGS));
+        keyBindingRepository =
+                new KeyBindingRepository(getStringList(BIND_NAMES), getStringList(BINDINGS));
 
-        EasyBind.listen(keyBindingRepository.getBindingsProperty(), (obs, oldValue, newValue) -> {
-            putStringList(BIND_NAMES, keyBindingRepository.getBindNames());
-            putStringList(BINDINGS, keyBindingRepository.getBindings());
-        });
+        EasyBind.listen(
+                keyBindingRepository.getBindingsProperty(),
+                (obs, oldValue, newValue) -> {
+                    putStringList(BIND_NAMES, keyBindingRepository.getBindNames());
+                    putStringList(BINDINGS, keyBindingRepository.getBindings());
+                });
 
         return keyBindingRepository;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
index bb246d0e18f8..ba5bf2ee5f30 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -1,7 +1,9 @@
 package org.jabref.gui.preferences;
 
-import java.util.Locale;
-import java.util.Optional;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import jakarta.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
@@ -10,6 +12,7 @@
 import javafx.scene.control.ToggleButton;
 import javafx.scene.input.KeyCode;
 
+import org.controlsfx.control.textfield.CustomTextField;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
@@ -19,10 +22,8 @@
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
-import org.controlsfx.control.textfield.CustomTextField;
+import java.util.Locale;
+import java.util.Optional;
 
 /**
  * Preferences dialog. Contains a TabbedPane, and tabs will be defined in separate classes. Tabs MUST implement the
@@ -48,18 +49,18 @@ public PreferencesDialogView(Class<? extends PreferencesTab> preferencesTabToSel
         this.setTitle(Localization.lang("JabRef preferences"));
         this.preferencesTabToSelectClass = preferencesTabToSelectClass;
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
-        ControlHelper.setAction(saveButton, getDialogPane(), event -> savePreferencesAndCloseDialog());
+        ControlHelper.setAction(
+                saveButton, getDialogPane(), event -> savePreferencesAndCloseDialog());
 
         // Stop the default button from firing when the user hits enter within the search box
-        searchBox.setOnKeyPressed(event -> {
-            if (event.getCode() == KeyCode.ENTER) {
-                event.consume();
-            }
-        });
+        searchBox.setOnKeyPressed(
+                event -> {
+                    if (event.getCode() == KeyCode.ENTER) {
+                        event.consume();
+                    }
+                });
 
         themeManager.updateFontStyle(getDialogPane().getScene());
     }
@@ -75,38 +76,54 @@ private void initialize() {
         preferenceTabList.itemsProperty().setValue(viewModel.getPreferenceTabs());
 
         // The list view does not respect the listener for the dialog and needs its own
-        preferenceTabList.setOnKeyReleased(key -> {
-            if (preferences.getKeyBindingRepository().checkKeyCombinationEquality(KeyBinding.CLOSE, key)) {
-                this.closeDialog();
-            }
-        });
-
-        PreferencesSearchHandler searchHandler = new PreferencesSearchHandler(viewModel.getPreferenceTabs());
-        preferenceTabList.itemsProperty().bindBidirectional(searchHandler.filteredPreferenceTabsProperty());
-        searchBox.textProperty().addListener((observable, previousText, newText) -> {
-            searchHandler.filterTabs(newText.toLowerCase(Locale.ROOT));
-            preferenceTabList.getSelectionModel().clearSelection();
-            preferenceTabList.getSelectionModel().selectFirst();
-        });
+        preferenceTabList.setOnKeyReleased(
+                key -> {
+                    if (preferences
+                            .getKeyBindingRepository()
+                            .checkKeyCombinationEquality(KeyBinding.CLOSE, key)) {
+                        this.closeDialog();
+                    }
+                });
+
+        PreferencesSearchHandler searchHandler =
+                new PreferencesSearchHandler(viewModel.getPreferenceTabs());
+        preferenceTabList
+                .itemsProperty()
+                .bindBidirectional(searchHandler.filteredPreferenceTabsProperty());
+        searchBox
+                .textProperty()
+                .addListener(
+                        (observable, previousText, newText) -> {
+                            searchHandler.filterTabs(newText.toLowerCase(Locale.ROOT));
+                            preferenceTabList.getSelectionModel().clearSelection();
+                            preferenceTabList.getSelectionModel().selectFirst();
+                        });
         searchBox.setPromptText(Localization.lang("Search") + "...");
         searchBox.setLeft(IconTheme.JabRefIcons.SEARCH.getGraphicNode());
 
-        EasyBind.subscribe(preferenceTabList.getSelectionModel().selectedItemProperty(), tab -> {
-            if (tab instanceof AbstractPreferenceTabView<?> preferencesTab) {
-                preferencesContainer.setContent(preferencesTab.getBuilder());
-                preferencesTab.prefWidthProperty().bind(preferencesContainer.widthProperty().subtract(10d));
-                preferencesTab.getStyleClass().add("preferencesTab");
-            } else {
-                preferencesContainer.setContent(null);
-            }
-        });
+        EasyBind.subscribe(
+                preferenceTabList.getSelectionModel().selectedItemProperty(),
+                tab -> {
+                    if (tab instanceof AbstractPreferenceTabView<?> preferencesTab) {
+                        preferencesContainer.setContent(preferencesTab.getBuilder());
+                        preferencesTab
+                                .prefWidthProperty()
+                                .bind(preferencesContainer.widthProperty().subtract(10d));
+                        preferencesTab.getStyleClass().add("preferencesTab");
+                    } else {
+                        preferencesContainer.setContent(null);
+                    }
+                });
 
         if (this.preferencesTabToSelectClass != null) {
-            Optional<PreferencesTab> tabToSelectIfExist = preferenceTabList.getItems()
-                                                                           .stream()
-                                                                           .filter(prefTab -> prefTab.getClass().equals(preferencesTabToSelectClass))
-                                                                           .findFirst();
-            tabToSelectIfExist.ifPresent(preferencesTab -> preferenceTabList.getSelectionModel().select(preferencesTab));
+            Optional<PreferencesTab> tabToSelectIfExist =
+                    preferenceTabList.getItems().stream()
+                            .filter(
+                                    prefTab ->
+                                            prefTab.getClass().equals(preferencesTabToSelectClass))
+                            .findFirst();
+            tabToSelectIfExist.ifPresent(
+                    preferencesTab -> preferenceTabList.getSelectionModel().select(preferencesTab));
         } else {
             preferenceTabList.getSelectionModel().selectFirst();
         }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index d99eeb7fd343..f185ff0d9ea1 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.preferences;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.prefs.BackingStoreException;
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyListWrapper;
@@ -40,11 +38,13 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntryTypesManager;
-
-import com.airhacks.afterburner.injection.Injector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.prefs.BackingStoreException;
+
 public class PreferencesDialogViewModel extends AbstractViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesDialogViewModel.class);
@@ -59,31 +59,31 @@ public PreferencesDialogViewModel(DialogService dialogService, GuiPreferences pr
         this.dialogService = dialogService;
         this.preferences = preferences;
 
-        preferenceTabs = FXCollections.observableArrayList(
-                new GeneralTab(),
-                new KeyBindingsTab(),
-                new GroupsTab(),
-                new WebSearchTab(),
-                new AiTab(),
-                new EntryTab(),
-                new TableTab(),
-                new PreviewTab(),
-                new EntryEditorTab(),
-                new CustomEntryTypesTab(),
-                new CitationKeyPatternTab(),
-                new LinkedFilesTab(),
-                new ExportTab(),
-                new AutoCompletionTab(),
-                new ProtectedTermsTab(),
-                new ExternalTab(),
-                new ExternalFileTypesTab(),
-                new JournalAbbreviationsTab(),
-                new NameFormatterTab(),
-                new XmpPrivacyTab(),
-                new CustomImporterTab(),
-                new CustomExporterTab(),
-                new NetworkTab()
-        );
+        preferenceTabs =
+                FXCollections.observableArrayList(
+                        new GeneralTab(),
+                        new KeyBindingsTab(),
+                        new GroupsTab(),
+                        new WebSearchTab(),
+                        new AiTab(),
+                        new EntryTab(),
+                        new TableTab(),
+                        new PreviewTab(),
+                        new EntryEditorTab(),
+                        new CustomEntryTypesTab(),
+                        new CitationKeyPatternTab(),
+                        new LinkedFilesTab(),
+                        new ExportTab(),
+                        new AutoCompletionTab(),
+                        new ProtectedTermsTab(),
+                        new ExternalTab(),
+                        new ExternalFileTypesTab(),
+                        new JournalAbbreviationsTab(),
+                        new NameFormatterTab(),
+                        new XmpPrivacyTab(),
+                        new CustomImporterTab(),
+                        new CustomExporterTab(),
+                        new NetworkTab());
     }
 
     public ObservableList<PreferencesTab> getPreferenceTabs() {
@@ -91,60 +91,79 @@ public ObservableList<PreferencesTab> getPreferenceTabs() {
     }
 
     public void importPreferences() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.XML)
-                .withDefaultExtension(StandardFileType.XML)
-                .withInitialDirectory(preferences.getInternalPreferences().getLastPreferencesExportPath()).build();
-
-        dialogService.showFileOpenDialog(fileDialogConfiguration)
-                     .ifPresent(file -> {
-                         try {
-                             preferences.importPreferences(file);
-                             setValues();
-
-                             dialogService.showWarningDialogAndWait(Localization.lang("Import preferences"),
-                                     Localization.lang("You must restart JabRef for this to come into effect."));
-                         } catch (JabRefException ex) {
-                             LOGGER.error("Error while importing preferences", ex);
-                             dialogService.showErrorDialogAndWait(Localization.lang("Import preferences"), ex);
-                         }
-                     });
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(StandardFileType.XML)
+                        .withDefaultExtension(StandardFileType.XML)
+                        .withInitialDirectory(
+                                preferences.getInternalPreferences().getLastPreferencesExportPath())
+                        .build();
+
+        dialogService
+                .showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(
+                        file -> {
+                            try {
+                                preferences.importPreferences(file);
+                                setValues();
+
+                                dialogService.showWarningDialogAndWait(
+                                        Localization.lang("Import preferences"),
+                                        Localization.lang(
+                                                "You must restart JabRef for this to come into effect."));
+                            } catch (JabRefException ex) {
+                                LOGGER.error("Error while importing preferences", ex);
+                                dialogService.showErrorDialogAndWait(
+                                        Localization.lang("Import preferences"), ex);
+                            }
+                        });
     }
 
     public void exportPreferences() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.XML)
-                .withDefaultExtension(StandardFileType.XML)
-                .withInitialDirectory(preferences.getInternalPreferences().getLastPreferencesExportPath())
-                .build();
-
-        dialogService.showFileSaveDialog(fileDialogConfiguration)
-                     .ifPresent(exportFile -> {
-                         try {
-                             storeAllSettings();
-                             preferences.exportPreferences(exportFile);
-                             preferences.getInternalPreferences().setLastPreferencesExportPath(exportFile);
-                         } catch (JabRefException ex) {
-                             LOGGER.warn(ex.getMessage(), ex);
-                             dialogService.showErrorDialogAndWait(Localization.lang("Export preferences"), ex);
-                         }
-                     });
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(StandardFileType.XML)
+                        .withDefaultExtension(StandardFileType.XML)
+                        .withInitialDirectory(
+                                preferences.getInternalPreferences().getLastPreferencesExportPath())
+                        .build();
+
+        dialogService
+                .showFileSaveDialog(fileDialogConfiguration)
+                .ifPresent(
+                        exportFile -> {
+                            try {
+                                storeAllSettings();
+                                preferences.exportPreferences(exportFile);
+                                preferences
+                                        .getInternalPreferences()
+                                        .setLastPreferencesExportPath(exportFile);
+                            } catch (JabRefException ex) {
+                                LOGGER.warn(ex.getMessage(), ex);
+                                dialogService.showErrorDialogAndWait(
+                                        Localization.lang("Export preferences"), ex);
+                            }
+                        });
     }
 
     public void showPreferences() {
-        dialogService.showCustomDialogAndWait(new PreferencesFilterDialog(new PreferencesFilter(preferences)));
+        dialogService.showCustomDialogAndWait(
+                new PreferencesFilterDialog(new PreferencesFilter(preferences)));
     }
 
     public void resetPreferences() {
-        boolean resetPreferencesConfirmed = dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Reset preferences"),
-                Localization.lang("Are you sure you want to reset all settings to default values?"),
-                Localization.lang("Reset preferences"),
-                Localization.lang("Cancel"));
+        boolean resetPreferencesConfirmed =
+                dialogService.showConfirmationDialogAndWait(
+                        Localization.lang("Reset preferences"),
+                        Localization.lang(
+                                "Are you sure you want to reset all settings to default values?"),
+                        Localization.lang("Reset preferences"),
+                        Localization.lang("Cancel"));
         if (resetPreferencesConfirmed) {
             try {
                 preferences.clear();
-                dialogService.showWarningDialogAndWait(Localization.lang("Reset preferences"),
+                dialogService.showWarningDialogAndWait(
+                        Localization.lang("Reset preferences"),
                         Localization.lang("You must restart JabRef for this to come into effect."));
             } catch (BackingStoreException ex) {
                 LOGGER.error("Error while resetting preferences", ex);
@@ -181,13 +200,16 @@ public void storeAllSettings() {
         preferences.flush();
 
         if (!restartWarnings.isEmpty()) {
-            dialogService.showWarningDialogAndWait(Localization.lang("Restart required"),
+            dialogService.showWarningDialogAndWait(
+                    Localization.lang("Restart required"),
                     String.join(",\n", restartWarnings)
                             + "\n\n"
-                            + Localization.lang("You must restart JabRef for this to come into effect."));
+                            + Localization.lang(
+                                    "You must restart JabRef for this to come into effect."));
         }
 
-        Injector.setModelOrService(BibEntryTypesManager.class, preferences.getCustomEntryTypesRepository());
+        Injector.setModelOrService(
+                BibEntryTypesManager.class, preferences.getCustomEntryTypesRepository());
         dialogService.notify(Localization.lang("Preferences recorded."));
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesFilter.java b/src/main/java/org/jabref/gui/preferences/PreferencesFilter.java
index 8c27486f55d1..cf30225af855 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesFilter.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesFilter.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.preferences;
 
+import org.jabref.logic.preferences.CliPreferences;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -7,8 +9,6 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.jabref.logic.preferences.CliPreferences;
-
 public class PreferencesFilter {
 
     private final CliPreferences preferences;
@@ -22,19 +22,26 @@ public List<PreferenceOption> getPreferenceOptions() {
         Map<String, Object> prefs = preferences.getPreferences();
 
         return prefs.entrySet().stream()
-                    .map(entry -> new PreferenceOption(entry.getKey(), entry.getValue(), defaults.get(entry.getKey())))
-                    .collect(Collectors.toList());
+                .map(
+                        entry ->
+                                new PreferenceOption(
+                                        entry.getKey(),
+                                        entry.getValue(),
+                                        defaults.get(entry.getKey())))
+                .collect(Collectors.toList());
     }
 
     public List<PreferenceOption> getDeviatingPreferences() {
         return getPreferenceOptions().stream()
-                                     .filter(PreferenceOption::isChanged)
-                                     .sorted()
-                                     .collect(Collectors.toList());
+                .filter(PreferenceOption::isChanged)
+                .sorted()
+                .collect(Collectors.toList());
     }
 
     public enum PreferenceType {
-        BOOLEAN, INTEGER, STRING
+        BOOLEAN,
+        INTEGER,
+        STRING
     }
 
     public static class PreferenceOption implements Comparable<PreferenceOption> {
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
index 60c96af5c1ec..f6a4dcb007f6 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.preferences;
 
-import java.util.Locale;
-import java.util.Objects;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ReadOnlyObjectWrapper;
@@ -19,8 +19,8 @@
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
+import java.util.Locale;
+import java.util.Objects;
 
 public class PreferencesFilterDialog extends BaseDialog<Void> {
 
@@ -29,7 +29,11 @@ public class PreferencesFilterDialog extends BaseDialog<Void> {
     private final FilteredList<PreferencesFilter.PreferenceOption> filteredOptions;
 
     @FXML private TableView<PreferencesFilter.PreferenceOption> table;
-    @FXML private TableColumn<PreferencesFilter.PreferenceOption, PreferencesFilter.PreferenceType> columnType;
+
+    @FXML
+    private TableColumn<PreferencesFilter.PreferenceOption, PreferencesFilter.PreferenceType>
+            columnType;
+
     @FXML private TableColumn<PreferencesFilter.PreferenceOption, String> columnKey;
     @FXML private TableColumn<PreferencesFilter.PreferenceOption, Object> columnValue;
     @FXML private TableColumn<PreferencesFilter.PreferenceOption, Object> columnDefaultValue;
@@ -42,9 +46,7 @@ public PreferencesFilterDialog(PreferencesFilter preferencesFilter) {
         this.preferenceOptions = FXCollections.observableArrayList();
         this.filteredOptions = new FilteredList<>(this.preferenceOptions);
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         this.setTitle(Localization.lang("Preferences"));
     }
@@ -52,17 +54,29 @@ public PreferencesFilterDialog(PreferencesFilter preferencesFilter) {
     @FXML
     private void initialize() {
         showOnlyDeviatingPreferenceOptions.setOnAction(event -> updateModel());
-        filteredOptions.predicateProperty().bind(EasyBind.map(searchField.textProperty(), searchText -> {
-            if ((searchText == null) || searchText.isEmpty()) {
-                return null;
-            }
-            String lowerCaseSearchText = searchText.toLowerCase(Locale.ROOT);
-            return option -> option.getKey().toLowerCase(Locale.ROOT).contains(lowerCaseSearchText);
-        }));
-        columnType.setCellValueFactory(data -> new ReadOnlyObjectWrapper<>(data.getValue().getType()));
+        filteredOptions
+                .predicateProperty()
+                .bind(
+                        EasyBind.map(
+                                searchField.textProperty(),
+                                searchText -> {
+                                    if ((searchText == null) || searchText.isEmpty()) {
+                                        return null;
+                                    }
+                                    String lowerCaseSearchText =
+                                            searchText.toLowerCase(Locale.ROOT);
+                                    return option ->
+                                            option.getKey()
+                                                    .toLowerCase(Locale.ROOT)
+                                                    .contains(lowerCaseSearchText);
+                                }));
+        columnType.setCellValueFactory(
+                data -> new ReadOnlyObjectWrapper<>(data.getValue().getType()));
         columnKey.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getKey()));
-        columnValue.setCellValueFactory(data -> new ReadOnlyObjectWrapper<>(data.getValue().getValue()));
-        columnDefaultValue.setCellValueFactory(data -> new ReadOnlyObjectWrapper<>(data.getValue().getDefaultValue().orElse("")));
+        columnValue.setCellValueFactory(
+                data -> new ReadOnlyObjectWrapper<>(data.getValue().getValue()));
+        columnDefaultValue.setCellValueFactory(
+                data -> new ReadOnlyObjectWrapper<>(data.getValue().getDefaultValue().orElse("")));
         table.setItems(filteredOptions);
         count.textProperty().bind(Bindings.size(table.getItems()).asString("(%d)"));
         updateModel();
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java b/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java
index ad645c90a784..6a425549b261 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.preferences;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
+import com.google.common.collect.ArrayListMultimap;
 
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
@@ -12,7 +10,9 @@
 import javafx.scene.Parent;
 import javafx.scene.control.Labeled;
 
-import com.google.common.collect.ArrayListMultimap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
 
 class PreferencesSearchHandler {
 
@@ -25,7 +25,8 @@ class PreferencesSearchHandler {
     PreferencesSearchHandler(List<PreferencesTab> preferenceTabs) {
         this.preferenceTabs = preferenceTabs;
         this.preferenceTabsLabelNames = getPrefsTabLabelMap();
-        this.filteredPreferenceTabs = new SimpleListProperty<>(FXCollections.observableArrayList(preferenceTabs));
+        this.filteredPreferenceTabs =
+                new SimpleListProperty<>(FXCollections.observableArrayList(preferenceTabs));
     }
 
     public void filterTabs(String text) {
@@ -44,7 +45,8 @@ public void filterTabs(String text) {
                     highlightLabel(labeled);
                 }
             }
-            boolean tabNameIsMatchedByQuery = tab.getTabName().toLowerCase(Locale.ROOT).contains(text);
+            boolean tabNameIsMatchedByQuery =
+                    tab.getTabName().toLowerCase(Locale.ROOT).contains(text);
             if (tabContainsLabel || tabNameIsMatchedByQuery) {
                 filteredPreferenceTabs.add(tab);
             }
@@ -61,7 +63,8 @@ private void highlightLabel(Labeled labeled) {
     }
 
     private void clearHighlights() {
-        highlightedLabels.forEach(labeled -> labeled.pseudoClassStateChanged(labelHighlight, false));
+        highlightedLabels.forEach(
+                labeled -> labeled.pseudoClassStateChanged(labelHighlight, false));
     }
 
     private void clearSearch() {
@@ -87,7 +90,10 @@ protected ListProperty<PreferencesTab> filteredPreferenceTabsProperty() {
         return filteredPreferenceTabs;
     }
 
-    private static void scanLabeledControls(Parent parent, ArrayListMultimap<PreferencesTab, Labeled> prefsTabLabelMap, PreferencesTab preferencesTab) {
+    private static void scanLabeledControls(
+            Parent parent,
+            ArrayListMultimap<PreferencesTab, Labeled> prefsTabLabelMap,
+            PreferencesTab preferencesTab) {
         for (Node child : parent.getChildrenUnmodifiable()) {
             if (child instanceof Labeled labeled) {
                 if (!labeled.getText().isEmpty()) {
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesTab.java b/src/main/java/org/jabref/gui/preferences/PreferencesTab.java
index d038e49622fe..220dd57f9dd3 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesTab.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesTab.java
@@ -1,9 +1,9 @@
 package org.jabref.gui.preferences;
 
-import java.util.List;
-
 import javafx.scene.Node;
 
+import java.util.List;
+
 /**
  * A prefsTab is a component displayed in the PreferenceDialog.
  * <p>
diff --git a/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java b/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
index 0ba021be858b..14f1036772b7 100644
--- a/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
+++ b/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
@@ -15,7 +15,10 @@ public ShowPreferencesAction(LibraryTabContainer tabContainer, DialogService dia
         this(tabContainer, null, dialogService);
     }
 
-    public ShowPreferencesAction(LibraryTabContainer tabContainer, Class<? extends PreferencesTab> preferencesTabToSelectClass, DialogService dialogService) {
+    public ShowPreferencesAction(
+            LibraryTabContainer tabContainer,
+            Class<? extends PreferencesTab> preferencesTabToSelectClass,
+            DialogService dialogService) {
         this.tabContainer = tabContainer;
         this.preferencesTabToSelectClass = preferencesTabToSelectClass;
         this.dialogService = dialogService;
@@ -23,7 +26,8 @@ public ShowPreferencesAction(LibraryTabContainer tabContainer, Class<? extends P
 
     @Override
     public void execute() {
-        dialogService.showCustomDialogAndWait(new PreferencesDialogView(preferencesTabToSelectClass));
+        dialogService.showCustomDialogAndWait(
+                new PreferencesDialogView(preferencesTabToSelectClass));
         tabContainer.refresh();
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTab.java b/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
index 4cb672566032..bed9f78eae9c 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
@@ -1,5 +1,11 @@
 package org.jabref.gui.preferences.ai;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.dlsc.gemsfx.ResizableTextArea;
+import com.dlsc.unitfx.IntegerInputField;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
 import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -7,6 +13,8 @@
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextField;
 
+import org.controlsfx.control.SearchableComboBox;
+import org.controlsfx.control.textfield.CustomPasswordField;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
@@ -18,15 +26,9 @@
 import org.jabref.model.ai.AiProvider;
 import org.jabref.model.ai.EmbeddingModel;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.dlsc.gemsfx.ResizableTextArea;
-import com.dlsc.unitfx.IntegerInputField;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import org.controlsfx.control.SearchableComboBox;
-import org.controlsfx.control.textfield.CustomPasswordField;
-
 public class AiTab extends AbstractPreferenceTabView<AiTabViewModel> implements PreferencesTab {
-    private static final String HUGGING_FACE_CHAT_MODEL_PROMPT = "TinyLlama/TinyLlama_v1.1 (or any other model name)";
+    private static final String HUGGING_FACE_CHAT_MODEL_PROMPT =
+            "TinyLlama/TinyLlama_v1.1 (or any other model name)";
 
     @FXML private CheckBox enableAi;
 
@@ -52,9 +54,7 @@ public class AiTab extends AbstractPreferenceTabView<AiTabViewModel> implements
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
 
     public AiTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     public void initialize() {
@@ -66,116 +66,213 @@ public void initialize() {
                 .withText(AiProvider::toString)
                 .install(aiProviderComboBox);
         aiProviderComboBox.setItems(viewModel.aiProvidersProperty());
-        aiProviderComboBox.valueProperty().bindBidirectional(viewModel.selectedAiProviderProperty());
+        aiProviderComboBox
+                .valueProperty()
+                .bindBidirectional(viewModel.selectedAiProviderProperty());
         aiProviderComboBox.disableProperty().bind(viewModel.disableBasicSettingsProperty());
 
-        new ViewModelListCellFactory<String>()
-                .withText(text -> text)
-                .install(chatModelComboBox);
+        new ViewModelListCellFactory<String>().withText(text -> text).install(chatModelComboBox);
         chatModelComboBox.setItems(viewModel.chatModelsProperty());
         chatModelComboBox.valueProperty().bindBidirectional(viewModel.selectedChatModelProperty());
         chatModelComboBox.disableProperty().bind(viewModel.disableBasicSettingsProperty());
 
-        this.aiProviderComboBox.valueProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue == AiProvider.HUGGING_FACE) {
-                chatModelComboBox.setPromptText(HUGGING_FACE_CHAT_MODEL_PROMPT);
-            }
-        });
+        this.aiProviderComboBox
+                .valueProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            if (newValue == AiProvider.HUGGING_FACE) {
+                                chatModelComboBox.setPromptText(HUGGING_FACE_CHAT_MODEL_PROMPT);
+                            }
+                        });
 
         apiKeyTextField.textProperty().bindBidirectional(viewModel.apiKeyProperty());
         apiKeyTextField.disableProperty().bind(viewModel.disableBasicSettingsProperty());
 
-        customizeExpertSettingsCheckbox.selectedProperty().bindBidirectional(viewModel.customizeExpertSettingsProperty());
-        customizeExpertSettingsCheckbox.disableProperty().bind(viewModel.disableBasicSettingsProperty());
+        customizeExpertSettingsCheckbox
+                .selectedProperty()
+                .bindBidirectional(viewModel.customizeExpertSettingsProperty());
+        customizeExpertSettingsCheckbox
+                .disableProperty()
+                .bind(viewModel.disableBasicSettingsProperty());
 
         new ViewModelListCellFactory<EmbeddingModel>()
                 .withText(EmbeddingModel::fullInfo)
                 .install(embeddingModelComboBox);
         embeddingModelComboBox.setItems(viewModel.embeddingModelsProperty());
-        embeddingModelComboBox.valueProperty().bindBidirectional(viewModel.selectedEmbeddingModelProperty());
+        embeddingModelComboBox
+                .valueProperty()
+                .bindBidirectional(viewModel.selectedEmbeddingModelProperty());
         embeddingModelComboBox.disableProperty().bind(viewModel.disableExpertSettingsProperty());
 
         apiBaseUrlTextField.textProperty().bindBidirectional(viewModel.apiBaseUrlProperty());
 
-        viewModel.disableExpertSettingsProperty().addListener((observable, oldValue, newValue) ->
-            apiBaseUrlTextField.setDisable(newValue || viewModel.disableApiBaseUrlProperty().get())
-        );
-
-        viewModel.disableApiBaseUrlProperty().addListener((observable, oldValue, newValue) ->
-            apiBaseUrlTextField.setDisable(newValue || viewModel.disableExpertSettingsProperty().get())
-        );
+        viewModel
+                .disableExpertSettingsProperty()
+                .addListener(
+                        (observable, oldValue, newValue) ->
+                                apiBaseUrlTextField.setDisable(
+                                        newValue || viewModel.disableApiBaseUrlProperty().get()));
+
+        viewModel
+                .disableApiBaseUrlProperty()
+                .addListener(
+                        (observable, oldValue, newValue) ->
+                                apiBaseUrlTextField.setDisable(
+                                        newValue
+                                                || viewModel
+                                                        .disableExpertSettingsProperty()
+                                                        .get()));
 
         instructionTextArea.textProperty().bindBidirectional(viewModel.instructionProperty());
         instructionTextArea.disableProperty().bind(viewModel.disableExpertSettingsProperty());
 
-        // bindBidirectional doesn't work well with number input fields ({@link IntegerInputField}, {@link DoubleInputField}),
+        // bindBidirectional doesn't work well with number input fields ({@link IntegerInputField},
+        // {@link DoubleInputField}),
         // so they are expanded into `addListener` calls.
 
-        contextWindowSizeTextField.valueProperty().addListener((observable, oldValue, newValue) -> {
-            viewModel.contextWindowSizeProperty().set(newValue == null ? 0 : newValue);
-        });
-
-        viewModel.contextWindowSizeProperty().addListener((observable, oldValue, newValue) -> {
-            contextWindowSizeTextField.valueProperty().set(newValue == null ? 0 : newValue.intValue());
-        });
-
-        contextWindowSizeTextField.disableProperty().bind(viewModel.disableExpertSettingsProperty());
+        contextWindowSizeTextField
+                .valueProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            viewModel
+                                    .contextWindowSizeProperty()
+                                    .set(newValue == null ? 0 : newValue);
+                        });
+
+        viewModel
+                .contextWindowSizeProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            contextWindowSizeTextField
+                                    .valueProperty()
+                                    .set(newValue == null ? 0 : newValue.intValue());
+                        });
+
+        contextWindowSizeTextField
+                .disableProperty()
+                .bind(viewModel.disableExpertSettingsProperty());
 
         temperatureTextField.textProperty().bindBidirectional(viewModel.temperatureProperty());
         temperatureTextField.disableProperty().bind(viewModel.disableExpertSettingsProperty());
 
-        documentSplitterChunkSizeTextField.valueProperty().addListener((observable, oldValue, newValue) -> {
-            viewModel.documentSplitterChunkSizeProperty().set(newValue == null ? 0 : newValue);
-        });
-
-        viewModel.documentSplitterChunkSizeProperty().addListener((observable, oldValue, newValue) -> {
-            documentSplitterChunkSizeTextField.valueProperty().set(newValue == null ? 0 : newValue.intValue());
-        });
-
-        documentSplitterChunkSizeTextField.disableProperty().bind(viewModel.disableExpertSettingsProperty());
-
-        documentSplitterOverlapSizeTextField.valueProperty().addListener((observable, oldValue, newValue) -> {
-            viewModel.documentSplitterOverlapSizeProperty().set(newValue == null ? 0 : newValue);
-        });
-
-        viewModel.documentSplitterOverlapSizeProperty().addListener((observable, oldValue, newValue) -> {
-            documentSplitterOverlapSizeTextField.valueProperty().set(newValue == null ? 0 : newValue.intValue());
-        });
-
-        documentSplitterOverlapSizeTextField.disableProperty().bind(viewModel.disableExpertSettingsProperty());
-
-        ragMaxResultsCountTextField.valueProperty().addListener((observable, oldValue, newValue) -> {
-            viewModel.ragMaxResultsCountProperty().set(newValue == null ? 0 : newValue);
-        });
-
-        viewModel.ragMaxResultsCountProperty().addListener((observable, oldValue, newValue) -> {
-            ragMaxResultsCountTextField.valueProperty().set(newValue == null ? 0 : newValue.intValue());
-        });
-
-        ragMaxResultsCountTextField.disableProperty().bind(viewModel.disableExpertSettingsProperty());
+        documentSplitterChunkSizeTextField
+                .valueProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            viewModel
+                                    .documentSplitterChunkSizeProperty()
+                                    .set(newValue == null ? 0 : newValue);
+                        });
+
+        viewModel
+                .documentSplitterChunkSizeProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            documentSplitterChunkSizeTextField
+                                    .valueProperty()
+                                    .set(newValue == null ? 0 : newValue.intValue());
+                        });
+
+        documentSplitterChunkSizeTextField
+                .disableProperty()
+                .bind(viewModel.disableExpertSettingsProperty());
+
+        documentSplitterOverlapSizeTextField
+                .valueProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            viewModel
+                                    .documentSplitterOverlapSizeProperty()
+                                    .set(newValue == null ? 0 : newValue);
+                        });
+
+        viewModel
+                .documentSplitterOverlapSizeProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            documentSplitterOverlapSizeTextField
+                                    .valueProperty()
+                                    .set(newValue == null ? 0 : newValue.intValue());
+                        });
+
+        documentSplitterOverlapSizeTextField
+                .disableProperty()
+                .bind(viewModel.disableExpertSettingsProperty());
+
+        ragMaxResultsCountTextField
+                .valueProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            viewModel
+                                    .ragMaxResultsCountProperty()
+                                    .set(newValue == null ? 0 : newValue);
+                        });
+
+        viewModel
+                .ragMaxResultsCountProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            ragMaxResultsCountTextField
+                                    .valueProperty()
+                                    .set(newValue == null ? 0 : newValue.intValue());
+                        });
+
+        ragMaxResultsCountTextField
+                .disableProperty()
+                .bind(viewModel.disableExpertSettingsProperty());
 
         ragMinScoreTextField.textProperty().bindBidirectional(viewModel.ragMinScoreProperty());
         ragMinScoreTextField.disableProperty().bind(viewModel.disableExpertSettingsProperty());
 
-        Platform.runLater(() -> {
-            visualizer.initVisualization(viewModel.getApiTokenValidationStatus(), apiKeyTextField);
-            visualizer.initVisualization(viewModel.getChatModelValidationStatus(), chatModelComboBox);
-            visualizer.initVisualization(viewModel.getApiBaseUrlValidationStatus(), apiBaseUrlTextField);
-            visualizer.initVisualization(viewModel.getEmbeddingModelValidationStatus(), embeddingModelComboBox);
-            visualizer.initVisualization(viewModel.getSystemMessageValidationStatus(), instructionTextArea);
-            visualizer.initVisualization(viewModel.getTemperatureTypeValidationStatus(), temperatureTextField);
-            visualizer.initVisualization(viewModel.getTemperatureRangeValidationStatus(), temperatureTextField);
-            visualizer.initVisualization(viewModel.getMessageWindowSizeValidationStatus(), contextWindowSizeTextField);
-            visualizer.initVisualization(viewModel.getDocumentSplitterChunkSizeValidationStatus(), documentSplitterChunkSizeTextField);
-            visualizer.initVisualization(viewModel.getDocumentSplitterOverlapSizeValidationStatus(), documentSplitterOverlapSizeTextField);
-            visualizer.initVisualization(viewModel.getRagMaxResultsCountValidationStatus(), ragMaxResultsCountTextField);
-            visualizer.initVisualization(viewModel.getRagMinScoreTypeValidationStatus(), ragMinScoreTextField);
-            visualizer.initVisualization(viewModel.getRagMinScoreRangeValidationStatus(), ragMinScoreTextField);
-        });
+        Platform.runLater(
+                () -> {
+                    visualizer.initVisualization(
+                            viewModel.getApiTokenValidationStatus(), apiKeyTextField);
+                    visualizer.initVisualization(
+                            viewModel.getChatModelValidationStatus(), chatModelComboBox);
+                    visualizer.initVisualization(
+                            viewModel.getApiBaseUrlValidationStatus(), apiBaseUrlTextField);
+                    visualizer.initVisualization(
+                            viewModel.getEmbeddingModelValidationStatus(), embeddingModelComboBox);
+                    visualizer.initVisualization(
+                            viewModel.getSystemMessageValidationStatus(), instructionTextArea);
+                    visualizer.initVisualization(
+                            viewModel.getTemperatureTypeValidationStatus(), temperatureTextField);
+                    visualizer.initVisualization(
+                            viewModel.getTemperatureRangeValidationStatus(), temperatureTextField);
+                    visualizer.initVisualization(
+                            viewModel.getMessageWindowSizeValidationStatus(),
+                            contextWindowSizeTextField);
+                    visualizer.initVisualization(
+                            viewModel.getDocumentSplitterChunkSizeValidationStatus(),
+                            documentSplitterChunkSizeTextField);
+                    visualizer.initVisualization(
+                            viewModel.getDocumentSplitterOverlapSizeValidationStatus(),
+                            documentSplitterOverlapSizeTextField);
+                    visualizer.initVisualization(
+                            viewModel.getRagMaxResultsCountValidationStatus(),
+                            ragMaxResultsCountTextField);
+                    visualizer.initVisualization(
+                            viewModel.getRagMinScoreTypeValidationStatus(), ragMinScoreTextField);
+                    visualizer.initVisualization(
+                            viewModel.getRagMinScoreRangeValidationStatus(), ragMinScoreTextField);
+                });
 
         ActionFactory actionFactory = new ActionFactory();
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AI_GENERAL_SETTINGS, dialogService, preferences.getExternalApplicationsPreferences()), generalSettingsHelp);
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AI_EXPERT_SETTINGS, dialogService, preferences.getExternalApplicationsPreferences()), expertSettingsHelp);
+        actionFactory.configureIconButton(
+                StandardActions.HELP,
+                new HelpAction(
+                        HelpFile.AI_GENERAL_SETTINGS,
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences()),
+                generalSettingsHelp);
+        actionFactory.configureIconButton(
+                StandardActions.HELP,
+                new HelpAction(
+                        HelpFile.AI_EXPERT_SETTINGS,
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences()),
+                expertSettingsHelp);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java b/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
index 8ba7c3a66c0d..88107f7e7b97 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
@@ -1,9 +1,9 @@
 package org.jabref.gui.preferences.ai;
 
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
@@ -28,10 +28,10 @@
 import org.jabref.model.ai.EmbeddingModel;
 import org.jabref.model.strings.StringUtil;
 
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
 
 public class AiTabViewModel implements PreferenceTabViewModel {
     private final Locale oldLocale;
@@ -63,10 +63,14 @@ public class AiTabViewModel implements PreferenceTabViewModel {
 
     private final ListProperty<EmbeddingModel> embeddingModelsList =
             new SimpleListProperty<>(FXCollections.observableArrayList(EmbeddingModel.values()));
-    private final ObjectProperty<EmbeddingModel> selectedEmbeddingModel = new SimpleObjectProperty<>();
+    private final ObjectProperty<EmbeddingModel> selectedEmbeddingModel =
+            new SimpleObjectProperty<>();
 
     private final StringProperty currentApiBaseUrl = new SimpleStringProperty();
-    private final BooleanProperty disableApiBaseUrl = new SimpleBooleanProperty(true); // {@link HuggingFaceChatModel} and {@link GoogleAiGeminiChatModel} doesn't support setting API base URL
+    private final BooleanProperty disableApiBaseUrl =
+            new SimpleBooleanProperty(
+                    true); // {@link HuggingFaceChatModel} and {@link GoogleAiGeminiChatModel}
+                           // doesn't support setting API base URL
 
     private final StringProperty openAiApiBaseUrl = new SimpleStringProperty();
     private final StringProperty mistralAiApiBaseUrl = new SimpleStringProperty();
@@ -105,176 +109,225 @@ public AiTabViewModel(CliPreferences preferences) {
 
         this.aiPreferences = preferences.getAiPreferences();
 
-        this.enableAi.addListener((observable, oldValue, newValue) -> {
-            disableBasicSettings.set(!newValue);
-            disableExpertSettings.set(!newValue || !customizeExpertSettings.get());
-        });
-
-        this.customizeExpertSettings.addListener((observableValue, oldValue, newValue) ->
-                disableExpertSettings.set(!newValue || !enableAi.get())
-        );
-
-        this.selectedAiProvider.addListener((observable, oldValue, newValue) -> {
-            List<String> models = AiDefaultPreferences.AVAILABLE_CHAT_MODELS.get(newValue);
-
-            // When we setAll on Hugging Face, models are empty, and currentChatModel become null.
-            // It becomes null beause currentChatModel is binded to combobox, and this combobox becomes empty.
-            // For some reason, custom edited value in the combobox will be erased, so we need to store the old value.
-            String oldChatModel = currentChatModel.get();
-            chatModelsList.setAll(models);
-
-            disableApiBaseUrl.set(newValue == AiProvider.HUGGING_FACE || newValue == AiProvider.GEMINI);
-
-            if (oldValue != null) {
-                switch (oldValue) {
-                    case OPEN_AI -> {
-                        openAiChatModel.set(oldChatModel);
-                        openAiApiKey.set(currentApiKey.get());
-                        openAiApiBaseUrl.set(currentApiBaseUrl.get());
+        this.enableAi.addListener(
+                (observable, oldValue, newValue) -> {
+                    disableBasicSettings.set(!newValue);
+                    disableExpertSettings.set(!newValue || !customizeExpertSettings.get());
+                });
+
+        this.customizeExpertSettings.addListener(
+                (observableValue, oldValue, newValue) ->
+                        disableExpertSettings.set(!newValue || !enableAi.get()));
+
+        this.selectedAiProvider.addListener(
+                (observable, oldValue, newValue) -> {
+                    List<String> models = AiDefaultPreferences.AVAILABLE_CHAT_MODELS.get(newValue);
+
+                    // When we setAll on Hugging Face, models are empty, and currentChatModel become
+                    // null.
+                    // It becomes null beause currentChatModel is binded to combobox, and this
+                    // combobox becomes empty.
+                    // For some reason, custom edited value in the combobox will be erased, so we
+                    // need to store the old value.
+                    String oldChatModel = currentChatModel.get();
+                    chatModelsList.setAll(models);
+
+                    disableApiBaseUrl.set(
+                            newValue == AiProvider.HUGGING_FACE || newValue == AiProvider.GEMINI);
+
+                    if (oldValue != null) {
+                        switch (oldValue) {
+                            case OPEN_AI -> {
+                                openAiChatModel.set(oldChatModel);
+                                openAiApiKey.set(currentApiKey.get());
+                                openAiApiBaseUrl.set(currentApiBaseUrl.get());
+                            }
+                            case MISTRAL_AI -> {
+                                mistralAiChatModel.set(oldChatModel);
+                                mistralAiApiKey.set(currentApiKey.get());
+                                mistralAiApiBaseUrl.set(currentApiBaseUrl.get());
+                            }
+                            case GEMINI -> {
+                                geminiChatModel.set(oldChatModel);
+                                geminiAiApiKey.set(currentApiKey.get());
+                                geminiApiBaseUrl.set(currentApiBaseUrl.get());
+                            }
+                            case HUGGING_FACE -> {
+                                huggingFaceChatModel.set(oldChatModel);
+                                huggingFaceApiKey.set(currentApiKey.get());
+                                huggingFaceApiBaseUrl.set(currentApiBaseUrl.get());
+                            }
+                        }
                     }
-                    case MISTRAL_AI -> {
-                        mistralAiChatModel.set(oldChatModel);
-                        mistralAiApiKey.set(currentApiKey.get());
-                        mistralAiApiBaseUrl.set(currentApiBaseUrl.get());
-                    }
-                    case GEMINI -> {
-                        geminiChatModel.set(oldChatModel);
-                        geminiAiApiKey.set(currentApiKey.get());
-                        geminiApiBaseUrl.set(currentApiBaseUrl.get());
+
+                    switch (newValue) {
+                        case OPEN_AI -> {
+                            currentChatModel.set(openAiChatModel.get());
+                            currentApiKey.set(openAiApiKey.get());
+                            currentApiBaseUrl.set(openAiApiBaseUrl.get());
+                        }
+                        case MISTRAL_AI -> {
+                            currentChatModel.set(mistralAiChatModel.get());
+                            currentApiKey.set(mistralAiApiKey.get());
+                            currentApiBaseUrl.set(mistralAiApiBaseUrl.get());
+                        }
+                        case GEMINI -> {
+                            currentChatModel.set(geminiChatModel.get());
+                            currentApiKey.set(geminiAiApiKey.get());
+                            currentApiBaseUrl.set(geminiApiBaseUrl.get());
+                        }
+                        case HUGGING_FACE -> {
+                            currentChatModel.set(huggingFaceChatModel.get());
+                            currentApiKey.set(huggingFaceApiKey.get());
+                            currentApiBaseUrl.set(huggingFaceApiBaseUrl.get());
+                        }
                     }
-                    case HUGGING_FACE -> {
-                        huggingFaceChatModel.set(oldChatModel);
-                        huggingFaceApiKey.set(currentApiKey.get());
-                        huggingFaceApiBaseUrl.set(currentApiBaseUrl.get());
+                });
+
+        this.currentChatModel.addListener(
+                (observable, oldValue, newValue) -> {
+                    switch (selectedAiProvider.get()) {
+                        case OPEN_AI -> openAiChatModel.set(newValue);
+                        case MISTRAL_AI -> mistralAiChatModel.set(newValue);
+                        case GEMINI -> geminiChatModel.set(newValue);
+                        case HUGGING_FACE -> huggingFaceChatModel.set(newValue);
                     }
-                }
-            }
-
-            switch (newValue) {
-                case OPEN_AI -> {
-                    currentChatModel.set(openAiChatModel.get());
-                    currentApiKey.set(openAiApiKey.get());
-                    currentApiBaseUrl.set(openAiApiBaseUrl.get());
-                }
-                case MISTRAL_AI -> {
-                    currentChatModel.set(mistralAiChatModel.get());
-                    currentApiKey.set(mistralAiApiKey.get());
-                    currentApiBaseUrl.set(mistralAiApiBaseUrl.get());
-                }
-                case GEMINI -> {
-                    currentChatModel.set(geminiChatModel.get());
-                    currentApiKey.set(geminiAiApiKey.get());
-                    currentApiBaseUrl.set(geminiApiBaseUrl.get());
-                }
-                case HUGGING_FACE -> {
-                    currentChatModel.set(huggingFaceChatModel.get());
-                    currentApiKey.set(huggingFaceApiKey.get());
-                    currentApiBaseUrl.set(huggingFaceApiBaseUrl.get());
-                }
-            }
-        });
-
-        this.currentChatModel.addListener((observable, oldValue, newValue) -> {
-            switch (selectedAiProvider.get()) {
-                case OPEN_AI -> openAiChatModel.set(newValue);
-                case MISTRAL_AI -> mistralAiChatModel.set(newValue);
-                case GEMINI -> geminiChatModel.set(newValue);
-                case HUGGING_FACE -> huggingFaceChatModel.set(newValue);
-            }
 
-            Map<String, Integer> modelContextWindows = AiDefaultPreferences.CONTEXT_WINDOW_SIZES.get(selectedAiProvider.get());
+                    Map<String, Integer> modelContextWindows =
+                            AiDefaultPreferences.CONTEXT_WINDOW_SIZES.get(selectedAiProvider.get());
 
-            if (modelContextWindows == null) {
-                contextWindowSize.set(AiDefaultPreferences.CONTEXT_WINDOW_SIZE);
-                return;
-            }
-
-            contextWindowSize.set(modelContextWindows.getOrDefault(newValue, AiDefaultPreferences.CONTEXT_WINDOW_SIZE));
-        });
+                    if (modelContextWindows == null) {
+                        contextWindowSize.set(AiDefaultPreferences.CONTEXT_WINDOW_SIZE);
+                        return;
+                    }
 
-        this.currentApiKey.addListener((observable, oldValue, newValue) -> {
-            switch (selectedAiProvider.get()) {
-                case OPEN_AI -> openAiApiKey.set(newValue);
-                case MISTRAL_AI -> mistralAiApiKey.set(newValue);
-                case GEMINI -> geminiAiApiKey.set(newValue);
-                case HUGGING_FACE -> huggingFaceApiKey.set(newValue);
-            }
-        });
-
-        this.currentApiBaseUrl.addListener((observable, oldValue, newValue) -> {
-            switch (selectedAiProvider.get()) {
-                case OPEN_AI -> openAiApiBaseUrl.set(newValue);
-                case MISTRAL_AI -> mistralAiApiBaseUrl.set(newValue);
-                case GEMINI -> geminiApiBaseUrl.set(newValue);
-                case HUGGING_FACE -> huggingFaceApiBaseUrl.set(newValue);
-            }
-        });
-
-        this.apiKeyValidator = new FunctionBasedValidator<>(
-                currentApiKey,
-                token -> !StringUtil.isBlank(token),
-                ValidationMessage.error(Localization.lang("An API key has to be provided")));
-
-        this.chatModelValidator = new FunctionBasedValidator<>(
-                currentChatModel,
-                chatModel -> !StringUtil.isBlank(chatModel),
-                ValidationMessage.error(Localization.lang("Chat model has to be provided")));
-
-        this.apiBaseUrlValidator = new FunctionBasedValidator<>(
-                currentApiBaseUrl,
-                token -> !StringUtil.isBlank(token),
-                ValidationMessage.error(Localization.lang("API base URL has to be provided")));
-
-        this.embeddingModelValidator = new FunctionBasedValidator<>(
-                selectedEmbeddingModel,
-                Objects::nonNull,
-                ValidationMessage.error(Localization.lang("Embedding model has to be provided")));
-
-        this.instructionValidator = new FunctionBasedValidator<>(
-                instruction,
-                message -> !StringUtil.isBlank(message),
-                ValidationMessage.error(Localization.lang("The instruction has to be provided")));
-
-        this.temperatureTypeValidator = new FunctionBasedValidator<>(
-                temperature,
-                temp -> LocalizedNumbers.stringToDouble(temp).isPresent(),
-                ValidationMessage.error(Localization.lang("Temperature must be a number")));
-
-        // Source: https://platform.openai.com/docs/api-reference/chat/create#chat-create-temperature
-        this.temperatureRangeValidator = new FunctionBasedValidator<>(
-                temperature,
-                temp -> LocalizedNumbers.stringToDouble(temp).map(t -> t >= 0 && t <= 2).orElse(false),
-                ValidationMessage.error(Localization.lang("Temperature must be between 0 and 2")));
-
-        this.contextWindowSizeValidator = new FunctionBasedValidator<>(
-                contextWindowSize,
-                size -> size.intValue() > 0,
-                ValidationMessage.error(Localization.lang("Context window size must be greater than 0")));
-
-        this.documentSplitterChunkSizeValidator = new FunctionBasedValidator<>(
-                documentSplitterChunkSize,
-                size -> size.intValue() > 0,
-                ValidationMessage.error(Localization.lang("Document splitter chunk size must be greater than 0")));
-
-        this.documentSplitterOverlapSizeValidator = new FunctionBasedValidator<>(
-                documentSplitterOverlapSize,
-                size -> size.intValue() > 0 && size.intValue() < documentSplitterChunkSize.get(),
-                ValidationMessage.error(Localization.lang("Document splitter overlap size must be greater than 0 and less than chunk size")));
-
-        this.ragMaxResultsCountValidator = new FunctionBasedValidator<>(
-                ragMaxResultsCount,
-                count -> count.intValue() > 0,
-                ValidationMessage.error(Localization.lang("RAG max results count must be greater than 0")));
-
-        this.ragMinScoreTypeValidator = new FunctionBasedValidator<>(
-                ragMinScore,
-                minScore -> LocalizedNumbers.stringToDouble(minScore).isPresent(),
-                ValidationMessage.error(Localization.lang("RAG minimum score must be a number")));
-
-        this.ragMinScoreRangeValidator = new FunctionBasedValidator<>(
-                ragMinScore,
-                minScore -> LocalizedNumbers.stringToDouble(minScore).map(s -> s > 0 && s < 1).orElse(false),
-                ValidationMessage.error(Localization.lang("RAG minimum score must be greater than 0 and less than 1")));
+                    contextWindowSize.set(
+                            modelContextWindows.getOrDefault(
+                                    newValue, AiDefaultPreferences.CONTEXT_WINDOW_SIZE));
+                });
+
+        this.currentApiKey.addListener(
+                (observable, oldValue, newValue) -> {
+                    switch (selectedAiProvider.get()) {
+                        case OPEN_AI -> openAiApiKey.set(newValue);
+                        case MISTRAL_AI -> mistralAiApiKey.set(newValue);
+                        case GEMINI -> geminiAiApiKey.set(newValue);
+                        case HUGGING_FACE -> huggingFaceApiKey.set(newValue);
+                    }
+                });
+
+        this.currentApiBaseUrl.addListener(
+                (observable, oldValue, newValue) -> {
+                    switch (selectedAiProvider.get()) {
+                        case OPEN_AI -> openAiApiBaseUrl.set(newValue);
+                        case MISTRAL_AI -> mistralAiApiBaseUrl.set(newValue);
+                        case GEMINI -> geminiApiBaseUrl.set(newValue);
+                        case HUGGING_FACE -> huggingFaceApiBaseUrl.set(newValue);
+                    }
+                });
+
+        this.apiKeyValidator =
+                new FunctionBasedValidator<>(
+                        currentApiKey,
+                        token -> !StringUtil.isBlank(token),
+                        ValidationMessage.error(
+                                Localization.lang("An API key has to be provided")));
+
+        this.chatModelValidator =
+                new FunctionBasedValidator<>(
+                        currentChatModel,
+                        chatModel -> !StringUtil.isBlank(chatModel),
+                        ValidationMessage.error(
+                                Localization.lang("Chat model has to be provided")));
+
+        this.apiBaseUrlValidator =
+                new FunctionBasedValidator<>(
+                        currentApiBaseUrl,
+                        token -> !StringUtil.isBlank(token),
+                        ValidationMessage.error(
+                                Localization.lang("API base URL has to be provided")));
+
+        this.embeddingModelValidator =
+                new FunctionBasedValidator<>(
+                        selectedEmbeddingModel,
+                        Objects::nonNull,
+                        ValidationMessage.error(
+                                Localization.lang("Embedding model has to be provided")));
+
+        this.instructionValidator =
+                new FunctionBasedValidator<>(
+                        instruction,
+                        message -> !StringUtil.isBlank(message),
+                        ValidationMessage.error(
+                                Localization.lang("The instruction has to be provided")));
+
+        this.temperatureTypeValidator =
+                new FunctionBasedValidator<>(
+                        temperature,
+                        temp -> LocalizedNumbers.stringToDouble(temp).isPresent(),
+                        ValidationMessage.error(Localization.lang("Temperature must be a number")));
+
+        // Source:
+        // https://platform.openai.com/docs/api-reference/chat/create#chat-create-temperature
+        this.temperatureRangeValidator =
+                new FunctionBasedValidator<>(
+                        temperature,
+                        temp ->
+                                LocalizedNumbers.stringToDouble(temp)
+                                        .map(t -> t >= 0 && t <= 2)
+                                        .orElse(false),
+                        ValidationMessage.error(
+                                Localization.lang("Temperature must be between 0 and 2")));
+
+        this.contextWindowSizeValidator =
+                new FunctionBasedValidator<>(
+                        contextWindowSize,
+                        size -> size.intValue() > 0,
+                        ValidationMessage.error(
+                                Localization.lang("Context window size must be greater than 0")));
+
+        this.documentSplitterChunkSizeValidator =
+                new FunctionBasedValidator<>(
+                        documentSplitterChunkSize,
+                        size -> size.intValue() > 0,
+                        ValidationMessage.error(
+                                Localization.lang(
+                                        "Document splitter chunk size must be greater than 0")));
+
+        this.documentSplitterOverlapSizeValidator =
+                new FunctionBasedValidator<>(
+                        documentSplitterOverlapSize,
+                        size ->
+                                size.intValue() > 0
+                                        && size.intValue() < documentSplitterChunkSize.get(),
+                        ValidationMessage.error(
+                                Localization.lang(
+                                        "Document splitter overlap size must be greater than 0 and less than chunk size")));
+
+        this.ragMaxResultsCountValidator =
+                new FunctionBasedValidator<>(
+                        ragMaxResultsCount,
+                        count -> count.intValue() > 0,
+                        ValidationMessage.error(
+                                Localization.lang("RAG max results count must be greater than 0")));
+
+        this.ragMinScoreTypeValidator =
+                new FunctionBasedValidator<>(
+                        ragMinScore,
+                        minScore -> LocalizedNumbers.stringToDouble(minScore).isPresent(),
+                        ValidationMessage.error(
+                                Localization.lang("RAG minimum score must be a number")));
+
+        this.ragMinScoreRangeValidator =
+                new FunctionBasedValidator<>(
+                        ragMinScore,
+                        minScore ->
+                                LocalizedNumbers.stringToDouble(minScore)
+                                        .map(s -> s > 0 && s < 1)
+                                        .orElse(false),
+                        ValidationMessage.error(
+                                Localization.lang(
+                                        "RAG minimum score must be greater than 0 and less than 1")));
     }
 
     @Override
@@ -316,15 +369,24 @@ public void storeSettings() {
 
         aiPreferences.setAiProvider(selectedAiProvider.get());
 
-        aiPreferences.setOpenAiChatModel(openAiChatModel.get() == null ? "" : openAiChatModel.get());
-        aiPreferences.setMistralAiChatModel(mistralAiChatModel.get() == null ? "" : mistralAiChatModel.get());
-        aiPreferences.setGeminiChatModel(geminiChatModel.get() == null ? "" : geminiChatModel.get());
-        aiPreferences.setHuggingFaceChatModel(huggingFaceChatModel.get() == null ? "" : huggingFaceChatModel.get());
-
-        aiPreferences.storeAiApiKeyInKeyring(AiProvider.OPEN_AI, openAiApiKey.get() == null ? "" : openAiApiKey.get());
-        aiPreferences.storeAiApiKeyInKeyring(AiProvider.MISTRAL_AI, mistralAiApiKey.get() == null ? "" : mistralAiApiKey.get());
-        aiPreferences.storeAiApiKeyInKeyring(AiProvider.GEMINI, geminiAiApiKey.get() == null ? "" : geminiAiApiKey.get());
-        aiPreferences.storeAiApiKeyInKeyring(AiProvider.HUGGING_FACE, huggingFaceApiKey.get() == null ? "" : huggingFaceApiKey.get());
+        aiPreferences.setOpenAiChatModel(
+                openAiChatModel.get() == null ? "" : openAiChatModel.get());
+        aiPreferences.setMistralAiChatModel(
+                mistralAiChatModel.get() == null ? "" : mistralAiChatModel.get());
+        aiPreferences.setGeminiChatModel(
+                geminiChatModel.get() == null ? "" : geminiChatModel.get());
+        aiPreferences.setHuggingFaceChatModel(
+                huggingFaceChatModel.get() == null ? "" : huggingFaceChatModel.get());
+
+        aiPreferences.storeAiApiKeyInKeyring(
+                AiProvider.OPEN_AI, openAiApiKey.get() == null ? "" : openAiApiKey.get());
+        aiPreferences.storeAiApiKeyInKeyring(
+                AiProvider.MISTRAL_AI, mistralAiApiKey.get() == null ? "" : mistralAiApiKey.get());
+        aiPreferences.storeAiApiKeyInKeyring(
+                AiProvider.GEMINI, geminiAiApiKey.get() == null ? "" : geminiAiApiKey.get());
+        aiPreferences.storeAiApiKeyInKeyring(
+                AiProvider.HUGGING_FACE,
+                huggingFaceApiKey.get() == null ? "" : huggingFaceApiKey.get());
         // We notify in all cases without a real check if something was changed
         aiPreferences.apiKeyUpdated();
 
@@ -332,28 +394,39 @@ public void storeSettings() {
 
         aiPreferences.setEmbeddingModel(selectedEmbeddingModel.get());
 
-        aiPreferences.setOpenAiApiBaseUrl(openAiApiBaseUrl.get() == null ? "" : openAiApiBaseUrl.get());
-        aiPreferences.setMistralAiApiBaseUrl(mistralAiApiBaseUrl.get() == null ? "" : mistralAiApiBaseUrl.get());
-        aiPreferences.setGeminiApiBaseUrl(geminiApiBaseUrl.get() == null ? "" : geminiApiBaseUrl.get());
-        aiPreferences.setHuggingFaceApiBaseUrl(huggingFaceApiBaseUrl.get() == null ? "" : huggingFaceApiBaseUrl.get());
+        aiPreferences.setOpenAiApiBaseUrl(
+                openAiApiBaseUrl.get() == null ? "" : openAiApiBaseUrl.get());
+        aiPreferences.setMistralAiApiBaseUrl(
+                mistralAiApiBaseUrl.get() == null ? "" : mistralAiApiBaseUrl.get());
+        aiPreferences.setGeminiApiBaseUrl(
+                geminiApiBaseUrl.get() == null ? "" : geminiApiBaseUrl.get());
+        aiPreferences.setHuggingFaceApiBaseUrl(
+                huggingFaceApiBaseUrl.get() == null ? "" : huggingFaceApiBaseUrl.get());
 
         aiPreferences.setInstruction(instruction.get());
-        // We already check the correctness of temperature and RAG minimum score in validators, so we don't need to check it here.
-        aiPreferences.setTemperature(LocalizedNumbers.stringToDouble(oldLocale, temperature.get()).get());
+        // We already check the correctness of temperature and RAG minimum score in validators, so
+        // we don't need to check it here.
+        aiPreferences.setTemperature(
+                LocalizedNumbers.stringToDouble(oldLocale, temperature.get()).get());
         aiPreferences.setContextWindowSize(contextWindowSize.get());
         aiPreferences.setDocumentSplitterChunkSize(documentSplitterChunkSize.get());
         aiPreferences.setDocumentSplitterOverlapSize(documentSplitterOverlapSize.get());
         aiPreferences.setRagMaxResultsCount(ragMaxResultsCount.get());
-        aiPreferences.setRagMinScore(LocalizedNumbers.stringToDouble(oldLocale, ragMinScore.get()).get());
+        aiPreferences.setRagMinScore(
+                LocalizedNumbers.stringToDouble(oldLocale, ragMinScore.get()).get());
     }
 
     public void resetExpertSettings() {
-        String resetApiBaseUrl = AiDefaultPreferences.PROVIDERS_API_URLS.get(selectedAiProvider.get());
+        String resetApiBaseUrl =
+                AiDefaultPreferences.PROVIDERS_API_URLS.get(selectedAiProvider.get());
         currentApiBaseUrl.set(resetApiBaseUrl);
 
         instruction.set(AiDefaultPreferences.SYSTEM_MESSAGE);
 
-        int resetContextWindowSize = AiDefaultPreferences.CONTEXT_WINDOW_SIZES.getOrDefault(selectedAiProvider.get(), Map.of()).getOrDefault(currentChatModel.get(), 0);
+        int resetContextWindowSize =
+                AiDefaultPreferences.CONTEXT_WINDOW_SIZES
+                        .getOrDefault(selectedAiProvider.get(), Map.of())
+                        .getOrDefault(currentChatModel.get(), 0);
         contextWindowSize.set(resetContextWindowSize);
 
         temperature.set(LocalizedNumbers.doubleToString(AiDefaultPreferences.TEMPERATURE));
@@ -377,30 +450,36 @@ public boolean validateSettings() {
     }
 
     public boolean validateBasicSettings() {
-        List<Validator> validators = List.of(
-                chatModelValidator
-                // apiKeyValidator -- skipped, it will generate warning, but the preferences should be able to save.
-        );
+        List<Validator> validators =
+                List.of(
+                        chatModelValidator
+                        // apiKeyValidator -- skipped, it will generate warning, but the preferences
+                        // should be able to save.
+                        );
 
-        return validators.stream().map(Validator::getValidationStatus).allMatch(ValidationStatus::isValid);
+        return validators.stream()
+                .map(Validator::getValidationStatus)
+                .allMatch(ValidationStatus::isValid);
     }
 
     public boolean validateExpertSettings() {
-        List<Validator> validators = List.of(
-                apiBaseUrlValidator,
-                embeddingModelValidator,
-                instructionValidator,
-                temperatureTypeValidator,
-                temperatureRangeValidator,
-                contextWindowSizeValidator,
-                documentSplitterChunkSizeValidator,
-                documentSplitterOverlapSizeValidator,
-                ragMaxResultsCountValidator,
-                ragMinScoreTypeValidator,
-                ragMinScoreRangeValidator
-        );
-
-        return validators.stream().map(Validator::getValidationStatus).allMatch(ValidationStatus::isValid);
+        List<Validator> validators =
+                List.of(
+                        apiBaseUrlValidator,
+                        embeddingModelValidator,
+                        instructionValidator,
+                        temperatureTypeValidator,
+                        temperatureRangeValidator,
+                        contextWindowSizeValidator,
+                        documentSplitterChunkSizeValidator,
+                        documentSplitterOverlapSizeValidator,
+                        ragMaxResultsCountValidator,
+                        ragMinScoreTypeValidator,
+                        ragMinScoreRangeValidator);
+
+        return validators.stream()
+                .map(Validator::getValidationStatus)
+                .allMatch(ValidationStatus::isValid);
     }
 
     public BooleanProperty enableAi() {
diff --git a/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.java b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.java
index d8837eb0443c..91549fd32fc6 100644
--- a/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.java
+++ b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.preferences.autocompletion;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.dlsc.gemsfx.TagsField;
+
 import javafx.css.PseudoClass;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
@@ -15,10 +18,8 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.dlsc.gemsfx.TagsField;
-
-public class AutoCompletionTab extends AbstractPreferenceTabView<AutoCompletionTabViewModel> implements PreferencesTab {
+public class AutoCompletionTab extends AbstractPreferenceTabView<AutoCompletionTabViewModel>
+        implements PreferencesTab {
     private static final PseudoClass FOCUSED = PseudoClass.getPseudoClass("focused");
 
     @FXML private CheckBox enableAutoComplete;
@@ -31,9 +32,7 @@ public class AutoCompletionTab extends AbstractPreferenceTabView<AutoCompletionT
     @FXML private RadioButton firstNameModeBoth;
 
     public AutoCompletionTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -44,26 +43,46 @@ public String getTabName() {
     public void initialize() {
         viewModel = new AutoCompletionTabViewModel(preferences.getAutoCompletePreferences());
         setupTagsFiled();
-        enableAutoComplete.selectedProperty().bindBidirectional(viewModel.enableAutoCompleteProperty());
-        autoCompleteFirstLast.selectedProperty().bindBidirectional(viewModel.autoCompleteFirstLastProperty());
-        autoCompleteLastFirst.selectedProperty().bindBidirectional(viewModel.autoCompleteLastFirstProperty());
+        enableAutoComplete
+                .selectedProperty()
+                .bindBidirectional(viewModel.enableAutoCompleteProperty());
+        autoCompleteFirstLast
+                .selectedProperty()
+                .bindBidirectional(viewModel.autoCompleteFirstLastProperty());
+        autoCompleteLastFirst
+                .selectedProperty()
+                .bindBidirectional(viewModel.autoCompleteLastFirstProperty());
         autoCompleteBoth.selectedProperty().bindBidirectional(viewModel.autoCompleteBothProperty());
-        firstNameModeAbbreviated.selectedProperty().bindBidirectional(viewModel.firstNameModeAbbreviatedProperty());
-        firstNameModeFull.selectedProperty().bindBidirectional(viewModel.firstNameModeFullProperty());
-        firstNameModeBoth.selectedProperty().bindBidirectional(viewModel.firstNameModeBothProperty());
+        firstNameModeAbbreviated
+                .selectedProperty()
+                .bindBidirectional(viewModel.firstNameModeAbbreviatedProperty());
+        firstNameModeFull
+                .selectedProperty()
+                .bindBidirectional(viewModel.firstNameModeFullProperty());
+        firstNameModeBoth
+                .selectedProperty()
+                .bindBidirectional(viewModel.firstNameModeBothProperty());
     }
 
     private void setupTagsFiled() {
-        autoCompleteFields.setCellFactory(new ViewModelListCellFactory<Field>().withText(Field::getDisplayName));
-        autoCompleteFields.setSuggestionProvider(request -> viewModel.getSuggestions(request.getUserText()));
+        autoCompleteFields.setCellFactory(
+                new ViewModelListCellFactory<Field>().withText(Field::getDisplayName));
+        autoCompleteFields.setSuggestionProvider(
+                request -> viewModel.getSuggestions(request.getUserText()));
         autoCompleteFields.tagsProperty().bindBidirectional(viewModel.autoCompleteFieldsProperty());
         autoCompleteFields.setConverter(viewModel.getFieldStringConverter());
         autoCompleteFields.setTagViewFactory(this::createTag);
         autoCompleteFields.setShowSearchIcon(false);
-        autoCompleteFields.setOnMouseClicked(event -> autoCompleteFields.getEditor().requestFocus());
+        autoCompleteFields.setOnMouseClicked(
+                event -> autoCompleteFields.getEditor().requestFocus());
         autoCompleteFields.getEditor().getStyleClass().clear();
         autoCompleteFields.getEditor().getStyleClass().add("tags-field-editor");
-        autoCompleteFields.getEditor().focusedProperty().addListener((observable, oldValue, newValue) -> autoCompleteFields.pseudoClassStateChanged(FOCUSED, newValue));
+        autoCompleteFields
+                .getEditor()
+                .focusedProperty()
+                .addListener(
+                        (observable, oldValue, newValue) ->
+                                autoCompleteFields.pseudoClassStateChanged(FOCUSED, newValue));
     }
 
     private Node createTag(Field field) {
diff --git a/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTabViewModel.java b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTabViewModel.java
index 125b1a7b8300..58a424984b0a 100644
--- a/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTabViewModel.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.preferences.autocompletion;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -18,10 +14,15 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class AutoCompletionTabViewModel implements PreferenceTabViewModel {
 
     private final BooleanProperty enableAutoCompleteProperty = new SimpleBooleanProperty();
-    private final ListProperty<Field> autoCompleteFieldsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<Field> autoCompleteFieldsProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
     private final BooleanProperty autoCompleteFirstLastProperty = new SimpleBooleanProperty();
     private final BooleanProperty autoCompleteLastFirstProperty = new SimpleBooleanProperty();
     private final BooleanProperty autoCompleteBothProperty = new SimpleBooleanProperty();
@@ -40,10 +41,13 @@ public AutoCompletionTabViewModel(AutoCompletePreferences autoCompletePreference
     @Override
     public void setValues() {
         enableAutoCompleteProperty.setValue(autoCompletePreferences.shouldAutoComplete());
-        autoCompleteFieldsProperty.setValue(FXCollections.observableArrayList(autoCompletePreferences.getCompleteFields()));
-        if (autoCompletePreferences.getNameFormat() == AutoCompletePreferences.NameFormat.FIRST_LAST) {
+        autoCompleteFieldsProperty.setValue(
+                FXCollections.observableArrayList(autoCompletePreferences.getCompleteFields()));
+        if (autoCompletePreferences.getNameFormat()
+                == AutoCompletePreferences.NameFormat.FIRST_LAST) {
             autoCompleteFirstLastProperty.setValue(true);
-        } else if (autoCompletePreferences.getNameFormat() == AutoCompletePreferences.NameFormat.LAST_FIRST) {
+        } else if (autoCompletePreferences.getNameFormat()
+                == AutoCompletePreferences.NameFormat.LAST_FIRST) {
             autoCompleteLastFirstProperty.setValue(true);
         } else {
             autoCompleteBothProperty.setValue(true);
@@ -141,7 +145,11 @@ public Field fromString(String string) {
 
     public List<Field> getSuggestions(String request) {
         return FieldFactory.getAllFieldsWithOutInternal().stream()
-                           .filter(field -> field.getDisplayName().toLowerCase().contains(request.toLowerCase()))
-                           .collect(Collectors.toList());
+                .filter(
+                        field ->
+                                field.getDisplayName()
+                                        .toLowerCase()
+                                        .contains(request.toLowerCase()))
+                .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java
index 99133e31a1ce..a4f4cc5711d3 100644
--- a/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java
+++ b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.preferences.citationkeypattern;
 
+import com.airhacks.afterburner.injection.Injector;
+import com.airhacks.afterburner.views.ViewLoader;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
@@ -16,10 +19,8 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntryTypesManager;
 
-import com.airhacks.afterburner.injection.Injector;
-import com.airhacks.afterburner.views.ViewLoader;
-
-public class CitationKeyPatternTab extends AbstractPreferenceTabView<CitationKeyPatternTabViewModel> implements PreferencesTab {
+public class CitationKeyPatternTab extends AbstractPreferenceTabView<CitationKeyPatternTabViewModel>
+        implements PreferencesTab {
 
     @FXML private CheckBox overwriteAllow;
     @FXML private CheckBox overwriteWarning;
@@ -34,9 +35,7 @@ public class CitationKeyPatternTab extends AbstractPreferenceTabView<CitationKey
     @FXML private CitationKeyPatternsPanel bibtexKeyPatternTable;
 
     public CitationKeyPatternTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -45,7 +44,8 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new CitationKeyPatternTabViewModel(preferences.getCitationKeyPatternPreferences());
+        this.viewModel =
+                new CitationKeyPatternTabViewModel(preferences.getCitationKeyPatternPreferences());
 
         overwriteAllow.selectedProperty().bindBidirectional(viewModel.overwriteAllowProperty());
         overwriteWarning.selectedProperty().bindBidirectional(viewModel.overwriteWarningProperty());
@@ -54,22 +54,36 @@ public void initialize() {
         letterStartB.selectedProperty().bindBidirectional(viewModel.letterStartBProperty());
         letterAlwaysAdd.selectedProperty().bindBidirectional(viewModel.letterAlwaysAddProperty());
         keyPatternRegex.textProperty().bindBidirectional(viewModel.keyPatternRegexProperty());
-        keyPatternReplacement.textProperty().bindBidirectional(viewModel.keyPatternReplacementProperty());
+        keyPatternReplacement
+                .textProperty()
+                .bindBidirectional(viewModel.keyPatternReplacementProperty());
         unwantedCharacters.textProperty().bindBidirectional(viewModel.unwantedCharactersProperty());
 
-        bibtexKeyPatternTable.patternListProperty().bindBidirectional(viewModel.patternListProperty());
-        bibtexKeyPatternTable.defaultKeyPatternProperty().bindBidirectional(viewModel.defaultKeyPatternProperty());
+        bibtexKeyPatternTable
+                .patternListProperty()
+                .bindBidirectional(viewModel.patternListProperty());
+        bibtexKeyPatternTable
+                .defaultKeyPatternProperty()
+                .bindBidirectional(viewModel.defaultKeyPatternProperty());
 
         ActionFactory actionFactory = new ActionFactory();
-        actionFactory.configureIconButton(StandardActions.HELP_KEY_PATTERNS, new HelpAction(HelpFile.CITATION_KEY_PATTERN, dialogService, preferences.getExternalApplicationsPreferences()), keyPatternHelp);
+        actionFactory.configureIconButton(
+                StandardActions.HELP_KEY_PATTERNS,
+                new HelpAction(
+                        HelpFile.CITATION_KEY_PATTERN,
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences()),
+                keyPatternHelp);
     }
 
     @Override
     public void setValues() {
         viewModel.setValues();
-        BibEntryTypesManager entryTypesManager = Injector.instantiateModelOrService(BibEntryTypesManager.class);
+        BibEntryTypesManager entryTypesManager =
+                Injector.instantiateModelOrService(BibEntryTypesManager.class);
         bibtexKeyPatternTable.setValues(
-                entryTypesManager.getAllTypes(preferences.getLibraryPreferences().getDefaultBibDatabaseMode()),
+                entryTypesManager.getAllTypes(
+                        preferences.getLibraryPreferences().getDefaultBibDatabaseMode()),
                 preferences.getCitationKeyPatternPreferences().getKeyPatterns());
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTabViewModel.java b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTabViewModel.java
index c653e840ba7b..7f7572746542 100644
--- a/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTabViewModel.java
@@ -28,11 +28,16 @@ public class CitationKeyPatternTabViewModel implements PreferenceTabViewModel {
     private final StringProperty keyPatternReplacementProperty = new SimpleStringProperty();
     private final StringProperty unwantedCharactersProperty = new SimpleStringProperty();
 
-    // The list and the default properties are being overwritten by the bound properties of the tableView, but to
-    // prevent an NPE on storing the preferences before lazy-loading of the setValues, they need to be initialized.
-    private final ListProperty<CitationKeyPatternsPanelItemModel> patternListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<CitationKeyPatternsPanelItemModel> defaultKeyPatternProperty = new SimpleObjectProperty<>(
-            new CitationKeyPatternsPanelItemModel(new CitationKeyPatternsPanelViewModel.DefaultEntryType(), ""));
+    // The list and the default properties are being overwritten by the bound properties of the
+    // tableView, but to
+    // prevent an NPE on storing the preferences before lazy-loading of the setValues, they need to
+    // be initialized.
+    private final ListProperty<CitationKeyPatternsPanelItemModel> patternListProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<CitationKeyPatternsPanelItemModel> defaultKeyPatternProperty =
+            new SimpleObjectProperty<>(
+                    new CitationKeyPatternsPanelItemModel(
+                            new CitationKeyPatternsPanelViewModel.DefaultEntryType(), ""));
 
     private final CitationKeyPatternPreferences keyPatternPreferences;
 
@@ -70,23 +75,27 @@ public void setValues() {
     @Override
     public void storeSettings() {
         GlobalCitationKeyPatterns newKeyPattern =
-                new GlobalCitationKeyPatterns(keyPatternPreferences.getKeyPatterns().getDefaultValue());
-        patternListProperty.forEach(item -> {
-            String patternString = item.getPattern();
-            if (!"default".equals(item.getEntryType().getName())) {
-                if (!patternString.trim().isEmpty()) {
-                    newKeyPattern.addCitationKeyPattern(item.getEntryType(), patternString);
-                }
-            }
-        });
+                new GlobalCitationKeyPatterns(
+                        keyPatternPreferences.getKeyPatterns().getDefaultValue());
+        patternListProperty.forEach(
+                item -> {
+                    String patternString = item.getPattern();
+                    if (!"default".equals(item.getEntryType().getName())) {
+                        if (!patternString.trim().isEmpty()) {
+                            newKeyPattern.addCitationKeyPattern(item.getEntryType(), patternString);
+                        }
+                    }
+                });
 
         if (!defaultKeyPatternProperty.getValue().getPattern().trim().isEmpty()) {
-            // we do not trim the value at the assignment to enable users to have spaces at the beginning and
+            // we do not trim the value at the assignment to enable users to have spaces at the
+            // beginning and
             // at the end of the pattern
             newKeyPattern.setDefaultValue(defaultKeyPatternProperty.getValue().getPattern());
         }
 
-        CitationKeyPatternPreferences.KeySuffix keySuffix = CitationKeyPatternPreferences.KeySuffix.ALWAYS;
+        CitationKeyPatternPreferences.KeySuffix keySuffix =
+                CitationKeyPatternPreferences.KeySuffix.ALWAYS;
 
         if (letterStartAProperty.getValue()) {
             keySuffix = CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A;
diff --git a/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypeViewModel.java b/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypeViewModel.java
index 45dbb9ad7963..38edd02cbe93 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypeViewModel.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.preferences.customentrytypes;
 
-import java.util.function.Predicate;
-
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.field.Field;
 
+import java.util.function.Predicate;
+
 /**
  * This class is required to check whether a delete button should be displayed at {@link org.jabref.gui.preferences.customentrytypes.CustomEntryTypesTab#setupEntryTypesTable()}
  */
diff --git a/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTab.java b/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTab.java
index 8bdd84d2b02c..e867053a7d21 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTab.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTab.java
@@ -1,5 +1,12 @@
 package org.jabref.gui.preferences.customentrytypes;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+import jakarta.inject.Inject;
+
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.ObservableList;
@@ -36,12 +43,8 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import jakarta.inject.Inject;
-
-public class CustomEntryTypesTab extends AbstractPreferenceTabView<CustomEntryTypesTabViewModel> implements PreferencesTab {
+public class CustomEntryTypesTab extends AbstractPreferenceTabView<CustomEntryTypesTabViewModel>
+        implements PreferencesTab {
 
     @FXML private TableView<EntryTypeViewModel> entryTypesTable;
     @FXML private TableColumn<EntryTypeViewModel, String> entryTypColumn;
@@ -63,9 +66,7 @@ public class CustomEntryTypesTab extends AbstractPreferenceTabView<CustomEntryTy
     private CustomLocalDragboard localDragboard;
 
     public CustomEntryTypesTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -74,11 +75,16 @@ public String getTabName() {
     }
 
     public void initialize() {
-        BibDatabaseMode mode = stateManager.getActiveDatabase().map(BibDatabaseContext::getMode)
-                                           .orElse(preferences.getLibraryPreferences().getDefaultBibDatabaseMode());
+        BibDatabaseMode mode =
+                stateManager
+                        .getActiveDatabase()
+                        .map(BibDatabaseContext::getMode)
+                        .orElse(preferences.getLibraryPreferences().getDefaultBibDatabaseMode());
         BibEntryTypesManager entryTypesRepository = preferences.getCustomEntryTypesRepository();
 
-        this.viewModel = new CustomEntryTypesTabViewModel(mode, entryTypesRepository, dialogService, preferences);
+        this.viewModel =
+                new CustomEntryTypesTabViewModel(
+                        mode, entryTypesRepository, dialogService, preferences);
 
         // As the state manager gets injected it's not available in the constructor
         this.localDragboard = stateManager.getLocalDragboard();
@@ -86,108 +92,154 @@ public void initialize() {
         setupEntryTypesTable();
         setupFieldsTable();
 
-        addNewEntryTypeButton.disableProperty().bind(viewModel.entryTypeValidationStatus().validProperty().not());
-        addNewFieldButton.disableProperty().bind(viewModel.fieldValidationStatus().validProperty().not().or(viewModel.selectedEntryTypeProperty().isNull()));
-
-        Platform.runLater(() -> {
-            visualizer.initVisualization(viewModel.entryTypeValidationStatus(), addNewEntryType, true);
-            visualizer.initVisualization(viewModel.fieldValidationStatus(), addNewField, true);
-        });
+        addNewEntryTypeButton
+                .disableProperty()
+                .bind(viewModel.entryTypeValidationStatus().validProperty().not());
+        addNewFieldButton
+                .disableProperty()
+                .bind(
+                        viewModel
+                                .fieldValidationStatus()
+                                .validProperty()
+                                .not()
+                                .or(viewModel.selectedEntryTypeProperty().isNull()));
+
+        Platform.runLater(
+                () -> {
+                    visualizer.initVisualization(
+                            viewModel.entryTypeValidationStatus(), addNewEntryType, true);
+                    visualizer.initVisualization(
+                            viewModel.fieldValidationStatus(), addNewField, true);
+                });
     }
 
     private void setupEntryTypesTable() {
-        // Table View must be editable, otherwise the change of the Radiobuttons does not propagate the commit event
+        // Table View must be editable, otherwise the change of the Radiobuttons does not propagate
+        // the commit event
         fields.setEditable(true);
-        entryTypColumn.setCellValueFactory(cellData -> new ReadOnlyStringWrapper(cellData.getValue().entryType().get().getType().getDisplayName()));
+        entryTypColumn.setCellValueFactory(
+                cellData ->
+                        new ReadOnlyStringWrapper(
+                                cellData.getValue().entryType().get().getType().getDisplayName()));
         entryTypesTable.setItems(viewModel.entryTypes());
         entryTypesTable.getSelectionModel().selectFirst();
 
         entryTypeActionsColumn.setSortable(false);
         entryTypeActionsColumn.setReorderable(false);
-        entryTypeActionsColumn.setCellValueFactory(cellData -> new ReadOnlyStringWrapper(cellData.getValue().entryType().get().getType().getDisplayName()));
+        entryTypeActionsColumn.setCellValueFactory(
+                cellData ->
+                        new ReadOnlyStringWrapper(
+                                cellData.getValue().entryType().get().getType().getDisplayName()));
         new ValueTableCellFactory<EntryTypeViewModel, String>()
-                .withGraphic((type, name) -> {
-                    if (type instanceof CustomEntryTypeViewModel) {
-                        return IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode();
-                    } else {
-                        return null;
-                    }
-                })
-                .withTooltip((type, name) -> {
-                    if (type instanceof CustomEntryTypeViewModel) {
-                        return Localization.lang("Remove entry type") + " " + name;
-                    } else {
-                        return null;
-                    }
-                })
-                .withOnMouseClickedEvent((type, name) -> {
-                    if (type instanceof CustomEntryTypeViewModel) {
-                        return evt -> viewModel.removeEntryType(entryTypesTable.getSelectionModel().getSelectedItem());
-                    } else {
-                        return evt -> {
-                        };
-                    }
-                })
+                .withGraphic(
+                        (type, name) -> {
+                            if (type instanceof CustomEntryTypeViewModel) {
+                                return IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode();
+                            } else {
+                                return null;
+                            }
+                        })
+                .withTooltip(
+                        (type, name) -> {
+                            if (type instanceof CustomEntryTypeViewModel) {
+                                return Localization.lang("Remove entry type") + " " + name;
+                            } else {
+                                return null;
+                            }
+                        })
+                .withOnMouseClickedEvent(
+                        (type, name) -> {
+                            if (type instanceof CustomEntryTypeViewModel) {
+                                return evt ->
+                                        viewModel.removeEntryType(
+                                                entryTypesTable
+                                                        .getSelectionModel()
+                                                        .getSelectedItem());
+                            } else {
+                                return evt -> {};
+                            }
+                        })
                 .install(entryTypeActionsColumn);
 
-        viewModel.selectedEntryTypeProperty().bind(entryTypesTable.getSelectionModel().selectedItemProperty());
+        viewModel
+                .selectedEntryTypeProperty()
+                .bind(entryTypesTable.getSelectionModel().selectedItemProperty());
         viewModel.entryTypeToAddProperty().bindBidirectional(addNewEntryType.textProperty());
 
-        EasyBind.subscribe(viewModel.selectedEntryTypeProperty(), type -> {
-            if (type != null) {
-                var items = type.fields();
-                fields.setItems(items);
-            } else {
-                fields.setItems(null);
-            }
-        });
+        EasyBind.subscribe(
+                viewModel.selectedEntryTypeProperty(),
+                type -> {
+                    if (type != null) {
+                        var items = type.fields();
+                        fields.setItems(items);
+                    } else {
+                        fields.setItems(null);
+                    }
+                });
     }
 
     private void setupFieldsTable() {
         fieldNameColumn.setCellValueFactory(item -> item.getValue().displayNameProperty());
         fieldNameColumn.setCellFactory(TextFieldTableCell.forTableColumn());
         fieldNameColumn.setEditable(true);
-        fieldNameColumn.setOnEditCommit((TableColumn.CellEditEvent<FieldViewModel, String> event) -> {
-            String newDisplayName = event.getNewValue();
-            if (newDisplayName.isBlank()) {
-                dialogService.notify(Localization.lang("Name cannot be empty"));
-                event.getTableView().edit(-1, null);
-                event.getTableView().refresh();
-                return;
-            }
+        fieldNameColumn.setOnEditCommit(
+                (TableColumn.CellEditEvent<FieldViewModel, String> event) -> {
+                    String newDisplayName = event.getNewValue();
+                    if (newDisplayName.isBlank()) {
+                        dialogService.notify(Localization.lang("Name cannot be empty"));
+                        event.getTableView().edit(-1, null);
+                        event.getTableView().refresh();
+                        return;
+                    }
 
-            FieldViewModel fieldViewModel = event.getRowValue();
-            String currentDisplayName = fieldViewModel.displayNameProperty().getValue();
-            EntryTypeViewModel selectedEntryType = viewModel.selectedEntryTypeProperty().get();
-            ObservableList<FieldViewModel> entryFields = selectedEntryType.fields();
-            // The first predicate will check if the user input the original field name or doesn't edit anything after double click
-            boolean fieldExists = !newDisplayName.equals(currentDisplayName) && viewModel.displayNameExists(newDisplayName);
-            if (fieldExists) {
-                dialogService.notify(Localization.lang("Unable to change field name. \"%0\" already in use.", newDisplayName));
-                event.getTableView().edit(-1, null);
-            } else {
-                fieldViewModel.displayNameProperty().setValue(newDisplayName);
-            }
-            event.getTableView().refresh();
-        });
+                    FieldViewModel fieldViewModel = event.getRowValue();
+                    String currentDisplayName = fieldViewModel.displayNameProperty().getValue();
+                    EntryTypeViewModel selectedEntryType =
+                            viewModel.selectedEntryTypeProperty().get();
+                    ObservableList<FieldViewModel> entryFields = selectedEntryType.fields();
+                    // The first predicate will check if the user input the original field name or
+                    // doesn't edit anything after double click
+                    boolean fieldExists =
+                            !newDisplayName.equals(currentDisplayName)
+                                    && viewModel.displayNameExists(newDisplayName);
+                    if (fieldExists) {
+                        dialogService.notify(
+                                Localization.lang(
+                                        "Unable to change field name. \"%0\" already in use.",
+                                        newDisplayName));
+                        event.getTableView().edit(-1, null);
+                    } else {
+                        fieldViewModel.displayNameProperty().setValue(newDisplayName);
+                    }
+                    event.getTableView().refresh();
+                });
 
         fieldTypeColumn.setCellFactory(CheckBoxTableCell.forTableColumn(fieldTypeColumn));
         fieldTypeColumn.setCellValueFactory(item -> item.getValue().requiredProperty());
         makeRotatedColumnHeader(fieldTypeColumn, Localization.lang("Required"));
 
-        fieldTypeMultilineColumn.setCellFactory(CheckBoxTableCell.forTableColumn(fieldTypeMultilineColumn));
+        fieldTypeMultilineColumn.setCellFactory(
+                CheckBoxTableCell.forTableColumn(fieldTypeMultilineColumn));
         fieldTypeMultilineColumn.setCellValueFactory(item -> item.getValue().multilineProperty());
         makeRotatedColumnHeader(fieldTypeMultilineColumn, Localization.lang("Multiline"));
 
         fieldTypeActionColumn.setSortable(false);
         fieldTypeActionColumn.setReorderable(false);
         fieldTypeActionColumn.setEditable(false);
-        fieldTypeActionColumn.setCellValueFactory(cellData -> cellData.getValue().displayNameProperty());
+        fieldTypeActionColumn.setCellValueFactory(
+                cellData -> cellData.getValue().displayNameProperty());
 
         new ValueTableCellFactory<FieldViewModel, String>()
                 .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
-                .withTooltip(name -> Localization.lang("Remove field %0 from currently selected entry type", name))
-                .withOnMouseClickedEvent(item -> evt -> viewModel.removeField(fields.getSelectionModel().getSelectedItem()))
+                .withTooltip(
+                        name ->
+                                Localization.lang(
+                                        "Remove field %0 from currently selected entry type", name))
+                .withOnMouseClickedEvent(
+                        item ->
+                                evt ->
+                                        viewModel.removeField(
+                                                fields.getSelectionModel().getSelectedItem()))
                 .install(fieldTypeActionColumn);
 
         new ViewModelTableRowFactory<FieldViewModel>()
@@ -201,9 +253,12 @@ private void setupFieldsTable() {
         addNewField.setConverter(FieldsUtil.FIELD_STRING_CONVERTER);
 
         viewModel.newFieldToAddProperty().bindBidirectional(addNewField.valueProperty());
-        // The valueProperty() of addNewField ComboBox needs to be updated by typing text in the ComboBox textfield,
+        // The valueProperty() of addNewField ComboBox needs to be updated by typing text in the
+        // ComboBox textfield,
         // since the enabled/disabled state of addNewFieldButton won't update otherwise
-        EasyBind.subscribe(addNewField.getEditor().textProperty(), text -> addNewField.setValue(FieldsUtil.FIELD_STRING_CONVERTER.fromString(text)));
+        EasyBind.subscribe(
+                addNewField.getEditor().textProperty(),
+                text -> addNewField.setValue(FieldsUtil.FIELD_STRING_CONVERTER.fromString(text)));
     }
 
     private void makeRotatedColumnHeader(TableColumn<?, ?> column, String text) {
@@ -215,16 +270,17 @@ private void makeRotatedColumnHeader(TableColumn<?, ?> column, String text) {
         column.getStyleClass().add("rotated");
     }
 
-    private void handleOnDragOver(TableRow<FieldViewModel> row, FieldViewModel originalItem, DragEvent
-            event) {
-        if ((event.getGestureSource() != originalItem) && event.getDragboard().hasContent(DragAndDropDataFormats.FIELD)) {
+    private void handleOnDragOver(
+            TableRow<FieldViewModel> row, FieldViewModel originalItem, DragEvent event) {
+        if ((event.getGestureSource() != originalItem)
+                && event.getDragboard().hasContent(DragAndDropDataFormats.FIELD)) {
             event.acceptTransferModes(TransferMode.MOVE);
             ControlHelper.setDroppingPseudoClasses(row, event);
         }
     }
 
-    private void handleOnDragDetected(TableRow<FieldViewModel> row, FieldViewModel fieldViewModel, MouseEvent
-            event) {
+    private void handleOnDragDetected(
+            TableRow<FieldViewModel> row, FieldViewModel fieldViewModel, MouseEvent event) {
         row.startFullDrag();
         FieldViewModel field = fields.getSelectionModel().getSelectedItem();
 
@@ -236,7 +292,8 @@ private void handleOnDragDetected(TableRow<FieldViewModel> row, FieldViewModel f
         event.consume();
     }
 
-    private void handleOnDragDropped(TableRow<FieldViewModel> row, FieldViewModel originalItem, DragEvent event) {
+    private void handleOnDragDropped(
+            TableRow<FieldViewModel> row, FieldViewModel originalItem, DragEvent event) {
         if (localDragboard.hasType(FieldViewModel.class)) {
             FieldViewModel field = localDragboard.getValue(FieldViewModel.class);
             fields.getItems().remove(field);
@@ -253,7 +310,8 @@ private void handleOnDragDropped(TableRow<FieldViewModel> row, FieldViewModel or
         event.consume();
     }
 
-    private void handleOnDragExited(TableRow<FieldViewModel> row, FieldViewModel fieldViewModel, DragEvent dragEvent) {
+    private void handleOnDragExited(
+            TableRow<FieldViewModel> row, FieldViewModel fieldViewModel, DragEvent dragEvent) {
         ControlHelper.removeDroppingPseudoClasses(row);
     }
 
@@ -271,10 +329,12 @@ void addNewField() {
 
     @FXML
     void resetEntryTypes() {
-        boolean reset = dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Reset entry types and fields to defaults"),
-                Localization.lang("This will reset all entry types to their default values and remove all custom entry types"),
-                Localization.lang("Reset to default"));
+        boolean reset =
+                dialogService.showConfirmationDialogAndWait(
+                        Localization.lang("Reset entry types and fields to defaults"),
+                        Localization.lang(
+                                "This will reset all entry types to their default values and remove all custom entry types"),
+                        Localization.lang("Reset to default"));
         if (reset) {
             viewModel.resetAllCustomEntryTypes();
             fields.getSelectionModel().clearSelection();
diff --git a/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModel.java b/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModel.java
index ea773ee88e97..e240fae58aad 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModel.java
@@ -1,13 +1,9 @@
 package org.jabref.gui.preferences.customentrytypes;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.Observable;
 import javafx.beans.property.ObjectProperty;
@@ -34,18 +30,26 @@
 import org.jabref.model.entry.types.UnknownEntryType;
 import org.jabref.model.strings.StringUtil;
 
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 public class CustomEntryTypesTabViewModel implements PreferenceTabViewModel {
 
-    private final ObservableList<Field> fieldsForAdding = FXCollections.observableArrayList(FieldFactory.getStandardFieldsWithCitationKey());
-    private final ObjectProperty<EntryTypeViewModel> selectedEntryType = new SimpleObjectProperty<>();
+    private final ObservableList<Field> fieldsForAdding =
+            FXCollections.observableArrayList(FieldFactory.getStandardFieldsWithCitationKey());
+    private final ObjectProperty<EntryTypeViewModel> selectedEntryType =
+            new SimpleObjectProperty<>();
     private final StringProperty entryTypeToAdd = new SimpleStringProperty("");
     private final ObjectProperty<Field> newFieldToAdd = new SimpleObjectProperty<>();
-    private final ObservableList<EntryTypeViewModel> entryTypesWithFields = FXCollections.observableArrayList(extractor -> new Observable[]{extractor.entryType(), extractor.fields()});
+    private final ObservableList<EntryTypeViewModel> entryTypesWithFields =
+            FXCollections.observableArrayList(
+                    extractor -> new Observable[] {extractor.entryType(), extractor.fields()});
     private final List<BibEntryType> entryTypesToDelete = new ArrayList<>();
 
     private final CliPreferences preferences;
@@ -57,12 +61,16 @@ public class CustomEntryTypesTabViewModel implements PreferenceTabViewModel {
     private final Validator fieldValidator;
     private final Set<Field> multiLineFields = new HashSet<>();
 
-    Predicate<Field> isMultiline = field -> this.multiLineFields.contains(field) || field.getProperties().contains(FieldProperty.MULTILINE_TEXT);
+    Predicate<Field> isMultiline =
+            field ->
+                    this.multiLineFields.contains(field)
+                            || field.getProperties().contains(FieldProperty.MULTILINE_TEXT);
 
-    public CustomEntryTypesTabViewModel(BibDatabaseMode mode,
-                                        BibEntryTypesManager entryTypesManager,
-                                        DialogService dialogService,
-                                        CliPreferences preferences) {
+    public CustomEntryTypesTabViewModel(
+            BibDatabaseMode mode,
+            BibEntryTypesManager entryTypesManager,
+            DialogService dialogService,
+            CliPreferences preferences) {
         this.preferences = preferences;
         this.entryTypesManager = entryTypesManager;
         this.dialogService = dialogService;
@@ -70,14 +78,19 @@ public CustomEntryTypesTabViewModel(BibDatabaseMode mode,
 
         this.multiLineFields.addAll(preferences.getFieldPreferences().getNonWrappableFields());
 
-        entryTypeValidator = new FunctionBasedValidator<>(
-                entryTypeToAdd,
-                StringUtil::isNotBlank,
-                ValidationMessage.error(Localization.lang("Entry type cannot be empty. Please enter a name.")));
-        fieldValidator = new FunctionBasedValidator<>(
-                newFieldToAdd,
-                input -> (input != null) && StringUtil.isNotBlank(input.getDisplayName()),
-                ValidationMessage.error(Localization.lang("Field cannot be empty. Please enter a name.")));
+        entryTypeValidator =
+                new FunctionBasedValidator<>(
+                        entryTypeToAdd,
+                        StringUtil::isNotBlank,
+                        ValidationMessage.error(
+                                Localization.lang(
+                                        "Entry type cannot be empty. Please enter a name.")));
+        fieldValidator =
+                new FunctionBasedValidator<>(
+                        newFieldToAdd,
+                        input -> (input != null) && StringUtil.isNotBlank(input.getDisplayName()),
+                        ValidationMessage.error(
+                                Localization.lang("Field cannot be empty. Please enter a name.")));
     }
 
     @Override
@@ -108,18 +121,23 @@ public void storeSettings() {
             EntryType newPlainType = type.getType();
 
             // Collect multilineFields for storage in preferences later
-            multilineFields.addAll(allFields.stream()
-                                            .filter(FieldViewModel::isMultiline)
-                                            .map(model -> model.toField(newPlainType))
-                                            .toList());
-
-            List<OrFields> required = allFields.stream()
-                                               .filter(FieldViewModel::isRequired)
-                                               .map(model -> model.toField(newPlainType))
-                                               .map(OrFields::new)
-                                               .collect(Collectors.toList());
-
-            List<BibField> fields = allFields.stream().map(model -> model.toBibField(newPlainType)).collect(Collectors.toList());
+            multilineFields.addAll(
+                    allFields.stream()
+                            .filter(FieldViewModel::isMultiline)
+                            .map(model -> model.toField(newPlainType))
+                            .toList());
+
+            List<OrFields> required =
+                    allFields.stream()
+                            .filter(FieldViewModel::isRequired)
+                            .map(model -> model.toField(newPlainType))
+                            .map(OrFields::new)
+                            .collect(Collectors.toList());
+
+            List<BibField> fields =
+                    allFields.stream()
+                            .map(model -> model.toBibField(newPlainType))
+                            .collect(Collectors.toList());
 
             BibEntryType newType = new BibEntryType(newPlainType, fields, required);
 
@@ -136,7 +154,8 @@ public void storeSettings() {
 
     public EntryTypeViewModel addNewCustomEntryType() {
         EntryType newentryType = new UnknownEntryType(entryTypeToAdd.getValue());
-        BibEntryType type = new BibEntryType(newentryType, new ArrayList<>(), Collections.emptyList());
+        BibEntryType type =
+                new BibEntryType(newentryType, new ArrayList<>(), Collections.emptyList());
         EntryTypeViewModel viewModel = new CustomEntryTypeViewModel(type, isMultiline);
         this.entryTypesWithFields.add(viewModel);
         this.entryTypeToAdd.setValue("");
@@ -156,21 +175,31 @@ public void addNewField() {
         if (fieldExists) {
             dialogService.showWarningDialogAndWait(
                     Localization.lang("Duplicate fields"),
-                    Localization.lang("Warning: You added field \"%0\" twice. Only one will be kept.", field.getDisplayName()));
+                    Localization.lang(
+                            "Warning: You added field \"%0\" twice. Only one will be kept.",
+                            field.getDisplayName()));
         } else {
-            this.selectedEntryType.getValue().addField(new FieldViewModel(
-                    field,
-                    FieldViewModel.Mandatory.REQUIRED,
-                    FieldPriority.IMPORTANT,
-                    false));
+            this.selectedEntryType
+                    .getValue()
+                    .addField(
+                            new FieldViewModel(
+                                    field,
+                                    FieldViewModel.Mandatory.REQUIRED,
+                                    FieldPriority.IMPORTANT,
+                                    false));
         }
         newFieldToAddProperty().setValue(null);
     }
 
     public boolean displayNameExists(String displayName) {
         ObservableList<FieldViewModel> entryFields = this.selectedEntryType.getValue().fields();
-        return entryFields.stream().anyMatch(fieldViewModel ->
-                fieldViewModel.displayNameProperty().getValue().equals(displayName));
+        return entryFields.stream()
+                .anyMatch(
+                        fieldViewModel ->
+                                fieldViewModel
+                                        .displayNameProperty()
+                                        .getValue()
+                                        .equals(displayName));
     }
 
     public void removeField(FieldViewModel focusedItem) {
diff --git a/src/main/java/org/jabref/gui/preferences/customentrytypes/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/preferences/customentrytypes/EntryTypeViewModel.java
index 11c99161151a..5a5db08aab97 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/EntryTypeViewModel.java
@@ -1,9 +1,6 @@
 package org.jabref.gui.preferences.customentrytypes;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
+import static org.jabref.gui.preferences.customentrytypes.FieldViewModel.Mandatory;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -13,7 +10,10 @@
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.field.Field;
 
-import static org.jabref.gui.preferences.customentrytypes.FieldViewModel.Mandatory;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 public class EntryTypeViewModel {
 
@@ -22,12 +22,18 @@ public class EntryTypeViewModel {
 
     public EntryTypeViewModel(BibEntryType entryType, Predicate<Field> isMultiline) {
         this.entryType.set(entryType);
-        List<FieldViewModel> allFieldsForType = entryType.getAllBibFields()
-                       .stream().map(bibField -> new FieldViewModel(bibField.field(),
-                                   entryType.isRequired(bibField.field()) ? Mandatory.REQUIRED : Mandatory.OPTIONAL,
-                                   bibField.priority(),
-                                   isMultiline.test(bibField.field())))
-                                                 .collect(Collectors.toList());
+        List<FieldViewModel> allFieldsForType =
+                entryType.getAllBibFields().stream()
+                        .map(
+                                bibField ->
+                                        new FieldViewModel(
+                                                bibField.field(),
+                                                entryType.isRequired(bibField.field())
+                                                        ? Mandatory.REQUIRED
+                                                        : Mandatory.OPTIONAL,
+                                                bibField.priority(),
+                                                isMultiline.test(bibField.field())))
+                        .collect(Collectors.toList());
         fields = FXCollections.observableArrayList(allFieldsForType);
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/customentrytypes/FieldViewModel.java b/src/main/java/org/jabref/gui/preferences/customentrytypes/FieldViewModel.java
index ae987a276524..c9220674d05d 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/FieldViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/FieldViewModel.java
@@ -22,10 +22,8 @@ public class FieldViewModel {
     private final BooleanProperty multiline = new SimpleBooleanProperty();
     private final ObjectProperty<FieldPriority> priorityProperty = new SimpleObjectProperty<>();
 
-    public FieldViewModel(Field field,
-                          Mandatory required,
-                          FieldPriority priorityProperty,
-                          boolean multiline) {
+    public FieldViewModel(
+            Field field, Mandatory required, FieldPriority priorityProperty, boolean multiline) {
         this.displayName.setValue(field.getDisplayName());
         this.required.setValue(required == Mandatory.REQUIRED);
         this.priorityProperty.setValue(priorityProperty);
diff --git a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java
index f5b409f6002d..73b4b244c63a 100644
--- a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java
+++ b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.preferences.customexporter;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TableColumn;
@@ -10,10 +13,8 @@
 import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-
-public class CustomExporterTab extends AbstractPreferenceTabView<CustomExporterTabViewModel> implements PreferencesTab {
+public class CustomExporterTab extends AbstractPreferenceTabView<CustomExporterTabViewModel>
+        implements PreferencesTab {
 
     @FXML private TableView<ExporterViewModel> exporterTable;
     @FXML private TableColumn<ExporterViewModel, String> nameColumn;
@@ -21,9 +22,7 @@ public class CustomExporterTab extends AbstractPreferenceTabView<CustomExporterT
     @FXML private TableColumn<ExporterViewModel, String> extensionColumn;
 
     public CustomExporterTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -37,7 +36,9 @@ private void initialize() {
 
         exporterTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
         exporterTable.itemsProperty().bind(viewModel.exportersProperty());
-        EasyBind.bindContent(viewModel.selectedExportersProperty(), exporterTable.getSelectionModel().getSelectedItems());
+        EasyBind.bindContent(
+                viewModel.selectedExportersProperty(),
+                exporterTable.getSelectionModel().getSelectedItems());
         nameColumn.setCellValueFactory(cellData -> cellData.getValue().name());
         layoutColumn.setCellValueFactory(cellData -> cellData.getValue().layoutFileName());
         extensionColumn.setCellValueFactory(cellData -> cellData.getValue().extension());
diff --git a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTabViewModel.java b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTabViewModel.java
index e0db96a69bf9..9d1be875eaea 100644
--- a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTabViewModel.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.preferences.customexporter;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
@@ -15,10 +11,16 @@
 import org.jabref.logic.exporter.TemplateExporter;
 import org.jabref.logic.preferences.CliPreferences;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class CustomExporterTabViewModel implements PreferenceTabViewModel {
 
-    private final ListProperty<ExporterViewModel> exporters = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ListProperty<ExporterViewModel> selectedExporters = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<ExporterViewModel> exporters =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<ExporterViewModel> selectedExporters =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
 
     private final CliPreferences preferences;
     private final DialogService dialogService;
@@ -30,7 +32,8 @@ public CustomExporterTabViewModel(CliPreferences preferences, DialogService dial
 
     @Override
     public void setValues() {
-        List<TemplateExporter> exportersLogic = preferences.getExportPreferences().getCustomExporters();
+        List<TemplateExporter> exportersLogic =
+                preferences.getExportPreferences().getCustomExporters();
         exporters.clear();
         for (TemplateExporter exporter : exportersLogic) {
             exporters.add(new ExporterViewModel(exporter));
@@ -39,9 +42,8 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        List<TemplateExporter> exportersLogic = exporters.stream()
-                                                         .map(ExporterViewModel::getLogic)
-                                                         .collect(Collectors.toList());
+        List<TemplateExporter> exportersLogic =
+                exporters.stream().map(ExporterViewModel::getLogic).collect(Collectors.toList());
         preferences.getExportPreferences().setCustomExporters(exportersLogic);
     }
 
@@ -59,7 +61,8 @@ public void modifyExporter() {
         }
 
         ExporterViewModel exporterToModify = selectedExporters.getFirst();
-        CreateModifyExporterDialogView dialog = new CreateModifyExporterDialogView(exporterToModify);
+        CreateModifyExporterDialogView dialog =
+                new CreateModifyExporterDialogView(exporterToModify);
         Optional<ExporterViewModel> exporter = dialogService.showCustomDialogAndWait(dialog);
         if ((exporter != null) && exporter.isPresent()) {
             exporters.remove(exporterToModify);
diff --git a/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTab.java b/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTab.java
index 7a05fcdc9db9..9db5c0ac43e6 100644
--- a/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTab.java
+++ b/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTab.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.preferences.customimporter;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.SelectionMode;
@@ -13,10 +16,8 @@
 import org.jabref.gui.util.ViewModelTableRowFactory;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-
-public class CustomImporterTab extends AbstractPreferenceTabView<CustomImporterTabViewModel> implements PreferencesTab {
+public class CustomImporterTab extends AbstractPreferenceTabView<CustomImporterTabViewModel>
+        implements PreferencesTab {
 
     @FXML private TableView<ImporterViewModel> importerTable;
     @FXML private TableColumn<ImporterViewModel, String> nameColumn;
@@ -25,9 +26,7 @@ public class CustomImporterTab extends AbstractPreferenceTabView<CustomImporterT
     @FXML private Button addButton;
 
     public CustomImporterTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -41,7 +40,9 @@ private void initialize() {
 
         importerTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
         importerTable.itemsProperty().bind(viewModel.importersProperty());
-        EasyBind.bindContent(viewModel.selectedImportersProperty(), importerTable.getSelectionModel().getSelectedItems());
+        EasyBind.bindContent(
+                viewModel.selectedImportersProperty(),
+                importerTable.getSelectionModel().getSelectedItems());
         nameColumn.setCellValueFactory(cellData -> cellData.getValue().name());
         classColumn.setCellValueFactory(cellData -> cellData.getValue().className());
         basePathColumn.setCellValueFactory(cellData -> cellData.getValue().basePath());
@@ -49,9 +50,13 @@ private void initialize() {
                 .withTooltip(importer -> importer.getLogic().getDescription())
                 .install(importerTable);
 
-        addButton.setTooltip(new Tooltip(
-                Localization.lang("Add a (compiled) custom Importer class from a class path.")
-                        + "\n" + Localization.lang("The path need not be on the classpath of JabRef.")));
+        addButton.setTooltip(
+                new Tooltip(
+                        Localization.lang(
+                                        "Add a (compiled) custom Importer class from a class path.")
+                                + "\n"
+                                + Localization.lang(
+                                        "The path need not be on the classpath of JabRef.")));
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java b/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java
index 227fe4a1e729..61c62b442c5c 100644
--- a/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java
@@ -1,12 +1,5 @@
 package org.jabref.gui.preferences.customimporter;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
@@ -21,16 +14,24 @@
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.logic.util.io.FileUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 public class CustomImporterTabViewModel implements PreferenceTabViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CustomImporterTabViewModel.class);
 
-    private final ListProperty<ImporterViewModel> importers = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ListProperty<ImporterViewModel> selectedImporters = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<ImporterViewModel> importers =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<ImporterViewModel> selectedImporters =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
 
     private final CliPreferences preferences;
     private final DialogService dialogService;
@@ -42,7 +43,8 @@ public CustomImporterTabViewModel(CliPreferences preferences, DialogService dial
 
     @Override
     public void setValues() {
-        Set<CustomImporter> importersLogic = preferences.getImporterPreferences().getCustomImporters();
+        Set<CustomImporter> importersLogic =
+                preferences.getImporterPreferences().getCustomImporters();
         importers.clear();
         for (CustomImporter importer : importersLogic) {
             importers.add(new ImporterViewModel(importer));
@@ -51,9 +53,12 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        preferences.getImporterPreferences().setCustomImporters(importers.stream()
-                                                                         .map(ImporterViewModel::getLogic)
-                                                                         .collect(Collectors.toSet()));
+        preferences
+                .getImporterPreferences()
+                .setCustomImporters(
+                        importers.stream()
+                                .map(ImporterViewModel::getLogic)
+                                .collect(Collectors.toSet()));
     }
 
     /**
@@ -64,7 +69,8 @@ public void storeSettings() {
      * @return class name
      */
     private static String pathToClass(String basePath, Path path) {
-        String className = FileUtil.relativize(path, Collections.singletonList(Path.of(basePath))).toString();
+        String className =
+                FileUtil.relativize(path, Collections.singletonList(Path.of(basePath))).toString();
         if (className != null) {
             int lastDot = className.lastIndexOf('.');
             if (lastDot < 0) {
@@ -76,39 +82,59 @@ private static String pathToClass(String basePath, Path path) {
     }
 
     public void addImporter() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.CLASS, StandardFileType.JAR, StandardFileType.ZIP)
-                .withDefaultExtension(StandardFileType.CLASS)
-                .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory())
-                .build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(
+                                StandardFileType.CLASS, StandardFileType.JAR, StandardFileType.ZIP)
+                        .withDefaultExtension(StandardFileType.CLASS)
+                        .withInitialDirectory(
+                                preferences.getFilePreferences().getWorkingDirectory())
+                        .build();
 
         Optional<Path> selectedFile = dialogService.showFileOpenDialog(fileDialogConfiguration);
 
         if (selectedFile.isPresent() && (selectedFile.get().getParent() != null)) {
-            boolean isArchive = FileUtil.getFileExtension(selectedFile.get())
-                                        .filter(extension -> "jar".equalsIgnoreCase(extension) || "zip".equalsIgnoreCase(extension))
-                                        .isPresent();
+            boolean isArchive =
+                    FileUtil.getFileExtension(selectedFile.get())
+                            .filter(
+                                    extension ->
+                                            "jar".equalsIgnoreCase(extension)
+                                                    || "zip".equalsIgnoreCase(extension))
+                            .isPresent();
 
             if (isArchive) {
                 try {
-                    Optional<Path> selectedFileInArchive = dialogService.showFileOpenFromArchiveDialog(selectedFile.get());
+                    Optional<Path> selectedFileInArchive =
+                            dialogService.showFileOpenFromArchiveDialog(selectedFile.get());
                     if (selectedFileInArchive.isPresent()) {
-                        String className = selectedFileInArchive.get().toString().substring(0, selectedFileInArchive.get().toString().lastIndexOf('.')).replace(
-                                "/", ".");
-                        CustomImporter importer = new CustomImporter(selectedFile.get().toAbsolutePath().toString(), className);
+                        String className =
+                                selectedFileInArchive
+                                        .get()
+                                        .toString()
+                                        .substring(
+                                                0,
+                                                selectedFileInArchive
+                                                        .get()
+                                                        .toString()
+                                                        .lastIndexOf('.'))
+                                        .replace("/", ".");
+                        CustomImporter importer =
+                                new CustomImporter(
+                                        selectedFile.get().toAbsolutePath().toString(), className);
                         importers.add(new ImporterViewModel(importer));
                     }
                 } catch (IOException exc) {
                     LOGGER.error("Could not open ZIP-archive.", exc);
                     dialogService.showErrorDialogAndWait(
-                            Localization.lang("Could not open %0", selectedFile.get().toString()) + "\n"
-                                    + Localization.lang("Have you chosen the correct package path?"),
+                            Localization.lang("Could not open %0", selectedFile.get().toString())
+                                    + "\n"
+                                    + Localization.lang(
+                                            "Have you chosen the correct package path?"),
                             exc);
                 } catch (ImportException exc) {
                     LOGGER.error("Could not instantiate importer", exc);
                     dialogService.showErrorDialogAndWait(
-                            Localization.lang("Could not instantiate %0 %1", "importer"),
-                            exc);
+                            Localization.lang("Could not instantiate %0 %1", "importer"), exc);
                 }
             } else {
                 try {
@@ -119,11 +145,16 @@ public void addImporter() {
                     importers.add(new ImporterViewModel(importer));
                 } catch (Exception exc) {
                     LOGGER.error("Could not instantiate importer", exc);
-                    dialogService.showErrorDialogAndWait(Localization.lang("Could not instantiate %0", selectedFile.get().toString()), exc);
+                    dialogService.showErrorDialogAndWait(
+                            Localization.lang(
+                                    "Could not instantiate %0", selectedFile.get().toString()),
+                            exc);
                 } catch (NoClassDefFoundError exc) {
                     LOGGER.error("Could not find class while instantiating importer", exc);
                     dialogService.showErrorDialogAndWait(
-                            Localization.lang("Could not instantiate %0. Have you chosen the correct package path?", selectedFile.get().toString()),
+                            Localization.lang(
+                                    "Could not instantiate %0. Have you chosen the correct package path?",
+                                    selectedFile.get().toString()),
                             exc);
                 }
             }
diff --git a/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java b/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java
index e2202142cbd3..89a8ea453aad 100644
--- a/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.preferences.entry;
 
-import java.util.function.UnaryOperator;
+import com.airhacks.afterburner.views.ViewLoader;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -16,11 +16,10 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
-public class EntryTab extends AbstractPreferenceTabView<EntryTabViewModel> implements PreferencesTab {
-
+import java.util.function.UnaryOperator;
 
+public class EntryTab extends AbstractPreferenceTabView<EntryTabViewModel>
+        implements PreferencesTab {
 
     @FXML private TextField keywordSeparator;
 
@@ -37,9 +36,7 @@ public class EntryTab extends AbstractPreferenceTabView<EntryTabViewModel> imple
     @FXML private CheckBox addModificationDate;
 
     public EntryTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     public void initialize() {
@@ -47,32 +44,46 @@ public void initialize() {
 
         keywordSeparator.textProperty().bindBidirectional(viewModel.keywordSeparatorProperty());
 
-        // Use TextFormatter to limit the length of the Input of keywordSeparator to 1 character only.
-        UnaryOperator<TextFormatter.Change> singleCharacterFilter = change -> {
-            if (change.getControlNewText().length() <= 1) {
-                return change;
-            }
-            return null; // null means the change is rejected
-        };
+        // Use TextFormatter to limit the length of the Input of keywordSeparator to 1 character
+        // only.
+        UnaryOperator<TextFormatter.Change> singleCharacterFilter =
+                change -> {
+                    if (change.getControlNewText().length() <= 1) {
+                        return change;
+                    }
+                    return null; // null means the change is rejected
+                };
         TextFormatter<String> formatter = new TextFormatter<>(singleCharacterFilter);
 
         keywordSeparator.setTextFormatter(formatter);
 
         resolveStrings.selectedProperty().bindBidirectional(viewModel.resolveStringsProperty());
-        resolveStringsForFields.textProperty().bindBidirectional(viewModel.resolveStringsForFieldsProperty());
+        resolveStringsForFields
+                .textProperty()
+                .bindBidirectional(viewModel.resolveStringsForFieldsProperty());
         nonWrappableFields.textProperty().bindBidirectional(viewModel.nonWrappableFieldsProperty());
 
         markOwner.selectedProperty().bindBidirectional(viewModel.markOwnerProperty());
         markOwnerName.textProperty().bindBidirectional(viewModel.markOwnerNameProperty());
         markOwnerName.disableProperty().bind(markOwner.selectedProperty().not());
-        markOwnerOverwrite.selectedProperty().bindBidirectional(viewModel.markOwnerOverwriteProperty());
+        markOwnerOverwrite
+                .selectedProperty()
+                .bindBidirectional(viewModel.markOwnerOverwriteProperty());
         markOwnerOverwrite.disableProperty().bind(markOwner.selectedProperty().not());
 
         addCreationDate.selectedProperty().bindBidirectional(viewModel.addCreationDateProperty());
-        addModificationDate.selectedProperty().bindBidirectional(viewModel.addModificationDateProperty());
+        addModificationDate
+                .selectedProperty()
+                .bindBidirectional(viewModel.addModificationDateProperty());
 
         ActionFactory actionFactory = new ActionFactory();
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.OWNER, dialogService, preferences.getExternalApplicationsPreferences()), markOwnerHelp);
+        actionFactory.configureIconButton(
+                StandardActions.HELP,
+                new HelpAction(
+                        HelpFile.OWNER,
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences()),
+                markOwnerHelp);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java b/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
index 2f6fbbe9aa01..f38682cdd4af 100644
--- a/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
@@ -44,8 +44,10 @@ public void setValues() {
         keywordSeparatorProperty.setValue(bibEntryPreferences.getKeywordSeparator().toString());
 
         resolveStringsProperty.setValue(fieldPreferences.shouldResolveStrings());
-        resolveStringsForFieldsProperty.setValue(FieldFactory.serializeFieldsList(fieldPreferences.getResolvableFields()));
-        nonWrappableFieldsProperty.setValue(FieldFactory.serializeFieldsList(fieldPreferences.getNonWrappableFields()));
+        resolveStringsForFieldsProperty.setValue(
+                FieldFactory.serializeFieldsList(fieldPreferences.getResolvableFields()));
+        nonWrappableFieldsProperty.setValue(
+                FieldFactory.serializeFieldsList(fieldPreferences.getNonWrappableFields()));
 
         markOwnerProperty.setValue(ownerPreferences.isUseOwner());
         markOwnerNameProperty.setValue(ownerPreferences.getDefaultOwner());
@@ -57,11 +59,15 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        bibEntryPreferences.keywordSeparatorProperty().setValue(keywordSeparatorProperty.getValue().charAt(0));
+        bibEntryPreferences
+                .keywordSeparatorProperty()
+                .setValue(keywordSeparatorProperty.getValue().charAt(0));
 
         fieldPreferences.setResolveStrings(resolveStringsProperty.getValue());
-        fieldPreferences.setResolvableFields(FieldFactory.parseFieldList(resolveStringsForFieldsProperty.getValue().trim()));
-        fieldPreferences.setNonWrappableFields(FieldFactory.parseFieldList(nonWrappableFieldsProperty.getValue().trim()));
+        fieldPreferences.setResolvableFields(
+                FieldFactory.parseFieldList(resolveStringsForFieldsProperty.getValue().trim()));
+        fieldPreferences.setNonWrappableFields(
+                FieldFactory.parseFieldList(nonWrappableFieldsProperty.getValue().trim()));
 
         ownerPreferences.setUseOwner(markOwnerProperty.getValue());
         ownerPreferences.setDefaultOwner(markOwnerNameProperty.getValue());
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
index bee167050a80..a9a44bd2cd25 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.preferences.entryeditor;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
@@ -13,9 +15,8 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
-public class EntryEditorTab extends AbstractPreferenceTabView<EntryEditorTabViewModel> implements PreferencesTab {
+public class EntryEditorTab extends AbstractPreferenceTabView<EntryEditorTabViewModel>
+        implements PreferencesTab {
 
     @FXML private CheckBox openOnNewEntry;
     @FXML private CheckBox defaultSource;
@@ -35,9 +36,7 @@ public class EntryEditorTab extends AbstractPreferenceTabView<EntryEditorTabView
     @FXML private TextArea fieldsTextArea;
 
     public EntryEditorTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -50,22 +49,42 @@ public void initialize() {
 
         openOnNewEntry.selectedProperty().bindBidirectional(viewModel.openOnNewEntryProperty());
         defaultSource.selectedProperty().bindBidirectional(viewModel.defaultSourceProperty());
-        enableRelatedArticlesTab.selectedProperty().bindBidirectional(viewModel.enableRelatedArticlesTabProperty());
-        enableAiSummaryTab.selectedProperty().bindBidirectional(viewModel.enableAiSummaryTabProperty());
+        enableRelatedArticlesTab
+                .selectedProperty()
+                .bindBidirectional(viewModel.enableRelatedArticlesTabProperty());
+        enableAiSummaryTab
+                .selectedProperty()
+                .bindBidirectional(viewModel.enableAiSummaryTabProperty());
         enableAiChatTab.selectedProperty().bindBidirectional(viewModel.enableAiChatTabProperty());
-        acceptRecommendations.selectedProperty().bindBidirectional(viewModel.acceptRecommendationsProperty());
-        enableLatexCitationsTab.selectedProperty().bindBidirectional(viewModel.enableLatexCitationsTabProperty());
+        acceptRecommendations
+                .selectedProperty()
+                .bindBidirectional(viewModel.acceptRecommendationsProperty());
+        enableLatexCitationsTab
+                .selectedProperty()
+                .bindBidirectional(viewModel.enableLatexCitationsTabProperty());
         enableValidation.selectedProperty().bindBidirectional(viewModel.enableValidationProperty());
-        allowIntegerEdition.selectedProperty().bindBidirectional(viewModel.allowIntegerEditionProperty());
+        allowIntegerEdition
+                .selectedProperty()
+                .bindBidirectional(viewModel.allowIntegerEditionProperty());
         journalPopupEnabled.selectedProperty().bindBidirectional(viewModel.journalPopupProperty());
-        autoLinkFilesEnabled.selectedProperty().bindBidirectional(viewModel.autoLinkFilesEnabledProperty());
+        autoLinkFilesEnabled
+                .selectedProperty()
+                .bindBidirectional(viewModel.autoLinkFilesEnabledProperty());
         enableSciteTab.selectedProperty().bindBidirectional(viewModel.enableSciteTabProperty());
-        showUserCommentsField.selectedProperty().bindBidirectional(viewModel.showUserCommentsProperty());
+        showUserCommentsField
+                .selectedProperty()
+                .bindBidirectional(viewModel.showUserCommentsProperty());
 
         fieldsTextArea.textProperty().bindBidirectional(viewModel.fieldsProperty());
 
         ActionFactory actionFactory = new ActionFactory();
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.GENERAL_FIELDS, dialogService, preferences.getExternalApplicationsPreferences()), generalFieldsHelp);
+        actionFactory.configureIconButton(
+                StandardActions.HELP,
+                new HelpAction(
+                        HelpFile.GENERAL_FIELDS,
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences()),
+                generalFieldsHelp);
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
index 58a3a7baad86..e2959658c648 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.preferences.entryeditor;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -19,6 +15,10 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
 public class EntryEditorTabViewModel implements PreferenceTabViewModel {
 
     private final BooleanProperty openOnNewEntryProperty = new SimpleBooleanProperty();
@@ -57,14 +57,19 @@ public void setValues() {
 
         openOnNewEntryProperty.setValue(entryEditorPreferences.shouldOpenOnNewEntry());
         defaultSourceProperty.setValue(entryEditorPreferences.showSourceTabByDefault());
-        enableRelatedArticlesTabProperty.setValue(entryEditorPreferences.shouldShowRecommendationsTab());
+        enableRelatedArticlesTabProperty.setValue(
+                entryEditorPreferences.shouldShowRecommendationsTab());
         enableAiSummaryTabProperty.setValue(entryEditorPreferences.shouldShowAiSummaryTab());
         enableAiChatTabProperty.setValue(entryEditorPreferences.shouldShowAiChatTab());
         acceptRecommendationsProperty.setValue(mrDlibPreferences.shouldAcceptRecommendations());
-        enableLatexCitationsTabProperty.setValue(entryEditorPreferences.shouldShowLatexCitationsTab());
+        enableLatexCitationsTabProperty.setValue(
+                entryEditorPreferences.shouldShowLatexCitationsTab());
         enableValidationProperty.setValue(entryEditorPreferences.shouldEnableValidation());
-        allowIntegerEditionProperty.setValue(entryEditorPreferences.shouldAllowIntegerEditionBibtex());
-        journalPopupProperty.setValue(entryEditorPreferences.shouldEnableJournalPopup() == EntryEditorPreferences.JournalPopupEnabled.ENABLED);
+        allowIntegerEditionProperty.setValue(
+                entryEditorPreferences.shouldAllowIntegerEditionBibtex());
+        journalPopupProperty.setValue(
+                entryEditorPreferences.shouldEnableJournalPopup()
+                        == EntryEditorPreferences.JournalPopupEnabled.ENABLED);
         autoLinkEnabledProperty.setValue(entryEditorPreferences.autoLinkFilesEnabled());
         enableSciteTabProperty.setValue(entryEditorPreferences.shouldShowSciteTab());
         showUserCommentsProperty.setValue(entryEditorPreferences.shouldShowUserCommentsFields());
@@ -93,17 +98,20 @@ private void setFields(Map<String, Set<Field>> tabNamesAndFields) {
     public void storeSettings() {
         // entryEditorPreferences.setEntryEditorTabList();
         entryEditorPreferences.setShouldOpenOnNewEntry(openOnNewEntryProperty.getValue());
-        entryEditorPreferences.setShouldShowRecommendationsTab(enableRelatedArticlesTabProperty.getValue());
+        entryEditorPreferences.setShouldShowRecommendationsTab(
+                enableRelatedArticlesTabProperty.getValue());
         entryEditorPreferences.setShouldShowAiSummaryTab(enableAiSummaryTabProperty.getValue());
         entryEditorPreferences.setShouldShowAiChatTab(enableAiChatTabProperty.getValue());
         mrDlibPreferences.setAcceptRecommendations(acceptRecommendationsProperty.getValue());
-        entryEditorPreferences.setShouldShowLatexCitationsTab(enableLatexCitationsTabProperty.getValue());
+        entryEditorPreferences.setShouldShowLatexCitationsTab(
+                enableLatexCitationsTabProperty.getValue());
         entryEditorPreferences.setShowSourceTabByDefault(defaultSourceProperty.getValue());
         entryEditorPreferences.setEnableValidation(enableValidationProperty.getValue());
         entryEditorPreferences.setAllowIntegerEditionBibtex(allowIntegerEditionProperty.getValue());
-        entryEditorPreferences.setEnableJournalPopup(journalPopupProperty.getValue()
-                ? EntryEditorPreferences.JournalPopupEnabled.ENABLED
-                : EntryEditorPreferences.JournalPopupEnabled.DISABLED);
+        entryEditorPreferences.setEnableJournalPopup(
+                journalPopupProperty.getValue()
+                        ? EntryEditorPreferences.JournalPopupEnabled.ENABLED
+                        : EntryEditorPreferences.JournalPopupEnabled.DISABLED);
         // entryEditorPreferences.setDividerPosition();
         entryEditorPreferences.setAutoLinkFilesEnabled(autoLinkEnabledProperty.getValue());
         entryEditorPreferences.setShouldShowSciteTab(enableSciteTabProperty.getValue());
@@ -117,19 +125,23 @@ public void storeSettings() {
             if (parts.length != 2) {
                 dialogService.showInformationDialogAndWait(
                         Localization.lang("Error"),
-                        Localization.lang("Each line must be of the following form: 'tab:field1;field2;...;fieldN'."));
+                        Localization.lang(
+                                "Each line must be of the following form: 'tab:field1;field2;...;fieldN'."));
                 return;
             }
 
-            // Use literal string of unwanted characters specified below as opposed to exporting characters
+            // Use literal string of unwanted characters specified below as opposed to exporting
+            // characters
             // from preferences because the list of allowable characters in this particular differs
-            // i.e. ';' character is allowed in this window, but it's on the list of unwanted chars in preferences
+            // i.e. ';' character is allowed in this window, but it's on the list of unwanted chars
+            // in preferences
             String unwantedChars = "#{}()~,^&-\"'`ʹ\\";
             String testString = CitationKeyGenerator.cleanKey(parts[1], unwantedChars);
             if (!testString.equals(parts[1])) {
                 dialogService.showInformationDialogAndWait(
                         Localization.lang("Error"),
-                        Localization.lang("Field names are not allowed to contain white spaces or certain characters (%0).",
+                        Localization.lang(
+                                "Field names are not allowed to contain white spaces or certain characters (%0).",
                                 "# { } ( ) ~ , ^ & - \" ' ` ʹ \\"));
                 return;
             }
diff --git a/src/main/java/org/jabref/gui/preferences/export/ExportTab.java b/src/main/java/org/jabref/gui/preferences/export/ExportTab.java
index 3e99e6153409..0c4f46c7c12d 100644
--- a/src/main/java/org/jabref/gui/preferences/export/ExportTab.java
+++ b/src/main/java/org/jabref/gui/preferences/export/ExportTab.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.preferences.export;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
 import javafx.fxml.FXML;
 
 import org.jabref.gui.commonfxcontrols.SaveOrderConfigPanel;
@@ -7,15 +9,12 @@
 import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
-public class ExportTab extends AbstractPreferenceTabView<ExportTabViewModel> implements PreferencesTab {
+public class ExportTab extends AbstractPreferenceTabView<ExportTabViewModel>
+        implements PreferencesTab {
     @FXML private SaveOrderConfigPanel exportOrderPanel;
 
     public ExportTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -26,9 +25,15 @@ public String getTabName() {
     public void initialize() {
         this.viewModel = new ExportTabViewModel(preferences.getExportPreferences());
 
-        exportOrderPanel.saveInOriginalProperty().bindBidirectional(viewModel.saveInOriginalProperty());
-        exportOrderPanel.saveInTableOrderProperty().bindBidirectional(viewModel.saveInTableOrderProperty());
-        exportOrderPanel.saveInSpecifiedOrderProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
+        exportOrderPanel
+                .saveInOriginalProperty()
+                .bindBidirectional(viewModel.saveInOriginalProperty());
+        exportOrderPanel
+                .saveInTableOrderProperty()
+                .bindBidirectional(viewModel.saveInTableOrderProperty());
+        exportOrderPanel
+                .saveInSpecifiedOrderProperty()
+                .bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
         exportOrderPanel.sortableFieldsProperty().bind(viewModel.sortableFieldsProperty());
         exportOrderPanel.sortCriteriaProperty().bindBidirectional(viewModel.sortCriteriaProperty());
         exportOrderPanel.setCriteriaLimit(3);
diff --git a/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java
index 00717280eaf3..612acedbd0b1 100644
--- a/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.preferences.export;
 
-import java.util.ArrayList;
-import java.util.Set;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -17,14 +14,19 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.metadata.SaveOrder;
 
+import java.util.ArrayList;
+import java.util.Set;
+
 public class ExportTabViewModel implements PreferenceTabViewModel {
 
     // SaveOrderConfigPanel
     private final BooleanProperty exportInOriginalProperty = new SimpleBooleanProperty();
     private final BooleanProperty exportInTableOrderProperty = new SimpleBooleanProperty();
     private final BooleanProperty exportInSpecifiedOrderProperty = new SimpleBooleanProperty();
-    private final ListProperty<Field> sortableFieldsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ListProperty<SortCriterionViewModel> sortCriteriaProperty = new SimpleListProperty<>(FXCollections.observableArrayList(new ArrayList<>()));
+    private final ListProperty<Field> sortableFieldsProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<SortCriterionViewModel> sortCriteriaProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList(new ArrayList<>()));
 
     private final ExportPreferences exportPreferences;
 
@@ -40,9 +42,10 @@ public void setValues() {
             case ORIGINAL -> exportInOriginalProperty.setValue(true);
             case TABLE -> exportInTableOrderProperty.setValue(true);
         }
-        sortCriteriaProperty.addAll(exportSaveOrder.getSortCriteria().stream()
-                                                   .map(SortCriterionViewModel::new)
-                                                   .toList());
+        sortCriteriaProperty.addAll(
+                exportSaveOrder.getSortCriteria().stream()
+                        .map(SortCriterionViewModel::new)
+                        .toList());
 
         Set<Field> fields = FieldFactory.getAllFieldsWithOutInternal();
         fields.add(InternalField.INTERNAL_ALL_FIELD);
@@ -54,9 +57,14 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        SaveOrder newSaveOrder = new SaveOrder(
-                SaveOrder.OrderType.fromBooleans(exportInSpecifiedOrderProperty.getValue(), exportInOriginalProperty.getValue()),
-                sortCriteriaProperty.stream().map(SortCriterionViewModel::getCriterion).toList());
+        SaveOrder newSaveOrder =
+                new SaveOrder(
+                        SaveOrder.OrderType.fromBooleans(
+                                exportInSpecifiedOrderProperty.getValue(),
+                                exportInOriginalProperty.getValue()),
+                        sortCriteriaProperty.stream()
+                                .map(SortCriterionViewModel::getCriterion)
+                                .toList());
         exportPreferences.setExportSaveOrder(newSaveOrder);
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/external/ExternalTab.java b/src/main/java/org/jabref/gui/preferences/external/ExternalTab.java
index 00cf98349249..967313e4fb31 100644
--- a/src/main/java/org/jabref/gui/preferences/external/ExternalTab.java
+++ b/src/main/java/org/jabref/gui/preferences/external/ExternalTab.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.preferences.external;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
 import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -18,10 +22,8 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-
-public class ExternalTab extends AbstractPreferenceTabView<ExternalTabViewModel> implements PreferencesTab {
+public class ExternalTab extends AbstractPreferenceTabView<ExternalTabViewModel>
+        implements PreferencesTab {
 
     @FXML private TextField eMailReferenceSubject;
     @FXML private CheckBox autoOpenAttachedFolders;
@@ -40,9 +42,7 @@ public class ExternalTab extends AbstractPreferenceTabView<ExternalTabViewModel>
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     public ExternalTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -58,33 +58,61 @@ public void initialize() {
                 .withIcon(PushToApplication::getApplicationIcon)
                 .install(pushToApplicationCombo);
 
-        eMailReferenceSubject.textProperty().bindBidirectional(viewModel.eMailReferenceSubjectProperty());
-        autoOpenAttachedFolders.selectedProperty().bindBidirectional(viewModel.autoOpenAttachedFoldersProperty());
+        eMailReferenceSubject
+                .textProperty()
+                .bindBidirectional(viewModel.eMailReferenceSubjectProperty());
+        autoOpenAttachedFolders
+                .selectedProperty()
+                .bindBidirectional(viewModel.autoOpenAttachedFoldersProperty());
 
         pushToApplicationCombo.itemsProperty().bind(viewModel.pushToApplicationsListProperty());
-        pushToApplicationCombo.valueProperty().bindBidirectional(viewModel.selectedPushToApplication());
+        pushToApplicationCombo
+                .valueProperty()
+                .bindBidirectional(viewModel.selectedPushToApplication());
         citeCommand.textProperty().bindBidirectional(viewModel.citeCommandProperty());
 
-        useCustomTerminal.selectedProperty().bindBidirectional(viewModel.useCustomTerminalProperty());
-        customTerminalCommand.textProperty().bindBidirectional(viewModel.customTerminalCommandProperty());
+        useCustomTerminal
+                .selectedProperty()
+                .bindBidirectional(viewModel.useCustomTerminalProperty());
+        customTerminalCommand
+                .textProperty()
+                .bindBidirectional(viewModel.customTerminalCommandProperty());
         customTerminalCommand.disableProperty().bind(useCustomTerminal.selectedProperty().not());
         customTerminalBrowse.disableProperty().bind(useCustomTerminal.selectedProperty().not());
 
-        useCustomFileBrowser.selectedProperty().bindBidirectional(viewModel.useCustomFileBrowserProperty());
-        customFileBrowserCommand.textProperty().bindBidirectional(viewModel.customFileBrowserCommandProperty());
-        customFileBrowserCommand.disableProperty().bind(useCustomFileBrowser.selectedProperty().not());
-        customFileBrowserBrowse.disableProperty().bind(useCustomFileBrowser.selectedProperty().not());
+        useCustomFileBrowser
+                .selectedProperty()
+                .bindBidirectional(viewModel.useCustomFileBrowserProperty());
+        customFileBrowserCommand
+                .textProperty()
+                .bindBidirectional(viewModel.customFileBrowserCommandProperty());
+        customFileBrowserCommand
+                .disableProperty()
+                .bind(useCustomFileBrowser.selectedProperty().not());
+        customFileBrowserBrowse
+                .disableProperty()
+                .bind(useCustomFileBrowser.selectedProperty().not());
 
         kindleEmail.textProperty().bindBidirectional(viewModel.kindleEmailProperty());
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        Platform.runLater(() -> {
-            validationVisualizer.initVisualization(viewModel.terminalCommandValidationStatus(), customTerminalCommand);
-            validationVisualizer.initVisualization(viewModel.fileBrowserCommandValidationStatus(), customFileBrowserCommand);
-        });
+        Platform.runLater(
+                () -> {
+                    validationVisualizer.initVisualization(
+                            viewModel.terminalCommandValidationStatus(), customTerminalCommand);
+                    validationVisualizer.initVisualization(
+                            viewModel.fileBrowserCommandValidationStatus(),
+                            customFileBrowserCommand);
+                });
 
         ActionFactory actionFactory = new ActionFactory();
-        actionFactory.configureIconButton(StandardActions.HELP_PUSH_TO_APPLICATION, new HelpAction(HelpFile.PUSH_TO_APPLICATION, dialogService, preferences.getExternalApplicationsPreferences()), autolinkExternalHelp);
+        actionFactory.configureIconButton(
+                StandardActions.HELP_PUSH_TO_APPLICATION,
+                new HelpAction(
+                        HelpFile.PUSH_TO_APPLICATION,
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences()),
+                autolinkExternalHelp);
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java b/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
index 815009515a9f..726645820e63 100644
--- a/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
@@ -1,6 +1,10 @@
 package org.jabref.gui.preferences.external;
 
-import java.util.HashMap;
+import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -28,18 +32,16 @@
 import org.jabref.logic.push.CitationCommandString;
 import org.jabref.model.strings.StringUtil;
 
-import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
+import java.util.HashMap;
 
 public class ExternalTabViewModel implements PreferenceTabViewModel {
 
     private final StringProperty eMailReferenceSubjectProperty = new SimpleStringProperty("");
     private final BooleanProperty autoOpenAttachedFoldersProperty = new SimpleBooleanProperty();
-    private final ListProperty<PushToApplication> pushToApplicationsListProperty = new SimpleListProperty<>();
-    private final ObjectProperty<PushToApplication> selectedPushToApplicationProperty = new SimpleObjectProperty<>();
+    private final ListProperty<PushToApplication> pushToApplicationsListProperty =
+            new SimpleListProperty<>();
+    private final ObjectProperty<PushToApplication> selectedPushToApplicationProperty =
+            new SimpleObjectProperty<>();
     private final StringProperty citeCommandProperty = new SimpleStringProperty("");
     private final BooleanProperty useCustomTerminalProperty = new SimpleBooleanProperty();
     private final StringProperty customTerminalCommandProperty = new SimpleStringProperty("");
@@ -53,7 +55,8 @@ public class ExternalTabViewModel implements PreferenceTabViewModel {
     private final DialogService dialogService;
     private final GuiPreferences preferences;
 
-    private final FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder().build();
+    private final FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder().build();
 
     private final ExternalApplicationsPreferences initialExternalApplicationPreferences;
     private final PushToApplicationPreferences initialPushToApplicationPreferences;
@@ -62,65 +65,93 @@ public class ExternalTabViewModel implements PreferenceTabViewModel {
     public ExternalTabViewModel(DialogService dialogService, GuiPreferences preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
-        this.initialExternalApplicationPreferences = this.preferences.getExternalApplicationsPreferences();
-        this.initialPushToApplicationPreferences = this.preferences.getPushToApplicationPreferences();
-        this.workingPushToApplicationPreferences = new PushToApplicationPreferences(
-                initialPushToApplicationPreferences.getActiveApplicationName(),
-                new HashMap<>(initialPushToApplicationPreferences.getCommandPaths()),
-                initialPushToApplicationPreferences.getEmacsArguments(),
-                initialPushToApplicationPreferences.getVimServer());
-
-        terminalCommandValidator = new FunctionBasedValidator<>(
-                customTerminalCommandProperty,
-                input -> !StringUtil.isNullOrEmpty(input),
-                ValidationMessage.error("%s > %s %n %n %s".formatted(
-                        Localization.lang("External programs"),
-                        Localization.lang("Custom applications"),
-                        Localization.lang("Please specify a terminal application."))));
-
-        fileBrowserCommandValidator = new FunctionBasedValidator<>(
-                customFileBrowserCommandProperty,
-                input -> !StringUtil.isNullOrEmpty(input),
-                ValidationMessage.error("%s > %s %n %n %s".formatted(
-                        Localization.lang("External programs"),
-                        Localization.lang("Custom applications"),
-                        Localization.lang("Please specify a file browser."))));
+        this.initialExternalApplicationPreferences =
+                this.preferences.getExternalApplicationsPreferences();
+        this.initialPushToApplicationPreferences =
+                this.preferences.getPushToApplicationPreferences();
+        this.workingPushToApplicationPreferences =
+                new PushToApplicationPreferences(
+                        initialPushToApplicationPreferences.getActiveApplicationName(),
+                        new HashMap<>(initialPushToApplicationPreferences.getCommandPaths()),
+                        initialPushToApplicationPreferences.getEmacsArguments(),
+                        initialPushToApplicationPreferences.getVimServer());
+
+        terminalCommandValidator =
+                new FunctionBasedValidator<>(
+                        customTerminalCommandProperty,
+                        input -> !StringUtil.isNullOrEmpty(input),
+                        ValidationMessage.error(
+                                "%s > %s %n %n %s"
+                                        .formatted(
+                                                Localization.lang("External programs"),
+                                                Localization.lang("Custom applications"),
+                                                Localization.lang(
+                                                        "Please specify a terminal application."))));
+
+        fileBrowserCommandValidator =
+                new FunctionBasedValidator<>(
+                        customFileBrowserCommandProperty,
+                        input -> !StringUtil.isNullOrEmpty(input),
+                        ValidationMessage.error(
+                                "%s > %s %n %n %s"
+                                        .formatted(
+                                                Localization.lang("External programs"),
+                                                Localization.lang("Custom applications"),
+                                                Localization.lang(
+                                                        "Please specify a file browser."))));
     }
 
     @Override
     public void setValues() {
-        eMailReferenceSubjectProperty.setValue(initialExternalApplicationPreferences.getEmailSubject());
-        autoOpenAttachedFoldersProperty.setValue(initialExternalApplicationPreferences.shouldAutoOpenEmailAttachmentsFolder());
+        eMailReferenceSubjectProperty.setValue(
+                initialExternalApplicationPreferences.getEmailSubject());
+        autoOpenAttachedFoldersProperty.setValue(
+                initialExternalApplicationPreferences.shouldAutoOpenEmailAttachmentsFolder());
 
         pushToApplicationsListProperty.setValue(
-                FXCollections.observableArrayList(PushToApplications.getAllApplications(dialogService, preferences)));
+                FXCollections.observableArrayList(
+                        PushToApplications.getAllApplications(dialogService, preferences)));
         selectedPushToApplicationProperty.setValue(
-                PushToApplications.getApplicationByName(initialPushToApplicationPreferences.getActiveApplicationName(), dialogService, preferences)
-                                  .orElse(new PushToEmacs(dialogService, preferences)));
-
-        citeCommandProperty.setValue(initialExternalApplicationPreferences.getCiteCommand().toString());
-
-        useCustomTerminalProperty.setValue(initialExternalApplicationPreferences.useCustomTerminal());
-        customTerminalCommandProperty.setValue(initialExternalApplicationPreferences.getCustomTerminalCommand());
-        useCustomFileBrowserProperty.setValue(initialExternalApplicationPreferences.useCustomFileBrowser());
-        customFileBrowserCommandProperty.setValue(initialExternalApplicationPreferences.getCustomFileBrowserCommand());
+                PushToApplications.getApplicationByName(
+                                initialPushToApplicationPreferences.getActiveApplicationName(),
+                                dialogService,
+                                preferences)
+                        .orElse(new PushToEmacs(dialogService, preferences)));
+
+        citeCommandProperty.setValue(
+                initialExternalApplicationPreferences.getCiteCommand().toString());
+
+        useCustomTerminalProperty.setValue(
+                initialExternalApplicationPreferences.useCustomTerminal());
+        customTerminalCommandProperty.setValue(
+                initialExternalApplicationPreferences.getCustomTerminalCommand());
+        useCustomFileBrowserProperty.setValue(
+                initialExternalApplicationPreferences.useCustomFileBrowser());
+        customFileBrowserCommandProperty.setValue(
+                initialExternalApplicationPreferences.getCustomFileBrowserCommand());
         kindleEmailProperty.setValue(initialExternalApplicationPreferences.getKindleEmail());
     }
 
     @Override
     public void storeSettings() {
-        ExternalApplicationsPreferences externalPreferences = preferences.getExternalApplicationsPreferences();
+        ExternalApplicationsPreferences externalPreferences =
+                preferences.getExternalApplicationsPreferences();
         externalPreferences.setEMailSubject(eMailReferenceSubjectProperty.getValue());
-        externalPreferences.setAutoOpenEmailAttachmentsFolder(autoOpenAttachedFoldersProperty.getValue());
-        externalPreferences.setCiteCommand(CitationCommandString.from(citeCommandProperty.getValue()));
+        externalPreferences.setAutoOpenEmailAttachmentsFolder(
+                autoOpenAttachedFoldersProperty.getValue());
+        externalPreferences.setCiteCommand(
+                CitationCommandString.from(citeCommandProperty.getValue()));
         externalPreferences.setUseCustomTerminal(useCustomTerminalProperty.getValue());
         externalPreferences.setCustomTerminalCommand(customTerminalCommandProperty.getValue());
         externalPreferences.setUseCustomFileBrowser(useCustomFileBrowserProperty.getValue());
-        externalPreferences.setCustomFileBrowserCommand(customFileBrowserCommandProperty.getValue());
+        externalPreferences.setCustomFileBrowserCommand(
+                customFileBrowserCommandProperty.getValue());
         externalPreferences.setKindleEmail(kindleEmailProperty.getValue());
 
-        PushToApplicationPreferences pushPreferences = preferences.getPushToApplicationPreferences();
-        pushPreferences.setActiveApplicationName(selectedPushToApplicationProperty.getValue().getDisplayName());
+        PushToApplicationPreferences pushPreferences =
+                preferences.getPushToApplicationPreferences();
+        pushPreferences.setActiveApplicationName(
+                selectedPushToApplicationProperty.getValue().getDisplayName());
         pushPreferences.setCommandPaths(workingPushToApplicationPreferences.getCommandPaths());
         pushPreferences.setEmacsArguments(workingPushToApplicationPreferences.getEmacsArguments());
         pushPreferences.setVimServer(workingPushToApplicationPreferences.getVimServer());
@@ -148,8 +179,10 @@ public boolean validateSettings() {
 
         ValidationStatus validationStatus = validator.getValidationStatus();
         if (!validationStatus.isValid()) {
-            validationStatus.getHighestMessage().ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage()));
+            validationStatus
+                    .getHighestMessage()
+                    .ifPresent(
+                            message -> dialogService.showErrorDialogAndWait(message.getMessage()));
             return false;
         }
         return true;
@@ -157,31 +190,43 @@ public boolean validateSettings() {
 
     public void pushToApplicationSettings() {
         PushToApplication selectedApplication = selectedPushToApplicationProperty.getValue();
-        PushToApplicationSettings settings = selectedApplication.getSettings(selectedApplication, workingPushToApplicationPreferences);
+        PushToApplicationSettings settings =
+                selectedApplication.getSettings(
+                        selectedApplication, workingPushToApplicationPreferences);
 
         DialogPane dialogPane = new DialogPane();
         dialogPane.setContent(settings.getSettingsPane());
 
-        dialogService.showCustomDialogAndWait(
-                Localization.lang("Application settings"),
-                dialogPane,
-                ButtonType.OK, ButtonType.CANCEL)
-                     .ifPresent(btn -> {
-                                 if (btn == ButtonType.OK) {
-                                     settings.storeSettings();
-                                 }
-                             }
-                     );
+        dialogService
+                .showCustomDialogAndWait(
+                        Localization.lang("Application settings"),
+                        dialogPane,
+                        ButtonType.OK,
+                        ButtonType.CANCEL)
+                .ifPresent(
+                        btn -> {
+                            if (btn == ButtonType.OK) {
+                                settings.storeSettings();
+                            }
+                        });
     }
 
     public void customTerminalBrowse() {
-        dialogService.showFileOpenDialog(fileDialogConfiguration)
-                     .ifPresent(file -> customTerminalCommandProperty.setValue(file.toAbsolutePath().toString()));
+        dialogService
+                .showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(
+                        file ->
+                                customTerminalCommandProperty.setValue(
+                                        file.toAbsolutePath().toString()));
     }
 
     public void customFileBrowserBrowse() {
-        dialogService.showFileOpenDialog(fileDialogConfiguration)
-                     .ifPresent(file -> customFileBrowserCommandProperty.setValue(file.toAbsolutePath().toString()));
+        dialogService
+                .showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(
+                        file ->
+                                customFileBrowserCommandProperty.setValue(
+                                        file.toAbsolutePath().toString()));
     }
 
     // EMail
@@ -231,6 +276,10 @@ public StringProperty customFileBrowserCommandProperty() {
     }
 
     public void resetCiteCommandToDefault() {
-        this.citeCommandProperty.setValue(preferences.getExternalApplicationsPreferences().getDefaultCiteCommand().toString());
+        this.citeCommandProperty.setValue(
+                preferences
+                        .getExternalApplicationsPreferences()
+                        .getDefaultCiteCommand()
+                        .toString());
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
index 44cab5420aa2..e7a58725067d 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
@@ -1,5 +1,11 @@
 package org.jabref.gui.preferences.externalfiletypes;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+import jakarta.inject.Inject;
+
 import javafx.application.Platform;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
@@ -17,10 +23,6 @@
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.gui.util.IconValidationDecorator;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import jakarta.inject.Inject;
-
 public class EditExternalFileTypeEntryDialog extends BaseDialog<Void> {
 
     @FXML private RadioButton defaultApplication;
@@ -34,7 +36,10 @@ public class EditExternalFileTypeEntryDialog extends BaseDialog<Void> {
     @FXML private Label icon;
     @Inject private DialogService dialogService;
 
-    private final FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder().withInitialDirectory(NativeDesktop.get().getApplicationDirectory()).build();
+    private final FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
+                    .withInitialDirectory(NativeDesktop.get().getApplicationDirectory())
+                    .build();
     private final ExternalFileTypeItemViewModel item;
 
     private final ObservableList<ExternalFileTypeItemViewModel> fileTypes;
@@ -42,25 +47,29 @@ public class EditExternalFileTypeEntryDialog extends BaseDialog<Void> {
 
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
 
-    public EditExternalFileTypeEntryDialog(ExternalFileTypeItemViewModel item, String dialogTitle, ObservableList<ExternalFileTypeItemViewModel> fileTypes) {
+    public EditExternalFileTypeEntryDialog(
+            ExternalFileTypeItemViewModel item,
+            String dialogTitle,
+            ObservableList<ExternalFileTypeItemViewModel> fileTypes) {
         this.item = item;
         this.fileTypes = fileTypes;
         this.setTitle(dialogTitle);
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
 
         final Button confirmDialogButton = (Button) getDialogPane().lookupButton(ButtonType.OK);
-        confirmDialogButton.disableProperty().bind(viewModel.validationStatus().validProperty().not());
-        this.setResultConverter(button -> {
-            if (button == ButtonType.OK) {
-                viewModel.storeSettings();
-            }
-            return null;
-        });
+        confirmDialogButton
+                .disableProperty()
+                .bind(viewModel.validationStatus().validProperty().not());
+        this.setResultConverter(
+                button -> {
+                    if (button == ButtonType.OK) {
+                        viewModel.storeSettings();
+                    }
+                    return null;
+                });
     }
 
     @FXML
@@ -71,24 +80,37 @@ public void initialize() {
 
         icon.setGraphic(viewModel.getIcon());
 
-        defaultApplication.selectedProperty().bindBidirectional(viewModel.defaultApplicationSelectedProperty());
-        customApplication.selectedProperty().bindBidirectional(viewModel.customApplicationSelectedProperty());
+        defaultApplication
+                .selectedProperty()
+                .bindBidirectional(viewModel.defaultApplicationSelectedProperty());
+        customApplication
+                .selectedProperty()
+                .bindBidirectional(viewModel.customApplicationSelectedProperty());
         selectedApplication.disableProperty().bind(viewModel.defaultApplicationSelectedProperty());
         btnBrowse.disableProperty().bind(viewModel.defaultApplicationSelectedProperty());
         extension.textProperty().bindBidirectional(viewModel.extensionProperty());
         name.textProperty().bindBidirectional(viewModel.nameProperty());
         mimeType.textProperty().bindBidirectional(viewModel.mimeTypeProperty());
-        selectedApplication.textProperty().bindBidirectional(viewModel.selectedApplicationProperty());
-
-        Platform.runLater(() -> {
-            visualizer.initVisualization(viewModel.extensionValidation(), extension, true);
-            visualizer.initVisualization(viewModel.nameValidation(), name, true);
-            visualizer.initVisualization(viewModel.mimeTypeValidation(), mimeType, true);
-        });
+        selectedApplication
+                .textProperty()
+                .bindBidirectional(viewModel.selectedApplicationProperty());
+
+        Platform.runLater(
+                () -> {
+                    visualizer.initVisualization(viewModel.extensionValidation(), extension, true);
+                    visualizer.initVisualization(viewModel.nameValidation(), name, true);
+                    visualizer.initVisualization(viewModel.mimeTypeValidation(), mimeType, true);
+                });
     }
 
     @FXML
     private void openFileChooser(ActionEvent event) {
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(path -> viewModel.selectedApplicationProperty().setValue(path.toAbsolutePath().toString()));
+        dialogService
+                .showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(
+                        path ->
+                                viewModel
+                                        .selectedApplicationProperty()
+                                        .setValue(path.toAbsolutePath().toString()));
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
index e56aa5e51146..f7ae459a2005 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
@@ -1,5 +1,11 @@
 package org.jabref.gui.preferences.externalfiletypes;
 
+import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -10,20 +16,16 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
-import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
-
 public class EditExternalFileTypeViewModel {
     private final ExternalFileTypeItemViewModel fileTypeViewModel;
     private final StringProperty nameProperty = new SimpleStringProperty("");
     private final StringProperty mimeTypeProperty = new SimpleStringProperty("");
     private final StringProperty extensionProperty = new SimpleStringProperty("");
     private final StringProperty selectedApplicationProperty = new SimpleStringProperty("");
-    private final BooleanProperty defaultApplicationSelectedProperty = new SimpleBooleanProperty(false);
-    private final BooleanProperty customApplicationSelectedProperty = new SimpleBooleanProperty(false);
+    private final BooleanProperty defaultApplicationSelectedProperty =
+            new SimpleBooleanProperty(false);
+    private final BooleanProperty customApplicationSelectedProperty =
+            new SimpleBooleanProperty(false);
     private final ObservableList<ExternalFileTypeItemViewModel> fileTypes;
     private final String originalExtension;
     private final String originalName;
@@ -33,7 +35,9 @@ public class EditExternalFileTypeViewModel {
     private CompositeValidator mimeTypeValidator;
     private CompositeValidator validator;
 
-    public EditExternalFileTypeViewModel(ExternalFileTypeItemViewModel fileTypeViewModel, ObservableList<ExternalFileTypeItemViewModel> fileTypes) {
+    public EditExternalFileTypeViewModel(
+            ExternalFileTypeItemViewModel fileTypeViewModel,
+            ObservableList<ExternalFileTypeItemViewModel> fileTypes) {
         this.fileTypeViewModel = fileTypeViewModel;
         this.fileTypes = fileTypes;
         this.originalExtension = fileTypeViewModel.extensionProperty().getValue();
@@ -47,7 +51,8 @@ public EditExternalFileTypeViewModel(ExternalFileTypeItemViewModel fileTypeViewM
             defaultApplicationSelectedProperty.setValue(true);
         } else {
             customApplicationSelectedProperty.setValue(true);
-            selectedApplicationProperty.setValue(fileTypeViewModel.applicationProperty().getValue());
+            selectedApplicationProperty.setValue(
+                    fileTypeViewModel.applicationProperty().getValue());
         }
 
         setupValidation();
@@ -57,68 +62,86 @@ private void setupValidation() {
         validator = new CompositeValidator();
         extensionValidator = new CompositeValidator();
 
-        Validator extensionisNotBlankValidator = new FunctionBasedValidator<>(
-                extensionProperty,
-                StringUtil::isNotBlank,
-                ValidationMessage.error(Localization.lang("Please enter a name for the extension."))
-        );
-        Validator sameExtensionValidator = new FunctionBasedValidator<>(
-                extensionProperty,
-                extension -> {
-                    for (ExternalFileTypeItemViewModel fileTypeItem : fileTypes) {
-                        if (extension.equalsIgnoreCase(fileTypeItem.extensionProperty().get()) && !extension.equalsIgnoreCase(originalExtension)) {
-                            return false;
-                        }
-                    }
-                    return true;
-                },
-                ValidationMessage.error(Localization.lang("There already exists an external file type with the same extension"))
-        );
+        Validator extensionisNotBlankValidator =
+                new FunctionBasedValidator<>(
+                        extensionProperty,
+                        StringUtil::isNotBlank,
+                        ValidationMessage.error(
+                                Localization.lang("Please enter a name for the extension.")));
+        Validator sameExtensionValidator =
+                new FunctionBasedValidator<>(
+                        extensionProperty,
+                        extension -> {
+                            for (ExternalFileTypeItemViewModel fileTypeItem : fileTypes) {
+                                if (extension.equalsIgnoreCase(
+                                                fileTypeItem.extensionProperty().get())
+                                        && !extension.equalsIgnoreCase(originalExtension)) {
+                                    return false;
+                                }
+                            }
+                            return true;
+                        },
+                        ValidationMessage.error(
+                                Localization.lang(
+                                        "There already exists an external file type with the same extension")));
         extensionValidator.addValidators(sameExtensionValidator, extensionisNotBlankValidator);
 
         nameValidator = new CompositeValidator();
-        Validator sameNameValidator = new FunctionBasedValidator<>(
-                nameProperty,
-                name -> {
-                    for (ExternalFileTypeItemViewModel fileTypeItem : fileTypes) {
-                        if (name.equalsIgnoreCase(fileTypeItem.nameProperty().get()) && !name.equalsIgnoreCase(originalName)) {
-                            return false;
-                        }
-                    }
-                    return true;
-                },
-                ValidationMessage.error(Localization.lang("There already exists an external file type with the same name"))
-        );
-
-        Validator nameIsNotBlankValidator = new FunctionBasedValidator<>(
-                nameProperty,
-                StringUtil::isNotBlank,
-                ValidationMessage.error(Localization.lang("Please enter a name."))
-        );
+        Validator sameNameValidator =
+                new FunctionBasedValidator<>(
+                        nameProperty,
+                        name -> {
+                            for (ExternalFileTypeItemViewModel fileTypeItem : fileTypes) {
+                                if (name.equalsIgnoreCase(fileTypeItem.nameProperty().get())
+                                        && !name.equalsIgnoreCase(originalName)) {
+                                    return false;
+                                }
+                            }
+                            return true;
+                        },
+                        ValidationMessage.error(
+                                Localization.lang(
+                                        "There already exists an external file type with the same name")));
+
+        Validator nameIsNotBlankValidator =
+                new FunctionBasedValidator<>(
+                        nameProperty,
+                        StringUtil::isNotBlank,
+                        ValidationMessage.error(Localization.lang("Please enter a name.")));
         nameValidator.addValidators(sameNameValidator, nameIsNotBlankValidator);
 
         mimeTypeValidator = new CompositeValidator();
-        Validator mimeTypeIsNotBlankValidator = new FunctionBasedValidator<>(
-                mimeTypeProperty,
-                StringUtil::isNotBlank,
-                ValidationMessage.error(Localization.lang("Please enter a name for the MIME type."))
-        );
-
-        Validator sameMimeTypeValidator = new FunctionBasedValidator<>(
-                mimeTypeProperty,
-                mimeType -> {
-                    for (ExternalFileTypeItemViewModel fileTypeItem : fileTypes) {
-                        if (mimeType.equalsIgnoreCase(fileTypeItem.mimetypeProperty().get()) && !mimeType.equalsIgnoreCase(originalMimeType)) {
-                            return false;
-                        }
-                    }
-                    return true;
-                },
-                ValidationMessage.error(Localization.lang("There already exists an external file type with the same MIME type"))
-        );
+        Validator mimeTypeIsNotBlankValidator =
+                new FunctionBasedValidator<>(
+                        mimeTypeProperty,
+                        StringUtil::isNotBlank,
+                        ValidationMessage.error(
+                                Localization.lang("Please enter a name for the MIME type.")));
+
+        Validator sameMimeTypeValidator =
+                new FunctionBasedValidator<>(
+                        mimeTypeProperty,
+                        mimeType -> {
+                            for (ExternalFileTypeItemViewModel fileTypeItem : fileTypes) {
+                                if (mimeType.equalsIgnoreCase(fileTypeItem.mimetypeProperty().get())
+                                        && !mimeType.equalsIgnoreCase(originalMimeType)) {
+                                    return false;
+                                }
+                            }
+                            return true;
+                        },
+                        ValidationMessage.error(
+                                Localization.lang(
+                                        "There already exists an external file type with the same MIME type")));
         mimeTypeValidator.addValidators(sameMimeTypeValidator, mimeTypeIsNotBlankValidator);
 
-        validator.addValidators(extensionValidator, sameExtensionValidator, nameValidator, sameNameValidator, mimeTypeValidator, sameMimeTypeValidator);
+        validator.addValidators(
+                extensionValidator,
+                sameExtensionValidator,
+                nameValidator,
+                sameNameValidator,
+                mimeTypeValidator,
+                sameMimeTypeValidator);
     }
 
     public ValidationStatus validationStatus() {
@@ -182,7 +205,8 @@ public void storeSettings() {
 
         String application = selectedApplicationProperty.getValue().trim();
 
-        // store application as empty if the "Default" option is selected, or if the application name is empty:
+        // store application as empty if the "Default" option is selected, or if the application
+        // name is empty:
         if (defaultApplicationSelectedProperty.getValue() || application.isEmpty()) {
             fileTypeViewModel.applicationProperty().setValue("");
             selectedApplicationProperty.setValue("");
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
index 1529d07d92cb..cc49ee72193d 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.preferences.externalfiletypes;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
@@ -12,26 +14,26 @@
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
 /**
  * Editor for external file types.
  */
-public class ExternalFileTypesTab extends AbstractPreferenceTabView<ExternalFileTypesTabViewModel> implements PreferencesTab {
+public class ExternalFileTypesTab extends AbstractPreferenceTabView<ExternalFileTypesTabViewModel>
+        implements PreferencesTab {
 
     @FXML private TableColumn<ExternalFileTypeItemViewModel, JabRefIcon> fileTypesTableIconColumn;
     @FXML private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableNameColumn;
     @FXML private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableExtensionColumn;
     @FXML private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableMimeTypeColumn;
-    @FXML private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableApplicationColumn;
+
+    @FXML
+    private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableApplicationColumn;
+
     @FXML private TableColumn<ExternalFileTypeItemViewModel, Boolean> fileTypesTableEditColumn;
     @FXML private TableColumn<ExternalFileTypeItemViewModel, Boolean> fileTypesTableDeleteColumn;
     @FXML private TableView<ExternalFileTypeItemViewModel> fileTypesTable;
 
     public ExternalFileTypesTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -41,31 +43,38 @@ public String getTabName() {
 
     @FXML
     public void initialize() {
-        viewModel = new ExternalFileTypesTabViewModel(preferences.getExternalApplicationsPreferences(), dialogService);
+        viewModel =
+                new ExternalFileTypesTabViewModel(
+                        preferences.getExternalApplicationsPreferences(), dialogService);
 
         fileTypesTable.setItems(viewModel.getFileTypes());
 
-        fileTypesTableIconColumn.setCellValueFactory(cellData -> cellData.getValue().iconProperty());
+        fileTypesTableIconColumn.setCellValueFactory(
+                cellData -> cellData.getValue().iconProperty());
         new ValueTableCellFactory<ExternalFileTypeItemViewModel, JabRefIcon>()
                 .withGraphic(JabRefIcon::getGraphicNode)
                 .install(fileTypesTableIconColumn);
 
-        fileTypesTableNameColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
+        fileTypesTableNameColumn.setCellValueFactory(
+                cellData -> cellData.getValue().nameProperty());
         new ValueTableCellFactory<ExternalFileTypeItemViewModel, String>()
                 .withText(name -> name)
                 .install(fileTypesTableNameColumn);
 
-        fileTypesTableExtensionColumn.setCellValueFactory(cellData -> cellData.getValue().extensionProperty());
+        fileTypesTableExtensionColumn.setCellValueFactory(
+                cellData -> cellData.getValue().extensionProperty());
         new ValueTableCellFactory<ExternalFileTypeItemViewModel, String>()
                 .withText(extension -> extension)
                 .install(fileTypesTableExtensionColumn);
 
-        fileTypesTableMimeTypeColumn.setCellValueFactory(cellData -> cellData.getValue().mimetypeProperty());
+        fileTypesTableMimeTypeColumn.setCellValueFactory(
+                cellData -> cellData.getValue().mimetypeProperty());
         new ValueTableCellFactory<ExternalFileTypeItemViewModel, String>()
                 .withText(mimetype -> mimetype)
                 .install(fileTypesTableMimeTypeColumn);
 
-        fileTypesTableApplicationColumn.setCellValueFactory(cellData -> cellData.getValue().applicationProperty());
+        fileTypesTableApplicationColumn.setCellValueFactory(
+                cellData -> cellData.getValue().applicationProperty());
         new ValueTableCellFactory<ExternalFileTypeItemViewModel, String>()
                 .withText(extension -> extension)
                 .install(fileTypesTableApplicationColumn);
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
index a0c4866fc2e6..1721cbf6167f 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.preferences.externalfiletypes;
 
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Set;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
@@ -13,19 +9,26 @@
 import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.l10n.Localization;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Set;
+
 public class ExternalFileTypesTabViewModel implements PreferenceTabViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ExternalFileTypesTabViewModel.class);
-    private final ObservableList<ExternalFileTypeItemViewModel> fileTypes = FXCollections.observableArrayList();
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(ExternalFileTypesTabViewModel.class);
+    private final ObservableList<ExternalFileTypeItemViewModel> fileTypes =
+            FXCollections.observableArrayList();
 
     private final ExternalApplicationsPreferences externalApplicationsPreferences;
     private final DialogService dialogService;
 
-    public ExternalFileTypesTabViewModel(ExternalApplicationsPreferences externalApplicationsPreferences, DialogService dialogService) {
+    public ExternalFileTypesTabViewModel(
+            ExternalApplicationsPreferences externalApplicationsPreferences,
+            DialogService dialogService) {
         this.externalApplicationsPreferences = externalApplicationsPreferences;
         this.dialogService = dialogService;
     }
@@ -33,28 +36,34 @@ public ExternalFileTypesTabViewModel(ExternalApplicationsPreferences externalApp
     @Override
     public void setValues() {
         fileTypes.clear();
-        fileTypes.addAll(externalApplicationsPreferences.getExternalFileTypes().stream()
-                                                        .map(ExternalFileTypeItemViewModel::new)
-                                                        .toList());
+        fileTypes.addAll(
+                externalApplicationsPreferences.getExternalFileTypes().stream()
+                        .map(ExternalFileTypeItemViewModel::new)
+                        .toList());
         fileTypes.sort(Comparator.comparing(ExternalFileTypeItemViewModel::getName));
     }
 
     public void storeSettings() {
         Set<ExternalFileType> saveList = new HashSet<>();
 
-        fileTypes.stream().map(ExternalFileTypeItemViewModel::toExternalFileType)
-                 .forEach(type -> ExternalFileTypes.getDefaultExternalFileTypes().stream()
-                                                   .filter(type::equals).findAny()
-                                                   .ifPresentOrElse(saveList::add, () -> saveList.add(type)));
+        fileTypes.stream()
+                .map(ExternalFileTypeItemViewModel::toExternalFileType)
+                .forEach(
+                        type ->
+                                ExternalFileTypes.getDefaultExternalFileTypes().stream()
+                                        .filter(type::equals)
+                                        .findAny()
+                                        .ifPresentOrElse(saveList::add, () -> saveList.add(type)));
 
         externalApplicationsPreferences.getExternalFileTypes().clear();
         externalApplicationsPreferences.getExternalFileTypes().addAll(saveList);
     }
 
     public void resetToDefaults() {
-        fileTypes.setAll(ExternalFileTypes.getDefaultExternalFileTypes().stream()
-                                          .map(ExternalFileTypeItemViewModel::new)
-                                          .toList());
+        fileTypes.setAll(
+                ExternalFileTypes.getDefaultExternalFileTypes().stream()
+                        .map(ExternalFileTypeItemViewModel::new)
+                        .toList());
         fileTypes.sort(Comparator.comparing(ExternalFileTypeItemViewModel::getName));
     }
 
@@ -75,11 +84,13 @@ public ObservableList<ExternalFileTypeItemViewModel> getFileTypes() {
     }
 
     protected void showEditDialog(ExternalFileTypeItemViewModel item, String dialogTitle) {
-        dialogService.showCustomDialogAndWait(new EditExternalFileTypeEntryDialog(item, dialogTitle, fileTypes));
+        dialogService.showCustomDialogAndWait(
+                new EditExternalFileTypeEntryDialog(item, dialogTitle, fileTypes));
     }
 
     public boolean edit(ExternalFileTypeItemViewModel type) {
-        ExternalFileTypeItemViewModel typeToModify = new ExternalFileTypeItemViewModel(type.toExternalFileType());
+        ExternalFileTypeItemViewModel typeToModify =
+                new ExternalFileTypeItemViewModel(type.toExternalFileType());
         showEditDialog(typeToModify, Localization.lang("Edit file type"));
 
         if (!isValidExternalFileType(typeToModify)) {
@@ -110,7 +121,9 @@ public boolean isValidExternalFileType(ExternalFileTypeItemViewModel item) {
     }
 
     private boolean withEmptyValue(ExternalFileTypeItemViewModel item) {
-        return item.getName().isEmpty() || item.extensionProperty().get().isEmpty() || item.mimetypeProperty().get().isEmpty();
+        return item.getName().isEmpty()
+                || item.extensionProperty().get().isEmpty()
+                || item.mimetypeProperty().get().isEmpty();
     }
 
     private boolean isUniqueExtension(ExternalFileTypeItemViewModel item) {
diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
index e178b10a6e76..7f46ba947dfb 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
@@ -1,6 +1,11 @@
 package org.jabref.gui.preferences.general;
 
-import java.util.regex.Pattern;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+import jakarta.inject.Inject;
 
 import javafx.application.Platform;
 import javafx.fxml.FXML;
@@ -28,12 +33,10 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import jakarta.inject.Inject;
+import java.util.regex.Pattern;
 
-public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> implements PreferencesTab {
+public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel>
+        implements PreferencesTab {
 
     @FXML private ComboBox<Language> language;
     @FXML private ComboBox<ThemeTypes> theme;
@@ -61,20 +64,22 @@ public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> i
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
-    // The fontSizeFormatter formats the input given to the fontSize spinner so that non valid values cannot be entered.
-    private final TextFormatter<Integer> fontSizeFormatter = new TextFormatter<>(new IntegerStringConverter(), 9,
-            c -> {
-                if (Pattern.matches("\\d*", c.getText())) {
-                    return c;
-                }
-                c.setText("0");
-                return c;
-            });
+    // The fontSizeFormatter formats the input given to the fontSize spinner so that non valid
+    // values cannot be entered.
+    private final TextFormatter<Integer> fontSizeFormatter =
+            new TextFormatter<>(
+                    new IntegerStringConverter(),
+                    9,
+                    c -> {
+                        if (Pattern.matches("\\d*", c.getText())) {
+                            return c;
+                        }
+                        c.setText("0");
+                        return c;
+                    });
 
     public GeneralTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -83,7 +88,9 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new GeneralTabViewModel(dialogService, preferences, fileUpdateMonitor, entryTypesManager);
+        this.viewModel =
+                new GeneralTabViewModel(
+                        dialogService, preferences, fileUpdateMonitor, entryTypesManager);
 
         new ViewModelListCellFactory<Language>()
                 .withText(Language::getDisplayName)
@@ -107,17 +114,23 @@ public void initialize() {
         theme.valueProperty().bindBidirectional(viewModel.selectedThemeProperty());
         themeSyncOs.selectedProperty().bindBidirectional(viewModel.themeSyncOsProperty());
         customThemePath.textProperty().bindBidirectional(viewModel.customPathToThemeProperty());
-        EasyBind.subscribe(viewModel.selectedThemeProperty(), theme -> {
-            boolean isCustomTheme = theme == ThemeTypes.CUSTOM;
-            customThemePath.disableProperty().set(!isCustomTheme);
-            customThemeBrowse.disableProperty().set(!isCustomTheme);
-        });
+        EasyBind.subscribe(
+                viewModel.selectedThemeProperty(),
+                theme -> {
+                    boolean isCustomTheme = theme == ThemeTypes.CUSTOM;
+                    customThemePath.disableProperty().set(!isCustomTheme);
+                    customThemeBrowse.disableProperty().set(!isCustomTheme);
+                });
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
 
         openLastStartup.selectedProperty().bindBidirectional(viewModel.openLastStartupProperty());
-        showAdvancedHints.selectedProperty().bindBidirectional(viewModel.showAdvancedHintsProperty());
-        inspectionWarningDuplicate.selectedProperty().bindBidirectional(viewModel.inspectionWarningDuplicateProperty());
+        showAdvancedHints
+                .selectedProperty()
+                .bindBidirectional(viewModel.showAdvancedHintsProperty());
+        inspectionWarningDuplicate
+                .selectedProperty()
+                .bindBidirectional(viewModel.inspectionWarningDuplicateProperty());
         confirmDelete.selectedProperty().bindBidirectional(viewModel.confirmDeleteProperty());
 
         new ViewModelListCellFactory<BibDatabaseMode>()
@@ -126,21 +139,41 @@ public void initialize() {
         biblatexMode.itemsProperty().bind(viewModel.biblatexModeListProperty());
         biblatexMode.valueProperty().bindBidirectional(viewModel.selectedBiblatexModeProperty());
 
-        alwaysReformatBib.selectedProperty().bindBidirectional(viewModel.alwaysReformatBibProperty());
-        autosaveLocalLibraries.selectedProperty().bindBidirectional(viewModel.autosaveLocalLibrariesProperty());
+        alwaysReformatBib
+                .selectedProperty()
+                .bindBidirectional(viewModel.alwaysReformatBibProperty());
+        autosaveLocalLibraries
+                .selectedProperty()
+                .bindBidirectional(viewModel.autosaveLocalLibrariesProperty());
         ActionFactory actionFactory = new ActionFactory();
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE, dialogService, preferences.getExternalApplicationsPreferences()), autosaveLocalLibrariesHelp);
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService, preferences.getExternalApplicationsPreferences()), remoteHelp);
+        actionFactory.configureIconButton(
+                StandardActions.HELP,
+                new HelpAction(
+                        HelpFile.AUTOSAVE,
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences()),
+                autosaveLocalLibrariesHelp);
+        actionFactory.configureIconButton(
+                StandardActions.HELP,
+                new HelpAction(
+                        HelpFile.REMOTE,
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences()),
+                remoteHelp);
 
         createBackup.selectedProperty().bindBidirectional(viewModel.createBackupProperty());
         backupDirectory.textProperty().bindBidirectional(viewModel.backupDirectoryProperty());
         backupDirectory.disableProperty().bind(viewModel.createBackupProperty().not());
 
-        Platform.runLater(() -> {
-            validationVisualizer.initVisualization(viewModel.remotePortValidationStatus(), remotePort);
-            validationVisualizer.initVisualization(viewModel.fontSizeValidationStatus(), fontSize);
-            validationVisualizer.initVisualization(viewModel.customPathToThemeValidationStatus(), customThemePath);
-        });
+        Platform.runLater(
+                () -> {
+                    validationVisualizer.initVisualization(
+                            viewModel.remotePortValidationStatus(), remotePort);
+                    validationVisualizer.initVisualization(
+                            viewModel.fontSizeValidationStatus(), fontSize);
+                    validationVisualizer.initVisualization(
+                            viewModel.customPathToThemeValidationStatus(), customThemePath);
+                });
 
         remoteServer.selectedProperty().bindBidirectional(viewModel.remoteServerProperty());
         remotePort.textProperty().bindBidirectional(viewModel.remotePortProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
index 460d1aae3c7c..77e0b483f112 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -1,10 +1,12 @@
 package org.jabref.gui.preferences.general;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import com.airhacks.afterburner.injection.Injector;
+
+import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -44,12 +46,11 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
 
-import com.airhacks.afterburner.injection.Injector;
-import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 
 public class GeneralTabViewModel implements PreferenceTabViewModel {
 
@@ -77,8 +78,10 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty inspectionWarningDuplicateProperty = new SimpleBooleanProperty();
     private final BooleanProperty confirmDeleteProperty = new SimpleBooleanProperty();
 
-    private final ListProperty<BibDatabaseMode> bibliographyModeListProperty = new SimpleListProperty<>();
-    private final ObjectProperty<BibDatabaseMode> selectedBiblatexModeProperty = new SimpleObjectProperty<>();
+    private final ListProperty<BibDatabaseMode> bibliographyModeListProperty =
+            new SimpleListProperty<>();
+    private final ObjectProperty<BibDatabaseMode> selectedBiblatexModeProperty =
+            new SimpleObjectProperty<>();
 
     private final BooleanProperty alwaysReformatBibProperty = new SimpleBooleanProperty();
     private final BooleanProperty autosaveLocalLibraries = new SimpleBooleanProperty();
@@ -104,7 +107,11 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final BibEntryTypesManager entryTypesManager;
     private final TrustStoreManager trustStoreManager;
 
-    public GeneralTabViewModel(DialogService dialogService, GuiPreferences preferences, FileUpdateMonitor fileUpdateMonitor, BibEntryTypesManager entryTypesManager) {
+    public GeneralTabViewModel(
+            DialogService dialogService,
+            GuiPreferences preferences,
+            FileUpdateMonitor fileUpdateMonitor,
+            BibEntryTypesManager entryTypesManager) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.workspacePreferences = preferences.getWorkspacePreferences();
@@ -114,44 +121,57 @@ public GeneralTabViewModel(DialogService dialogService, GuiPreferences preferenc
         this.fileUpdateMonitor = fileUpdateMonitor;
         this.entryTypesManager = entryTypesManager;
 
-        fontSizeValidator = new FunctionBasedValidator<>(
-                fontSizeProperty,
-                input -> {
-                    try {
-                        return Integer.parseInt(fontSizeProperty().getValue()) > 8;
-                    } catch (NumberFormatException ex) {
-                        return false;
-                    }
-                },
-                ValidationMessage.error("%s > %s %n %n %s".formatted(
-                        Localization.lang("General"),
-                        Localization.lang("Font settings"),
-                        Localization.lang("You must enter an integer value higher than 8."))));
-
-        customPathToThemeValidator = new FunctionBasedValidator<>(
-                customPathToThemeProperty,
-                input -> !StringUtil.isNullOrEmpty(input),
-                ValidationMessage.error("%s > %s %n %n %s".formatted(
-                        Localization.lang("General"),
-                        Localization.lang("Visual theme"),
-                        Localization.lang("Please specify a css theme file."))));
-
-        remotePortValidator = new FunctionBasedValidator<>(
-                remotePortProperty,
-                input -> {
-                    try {
-                        int portNumber = Integer.parseInt(remotePortProperty().getValue());
-                        return RemoteUtil.isUserPort(portNumber);
-                    } catch (NumberFormatException ex) {
-                        return false;
-                    }
-                },
-                ValidationMessage.error("%s > %s %n %n %s".formatted(
-                        Localization.lang("Network"),
-                        Localization.lang("Remote operation"),
-                        Localization.lang("You must enter an integer value in the interval 1025-65535"))));
-
-        this.trustStoreManager = new TrustStoreManager(Path.of(preferences.getSSLPreferences().getTruststorePath()));
+        fontSizeValidator =
+                new FunctionBasedValidator<>(
+                        fontSizeProperty,
+                        input -> {
+                            try {
+                                return Integer.parseInt(fontSizeProperty().getValue()) > 8;
+                            } catch (NumberFormatException ex) {
+                                return false;
+                            }
+                        },
+                        ValidationMessage.error(
+                                "%s > %s %n %n %s"
+                                        .formatted(
+                                                Localization.lang("General"),
+                                                Localization.lang("Font settings"),
+                                                Localization.lang(
+                                                        "You must enter an integer value higher than 8."))));
+
+        customPathToThemeValidator =
+                new FunctionBasedValidator<>(
+                        customPathToThemeProperty,
+                        input -> !StringUtil.isNullOrEmpty(input),
+                        ValidationMessage.error(
+                                "%s > %s %n %n %s"
+                                        .formatted(
+                                                Localization.lang("General"),
+                                                Localization.lang("Visual theme"),
+                                                Localization.lang(
+                                                        "Please specify a css theme file."))));
+
+        remotePortValidator =
+                new FunctionBasedValidator<>(
+                        remotePortProperty,
+                        input -> {
+                            try {
+                                int portNumber = Integer.parseInt(remotePortProperty().getValue());
+                                return RemoteUtil.isUserPort(portNumber);
+                            } catch (NumberFormatException ex) {
+                                return false;
+                            }
+                        },
+                        ValidationMessage.error(
+                                "%s > %s %n %n %s"
+                                        .formatted(
+                                                Localization.lang("Network"),
+                                                Localization.lang("Remote operation"),
+                                                Localization.lang(
+                                                        "You must enter an integer value in the interval 1025-65535"))));
+
+        this.trustStoreManager =
+                new TrustStoreManager(Path.of(preferences.getSSLPreferences().getTruststorePath()));
     }
 
     public ValidationStatus remotePortValidationStatus() {
@@ -162,13 +182,13 @@ public ValidationStatus remotePortValidationStatus() {
     public void setValues() {
         selectedLanguageProperty.setValue(workspacePreferences.getLanguage());
 
-        // The light theme is in fact the absence of any theme modifying 'base.css'. Another embedded theme like
-        // 'dark.css', stored in the classpath, can be introduced in {@link org.jabref.gui.theme.Theme}.
+        // The light theme is in fact the absence of any theme modifying 'base.css'. Another
+        // embedded theme like
+        // 'dark.css', stored in the classpath, can be introduced in {@link
+        // org.jabref.gui.theme.Theme}.
         switch (workspacePreferences.getTheme().getType()) {
-            case DEFAULT ->
-                    selectedThemeProperty.setValue(ThemeTypes.LIGHT);
-            case EMBEDDED ->
-                    selectedThemeProperty.setValue(ThemeTypes.DARK);
+            case DEFAULT -> selectedThemeProperty.setValue(ThemeTypes.LIGHT);
+            case EMBEDDED -> selectedThemeProperty.setValue(ThemeTypes.DARK);
             case CUSTOM -> {
                 selectedThemeProperty.setValue(ThemeTypes.CUSTOM);
                 customPathToThemeProperty.setValue(workspacePreferences.getTheme().getName());
@@ -181,11 +201,13 @@ public void setValues() {
 
         openLastStartupProperty.setValue(workspacePreferences.shouldOpenLastEdited());
         showAdvancedHintsProperty.setValue(workspacePreferences.shouldShowAdvancedHints());
-        inspectionWarningDuplicateProperty.setValue(workspacePreferences.shouldWarnAboutDuplicatesInInspection());
+        inspectionWarningDuplicateProperty.setValue(
+                workspacePreferences.shouldWarnAboutDuplicatesInInspection());
 
         confirmDeleteProperty.setValue(workspacePreferences.shouldConfirmDelete());
 
-        bibliographyModeListProperty.setValue(FXCollections.observableArrayList(BibDatabaseMode.values()));
+        bibliographyModeListProperty.setValue(
+                FXCollections.observableArrayList(BibDatabaseMode.values()));
         selectedBiblatexModeProperty.setValue(libraryPreferences.getDefaultBibDatabaseMode());
 
         alwaysReformatBibProperty.setValue(libraryPreferences.shouldAlwaysReformatOnSave());
@@ -204,25 +226,26 @@ public void storeSettings() {
         if (newLanguage != workspacePreferences.getLanguage()) {
             workspacePreferences.setLanguage(newLanguage);
             Localization.setLanguage(newLanguage);
-            restartWarning.add(Localization.lang("Changed language") + ": " + newLanguage.getDisplayName());
+            restartWarning.add(
+                    Localization.lang("Changed language") + ": " + newLanguage.getDisplayName());
         }
 
         workspacePreferences.setShouldOverrideDefaultFontSize(fontOverrideProperty.getValue());
         workspacePreferences.setMainFontSize(Integer.parseInt(fontSizeProperty.getValue()));
 
         switch (selectedThemeProperty.get()) {
-            case LIGHT ->
-                    workspacePreferences.setTheme(Theme.light());
-            case DARK ->
-                    workspacePreferences.setTheme(Theme.dark());
+            case LIGHT -> workspacePreferences.setTheme(Theme.light());
+            case DARK -> workspacePreferences.setTheme(Theme.dark());
             case CUSTOM ->
-                    workspacePreferences.setTheme(Theme.custom(customPathToThemeProperty.getValue()));
+                    workspacePreferences.setTheme(
+                            Theme.custom(customPathToThemeProperty.getValue()));
         }
         workspacePreferences.setThemeSyncOs(themeSyncOsProperty.getValue());
 
         workspacePreferences.setOpenLastEdited(openLastStartupProperty.getValue());
         workspacePreferences.setShowAdvancedHints(showAdvancedHintsProperty.getValue());
-        workspacePreferences.setWarnAboutDuplicatesInInspection(inspectionWarningDuplicateProperty.getValue());
+        workspacePreferences.setWarnAboutDuplicatesInInspection(
+                inspectionWarningDuplicateProperty.getValue());
 
         workspacePreferences.setConfirmDelete(confirmDeleteProperty.getValue());
 
@@ -232,28 +255,38 @@ public void storeSettings() {
         libraryPreferences.setAutoSave(autosaveLocalLibraries.getValue());
 
         filePreferences.createBackupProperty().setValue(createBackupProperty.getValue());
-        filePreferences.backupDirectoryProperty().setValue(Path.of(backupDirectoryProperty.getValue()));
-
-        getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
-            if (remotePreferences.isDifferentPort(newPort)) {
-                remotePreferences.setPort(newPort);
-            }
-        });
-
-        getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
-            if (remotePreferences.isDifferentPort(newPort)) {
-                remotePreferences.setPort(newPort);
-            }
-        });
-
-        UiMessageHandler uiMessageHandler = Injector.instantiateModelOrService(UiMessageHandler.class);
-        RemoteListenerServerManager remoteListenerServerManager = Injector.instantiateModelOrService(RemoteListenerServerManager.class);
-        remoteListenerServerManager.stop(); // stop in all cases, because the port might have changed
+        filePreferences
+                .backupDirectoryProperty()
+                .setValue(Path.of(backupDirectoryProperty.getValue()));
+
+        getPortAsInt(remotePortProperty.getValue())
+                .ifPresent(
+                        newPort -> {
+                            if (remotePreferences.isDifferentPort(newPort)) {
+                                remotePreferences.setPort(newPort);
+                            }
+                        });
+
+        getPortAsInt(remotePortProperty.getValue())
+                .ifPresent(
+                        newPort -> {
+                            if (remotePreferences.isDifferentPort(newPort)) {
+                                remotePreferences.setPort(newPort);
+                            }
+                        });
+
+        UiMessageHandler uiMessageHandler =
+                Injector.instantiateModelOrService(UiMessageHandler.class);
+        RemoteListenerServerManager remoteListenerServerManager =
+                Injector.instantiateModelOrService(RemoteListenerServerManager.class);
+        remoteListenerServerManager
+                .stop(); // stop in all cases, because the port might have changed
 
         if (remoteServerProperty.getValue()) {
             remotePreferences.setUseRemoteServer(true);
             remoteListenerServerManager.openAndStart(
-                    new CLIMessageHandler(uiMessageHandler, preferences, fileUpdateMonitor, entryTypesManager),
+                    new CLIMessageHandler(
+                            uiMessageHandler, preferences, fileUpdateMonitor, entryTypesManager),
                     remotePreferences.getPort());
         } else {
             remotePreferences.setUseRemoteServer(false);
@@ -263,7 +296,8 @@ public void storeSettings() {
         if (remoteServerProperty.getValue()) {
             remotePreferences.setUseRemoteServer(true);
             remoteListenerServerManager.openAndStart(
-                    new CLIMessageHandler(uiMessageHandler, preferences, fileUpdateMonitor, entryTypesManager),
+                    new CLIMessageHandler(
+                            uiMessageHandler, preferences, fileUpdateMonitor, entryTypesManager),
                     remotePreferences.getPort());
         } else {
             remotePreferences.setUseRemoteServer(false);
@@ -298,8 +332,10 @@ public boolean validateSettings() {
 
         ValidationStatus validationStatus = validator.getValidationStatus();
         if (!validationStatus.isValid()) {
-            validationStatus.getHighestMessage().ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage()));
+            validationStatus
+                    .getHighestMessage()
+                    .ifPresent(
+                            message -> dialogService.showErrorDialogAndWait(message.getMessage()));
             return false;
         }
         return true;
@@ -335,16 +371,27 @@ public StringProperty customPathToThemeProperty() {
     }
 
     public void importCSSFile() {
-        String fileDir = customPathToThemeProperty.getValue().isEmpty() ? preferences.getInternalPreferences().getLastPreferencesExportPath().toString()
-                : customPathToThemeProperty.getValue();
-
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.CSS)
-                .withDefaultExtension(StandardFileType.CSS)
-                .withInitialDirectory(fileDir).build();
-
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file ->
-                customPathToThemeProperty.setValue(file.toAbsolutePath().toString()));
+        String fileDir =
+                customPathToThemeProperty.getValue().isEmpty()
+                        ? preferences
+                                .getInternalPreferences()
+                                .getLastPreferencesExportPath()
+                                .toString()
+                        : customPathToThemeProperty.getValue();
+
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(StandardFileType.CSS)
+                        .withDefaultExtension(StandardFileType.CSS)
+                        .withInitialDirectory(fileDir)
+                        .build();
+
+        dialogService
+                .showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(
+                        file ->
+                                customPathToThemeProperty.setValue(
+                                        file.toAbsolutePath().toString()));
     }
 
     public BooleanProperty fontOverrideProperty() {
@@ -397,9 +444,12 @@ public StringProperty backupDirectoryProperty() {
 
     public void backupFileDirBrowse() {
         DirectoryDialogConfiguration dirDialogConfiguration =
-                new DirectoryDialogConfiguration.Builder().withInitialDirectory(Path.of(backupDirectoryProperty().getValue())).build();
-        dialogService.showDirectorySelectionDialog(dirDialogConfiguration)
-                     .ifPresent(dir -> backupDirectoryProperty.setValue(dir.toString()));
+                new DirectoryDialogConfiguration.Builder()
+                        .withInitialDirectory(Path.of(backupDirectoryProperty().getValue()))
+                        .build();
+        dialogService
+                .showDirectorySelectionDialog(dirDialogConfiguration)
+                .ifPresent(dir -> backupDirectoryProperty.setValue(dir.toString()));
     }
 
     public BooleanProperty remoteServerProperty() {
diff --git a/src/main/java/org/jabref/gui/preferences/groups/GroupsTab.java b/src/main/java/org/jabref/gui/preferences/groups/GroupsTab.java
index cf6ada3c627e..e7e2ad9e3410 100644
--- a/src/main/java/org/jabref/gui/preferences/groups/GroupsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/groups/GroupsTab.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.preferences.groups;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.RadioButton;
@@ -8,9 +10,8 @@
 import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
-public class GroupsTab extends AbstractPreferenceTabView<GroupsTabViewModel> implements PreferencesTab {
+public class GroupsTab extends AbstractPreferenceTabView<GroupsTabViewModel>
+        implements PreferencesTab {
 
     @FXML private RadioButton groupViewModeIntersection;
     @FXML private RadioButton groupViewModeUnion;
@@ -18,9 +19,7 @@ public class GroupsTab extends AbstractPreferenceTabView<GroupsTabViewModel> imp
     @FXML private CheckBox displayGroupCount;
 
     public GroupsTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -31,8 +30,12 @@ public String getTabName() {
     public void initialize() {
         this.viewModel = new GroupsTabViewModel(preferences.getGroupsPreferences());
 
-        groupViewModeIntersection.selectedProperty().bindBidirectional(viewModel.groupViewModeIntersectionProperty());
-        groupViewModeUnion.selectedProperty().bindBidirectional(viewModel.groupViewModeUnionProperty());
+        groupViewModeIntersection
+                .selectedProperty()
+                .bindBidirectional(viewModel.groupViewModeIntersectionProperty());
+        groupViewModeUnion
+                .selectedProperty()
+                .bindBidirectional(viewModel.groupViewModeUnionProperty());
         autoAssignGroup.selectedProperty().bindBidirectional(viewModel.autoAssignGroupProperty());
         displayGroupCount.selectedProperty().bindBidirectional(viewModel.displayGroupCount());
     }
diff --git a/src/main/java/org/jabref/gui/preferences/groups/GroupsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/groups/GroupsTabViewModel.java
index 0d1d095108fb..4408dbea44a8 100644
--- a/src/main/java/org/jabref/gui/preferences/groups/GroupsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/groups/GroupsTabViewModel.java
@@ -35,7 +35,8 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        groupsPreferences.setGroupViewMode(GroupViewMode.INTERSECTION, groupViewModeIntersectionProperty.getValue());
+        groupsPreferences.setGroupViewMode(
+                GroupViewMode.INTERSECTION, groupViewModeIntersectionProperty.getValue());
         groupsPreferences.setAutoAssignGroup(autoAssignGroupProperty.getValue());
         groupsPreferences.setDisplayGroupCount(displayGroupCountProperty.getValue());
     }
diff --git a/src/main/java/org/jabref/gui/preferences/journals/AbbreviationViewModel.java b/src/main/java/org/jabref/gui/preferences/journals/AbbreviationViewModel.java
index 1c13439cf6bf..617121f77d6e 100644
--- a/src/main/java/org/jabref/gui/preferences/journals/AbbreviationViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/AbbreviationViewModel.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.preferences.journals;
 
-import java.util.Locale;
-import java.util.Objects;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -10,6 +7,9 @@
 
 import org.jabref.logic.journals.Abbreviation;
 
+import java.util.Locale;
+import java.util.Objects;
+
 /**
  * This class provides a view model for abbreviation objects which can also define placeholder objects of abbreviations.
  * This is indicated by using the {@code pseudoAbbreviation} property.
@@ -30,8 +30,11 @@ public AbbreviationViewModel(Abbreviation abbreviationObject) {
             this.abbreviation.setValue(abbreviationObject.getAbbreviation());
 
             // the view model stores the "real" values, not the default fallback
-            String shortestUniqueAbbreviationOfAbbreviation = abbreviationObject.getShortestUniqueAbbreviation();
-            boolean shortestUniqueAbbreviationIsDefaultValue = shortestUniqueAbbreviationOfAbbreviation.equals(abbreviationObject.getAbbreviation());
+            String shortestUniqueAbbreviationOfAbbreviation =
+                    abbreviationObject.getShortestUniqueAbbreviation();
+            boolean shortestUniqueAbbreviationIsDefaultValue =
+                    shortestUniqueAbbreviationOfAbbreviation.equals(
+                            abbreviationObject.getAbbreviation());
             if (shortestUniqueAbbreviationIsDefaultValue) {
                 this.shortestUniqueAbbreviation.set("");
             } else {
@@ -105,13 +108,20 @@ && getShortestUniqueAbbreviation().equals(that.getShortestUniqueAbbreviation())
 
     @Override
     public int hashCode() {
-        return Objects.hash(getName(), getAbbreviation(), getShortestUniqueAbbreviation(), isPseudoAbbreviation());
+        return Objects.hash(
+                getName(),
+                getAbbreviation(),
+                getShortestUniqueAbbreviation(),
+                isPseudoAbbreviation());
     }
 
     public boolean containsCaseIndependent(String searchTerm) {
         searchTerm = searchTerm.toLowerCase(Locale.ROOT);
-        return this.abbreviation.get().toLowerCase(Locale.ROOT).contains(searchTerm) ||
-                this.name.get().toLowerCase(Locale.ROOT).contains(searchTerm) ||
-                this.shortestUniqueAbbreviation.get().toLowerCase(Locale.ROOT).contains(searchTerm);
+        return this.abbreviation.get().toLowerCase(Locale.ROOT).contains(searchTerm)
+                || this.name.get().toLowerCase(Locale.ROOT).contains(searchTerm)
+                || this.shortestUniqueAbbreviation
+                        .get()
+                        .toLowerCase(Locale.ROOT)
+                        .contains(searchTerm);
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java b/src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java
index 88ecb96d2409..e78b735b5dfd 100644
--- a/src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java
@@ -1,5 +1,14 @@
 package org.jabref.gui.preferences.journals;
 
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.logic.journals.Abbreviation;
+import org.jabref.logic.journals.AbbreviationWriter;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
+
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -10,23 +19,14 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javafx.beans.property.ReadOnlyBooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
-
-import org.jabref.logic.journals.Abbreviation;
-import org.jabref.logic.journals.AbbreviationWriter;
-import org.jabref.logic.journals.JournalAbbreviationLoader;
-
 /**
  * This class provides a model for abbreviation files. It actually doesn't save the files as objects but rather saves
  * their paths. This also allows to specify pseudo files as placeholder objects.
  */
 public class AbbreviationsFileViewModel {
 
-    private final SimpleListProperty<AbbreviationViewModel> abbreviations = new SimpleListProperty<>(
-            FXCollections.observableArrayList());
+    private final SimpleListProperty<AbbreviationViewModel> abbreviations =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
     private final ReadOnlyBooleanProperty isBuiltInList;
     private final String name;
     private final Optional<Path> path;
@@ -51,8 +51,10 @@ public AbbreviationsFileViewModel(List<AbbreviationViewModel> abbreviations, Str
 
     public void readAbbreviations() throws IOException {
         if (path.isPresent()) {
-            Collection<Abbreviation> abbreviationList = JournalAbbreviationLoader.readAbbreviationsFromCsvFile(path.get());
-            abbreviationList.forEach(abbreviation -> abbreviations.addAll(new AbbreviationViewModel(abbreviation)));
+            Collection<Abbreviation> abbreviationList =
+                    JournalAbbreviationLoader.readAbbreviationsFromCsvFile(path.get());
+            abbreviationList.forEach(
+                    abbreviation -> abbreviations.addAll(new AbbreviationViewModel(abbreviation)));
         } else {
             throw new FileNotFoundException();
         }
@@ -66,9 +68,10 @@ public void readAbbreviations() throws IOException {
     public void writeOrCreate() throws IOException {
         if (!isBuiltInList.get()) {
             List<Abbreviation> actualAbbreviations =
-                    abbreviations.stream().filter(abb -> !abb.isPseudoAbbreviation())
-                                 .map(AbbreviationViewModel::getAbbreviationObject)
-                                 .collect(Collectors.toList());
+                    abbreviations.stream()
+                            .filter(abb -> !abb.isPseudoAbbreviation())
+                            .map(AbbreviationViewModel::getAbbreviationObject)
+                            .collect(Collectors.toList());
             AbbreviationWriter.writeOrCreate(path.get(), actualAbbreviations);
         }
     }
diff --git a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
index 1ca3985fc68b..2e8406ff1c61 100644
--- a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
@@ -1,5 +1,10 @@
 package org.jabref.gui.preferences.journals;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import jakarta.inject.Inject;
+
 import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
@@ -22,6 +27,7 @@
 import javafx.scene.paint.Color;
 import javafx.util.Duration;
 
+import org.controlsfx.control.textfield.CustomTextField;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
@@ -31,16 +37,13 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.TaskExecutor;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
-import org.controlsfx.control.textfield.CustomTextField;
-
 /**
  * This class controls the user interface of the journal abbreviations dialog. The UI elements and their layout are
  * defined in the FXML file.
  */
-public class JournalAbbreviationsTab extends AbstractPreferenceTabView<JournalAbbreviationsTabViewModel> implements PreferencesTab {
+public class JournalAbbreviationsTab
+        extends AbstractPreferenceTabView<JournalAbbreviationsTabViewModel>
+        implements PreferencesTab {
 
     @FXML private Label loadingLabel;
     @FXML private ProgressIndicator progressIndicator;
@@ -48,7 +51,10 @@ public class JournalAbbreviationsTab extends AbstractPreferenceTabView<JournalAb
     @FXML private TableView<AbbreviationViewModel> journalAbbreviationsTable;
     @FXML private TableColumn<AbbreviationViewModel, String> journalTableNameColumn;
     @FXML private TableColumn<AbbreviationViewModel, String> journalTableAbbreviationColumn;
-    @FXML private TableColumn<AbbreviationViewModel, String> journalTableShortestUniqueAbbreviationColumn;
+
+    @FXML
+    private TableColumn<AbbreviationViewModel, String> journalTableShortestUniqueAbbreviationColumn;
+
     @FXML private TableColumn<AbbreviationViewModel, String> actionsColumn;
 
     private FilteredList<AbbreviationViewModel> filteredAbbreviations;
@@ -66,18 +72,17 @@ public class JournalAbbreviationsTab extends AbstractPreferenceTabView<JournalAb
     private Timeline invalidateSearch;
 
     public JournalAbbreviationsTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @FXML
     private void initialize() {
-        viewModel = new JournalAbbreviationsTabViewModel(
-                preferences.getJournalAbbreviationPreferences(),
-                dialogService,
-                taskExecutor,
-                abbreviationRepository);
+        viewModel =
+                new JournalAbbreviationsTabViewModel(
+                        preferences.getJournalAbbreviationPreferences(),
+                        dialogService,
+                        taskExecutor,
+                        abbreviationRepository);
 
         filteredAbbreviations = new FilteredList<>(viewModel.abbreviationsProperty());
 
@@ -93,11 +98,14 @@ private void setUpTable() {
         journalTableNameColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
         journalTableNameColumn.setCellFactory(TextFieldTableCell.forTableColumn());
 
-        journalTableAbbreviationColumn.setCellValueFactory(cellData -> cellData.getValue().abbreviationProperty());
+        journalTableAbbreviationColumn.setCellValueFactory(
+                cellData -> cellData.getValue().abbreviationProperty());
         journalTableAbbreviationColumn.setCellFactory(TextFieldTableCell.forTableColumn());
 
-        journalTableShortestUniqueAbbreviationColumn.setCellValueFactory(cellData -> cellData.getValue().shortestUniqueAbbreviationProperty());
-        journalTableShortestUniqueAbbreviationColumn.setCellFactory(TextFieldTableCell.forTableColumn());
+        journalTableShortestUniqueAbbreviationColumn.setCellValueFactory(
+                cellData -> cellData.getValue().shortestUniqueAbbreviationProperty());
+        journalTableShortestUniqueAbbreviationColumn.setCellFactory(
+                TextFieldTableCell.forTableColumn());
 
         actionsColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
         new ValueTableCellFactory<AbbreviationViewModel, String>()
@@ -105,52 +113,92 @@ private void setUpTable() {
                 .withTooltip(name -> Localization.lang("Remove journal '%0'", name))
                 .withDisableExpression(item -> viewModel.isEditableAndRemovableProperty().not())
                 .withVisibleExpression(item -> viewModel.isEditableAndRemovableProperty())
-                .withOnMouseClickedEvent(item -> evt ->
-                        viewModel.removeAbbreviation(journalAbbreviationsTable.getFocusModel().getFocusedItem()))
+                .withOnMouseClickedEvent(
+                        item ->
+                                evt ->
+                                        viewModel.removeAbbreviation(
+                                                journalAbbreviationsTable
+                                                        .getFocusModel()
+                                                        .getFocusedItem()))
                 .install(actionsColumn);
     }
 
     private void setBindings() {
         journalAbbreviationsTable.setItems(filteredAbbreviations);
 
-        EasyBind.subscribe(journalAbbreviationsTable.getSelectionModel().selectedItemProperty(), newValue ->
-                viewModel.currentAbbreviationProperty().set(newValue));
-        EasyBind.subscribe(viewModel.currentAbbreviationProperty(), newValue ->
-                journalAbbreviationsTable.getSelectionModel().select(newValue));
-
-        journalTableNameColumn.editableProperty().bind(viewModel.isAbbreviationEditableAndRemovable());
-        journalTableAbbreviationColumn.editableProperty().bind(viewModel.isAbbreviationEditableAndRemovable());
-        journalTableShortestUniqueAbbreviationColumn.editableProperty().bind(viewModel.isAbbreviationEditableAndRemovable());
-
-        removeAbbreviationListButton.disableProperty().bind(viewModel.isFileRemovableProperty().not());
+        EasyBind.subscribe(
+                journalAbbreviationsTable.getSelectionModel().selectedItemProperty(),
+                newValue -> viewModel.currentAbbreviationProperty().set(newValue));
+        EasyBind.subscribe(
+                viewModel.currentAbbreviationProperty(),
+                newValue -> journalAbbreviationsTable.getSelectionModel().select(newValue));
+
+        journalTableNameColumn
+                .editableProperty()
+                .bind(viewModel.isAbbreviationEditableAndRemovable());
+        journalTableAbbreviationColumn
+                .editableProperty()
+                .bind(viewModel.isAbbreviationEditableAndRemovable());
+        journalTableShortestUniqueAbbreviationColumn
+                .editableProperty()
+                .bind(viewModel.isAbbreviationEditableAndRemovable());
+
+        removeAbbreviationListButton
+                .disableProperty()
+                .bind(viewModel.isFileRemovableProperty().not());
         journalFilesBox.itemsProperty().bindBidirectional(viewModel.journalFilesProperty());
         journalFilesBox.valueProperty().bindBidirectional(viewModel.currentFileProperty());
 
-        addAbbreviationButton.disableProperty().bind(viewModel.isEditableAndRemovableProperty().not());
+        addAbbreviationButton
+                .disableProperty()
+                .bind(viewModel.isEditableAndRemovableProperty().not());
 
         loadingLabel.visibleProperty().bind(viewModel.isLoadingProperty());
         progressIndicator.visibleProperty().bind(viewModel.isLoadingProperty());
 
-        searchBox.textProperty().addListener((observable, previousText, searchTerm) ->
-                filteredAbbreviations.setPredicate(abbreviation -> searchTerm.isEmpty() || abbreviation.containsCaseIndependent(searchTerm)));
+        searchBox
+                .textProperty()
+                .addListener(
+                        (observable, previousText, searchTerm) ->
+                                filteredAbbreviations.setPredicate(
+                                        abbreviation ->
+                                                searchTerm.isEmpty()
+                                                        || abbreviation.containsCaseIndependent(
+                                                                searchTerm)));
 
         useFJournal.selectedProperty().bindBidirectional(viewModel.useFJournalProperty());
     }
 
     private void setAnimations() {
         ObjectProperty<Color> flashingColor = new SimpleObjectProperty<>(Color.TRANSPARENT);
-        StringProperty flashingColorStringProperty = createFlashingColorStringProperty(flashingColor);
-
-        searchBox.styleProperty().bind(
-                new SimpleStringProperty("-fx-control-inner-background: ").concat(flashingColorStringProperty).concat(";")
-        );
-        invalidateSearch = new Timeline(
-                new KeyFrame(Duration.seconds(0), new KeyValue(flashingColor, Color.TRANSPARENT, Interpolator.LINEAR)),
-                new KeyFrame(Duration.seconds(0.25), new KeyValue(flashingColor, Color.RED, Interpolator.LINEAR)),
-                new KeyFrame(Duration.seconds(0.25), new KeyValue(searchBox.textProperty(), "", Interpolator.DISCRETE)),
-                new KeyFrame(Duration.seconds(0.25), (ActionEvent event) -> addAbbreviationActions()),
-                new KeyFrame(Duration.seconds(0.5), new KeyValue(flashingColor, Color.TRANSPARENT, Interpolator.LINEAR))
-        );
+        StringProperty flashingColorStringProperty =
+                createFlashingColorStringProperty(flashingColor);
+
+        searchBox
+                .styleProperty()
+                .bind(
+                        new SimpleStringProperty("-fx-control-inner-background: ")
+                                .concat(flashingColorStringProperty)
+                                .concat(";"));
+        invalidateSearch =
+                new Timeline(
+                        new KeyFrame(
+                                Duration.seconds(0),
+                                new KeyValue(
+                                        flashingColor, Color.TRANSPARENT, Interpolator.LINEAR)),
+                        new KeyFrame(
+                                Duration.seconds(0.25),
+                                new KeyValue(flashingColor, Color.RED, Interpolator.LINEAR)),
+                        new KeyFrame(
+                                Duration.seconds(0.25),
+                                new KeyValue(searchBox.textProperty(), "", Interpolator.DISCRETE)),
+                        new KeyFrame(
+                                Duration.seconds(0.25),
+                                (ActionEvent event) -> addAbbreviationActions()),
+                        new KeyFrame(
+                                Duration.seconds(0.5),
+                                new KeyValue(
+                                        flashingColor, Color.TRANSPARENT, Interpolator.LINEAR)));
     }
 
     @FXML
@@ -183,14 +231,18 @@ private void addAbbreviationActions() {
         editAbbreviation();
     }
 
-    private static StringProperty createFlashingColorStringProperty(final ObjectProperty<Color> flashingColor) {
+    private static StringProperty createFlashingColorStringProperty(
+            final ObjectProperty<Color> flashingColor) {
         final StringProperty flashingColorStringProperty = new SimpleStringProperty();
         setColorStringFromColor(flashingColorStringProperty, flashingColor);
-        flashingColor.addListener((observable, oldValue, newValue) -> setColorStringFromColor(flashingColorStringProperty, flashingColor));
+        flashingColor.addListener(
+                (observable, oldValue, newValue) ->
+                        setColorStringFromColor(flashingColorStringProperty, flashingColor));
         return flashingColorStringProperty;
     }
 
-    private static void setColorStringFromColor(StringProperty colorStringProperty, ObjectProperty<Color> color) {
+    private static void setColorStringFromColor(
+            StringProperty colorStringProperty, ObjectProperty<Color> color) {
         colorStringProperty.set(ColorUtil.toRGBACode(color.get()));
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java
index 106a475df00d..80392d89a1d5 100644
--- a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java
@@ -1,10 +1,6 @@
 package org.jabref.gui.preferences.journals;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -24,11 +20,15 @@
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.logic.util.TaskExecutor;
-
-import com.airhacks.afterburner.injection.Injector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
  * This class provides a model for managing journal abbreviation lists. It provides all necessary methods to create,
  * modify or delete journal abbreviations and files. To visualize the model one can bind the properties to UI elements.
@@ -37,17 +37,22 @@ public class JournalAbbreviationsTabViewModel implements PreferenceTabViewModel
 
     private final Logger LOGGER = LoggerFactory.getLogger(JournalAbbreviationsTabViewModel.class);
 
-    private final SimpleListProperty<AbbreviationsFileViewModel> journalFiles = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final SimpleListProperty<AbbreviationViewModel> abbreviations = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final SimpleListProperty<AbbreviationsFileViewModel> journalFiles =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final SimpleListProperty<AbbreviationViewModel> abbreviations =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
     private final SimpleIntegerProperty abbreviationsCount = new SimpleIntegerProperty();
 
-    private final SimpleObjectProperty<AbbreviationsFileViewModel> currentFile = new SimpleObjectProperty<>();
-    private final SimpleObjectProperty<AbbreviationViewModel> currentAbbreviation = new SimpleObjectProperty<>();
+    private final SimpleObjectProperty<AbbreviationsFileViewModel> currentFile =
+            new SimpleObjectProperty<>();
+    private final SimpleObjectProperty<AbbreviationViewModel> currentAbbreviation =
+            new SimpleObjectProperty<>();
 
     private final SimpleBooleanProperty isFileRemovable = new SimpleBooleanProperty();
     private final SimpleBooleanProperty isLoading = new SimpleBooleanProperty(false);
     private final SimpleBooleanProperty isEditableAndRemovable = new SimpleBooleanProperty(false);
-    private final SimpleBooleanProperty isAbbreviationEditableAndRemovable = new SimpleBooleanProperty(false);
+    private final SimpleBooleanProperty isAbbreviationEditableAndRemovable =
+            new SimpleBooleanProperty(false);
     private final SimpleBooleanProperty useFJournal = new SimpleBooleanProperty(true);
 
     private final DialogService dialogService;
@@ -57,52 +62,63 @@ public class JournalAbbreviationsTabViewModel implements PreferenceTabViewModel
     private final JournalAbbreviationRepository journalAbbreviationRepository;
     private boolean shouldWriteLists;
 
-    public JournalAbbreviationsTabViewModel(JournalAbbreviationPreferences abbreviationsPreferences,
-                                            DialogService dialogService,
-                                            TaskExecutor taskExecutor,
-                                            JournalAbbreviationRepository journalAbbreviationRepository) {
+    public JournalAbbreviationsTabViewModel(
+            JournalAbbreviationPreferences abbreviationsPreferences,
+            DialogService dialogService,
+            TaskExecutor taskExecutor,
+            JournalAbbreviationRepository journalAbbreviationRepository) {
         this.dialogService = Objects.requireNonNull(dialogService);
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
         this.journalAbbreviationRepository = Objects.requireNonNull(journalAbbreviationRepository);
         this.abbreviationsPreferences = abbreviationsPreferences;
 
         abbreviationsCount.bind(abbreviations.sizeProperty());
-        currentAbbreviation.addListener((observable, oldValue, newValue) -> {
-            boolean isAbbreviation = (newValue != null) && !newValue.isPseudoAbbreviation();
-            boolean isEditableFile = (currentFile.get() != null) && !currentFile.get().isBuiltInListProperty().get();
-            isEditableAndRemovable.set(isEditableFile);
-            isAbbreviationEditableAndRemovable.set(isAbbreviation && isEditableFile);
-        });
-        currentFile.addListener((observable, oldValue, newValue) -> {
-            if (oldValue != null) {
-                abbreviations.unbindBidirectional(oldValue.abbreviationsProperty());
-                currentAbbreviation.set(null);
-            }
-            if (newValue != null) {
-                isFileRemovable.set(!newValue.isBuiltInListProperty().get());
-                abbreviations.bindBidirectional(newValue.abbreviationsProperty());
-                if (!abbreviations.isEmpty()) {
-                    currentAbbreviation.set(abbreviations.getLast());
-                }
-            } else {
-                isFileRemovable.set(false);
-                if (journalFiles.isEmpty()) {
-                    currentAbbreviation.set(null);
-                    abbreviations.clear();
-                } else {
-                    currentFile.set(journalFiles.getFirst());
-                }
-            }
-        });
-        journalFiles.addListener((ListChangeListener<AbbreviationsFileViewModel>) lcl -> {
-            if (lcl.next()) {
-                if (!lcl.wasReplaced()) {
-                    if (lcl.wasAdded() && !lcl.getAddedSubList().getFirst().isBuiltInListProperty().get()) {
-                        currentFile.set(lcl.getAddedSubList().getFirst());
+        currentAbbreviation.addListener(
+                (observable, oldValue, newValue) -> {
+                    boolean isAbbreviation = (newValue != null) && !newValue.isPseudoAbbreviation();
+                    boolean isEditableFile =
+                            (currentFile.get() != null)
+                                    && !currentFile.get().isBuiltInListProperty().get();
+                    isEditableAndRemovable.set(isEditableFile);
+                    isAbbreviationEditableAndRemovable.set(isAbbreviation && isEditableFile);
+                });
+        currentFile.addListener(
+                (observable, oldValue, newValue) -> {
+                    if (oldValue != null) {
+                        abbreviations.unbindBidirectional(oldValue.abbreviationsProperty());
+                        currentAbbreviation.set(null);
                     }
-                }
-            }
-        });
+                    if (newValue != null) {
+                        isFileRemovable.set(!newValue.isBuiltInListProperty().get());
+                        abbreviations.bindBidirectional(newValue.abbreviationsProperty());
+                        if (!abbreviations.isEmpty()) {
+                            currentAbbreviation.set(abbreviations.getLast());
+                        }
+                    } else {
+                        isFileRemovable.set(false);
+                        if (journalFiles.isEmpty()) {
+                            currentAbbreviation.set(null);
+                            abbreviations.clear();
+                        } else {
+                            currentFile.set(journalFiles.getFirst());
+                        }
+                    }
+                });
+        journalFiles.addListener(
+                (ListChangeListener<AbbreviationsFileViewModel>)
+                        lcl -> {
+                            if (lcl.next()) {
+                                if (!lcl.wasReplaced()) {
+                                    if (lcl.wasAdded()
+                                            && !lcl.getAddedSubList()
+                                                    .getFirst()
+                                                    .isBuiltInListProperty()
+                                                    .get()) {
+                                        currentFile.set(lcl.getAddedSubList().getFirst());
+                                    }
+                                }
+                            }
+                        });
     }
 
     @Override
@@ -137,17 +153,21 @@ public void selectLastJournalFile() {
      * This will load the built in abbreviation files and add it to the list of journal abbreviation files.
      */
     public void addBuiltInList() {
-        BackgroundTask
-                .wrap(journalAbbreviationRepository::getAllLoaded)
+        BackgroundTask.wrap(journalAbbreviationRepository::getAllLoaded)
                 .onRunning(() -> isLoading.setValue(true))
-                .onSuccess(result -> {
-                    isLoading.setValue(false);
-                    List<AbbreviationViewModel> builtInViewModels = result.stream()
-                                                                          .map(AbbreviationViewModel::new)
-                                                                          .collect(Collectors.toList());
-                    journalFiles.add(new AbbreviationsFileViewModel(builtInViewModels, Localization.lang("JabRef built in list")));
-                    selectLastJournalFile();
-                })
+                .onSuccess(
+                        result -> {
+                            isLoading.setValue(false);
+                            List<AbbreviationViewModel> builtInViewModels =
+                                    result.stream()
+                                            .map(AbbreviationViewModel::new)
+                                            .collect(Collectors.toList());
+                            journalFiles.add(
+                                    new AbbreviationsFileViewModel(
+                                            builtInViewModels,
+                                            Localization.lang("JabRef built in list")));
+                            selectLastJournalFile();
+                        })
                 .onFailure(dialogService::showErrorDialogAndWait)
                 .executeWith(taskExecutor);
     }
@@ -157,9 +177,10 @@ public void addBuiltInList() {
      * basically just calls the {@link #openFile(Path)}} method.
      */
     public void addNewFile() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.CSV)
-                .build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(StandardFileType.CSV)
+                        .build();
 
         dialogService.showFileSaveDialog(fileDialogConfiguration).ifPresent(this::openFile);
     }
@@ -174,7 +195,8 @@ public void addNewFile() {
     private void openFile(Path filePath) {
         AbbreviationsFileViewModel abbreviationsFile = new AbbreviationsFileViewModel(filePath);
         if (journalFiles.contains(abbreviationsFile)) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Duplicated Journal File"),
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Duplicated Journal File"),
                     Localization.lang("Journal file %s already added", filePath.toString()));
             return;
         }
@@ -189,9 +211,10 @@ private void openFile(Path filePath) {
     }
 
     public void openFile() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.CSV)
-                .build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(StandardFileType.CSV)
+                        .build();
 
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(this::openFile);
     }
@@ -218,8 +241,11 @@ public void removeCurrentFile() {
     public void addAbbreviation(Abbreviation abbreviationObject) {
         AbbreviationViewModel abbreviationViewModel = new AbbreviationViewModel(abbreviationObject);
         if (abbreviations.contains(abbreviationViewModel)) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Duplicated Journal Abbreviation"),
-                    Localization.lang("Abbreviation '%0' for journal '%1' already defined.", abbreviationObject.getAbbreviation(), abbreviationObject.getName()));
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Duplicated Journal Abbreviation"),
+                    Localization.lang(
+                            "Abbreviation '%0' for journal '%1' already defined.",
+                            abbreviationObject.getAbbreviation(), abbreviationObject.getName()));
         } else {
             abbreviations.add(abbreviationViewModel);
             currentAbbreviation.set(abbreviationViewModel);
@@ -228,10 +254,11 @@ public void addAbbreviation(Abbreviation abbreviationObject) {
     }
 
     public void addAbbreviation() {
-        addAbbreviation(new Abbreviation(
-                Localization.lang("Name"),
-                Localization.lang("Abbreviation"),
-                Localization.lang("Shortest unique abbreviation")));
+        addAbbreviation(
+                new Abbreviation(
+                        Localization.lang("Name"),
+                        Localization.lang("Abbreviation"),
+                        Localization.lang("Shortest unique abbreviation")));
     }
 
     /**
@@ -244,8 +271,12 @@ void editAbbreviation(Abbreviation abbreviationObject) {
                 if (abbViewModel.equals(currentAbbreviation.get())) {
                     setCurrentAbbreviationNameAndAbbreviationIfValid(abbreviationObject);
                 } else {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Duplicated Journal Abbreviation"),
-                            Localization.lang("Abbreviation '%0' for journal '%1' already defined.", abbreviationObject.getAbbreviation(), abbreviationObject.getName()));
+                    dialogService.showErrorDialogAndWait(
+                            Localization.lang("Duplicated Journal Abbreviation"),
+                            Localization.lang(
+                                    "Abbreviation '%0' for journal '%1' already defined.",
+                                    abbreviationObject.getAbbreviation(),
+                                    abbreviationObject.getName()));
                 }
             } else {
                 setCurrentAbbreviationNameAndAbbreviationIfValid(abbreviationObject);
@@ -268,7 +299,8 @@ private void setCurrentAbbreviationNameAndAbbreviationIfValid(Abbreviation abbre
         if (abbreviationObject.isDefaultShortestUniqueAbbreviation()) {
             abbreviationViewModel.setShortestUniqueAbbreviation("");
         } else {
-            abbreviationViewModel.setShortestUniqueAbbreviation(abbreviationObject.getShortestUniqueAbbreviation());
+            abbreviationViewModel.setShortestUniqueAbbreviation(
+                    abbreviationObject.getShortestUniqueAbbreviation());
         }
         shouldWriteLists = true;
     }
@@ -279,7 +311,8 @@ private void setCurrentAbbreviationNameAndAbbreviationIfValid(Abbreviation abbre
      * {@code null} if there are no abbreviations left.
      */
     public void deleteAbbreviation() {
-        if ((currentAbbreviation.get() != null) && !currentAbbreviation.get().isPseudoAbbreviation()) {
+        if ((currentAbbreviation.get() != null)
+                && !currentAbbreviation.get().isPseudoAbbreviation()) {
             int index = abbreviations.indexOf(currentAbbreviation.get());
             if (index > 1) {
                 currentAbbreviation.set(abbreviations.get(index - 1));
@@ -310,13 +343,14 @@ public void removeAbbreviation(AbbreviationViewModel abbreviation) {
      * Non-existing files will be created.
      */
     public void saveJournalAbbreviationFiles() {
-        journalFiles.forEach(file -> {
-            try {
-                file.writeOrCreate();
-            } catch (IOException e) {
-                LOGGER.debug("Error during writing journal CSV", e);
-            }
-        });
+        journalFiles.forEach(
+                file -> {
+                    try {
+                        file.writeOrCreate();
+                    } catch (IOException e) {
+                        LOGGER.debug("Error during writing journal CSV", e);
+                    }
+                });
     }
 
     /**
@@ -325,26 +359,37 @@ public void saveJournalAbbreviationFiles() {
      */
     @Override
     public void storeSettings() {
-        BackgroundTask
-                .wrap(() -> {
-                    List<String> journalStringList = journalFiles.stream()
-                                                                 .filter(path -> !path.isBuiltInListProperty().get())
-                                                                 .filter(path -> path.getAbsolutePath().isPresent())
-                                                                 .map(path -> path.getAbsolutePath().get().toAbsolutePath().toString())
-                                                                 .collect(Collectors.toList());
-
-                    abbreviationsPreferences.setExternalJournalLists(journalStringList);
-                    abbreviationsPreferences.setUseFJournalField(useFJournal.get());
-
-                    if (shouldWriteLists) {
-                        saveJournalAbbreviationFiles();
-                        shouldWriteLists = false;
-                    }
-                })
-                .onSuccess(success -> Injector.setModelOrService(
-                        JournalAbbreviationRepository.class,
-                        JournalAbbreviationLoader.loadRepository(abbreviationsPreferences)))
-                .onFailure(exception -> LOGGER.error("Failed to store journal preferences.", exception))
+        BackgroundTask.wrap(
+                        () -> {
+                            List<String> journalStringList =
+                                    journalFiles.stream()
+                                            .filter(path -> !path.isBuiltInListProperty().get())
+                                            .filter(path -> path.getAbsolutePath().isPresent())
+                                            .map(
+                                                    path ->
+                                                            path.getAbsolutePath()
+                                                                    .get()
+                                                                    .toAbsolutePath()
+                                                                    .toString())
+                                            .collect(Collectors.toList());
+
+                            abbreviationsPreferences.setExternalJournalLists(journalStringList);
+                            abbreviationsPreferences.setUseFJournalField(useFJournal.get());
+
+                            if (shouldWriteLists) {
+                                saveJournalAbbreviationFiles();
+                                shouldWriteLists = false;
+                            }
+                        })
+                .onSuccess(
+                        success ->
+                                Injector.setModelOrService(
+                                        JournalAbbreviationRepository.class,
+                                        JournalAbbreviationLoader.loadRepository(
+                                                abbreviationsPreferences)))
+                .onFailure(
+                        exception ->
+                                LOGGER.error("Failed to store journal preferences.", exception))
                 .executeWith(taskExecutor);
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModel.java b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModel.java
index 5caa9ca82e36..61c71747a148 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModel.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.preferences.keybindings;
 
-import java.util.Optional;
+import com.google.common.base.CaseFormat;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
@@ -15,7 +15,7 @@
 import org.jabref.gui.keyboard.KeyBindingCategory;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
-import com.google.common.base.CaseFormat;
+import java.util.Optional;
 
 /**
  * This class represents a view model for objects of the KeyBinding
@@ -28,21 +28,24 @@ public class KeyBindingViewModel {
 
     private KeyBinding keyBinding = null;
     private String realBinding = "";
-    private final ObservableList<KeyBindingViewModel> children = FXCollections.observableArrayList();
+    private final ObservableList<KeyBindingViewModel> children =
+            FXCollections.observableArrayList();
     private final KeyBindingRepository keyBindingRepository;
     private final SimpleStringProperty displayName = new SimpleStringProperty();
     private final SimpleStringProperty shownBinding = new SimpleStringProperty();
 
     private final KeyBindingCategory category;
 
-    public KeyBindingViewModel(KeyBindingRepository keyBindingRepository, KeyBinding keyBinding, String binding) {
+    public KeyBindingViewModel(
+            KeyBindingRepository keyBindingRepository, KeyBinding keyBinding, String binding) {
         this(keyBindingRepository, keyBinding.getCategory());
         this.keyBinding = keyBinding;
         setDisplayName();
         setBinding(binding);
     }
 
-    public KeyBindingViewModel(KeyBindingRepository keyBindingRepository, KeyBindingCategory category) {
+    public KeyBindingViewModel(
+            KeyBindingRepository keyBindingRepository, KeyBindingCategory category) {
         this.keyBindingRepository = keyBindingRepository;
         this.category = category;
         setDisplayName();
@@ -75,7 +78,8 @@ private void setBinding(String bind) {
     }
 
     private void setDisplayName() {
-        this.displayName.set(keyBinding == null ? this.category.getName() : keyBinding.getLocalization());
+        this.displayName.set(
+                keyBinding == null ? this.category.getName() : keyBinding.getLocalization());
     }
 
     public StringProperty nameProperty() {
@@ -97,8 +101,12 @@ public boolean setNewBinding(KeyEvent evt) {
         // validate the shortcut is no modifier key
 
         KeyCode code = evt.getCode();
-        if (code.isModifierKey() || (code == KeyCode.BACK_SPACE) || (code == KeyCode.SPACE) || (code == KeyCode.TAB)
-                || (code == KeyCode.ENTER) || (code == KeyCode.UNDEFINED)) {
+        if (code.isModifierKey()
+                || (code == KeyCode.BACK_SPACE)
+                || (code == KeyCode.SPACE)
+                || (code == KeyCode.TAB)
+                || (code == KeyCode.ENTER)
+                || (code == KeyCode.UNDEFINED)) {
             return false;
         }
 
diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
index 20bd57283255..897d0955ee91 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
@@ -1,5 +1,10 @@
 package org.jabref.gui.preferences.keybindings;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import jakarta.inject.Inject;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.MenuButton;
 import javafx.scene.control.MenuItem;
@@ -18,11 +23,8 @@
 import org.jabref.gui.util.ViewModelTreeTableCellFactory;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
-
-public class KeyBindingsTab extends AbstractPreferenceTabView<KeyBindingsTabViewModel> implements PreferencesTab {
+public class KeyBindingsTab extends AbstractPreferenceTabView<KeyBindingsTabViewModel>
+        implements PreferencesTab {
 
     @FXML private TreeTableView<KeyBindingViewModel> keyBindingsTable;
     @FXML private TreeTableColumn<KeyBindingViewModel, String> actionColumn;
@@ -34,9 +36,7 @@ public class KeyBindingsTab extends AbstractPreferenceTabView<KeyBindingsTabView
     @Inject private KeyBindingRepository keyBindingRepository;
 
     public KeyBindingsTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -49,28 +49,46 @@ private void initialize() {
         viewModel = new KeyBindingsTabViewModel(keyBindingRepository, dialogService, preferences);
 
         keyBindingsTable.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
-        viewModel.selectedKeyBindingProperty().bind(
-                EasyBind.wrapNullable(keyBindingsTable.selectionModelProperty())
-                        .mapObservable(SelectionModel::selectedItemProperty)
-                        .mapObservable(TreeItem::valueProperty)
-        );
+        viewModel
+                .selectedKeyBindingProperty()
+                .bind(
+                        EasyBind.wrapNullable(keyBindingsTable.selectionModelProperty())
+                                .mapObservable(SelectionModel::selectedItemProperty)
+                                .mapObservable(TreeItem::valueProperty));
         keyBindingsTable.setOnKeyPressed(viewModel::setNewBindingForCurrent);
-        keyBindingsTable.rootProperty().bind(
-                EasyBind.map(viewModel.rootKeyBindingProperty(),
-                        keybinding -> new RecursiveTreeItem<>(keybinding, KeyBindingViewModel::getChildren))
-        );
+        keyBindingsTable
+                .rootProperty()
+                .bind(
+                        EasyBind.map(
+                                viewModel.rootKeyBindingProperty(),
+                                keybinding ->
+                                        new RecursiveTreeItem<>(
+                                                keybinding, KeyBindingViewModel::getChildren)));
         actionColumn.setCellValueFactory(cellData -> cellData.getValue().getValue().nameProperty());
-        shortcutColumn.setCellValueFactory(cellData -> cellData.getValue().getValue().shownBindingProperty());
+        shortcutColumn.setCellValueFactory(
+                cellData -> cellData.getValue().getValue().shownBindingProperty());
         new ViewModelTreeTableCellFactory<KeyBindingViewModel>()
-                .withGraphic(keyBinding -> keyBinding.getResetIcon().map(JabRefIcon::getGraphicNode).orElse(null))
+                .withGraphic(
+                        keyBinding ->
+                                keyBinding
+                                        .getResetIcon()
+                                        .map(JabRefIcon::getGraphicNode)
+                                        .orElse(null))
                 .withOnMouseClickedEvent(keyBinding -> evt -> keyBinding.resetToDefault())
                 .install(resetColumn);
         new ViewModelTreeTableCellFactory<KeyBindingViewModel>()
-                .withGraphic(keyBinding -> keyBinding.getClearIcon().map(JabRefIcon::getGraphicNode).orElse(null))
+                .withGraphic(
+                        keyBinding ->
+                                keyBinding
+                                        .getClearIcon()
+                                        .map(JabRefIcon::getGraphicNode)
+                                        .orElse(null))
                 .withOnMouseClickedEvent(keyBinding -> evt -> keyBinding.clear())
                 .install(clearColumn);
 
-        viewModel.keyBindingPresets().forEach(preset -> presetsButton.getItems().add(createMenuItem(preset)));
+        viewModel
+                .keyBindingPresets()
+                .forEach(preset -> presetsButton.getItems().add(createMenuItem(preset)));
     }
 
     private MenuItem createMenuItem(KeyBindingPreset preset) {
diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTabViewModel.java
index 0af50012a236..b8375ae2fc52 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTabViewModel.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.preferences.keybindings;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleListProperty;
@@ -26,19 +21,29 @@
 import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 public class KeyBindingsTabViewModel implements PreferenceTabViewModel {
 
     private final KeyBindingRepository keyBindingRepository;
     private final GuiPreferences preferences;
-    private final OptionalObjectProperty<KeyBindingViewModel> selectedKeyBinding = OptionalObjectProperty.empty();
+    private final OptionalObjectProperty<KeyBindingViewModel> selectedKeyBinding =
+            OptionalObjectProperty.empty();
     private final ObjectProperty<KeyBindingViewModel> rootKeyBinding = new SimpleObjectProperty<>();
-    private final ListProperty<KeyBindingPreset> keyBindingPresets = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<KeyBindingPreset> keyBindingPresets =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
 
     private final DialogService dialogService;
 
     private final List<String> restartWarning = new ArrayList<>();
 
-    public KeyBindingsTabViewModel(KeyBindingRepository keyBindingRepository, DialogService dialogService, GuiPreferences preferences) {
+    public KeyBindingsTabViewModel(
+            KeyBindingRepository keyBindingRepository,
+            DialogService dialogService,
+            GuiPreferences preferences) {
         this.keyBindingRepository = new KeyBindingRepository(keyBindingRepository.getKeyBindings());
         this.dialogService = Objects.requireNonNull(dialogService);
         this.preferences = Objects.requireNonNull(preferences);
@@ -52,15 +57,22 @@ public KeyBindingsTabViewModel(KeyBindingRepository keyBindingRepository, Dialog
      */
     @Override
     public void setValues() {
-        KeyBindingViewModel root = new KeyBindingViewModel(keyBindingRepository, KeyBindingCategory.FILE);
+        KeyBindingViewModel root =
+                new KeyBindingViewModel(keyBindingRepository, KeyBindingCategory.FILE);
         for (KeyBindingCategory category : KeyBindingCategory.values()) {
-            KeyBindingViewModel categoryItem = new KeyBindingViewModel(keyBindingRepository, category);
-            keyBindingRepository.getKeyBindings().forEach((keyBinding, bind) -> {
-                if (keyBinding.getCategory() == category) {
-                    KeyBindingViewModel keyBindViewModel = new KeyBindingViewModel(keyBindingRepository, keyBinding, bind);
-                    categoryItem.getChildren().add(keyBindViewModel);
-                }
-            });
+            KeyBindingViewModel categoryItem =
+                    new KeyBindingViewModel(keyBindingRepository, category);
+            keyBindingRepository
+                    .getKeyBindings()
+                    .forEach(
+                            (keyBinding, bind) -> {
+                                if (keyBinding.getCategory() == category) {
+                                    KeyBindingViewModel keyBindViewModel =
+                                            new KeyBindingViewModel(
+                                                    keyBindingRepository, keyBinding, bind);
+                                    categoryItem.getChildren().add(keyBindViewModel);
+                                }
+                            });
             root.getChildren().add(categoryItem);
         }
         rootKeyBinding.set(root);
@@ -84,22 +96,33 @@ public void setNewBindingForCurrent(KeyEvent event) {
 
     public void storeSettings() {
         if (!keyBindingRepository.equals(preferences.getKeyBindingRepository())) {
-            preferences.getKeyBindingRepository().getBindingsProperty().set(keyBindingRepository.getBindingsProperty());
+            preferences
+                    .getKeyBindingRepository()
+                    .getBindingsProperty()
+                    .set(keyBindingRepository.getBindingsProperty());
             restartWarning.add(Localization.lang("Keyboard shortcuts changed"));
         }
     }
 
     public void resetToDefault() {
         String title = Localization.lang("Resetting all keyboard shortcuts");
-        String content = Localization.lang("All keyboard shortcuts will be reset to their defaults.");
+        String content =
+                Localization.lang("All keyboard shortcuts will be reset to their defaults.");
         ButtonType resetButtonType = new ButtonType("Reset", ButtonBar.ButtonData.OK_DONE);
-        dialogService.showCustomButtonDialogAndWait(Alert.AlertType.INFORMATION, title, content, resetButtonType,
-                ButtonType.CANCEL).ifPresent(response -> {
-            if (response == resetButtonType) {
-                keyBindingRepository.resetToDefault();
-                setValues();
-            }
-        });
+        dialogService
+                .showCustomButtonDialogAndWait(
+                        Alert.AlertType.INFORMATION,
+                        title,
+                        content,
+                        resetButtonType,
+                        ButtonType.CANCEL)
+                .ifPresent(
+                        response -> {
+                            if (response == resetButtonType) {
+                                keyBindingRepository.resetToDefault();
+                                setValues();
+                            }
+                        });
     }
 
     public void loadPreset(KeyBindingPreset preset) {
diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/presets/BashKeyBindingPreset.java b/src/main/java/org/jabref/gui/preferences/keybindings/presets/BashKeyBindingPreset.java
index 72265447c39d..a0a2c7c7fbdf 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/presets/BashKeyBindingPreset.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/presets/BashKeyBindingPreset.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.preferences.keybindings.presets;
 
+import org.jabref.gui.keyboard.KeyBinding;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jabref.gui.keyboard.KeyBinding;
-
 public class BashKeyBindingPreset implements KeyBindingPreset {
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/presets/KeyBindingPreset.java b/src/main/java/org/jabref/gui/preferences/keybindings/presets/KeyBindingPreset.java
index 4eae173e8de9..562deeeab245 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/presets/KeyBindingPreset.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/presets/KeyBindingPreset.java
@@ -1,9 +1,9 @@
 package org.jabref.gui.preferences.keybindings.presets;
 
-import java.util.Map;
-
 import org.jabref.gui.keyboard.KeyBinding;
 
+import java.util.Map;
+
 public interface KeyBindingPreset {
     String getName();
 
diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/presets/NewEntryBindingPreset.java b/src/main/java/org/jabref/gui/preferences/keybindings/presets/NewEntryBindingPreset.java
index dc4993e67abb..abb01f0d9083 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/presets/NewEntryBindingPreset.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/presets/NewEntryBindingPreset.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.preferences.keybindings.presets;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class NewEntryBindingPreset implements KeyBindingPreset {
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java
index c624862c6843..ed2e4e4f5f05 100644
--- a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java
+++ b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.preferences.linkedfiles;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
 import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -18,10 +22,8 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-
-public class LinkedFilesTab extends AbstractPreferenceTabView<LinkedFilesTabViewModel> implements PreferencesTab {
+public class LinkedFilesTab extends AbstractPreferenceTabView<LinkedFilesTabViewModel>
+        implements PreferencesTab {
 
     @FXML private TextField mainFileDirectory;
     @FXML private RadioButton useMainFileDirectory;
@@ -43,9 +45,7 @@ public class LinkedFilesTab extends AbstractPreferenceTabView<LinkedFilesTabView
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     public LinkedFilesTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -59,28 +59,49 @@ public void initialize() {
         mainFileDirectory.textProperty().bindBidirectional(viewModel.mainFileDirectoryProperty());
         mainFileDirectory.disableProperty().bind(viewModel.useBibLocationAsPrimaryProperty());
         browseDirectory.disableProperty().bind(viewModel.useBibLocationAsPrimaryProperty());
-        useBibLocationAsPrimary.selectedProperty().bindBidirectional(viewModel.useBibLocationAsPrimaryProperty());
-        useMainFileDirectory.selectedProperty().bindBidirectional(viewModel.useMainFileDirectoryProperty());
+        useBibLocationAsPrimary
+                .selectedProperty()
+                .bindBidirectional(viewModel.useBibLocationAsPrimaryProperty());
+        useMainFileDirectory
+                .selectedProperty()
+                .bindBidirectional(viewModel.useMainFileDirectoryProperty());
 
         moveToTrash.selectedProperty().bindBidirectional(viewModel.moveToTrashProperty());
         moveToTrash.setDisable(!NativeDesktop.get().moveToTrashSupported());
 
-        autolinkFileStartsBibtex.selectedProperty().bindBidirectional(viewModel.autolinkFileStartsBibtexProperty());
-        autolinkFileExactBibtex.selectedProperty().bindBidirectional(viewModel.autolinkFileExactBibtexProperty());
+        autolinkFileStartsBibtex
+                .selectedProperty()
+                .bindBidirectional(viewModel.autolinkFileStartsBibtexProperty());
+        autolinkFileExactBibtex
+                .selectedProperty()
+                .bindBidirectional(viewModel.autolinkFileExactBibtexProperty());
         autolinkUseRegex.selectedProperty().bindBidirectional(viewModel.autolinkUseRegexProperty());
         autolinkRegexKey.textProperty().bindBidirectional(viewModel.autolinkRegexKeyProperty());
         autolinkRegexKey.disableProperty().bind(autolinkUseRegex.selectedProperty().not());
         fulltextIndex.selectedProperty().bindBidirectional(viewModel.fulltextIndexProperty());
         fileNamePattern.valueProperty().bindBidirectional(viewModel.fileNamePatternProperty());
         fileNamePattern.itemsProperty().bind(viewModel.defaultFileNamePatternsProperty());
-        fileDirectoryPattern.textProperty().bindBidirectional(viewModel.fileDirectoryPatternProperty());
-        confirmLinkedFileDelete.selectedProperty().bindBidirectional(viewModel.confirmLinkedFileDeleteProperty());
+        fileDirectoryPattern
+                .textProperty()
+                .bindBidirectional(viewModel.fileDirectoryPatternProperty());
+        confirmLinkedFileDelete
+                .selectedProperty()
+                .bindBidirectional(viewModel.confirmLinkedFileDeleteProperty());
 
         ActionFactory actionFactory = new ActionFactory();
-        actionFactory.configureIconButton(StandardActions.HELP_REGEX_SEARCH, new HelpAction(HelpFile.REGEX_SEARCH, dialogService, preferences.getExternalApplicationsPreferences()), autolinkRegexHelp);
+        actionFactory.configureIconButton(
+                StandardActions.HELP_REGEX_SEARCH,
+                new HelpAction(
+                        HelpFile.REGEX_SEARCH,
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences()),
+                autolinkRegexHelp);
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.mainFileDirValidationStatus(), mainFileDirectory));
+        Platform.runLater(
+                () ->
+                        validationVisualizer.initVisualization(
+                                viewModel.mainFileDirValidationStatus(), mainFileDirectory));
     }
 
     public void mainFileDirBrowse() {
diff --git a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
index 437d6d713fb3..4a6932af069f 100644
--- a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
@@ -1,8 +1,9 @@
 package org.jabref.gui.preferences.linkedfiles;
 
-import java.nio.file.Files;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -20,10 +21,9 @@
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.util.io.AutoLinkPreferences;
 
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
 
 public class LinkedFilesTabViewModel implements PreferenceTabViewModel {
 
@@ -35,7 +35,8 @@ public class LinkedFilesTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty autolinkUseRegexProperty = new SimpleBooleanProperty();
     private final StringProperty autolinkRegexKeyProperty = new SimpleStringProperty("");
     private final ListProperty<String> defaultFileNamePatternsProperty =
-            new SimpleListProperty<>(FXCollections.observableArrayList(FilePreferences.DEFAULT_FILENAME_PATTERNS));
+            new SimpleListProperty<>(
+                    FXCollections.observableArrayList(FilePreferences.DEFAULT_FILENAME_PATTERNS));
     private final BooleanProperty fulltextIndex = new SimpleBooleanProperty();
     private final StringProperty fileNamePatternProperty = new SimpleStringProperty();
     private final StringProperty fileDirectoryPatternProperty = new SimpleStringProperty();
@@ -53,32 +54,36 @@ public LinkedFilesTabViewModel(DialogService dialogService, CliPreferences prefe
         this.filePreferences = preferences.getFilePreferences();
         this.autoLinkPreferences = preferences.getAutoLinkPreferences();
 
-        mainFileDirValidator = new FunctionBasedValidator<>(
-                mainFileDirectoryProperty,
-                mainDirectoryPath -> {
-                    ValidationMessage error = ValidationMessage.error(
-                            Localization.lang("Main file directory '%0' not found.\nCheck the tab \"Linked files\".", mainDirectoryPath)
-                    );
-                    try {
-                        Path path = Path.of(mainDirectoryPath);
-                        if (!(Files.exists(path) && Files.isDirectory(path))) {
-                            return error;
-                        }
-                    } catch (InvalidPathException ex) {
-                        return error;
-                    }
-                    // main directory is valid
-                    return null;
-                }
-        );
+        mainFileDirValidator =
+                new FunctionBasedValidator<>(
+                        mainFileDirectoryProperty,
+                        mainDirectoryPath -> {
+                            ValidationMessage error =
+                                    ValidationMessage.error(
+                                            Localization.lang(
+                                                    "Main file directory '%0' not found.\nCheck the tab \"Linked files\".",
+                                                    mainDirectoryPath));
+                            try {
+                                Path path = Path.of(mainDirectoryPath);
+                                if (!(Files.exists(path) && Files.isDirectory(path))) {
+                                    return error;
+                                }
+                            } catch (InvalidPathException ex) {
+                                return error;
+                            }
+                            // main directory is valid
+                            return null;
+                        });
     }
 
     @Override
     public void setValues() {
         // External files preferences / Attached files preferences / File preferences
-        mainFileDirectoryProperty.setValue(filePreferences.getMainFileDirectory().orElse(Path.of("")).toString());
+        mainFileDirectoryProperty.setValue(
+                filePreferences.getMainFileDirectory().orElse(Path.of("")).toString());
         useMainFileDirectoryProperty.setValue(!filePreferences.shouldStoreFilesRelativeToBibFile());
-        useBibLocationAsPrimaryProperty.setValue(filePreferences.shouldStoreFilesRelativeToBibFile());
+        useBibLocationAsPrimaryProperty.setValue(
+                filePreferences.shouldStoreFilesRelativeToBibFile());
         fulltextIndex.setValue(filePreferences.shouldFulltextIndexLinkedFiles());
         fileNamePatternProperty.setValue(filePreferences.getFileNamePattern());
         fileDirectoryPatternProperty.setValue(filePreferences.getFileDirectoryPattern());
@@ -106,11 +111,14 @@ public void storeSettings() {
 
         // Autolink preferences
         if (autolinkFileStartsBibtexProperty.getValue()) {
-            autoLinkPreferences.setCitationKeyDependency(AutoLinkPreferences.CitationKeyDependency.START);
+            autoLinkPreferences.setCitationKeyDependency(
+                    AutoLinkPreferences.CitationKeyDependency.START);
         } else if (autolinkFileExactBibtexProperty.getValue()) {
-            autoLinkPreferences.setCitationKeyDependency(AutoLinkPreferences.CitationKeyDependency.EXACT);
+            autoLinkPreferences.setCitationKeyDependency(
+                    AutoLinkPreferences.CitationKeyDependency.EXACT);
         } else if (autolinkUseRegexProperty.getValue()) {
-            autoLinkPreferences.setCitationKeyDependency(AutoLinkPreferences.CitationKeyDependency.REGEX);
+            autoLinkPreferences.setCitationKeyDependency(
+                    AutoLinkPreferences.CitationKeyDependency.REGEX);
         }
 
         autoLinkPreferences.setRegularExpression(autolinkRegexKeyProperty.getValue());
@@ -126,8 +134,10 @@ ValidationStatus mainFileDirValidationStatus() {
     public boolean validateSettings() {
         ValidationStatus validationStatus = mainFileDirValidationStatus();
         if (!validationStatus.isValid() && useMainFileDirectoryProperty().get()) {
-            validationStatus.getHighestMessage().ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage()));
+            validationStatus
+                    .getHighestMessage()
+                    .ifPresent(
+                            message -> dialogService.showErrorDialogAndWait(message.getMessage()));
             return false;
         }
         return true;
@@ -135,9 +145,12 @@ public boolean validateSettings() {
 
     public void mainFileDirBrowse() {
         DirectoryDialogConfiguration dirDialogConfiguration =
-                new DirectoryDialogConfiguration.Builder().withInitialDirectory(Path.of(mainFileDirectoryProperty.getValue())).build();
-        dialogService.showDirectorySelectionDialog(dirDialogConfiguration)
-                     .ifPresent(f -> mainFileDirectoryProperty.setValue(f.toString()));
+                new DirectoryDialogConfiguration.Builder()
+                        .withInitialDirectory(Path.of(mainFileDirectoryProperty.getValue()))
+                        .build();
+        dialogService
+                .showDirectorySelectionDialog(dirDialogConfiguration)
+                .ifPresent(f -> mainFileDirectoryProperty.setValue(f.toString()));
     }
 
     // External file links
@@ -193,4 +206,3 @@ public BooleanProperty moveToTrashProperty() {
         return this.moveToTrashProperty;
     }
 }
-
diff --git a/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.java b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.java
index 50582e5a8596..388a9391df31 100644
--- a/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.java
+++ b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.preferences.nameformatter;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.TableColumn;
@@ -19,9 +21,8 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
-public class NameFormatterTab extends AbstractPreferenceTabView<NameFormatterTabViewModel> implements PreferencesTab {
+public class NameFormatterTab extends AbstractPreferenceTabView<NameFormatterTabViewModel>
+        implements PreferencesTab {
 
     @FXML private TableView<NameFormatterItemModel> formatterList;
     @FXML private TableColumn<NameFormatterItemModel, String> formatterNameColumn;
@@ -32,9 +33,7 @@ public class NameFormatterTab extends AbstractPreferenceTabView<NameFormatterTab
     @FXML private Button formatterHelp;
 
     public NameFormatterTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -69,40 +68,56 @@ public void initialize() {
         new ValueTableCellFactory<NameFormatterItemModel, String>()
                 .withGraphic(name -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
                 .withTooltip(name -> Localization.lang("Remove formatter '%0'", name))
-                .withOnMouseClickedEvent(item -> evt ->
-                        viewModel.removeFormatter(formatterList.getFocusModel().getFocusedItem()))
+                .withOnMouseClickedEvent(
+                        item ->
+                                evt ->
+                                        viewModel.removeFormatter(
+                                                formatterList.getFocusModel().getFocusedItem()))
                 .install(actionsColumn);
 
-        formatterList.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            if (event.getCode() == KeyCode.DELETE) {
-                viewModel.removeFormatter(formatterList.getSelectionModel().getSelectedItem());
-                event.consume();
-            }
-        });
+        formatterList.addEventFilter(
+                KeyEvent.KEY_PRESSED,
+                event -> {
+                    if (event.getCode() == KeyCode.DELETE) {
+                        viewModel.removeFormatter(
+                                formatterList.getSelectionModel().getSelectedItem());
+                        event.consume();
+                    }
+                });
 
         formatterList.setEditable(true);
         formatterList.itemsProperty().bindBidirectional(viewModel.formatterListProperty());
 
         addFormatterName.textProperty().bindBidirectional(viewModel.addFormatterNameProperty());
-        addFormatterName.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            if (event.getCode() == KeyCode.ENTER) {
-                addFormatterString.requestFocus();
-                addFormatterString.selectAll();
-                event.consume();
-            }
-        });
+        addFormatterName.addEventFilter(
+                KeyEvent.KEY_PRESSED,
+                event -> {
+                    if (event.getCode() == KeyCode.ENTER) {
+                        addFormatterString.requestFocus();
+                        addFormatterString.selectAll();
+                        event.consume();
+                    }
+                });
 
         addFormatterString.textProperty().bindBidirectional(viewModel.addFormatterStringProperty());
-        addFormatterString.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            if (event.getCode() == KeyCode.ENTER) {
-                viewModel.addFormatter();
-                addFormatterName.requestFocus();
-                event.consume();
-            }
-        });
+        addFormatterString.addEventFilter(
+                KeyEvent.KEY_PRESSED,
+                event -> {
+                    if (event.getCode() == KeyCode.ENTER) {
+                        viewModel.addFormatter();
+                        addFormatterName.requestFocus();
+                        event.consume();
+                    }
+                });
 
         ActionFactory actionFactory = new ActionFactory();
-        actionFactory.configureIconButton(StandardActions.HELP_NAME_FORMATTER, new HelpAction(HelpFile.CUSTOM_EXPORTS_NAME_FORMATTER, dialogService, preferences.getExternalApplicationsPreferences()), formatterHelp);
+        actionFactory.configureIconButton(
+                StandardActions.HELP_NAME_FORMATTER,
+                new HelpAction(
+                        HelpFile.CUSTOM_EXPORTS_NAME_FORMATTER,
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences()),
+                formatterHelp);
     }
 
     public void addFormatter() {
diff --git a/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTabViewModel.java b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTabViewModel.java
index 4efae9eea8e4..90dd23ef88ed 100644
--- a/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTabViewModel.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.preferences.nameformatter;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -13,9 +10,13 @@
 import org.jabref.logic.layout.format.NameFormatterPreferences;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class NameFormatterTabViewModel implements PreferenceTabViewModel {
 
-    private final ListProperty<NameFormatterItemModel> formatterListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<NameFormatterItemModel> formatterListProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
     private final StringProperty addFormatterNameProperty = new SimpleStringProperty();
     private final StringProperty addFormatterStringProperty = new SimpleStringProperty();
 
@@ -56,10 +57,12 @@ public void storeSettings() {
     }
 
     public void addFormatter() {
-        if (!StringUtil.isNullOrEmpty(addFormatterNameProperty.getValue()) &&
-                !StringUtil.isNullOrEmpty(addFormatterStringProperty.getValue())) {
-            formatterListProperty.add(new NameFormatterItemModel(
-                    addFormatterNameProperty.getValue(), addFormatterStringProperty.getValue()));
+        if (!StringUtil.isNullOrEmpty(addFormatterNameProperty.getValue())
+                && !StringUtil.isNullOrEmpty(addFormatterStringProperty.getValue())) {
+            formatterListProperty.add(
+                    new NameFormatterItemModel(
+                            addFormatterNameProperty.getValue(),
+                            addFormatterStringProperty.getValue()));
 
             addFormatterNameProperty.setValue("");
             addFormatterStringProperty.setValue("");
diff --git a/src/main/java/org/jabref/gui/preferences/network/CustomCertificateViewModel.java b/src/main/java/org/jabref/gui/preferences/network/CustomCertificateViewModel.java
index 48844b9056f8..0245b10999ad 100644
--- a/src/main/java/org/jabref/gui/preferences/network/CustomCertificateViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/network/CustomCertificateViewModel.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.preferences.network;
 
-import java.time.LocalDate;
-import java.util.Optional;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyStringProperty;
@@ -13,6 +10,9 @@
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.logic.net.ssl.SSLCertificate;
 
+import java.time.LocalDate;
+import java.util.Optional;
+
 public class CustomCertificateViewModel extends AbstractViewModel {
     private final StringProperty serialNumberProperty = new SimpleStringProperty("");
     private final StringProperty issuerProperty = new SimpleStringProperty("");
@@ -23,7 +23,14 @@ public class CustomCertificateViewModel extends AbstractViewModel {
     private final StringProperty thumbprintProperty = new SimpleStringProperty("");
     private final StringProperty pathProperty = new SimpleStringProperty("");
 
-    public CustomCertificateViewModel(String thumbprint, String serialNumber, String issuer, LocalDate validFrom, LocalDate validTo, String sigAlgorithm, String version) {
+    public CustomCertificateViewModel(
+            String thumbprint,
+            String serialNumber,
+            String issuer,
+            LocalDate validFrom,
+            LocalDate validTo,
+            String sigAlgorithm,
+            String version) {
         serialNumberProperty.setValue(serialNumber);
         issuerProperty.setValue(issuer);
         validFromProperty.setValue(validFrom);
diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
index 232324c4095d..79a6ff30edaf 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
@@ -1,7 +1,9 @@
 package org.jabref.gui.preferences.network;
 
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
 import javafx.application.Platform;
 import javafx.beans.binding.BooleanBinding;
@@ -17,6 +19,7 @@
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.MouseEvent;
 
+import org.controlsfx.control.textfield.CustomPasswordField;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
@@ -24,12 +27,11 @@
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import org.controlsfx.control.textfield.CustomPasswordField;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
-public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> implements PreferencesTab {
+public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel>
+        implements PreferencesTab {
     @FXML private CheckBox versionCheck;
     @FXML private CheckBox proxyUse;
     @FXML private Label proxyHostnameLabel;
@@ -43,7 +45,10 @@ public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> i
     @FXML private CustomPasswordField proxyPassword;
     @FXML private Button checkConnectionButton;
     @FXML private CheckBox proxyPersistPassword;
-    @FXML private SplitPane persistentTooltipWrapper; // The disabled persistPassword control does not show tooltips
+
+    @FXML
+    private SplitPane
+            persistentTooltipWrapper; // The disabled persistPassword control does not show tooltips
 
     @FXML private TableView<CustomCertificateViewModel> customCertificatesTable;
     @FXML private TableColumn<CustomCertificateViewModel, String> certIssuer;
@@ -60,9 +65,7 @@ public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> i
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     public NetworkTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -82,55 +85,84 @@ public void initialize() {
         proxyPortLabel.disableProperty().bind(proxyUse.selectedProperty().not());
         proxyPort.textProperty().bindBidirectional(viewModel.proxyPortProperty());
         proxyPort.disableProperty().bind(proxyUse.selectedProperty().not());
-        proxyUseAuthentication.selectedProperty().bindBidirectional(viewModel.proxyUseAuthenticationProperty());
+        proxyUseAuthentication
+                .selectedProperty()
+                .bindBidirectional(viewModel.proxyUseAuthenticationProperty());
         proxyUseAuthentication.disableProperty().bind(proxyUse.selectedProperty().not());
 
-        BooleanBinding proxyCustomAndAuthentication = proxyUse.selectedProperty().and(proxyUseAuthentication.selectedProperty());
+        BooleanBinding proxyCustomAndAuthentication =
+                proxyUse.selectedProperty().and(proxyUseAuthentication.selectedProperty());
         proxyUsernameLabel.disableProperty().bind(proxyCustomAndAuthentication.not());
         proxyUsername.textProperty().bindBidirectional(viewModel.proxyUsernameProperty());
         proxyUsername.disableProperty().bind(proxyCustomAndAuthentication.not());
         proxyPasswordLabel.disableProperty().bind(proxyCustomAndAuthentication.not());
         proxyPassword.textProperty().bindBidirectional(viewModel.proxyPasswordProperty());
         proxyPassword.disableProperty().bind(proxyCustomAndAuthentication.not());
-        proxyPersistPassword.selectedProperty().bindBidirectional(viewModel.proxyPersistPasswordProperty());
-        proxyPersistPassword.disableProperty().bind(
-                proxyCustomAndAuthentication.and(viewModel.passwordPersistAvailable()).not());
-        EasyBind.subscribe(viewModel.passwordPersistAvailable(), available -> {
-            if (!available) {
-                persistentTooltipWrapper.setTooltip(new Tooltip(Localization.lang("Credential store not available.")));
-            } else {
-                persistentTooltipWrapper.setTooltip(null);
-            }
-        });
+        proxyPersistPassword
+                .selectedProperty()
+                .bindBidirectional(viewModel.proxyPersistPasswordProperty());
+        proxyPersistPassword
+                .disableProperty()
+                .bind(proxyCustomAndAuthentication.and(viewModel.passwordPersistAvailable()).not());
+        EasyBind.subscribe(
+                viewModel.passwordPersistAvailable(),
+                available -> {
+                    if (!available) {
+                        persistentTooltipWrapper.setTooltip(
+                                new Tooltip(Localization.lang("Credential store not available.")));
+                    } else {
+                        persistentTooltipWrapper.setTooltip(null);
+                    }
+                });
 
         proxyPassword.setRight(IconTheme.JabRefIcons.PASSWORD_REVEALED.getGraphicNode());
-        proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_PRESSED, this::proxyPasswordReveal);
+        proxyPassword
+                .getRight()
+                .addEventFilter(MouseEvent.MOUSE_PRESSED, this::proxyPasswordReveal);
         proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_RELEASED, this::proxyPasswordMask);
         proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_EXITED, this::proxyPasswordMask);
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        Platform.runLater(() -> {
-            validationVisualizer.initVisualization(viewModel.proxyHostnameValidationStatus(), proxyHostname);
-            validationVisualizer.initVisualization(viewModel.proxyPortValidationStatus(), proxyPort);
-            validationVisualizer.initVisualization(viewModel.proxyUsernameValidationStatus(), proxyUsername);
-            validationVisualizer.initVisualization(viewModel.proxyPasswordValidationStatus(), proxyPassword);
-        });
+        Platform.runLater(
+                () -> {
+                    validationVisualizer.initVisualization(
+                            viewModel.proxyHostnameValidationStatus(), proxyHostname);
+                    validationVisualizer.initVisualization(
+                            viewModel.proxyPortValidationStatus(), proxyPort);
+                    validationVisualizer.initVisualization(
+                            viewModel.proxyUsernameValidationStatus(), proxyUsername);
+                    validationVisualizer.initVisualization(
+                            viewModel.proxyPasswordValidationStatus(), proxyPassword);
+                });
 
         certSerialNumber.setCellValueFactory(data -> data.getValue().serialNumberProperty());
         certIssuer.setCellValueFactory(data -> data.getValue().issuerProperty());
-        certSignatureAlgorithm.setCellValueFactory(data -> data.getValue().signatureAlgorithmProperty());
-        certVersion.setCellValueFactory(data -> EasyBind.map(data.getValue().versionProperty(), this::formatVersion));
+        certSignatureAlgorithm.setCellValueFactory(
+                data -> data.getValue().signatureAlgorithmProperty());
+        certVersion.setCellValueFactory(
+                data -> EasyBind.map(data.getValue().versionProperty(), this::formatVersion));
 
-        certValidFrom.setCellValueFactory(data -> EasyBind.map(data.getValue().validFromProperty(), this::formatDate));
-        certValidTo.setCellValueFactory(data -> EasyBind.map(data.getValue().validToProperty(), this::formatDate));
+        certValidFrom.setCellValueFactory(
+                data -> EasyBind.map(data.getValue().validFromProperty(), this::formatDate));
+        certValidTo.setCellValueFactory(
+                data -> EasyBind.map(data.getValue().validToProperty(), this::formatDate));
 
         customCertificatesTable.itemsProperty().set(viewModel.customCertificateListProperty());
 
-        actionsColumn.setCellValueFactory(cellData -> new SimpleStringProperty(cellData.getValue().getThumbprint()));
+        actionsColumn.setCellValueFactory(
+                cellData -> new SimpleStringProperty(cellData.getValue().getThumbprint()));
         new ValueTableCellFactory<CustomCertificateViewModel, String>()
                 .withGraphic(name -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
                 .withTooltip(name -> Localization.lang("Remove formatter '%0'", name))
-                .withOnMouseClickedEvent(thumbprint -> evt -> viewModel.customCertificateListProperty().removeIf(cert -> cert.getThumbprint().equals(thumbprint)))
+                .withOnMouseClickedEvent(
+                        thumbprint ->
+                                evt ->
+                                        viewModel
+                                                .customCertificateListProperty()
+                                                .removeIf(
+                                                        cert ->
+                                                                cert.getThumbprint()
+                                                                        .equals(thumbprint)))
                 .install(actionsColumn);
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
index 9035c8394ed1..16e021f41df1 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
@@ -1,11 +1,10 @@
 package org.jabref.gui.preferences.network;
 
-import java.net.MalformedURLException;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
+import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -18,6 +17,8 @@
 import javafx.collections.ListChangeListener;
 import javafx.stage.FileChooser;
 
+import kong.unirest.core.UnirestException;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.util.FileDialogConfiguration;
@@ -33,12 +34,12 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.strings.StringUtil;
 
-import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
-import kong.unirest.core.UnirestException;
+import java.net.MalformedURLException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class NetworkTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty versionCheckProperty = new SimpleBooleanProperty();
@@ -50,7 +51,8 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
     private final StringProperty proxyPasswordProperty = new SimpleStringProperty("");
     private final BooleanProperty proxyPersistPasswordProperty = new SimpleBooleanProperty();
     private final BooleanProperty passwordPersistAvailable = new SimpleBooleanProperty();
-    private final ListProperty<CustomCertificateViewModel> customCertificateListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<CustomCertificateViewModel> customCertificateListProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
 
     private final Validator proxyHostnameValidator;
     private final Validator proxyPortValidator;
@@ -60,7 +62,6 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
     private final DialogService dialogService;
     private final CliPreferences preferences;
 
-
     private final ProxyPreferences proxyPreferences;
     private final ProxyPreferences backupProxyPreferences;
     private final InternalPreferences internalPreferences;
@@ -69,55 +70,68 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
 
     private final AtomicBoolean sslCertificatesChanged = new AtomicBoolean(false);
 
-    public NetworkTabViewModel(DialogService dialogService,
-                               CliPreferences preferences) {
+    public NetworkTabViewModel(DialogService dialogService, CliPreferences preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.proxyPreferences = preferences.getProxyPreferences();
         this.internalPreferences = preferences.getInternalPreferences();
 
-        backupProxyPreferences = new ProxyPreferences(
-                proxyPreferences.shouldUseProxy(),
-                proxyPreferences.getHostname(),
-                proxyPreferences.getPort(),
-                proxyPreferences.shouldUseAuthentication(),
-                proxyPreferences.getUsername(),
-                proxyPreferences.getPassword(),
-                proxyPreferences.shouldPersistPassword());
-
-        proxyHostnameValidator = new FunctionBasedValidator<>(
-                proxyHostnameProperty,
-                input -> !StringUtil.isNullOrEmpty(input),
-                ValidationMessage.error("%s > %s %n %n %s".formatted(
-                        Localization.lang("Network"),
-                        Localization.lang("Proxy configuration"),
-                        Localization.lang("Please specify a hostname"))));
-
-        proxyPortValidator = new FunctionBasedValidator<>(
-                proxyPortProperty,
-                input -> getPortAsInt(input).isPresent(),
-                ValidationMessage.error("%s > %s %n %n %s".formatted(
-                        Localization.lang("Network"),
-                        Localization.lang("Proxy configuration"),
-                        Localization.lang("Please specify a port"))));
-
-        proxyUsernameValidator = new FunctionBasedValidator<>(
-                proxyUsernameProperty,
-                input -> !StringUtil.isNullOrEmpty(input),
-                ValidationMessage.error("%s > %s %n %n %s".formatted(
-                        Localization.lang("Network"),
-                        Localization.lang("Proxy configuration"),
-                        Localization.lang("Please specify a username"))));
-
-        proxyPasswordValidator = new FunctionBasedValidator<>(
-                proxyPasswordProperty,
-                input -> !input.isBlank(),
-                ValidationMessage.error("%s > %s %n %n %s".formatted(
-                        Localization.lang("Network"),
-                        Localization.lang("Proxy configuration"),
-                        Localization.lang("Please specify a password"))));
-
-        this.trustStoreManager = new TrustStoreManager(Path.of(preferences.getSSLPreferences().getTruststorePath()));
+        backupProxyPreferences =
+                new ProxyPreferences(
+                        proxyPreferences.shouldUseProxy(),
+                        proxyPreferences.getHostname(),
+                        proxyPreferences.getPort(),
+                        proxyPreferences.shouldUseAuthentication(),
+                        proxyPreferences.getUsername(),
+                        proxyPreferences.getPassword(),
+                        proxyPreferences.shouldPersistPassword());
+
+        proxyHostnameValidator =
+                new FunctionBasedValidator<>(
+                        proxyHostnameProperty,
+                        input -> !StringUtil.isNullOrEmpty(input),
+                        ValidationMessage.error(
+                                "%s > %s %n %n %s"
+                                        .formatted(
+                                                Localization.lang("Network"),
+                                                Localization.lang("Proxy configuration"),
+                                                Localization.lang("Please specify a hostname"))));
+
+        proxyPortValidator =
+                new FunctionBasedValidator<>(
+                        proxyPortProperty,
+                        input -> getPortAsInt(input).isPresent(),
+                        ValidationMessage.error(
+                                "%s > %s %n %n %s"
+                                        .formatted(
+                                                Localization.lang("Network"),
+                                                Localization.lang("Proxy configuration"),
+                                                Localization.lang("Please specify a port"))));
+
+        proxyUsernameValidator =
+                new FunctionBasedValidator<>(
+                        proxyUsernameProperty,
+                        input -> !StringUtil.isNullOrEmpty(input),
+                        ValidationMessage.error(
+                                "%s > %s %n %n %s"
+                                        .formatted(
+                                                Localization.lang("Network"),
+                                                Localization.lang("Proxy configuration"),
+                                                Localization.lang("Please specify a username"))));
+
+        proxyPasswordValidator =
+                new FunctionBasedValidator<>(
+                        proxyPasswordProperty,
+                        input -> !input.isBlank(),
+                        ValidationMessage.error(
+                                "%s > %s %n %n %s"
+                                        .formatted(
+                                                Localization.lang("Network"),
+                                                Localization.lang("Proxy configuration"),
+                                                Localization.lang("Please specify a password"))));
+
+        this.trustStoreManager =
+                new TrustStoreManager(Path.of(preferences.getSSLPreferences().getTruststorePath()));
     }
 
     @Override
@@ -141,20 +155,37 @@ private void setProxyValues() {
 
     private void setSSLValues() {
         customCertificateListProperty.clear();
-        trustStoreManager.getCustomCertificates().forEach(cert -> customCertificateListProperty.add(CustomCertificateViewModel.fromSSLCertificate(cert)));
-        customCertificateListProperty.addListener((ListChangeListener<CustomCertificateViewModel>) c -> {
-            sslCertificatesChanged.set(true);
-            while (c.next()) {
-                if (c.wasAdded()) {
-                    CustomCertificateViewModel certificate = c.getAddedSubList().getFirst();
-                    certificate.getPath().ifPresent(path -> trustStoreManager
-                            .addCertificate(formatCustomAlias(certificate.getThumbprint()), Path.of(path)));
-                } else if (c.wasRemoved()) {
-                    CustomCertificateViewModel certificate = c.getRemoved().getFirst();
-                    trustStoreManager.deleteCertificate(formatCustomAlias(certificate.getThumbprint()));
-                }
-            }
-        });
+        trustStoreManager
+                .getCustomCertificates()
+                .forEach(
+                        cert ->
+                                customCertificateListProperty.add(
+                                        CustomCertificateViewModel.fromSSLCertificate(cert)));
+        customCertificateListProperty.addListener(
+                (ListChangeListener<CustomCertificateViewModel>)
+                        c -> {
+                            sslCertificatesChanged.set(true);
+                            while (c.next()) {
+                                if (c.wasAdded()) {
+                                    CustomCertificateViewModel certificate =
+                                            c.getAddedSubList().getFirst();
+                                    certificate
+                                            .getPath()
+                                            .ifPresent(
+                                                    path ->
+                                                            trustStoreManager.addCertificate(
+                                                                    formatCustomAlias(
+                                                                            certificate
+                                                                                    .getThumbprint()),
+                                                                    Path.of(path)));
+                                } else if (c.wasRemoved()) {
+                                    CustomCertificateViewModel certificate =
+                                            c.getRemoved().getFirst();
+                                    trustStoreManager.deleteCertificate(
+                                            formatCustomAlias(certificate.getThumbprint()));
+                                }
+                            }
+                        });
     }
 
     @Override
@@ -165,7 +196,9 @@ public void storeSettings() {
         proxyPreferences.setPort(proxyPortProperty.getValue().trim());
         proxyPreferences.setUseAuthentication(proxyUseAuthenticationProperty.getValue());
         proxyPreferences.setUsername(proxyUsernameProperty.getValue().trim());
-        proxyPreferences.setPersistPassword(proxyPersistPasswordProperty.getValue()); // Set before the password to actually persist
+        proxyPreferences.setPersistPassword(
+                proxyPersistPasswordProperty
+                        .getValue()); // Set before the password to actually persist
         proxyPreferences.setPassword(proxyPasswordProperty.getValue());
         ProxyRegisterer.register(proxyPreferences);
 
@@ -212,8 +245,10 @@ public boolean validateSettings() {
 
         ValidationStatus validationStatus = validator.getValidationStatus();
         if (!validationStatus.isValid()) {
-            validationStatus.getHighestMessage().ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage()));
+            validationStatus
+                    .getHighestMessage()
+                    .ifPresent(
+                            message -> dialogService.showErrorDialogAndWait(message.getMessage()));
             return false;
         }
         return true;
@@ -229,15 +264,15 @@ public void checkConnection() {
 
         final String testUrl = "http://jabref.org";
 
-        ProxyRegisterer.register(new ProxyPreferences(
-                proxyUseProperty.getValue(),
-                proxyHostnameProperty.getValue().trim(),
-                proxyPortProperty.getValue().trim(),
-                proxyUseAuthenticationProperty.getValue(),
-                proxyUsernameProperty.getValue().trim(),
-                proxyPasswordProperty.getValue(),
-                proxyPersistPasswordProperty.getValue()
-        ));
+        ProxyRegisterer.register(
+                new ProxyPreferences(
+                        proxyUseProperty.getValue(),
+                        proxyHostnameProperty.getValue().trim(),
+                        proxyPortProperty.getValue().trim(),
+                        proxyUseAuthenticationProperty.getValue(),
+                        proxyUsernameProperty.getValue().trim(),
+                        proxyPasswordProperty.getValue(),
+                        proxyPersistPasswordProperty.getValue()));
 
         URLDownload urlDownload;
         try {
@@ -306,20 +341,45 @@ public ListProperty<CustomCertificateViewModel> customCertificateListProperty()
     }
 
     public void addCertificateFile() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(new FileChooser.ExtensionFilter(Localization.lang("SSL certificate file"), "*.crt", "*.cer"))
-                .withDefaultExtension(Localization.lang("SSL certificate file"), StandardFileType.CER)
-                .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory())
-                .build();
-
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(certPath -> SSLCertificate.fromPath(certPath).ifPresent(sslCertificate -> {
-            if (!trustStoreManager.certificateExists(formatCustomAlias(sslCertificate.getSHA256Thumbprint()))) {
-                customCertificateListProperty.add(CustomCertificateViewModel.fromSSLCertificate(sslCertificate)
-                                                                            .setPath(certPath.toAbsolutePath().toString()));
-            } else {
-                dialogService.showWarningDialogAndWait(Localization.lang("Duplicate Certificates"), Localization.lang("You already added this certificate"));
-            }
-        }));
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(
+                                new FileChooser.ExtensionFilter(
+                                        Localization.lang("SSL certificate file"),
+                                        "*.crt",
+                                        "*.cer"))
+                        .withDefaultExtension(
+                                Localization.lang("SSL certificate file"), StandardFileType.CER)
+                        .withInitialDirectory(
+                                preferences.getFilePreferences().getWorkingDirectory())
+                        .build();
+
+        dialogService
+                .showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(
+                        certPath ->
+                                SSLCertificate.fromPath(certPath)
+                                        .ifPresent(
+                                                sslCertificate -> {
+                                                    if (!trustStoreManager.certificateExists(
+                                                            formatCustomAlias(
+                                                                    sslCertificate
+                                                                            .getSHA256Thumbprint()))) {
+                                                        customCertificateListProperty.add(
+                                                                CustomCertificateViewModel
+                                                                        .fromSSLCertificate(
+                                                                                sslCertificate)
+                                                                        .setPath(
+                                                                                certPath.toAbsolutePath()
+                                                                                        .toString()));
+                                                    } else {
+                                                        dialogService.showWarningDialogAndWait(
+                                                                Localization.lang(
+                                                                        "Duplicate Certificates"),
+                                                                Localization.lang(
+                                                                        "You already added this certificate"));
+                                                    }
+                                                }));
     }
 
     private String formatCustomAlias(String thumbprint) {
diff --git a/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
index baa36aa4b112..01463b156fab 100644
--- a/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
@@ -1,7 +1,11 @@
 package org.jabref.gui.preferences.preview;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+import jakarta.inject.Inject;
 
 import javafx.application.Platform;
 import javafx.beans.property.ListProperty;
@@ -20,6 +24,9 @@
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.TransferMode;
 
+import org.controlsfx.control.textfield.CustomTextField;
+import org.fxmisc.richtext.CodeArea;
+import org.fxmisc.richtext.LineNumberFactory;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.SimpleCommand;
@@ -39,15 +46,11 @@
 import org.jabref.logic.util.TestEntry;
 import org.jabref.model.database.BibDatabaseContext;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import jakarta.inject.Inject;
-import org.controlsfx.control.textfield.CustomTextField;
-import org.fxmisc.richtext.CodeArea;
-import org.fxmisc.richtext.LineNumberFactory;
+import java.util.ArrayList;
+import java.util.List;
 
-public class PreviewTab extends AbstractPreferenceTabView<PreviewTabViewModel> implements PreferencesTab {
+public class PreviewTab extends AbstractPreferenceTabView<PreviewTabViewModel>
+        implements PreferencesTab {
 
     @FXML private CheckBox showAsTabCheckBox;
     @FXML private CheckBox showPreviewTooltipCheckBox;
@@ -74,9 +77,7 @@ public class PreviewTab extends AbstractPreferenceTabView<PreviewTabViewModel> i
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     public PreviewTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     private class EditAction extends SimpleCommand {
@@ -91,14 +92,10 @@ public EditAction(StandardActions command) {
         public void execute() {
             if (editArea != null) {
                 switch (command) {
-                    case COPY ->
-                            editArea.copy();
-                    case CUT ->
-                            editArea.cut();
-                    case PASTE ->
-                            editArea.paste();
-                    case SELECT_ALL ->
-                            editArea.selectAll();
+                    case COPY -> editArea.copy();
+                    case CUT -> editArea.cut();
+                    case PASTE -> editArea.paste();
+                    case SELECT_ALL -> editArea.selectAll();
                 }
                 editArea.requestFocus();
             }
@@ -112,34 +109,52 @@ public String getTabName() {
 
     @FXML
     private void selectBstFile(ActionEvent event) {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.BST)
-                .withDefaultExtension(StandardFileType.BST)
-                .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory())
-                .build();
-
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(bstFile -> {
-            viewModel.addBstStyle(bstFile);
-        });
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(StandardFileType.BST)
+                        .withDefaultExtension(StandardFileType.BST)
+                        .withInitialDirectory(
+                                preferences.getFilePreferences().getWorkingDirectory())
+                        .build();
+
+        dialogService
+                .showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(
+                        bstFile -> {
+                            viewModel.addBstStyle(bstFile);
+                        });
     }
 
     public void initialize() {
-        this.viewModel = new PreviewTabViewModel(dialogService, preferences.getPreviewPreferences(), taskExecutor, stateManager);
+        this.viewModel =
+                new PreviewTabViewModel(
+                        dialogService,
+                        preferences.getPreviewPreferences(),
+                        taskExecutor,
+                        stateManager);
         lastKeyPressTime = System.currentTimeMillis();
 
         showAsTabCheckBox.selectedProperty().bindBidirectional(viewModel.showAsExtraTabProperty());
-        showPreviewTooltipCheckBox.selectedProperty().bindBidirectional(viewModel.showPreviewInEntryTableTooltip());
+        showPreviewTooltipCheckBox
+                .selectedProperty()
+                .bindBidirectional(viewModel.showPreviewInEntryTableTooltip());
 
         searchBox.setPromptText(Localization.lang("Search") + "...");
         searchBox.setLeft(IconTheme.JabRefIcons.SEARCH.getGraphicNode());
 
         ActionFactory factory = new ActionFactory();
-        contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT)),
-                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY)),
-                factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE)),
-                factory.createMenuItem(StandardActions.SELECT_ALL, new EditAction(StandardActions.SELECT_ALL))
-        );
+        contextMenu
+                .getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.CUT, new EditAction(StandardActions.CUT)),
+                        factory.createMenuItem(
+                                StandardActions.COPY, new EditAction(StandardActions.COPY)),
+                        factory.createMenuItem(
+                                StandardActions.PASTE, new EditAction(StandardActions.PASTE)),
+                        factory.createMenuItem(
+                                StandardActions.SELECT_ALL,
+                                new EditAction(StandardActions.SELECT_ALL)));
         contextMenu.getItems().forEach(item -> item.setGraphic(null));
         contextMenu.getStyleClass().add("context-menu");
 
@@ -150,12 +165,17 @@ public void initialize() {
                 .install(availableListView);
         availableListView.setOnDragOver(this::dragOver);
         availableListView.setOnDragDetected(this::dragDetectedInAvailable);
-        availableListView.setOnDragDropped(event -> dragDropped(viewModel.availableListProperty(), event));
+        availableListView.setOnDragDropped(
+                event -> dragDropped(viewModel.availableListProperty(), event));
         availableListView.setOnKeyTyped(event -> jumpToSearchKey(availableListView, event));
         availableListView.setOnMouseClicked(this::mouseClickedAvailable);
         availableListView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
-        availableListView.selectionModelProperty().getValue().selectedItemProperty().addListener((observable, oldValue, newValue) ->
-                viewModel.setPreviewLayout(newValue));
+        availableListView
+                .selectionModelProperty()
+                .getValue()
+                .selectedItemProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> viewModel.setPreviewLayout(newValue));
 
         chosenListView.itemsProperty().bindBidirectional(viewModel.chosenListProperty());
         viewModel.chosenSelectionModelProperty().setValue(chosenListView.getSelectionModel());
@@ -165,30 +185,92 @@ public void initialize() {
                 .install(chosenListView);
         chosenListView.setOnDragOver(this::dragOver);
         chosenListView.setOnDragDetected(this::dragDetectedInChosen);
-        chosenListView.setOnDragDropped(event -> dragDropped(viewModel.chosenListProperty(), event));
+        chosenListView.setOnDragDropped(
+                event -> dragDropped(viewModel.chosenListProperty(), event));
         chosenListView.setOnKeyTyped(event -> jumpToSearchKey(chosenListView, event));
         chosenListView.setOnMouseClicked(this::mouseClickedChosen);
         chosenListView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
-        chosenListView.selectionModelProperty().getValue().selectedItemProperty().addListener((observable, oldValue, newValue) ->
-                viewModel.setPreviewLayout(newValue));
-
-        toRightButton.disableProperty().bind(viewModel.availableSelectionModelProperty().getValue().selectedItemProperty().isNull());
-        toLeftButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
-        sortUpButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
-        sortDownButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
-
-        PreviewViewer previewViewer = new PreviewViewer(new BibDatabaseContext(), dialogService, preferences, themeManager, taskExecutor);
+        chosenListView
+                .selectionModelProperty()
+                .getValue()
+                .selectedItemProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> viewModel.setPreviewLayout(newValue));
+
+        toRightButton
+                .disableProperty()
+                .bind(
+                        viewModel
+                                .availableSelectionModelProperty()
+                                .getValue()
+                                .selectedItemProperty()
+                                .isNull());
+        toLeftButton
+                .disableProperty()
+                .bind(
+                        viewModel
+                                .chosenSelectionModelProperty()
+                                .getValue()
+                                .selectedItemProperty()
+                                .isNull());
+        sortUpButton
+                .disableProperty()
+                .bind(
+                        viewModel
+                                .chosenSelectionModelProperty()
+                                .getValue()
+                                .selectedItemProperty()
+                                .isNull());
+        sortDownButton
+                .disableProperty()
+                .bind(
+                        viewModel
+                                .chosenSelectionModelProperty()
+                                .getValue()
+                                .selectedItemProperty()
+                                .isNull());
+
+        PreviewViewer previewViewer =
+                new PreviewViewer(
+                        new BibDatabaseContext(),
+                        dialogService,
+                        preferences,
+                        themeManager,
+                        taskExecutor);
         previewViewer.setEntry(TestEntry.getTestEntry());
         EasyBind.subscribe(viewModel.selectedLayoutProperty(), previewViewer::setLayout);
-        previewViewer.visibleProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNotNull()
-                                                      .or(viewModel.availableSelectionModelProperty().getValue().selectedItemProperty().isNotNull()));
+        previewViewer
+                .visibleProperty()
+                .bind(
+                        viewModel
+                                .chosenSelectionModelProperty()
+                                .getValue()
+                                .selectedItemProperty()
+                                .isNotNull()
+                                .or(
+                                        viewModel
+                                                .availableSelectionModelProperty()
+                                                .getValue()
+                                                .selectedItemProperty()
+                                                .isNotNull()));
         previewTab.setContent(previewViewer);
 
         editArea.clear();
         editArea.setParagraphGraphicFactory(LineNumberFactory.get(editArea));
         editArea.setContextMenu(contextMenu);
-        editArea.visibleProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNotNull()
-                                                 .or(viewModel.availableSelectionModelProperty().getValue().selectedItemProperty().isNotNull()));
+        editArea.visibleProperty()
+                .bind(
+                        viewModel
+                                .chosenSelectionModelProperty()
+                                .getValue()
+                                .selectedItemProperty()
+                                .isNotNull()
+                                .or(
+                                        viewModel
+                                                .availableSelectionModelProperty()
+                                                .getValue()
+                                                .selectedItemProperty()
+                                                .isNotNull()));
 
         BindingsHelper.bindBidirectional(
                 editArea.textProperty(),
@@ -199,25 +281,44 @@ public void initialize() {
                     viewModel.refreshPreview();
                 });
 
-        editArea.textProperty().addListener((obs, oldValue, newValue) ->
-                editArea.setStyleSpans(0, viewModel.computeHighlighting(newValue)));
-
-        editArea.focusedProperty().addListener((observable, oldValue, newValue) -> {
-            if (!newValue) {
-                viewModel.refreshPreview();
-            }
-        });
-
-        searchBox.textProperty().addListener((observable, previousText, searchTerm) -> viewModel.setAvailableFilter(searchTerm));
+        editArea.textProperty()
+                .addListener(
+                        (obs, oldValue, newValue) ->
+                                editArea.setStyleSpans(0, viewModel.computeHighlighting(newValue)));
+
+        editArea.focusedProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            if (!newValue) {
+                                viewModel.refreshPreview();
+                            }
+                        });
+
+        searchBox
+                .textProperty()
+                .addListener(
+                        (observable, previousText, searchTerm) ->
+                                viewModel.setAvailableFilter(searchTerm));
 
         readOnlyLabel.visibleProperty().bind(viewModel.selectedIsEditableProperty().not());
         resetDefaultButton.disableProperty().bind(viewModel.selectedIsEditableProperty().not());
-        contextMenu.getItems().getFirst().disableProperty().bind(viewModel.selectedIsEditableProperty().not());
-        contextMenu.getItems().get(2).disableProperty().bind(viewModel.selectedIsEditableProperty().not());
+        contextMenu
+                .getItems()
+                .getFirst()
+                .disableProperty()
+                .bind(viewModel.selectedIsEditableProperty().not());
+        contextMenu
+                .getItems()
+                .get(2)
+                .disableProperty()
+                .bind(viewModel.selectedIsEditableProperty().not());
         editArea.editableProperty().bind(viewModel.selectedIsEditableProperty());
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.chosenListValidationStatus(), chosenListView));
+        Platform.runLater(
+                () ->
+                        validationVisualizer.initVisualization(
+                                viewModel.chosenListValidationStatus(), chosenListView));
     }
 
     /**
@@ -227,7 +328,6 @@ public void initialize() {
      * @param list       The ListView currently focused
      * @param keypressed The pressed character
      */
-
     private void jumpToSearchKey(ListView<PreviewLayout> list, KeyEvent keypressed) {
         if (keypressed.getCharacter() == null) {
             return;
@@ -241,8 +341,10 @@ private void jumpToSearchKey(ListView<PreviewLayout> list, KeyEvent keypressed)
 
         lastKeyPressTime = System.currentTimeMillis();
 
-        list.getItems().stream().filter(item -> item.getDisplayName().toLowerCase().startsWith(listSearchTerm))
-            .findFirst().ifPresent(list::scrollTo);
+        list.getItems().stream()
+                .filter(item -> item.getDisplayName().toLowerCase().startsWith(listSearchTerm))
+                .findFirst()
+                .ifPresent(list::scrollTo);
     }
 
     private void dragOver(DragEvent event) {
@@ -250,19 +352,31 @@ private void dragOver(DragEvent event) {
     }
 
     private void dragDetectedInAvailable(MouseEvent event) {
-        List<PreviewLayout> selectedLayouts = new ArrayList<>(viewModel.availableSelectionModelProperty().getValue().getSelectedItems());
+        List<PreviewLayout> selectedLayouts =
+                new ArrayList<>(
+                        viewModel.availableSelectionModelProperty().getValue().getSelectedItems());
         if (!selectedLayouts.isEmpty()) {
             Dragboard dragboard = startDragAndDrop(TransferMode.MOVE);
-            viewModel.dragDetected(viewModel.availableListProperty(), viewModel.availableSelectionModelProperty(), selectedLayouts, dragboard);
+            viewModel.dragDetected(
+                    viewModel.availableListProperty(),
+                    viewModel.availableSelectionModelProperty(),
+                    selectedLayouts,
+                    dragboard);
         }
         event.consume();
     }
 
     private void dragDetectedInChosen(MouseEvent event) {
-        List<PreviewLayout> selectedLayouts = new ArrayList<>(viewModel.chosenSelectionModelProperty().getValue().getSelectedItems());
+        List<PreviewLayout> selectedLayouts =
+                new ArrayList<>(
+                        viewModel.chosenSelectionModelProperty().getValue().getSelectedItems());
         if (!selectedLayouts.isEmpty()) {
             Dragboard dragboard = startDragAndDrop(TransferMode.MOVE);
-            viewModel.dragDetected(viewModel.chosenListProperty(), viewModel.chosenSelectionModelProperty(), selectedLayouts, dragboard);
+            viewModel.dragDetected(
+                    viewModel.chosenListProperty(),
+                    viewModel.chosenSelectionModelProperty(),
+                    selectedLayouts,
+                    dragboard);
         }
         event.consume();
     }
diff --git a/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java b/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
index dcef02aaa9f0..188a0fc43fa1 100644
--- a/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
@@ -1,13 +1,11 @@
 package org.jabref.gui.preferences.preview;
 
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import com.airhacks.afterburner.injection.Injector;
+
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -25,6 +23,8 @@
 import javafx.scene.input.Dragboard;
 import javafx.scene.input.TransferMode;
 
+import org.fxmisc.richtext.model.StyleSpans;
+import org.fxmisc.richtext.model.StyleSpansBuilder;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.DragAndDropDataFormats;
 import org.jabref.gui.StateManager;
@@ -41,17 +41,18 @@
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntryTypesManager;
-
-import com.airhacks.afterburner.injection.Injector;
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
-import org.fxmisc.richtext.model.StyleSpans;
-import org.fxmisc.richtext.model.StyleSpansBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * This class is Preferences -> Entry Preview tab model
  * <p>
@@ -67,16 +68,23 @@ public class PreviewTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty showAsExtraTabProperty = new SimpleBooleanProperty(false);
     private final BooleanProperty showPreviewInEntryTableTooltip = new SimpleBooleanProperty(false);
 
-    private final ListProperty<PreviewLayout> availableListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<MultipleSelectionModel<PreviewLayout>> availableSelectionModelProperty = new SimpleObjectProperty<>(new NoSelectionModel<>());
-    private final FilteredList<PreviewLayout> filteredAvailableLayouts = new FilteredList<>(this.availableListProperty());
-    private final ListProperty<PreviewLayout> chosenListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<MultipleSelectionModel<PreviewLayout>> chosenSelectionModelProperty = new SimpleObjectProperty<>(new NoSelectionModel<>());
+    private final ListProperty<PreviewLayout> availableListProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<MultipleSelectionModel<PreviewLayout>>
+            availableSelectionModelProperty = new SimpleObjectProperty<>(new NoSelectionModel<>());
+    private final FilteredList<PreviewLayout> filteredAvailableLayouts =
+            new FilteredList<>(this.availableListProperty());
+    private final ListProperty<PreviewLayout> chosenListProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<MultipleSelectionModel<PreviewLayout>>
+            chosenSelectionModelProperty = new SimpleObjectProperty<>(new NoSelectionModel<>());
 
-    private final ListProperty<Path> bstStylesPaths = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<Path> bstStylesPaths =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
 
     private final BooleanProperty selectedIsEditableProperty = new SimpleBooleanProperty(false);
-    private final ObjectProperty<PreviewLayout> selectedLayoutProperty = new SimpleObjectProperty<>();
+    private final ObjectProperty<PreviewLayout> selectedLayoutProperty =
+            new SimpleObjectProperty<>();
     private final StringProperty sourceTextProperty = new SimpleStringProperty("");
 
     private final DialogService dialogService;
@@ -89,31 +97,35 @@ public class PreviewTabViewModel implements PreferenceTabViewModel {
     private ListProperty<PreviewLayout> dragSourceList = null;
     private ObjectProperty<MultipleSelectionModel<PreviewLayout>> dragSourceSelectionModel = null;
 
-    public PreviewTabViewModel(DialogService dialogService,
-                               PreviewPreferences previewPreferences,
-                               TaskExecutor taskExecutor,
-                               StateManager stateManager) {
+    public PreviewTabViewModel(
+            DialogService dialogService,
+            PreviewPreferences previewPreferences,
+            TaskExecutor taskExecutor,
+            StateManager stateManager) {
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
         this.localDragboard = stateManager.getLocalDragboard();
         this.previewPreferences = previewPreferences;
 
-        sourceTextProperty.addListener((observable, oldValue, newValue) -> {
-            if (selectedLayoutProperty.getValue() instanceof TextBasedPreviewLayout layout) {
-                layout.setText(sourceTextProperty.getValue());
-            }
-        });
-
-        chosenListValidator = new FunctionBasedValidator<>(
-                chosenListProperty,
-                input -> !chosenListProperty.getValue().isEmpty(),
-                ValidationMessage.error("%s > %s %n %n %s".formatted(
-                                Localization.lang("Entry preview"),
-                                Localization.lang("Selected"),
-                                Localization.lang("Selected Layouts can not be empty")
-                        )
-                )
-        );
+        sourceTextProperty.addListener(
+                (observable, oldValue, newValue) -> {
+                    if (selectedLayoutProperty.getValue()
+                            instanceof TextBasedPreviewLayout layout) {
+                        layout.setText(sourceTextProperty.getValue());
+                    }
+                });
+
+        chosenListValidator =
+                new FunctionBasedValidator<>(
+                        chosenListProperty,
+                        input -> !chosenListProperty.getValue().isEmpty(),
+                        ValidationMessage.error(
+                                "%s > %s %n %n %s"
+                                        .formatted(
+                                                Localization.lang("Entry preview"),
+                                                Localization.lang("Selected"),
+                                                Localization.lang(
+                                                        "Selected Layouts can not be empty"))));
     }
 
     @Override
@@ -128,26 +140,47 @@ public void setValues() {
             availableListProperty.getValue().add(previewPreferences.getCustomPreviewLayout());
         }
 
-        BibEntryTypesManager entryTypesManager = Injector.instantiateModelOrService(BibEntryTypesManager.class);
+        BibEntryTypesManager entryTypesManager =
+                Injector.instantiateModelOrService(BibEntryTypesManager.class);
 
         BackgroundTask.wrap(CitationStyle::discoverCitationStyles)
-                      .onSuccess(styles -> styles.stream()
-                                                 .map(style -> new CitationStylePreviewLayout(style, entryTypesManager))
-                                                 .filter(style -> chosenListProperty.getValue().filtered(item ->
-                                                         item.getName().equals(style.getName())).isEmpty())
-                                                 .sorted(Comparator.comparing(PreviewLayout::getName))
-                                                 .forEach(availableListProperty::add))
-                      .onFailure(ex -> {
-                          LOGGER.error("Something went wrong while adding the discovered CitationStyles to the list.", ex);
-                          dialogService.showErrorDialogAndWait(Localization.lang("Error adding discovered CitationStyles"), ex);
-                      })
-                      .executeWith(taskExecutor);
+                .onSuccess(
+                        styles ->
+                                styles.stream()
+                                        .map(
+                                                style ->
+                                                        new CitationStylePreviewLayout(
+                                                                style, entryTypesManager))
+                                        .filter(
+                                                style ->
+                                                        chosenListProperty
+                                                                .getValue()
+                                                                .filtered(
+                                                                        item ->
+                                                                                item.getName()
+                                                                                        .equals(
+                                                                                                style
+                                                                                                        .getName()))
+                                                                .isEmpty())
+                                        .sorted(Comparator.comparing(PreviewLayout::getName))
+                                        .forEach(availableListProperty::add))
+                .onFailure(
+                        ex -> {
+                            LOGGER.error(
+                                    "Something went wrong while adding the discovered CitationStyles to the list.",
+                                    ex);
+                            dialogService.showErrorDialogAndWait(
+                                    Localization.lang("Error adding discovered CitationStyles"),
+                                    ex);
+                        })
+                .executeWith(taskExecutor);
         bstStylesPaths.clear();
         bstStylesPaths.addAll(previewPreferences.getBstPreviewLayoutPaths());
-        bstStylesPaths.forEach(path -> {
-            BstPreviewLayout layout = new BstPreviewLayout(path);
-            availableListProperty.add(layout);
-        });
+        bstStylesPaths.forEach(
+                path -> {
+                    BstPreviewLayout layout = new BstPreviewLayout(path);
+                    availableListProperty.add(layout);
+                });
     }
 
     public void setPreviewLayout(PreviewLayout selectedLayout) {
@@ -163,7 +196,10 @@ public void setPreviewLayout(PreviewLayout selectedLayout) {
             LOGGER.warn("Parsing error.", exception);
             dialogService.showErrorDialogAndWait(
                     Localization.lang("Parsing error"),
-                    Localization.lang("Parsing error") + ": " + Localization.lang("illegal backslash expression"), exception);
+                    Localization.lang("Parsing error")
+                            + ": "
+                            + Localization.lang("illegal backslash expression"),
+                    exception);
         }
 
         boolean isEditingAllowed = selectedLayout instanceof TextBasedPreviewLayout;
@@ -181,11 +217,14 @@ public void refreshPreview() {
     }
 
     private PreviewLayout findLayoutByName(String name) {
-        return availableListProperty.getValue().stream().filter(layout -> layout.getName().equals(name))
-                                    .findAny()
-                                    .orElse(chosenListProperty.getValue().stream().filter(layout -> layout.getName().equals(name))
-                                                              .findAny()
-                                                              .orElse(null));
+        return availableListProperty.getValue().stream()
+                .filter(layout -> layout.getName().equals(name))
+                .findAny()
+                .orElse(
+                        chosenListProperty.getValue().stream()
+                                .filter(layout -> layout.getName().equals(name))
+                                .findAny()
+                                .orElse(null));
     }
 
     /**
@@ -205,13 +244,20 @@ public void storeSettings() {
         previewPreferences.getLayoutCycle().clear();
         previewPreferences.getLayoutCycle().addAll(chosenListProperty);
         previewPreferences.setShowPreviewAsExtraTab(showAsExtraTabProperty.getValue());
-        previewPreferences.setShowPreviewEntryTableTooltip(showPreviewInEntryTableTooltip.getValue());
+        previewPreferences.setShowPreviewEntryTableTooltip(
+                showPreviewInEntryTableTooltip.getValue());
         previewPreferences.setCustomPreviewLayout((TextBasedPreviewLayout) customLayout);
         previewPreferences.setBstPreviewLayoutPaths(bstStylesPaths);
 
         if (!chosenSelectionModelProperty.getValue().getSelectedItems().isEmpty()) {
-            previewPreferences.setLayoutCyclePosition(chosenListProperty.getValue().indexOf(
-                    chosenSelectionModelProperty.getValue().getSelectedItems().getFirst()));
+            previewPreferences.setLayoutCyclePosition(
+                    chosenListProperty
+                            .getValue()
+                            .indexOf(
+                                    chosenSelectionModelProperty
+                                            .getValue()
+                                            .getSelectedItems()
+                                            .getFirst()));
         }
     }
 
@@ -224,8 +270,11 @@ public boolean validateSettings() {
         ValidationStatus validationStatus = chosenListValidationStatus();
         if (!validationStatus.isValid()) {
             if (validationStatus.getHighestMessage().isPresent()) {
-                validationStatus.getHighestMessage().ifPresent(message ->
-                        dialogService.showErrorDialogAndWait(message.getMessage()));
+                validationStatus
+                        .getHighestMessage()
+                        .ifPresent(
+                                message ->
+                                        dialogService.showErrorDialogAndWait(message.getMessage()));
             }
             return false;
         }
@@ -233,18 +282,21 @@ public boolean validateSettings() {
     }
 
     public void addToChosen() {
-        List<PreviewLayout> selected = new ArrayList<>(availableSelectionModelProperty.getValue().getSelectedItems());
+        List<PreviewLayout> selected =
+                new ArrayList<>(availableSelectionModelProperty.getValue().getSelectedItems());
         availableSelectionModelProperty.getValue().clearSelection();
         availableListProperty.removeAll(selected);
         chosenListProperty.addAll(selected);
     }
 
     public void removeFromChosen() {
-        List<PreviewLayout> selected = new ArrayList<>(chosenSelectionModelProperty.getValue().getSelectedItems());
+        List<PreviewLayout> selected =
+                new ArrayList<>(chosenSelectionModelProperty.getValue().getSelectedItems());
         chosenSelectionModelProperty.getValue().clearSelection();
         chosenListProperty.removeAll(selected);
         availableListProperty.addAll(selected);
-        availableListProperty.sort((a, b) -> a.getDisplayName().compareToIgnoreCase(b.getDisplayName()));
+        availableListProperty.sort(
+                (a, b) -> a.getDisplayName().compareToIgnoreCase(b.getDisplayName()));
     }
 
     public void selectedInChosenUp() {
@@ -252,7 +304,8 @@ public void selectedInChosenUp() {
             return;
         }
 
-        List<Integer> selected = new ArrayList<>(chosenSelectionModelProperty.getValue().getSelectedIndices());
+        List<Integer> selected =
+                new ArrayList<>(chosenSelectionModelProperty.getValue().getSelectedIndices());
         List<Integer> newIndices = new ArrayList<>();
         chosenSelectionModelProperty.getValue().clearSelection();
 
@@ -273,14 +326,18 @@ public void selectedInChosenDown() {
             return;
         }
 
-        List<Integer> selected = new ArrayList<>(chosenSelectionModelProperty.getValue().getSelectedIndices());
+        List<Integer> selected =
+                new ArrayList<>(chosenSelectionModelProperty.getValue().getSelectedIndices());
         List<Integer> newIndices = new ArrayList<>();
         chosenSelectionModelProperty.getValue().clearSelection();
 
         for (int i = selected.size() - 1; i >= 0; i--) {
             int oldIndex = selected.get(i);
             boolean alreadyTaken = newIndices.contains(oldIndex + 1);
-            int newIndex = (oldIndex < (chosenListProperty.size() - 1)) && !alreadyTaken ? oldIndex + 1 : oldIndex;
+            int newIndex =
+                    (oldIndex < (chosenListProperty.size() - 1)) && !alreadyTaken
+                            ? oldIndex + 1
+                            : oldIndex;
             chosenListProperty.add(newIndex, chosenListProperty.remove(oldIndex));
             newIndices.add(newIndex);
         }
@@ -311,8 +368,10 @@ public void resetDefaultLayout() {
      * @return highlighted span for codeArea
      */
     public StyleSpans<Collection<String>> computeHighlighting(String text) {
-        final Pattern XML_TAG = Pattern.compile("(?<ELEMENT>(</?\\h*)(\\w+)([^<>]*)(\\h*/?>))"
-                + "|(?<COMMENT><!--[^<>]+-->)");
+        final Pattern XML_TAG =
+                Pattern.compile(
+                        "(?<ELEMENT>(</?\\h*)(\\w+)([^<>]*)(\\h*/?>))"
+                                + "|(?<COMMENT><!--[^<>]+-->)");
         final Pattern ATTRIBUTES = Pattern.compile("(\\w+\\h*)(=)(\\h*\"[^\"]+\")");
 
         final int GROUP_OPEN_BRACKET = 2;
@@ -334,28 +393,47 @@ public StyleSpans<Collection<String>> computeHighlighting(String text) {
                 if (matcher.group("ELEMENT") != null) {
                     String attributesText = matcher.group(GROUP_ATTRIBUTES_SECTION);
 
-                    spansBuilder.add(Collections.singleton("tagmark"), matcher.end(GROUP_OPEN_BRACKET) - matcher.start(GROUP_OPEN_BRACKET));
-                    spansBuilder.add(Collections.singleton("anytag"), matcher.end(GROUP_ELEMENT_NAME) - matcher.end(GROUP_OPEN_BRACKET));
+                    spansBuilder.add(
+                            Collections.singleton("tagmark"),
+                            matcher.end(GROUP_OPEN_BRACKET) - matcher.start(GROUP_OPEN_BRACKET));
+                    spansBuilder.add(
+                            Collections.singleton("anytag"),
+                            matcher.end(GROUP_ELEMENT_NAME) - matcher.end(GROUP_OPEN_BRACKET));
 
                     if (!attributesText.isEmpty()) {
                         lastKeywordEnd = 0;
 
                         Matcher attributesMatcher = ATTRIBUTES.matcher(attributesText);
                         while (attributesMatcher.find()) {
-                            spansBuilder.add(Collections.emptyList(), attributesMatcher.start() - lastKeywordEnd);
-                            spansBuilder.add(Collections.singleton("attribute"), attributesMatcher.end(GROUP_ATTRIBUTE_NAME) - attributesMatcher.start(GROUP_ATTRIBUTE_NAME));
-                            spansBuilder.add(Collections.singleton("tagmark"), attributesMatcher.end(GROUP_EQUAL_SYMBOL) - attributesMatcher.end(GROUP_ATTRIBUTE_NAME));
-                            spansBuilder.add(Collections.singleton("avalue"), attributesMatcher.end(GROUP_ATTRIBUTE_VALUE) - attributesMatcher.end(GROUP_EQUAL_SYMBOL));
+                            spansBuilder.add(
+                                    Collections.emptyList(),
+                                    attributesMatcher.start() - lastKeywordEnd);
+                            spansBuilder.add(
+                                    Collections.singleton("attribute"),
+                                    attributesMatcher.end(GROUP_ATTRIBUTE_NAME)
+                                            - attributesMatcher.start(GROUP_ATTRIBUTE_NAME));
+                            spansBuilder.add(
+                                    Collections.singleton("tagmark"),
+                                    attributesMatcher.end(GROUP_EQUAL_SYMBOL)
+                                            - attributesMatcher.end(GROUP_ATTRIBUTE_NAME));
+                            spansBuilder.add(
+                                    Collections.singleton("avalue"),
+                                    attributesMatcher.end(GROUP_ATTRIBUTE_VALUE)
+                                            - attributesMatcher.end(GROUP_EQUAL_SYMBOL));
                             lastKeywordEnd = attributesMatcher.end();
                         }
                         if (attributesText.length() > lastKeywordEnd) {
-                            spansBuilder.add(Collections.emptyList(), attributesText.length() - lastKeywordEnd);
+                            spansBuilder.add(
+                                    Collections.emptyList(),
+                                    attributesText.length() - lastKeywordEnd);
                         }
                     }
 
                     lastKeywordEnd = matcher.end(GROUP_ATTRIBUTES_SECTION);
 
-                    spansBuilder.add(Collections.singleton("tagmark"), matcher.end(GROUP_CLOSE_BRACKET) - lastKeywordEnd);
+                    spansBuilder.add(
+                            Collections.singleton("tagmark"),
+                            matcher.end(GROUP_CLOSE_BRACKET) - lastKeywordEnd);
                 }
             }
             lastKeywordEnd = matcher.end();
@@ -370,7 +448,11 @@ public void dragOver(DragEvent event) {
         }
     }
 
-    public void dragDetected(ListProperty<PreviewLayout> sourceList, ObjectProperty<MultipleSelectionModel<PreviewLayout>> sourceSelectionModel, List<PreviewLayout> selectedLayouts, Dragboard dragboard) {
+    public void dragDetected(
+            ListProperty<PreviewLayout> sourceList,
+            ObjectProperty<MultipleSelectionModel<PreviewLayout>> sourceSelectionModel,
+            List<PreviewLayout> selectedLayouts,
+            Dragboard dragboard) {
         ClipboardContent content = new ClipboardContent();
         content.put(DragAndDropDataFormats.PREVIEWLAYOUTS, "");
         dragboard.setContent(content);
@@ -384,7 +466,6 @@ public void dragDetected(ListProperty<PreviewLayout> sourceList, ObjectProperty<
      *
      * @param targetList either availableListView or chosenListView
      */
-
     public boolean dragDropped(ListProperty<PreviewLayout> targetList, Dragboard dragboard) {
         boolean success = false;
 
@@ -397,7 +478,12 @@ public boolean dragDropped(ListProperty<PreviewLayout> targetList, Dragboard dra
                 success = true;
 
                 if (targetList == availableListProperty) {
-                    targetList.getValue().sort((a, b) -> a.getDisplayName().compareToIgnoreCase(b.getDisplayName()));
+                    targetList
+                            .getValue()
+                            .sort(
+                                    (a, b) ->
+                                            a.getDisplayName()
+                                                    .compareToIgnoreCase(b.getDisplayName()));
                 }
             }
         }
@@ -410,17 +496,18 @@ public boolean dragDropped(ListProperty<PreviewLayout> targetList, Dragboard dra
      *
      * @param targetLayout the Layout, the user drops a layout on
      */
-
     public boolean dragDroppedInChosenCell(PreviewLayout targetLayout, Dragboard dragboard) {
         boolean success = false;
 
         if (dragboard.hasContent(DragAndDropDataFormats.PREVIEWLAYOUTS)) {
-            List<PreviewLayout> draggedSelectedLayouts = new ArrayList<>(localDragboard.getPreviewLayouts());
+            List<PreviewLayout> draggedSelectedLayouts =
+                    new ArrayList<>(localDragboard.getPreviewLayouts());
             if (!draggedSelectedLayouts.isEmpty()) {
                 chosenSelectionModelProperty.getValue().clearSelection();
                 int targetId = chosenListProperty.getValue().indexOf(targetLayout);
 
-                // see https://stackoverflow.com/questions/28603224/sort-tableview-with-drag-and-drop-rows
+                // see
+                // https://stackoverflow.com/questions/28603224/sort-tableview-with-drag-and-drop-rows
                 int onSelectedDelta = 0;
                 while (draggedSelectedLayouts.contains(targetLayout)) {
                     onSelectedDelta = 1;
@@ -436,14 +523,16 @@ public boolean dragDroppedInChosenCell(PreviewLayout targetLayout, Dragboard dra
                 dragSourceList.getValue().removeAll(draggedSelectedLayouts);
 
                 if (targetLayout != null) {
-                    targetId = chosenListProperty.getValue().indexOf(targetLayout) + onSelectedDelta;
+                    targetId =
+                            chosenListProperty.getValue().indexOf(targetLayout) + onSelectedDelta;
                 } else if (targetId != 0) {
                     targetId = chosenListProperty.getValue().size();
                 }
 
                 chosenListProperty.getValue().addAll(targetId, draggedSelectedLayouts);
 
-                draggedSelectedLayouts.forEach(layout -> chosenSelectionModelProperty.getValue().select(layout));
+                draggedSelectedLayouts.forEach(
+                        layout -> chosenSelectionModelProperty.getValue().select(layout));
 
                 success = true;
             }
@@ -470,8 +559,7 @@ public FilteredList<PreviewLayout> getFilteredAvailableLayouts() {
 
     public void setAvailableFilter(String searchTerm) {
         this.filteredAvailableLayouts.setPredicate(
-                preview -> searchTerm.isEmpty()
-                        || preview.containsCaseIndependent(searchTerm));
+                preview -> searchTerm.isEmpty() || preview.containsCaseIndependent(searchTerm));
     }
 
     public ObjectProperty<MultipleSelectionModel<PreviewLayout>> availableSelectionModelProperty() {
diff --git a/src/main/java/org/jabref/gui/preferences/protectedterms/NewProtectedTermsFileDialog.java b/src/main/java/org/jabref/gui/preferences/protectedterms/NewProtectedTermsFileDialog.java
index 5989cbc6792c..df2341fb7b43 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/NewProtectedTermsFileDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/NewProtectedTermsFileDialog.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.preferences.protectedterms;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Label;
@@ -18,46 +15,66 @@
 import org.jabref.logic.protectedterms.ProtectedTermsList;
 import org.jabref.logic.util.StandardFileType;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class NewProtectedTermsFileDialog extends BaseDialog<Void> {
 
     private final TextField newFile = new TextField();
     private final DialogService dialogService;
 
-    public NewProtectedTermsFileDialog(List<ProtectedTermsListItemModel> termsLists, DialogService dialogService, FilePreferences filePreferences) {
+    public NewProtectedTermsFileDialog(
+            List<ProtectedTermsListItemModel> termsLists,
+            DialogService dialogService,
+            FilePreferences filePreferences) {
         this.dialogService = dialogService;
 
         this.setTitle(Localization.lang("New protected terms file"));
 
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(Localization.lang("Protected terms file"), StandardFileType.TERMS)
-                .withDefaultExtension(Localization.lang("Protected terms file"), StandardFileType.TERMS)
-                .withInitialDirectory(filePreferences.getWorkingDirectory())
-                .build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(
+                                Localization.lang("Protected terms file"), StandardFileType.TERMS)
+                        .withDefaultExtension(
+                                Localization.lang("Protected terms file"), StandardFileType.TERMS)
+                        .withInitialDirectory(filePreferences.getWorkingDirectory())
+                        .build();
 
         Button browse = new Button(Localization.lang("Browse"));
-        browse.setOnAction(event -> this.dialogService.showFileSaveDialog(fileDialogConfiguration)
-                                                      .ifPresent(file -> newFile.setText(file.toAbsolutePath().toString())));
+        browse.setOnAction(
+                event ->
+                        this.dialogService
+                                .showFileSaveDialog(fileDialogConfiguration)
+                                .ifPresent(
+                                        file -> newFile.setText(file.toAbsolutePath().toString())));
 
         TextField newDescription = new TextField();
-        VBox container = new VBox(10,
-                new VBox(5, new Label(Localization.lang("Description")), newDescription),
-                new VBox(5, new Label(Localization.lang("File")), new HBox(10, newFile, browse))
-        );
+        VBox container =
+                new VBox(
+                        10,
+                        new VBox(5, new Label(Localization.lang("Description")), newDescription),
+                        new VBox(
+                                5,
+                                new Label(Localization.lang("File")),
+                                new HBox(10, newFile, browse)));
         getDialogPane().setContent(container);
 
-        getDialogPane().getButtonTypes().setAll(
-                ButtonType.OK,
-                ButtonType.CANCEL
-        );
-
-        setResultConverter(button -> {
-            if (button == ButtonType.OK) {
-                ProtectedTermsList newList = new ProtectedTermsList(newDescription.getText(), new ArrayList<>(), newFile.getText(), false);
-                newList.setEnabled(true);
-                newList.createAndWriteHeading(newDescription.getText());
-                termsLists.add(new ProtectedTermsListItemModel(newList));
-            }
-            return null;
-        });
+        getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
+
+        setResultConverter(
+                button -> {
+                    if (button == ButtonType.OK) {
+                        ProtectedTermsList newList =
+                                new ProtectedTermsList(
+                                        newDescription.getText(),
+                                        new ArrayList<>(),
+                                        newFile.getText(),
+                                        false);
+                        newList.setEnabled(true);
+                        newList.createAndWriteHeading(newDescription.getText());
+                        termsLists.add(new ProtectedTermsListItemModel(newList));
+                    }
+                    return null;
+                });
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
index 733dcec512f5..579d5d77e9a8 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.preferences.protectedterms;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
+
 import javafx.beans.property.ReadOnlyBooleanWrapper;
 import javafx.fxml.FXML;
 import javafx.scene.control.ContextMenu;
@@ -20,13 +24,11 @@
 import org.jabref.logic.protectedterms.ProtectedTermsList;
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 /**
  * Dialog for managing term list files.
  */
-public class ProtectedTermsTab extends AbstractPreferenceTabView<ProtectedTermsTabViewModel> implements PreferencesTab {
+public class ProtectedTermsTab extends AbstractPreferenceTabView<ProtectedTermsTabViewModel>
+        implements PreferencesTab {
     @FXML private TableView<ProtectedTermsListItemModel> filesTable;
     @FXML private TableColumn<ProtectedTermsListItemModel, Boolean> filesTableEnabledColumn;
     @FXML private TableColumn<ProtectedTermsListItemModel, String> filesTableDescriptionColumn;
@@ -37,9 +39,7 @@ public class ProtectedTermsTab extends AbstractPreferenceTabView<ProtectedTermsT
     @Inject private ProtectedTermsLoader termsLoader;
 
     public ProtectedTermsTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -54,18 +54,21 @@ public void initialize() {
         new ViewModelTableRowFactory<ProtectedTermsListItemModel>()
                 .withContextMenu(this::createContextMenu)
                 .install(filesTable);
-        filesTableEnabledColumn.setCellFactory(CheckBoxTableCell.forTableColumn(filesTableEnabledColumn));
+        filesTableEnabledColumn.setCellFactory(
+                CheckBoxTableCell.forTableColumn(filesTableEnabledColumn));
         filesTableEnabledColumn.setCellValueFactory(data -> data.getValue().enabledProperty());
-        filesTableDescriptionColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getTermsList().getDescription()));
-
-        filesTableFileColumn.setCellValueFactory(data -> {
-            ProtectedTermsList list = data.getValue().getTermsList();
-            if (list.isInternalList()) {
-                return BindingsHelper.constantOf(Localization.lang("Internal list"));
-            } else {
-                return BindingsHelper.constantOf(list.getLocation());
-            }
-        });
+        filesTableDescriptionColumn.setCellValueFactory(
+                data -> BindingsHelper.constantOf(data.getValue().getTermsList().getDescription()));
+
+        filesTableFileColumn.setCellValueFactory(
+                data -> {
+                    ProtectedTermsList list = data.getValue().getTermsList();
+                    if (list.isInternalList()) {
+                        return BindingsHelper.constantOf(Localization.lang("Internal list"));
+                    } else {
+                        return BindingsHelper.constantOf(list.getLocation());
+                    }
+                });
 
         filesTableEditColumn.setCellValueFactory(data -> data.getValue().internalProperty().not());
         new ValueTableCellFactory<ProtectedTermsListItemModel, Boolean>()
@@ -74,7 +77,8 @@ public void initialize() {
                 .withOnMouseClickedEvent((item, none) -> event -> viewModel.edit(item))
                 .install(filesTableEditColumn);
 
-        filesTableDeleteColumn.setCellValueFactory(data -> data.getValue().internalProperty().not());
+        filesTableDeleteColumn.setCellValueFactory(
+                data -> data.getValue().internalProperty().not());
         new ValueTableCellFactory<ProtectedTermsListItemModel, Boolean>()
                 .withGraphic(none -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
                 .withVisibleExpression(ReadOnlyBooleanWrapper::new)
@@ -88,12 +92,25 @@ public void initialize() {
     private ContextMenu createContextMenu(ProtectedTermsListItemModel file) {
         ActionFactory factory = new ActionFactory();
         ContextMenu contextMenu = new ContextMenu();
-        contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.EDIT_LIST, new ProtectedTermsTab.ContextAction(StandardActions.EDIT_LIST, file)),
-                factory.createMenuItem(StandardActions.VIEW_LIST, new ProtectedTermsTab.ContextAction(StandardActions.VIEW_LIST, file)),
-                factory.createMenuItem(StandardActions.REMOVE_LIST, new ProtectedTermsTab.ContextAction(StandardActions.REMOVE_LIST, file)),
-                factory.createMenuItem(StandardActions.RELOAD_LIST, new ProtectedTermsTab.ContextAction(StandardActions.RELOAD_LIST, file))
-        );
+        contextMenu
+                .getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.EDIT_LIST,
+                                new ProtectedTermsTab.ContextAction(
+                                        StandardActions.EDIT_LIST, file)),
+                        factory.createMenuItem(
+                                StandardActions.VIEW_LIST,
+                                new ProtectedTermsTab.ContextAction(
+                                        StandardActions.VIEW_LIST, file)),
+                        factory.createMenuItem(
+                                StandardActions.REMOVE_LIST,
+                                new ProtectedTermsTab.ContextAction(
+                                        StandardActions.REMOVE_LIST, file)),
+                        factory.createMenuItem(
+                                StandardActions.RELOAD_LIST,
+                                new ProtectedTermsTab.ContextAction(
+                                        StandardActions.RELOAD_LIST, file)));
         contextMenu.getItems().forEach(item -> item.setGraphic(null));
         contextMenu.getStyleClass().add("context-menu");
 
@@ -119,11 +136,13 @@ public ContextAction(StandardActions command, ProtectedTermsListItemModel itemMo
             this.command = command;
             this.itemModel = itemModel;
 
-            this.executable.bind(BindingsHelper.constantOf(
-                    switch (command) {
-                        case EDIT_LIST, REMOVE_LIST, RELOAD_LIST -> !itemModel.getTermsList().isInternalList();
-                        default -> true;
-                    }));
+            this.executable.bind(
+                    BindingsHelper.constantOf(
+                            switch (command) {
+                                case EDIT_LIST, REMOVE_LIST, RELOAD_LIST ->
+                                        !itemModel.getTermsList().isInternalList();
+                                default -> true;
+                            }));
         }
 
         @Override
diff --git a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
index da345cd066d2..3bb7f0e6ec18 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.preferences.protectedterms;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
@@ -30,23 +24,30 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.OptionalUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
 public class ProtectedTermsTabViewModel implements PreferenceTabViewModel {
     private static final Logger LOGGER = LoggerFactory.getLogger(ProtectedTermsTabViewModel.class);
 
     private final ProtectedTermsLoader termsLoader;
-    private final ListProperty<ProtectedTermsListItemModel> termsFilesProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<ProtectedTermsListItemModel> termsFilesProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
     private final DialogService dialogService;
     private final ExternalApplicationsPreferences externalApplicationsPreferences;
     private final FilePreferences filePreferences;
     private final ProtectedTermsPreferences protectedTermsPreferences;
 
-    public ProtectedTermsTabViewModel(ProtectedTermsLoader termsLoader,
-                                      DialogService dialogService,
-                                      GuiPreferences preferences) {
+    public ProtectedTermsTabViewModel(
+            ProtectedTermsLoader termsLoader,
+            DialogService dialogService,
+            GuiPreferences preferences) {
         this.termsLoader = termsLoader;
         this.dialogService = dialogService;
         this.externalApplicationsPreferences = preferences.getExternalApplicationsPreferences();
@@ -57,7 +58,10 @@ public ProtectedTermsTabViewModel(ProtectedTermsLoader termsLoader,
     @Override
     public void setValues() {
         termsFilesProperty.clear();
-        termsFilesProperty.addAll(termsLoader.getProtectedTermsLists().stream().map(ProtectedTermsListItemModel::new).toList());
+        termsFilesProperty.addAll(
+                termsLoader.getProtectedTermsLists().stream()
+                        .map(ProtectedTermsListItemModel::new)
+                        .toList());
     }
 
     @Override
@@ -67,8 +71,10 @@ public void storeSettings() {
         List<String> enabledInternalList = new ArrayList<>();
         List<String> disabledInternalList = new ArrayList<>();
 
-        for (ProtectedTermsList list : termsFilesProperty.getValue().stream()
-                                                         .map(ProtectedTermsListItemModel::getTermsList).toList()) {
+        for (ProtectedTermsList list :
+                termsFilesProperty.getValue().stream()
+                        .map(ProtectedTermsListItemModel::getTermsList)
+                        .toList()) {
             if (list.isInternalList()) {
                 if (list.isEnabled()) {
                     enabledInternalList.add(list.getLocation());
@@ -93,25 +99,36 @@ public void storeSettings() {
     }
 
     public void addFile() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(Localization.lang("Protected terms file"), StandardFileType.TERMS)
-                .withDefaultExtension(Localization.lang("Protected terms file"), StandardFileType.TERMS)
-                .withInitialDirectory(filePreferences.getWorkingDirectory())
-                .build();
-
-        dialogService.showFileOpenDialog(fileDialogConfiguration)
-                     .ifPresent(file -> {
-                         Path fileName = file.toAbsolutePath();
-                         termsFilesProperty.add(new ProtectedTermsListItemModel(ProtectedTermsLoader.readProtectedTermsListFromFile(fileName, true)));
-                     });
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(
+                                Localization.lang("Protected terms file"), StandardFileType.TERMS)
+                        .withDefaultExtension(
+                                Localization.lang("Protected terms file"), StandardFileType.TERMS)
+                        .withInitialDirectory(filePreferences.getWorkingDirectory())
+                        .build();
+
+        dialogService
+                .showFileOpenDialog(fileDialogConfiguration)
+                .ifPresent(
+                        file -> {
+                            Path fileName = file.toAbsolutePath();
+                            termsFilesProperty.add(
+                                    new ProtectedTermsListItemModel(
+                                            ProtectedTermsLoader.readProtectedTermsListFromFile(
+                                                    fileName, true)));
+                        });
     }
 
     public void removeList(ProtectedTermsListItemModel itemModel) {
         ProtectedTermsList list = itemModel.getTermsList();
-        if (!list.isInternalList() && dialogService.showConfirmationDialogAndWait(Localization.lang("Remove protected terms file"),
-                Localization.lang("Are you sure you want to remove the protected terms file?"),
-                Localization.lang("Remove protected terms file"),
-                Localization.lang("Cancel"))) {
+        if (!list.isInternalList()
+                && dialogService.showConfirmationDialogAndWait(
+                        Localization.lang("Remove protected terms file"),
+                        Localization.lang(
+                                "Are you sure you want to remove the protected terms file?"),
+                        Localization.lang("Remove protected terms file"),
+                        Localization.lang("Cancel"))) {
             itemModel.enabledProperty().setValue(false);
             if (!termsFilesProperty.remove(itemModel)) {
                 LOGGER.info("Problem removing protected terms file");
@@ -120,18 +137,27 @@ public void removeList(ProtectedTermsListItemModel itemModel) {
     }
 
     public void createNewFile() {
-        dialogService.showCustomDialogAndWait(new NewProtectedTermsFileDialog(termsFilesProperty, dialogService, filePreferences));
+        dialogService.showCustomDialogAndWait(
+                new NewProtectedTermsFileDialog(
+                        termsFilesProperty, dialogService, filePreferences));
     }
 
     public void edit(ProtectedTermsListItemModel file) {
-        Optional<ExternalFileType> termsFileType = OptionalUtil.<ExternalFileType>orElse(
-                ExternalFileTypes.getExternalFileTypeByExt("terms", externalApplicationsPreferences),
-                ExternalFileTypes.getExternalFileTypeByExt("txt", externalApplicationsPreferences)
-        );
+        Optional<ExternalFileType> termsFileType =
+                OptionalUtil.<ExternalFileType>orElse(
+                        ExternalFileTypes.getExternalFileTypeByExt(
+                                "terms", externalApplicationsPreferences),
+                        ExternalFileTypes.getExternalFileTypeByExt(
+                                "txt", externalApplicationsPreferences));
 
         String fileName = file.getTermsList().getLocation();
         try {
-            NativeDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), externalApplicationsPreferences, filePreferences, fileName, termsFileType);
+            NativeDesktop.openExternalFileAnyFormat(
+                    new BibDatabaseContext(),
+                    externalApplicationsPreferences,
+                    filePreferences,
+                    fileName,
+                    termsFileType);
         } catch (IOException e) {
             LOGGER.warn("Problem open protected terms file editor", e);
         }
@@ -150,12 +176,15 @@ public void displayContent(ProtectedTermsListItemModel itemModel) {
         DialogPane dialogPane = new DialogPane();
         dialogPane.setContent(scrollPane);
 
-        dialogService.showCustomDialogAndWait(list.getDescription() + " - " + list.getLocation(), dialogPane, ButtonType.OK);
+        dialogService.showCustomDialogAndWait(
+                list.getDescription() + " - " + list.getLocation(), dialogPane, ButtonType.OK);
     }
 
     public void reloadList(ProtectedTermsListItemModel oldItemModel) {
         ProtectedTermsList oldList = oldItemModel.getTermsList();
-        ProtectedTermsList newList = ProtectedTermsLoader.readProtectedTermsListFromFile(Path.of(oldList.getLocation()), oldList.isEnabled());
+        ProtectedTermsList newList =
+                ProtectedTermsLoader.readProtectedTermsListFromFile(
+                        Path.of(oldList.getLocation()), oldList.isEnabled());
         int index = termsFilesProperty.indexOf(oldItemModel);
         if (index >= 0) {
             termsFilesProperty.set(index, new ProtectedTermsListItemModel(newList));
diff --git a/src/main/java/org/jabref/gui/preferences/table/TableTab.java b/src/main/java/org/jabref/gui/preferences/table/TableTab.java
index 37ea2359c397..941d19667637 100644
--- a/src/main/java/org/jabref/gui/preferences/table/TableTab.java
+++ b/src/main/java/org/jabref/gui/preferences/table/TableTab.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.preferences.table;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
 import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -24,10 +28,8 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-
-public class TableTab extends AbstractPreferenceTabView<TableTabViewModel> implements PreferencesTab {
+public class TableTab extends AbstractPreferenceTabView<TableTabViewModel>
+        implements PreferencesTab {
 
     @FXML private TableView<MainTableColumnModel> columnsList;
     @FXML private TableColumn<MainTableColumnModel, String> nameColumn;
@@ -49,9 +51,7 @@ public class TableTab extends AbstractPreferenceTabView<TableTabViewModel> imple
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     public TableTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -66,7 +66,13 @@ public void initialize() {
         setupBindings();
 
         ActionFactory actionFactory = new ActionFactory();
-        actionFactory.configureIconButton(StandardActions.HELP_SPECIAL_FIELDS, new HelpAction(HelpFile.SPECIAL_FIELDS, dialogService, preferences.getExternalApplicationsPreferences()), specialFieldsHelp);
+        actionFactory.configureIconButton(
+                StandardActions.HELP_SPECIAL_FIELDS,
+                new HelpAction(
+                        HelpFile.SPECIAL_FIELDS,
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences()),
+                specialFieldsHelp);
     }
 
     private void setupTable() {
@@ -83,17 +89,22 @@ private void setupTable() {
         new ValueTableCellFactory<MainTableColumnModel, String>()
                 .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
                 .withTooltip(name -> Localization.lang("Remove column") + " " + name)
-                .withOnMouseClickedEvent(item -> evt ->
-                        viewModel.removeColumn(columnsList.getFocusModel().getFocusedItem()))
+                .withOnMouseClickedEvent(
+                        item ->
+                                evt ->
+                                        viewModel.removeColumn(
+                                                columnsList.getFocusModel().getFocusedItem()))
                 .install(actionsColumn);
 
         viewModel.selectedColumnModelProperty().setValue(columnsList.getSelectionModel());
-        columnsList.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            if (event.getCode() == KeyCode.DELETE) {
-                viewModel.removeColumn(columnsList.getSelectionModel().getSelectedItem());
-                event.consume();
-            }
-        });
+        columnsList.addEventFilter(
+                KeyEvent.KEY_PRESSED,
+                event -> {
+                    if (event.getCode() == KeyCode.DELETE) {
+                        viewModel.removeColumn(columnsList.getSelectionModel().getSelectedItem());
+                        event.consume();
+                    }
+                });
 
         columnsList.itemsProperty().bind(viewModel.columnsListProperty());
 
@@ -103,33 +114,56 @@ private void setupTable() {
         addColumnName.itemsProperty().bind(viewModel.availableColumnsProperty());
         addColumnName.valueProperty().bindBidirectional(viewModel.addColumnProperty());
         addColumnName.setConverter(TableTabViewModel.columnNameStringConverter);
-        addColumnName.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            if (event.getCode() == KeyCode.ENTER) {
-                viewModel.insertColumnInList();
-                event.consume();
-            }
-        });
+        addColumnName.addEventFilter(
+                KeyEvent.KEY_PRESSED,
+                event -> {
+                    if (event.getCode() == KeyCode.ENTER) {
+                        viewModel.insertColumnInList();
+                        event.consume();
+                    }
+                });
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.columnsListValidationStatus(), columnsList));
+        Platform.runLater(
+                () ->
+                        validationVisualizer.initVisualization(
+                                viewModel.columnsListValidationStatus(), columnsList));
     }
 
     private void setupBindings() {
-        specialFieldsEnable.selectedProperty().bindBidirectional(viewModel.specialFieldsEnabledProperty());
-        extraFileColumnsEnable.selectedProperty().bindBidirectional(viewModel.extraFileColumnsEnabledProperty());
-        autoResizeColumns.selectedProperty().bindBidirectional(viewModel.autoResizeColumnsProperty());
+        specialFieldsEnable
+                .selectedProperty()
+                .bindBidirectional(viewModel.specialFieldsEnabledProperty());
+        extraFileColumnsEnable
+                .selectedProperty()
+                .bindBidirectional(viewModel.extraFileColumnsEnabledProperty());
+        autoResizeColumns
+                .selectedProperty()
+                .bindBidirectional(viewModel.autoResizeColumnsProperty());
 
         namesNatbib.selectedProperty().bindBidirectional(viewModel.namesNatbibProperty());
         nameAsIs.selectedProperty().bindBidirectional(viewModel.nameAsIsProperty());
         nameFirstLast.selectedProperty().bindBidirectional(viewModel.nameFirstLastProperty());
         nameLastFirst.selectedProperty().bindBidirectional(viewModel.nameLastFirstProperty());
 
-        abbreviationDisabled.selectedProperty().bindBidirectional(viewModel.abbreviationDisabledProperty());
-        abbreviationDisabled.disableProperty().bind(namesNatbib.selectedProperty().or(nameAsIs.selectedProperty()));
-        abbreviationEnabled.selectedProperty().bindBidirectional(viewModel.abbreviationEnabledProperty());
-        abbreviationEnabled.disableProperty().bind(namesNatbib.selectedProperty().or(nameAsIs.selectedProperty()));
-        abbreviationLastNameOnly.selectedProperty().bindBidirectional(viewModel.abbreviationLastNameOnlyProperty());
-        abbreviationLastNameOnly.disableProperty().bind(namesNatbib.selectedProperty().or(nameAsIs.selectedProperty()));
+        abbreviationDisabled
+                .selectedProperty()
+                .bindBidirectional(viewModel.abbreviationDisabledProperty());
+        abbreviationDisabled
+                .disableProperty()
+                .bind(namesNatbib.selectedProperty().or(nameAsIs.selectedProperty()));
+        abbreviationEnabled
+                .selectedProperty()
+                .bindBidirectional(viewModel.abbreviationEnabledProperty());
+        abbreviationEnabled
+                .disableProperty()
+                .bind(namesNatbib.selectedProperty().or(nameAsIs.selectedProperty()));
+        abbreviationLastNameOnly
+                .selectedProperty()
+                .bindBidirectional(viewModel.abbreviationLastNameOnlyProperty());
+        abbreviationLastNameOnly
+                .disableProperty()
+                .bind(namesNatbib.selectedProperty().or(nameAsIs.selectedProperty()));
     }
 
     public void updateToCurrentColumnOrder() {
diff --git a/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java b/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java
index 1df137f28e48..517eedfa9017 100644
--- a/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java
@@ -1,6 +1,9 @@
 package org.jabref.gui.preferences.table;
 
-import java.util.EnumSet;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -30,33 +33,35 @@
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.StandardField;
 
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
+import java.util.EnumSet;
 
 public class TableTabViewModel implements PreferenceTabViewModel {
 
-    static StringConverter<MainTableColumnModel> columnNameStringConverter = new StringConverter<>() {
-        @Override
-        public String toString(MainTableColumnModel object) {
-            if (object != null) {
-                return object.getName();
-            } else {
-                return "";
-            }
-        }
-
-        @Override
-        public MainTableColumnModel fromString(String string) {
-            return MainTableColumnModel.parse(string);
-        }
-    };
-
-    private final ListProperty<MainTableColumnModel> columnsListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<SelectionModel<MainTableColumnModel>> selectedColumnModelProperty = new SimpleObjectProperty<>(new NoSelectionModel<>());
-    private final ListProperty<MainTableColumnModel> availableColumnsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<MainTableColumnModel> addColumnProperty = new SimpleObjectProperty<>();
+    static StringConverter<MainTableColumnModel> columnNameStringConverter =
+            new StringConverter<>() {
+                @Override
+                public String toString(MainTableColumnModel object) {
+                    if (object != null) {
+                        return object.getName();
+                    } else {
+                        return "";
+                    }
+                }
+
+                @Override
+                public MainTableColumnModel fromString(String string) {
+                    return MainTableColumnModel.parse(string);
+                }
+            };
+
+    private final ListProperty<MainTableColumnModel> columnsListProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<SelectionModel<MainTableColumnModel>> selectedColumnModelProperty =
+            new SimpleObjectProperty<>(new NoSelectionModel<>());
+    private final ListProperty<MainTableColumnModel> availableColumnsProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<MainTableColumnModel> addColumnProperty =
+            new SimpleObjectProperty<>();
     private final BooleanProperty specialFieldsEnabledProperty = new SimpleBooleanProperty();
     private final BooleanProperty extraFileColumnsEnabledProperty = new SimpleBooleanProperty();
     private final BooleanProperty autoResizeColumnsProperty = new SimpleBooleanProperty();
@@ -86,29 +91,34 @@ public TableTabViewModel(DialogService dialogService, GuiPreferences preferences
         this.nameDisplayPreferences = preferences.getNameDisplayPreferences();
         this.mainTablePreferences = preferences.getMainTablePreferences();
 
-        specialFieldsEnabledProperty.addListener((observable, oldValue, newValue) -> {
-            if (newValue) {
-                insertSpecialFieldColumns();
-            } else {
-                removeSpecialFieldColumns();
-            }
-        });
-
-        extraFileColumnsEnabledProperty.addListener((observable, oldValue, newValue) -> {
-            if (newValue) {
-                insertExtraFileColumns();
-            } else {
-                removeExtraFileColumns();
-            }
-        });
-
-        columnsNotEmptyValidator = new FunctionBasedValidator<>(
-                columnsListProperty,
-                list -> !list.isEmpty(),
-                ValidationMessage.error("%s > %s %n %n %s".formatted(
-                        Localization.lang("Entry table columns"),
-                        Localization.lang("Columns"),
-                        Localization.lang("List must not be empty."))));
+        specialFieldsEnabledProperty.addListener(
+                (observable, oldValue, newValue) -> {
+                    if (newValue) {
+                        insertSpecialFieldColumns();
+                    } else {
+                        removeSpecialFieldColumns();
+                    }
+                });
+
+        extraFileColumnsEnabledProperty.addListener(
+                (observable, oldValue, newValue) -> {
+                    if (newValue) {
+                        insertExtraFileColumns();
+                    } else {
+                        removeExtraFileColumns();
+                    }
+                });
+
+        columnsNotEmptyValidator =
+                new FunctionBasedValidator<>(
+                        columnsListProperty,
+                        list -> !list.isEmpty(),
+                        ValidationMessage.error(
+                                "%s > %s %n %n %s"
+                                        .formatted(
+                                                Localization.lang("Entry table columns"),
+                                                Localization.lang("Columns"),
+                                                Localization.lang("List must not be empty."))));
     }
 
     @Override
@@ -129,17 +139,22 @@ public void setValues() {
                 new MainTableColumnModel(MainTableColumnModel.Type.GROUPS),
                 new MainTableColumnModel(MainTableColumnModel.Type.GROUP_ICONS),
                 new MainTableColumnModel(MainTableColumnModel.Type.FILES),
-                new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, StandardField.TIMESTAMP.getName()),
-                new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, StandardField.OWNER.getName()),
-                new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, StandardField.GROUPS.getName()),
-                new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, InternalField.KEY_FIELD.getName()),
-                new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, InternalField.TYPE_HEADER.getName())
-        );
+                new MainTableColumnModel(
+                        MainTableColumnModel.Type.NORMALFIELD, StandardField.TIMESTAMP.getName()),
+                new MainTableColumnModel(
+                        MainTableColumnModel.Type.NORMALFIELD, StandardField.OWNER.getName()),
+                new MainTableColumnModel(
+                        MainTableColumnModel.Type.NORMALFIELD, StandardField.GROUPS.getName()),
+                new MainTableColumnModel(
+                        MainTableColumnModel.Type.NORMALFIELD, InternalField.KEY_FIELD.getName()),
+                new MainTableColumnModel(
+                        MainTableColumnModel.Type.NORMALFIELD,
+                        InternalField.TYPE_HEADER.getName()));
 
         EnumSet.allOf(StandardField.class).stream()
-               .map(Field::getName)
-               .map(name -> new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, name))
-               .forEach(item -> availableColumnsProperty.getValue().add(item));
+                .map(Field::getName)
+                .map(name -> new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, name))
+                .forEach(item -> availableColumnsProperty.getValue().add(item));
 
         if (specialFieldsEnabledProperty.getValue()) {
             insertSpecialFieldColumns();
@@ -172,26 +187,34 @@ public void fillColumnList() {
 
     private void insertSpecialFieldColumns() {
         EnumSet.allOf(SpecialField.class).stream()
-               .map(Field::getName)
-               .map(name -> new MainTableColumnModel(MainTableColumnModel.Type.SPECIALFIELD, name))
-               .forEach(item -> availableColumnsProperty.getValue().addFirst(item));
+                .map(Field::getName)
+                .map(name -> new MainTableColumnModel(MainTableColumnModel.Type.SPECIALFIELD, name))
+                .forEach(item -> availableColumnsProperty.getValue().addFirst(item));
     }
 
     private void removeSpecialFieldColumns() {
-        columnsListProperty.getValue().removeIf(column -> column.getType() == MainTableColumnModel.Type.SPECIALFIELD);
-        availableColumnsProperty.getValue().removeIf(column -> column.getType() == MainTableColumnModel.Type.SPECIALFIELD);
+        columnsListProperty
+                .getValue()
+                .removeIf(column -> column.getType() == MainTableColumnModel.Type.SPECIALFIELD);
+        availableColumnsProperty
+                .getValue()
+                .removeIf(column -> column.getType() == MainTableColumnModel.Type.SPECIALFIELD);
     }
 
     private void insertExtraFileColumns() {
         preferences.getExternalApplicationsPreferences().getExternalFileTypes().stream()
-                   .map(ExternalFileType::getName)
-                   .map(name -> new MainTableColumnModel(MainTableColumnModel.Type.EXTRAFILE, name))
-                   .forEach(item -> availableColumnsProperty.getValue().add(item));
+                .map(ExternalFileType::getName)
+                .map(name -> new MainTableColumnModel(MainTableColumnModel.Type.EXTRAFILE, name))
+                .forEach(item -> availableColumnsProperty.getValue().add(item));
     }
 
     private void removeExtraFileColumns() {
-        columnsListProperty.getValue().removeIf(column -> column.getType() == MainTableColumnModel.Type.EXTRAFILE);
-        availableColumnsProperty.getValue().removeIf(column -> column.getType() == MainTableColumnModel.Type.EXTRAFILE);
+        columnsListProperty
+                .getValue()
+                .removeIf(column -> column.getType() == MainTableColumnModel.Type.EXTRAFILE);
+        availableColumnsProperty
+                .getValue()
+                .removeIf(column -> column.getType() == MainTableColumnModel.Type.EXTRAFILE);
     }
 
     public void insertColumnInList() {
@@ -199,7 +222,10 @@ public void insertColumnInList() {
             return;
         }
 
-        if (columnsListProperty.getValue().stream().filter(item -> item.equals(addColumnProperty.getValue())).findAny().isEmpty()) {
+        if (columnsListProperty.getValue().stream()
+                .filter(item -> item.equals(addColumnProperty.getValue()))
+                .findAny()
+                .isEmpty()) {
             columnsListProperty.add(addColumnProperty.getValue());
             addColumnProperty.setValue(null);
         }
@@ -210,7 +236,8 @@ public void removeColumn(MainTableColumnModel column) {
     }
 
     public void moveColumnUp() {
-        MainTableColumnModel selectedColumn = selectedColumnModelProperty.getValue().getSelectedItem();
+        MainTableColumnModel selectedColumn =
+                selectedColumnModelProperty.getValue().getSelectedItem();
         int row = columnsListProperty.getValue().indexOf(selectedColumn);
         if ((selectedColumn == null) || (row < 1)) {
             return;
@@ -222,7 +249,8 @@ public void moveColumnUp() {
     }
 
     public void moveColumnDown() {
-        MainTableColumnModel selectedColumn = selectedColumnModelProperty.getValue().getSelectedItem();
+        MainTableColumnModel selectedColumn =
+                selectedColumnModelProperty.getValue().getSelectedItem();
         int row = columnsListProperty.getValue().indexOf(selectedColumn);
         if ((selectedColumn == null) || (row > (columnsListProperty.getValue().size() - 2))) {
             return;
@@ -268,8 +296,10 @@ ValidationStatus columnsListValidationStatus() {
     public boolean validateSettings() {
         ValidationStatus validationStatus = columnsListValidationStatus();
         if (!validationStatus.isValid()) {
-            validationStatus.getHighestMessage().ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage()));
+            validationStatus
+                    .getHighestMessage()
+                    .ifPresent(
+                            message -> dialogService.showErrorDialogAndWait(message.getMessage()));
             return false;
         }
         return true;
diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
index b15196a59e3e..9befcc483e87 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.preferences.websearch;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.beans.InvalidationListener;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -20,10 +23,8 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.preferences.FetcherApiKey;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-
-public class WebSearchTab extends AbstractPreferenceTabView<WebSearchTabViewModel> implements PreferencesTab {
+public class WebSearchTab extends AbstractPreferenceTabView<WebSearchTabViewModel>
+        implements PreferencesTab {
 
     @FXML private CheckBox enableWebSearch;
     @FXML private CheckBox generateNewKeyOnImport;
@@ -44,15 +45,17 @@ public class WebSearchTab extends AbstractPreferenceTabView<WebSearchTabViewMode
     @FXML private Button testCustomApiKey;
 
     @FXML private CheckBox persistApiKeys;
-    @FXML private SplitPane persistentTooltipWrapper; // The disabled persistApiKeys control does not show tooltips
+
+    @FXML
+    private SplitPane
+            persistentTooltipWrapper; // The disabled persistApiKeys control does not show tooltips
+
     @FXML private TableView<StudyCatalogItem> catalogTable;
     @FXML private TableColumn<StudyCatalogItem, Boolean> catalogEnabledColumn;
     @FXML private TableColumn<StudyCatalogItem, String> catalogColumn;
 
     public WebSearchTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -64,9 +67,15 @@ public void initialize() {
         this.viewModel = new WebSearchTabViewModel(preferences, dialogService);
 
         enableWebSearch.selectedProperty().bindBidirectional(viewModel.enableWebSearchProperty());
-        generateNewKeyOnImport.selectedProperty().bindBidirectional(viewModel.generateKeyOnImportProperty());
-        warnAboutDuplicatesOnImport.selectedProperty().bindBidirectional(viewModel.warnAboutDuplicatesOnImportProperty());
-        downloadLinkedOnlineFiles.selectedProperty().bindBidirectional(viewModel.shouldDownloadLinkedOnlineFiles());
+        generateNewKeyOnImport
+                .selectedProperty()
+                .bindBidirectional(viewModel.generateKeyOnImportProperty());
+        warnAboutDuplicatesOnImport
+                .selectedProperty()
+                .bindBidirectional(viewModel.warnAboutDuplicatesOnImportProperty());
+        downloadLinkedOnlineFiles
+                .selectedProperty()
+                .bindBidirectional(viewModel.shouldDownloadLinkedOnlineFiles());
         keepDownloadUrl.selectedProperty().bindBidirectional(viewModel.shouldKeepDownloadUrl());
 
         grobidEnabled.selectedProperty().bindBidirectional(viewModel.grobidEnabledProperty());
@@ -78,11 +87,12 @@ public void initialize() {
         useCustomDOIName.disableProperty().bind(useCustomDOI.selectedProperty().not());
 
         new ViewModelTableRowFactory<StudyCatalogItem>()
-                .withOnMouseClickedEvent((entry, event) -> {
-                    if (event.getButton() == MouseButton.PRIMARY) {
-                        entry.setEnabled(!entry.isEnabled());
-                    }
-                })
+                .withOnMouseClickedEvent(
+                        (entry, event) -> {
+                            if (event.getButton() == MouseButton.PRIMARY) {
+                                entry.setEnabled(!entry.isEnabled());
+                            }
+                        })
                 .install(catalogTable);
 
         catalogColumn.setReorderable(false);
@@ -99,18 +109,23 @@ public void initialize() {
 
         testCustomApiKey.setDisable(true);
 
-        new ViewModelTableRowFactory<FetcherApiKey>()
-                .install(apiKeySelectorTable);
-
-        apiKeySelectorTable.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-            if (oldValue != null) {
-                updateFetcherApiKey(oldValue);
-            }
-            if (newValue != null) {
-                viewModel.selectedApiKeyProperty().setValue(newValue);
-                testCustomApiKey.disableProperty().bind(newValue.useProperty().not());
-            }
-        });
+        new ViewModelTableRowFactory<FetcherApiKey>().install(apiKeySelectorTable);
+
+        apiKeySelectorTable
+                .getSelectionModel()
+                .selectedItemProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            if (oldValue != null) {
+                                updateFetcherApiKey(oldValue);
+                            }
+                            if (newValue != null) {
+                                viewModel.selectedApiKeyProperty().setValue(newValue);
+                                testCustomApiKey
+                                        .disableProperty()
+                                        .bind(newValue.useProperty().not());
+                            }
+                        });
 
         apiKeyName.setCellValueFactory(param -> param.getValue().nameProperty());
         apiKeyName.setCellFactory(TextFieldTableCell.forTableColumn());
@@ -131,22 +146,29 @@ public void initialize() {
 
         persistApiKeys.selectedProperty().bindBidirectional(viewModel.getApikeyPersistProperty());
         persistApiKeys.disableProperty().bind(viewModel.apiKeyPersistAvailable().not());
-        EasyBind.subscribe(viewModel.apiKeyPersistAvailable(), available -> {
-            if (!available) {
-                persistentTooltipWrapper.setTooltip(new Tooltip(Localization.lang("Credential store not available.")));
-            } else {
-                persistentTooltipWrapper.setTooltip(null);
-            }
-        });
+        EasyBind.subscribe(
+                viewModel.apiKeyPersistAvailable(),
+                available -> {
+                    if (!available) {
+                        persistentTooltipWrapper.setTooltip(
+                                new Tooltip(Localization.lang("Credential store not available.")));
+                    } else {
+                        persistentTooltipWrapper.setTooltip(null);
+                    }
+                });
 
         apiKeySelectorTable.setItems(viewModel.fetcherApiKeys());
 
         // Content is set later
-        viewModel.fetcherApiKeys().addListener((InvalidationListener) change -> {
-            if (!apiKeySelectorTable.getItems().isEmpty()) {
-                apiKeySelectorTable.getSelectionModel().selectFirst();
-            }
-        });
+        viewModel
+                .fetcherApiKeys()
+                .addListener(
+                        (InvalidationListener)
+                                change -> {
+                                    if (!apiKeySelectorTable.getItems().isEmpty()) {
+                                        apiKeySelectorTable.getSelectionModel().selectFirst();
+                                    }
+                                });
     }
 
     private void updateFetcherApiKey(FetcherApiKey apiKey) {
diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
index 81cc3a2a11ac..4d0be90ddd62 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.preferences.websearch;
 
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -17,6 +12,8 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
+import kong.unirest.core.UnirestException;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.slr.StudyCatalogItem;
@@ -35,7 +32,10 @@
 import org.jabref.logic.preferences.DOIPreferences;
 import org.jabref.logic.preferences.FetcherApiKey;
 
-import kong.unirest.core.UnirestException;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 public class WebSearchTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty enableWebSearchProperty = new SimpleBooleanProperty();
@@ -52,7 +52,8 @@ public class WebSearchTabViewModel implements PreferenceTabViewModel {
     private final StringProperty grobidURLProperty = new SimpleStringProperty("");
 
     private final ListProperty<FetcherApiKey> apiKeys = new SimpleListProperty<>();
-    private final ObjectProperty<FetcherApiKey> selectedApiKeyProperty = new SimpleObjectProperty<>();
+    private final ObjectProperty<FetcherApiKey> selectedApiKeyProperty =
+            new SimpleObjectProperty<>();
     private final BooleanProperty apikeyPersistProperty = new SimpleBooleanProperty();
     private final BooleanProperty apikeyPersistAvailableProperty = new SimpleBooleanProperty();
 
@@ -78,7 +79,8 @@ public WebSearchTabViewModel(CliPreferences preferences, DialogService dialogSer
     public void setValues() {
         enableWebSearchProperty.setValue(importerPreferences.areImporterEnabled());
         generateKeyOnImportProperty.setValue(importerPreferences.isGenerateNewKeyOnImport());
-        warnAboutDuplicatesOnImportProperty.setValue(importerPreferences.shouldWarnAboutDuplicatesOnImport());
+        warnAboutDuplicatesOnImportProperty.setValue(
+                importerPreferences.shouldWarnAboutDuplicatesOnImport());
         shouldDownloadLinkedOnlineFiles.setValue(filePreferences.shouldDownloadLinkedFiles());
         shouldkeepDownloadUrl.setValue(filePreferences.shouldKeepDownloadUrl());
         useCustomDOIProperty.setValue(doiPreferences.isUseCustom());
@@ -87,25 +89,32 @@ public void setValues() {
         grobidEnabledProperty.setValue(grobidPreferences.isGrobidEnabled());
         grobidURLProperty.setValue(grobidPreferences.getGrobidURL());
 
-        apiKeys.setValue(FXCollections.observableArrayList(preferences.getImporterPreferences().getApiKeys()));
+        apiKeys.setValue(
+                FXCollections.observableArrayList(
+                        preferences.getImporterPreferences().getApiKeys()));
         apikeyPersistAvailableProperty.setValue(OS.isKeyringAvailable());
-        apikeyPersistProperty.setValue(preferences.getImporterPreferences().shouldPersistCustomKeys());
-        catalogs.addAll(WebFetchers.getSearchBasedFetchers(importFormatPreferences, importerPreferences)
-                                   .stream()
-                                   .map(SearchBasedFetcher::getName)
-                                   .filter(name -> !name.equals(CompositeSearchBasedFetcher.FETCHER_NAME))
-                                   .map(name -> {
-                                       boolean enabled = importerPreferences.getCatalogs().contains(name);
-                                       return new StudyCatalogItem(name, enabled);
-                                   })
-                                   .toList());
+        apikeyPersistProperty.setValue(
+                preferences.getImporterPreferences().shouldPersistCustomKeys());
+        catalogs.addAll(
+                WebFetchers.getSearchBasedFetchers(importFormatPreferences, importerPreferences)
+                        .stream()
+                        .map(SearchBasedFetcher::getName)
+                        .filter(name -> !name.equals(CompositeSearchBasedFetcher.FETCHER_NAME))
+                        .map(
+                                name -> {
+                                    boolean enabled =
+                                            importerPreferences.getCatalogs().contains(name);
+                                    return new StudyCatalogItem(name, enabled);
+                                })
+                        .toList());
     }
 
     @Override
     public void storeSettings() {
         importerPreferences.setImporterEnabled(enableWebSearchProperty.getValue());
         importerPreferences.setGenerateNewKeyOnImport(generateKeyOnImportProperty.getValue());
-        importerPreferences.setWarnAboutDuplicatesOnImport(warnAboutDuplicatesOnImportProperty.getValue());
+        importerPreferences.setWarnAboutDuplicatesOnImport(
+                warnAboutDuplicatesOnImportProperty.getValue());
         filePreferences.setDownloadLinkedFiles(shouldDownloadLinkedOnlineFiles.getValue());
         filePreferences.setKeepDownloadUrl(shouldkeepDownloadUrl.getValue());
         grobidPreferences.setGrobidEnabled(grobidEnabledProperty.getValue());
@@ -114,10 +123,11 @@ public void storeSettings() {
         doiPreferences.setUseCustom(useCustomDOIProperty.get());
         doiPreferences.setDefaultBaseURI(useCustomDOINameProperty.getValue().trim());
         importerPreferences.setCatalogs(
-                FXCollections.observableList(catalogs.stream()
-                                                     .filter(StudyCatalogItem::isEnabled)
-                                                     .map(StudyCatalogItem::getName)
-                                                     .collect(Collectors.toList())));
+                FXCollections.observableList(
+                        catalogs.stream()
+                                .filter(StudyCatalogItem::isEnabled)
+                                .map(StudyCatalogItem::getName)
+                                .collect(Collectors.toList())));
         importerPreferences.setPersistCustomKeys(apikeyPersistProperty.get());
         preferences.getImporterPreferences().getApiKeys().clear();
         if (apikeyPersistAvailableProperty.get()) {
@@ -186,11 +196,11 @@ public void checkCustomApiKey() {
 
         final Optional<CustomizableKeyFetcher> fetcherOpt =
                 WebFetchers.getCustomizableKeyFetchers(
-                                   preferences.getImportFormatPreferences(),
-                                   preferences.getImporterPreferences())
-                           .stream()
-                           .filter(fetcher -> fetcher.getName().equals(apiKeyName))
-                           .findFirst();
+                                preferences.getImportFormatPreferences(),
+                                preferences.getImporterPreferences())
+                        .stream()
+                        .filter(fetcher -> fetcher.getName().equals(apiKeyName))
+                        .findFirst();
 
         if (fetcherOpt.isEmpty()) {
             dialogService.showErrorDialogAndWait(
@@ -214,8 +224,11 @@ public void checkCustomApiKey() {
             URLDownload urlDownload;
             try {
                 urlDownload = new URLDownload(testUrlWithoutApiKey + apiKey);
-                // The HEAD request cannot be used because its response is not 200 (maybe 404 or 596...).
-                int statusCode = ((HttpURLConnection) urlDownload.getSource().openConnection()).getResponseCode();
+                // The HEAD request cannot be used because its response is not 200 (maybe 404 or
+                // 596...).
+                int statusCode =
+                        ((HttpURLConnection) urlDownload.getSource().openConnection())
+                                .getResponseCode();
                 keyValid = (statusCode >= 200) && (statusCode < 300);
             } catch (IOException | UnirestException e) {
                 keyValid = false;
@@ -225,9 +238,13 @@ public void checkCustomApiKey() {
         }
 
         if (keyValid) {
-            dialogService.showInformationDialogAndWait(Localization.lang("Check %0 API Key Setting", apiKeyName), Localization.lang("Connection successful!"));
+            dialogService.showInformationDialogAndWait(
+                    Localization.lang("Check %0 API Key Setting", apiKeyName),
+                    Localization.lang("Connection successful!"));
         } else {
-            dialogService.showErrorDialogAndWait(Localization.lang("Check %0 API Key Setting", apiKeyName), Localization.lang("Connection failed!"));
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Check %0 API Key Setting", apiKeyName),
+                    Localization.lang("Connection failed!"));
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTab.java b/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTab.java
index ec486b606fba..2557736002bc 100644
--- a/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTab.java
+++ b/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTab.java
@@ -1,6 +1,10 @@
 package org.jabref.gui.preferences.xmp;
 
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.views.ViewLoader;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+import jakarta.inject.Inject;
 
 import javafx.application.Platform;
 import javafx.fxml.FXML;
@@ -24,11 +28,10 @@
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import jakarta.inject.Inject;
+import javax.swing.undo.UndoManager;
 
-public class XmpPrivacyTab extends AbstractPreferenceTabView<XmpPrivacyTabViewModel> implements PreferencesTab {
+public class XmpPrivacyTab extends AbstractPreferenceTabView<XmpPrivacyTabViewModel>
+        implements PreferencesTab {
 
     @FXML private CheckBox enableXmpFilter;
     @FXML private TableView<Field> filterList;
@@ -43,9 +46,7 @@ public class XmpPrivacyTab extends AbstractPreferenceTabView<XmpPrivacyTabViewMo
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     public XmpPrivacyTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -70,20 +71,26 @@ public void initialize() {
 
         actionsColumn.setSortable(false);
         actionsColumn.setReorderable(false);
-        actionsColumn.setCellValueFactory(cellData -> BindingsHelper.constantOf(cellData.getValue()));
+        actionsColumn.setCellValueFactory(
+                cellData -> BindingsHelper.constantOf(cellData.getValue()));
         new ValueTableCellFactory<Field, Field>()
                 .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
                 .withTooltip(item -> Localization.lang("Remove") + " " + item.getName())
                 .withOnMouseClickedEvent(
-                        item -> evt -> viewModel.removeFilter(filterList.getFocusModel().getFocusedItem()))
+                        item ->
+                                evt ->
+                                        viewModel.removeFilter(
+                                                filterList.getFocusModel().getFocusedItem()))
                 .install(actionsColumn);
 
-        filterList.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            if (event.getCode() == KeyCode.DELETE) {
-                viewModel.removeFilter(filterList.getSelectionModel().getSelectedItem());
-                event.consume();
-            }
-        });
+        filterList.addEventFilter(
+                KeyEvent.KEY_PRESSED,
+                event -> {
+                    if (event.getCode() == KeyCode.DELETE) {
+                        viewModel.removeFilter(filterList.getSelectionModel().getSelectedItem());
+                        event.consume();
+                    }
+                });
 
         filterList.itemsProperty().bind(viewModel.filterListProperty());
 
@@ -94,15 +101,20 @@ public void initialize() {
         addFieldName.itemsProperty().bind(viewModel.availableFieldsProperty());
         addFieldName.valueProperty().bindBidirectional(viewModel.addFieldNameProperty());
         addFieldName.setConverter(FieldsUtil.FIELD_STRING_CONVERTER);
-        addFieldName.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            if (event.getCode() == KeyCode.ENTER) {
-                viewModel.addField();
-                event.consume();
-            }
-        });
+        addFieldName.addEventFilter(
+                KeyEvent.KEY_PRESSED,
+                event -> {
+                    if (event.getCode() == KeyCode.ENTER) {
+                        viewModel.addField();
+                        event.consume();
+                    }
+                });
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.xmpFilterListValidationStatus(), filterList));
+        Platform.runLater(
+                () ->
+                        validationVisualizer.initVisualization(
+                                viewModel.xmpFilterListValidationStatus(), filterList));
     }
 
     public void addField() {
diff --git a/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTabViewModel.java b/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTabViewModel.java
index d724eb96234b..fdce1b48e204 100644
--- a/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTabViewModel.java
@@ -1,6 +1,9 @@
 package org.jabref.gui.preferences.xmp;
 
-import java.util.Comparator;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -17,16 +20,15 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
+import java.util.Comparator;
 
 public class XmpPrivacyTabViewModel implements PreferenceTabViewModel {
 
     private final BooleanProperty xmpFilterEnabledProperty = new SimpleBooleanProperty();
-    private final ListProperty<Field> xmpFilterListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ListProperty<Field> availableFieldsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<Field> xmpFilterListProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<Field> availableFieldsProperty =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
     private final ObjectProperty<Field> addFieldProperty = new SimpleObjectProperty<>();
 
     private final DialogService dialogService;
@@ -38,13 +40,16 @@ public class XmpPrivacyTabViewModel implements PreferenceTabViewModel {
         this.dialogService = dialogService;
         this.xmpPreferences = xmpPreferences;
 
-        xmpFilterListValidator = new FunctionBasedValidator<>(
-                xmpFilterListProperty,
-                input -> !input.isEmpty(),
-                ValidationMessage.error("%s > %s %n %n %s".formatted(
-                        Localization.lang("XMP metadata"),
-                        Localization.lang("Filter List"),
-                        Localization.lang("List must not be empty."))));
+        xmpFilterListValidator =
+                new FunctionBasedValidator<>(
+                        xmpFilterListProperty,
+                        input -> !input.isEmpty(),
+                        ValidationMessage.error(
+                                "%s > %s %n %n %s"
+                                        .formatted(
+                                                Localization.lang("XMP metadata"),
+                                                Localization.lang("Filter List"),
+                                                Localization.lang("List must not be empty."))));
     }
 
     @Override
@@ -71,7 +76,10 @@ public void addField() {
             return;
         }
 
-        if (xmpFilterListProperty.getValue().stream().filter(item -> item.equals(addFieldProperty.getValue())).findAny().isEmpty()) {
+        if (xmpFilterListProperty.getValue().stream()
+                .filter(item -> item.equals(addFieldProperty.getValue()))
+                .findAny()
+                .isEmpty()) {
             xmpFilterListProperty.add(addFieldProperty.getValue());
             addFieldProperty.setValue(null);
         }
@@ -89,8 +97,10 @@ public ValidationStatus xmpFilterListValidationStatus() {
     public boolean validateSettings() {
         ValidationStatus validationStatus = xmpFilterListValidationStatus();
         if (xmpFilterEnabledProperty.getValue() && !validationStatus.isValid()) {
-            validationStatus.getHighestMessage().ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage()));
+            validationStatus
+                    .getHighestMessage()
+                    .ifPresent(
+                            message -> dialogService.showErrorDialogAndWait(message.getMessage()));
             return false;
         }
         return true;
diff --git a/src/main/java/org/jabref/gui/preview/ClipboardContentGenerator.java b/src/main/java/org/jabref/gui/preview/ClipboardContentGenerator.java
index a47915c206cf..21a7742539ee 100644
--- a/src/main/java/org/jabref/gui/preview/ClipboardContentGenerator.java
+++ b/src/main/java/org/jabref/gui/preview/ClipboardContentGenerator.java
@@ -1,9 +1,7 @@
 package org.jabref.gui.preview;
 
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
+import com.airhacks.afterburner.injection.Injector;
+import com.google.common.annotations.VisibleForTesting;
 
 import javafx.scene.input.ClipboardContent;
 
@@ -21,8 +19,10 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 
-import com.airhacks.afterburner.injection.Injector;
-import com.google.common.annotations.VisibleForTesting;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
 
 public class ClipboardContentGenerator {
 
@@ -30,16 +30,22 @@ public class ClipboardContentGenerator {
     private final LayoutFormatterPreferences layoutFormatterPreferences;
     private final JournalAbbreviationRepository abbreviationRepository;
 
-    public ClipboardContentGenerator(PreviewPreferences previewPreferences,
-                                     LayoutFormatterPreferences layoutFormatterPreferences,
-                                     JournalAbbreviationRepository abbreviationRepository) {
+    public ClipboardContentGenerator(
+            PreviewPreferences previewPreferences,
+            LayoutFormatterPreferences layoutFormatterPreferences,
+            JournalAbbreviationRepository abbreviationRepository) {
         this.previewPreferences = previewPreferences;
         this.layoutFormatterPreferences = layoutFormatterPreferences;
         this.abbreviationRepository = abbreviationRepository;
     }
 
-    public ClipboardContent generate(List<BibEntry> selectedEntries, CitationStyleOutputFormat outputFormat, BibDatabaseContext bibDatabaseContext) throws IOException {
-        List<String> citations = generateCitations(selectedEntries, outputFormat, bibDatabaseContext);
+    public ClipboardContent generate(
+            List<BibEntry> selectedEntries,
+            CitationStyleOutputFormat outputFormat,
+            BibDatabaseContext bibDatabaseContext)
+            throws IOException {
+        List<String> citations =
+                generateCitations(selectedEntries, outputFormat, bibDatabaseContext);
         PreviewLayout previewLayout = previewPreferences.getSelectedPreviewLayout();
 
         // if it is not a citation style take care of the preview
@@ -55,8 +61,13 @@ public ClipboardContent generate(List<BibEntry> selectedEntries, CitationStyleOu
         }
     }
 
-    private List<String> generateCitations(List<BibEntry> selectedEntries, CitationStyleOutputFormat outputFormat, BibDatabaseContext bibDatabaseContext) throws IOException {
-        // This worker stored the style as filename. The CSLAdapter and the CitationStyleCache store the source of the
+    private List<String> generateCitations(
+            List<BibEntry> selectedEntries,
+            CitationStyleOutputFormat outputFormat,
+            BibDatabaseContext bibDatabaseContext)
+            throws IOException {
+        // This worker stored the style as filename. The CSLAdapter and the CitationStyleCache store
+        // the source of the
         // style. Therefore, we extract the style source from the file.
         String styleSource = null;
         PreviewLayout previewLayout = previewPreferences.getSelectedPreviewLayout();
@@ -85,7 +96,8 @@ private List<String> generateCitations(List<BibEntry> selectedEntries, CitationS
     static ClipboardContent processPreview(List<String> citations) {
         ClipboardContent content = new ClipboardContent();
         content.putHtml(String.join(CitationStyleOutputFormat.HTML.getLineSeparator(), citations));
-        content.putString(String.join(CitationStyleOutputFormat.HTML.getLineSeparator(), citations));
+        content.putString(
+                String.join(CitationStyleOutputFormat.HTML.getLineSeparator(), citations));
         return content;
     }
 
@@ -95,7 +107,8 @@ static ClipboardContent processPreview(List<String> citations) {
     @VisibleForTesting
     static ClipboardContent processText(List<String> citations) {
         ClipboardContent content = new ClipboardContent();
-        content.putString(String.join(CitationStyleOutputFormat.TEXT.getLineSeparator(), citations));
+        content.putString(
+                String.join(CitationStyleOutputFormat.TEXT.getLineSeparator(), citations));
         return content;
     }
 
@@ -105,17 +118,23 @@ static ClipboardContent processText(List<String> citations) {
      */
     @VisibleForTesting
     static ClipboardContent processHtml(List<String> citations) {
-        String result = "<!DOCTYPE html>" + OS.NEWLINE +
-                "<html>" + OS.NEWLINE +
-                "   <head>" + OS.NEWLINE +
-                "      <meta charset=\"utf-8\">" + OS.NEWLINE +
-                "   </head>" + OS.NEWLINE +
-                "   <body>" + OS.NEWLINE + OS.NEWLINE;
+        String result =
+                "<!DOCTYPE html>"
+                        + OS.NEWLINE
+                        + "<html>"
+                        + OS.NEWLINE
+                        + "   <head>"
+                        + OS.NEWLINE
+                        + "      <meta charset=\"utf-8\">"
+                        + OS.NEWLINE
+                        + "   </head>"
+                        + OS.NEWLINE
+                        + "   <body>"
+                        + OS.NEWLINE
+                        + OS.NEWLINE;
 
         result += String.join(CitationStyleOutputFormat.HTML.getLineSeparator(), citations);
-        result += OS.NEWLINE +
-                "   </body>" + OS.NEWLINE +
-                "</html>" + OS.NEWLINE;
+        result += OS.NEWLINE + "   </body>" + OS.NEWLINE + "</html>" + OS.NEWLINE;
 
         ClipboardContent content = new ClipboardContent();
         content.putString(result);
@@ -123,10 +142,18 @@ static ClipboardContent processHtml(List<String> citations) {
         return content;
     }
 
-    private List<String> generateTextBasedPreviewLayoutCitations(List<BibEntry> selectedEntries, BibDatabaseContext bibDatabaseContext) throws IOException {
+    private List<String> generateTextBasedPreviewLayoutCitations(
+            List<BibEntry> selectedEntries, BibDatabaseContext bibDatabaseContext)
+            throws IOException {
         TextBasedPreviewLayout customPreviewLayout = previewPreferences.getCustomPreviewLayout();
-        StringReader customLayoutReader = new StringReader(customPreviewLayout.getText().replace("__NEWLINE__", "\n"));
-        Layout layout = new LayoutHelper(customLayoutReader, layoutFormatterPreferences, abbreviationRepository).getLayoutFromText();
+        StringReader customLayoutReader =
+                new StringReader(customPreviewLayout.getText().replace("__NEWLINE__", "\n"));
+        Layout layout =
+                new LayoutHelper(
+                                customLayoutReader,
+                                layoutFormatterPreferences,
+                                abbreviationRepository)
+                        .getLayoutFromText();
         List<String> citations = new ArrayList<>(selectedEntries.size());
         for (BibEntry entry : selectedEntries) {
             citations.add(layout.doLayout(entry, bibDatabaseContext.getDatabase()));
diff --git a/src/main/java/org/jabref/gui/preview/CopyCitationAction.java b/src/main/java/org/jabref/gui/preview/CopyCitationAction.java
index e8364ca1a3f7..4ec5427a144f 100644
--- a/src/main/java/org/jabref/gui/preview/CopyCitationAction.java
+++ b/src/main/java/org/jabref/gui/preview/CopyCitationAction.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.preview;
 
-import java.io.IOException;
-import java.util.List;
-
 import javafx.scene.input.ClipboardContent;
 
 import org.jabref.gui.ClipBoardManager;
@@ -17,10 +14,12 @@
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntry;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.List;
+
 /**
  * Copies the selected entries and formats them with the selected citation style (or preview), then it is copied to the clipboard. This worker cannot be reused.
  */
@@ -37,20 +36,25 @@ public class CopyCitationAction extends SimpleCommand {
     private final TaskExecutor taskExecutor;
     private final ClipboardContentGenerator clipboardContentGenerator;
 
-    public CopyCitationAction(CitationStyleOutputFormat outputFormat,
-                              DialogService dialogService,
-                              StateManager stateManager,
-                              ClipBoardManager clipBoardManager,
-                              TaskExecutor taskExecutor,
-                              GuiPreferences preferences,
-                              JournalAbbreviationRepository abbreviationRepository) {
+    public CopyCitationAction(
+            CitationStyleOutputFormat outputFormat,
+            DialogService dialogService,
+            StateManager stateManager,
+            ClipBoardManager clipBoardManager,
+            TaskExecutor taskExecutor,
+            GuiPreferences preferences,
+            JournalAbbreviationRepository abbreviationRepository) {
         this.outputFormat = outputFormat;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.selectedEntries = stateManager.getSelectedEntries();
         this.clipBoardManager = clipBoardManager;
         this.taskExecutor = taskExecutor;
-        this.clipboardContentGenerator = new ClipboardContentGenerator(preferences.getPreviewPreferences(), preferences.getLayoutFormatterPreferences(), abbreviationRepository);
+        this.clipboardContentGenerator =
+                new ClipboardContentGenerator(
+                        preferences.getPreviewPreferences(),
+                        preferences.getLayoutFormatterPreferences(),
+                        abbreviationRepository);
 
         this.executable.bind(ActionHelper.needsEntriesSelected(stateManager));
     }
@@ -58,17 +62,19 @@ public CopyCitationAction(CitationStyleOutputFormat outputFormat,
     @Override
     public void execute() {
         BackgroundTask.wrap(this::generateCitations)
-                      .onFailure(ex -> LOGGER.error("Error while copying citations to the clipboard", ex))
-                      .onSuccess(this::setClipBoardContent)
-                      .executeWith(taskExecutor);
+                .onFailure(ex -> LOGGER.error("Error while copying citations to the clipboard", ex))
+                .onSuccess(this::setClipBoardContent)
+                .executeWith(taskExecutor);
     }
 
     private ClipboardContent generateCitations() throws IOException {
-        return clipboardContentGenerator.generate(selectedEntries, outputFormat, stateManager.getActiveDatabase().get());
+        return clipboardContentGenerator.generate(
+                selectedEntries, outputFormat, stateManager.getActiveDatabase().get());
     }
 
     private void setClipBoardContent(ClipboardContent clipBoardContent) {
         clipBoardManager.setContent(clipBoardContent);
-        dialogService.notify(Localization.lang("Copied %0 citations.", String.valueOf(selectedEntries.size())));
+        dialogService.notify(
+                Localization.lang("Copied %0 citations.", String.valueOf(selectedEntries.size())));
     }
 }
diff --git a/src/main/java/org/jabref/gui/preview/PreviewPanel.java b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
index 1120ad4fc612..ab42e99ed005 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
@@ -1,11 +1,5 @@
 package org.jabref.gui.preview;
 
-import java.io.File;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
@@ -31,10 +25,15 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.SearchQuery;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class PreviewPanel extends VBox {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PreviewPanel.class);
@@ -46,64 +45,85 @@ public class PreviewPanel extends VBox {
     private final DialogService dialogService;
     private BibEntry entry;
 
-    public PreviewPanel(BibDatabaseContext database,
-                        DialogService dialogService,
-                        KeyBindingRepository keyBindingRepository,
-                        GuiPreferences preferences,
-                        ThemeManager themeManager,
-                        TaskExecutor taskExecutor,
-                        LuceneManager luceneManager,
-                        OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+    public PreviewPanel(
+            BibDatabaseContext database,
+            DialogService dialogService,
+            KeyBindingRepository keyBindingRepository,
+            GuiPreferences preferences,
+            ThemeManager themeManager,
+            TaskExecutor taskExecutor,
+            LuceneManager luceneManager,
+            OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         this.keyBindingRepository = keyBindingRepository;
         this.dialogService = dialogService;
         this.previewPreferences = preferences.getPreviewPreferences();
-        this.fileLinker = new ExternalFilesEntryLinker(preferences.getExternalApplicationsPreferences(), preferences.getFilePreferences(), database, dialogService);
+        this.fileLinker =
+                new ExternalFilesEntryLinker(
+                        preferences.getExternalApplicationsPreferences(),
+                        preferences.getFilePreferences(),
+                        database,
+                        dialogService);
 
         PreviewPreferences previewPreferences = preferences.getPreviewPreferences();
-        previewView = new PreviewViewer(database, dialogService, preferences, themeManager, taskExecutor, searchQueryProperty);
+        previewView =
+                new PreviewViewer(
+                        database,
+                        dialogService,
+                        preferences,
+                        themeManager,
+                        taskExecutor,
+                        searchQueryProperty);
         previewView.setLayout(previewPreferences.getSelectedPreviewLayout());
         previewView.setContextMenu(createPopupMenu());
-        previewView.setOnDragDetected(event -> {
-            previewView.startFullDrag();
-
-            Dragboard dragboard = previewView.startDragAndDrop(TransferMode.COPY);
-            ClipboardContent content = new ClipboardContent();
-            content.putHtml(previewView.getSelectionHtmlContent());
-            dragboard.setContent(content);
-
-            event.consume();
-        });
-
-        previewView.setOnDragOver(event -> {
-            if (event.getDragboard().hasFiles()) {
-                event.acceptTransferModes(TransferMode.COPY, TransferMode.MOVE, TransferMode.LINK);
-            }
-            event.consume();
-        });
-
-        previewView.setOnDragDropped(event -> {
-            boolean success = false;
-            if (event.getDragboard().hasContent(DataFormat.FILES)) {
-                List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).collect(Collectors.toList());
-
-                if (event.getTransferMode() == TransferMode.MOVE) {
-                    LOGGER.debug("Mode MOVE"); // shift on win or no modifier
-                    fileLinker.moveFilesToFileDirRenameAndAddToEntry(entry, files, luceneManager);
-                }
-                if (event.getTransferMode() == TransferMode.LINK) {
-                    LOGGER.debug("Node LINK"); // alt on win
-                    fileLinker.addFilesToEntry(entry, files);
-                }
-                if (event.getTransferMode() == TransferMode.COPY) {
-                    LOGGER.debug("Mode Copy"); // ctrl on win, no modifier on Xubuntu
-                    fileLinker.copyFilesToFileDirAndAddToEntry(entry, files, luceneManager);
-                }
-                success = true;
-            }
-
-            event.setDropCompleted(success);
-            event.consume();
-        });
+        previewView.setOnDragDetected(
+                event -> {
+                    previewView.startFullDrag();
+
+                    Dragboard dragboard = previewView.startDragAndDrop(TransferMode.COPY);
+                    ClipboardContent content = new ClipboardContent();
+                    content.putHtml(previewView.getSelectionHtmlContent());
+                    dragboard.setContent(content);
+
+                    event.consume();
+                });
+
+        previewView.setOnDragOver(
+                event -> {
+                    if (event.getDragboard().hasFiles()) {
+                        event.acceptTransferModes(
+                                TransferMode.COPY, TransferMode.MOVE, TransferMode.LINK);
+                    }
+                    event.consume();
+                });
+
+        previewView.setOnDragDropped(
+                event -> {
+                    boolean success = false;
+                    if (event.getDragboard().hasContent(DataFormat.FILES)) {
+                        List<Path> files =
+                                event.getDragboard().getFiles().stream()
+                                        .map(File::toPath)
+                                        .collect(Collectors.toList());
+
+                        if (event.getTransferMode() == TransferMode.MOVE) {
+                            LOGGER.debug("Mode MOVE"); // shift on win or no modifier
+                            fileLinker.moveFilesToFileDirRenameAndAddToEntry(
+                                    entry, files, luceneManager);
+                        }
+                        if (event.getTransferMode() == TransferMode.LINK) {
+                            LOGGER.debug("Node LINK"); // alt on win
+                            fileLinker.addFilesToEntry(entry, files);
+                        }
+                        if (event.getTransferMode() == TransferMode.COPY) {
+                            LOGGER.debug("Mode Copy"); // ctrl on win, no modifier on Xubuntu
+                            fileLinker.copyFilesToFileDirAndAddToEntry(entry, files, luceneManager);
+                        }
+                        success = true;
+                    }
+
+                    event.setDropCompleted(success);
+                    event.consume();
+                });
         this.getChildren().add(previewView);
 
         createKeyBindings();
@@ -111,30 +131,44 @@ public PreviewPanel(BibDatabaseContext database,
     }
 
     private void createKeyBindings() {
-        previewView.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
-            if (keyBinding.isPresent()) {
-                if (keyBinding.get() == KeyBinding.COPY_PREVIEW) {
-                    previewView.copyPreviewToClipBoard();
-                    event.consume();
-                }
-            }
-        });
+        previewView.addEventFilter(
+                KeyEvent.KEY_PRESSED,
+                event -> {
+                    Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
+                    if (keyBinding.isPresent()) {
+                        if (keyBinding.get() == KeyBinding.COPY_PREVIEW) {
+                            previewView.copyPreviewToClipBoard();
+                            event.consume();
+                        }
+                    }
+                });
     }
 
     private ContextMenu createPopupMenu() {
-        MenuItem copyPreview = new MenuItem(Localization.lang("Copy preview"), IconTheme.JabRefIcons.COPY.getGraphicNode());
-        keyBindingRepository.getKeyCombination(KeyBinding.COPY_PREVIEW).ifPresent(copyPreview::setAccelerator);
+        MenuItem copyPreview =
+                new MenuItem(
+                        Localization.lang("Copy preview"),
+                        IconTheme.JabRefIcons.COPY.getGraphicNode());
+        keyBindingRepository
+                .getKeyCombination(KeyBinding.COPY_PREVIEW)
+                .ifPresent(copyPreview::setAccelerator);
         copyPreview.setOnAction(event -> previewView.copyPreviewToClipBoard());
         MenuItem copySelection = new MenuItem(Localization.lang("Copy selection"));
         copySelection.setOnAction(event -> previewView.copySelectionToClipBoard());
-        MenuItem printEntryPreview = new MenuItem(Localization.lang("Print entry preview"), IconTheme.JabRefIcons.PRINTED.getGraphicNode());
+        MenuItem printEntryPreview =
+                new MenuItem(
+                        Localization.lang("Print entry preview"),
+                        IconTheme.JabRefIcons.PRINTED.getGraphicNode());
         printEntryPreview.setOnAction(event -> previewView.print());
         MenuItem previousPreviewLayout = new MenuItem(Localization.lang("Previous preview layout"));
-        keyBindingRepository.getKeyCombination(KeyBinding.PREVIOUS_PREVIEW_LAYOUT).ifPresent(previousPreviewLayout::setAccelerator);
+        keyBindingRepository
+                .getKeyCombination(KeyBinding.PREVIOUS_PREVIEW_LAYOUT)
+                .ifPresent(previousPreviewLayout::setAccelerator);
         previousPreviewLayout.setOnAction(event -> this.previousPreviewStyle());
         MenuItem nextPreviewLayout = new MenuItem(Localization.lang("Next preview layout"));
-        keyBindingRepository.getKeyCombination(KeyBinding.NEXT_PREVIEW_LAYOUT).ifPresent(nextPreviewLayout::setAccelerator);
+        keyBindingRepository
+                .getKeyCombination(KeyBinding.NEXT_PREVIEW_LAYOUT)
+                .ifPresent(nextPreviewLayout::setAccelerator);
         nextPreviewLayout.setOnAction(event -> this.nextPreviewStyle());
 
         ContextMenu menu = new ContextMenu();
@@ -170,6 +204,7 @@ private void cyclePreview(int newPosition) {
 
         PreviewLayout layout = previewPreferences.getSelectedPreviewLayout();
         previewView.setLayout(layout);
-        dialogService.notify(Localization.lang("Preview style changed to: %0", layout.getDisplayName()));
+        dialogService.notify(
+                Localization.lang("Preview style changed to: %0", layout.getDisplayName()));
     }
 }
diff --git a/src/main/java/org/jabref/gui/preview/PreviewPreferences.java b/src/main/java/org/jabref/gui/preview/PreviewPreferences.java
index 85b98a01ec43..8a5f8ebeef9b 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewPreferences.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewPreferences.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.preview;
 
-import java.nio.file.Path;
-import java.util.List;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
@@ -17,6 +14,9 @@
 import org.jabref.logic.layout.TextBasedPreviewLayout;
 import org.jabref.logic.preview.PreviewLayout;
 
+import java.nio.file.Path;
+import java.util.List;
+
 public class PreviewPreferences {
 
     private final ObservableList<PreviewLayout> layoutCycle;
@@ -27,13 +27,14 @@ public class PreviewPreferences {
     private final BooleanProperty showPreviewEntryTableTooltip;
     private final ObservableList<Path> bstPreviewLayoutPaths;
 
-    public PreviewPreferences(List<PreviewLayout> layoutCycle,
-                              int layoutCyclePosition,
-                              TextBasedPreviewLayout customPreviewLayout,
-                              String defaultCustomPreviewLayout,
-                              boolean showPreviewAsExtraTab,
-                              boolean showPreviewEntryTableTooltip,
-                              List<Path> bstPreviewLayoutPaths) {
+    public PreviewPreferences(
+            List<PreviewLayout> layoutCycle,
+            int layoutCyclePosition,
+            TextBasedPreviewLayout customPreviewLayout,
+            String defaultCustomPreviewLayout,
+            boolean showPreviewAsExtraTab,
+            boolean showPreviewEntryTableTooltip,
+            List<Path> bstPreviewLayoutPaths) {
         this.layoutCycle = FXCollections.observableArrayList(layoutCycle);
         this.layoutCyclePosition = new SimpleIntegerProperty(layoutCyclePosition);
         this.customPreviewLayout = new SimpleObjectProperty<>(customPreviewLayout);
diff --git a/src/main/java/org/jabref/gui/preview/PreviewViewer.java b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
index 26322517004a..533286b69772 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewViewer.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
@@ -1,12 +1,6 @@
 package org.jabref.gui.preview;
 
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.MalformedURLException;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Pattern;
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -32,8 +26,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.SearchQuery;
-
-import com.airhacks.afterburner.injection.Injector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -42,6 +34,14 @@
 import org.w3c.dom.events.EventTarget;
 import org.w3c.dom.html.HTMLAnchorElement;
 
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.MalformedURLException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Pattern;
+
 /**
  * Displays an BibEntry using the given layout format.
  */
@@ -50,7 +50,8 @@ public class PreviewViewer extends ScrollPane implements InvalidationListener {
     private static final Logger LOGGER = LoggerFactory.getLogger(PreviewViewer.class);
 
     // https://stackoverflow.com/questions/5669448/get-selected-texts-html-in-div/5670825#5670825
-    private static final String JS_GET_SELECTION_HTML_SCRIPT = """
+    private static final String JS_GET_SELECTION_HTML_SCRIPT =
+            """
                                                                    function getSelectionHtml() {
                                                                    var html = "";
                                                                    if (typeof window.getSelection != "undefined") {
@@ -106,14 +107,16 @@ function getSelectionHtml() {
                        </script>
 
                     </head>""";
-    // This is a string format, and it takes a variable name as an argument to pass to the markInstance.markRegExp() Javascript method.
+    // This is a string format, and it takes a variable name as an argument to pass to the
+    // markInstance.markRegExp() Javascript method.
     private static final String JS_MARK_REG_EXP_CALLBACK =
             """
             {done: function(){
                 markInstance.markRegExp(%s);}
             }""";
 
-    // This is a string format, and it takes a variable name as an argument to pass to the markInstance.unmark() Javascript method.
+    // This is a string format, and it takes a variable name as an argument to pass to the
+    // markInstance.unmark() Javascript method.
     private static final String JS_UNMARK_WITH_CALLBACK =
             """
             var markInstance = new Mark(document.getElementById("content"));
@@ -125,10 +128,12 @@ function getSelectionHtml() {
     private final TaskExecutor taskExecutor;
     private final WebView previewView;
     private final BibDatabaseContext database;
-    private final ChangeListener<Optional<SearchQuery>> listener = (queryObservable, queryOldValue, queryNewValue) -> {
-        searchHighlightPattern = queryNewValue.flatMap(SearchQuery::getJavaScriptPatternForWords);
-        highlightSearchPattern();
-    };
+    private final ChangeListener<Optional<SearchQuery>> listener =
+            (queryObservable, queryOldValue, queryNewValue) -> {
+                searchHighlightPattern =
+                        queryNewValue.flatMap(SearchQuery::getJavaScriptPatternForWords);
+                highlightSearchPattern();
+            };
 
     private Optional<BibEntry> entry = Optional.empty();
     private Optional<Pattern> searchHighlightPattern = Optional.empty();
@@ -138,12 +143,13 @@ function getSelectionHtml() {
     /**
      * @param database Used for resolving strings and pdf directories for links.
      */
-    public PreviewViewer(BibDatabaseContext database,
-                         DialogService dialogService,
-                         GuiPreferences preferences,
-                         ThemeManager themeManager,
-                         TaskExecutor taskExecutor,
-                         OptionalObjectProperty<SearchQuery> searchQueryProperty) {
+    public PreviewViewer(
+            BibDatabaseContext database,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            ThemeManager themeManager,
+            TaskExecutor taskExecutor,
+            OptionalObjectProperty<SearchQuery> searchQueryProperty) {
         this.database = Objects.requireNonNull(database);
         this.dialogService = dialogService;
         this.clipBoardManager = Injector.instantiateModelOrService(ClipBoardManager.class);
@@ -155,50 +161,73 @@ public PreviewViewer(BibDatabaseContext database,
         setContent(previewView);
         previewView.setContextMenuEnabled(false);
 
-        previewView.getEngine().getLoadWorker().stateProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue != Worker.State.SUCCEEDED) {
-                return;
-            }
-
-            if (!registered) {
-                searchHighlightPattern = searchQueryProperty.get().flatMap(SearchQuery::getJavaScriptPatternForWords);
-                searchQueryProperty.addListener(listener);
-                registered = true;
-            }
-            highlightSearchPattern();
-
-            // https://stackoverflow.com/questions/15555510/javafx-stop-opening-url-in-webview-open-in-browser-instead
-            NodeList anchorList = previewView.getEngine().getDocument().getElementsByTagName("a");
-            for (int i = 0; i < anchorList.getLength(); i++) {
-                Node node = anchorList.item(i);
-                EventTarget eventTarget = (EventTarget) node;
-                eventTarget.addEventListener("click", evt -> {
-                    EventTarget target = evt.getCurrentTarget();
-                    HTMLAnchorElement anchorElement = (HTMLAnchorElement) target;
-                    String href = anchorElement.getHref();
-                    if (href != null) {
-                        try {
-                            NativeDesktop.openBrowser(href, preferences.getExternalApplicationsPreferences());
-                        } catch (MalformedURLException exception) {
-                            LOGGER.error("Invalid URL", exception);
-                        } catch (IOException exception) {
-                            LOGGER.error("Invalid URL Input", exception);
-                        }
-                    }
-                    evt.preventDefault();
-                }, false);
-            }
-        });
+        previewView
+                .getEngine()
+                .getLoadWorker()
+                .stateProperty()
+                .addListener(
+                        (observable, oldValue, newValue) -> {
+                            if (newValue != Worker.State.SUCCEEDED) {
+                                return;
+                            }
+
+                            if (!registered) {
+                                searchHighlightPattern =
+                                        searchQueryProperty
+                                                .get()
+                                                .flatMap(SearchQuery::getJavaScriptPatternForWords);
+                                searchQueryProperty.addListener(listener);
+                                registered = true;
+                            }
+                            highlightSearchPattern();
+
+                            // https://stackoverflow.com/questions/15555510/javafx-stop-opening-url-in-webview-open-in-browser-instead
+                            NodeList anchorList =
+                                    previewView.getEngine().getDocument().getElementsByTagName("a");
+                            for (int i = 0; i < anchorList.getLength(); i++) {
+                                Node node = anchorList.item(i);
+                                EventTarget eventTarget = (EventTarget) node;
+                                eventTarget.addEventListener(
+                                        "click",
+                                        evt -> {
+                                            EventTarget target = evt.getCurrentTarget();
+                                            HTMLAnchorElement anchorElement =
+                                                    (HTMLAnchorElement) target;
+                                            String href = anchorElement.getHref();
+                                            if (href != null) {
+                                                try {
+                                                    NativeDesktop.openBrowser(
+                                                            href,
+                                                            preferences
+                                                                    .getExternalApplicationsPreferences());
+                                                } catch (MalformedURLException exception) {
+                                                    LOGGER.error("Invalid URL", exception);
+                                                } catch (IOException exception) {
+                                                    LOGGER.error("Invalid URL Input", exception);
+                                                }
+                                            }
+                                            evt.preventDefault();
+                                        },
+                                        false);
+                            }
+                        });
 
         themeManager.installCss(previewView.getEngine());
     }
 
-    public PreviewViewer(BibDatabaseContext database,
-                         DialogService dialogService,
-                         GuiPreferences preferences,
-                         ThemeManager themeManager,
-                         TaskExecutor taskExecutor) {
-        this(database, dialogService, preferences, themeManager, taskExecutor, OptionalObjectProperty.empty());
+    public PreviewViewer(
+            BibDatabaseContext database,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            ThemeManager themeManager,
+            TaskExecutor taskExecutor) {
+        this(
+                database,
+                dialogService,
+                preferences,
+                themeManager,
+                taskExecutor,
+                OptionalObjectProperty.empty());
     }
 
     private void highlightSearchPattern() {
@@ -219,14 +248,17 @@ private void highlightSearchPattern() {
      */
     private static String createJavaScriptRegex(Pattern regex) {
         String pattern = regex.pattern();
-        // Create a JavaScript regular expression literal (https://ecma-international.org/ecma-262/10.0/index.html#sec-literals-regular-expression-literals)
-        // Forward slashes are reserved to delimit the regular expression body. Hence, they must be escaped.
+        // Create a JavaScript regular expression literal
+        // (https://ecma-international.org/ecma-262/10.0/index.html#sec-literals-regular-expression-literals)
+        // Forward slashes are reserved to delimit the regular expression body. Hence, they must be
+        // escaped.
         pattern = UNESCAPED_FORWARD_SLASH.matcher(pattern).replaceAll("\\\\/");
         return "/" + pattern + "/gmi";
     }
 
     public void setLayout(PreviewLayout newLayout) {
-        // Change listeners might set the layout to null while the update method is executing, therefore we need to prevent this here
+        // Change listeners might set the layout to null while the update method is executing,
+        // therefore we need to prevent this here
         if (newLayout == null || newLayout.equals(layout)) {
             return;
         }
@@ -240,11 +272,12 @@ public void setEntry(BibEntry newEntry) {
         }
 
         // Remove update listener for old entry
-        entry.ifPresent(oldEntry -> {
-            for (Observable observable : oldEntry.getObservables()) {
-                observable.removeListener(this);
-            }
-        });
+        entry.ifPresent(
+                oldEntry -> {
+                    for (Observable observable : oldEntry.getObservables()) {
+                        observable.removeListener(this);
+                    }
+                });
 
         entry = Optional.of(newEntry);
 
@@ -257,42 +290,61 @@ public void setEntry(BibEntry newEntry) {
 
     private void update() {
         if (entry.isEmpty() || (layout == null)) {
-            // Make sure that the preview panel is not completely white, especially with dark theme on
+            // Make sure that the preview panel is not completely white, especially with dark theme
+            // on
             setPreviewText("");
             return;
         }
 
-        Number.serialExportNumber = 1; // Set entry number in case that is included in the preview layout.
+        Number.serialExportNumber =
+                1; // Set entry number in case that is included in the preview layout.
 
         final BibEntry theEntry = entry.get();
-        BackgroundTask
-                .wrap(() -> layout.generatePreview(theEntry, database))
-                .onRunning(() -> setPreviewText("<i>" + Localization.lang("Processing Citation Style \"%0\"...", layout.getDisplayName()) + "</i>"))
+        BackgroundTask.wrap(() -> layout.generatePreview(theEntry, database))
+                .onRunning(
+                        () ->
+                                setPreviewText(
+                                        "<i>"
+                                                + Localization.lang(
+                                                        "Processing Citation Style \"%0\"...",
+                                                        layout.getDisplayName())
+                                                + "</i>"))
                 .onSuccess(this::setPreviewText)
-                .onFailure(exception -> {
-                    LOGGER.error("Error while generating citation style", exception);
-
-                    // Convert stack trace to a string
-                    StringWriter stringWriter = new StringWriter();
-                    PrintWriter printWriter = new PrintWriter(stringWriter);
-                    exception.printStackTrace(printWriter);
-                    String stackTraceString = stringWriter.toString();
-
-                    // Set the preview text with the localized error message and the stack trace
-                    setPreviewText(Localization.lang("Error while generating citation style") + "\n\n" + exception.getLocalizedMessage() + "\n\nBibTeX (internal):\n" + theEntry + "\n\nStack Trace:\n" + stackTraceString);
-                })
+                .onFailure(
+                        exception -> {
+                            LOGGER.error("Error while generating citation style", exception);
+
+                            // Convert stack trace to a string
+                            StringWriter stringWriter = new StringWriter();
+                            PrintWriter printWriter = new PrintWriter(stringWriter);
+                            exception.printStackTrace(printWriter);
+                            String stackTraceString = stringWriter.toString();
+
+                            // Set the preview text with the localized error message and the stack
+                            // trace
+                            setPreviewText(
+                                    Localization.lang("Error while generating citation style")
+                                            + "\n\n"
+                                            + exception.getLocalizedMessage()
+                                            + "\n\nBibTeX (internal):\n"
+                                            + theEntry
+                                            + "\n\nStack Trace:\n"
+                                            + stackTraceString);
+                        })
                 .executeWith(taskExecutor);
     }
 
     private void setPreviewText(String text) {
-        String myText = """
+        String myText =
+                """
                 <html>
                     %s
                     <body id="previewBody">
                         <div id="content"> %s </div>
                     </body>
                 </html>
-                """.formatted(JS_HIGHLIGHT_FUNCTION, text);
+                """
+                        .formatted(JS_HIGHLIGHT_FUNCTION, text);
         previewView.getEngine().setJavaScriptEnabled(true);
         previewView.getEngine().loadContent(myText);
 
@@ -306,13 +358,19 @@ public void print() {
             return;
         }
 
-        BackgroundTask
-                .wrap(() -> {
-                    job.getJobSettings().setJobName(entry.flatMap(BibEntry::getCitationKey).orElse("NO ENTRY"));
-                    previewView.getEngine().print(job);
-                    job.endJob();
-                })
-                .onFailure(exception -> dialogService.showErrorDialogAndWait(Localization.lang("Could not print preview"), exception))
+        BackgroundTask.wrap(
+                        () -> {
+                            job.getJobSettings()
+                                    .setJobName(
+                                            entry.flatMap(BibEntry::getCitationKey)
+                                                    .orElse("NO ENTRY"));
+                            previewView.getEngine().print(job);
+                            job.endJob();
+                        })
+                .onFailure(
+                        exception ->
+                                dialogService.showErrorDialogAndWait(
+                                        Localization.lang("Could not print preview"), exception))
                 .executeWith(taskExecutor);
     }
 
@@ -321,7 +379,11 @@ public void copyPreviewToClipBoard() {
 
         ClipboardContent content = new ClipboardContent();
         content.putString(document.getElementById("content").getTextContent());
-        content.putHtml((String) previewView.getEngine().executeScript("document.documentElement.outerHTML"));
+        content.putHtml(
+                (String)
+                        previewView
+                                .getEngine()
+                                .executeScript("document.documentElement.outerHTML"));
 
         clipBoardManager.setContent(content);
     }
diff --git a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
index 40c04c97a8d5..9c8bb91f4519 100644
--- a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
+++ b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.push;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
+import com.google.common.annotations.VisibleForTesting;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.Action;
@@ -15,20 +13,27 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.strings.StringUtil;
-
-import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * Abstract class for pushing entries into different editors.
  */
 public abstract class AbstractPushToApplication implements PushToApplication {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPushToApplication.class);
-    protected boolean couldNotCall; // Set to true in case the command could not be executed, e.g., if the file is not found
-    protected boolean couldNotPush; // Set to true in case the tunnel to the program (if one is used) does not operate
-    protected boolean notDefined; // Set to true if the corresponding path is not defined in the preferences
+    protected boolean
+            couldNotCall; // Set to true in case the command could not be executed, e.g., if the
+                          // file is not found
+    protected boolean
+            couldNotPush; // Set to true in case the tunnel to the program (if one is used) does not
+                          // operate
+    protected boolean
+            notDefined; // Set to true if the corresponding path is not defined in the preferences
 
     protected String commandPath;
 
@@ -61,12 +66,20 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
     }
 
     @VisibleForTesting
-    protected void pushEntries(BibDatabaseContext database, List<BibEntry> entries, String keyString, ProcessBuilder processBuilder) {
+    protected void pushEntries(
+            BibDatabaseContext database,
+            List<BibEntry> entries,
+            String keyString,
+            ProcessBuilder processBuilder) {
         couldNotPush = false;
         couldNotCall = false;
         notDefined = false;
 
-        commandPath = preferences.getPushToApplicationPreferences().getCommandPaths().get(this.getDisplayName());
+        commandPath =
+                preferences
+                        .getPushToApplicationPreferences()
+                        .getCommandPaths()
+                        .get(this.getDisplayName());
 
         // Check if a path to the command has been specified
         if (StringUtil.isNullOrEmpty(commandPath)) {
@@ -79,18 +92,12 @@ protected void pushEntries(BibDatabaseContext database, List<BibEntry> entries,
             if (OS.OS_X) {
                 String[] commands = getCommandLine(keyString);
                 if (commands.length < 3) {
-                    LOGGER.error("Commandline does not contain enough parameters to \"push to application\"");
+                    LOGGER.error(
+                            "Commandline does not contain enough parameters to \"push to application\"");
                     return;
                 }
                 processBuilder.command(
-                        "open",
-                        "-a",
-                        commands[0],
-                        "-n",
-                        "--args",
-                        commands[1],
-                        commands[2]
-                );
+                        "open", "-a", commands[0], "-n", "--args", commands[1], commands[2]);
                 processBuilder.start();
             } else {
                 processBuilder.command(getCommandLine(keyString));
@@ -117,7 +124,8 @@ public void onOperationCompleted() {
                     Localization.lang("Error pushing entries"),
                     Localization.lang("Could not connect to %0", getDisplayName()) + ".");
         } else {
-            dialogService.notify(Localization.lang("Pushed citations to %0", getDisplayName()) + ".");
+            dialogService.notify(
+                    Localization.lang("Pushed citations to %0", getDisplayName()) + ".");
         }
     }
 
@@ -161,8 +169,10 @@ protected String getCiteSuffix() {
     }
 
     @Override
-    public PushToApplicationSettings getSettings(PushToApplication application, PushToApplicationPreferences preferences) {
-        return new PushToApplicationSettings(application, dialogService, this.preferences.getFilePreferences(), preferences);
+    public PushToApplicationSettings getSettings(
+            PushToApplication application, PushToApplicationPreferences preferences) {
+        return new PushToApplicationSettings(
+                application, dialogService, this.preferences.getFilePreferences(), preferences);
     }
 
     protected class PushToApplicationAction implements Action {
diff --git a/src/main/java/org/jabref/gui/push/PushToApplication.java b/src/main/java/org/jabref/gui/push/PushToApplication.java
index 18e012e904f9..95f379eec025 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplication.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplication.java
@@ -1,12 +1,12 @@
 package org.jabref.gui.push;
 
-import java.util.List;
-
 import org.jabref.gui.actions.Action;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
+import java.util.List;
+
 /**
  * Class that defines interaction with an external application in the form of "pushing" selected entries to it.
  */
@@ -53,7 +53,9 @@ public interface PushToApplication {
 
     Action getAction();
 
-    PushToApplicationSettings getSettings(PushToApplication application, PushToApplicationPreferences pushToApplicationPreferences);
+    PushToApplicationSettings getSettings(
+            PushToApplication application,
+            PushToApplicationPreferences pushToApplicationPreferences);
 
     String getDelimiter();
 }
diff --git a/src/main/java/org/jabref/gui/push/PushToApplicationCommand.java b/src/main/java/org/jabref/gui/push/PushToApplicationCommand.java
index c5fa4c905eb9..8da81bc2ea0a 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplicationCommand.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplicationCommand.java
@@ -1,9 +1,9 @@
 package org.jabref.gui.push;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
+
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.scene.control.ButtonBase;
 import javafx.scene.control.MenuItem;
@@ -21,13 +21,13 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.strings.StringUtil;
-
-import com.tobiasdiez.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 /**
  * An Action class representing the process of invoking a PushToApplication operation.
@@ -45,23 +45,29 @@ public class PushToApplicationCommand extends SimpleCommand {
 
     private PushToApplication application;
 
-    public PushToApplicationCommand(StateManager stateManager, DialogService dialogService, GuiPreferences preferences, TaskExecutor taskExecutor) {
+    public PushToApplicationCommand(
+            StateManager stateManager,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            TaskExecutor taskExecutor) {
         this.stateManager = stateManager;
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.taskExecutor = taskExecutor;
 
-        setApplication(preferences.getPushToApplicationPreferences()
-                                  .getActiveApplicationName());
+        setApplication(preferences.getPushToApplicationPreferences().getActiveApplicationName());
 
-        EasyBind.subscribe(preferences.getPushToApplicationPreferences().activeApplicationNameProperty(),
+        EasyBind.subscribe(
+                preferences.getPushToApplicationPreferences().activeApplicationNameProperty(),
                 this::setApplication);
 
         this.executable.bind(needsDatabase(stateManager).and(needsEntriesSelected(stateManager)));
-        this.statusMessage.bind(BindingsHelper.ifThenElse(
-                this.executable,
-                "",
-                Localization.lang("This operation requires one or more entries to be selected.")));
+        this.statusMessage.bind(
+                BindingsHelper.ifThenElse(
+                        this.executable,
+                        "",
+                        Localization.lang(
+                                "This operation requires one or more entries to be selected.")));
     }
 
     public void registerReconfigurable(Object node) {
@@ -75,22 +81,23 @@ public void registerReconfigurable(Object node) {
 
     private void setApplication(String applicationName) {
         final ActionFactory factory = new ActionFactory();
-        PushToApplication application = PushToApplications.getApplicationByName(
-                                                                  applicationName,
-                                                                  dialogService,
-                                                                  preferences)
-                                                          .orElse(new PushToEmacs(dialogService, preferences));
+        PushToApplication application =
+                PushToApplications.getApplicationByName(applicationName, dialogService, preferences)
+                        .orElse(new PushToEmacs(dialogService, preferences));
 
-        preferences.getPushToApplicationPreferences().setActiveApplicationName(application.getDisplayName());
+        preferences
+                .getPushToApplicationPreferences()
+                .setActiveApplicationName(application.getDisplayName());
         this.application = Objects.requireNonNull(application);
 
-        reconfigurableControls.forEach(object -> {
-            if (object instanceof MenuItem item) {
-                factory.configureMenuItem(application.getAction(), this, item);
-            } else if (object instanceof ButtonBase base) {
-                factory.configureIconButton(application.getAction(), this, base);
-            }
-        });
+        reconfigurableControls.forEach(
+                object -> {
+                    if (object instanceof MenuItem item) {
+                        factory.configureMenuItem(application.getAction(), this, item);
+                    } else if (object instanceof ButtonBase base) {
+                        factory.configureIconButton(application.getAction(), this, base);
+                    }
+                });
     }
 
     public Action getAction() {
@@ -125,7 +132,8 @@ public void execute() {
                 if (StringUtil.isBlank(entry.getCitationKey())) {
                     dialogService.showErrorDialogAndWait(
                             application.getDisplayName(),
-                            Localization.lang("This operation requires all selected entries to have citation keys defined."));
+                            Localization.lang(
+                                    "This operation requires all selected entries to have citation keys defined."));
                     return;
                 }
             }
@@ -133,13 +141,19 @@ public void execute() {
 
         // All set, call the operation in a new thread:
         BackgroundTask.wrap(this::pushEntries)
-                      .onSuccess(s -> application.onOperationCompleted())
-                      .onFailure(ex -> LOGGER.error("Error pushing citation", ex))
-                      .executeWith(taskExecutor);
+                .onSuccess(s -> application.onOperationCompleted())
+                .onFailure(ex -> LOGGER.error("Error pushing citation", ex))
+                .executeWith(taskExecutor);
     }
 
     private void pushEntries() {
-        BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null"));
-        application.pushEntries(database, stateManager.getSelectedEntries(), getKeyString(stateManager.getSelectedEntries(), application.getDelimiter()));
+        BibDatabaseContext database =
+                stateManager
+                        .getActiveDatabase()
+                        .orElseThrow(() -> new NullPointerException("Database null"));
+        application.pushEntries(
+                database,
+                stateManager.getSelectedEntries(),
+                getKeyString(stateManager.getSelectedEntries(), application.getDelimiter()));
     }
 }
diff --git a/src/main/java/org/jabref/gui/push/PushToApplicationPreferences.java b/src/main/java/org/jabref/gui/push/PushToApplicationPreferences.java
index 7b569f736914..16966c8c51e0 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplicationPreferences.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplicationPreferences.java
@@ -1,23 +1,24 @@
 package org.jabref.gui.push;
 
-import java.util.Map;
-
 import javafx.beans.property.MapProperty;
 import javafx.beans.property.SimpleMapProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 
+import java.util.Map;
+
 public class PushToApplicationPreferences {
     private final StringProperty activeApplicationName;
     private final MapProperty<String, String> commandPaths;
     private final StringProperty emacsArguments;
     private final StringProperty vimServer;
 
-    public PushToApplicationPreferences(String activeApplicationName,
-                                        Map<String, String> commandPaths,
-                                        String emacsArguments,
-                                        String vimServer) {
+    public PushToApplicationPreferences(
+            String activeApplicationName,
+            Map<String, String> commandPaths,
+            String emacsArguments,
+            String vimServer) {
         this.activeApplicationName = new SimpleStringProperty(activeApplicationName);
         this.commandPaths = new SimpleMapProperty<>(FXCollections.observableMap(commandPaths));
         this.emacsArguments = new SimpleStringProperty(emacsArguments);
diff --git a/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java b/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
index 26740b27abe6..6f2eee30c1c1 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.push;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
@@ -17,6 +14,9 @@
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class PushToApplicationSettings {
 
     protected final Label commandLabel;
@@ -25,10 +25,11 @@ public class PushToApplicationSettings {
     protected final PushToApplicationPreferences preferences;
     protected final AbstractPushToApplication application;
 
-    public PushToApplicationSettings(PushToApplication application,
-                                     DialogService dialogService,
-                                     FilePreferences filePreferences,
-                                     PushToApplicationPreferences preferences) {
+    public PushToApplicationSettings(
+            PushToApplication application,
+            DialogService dialogService,
+            FilePreferences filePreferences,
+            PushToApplicationPreferences preferences) {
         this.application = (AbstractPushToApplication) application;
         this.preferences = preferences;
 
@@ -46,8 +47,10 @@ public PushToApplicationSettings(PushToApplication application,
         browse.setPrefHeight(20.0);
         browse.setPrefWidth(20.0);
 
-        // In case the application name and the actual command is not the same, add the command in brackets
-        StringBuilder commandLine = new StringBuilder(Localization.lang("Path to %0", application.getDisplayName()));
+        // In case the application name and the actual command is not the same, add the command in
+        // brackets
+        StringBuilder commandLine =
+                new StringBuilder(Localization.lang("Path to %0", application.getDisplayName()));
         if (this.application.getCommandName() == null) {
             commandLine.append(':');
         } else {
@@ -59,10 +62,15 @@ public PushToApplicationSettings(PushToApplication application,
         path.setText(preferences.getCommandPaths().get(this.application.getDisplayName()));
         settingsPane.add(path, 1, 0);
 
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(filePreferences.getWorkingDirectory()).build();
-        browse.setOnAction(e -> dialogService.showFileOpenDialog(fileDialogConfiguration)
-                                             .ifPresent(f -> path.setText(f.toAbsolutePath().toString())));
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .withInitialDirectory(filePreferences.getWorkingDirectory())
+                        .build();
+        browse.setOnAction(
+                e ->
+                        dialogService
+                                .showFileOpenDialog(fileDialogConfiguration)
+                                .ifPresent(f -> path.setText(f.toAbsolutePath().toString())));
         settingsPane.add(browse, 2, 0);
 
         ColumnConstraints textConstraints = new ColumnConstraints();
@@ -70,7 +78,9 @@ public PushToApplicationSettings(PushToApplication application,
         pathConstraints.setHgrow(Priority.ALWAYS);
         ColumnConstraints browseConstraints = new ColumnConstraints(20.0);
         browseConstraints.setHgrow(Priority.NEVER);
-        settingsPane.getColumnConstraints().addAll(textConstraints, pathConstraints, browseConstraints);
+        settingsPane
+                .getColumnConstraints()
+                .addAll(textConstraints, pathConstraints, browseConstraints);
     }
 
     /**
diff --git a/src/main/java/org/jabref/gui/push/PushToApplications.java b/src/main/java/org/jabref/gui/push/PushToApplications.java
index 08b551674a79..6374244f5673 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplications.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplications.java
@@ -1,12 +1,12 @@
 package org.jabref.gui.push;
 
+import org.jabref.gui.DialogService;
+import org.jabref.gui.preferences.GuiPreferences;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import org.jabref.gui.DialogService;
-import org.jabref.gui.preferences.GuiPreferences;
-
 public class PushToApplications {
 
     public static final String EMACS = "Emacs";
@@ -21,31 +21,33 @@ public class PushToApplications {
 
     private static final List<PushToApplication> APPLICATIONS = new ArrayList<>();
 
-    private PushToApplications() {
-    }
+    private PushToApplications() {}
 
-    public static List<PushToApplication> getAllApplications(DialogService dialogService, GuiPreferences preferences) {
+    public static List<PushToApplication> getAllApplications(
+            DialogService dialogService, GuiPreferences preferences) {
         if (!APPLICATIONS.isEmpty()) {
             return APPLICATIONS;
         }
 
-        APPLICATIONS.addAll(List.of(
-                new PushToEmacs(dialogService, preferences),
-                new PushToLyx(dialogService, preferences),
-                new PushToSublimeText(dialogService, preferences),
-                new PushToTexmaker(dialogService, preferences),
-                new PushToTeXstudio(dialogService, preferences),
-                new PushToTeXworks(dialogService, preferences),
-                new PushToVim(dialogService, preferences),
-                new PushToWinEdt(dialogService, preferences),
-                new PushToTexShop(dialogService, preferences)));
+        APPLICATIONS.addAll(
+                List.of(
+                        new PushToEmacs(dialogService, preferences),
+                        new PushToLyx(dialogService, preferences),
+                        new PushToSublimeText(dialogService, preferences),
+                        new PushToTexmaker(dialogService, preferences),
+                        new PushToTeXstudio(dialogService, preferences),
+                        new PushToTeXworks(dialogService, preferences),
+                        new PushToVim(dialogService, preferences),
+                        new PushToWinEdt(dialogService, preferences),
+                        new PushToTexShop(dialogService, preferences)));
 
         return APPLICATIONS;
     }
 
-    public static Optional<PushToApplication> getApplicationByName(String applicationName, DialogService dialogService, GuiPreferences preferences) {
+    public static Optional<PushToApplication> getApplicationByName(
+            String applicationName, DialogService dialogService, GuiPreferences preferences) {
         return getAllApplications(dialogService, preferences).stream()
-                                                             .filter(application -> application.getDisplayName().equals(applicationName))
-                                                             .findAny();
+                .filter(application -> application.getDisplayName().equals(applicationName))
+                .findAny();
     }
 }
diff --git a/src/main/java/org/jabref/gui/push/PushToEmacs.java b/src/main/java/org/jabref/gui/push/PushToEmacs.java
index c3d612b2d48b..8edac279f1db 100644
--- a/src/main/java/org/jabref/gui/push/PushToEmacs.java
+++ b/src/main/java/org/jabref/gui/push/PushToEmacs.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.push;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.List;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
@@ -14,10 +9,14 @@
 import org.jabref.logic.util.HeadlessExecutorService;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+
 public class PushToEmacs extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.EMACS;
@@ -47,7 +46,8 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
         couldNotCall = false;
         notDefined = false;
 
-        PushToApplicationPreferences pushToApplicationPreferences = preferences.getPushToApplicationPreferences();
+        PushToApplicationPreferences pushToApplicationPreferences =
+                preferences.getPushToApplicationPreferences();
 
         commandPath = pushToApplicationPreferences.getCommandPaths().get(this.getDisplayName());
 
@@ -74,51 +74,58 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
                 // so cmd receives: (insert \"\\cite{Blah2001}\")
                 // so emacs receives: (insert "\cite{Blah2001}")
 
-                com[com.length - 1] = prefix.concat("\""
-                                                    + getCitePrefix().replace("\\", "\\\\")
-                                                    + keys
-                                                    + getCiteSuffix().replace("\\", "\\\\")
-                                                    + "\"").concat(suffix)
-                                            .replace("\"", "\\\"");
+                com[com.length - 1] =
+                        prefix.concat(
+                                        "\""
+                                                + getCitePrefix().replace("\\", "\\\\")
+                                                + keys
+                                                + getCiteSuffix().replace("\\", "\\\\")
+                                                + "\"")
+                                .concat(suffix)
+                                .replace("\"", "\\\"");
             } else {
                 // Linux gnuclient/emacslient escaping:
                 // java string: "(insert \"\\\\cite{Blah2001}\")"
                 // so sh receives: (insert "\\cite{Blah2001}")
                 // so emacs receives: (insert "\cite{Blah2001}")
-                com[com.length - 1] = prefix.concat("\""
-                                                    + getCitePrefix().replace("\\", "\\\\")
-                                                    + keys
-                                                    + getCiteSuffix().replace("\\", "\\\\")
-                                                    + "\"").concat(suffix);
+                com[com.length - 1] =
+                        prefix.concat(
+                                        "\""
+                                                + getCitePrefix().replace("\\", "\\\\")
+                                                + keys
+                                                + getCiteSuffix().replace("\\", "\\\\")
+                                                + "\"")
+                                .concat(suffix);
             }
 
             LOGGER.atDebug()
-                  .setMessage("Executing command {}")
-                  .addArgument(() -> Arrays.toString(com))
-                  .log();
+                    .setMessage("Executing command {}")
+                    .addArgument(() -> Arrays.toString(com))
+                    .log();
 
             final Process p = Runtime.getRuntime().exec(com);
 
-            HeadlessExecutorService.INSTANCE.executeAndWait(() -> {
-                try (InputStream out = p.getErrorStream()) {
-                    int c;
-                    StringBuilder sb = new StringBuilder();
-                    try {
-                        while ((c = out.read()) != -1) {
-                            sb.append((char) c);
+            HeadlessExecutorService.INSTANCE.executeAndWait(
+                    () -> {
+                        try (InputStream out = p.getErrorStream()) {
+                            int c;
+                            StringBuilder sb = new StringBuilder();
+                            try {
+                                while ((c = out.read()) != -1) {
+                                    sb.append((char) c);
+                                }
+                            } catch (IOException e) {
+                                LOGGER.warn("Could not read from stderr.", e);
+                            }
+                            // Error stream has been closed. See if there were any errors:
+                            if (!sb.toString().trim().isEmpty()) {
+                                LOGGER.warn("Push to Emacs error: {}", sb);
+                                couldNotPush = true;
+                            }
+                        } catch (IOException e) {
+                            LOGGER.warn("Error handling std streams", e);
                         }
-                    } catch (IOException e) {
-                        LOGGER.warn("Could not read from stderr.", e);
-                    }
-                    // Error stream has been closed. See if there were any errors:
-                    if (!sb.toString().trim().isEmpty()) {
-                        LOGGER.warn("Push to Emacs error: {}", sb);
-                        couldNotPush = true;
-                    }
-                } catch (IOException e) {
-                    LOGGER.warn("Error handling std streams", e);
-                }
-            });
+                    });
         } catch (IOException excep) {
             LOGGER.warn("Problem pushing to Emacs.", excep);
             couldNotCall = true;
@@ -128,10 +135,12 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
     @Override
     public void onOperationCompleted() {
         if (couldNotPush) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Error pushing entries"),
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Error pushing entries"),
                     Localization.lang("Could not push to a running emacs daemon."));
         } else if (couldNotCall) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Error pushing entries"),
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Error pushing entries"),
                     Localization.lang("Could not run the emacs client."));
         } else {
             super.onOperationCompleted();
@@ -144,7 +153,9 @@ protected String getCommandName() {
     }
 
     @Override
-    public PushToApplicationSettings getSettings(PushToApplication application, PushToApplicationPreferences preferences) {
-        return new PushToEmacsSettings(application, dialogService, this.preferences.getFilePreferences(), preferences);
+    public PushToApplicationSettings getSettings(
+            PushToApplication application, PushToApplicationPreferences preferences) {
+        return new PushToEmacsSettings(
+                application, dialogService, this.preferences.getFilePreferences(), preferences);
     }
 }
diff --git a/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java b/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java
index 4efcb9be8144..315a71c66ab7 100644
--- a/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java
@@ -11,10 +11,11 @@ public class PushToEmacsSettings extends PushToApplicationSettings {
 
     private final TextField additionalParams = new TextField();
 
-    public PushToEmacsSettings(PushToApplication application,
-                               DialogService dialogService,
-                               FilePreferences filePreferences,
-                               PushToApplicationPreferences preferences) {
+    public PushToEmacsSettings(
+            PushToApplication application,
+            DialogService dialogService,
+            FilePreferences filePreferences,
+            PushToApplicationPreferences preferences) {
         super(application, dialogService, filePreferences, preferences);
 
         settingsPane.add(new Label(Localization.lang("Additional parameters") + ":"), 0, 1);
diff --git a/src/main/java/org/jabref/gui/push/PushToLyx.java b/src/main/java/org/jabref/gui/push/PushToLyx.java
index 0bcb7795fc8d..6549b76c9a3a 100644
--- a/src/main/java/org/jabref/gui/push/PushToLyx.java
+++ b/src/main/java/org/jabref/gui/push/PushToLyx.java
@@ -1,12 +1,5 @@
 package org.jabref.gui.push;
 
-import java.io.BufferedWriter;
-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;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
@@ -15,10 +8,16 @@
 import org.jabref.logic.util.HeadlessExecutorService;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
 public class PushToLyx extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.LYX;
@@ -42,28 +41,39 @@ public JabRefIcon getApplicationIcon() {
     @Override
     public void onOperationCompleted() {
         if (couldNotPush) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Error pushing entries"),
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Error pushing entries"),
                     Localization.lang("Verify that LyX is running and that the lyxpipe is valid.")
-                            + "[" + commandPath + "]");
+                            + "["
+                            + commandPath
+                            + "]");
         } else if (couldNotCall) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Unable to write to %0.", commandPath + ".in"));
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Unable to write to %0.", commandPath + ".in"));
         } else {
             super.onOperationCompleted();
         }
     }
 
     @Override
-    public PushToApplicationSettings getSettings(PushToApplication application, PushToApplicationPreferences preferences) {
-        return new PushToLyxSettings(application, dialogService, this.preferences.getFilePreferences(), preferences);
+    public PushToApplicationSettings getSettings(
+            PushToApplication application, PushToApplicationPreferences preferences) {
+        return new PushToLyxSettings(
+                application, dialogService, this.preferences.getFilePreferences(), preferences);
     }
 
     @Override
-    public void pushEntries(BibDatabaseContext database, final List<BibEntry> entries, final String keyString) {
+    public void pushEntries(
+            BibDatabaseContext database, final List<BibEntry> entries, final String keyString) {
         couldNotPush = false;
         couldNotCall = false;
         notDefined = false;
 
-        commandPath = preferences.getPushToApplicationPreferences().getCommandPaths().get(this.getDisplayName());
+        commandPath =
+                preferences
+                        .getPushToApplicationPreferences()
+                        .getCommandPaths()
+                        .get(this.getDisplayName());
 
         if ((commandPath == null) || commandPath.trim().isEmpty()) {
             notDefined = true;
@@ -73,7 +83,10 @@ public void pushEntries(BibDatabaseContext database, final List<BibEntry> entrie
         if (!commandPath.endsWith(".in")) {
             commandPath = commandPath + ".in";
         }
-        File lp = new File(commandPath); // this needs to fixed because it gives "asdf" when going prefs.get("lyxpipe")
+        File lp =
+                new File(
+                        commandPath); // this needs to fixed because it gives "asdf" when going
+                                      // prefs.get("lyxpipe")
         if (!lp.exists() || !lp.canWrite()) {
             // See if it helps to append ".in":
             lp = new File(commandPath + ".in");
@@ -85,14 +98,16 @@ public void pushEntries(BibDatabaseContext database, final List<BibEntry> entrie
 
         final File lyxpipe = lp;
 
-        HeadlessExecutorService.INSTANCE.executeAndWait(() -> {
-            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) {
-                couldNotCall = true;
-                LOGGER.warn("Problem pushing to LyX/Kile.", excep);
-            }
-        });
+        HeadlessExecutorService.INSTANCE.executeAndWait(
+                () -> {
+                    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) {
+                        couldNotCall = true;
+                        LOGGER.warn("Problem pushing to LyX/Kile.", excep);
+                    }
+                });
     }
 }
diff --git a/src/main/java/org/jabref/gui/push/PushToLyxSettings.java b/src/main/java/org/jabref/gui/push/PushToLyxSettings.java
index 86f0a06804fa..dacbc8866d60 100644
--- a/src/main/java/org/jabref/gui/push/PushToLyxSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToLyxSettings.java
@@ -6,10 +6,11 @@
 
 public class PushToLyxSettings extends PushToApplicationSettings {
 
-    public PushToLyxSettings(PushToApplication application,
-                             DialogService dialogService,
-                             FilePreferences filePreferences,
-                             PushToApplicationPreferences preferences) {
+    public PushToLyxSettings(
+            PushToApplication application,
+            DialogService dialogService,
+            FilePreferences filePreferences,
+            PushToApplicationPreferences preferences) {
         super(application, dialogService, filePreferences, preferences);
 
         commandLabel.setText(Localization.lang("Path to LyX pipe") + ":");
diff --git a/src/main/java/org/jabref/gui/push/PushToSublimeText.java b/src/main/java/org/jabref/gui/push/PushToSublimeText.java
index af0820e7ab27..00211be64774 100644
--- a/src/main/java/org/jabref/gui/push/PushToSublimeText.java
+++ b/src/main/java/org/jabref/gui/push/PushToSublimeText.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.push;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
@@ -15,10 +10,14 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+
 public class PushToSublimeText extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.SUBLIME_TEXT;
@@ -45,7 +44,11 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
         couldNotCall = false;
         notDefined = false;
 
-        commandPath = preferences.getPushToApplicationPreferences().getCommandPaths().get(this.getDisplayName());
+        commandPath =
+                preferences
+                        .getPushToApplicationPreferences()
+                        .getCommandPaths()
+                        .get(this.getDisplayName());
 
         // Check if a path to the command has been specified
         if (StringUtil.isNullOrEmpty(commandPath)) {
@@ -60,8 +63,10 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
             envs.put("PATH", Path.of(commandPath).getParent().toString());
 
             Process process = processBuilder.start();
-            StreamGobbler streamGobblerInput = new StreamGobbler(process.getInputStream(), LOGGER::info);
-            StreamGobbler streamGobblerError = new StreamGobbler(process.getErrorStream(), LOGGER::info);
+            StreamGobbler streamGobblerInput =
+                    new StreamGobbler(process.getInputStream(), LOGGER::info);
+            StreamGobbler streamGobblerError =
+                    new StreamGobbler(process.getErrorStream(), LOGGER::info);
 
             HeadlessExecutorService.INSTANCE.execute(streamGobblerInput);
             HeadlessExecutorService.INSTANCE.execute(streamGobblerError);
@@ -81,9 +86,31 @@ protected String[] getCommandLine(String keyString) {
 
         if (OS.WINDOWS) {
             // TODO we might need to escape the inner double quotes with """ """
-            return new String[] {"cmd.exe", "/c", "\"" + commandPath + "\"" + "--command \"insert {\\\"characters\\\": \"\\" + getCitePrefix() + keyString + getCiteSuffix() + "\"}\""};
+            return new String[] {
+                "cmd.exe",
+                "/c",
+                "\""
+                        + commandPath
+                        + "\""
+                        + "--command \"insert {\\\"characters\\\": \"\\"
+                        + getCitePrefix()
+                        + keyString
+                        + getCiteSuffix()
+                        + "\"}\""
+            };
         } else {
-            return new String[] {"sh", "-c", "\"" + commandPath + "\"" + " --command 'insert {\"characters\": \"" + citeCommand + keyString + getCiteSuffix() + "\"}'"};
+            return new String[] {
+                "sh",
+                "-c",
+                "\""
+                        + commandPath
+                        + "\""
+                        + " --command 'insert {\"characters\": \""
+                        + citeCommand
+                        + keyString
+                        + getCiteSuffix()
+                        + "\"}'"
+            };
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/push/PushToTeXstudio.java b/src/main/java/org/jabref/gui/push/PushToTeXstudio.java
index 17c6d5650c62..7e8700a578dc 100644
--- a/src/main/java/org/jabref/gui/push/PushToTeXstudio.java
+++ b/src/main/java/org/jabref/gui/push/PushToTeXstudio.java
@@ -25,6 +25,10 @@ public JabRefIcon getApplicationIcon() {
 
     @Override
     protected String[] getCommandLine(String keyString) {
-        return new String[] {commandPath, "--insert-cite", "%s%s%s".formatted(getCitePrefix(), keyString, getCiteSuffix())};
+        return new String[] {
+            commandPath,
+            "--insert-cite",
+            "%s%s%s".formatted(getCitePrefix(), keyString, getCiteSuffix())
+        };
     }
 }
diff --git a/src/main/java/org/jabref/gui/push/PushToTeXworks.java b/src/main/java/org/jabref/gui/push/PushToTeXworks.java
index c59df18ba0f8..3f8a3cc35fe6 100644
--- a/src/main/java/org/jabref/gui/push/PushToTeXworks.java
+++ b/src/main/java/org/jabref/gui/push/PushToTeXworks.java
@@ -31,6 +31,10 @@ public JabRefIcon getApplicationIcon() {
 
     @Override
     protected String[] getCommandLine(String keyString) {
-        return new String[] {commandPath, "--insert-text", "%s%s%s".formatted(getCitePrefix(), keyString, getCiteSuffix())};
+        return new String[] {
+            commandPath,
+            "--insert-text",
+            "%s%s%s".formatted(getCitePrefix(), keyString, getCiteSuffix())
+        };
     }
 }
diff --git a/src/main/java/org/jabref/gui/push/PushToTexShop.java b/src/main/java/org/jabref/gui/push/PushToTexShop.java
index 889982ca8ce7..64d605a4d940 100644
--- a/src/main/java/org/jabref/gui/push/PushToTexShop.java
+++ b/src/main/java/org/jabref/gui/push/PushToTexShop.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.push;
 
-import java.io.IOException;
-import java.util.List;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
@@ -13,10 +10,12 @@
 import org.jabref.logic.util.HeadlessExecutorService;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.List;
+
 public class PushToTexShop extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.TEXSHOP;
@@ -43,15 +42,21 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
         couldNotCall = false;
         notDefined = false;
 
-        commandPath = preferences.getPushToApplicationPreferences().getCommandPaths().get(this.getDisplayName());
+        commandPath =
+                preferences
+                        .getPushToApplicationPreferences()
+                        .getCommandPaths()
+                        .get(this.getDisplayName());
 
         try {
             LOGGER.debug("TexShop string: {}", String.join(" ", getCommandLine(keyString)));
             ProcessBuilder processBuilder = new ProcessBuilder(getCommandLine(keyString));
             processBuilder.inheritIO();
             Process process = processBuilder.start();
-            StreamGobbler streamGobblerInput = new StreamGobbler(process.getInputStream(), LOGGER::info);
-            StreamGobbler streamGobblerError = new StreamGobbler(process.getErrorStream(), LOGGER::info);
+            StreamGobbler streamGobblerInput =
+                    new StreamGobbler(process.getInputStream(), LOGGER::info);
+            StreamGobbler streamGobblerError =
+                    new StreamGobbler(process.getErrorStream(), LOGGER::info);
 
             HeadlessExecutorService.INSTANCE.execute(streamGobblerInput);
             HeadlessExecutorService.INSTANCE.execute(streamGobblerError);
@@ -73,16 +78,23 @@ protected String[] getCommandLine(String keyString) {
             citeCommand = sb.toString();
         }
 
-        String osascriptTexShop = "osascript -e 'tell application \"TeXShop\"\n" +
-                "activate\n" +
-                "set TheString to \"" + citeCommand + keyString + getCiteSuffix() + "\"\n" +
-                "set content of selection of front document to TheString\n" +
-                "end tell'";
+        String osascriptTexShop =
+                "osascript -e 'tell application \"TeXShop\"\n"
+                        + "activate\n"
+                        + "set TheString to \""
+                        + citeCommand
+                        + keyString
+                        + getCiteSuffix()
+                        + "\"\n"
+                        + "set content of selection of front document to TheString\n"
+                        + "end tell'";
 
         if (OS.OS_X) {
             return new String[] {"sh", "-c", osascriptTexShop};
         } else {
-            dialogService.showInformationDialogAndWait(Localization.lang("Push to application"), Localization.lang("Pushing citations to TeXShop is only possible on macOS!"));
+            dialogService.showInformationDialogAndWait(
+                    Localization.lang("Push to application"),
+                    Localization.lang("Pushing citations to TeXShop is only possible on macOS!"));
             return new String[] {};
         }
     }
diff --git a/src/main/java/org/jabref/gui/push/PushToVim.java b/src/main/java/org/jabref/gui/push/PushToVim.java
index 8702cd11eedb..4df20019e7ce 100644
--- a/src/main/java/org/jabref/gui/push/PushToVim.java
+++ b/src/main/java/org/jabref/gui/push/PushToVim.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.push;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.List;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
@@ -13,10 +8,14 @@
 import org.jabref.logic.util.HeadlessExecutorService;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+
 public class PushToVim extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.VIM;
@@ -38,8 +37,10 @@ public JabRefIcon getApplicationIcon() {
     }
 
     @Override
-    public PushToApplicationSettings getSettings(PushToApplication application, PushToApplicationPreferences preferences) {
-        return new PushToVimSettings(application, dialogService, this.preferences.getFilePreferences(), preferences);
+    public PushToApplicationSettings getSettings(
+            PushToApplication application, PushToApplicationPreferences preferences) {
+        return new PushToVimSettings(
+                application, dialogService, this.preferences.getFilePreferences(), preferences);
     }
 
     @Override
@@ -48,7 +49,11 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
         couldNotCall = false;
         notDefined = false;
 
-        commandPath = preferences.getPushToApplicationPreferences().getCommandPaths().get(this.getDisplayName());
+        commandPath =
+                preferences
+                        .getPushToApplicationPreferences()
+                        .getCommandPaths()
+                        .get(this.getDisplayName());
 
         if ((commandPath == null) || commandPath.trim().isEmpty()) {
             notDefined = true;
@@ -56,37 +61,43 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
         }
 
         try {
-            String[] com = new String[]{commandPath, "--servername",
-                    preferences.getPushToApplicationPreferences().getVimServer(), "--remote-send",
-                    "<C-\\><C-N>a" + getCitePrefix() + keys + getCiteSuffix()};
+            String[] com =
+                    new String[] {
+                        commandPath,
+                        "--servername",
+                        preferences.getPushToApplicationPreferences().getVimServer(),
+                        "--remote-send",
+                        "<C-\\><C-N>a" + getCitePrefix() + keys + getCiteSuffix()
+                    };
 
             LOGGER.atDebug()
-                  .setMessage("Executing command {}")
-                  .addArgument(() -> Arrays.toString(com))
-                  .log();
+                    .setMessage("Executing command {}")
+                    .addArgument(() -> Arrays.toString(com))
+                    .log();
 
             final Process p = Runtime.getRuntime().exec(com);
 
-            HeadlessExecutorService.INSTANCE.executeAndWait(() -> {
-                try (InputStream out = p.getErrorStream()) {
-                    int c;
-                    StringBuilder sb = new StringBuilder();
-                    try {
-                        while ((c = out.read()) != -1) {
-                            sb.append((char) c);
+            HeadlessExecutorService.INSTANCE.executeAndWait(
+                    () -> {
+                        try (InputStream out = p.getErrorStream()) {
+                            int c;
+                            StringBuilder sb = new StringBuilder();
+                            try {
+                                while ((c = out.read()) != -1) {
+                                    sb.append((char) c);
+                                }
+                            } catch (IOException e) {
+                                LOGGER.warn("Could not read from stderr.", e);
+                            }
+                            // Error stream has been closed. See if there were any errors:
+                            if (!sb.toString().trim().isEmpty()) {
+                                LOGGER.warn("Push to Vim error: {}", sb);
+                                couldNotPush = true;
+                            }
+                        } catch (IOException e) {
+                            LOGGER.warn("Error handling std streams", e);
                         }
-                    } catch (IOException e) {
-                        LOGGER.warn("Could not read from stderr.", e);
-                    }
-                    // Error stream has been closed. See if there were any errors:
-                    if (!sb.toString().trim().isEmpty()) {
-                        LOGGER.warn("Push to Vim error: {}", sb);
-                        couldNotPush = true;
-                    }
-                } catch (IOException e) {
-                    LOGGER.warn("Error handling std streams", e);
-                }
-            });
+                    });
         } catch (IOException excep) {
             LOGGER.warn("Problem pushing to Vim.", excep);
             couldNotCall = true;
@@ -96,10 +107,12 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
     @Override
     public void onOperationCompleted() {
         if (couldNotPush) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Error pushing entries"),
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Error pushing entries"),
                     Localization.lang("Could not push to a running Vim server."));
         } else if (couldNotCall) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Error pushing entries"),
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Error pushing entries"),
                     Localization.lang("Could not run the 'vim' program."));
         } else {
             super.onOperationCompleted();
diff --git a/src/main/java/org/jabref/gui/push/PushToVimSettings.java b/src/main/java/org/jabref/gui/push/PushToVimSettings.java
index 724fae85eae9..1ad8fe7d3e82 100644
--- a/src/main/java/org/jabref/gui/push/PushToVimSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToVimSettings.java
@@ -11,10 +11,11 @@ public class PushToVimSettings extends PushToApplicationSettings {
 
     private final TextField vimServer = new TextField();
 
-    public PushToVimSettings(PushToApplication application,
-                             DialogService dialogService,
-                             FilePreferences filePreferences,
-                             PushToApplicationPreferences preferences) {
+    public PushToVimSettings(
+            PushToApplication application,
+            DialogService dialogService,
+            FilePreferences filePreferences,
+            PushToApplicationPreferences preferences) {
         super(application, dialogService, filePreferences, preferences);
 
         settingsPane.add(new Label(Localization.lang("Vim server name") + ":"), 0, 1);
diff --git a/src/main/java/org/jabref/gui/push/PushToWinEdt.java b/src/main/java/org/jabref/gui/push/PushToWinEdt.java
index 7545a75244ca..da3b686f560d 100644
--- a/src/main/java/org/jabref/gui/push/PushToWinEdt.java
+++ b/src/main/java/org/jabref/gui/push/PushToWinEdt.java
@@ -25,7 +25,13 @@ public JabRefIcon getApplicationIcon() {
 
     @Override
     protected String[] getCommandLine(String keyString) {
-        return new String[] {commandPath,
-                "\"[InsText('" + getCitePrefix() + keyString.replace("'", "''") + getCiteSuffix() + "');]\""};
+        return new String[] {
+            commandPath,
+            "\"[InsText('"
+                    + getCitePrefix()
+                    + keyString.replace("'", "''")
+                    + getCiteSuffix()
+                    + "');]\""
+        };
     }
 }
diff --git a/src/main/java/org/jabref/gui/remote/CLIMessageHandler.java b/src/main/java/org/jabref/gui/remote/CLIMessageHandler.java
index e42bcc2e3580..2387d5d83a6f 100644
--- a/src/main/java/org/jabref/gui/remote/CLIMessageHandler.java
+++ b/src/main/java/org/jabref/gui/remote/CLIMessageHandler.java
@@ -1,20 +1,19 @@
 package org.jabref.gui.remote;
 
-import java.util.Arrays;
-
 import javafx.application.Platform;
 
+import org.apache.commons.cli.ParseException;
 import org.jabref.cli.ArgumentProcessor;
 import org.jabref.gui.frame.UiMessageHandler;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.logic.remote.server.RemoteMessageHandler;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import org.apache.commons.cli.ParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+
 public class CLIMessageHandler implements RemoteMessageHandler {
     private static final Logger LOGGER = LoggerFactory.getLogger(CLIMessageHandler.class);
 
@@ -23,10 +22,11 @@ public class CLIMessageHandler implements RemoteMessageHandler {
     private final BibEntryTypesManager entryTypesManager;
     private final UiMessageHandler uiMessageHandler;
 
-    public CLIMessageHandler(UiMessageHandler uiMessageHandler,
-                             GuiPreferences preferences,
-                             FileUpdateMonitor fileUpdateMonitor,
-                             BibEntryTypesManager entryTypesManager) {
+    public CLIMessageHandler(
+            UiMessageHandler uiMessageHandler,
+            GuiPreferences preferences,
+            FileUpdateMonitor fileUpdateMonitor,
+            BibEntryTypesManager entryTypesManager) {
         this.uiMessageHandler = uiMessageHandler;
         this.preferences = preferences;
         this.fileUpdateMonitor = fileUpdateMonitor;
@@ -37,15 +37,17 @@ public CLIMessageHandler(UiMessageHandler uiMessageHandler,
     public void handleCommandLineArguments(String[] message) {
         try {
             LOGGER.info("Processing message {}", Arrays.stream(message).toList());
-            ArgumentProcessor argumentProcessor = new ArgumentProcessor(
-                    message,
-                    ArgumentProcessor.Mode.REMOTE_START,
-                    preferences,
-                    preferences,
-                    fileUpdateMonitor,
-                    entryTypesManager);
+            ArgumentProcessor argumentProcessor =
+                    new ArgumentProcessor(
+                            message,
+                            ArgumentProcessor.Mode.REMOTE_START,
+                            preferences,
+                            preferences,
+                            fileUpdateMonitor,
+                            entryTypesManager);
             argumentProcessor.processArguments();
-            Platform.runLater(() -> uiMessageHandler.handleUiCommands(argumentProcessor.getUiCommands()));
+            Platform.runLater(
+                    () -> uiMessageHandler.handleUiCommands(argumentProcessor.getUiCommands()));
         } catch (ParseException e) {
             LOGGER.error("Error when parsing CLI args", e);
         }
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index cc87b5cfd179..a94cc9528f33 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -1,15 +1,10 @@
 package org.jabref.gui.search;
 
-import java.lang.reflect.Field;
-import java.time.Duration;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
 
-import javax.swing.undo.UndoManager;
+import com.tobiasdiez.easybind.EasyBind;
+
+import impl.org.controlsfx.skin.AutoCompletePopup;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -41,6 +36,8 @@
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
 
+import org.controlsfx.control.textfield.AutoCompletionBinding;
+import org.controlsfx.control.textfield.CustomTextField;
 import org.jabref.architecture.AllowedToUseClassGetResource;
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
@@ -66,17 +63,21 @@
 import org.jabref.model.entry.Author;
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.search.SearchQuery;
-
-import com.tobiasdiez.easybind.EasyBind;
-import impl.org.controlsfx.skin.AutoCompletePopup;
-import org.controlsfx.control.textfield.AutoCompletionBinding;
-import org.controlsfx.control.textfield.CustomTextField;
 import org.reactfx.util.FxTimer;
 import org.reactfx.util.Timer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import java.lang.reflect.Field;
+import java.time.Duration;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+import javax.swing.undo.UndoManager;
 
 public class GlobalSearchBar extends HBox {
 
@@ -102,12 +103,13 @@ public class GlobalSearchBar extends HBox {
     private GlobalSearchResultDialog globalSearchResultDialog;
     private final SearchType searchType;
 
-    public GlobalSearchBar(LibraryTabContainer tabContainer,
-                           StateManager stateManager,
-                           GuiPreferences preferences,
-                           UndoManager undoManager,
-                           DialogService dialogService,
-                           SearchType searchType) {
+    public GlobalSearchBar(
+            LibraryTabContainer tabContainer,
+            StateManager stateManager,
+            GuiPreferences preferences,
+            UndoManager undoManager,
+            DialogService dialogService,
+            SearchType searchType) {
         super();
         this.stateManager = stateManager;
         this.preferences = preferences;
@@ -124,53 +126,71 @@ public GlobalSearchBar(LibraryTabContainer tabContainer,
         searchField.disableProperty().bind(needsDatabase(stateManager).not());
 
         Label currentResults = new Label();
-        // fits the standard "found x entries"-message thus hinders the searchbar to jump around while searching if the tabContainer width is too small
+        // fits the standard "found x entries"-message thus hinders the searchbar to jump around
+        // while searching if the tabContainer width is too small
         currentResults.setPrefWidth(150);
 
-        currentResults.textProperty().bind(EasyBind.combine(
-                stateManager.activeSearchQuery(searchType), stateManager.searchResultSize(searchType), illegalSearch,
-                (searchQuery, matched, illegal) -> {
-                    if (illegal) {
-                        searchField.pseudoClassStateChanged(ILLEGAL_SEARCH, true);
-                        return Localization.lang("Search failed: illegal search expression");
-                    } else if (searchQuery.isEmpty()) {
-                        searchField.pseudoClassStateChanged(ILLEGAL_SEARCH, false);
-                        return "";
-                    } else if (matched.intValue() == 0) {
-                        searchField.pseudoClassStateChanged(ILLEGAL_SEARCH, false);
-                        return Localization.lang("No results found.");
-                    } else {
-                        searchField.pseudoClassStateChanged(ILLEGAL_SEARCH, false);
-                        return Localization.lang("Found %0 results.", String.valueOf(matched));
-                    }
-                }
-        ));
+        currentResults
+                .textProperty()
+                .bind(
+                        EasyBind.combine(
+                                stateManager.activeSearchQuery(searchType),
+                                stateManager.searchResultSize(searchType),
+                                illegalSearch,
+                                (searchQuery, matched, illegal) -> {
+                                    if (illegal) {
+                                        searchField.pseudoClassStateChanged(ILLEGAL_SEARCH, true);
+                                        return Localization.lang(
+                                                "Search failed: illegal search expression");
+                                    } else if (searchQuery.isEmpty()) {
+                                        searchField.pseudoClassStateChanged(ILLEGAL_SEARCH, false);
+                                        return "";
+                                    } else if (matched.intValue() == 0) {
+                                        searchField.pseudoClassStateChanged(ILLEGAL_SEARCH, false);
+                                        return Localization.lang("No results found.");
+                                    } else {
+                                        searchField.pseudoClassStateChanged(ILLEGAL_SEARCH, false);
+                                        return Localization.lang(
+                                                "Found %0 results.", String.valueOf(matched));
+                                    }
+                                }));
 
         searchField.setTooltip(searchFieldTooltip);
         searchFieldTooltip.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
         searchFieldTooltip.setMaxHeight(10);
         updateHintVisibility();
 
-        searchField.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            if (keyBindingRepository.matches(event, KeyBinding.CLEAR_SEARCH)) {
-                searchField.clear();
-                if (searchType == SearchType.NORMAL_SEARCH) {
-                    LibraryTab currentLibraryTab = tabContainer.getCurrentLibraryTab();
-                    if (currentLibraryTab != null) {
-                        currentLibraryTab.getMainTable().requestFocus();
+        searchField.addEventFilter(
+                KeyEvent.KEY_PRESSED,
+                event -> {
+                    if (keyBindingRepository.matches(event, KeyBinding.CLEAR_SEARCH)) {
+                        searchField.clear();
+                        if (searchType == SearchType.NORMAL_SEARCH) {
+                            LibraryTab currentLibraryTab = tabContainer.getCurrentLibraryTab();
+                            if (currentLibraryTab != null) {
+                                currentLibraryTab.getMainTable().requestFocus();
+                            }
+                        }
+                        event.consume();
                     }
-                }
-                event.consume();
-            }
-        });
+                });
 
         ClipBoardManager.addX11Support(searchField);
 
         searchField.setContextMenu(SearchFieldRightClickMenu.create(stateManager, searchField));
-        stateManager.getWholeSearchHistory().addListener((ListChangeListener.Change<? extends String> change) -> {
-            searchField.getContextMenu().getItems().removeLast();
-            searchField.getContextMenu().getItems().add(SearchFieldRightClickMenu.createSearchFromHistorySubMenu(stateManager, searchField));
-        });
+        stateManager
+                .getWholeSearchHistory()
+                .addListener(
+                        (ListChangeListener.Change<? extends String> change) -> {
+                            searchField.getContextMenu().getItems().removeLast();
+                            searchField
+                                    .getContextMenu()
+                                    .getItems()
+                                    .add(
+                                            SearchFieldRightClickMenu
+                                                    .createSearchFromHistorySubMenu(
+                                                            stateManager, searchField));
+                        });
 
         fulltextButton = IconTheme.JabRefIcons.FULLTEXT.asToggleButton();
         openGlobalSearchButton = IconTheme.JabRefIcons.OPEN_GLOBAL_SEARCH.asButton();
@@ -179,11 +199,13 @@ public GlobalSearchBar(LibraryTabContainer tabContainer,
 
         initSearchModifierButtons();
 
-        BooleanBinding focusedOrActive = searchField.focusedProperty()
-                                                    .or(fulltextButton.focusedProperty())
-                                                    .or(keepSearchString.focusedProperty())
-                                                    .or(filterModeButton.focusedProperty())
-                                                    .or(searchField.textProperty().isNotEmpty());
+        BooleanBinding focusedOrActive =
+                searchField
+                        .focusedProperty()
+                        .or(fulltextButton.focusedProperty())
+                        .or(keepSearchString.focusedProperty())
+                        .or(filterModeButton.focusedProperty())
+                        .or(searchField.textProperty().isNotEmpty());
 
         fulltextButton.visibleProperty().unbind();
         fulltextButton.visibleProperty().bind(focusedOrActive);
@@ -194,7 +216,8 @@ public GlobalSearchBar(LibraryTabContainer tabContainer,
 
         StackPane modifierButtons;
         if (searchType == SearchType.NORMAL_SEARCH) {
-            modifierButtons = new StackPane(new HBox(fulltextButton, keepSearchString, filterModeButton));
+            modifierButtons =
+                    new StackPane(new HBox(fulltextButton, keepSearchString, filterModeButton));
         } else {
             modifierButtons = new StackPane(new HBox(fulltextButton));
         }
@@ -221,7 +244,12 @@ public GlobalSearchBar(LibraryTabContainer tabContainer,
                     // Async update
                     searchTask.restart();
                 },
-                query -> setSearchTerm(query.orElseGet(() -> new SearchQuery("", EnumSet.noneOf(SearchFlags.class)))));
+                query ->
+                        setSearchTerm(
+                                query.orElseGet(
+                                        () ->
+                                                new SearchQuery(
+                                                        "", EnumSet.noneOf(SearchFlags.class)))));
 
         /*
          * The listener tracks a change on the focus property value.
@@ -229,68 +257,98 @@ public GlobalSearchBar(LibraryTabContainer tabContainer,
          * lost (e.g., user selects an entry or triggers the search).
          * The search history should only be filled, if focus is lost.
          */
-        searchField.focusedProperty().addListener((obs, oldValue, newValue) -> {
-            // Focus lost can be derived by checking that there is no newValue (or the text is empty)
-            if (oldValue && !(newValue || searchField.getText().isBlank())) {
-                this.stateManager.addSearchHistory(searchField.textProperty().get());
-            }
-        });
+        searchField
+                .focusedProperty()
+                .addListener(
+                        (obs, oldValue, newValue) -> {
+                            // Focus lost can be derived by checking that there is no newValue (or
+                            // the text is empty)
+                            if (oldValue && !(newValue || searchField.getText().isBlank())) {
+                                this.stateManager.addSearchHistory(
+                                        searchField.textProperty().get());
+                            }
+                        });
     }
 
     private void initSearchModifierButtons() {
         fulltextButton.setTooltip(new Tooltip(Localization.lang("Fulltext search")));
         initSearchModifierButton(fulltextButton);
 
-        EasyBind.subscribe(filePreferences.fulltextIndexLinkedFilesProperty(), enabled -> {
-            if (!enabled) {
-                fulltextButton.setSelected(false);
-            } else if (searchPreferences.isFulltext()) {
-                fulltextButton.setSelected(true);
-            }
-        });
-
-        fulltextButton.selectedProperty().addListener((obs, oldVal, newVal) -> {
-            if (!filePreferences.shouldFulltextIndexLinkedFiles() && newVal) {
-                boolean enableFulltextSearch = dialogService.showConfirmationDialogAndWait(Localization.lang("Fulltext search"), Localization.lang("Fulltext search requires the setting 'Automatically index all linked files for fulltext search' to be enabled. Do you want to enable indexing now?"), Localization.lang("Enable indexing"), Localization.lang("Keep disabled"));
-
-                LibraryTab libraryTab = tabContainer.getCurrentLibraryTab();
-                if (libraryTab != null && enableFulltextSearch) {
-                    filePreferences.setFulltextIndexLinkedFiles(true);
-                    searchPreferences.setSearchFlag(SearchFlags.FULLTEXT, true);
-                }
-                if (!enableFulltextSearch) {
-                    fulltextButton.setSelected(false);
-                    searchPreferences.setSearchFlag(SearchFlags.FULLTEXT, false);
-                }
-            } else {
-                searchPreferences.setSearchFlag(SearchFlags.FULLTEXT, newVal);
-            }
-            searchField.requestFocus();
-            updateSearchQuery();
-        });
+        EasyBind.subscribe(
+                filePreferences.fulltextIndexLinkedFilesProperty(),
+                enabled -> {
+                    if (!enabled) {
+                        fulltextButton.setSelected(false);
+                    } else if (searchPreferences.isFulltext()) {
+                        fulltextButton.setSelected(true);
+                    }
+                });
+
+        fulltextButton
+                .selectedProperty()
+                .addListener(
+                        (obs, oldVal, newVal) -> {
+                            if (!filePreferences.shouldFulltextIndexLinkedFiles() && newVal) {
+                                boolean enableFulltextSearch =
+                                        dialogService.showConfirmationDialogAndWait(
+                                                Localization.lang("Fulltext search"),
+                                                Localization.lang(
+                                                        "Fulltext search requires the setting 'Automatically index all linked files for fulltext search' to be enabled. Do you want to enable indexing now?"),
+                                                Localization.lang("Enable indexing"),
+                                                Localization.lang("Keep disabled"));
+
+                                LibraryTab libraryTab = tabContainer.getCurrentLibraryTab();
+                                if (libraryTab != null && enableFulltextSearch) {
+                                    filePreferences.setFulltextIndexLinkedFiles(true);
+                                    searchPreferences.setSearchFlag(SearchFlags.FULLTEXT, true);
+                                }
+                                if (!enableFulltextSearch) {
+                                    fulltextButton.setSelected(false);
+                                    searchPreferences.setSearchFlag(SearchFlags.FULLTEXT, false);
+                                }
+                            } else {
+                                searchPreferences.setSearchFlag(SearchFlags.FULLTEXT, newVal);
+                            }
+                            searchField.requestFocus();
+                            updateSearchQuery();
+                        });
 
         keepSearchString.setSelected(searchPreferences.shouldKeepSearchString());
-        keepSearchString.setTooltip(new Tooltip(Localization.lang("Keep search string across libraries")));
+        keepSearchString.setTooltip(
+                new Tooltip(Localization.lang("Keep search string across libraries")));
         initSearchModifierButton(keepSearchString);
-        keepSearchString.selectedProperty().addListener((obs, oldVal, newVal) -> {
-            searchPreferences.setKeepSearchString(newVal);
-            searchField.requestFocus();
-        });
-
-        filterModeButton.setSelected(searchPreferences.getSearchDisplayMode() == SearchDisplayMode.FILTER);
+        keepSearchString
+                .selectedProperty()
+                .addListener(
+                        (obs, oldVal, newVal) -> {
+                            searchPreferences.setKeepSearchString(newVal);
+                            searchField.requestFocus();
+                        });
+
+        filterModeButton.setSelected(
+                searchPreferences.getSearchDisplayMode() == SearchDisplayMode.FILTER);
         filterModeButton.setTooltip(new Tooltip(Localization.lang("Filter search results")));
         initSearchModifierButton(filterModeButton);
-        filterModeButton.setOnAction(event -> {
-            searchPreferences.setSearchDisplayMode(filterModeButton.isSelected() ? SearchDisplayMode.FILTER : SearchDisplayMode.FLOAT);
-            searchField.requestFocus();
-        });
+        filterModeButton.setOnAction(
+                event -> {
+                    searchPreferences.setSearchDisplayMode(
+                            filterModeButton.isSelected()
+                                    ? SearchDisplayMode.FILTER
+                                    : SearchDisplayMode.FLOAT);
+                    searchField.requestFocus();
+                });
 
         openGlobalSearchButton.disableProperty().bindBidirectional(globalSearchActive);
-        openGlobalSearchButton.setTooltip(new Tooltip(Localization.lang("Search across libraries in a new window")));
+        openGlobalSearchButton.setTooltip(
+                new Tooltip(Localization.lang("Search across libraries in a new window")));
         initSearchModifierButton(openGlobalSearchButton);
         openGlobalSearchButton.setOnAction(evt -> openGlobalSearchDialog());
 
-        searchPreferences.getObservableSearchFlags().addListener((SetChangeListener.Change<? extends SearchFlags> change) -> fulltextButton.setSelected(searchPreferences.isFulltext()));
+        searchPreferences
+                .getObservableSearchFlags()
+                .addListener(
+                        (SetChangeListener.Change<? extends SearchFlags> change) ->
+                                fulltextButton.setSelected(searchPreferences.isFulltext()));
     }
 
     public void openGlobalSearchDialog() {
@@ -301,8 +359,14 @@ public void openGlobalSearchDialog() {
         if (globalSearchResultDialog == null) {
             globalSearchResultDialog = new GlobalSearchResultDialog(undoManager, tabContainer);
         }
-        stateManager.activeSearchQuery(SearchType.NORMAL_SEARCH).get().ifPresent(query ->
-                stateManager.activeSearchQuery(SearchType.GLOBAL_SEARCH).set(Optional.of(query)));
+        stateManager
+                .activeSearchQuery(SearchType.NORMAL_SEARCH)
+                .get()
+                .ifPresent(
+                        query ->
+                                stateManager
+                                        .activeSearchQuery(SearchType.GLOBAL_SEARCH)
+                                        .set(Optional.of(query)));
         updateSearchQuery();
         dialogService.showCustomDialogAndWait(globalSearchResultDialog);
         globalSearchActive.setValue(false);
@@ -341,7 +405,8 @@ public void updateSearchQuery() {
             return;
         }
 
-        SearchQuery searchQuery = new SearchQuery(this.searchField.getText(), searchPreferences.getSearchFlags());
+        SearchQuery searchQuery =
+                new SearchQuery(this.searchField.getText(), searchPreferences.getSearchFlags());
         if (!searchQuery.isValid()) {
             illegalSearch.set(true);
             return;
@@ -363,10 +428,13 @@ private boolean validRegex() {
 
     public void setAutoCompleter(SuggestionProvider<Author> searchCompleter) {
         if (preferences.getAutoCompletePreferences().shouldAutoComplete()) {
-            AutoCompletionTextInputBinding<Author> autoComplete = AutoCompletionTextInputBinding.autoComplete(searchField,
-                    searchCompleter::provideSuggestions,
-                    new PersonNameStringConverter(false, false, AutoCompleteFirstNameMode.BOTH),
-                    new AppendPersonNamesStrategy());
+            AutoCompletionTextInputBinding<Author> autoComplete =
+                    AutoCompletionTextInputBinding.autoComplete(
+                            searchField,
+                            searchCompleter::provideSuggestions,
+                            new PersonNameStringConverter(
+                                    false, false, AutoCompleteFirstNameMode.BOTH),
+                            new AppendPersonNamesStrategy());
             AutoCompletePopup<Author> popup = getPopup(autoComplete);
             popup.setSkin(new SearchPopupSkin<>(popup));
         }
@@ -379,7 +447,8 @@ public void setAutoCompleter(SuggestionProvider<Author> searchCompleter) {
     private <T> AutoCompletePopup<T> getPopup(AutoCompletionBinding<T> autoCompletionBinding) {
         try {
             // TODO: reflective access, should be removed
-            Field privatePopup = AutoCompletionBinding.class.getDeclaredField("autoCompletionPopup");
+            Field privatePopup =
+                    AutoCompletionBinding.class.getDeclaredField("autoCompletionPopup");
             privatePopup.setAccessible(true);
             return (AutoCompletePopup<T>) privatePopup.get(autoCompletionBinding);
         } catch (IllegalAccessException | NoSuchFieldException e) {
@@ -390,8 +459,11 @@ private <T> AutoCompletePopup<T> getPopup(AutoCompletionBinding<T> autoCompletio
 
     public void updateHintVisibility() {
         if (preferences.getWorkspacePreferences().shouldShowAdvancedHints()) {
-            String genericDescription = Localization.lang("Hint:\n\nTo search all fields for <b>Smith</b>, enter:\n<tt>smith</tt>\n\nTo search the field <b>author</b> for <b>Smith</b> and the field <b>title</b> for <b>electrical</b>, enter:\n<tt>author:Smith AND title:electrical</tt>");
-            List<Text> genericDescriptionTexts = TooltipTextUtil.createTextsFromHtml(genericDescription);
+            String genericDescription =
+                    Localization.lang(
+                            "Hint:\n\nTo search all fields for <b>Smith</b>, enter:\n<tt>smith</tt>\n\nTo search the field <b>author</b> for <b>Smith</b> and the field <b>title</b> for <b>electrical</b>, enter:\n<tt>author:Smith AND title:electrical</tt>");
+            List<Text> genericDescriptionTexts =
+                    TooltipTextUtil.createTextsFromHtml(genericDescription);
 
             TextFlow emptyHintTooltip = new TextFlow();
             emptyHintTooltip.getChildren().setAll(genericDescriptionTexts);
@@ -418,9 +490,23 @@ public SearchPopupSkin(AutoCompletePopup<T> control) {
             this.control = control;
             this.suggestionList = new ListView<>(control.getSuggestions());
             this.suggestionList.getStyleClass().add("auto-complete-popup");
-            this.suggestionList.getStylesheets().add(Objects.requireNonNull(AutoCompletionBinding.class.getResource("autocompletion.css")).toExternalForm());
-            this.suggestionList.prefHeightProperty().bind(Bindings.min(control.visibleRowCountProperty(), Bindings.size(this.suggestionList.getItems())).multiply(24).add(18));
-            this.suggestionList.setCellFactory(TextFieldListCell.forListView(control.getConverter()));
+            this.suggestionList
+                    .getStylesheets()
+                    .add(
+                            Objects.requireNonNull(
+                                            AutoCompletionBinding.class.getResource(
+                                                    "autocompletion.css"))
+                                    .toExternalForm());
+            this.suggestionList
+                    .prefHeightProperty()
+                    .bind(
+                            Bindings.min(
+                                            control.visibleRowCountProperty(),
+                                            Bindings.size(this.suggestionList.getItems()))
+                                    .multiply(24)
+                                    .add(18));
+            this.suggestionList.setCellFactory(
+                    TextFieldListCell.forListView(control.getConverter()));
             this.suggestionList.prefWidthProperty().bind(control.prefWidthProperty());
             this.suggestionList.maxWidthProperty().bind(control.maxWidthProperty());
             this.suggestionList.minWidthProperty().bind(control.minWidthProperty());
@@ -432,26 +518,30 @@ public SearchPopupSkin(AutoCompletePopup<T> control) {
         }
 
         private void registerEventListener() {
-            this.suggestionList.setOnMouseClicked(me -> {
-                if (me.getButton() == MouseButton.PRIMARY) {
-                    this.onSuggestionChosen(this.suggestionList.getSelectionModel().getSelectedItem());
-                }
-            });
-            this.suggestionList.setOnKeyPressed(ke -> {
-                switch (ke.getCode()) {
-                    case TAB:
-                    case ENTER:
-                        this.onSuggestionChosen(this.suggestionList.getSelectionModel().getSelectedItem());
-                        break;
-                    case ESCAPE:
-                        if (this.control.isHideOnEscape()) {
-                            this.control.hide();
+            this.suggestionList.setOnMouseClicked(
+                    me -> {
+                        if (me.getButton() == MouseButton.PRIMARY) {
+                            this.onSuggestionChosen(
+                                    this.suggestionList.getSelectionModel().getSelectedItem());
+                        }
+                    });
+            this.suggestionList.setOnKeyPressed(
+                    ke -> {
+                        switch (ke.getCode()) {
+                            case TAB:
+                            case ENTER:
+                                this.onSuggestionChosen(
+                                        this.suggestionList.getSelectionModel().getSelectedItem());
+                                break;
+                            case ESCAPE:
+                                if (this.control.isHideOnEscape()) {
+                                    this.control.hide();
+                                }
+                                break;
+                            default:
+                                break;
                         }
-                        break;
-                    default:
-                        break;
-                }
-            });
+                    });
         }
 
         private void onSuggestionChosen(T suggestion) {
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
index 87d72be77744..7e1584aa69e7 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
@@ -1,6 +1,10 @@
 package org.jabref.gui.search;
 
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.Subscription;
+
+import jakarta.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.SplitPane;
@@ -23,10 +27,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.TaskExecutor;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.Subscription;
-import jakarta.inject.Inject;
+import javax.swing.undo.UndoManager;
 
 public class GlobalSearchResultDialog extends BaseDialog<Void> {
 
@@ -37,8 +38,10 @@ public class GlobalSearchResultDialog extends BaseDialog<Void> {
     private final UndoManager undoManager;
     private final LibraryTabContainer libraryTabContainer;
 
-    // Reference needs to be kept, since java garbage collection would otherwise destroy the subscription
-    @SuppressWarnings("FieldCanBeLocal") private Subscription keepOnTopSubscription;
+    // Reference needs to be kept, since java garbage collection would otherwise destroy the
+    // subscription
+    @SuppressWarnings("FieldCanBeLocal")
+    private Subscription keepOnTopSubscription;
 
     @Inject private GuiPreferences preferences;
     @Inject private StateManager stateManager;
@@ -46,82 +49,139 @@ public class GlobalSearchResultDialog extends BaseDialog<Void> {
     @Inject private ThemeManager themeManager;
     @Inject private TaskExecutor taskExecutor;
 
-    public GlobalSearchResultDialog(UndoManager undoManager, LibraryTabContainer libraryTabContainer) {
+    public GlobalSearchResultDialog(
+            UndoManager undoManager, LibraryTabContainer libraryTabContainer) {
         this.undoManager = undoManager;
         this.libraryTabContainer = libraryTabContainer;
 
         setTitle(Localization.lang("Search results from open libraries"));
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
         initModality(Modality.NONE);
     }
 
     @FXML
     private void initialize() {
-        GlobalSearchResultDialogViewModel viewModel = new GlobalSearchResultDialogViewModel(preferences.getSearchPreferences());
-
-        GlobalSearchBar searchBar = new GlobalSearchBar(libraryTabContainer, stateManager, preferences, undoManager, dialogService, SearchType.GLOBAL_SEARCH);
+        GlobalSearchResultDialogViewModel viewModel =
+                new GlobalSearchResultDialogViewModel(preferences.getSearchPreferences());
+
+        GlobalSearchBar searchBar =
+                new GlobalSearchBar(
+                        libraryTabContainer,
+                        stateManager,
+                        preferences,
+                        undoManager,
+                        dialogService,
+                        SearchType.GLOBAL_SEARCH);
         searchBarContainer.getChildren().addFirst(searchBar);
         HBox.setHgrow(searchBar, Priority.ALWAYS);
 
-        PreviewViewer previewViewer = new PreviewViewer(viewModel.getSearchDatabaseContext(), dialogService, preferences, themeManager, taskExecutor, stateManager.activeSearchQuery(SearchType.GLOBAL_SEARCH));
+        PreviewViewer previewViewer =
+                new PreviewViewer(
+                        viewModel.getSearchDatabaseContext(),
+                        dialogService,
+                        preferences,
+                        themeManager,
+                        taskExecutor,
+                        stateManager.activeSearchQuery(SearchType.GLOBAL_SEARCH));
         previewViewer.setLayout(preferences.getPreviewPreferences().getSelectedPreviewLayout());
 
-        SearchResultsTableDataModel model = new SearchResultsTableDataModel(viewModel.getSearchDatabaseContext(), preferences, stateManager, taskExecutor);
-        SearchResultsTable resultsTable = new SearchResultsTable(model, viewModel.getSearchDatabaseContext(), preferences, undoManager, dialogService, stateManager, taskExecutor);
+        SearchResultsTableDataModel model =
+                new SearchResultsTableDataModel(
+                        viewModel.getSearchDatabaseContext(),
+                        preferences,
+                        stateManager,
+                        taskExecutor);
+        SearchResultsTable resultsTable =
+                new SearchResultsTable(
+                        model,
+                        viewModel.getSearchDatabaseContext(),
+                        preferences,
+                        undoManager,
+                        dialogService,
+                        stateManager,
+                        taskExecutor);
 
         resultsTable.getColumns().removeIf(SpecialFieldColumn.class::isInstance);
 
-        resultsTable.getSelectionModel().selectedItemProperty().addListener((obs, oldValue, newValue) -> {
-            if (newValue != null) {
-                previewViewer.setEntry(newValue.getEntry());
-            } else {
-                previewViewer.setEntry(oldValue.getEntry());
-            }
-        });
+        resultsTable
+                .getSelectionModel()
+                .selectedItemProperty()
+                .addListener(
+                        (obs, oldValue, newValue) -> {
+                            if (newValue != null) {
+                                previewViewer.setEntry(newValue.getEntry());
+                            } else {
+                                previewViewer.setEntry(oldValue.getEntry());
+                            }
+                        });
 
         Stage stage = (Stage) getDialogPane().getScene().getWindow();
 
-        resultsTable.setOnMouseClicked(event -> {
-            if (event.getClickCount() == 2) {
-                BibEntryTableViewModel selectedEntry = resultsTable.getSelectionModel().getSelectedItem();
-                if (selectedEntry == null) {
-                    return;
-                }
-                libraryTabContainer.getLibraryTabs().stream()
-                                   .filter(tab -> tab.getBibDatabaseContext().equals(selectedEntry.getBibDatabaseContext()))
-                                   .findFirst()
-                                   .ifPresent(libraryTabContainer::showLibraryTab);
-
-                stateManager.activeSearchQuery(SearchType.NORMAL_SEARCH).set(stateManager.activeSearchQuery(SearchType.GLOBAL_SEARCH).get());
-                stateManager.activeTabProperty().get().ifPresent(tab -> tab.clearAndSelect(selectedEntry.getEntry()));
-                stage.close();
-            }
-        });
+        resultsTable.setOnMouseClicked(
+                event -> {
+                    if (event.getClickCount() == 2) {
+                        BibEntryTableViewModel selectedEntry =
+                                resultsTable.getSelectionModel().getSelectedItem();
+                        if (selectedEntry == null) {
+                            return;
+                        }
+                        libraryTabContainer.getLibraryTabs().stream()
+                                .filter(
+                                        tab ->
+                                                tab.getBibDatabaseContext()
+                                                        .equals(
+                                                                selectedEntry
+                                                                        .getBibDatabaseContext()))
+                                .findFirst()
+                                .ifPresent(libraryTabContainer::showLibraryTab);
+
+                        stateManager
+                                .activeSearchQuery(SearchType.NORMAL_SEARCH)
+                                .set(
+                                        stateManager
+                                                .activeSearchQuery(SearchType.GLOBAL_SEARCH)
+                                                .get());
+                        stateManager
+                                .activeTabProperty()
+                                .get()
+                                .ifPresent(tab -> tab.clearAndSelect(selectedEntry.getEntry()));
+                        stage.close();
+                    }
+                });
 
         container.getItems().addAll(resultsTable, previewViewer);
 
         keepOnTop.selectedProperty().bindBidirectional(viewModel.keepOnTop());
 
-        keepOnTopSubscription = EasyBind.subscribe(viewModel.keepOnTop(), value -> {
-            stage.setAlwaysOnTop(value);
-            keepOnTop.setGraphic(value
-                    ? IconTheme.JabRefIcons.KEEP_ON_TOP.getGraphicNode()
-                    : IconTheme.JabRefIcons.KEEP_ON_TOP_OFF.getGraphicNode());
-        });
-
-        stage.setOnShown(event -> {
-            stage.setHeight(preferences.getSearchPreferences().getSearchWindowHeight());
-            stage.setWidth(preferences.getSearchPreferences().getSearchWindowWidth());
-            container.setDividerPositions(preferences.getSearchPreferences().getSearchWindowDividerPosition());
-            searchBar.requestFocus();
-        });
-
-        stage.setOnHidden(event -> {
-            preferences.getSearchPreferences().setSearchWindowHeight(getHeight());
-            preferences.getSearchPreferences().setSearchWindowWidth(getWidth());
-            preferences.getSearchPreferences().setSearchWindowDividerPosition(container.getDividers().getFirst().getPosition());
-        });
+        keepOnTopSubscription =
+                EasyBind.subscribe(
+                        viewModel.keepOnTop(),
+                        value -> {
+                            stage.setAlwaysOnTop(value);
+                            keepOnTop.setGraphic(
+                                    value
+                                            ? IconTheme.JabRefIcons.KEEP_ON_TOP.getGraphicNode()
+                                            : IconTheme.JabRefIcons.KEEP_ON_TOP_OFF
+                                                    .getGraphicNode());
+                        });
+
+        stage.setOnShown(
+                event -> {
+                    stage.setHeight(preferences.getSearchPreferences().getSearchWindowHeight());
+                    stage.setWidth(preferences.getSearchPreferences().getSearchWindowWidth());
+                    container.setDividerPositions(
+                            preferences.getSearchPreferences().getSearchWindowDividerPosition());
+                    searchBar.requestFocus();
+                });
+
+        stage.setOnHidden(
+                event -> {
+                    preferences.getSearchPreferences().setSearchWindowHeight(getHeight());
+                    preferences.getSearchPreferences().setSearchWindowWidth(getWidth());
+                    preferences
+                            .getSearchPreferences()
+                            .setSearchWindowDividerPosition(
+                                    container.getDividers().getFirst().getPosition());
+                });
     }
 }
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java
index 7c267c2396c6..ced418cf7a69 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.search;
 
+import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 
 import org.jabref.logic.search.SearchPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class GlobalSearchResultDialogViewModel {
     private final BibDatabaseContext searchDatabaseContext = new BibDatabaseContext();
     private final BooleanProperty keepOnTop = new SimpleBooleanProperty();
diff --git a/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java b/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java
index c623edb60e4b..73c621933985 100644
--- a/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java
+++ b/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.search;
 
-import java.util.function.Supplier;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
@@ -9,7 +9,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.preferences.CliPreferences;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import java.util.function.Supplier;
 
 public class RebuildFulltextSearchIndexAction extends SimpleCommand {
 
@@ -18,14 +18,17 @@ public class RebuildFulltextSearchIndexAction extends SimpleCommand {
     private final Supplier<LibraryTab> tabSupplier;
     private boolean shouldContinue = true;
 
-    public RebuildFulltextSearchIndexAction(StateManager stateManager,
-                                            Supplier<LibraryTab> tabSupplier,
-                                            DialogService dialogService,
-                                            CliPreferences preferences) {
+    public RebuildFulltextSearchIndexAction(
+            StateManager stateManager,
+            Supplier<LibraryTab> tabSupplier,
+            DialogService dialogService,
+            CliPreferences preferences) {
         this.stateManager = stateManager;
         this.dialogService = dialogService;
         this.tabSupplier = tabSupplier;
-        this.executable.bind(needsDatabase(stateManager).and(preferences.getFilePreferences().fulltextIndexLinkedFilesProperty()));
+        this.executable.bind(
+                needsDatabase(stateManager)
+                        .and(preferences.getFilePreferences().fulltextIndexLinkedFilesProperty()));
     }
 
     @Override
@@ -39,9 +42,10 @@ public void init() {
             return;
         }
 
-        boolean confirm = dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Rebuild fulltext search index"),
-                Localization.lang("Rebuild fulltext search index for current library?"));
+        boolean confirm =
+                dialogService.showConfirmationDialogAndWait(
+                        Localization.lang("Rebuild fulltext search index"),
+                        Localization.lang("Rebuild fulltext search index for current library?"));
         if (!confirm) {
             shouldContinue = false;
             return;
diff --git a/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java b/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java
index 1d2a64ad0b5c..0c1952290b56 100644
--- a/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java
+++ b/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java
@@ -1,12 +1,11 @@
 package org.jabref.gui.search;
 
-import java.util.List;
-
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
 
+import org.controlsfx.control.textfield.CustomTextField;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.SimpleCommand;
@@ -14,29 +13,47 @@
 import org.jabref.gui.fieldeditors.contextmenu.EditorContextAction;
 import org.jabref.logic.l10n.Localization;
 
-import org.controlsfx.control.textfield.CustomTextField;
+import java.util.List;
 
 public class SearchFieldRightClickMenu {
     public static ContextMenu create(StateManager stateManager, CustomTextField searchField) {
         ActionFactory factory = new ActionFactory();
         ContextMenu contextMenu = new ContextMenu();
 
-        contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.UNDO, new EditorContextAction(StandardActions.UNDO, searchField)),
-                factory.createMenuItem(StandardActions.REDO, new EditorContextAction(StandardActions.REDO, searchField)),
-                factory.createMenuItem(StandardActions.CUT, new EditorContextAction(StandardActions.CUT, searchField)),
-                factory.createMenuItem(StandardActions.COPY, new EditorContextAction(StandardActions.COPY, searchField)),
-                factory.createMenuItem(StandardActions.PASTE, new EditorContextAction(StandardActions.PASTE, searchField)),
-                factory.createMenuItem(StandardActions.DELETE, new EditorContextAction(StandardActions.DELETE, searchField)),
-                factory.createMenuItem(StandardActions.SELECT_ALL, new EditorContextAction(StandardActions.SELECT_ALL, searchField)),
-                new SeparatorMenuItem(),
-                createSearchFromHistorySubMenu(stateManager, searchField));
+        contextMenu
+                .getItems()
+                .addAll(
+                        factory.createMenuItem(
+                                StandardActions.UNDO,
+                                new EditorContextAction(StandardActions.UNDO, searchField)),
+                        factory.createMenuItem(
+                                StandardActions.REDO,
+                                new EditorContextAction(StandardActions.REDO, searchField)),
+                        factory.createMenuItem(
+                                StandardActions.CUT,
+                                new EditorContextAction(StandardActions.CUT, searchField)),
+                        factory.createMenuItem(
+                                StandardActions.COPY,
+                                new EditorContextAction(StandardActions.COPY, searchField)),
+                        factory.createMenuItem(
+                                StandardActions.PASTE,
+                                new EditorContextAction(StandardActions.PASTE, searchField)),
+                        factory.createMenuItem(
+                                StandardActions.DELETE,
+                                new EditorContextAction(StandardActions.DELETE, searchField)),
+                        factory.createMenuItem(
+                                StandardActions.SELECT_ALL,
+                                new EditorContextAction(StandardActions.SELECT_ALL, searchField)),
+                        new SeparatorMenuItem(),
+                        createSearchFromHistorySubMenu(stateManager, searchField));
         return contextMenu;
     }
 
-    public static Menu createSearchFromHistorySubMenu(StateManager stateManager, CustomTextField searchField) {
+    public static Menu createSearchFromHistorySubMenu(
+            StateManager stateManager, CustomTextField searchField) {
         ActionFactory factory = new ActionFactory();
-        Menu searchFromHistorySubMenu = factory.createMenu(() -> Localization.lang("Search from history..."));
+        Menu searchFromHistorySubMenu =
+                factory.createMenu(() -> Localization.lang("Search from history..."));
 
         final int numberOfLastQueries = 10;
         List<String> searchHistory = stateManager.getLastSearchHistory(numberOfLastQueries);
@@ -45,20 +62,26 @@ public static Menu createSearchFromHistorySubMenu(StateManager stateManager, Cus
             searchFromHistorySubMenu.getItems().add(item);
         } else {
             for (String query : searchHistory) {
-                MenuItem item = factory.createMenuItem(() -> query, new SimpleCommand() {
-                    @Override
-                    public void execute() {
-                        searchField.setText(query);
-                    }
-                });
+                MenuItem item =
+                        factory.createMenuItem(
+                                () -> query,
+                                new SimpleCommand() {
+                                    @Override
+                                    public void execute() {
+                                        searchField.setText(query);
+                                    }
+                                });
                 searchFromHistorySubMenu.getItems().add(item);
             }
-            MenuItem clear = factory.createMenuItem(() -> Localization.lang("Clear history"), new SimpleCommand() {
-                @Override
-                public void execute() {
-                    stateManager.clearSearchHistory();
-                }
-            });
+            MenuItem clear =
+                    factory.createMenuItem(
+                            () -> Localization.lang("Clear history"),
+                            new SimpleCommand() {
+                                @Override
+                                public void execute() {
+                                    stateManager.clearSearchHistory();
+                                }
+                            });
             searchFromHistorySubMenu.getItems().addAll(new SeparatorMenuItem(), clear);
         }
         return searchFromHistorySubMenu;
diff --git a/src/main/java/org/jabref/gui/search/SearchResultsTable.java b/src/main/java/org/jabref/gui/search/SearchResultsTable.java
index 76ebb2cff264..04e54e324827 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultsTable.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultsTable.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.search;
 
-import java.util.List;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
@@ -22,30 +18,37 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 
+import java.util.List;
+
+import javax.swing.undo.UndoManager;
+
 @AllowedToUseClassGetResource("JavaFX internally handles the passed URLs properly.")
 public class SearchResultsTable extends TableView<BibEntryTableViewModel> {
 
-    public SearchResultsTable(SearchResultsTableDataModel model,
-                              BibDatabaseContext database,
-                              GuiPreferences preferences,
-                              UndoManager undoManager,
-                              DialogService dialogService,
-                              StateManager stateManager,
-                              TaskExecutor taskExecutor) {
+    public SearchResultsTable(
+            SearchResultsTableDataModel model,
+            BibDatabaseContext database,
+            GuiPreferences preferences,
+            UndoManager undoManager,
+            DialogService dialogService,
+            StateManager stateManager,
+            TaskExecutor taskExecutor) {
         super();
 
         this.getStyleClass().add("main-table");
 
         MainTablePreferences mainTablePreferences = preferences.getMainTablePreferences();
 
-        List<TableColumn<BibEntryTableViewModel, ?>> allCols = new MainTableColumnFactory(
-                database,
-                preferences,
-                preferences.getSearchDialogColumnPreferences(),
-                undoManager,
-                dialogService,
-                stateManager,
-                taskExecutor).createColumns();
+        List<TableColumn<BibEntryTableViewModel, ?>> allCols =
+                new MainTableColumnFactory(
+                                database,
+                                preferences,
+                                preferences.getSearchDialogColumnPreferences(),
+                                undoManager,
+                                dialogService,
+                                stateManager,
+                                taskExecutor)
+                        .createColumns();
 
         if (allCols.stream().noneMatch(LibraryColumn.class::isInstance)) {
             allCols.addFirst(new LibraryColumn());
@@ -53,12 +56,16 @@ public SearchResultsTable(SearchResultsTableDataModel model,
         this.getColumns().addAll(allCols);
 
         this.getSortOrder().clear();
-        preferences.getSearchDialogColumnPreferences().getColumnSortOrder().forEach(columnModel ->
-                this.getColumns().stream()
-                    .map(column -> (MainTableColumn<?>) column)
-                    .filter(column -> column.getModel().equals(columnModel))
-                    .findFirst()
-                    .ifPresent(column -> this.getSortOrder().add(column)));
+        preferences
+                .getSearchDialogColumnPreferences()
+                .getColumnSortOrder()
+                .forEach(
+                        columnModel ->
+                                this.getColumns().stream()
+                                        .map(column -> (MainTableColumn<?>) column)
+                                        .filter(column -> column.getModel().equals(columnModel))
+                                        .findFirst()
+                                        .ifPresent(column -> this.getSortOrder().add(column)));
 
         if (mainTablePreferences.getResizeColumnsToFit()) {
             this.setColumnResizePolicy(new SmartConstrainedResizePolicy());
@@ -70,9 +77,9 @@ public SearchResultsTable(SearchResultsTableDataModel model,
         model.getEntriesFilteredAndSorted().comparatorProperty().bind(this.comparatorProperty());
 
         // Store visual state
-        new PersistenceVisualStateTable(this, preferences.getSearchDialogColumnPreferences()).addListeners();
+        new PersistenceVisualStateTable(this, preferences.getSearchDialogColumnPreferences())
+                .addListeners();
 
         database.getDatabase().registerListener(this);
     }
 }
-
diff --git a/src/main/java/org/jabref/gui/search/SearchResultsTableDataModel.java b/src/main/java/org/jabref/gui/search/SearchResultsTableDataModel.java
index b6f7503ccbbe..2b8069edb56f 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultsTableDataModel.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultsTableDataModel.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.search;
 
-import java.util.Optional;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
@@ -24,65 +24,100 @@
 import org.jabref.model.search.SearchQuery;
 import org.jabref.model.search.SearchResults;
 
-import com.tobiasdiez.easybind.EasyBind;
+import java.util.Optional;
 
 public class SearchResultsTableDataModel {
 
-    private final ObservableList<BibEntryTableViewModel> entriesViewModel = FXCollections.observableArrayList();
+    private final ObservableList<BibEntryTableViewModel> entriesViewModel =
+            FXCollections.observableArrayList();
     private final SortedList<BibEntryTableViewModel> entriesSorted;
     private final ObjectProperty<MainTableFieldValueFormatter> fieldValueFormatter;
     private final StateManager stateManager;
     private final FilteredList<BibEntryTableViewModel> entriesFiltered;
     private final TaskExecutor taskExecutor;
 
-    public SearchResultsTableDataModel(BibDatabaseContext bibDatabaseContext, GuiPreferences preferences, StateManager stateManager, TaskExecutor taskExecutor) {
+    public SearchResultsTableDataModel(
+            BibDatabaseContext bibDatabaseContext,
+            GuiPreferences preferences,
+            StateManager stateManager,
+            TaskExecutor taskExecutor) {
         NameDisplayPreferences nameDisplayPreferences = preferences.getNameDisplayPreferences();
         this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
-        this.fieldValueFormatter = new SimpleObjectProperty<>(new MainTableFieldValueFormatter(nameDisplayPreferences, bibDatabaseContext));
+        this.fieldValueFormatter =
+                new SimpleObjectProperty<>(
+                        new MainTableFieldValueFormatter(
+                                nameDisplayPreferences, bibDatabaseContext));
 
         populateEntriesViewModel();
-        stateManager.getOpenDatabases().addListener((ListChangeListener<BibDatabaseContext>) change -> populateEntriesViewModel());
+        stateManager
+                .getOpenDatabases()
+                .addListener(
+                        (ListChangeListener<BibDatabaseContext>)
+                                change -> populateEntriesViewModel());
         entriesFiltered = new FilteredList<>(entriesViewModel, BibEntryTableViewModel::isVisible);
 
         // We need to wrap the list since otherwise sorting in the table does not work
         entriesSorted = new SortedList<>(entriesFiltered);
 
-        EasyBind.listen(stateManager.activeSearchQuery(SearchType.GLOBAL_SEARCH), (observable, oldValue, newValue) -> updateSearchMatches(newValue));
-        stateManager.searchResultSize(SearchType.GLOBAL_SEARCH).bind(Bindings.size(entriesFiltered));
+        EasyBind.listen(
+                stateManager.activeSearchQuery(SearchType.GLOBAL_SEARCH),
+                (observable, oldValue, newValue) -> updateSearchMatches(newValue));
+        stateManager
+                .searchResultSize(SearchType.GLOBAL_SEARCH)
+                .bind(Bindings.size(entriesFiltered));
     }
 
     private void populateEntriesViewModel() {
         entriesViewModel.clear();
         for (BibDatabaseContext context : stateManager.getOpenDatabases()) {
             ObservableList<BibEntry> entriesForDb = context.getDatabase().getEntries();
-            ObservableList<BibEntryTableViewModel> viewModelForDb = EasyBind.mapBacked(entriesForDb, entry -> new BibEntryTableViewModel(entry, context, fieldValueFormatter), false);
+            ObservableList<BibEntryTableViewModel> viewModelForDb =
+                    EasyBind.mapBacked(
+                            entriesForDb,
+                            entry ->
+                                    new BibEntryTableViewModel(entry, context, fieldValueFormatter),
+                            false);
             entriesViewModel.addAll(viewModelForDb);
         }
     }
 
     private void updateSearchMatches(Optional<SearchQuery> query) {
-        BackgroundTask.wrap(() -> {
-            if (query.isPresent()) {
-                SearchResults searchResults = new SearchResults();
-                for (BibDatabaseContext context : stateManager.getOpenDatabases()) {
-                    stateManager.getLuceneManager(context).ifPresent(luceneManager -> {
-                        searchResults.mergeSearchResults(luceneManager.search(query.get()));
-                    });
-                }
-                for (BibEntryTableViewModel entry : entriesViewModel) {
-                    entry.searchScoreProperty().set(searchResults.getSearchScoreForEntry(entry.getEntry()));
-                    entry.hasFullTextResultsProperty().set(searchResults.hasFulltextResults(entry.getEntry()));
-                    entry.isVisibleBySearch().set(entry.searchScoreProperty().get() > 0);
-                }
-            } else {
-                for (BibEntryTableViewModel entry : entriesViewModel) {
-                    entry.searchScoreProperty().set(0);
-                    entry.hasFullTextResultsProperty().set(false);
-                    entry.isVisibleBySearch().set(true);
-                }
-            }
-        }).onSuccess(result -> FilteredListProxy.refilterListReflection(entriesFiltered)).executeWith(taskExecutor);
+        BackgroundTask.wrap(
+                        () -> {
+                            if (query.isPresent()) {
+                                SearchResults searchResults = new SearchResults();
+                                for (BibDatabaseContext context : stateManager.getOpenDatabases()) {
+                                    stateManager
+                                            .getLuceneManager(context)
+                                            .ifPresent(
+                                                    luceneManager -> {
+                                                        searchResults.mergeSearchResults(
+                                                                luceneManager.search(query.get()));
+                                                    });
+                                }
+                                for (BibEntryTableViewModel entry : entriesViewModel) {
+                                    entry.searchScoreProperty()
+                                            .set(
+                                                    searchResults.getSearchScoreForEntry(
+                                                            entry.getEntry()));
+                                    entry.hasFullTextResultsProperty()
+                                            .set(
+                                                    searchResults.hasFulltextResults(
+                                                            entry.getEntry()));
+                                    entry.isVisibleBySearch()
+                                            .set(entry.searchScoreProperty().get() > 0);
+                                }
+                            } else {
+                                for (BibEntryTableViewModel entry : entriesViewModel) {
+                                    entry.searchScoreProperty().set(0);
+                                    entry.hasFullTextResultsProperty().set(false);
+                                    entry.isVisibleBySearch().set(true);
+                                }
+                            }
+                        })
+                .onSuccess(result -> FilteredListProxy.refilterListReflection(entriesFiltered))
+                .executeWith(taskExecutor);
     }
 
     public SortedList<BibEntryTableViewModel> getEntriesFilteredAndSorted() {
diff --git a/src/main/java/org/jabref/gui/search/SearchTextField.java b/src/main/java/org/jabref/gui/search/SearchTextField.java
index 4cb2b060ba62..6e021f3e41e7 100644
--- a/src/main/java/org/jabref/gui/search/SearchTextField.java
+++ b/src/main/java/org/jabref/gui/search/SearchTextField.java
@@ -3,14 +3,13 @@
 import javafx.scene.Node;
 import javafx.scene.input.KeyEvent;
 
+import org.controlsfx.control.textfield.CustomTextField;
+import org.controlsfx.control.textfield.TextFields;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.logic.l10n.Localization;
 
-import org.controlsfx.control.textfield.CustomTextField;
-import org.controlsfx.control.textfield.TextFields;
-
 public class SearchTextField {
 
     public static CustomTextField create(KeyBindingRepository keyBindingRepository) {
@@ -23,16 +22,20 @@ public static CustomTextField create(KeyBindingRepository keyBindingRepository)
         graphicNode.getStyleClass().add("search-field-icon");
         textField.setLeft(graphicNode);
 
-        textField.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            // Other key bindings are handled at org.jabref.gui.keyboard.TextInputKeyBindings
-            // We need to handle clear search here to have the code "more clean"
-            // Otherwise, we would have to add a new class for this and handle the case hitting that class in TextInputKeyBindings
-
-            if (keyBindingRepository.matches(event, KeyBinding.CLEAR_SEARCH)) {
-                       textField.clear();
-                       event.consume();
-            }
-        });
+        textField.addEventFilter(
+                KeyEvent.KEY_PRESSED,
+                event -> {
+                    // Other key bindings are handled at
+                    // org.jabref.gui.keyboard.TextInputKeyBindings
+                    // We need to handle clear search here to have the code "more clean"
+                    // Otherwise, we would have to add a new class for this and handle the case
+                    // hitting that class in TextInputKeyBindings
+
+                    if (keyBindingRepository.matches(event, KeyBinding.CLEAR_SEARCH)) {
+                        textField.clear();
+                        event.consume();
+                    }
+                });
 
         return textField;
     }
diff --git a/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java b/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java
index 16b11a60caec..07d0a6d9a0c6 100644
--- a/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java
+++ b/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java
@@ -12,7 +12,8 @@ public class ConnectToSharedDatabaseCommand extends SimpleCommand {
     private final LibraryTabContainer tabContainer;
     private final DialogService dialogService;
 
-    public ConnectToSharedDatabaseCommand(LibraryTabContainer tabContainer, DialogService dialogService) {
+    public ConnectToSharedDatabaseCommand(
+            LibraryTabContainer tabContainer, DialogService dialogService) {
         this.tabContainer = tabContainer;
         this.dialogService = dialogService;
     }
diff --git a/src/main/java/org/jabref/gui/shared/PullChangesFromSharedAction.java b/src/main/java/org/jabref/gui/shared/PullChangesFromSharedAction.java
index d19090cf367a..7c34497c94e0 100644
--- a/src/main/java/org/jabref/gui/shared/PullChangesFromSharedAction.java
+++ b/src/main/java/org/jabref/gui/shared/PullChangesFromSharedAction.java
@@ -12,13 +12,19 @@ public class PullChangesFromSharedAction extends SimpleCommand {
     public PullChangesFromSharedAction(StateManager stateManager) {
         this.stateManager = stateManager;
 
-        this.executable.bind(ActionHelper.needsDatabase(stateManager).and(ActionHelper.needsSharedDatabase(stateManager)));
+        this.executable.bind(
+                ActionHelper.needsDatabase(stateManager)
+                        .and(ActionHelper.needsSharedDatabase(stateManager)));
     }
 
     public void execute() {
-        stateManager.getActiveDatabase().ifPresent(databaseContext -> {
-            DatabaseSynchronizer dbmsSynchronizer = databaseContext.getDBMSSynchronizer();
-            dbmsSynchronizer.pullChanges();
-        });
+        stateManager
+                .getActiveDatabase()
+                .ifPresent(
+                        databaseContext -> {
+                            DatabaseSynchronizer dbmsSynchronizer =
+                                    databaseContext.getDBMSSynchronizer();
+                            dbmsSynchronizer.pullChanges();
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
index ed30a868a2bd..c05595a89d7d 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
@@ -1,6 +1,11 @@
 package org.jabref.gui.shared;
 
-import javax.swing.undo.UndoManager;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+import jakarta.inject.Inject;
 
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
@@ -27,10 +32,7 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import jakarta.inject.Inject;
+import javax.swing.undo.UndoManager;
 
 /**
  * This offers the user to connect to a remove SQL database.
@@ -74,15 +76,21 @@ public SharedDatabaseLoginDialogView(LibraryTabContainer tabContainer) {
         this.tabContainer = tabContainer;
         this.setTitle(Localization.lang("Connect to shared database"));
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         ControlHelper.setAction(connectButton, this.getDialogPane(), event -> openDatabase());
         Button btnConnect = (Button) this.getDialogPane().lookupButton(connectButton);
         // must be set here, because in initialize the button is still null
         btnConnect.disableProperty().bind(viewModel.formValidation().validProperty().not());
-        btnConnect.textProperty().bind(EasyBind.map(viewModel.loadingProperty(), loading -> loading ? Localization.lang("Connecting...") : Localization.lang("Connect")));
+        btnConnect
+                .textProperty()
+                .bind(
+                        EasyBind.map(
+                                viewModel.loadingProperty(),
+                                loading ->
+                                        loading
+                                                ? Localization.lang("Connecting...")
+                                                : Localization.lang("Connect")));
     }
 
     @FXML
@@ -98,17 +106,18 @@ private void openDatabase() {
     private void initialize() {
         visualizer.setDecoration(new IconValidationDecorator());
 
-        viewModel = new SharedDatabaseLoginDialogViewModel(
-                tabContainer,
-                dialogService,
-                preferences,
-                aiService,
-                stateManager,
-                entryTypesManager,
-                fileUpdateMonitor,
-                undoManager,
-                clipBoardManager,
-                taskExecutor);
+        viewModel =
+                new SharedDatabaseLoginDialogViewModel(
+                        tabContainer,
+                        dialogService,
+                        preferences,
+                        aiService,
+                        stateManager,
+                        entryTypesManager,
+                        fileUpdateMonitor,
+                        undoManager,
+                        clipBoardManager,
+                        taskExecutor);
         databaseType.getItems().addAll(DBMSType.values());
         databaseType.getSelectionModel().select(0);
 
@@ -139,18 +148,25 @@ private void initialize() {
         rememberPassword.selectedProperty().bindBidirectional(viewModel.rememberPasswordProperty());
 
         // Must be executed after the initialization of the view, otherwise it doesn't work
-        Platform.runLater(() -> {
-            visualizer.initVisualization(viewModel.dbValidation(), database, true);
-            visualizer.initVisualization(viewModel.hostValidation(), host, true);
-            visualizer.initVisualization(viewModel.portValidation(), port, true);
-            visualizer.initVisualization(viewModel.userValidation(), user, true);
-
-            EasyBind.subscribe(autosave.selectedProperty(), selected ->
-                    visualizer.initVisualization(viewModel.folderValidation(), folder, true));
-
-            EasyBind.subscribe(useSSL.selectedProperty(), selected ->
-                    visualizer.initVisualization(viewModel.keystoreValidation(), fileKeystore, true));
-        });
+        Platform.runLater(
+                () -> {
+                    visualizer.initVisualization(viewModel.dbValidation(), database, true);
+                    visualizer.initVisualization(viewModel.hostValidation(), host, true);
+                    visualizer.initVisualization(viewModel.portValidation(), port, true);
+                    visualizer.initVisualization(viewModel.userValidation(), user, true);
+
+                    EasyBind.subscribe(
+                            autosave.selectedProperty(),
+                            selected ->
+                                    visualizer.initVisualization(
+                                            viewModel.folderValidation(), folder, true));
+
+                    EasyBind.subscribe(
+                            useSSL.selectedProperty(),
+                            selected ->
+                                    visualizer.initVisualization(
+                                            viewModel.keystoreValidation(), fileKeystore, true));
+                });
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
index e4c9d13fc049..856f96fe5f83 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -1,15 +1,13 @@
 package org.jabref.gui.shared;
 
-import java.io.UnsupportedEncodingException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.GeneralSecurityException;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
+import com.airhacks.afterburner.injection.Injector;
+import com.tobiasdiez.easybind.EasyBind;
 
-import javax.swing.undo.UndoManager;
+import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -48,22 +46,27 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import com.airhacks.afterburner.injection.Injector;
-import com.tobiasdiez.easybind.EasyBind;
-import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.UnsupportedEncodingException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.GeneralSecurityException;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+
+import javax.swing.undo.UndoManager;
+
 public class SharedDatabaseLoginDialogViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SharedDatabaseLoginDialogViewModel.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(SharedDatabaseLoginDialogViewModel.class);
 
-    private final ObjectProperty<DBMSType> selectedDBMSType = new SimpleObjectProperty<>(DBMSType.values()[0]);
+    private final ObjectProperty<DBMSType> selectedDBMSType =
+            new SimpleObjectProperty<>(DBMSType.values()[0]);
 
     private final StringProperty database = new SimpleStringProperty("");
     private final StringProperty host = new SimpleStringProperty("");
@@ -85,7 +88,8 @@ public class SharedDatabaseLoginDialogViewModel extends AbstractViewModel {
     private final DialogService dialogService;
     private final GuiPreferences preferences;
     private final AiService aiService;
-    private final SharedDatabasePreferences sharedDatabasePreferences = new SharedDatabasePreferences();
+    private final SharedDatabasePreferences sharedDatabasePreferences =
+            new SharedDatabasePreferences();
     private final StateManager stateManager;
     private final BibEntryTypesManager entryTypesManager;
     private final FileUpdateMonitor fileUpdateMonitor;
@@ -101,16 +105,17 @@ public class SharedDatabaseLoginDialogViewModel extends AbstractViewModel {
     private final Validator keystoreValidator;
     private final CompositeValidator formValidator;
 
-    public SharedDatabaseLoginDialogViewModel(LibraryTabContainer tabContainer,
-                                              DialogService dialogService,
-                                              GuiPreferences preferences,
-                                              AiService aiService,
-                                              StateManager stateManager,
-                                              BibEntryTypesManager entryTypesManager,
-                                              FileUpdateMonitor fileUpdateMonitor,
-                                              UndoManager undoManager,
-                                              ClipBoardManager clipBoardManager,
-                                              TaskExecutor taskExecutor) {
+    public SharedDatabaseLoginDialogViewModel(
+            LibraryTabContainer tabContainer,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            AiService aiService,
+            StateManager stateManager,
+            BibEntryTypesManager entryTypesManager,
+            FileUpdateMonitor fileUpdateMonitor,
+            UndoManager undoManager,
+            ClipBoardManager clipBoardManager,
+            TaskExecutor taskExecutor) {
         this.tabContainer = tabContainer;
         this.dialogService = dialogService;
         this.preferences = preferences;
@@ -122,18 +127,58 @@ public SharedDatabaseLoginDialogViewModel(LibraryTabContainer tabContainer,
         this.clipBoardManager = clipBoardManager;
         this.taskExecutor = taskExecutor;
 
-        EasyBind.subscribe(selectedDBMSType, selected -> port.setValue(Integer.toString(selected.getDefaultPort())));
+        EasyBind.subscribe(
+                selectedDBMSType,
+                selected -> port.setValue(Integer.toString(selected.getDefaultPort())));
 
         Predicate<String> notEmpty = input -> (input != null) && !input.trim().isEmpty();
         Predicate<String> fileExists = input -> Files.exists(Path.of(input));
         Predicate<String> notEmptyAndfilesExist = notEmpty.and(fileExists);
 
-        databaseValidator = new FunctionBasedValidator<>(database, notEmpty, ValidationMessage.error(Localization.lang("Required field \"%0\" is empty.", Localization.lang("Library"))));
-        hostValidator = new FunctionBasedValidator<>(host, notEmpty, ValidationMessage.error(Localization.lang("Required field \"%0\" is empty.", Localization.lang("Port"))));
-        portValidator = new FunctionBasedValidator<>(port, notEmpty, ValidationMessage.error(Localization.lang("Required field \"%0\" is empty.", Localization.lang("Host"))));
-        userValidator = new FunctionBasedValidator<>(user, notEmpty, ValidationMessage.error(Localization.lang("Required field \"%0\" is empty.", Localization.lang("User"))));
-        folderValidator = new FunctionBasedValidator<>(folder, notEmptyAndfilesExist, ValidationMessage.error(Localization.lang("Please enter a valid file path.")));
-        keystoreValidator = new FunctionBasedValidator<>(keystore, notEmptyAndfilesExist, ValidationMessage.error(Localization.lang("Please enter a valid file path.")));
+        databaseValidator =
+                new FunctionBasedValidator<>(
+                        database,
+                        notEmpty,
+                        ValidationMessage.error(
+                                Localization.lang(
+                                        "Required field \"%0\" is empty.",
+                                        Localization.lang("Library"))));
+        hostValidator =
+                new FunctionBasedValidator<>(
+                        host,
+                        notEmpty,
+                        ValidationMessage.error(
+                                Localization.lang(
+                                        "Required field \"%0\" is empty.",
+                                        Localization.lang("Port"))));
+        portValidator =
+                new FunctionBasedValidator<>(
+                        port,
+                        notEmpty,
+                        ValidationMessage.error(
+                                Localization.lang(
+                                        "Required field \"%0\" is empty.",
+                                        Localization.lang("Host"))));
+        userValidator =
+                new FunctionBasedValidator<>(
+                        user,
+                        notEmpty,
+                        ValidationMessage.error(
+                                Localization.lang(
+                                        "Required field \"%0\" is empty.",
+                                        Localization.lang("User"))));
+        folderValidator =
+                new FunctionBasedValidator<>(
+                        folder,
+                        notEmptyAndfilesExist,
+                        ValidationMessage.error(
+                                Localization.lang("Please enter a valid file path.")));
+        keystoreValidator =
+                new FunctionBasedValidator<>(
+                        keystore,
+                        notEmptyAndfilesExist,
+                        ValidationMessage.error(
+                                Localization.lang("Please enter a valid file path.")));
 
         formValidator = new CompositeValidator();
         formValidator.addValidators(databaseValidator, hostValidator, portValidator, userValidator);
@@ -142,21 +187,24 @@ public SharedDatabaseLoginDialogViewModel(LibraryTabContainer tabContainer,
     }
 
     public boolean openDatabase() {
-        DBMSConnectionProperties connectionProperties = new DBMSConnectionPropertiesBuilder()
-                .setType(selectedDBMSType.getValue())
-                .setHost(host.getValue())
-                .setPort(Integer.parseInt(port.getValue()))
-                .setDatabase(database.getValue())
-                .setUser(user.getValue())
-                .setPassword(password.getValue())
-                .setUseSSL(useSSL.getValue())
-                // Authorize client to retrieve RSA server public key when serverRsaPublicKeyFile is not set (for sha256_password and caching_sha2_password authentication password)
-                .setAllowPublicKeyRetrieval(true)
-                .setKeyStore(keystore.getValue())
-                .setServerTimezone(serverTimezone.getValue())
-                .setExpertMode(expertMode.getValue())
-                .setJdbcUrl(jdbcUrl.getValue())
-                .createDBMSConnectionProperties();
+        DBMSConnectionProperties connectionProperties =
+                new DBMSConnectionPropertiesBuilder()
+                        .setType(selectedDBMSType.getValue())
+                        .setHost(host.getValue())
+                        .setPort(Integer.parseInt(port.getValue()))
+                        .setDatabase(database.getValue())
+                        .setUser(user.getValue())
+                        .setPassword(password.getValue())
+                        .setUseSSL(useSSL.getValue())
+                        // Authorize client to retrieve RSA server public key when
+                        // serverRsaPublicKeyFile is not set (for sha256_password and
+                        // caching_sha2_password authentication password)
+                        .setAllowPublicKeyRetrieval(true)
+                        .setKeyStore(keystore.getValue())
+                        .setServerTimezone(serverTimezone.getValue())
+                        .setExpertMode(expertMode.getValue())
+                        .setJdbcUrl(jdbcUrl.getValue())
+                        .createDBMSConnectionProperties();
 
         setupKeyStore();
         return openSharedDatabase(connectionProperties);
@@ -170,8 +218,10 @@ private void setupKeyStore() {
 
     private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties) {
         if (isSharedDatabaseAlreadyPresent(connectionProperties)) {
-            dialogService.showWarningDialogAndWait(Localization.lang("Shared database connection"),
-                    Localization.lang("You are already connected to a database using entered connection details."));
+            dialogService.showWarningDialogAndWait(
+                    Localization.lang("Shared database connection"),
+                    Localization.lang(
+                            "You are already connected to a database using entered connection details."));
             return true;
         }
 
@@ -179,10 +229,14 @@ private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties
             Path localFilePath = Path.of(folder.getValue());
 
             if (Files.exists(localFilePath) && !Files.isDirectory(localFilePath)) {
-                boolean overwriteFilePressed = dialogService.showConfirmationDialogAndWait(Localization.lang("Existing file"),
-                        Localization.lang("'%0' exists. Overwrite file?", localFilePath.getFileName().toString()),
-                        Localization.lang("Overwrite file"),
-                        Localization.lang("Cancel"));
+                boolean overwriteFilePressed =
+                        dialogService.showConfirmationDialogAndWait(
+                                Localization.lang("Existing file"),
+                                Localization.lang(
+                                        "'%0' exists. Overwrite file?",
+                                        localFilePath.getFileName().toString()),
+                                Localization.lang("Overwrite file"),
+                                Localization.lang("Cancel"));
                 if (!overwriteFilePressed) {
                     return true;
                 }
@@ -192,28 +246,29 @@ private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties
         loading.set(true);
 
         try {
-            SharedDatabaseUIManager manager = new SharedDatabaseUIManager(
-                    tabContainer,
-                    dialogService,
-                    preferences,
-                    aiService,
-                    stateManager,
-                    entryTypesManager,
-                    fileUpdateMonitor,
-                    undoManager,
-                    clipBoardManager,
-                    taskExecutor);
+            SharedDatabaseUIManager manager =
+                    new SharedDatabaseUIManager(
+                            tabContainer,
+                            dialogService,
+                            preferences,
+                            aiService,
+                            stateManager,
+                            entryTypesManager,
+                            fileUpdateMonitor,
+                            undoManager,
+                            clipBoardManager,
+                            taskExecutor);
             LibraryTab libraryTab = manager.openNewSharedDatabaseTab(connectionProperties);
             setPreferences();
 
             if (!folder.getValue().isEmpty() && autosave.get()) {
                 try {
                     new SaveDatabaseAction(
-                            libraryTab,
-                            dialogService,
-                            preferences,
-                            Injector.instantiateModelOrService(BibEntryTypesManager.class)
-                    ).saveAs(Path.of(folder.getValue()));
+                                    libraryTab,
+                                    dialogService,
+                                    preferences,
+                                    Injector.instantiateModelOrService(BibEntryTypesManager.class))
+                            .saveAs(Path.of(folder.getValue()));
                 } catch (Throwable e) {
                     LOGGER.error("Error while saving the database", e);
                 }
@@ -225,17 +280,32 @@ private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties
         } catch (DatabaseNotSupportedException exception) {
             ButtonType openHelp = new ButtonType("Open Help", ButtonData.OTHER);
 
-            Optional<ButtonType> result = dialogService.showCustomButtonDialogAndWait(AlertType.INFORMATION,
-                    Localization.lang("Migration help information"),
-                    Localization.lang("Entered database has obsolete structure and is no longer supported.")
-                            + "\n" +
-                            Localization.lang("Click help to learn about the migration of pre-3.6 databases.")
-                            + "\n" +
-                            Localization.lang("However, a new database was created alongside the pre-3.6 one."),
-                    ButtonType.OK, openHelp);
-
-            result.filter(btn -> btn.equals(openHelp)).ifPresent(btn -> new HelpAction(HelpFile.SQL_DATABASE_MIGRATION, dialogService, preferences.getExternalApplicationsPreferences()).execute());
-            result.filter(btn -> btn.equals(ButtonType.OK)).ifPresent(btn -> openSharedDatabase(connectionProperties));
+            Optional<ButtonType> result =
+                    dialogService.showCustomButtonDialogAndWait(
+                            AlertType.INFORMATION,
+                            Localization.lang("Migration help information"),
+                            Localization.lang(
+                                            "Entered database has obsolete structure and is no longer supported.")
+                                    + "\n"
+                                    + Localization.lang(
+                                            "Click help to learn about the migration of pre-3.6 databases.")
+                                    + "\n"
+                                    + Localization.lang(
+                                            "However, a new database was created alongside the pre-3.6 one."),
+                            ButtonType.OK,
+                            openHelp);
+
+            result.filter(btn -> btn.equals(openHelp))
+                    .ifPresent(
+                            btn ->
+                                    new HelpAction(
+                                                    HelpFile.SQL_DATABASE_MIGRATION,
+                                                    dialogService,
+                                                    preferences
+                                                            .getExternalApplicationsPreferences())
+                                            .execute());
+            result.filter(btn -> btn.equals(ButtonType.OK))
+                    .ifPresent(btn -> openSharedDatabase(connectionProperties));
         }
         loading.set(false);
         return false;
@@ -253,12 +323,14 @@ private void setPreferences() {
 
         if (rememberPassword.get()) {
             try {
-                sharedDatabasePreferences.setPassword(new Password(password.getValue(), user.getValue()).encrypt());
+                sharedDatabasePreferences.setPassword(
+                        new Password(password.getValue(), user.getValue()).encrypt());
             } catch (GeneralSecurityException | UnsupportedEncodingException e) {
                 LOGGER.error("Could not store the password due to encryption problems.", e);
             }
         } else {
-            sharedDatabasePreferences.clearPassword(); // for the case that the password is already set
+            sharedDatabasePreferences
+                    .clearPassword(); // for the case that the password is already set
         }
 
         sharedDatabasePreferences.setRememberPassword(rememberPassword.get());
@@ -296,7 +368,11 @@ private void applyPreferences() {
 
         if (sharedDatabasePassword.isPresent() && sharedDatabaseUser.isPresent()) {
             try {
-                password.setValue(new Password(sharedDatabasePassword.get().toCharArray(), sharedDatabaseUser.get()).decrypt());
+                password.setValue(
+                        new Password(
+                                        sharedDatabasePassword.get().toCharArray(),
+                                        sharedDatabaseUser.get())
+                                .decrypt());
             } catch (GeneralSecurityException | UnsupportedEncodingException e) {
                 LOGGER.error("Could not read the password due to decryption problems.", e);
             }
@@ -310,31 +386,39 @@ private void applyPreferences() {
 
     private boolean isSharedDatabaseAlreadyPresent(DBMSConnectionProperties connectionProperties) {
         List<LibraryTab> libraryTabs = tabContainer.getLibraryTabs();
-        return libraryTabs.parallelStream().anyMatch(panel -> {
-            BibDatabaseContext context = panel.getBibDatabaseContext();
+        return libraryTabs.parallelStream()
+                .anyMatch(
+                        panel -> {
+                            BibDatabaseContext context = panel.getBibDatabaseContext();
 
-            return (context.getLocation() == DatabaseLocation.SHARED) &&
-                    connectionProperties.equals(context.getDBMSSynchronizer().getConnectionProperties());
-        });
+                            return (context.getLocation() == DatabaseLocation.SHARED)
+                                    && connectionProperties.equals(
+                                            context.getDBMSSynchronizer()
+                                                    .getConnectionProperties());
+                        });
     }
 
     public void showSaveDbToFileDialog() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.BIBTEX_DB)
-                .withDefaultExtension(StandardFileType.BIBTEX_DB)
-                .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory())
-                .build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(StandardFileType.BIBTEX_DB)
+                        .withDefaultExtension(StandardFileType.BIBTEX_DB)
+                        .withInitialDirectory(
+                                preferences.getFilePreferences().getWorkingDirectory())
+                        .build();
         Optional<Path> exportPath = dialogService.showFileSaveDialog(fileDialogConfiguration);
         exportPath.ifPresent(path -> folder.setValue(path.toString()));
     }
 
     public void showOpenKeystoreFileDialog() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(FileFilterConverter.ANY_FILE)
-                .addExtensionFilter(StandardFileType.JAVA_KEYSTORE)
-                .withDefaultExtension(StandardFileType.JAVA_KEYSTORE)
-                .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory())
-                .build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .addExtensionFilter(FileFilterConverter.ANY_FILE)
+                        .addExtensionFilter(StandardFileType.JAVA_KEYSTORE)
+                        .withDefaultExtension(StandardFileType.JAVA_KEYSTORE)
+                        .withInitialDirectory(
+                                preferences.getFilePreferences().getWorkingDirectory())
+                        .build();
         Optional<Path> keystorePath = dialogService.showFileOpenDialog(fileDialogConfiguration);
         keystorePath.ifPresent(path -> keystore.setValue(path.toString()));
     }
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
index d3f2989b36ec..e4cffc0c97af 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
@@ -1,9 +1,6 @@
 package org.jabref.gui.shared;
 
-import java.sql.SQLException;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
+import com.google.common.eventbus.Subscribe;
 
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonBar;
@@ -41,7 +38,10 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 
-import com.google.common.eventbus.Subscribe;
+import java.sql.SQLException;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
 
 public class SharedDatabaseUIManager {
 
@@ -57,16 +57,17 @@ public class SharedDatabaseUIManager {
     private final ClipBoardManager clipBoardManager;
     private final TaskExecutor taskExecutor;
 
-    public SharedDatabaseUIManager(LibraryTabContainer tabContainer,
-                                   DialogService dialogService,
-                                   GuiPreferences preferences,
-                                   AiService aiService,
-                                   StateManager stateManager,
-                                   BibEntryTypesManager entryTypesManager,
-                                   FileUpdateMonitor fileUpdateMonitor,
-                                   UndoManager undoManager,
-                                   ClipBoardManager clipBoardManager,
-                                   TaskExecutor taskExecutor) {
+    public SharedDatabaseUIManager(
+            LibraryTabContainer tabContainer,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            AiService aiService,
+            StateManager stateManager,
+            BibEntryTypesManager entryTypesManager,
+            FileUpdateMonitor fileUpdateMonitor,
+            UndoManager undoManager,
+            ClipBoardManager clipBoardManager,
+            TaskExecutor taskExecutor) {
         this.tabContainer = tabContainer;
         this.dialogService = dialogService;
         this.preferences = preferences;
@@ -83,19 +84,23 @@ public SharedDatabaseUIManager(LibraryTabContainer tabContainer,
     public void listen(ConnectionLostEvent connectionLostEvent) {
         ButtonType reconnect = new ButtonType(Localization.lang("Reconnect"), ButtonData.YES);
         ButtonType workOffline = new ButtonType(Localization.lang("Work offline"), ButtonData.NO);
-        ButtonType closeLibrary = new ButtonType(Localization.lang("Close library"), ButtonData.CANCEL_CLOSE);
-
-        Optional<ButtonType> answer = dialogService.showCustomButtonDialogAndWait(AlertType.WARNING,
-                Localization.lang("Connection lost"),
-                Localization.lang("The connection to the server has been terminated."),
-                reconnect,
-                workOffline,
-                closeLibrary);
+        ButtonType closeLibrary =
+                new ButtonType(Localization.lang("Close library"), ButtonData.CANCEL_CLOSE);
+
+        Optional<ButtonType> answer =
+                dialogService.showCustomButtonDialogAndWait(
+                        AlertType.WARNING,
+                        Localization.lang("Connection lost"),
+                        Localization.lang("The connection to the server has been terminated."),
+                        reconnect,
+                        workOffline,
+                        closeLibrary);
 
         if (answer.isPresent()) {
             if (answer.get().equals(reconnect)) {
                 tabContainer.closeTab(tabContainer.getCurrentLibraryTab());
-                dialogService.showCustomDialogAndWait(new SharedDatabaseLoginDialogView(tabContainer));
+                dialogService.showCustomDialogAndWait(
+                        new SharedDatabaseLoginDialogView(tabContainer));
             } else if (answer.get().equals(workOffline)) {
                 connectionLostEvent.getBibDatabaseContext().convertToLocalDatabase();
                 tabContainer.getLibraryTabs().forEach(tab -> tab.updateTabTitle(tab.isModified()));
@@ -113,29 +118,58 @@ public void listen(UpdateRefusedEvent updateRefusedEvent) {
         BibEntry localBibEntry = updateRefusedEvent.getLocalBibEntry();
         BibEntry sharedBibEntry = updateRefusedEvent.getSharedBibEntry();
 
-        String message = Localization.lang("Update could not be performed due to existing change conflicts.") + "\r\n" +
-                Localization.lang("You are not working on the newest version of BibEntry.") + "\r\n" +
-                Localization.lang("Shared version: %0", String.valueOf(sharedBibEntry.getSharedBibEntryData().getVersion())) + "\r\n" +
-                Localization.lang("Local version: %0", String.valueOf(localBibEntry.getSharedBibEntryData().getVersion())) + "\r\n" +
-                Localization.lang("Press \"Merge entries\" to merge the changes and resolve this problem.") + "\r\n" +
-                Localization.lang("Canceling this operation will leave your changes unsynchronized.");
-
-        ButtonType merge = new ButtonType(Localization.lang("Merge entries"), ButtonBar.ButtonData.YES);
-
-        Optional<ButtonType> response = dialogService.showCustomButtonDialogAndWait(AlertType.CONFIRMATION, Localization.lang("Update refused"), message, ButtonType.CANCEL, merge);
+        String message =
+                Localization.lang("Update could not be performed due to existing change conflicts.")
+                        + "\r\n"
+                        + Localization.lang(
+                                "You are not working on the newest version of BibEntry.")
+                        + "\r\n"
+                        + Localization.lang(
+                                "Shared version: %0",
+                                String.valueOf(sharedBibEntry.getSharedBibEntryData().getVersion()))
+                        + "\r\n"
+                        + Localization.lang(
+                                "Local version: %0",
+                                String.valueOf(localBibEntry.getSharedBibEntryData().getVersion()))
+                        + "\r\n"
+                        + Localization.lang(
+                                "Press \"Merge entries\" to merge the changes and resolve this problem.")
+                        + "\r\n"
+                        + Localization.lang(
+                                "Canceling this operation will leave your changes unsynchronized.");
+
+        ButtonType merge =
+                new ButtonType(Localization.lang("Merge entries"), ButtonBar.ButtonData.YES);
+
+        Optional<ButtonType> response =
+                dialogService.showCustomButtonDialogAndWait(
+                        AlertType.CONFIRMATION,
+                        Localization.lang("Update refused"),
+                        message,
+                        ButtonType.CANCEL,
+                        merge);
 
         if (response.isPresent() && response.get().equals(merge)) {
-            MergeEntriesDialog dialog = new MergeEntriesDialog(localBibEntry, sharedBibEntry, preferences);
+            MergeEntriesDialog dialog =
+                    new MergeEntriesDialog(localBibEntry, sharedBibEntry, preferences);
             dialog.setTitle(Localization.lang("Update refused"));
-            Optional<BibEntry> mergedEntry = dialogService.showCustomDialogAndWait(dialog).map(EntriesMergeResult::mergedEntry);
-
-            mergedEntry.ifPresent(mergedBibEntry -> {
-                mergedBibEntry.getSharedBibEntryData().setSharedID(sharedBibEntry.getSharedBibEntryData().getSharedID());
-                mergedBibEntry.getSharedBibEntryData().setVersion(sharedBibEntry.getSharedBibEntryData().getVersion());
-
-                dbmsSynchronizer.synchronizeSharedEntry(mergedBibEntry);
-                dbmsSynchronizer.synchronizeLocalDatabase();
-            });
+            Optional<BibEntry> mergedEntry =
+                    dialogService
+                            .showCustomDialogAndWait(dialog)
+                            .map(EntriesMergeResult::mergedEntry);
+
+            mergedEntry.ifPresent(
+                    mergedBibEntry -> {
+                        mergedBibEntry
+                                .getSharedBibEntryData()
+                                .setSharedID(sharedBibEntry.getSharedBibEntryData().getSharedID());
+                        mergedBibEntry
+                                .getSharedBibEntryData()
+                                .setVersion(sharedBibEntry.getSharedBibEntryData().getVersion());
+
+                        dbmsSynchronizer.synchronizeSharedEntry(mergedBibEntry);
+                        dbmsSynchronizer.synchronizeLocalDatabase();
+                    });
         }
     }
 
@@ -144,13 +178,20 @@ public void listen(SharedEntriesNotPresentEvent event) {
         LibraryTab libraryTab = tabContainer.getCurrentLibraryTab();
         EntryEditor entryEditor = libraryTab.getEntryEditor();
 
-        libraryTab.getUndoManager().addEdit(new UndoableRemoveEntries(libraryTab.getDatabase(), event.getBibEntries()));
-
-        if (entryEditor != null && (event.getBibEntries().contains(entryEditor.getCurrentlyEditedEntry()))) {
-            dialogService.showInformationDialogAndWait(Localization.lang("Shared entry is no longer present"),
-                    Localization.lang("The entry you currently work on has been deleted on the shared side.")
+        libraryTab
+                .getUndoManager()
+                .addEdit(
+                        new UndoableRemoveEntries(libraryTab.getDatabase(), event.getBibEntries()));
+
+        if (entryEditor != null
+                && (event.getBibEntries().contains(entryEditor.getCurrentlyEditedEntry()))) {
+            dialogService.showInformationDialogAndWait(
+                    Localization.lang("Shared entry is no longer present"),
+                    Localization.lang(
+                                    "The entry you currently work on has been deleted on the shared side.")
                             + "\n"
-                            + Localization.lang("You can restore the entry using the \"Undo\" operation."));
+                            + Localization.lang(
+                                    "You can restore the entry using the \"Undo\" operation."));
             libraryTab.closeBottomPane();
         }
     }
@@ -162,52 +203,66 @@ public void listen(SharedEntriesNotPresentEvent event) {
      * @return BasePanel which also used by {@link SaveDatabaseAction}
      */
     public LibraryTab openNewSharedDatabaseTab(DBMSConnectionProperties dbmsConnectionProperties)
-            throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException {
+            throws SQLException,
+                    DatabaseNotSupportedException,
+                    InvalidDBMSConnectionPropertiesException {
 
         BibDatabaseContext bibDatabaseContext = getBibDatabaseContextForSharedDatabase();
 
         dbmsSynchronizer = bibDatabaseContext.getDBMSSynchronizer();
         dbmsSynchronizer.openSharedDatabase(new DBMSConnection(dbmsConnectionProperties));
         dbmsSynchronizer.registerListener(this);
-        dialogService.notify(Localization.lang("Connection to %0 server established.", dbmsConnectionProperties.getType().toString()));
-
-        LibraryTab libraryTab = LibraryTab.createLibraryTab(
-                bibDatabaseContext,
-                tabContainer,
-                dialogService,
-                preferences,
-                stateManager,
-                fileUpdateMonitor,
-                entryTypesManager,
-                undoManager,
-                clipBoardManager,
-                taskExecutor);
+        dialogService.notify(
+                Localization.lang(
+                        "Connection to %0 server established.",
+                        dbmsConnectionProperties.getType().toString()));
+
+        LibraryTab libraryTab =
+                LibraryTab.createLibraryTab(
+                        bibDatabaseContext,
+                        tabContainer,
+                        dialogService,
+                        preferences,
+                        stateManager,
+                        fileUpdateMonitor,
+                        entryTypesManager,
+                        undoManager,
+                        clipBoardManager,
+                        taskExecutor);
         tabContainer.addTab(libraryTab, true);
         return libraryTab;
     }
 
     public void openSharedDatabaseFromParserResult(ParserResult parserResult)
-            throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException,
-            NotASharedDatabaseException {
+            throws SQLException,
+                    DatabaseNotSupportedException,
+                    InvalidDBMSConnectionPropertiesException,
+                    NotASharedDatabaseException {
 
-        Optional<String> sharedDatabaseIDOptional = parserResult.getDatabase().getSharedDatabaseID();
+        Optional<String> sharedDatabaseIDOptional =
+                parserResult.getDatabase().getSharedDatabaseID();
 
         if (sharedDatabaseIDOptional.isEmpty()) {
             throw new NotASharedDatabaseException();
         }
 
         String sharedDatabaseID = sharedDatabaseIDOptional.get();
-        DBMSConnectionProperties dbmsConnectionProperties = new DBMSConnectionProperties(new SharedDatabasePreferences(sharedDatabaseID));
+        DBMSConnectionProperties dbmsConnectionProperties =
+                new DBMSConnectionProperties(new SharedDatabasePreferences(sharedDatabaseID));
 
         BibDatabaseContext bibDatabaseContext = getBibDatabaseContextForSharedDatabase();
 
         bibDatabaseContext.getDatabase().setSharedDatabaseID(sharedDatabaseID);
-        bibDatabaseContext.setDatabasePath(parserResult.getDatabaseContext().getDatabasePath().orElse(null));
+        bibDatabaseContext.setDatabasePath(
+                parserResult.getDatabaseContext().getDatabasePath().orElse(null));
 
         dbmsSynchronizer = bibDatabaseContext.getDBMSSynchronizer();
         dbmsSynchronizer.openSharedDatabase(new DBMSConnection(dbmsConnectionProperties));
         dbmsSynchronizer.registerListener(this);
-        dialogService.notify(Localization.lang("Connection to %0 server established.", dbmsConnectionProperties.getType().toString()));
+        dialogService.notify(
+                Localization.lang(
+                        "Connection to %0 server established.",
+                        dbmsConnectionProperties.getType().toString()));
 
         parserResult.setDatabaseContext(bibDatabaseContext);
     }
@@ -215,12 +270,13 @@ public void openSharedDatabaseFromParserResult(ParserResult parserResult)
     private BibDatabaseContext getBibDatabaseContextForSharedDatabase() {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
         bibDatabaseContext.setMode(preferences.getLibraryPreferences().getDefaultBibDatabaseMode());
-        DBMSSynchronizer synchronizer = new DBMSSynchronizer(
-                bibDatabaseContext,
-                preferences.getBibEntryPreferences().getKeywordSeparator(),
-                preferences.getFieldPreferences(),
-                preferences.getCitationKeyPatternPreferences().getKeyPatterns(),
-                fileUpdateMonitor);
+        DBMSSynchronizer synchronizer =
+                new DBMSSynchronizer(
+                        bibDatabaseContext,
+                        preferences.getBibEntryPreferences().getKeywordSeparator(),
+                        preferences.getFieldPreferences(),
+                        preferences.getCitationKeyPatternPreferences().getKeyPatterns(),
+                        fileUpdateMonitor);
         bibDatabaseContext.convertToSharedDatabase(synchronizer);
         return bibDatabaseContext;
     }
diff --git a/src/main/java/org/jabref/gui/sidepane/GroupsSidePaneComponent.java b/src/main/java/org/jabref/gui/sidepane/GroupsSidePaneComponent.java
index e5f48ae21f4d..467cedf302b5 100644
--- a/src/main/java/org/jabref/gui/sidepane/GroupsSidePaneComponent.java
+++ b/src/main/java/org/jabref/gui/sidepane/GroupsSidePaneComponent.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.sidepane;
 
-import java.util.EnumSet;
-
 import javafx.collections.SetChangeListener;
 import javafx.scene.control.Button;
 import javafx.scene.control.ToggleButton;
@@ -15,19 +13,23 @@
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.EnumSet;
+
 public class GroupsSidePaneComponent extends SidePaneComponent {
     private final GroupsPreferences groupsPreferences;
     private final DialogService dialogService;
-    private final Button intersectionUnionToggle = IconTheme.JabRefIcons.GROUP_INTERSECTION.asButton();
+    private final Button intersectionUnionToggle =
+            IconTheme.JabRefIcons.GROUP_INTERSECTION.asButton();
     private final ToggleButton filterToggle = IconTheme.JabRefIcons.FILTER.asToggleButton();
     private final ToggleButton invertToggle = IconTheme.JabRefIcons.INVERT.asToggleButton();
 
-    public GroupsSidePaneComponent(SimpleCommand closeCommand,
-                                   SimpleCommand moveUpCommand,
-                                   SimpleCommand moveDownCommand,
-                                   SidePaneContentFactory contentFactory,
-                                   GroupsPreferences groupsPreferences,
-                                   DialogService dialogService) {
+    public GroupsSidePaneComponent(
+            SimpleCommand closeCommand,
+            SimpleCommand moveUpCommand,
+            SimpleCommand moveDownCommand,
+            SidePaneContentFactory contentFactory,
+            GroupsPreferences groupsPreferences,
+            DialogService dialogService) {
         super(SidePaneType.GROUPS, closeCommand, moveUpCommand, moveDownCommand, contentFactory);
         this.groupsPreferences = groupsPreferences;
         this.dialogService = dialogService;
@@ -36,11 +38,19 @@ public GroupsSidePaneComponent(SimpleCommand closeCommand,
         setupFilterToggle();
         setupIntersectionUnionToggle();
 
-        groupsPreferences.groupViewModeProperty().addListener((SetChangeListener<GroupViewMode>) change -> {
-            GroupModeViewModel modeViewModel = new GroupModeViewModel(groupsPreferences.groupViewModeProperty());
-            intersectionUnionToggle.setGraphic(modeViewModel.getUnionIntersectionGraphic());
-            intersectionUnionToggle.setTooltip(modeViewModel.getUnionIntersectionTooltip());
-        });
+        groupsPreferences
+                .groupViewModeProperty()
+                .addListener(
+                        (SetChangeListener<GroupViewMode>)
+                                change -> {
+                                    GroupModeViewModel modeViewModel =
+                                            new GroupModeViewModel(
+                                                    groupsPreferences.groupViewModeProperty());
+                                    intersectionUnionToggle.setGraphic(
+                                            modeViewModel.getUnionIntersectionGraphic());
+                                    intersectionUnionToggle.setTooltip(
+                                            modeViewModel.getUnionIntersectionTooltip());
+                                });
     }
 
     private void setupIntersectionUnionToggle() {
@@ -51,15 +61,25 @@ private void setupIntersectionUnionToggle() {
     private void setupFilterToggle() {
         addExtraNodeToHeader(filterToggle, 0);
         filterToggle.setTooltip(new Tooltip(Localization.lang("Filter by groups")));
-        filterToggle.setSelected(groupsPreferences.groupViewModeProperty().contains(GroupViewMode.FILTER));
-        filterToggle.selectedProperty().addListener((observable, oldValue, newValue) -> groupsPreferences.setGroupViewMode(GroupViewMode.FILTER, newValue));
+        filterToggle.setSelected(
+                groupsPreferences.groupViewModeProperty().contains(GroupViewMode.FILTER));
+        filterToggle
+                .selectedProperty()
+                .addListener(
+                        (observable, oldValue, newValue) ->
+                                groupsPreferences.setGroupViewMode(GroupViewMode.FILTER, newValue));
     }
 
     private void setupInvertToggle() {
         addExtraNodeToHeader(invertToggle, 0);
         invertToggle.setTooltip(new Tooltip(Localization.lang("Invert groups")));
-        invertToggle.setSelected(groupsPreferences.groupViewModeProperty().contains(GroupViewMode.INVERT));
-        invertToggle.selectedProperty().addListener((observable, oldValue, newValue) -> groupsPreferences.setGroupViewMode(GroupViewMode.INVERT, newValue));
+        invertToggle.setSelected(
+                groupsPreferences.groupViewModeProperty().contains(GroupViewMode.INVERT));
+        invertToggle
+                .selectedProperty()
+                .addListener(
+                        (observable, oldValue, newValue) ->
+                                groupsPreferences.setGroupViewMode(GroupViewMode.INVERT, newValue));
     }
 
     private class ToggleUnionIntersectionAction extends SimpleCommand {
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePane.java b/src/main/java/org/jabref/gui/sidepane/SidePane.java
index e4a969e663b8..0c27324dab27 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePane.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePane.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.sidepane;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.collections.ListChangeListener;
@@ -22,6 +17,11 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.swing.undo.UndoManager;
+
 public class SidePane extends VBox {
     private final SidePaneViewModel viewModel;
     private final GuiPreferences preferences;
@@ -31,48 +31,53 @@ public class SidePane extends VBox {
     @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
     private final Map<SidePaneType, BooleanBinding> visibleBindings = new HashMap<>();
 
-    public SidePane(LibraryTabContainer tabContainer,
-                    GuiPreferences preferences,
-                    ChatHistoryService chatHistoryService,
-                    JournalAbbreviationRepository abbreviationRepository,
-                    TaskExecutor taskExecutor,
-                    DialogService dialogService,
-                    StateManager stateManager,
-                    FileUpdateMonitor fileUpdateMonitor,
-                    BibEntryTypesManager entryTypesManager,
-                    ClipBoardManager clipBoardManager,
-                    UndoManager undoManager) {
+    public SidePane(
+            LibraryTabContainer tabContainer,
+            GuiPreferences preferences,
+            ChatHistoryService chatHistoryService,
+            JournalAbbreviationRepository abbreviationRepository,
+            TaskExecutor taskExecutor,
+            DialogService dialogService,
+            StateManager stateManager,
+            FileUpdateMonitor fileUpdateMonitor,
+            BibEntryTypesManager entryTypesManager,
+            ClipBoardManager clipBoardManager,
+            UndoManager undoManager) {
         this.stateManager = stateManager;
         this.preferences = preferences;
-        this.viewModel = new SidePaneViewModel(
-                tabContainer,
-                preferences,
-                chatHistoryService,
-                abbreviationRepository,
-                stateManager,
-                taskExecutor,
-                dialogService,
-                fileUpdateMonitor,
-                entryTypesManager,
-                clipBoardManager,
-                undoManager);
+        this.viewModel =
+                new SidePaneViewModel(
+                        tabContainer,
+                        preferences,
+                        chatHistoryService,
+                        abbreviationRepository,
+                        stateManager,
+                        taskExecutor,
+                        dialogService,
+                        fileUpdateMonitor,
+                        entryTypesManager,
+                        clipBoardManager,
+                        undoManager);
 
-        stateManager.getVisibleSidePaneComponents().addListener((ListChangeListener<SidePaneType>) c -> updateView());
+        stateManager
+                .getVisibleSidePaneComponents()
+                .addListener((ListChangeListener<SidePaneType>) c -> updateView());
         updateView();
     }
 
-     private void updateView() {
+    private void updateView() {
         getChildren().clear();
-         for (SidePaneType type : stateManager.getVisibleSidePaneComponents()) {
-             SidePaneComponent view = viewModel.getSidePaneComponent(type);
-             getChildren().add(view);
-         }
-     }
+        for (SidePaneType type : stateManager.getVisibleSidePaneComponents()) {
+            SidePaneComponent view = viewModel.getSidePaneComponent(type);
+            getChildren().add(view);
+        }
+    }
 
     public BooleanBinding paneVisibleBinding(SidePaneType pane) {
-        BooleanBinding visibility = Bindings.createBooleanBinding(
-                () -> stateManager.getVisibleSidePaneComponents().contains(pane),
-                stateManager.getVisibleSidePaneComponents());
+        BooleanBinding visibility =
+                Bindings.createBooleanBinding(
+                        () -> stateManager.getVisibleSidePaneComponents().contains(pane),
+                        stateManager.getVisibleSidePaneComponents());
         visibleBindings.put(pane, visibility);
         return visibility;
     }
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java b/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java
index 6260a9081238..d392dfabcee3 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java
@@ -23,11 +23,12 @@ public class SidePaneComponent extends BorderPane {
 
     private HBox buttonContainer;
 
-    public SidePaneComponent(SidePaneType sidePaneType,
-                             SimpleCommand closeCommand,
-                             SimpleCommand moveUpCommand,
-                             SimpleCommand moveDownCommand,
-                             SidePaneContentFactory contentFactory) {
+    public SidePaneComponent(
+            SidePaneType sidePaneType,
+            SimpleCommand closeCommand,
+            SimpleCommand moveUpCommand,
+            SimpleCommand moveDownCommand,
+            SidePaneContentFactory contentFactory) {
         this.sidePaneType = sidePaneType;
         this.closeCommand = closeCommand;
         this.moveUpCommand = moveUpCommand;
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java b/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
index 171fc8b87777..3bcc3081bdf1 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.sidepane;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.Node;
 
 import org.jabref.gui.ClipBoardManager;
@@ -19,6 +17,8 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 
+import javax.swing.undo.UndoManager;
+
 public class SidePaneContentFactory {
     private final LibraryTabContainer tabContainer;
     private final GuiPreferences preferences;
@@ -32,17 +32,18 @@ public class SidePaneContentFactory {
     private final ClipBoardManager clipBoardManager;
     private final UndoManager undoManager;
 
-    public SidePaneContentFactory(LibraryTabContainer tabContainer,
-                                  GuiPreferences preferences,
-                                  ChatHistoryService chatHistoryService,
-                                  JournalAbbreviationRepository abbreviationRepository,
-                                  TaskExecutor taskExecutor,
-                                  DialogService dialogService,
-                                  StateManager stateManager,
-                                  FileUpdateMonitor fileUpdateMonitor,
-                                  BibEntryTypesManager entryTypesManager,
-                                  ClipBoardManager clipBoardManager,
-                                  UndoManager undoManager) {
+    public SidePaneContentFactory(
+            LibraryTabContainer tabContainer,
+            GuiPreferences preferences,
+            ChatHistoryService chatHistoryService,
+            JournalAbbreviationRepository abbreviationRepository,
+            TaskExecutor taskExecutor,
+            DialogService dialogService,
+            StateManager stateManager,
+            FileUpdateMonitor fileUpdateMonitor,
+            BibEntryTypesManager entryTypesManager,
+            ClipBoardManager clipBoardManager,
+            UndoManager undoManager) {
         this.tabContainer = tabContainer;
         this.preferences = preferences;
         this.chatHistoryService = chatHistoryService;
@@ -58,31 +59,31 @@ public SidePaneContentFactory(LibraryTabContainer tabContainer,
 
     public Node create(SidePaneType sidePaneType) {
         return switch (sidePaneType) {
-            case GROUPS -> new GroupTreeView(
-                    taskExecutor,
-                    stateManager,
-                    preferences,
-                    dialogService,
-                    chatHistoryService);
-            case OPEN_OFFICE -> new OpenOfficePanel(
-                    tabContainer,
-                    preferences,
-                    preferences.getOpenOfficePreferences(),
-                    preferences.getExternalApplicationsPreferences(),
-                    preferences.getLayoutFormatterPreferences(),
-                    preferences.getCitationKeyPatternPreferences(),
-                    abbreviationRepository,
-                    (UiTaskExecutor) taskExecutor,
-                    dialogService,
-                    stateManager,
-                    fileUpdateMonitor,
-                    entryTypesManager,
-                    clipBoardManager,
-                    undoManager).getContent();
-            case WEB_SEARCH -> new WebSearchPaneView(
-                    preferences,
-                    dialogService,
-                    stateManager);
+            case GROUPS ->
+                    new GroupTreeView(
+                            taskExecutor,
+                            stateManager,
+                            preferences,
+                            dialogService,
+                            chatHistoryService);
+            case OPEN_OFFICE ->
+                    new OpenOfficePanel(
+                                    tabContainer,
+                                    preferences,
+                                    preferences.getOpenOfficePreferences(),
+                                    preferences.getExternalApplicationsPreferences(),
+                                    preferences.getLayoutFormatterPreferences(),
+                                    preferences.getCitationKeyPatternPreferences(),
+                                    abbreviationRepository,
+                                    (UiTaskExecutor) taskExecutor,
+                                    dialogService,
+                                    stateManager,
+                                    fileUpdateMonitor,
+                                    entryTypesManager,
+                                    clipBoardManager,
+                                    undoManager)
+                            .getContent();
+            case WEB_SEARCH -> new WebSearchPaneView(preferences, dialogService, stateManager);
         };
     }
 }
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneType.java b/src/main/java/org/jabref/gui/sidepane/SidePaneType.java
index ebfd8f0d8b7b..6c4b377c2864 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneType.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneType.java
@@ -10,9 +10,18 @@
  * Definition of all possible components in the side pane.
  */
 public enum SidePaneType {
-    OPEN_OFFICE("OpenOffice/LibreOffice", IconTheme.JabRefIcons.FILE_OPENOFFICE, StandardActions.TOGGLE_OO),
-    WEB_SEARCH(Localization.lang("Web search"), IconTheme.JabRefIcons.WWW, StandardActions.TOGGLE_WEB_SEARCH),
-    GROUPS(Localization.lang("Groups"), IconTheme.JabRefIcons.TOGGLE_GROUPS, StandardActions.TOGGLE_GROUPS);
+    OPEN_OFFICE(
+            "OpenOffice/LibreOffice",
+            IconTheme.JabRefIcons.FILE_OPENOFFICE,
+            StandardActions.TOGGLE_OO),
+    WEB_SEARCH(
+            Localization.lang("Web search"),
+            IconTheme.JabRefIcons.WWW,
+            StandardActions.TOGGLE_WEB_SEARCH),
+    GROUPS(
+            Localization.lang("Groups"),
+            IconTheme.JabRefIcons.TOGGLE_GROUPS,
+            StandardActions.TOGGLE_GROUPS);
 
     private final String title;
     private final JabRefIcon icon;
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java b/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
index 9d13d9ef56a1..132526d29358 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
@@ -1,15 +1,5 @@
 package org.jabref.gui.sidepane;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.IntStream;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 
@@ -26,10 +16,19 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.IntStream;
+
+import javax.swing.undo.UndoManager;
+
 public class SidePaneViewModel extends AbstractViewModel {
     private static final Logger LOGGER = LoggerFactory.getLogger(SidePaneViewModel.class);
 
@@ -40,62 +39,77 @@ public class SidePaneViewModel extends AbstractViewModel {
     private final SidePaneContentFactory sidePaneContentFactory;
     private final DialogService dialogService;
 
-    public SidePaneViewModel(LibraryTabContainer tabContainer,
-                             GuiPreferences preferences,
-                             ChatHistoryService chatHistoryService,
-                             JournalAbbreviationRepository abbreviationRepository,
-                             StateManager stateManager,
-                             TaskExecutor taskExecutor,
-                             DialogService dialogService,
-                             FileUpdateMonitor fileUpdateMonitor,
-                             BibEntryTypesManager entryTypesManager,
-                             ClipBoardManager clipBoardManager,
-                             UndoManager undoManager) {
+    public SidePaneViewModel(
+            LibraryTabContainer tabContainer,
+            GuiPreferences preferences,
+            ChatHistoryService chatHistoryService,
+            JournalAbbreviationRepository abbreviationRepository,
+            StateManager stateManager,
+            TaskExecutor taskExecutor,
+            DialogService dialogService,
+            FileUpdateMonitor fileUpdateMonitor,
+            BibEntryTypesManager entryTypesManager,
+            ClipBoardManager clipBoardManager,
+            UndoManager undoManager) {
         this.preferences = preferences;
         this.stateManager = stateManager;
         this.dialogService = dialogService;
-        this.sidePaneContentFactory = new SidePaneContentFactory(
-                tabContainer,
-                preferences,
-                chatHistoryService,
-                abbreviationRepository,
-                taskExecutor,
-                dialogService,
-                stateManager,
-                fileUpdateMonitor,
-                entryTypesManager,
-                clipBoardManager,
-                undoManager);
+        this.sidePaneContentFactory =
+                new SidePaneContentFactory(
+                        tabContainer,
+                        preferences,
+                        chatHistoryService,
+                        abbreviationRepository,
+                        taskExecutor,
+                        dialogService,
+                        stateManager,
+                        fileUpdateMonitor,
+                        entryTypesManager,
+                        clipBoardManager,
+                        undoManager);
 
         preferences.getSidePanePreferences().visiblePanes().forEach(this::show);
-        getPanes().addListener((ListChangeListener<? super SidePaneType>) change -> {
-            while (change.next()) {
-                if (change.wasAdded()) {
-                    preferences.getSidePanePreferences().visiblePanes().add(change.getAddedSubList().getFirst());
-                } else if (change.wasRemoved()) {
-                    preferences.getSidePanePreferences().visiblePanes().remove(change.getRemoved().getFirst());
-                }
-            }
-        });
+        getPanes()
+                .addListener(
+                        (ListChangeListener<? super SidePaneType>)
+                                change -> {
+                                    while (change.next()) {
+                                        if (change.wasAdded()) {
+                                            preferences
+                                                    .getSidePanePreferences()
+                                                    .visiblePanes()
+                                                    .add(change.getAddedSubList().getFirst());
+                                        } else if (change.wasRemoved()) {
+                                            preferences
+                                                    .getSidePanePreferences()
+                                                    .visiblePanes()
+                                                    .remove(change.getRemoved().getFirst());
+                                        }
+                                    }
+                                });
     }
 
     protected SidePaneComponent getSidePaneComponent(SidePaneType pane) {
         SidePaneComponent sidePaneComponent = sidePaneComponentLookup.get(pane);
         if (sidePaneComponent == null) {
-            sidePaneComponent = switch (pane) {
-                case GROUPS -> new GroupsSidePaneComponent(
-                        new ClosePaneAction(pane),
-                        new MoveUpAction(pane),
-                        new MoveDownAction(pane),
-                        sidePaneContentFactory,
-                        preferences.getGroupsPreferences(),
-                        dialogService);
-                case WEB_SEARCH, OPEN_OFFICE -> new SidePaneComponent(pane,
-                        new ClosePaneAction(pane),
-                        new MoveUpAction(pane),
-                        new MoveDownAction(pane),
-                        sidePaneContentFactory);
-            };
+            sidePaneComponent =
+                    switch (pane) {
+                        case GROUPS ->
+                                new GroupsSidePaneComponent(
+                                        new ClosePaneAction(pane),
+                                        new MoveUpAction(pane),
+                                        new MoveDownAction(pane),
+                                        sidePaneContentFactory,
+                                        preferences.getGroupsPreferences(),
+                                        dialogService);
+                        case WEB_SEARCH, OPEN_OFFICE ->
+                                new SidePaneComponent(
+                                        pane,
+                                        new ClosePaneAction(pane),
+                                        new MoveUpAction(pane),
+                                        new MoveDownAction(pane),
+                                        sidePaneContentFactory);
+                    };
             sidePaneComponentLookup.put(pane, sidePaneComponent);
         }
         return sidePaneComponent;
@@ -106,9 +120,10 @@ protected SidePaneComponent getSidePaneComponent(SidePaneType pane) {
      * position next time.
      */
     private void updatePreferredPositions() {
-        Map<SidePaneType, Integer> preferredPositions = new HashMap<>(preferences.getSidePanePreferences()
-                                                                                 .getPreferredPositions());
-        IntStream.range(0, getPanes().size()).forEach(i -> preferredPositions.put(getPanes().get(i), i));
+        Map<SidePaneType, Integer> preferredPositions =
+                new HashMap<>(preferences.getSidePanePreferences().getPreferredPositions());
+        IntStream.range(0, getPanes().size())
+                .forEach(i -> preferredPositions.put(getPanes().get(i), i));
         preferences.getSidePanePreferences().setPreferredPositions(preferredPositions);
     }
 
diff --git a/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java b/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java
index 864a3e70591e..121a8db8992a 100644
--- a/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java
+++ b/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java
@@ -9,7 +9,8 @@ public class TogglePaneAction extends SimpleCommand {
     private final SidePaneType pane;
     private final SidePanePreferences sidePanePreferences;
 
-    public TogglePaneAction(StateManager stateManager, SidePaneType pane, SidePanePreferences sidePanePreferences) {
+    public TogglePaneAction(
+            StateManager stateManager, SidePaneType pane, SidePanePreferences sidePanePreferences) {
         this.stateManager = stateManager;
         this.pane = pane;
         this.sidePanePreferences = sidePanePreferences;
@@ -19,7 +20,9 @@ public TogglePaneAction(StateManager stateManager, SidePaneType pane, SidePanePr
     public void execute() {
         if (!stateManager.getVisibleSidePaneComponents().contains(pane)) {
             stateManager.getVisibleSidePaneComponents().add(pane);
-            stateManager.getVisibleSidePaneComponents().sort(new SidePaneViewModel.PreferredIndexSort(sidePanePreferences));
+            stateManager
+                    .getVisibleSidePaneComponents()
+                    .sort(new SidePaneViewModel.PreferredIndexSort(sidePanePreferences));
         } else {
             stateManager.getVisibleSidePaneComponents().remove(pane);
         }
diff --git a/src/main/java/org/jabref/gui/slr/EditExistingStudyAction.java b/src/main/java/org/jabref/gui/slr/EditExistingStudyAction.java
index f86eae44389d..c9eeac802528 100644
--- a/src/main/java/org/jabref/gui/slr/EditExistingStudyAction.java
+++ b/src/main/java/org/jabref/gui/slr/EditExistingStudyAction.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.slr;
 
-import java.io.IOException;
-import java.nio.file.Path;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
@@ -12,10 +9,12 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.study.Study;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+
 public class EditExistingStudyAction extends SimpleCommand {
     private static final Logger LOGGER = LoggerFactory.getLogger(EditExistingStudyAction.class);
 
@@ -32,7 +31,8 @@ public EditExistingStudyAction(DialogService dialogService, StateManager stateMa
     public void execute() {
         // The action works on the current library
         // This library has to be determined
-        if (stateManager.getActiveDatabase().isEmpty() || !stateManager.getActiveDatabase().get().isStudy()) {
+        if (stateManager.getActiveDatabase().isEmpty()
+                || !stateManager.getActiveDatabase().get().isStudy()) {
             return;
         }
         BibDatabaseContext bibDatabaseContext = stateManager.getActiveDatabase().get();
@@ -51,7 +51,11 @@ public void execute() {
 
         Study study;
         try {
-            study = new StudyYamlParser().parseStudyYamlFile(studyDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME));
+            study =
+                    new StudyYamlParser()
+                            .parseStudyYamlFile(
+                                    studyDirectory.resolve(
+                                            StudyRepository.STUDY_DEFINITION_FILE_NAME));
         } catch (IOException e) {
             dialogService.showErrorDialogAndWait(Localization.lang("Error opening file"), e);
             return;
diff --git a/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java b/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
index 512bcfd075cd..db3d94005a82 100644
--- a/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
+++ b/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
@@ -1,9 +1,6 @@
 package org.jabref.gui.slr;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.function.Supplier;
-
+import org.eclipse.jgit.api.errors.GitAPIException;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
@@ -20,11 +17,13 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import org.eclipse.jgit.api.errors.GitAPIException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.function.Supplier;
+
 public class ExistingStudySearchAction extends SimpleCommand {
     private static final Logger LOGGER = LoggerFactory.getLogger(ExistingStudySearchAction.class);
 
@@ -51,7 +50,8 @@ public ExistingStudySearchAction(
             TaskExecutor taskExecutor,
             CliPreferences preferences,
             StateManager stateManager) {
-        this(tabContainer,
+        this(
+                tabContainer,
                 openDatabaseActionSupplier,
                 dialogService,
                 fileUpdateMonitor,
@@ -104,38 +104,53 @@ protected void crawl() {
         try {
             crawlPreparation(this.studyDirectory);
         } catch (IOException | GitAPIException e) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Study repository could not be created"), e);
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Study repository could not be created"), e);
             return;
         }
 
         final Crawler crawler;
         try {
-            crawler = new Crawler(
-                    this.studyDirectory,
-                    new SlrGitHandler(this.studyDirectory),
-                    preferences,
-                    new BibEntryTypesManager(),
-                    fileUpdateMonitor);
+            crawler =
+                    new Crawler(
+                            this.studyDirectory,
+                            new SlrGitHandler(this.studyDirectory),
+                            preferences,
+                            new BibEntryTypesManager(),
+                            fileUpdateMonitor);
         } catch (IOException | ParseException e) {
             LOGGER.error("Error during reading of study definition file.", e);
-            dialogService.showErrorDialogAndWait(Localization.lang("Error during reading of study definition file."), e);
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Error during reading of study definition file."), e);
             return;
         }
 
         dialogService.notify(Localization.lang("Searching..."));
-        BackgroundTask.wrap(() -> {
-                          crawler.performCrawl();
-                          return 0; // Return any value to make this a callable instead of a runnable. This allows throwing exceptions.
-                      })
-                      .onFailure(e -> {
-                          LOGGER.error("Error during persistence of crawling results.");
-                          dialogService.showErrorDialogAndWait(Localization.lang("Error during persistence of crawling results."), e);
-                      })
-                      .onSuccess(unused -> {
-                          dialogService.notify(Localization.lang("Finished Searching"));
-                          openDatabaseActionSupplier.get().openFile(Path.of(this.studyDirectory.toString(), Crawler.FILENAME_STUDY_RESULT_BIB));
-                      })
-                      .executeWith(taskExecutor);
+        BackgroundTask.wrap(
+                        () -> {
+                            crawler.performCrawl();
+                            return 0; // Return any value to make this a callable instead of a
+                                      // runnable. This allows throwing exceptions.
+                        })
+                .onFailure(
+                        e -> {
+                            LOGGER.error("Error during persistence of crawling results.");
+                            dialogService.showErrorDialogAndWait(
+                                    Localization.lang(
+                                            "Error during persistence of crawling results."),
+                                    e);
+                        })
+                .onSuccess(
+                        unused -> {
+                            dialogService.notify(Localization.lang("Finished Searching"));
+                            openDatabaseActionSupplier
+                                    .get()
+                                    .openFile(
+                                            Path.of(
+                                                    this.studyDirectory.toString(),
+                                                    Crawler.FILENAME_STUDY_RESULT_BIB));
+                        })
+                .executeWith(taskExecutor);
     }
 
     /**
diff --git a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
index 519b9899ed22..97ef9adaeb13 100644
--- a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
+++ b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
@@ -1,12 +1,8 @@
 package org.jabref.gui.slr;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Optional;
-import java.util.StringJoiner;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
+import com.airhacks.afterburner.views.ViewLoader;
+
+import jakarta.inject.Inject;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleStringProperty;
@@ -34,12 +30,17 @@
 import org.jabref.gui.util.ViewModelTableRowFactory;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.study.Study;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.StringJoiner;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
 /**
  * This class controls the user interface of the study definition management dialog. The UI elements and their layout
  * are defined in the FXML file.
@@ -99,9 +100,7 @@ public ManageStudyDefinitionView(Path pathToStudyDataDirectory) {
         this.setTitle(Localization.lang("Define study parameters"));
         this.study = Optional.empty();
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         setupSaveSurveyButton(false);
 
@@ -119,9 +118,7 @@ public ManageStudyDefinitionView(Study study, Path studyDirectory) {
         this.setTitle(Localization.lang("Manage study definition"));
         this.study = Optional.of(study);
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         setupSaveSurveyButton(true);
 
@@ -135,47 +132,60 @@ private void setupSaveSurveyButton(boolean isEdit) {
             saveSurveyButton.setText(Localization.lang("Start survey"));
         }
 
-        saveSurveyButton.disableProperty().bind(Bindings.or(Bindings.or(Bindings.or(Bindings.or(Bindings.or(
-                                                Bindings.isEmpty(viewModel.getQueries()),
-                                                Bindings.isEmpty(viewModel.getCatalogs())),
-                                                Bindings.isEmpty(viewModel.getAuthors())),
+        saveSurveyButton
+                .disableProperty()
+                .bind(
+                        Bindings.or(
+                                Bindings.or(
+                                        Bindings.or(
+                                                Bindings.or(
+                                                        Bindings.or(
+                                                                Bindings.isEmpty(
+                                                                        viewModel.getQueries()),
+                                                                Bindings.isEmpty(
+                                                                        viewModel.getCatalogs())),
+                                                        Bindings.isEmpty(viewModel.getAuthors())),
                                                 viewModel.getTitle().isEmpty()),
-                                                viewModel.getDirectory().isEmpty()),
-                                                directoryWarning.visibleProperty()));
-
-        setResultConverter(button -> {
-            if (button == saveSurveyButtonType) {
-                viewModel.updateSelectedCatalogs();
-                return viewModel.saveStudy();
-            }
-            // Cancel button will return null
-            return null;
-        });
+                                        viewModel.getDirectory().isEmpty()),
+                                directoryWarning.visibleProperty()));
+
+        setResultConverter(
+                button -> {
+                    if (button == saveSurveyButtonType) {
+                        viewModel.updateSelectedCatalogs();
+                        return viewModel.saveStudy();
+                    }
+                    // Cancel button will return null
+                    return null;
+                });
     }
 
     @FXML
     private void initialize() {
         if (study.isEmpty()) {
-            viewModel = new ManageStudyDefinitionViewModel(
-                    preferences.getImportFormatPreferences(),
-                    preferences.getImporterPreferences(),
-                    preferences.getWorkspacePreferences(),
-                    dialogService);
+            viewModel =
+                    new ManageStudyDefinitionViewModel(
+                            preferences.getImportFormatPreferences(),
+                            preferences.getImporterPreferences(),
+                            preferences.getWorkspacePreferences(),
+                            dialogService);
         } else {
-            viewModel = new ManageStudyDefinitionViewModel(
-                    study.get(),
-                    pathToStudyDataDirectory,
-                    preferences.getImportFormatPreferences(),
-                    preferences.getImporterPreferences(),
-                    preferences.getWorkspacePreferences(),
-                    dialogService);
+            viewModel =
+                    new ManageStudyDefinitionViewModel(
+                            study.get(),
+                            pathToStudyDataDirectory,
+                            preferences.getImportFormatPreferences(),
+                            preferences.getImporterPreferences(),
+                            preferences.getWorkspacePreferences(),
+                            dialogService);
 
             // The directory of the study cannot be changed
             studyDirectory.setEditable(false);
             selectStudyDirectory.setDisable(true);
         }
 
-        // Listen whether any catalogs are removed from selection -> Add back to the catalog selector
+        // Listen whether any catalogs are removed from selection -> Add back to the catalog
+        // selector
         studyTitle.textProperty().bindBidirectional(viewModel.titleProperty());
         studyDirectory.textProperty().bindBidirectional(viewModel.getDirectory());
 
@@ -187,57 +197,76 @@ private void initialize() {
 
     private void updateDirectoryWarning(Path directory) {
         if (!Files.isDirectory(directory)) {
-            directoryWarning.setText(Localization.lang("Warning: The selected directory is not a valid directory."));
+            directoryWarning.setText(
+                    Localization.lang("Warning: The selected directory is not a valid directory."));
             directoryWarning.setVisible(true);
         } else {
             try (Stream<Path> entries = Files.list(directory)) {
                 if (entries.findAny().isPresent()) {
-                    directoryWarning.setText(Localization.lang("Warning: The selected directory is not empty."));
+                    directoryWarning.setText(
+                            Localization.lang("Warning: The selected directory is not empty."));
                     directoryWarning.setVisible(true);
                 } else {
                     directoryWarning.setVisible(false);
                 }
-            } catch (
-                    IOException e) {
-                directoryWarning.setText(Localization.lang("Warning: Failed to check if the directory is empty."));
+            } catch (IOException e) {
+                directoryWarning.setText(
+                        Localization.lang("Warning: Failed to check if the directory is empty."));
                 directoryWarning.setVisible(true);
             }
         }
     }
 
     private void initAuthorTab() {
-        setupCommonPropertiesForTables(addAuthor, this::addAuthor, authorsColumn, authorsActionColumn);
+        setupCommonPropertiesForTables(
+                addAuthor, this::addAuthor, authorsColumn, authorsActionColumn);
         setupCellFactories(authorsColumn, authorsActionColumn, viewModel::deleteAuthor);
         authorTableView.setItems(viewModel.getAuthors());
     }
 
     private void initQuestionsTab() {
-        setupCommonPropertiesForTables(addResearchQuestion, this::addResearchQuestion, questionsColumn, questionsActionColumn);
+        setupCommonPropertiesForTables(
+                addResearchQuestion,
+                this::addResearchQuestion,
+                questionsColumn,
+                questionsActionColumn);
         setupCellFactories(questionsColumn, questionsActionColumn, viewModel::deleteQuestion);
         questionTableView.setItems(viewModel.getResearchQuestions());
     }
 
     private void initQueriesTab() {
-        setupCommonPropertiesForTables(addQuery, this::addQuery, queriesColumn, queriesActionColumn);
+        setupCommonPropertiesForTables(
+                addQuery, this::addQuery, queriesColumn, queriesActionColumn);
         setupCellFactories(queriesColumn, queriesActionColumn, viewModel::deleteQuery);
         queryTableView.setItems(viewModel.getQueries());
 
         // TODO: Keep until PR #7279 is merged
-        helpIcon.setTooltip(new Tooltip(new StringJoiner("\n")
-                .add(Localization.lang("Query terms are separated by spaces."))
-                .add(Localization.lang("All query terms are joined using the logical AND, and OR operators") + ".")
-                .add(Localization.lang("If the sequence of terms is relevant wrap them in double quotes") + "(\").")
-                .add(Localization.lang("An example:") + " rain AND (clouds OR drops) AND \"precipitation distribution\"")
-                .toString()));
+        helpIcon.setTooltip(
+                new Tooltip(
+                        new StringJoiner("\n")
+                                .add(Localization.lang("Query terms are separated by spaces."))
+                                .add(
+                                        Localization.lang(
+                                                        "All query terms are joined using the logical AND, and OR operators")
+                                                + ".")
+                                .add(
+                                        Localization.lang(
+                                                        "If the sequence of terms is relevant wrap them in double quotes")
+                                                + "(\").")
+                                .add(
+                                        Localization.lang("An example:")
+                                                + " rain AND (clouds OR drops) AND \"precipitation distribution\"")
+                                .toString()));
     }
 
     private void initCatalogsTab() {
         new ViewModelTableRowFactory<StudyCatalogItem>()
-                .withOnMouseClickedEvent((entry, event) -> {
-                    if (event.getButton() == MouseButton.PRIMARY) {
-                        entry.setEnabled(!entry.isEnabled());
-                    }
-                })
+                .withOnMouseClickedEvent(
+                        (entry, event) -> {
+                            if (event.getButton() == MouseButton.PRIMARY) {
+                                entry.setEnabled(!entry.isEnabled());
+                            }
+                        })
                 .install(catalogTable);
 
         if (study.isEmpty()) {
@@ -258,15 +287,17 @@ private void initCatalogsTab() {
         catalogTable.setItems(viewModel.getCatalogs());
     }
 
-    private void setupCommonPropertiesForTables(Node addControl,
-                                                Runnable addAction,
-                                                TableColumn<?, String> contentColumn,
-                                                TableColumn<?, String> actionColumn) {
-        addControl.setOnKeyPressed(event -> {
-            if (event.getCode() == KeyCode.ENTER) {
-                addAction.run();
-            }
-        });
+    private void setupCommonPropertiesForTables(
+            Node addControl,
+            Runnable addAction,
+            TableColumn<?, String> contentColumn,
+            TableColumn<?, String> actionColumn) {
+        addControl.setOnKeyPressed(
+                event -> {
+                    if (event.getCode() == KeyCode.ENTER) {
+                        addAction.run();
+                    }
+                });
 
         contentColumn.setReorderable(false);
         contentColumn.setCellFactory(TextFieldTableCell.forTableColumn());
@@ -274,16 +305,16 @@ private void setupCommonPropertiesForTables(Node addControl,
         actionColumn.setResizable(false);
     }
 
-    private void setupCellFactories(TableColumn<String, String> contentColumn,
-                                    TableColumn<String, String> actionColumn,
-                                    Consumer<String> removeAction) {
+    private void setupCellFactories(
+            TableColumn<String, String> contentColumn,
+            TableColumn<String, String> actionColumn,
+            Consumer<String> removeAction) {
         contentColumn.setCellValueFactory(param -> new SimpleStringProperty(param.getValue()));
         actionColumn.setCellValueFactory(param -> new SimpleStringProperty(param.getValue()));
         new ValueTableCellFactory<String, String>()
                 .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
                 .withTooltip(name -> Localization.lang("Remove"))
-                .withOnMouseClickedEvent(item -> evt ->
-                        removeAction.accept(item))
+                .withOnMouseClickedEvent(item -> evt -> removeAction.accept(item))
                 .install(actionColumn);
     }
 
@@ -307,14 +338,17 @@ private void addQuery() {
 
     @FXML
     public void selectStudyDirectory() {
-        DirectoryDialogConfiguration directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(pathToStudyDataDirectory)
-                .build();
-
-        Optional<Path> selectedDirectoryOptional = dialogService.showDirectorySelectionDialog(directoryDialogConfiguration);
-        selectedDirectoryOptional.ifPresent(selectedDirectory -> {
-            viewModel.setStudyDirectory(Optional.of(selectedDirectory));
-            updateDirectoryWarning(selectedDirectory);
-        });
+        DirectoryDialogConfiguration directoryDialogConfiguration =
+                new DirectoryDialogConfiguration.Builder()
+                        .withInitialDirectory(pathToStudyDataDirectory)
+                        .build();
+
+        Optional<Path> selectedDirectoryOptional =
+                dialogService.showDirectorySelectionDialog(directoryDialogConfiguration);
+        selectedDirectoryOptional.ifPresent(
+                selectedDirectory -> {
+                    viewModel.setStudyDirectory(Optional.of(selectedDirectory));
+                    updateDirectoryWarning(selectedDirectory);
+                });
     }
 }
diff --git a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
index 8080c64990ad..c71fe6c3b710 100644
--- a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
+++ b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
@@ -1,14 +1,5 @@
 package org.jabref.gui.slr;
 
-import java.io.IOException;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
@@ -33,22 +24,32 @@
 import org.jabref.model.study.Study;
 import org.jabref.model.study.StudyDatabase;
 import org.jabref.model.study.StudyQuery;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * This class provides a model for managing study definitions.
  * To visualize the model one can bind the properties to UI elements.
  */
 public class ManageStudyDefinitionViewModel {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ManageStudyDefinitionViewModel.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(ManageStudyDefinitionViewModel.class);
 
-    private static final Set<String> DEFAULT_SELECTION = Set.of(
-            ACMPortalFetcher.FETCHER_NAME,
-            IEEE.FETCHER_NAME,
-            SpringerFetcher.FETCHER_NAME,
-            DBLPFetcher.FETCHER_NAME);
+    private static final Set<String> DEFAULT_SELECTION =
+            Set.of(
+                    ACMPortalFetcher.FETCHER_NAME,
+                    IEEE.FETCHER_NAME,
+                    SpringerFetcher.FETCHER_NAME,
+                    DBLPFetcher.FETCHER_NAME);
 
     private final StringProperty title = new SimpleStringProperty();
     private final ObservableList<String> authors = FXCollections.observableArrayList();
@@ -66,21 +67,25 @@ public class ManageStudyDefinitionViewModel {
     /**
      * Constructor for a new study
      */
-    public ManageStudyDefinitionViewModel(ImportFormatPreferences importFormatPreferences,
-                                          ImporterPreferences importerPreferences,
-                                          WorkspacePreferences workspacePreferences,
-                                          DialogService dialogService) {
-        databases.addAll(WebFetchers.getSearchBasedFetchers(importFormatPreferences, importerPreferences)
-                                    .stream()
-                                    .map(SearchBasedFetcher::getName)
-                                    // The user wants to select specific fetchers
-                                    // The fetcher summarizing ALL fetchers can be emulated by selecting ALL fetchers (which happens rarely when doing an SLR)
-                                    .filter(name -> !name.equals(CompositeSearchBasedFetcher.FETCHER_NAME))
-                                    .map(name -> {
-                                        boolean enabled = DEFAULT_SELECTION.contains(name);
-                                        return new StudyCatalogItem(name, enabled);
-                                    })
-                                    .toList());
+    public ManageStudyDefinitionViewModel(
+            ImportFormatPreferences importFormatPreferences,
+            ImporterPreferences importerPreferences,
+            WorkspacePreferences workspacePreferences,
+            DialogService dialogService) {
+        databases.addAll(
+                WebFetchers.getSearchBasedFetchers(importFormatPreferences, importerPreferences)
+                        .stream()
+                        .map(SearchBasedFetcher::getName)
+                        // The user wants to select specific fetchers
+                        // The fetcher summarizing ALL fetchers can be emulated by selecting ALL
+                        // fetchers (which happens rarely when doing an SLR)
+                        .filter(name -> !name.equals(CompositeSearchBasedFetcher.FETCHER_NAME))
+                        .map(
+                                name -> {
+                                    boolean enabled = DEFAULT_SELECTION.contains(name);
+                                    return new StudyCatalogItem(name, enabled);
+                                })
+                        .toList());
         this.dialogService = Objects.requireNonNull(dialogService);
         this.workspacePreferences = Objects.requireNonNull(workspacePreferences);
     }
@@ -91,29 +96,34 @@ public ManageStudyDefinitionViewModel(ImportFormatPreferences importFormatPrefer
      * @param study          The study to initialize the UI from
      * @param studyDirectory The path where the study resides
      */
-    public ManageStudyDefinitionViewModel(Study study,
-                                          Path studyDirectory,
-                                          ImportFormatPreferences importFormatPreferences,
-                                          ImporterPreferences importerPreferences,
-                                          WorkspacePreferences workspacePreferences,
-                                          DialogService dialogService) {
+    public ManageStudyDefinitionViewModel(
+            Study study,
+            Path studyDirectory,
+            ImportFormatPreferences importFormatPreferences,
+            ImporterPreferences importerPreferences,
+            WorkspacePreferences workspacePreferences,
+            DialogService dialogService) {
         // copy the content of the study object into the UI fields
         authors.addAll(Objects.requireNonNull(study).getAuthors());
         title.setValue(study.getTitle());
         researchQuestions.addAll(study.getResearchQuestions());
         queries.addAll(study.getQueries().stream().map(StudyQuery::getQuery).toList());
         List<StudyDatabase> studyDatabases = study.getDatabases();
-        databases.addAll(WebFetchers.getSearchBasedFetchers(importFormatPreferences, importerPreferences)
-                                    .stream()
-                                    .map(SearchBasedFetcher::getName)
-                                    // The user wants to select specific fetchers
-                                    // The fetcher summarizing ALL fetchers can be emulated by selecting ALL fetchers (which happens rarely when doing an SLR)
-                                    .filter(name -> !name.equals(CompositeSearchBasedFetcher.FETCHER_NAME))
-                                    .map(name -> {
-                                        boolean enabled = studyDatabases.contains(new StudyDatabase(name, true));
-                                        return new StudyCatalogItem(name, enabled);
-                                    })
-                                    .toList());
+        databases.addAll(
+                WebFetchers.getSearchBasedFetchers(importFormatPreferences, importerPreferences)
+                        .stream()
+                        .map(SearchBasedFetcher::getName)
+                        // The user wants to select specific fetchers
+                        // The fetcher summarizing ALL fetchers can be emulated by selecting ALL
+                        // fetchers (which happens rarely when doing an SLR)
+                        .filter(name -> !name.equals(CompositeSearchBasedFetcher.FETCHER_NAME))
+                        .map(
+                                name -> {
+                                    boolean enabled =
+                                            studyDatabases.contains(new StudyDatabase(name, true));
+                                    return new StudyCatalogItem(name, enabled);
+                                })
+                        .toList());
 
         this.directory.set(Objects.requireNonNull(studyDirectory).toString());
         this.dialogService = Objects.requireNonNull(dialogService);
@@ -166,39 +176,53 @@ public void addQuery(String query) {
     }
 
     public SlrStudyAndDirectory saveStudy() {
-        Study study = new Study(
-                authors,
-                title.getValueSafe(),
-                researchQuestions,
-                queries.stream().map(StudyQuery::new).collect(Collectors.toList()),
-                databases.stream().map(studyDatabaseItem -> new StudyDatabase(studyDatabaseItem.getName(), studyDatabaseItem.isEnabled())).filter(StudyDatabase::isEnabled).collect(Collectors.toList()));
+        Study study =
+                new Study(
+                        authors,
+                        title.getValueSafe(),
+                        researchQuestions,
+                        queries.stream().map(StudyQuery::new).collect(Collectors.toList()),
+                        databases.stream()
+                                .map(
+                                        studyDatabaseItem ->
+                                                new StudyDatabase(
+                                                        studyDatabaseItem.getName(),
+                                                        studyDatabaseItem.isEnabled()))
+                                .filter(StudyDatabase::isEnabled)
+                                .collect(Collectors.toList()));
         Path studyDirectory;
         final String studyDirectoryAsString = directory.getValueSafe();
         try {
             studyDirectory = Path.of(studyDirectoryAsString);
         } catch (InvalidPathException e) {
             LOGGER.error("Invalid path was provided: {}", studyDirectoryAsString);
-            dialogService.notify(Localization.lang("Unable to write to %0.", studyDirectoryAsString));
+            dialogService.notify(
+                    Localization.lang("Unable to write to %0.", studyDirectoryAsString));
             // We do not assume another path - we return that there is an invalid object.
             return null;
         }
-        Path studyDefinitionFile = studyDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME);
+        Path studyDefinitionFile =
+                studyDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME);
         try {
             new StudyYamlParser().writeStudyYamlFile(study, studyDefinitionFile);
         } catch (IOException e) {
             LOGGER.error("Could not write study file {}", studyDefinitionFile, e);
-            dialogService.notify(Localization.lang("Please enter a valid file path.") +
-                    ": " + studyDirectoryAsString);
+            dialogService.notify(
+                    Localization.lang("Please enter a valid file path.")
+                            + ": "
+                            + studyDirectoryAsString);
             // We do not assume another path - we return that there is an invalid object.
             return null;
         }
 
         try {
-            new GitHandler(studyDirectory).createCommitOnCurrentBranch("Update study definition", false);
+            new GitHandler(studyDirectory)
+                    .createCommitOnCurrentBranch("Update study definition", false);
         } catch (Exception e) {
-            LOGGER.error("Could not commit study definition file in directory {}", studyDirectory, e);
-            dialogService.notify(Localization.lang("Please enter a valid file path.") +
-                    ": " + studyDirectory);
+            LOGGER.error(
+                    "Could not commit study definition file in directory {}", studyDirectory, e);
+            dialogService.notify(
+                    Localization.lang("Please enter a valid file path.") + ": " + studyDirectory);
             // We continue nevertheless as the directory itself could be valid
         }
 
@@ -210,7 +234,11 @@ public Property<String> titleProperty() {
     }
 
     public void setStudyDirectory(Optional<Path> studyRepositoryRoot) {
-        getDirectory().setValue(studyRepositoryRoot.map(Path::toString).orElseGet(() -> getDirectory().getValueSafe()));
+        getDirectory()
+                .setValue(
+                        studyRepositoryRoot
+                                .map(Path::toString)
+                                .orElseGet(() -> getDirectory().getValueSafe()));
     }
 
     public void deleteAuthor(String item) {
@@ -233,10 +261,11 @@ public void initializeSelectedCatalogs() {
     }
 
     public void updateSelectedCatalogs() {
-        List<String> selectedCatalogsList = databases.stream()
-                                                     .filter(StudyCatalogItem::isEnabled)
-                                                     .map(StudyCatalogItem::getName)
-                                                     .collect(Collectors.toList());
+        List<String> selectedCatalogsList =
+                databases.stream()
+                        .filter(StudyCatalogItem::isEnabled)
+                        .map(StudyCatalogItem::getName)
+                        .collect(Collectors.toList());
 
         workspacePreferences.setSelectedSlrCatalogs(selectedCatalogsList);
     }
diff --git a/src/main/java/org/jabref/gui/slr/SlrStudyAndDirectory.java b/src/main/java/org/jabref/gui/slr/SlrStudyAndDirectory.java
index 223d99d52244..3460510b6073 100644
--- a/src/main/java/org/jabref/gui/slr/SlrStudyAndDirectory.java
+++ b/src/main/java/org/jabref/gui/slr/SlrStudyAndDirectory.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.slr;
 
+import org.jabref.model.study.Study;
+
 import java.nio.file.Path;
 import java.util.Objects;
 
-import org.jabref.model.study.Study;
-
 public class SlrStudyAndDirectory {
     private final Study study;
     private final Path studyDirectory;
diff --git a/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java b/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java
index 3b2b34f105b8..ccf985997d7f 100644
--- a/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java
+++ b/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java
@@ -1,10 +1,6 @@
 package org.jabref.gui.slr;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Optional;
-import java.util.function.Supplier;
-
+import org.eclipse.jgit.api.errors.GitAPIException;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
@@ -17,11 +13,14 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.study.Study;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import org.eclipse.jgit.api.errors.GitAPIException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.function.Supplier;
+
 /**
  * Used to start a new study:
  * <ol>
@@ -38,14 +37,16 @@ public class StartNewStudyAction extends ExistingStudySearchAction {
 
     Study newStudy;
 
-    public StartNewStudyAction(LibraryTabContainer tabContainer,
-                               Supplier<OpenDatabaseAction> openDatabaseActionSupplier,
-                               FileUpdateMonitor fileUpdateMonitor,
-                               TaskExecutor taskExecutor,
-                               CliPreferences preferences,
-                               StateManager stateManager,
-                               DialogService dialogService) {
-        super(tabContainer,
+    public StartNewStudyAction(
+            LibraryTabContainer tabContainer,
+            Supplier<OpenDatabaseAction> openDatabaseActionSupplier,
+            FileUpdateMonitor fileUpdateMonitor,
+            TaskExecutor taskExecutor,
+            CliPreferences preferences,
+            StateManager stateManager,
+            DialogService dialogService) {
+        super(
+                tabContainer,
                 openDatabaseActionSupplier,
                 dialogService,
                 fileUpdateMonitor,
@@ -58,10 +59,12 @@ public StartNewStudyAction(LibraryTabContainer tabContainer,
     @Override
     protected void crawlPreparation(Path studyRepositoryRoot) throws IOException, GitAPIException {
         StudyYamlParser studyYAMLParser = new StudyYamlParser();
-        studyYAMLParser.writeStudyYamlFile(newStudy, studyRepositoryRoot.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME));
+        studyYAMLParser.writeStudyYamlFile(
+                newStudy, studyRepositoryRoot.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME));
 
         // When execution reaches this point, the user created a new study.
-        // The GitHandler is already called to initialize the repository with one single commit "Initial commit".
+        // The GitHandler is already called to initialize the repository with one single commit
+        // "Initial commit".
         // The "Initial commit" should also contain the created YAML.
         // Thus, we append to that commit.
         new GitHandler(studyRepositoryRoot).createCommitOnCurrentBranch("Initial commit", true);
@@ -69,8 +72,10 @@ protected void crawlPreparation(Path studyRepositoryRoot) throws IOException, Gi
 
     @Override
     public void execute() {
-        Optional<SlrStudyAndDirectory> studyAndDirectory = dialogService.showCustomDialogAndWait(
-                new ManageStudyDefinitionView(preferences.getFilePreferences().getWorkingDirectory()));
+        Optional<SlrStudyAndDirectory> studyAndDirectory =
+                dialogService.showCustomDialogAndWait(
+                        new ManageStudyDefinitionView(
+                                preferences.getFilePreferences().getWorkingDirectory()));
         if (studyAndDirectory.isEmpty()) {
             return;
         }
diff --git a/src/main/java/org/jabref/gui/slr/StudyCatalogItem.java b/src/main/java/org/jabref/gui/slr/StudyCatalogItem.java
index b379d373bf95..7eeb3d2e442d 100644
--- a/src/main/java/org/jabref/gui/slr/StudyCatalogItem.java
+++ b/src/main/java/org/jabref/gui/slr/StudyCatalogItem.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.slr;
 
-import java.util.Objects;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -9,6 +7,8 @@
 
 import org.jabref.model.study.StudyDatabase;
 
+import java.util.Objects;
+
 /**
  * View representation of {@link StudyDatabase}
  */
@@ -47,10 +47,7 @@ public BooleanProperty enabledProperty() {
 
     @Override
     public String toString() {
-        return "StudyCatalogItem{" +
-                "name=" + name.get() +
-                ", enabled=" + enabled.get() +
-                '}';
+        return "StudyCatalogItem{" + "name=" + name.get() + ", enabled=" + enabled.get() + '}';
     }
 
     @Override
@@ -62,7 +59,8 @@ public boolean equals(Object o) {
             return false;
         }
         StudyCatalogItem that = (StudyCatalogItem) o;
-        return Objects.equals(getName(), that.getName()) && Objects.equals(isEnabled(), that.isEnabled());
+        return Objects.equals(getName(), that.getName())
+                && Objects.equals(isEnabled(), that.isEnabled());
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
index 990c81cd3d35..4861c77bfddc 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
@@ -1,13 +1,5 @@
 package org.jabref.gui.specialfields;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Supplier;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
@@ -21,10 +13,17 @@
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.SpecialField;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import javax.swing.undo.UndoManager;
+
 public class SpecialFieldAction extends SimpleCommand {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SpecialFieldAction.class);
@@ -41,15 +40,16 @@ public class SpecialFieldAction extends SimpleCommand {
     /**
      * @param nullFieldIfValueIsTheSame - false also causes that doneTextPattern has two place holders %0 for the value and %1 for the sum of entries
      */
-    public SpecialFieldAction(Supplier<LibraryTab> tabSupplier,
-                              SpecialField specialField,
-                              String value,
-                              boolean nullFieldIfValueIsTheSame,
-                              String undoText,
-                              DialogService dialogService,
-                              CliPreferences preferences,
-                              UndoManager undoManager,
-                              StateManager stateManager) {
+    public SpecialFieldAction(
+            Supplier<LibraryTab> tabSupplier,
+            SpecialField specialField,
+            String value,
+            boolean nullFieldIfValueIsTheSame,
+            String undoText,
+            DialogService dialogService,
+            CliPreferences preferences,
+            UndoManager undoManager,
+            StateManager stateManager) {
         this.tabSupplier = tabSupplier;
         this.specialField = specialField;
         this.value = value;
@@ -73,8 +73,11 @@ public void execute() {
             NamedCompound ce = new NamedCompound(undoText);
             List<BibEntry> besCopy = new ArrayList<>(bes);
             for (BibEntry bibEntry : besCopy) {
-                // if (value==null) and then call nullField has been omitted as updatefield also handles value==null
-                Optional<FieldChange> change = UpdateField.updateField(bibEntry, specialField, value, nullFieldIfValueIsTheSame);
+                // if (value==null) and then call nullField has been omitted as updatefield also
+                // handles value==null
+                Optional<FieldChange> change =
+                        UpdateField.updateField(
+                                bibEntry, specialField, value, nullFieldIfValueIsTheSame);
 
                 change.ifPresent(fieldChange -> ce.addEdit(new UndoableFieldChange(fieldChange)));
             }
@@ -92,7 +95,8 @@ public void execute() {
                 dialogService.notify(outText);
             }
 
-            // if user does not change anything with his action, we do not do anything either, even no output message
+            // if user does not change anything with his action, we do not do anything either, even
+            // no output message
         } catch (Throwable ex) {
             LOGGER.error("Problem setting special fields", ex);
         }
@@ -101,21 +105,28 @@ public void execute() {
     private String getTextDone(SpecialField field, String... params) {
         Objects.requireNonNull(params);
 
-        SpecialFieldViewModel viewModel = new SpecialFieldViewModel(field, preferences, undoManager);
+        SpecialFieldViewModel viewModel =
+                new SpecialFieldViewModel(field, preferences, undoManager);
 
         if (field.isSingleValueField() && (params.length == 1) && (params[0] != null)) {
             // Single value fields can be toggled only
-            return Localization.lang("Toggled '%0' for %1 entries", viewModel.getLocalization(), params[0]);
-        } else if (!field.isSingleValueField() && (params.length == 2) && (params[0] != null) && (params[1] != null)) {
+            return Localization.lang(
+                    "Toggled '%0' for %1 entries", viewModel.getLocalization(), params[0]);
+        } else if (!field.isSingleValueField()
+                && (params.length == 2)
+                && (params[0] != null)
+                && (params[1] != null)) {
             // setting a multi value special field - the setted value is displayed, too
             String[] allParams = {viewModel.getLocalization(), params[0], params[1]};
             return Localization.lang("Set '%0' to '%1' for %2 entries", allParams);
         } else if (!field.isSingleValueField() && (params.length == 1) && (params[0] != null)) {
             // clearing a multi value specialfield
-            return Localization.lang("Cleared '%0' for %1 entries", viewModel.getLocalization(), params[0]);
+            return Localization.lang(
+                    "Cleared '%0' for %1 entries", viewModel.getLocalization(), params[0]);
         } else {
             // invalid usage
-            LOGGER.info("Creation of special field status change message failed: illegal argument combination.");
+            LOGGER.info(
+                    "Creation of special field status change message failed: illegal argument combination.");
             return "";
         }
     }
diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuItemFactory.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuItemFactory.java
index 63ac0bbf84f5..9841df1b5aae 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuItemFactory.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuItemFactory.java
@@ -1,9 +1,6 @@
 package org.jabref.gui.specialfields;
 
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import javax.swing.undo.UndoManager;
+import de.saxsys.mvvmfx.utils.commands.Command;
 
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
@@ -16,51 +13,80 @@
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.SpecialFieldValue;
 
-import de.saxsys.mvvmfx.utils.commands.Command;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import javax.swing.undo.UndoManager;
 
 public class SpecialFieldMenuItemFactory {
-    public static MenuItem getSpecialFieldSingleItem(SpecialField field,
-                                                     ActionFactory factory,
-                                                     Supplier<LibraryTab> tabSupplier,
-                                                     DialogService dialogService,
-                                                     GuiPreferences preferences,
-                                                     UndoManager undoManager,
-                                                     StateManager stateManager) {
-        SpecialFieldValueViewModel specialField = new SpecialFieldValueViewModel(field.getValues().getFirst());
-        MenuItem menuItem = factory.createMenuItem(specialField.getAction(),
-                new SpecialFieldViewModel(field, preferences, undoManager)
-                        .getSpecialFieldAction(field.getValues().getFirst(), tabSupplier, dialogService, stateManager));
-        menuItem.visibleProperty().bind(preferences.getSpecialFieldsPreferences().specialFieldsEnabledProperty());
+    public static MenuItem getSpecialFieldSingleItem(
+            SpecialField field,
+            ActionFactory factory,
+            Supplier<LibraryTab> tabSupplier,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            UndoManager undoManager,
+            StateManager stateManager) {
+        SpecialFieldValueViewModel specialField =
+                new SpecialFieldValueViewModel(field.getValues().getFirst());
+        MenuItem menuItem =
+                factory.createMenuItem(
+                        specialField.getAction(),
+                        new SpecialFieldViewModel(field, preferences, undoManager)
+                                .getSpecialFieldAction(
+                                        field.getValues().getFirst(),
+                                        tabSupplier,
+                                        dialogService,
+                                        stateManager));
+        menuItem.visibleProperty()
+                .bind(preferences.getSpecialFieldsPreferences().specialFieldsEnabledProperty());
         return menuItem;
     }
 
-    public static Menu createSpecialFieldMenu(SpecialField field,
-                                              ActionFactory factory,
-                                              Supplier<LibraryTab> tabSupplier,
-                                              DialogService dialogService,
-                                              GuiPreferences preferences,
-                                              UndoManager undoManager,
-                                              StateManager stateManager) {
+    public static Menu createSpecialFieldMenu(
+            SpecialField field,
+            ActionFactory factory,
+            Supplier<LibraryTab> tabSupplier,
+            DialogService dialogService,
+            GuiPreferences preferences,
+            UndoManager undoManager,
+            StateManager stateManager) {
 
-        return createSpecialFieldMenu(field, factory, preferences, undoManager, specialField ->
-                new SpecialFieldViewModel(field, preferences, undoManager)
-                        .getSpecialFieldAction(specialField.getValue(), tabSupplier, dialogService, stateManager));
+        return createSpecialFieldMenu(
+                field,
+                factory,
+                preferences,
+                undoManager,
+                specialField ->
+                        new SpecialFieldViewModel(field, preferences, undoManager)
+                                .getSpecialFieldAction(
+                                        specialField.getValue(),
+                                        tabSupplier,
+                                        dialogService,
+                                        stateManager));
     }
 
-    public static Menu createSpecialFieldMenu(SpecialField field,
-                                              ActionFactory factory,
-                                              GuiPreferences preferences,
-                                              UndoManager undoManager,
-                                              Function<SpecialFieldValueViewModel, Command> commandFactory) {
-        SpecialFieldViewModel viewModel = new SpecialFieldViewModel(field, preferences, undoManager);
+    public static Menu createSpecialFieldMenu(
+            SpecialField field,
+            ActionFactory factory,
+            GuiPreferences preferences,
+            UndoManager undoManager,
+            Function<SpecialFieldValueViewModel, Command> commandFactory) {
+        SpecialFieldViewModel viewModel =
+                new SpecialFieldViewModel(field, preferences, undoManager);
         Menu menu = factory.createMenu(viewModel.getAction());
 
         for (SpecialFieldValue Value : field.getValues()) {
             SpecialFieldValueViewModel valueViewModel = new SpecialFieldValueViewModel(Value);
-            menu.getItems().add(factory.createMenuItem(valueViewModel.getAction(), commandFactory.apply(valueViewModel)));
+            menu.getItems()
+                    .add(
+                            factory.createMenuItem(
+                                    valueViewModel.getAction(),
+                                    commandFactory.apply(valueViewModel)));
         }
 
-        menu.visibleProperty().bind(preferences.getSpecialFieldsPreferences().specialFieldsEnabledProperty());
+        menu.visibleProperty()
+                .bind(preferences.getSpecialFieldsPreferences().specialFieldsEnabledProperty());
         return menu;
     }
 }
diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldValueViewModel.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldValueViewModel.java
index e2d3ffda9a69..c7e0ee29c83f 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldValueViewModel.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldValueViewModel.java
@@ -1,14 +1,14 @@
 package org.jabref.gui.specialfields;
 
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.gui.actions.Action;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.SpecialFieldValue;
 
+import java.util.Objects;
+import java.util.Optional;
+
 public class SpecialFieldValueViewModel {
 
     private final SpecialFieldValue value;
diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java
index e2f4387bb39e..5c725cd3f60f 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java
@@ -1,13 +1,5 @@
 package org.jabref.gui.specialfields;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
@@ -22,13 +14,22 @@
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.SpecialFieldValue;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
+
 public class SpecialFieldViewModel {
 
     private final SpecialField field;
     private final CliPreferences preferences;
     private final UndoManager undoManager;
 
-    public SpecialFieldViewModel(SpecialField field, CliPreferences preferences, UndoManager undoManager) {
+    public SpecialFieldViewModel(
+            SpecialField field, CliPreferences preferences, UndoManager undoManager) {
         this.field = Objects.requireNonNull(field);
         this.preferences = Objects.requireNonNull(preferences);
         this.undoManager = Objects.requireNonNull(undoManager);
@@ -38,15 +39,17 @@ public SpecialField getField() {
         return field;
     }
 
-    public SpecialFieldAction getSpecialFieldAction(SpecialFieldValue value,
-                                                    Supplier<LibraryTab> tabSupplier,
-                                                    DialogService dialogService,
-                                                    StateManager stateManager) {
+    public SpecialFieldAction getSpecialFieldAction(
+            SpecialFieldValue value,
+            Supplier<LibraryTab> tabSupplier,
+            DialogService dialogService,
+            StateManager stateManager) {
         return new SpecialFieldAction(
                 tabSupplier,
                 field,
                 value.getFieldValue().orElse(null),
-                // if field contains only one value, it has to be nulled, as another setting does not empty the field
+                // if field contains only one value, it has to be nulled, as another setting does
+                // not empty the field
                 field.getValues().size() == 1,
                 getLocalization(),
                 dialogService,
@@ -80,12 +83,17 @@ public JabRefIcon getEmptyIcon() {
 
     public List<SpecialFieldValueViewModel> getValues() {
         return field.getValues().stream()
-                    .map(SpecialFieldValueViewModel::new)
-                    .collect(Collectors.toList());
+                .map(SpecialFieldValueViewModel::new)
+                .collect(Collectors.toList());
     }
 
     public void setSpecialFieldValue(BibEntry bibEntry, SpecialFieldValue value) {
-        Optional<FieldChange> change = UpdateField.updateField(bibEntry, getField(), value.getFieldValue().orElse(null), getField().isSingleValueField());
+        Optional<FieldChange> change =
+                UpdateField.updateField(
+                        bibEntry,
+                        getField(),
+                        value.getFieldValue().orElse(null),
+                        getField().isSingleValueField());
 
         change.ifPresent(fieldChange -> undoManager.addEdit(new UndoableFieldChange(fieldChange)));
     }
diff --git a/src/main/java/org/jabref/gui/texparser/CitationsDisplay.java b/src/main/java/org/jabref/gui/texparser/CitationsDisplay.java
index 8c312f5b042c..d1517b632644 100644
--- a/src/main/java/org/jabref/gui/texparser/CitationsDisplay.java
+++ b/src/main/java/org/jabref/gui/texparser/CitationsDisplay.java
@@ -1,9 +1,5 @@
 package org.jabref.gui.texparser;
 
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.Node;
@@ -21,15 +17,20 @@
 import org.jabref.model.strings.LatexToUnicodeAdapter;
 import org.jabref.model.texparser.Citation;
 
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
 public class CitationsDisplay extends ListView<Citation> {
 
     private final ObjectProperty<Path> basePath;
 
     public CitationsDisplay() {
         this.basePath = new SimpleObjectProperty<>(null);
-        new ViewModelListCellFactory<Citation>().withGraphic(this::getDisplayGraphic)
-                                                .withTooltip(this::getDisplayTooltip)
-                                                .install(this);
+        new ViewModelListCellFactory<Citation>()
+                .withGraphic(this::getDisplayGraphic)
+                .withTooltip(this::getDisplayTooltip)
+                .install(this);
 
         this.getStyleClass().add("citationsList");
     }
@@ -51,7 +52,8 @@ private Node getDisplayGraphic(Citation item) {
 
         Label fileNameLabel = new Label("%s".formatted(basePath.get().relativize(item.path())));
         fileNameLabel.setGraphic(IconTheme.JabRefIcons.LATEX_FILE.getGraphicNode());
-        Label positionLabel = new Label("(%s:%s-%s)".formatted(item.line(), item.colStart(), item.colEnd()));
+        Label positionLabel =
+                new Label("(%s:%s-%s)".formatted(item.line(), item.colStart(), item.colEnd()));
         positionLabel.setGraphic(IconTheme.JabRefIcons.LATEX_LINE.getGraphicNode());
         HBox dataBox = new HBox(5, fileNameLabel, positionLabel);
 
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexAction.java b/src/main/java/org/jabref/gui/texparser/ParseLatexAction.java
index 637feed20fb1..94c65e178e3f 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexAction.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexAction.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.texparser;
 
+import com.airhacks.afterburner.injection.Injector;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.model.database.BibDatabaseContext;
 
-import com.airhacks.afterburner.injection.Injector;
-
 public class ParseLatexAction extends SimpleCommand {
 
     private final StateManager stateManager;
@@ -20,7 +20,8 @@ public ParseLatexAction(StateManager stateManager) {
     @Override
     public void execute() {
         DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(NullPointerException::new);
+        BibDatabaseContext database =
+                stateManager.getActiveDatabase().orElseThrow(NullPointerException::new);
         dialogService.showCustomDialogAndWait(new ParseLatexDialogView(database));
     }
 }
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java
index bf1a88fe7851..959eb90c3e99 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java
@@ -1,5 +1,12 @@
 package org.jabref.gui.texparser;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+import jakarta.inject.Inject;
+
 import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -9,6 +16,7 @@
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TextField;
 
+import org.controlsfx.control.CheckTreeView;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
@@ -23,12 +31,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.FileUpdateMonitor;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import jakarta.inject.Inject;
-import org.controlsfx.control.CheckTreeView;
-
 public class ParseLatexDialogView extends BaseDialog<Void> {
 
     private final BibDatabaseContext databaseContext;
@@ -56,38 +58,60 @@ public ParseLatexDialogView(BibDatabaseContext databaseContext) {
 
         ViewLoader.view(this).load().setAsDialogPane(this);
 
-        ControlHelper.setAction(parseButtonType, getDialogPane(), event -> viewModel.parseButtonClicked());
+        ControlHelper.setAction(
+                parseButtonType, getDialogPane(), event -> viewModel.parseButtonClicked());
         Button parseButton = (Button) getDialogPane().lookupButton(parseButtonType);
-        parseButton.disableProperty().bind(viewModel.noFilesFoundProperty().or(
-                Bindings.isEmpty(viewModel.getCheckedFileList())));
+        parseButton
+                .disableProperty()
+                .bind(
+                        viewModel
+                                .noFilesFoundProperty()
+                                .or(Bindings.isEmpty(viewModel.getCheckedFileList())));
 
         themeManager.updateFontStyle(getDialogPane().getScene());
     }
 
     @FXML
     private void initialize() {
-        viewModel = new ParseLatexDialogViewModel(databaseContext, dialogService, taskExecutor, preferences, fileMonitor);
+        viewModel =
+                new ParseLatexDialogViewModel(
+                        databaseContext, dialogService, taskExecutor, preferences, fileMonitor);
 
         fileTreeView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
         fileTreeView.showRootProperty().bindBidirectional(viewModel.successfulSearchProperty());
-        fileTreeView.rootProperty().bind(EasyBind.map(viewModel.rootProperty(), fileNode ->
-                new RecursiveTreeItem<>(fileNode, FileNodeViewModel::getChildren)));
+        fileTreeView
+                .rootProperty()
+                .bind(
+                        EasyBind.map(
+                                viewModel.rootProperty(),
+                                fileNode ->
+                                        new RecursiveTreeItem<>(
+                                                fileNode, FileNodeViewModel::getChildren)));
 
         new ViewModelTreeCellFactory<FileNodeViewModel>()
                 .withText(FileNodeViewModel::getDisplayText)
                 .install(fileTreeView);
 
-        EasyBind.subscribe(fileTreeView.rootProperty(), root -> {
-            ((CheckBoxTreeItem<FileNodeViewModel>) root).setSelected(true);
-            root.setExpanded(true);
-            EasyBind.bindContent(viewModel.getCheckedFileList(), fileTreeView.getCheckModel().getCheckedItems());
-        });
-
-        latexDirectoryField.textProperty().bindBidirectional(viewModel.latexFileDirectoryProperty());
+        EasyBind.subscribe(
+                fileTreeView.rootProperty(),
+                root -> {
+                    ((CheckBoxTreeItem<FileNodeViewModel>) root).setSelected(true);
+                    root.setExpanded(true);
+                    EasyBind.bindContent(
+                            viewModel.getCheckedFileList(),
+                            fileTreeView.getCheckModel().getCheckedItems());
+                });
+
+        latexDirectoryField
+                .textProperty()
+                .bindBidirectional(viewModel.latexFileDirectoryProperty());
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        validationVisualizer.initVisualization(viewModel.latexDirectoryValidation(), latexDirectoryField);
+        validationVisualizer.initVisualization(
+                viewModel.latexDirectoryValidation(), latexDirectoryField);
         browseButton.disableProperty().bindBidirectional(viewModel.searchInProgressProperty());
-        searchButton.disableProperty().bind(viewModel.latexDirectoryValidation().validProperty().not());
+        searchButton
+                .disableProperty()
+                .bind(viewModel.latexDirectoryValidation().validProperty().not());
         selectAllButton.disableProperty().bindBidirectional(viewModel.noFilesFoundProperty());
         unselectAllButton.disableProperty().bindBidirectional(viewModel.noFilesFoundProperty());
         progressIndicator.visibleProperty().bindBidirectional(viewModel.searchInProgressProperty());
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
index f0194c0a5b94..3379633da299 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
@@ -1,14 +1,9 @@
 package org.jabref.gui.texparser;
 
-import java.io.IOException;
-import java.nio.file.FileSystemException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -34,14 +29,19 @@
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.FileSystemException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 public class ParseLatexDialogViewModel extends AbstractViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ParseLatexDialogViewModel.class);
@@ -59,19 +59,31 @@ public class ParseLatexDialogViewModel extends AbstractViewModel {
     private final BooleanProperty searchInProgress;
     private final BooleanProperty successfulSearch;
 
-    public ParseLatexDialogViewModel(BibDatabaseContext databaseContext,
-                                     DialogService dialogService,
-                                     TaskExecutor taskExecutor,
-                                     CliPreferences preferences,
-                                     FileUpdateMonitor fileMonitor) {
+    public ParseLatexDialogViewModel(
+            BibDatabaseContext databaseContext,
+            DialogService dialogService,
+            TaskExecutor taskExecutor,
+            CliPreferences preferences,
+            FileUpdateMonitor fileMonitor) {
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
         this.preferences = preferences;
         this.fileMonitor = fileMonitor;
-        this.latexFileDirectory = new SimpleStringProperty(databaseContext.getMetaData().getLatexFileDirectory(preferences.getFilePreferences().getUserAndHost())
-                                                                          .orElse(FileUtil.getInitialDirectory(databaseContext, preferences.getFilePreferences().getWorkingDirectory()))
-                                                                          .toAbsolutePath().toString());
+        this.latexFileDirectory =
+                new SimpleStringProperty(
+                        databaseContext
+                                .getMetaData()
+                                .getLatexFileDirectory(
+                                        preferences.getFilePreferences().getUserAndHost())
+                                .orElse(
+                                        FileUtil.getInitialDirectory(
+                                                databaseContext,
+                                                preferences
+                                                        .getFilePreferences()
+                                                        .getWorkingDirectory()))
+                                .toAbsolutePath()
+                                .toString());
         this.root = new SimpleObjectProperty<>();
         this.checkedFileList = FXCollections.observableArrayList();
         this.noFilesFound = new SimpleBooleanProperty(true);
@@ -79,8 +91,12 @@ public ParseLatexDialogViewModel(BibDatabaseContext databaseContext,
         this.successfulSearch = new SimpleBooleanProperty(false);
 
         Predicate<String> isDirectory = path -> Path.of(path).toFile().isDirectory();
-        latexDirectoryValidator = new FunctionBasedValidator<>(latexFileDirectory, isDirectory,
-                ValidationMessage.error(Localization.lang("Please enter a valid file path.")));
+        latexDirectoryValidator =
+                new FunctionBasedValidator<>(
+                        latexFileDirectory,
+                        isDirectory,
+                        ValidationMessage.error(
+                                Localization.lang("Please enter a valid file path.")));
     }
 
     public StringProperty latexFileDirectoryProperty() {
@@ -112,13 +128,20 @@ public BooleanProperty successfulSearchProperty() {
     }
 
     public void browseButtonClicked() {
-        DirectoryDialogConfiguration directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(Path.of(latexFileDirectory.get())).build();
+        DirectoryDialogConfiguration directoryDialogConfiguration =
+                new DirectoryDialogConfiguration.Builder()
+                        .withInitialDirectory(Path.of(latexFileDirectory.get()))
+                        .build();
 
-        dialogService.showDirectorySelectionDialog(directoryDialogConfiguration).ifPresent(selectedDirectory -> {
-            latexFileDirectory.set(selectedDirectory.toAbsolutePath().toString());
-            preferences.getFilePreferences().setWorkingDirectory(selectedDirectory.toAbsolutePath());
-        });
+        dialogService
+                .showDirectorySelectionDialog(directoryDialogConfiguration)
+                .ifPresent(
+                        selectedDirectory -> {
+                            latexFileDirectory.set(selectedDirectory.toAbsolutePath().toString());
+                            preferences
+                                    .getFilePreferences()
+                                    .setWorkingDirectory(selectedDirectory.toAbsolutePath());
+                        });
     }
 
     /**
@@ -126,26 +149,33 @@ public void browseButtonClicked() {
      */
     public void searchButtonClicked() {
         BackgroundTask.wrap(() -> searchDirectory(Path.of(latexFileDirectory.get())))
-                      .onRunning(() -> {
-                          root.set(null);
-                          noFilesFound.set(true);
-                          searchInProgress.set(true);
-                          successfulSearch.set(false);
-                      })
-                      .onFinished(() -> searchInProgress.set(false))
-                      .onSuccess(newRoot -> {
-                          root.set(newRoot);
-                          noFilesFound.set(false);
-                          successfulSearch.set(true);
-                      })
-                      .onFailure(this::handleFailure)
-                      .executeWith(taskExecutor);
+                .onRunning(
+                        () -> {
+                            root.set(null);
+                            noFilesFound.set(true);
+                            searchInProgress.set(true);
+                            successfulSearch.set(false);
+                        })
+                .onFinished(() -> searchInProgress.set(false))
+                .onSuccess(
+                        newRoot -> {
+                            root.set(newRoot);
+                            noFilesFound.set(false);
+                            successfulSearch.set(true);
+                        })
+                .onFailure(this::handleFailure)
+                .executeWith(taskExecutor);
     }
 
     private void handleFailure(Exception exception) {
-        final boolean permissionProblem = (exception instanceof IOException) && (exception.getCause() instanceof FileSystemException) && exception.getCause().getMessage().endsWith("Operation not permitted");
+        final boolean permissionProblem =
+                (exception instanceof IOException)
+                        && (exception.getCause() instanceof FileSystemException)
+                        && exception.getCause().getMessage().endsWith("Operation not permitted");
         if (permissionProblem) {
-            dialogService.showErrorDialogAndWait(Localization.lang("JabRef does not have permission to access %s").formatted(exception.getCause().getMessage()));
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("JabRef does not have permission to access %s")
+                            .formatted(exception.getCause().getMessage()));
         } else {
             dialogService.showErrorDialogAndWait(exception);
         }
@@ -160,17 +190,22 @@ private FileNodeViewModel searchDirectory(Path directory) throws IOException {
         Map<Boolean, List<Path>> fileListPartition;
 
         try (Stream<Path> filesStream = Files.list(directory)) {
-            fileListPartition = filesStream.collect(Collectors.partitioningBy(path -> path.toFile().isDirectory()));
+            fileListPartition =
+                    filesStream.collect(
+                            Collectors.partitioningBy(path -> path.toFile().isDirectory()));
         } catch (IOException e) {
-            LOGGER.error("%s while searching files: %s".formatted(e.getClass().getName(), e.getMessage()), e);
+            LOGGER.error(
+                    "%s while searching files: %s"
+                            .formatted(e.getClass().getName(), e.getMessage()),
+                    e);
             return parent;
         }
 
         List<Path> subDirectories = fileListPartition.get(true);
-        List<Path> files = fileListPartition.get(false)
-                                            .stream()
-                                            .filter(path -> path.toString().endsWith(TEX_EXT))
-                                            .toList();
+        List<Path> files =
+                fileListPartition.get(false).stream()
+                        .filter(path -> path.toString().endsWith(TEX_EXT))
+                        .toList();
         int fileCount = 0;
 
         for (Path subDirectory : subDirectories) {
@@ -183,9 +218,7 @@ private FileNodeViewModel searchDirectory(Path directory) throws IOException {
         }
 
         parent.setFileCount(files.size() + fileCount);
-        parent.getChildren().addAll(files.stream()
-                                         .map(FileNodeViewModel::new)
-                                         .toList());
+        parent.getChildren().addAll(files.stream().map(FileNodeViewModel::new).toList());
         return parent;
     }
 
@@ -193,26 +226,33 @@ private FileNodeViewModel searchDirectory(Path directory) throws IOException {
      * Parse all checked files in a background task.
      */
     public void parseButtonClicked() {
-        List<Path> fileList = checkedFileList.stream()
-                                             .map(item -> item.getValue().getPath())
-                                             .filter(path -> path.toFile().isFile())
-                                             .toList();
+        List<Path> fileList =
+                checkedFileList.stream()
+                        .map(item -> item.getValue().getPath())
+                        .filter(path -> path.toFile().isFile())
+                        .toList();
         if (fileList.isEmpty()) {
             LOGGER.warn("There are no valid files checked");
             return;
         }
 
-        TexBibEntriesResolver entriesResolver = new TexBibEntriesResolver(
-                databaseContext.getDatabase(),
-                preferences.getImportFormatPreferences(),
-                fileMonitor);
+        TexBibEntriesResolver entriesResolver =
+                new TexBibEntriesResolver(
+                        databaseContext.getDatabase(),
+                        preferences.getImportFormatPreferences(),
+                        fileMonitor);
 
         BackgroundTask.wrap(() -> entriesResolver.resolve(new DefaultLatexParser().parse(fileList)))
-                      .onRunning(() -> searchInProgress.set(true))
-                      .onFinished(() -> searchInProgress.set(false))
-                      .onSuccess(result -> dialogService.showCustomDialogAndWait(
-                              new ParseLatexResultView(result, databaseContext, Path.of(latexFileDirectory.get()))))
-                      .onFailure(dialogService::showErrorDialogAndWait)
-                      .executeWith(taskExecutor);
+                .onRunning(() -> searchInProgress.set(true))
+                .onFinished(() -> searchInProgress.set(false))
+                .onSuccess(
+                        result ->
+                                dialogService.showCustomDialogAndWait(
+                                        new ParseLatexResultView(
+                                                result,
+                                                databaseContext,
+                                                Path.of(latexFileDirectory.get()))))
+                .onFailure(dialogService::showErrorDialogAndWait)
+                .executeWith(taskExecutor);
     }
 }
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java b/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
index 7fc00e8b7eb5..64e5f0a652a6 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
@@ -1,6 +1,9 @@
 package org.jabref.gui.texparser;
 
-import java.nio.file.Path;
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+import jakarta.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -16,9 +19,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.texparser.LatexBibEntriesResolverResult;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
+import java.nio.file.Path;
 
 public class ParseLatexResultView extends BaseDialog<Void> {
 
@@ -31,7 +32,10 @@ public class ParseLatexResultView extends BaseDialog<Void> {
     @Inject private ThemeManager themeManager;
     private ParseLatexResultViewModel viewModel;
 
-    public ParseLatexResultView(LatexBibEntriesResolverResult resolverResult, BibDatabaseContext databaseContext, Path basePath) {
+    public ParseLatexResultView(
+            LatexBibEntriesResolverResult resolverResult,
+            BibDatabaseContext databaseContext,
+            Path basePath) {
         this.resolverResult = resolverResult;
         this.databaseContext = databaseContext;
         this.basePath = basePath;
@@ -40,10 +44,13 @@ public ParseLatexResultView(LatexBibEntriesResolverResult resolverResult, BibDat
 
         ViewLoader.view(this).load().setAsDialogPane(this);
 
-        ControlHelper.setAction(importButtonType, getDialogPane(), event -> {
-            viewModel.importButtonClicked();
-            close();
-        });
+        ControlHelper.setAction(
+                importButtonType,
+                getDialogPane(),
+                event -> {
+                    viewModel.importButtonClicked();
+                    close();
+                });
         Button importButton = (Button) getDialogPane().lookupButton(importButtonType);
         importButton.disableProperty().bind(viewModel.importButtonDisabledProperty());
 
@@ -57,16 +64,18 @@ private void initialize() {
         referenceListView.setItems(viewModel.getReferenceList());
         referenceListView.getSelectionModel().selectFirst();
         new ViewModelListCellFactory<ReferenceViewModel>()
-                .withGraphic(reference -> {
-                    Text referenceText = new Text(reference.getDisplayText());
-                    if (reference.isHighlighted()) {
-                        referenceText.setStyle("-fx-fill: -fx-accent");
-                    }
-                    return referenceText;
-                })
+                .withGraphic(
+                        reference -> {
+                            Text referenceText = new Text(reference.getDisplayText());
+                            if (reference.isHighlighted()) {
+                                referenceText.setStyle("-fx-fill: -fx-accent");
+                            }
+                            return referenceText;
+                        })
                 .install(referenceListView);
 
-        EasyBind.subscribe(referenceListView.getSelectionModel().selectedItemProperty(),
+        EasyBind.subscribe(
+                referenceListView.getSelectionModel().selectedItemProperty(),
                 viewModel::activeReferenceChanged);
 
         citationsDisplay.basePathProperty().set(basePath);
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java b/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
index ba72bc933b35..4ec5ac333683 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
@@ -1,9 +1,6 @@
 package org.jabref.gui.texparser;
 
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyListWrapper;
@@ -21,7 +18,10 @@
 import org.jabref.model.texparser.Citation;
 import org.jabref.model.texparser.LatexBibEntriesResolverResult;
 
-import com.airhacks.afterburner.injection.Injector;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public class ParseLatexResultViewModel extends AbstractViewModel {
 
@@ -31,19 +31,27 @@ public class ParseLatexResultViewModel extends AbstractViewModel {
     private final ObservableList<Citation> citationList;
     private final BooleanProperty importButtonDisabled;
 
-    public ParseLatexResultViewModel(LatexBibEntriesResolverResult resolverResult, BibDatabaseContext databaseContext) {
+    public ParseLatexResultViewModel(
+            LatexBibEntriesResolverResult resolverResult, BibDatabaseContext databaseContext) {
         this.resolverResult = resolverResult;
         this.databaseContext = databaseContext;
         this.referenceList = FXCollections.observableArrayList();
         this.citationList = FXCollections.observableArrayList();
 
-        Set<String> newEntryKeys = resolverResult.getNewEntries().stream().map(entry -> entry.getCitationKey().orElse("")).collect(Collectors.toSet());
-        for (Map.Entry<String, Collection<Citation>> entry : resolverResult.getCitations().asMap().entrySet()) {
+        Set<String> newEntryKeys =
+                resolverResult.getNewEntries().stream()
+                        .map(entry -> entry.getCitationKey().orElse(""))
+                        .collect(Collectors.toSet());
+        for (Map.Entry<String, Collection<Citation>> entry :
+                resolverResult.getCitations().asMap().entrySet()) {
             String key = entry.getKey();
-            referenceList.add(new ReferenceViewModel(key, newEntryKeys.contains(key), entry.getValue()));
+            referenceList.add(
+                    new ReferenceViewModel(key, newEntryKeys.contains(key), entry.getValue()));
         }
 
-        this.importButtonDisabled = new SimpleBooleanProperty(referenceList.stream().noneMatch(ReferenceViewModel::isHighlighted));
+        this.importButtonDisabled =
+                new SimpleBooleanProperty(
+                        referenceList.stream().noneMatch(ReferenceViewModel::isHighlighted));
     }
 
     public ObservableList<ReferenceViewModel> getReferenceList() {
@@ -74,7 +82,11 @@ public void activeReferenceChanged(ReferenceViewModel reference) {
      */
     public void importButtonClicked() {
         DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        ImportEntriesDialog dialog = new ImportEntriesDialog(databaseContext, BackgroundTask.wrap(() -> new ParserResult(resolverResult.getNewEntries())));
+        ImportEntriesDialog dialog =
+                new ImportEntriesDialog(
+                        databaseContext,
+                        BackgroundTask.wrap(
+                                () -> new ParserResult(resolverResult.getNewEntries())));
         dialog.setTitle(Localization.lang("Import entries from LaTeX files"));
         dialogService.showCustomDialogAndWait(dialog);
     }
diff --git a/src/main/java/org/jabref/gui/texparser/ReferenceViewModel.java b/src/main/java/org/jabref/gui/texparser/ReferenceViewModel.java
index 665f13dd55e5..470f54b6b0d0 100644
--- a/src/main/java/org/jabref/gui/texparser/ReferenceViewModel.java
+++ b/src/main/java/org/jabref/gui/texparser/ReferenceViewModel.java
@@ -1,20 +1,21 @@
 package org.jabref.gui.texparser;
 
-import java.util.Collection;
-
 import javafx.beans.property.ReadOnlyListWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
 import org.jabref.model.texparser.Citation;
 
+import java.util.Collection;
+
 public class ReferenceViewModel {
 
     private final String entry;
     private final boolean highlighted;
     private final ObservableList<Citation> citationList;
 
-    public ReferenceViewModel(String entry, boolean highlighted, Collection<Citation> citationColl) {
+    public ReferenceViewModel(
+            String entry, boolean highlighted, Collection<Citation> citationColl) {
         this.entry = entry;
         this.highlighted = highlighted;
         this.citationList = FXCollections.observableArrayList();
@@ -39,9 +40,7 @@ public String getDisplayText() {
 
     @Override
     public String toString() {
-        return "ReferenceViewModel{entry='%s', highlighted=%s, citationList=%s}".formatted(
-                this.entry,
-                this.highlighted,
-                this.citationList);
+        return "ReferenceViewModel{entry='%s', highlighted=%s, citationList=%s}"
+                .formatted(this.entry, this.highlighted, this.citationList);
     }
 }
diff --git a/src/main/java/org/jabref/gui/theme/StyleSheet.java b/src/main/java/org/jabref/gui/theme/StyleSheet.java
index d922ce43a445..9a1ef6cfcf81 100644
--- a/src/main/java/org/jabref/gui/theme/StyleSheet.java
+++ b/src/main/java/org/jabref/gui/theme/StyleSheet.java
@@ -1,5 +1,10 @@
 package org.jabref.gui.theme;
 
+import org.jabref.architecture.AllowedToUseClassGetResource;
+import org.jabref.gui.JabRefGUI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -9,12 +14,6 @@
 import java.nio.file.Path;
 import java.util.Optional;
 
-import org.jabref.architecture.AllowedToUseClassGetResource;
-import org.jabref.gui.JabRefGUI;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 @AllowedToUseClassGetResource("JavaFX internally handles the passed URLs properly.")
 abstract class StyleSheet {
 
@@ -41,9 +40,17 @@ static Optional<StyleSheet> create(String name) {
             try {
                 styleSheetUrl = Optional.of(Path.of(name).toUri().toURL());
             } catch (InvalidPathException e) {
-                LOGGER.warn("Cannot load additional css {} because it is an invalid path: {}", name, e.getLocalizedMessage(), e);
+                LOGGER.warn(
+                        "Cannot load additional css {} because it is an invalid path: {}",
+                        name,
+                        e.getLocalizedMessage(),
+                        e);
             } catch (MalformedURLException e) {
-                LOGGER.warn("Cannot load additional css url {} because it is a malformed url: {}", name, e.getLocalizedMessage(), e);
+                LOGGER.warn(
+                        "Cannot load additional css url {} because it is a malformed url: {}",
+                        name,
+                        e.getLocalizedMessage(),
+                        e);
             }
         }
 
@@ -57,12 +64,16 @@ static Optional<StyleSheet> create(String name) {
             StyleSheet styleSheet = new StyleSheetFile(styleSheetUrl.get());
 
             if (Files.isDirectory(styleSheet.getWatchPath())) {
-                LOGGER.warn("Failed to loadCannot load additional css {} because it is a directory.", styleSheet.getWatchPath());
+                LOGGER.warn(
+                        "Failed to loadCannot load additional css {} because it is a directory.",
+                        styleSheet.getWatchPath());
                 return Optional.empty();
             }
 
             if (!Files.exists(styleSheet.getWatchPath())) {
-                LOGGER.warn("Cannot load additional css {} because the file does not exist.", styleSheet.getWatchPath());
+                LOGGER.warn(
+                        "Cannot load additional css {} because the file does not exist.",
+                        styleSheet.getWatchPath());
                 // Should not return empty, since the user can create the file later.
             }
 
diff --git a/src/main/java/org/jabref/gui/theme/StyleSheetDataUrl.java b/src/main/java/org/jabref/gui/theme/StyleSheetDataUrl.java
index 04045faa41b5..87a323f83ccb 100644
--- a/src/main/java/org/jabref/gui/theme/StyleSheetDataUrl.java
+++ b/src/main/java/org/jabref/gui/theme/StyleSheetDataUrl.java
@@ -25,7 +25,9 @@ public String getWebEngineStylesheet() {
 
     @Override
     void reload() {
-        StyleSheetFile.getDataUrl(url).ifPresentOrElse(createdUrl -> dataUrl = createdUrl, () -> dataUrl = EMPTY_WEBENGINE_CSS);
+        StyleSheetFile.getDataUrl(url)
+                .ifPresentOrElse(
+                        createdUrl -> dataUrl = createdUrl, () -> dataUrl = EMPTY_WEBENGINE_CSS);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/theme/StyleSheetFile.java b/src/main/java/org/jabref/gui/theme/StyleSheetFile.java
index 9401e51b18bb..c21d53a97cbd 100644
--- a/src/main/java/org/jabref/gui/theme/StyleSheetFile.java
+++ b/src/main/java/org/jabref/gui/theme/StyleSheetFile.java
@@ -1,5 +1,10 @@
 package org.jabref.gui.theme;
 
+import com.google.common.base.Strings;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -11,10 +16,6 @@
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 
-import com.google.common.base.Strings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 final class StyleSheetFile extends StyleSheet {
 
     /**
@@ -76,7 +77,8 @@ public URL getSceneStylesheet() {
         }
 
         if (Files.isDirectory(path)) {
-            LOGGER.warn("Failed to loadCannot load additional css {} because it is a directory.", path);
+            LOGGER.warn(
+                    "Failed to loadCannot load additional css {} because it is a directory.", path);
             return null;
         }
 
@@ -112,11 +114,14 @@ static Optional<String> getDataUrl(URL url) {
             try (InputStream inputStream = conn.getInputStream()) {
                 byte[] data = inputStream.readNBytes(MAX_IN_MEMORY_CSS_LENGTH);
                 if (data.length < MAX_IN_MEMORY_CSS_LENGTH) {
-                    String embeddedDataUrl = DATA_URL_PREFIX + Base64.getEncoder().encodeToString(data);
+                    String embeddedDataUrl =
+                            DATA_URL_PREFIX + Base64.getEncoder().encodeToString(data);
                     LOGGER.trace("Embedded css in data URL of length {}", embeddedDataUrl.length());
                     return Optional.of(embeddedDataUrl);
                 } else {
-                    LOGGER.trace("Not embedding css in data URL as the length is >= {}", MAX_IN_MEMORY_CSS_LENGTH);
+                    LOGGER.trace(
+                            "Not embedding css in data URL as the length is >= {}",
+                            MAX_IN_MEMORY_CSS_LENGTH);
                 }
             }
         } catch (IOException e) {
diff --git a/src/main/java/org/jabref/gui/theme/Theme.java b/src/main/java/org/jabref/gui/theme/Theme.java
index 03e6e414aed9..842f008a06e1 100644
--- a/src/main/java/org/jabref/gui/theme/Theme.java
+++ b/src/main/java/org/jabref/gui/theme/Theme.java
@@ -12,7 +12,9 @@
 public class Theme {
 
     public enum Type {
-        DEFAULT, EMBEDDED, CUSTOM
+        DEFAULT,
+        EMBEDDED,
+        CUSTOM
     }
 
     public static final String BASE_CSS = "Base.css";
@@ -40,7 +42,7 @@ public Theme(String name) {
             }
         } else {
             this.additionalStylesheet = StyleSheet.create(name);
-             if (this.additionalStylesheet.isPresent()) {
+            if (this.additionalStylesheet.isPresent()) {
                 this.type = Type.CUSTOM;
                 this.name = name;
             } else {
@@ -111,9 +113,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "Theme{" +
-                "type=" + type +
-                ", name='" + name + '\'' +
-                '}';
+        return "Theme{" + "type=" + type + ", name='" + name + '\'' + '}';
     }
 }
diff --git a/src/main/java/org/jabref/gui/theme/ThemeManager.java b/src/main/java/org/jabref/gui/theme/ThemeManager.java
index eda4b251f902..a7d40a886ad5 100644
--- a/src/main/java/org/jabref/gui/theme/ThemeManager.java
+++ b/src/main/java/org/jabref/gui/theme/ThemeManager.java
@@ -1,15 +1,6 @@
 package org.jabref.gui.theme;
 
-import java.io.IOException;
-import java.net.URL;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.WeakHashMap;
-import java.util.function.Consumer;
+import com.google.common.annotations.VisibleForTesting;
 
 import javafx.application.ColorScheme;
 import javafx.application.Platform;
@@ -24,11 +15,20 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.util.FileUpdateListener;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.function.Consumer;
+
 /**
  * Installs and manages style files and provides live reloading. JabRef provides two inbuilt themes and a user
  * customizable one: Light, Dark and Custom. The Light theme is basically the base.css theme. Every other theme is
@@ -44,9 +44,10 @@
  */
 public class ThemeManager {
 
-    public static Map<String, Node> getDownloadIconTitleMap = Map.of(
-            Localization.lang("Downloading"), IconTheme.JabRefIcons.DOWNLOAD.getGraphicNode()
-    );
+    public static Map<String, Node> getDownloadIconTitleMap =
+            Map.of(
+                    Localization.lang("Downloading"),
+                    IconTheme.JabRefIcons.DOWNLOAD.getGraphicNode());
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ThemeManager.class);
 
@@ -60,9 +61,10 @@ public class ThemeManager {
     private Scene mainWindowScene;
     private final Set<WebEngine> webEngines = Collections.newSetFromMap(new WeakHashMap<>());
 
-    public ThemeManager(WorkspacePreferences workspacePreferences,
-                        FileUpdateMonitor fileUpdateMonitor,
-                        Consumer<Runnable> updateRunner) {
+    public ThemeManager(
+            WorkspacePreferences workspacePreferences,
+            FileUpdateMonitor fileUpdateMonitor,
+            Consumer<Runnable> updateRunner) {
         this.workspacePreferences = Objects.requireNonNull(workspacePreferences);
         this.fileUpdateMonitor = Objects.requireNonNull(fileUpdateMonitor);
         this.updateRunner = Objects.requireNonNull(updateRunner);
@@ -70,16 +72,25 @@ public ThemeManager(WorkspacePreferences workspacePreferences,
         this.baseStyleSheet = StyleSheet.create(Theme.BASE_CSS).get();
         this.theme = workspacePreferences.getTheme();
 
-        // Watching base CSS only works in development and test scenarios, where the build system exposes the CSS as a
-        // file (e.g. for Gradle run task it will be in build/resources/main/org/jabref/gui/Base.css)
+        // Watching base CSS only works in development and test scenarios, where the build system
+        // exposes the CSS as a
+        // file (e.g. for Gradle run task it will be in
+        // build/resources/main/org/jabref/gui/Base.css)
         addStylesheetToWatchlist(this.baseStyleSheet, this::baseCssLiveUpdate);
         baseCssLiveUpdate();
 
-        BindingsHelper.subscribeFuture(workspacePreferences.themeProperty(), theme -> updateThemeSettings());
-        BindingsHelper.subscribeFuture(workspacePreferences.themeSyncOsProperty(), theme -> updateThemeSettings());
-        BindingsHelper.subscribeFuture(workspacePreferences.shouldOverrideDefaultFontSizeProperty(), should -> updateFontSettings());
-        BindingsHelper.subscribeFuture(workspacePreferences.mainFontSizeProperty(), size -> updateFontSettings());
-        BindingsHelper.subscribeFuture(Platform.getPreferences().colorSchemeProperty(), colorScheme -> updateThemeSettings());
+        BindingsHelper.subscribeFuture(
+                workspacePreferences.themeProperty(), theme -> updateThemeSettings());
+        BindingsHelper.subscribeFuture(
+                workspacePreferences.themeSyncOsProperty(), theme -> updateThemeSettings());
+        BindingsHelper.subscribeFuture(
+                workspacePreferences.shouldOverrideDefaultFontSizeProperty(),
+                should -> updateFontSettings());
+        BindingsHelper.subscribeFuture(
+                workspacePreferences.mainFontSizeProperty(), size -> updateFontSettings());
+        BindingsHelper.subscribeFuture(
+                Platform.getPreferences().colorSchemeProperty(),
+                colorScheme -> updateThemeSettings());
         updateThemeSettings();
     }
 
@@ -103,15 +114,20 @@ private void updateThemeSettings() {
         this.theme = newTheme;
         LOGGER.info("Theme set to {} with base css {}", newTheme, baseStyleSheet);
 
-        this.theme.getAdditionalStylesheet().ifPresent(
-                styleSheet -> addStylesheetToWatchlist(styleSheet, this::additionalCssLiveUpdate));
+        this.theme
+                .getAdditionalStylesheet()
+                .ifPresent(
+                        styleSheet ->
+                                addStylesheetToWatchlist(
+                                        styleSheet, this::additionalCssLiveUpdate));
 
         additionalCssLiveUpdate();
         updateFontSettings();
     }
 
     private void updateFontSettings() {
-        UiTaskExecutor.runInJavaFXThread(() -> updateRunner.accept(() -> updateFontStyle(mainWindowScene)));
+        UiTaskExecutor.runInJavaFXThread(
+                () -> updateRunner.accept(() -> updateFontStyle(mainWindowScene)));
     }
 
     private void removeStylesheetFromWatchList(StyleSheet styleSheet) {
@@ -146,26 +162,38 @@ private void baseCssLiveUpdate() {
     }
 
     private void additionalCssLiveUpdate() {
-        final String newStyleSheetLocation = this.theme.getAdditionalStylesheet().map(styleSheet -> {
-            styleSheet.reload();
-            return styleSheet.getWebEngineStylesheet();
-        }).orElse("");
-
-        LOGGER.debug("Updating additional CSS for main window scene and {} web engines", webEngines.size());
-
-        UiTaskExecutor.runInJavaFXThread(() ->
-                updateRunner.accept(() -> {
-                    updateAdditionalCss();
-
-                    webEngines.forEach(webEngine -> {
-                        // force refresh by unloading style sheet, if the location hasn't changed
-                        if (newStyleSheetLocation.equals(webEngine.getUserStyleSheetLocation())) {
-                            webEngine.setUserStyleSheetLocation(null);
-                        }
-                        webEngine.setUserStyleSheetLocation(newStyleSheetLocation);
-                    });
-                })
-        );
+        final String newStyleSheetLocation =
+                this.theme
+                        .getAdditionalStylesheet()
+                        .map(
+                                styleSheet -> {
+                                    styleSheet.reload();
+                                    return styleSheet.getWebEngineStylesheet();
+                                })
+                        .orElse("");
+
+        LOGGER.debug(
+                "Updating additional CSS for main window scene and {} web engines",
+                webEngines.size());
+
+        UiTaskExecutor.runInJavaFXThread(
+                () ->
+                        updateRunner.accept(
+                                () -> {
+                                    updateAdditionalCss();
+
+                                    webEngines.forEach(
+                                            webEngine -> {
+                                                // force refresh by unloading style sheet, if the
+                                                // location hasn't changed
+                                                if (newStyleSheetLocation.equals(
+                                                        webEngine.getUserStyleSheetLocation())) {
+                                                    webEngine.setUserStyleSheetLocation(null);
+                                                }
+                                                webEngine.setUserStyleSheetLocation(
+                                                        newStyleSheetLocation);
+                                            });
+                                }));
     }
 
     private void updateBaseCss() {
@@ -186,18 +214,23 @@ private void updateAdditionalCss() {
             return;
         }
 
-        mainWindowScene.getStylesheets().setAll(List.of(
-                baseStyleSheet.getSceneStylesheet().toExternalForm(),
-                theme.getAdditionalStylesheet().map(styleSheet -> {
-                         URL stylesheetUrl = styleSheet.getSceneStylesheet();
-                         if (stylesheetUrl != null) {
-                             return stylesheetUrl.toExternalForm();
-                         } else {
-                             return "";
-                         }
-                     })
-                     .orElse("")
-        ));
+        mainWindowScene
+                .getStylesheets()
+                .setAll(
+                        List.of(
+                                baseStyleSheet.getSceneStylesheet().toExternalForm(),
+                                theme.getAdditionalStylesheet()
+                                        .map(
+                                                styleSheet -> {
+                                                    URL stylesheetUrl =
+                                                            styleSheet.getSceneStylesheet();
+                                                    if (stylesheetUrl != null) {
+                                                        return stylesheetUrl.toExternalForm();
+                                                    } else {
+                                                        return "";
+                                                    }
+                                                })
+                                        .orElse("")));
     }
 
     /**
@@ -208,11 +241,12 @@ private void updateAdditionalCss() {
      */
     public void installCss(Scene mainWindowScene) {
         Objects.requireNonNull(mainWindowScene, "scene is required");
-        updateRunner.accept(() -> {
-            this.mainWindowScene = mainWindowScene;
-            updateBaseCss();
-            updateAdditionalCss();
-        });
+        updateRunner.accept(
+                () -> {
+                    this.mainWindowScene = mainWindowScene;
+                    updateBaseCss();
+                    updateAdditionalCss();
+                });
     }
 
     /**
@@ -222,12 +256,18 @@ public void installCss(Scene mainWindowScene) {
      * @param webEngine the web engine to install the css into
      */
     public void installCss(WebEngine webEngine) {
-        updateRunner.accept(() -> {
-            if (this.webEngines.add(webEngine)) {
-                webEngine.setUserStyleSheetLocation(this.theme.getAdditionalStylesheet().isPresent() ?
-                        this.theme.getAdditionalStylesheet().get().getWebEngineStylesheet() : "");
-            }
-        });
+        updateRunner.accept(
+                () -> {
+                    if (this.webEngines.add(webEngine)) {
+                        webEngine.setUserStyleSheetLocation(
+                                this.theme.getAdditionalStylesheet().isPresent()
+                                        ? this.theme
+                                                .getAdditionalStylesheet()
+                                                .get()
+                                                .getWebEngineStylesheet()
+                                        : "");
+                    }
+                });
     }
 
     /**
@@ -242,9 +282,12 @@ public void updateFontStyle(Scene scene) {
         }
 
         if (workspacePreferences.shouldOverrideDefaultFontSize()) {
-            scene.getRoot().setStyle("-fx-font-size: " + workspacePreferences.getMainFontSize() + "pt;");
+            scene.getRoot()
+                    .setStyle("-fx-font-size: " + workspacePreferences.getMainFontSize() + "pt;");
         } else {
-            scene.getRoot().setStyle("-fx-font-size: " + workspacePreferences.getDefaultFontSize() + "pt;");
+            scene.getRoot()
+                    .setStyle(
+                            "-fx-font-size: " + workspacePreferences.getDefaultFontSize() + "pt;");
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/theme/ThemeTypes.java b/src/main/java/org/jabref/gui/theme/ThemeTypes.java
index 73523ae9c475..6032990ad150 100644
--- a/src/main/java/org/jabref/gui/theme/ThemeTypes.java
+++ b/src/main/java/org/jabref/gui/theme/ThemeTypes.java
@@ -3,18 +3,17 @@
 import org.jabref.logic.l10n.Localization;
 
 public enum ThemeTypes {
+    LIGHT(Localization.lang("Light")),
+    DARK(Localization.lang("Dark")),
+    CUSTOM(Localization.lang("Custom..."));
 
-        LIGHT(Localization.lang("Light")),
-        DARK(Localization.lang("Dark")),
-        CUSTOM(Localization.lang("Custom..."));
+    private final String displayName;
 
-        private final String displayName;
+    ThemeTypes(String displayName) {
+        this.displayName = displayName;
+    }
 
-        ThemeTypes(String displayName) {
-            this.displayName = displayName;
-        }
-
-        public String getDisplayName() {
-            return displayName;
-        }
+    public String getDisplayName() {
+        return displayName;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/undo/AbstractUndoableJabRefEdit.java b/src/main/java/org/jabref/gui/undo/AbstractUndoableJabRefEdit.java
index d5f4fa0663f2..f0c8e362fc65 100644
--- a/src/main/java/org/jabref/gui/undo/AbstractUndoableJabRefEdit.java
+++ b/src/main/java/org/jabref/gui/undo/AbstractUndoableJabRefEdit.java
@@ -1,9 +1,9 @@
 package org.jabref.gui.undo;
 
-import javax.swing.undo.AbstractUndoableEdit;
-
 import org.jabref.logic.l10n.Localization;
 
+import javax.swing.undo.AbstractUndoableEdit;
+
 public class AbstractUndoableJabRefEdit extends AbstractUndoableEdit {
 
     @Override
diff --git a/src/main/java/org/jabref/gui/undo/CountingUndoManager.java b/src/main/java/org/jabref/gui/undo/CountingUndoManager.java
index 1e4eaa8981da..270ad3611faf 100644
--- a/src/main/java/org/jabref/gui/undo/CountingUndoManager.java
+++ b/src/main/java/org/jabref/gui/undo/CountingUndoManager.java
@@ -1,15 +1,15 @@
 package org.jabref.gui.undo;
 
-import javax.swing.undo.CannotUndoException;
-import javax.swing.undo.UndoManager;
-import javax.swing.undo.UndoableEdit;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 
+import javax.swing.undo.CannotUndoException;
+import javax.swing.undo.UndoManager;
+import javax.swing.undo.UndoableEdit;
+
 public class CountingUndoManager extends UndoManager {
 
     private int unchangedPoint;
@@ -18,6 +18,7 @@ public class CountingUndoManager extends UndoManager {
      * Indicates the number of edits aka balance of edits on the stack +1 when an edit is added/redone and -1 when an edit is undoed.
      * */
     private final IntegerProperty balanceProperty = new SimpleIntegerProperty(0);
+
     private final BooleanProperty undoableProperty = new SimpleBooleanProperty(false);
     private final BooleanProperty redoableProperty = new SimpleBooleanProperty(false);
 
diff --git a/src/main/java/org/jabref/gui/undo/NamedCompound.java b/src/main/java/org/jabref/gui/undo/NamedCompound.java
index 55be19a96e37..0d65b0851faa 100644
--- a/src/main/java/org/jabref/gui/undo/NamedCompound.java
+++ b/src/main/java/org/jabref/gui/undo/NamedCompound.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.undo;
 
+import org.jabref.logic.l10n.Localization;
+
 import javax.swing.undo.CompoundEdit;
 import javax.swing.undo.UndoableEdit;
 
-import org.jabref.logic.l10n.Localization;
-
 public class NamedCompound extends CompoundEdit {
 
     private final String name;
@@ -27,12 +27,24 @@ public boolean hasEdits() {
 
     @Override
     public String getUndoPresentationName() {
-        return "<html>" + Localization.lang("Undo") + ": " + name + "<ul>" + getPresentationName() + "</ul></html>";
+        return "<html>"
+                + Localization.lang("Undo")
+                + ": "
+                + name
+                + "<ul>"
+                + getPresentationName()
+                + "</ul></html>";
     }
 
     @Override
     public String getRedoPresentationName() {
-        return "<html>" + Localization.lang("Redo") + ": " + name + "<ul>" + getPresentationName() + "</ul></html>";
+        return "<html>"
+                + Localization.lang("Redo")
+                + ": "
+                + name
+                + "<ul>"
+                + getPresentationName()
+                + "</ul></html>";
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/undo/RedoAction.java b/src/main/java/org/jabref/gui/undo/RedoAction.java
index d5d3170a9933..1b9cc3bb429f 100644
--- a/src/main/java/org/jabref/gui/undo/RedoAction.java
+++ b/src/main/java/org/jabref/gui/undo/RedoAction.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.undo;
 
-import java.util.function.Supplier;
-
-import javax.swing.undo.CannotRedoException;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
 
 import javafx.beans.binding.Bindings;
 
@@ -12,7 +10,9 @@
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.logic.l10n.Localization;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import java.util.function.Supplier;
+
+import javax.swing.undo.CannotRedoException;
 
 /**
  * @implNote See also {@link UndoAction}
@@ -22,12 +22,17 @@ public class RedoAction extends SimpleCommand {
     private final DialogService dialogService;
     private final CountingUndoManager undoManager;
 
-    public RedoAction(Supplier<LibraryTab> tabSupplier, CountingUndoManager undoManager, DialogService dialogService, StateManager stateManager) {
+    public RedoAction(
+            Supplier<LibraryTab> tabSupplier,
+            CountingUndoManager undoManager,
+            DialogService dialogService,
+            StateManager stateManager) {
         this.tabSupplier = tabSupplier;
         this.dialogService = dialogService;
         this.undoManager = undoManager;
 
-        this.executable.bind(Bindings.and(needsDatabase(stateManager), undoManager.getRedoableProperty()));
+        this.executable.bind(
+                Bindings.and(needsDatabase(stateManager), undoManager.getRedoableProperty()));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/undo/UndoAction.java b/src/main/java/org/jabref/gui/undo/UndoAction.java
index 5eab905a9f8d..51efa93e0c5c 100644
--- a/src/main/java/org/jabref/gui/undo/UndoAction.java
+++ b/src/main/java/org/jabref/gui/undo/UndoAction.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.undo;
 
-import java.util.function.Supplier;
-
-import javax.swing.undo.CannotUndoException;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
 
 import javafx.beans.binding.Bindings;
 
@@ -12,7 +10,9 @@
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.logic.l10n.Localization;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import java.util.function.Supplier;
+
+import javax.swing.undo.CannotUndoException;
 
 /**
  * @implNote See also {@link RedoAction}
@@ -22,12 +22,17 @@ public class UndoAction extends SimpleCommand {
     private final DialogService dialogService;
     private final CountingUndoManager undoManager;
 
-    public UndoAction(Supplier<LibraryTab> tabSupplier, CountingUndoManager undoManager, DialogService dialogService, StateManager stateManager) {
+    public UndoAction(
+            Supplier<LibraryTab> tabSupplier,
+            CountingUndoManager undoManager,
+            DialogService dialogService,
+            StateManager stateManager) {
         this.tabSupplier = tabSupplier;
         this.dialogService = dialogService;
         this.undoManager = undoManager;
 
-        this.executable.bind(Bindings.and(needsDatabase(stateManager), undoManager.getUndoableProperty()));
+        this.executable.bind(
+                Bindings.and(needsDatabase(stateManager), undoManager.getUndoableProperty()));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/undo/UndoableChangeType.java b/src/main/java/org/jabref/gui/undo/UndoableChangeType.java
index 05d29f902e89..ce6999d68ffa 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableChangeType.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableChangeType.java
@@ -16,7 +16,10 @@ public class UndoableChangeType extends AbstractUndoableJabRefEdit {
     private final BibEntry entry;
 
     public UndoableChangeType(FieldChange change) {
-        this(change.getEntry(), EntryTypeFactory.parse(change.getOldValue()), EntryTypeFactory.parse(change.getNewValue()));
+        this(
+                change.getEntry(),
+                EntryTypeFactory.parse(change.getOldValue()),
+                EntryTypeFactory.parse(change.getNewValue()));
     }
 
     public UndoableChangeType(BibEntry entry, EntryType oldType, EntryType newType) {
@@ -27,7 +30,8 @@ public UndoableChangeType(BibEntry entry, EntryType oldType, EntryType newType)
 
     @Override
     public String getPresentationName() {
-        return Localization.lang("change type of entry %0 from %1 to %2",
+        return Localization.lang(
+                "change type of entry %0 from %1 to %2",
                 StringUtil.boldHTML(entry.getCitationKey().orElse(Localization.lang("undefined"))),
                 StringUtil.boldHTML(oldType.getDisplayName(), Localization.lang("undefined")),
                 StringUtil.boldHTML(newType.getDisplayName()));
diff --git a/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java b/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java
index efb96c700206..37227ce7be80 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java
@@ -5,7 +5,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,7 +34,9 @@ public UndoableFieldChange(FieldChange change) {
 
     @Override
     public String getPresentationName() {
-        return Localization.lang("change field %0 of entry %1 from %2 to %3", StringUtil.boldHTML(field.getDisplayName()),
+        return Localization.lang(
+                "change field %0 of entry %1 from %2 to %3",
+                StringUtil.boldHTML(field.getDisplayName()),
                 StringUtil.boldHTML(entry.getCitationKey().orElse(Localization.lang("undefined"))),
                 StringUtil.boldHTML(oldValue, Localization.lang("undefined")),
                 StringUtil.boldHTML(newValue, Localization.lang("undefined")));
diff --git a/src/main/java/org/jabref/gui/undo/UndoableInsertEntries.java b/src/main/java/org/jabref/gui/undo/UndoableInsertEntries.java
index 79803f1265d6..6f95a87d301b 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableInsertEntries.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableInsertEntries.java
@@ -1,16 +1,15 @@
 package org.jabref.gui.undo;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * This class represents the removal of entries. The constructor needs
  * references to the database, entries, and a boolean marked true if the undo
@@ -43,8 +42,12 @@ public String getPresentationName() {
             if (entries.size() > 1) {
                 return Localization.lang("paste entries");
             } else if (entries.size() == 1) {
-                return Localization.lang("paste entry %0",
-                        StringUtil.boldHTML(entries.getFirst().getCitationKey().orElse(Localization.lang("undefined"))));
+                return Localization.lang(
+                        "paste entry %0",
+                        StringUtil.boldHTML(
+                                entries.getFirst()
+                                        .getCitationKey()
+                                        .orElse(Localization.lang("undefined"))));
             } else {
                 return null;
             }
@@ -52,8 +55,12 @@ public String getPresentationName() {
             if (entries.size() > 1) {
                 return Localization.lang("insert entries");
             } else if (entries.size() == 1) {
-                return Localization.lang("insert entry %0",
-                        StringUtil.boldHTML(entries.getFirst().getCitationKey().orElse(Localization.lang("undefined"))));
+                return Localization.lang(
+                        "insert entry %0",
+                        StringUtil.boldHTML(
+                                entries.getFirst()
+                                        .getCitationKey()
+                                        .orElse(Localization.lang("undefined"))));
             } else {
                 return null;
             }
diff --git a/src/main/java/org/jabref/gui/undo/UndoableInsertString.java b/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
index 6485861abbe1..0f0ef17a1082 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
@@ -5,7 +5,6 @@
 import org.jabref.model.database.KeyCollisionException;
 import org.jabref.model.entry.BibtexString;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/jabref/gui/undo/UndoableKeyChange.java b/src/main/java/org/jabref/gui/undo/UndoableKeyChange.java
index 8b37869d6a89..343d603ef5c6 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableKeyChange.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableKeyChange.java
@@ -28,7 +28,8 @@ public UndoableKeyChange(BibEntry entry, String oldValue, String newValue) {
 
     @Override
     public String getPresentationName() {
-        return Localization.lang("change key from %0 to %1",
+        return Localization.lang(
+                "change key from %0 to %1",
                 StringUtil.boldHTML(oldValue, Localization.lang("undefined")),
                 StringUtil.boldHTML(newValue, Localization.lang("undefined")));
     }
diff --git a/src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java b/src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java
index 10d89179eaf0..af90af87ebda 100644
--- a/src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java
+++ b/src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java
@@ -12,8 +12,7 @@ public class UndoablePreambleChange extends AbstractUndoableJabRefEdit {
     private final String oldValue;
     private final String newValue;
 
-    public UndoablePreambleChange(BibDatabase base,
-                                  String oldValue, String newValue) {
+    public UndoablePreambleChange(BibDatabase base, String oldValue, String newValue) {
         this.base = base;
         this.oldValue = oldValue;
         this.newValue = newValue;
diff --git a/src/main/java/org/jabref/gui/undo/UndoableRemoveEntries.java b/src/main/java/org/jabref/gui/undo/UndoableRemoveEntries.java
index 133c44a81dda..75c806a240bc 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableRemoveEntries.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableRemoveEntries.java
@@ -1,17 +1,16 @@
 package org.jabref.gui.undo;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.event.EntriesEventSource;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * This class represents the removal of entries. The constructor needs
  * references to the database, the entries, and the map of open entry editors.
@@ -46,8 +45,12 @@ public String getPresentationName() {
             if (entries.size() > 1) {
                 return Localization.lang("cut entries");
             } else if (entries.size() == 1) {
-                return Localization.lang("cut entry %0",
-                        StringUtil.boldHTML(entries.getFirst().getCitationKey().orElse(Localization.lang("undefined"))));
+                return Localization.lang(
+                        "cut entry %0",
+                        StringUtil.boldHTML(
+                                entries.getFirst()
+                                        .getCitationKey()
+                                        .orElse(Localization.lang("undefined"))));
             } else {
                 return null;
             }
@@ -55,8 +58,12 @@ public String getPresentationName() {
             if (entries.size() > 1) {
                 return Localization.lang("remove entries");
             } else if (entries.size() == 1) {
-                return Localization.lang("remove entry %0",
-                        StringUtil.boldHTML(entries.getFirst().getCitationKey().orElse(Localization.lang("undefined"))));
+                return Localization.lang(
+                        "remove entry %0",
+                        StringUtil.boldHTML(
+                                entries.getFirst()
+                                        .getCitationKey()
+                                        .orElse(Localization.lang("undefined"))));
             } else {
                 return null;
             }
diff --git a/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java b/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
index 2c086ed3cf0a..cca522be9c3e 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
@@ -5,7 +5,6 @@
 import org.jabref.model.database.KeyCollisionException;
 import org.jabref.model.entry.BibtexString;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/jabref/gui/undo/UndoableStringChange.java b/src/main/java/org/jabref/gui/undo/UndoableStringChange.java
index 883f16757506..063f402591a5 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableStringChange.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableStringChange.java
@@ -11,7 +11,8 @@ public class UndoableStringChange extends AbstractUndoableJabRefEdit {
     private final String newValue;
     private final boolean nameChange;
 
-    public UndoableStringChange(BibtexString string, boolean nameChange, String oldValue, String newValue) {
+    public UndoableStringChange(
+            BibtexString string, boolean nameChange, String oldValue, String newValue) {
         this.string = string;
         this.oldValue = oldValue;
         this.newValue = newValue;
@@ -20,9 +21,12 @@ public UndoableStringChange(BibtexString string, boolean nameChange, String oldV
 
     @Override
     public String getPresentationName() {
-        return nameChange ? Localization.lang("change string name %0 to %1", StringUtil.boldHTML(oldValue),
-                StringUtil.boldHTML(newValue)) :
-                Localization.lang("change string content %0 to %1",
+        return nameChange
+                ? Localization.lang(
+                        "change string name %0 to %1",
+                        StringUtil.boldHTML(oldValue), StringUtil.boldHTML(newValue))
+                : Localization.lang(
+                        "change string content %0 to %1",
                         StringUtil.boldHTML(oldValue), StringUtil.boldHTML(newValue));
     }
 
diff --git a/src/main/java/org/jabref/gui/util/BaseDialog.java b/src/main/java/org/jabref/gui/util/BaseDialog.java
index 3e2d4c4c1822..a583556558ed 100644
--- a/src/main/java/org/jabref/gui/util/BaseDialog.java
+++ b/src/main/java/org/jabref/gui/util/BaseDialog.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.util;
 
-import java.util.Optional;
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -13,27 +13,33 @@
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
-import com.airhacks.afterburner.injection.Injector;
+import java.util.Optional;
 
 public class BaseDialog<T> extends Dialog<T> {
 
     protected BaseDialog() {
-        getDialogPane().getScene().setOnKeyPressed(event -> {
-            KeyBindingRepository keyBindingRepository = Injector.instantiateModelOrService(KeyBindingRepository.class);
-            if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE, event)) {
-                close();
-            } else if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.DEFAULT_DIALOG_ACTION, event)) {
-                getDefaultButton().ifPresent(Button::fire);
-            }
-
-            // all buttons in base dialogs react on enter
-            if (event.getCode() == KeyCode.ENTER) {
-                if (event.getTarget() instanceof Button) {
-                    ((Button) event.getTarget()).fire();
-                    event.consume();
-                }
-            }
-        });
+        getDialogPane()
+                .getScene()
+                .setOnKeyPressed(
+                        event -> {
+                            KeyBindingRepository keyBindingRepository =
+                                    Injector.instantiateModelOrService(KeyBindingRepository.class);
+                            if (keyBindingRepository.checkKeyCombinationEquality(
+                                    KeyBinding.CLOSE, event)) {
+                                close();
+                            } else if (keyBindingRepository.checkKeyCombinationEquality(
+                                    KeyBinding.DEFAULT_DIALOG_ACTION, event)) {
+                                getDefaultButton().ifPresent(Button::fire);
+                            }
+
+                            // all buttons in base dialogs react on enter
+                            if (event.getCode() == KeyCode.ENTER) {
+                                if (event.getTarget() instanceof Button) {
+                                    ((Button) event.getTarget()).fire();
+                                    event.consume();
+                                }
+                            }
+                        });
 
         setDialogIcon(IconTheme.getJabRefImage());
         setResizable(true);
@@ -45,9 +51,9 @@ private Optional<Button> getDefaultButton() {
 
     private ButtonType getDefaultButtonType() {
         return getDialogPane().getButtonTypes().stream()
-                              .filter(buttonType -> buttonType.getButtonData().isDefaultButton())
-                              .findFirst()
-                              .orElse(ButtonType.OK);
+                .filter(buttonType -> buttonType.getButtonData().isDefaultButton())
+                .findFirst()
+                .orElse(ButtonType.OK);
     }
 
     private void setDialogIcon(Image image) {
diff --git a/src/main/java/org/jabref/gui/util/BaseWindow.java b/src/main/java/org/jabref/gui/util/BaseWindow.java
index 5669ab8b5a02..a43258020656 100644
--- a/src/main/java/org/jabref/gui/util/BaseWindow.java
+++ b/src/main/java/org/jabref/gui/util/BaseWindow.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.util;
 
+import com.airhacks.afterburner.injection.Injector;
+
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
@@ -12,8 +14,6 @@
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
-import com.airhacks.afterburner.injection.Injector;
-
 /**
  * A base class for non-modal windows of JabRef.
  * <p>
@@ -32,17 +32,24 @@ public BaseWindow() {
 
         setScene(new Scene(new Pane()));
 
-        stylesheets.addListener((ListChangeListener<String>) c -> getScene().getStylesheets().setAll(stylesheets));
-        sceneProperty().addListener((obs, oldValue, newValue) -> {
-            newValue.getStylesheets().setAll(stylesheets);
-            newValue.setOnKeyPressed(event -> {
-                KeyBindingRepository keyBindingRepository = Injector.instantiateModelOrService(KeyBindingRepository.class);
-                if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE, event)) {
-                    close();
-                    onCloseRequestProperty().get().handle(null);
-                }
-            });
-        });
+        stylesheets.addListener(
+                (ListChangeListener<String>) c -> getScene().getStylesheets().setAll(stylesheets));
+        sceneProperty()
+                .addListener(
+                        (obs, oldValue, newValue) -> {
+                            newValue.getStylesheets().setAll(stylesheets);
+                            newValue.setOnKeyPressed(
+                                    event -> {
+                                        KeyBindingRepository keyBindingRepository =
+                                                Injector.instantiateModelOrService(
+                                                        KeyBindingRepository.class);
+                                        if (keyBindingRepository.checkKeyCombinationEquality(
+                                                KeyBinding.CLOSE, event)) {
+                                            close();
+                                            onCloseRequestProperty().get().handle(null);
+                                        }
+                                    });
+                        });
     }
 
     public void applyStylesheets(ObservableList<String> stylesheets) {
diff --git a/src/main/java/org/jabref/gui/util/BindingsHelper.java b/src/main/java/org/jabref/gui/util/BindingsHelper.java
index 48cef6198528..dabc73098c30 100644
--- a/src/main/java/org/jabref/gui/util/BindingsHelper.java
+++ b/src/main/java/org/jabref/gui/util/BindingsHelper.java
@@ -1,9 +1,8 @@
 package org.jabref.gui.util;
 
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-import java.util.function.Function;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.PreboundBinding;
+import com.tobiasdiez.easybind.Subscription;
 
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.ObjectBinding;
@@ -20,20 +19,22 @@
 import javafx.css.PseudoClass;
 import javafx.scene.Node;
 
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.PreboundBinding;
-import com.tobiasdiez.easybind.Subscription;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Function;
 
 /**
  * Helper methods for javafx binding. Some methods are taken from https://bugs.openjdk.java.net/browse/JDK-8134679
  */
 public class BindingsHelper {
 
-    private BindingsHelper() {
-    }
+    private BindingsHelper() {}
 
-    public static Subscription includePseudoClassWhen(Node node, PseudoClass pseudoClass, ObservableValue<? extends Boolean> condition) {
-        Consumer<Boolean> changePseudoClass = value -> node.pseudoClassStateChanged(pseudoClass, value);
+    public static Subscription includePseudoClassWhen(
+            Node node, PseudoClass pseudoClass, ObservableValue<? extends Boolean> condition) {
+        Consumer<Boolean> changePseudoClass =
+                value -> node.pseudoClassStateChanged(pseudoClass, value);
         Subscription subscription = EasyBind.subscribe(condition, changePseudoClass);
 
         // Put the pseudo class there depending on the current value
@@ -41,13 +42,15 @@ public static Subscription includePseudoClassWhen(Node node, PseudoClass pseudoC
         return subscription;
     }
 
-    public static <T, U> ObservableList<U> map(ObservableValue<T> source, Function<T, List<U>> mapper) {
-        PreboundBinding<List<U>> binding = new PreboundBinding<>(source) {
-            @Override
-            protected List<U> computeValue() {
-                return mapper.apply(source.getValue());
-            }
-        };
+    public static <T, U> ObservableList<U> map(
+            ObservableValue<T> source, Function<T, List<U>> mapper) {
+        PreboundBinding<List<U>> binding =
+                new PreboundBinding<>(source) {
+                    @Override
+                    protected List<U> computeValue() {
+                        return mapper.apply(source.getValue());
+                    }
+                };
 
         ObservableList<U> list = FXCollections.observableArrayList();
         binding.addListener((observable, oldValue, newValue) -> list.setAll(newValue));
@@ -57,7 +60,11 @@ protected List<U> computeValue() {
     /**
      * Binds propertyA bidirectional to propertyB using the provided map functions to convert between them.
      */
-    public static <A, B> void bindBidirectional(Property<A> propertyA, Property<B> propertyB, Function<A, B> mapAtoB, Function<B, A> mapBtoA) {
+    public static <A, B> void bindBidirectional(
+            Property<A> propertyA,
+            Property<B> propertyB,
+            Function<A, B> mapAtoB,
+            Function<B, A> mapBtoA) {
         Consumer<B> updateA = newValueB -> propertyA.setValue(mapBtoA.apply(newValueB));
         Consumer<A> updateB = newValueA -> propertyB.setValue(mapAtoB.apply(newValueA));
         bindBidirectional(propertyA, propertyB, updateA, updateB);
@@ -66,15 +73,21 @@ public static <A, B> void bindBidirectional(Property<A> propertyA, Property<B> p
     /**
      * Binds propertyA bidirectional to propertyB while using updateB to update propertyB when propertyA changed.
      */
-    public static <A> void bindBidirectional(Property<A> propertyA, ObservableValue<A> propertyB, Consumer<A> updateB) {
+    public static <A> void bindBidirectional(
+            Property<A> propertyA, ObservableValue<A> propertyB, Consumer<A> updateB) {
         bindBidirectional(propertyA, propertyB, propertyA::setValue, updateB);
     }
 
     /**
      * Binds propertyA bidirectional to propertyB using updateB to update propertyB when propertyA changed and similar for updateA.
      */
-    public static <A, B> void bindBidirectional(ObservableValue<A> propertyA, ObservableValue<B> propertyB, Consumer<B> updateA, Consumer<A> updateB) {
-        final BidirectionalBinding<A, B> binding = new BidirectionalBinding<>(propertyA, propertyB, updateA, updateB);
+    public static <A, B> void bindBidirectional(
+            ObservableValue<A> propertyA,
+            ObservableValue<B> propertyB,
+            Consumer<B> updateA,
+            Consumer<A> updateB) {
+        final BidirectionalBinding<A, B> binding =
+                new BidirectionalBinding<>(propertyA, propertyB, updateA, updateB);
 
         // use updateB as initial source
         updateA.accept(propertyB.getValue());
@@ -83,16 +96,22 @@ public static <A, B> void bindBidirectional(ObservableValue<A> propertyA, Observ
         propertyB.addListener(binding.getChangeListenerB());
     }
 
-    public static <A, B> void bindContentBidirectional(ObservableList<A> propertyA, ListProperty<B> propertyB, Consumer<ObservableList<B>> updateA, Consumer<List<A>> updateB) {
+    public static <A, B> void bindContentBidirectional(
+            ObservableList<A> propertyA,
+            ListProperty<B> propertyB,
+            Consumer<ObservableList<B>> updateA,
+            Consumer<List<A>> updateB) {
         bindContentBidirectional(
-                propertyA,
-                (ObservableValue<ObservableList<B>>) propertyB,
-                updateA,
-                updateB);
+                propertyA, (ObservableValue<ObservableList<B>>) propertyB, updateA, updateB);
     }
 
-    public static <A, B> void bindContentBidirectional(ObservableList<A> propertyA, ObservableValue<B> propertyB, Consumer<B> updateA, Consumer<List<A>> updateB) {
-        final BidirectionalListBinding<A, B> binding = new BidirectionalListBinding<>(propertyA, propertyB, updateA, updateB);
+    public static <A, B> void bindContentBidirectional(
+            ObservableList<A> propertyA,
+            ObservableValue<B> propertyB,
+            Consumer<B> updateA,
+            Consumer<List<A>> updateB) {
+        final BidirectionalListBinding<A, B> binding =
+                new BidirectionalListBinding<>(propertyA, propertyB, updateA, updateB);
 
         // use property as initial source
         updateA.accept(propertyB.getValue());
@@ -101,19 +120,24 @@ public static <A, B> void bindContentBidirectional(ObservableList<A> propertyA,
         propertyB.addListener(binding);
     }
 
-    public static <A, B> void bindContentBidirectional(ListProperty<A> listProperty, Property<B> property, Function<List<A>, B> mapToB, Function<B, List<A>> mapToList) {
+    public static <A, B> void bindContentBidirectional(
+            ListProperty<A> listProperty,
+            Property<B> property,
+            Function<List<A>, B> mapToB,
+            Function<B, List<A>> mapToList) {
         Consumer<B> updateList = newValueB -> listProperty.setAll(mapToList.apply(newValueB));
         Consumer<List<A>> updateB = newValueList -> property.setValue(mapToB.apply(newValueList));
 
-        bindContentBidirectional(
-                listProperty,
-                property,
-                updateList,
-                updateB);
+        bindContentBidirectional(listProperty, property, updateList, updateB);
     }
 
-    public static <A, V, B> void bindContentBidirectional(ObservableMap<A, V> propertyA, ObservableValue<B> propertyB, Consumer<B> updateA, Consumer<Map<A, V>> updateB) {
-        final BidirectionalMapBinding<A, V, B> binding = new BidirectionalMapBinding<>(propertyA, propertyB, updateA, updateB);
+    public static <A, V, B> void bindContentBidirectional(
+            ObservableMap<A, V> propertyA,
+            ObservableValue<B> propertyB,
+            Consumer<B> updateA,
+            Consumer<Map<A, V>> updateB) {
+        final BidirectionalMapBinding<A, V, B> binding =
+                new BidirectionalMapBinding<>(propertyA, propertyB, updateA, updateB);
 
         // use list as initial source
         updateB.accept(propertyA);
@@ -122,13 +146,14 @@ public static <A, V, B> void bindContentBidirectional(ObservableMap<A, V> proper
         propertyB.addListener(binding);
     }
 
-    public static <A, V, B> void bindContentBidirectional(ObservableMap<A, V> propertyA, Property<B> propertyB, Consumer<B> updateA, Function<Map<A, V>, B> mapToB) {
-        Consumer<Map<A, V>> updateB = newValueList -> propertyB.setValue(mapToB.apply(newValueList));
-        bindContentBidirectional(
-                propertyA,
-                propertyB,
-                updateA,
-                updateB);
+    public static <A, V, B> void bindContentBidirectional(
+            ObservableMap<A, V> propertyA,
+            Property<B> propertyB,
+            Consumer<B> updateA,
+            Function<Map<A, V>, B> mapToB) {
+        Consumer<Map<A, V>> updateB =
+                newValueList -> propertyB.setValue(mapToB.apply(newValueList));
+        bindContentBidirectional(propertyA, propertyB, updateA, updateB);
     }
 
     public static <T> ObservableValue<T> constantOf(T value) {
@@ -165,14 +190,17 @@ public static <T> ObservableList<T> forUI(ObservableList<T> list) {
         return new UiThreadList<>(list);
     }
 
-    public static <T> ObservableValue<T> ifThenElse(ObservableValue<Boolean> condition, T value, T other) {
-        return EasyBind.map(condition, conditionValue -> {
-            if (conditionValue) {
-                return value;
-            } else {
-                return other;
-            }
-        });
+    public static <T> ObservableValue<T> ifThenElse(
+            ObservableValue<Boolean> condition, T value, T other) {
+        return EasyBind.map(
+                condition,
+                conditionValue -> {
+                    if (conditionValue) {
+                        return value;
+                    } else {
+                        return other;
+                    }
+                });
     }
 
     /**
@@ -183,8 +211,10 @@ public static <T> ObservableValue<T> ifThenElse(ObservableValue<Boolean> conditi
      * @return a subscription that can be used to stop invoking subscriber for any further {@code observable} changes.
      * @apiNote {@link EasyBind#subscribe(ObservableValue, Consumer)} is similar but also invokes the {@code subscriber} for the current value
      */
-    public static <T> Subscription subscribeFuture(ObservableValue<T> observable, Consumer<? super T> subscriber) {
-        ChangeListener<? super T> listener = (obs, oldValue, newValue) -> subscriber.accept(newValue);
+    public static <T> Subscription subscribeFuture(
+            ObservableValue<T> observable, Consumer<? super T> subscriber) {
+        ChangeListener<? super T> listener =
+                (obs, oldValue, newValue) -> subscriber.accept(newValue);
         observable.addListener(listener);
         return () -> observable.removeListener(listener);
     }
@@ -196,7 +226,11 @@ private static class BidirectionalBinding<A, B> {
         private final Consumer<A> updateB;
         private boolean updating = false;
 
-        public BidirectionalBinding(ObservableValue<A> propertyA, ObservableValue<B> propertyB, Consumer<B> updateA, Consumer<A> updateB) {
+        public BidirectionalBinding(
+                ObservableValue<A> propertyA,
+                ObservableValue<B> propertyB,
+                Consumer<B> updateA,
+                Consumer<A> updateB) {
             this.propertyA = propertyA;
             this.updateA = updateA;
             this.updateB = updateB;
@@ -230,7 +264,8 @@ private <T> void updateLocked(Consumer<T> update, T oldValue, T newValue) {
         }
     }
 
-    private static class BidirectionalListBinding<A, B> implements ListChangeListener<A>, ChangeListener<B> {
+    private static class BidirectionalListBinding<A, B>
+            implements ListChangeListener<A>, ChangeListener<B> {
 
         private final ObservableList<A> listProperty;
         private final ObservableValue<B> property;
@@ -238,7 +273,11 @@ private static class BidirectionalListBinding<A, B> implements ListChangeListene
         private final Consumer<List<A>> updateB;
         private boolean updating = false;
 
-        public BidirectionalListBinding(ObservableList<A> listProperty, ObservableValue<B> property, Consumer<B> updateA, Consumer<List<A>> updateB) {
+        public BidirectionalListBinding(
+                ObservableList<A> listProperty,
+                ObservableValue<B> property,
+                Consumer<B> updateA,
+                Consumer<List<A>> updateB) {
             this.listProperty = listProperty;
             this.property = property;
             this.updateA = updateA;
@@ -270,7 +309,8 @@ public void onChanged(Change<? extends A> c) {
         }
     }
 
-    private static class BidirectionalMapBinding<A, V, B> implements MapChangeListener<A, V>, ChangeListener<B> {
+    private static class BidirectionalMapBinding<A, V, B>
+            implements MapChangeListener<A, V>, ChangeListener<B> {
 
         private final ObservableMap<A, V> mapProperty;
         private final ObservableValue<B> property;
@@ -278,7 +318,11 @@ private static class BidirectionalMapBinding<A, V, B> implements MapChangeListen
         private final Consumer<Map<A, V>> updateB;
         private boolean updating = false;
 
-        public BidirectionalMapBinding(ObservableMap<A, V> mapProperty, ObservableValue<B> property, Consumer<B> updateA, Consumer<Map<A, V>> updateB) {
+        public BidirectionalMapBinding(
+                ObservableMap<A, V> mapProperty,
+                ObservableValue<B> property,
+                Consumer<B> updateA,
+                Consumer<Map<A, V>> updateB) {
             this.mapProperty = mapProperty;
             this.property = property;
             this.updateA = updateA;
diff --git a/src/main/java/org/jabref/gui/util/ColorUtil.java b/src/main/java/org/jabref/gui/util/ColorUtil.java
index 31c64942c479..aea108dc2ab7 100644
--- a/src/main/java/org/jabref/gui/util/ColorUtil.java
+++ b/src/main/java/org/jabref/gui/util/ColorUtil.java
@@ -5,21 +5,27 @@
 public class ColorUtil {
 
     public static String toRGBCode(Color color) {
-        return "#%02X%02X%02X".formatted(
-                (int) (color.getRed() * 255),
-                (int) (color.getGreen() * 255),
-                (int) (color.getBlue() * 255));
+        return "#%02X%02X%02X"
+                .formatted(
+                        (int) (color.getRed() * 255),
+                        (int) (color.getGreen() * 255),
+                        (int) (color.getBlue() * 255));
     }
 
     public static String toRGBACode(Color color) {
-        return "rgba(%d,%d,%d,%f)".formatted(
-                (int) (color.getRed() * 255),
-                (int) (color.getGreen() * 255),
-                (int) (color.getBlue() * 255),
-                color.getOpacity());
+        return "rgba(%d,%d,%d,%f)"
+                .formatted(
+                        (int) (color.getRed() * 255),
+                        (int) (color.getGreen() * 255),
+                        (int) (color.getBlue() * 255),
+                        color.getOpacity());
     }
 
     public static String toHex(Color validFieldBackgroundColor) {
-        return "#%02x%02x%02x".formatted((int) validFieldBackgroundColor.getRed(), (int) validFieldBackgroundColor.getGreen(), (int) validFieldBackgroundColor.getBlue());
+        return "#%02x%02x%02x"
+                .formatted(
+                        (int) validFieldBackgroundColor.getRed(),
+                        (int) validFieldBackgroundColor.getGreen(),
+                        (int) validFieldBackgroundColor.getBlue());
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/ControlHelper.java b/src/main/java/org/jabref/gui/util/ControlHelper.java
index 6eef1d5481e0..98876b621e6c 100644
--- a/src/main/java/org/jabref/gui/util/ControlHelper.java
+++ b/src/main/java/org/jabref/gui/util/ControlHelper.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.util;
 
-import java.util.function.Consumer;
-import java.util.function.UnaryOperator;
-
 import javafx.css.PseudoClass;
 import javafx.event.ActionEvent;
 import javafx.event.Event;
@@ -14,6 +11,9 @@
 import javafx.scene.control.TextFormatter;
 import javafx.scene.input.DragEvent;
 
+import java.util.function.Consumer;
+import java.util.function.UnaryOperator;
+
 public class ControlHelper {
 
     // Pseudo-classes for drag and drop
@@ -21,39 +21,50 @@ public class ControlHelper {
     private static PseudoClass dragOverCenter = PseudoClass.getPseudoClass("dragOver-center");
     private static PseudoClass dragOverTop = PseudoClass.getPseudoClass("dragOver-top");
 
-    public enum EllipsisPosition { BEGINNING, CENTER, ENDING }
+    public enum EllipsisPosition {
+        BEGINNING,
+        CENTER,
+        ENDING
+    }
 
-    public static void setAction(ButtonType buttonType, DialogPane dialogPane, Consumer<Event> consumer) {
+    public static void setAction(
+            ButtonType buttonType, DialogPane dialogPane, Consumer<Event> consumer) {
         Button button = (Button) dialogPane.lookupButton(buttonType);
-        button.addEventFilter(ActionEvent.ACTION, (event -> {
-            consumer.accept(event);
-            event.consume();
-        }));
+        button.addEventFilter(
+                ActionEvent.ACTION,
+                (event -> {
+                    consumer.accept(event);
+                    event.consume();
+                }));
     }
 
     public static boolean childIsFocused(Parent node) {
-        return node.isFocused() || node.getChildrenUnmodifiable().stream().anyMatch(child -> {
-            if (child instanceof Parent parent) {
-                return childIsFocused(parent);
-            } else {
-                return child.isFocused();
-            }
-        });
+        return node.isFocused()
+                || node.getChildrenUnmodifiable().stream()
+                        .anyMatch(
+                                child -> {
+                                    if (child instanceof Parent parent) {
+                                        return childIsFocused(parent);
+                                    } else {
+                                        return child.isFocused();
+                                    }
+                                });
     }
 
     /**
      * Returns a text formatter that restricts input to integers
      */
     public static TextFormatter<String> getIntegerTextFormatter() {
-        UnaryOperator<TextFormatter.Change> filter = change -> {
-            String text = change.getText();
+        UnaryOperator<TextFormatter.Change> filter =
+                change -> {
+                    String text = change.getText();
 
-            if (text.matches("[0-9]*")) {
-                return change;
-            }
+                    if (text.matches("[0-9]*")) {
+                        return change;
+                    }
 
-            return null;
-        };
+                    return null;
+                };
         return new TextFormatter<>(filter);
     }
 
@@ -111,7 +122,11 @@ public static void removeDroppingPseudoClasses(Cell<?> cell) {
      * @param ellipsisPosition location in the given text where the truncation should be performed
      * @return the new, truncated string
      */
-    public static String truncateString(String text, int maxCharacters, String ellipsisString, EllipsisPosition ellipsisPosition) {
+    public static String truncateString(
+            String text,
+            int maxCharacters,
+            String ellipsisString,
+            EllipsisPosition ellipsisPosition) {
         if (text == null || "".equals(text)) {
             return text; // return original
         }
@@ -130,12 +145,18 @@ public static String truncateString(String text, int maxCharacters, String ellip
             // truncation necessary
             switch (ellipsisPosition) {
                 case BEGINNING:
-                    return ellipsisString + text.substring(text.length() - (maxCharacters - ellipsisString.length()));
+                    return ellipsisString
+                            + text.substring(
+                                    text.length() - (maxCharacters - ellipsisString.length()));
                 case CENTER:
-                    int partialLength = (int) Math.floor((maxCharacters - ellipsisString.length()) / 2f);
-                    return text.substring(0, partialLength) + ellipsisString + text.substring(text.length() - partialLength);
+                    int partialLength =
+                            (int) Math.floor((maxCharacters - ellipsisString.length()) / 2f);
+                    return text.substring(0, partialLength)
+                            + ellipsisString
+                            + text.substring(text.length() - partialLength);
                 case ENDING:
-                    return text.substring(0, maxCharacters - ellipsisString.length()) + ellipsisString;
+                    return text.substring(0, maxCharacters - ellipsisString.length())
+                            + ellipsisString;
             }
         }
 
diff --git a/src/main/java/org/jabref/gui/util/CustomLocalDragboard.java b/src/main/java/org/jabref/gui/util/CustomLocalDragboard.java
index 7a35d42e3119..5bddbe3ca68f 100644
--- a/src/main/java/org/jabref/gui/util/CustomLocalDragboard.java
+++ b/src/main/java/org/jabref/gui/util/CustomLocalDragboard.java
@@ -1,22 +1,24 @@
 package org.jabref.gui.util;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.jabref.gui.DragAndDropDataFormats;
 import org.jabref.gui.StateManager;
 import org.jabref.logic.preview.PreviewLayout;
 import org.jabref.model.entry.BibEntry;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Placeholder class for a custom generic type safe dragboard to be used in drag and drop, does not depend on serialization
  * Don't use this class directly. Use the instance provided in {@link StateManager#getLocalDragboard()}
  */
 public class CustomLocalDragboard {
 
-    @SuppressWarnings("unchecked") private static final Class<List<BibEntry>> BIB_ENTRIES = (Class<List<BibEntry>>) (Class<?>) List.class;
+    @SuppressWarnings("unchecked")
+    private static final Class<List<BibEntry>> BIB_ENTRIES =
+            (Class<List<BibEntry>>) (Class<?>) List.class;
 
     private final Map<Class<?>, Object> contents = new HashMap<>();
 
diff --git a/src/main/java/org/jabref/gui/util/CustomRatingSkin.java b/src/main/java/org/jabref/gui/util/CustomRatingSkin.java
index 96e6e8d75d59..adc77dcc4c3e 100644
--- a/src/main/java/org/jabref/gui/util/CustomRatingSkin.java
+++ b/src/main/java/org/jabref/gui/util/CustomRatingSkin.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.util;
 
-import javafx.scene.Node;
+import impl.org.controlsfx.skin.RatingSkin;
 
-import org.jabref.gui.icon.IconTheme;
+import javafx.scene.Node;
 
-import impl.org.controlsfx.skin.RatingSkin;
 import org.controlsfx.control.Rating;
+import org.jabref.gui.icon.IconTheme;
 
 public class CustomRatingSkin extends RatingSkin {
     public CustomRatingSkin(Rating control) {
diff --git a/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java b/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java
index 2b85377d971b..e9df408d7b9d 100644
--- a/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java
+++ b/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java
@@ -1,9 +1,6 @@
 package org.jabref.gui.util;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import static javafx.css.StyleConverter.getEnumConverter;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.DoubleBinding;
@@ -21,7 +18,10 @@
 import javafx.scene.text.Text;
 import javafx.scene.transform.Rotate;
 
-import static javafx.css.StyleConverter.getEnumConverter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
 
 /**
  *
@@ -31,7 +31,8 @@
 public class CustomTitledPaneSkin extends TitledPaneSkin {
 
     public enum ArrowSide {
-        LEFT, RIGHT
+        LEFT,
+        RIGHT
     }
 
     /* ********************************************************
@@ -40,13 +41,15 @@ public enum ArrowSide {
      *                                                        *
      **********************************************************/
 
-    private final StyleableObjectProperty<ArrowSide> arrowSide = new SimpleStyleableObjectProperty<>(StyleableProperties.ARROW_SIDE, this, "arrowSide", ArrowSide.LEFT) {
+    private final StyleableObjectProperty<ArrowSide> arrowSide =
+            new SimpleStyleableObjectProperty<>(
+                    StyleableProperties.ARROW_SIDE, this, "arrowSide", ArrowSide.LEFT) {
 
-        @Override
-        protected void invalidated() {
-            adjustTitleLayout();
-        }
-    };
+                @Override
+                protected void invalidated() {
+                    adjustTitleLayout();
+                }
+            };
 
     public final void setArrowSide(ArrowSide arrowSide) {
         this.arrowSide.set(arrowSide);
@@ -92,10 +95,8 @@ public CustomTitledPaneSkin(TitledPane control) {
         Rotate rotate = new Rotate();
         rotate.pivotXProperty().bind(arrow.widthProperty().divide(2.0));
         rotate.pivotYProperty().bind(arrow.heightProperty().divide(2.0));
-        rotate.angleProperty().bind(
-                Bindings.when(control.expandedProperty())
-                        .then(-180.0)
-                        .otherwise(90.0));
+        rotate.angleProperty()
+                .bind(Bindings.when(control.expandedProperty()).then(-180.0).otherwise(90.0));
 
         arrow.getTransforms().add(rotate);
 
@@ -115,17 +116,30 @@ private void adjustTitleLayout() {
             return;
         }
 
-        arrowTranslateBinding = Bindings.createDoubleBinding(() -> {
-            double rightInset = title.getPadding().getRight();
-            return title.getWidth() - arrowButton.getLayoutX() - arrowButton.getWidth() - rightInset;
-        }, title.paddingProperty(), title.widthProperty(), arrowButton.widthProperty(), arrowButton.layoutXProperty());
+        arrowTranslateBinding =
+                Bindings.createDoubleBinding(
+                        () -> {
+                            double rightInset = title.getPadding().getRight();
+                            return title.getWidth()
+                                    - arrowButton.getLayoutX()
+                                    - arrowButton.getWidth()
+                                    - rightInset;
+                        },
+                        title.paddingProperty(),
+                        title.widthProperty(),
+                        arrowButton.widthProperty(),
+                        arrowButton.layoutXProperty());
         arrowButton.translateXProperty().bind(arrowTranslateBinding);
 
-        textGraphicTranslateBinding = Bindings.createDoubleBinding(
-                () -> switch (getSkinnable().getAlignment()) {
-                    case TOP_CENTER, CENTER, BOTTOM_CENTER, BASELINE_CENTER -> 0.0;
-                    default -> -arrowButton.getWidth();
-                }, getSkinnable().alignmentProperty(), arrowButton.widthProperty());
+        textGraphicTranslateBinding =
+                Bindings.createDoubleBinding(
+                        () ->
+                                switch (getSkinnable().getAlignment()) {
+                                    case TOP_CENTER, CENTER, BOTTOM_CENTER, BASELINE_CENTER -> 0.0;
+                                    default -> -arrowButton.getWidth();
+                                },
+                        getSkinnable().alignmentProperty(),
+                        arrowButton.widthProperty());
         text.translateXProperty().bind(textGraphicTranslateBinding);
 
         graphic = getSkinnable().getGraphic();
@@ -178,33 +192,34 @@ public void dispose() {
 
     private static class StyleableProperties {
 
-        private static final CssMetaData<TitledPane, ArrowSide> ARROW_SIDE = new CssMetaData<>("-fx-arrow-side", getEnumConverter(ArrowSide.class), ArrowSide.LEFT) {
-
-            @Override
-            public boolean isSettable(TitledPane styleable) {
-                Property<?> prop = (Property<?>) getStyleableProperty(styleable);
-                return (prop != null) && !prop.isBound();
-            }
-
-            @Override
-            public StyleableProperty<ArrowSide> getStyleableProperty(TitledPane styleable) {
-                Skin<?> skin = styleable.getSkin();
-                if (skin instanceof CustomTitledPaneSkin paneSkin) {
-                    return paneSkin.arrowSide;
-                }
-                return null;
-            }
-
-        };
+        private static final CssMetaData<TitledPane, ArrowSide> ARROW_SIDE =
+                new CssMetaData<>(
+                        "-fx-arrow-side", getEnumConverter(ArrowSide.class), ArrowSide.LEFT) {
+
+                    @Override
+                    public boolean isSettable(TitledPane styleable) {
+                        Property<?> prop = (Property<?>) getStyleableProperty(styleable);
+                        return (prop != null) && !prop.isBound();
+                    }
+
+                    @Override
+                    public StyleableProperty<ArrowSide> getStyleableProperty(TitledPane styleable) {
+                        Skin<?> skin = styleable.getSkin();
+                        if (skin instanceof CustomTitledPaneSkin paneSkin) {
+                            return paneSkin.arrowSide;
+                        }
+                        return null;
+                    }
+                };
 
         private static final List<CssMetaData<?, ?>> CSS_META_DATA;
 
         static {
-            List<CssMetaData<?, ?>> list = new ArrayList<>(TitledPane.getClassCssMetaData().size() + 1);
+            List<CssMetaData<?, ?>> list =
+                    new ArrayList<>(TitledPane.getClassCssMetaData().size() + 1);
             list.addAll(TitledPaneSkin.getClassCssMetaData());
             list.add(ARROW_SIDE);
             CSS_META_DATA = Collections.unmodifiableList(list);
         }
-
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/DefaultDirectoryMonitor.java b/src/main/java/org/jabref/gui/util/DefaultDirectoryMonitor.java
index 522a63632b01..ffb62bc5d6b2 100644
--- a/src/main/java/org/jabref/gui/util/DefaultDirectoryMonitor.java
+++ b/src/main/java/org/jabref/gui/util/DefaultDirectoryMonitor.java
@@ -1,10 +1,9 @@
 package org.jabref.gui.util;
 
-import org.jabref.model.util.DirectoryMonitor;
-
 import org.apache.commons.io.monitor.FileAlterationListener;
 import org.apache.commons.io.monitor.FileAlterationMonitor;
 import org.apache.commons.io.monitor.FileAlterationObserver;
+import org.jabref.model.util.DirectoryMonitor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java b/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
index 9d53439b90e8..7b7fb46e5313 100644
--- a/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
+++ b/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
@@ -1,5 +1,15 @@
 package org.jabref.gui.util;
 
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+
+import org.jabref.logic.JabRefException;
+import org.jabref.logic.WatchServiceUnavailableException;
+import org.jabref.model.util.FileUpdateListener;
+import org.jabref.model.util.FileUpdateMonitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.nio.file.ClosedWatchServiceException;
 import java.nio.file.FileSystems;
@@ -12,16 +22,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.jabref.logic.JabRefException;
-import org.jabref.logic.WatchServiceUnavailableException;
-import org.jabref.model.util.FileUpdateListener;
-import org.jabref.model.util.FileUpdateMonitor;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * This class monitors a set of files for changes. Upon detecting a change it notifies the registered {@link
  * FileUpdateListener}s.
@@ -35,7 +35,8 @@ public class DefaultFileUpdateMonitor implements Runnable, FileUpdateMonitor {
     private final Multimap<Path, FileUpdateListener> listeners = ArrayListMultimap.create(20, 4);
     private volatile WatchService watcher;
     private final AtomicBoolean notShutdown = new AtomicBoolean(true);
-    private final AtomicReference<Optional<JabRefException>> filesystemMonitorFailure = new AtomicReference<>(Optional.empty());
+    private final AtomicReference<Optional<JabRefException>> filesystemMonitorFailure =
+            new AtomicReference<>(Optional.empty());
 
     @Override
     public void run() {
@@ -57,8 +58,10 @@ public void run() {
                     if (kind == StandardWatchEventKinds.OVERFLOW) {
                         Thread.yield();
                         continue;
-                    } else if (kind == StandardWatchEventKinds.ENTRY_CREATE || kind == StandardWatchEventKinds.ENTRY_MODIFY) {
-                        // We only handle "ENTRY_CREATE" and "ENTRY_MODIFY" here, so the context is always a Path
+                    } else if (kind == StandardWatchEventKinds.ENTRY_CREATE
+                            || kind == StandardWatchEventKinds.ENTRY_MODIFY) {
+                        // We only handle "ENTRY_CREATE" and "ENTRY_MODIFY" here, so the context is
+                        // always a Path
                         @SuppressWarnings("unchecked")
                         WatchEvent<Path> ev = (WatchEvent<Path>) event;
                         Path path = ((Path) key.watchable()).resolve(ev.context());
@@ -69,8 +72,9 @@ public void run() {
                 Thread.yield();
             }
         } catch (IOException e) {
-            JabRefException exception = new WatchServiceUnavailableException(
-                    e.getMessage(), e.getLocalizedMessage(), e.getCause());
+            JabRefException exception =
+                    new WatchServiceUnavailableException(
+                            e.getMessage(), e.getLocalizedMessage(), e.getCause());
             filesystemMonitorFailure.set(Optional.of(exception));
             LOGGER.warn("Error during watching", e);
         }
@@ -90,10 +94,16 @@ public void addListenerForFile(Path file, FileUpdateListener listener) throws IO
         if (isActive()) {
             // We can't watch files directly, so monitor their parent directory for updates
             Path directory = file.toAbsolutePath().getParent();
-            directory.register(watcher, StandardWatchEventKinds.ENTRY_CREATE, StandardWatchEventKinds.ENTRY_MODIFY);
+            directory.register(
+                    watcher,
+                    StandardWatchEventKinds.ENTRY_CREATE,
+                    StandardWatchEventKinds.ENTRY_MODIFY);
             listeners.put(file, listener);
         } else {
-            LOGGER.warn("Not adding listener {} to file {} because the file update monitor isn't active", listener, file);
+            LOGGER.warn(
+                    "Not adding listener {} to file {} because the file update monitor isn't active",
+                    listener,
+                    file);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/util/FieldsUtil.java b/src/main/java/org/jabref/gui/util/FieldsUtil.java
index 0823ec8a104e..513d05391250 100644
--- a/src/main/java/org/jabref/gui/util/FieldsUtil.java
+++ b/src/main/java/org/jabref/gui/util/FieldsUtil.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.util;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.util.StringConverter;
 
 import org.jabref.gui.specialfields.SpecialFieldViewModel;
@@ -14,28 +12,35 @@
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.UnknownField;
 
+import javax.swing.undo.UndoManager;
+
 public class FieldsUtil {
 
-    public static final StringConverter<Field> FIELD_STRING_CONVERTER = new StringConverter<>() {
-        @Override
-        public String toString(Field object) {
-            if (object != null) {
-                return object.getDisplayName();
-            } else {
-                return "";
-            }
-        }
+    public static final StringConverter<Field> FIELD_STRING_CONVERTER =
+            new StringConverter<>() {
+                @Override
+                public String toString(Field object) {
+                    if (object != null) {
+                        return object.getDisplayName();
+                    } else {
+                        return "";
+                    }
+                }
 
-        @Override
-        public Field fromString(String string) {
-            return FieldFactory.parseField(string);
-        }
-    };
+                @Override
+                public Field fromString(String string) {
+                    return FieldFactory.parseField(string);
+                }
+            };
 
-    public static String getNameWithType(Field field, CliPreferences preferences, UndoManager undoManager) {
+    public static String getNameWithType(
+            Field field, CliPreferences preferences, UndoManager undoManager) {
         if (field instanceof SpecialField specialField) {
-            return new SpecialFieldViewModel(specialField, preferences, undoManager).getLocalization()
-                    + " (" + Localization.lang("Special") + ")";
+            return new SpecialFieldViewModel(specialField, preferences, undoManager)
+                            .getLocalization()
+                    + " ("
+                    + Localization.lang("Special")
+                    + ")";
         } else if (field instanceof IEEEField) {
             return field.getDisplayName() + " (" + Localization.lang("IEEE") + ")";
         } else if (field instanceof InternalField) {
diff --git a/src/main/java/org/jabref/gui/util/FileDialogConfiguration.java b/src/main/java/org/jabref/gui/util/FileDialogConfiguration.java
index e4e559ab150b..cdd9d2012ca5 100644
--- a/src/main/java/org/jabref/gui/util/FileDialogConfiguration.java
+++ b/src/main/java/org/jabref/gui/util/FileDialogConfiguration.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.util;
 
+import javafx.stage.FileChooser;
+
+import org.jabref.logic.util.FileType;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -8,10 +12,6 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import javafx.stage.FileChooser;
-
-import org.jabref.logic.util.FileType;
-
 public class FileDialogConfiguration {
 
     private final List<FileChooser.ExtensionFilter> extensionFilters;
@@ -20,8 +20,11 @@ public class FileDialogConfiguration {
     private final String initialFileName;
     private FileChooser.ExtensionFilter selectedExtensionFilter;
 
-    private FileDialogConfiguration(Path initialDirectory, List<FileChooser.ExtensionFilter> extensionFilters,
-                                    FileChooser.ExtensionFilter defaultExtension, String initialFileName) {
+    private FileDialogConfiguration(
+            Path initialDirectory,
+            List<FileChooser.ExtensionFilter> extensionFilters,
+            FileChooser.ExtensionFilter defaultExtension,
+            String initialFileName) {
         this.initialDirectory = initialDirectory;
         this.extensionFilters = Objects.requireNonNull(extensionFilters);
         this.defaultExtension = defaultExtension;
@@ -60,11 +63,14 @@ public static class Builder {
         private String initialFileName;
 
         public FileDialogConfiguration build() {
-            return new FileDialogConfiguration(initialDirectory, extensionFilters, defaultExtension, initialFileName);
+            return new FileDialogConfiguration(
+                    initialDirectory, extensionFilters, defaultExtension, initialFileName);
         }
 
         public Builder withInitialDirectory(Path directory) {
-            if (directory == null) { // It could be that somehow the path is null, for example if it got deleted in the meantime
+            if (directory
+                    == null) { // It could be that somehow the path is null, for example if it got
+                               // deleted in the meantime
                 initialDirectory = null;
             } else { // Dir must be a folder, not a file
                 if (!Files.isDirectory(directory)) {
@@ -72,7 +78,8 @@ public Builder withInitialDirectory(Path directory) {
                 }
                 // The lines above work also if the dir does not exist at all!
                 // NULL is accepted by the filechooser as no inital path
-                // Explicit null check, if somehow the parent is null, as Files.exists throws an NPE otherwise
+                // Explicit null check, if somehow the parent is null, as Files.exists throws an NPE
+                // otherwise
                 if ((directory != null) && !Files.exists(directory)) {
                     directory = null;
                 }
@@ -112,9 +119,9 @@ public Builder withDefaultExtension(String description, FileType fileType) {
 
         public Builder withDefaultExtension(String fileTypeDescription) {
             extensionFilters.stream()
-                            .filter(type -> type.getDescription().equalsIgnoreCase(fileTypeDescription))
-                            .findFirst()
-                            .ifPresent(extensionFilter -> defaultExtension = extensionFilter);
+                    .filter(type -> type.getDescription().equalsIgnoreCase(fileTypeDescription))
+                    .findFirst()
+                    .ifPresent(extensionFilter -> defaultExtension = extensionFilter);
 
             return this;
         }
@@ -131,8 +138,8 @@ public Builder addExtensionFilter(List<FileChooser.ExtensionFilter> filters) {
 
         public Builder addExtensionFilter(FileType... fileTypes) {
             Stream.of(fileTypes)
-                  .map(FileFilterConverter::toExtensionFilter)
-                  .forEachOrdered(this::addExtensionFilter);
+                    .map(FileFilterConverter::toExtensionFilter)
+                    .forEachOrdered(this::addExtensionFilter);
             return this;
         }
 
diff --git a/src/main/java/org/jabref/gui/util/FileFilterConverter.java b/src/main/java/org/jabref/gui/util/FileFilterConverter.java
index 3e7a6c33315b..0652291410d4 100644
--- a/src/main/java/org/jabref/gui/util/FileFilterConverter.java
+++ b/src/main/java/org/jabref/gui/util/FileFilterConverter.java
@@ -1,5 +1,14 @@
 package org.jabref.gui.util;
 
+import javafx.stage.FileChooser;
+
+import org.jabref.logic.exporter.Exporter;
+import org.jabref.logic.importer.Importer;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.FileType;
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.strings.StringUtil;
+
 import java.io.FileFilter;
 import java.io.IOException;
 import java.nio.file.DirectoryStream.Filter;
@@ -10,59 +19,64 @@
 import java.util.SortedSet;
 import java.util.stream.Collectors;
 
-import javafx.stage.FileChooser;
-
-import org.jabref.logic.exporter.Exporter;
-import org.jabref.logic.importer.Importer;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.FileType;
-import org.jabref.logic.util.io.FileUtil;
-import org.jabref.model.strings.StringUtil;
-
 public class FileFilterConverter {
 
-    public static FileChooser.ExtensionFilter ANY_FILE = new FileChooser.ExtensionFilter(Localization.lang("Any file"), "*.*");
+    public static FileChooser.ExtensionFilter ANY_FILE =
+            new FileChooser.ExtensionFilter(Localization.lang("Any file"), "*.*");
 
-    private FileFilterConverter() {
-    }
+    private FileFilterConverter() {}
 
     public static FileChooser.ExtensionFilter toExtensionFilter(FileType fileType) {
         String fileList = String.join(", ", fileType.getExtensionsWithAsteriskAndDot());
         String description = Localization.lang("%0 file (%1)", fileType.getName(), fileList);
-        return new FileChooser.ExtensionFilter(description, fileType.getExtensionsWithAsteriskAndDot());
+        return new FileChooser.ExtensionFilter(
+                description, fileType.getExtensionsWithAsteriskAndDot());
     }
 
-    public static FileChooser.ExtensionFilter toExtensionFilter(String description, FileType fileType) {
-        return new FileChooser.ExtensionFilter(description, fileType.getExtensionsWithAsteriskAndDot());
+    public static FileChooser.ExtensionFilter toExtensionFilter(
+            String description, FileType fileType) {
+        return new FileChooser.ExtensionFilter(
+                description, fileType.getExtensionsWithAsteriskAndDot());
     }
 
-    public static Optional<Importer> getImporter(FileChooser.ExtensionFilter extensionFilter, Collection<Importer> importers) {
-        return importers.stream().filter(importer -> importer.getName().equals(extensionFilter.getDescription())).findFirst();
+    public static Optional<Importer> getImporter(
+            FileChooser.ExtensionFilter extensionFilter, Collection<Importer> importers) {
+        return importers.stream()
+                .filter(importer -> importer.getName().equals(extensionFilter.getDescription()))
+                .findFirst();
     }
 
-    public static Optional<Exporter> getExporter(FileChooser.ExtensionFilter extensionFilter, Collection<Exporter> exporters) {
-        return exporters.stream().filter(exporter -> exporter.getName().equals(extensionFilter.getDescription())).findFirst();
+    public static Optional<Exporter> getExporter(
+            FileChooser.ExtensionFilter extensionFilter, Collection<Exporter> exporters) {
+        return exporters.stream()
+                .filter(exporter -> exporter.getName().equals(extensionFilter.getDescription()))
+                .findFirst();
     }
 
     public static FileChooser.ExtensionFilter forAllImporters(SortedSet<Importer> importers) {
-        List<FileType> fileTypes = importers.stream().map(Importer::getFileType).collect(Collectors.toList());
-        List<String> flatExtensions = fileTypes.stream()
-                                               .flatMap(type -> type.getExtensionsWithAsteriskAndDot().stream())
-                                               .collect(Collectors.toList());
+        List<FileType> fileTypes =
+                importers.stream().map(Importer::getFileType).collect(Collectors.toList());
+        List<String> flatExtensions =
+                fileTypes.stream()
+                        .flatMap(type -> type.getExtensionsWithAsteriskAndDot().stream())
+                        .collect(Collectors.toList());
 
-        return new FileChooser.ExtensionFilter(Localization.lang("Available import formats"), flatExtensions);
+        return new FileChooser.ExtensionFilter(
+                Localization.lang("Available import formats"), flatExtensions);
     }
 
-    public static List<FileChooser.ExtensionFilter> importerToExtensionFilter(Collection<Importer> importers) {
+    public static List<FileChooser.ExtensionFilter> importerToExtensionFilter(
+            Collection<Importer> importers) {
         return importers.stream()
-                        .map(importer -> toExtensionFilter(importer.getName(), importer.getFileType()))
-                        .collect(Collectors.toList());
+                .map(importer -> toExtensionFilter(importer.getName(), importer.getFileType()))
+                .collect(Collectors.toList());
     }
 
-    public static List<FileChooser.ExtensionFilter> exporterToExtensionFilter(Collection<Exporter> exporters) {
+    public static List<FileChooser.ExtensionFilter> exporterToExtensionFilter(
+            Collection<Exporter> exporters) {
         return exporters.stream()
-                        .map(exporter -> toExtensionFilter(exporter.getName(), exporter.getFileType()))
-                        .collect(Collectors.toList());
+                .map(exporter -> toExtensionFilter(exporter.getName(), exporter.getFileType()))
+                .collect(Collectors.toList());
     }
 
     public static FileFilter toFileFilter(FileChooser.ExtensionFilter extensionFilter) {
@@ -81,17 +95,17 @@ public static FileFilter toFileFilter(List<String> extensions) {
     }
 
     public static Filter<Path> toDirFilter(List<String> extensions) {
-        List<String> extensionsCleaned = extensions.stream()
-                                                   .map(extension -> extension.replace(".", "").replace("*", ""))
-                                                   .filter(StringUtil::isNotBlank)
-                                                   .collect(Collectors.toList());
+        List<String> extensionsCleaned =
+                extensions.stream()
+                        .map(extension -> extension.replace(".", "").replace("*", ""))
+                        .filter(StringUtil::isNotBlank)
+                        .collect(Collectors.toList());
         if (extensionsCleaned.isEmpty()) {
             // Except every file
             return path -> true;
         } else {
-            return path -> FileUtil.getFileExtension(path)
-                                       .map(extensionsCleaned::contains)
-                                       .orElse(false);
+            return path ->
+                    FileUtil.getFileExtension(path).map(extensionsCleaned::contains).orElse(false);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/FileNodeViewModel.java b/src/main/java/org/jabref/gui/util/FileNodeViewModel.java
index 253ea20a69f6..785b595c045a 100644
--- a/src/main/java/org/jabref/gui/util/FileNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/util/FileNodeViewModel.java
@@ -1,5 +1,13 @@
 package org.jabref.gui.util;
 
+import javafx.beans.property.ReadOnlyListWrapper;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import org.jabref.logic.l10n.Localization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -9,15 +17,6 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Objects;
 
-import javafx.beans.property.ReadOnlyListWrapper;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-
-import org.jabref.logic.l10n.Localization;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class FileNodeViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FileNodeViewModel.class);
@@ -51,10 +50,8 @@ public void setFileCount(int fileCount) {
      * Return a string of a FileTime in a yyyy-MM-dd HH:mm format.
      */
     public static String formatDateTime(FileTime fileTime) {
-        LocalDateTime localDateTime = fileTime
-                .toInstant()
-                .atZone(ZoneId.systemDefault())
-                .toLocalDateTime();
+        LocalDateTime localDateTime =
+                fileTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
 
         return localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
     }
@@ -64,7 +61,8 @@ public static String formatDateTime(FileTime fileTime) {
      */
     public String getDisplayText() {
         if (path.toFile().isDirectory()) {
-            return "%s (%s)".formatted(path.getFileName(), Localization.lang("%0 file(s)", fileCount));
+            return "%s (%s)"
+                    .formatted(path.getFileName(), Localization.lang("%0 file(s)", fileCount));
         }
         return path.getFileName().toString();
     }
@@ -75,7 +73,8 @@ public String getDisplayText() {
      */
     public String getDisplayTextWithEditDate() {
         if (path.toFile().isDirectory()) {
-            return "%s (%s)".formatted(path.getFileName(), Localization.lang("%0 file(s)", fileCount));
+            return "%s (%s)"
+                    .formatted(path.getFileName(), Localization.lang("%0 file(s)", fileCount));
         }
         FileTime lastEditedTime = null;
         try {
@@ -83,15 +82,17 @@ public String getDisplayTextWithEditDate() {
         } catch (IOException e) {
             LOGGER.error("Could not get last modified time", e);
         }
-        return "%s (%s: %s)".formatted(path.getFileName(), Localization.lang("last edited"), formatDateTime(lastEditedTime));
+        return "%s (%s: %s)"
+                .formatted(
+                        path.getFileName(),
+                        Localization.lang("last edited"),
+                        formatDateTime(lastEditedTime));
     }
 
     @Override
     public String toString() {
-        return "FileNodeViewModel{path=%s, children=%s, fileCount=%s}".formatted(
-                this.path,
-                this.children,
-                this.fileCount);
+        return "FileNodeViewModel{path=%s, children=%s, fileCount=%s}"
+                .formatted(this.path, this.children, this.fileCount);
     }
 
     @Override
@@ -107,6 +108,8 @@ public boolean equals(Object obj) {
         if (!(obj instanceof FileNodeViewModel other)) {
             return false;
         }
-        return Objects.equals(children, other.children) && (fileCount == other.fileCount) && Objects.equals(path, other.path);
+        return Objects.equals(children, other.children)
+                && (fileCount == other.fileCount)
+                && Objects.equals(path, other.path);
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/FilteredListProxy.java b/src/main/java/org/jabref/gui/util/FilteredListProxy.java
index 7584d30cf412..55c1afff9a77 100644
--- a/src/main/java/org/jabref/gui/util/FilteredListProxy.java
+++ b/src/main/java/org/jabref/gui/util/FilteredListProxy.java
@@ -1,19 +1,18 @@
 package org.jabref.gui.util;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.ListIterator;
-import java.util.function.Predicate;
-
 import javafx.collections.ObservableListBase;
 import javafx.collections.transformation.FilteredList;
 
 import org.jabref.gui.maintable.BibEntryTableViewModel;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.ListIterator;
+import java.util.function.Predicate;
+
 public class FilteredListProxy {
     private static final Logger LOGGER = LoggerFactory.getLogger(FilteredListProxy.class);
     private static boolean initialized = false;
@@ -39,12 +38,15 @@ public static void refilterListReflection(FilteredList<BibEntryTableViewModel> f
         }
     }
 
-    public static void refilterListReflection(FilteredList<BibEntryTableViewModel> filteredList, int sourceFrom, int sourceTo) {
+    public static void refilterListReflection(
+            FilteredList<BibEntryTableViewModel> filteredList, int sourceFrom, int sourceTo) {
         try {
             if (!initialized) {
                 initReflection();
             }
-            if (sourceFrom < 0 || sourceTo > filteredList.getSource().size() || sourceFrom > sourceTo) {
+            if (sourceFrom < 0
+                    || sourceTo > filteredList.getSource().size()
+                    || sourceFrom > sourceTo) {
                 throw new IndexOutOfBoundsException();
             }
 
@@ -52,8 +54,11 @@ public static void refilterListReflection(FilteredList<BibEntryTableViewModel> f
             ENSURE_SIZE_METHOD.invoke(filteredList, filteredList.getSource().size());
 
             @SuppressWarnings("unchecked")
-            Predicate<BibEntryTableViewModel> predicateImpl = (Predicate<BibEntryTableViewModel>) GET_PREDICATE_IMPL_METHOD.invoke(filteredList);
-            ListIterator<? extends BibEntryTableViewModel> it = filteredList.getSource().listIterator(sourceFrom);
+            Predicate<BibEntryTableViewModel> predicateImpl =
+                    (Predicate<BibEntryTableViewModel>)
+                            GET_PREDICATE_IMPL_METHOD.invoke(filteredList);
+            ListIterator<? extends BibEntryTableViewModel> it =
+                    filteredList.getSource().listIterator(sourceFrom);
 
             int[] filtered = (int[]) FILTERED_FIELD.get(filteredList);
             int size = (int) SIZE_FIELD.get(filteredList);
@@ -75,7 +80,12 @@ public static void refilterListReflection(FilteredList<BibEntryTableViewModel> f
                     size--;
                 } else if (passedNow) {
                     int insertionPoint = ~pos;
-                    System.arraycopy(filtered, insertionPoint, filtered, insertionPoint + 1, size - insertionPoint);
+                    System.arraycopy(
+                            filtered,
+                            insertionPoint,
+                            filtered,
+                            insertionPoint + 1,
+                            size - insertionPoint);
                     filtered[insertionPoint] = i;
                     NEXT_ADD_METHOD.invoke(filteredList, insertionPoint, insertionPoint + 1);
                     size++;
@@ -95,9 +105,11 @@ public static void refilterListReflection(FilteredList<BibEntryTableViewModel> f
     private static void initReflection() throws NoSuchMethodException, NoSuchFieldException {
         BEGIN_CHANGE_METHOD = ObservableListBase.class.getDeclaredMethod("beginChange");
         END_CHANGE_METHOD = ObservableListBase.class.getDeclaredMethod("endChange");
-        NEXT_ADD_METHOD = ObservableListBase.class.getDeclaredMethod("nextAdd", int.class, int.class);
+        NEXT_ADD_METHOD =
+                ObservableListBase.class.getDeclaredMethod("nextAdd", int.class, int.class);
         NEXT_UPDATE_METHOD = ObservableListBase.class.getDeclaredMethod("nextUpdate", int.class);
-        NEXT_REMOVE_METHOD = ObservableListBase.class.getDeclaredMethod("nextRemove", int.class, Object.class);
+        NEXT_REMOVE_METHOD =
+                ObservableListBase.class.getDeclaredMethod("nextRemove", int.class, Object.class);
 
         REFILTER_METHOD = FilteredList.class.getDeclaredMethod("refilter");
         ENSURE_SIZE_METHOD = FilteredList.class.getDeclaredMethod("ensureSize", int.class);
diff --git a/src/main/java/org/jabref/gui/util/IconValidationDecorator.java b/src/main/java/org/jabref/gui/util/IconValidationDecorator.java
index 2608c5c06639..c83ffaf22970 100644
--- a/src/main/java/org/jabref/gui/util/IconValidationDecorator.java
+++ b/src/main/java/org/jabref/gui/util/IconValidationDecorator.java
@@ -1,20 +1,19 @@
 package org.jabref.gui.util;
 
-import java.util.Collection;
-import java.util.Collections;
-
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tooltip;
 
-import org.jabref.gui.icon.IconTheme;
-
 import org.controlsfx.control.decoration.Decoration;
 import org.controlsfx.control.decoration.GraphicDecoration;
 import org.controlsfx.validation.Severity;
 import org.controlsfx.validation.ValidationMessage;
 import org.controlsfx.validation.decoration.GraphicValidationDecoration;
+import org.jabref.gui.icon.IconTheme;
+
+import java.util.Collection;
+import java.util.Collections;
 
 /**
  * This class is similar to {@link GraphicValidationDecoration} but with a different style and font-based icon.
@@ -43,8 +42,10 @@ protected Node createWarningNode() {
 
     @Override
     public Node createDecorationNode(ValidationMessage message) {
-        Node graphic = Severity.ERROR == message.getSeverity() ? createErrorNode() : createWarningNode();
-        graphic.getStyleClass().add(Severity.ERROR == message.getSeverity() ? "error-icon" : "warning-icon");
+        Node graphic =
+                Severity.ERROR == message.getSeverity() ? createErrorNode() : createWarningNode();
+        graphic.getStyleClass()
+                .add(Severity.ERROR == message.getSeverity() ? "error-icon" : "warning-icon");
         Label label = new Label();
         label.setGraphic(graphic);
         label.setTooltip(createTooltip(message));
@@ -55,12 +56,14 @@ public Node createDecorationNode(ValidationMessage message) {
     @Override
     protected Tooltip createTooltip(ValidationMessage message) {
         Tooltip tooltip = new Tooltip(message.getText());
-        tooltip.getStyleClass().add(Severity.ERROR == message.getSeverity() ? "tooltip-error" : "tooltip-warning");
+        tooltip.getStyleClass()
+                .add(Severity.ERROR == message.getSeverity() ? "tooltip-error" : "tooltip-warning");
         return tooltip;
     }
 
     @Override
     protected Collection<Decoration> createValidationDecorations(ValidationMessage message) {
-        return Collections.singletonList(new GraphicDecoration(createDecorationNode(message), position));
+        return Collections.singletonList(
+                new GraphicDecoration(createDecorationNode(message), position));
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/JabRefResourceLocator.java b/src/main/java/org/jabref/gui/util/JabRefResourceLocator.java
index 03d4a2bfbe17..014b4c19c35d 100644
--- a/src/main/java/org/jabref/gui/util/JabRefResourceLocator.java
+++ b/src/main/java/org/jabref/gui/util/JabRefResourceLocator.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.util;
 
-import java.util.ResourceBundle;
+import com.airhacks.afterburner.views.ResourceLocator;
 
 import org.jabref.logic.l10n.Localization;
-
-import com.airhacks.afterburner.views.ResourceLocator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ResourceBundle;
+
 public class JabRefResourceLocator implements ResourceLocator {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(JabRefResourceLocator.class);
diff --git a/src/main/java/org/jabref/gui/util/NoSelectionModel.java b/src/main/java/org/jabref/gui/util/NoSelectionModel.java
index 88cba6e413ca..12139ba9f287 100644
--- a/src/main/java/org/jabref/gui/util/NoSelectionModel.java
+++ b/src/main/java/org/jabref/gui/util/NoSelectionModel.java
@@ -20,40 +20,31 @@ public ObservableList<T> getSelectedItems() {
     }
 
     @Override
-    public void selectIndices(int index, int... indices) {
-    }
+    public void selectIndices(int index, int... indices) {}
 
     @Override
-    public void selectAll() {
-    }
+    public void selectAll() {}
 
     @Override
-    public void selectFirst() {
-    }
+    public void selectFirst() {}
 
     @Override
-    public void selectLast() {
-    }
+    public void selectLast() {}
 
     @Override
-    public void clearAndSelect(int index) {
-    }
+    public void clearAndSelect(int index) {}
 
     @Override
-    public void select(int index) {
-    }
+    public void select(int index) {}
 
     @Override
-    public void select(T obj) {
-    }
+    public void select(T obj) {}
 
     @Override
-    public void clearSelection(int index) {
-    }
+    public void clearSelection(int index) {}
 
     @Override
-    public void clearSelection() {
-    }
+    public void clearSelection() {}
 
     @Override
     public boolean isSelected(int index) {
@@ -66,10 +57,8 @@ public boolean isEmpty() {
     }
 
     @Override
-    public void selectPrevious() {
-    }
+    public void selectPrevious() {}
 
     @Override
-    public void selectNext() {
-    }
+    public void selectNext() {}
 }
diff --git a/src/main/java/org/jabref/gui/util/OnlyIntegerFormatter.java b/src/main/java/org/jabref/gui/util/OnlyIntegerFormatter.java
index 7b7293a3b735..5b134c352b21 100644
--- a/src/main/java/org/jabref/gui/util/OnlyIntegerFormatter.java
+++ b/src/main/java/org/jabref/gui/util/OnlyIntegerFormatter.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.util;
 
-import java.util.function.UnaryOperator;
-import java.util.regex.Pattern;
-
 import javafx.scene.control.TextFormatter;
 import javafx.util.converter.IntegerStringConverter;
 
+import java.util.function.UnaryOperator;
+import java.util.regex.Pattern;
+
 /**
  * Formatter that only accepts integer.
  * <p>
@@ -22,7 +22,7 @@ public OnlyIntegerFormatter(Integer defaultValue) {
     }
 
     private static class IntegerFilter implements UnaryOperator<Change> {
-        private final static Pattern DIGIT_PATTERN = Pattern.compile("\\d*");
+        private static final Pattern DIGIT_PATTERN = Pattern.compile("\\d*");
 
         @Override
         public Change apply(TextFormatter.Change aT) {
diff --git a/src/main/java/org/jabref/gui/util/OptionalObjectProperty.java b/src/main/java/org/jabref/gui/util/OptionalObjectProperty.java
index 01a50742b94f..c9695af4f28c 100644
--- a/src/main/java/org/jabref/gui/util/OptionalObjectProperty.java
+++ b/src/main/java/org/jabref/gui/util/OptionalObjectProperty.java
@@ -1,12 +1,12 @@
 package org.jabref.gui.util;
 
-import java.util.Optional;
+import com.tobiasdiez.easybind.PreboundBinding;
 
 import javafx.beans.binding.BooleanExpression;
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.SimpleObjectProperty;
 
-import com.tobiasdiez.easybind.PreboundBinding;
+import java.util.Optional;
 
 /**
  * Similar to {@link com.tobiasdiez.easybind.monadic.MonadicObservableValue}
@@ -35,11 +35,12 @@ protected T computeValue() {
     }
 
     public BooleanExpression isPresent() {
-        return BooleanExpression.booleanExpression(new PreboundBinding<>(this) {
-            @Override
-            protected Boolean computeValue() {
-                return OptionalObjectProperty.this.getValue().isPresent();
-            }
-        });
+        return BooleanExpression.booleanExpression(
+                new PreboundBinding<>(this) {
+                    @Override
+                    protected Boolean computeValue() {
+                        return OptionalObjectProperty.this.getValue().isPresent();
+                    }
+                });
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/OptionalValueTableCellFactory.java b/src/main/java/org/jabref/gui/util/OptionalValueTableCellFactory.java
index 2232561583b6..c6dc67f0c105 100644
--- a/src/main/java/org/jabref/gui/util/OptionalValueTableCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/OptionalValueTableCellFactory.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.util;
 
-import java.util.Optional;
-import java.util.function.BiFunction;
-
 import javafx.scene.Node;
 import javafx.scene.control.TableCell;
 
+import java.util.Optional;
+import java.util.function.BiFunction;
+
 /**
  * Constructs a {@link TableCell} based on an optional value of the cell and a bunch of specified converter methods.
  *
@@ -17,7 +17,8 @@ public class OptionalValueTableCellFactory<S, T> extends ValueTableCellFactory<S
     private BiFunction<S, T, Node> toGraphicIfPresent;
     private Node defaultGraphic;
 
-    public OptionalValueTableCellFactory<S, T> withGraphicIfPresent(BiFunction<S, T, Node> toGraphicIfPresent) {
+    public OptionalValueTableCellFactory<S, T> withGraphicIfPresent(
+            BiFunction<S, T, Node> toGraphicIfPresent) {
         this.toGraphicIfPresent = toGraphicIfPresent;
         setToGraphic();
         return this;
@@ -30,12 +31,13 @@ public OptionalValueTableCellFactory<S, T> withDefaultGraphic(Node defaultGraphi
     }
 
     private void setToGraphic() {
-        withGraphic((rowItem, item) -> {
-            if (item.isPresent() && toGraphicIfPresent != null) {
-                return toGraphicIfPresent.apply(rowItem, item.get());
-            } else {
-                return defaultGraphic;
-            }
-        });
+        withGraphic(
+                (rowItem, item) -> {
+                    if (item.isPresent() && toGraphicIfPresent != null) {
+                        return toGraphicIfPresent.apply(rowItem, item.get());
+                    } else {
+                        return defaultGraphic;
+                    }
+                });
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java b/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java
index 75519a2f9e44..1870afd71790 100644
--- a/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java
+++ b/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.util;
 
-import java.util.function.Predicate;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
@@ -13,7 +13,7 @@
 import javafx.scene.control.CheckBoxTreeItem;
 import javafx.util.Callback;
 
-import com.tobiasdiez.easybind.EasyBind;
+import java.util.function.Predicate;
 
 /**
  * Taken from https://gist.github.com/lestard/011e9ed4433f9eb791a8
@@ -30,15 +30,27 @@ public RecursiveTreeItem(final T value, Callback<T, ObservableList<T>> func) {
         this(value, func, null, null);
     }
 
-    public RecursiveTreeItem(final T value, Callback<T, ObservableList<T>> func, Callback<T, BooleanProperty> expandedProperty, ObservableValue<Predicate<T>> filter) {
+    public RecursiveTreeItem(
+            final T value,
+            Callback<T, ObservableList<T>> func,
+            Callback<T, BooleanProperty> expandedProperty,
+            ObservableValue<Predicate<T>> filter) {
         this(value, null, func, expandedProperty, filter);
     }
 
-    public RecursiveTreeItem(final T value, Callback<T, ObservableList<T>> func, ObservableValue<Predicate<T>> filter) {
+    public RecursiveTreeItem(
+            final T value,
+            Callback<T, ObservableList<T>> func,
+            ObservableValue<Predicate<T>> filter) {
         this(value, null, func, null, filter);
     }
 
-    private RecursiveTreeItem(final T value, Node graphic, Callback<T, ObservableList<T>> func, Callback<T, BooleanProperty> expandedProperty, ObservableValue<Predicate<T>> filter) {
+    private RecursiveTreeItem(
+            final T value,
+            Node graphic,
+            Callback<T, ObservableList<T>> func,
+            Callback<T, BooleanProperty> expandedProperty,
+            ObservableValue<Predicate<T>> filter) {
         super(value, graphic);
 
         this.childrenFactory = func;
@@ -52,12 +64,14 @@ private RecursiveTreeItem(final T value, Node graphic, Callback<T, ObservableLis
             bindExpandedProperty(value, expandedProperty);
         }
 
-        valueProperty().addListener((obs, oldValue, newValue) -> {
-            if (newValue != null) {
-                addChildrenListener(newValue);
-                bindExpandedProperty(newValue, expandedProperty);
-            }
-        });
+        valueProperty()
+                .addListener(
+                        (obs, oldValue, newValue) -> {
+                            if (newValue != null) {
+                                addChildrenListener(newValue);
+                                bindExpandedProperty(newValue, expandedProperty);
+                            }
+                        });
     }
 
     private void bindExpandedProperty(T value, Callback<T, BooleanProperty> expandedProperty) {
@@ -67,8 +81,17 @@ private void bindExpandedProperty(T value, Callback<T, BooleanProperty> expanded
     }
 
     private void addChildrenListener(T value) {
-        children = EasyBind.mapBacked(childrenFactory.call(value), child -> new RecursiveTreeItem<>(child, getGraphic(), childrenFactory, expandedProperty, filter))
-                           .filtered(Bindings.createObjectBinding(() -> this::showNode, filter));
+        children =
+                EasyBind.mapBacked(
+                                childrenFactory.call(value),
+                                child ->
+                                        new RecursiveTreeItem<>(
+                                                child,
+                                                getGraphic(),
+                                                childrenFactory,
+                                                expandedProperty,
+                                                filter))
+                        .filtered(Bindings.createObjectBinding(() -> this::showNode, filter));
 
         Bindings.bindContent(getChildren(), children);
     }
@@ -83,7 +106,8 @@ private boolean showNode(RecursiveTreeItem<T> node) {
             return true;
         }
 
-        // Are there children (or children of children...) that are matched? If yes we also need to show this node
+        // Are there children (or children of children...) that are matched? If yes we also need to
+        // show this node
         return node.children.getSource().stream().anyMatch(this::showNode);
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/StreamGobbler.java b/src/main/java/org/jabref/gui/util/StreamGobbler.java
index b2131968f87d..6ede45f2f716 100644
--- a/src/main/java/org/jabref/gui/util/StreamGobbler.java
+++ b/src/main/java/org/jabref/gui/util/StreamGobbler.java
@@ -1,14 +1,14 @@
 package org.jabref.gui.util;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.function.Consumer;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class StreamGobbler implements Runnable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(StreamGobbler.class);
diff --git a/src/main/java/org/jabref/gui/util/TextFlowLimited.java b/src/main/java/org/jabref/gui/util/TextFlowLimited.java
index 42638536c661..f05b677e7940 100644
--- a/src/main/java/org/jabref/gui/util/TextFlowLimited.java
+++ b/src/main/java/org/jabref/gui/util/TextFlowLimited.java
@@ -31,21 +31,23 @@ public TextFlowLimited(Text... texts) {
 
     private void expand() {
         double newPrefHeight = super.computePrefHeight(getWidth());
-        final Animation expandPanel = new Transition() {
-            {
-                setCycleDuration(Duration.millis(200));
-            }
+        final Animation expandPanel =
+                new Transition() {
+                    {
+                        setCycleDuration(Duration.millis(200));
+                    }
 
-            @Override
-            protected void interpolate(double fraction) {
-                setPrefHeight(newPrefHeight * fraction);
-            }
-        };
+                    @Override
+                    protected void interpolate(double fraction) {
+                        setPrefHeight(newPrefHeight * fraction);
+                    }
+                };
 
-        expandPanel.setOnFinished(event -> {
-            isCollapsed = false;
-            requestLayout();
-        });
+        expandPanel.setOnFinished(
+                event -> {
+                    isCollapsed = false;
+                    requestLayout();
+                });
         expandPanel.play();
     }
 
@@ -67,9 +69,18 @@ protected void layoutChildren() {
             if (!this.getChildren().contains(moreLink)) {
                 this.getChildren().add(moreLink);
             }
-            layoutInArea(moreLink, 0, 0, getWidth(), getHeight(), getBaselineOffset(), HPos.RIGHT, VPos.BOTTOM);
+            layoutInArea(
+                    moreLink,
+                    0,
+                    0,
+                    getWidth(),
+                    getHeight(),
+                    getBaselineOffset(),
+                    HPos.RIGHT,
+                    VPos.BOTTOM);
 
-            // Clip content if it expands above pref height (no idea why this is needed, but otherwise sometimes the text is still visible)
+            // Clip content if it expands above pref height (no idea why this is needed, but
+            // otherwise sometimes the text is still visible)
             clip.setHeight(computePrefHeight(this.getWidth()));
             clip.setWidth(this.getWidth());
             this.setClip(clip);
diff --git a/src/main/java/org/jabref/gui/util/TooltipTextUtil.java b/src/main/java/org/jabref/gui/util/TooltipTextUtil.java
index 347c62bd8361..0e7c78de1998 100644
--- a/src/main/java/org/jabref/gui/util/TooltipTextUtil.java
+++ b/src/main/java/org/jabref/gui/util/TooltipTextUtil.java
@@ -1,27 +1,31 @@
 package org.jabref.gui.util;
 
+import javafx.scene.text.Text;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javafx.scene.text.Text;
-
 /**
  * Utility class with static methods for javafx {@link Text} objects
  */
 public class TooltipTextUtil {
 
     // (?s) tells Java that "." also matches the newline character
-    // (?<...>...) are named groups in Java regular expressions: https://stackoverflow.com/a/415635/873282
+    // (?<...>...) are named groups in Java regular expressions:
+    // https://stackoverflow.com/a/415635/873282
     // .*? tells to match non-greedy (see https://stackoverflow.com/q/7124778/873282 for details)
     private static final Pattern TT_TEXT = Pattern.compile("(?s)(?<before>.*?)<tt>(?<in>.*?)</tt>");
 
     private static final Pattern B_TEXT = Pattern.compile("(?s)(?<before>.*?)<b>(?<in>.*?)</b>");
 
     public enum TextType {
-        NORMAL, BOLD, ITALIC, MONOSPACED
+        NORMAL,
+        BOLD,
+        ITALIC,
+        MONOSPACED
     }
 
     public static Text createText(String textString, TextType textType) {
@@ -108,7 +112,10 @@ public static List<Text> formatToTexts(String original, TextReplacement... repla
     }
 
     private static void splitReplace(List<Text> textList, TextReplacement replacement) {
-        Optional<Text> textContainingReplacement = textList.stream().filter(it -> it.getText().contains(replacement.toReplace)).findFirst();
+        Optional<Text> textContainingReplacement =
+                textList.stream()
+                        .filter(it -> it.getText().contains(replacement.toReplace))
+                        .findFirst();
         if (textContainingReplacement.isPresent()) {
             int index = textList.indexOf(textContainingReplacement.get());
             String original = textContainingReplacement.get().getText();
@@ -116,23 +123,46 @@ private static void splitReplace(List<Text> textList, TextReplacement replacemen
             String[] textParts = original.split(replacement.toReplace);
             if (textParts.length == 2) {
                 if ("".equals(textParts[0])) {
-                    textList.add(index, TooltipTextUtil.createText(replacement.replacement, replacement.textType));
-                    textList.add(index + 1, TooltipTextUtil.createText(textParts[1], TooltipTextUtil.TextType.NORMAL));
+                    textList.add(
+                            index,
+                            TooltipTextUtil.createText(
+                                    replacement.replacement, replacement.textType));
+                    textList.add(
+                            index + 1,
+                            TooltipTextUtil.createText(
+                                    textParts[1], TooltipTextUtil.TextType.NORMAL));
                 } else {
-                    textList.add(index, TooltipTextUtil.createText(textParts[0], TooltipTextUtil.TextType.NORMAL));
-                    textList.add(index + 1, TooltipTextUtil.createText(replacement.replacement, replacement.textType));
-                    textList.add(index + 2, TooltipTextUtil.createText(textParts[1], TooltipTextUtil.TextType.NORMAL));
+                    textList.add(
+                            index,
+                            TooltipTextUtil.createText(
+                                    textParts[0], TooltipTextUtil.TextType.NORMAL));
+                    textList.add(
+                            index + 1,
+                            TooltipTextUtil.createText(
+                                    replacement.replacement, replacement.textType));
+                    textList.add(
+                            index + 2,
+                            TooltipTextUtil.createText(
+                                    textParts[1], TooltipTextUtil.TextType.NORMAL));
                 }
             } else if (textParts.length == 1) {
-                textList.add(index, TooltipTextUtil.createText(textParts[0], TooltipTextUtil.TextType.NORMAL));
-                textList.add(index + 1, TooltipTextUtil.createText(replacement.replacement, replacement.textType));
+                textList.add(
+                        index,
+                        TooltipTextUtil.createText(textParts[0], TooltipTextUtil.TextType.NORMAL));
+                textList.add(
+                        index + 1,
+                        TooltipTextUtil.createText(replacement.replacement, replacement.textType));
             } else {
-                throw new IllegalStateException("It is not allowed that the toReplace string: '" + replacement.toReplace
-                        + "' exists multiple times in the original string");
+                throw new IllegalStateException(
+                        "It is not allowed that the toReplace string: '"
+                                + replacement.toReplace
+                                + "' exists multiple times in the original string");
             }
         } else {
-            throw new IllegalStateException("It is not allowed that the toReplace string: '" + replacement.toReplace
-                    + "' does not exist in the original string");
+            throw new IllegalStateException(
+                    "It is not allowed that the toReplace string: '"
+                            + replacement.toReplace
+                            + "' does not exist in the original string");
         }
     }
 
@@ -141,7 +171,8 @@ public static class TextReplacement {
         private final String replacement;
         private final TooltipTextUtil.TextType textType;
 
-        public TextReplacement(String toReplace, String replacement, TooltipTextUtil.TextType textType) {
+        public TextReplacement(
+                String toReplace, String replacement, TooltipTextUtil.TextType textType) {
             this.toReplace = toReplace;
             this.replacement = replacement;
             this.textType = textType;
diff --git a/src/main/java/org/jabref/gui/util/UiTaskExecutor.java b/src/main/java/org/jabref/gui/util/UiTaskExecutor.java
index c346cb81ddd6..5a91c36ff3b3 100644
--- a/src/main/java/org/jabref/gui/util/UiTaskExecutor.java
+++ b/src/main/java/org/jabref/gui/util/UiTaskExecutor.java
@@ -1,5 +1,18 @@
 package org.jabref.gui.util;
 
+import com.airhacks.afterburner.injection.Injector;
+
+import javafx.application.Platform;
+import javafx.concurrent.Task;
+
+import org.jabref.gui.StateManager;
+import org.jabref.logic.util.BackgroundTask;
+import org.jabref.logic.util.DelayTaskThrottler;
+import org.jabref.logic.util.HeadlessExecutorService;
+import org.jabref.logic.util.TaskExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.Objects;
 import java.util.WeakHashMap;
 import java.util.concurrent.Callable;
@@ -13,19 +26,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
-import javafx.application.Platform;
-import javafx.concurrent.Task;
-
-import org.jabref.gui.StateManager;
-import org.jabref.logic.util.BackgroundTask;
-import org.jabref.logic.util.DelayTaskThrottler;
-import org.jabref.logic.util.HeadlessExecutorService;
-import org.jabref.logic.util.TaskExecutor;
-
-import com.airhacks.afterburner.injection.Injector;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * A very simple implementation of the {@link TaskExecutor} interface.
  * Every submitted task is invoked in a separate thread.
@@ -79,13 +79,14 @@ public static void runAndWaitInJavaFXThread(Runnable action) {
 
         // Queue on JavaFX thread and wait for completion
         final CountDownLatch doneLatch = new CountDownLatch(1);
-        Platform.runLater(() -> {
-            try {
-                action.run();
-            } finally {
-                doneLatch.countDown();
-            }
-        });
+        Platform.runLater(
+                () -> {
+                    try {
+                        action.run();
+                    } finally {
+                        doneLatch.countDown();
+                    }
+                });
 
         try {
             doneLatch.await();
@@ -112,15 +113,18 @@ public <V> Future<V> execute(BackgroundTask<V> task) {
         Task<V> javafxTask = getJavaFXTask(task);
 
         StateManager stateManager = Injector.instantiateModelOrService(StateManager.class);
-        task.showToUserProperty().subscribe(showToUser -> {
-            if (showToUser) {
-                if (stateManager != null) {
-                    runInJavaFXThread(() -> stateManager.addBackgroundTask(task, javafxTask));
-                } else {
-                    LOGGER.info("Background task visible without GUI");
-                }
-            }
-        });
+        task.showToUserProperty()
+                .subscribe(
+                        showToUser -> {
+                            if (showToUser) {
+                                if (stateManager != null) {
+                                    runInJavaFXThread(
+                                            () -> stateManager.addBackgroundTask(task, javafxTask));
+                                } else {
+                                    LOGGER.info("Background task visible without GUI");
+                                }
+                            }
+                        });
         return execute(javafxTask);
     }
 
@@ -148,7 +152,9 @@ public <V> Future<?> schedule(BackgroundTask<V> task, long delay, TimeUnit unit)
     public void shutdown() {
         StateManager stateManager = Injector.instantiateModelOrService(StateManager.class);
         if (stateManager != null) {
-            stateManager.getBackgroundTasks().stream().filter(task -> !task.isDone()).forEach(Task::cancel);
+            stateManager.getBackgroundTasks().stream()
+                    .filter(task -> !task.isDone())
+                    .forEach(Task::cancel);
         }
         executor.shutdownNow();
         scheduledExecutor.shutdownNow();
@@ -170,43 +176,51 @@ public DelayTaskThrottler createThrottler(int delay) {
      * @return a new Javafx Task object
      */
     public static <V> Task<V> getJavaFXTask(BackgroundTask<V> task) {
-        Task<V> javaTask = new Task<>() {
-            {
-                this.updateMessage(task.messageProperty().get());
-                this.updateTitle(task.titleProperty().get());
-                BindingsHelper.subscribeFuture(task.progressProperty(), progress -> updateProgress(progress.workDone(), progress.max()));
-                BindingsHelper.subscribeFuture(task.messageProperty(), this::updateMessage);
-                BindingsHelper.subscribeFuture(task.titleProperty(), this::updateTitle);
-                BindingsHelper.subscribeFuture(task.isCancelledProperty(), cancelled -> {
-                    if (cancelled) {
-                        cancel();
+        Task<V> javaTask =
+                new Task<>() {
+                    {
+                        this.updateMessage(task.messageProperty().get());
+                        this.updateTitle(task.titleProperty().get());
+                        BindingsHelper.subscribeFuture(
+                                task.progressProperty(),
+                                progress -> updateProgress(progress.workDone(), progress.max()));
+                        BindingsHelper.subscribeFuture(task.messageProperty(), this::updateMessage);
+                        BindingsHelper.subscribeFuture(task.titleProperty(), this::updateTitle);
+                        BindingsHelper.subscribeFuture(
+                                task.isCancelledProperty(),
+                                cancelled -> {
+                                    if (cancelled) {
+                                        cancel();
+                                    }
+                                });
+                        setOnCancelled(event -> task.cancel());
                     }
-                });
-                setOnCancelled(event -> task.cancel());
-            }
 
-            @Override
-            protected V call() throws Exception {
-                // this requires that background task call is public as it's in another package
-                return task.call();
-            }
-        };
+                    @Override
+                    protected V call() throws Exception {
+                        // this requires that background task call is public as it's in another
+                        // package
+                        return task.call();
+                    }
+                };
         Runnable onRunning = task.getOnRunning();
         if (onRunning != null) {
             javaTask.setOnRunning(event -> onRunning.run());
         }
         Consumer<V> onSuccess = task.getOnSuccess();
-        javaTask.setOnSucceeded(event -> {
-            // Set to 100% completed on completion
-            task.updateProgress(1, 1);
+        javaTask.setOnSucceeded(
+                event -> {
+                    // Set to 100% completed on completion
+                    task.updateProgress(1, 1);
 
-            if (onSuccess != null) {
-                onSuccess.accept(javaTask.getValue());
-            }
-        });
+                    if (onSuccess != null) {
+                        onSuccess.accept(javaTask.getValue());
+                    }
+                });
         Consumer<Exception> onException = task.getOnException();
         if (onException != null) {
-            javaTask.setOnFailed(event -> onException.accept(convertToException(javaTask.getException())));
+            javaTask.setOnFailed(
+                    event -> onException.accept(convertToException(javaTask.getException())));
         }
         return javaTask;
     }
diff --git a/src/main/java/org/jabref/gui/util/UiThreadList.java b/src/main/java/org/jabref/gui/util/UiThreadList.java
index 1e2f582a578b..4917ddcf0d54 100644
--- a/src/main/java/org/jabref/gui/util/UiThreadList.java
+++ b/src/main/java/org/jabref/gui/util/UiThreadList.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.util;
 
-import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Platform;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
@@ -10,6 +8,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.concurrent.CountDownLatch;
+
 class UiThreadList<T> extends TransformationList<T, T> {
     private static final Logger LOGGER = LoggerFactory.getLogger(UiThreadList.class);
 
@@ -23,10 +23,11 @@ protected void sourceChanged(ListChangeListener.Change<? extends T> change) {
             fireChange(change);
         } else {
             CountDownLatch latch = new CountDownLatch(1);
-            Platform.runLater(() -> {
-                fireChange(change);
-                latch.countDown();
-            });
+            Platform.runLater(
+                    () -> {
+                        fireChange(change);
+                        latch.countDown();
+                    });
 
             try {
                 latch.await();
diff --git a/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java b/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
index 62816f940e3f..d4364e879a3e 100644
--- a/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
@@ -1,8 +1,5 @@
 package org.jabref.gui.util;
 
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
 import javafx.beans.binding.BooleanExpression;
 import javafx.event.EventHandler;
 import javafx.scene.Node;
@@ -17,6 +14,9 @@
 
 import org.jabref.model.strings.StringUtil;
 
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
 /**
  * Constructs a {@link TableCell} based on the value of the cell and a bunch of specified converter methods.
  *
@@ -66,27 +66,32 @@ public ValueTableCellFactory<S, T> withTooltip(Function<T, String> toTooltip) {
         return this;
     }
 
-    public ValueTableCellFactory<S, T> withOnMouseClickedEvent(BiFunction<S, T, EventHandler<? super MouseEvent>> toOnMouseClickedEvent) {
+    public ValueTableCellFactory<S, T> withOnMouseClickedEvent(
+            BiFunction<S, T, EventHandler<? super MouseEvent>> toOnMouseClickedEvent) {
         this.toOnMouseClickedEvent = toOnMouseClickedEvent;
         return this;
     }
 
-    public ValueTableCellFactory<S, T> withOnMouseClickedEvent(Function<T, EventHandler<? super MouseEvent>> toOnMouseClickedEvent) {
+    public ValueTableCellFactory<S, T> withOnMouseClickedEvent(
+            Function<T, EventHandler<? super MouseEvent>> toOnMouseClickedEvent) {
         this.toOnMouseClickedEvent = (rowItem, value) -> toOnMouseClickedEvent.apply(value);
         return this;
     }
 
-    public ValueTableCellFactory<S, T> withDisableExpression(Function<T, BooleanExpression> toDisableBinding) {
+    public ValueTableCellFactory<S, T> withDisableExpression(
+            Function<T, BooleanExpression> toDisableBinding) {
         this.toDisableExpression = toDisableBinding;
         return this;
     }
 
-    public ValueTableCellFactory<S, T> withVisibleExpression(Function<T, BooleanExpression> toVisibleBinding) {
+    public ValueTableCellFactory<S, T> withVisibleExpression(
+            Function<T, BooleanExpression> toVisibleBinding) {
         this.toVisibleExpression = toVisibleBinding;
         return this;
     }
 
-    public ValueTableCellFactory<S, T> withContextMenu(Function<T, ContextMenu> contextMenuFactory) {
+    public ValueTableCellFactory<S, T> withContextMenu(
+            Function<T, ContextMenu> contextMenuFactory) {
         this.contextMenuFactory = contextMenuFactory;
         return this;
     }
@@ -103,7 +108,10 @@ public TableCell<S, T> call(TableColumn<S, T> param) {
             protected void updateItem(T item, boolean empty) {
                 super.updateItem(item, empty);
 
-                if (empty || (item == null) || (getTableRow() == null) || (getTableRow().getItem() == null)) {
+                if (empty
+                        || (item == null)
+                        || (getTableRow() == null)
+                        || (getTableRow().getItem() == null)) {
                     setText(null);
                     setGraphic(null);
                     setOnMouseClicked(null);
@@ -131,36 +139,40 @@ protected void updateItem(T item, boolean empty) {
 
                     if (contextMenuFactory != null) {
                         // We only create the context menu when really necessary
-                        setOnContextMenuRequested(event -> {
-                            if (!isEmpty()) {
-                                setContextMenu(contextMenuFactory.apply(item));
-                                getContextMenu().show(this, event.getScreenX(), event.getScreenY());
-                            }
-                            event.consume();
-                        });
+                        setOnContextMenuRequested(
+                                event -> {
+                                    if (!isEmpty()) {
+                                        setContextMenu(contextMenuFactory.apply(item));
+                                        getContextMenu()
+                                                .show(this, event.getScreenX(), event.getScreenY());
+                                    }
+                                    event.consume();
+                                });
                     }
 
-                    setOnMouseEntered(event -> {
-                        if (tooltip != null) {
-                            setTooltip(tooltip.apply(rowItem, item));
-                        }
-                    });
+                    setOnMouseEntered(
+                            event -> {
+                                if (tooltip != null) {
+                                    setTooltip(tooltip.apply(rowItem, item));
+                                }
+                            });
 
-                    setOnMouseClicked(event -> {
-                        if (toOnMouseClickedEvent != null) {
-                            toOnMouseClickedEvent.apply(rowItem, item).handle(event);
-                        }
+                    setOnMouseClicked(
+                            event -> {
+                                if (toOnMouseClickedEvent != null) {
+                                    toOnMouseClickedEvent.apply(rowItem, item).handle(event);
+                                }
 
-                        if ((menuFactory != null) && !event.isConsumed()) {
-                            if (event.getButton() == MouseButton.PRIMARY) {
-                                ContextMenu menu = menuFactory.apply(rowItem, item);
-                                if (menu != null) {
-                                    menu.show(this, event.getScreenX(), event.getScreenY());
-                                    event.consume();
+                                if ((menuFactory != null) && !event.isConsumed()) {
+                                    if (event.getButton() == MouseButton.PRIMARY) {
+                                        ContextMenu menu = menuFactory.apply(rowItem, item);
+                                        if (menu != null) {
+                                            menu.show(this, event.getScreenX(), event.getScreenY());
+                                            event.consume();
+                                        }
+                                    }
                                 }
-                            }
-                        }
-                    });
+                            });
 
                     if (toDisableExpression != null) {
                         disableProperty().bind(toDisableExpression.apply(item));
diff --git a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
index 41e0727583f3..66dba8795cd2 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
@@ -1,10 +1,8 @@
 package org.jabref.gui.util;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiConsumer;
+import com.tobiasdiez.easybind.Subscription;
+
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
 
 import javafx.beans.value.ObservableValue;
 import javafx.css.PseudoClass;
@@ -22,8 +20,11 @@
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.model.strings.StringUtil;
 
-import com.tobiasdiez.easybind.Subscription;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
 
 /**
  * Constructs a {@link ListCell} based on the view model of the row and a bunch of specified converter methods.
@@ -45,7 +46,8 @@ public class ViewModelListCellFactory<T> implements Callback<ListView<T>, ListCe
     private BiConsumer<T, ? super DragEvent> toOnDragEntered;
     private BiConsumer<T, ? super DragEvent> toOnDragExited;
     private BiConsumer<T, ? super DragEvent> toOnDragOver;
-    private final Map<PseudoClass, Callback<T, ObservableValue<Boolean>>> pseudoClasses = new HashMap<>();
+    private final Map<PseudoClass, Callback<T, ObservableValue<Boolean>>> pseudoClasses =
+            new HashMap<>();
     private Callback<T, ValidationStatus> validationStatusProperty;
 
     public ViewModelListCellFactory<T> withText(Callback<T, String> toText) {
@@ -59,29 +61,34 @@ public ViewModelListCellFactory<T> withGraphic(Callback<T, Node> toGraphic) {
     }
 
     public ViewModelListCellFactory<T> withIcon(Callback<T, JabRefIcon> toIcon) {
-        this.toGraphic = viewModel -> {
-            JabRefIcon icon = toIcon.call(viewModel);
-            if (icon != null) {
-                return icon.getGraphicNode();
-            }
-            return null;
-        };
+        this.toGraphic =
+                viewModel -> {
+                    JabRefIcon icon = toIcon.call(viewModel);
+                    if (icon != null) {
+                        return icon.getGraphicNode();
+                    }
+                    return null;
+                };
         return this;
     }
 
-    public ViewModelListCellFactory<T> withIcon(Callback<T, JabRefIcon> toIcon, Callback<T, Color> toColor) {
-        this.toGraphic = viewModel -> toIcon.call(viewModel).withColor(toColor.call(viewModel)).getGraphicNode();
+    public ViewModelListCellFactory<T> withIcon(
+            Callback<T, JabRefIcon> toIcon, Callback<T, Color> toColor) {
+        this.toGraphic =
+                viewModel ->
+                        toIcon.call(viewModel).withColor(toColor.call(viewModel)).getGraphicNode();
         return this;
     }
 
     public ViewModelListCellFactory<T> withStringTooltip(Callback<T, String> toStringTooltip) {
-        this.toTooltip = viewModel -> {
-            String tooltipText = toStringTooltip.call(viewModel);
-            if (StringUtil.isNotBlank(tooltipText)) {
-                return new Tooltip(tooltipText);
-            }
-            return null;
-        };
+        this.toTooltip =
+                viewModel -> {
+                    String tooltipText = toStringTooltip.call(viewModel);
+                    if (StringUtil.isNotBlank(tooltipText)) {
+                        return new Tooltip(tooltipText);
+                    }
+                    return null;
+                };
         return this;
     }
 
@@ -100,42 +107,50 @@ public ViewModelListCellFactory<T> withStyleClass(Callback<T, String> toStyleCla
         return this;
     }
 
-    public ViewModelListCellFactory<T> withOnMouseClickedEvent(BiConsumer<T, ? super MouseEvent> toOnMouseClickedEvent) {
+    public ViewModelListCellFactory<T> withOnMouseClickedEvent(
+            BiConsumer<T, ? super MouseEvent> toOnMouseClickedEvent) {
         this.toOnMouseClickedEvent = toOnMouseClickedEvent;
         return this;
     }
 
-    public ViewModelListCellFactory<T> setOnDragDetected(BiConsumer<T, ? super MouseEvent> toOnDragDetected) {
+    public ViewModelListCellFactory<T> setOnDragDetected(
+            BiConsumer<T, ? super MouseEvent> toOnDragDetected) {
         this.toOnDragDetected = toOnDragDetected;
         return this;
     }
 
-    public ViewModelListCellFactory<T> setOnDragDropped(BiConsumer<T, ? super DragEvent> toOnDragDropped) {
+    public ViewModelListCellFactory<T> setOnDragDropped(
+            BiConsumer<T, ? super DragEvent> toOnDragDropped) {
         this.toOnDragDropped = toOnDragDropped;
         return this;
     }
 
-    public ViewModelListCellFactory<T> setOnDragEntered(BiConsumer<T, ? super DragEvent> toOnDragEntered) {
+    public ViewModelListCellFactory<T> setOnDragEntered(
+            BiConsumer<T, ? super DragEvent> toOnDragEntered) {
         this.toOnDragEntered = toOnDragEntered;
         return this;
     }
 
-    public ViewModelListCellFactory<T> setOnDragExited(BiConsumer<T, ? super DragEvent> toOnDragExited) {
+    public ViewModelListCellFactory<T> setOnDragExited(
+            BiConsumer<T, ? super DragEvent> toOnDragExited) {
         this.toOnDragExited = toOnDragExited;
         return this;
     }
 
-    public ViewModelListCellFactory<T> setOnDragOver(BiConsumer<T, ? super DragEvent> toOnDragOver) {
+    public ViewModelListCellFactory<T> setOnDragOver(
+            BiConsumer<T, ? super DragEvent> toOnDragOver) {
         this.toOnDragOver = toOnDragOver;
         return this;
     }
 
-    public ViewModelListCellFactory<T> withPseudoClass(PseudoClass pseudoClass, Callback<T, ObservableValue<Boolean>> toCondition) {
+    public ViewModelListCellFactory<T> withPseudoClass(
+            PseudoClass pseudoClass, Callback<T, ObservableValue<Boolean>> toCondition) {
         this.pseudoClasses.putIfAbsent(pseudoClass, toCondition);
         return this;
     }
 
-    public ViewModelListCellFactory<T> withValidation(Callback<T, ValidationStatus> validationStatusProperty) {
+    public ViewModelListCellFactory<T> withValidation(
+            Callback<T, ValidationStatus> validationStatusProperty) {
         this.validationStatusProperty = validationStatusProperty;
         return this;
     }
@@ -203,22 +218,29 @@ protected void updateItem(T item, boolean empty) {
                     if (toOnDragOver != null) {
                         setOnDragOver(event -> toOnDragOver.accept(viewModel, event));
                     }
-                    for (Map.Entry<PseudoClass, Callback<T, ObservableValue<Boolean>>> pseudoClassWithCondition : pseudoClasses.entrySet()) {
-                        ObservableValue<Boolean> condition = pseudoClassWithCondition.getValue().call(viewModel);
-                        subscriptions.add(BindingsHelper.includePseudoClassWhen(
-                                this,
-                                pseudoClassWithCondition.getKey(),
-                                condition));
+                    for (Map.Entry<PseudoClass, Callback<T, ObservableValue<Boolean>>>
+                            pseudoClassWithCondition : pseudoClasses.entrySet()) {
+                        ObservableValue<Boolean> condition =
+                                pseudoClassWithCondition.getValue().call(viewModel);
+                        subscriptions.add(
+                                BindingsHelper.includePseudoClassWhen(
+                                        this, pseudoClassWithCondition.getKey(), condition));
                     }
                     if (validationStatusProperty != null) {
-                        validationStatusProperty.call(viewModel)
-                                                .getHighestMessage()
-                                                .ifPresent(message -> setTooltip(new Tooltip(message.getMessage())));
-
-                        subscriptions.add(BindingsHelper.includePseudoClassWhen(
-                                this,
-                                INVALID_PSEUDO_CLASS,
-                                validationStatusProperty.call(viewModel).validProperty().not()));
+                        validationStatusProperty
+                                .call(viewModel)
+                                .getHighestMessage()
+                                .ifPresent(
+                                        message -> setTooltip(new Tooltip(message.getMessage())));
+
+                        subscriptions.add(
+                                BindingsHelper.includePseudoClassWhen(
+                                        this,
+                                        INVALID_PSEUDO_CLASS,
+                                        validationStatusProperty
+                                                .call(viewModel)
+                                                .validProperty()
+                                                .not()));
                     }
                 }
             }
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTableRowFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTableRowFactory.java
index da698c6111d6..4c8d90c42119 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTableRowFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTableRowFactory.java
@@ -1,10 +1,5 @@
 package org.jabref.gui.util;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.function.Function;
-
 import javafx.beans.value.ObservableValue;
 import javafx.css.PseudoClass;
 import javafx.geometry.Bounds;
@@ -22,9 +17,13 @@
 import javafx.util.Callback;
 
 import org.jabref.model.strings.StringUtil;
-
 import org.reactfx.util.TriConsumer;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
 /**
  * Constructs a {@link TreeTableCell} based on the view model of the row and a bunch of specified converter methods.
  *
@@ -41,66 +40,83 @@ public class ViewModelTableRowFactory<S> implements Callback<TableView<S>, Table
     private TriConsumer<TableRow<S>, S, ? super DragEvent> toOnDragOver;
     private TriConsumer<TableRow<S>, S, ? super MouseDragEvent> toOnMouseDragEntered;
     private Callback<S, String> toTooltip;
-    private final Map<PseudoClass, Callback<S, ObservableValue<Boolean>>> pseudoClasses = new HashMap<>();
+    private final Map<PseudoClass, Callback<S, ObservableValue<Boolean>>> pseudoClasses =
+            new HashMap<>();
 
-    public ViewModelTableRowFactory<S> withOnMouseClickedEvent(BiConsumer<S, ? super MouseEvent> onMouseClickedEvent) {
+    public ViewModelTableRowFactory<S> withOnMouseClickedEvent(
+            BiConsumer<S, ? super MouseEvent> onMouseClickedEvent) {
         this.onMouseClickedEvent = onMouseClickedEvent;
         return this;
     }
 
-    public ViewModelTableRowFactory<S> withContextMenu(Function<S, ContextMenu> contextMenuFactory) {
+    public ViewModelTableRowFactory<S> withContextMenu(
+            Function<S, ContextMenu> contextMenuFactory) {
         this.contextMenuFactory = contextMenuFactory;
         return this;
     }
 
-    public ViewModelTableRowFactory<S> setOnDragDetected(TriConsumer<TableRow<S>, S, ? super MouseEvent> toOnDragDetected) {
+    public ViewModelTableRowFactory<S> setOnDragDetected(
+            TriConsumer<TableRow<S>, S, ? super MouseEvent> toOnDragDetected) {
         this.toOnDragDetected = toOnDragDetected;
         return this;
     }
 
-    public ViewModelTableRowFactory<S> setOnDragDetected(BiConsumer<S, ? super MouseEvent> toOnDragDetected) {
-        this.toOnDragDetected = (row, viewModel, event) -> toOnDragDetected.accept(viewModel, event);
+    public ViewModelTableRowFactory<S> setOnDragDetected(
+            BiConsumer<S, ? super MouseEvent> toOnDragDetected) {
+        this.toOnDragDetected =
+                (row, viewModel, event) -> toOnDragDetected.accept(viewModel, event);
         return this;
     }
 
-    public ViewModelTableRowFactory<S> setOnDragDropped(TriConsumer<TableRow<S>, S, ? super DragEvent> toOnDragDropped) {
+    public ViewModelTableRowFactory<S> setOnDragDropped(
+            TriConsumer<TableRow<S>, S, ? super DragEvent> toOnDragDropped) {
         this.toOnDragDropped = toOnDragDropped;
         return this;
     }
 
-    public ViewModelTableRowFactory<S> setOnDragDropped(BiConsumer<S, ? super DragEvent> toOnDragDropped) {
-        return setOnDragDropped((row, viewModel, event) -> toOnDragDropped.accept(viewModel, event));
+    public ViewModelTableRowFactory<S> setOnDragDropped(
+            BiConsumer<S, ? super DragEvent> toOnDragDropped) {
+        return setOnDragDropped(
+                (row, viewModel, event) -> toOnDragDropped.accept(viewModel, event));
     }
 
-    public ViewModelTableRowFactory<S> setOnDragEntered(BiConsumer<S, ? super DragEvent> toOnDragEntered) {
+    public ViewModelTableRowFactory<S> setOnDragEntered(
+            BiConsumer<S, ? super DragEvent> toOnDragEntered) {
         this.toOnDragEntered = toOnDragEntered;
         return this;
     }
 
-    public ViewModelTableRowFactory<S> setOnMouseDragEntered(TriConsumer<TableRow<S>, S, ? super MouseDragEvent> toOnDragEntered) {
+    public ViewModelTableRowFactory<S> setOnMouseDragEntered(
+            TriConsumer<TableRow<S>, S, ? super MouseDragEvent> toOnDragEntered) {
         this.toOnMouseDragEntered = toOnDragEntered;
         return this;
     }
 
-    public ViewModelTableRowFactory<S> setOnMouseDragEntered(BiConsumer<S, ? super MouseDragEvent> toOnDragEntered) {
-        return setOnMouseDragEntered((row, viewModel, event) -> toOnDragEntered.accept(viewModel, event));
+    public ViewModelTableRowFactory<S> setOnMouseDragEntered(
+            BiConsumer<S, ? super MouseDragEvent> toOnDragEntered) {
+        return setOnMouseDragEntered(
+                (row, viewModel, event) -> toOnDragEntered.accept(viewModel, event));
     }
 
-    public ViewModelTableRowFactory<S> setOnDragExited(TriConsumer<TableRow<S>, S, ? super DragEvent> toOnDragExited) {
+    public ViewModelTableRowFactory<S> setOnDragExited(
+            TriConsumer<TableRow<S>, S, ? super DragEvent> toOnDragExited) {
         this.toOnDragExited = toOnDragExited;
         return this;
     }
 
-    public ViewModelTableRowFactory<S> setOnDragExited(BiConsumer<S, ? super DragEvent> toOnDragExited) {
+    public ViewModelTableRowFactory<S> setOnDragExited(
+            BiConsumer<S, ? super DragEvent> toOnDragExited) {
         return setOnDragExited((row, viewModel, event) -> toOnDragExited.accept(viewModel, event));
     }
 
-    public ViewModelTableRowFactory<S> setOnDragOver(TriConsumer<TableRow<S>, S, ? super DragEvent> toOnDragOver) {
+    public ViewModelTableRowFactory<S> setOnDragOver(
+            TriConsumer<TableRow<S>, S, ? super DragEvent> toOnDragOver) {
         this.toOnDragOver = toOnDragOver;
         return this;
     }
 
-    public ViewModelTableRowFactory<S> setOnDragOver(BiConsumer<S, ? super DragEvent> toOnDragOver) {
+    public ViewModelTableRowFactory<S> setOnDragOver(
+            BiConsumer<S, ? super DragEvent> toOnDragOver) {
         return setOnDragOver((row, viewModel, event) -> toOnDragOver.accept(viewModel, event));
     }
 
@@ -109,26 +125,33 @@ public ViewModelTableRowFactory<S> withTooltip(Callback<S, String> toTooltip) {
         return this;
     }
 
-    public ViewModelTableRowFactory<S> withPseudoClass(PseudoClass pseudoClass, Callback<S, ObservableValue<Boolean>> toCondition) {
+    public ViewModelTableRowFactory<S> withPseudoClass(
+            PseudoClass pseudoClass, Callback<S, ObservableValue<Boolean>> toCondition) {
         this.pseudoClasses.putIfAbsent(pseudoClass, toCondition);
         return this;
     }
 
     @Override
     public TableRow<S> call(TableView<S> tableView) {
-        TableRow<S> row = new TableRow<>() {
-            @Override
-            protected void updateItem(S item, boolean empty) {
-                super.updateItem(item, empty);
-
-                if (empty || getItem() == null) {
-                    pseudoClasses.forEach((pseudoClass, toCondition) -> pseudoClassStateChanged(pseudoClass, false));
-                } else {
-                    pseudoClasses.forEach((pseudoClass, toCondition) ->
-                            pseudoClassStateChanged(pseudoClass, toCondition.call(getItem()).getValue()));
-                }
-            }
-        };
+        TableRow<S> row =
+                new TableRow<>() {
+                    @Override
+                    protected void updateItem(S item, boolean empty) {
+                        super.updateItem(item, empty);
+
+                        if (empty || getItem() == null) {
+                            pseudoClasses.forEach(
+                                    (pseudoClass, toCondition) ->
+                                            pseudoClassStateChanged(pseudoClass, false));
+                        } else {
+                            pseudoClasses.forEach(
+                                    (pseudoClass, toCondition) ->
+                                            pseudoClassStateChanged(
+                                                    pseudoClass,
+                                                    toCondition.call(getItem()).getValue()));
+                        }
+                    }
+                };
 
         if (toTooltip != null) {
             String tooltipText = toTooltip.call(row.getItem());
@@ -138,83 +161,97 @@ protected void updateItem(S item, boolean empty) {
         }
 
         if (onMouseClickedEvent != null) {
-            row.setOnMouseClicked(event -> {
-                if (!row.isEmpty()) {
-                    onMouseClickedEvent.accept(row.getItem(), event);
-                }
-            });
+            row.setOnMouseClicked(
+                    event -> {
+                        if (!row.isEmpty()) {
+                            onMouseClickedEvent.accept(row.getItem(), event);
+                        }
+                    });
         }
 
         if (contextMenuFactory != null) {
             // We only create the context menu when really necessary
-            row.setOnContextMenuRequested(event -> {
-                if (!row.isEmpty()) {
-                    row.setContextMenu(contextMenuFactory.apply(row.getItem()));
-                    row.getContextMenu().show(row, event.getScreenX(), event.getScreenY());
-                }
-                event.consume();
-            });
+            row.setOnContextMenuRequested(
+                    event -> {
+                        if (!row.isEmpty()) {
+                            row.setContextMenu(contextMenuFactory.apply(row.getItem()));
+                            row.getContextMenu().show(row, event.getScreenX(), event.getScreenY());
+                        }
+                        event.consume();
+                    });
 
             // Activate context menu if user presses the "context menu" key
-            tableView.addEventHandler(KeyEvent.KEY_RELEASED, event -> {
-                boolean rowFocused = !row.isEmpty() && tableView.getFocusModel().getFocusedIndex() == row.getIndex();
-                if (event.getCode() == KeyCode.CONTEXT_MENU && rowFocused) {
-                    // Get center of focused cell
-                    Bounds anchorBounds = row.getBoundsInParent();
-                    double x = anchorBounds.getMinX() + anchorBounds.getWidth() / 2;
-                    double y = anchorBounds.getMinY() + anchorBounds.getHeight() / 2;
-                    Point2D screenPosition = row.getParent().localToScreen(x, y);
-
-                    if (row.getContextMenu() == null) {
-                        row.setContextMenu(contextMenuFactory.apply(row.getItem()));
-                    }
-                    row.getContextMenu().show(row, screenPosition.getX(), screenPosition.getY());
-                }
-            });
+            tableView.addEventHandler(
+                    KeyEvent.KEY_RELEASED,
+                    event -> {
+                        boolean rowFocused =
+                                !row.isEmpty()
+                                        && tableView.getFocusModel().getFocusedIndex()
+                                                == row.getIndex();
+                        if (event.getCode() == KeyCode.CONTEXT_MENU && rowFocused) {
+                            // Get center of focused cell
+                            Bounds anchorBounds = row.getBoundsInParent();
+                            double x = anchorBounds.getMinX() + anchorBounds.getWidth() / 2;
+                            double y = anchorBounds.getMinY() + anchorBounds.getHeight() / 2;
+                            Point2D screenPosition = row.getParent().localToScreen(x, y);
+
+                            if (row.getContextMenu() == null) {
+                                row.setContextMenu(contextMenuFactory.apply(row.getItem()));
+                            }
+                            row.getContextMenu()
+                                    .show(row, screenPosition.getX(), screenPosition.getY());
+                        }
+                    });
         }
 
         if (toOnDragDetected != null) {
-            row.setOnDragDetected(event -> {
-                if (!row.isEmpty()) {
-                    toOnDragDetected.accept(row, row.getItem(), event);
-                }
-            });
+            row.setOnDragDetected(
+                    event -> {
+                        if (!row.isEmpty()) {
+                            toOnDragDetected.accept(row, row.getItem(), event);
+                        }
+                    });
         }
         if (toOnDragDropped != null) {
-            row.setOnDragDropped(event -> {
-                if (!row.isEmpty()) {
-                    toOnDragDropped.accept(row, row.getItem(), event);
-                }
-            });
+            row.setOnDragDropped(
+                    event -> {
+                        if (!row.isEmpty()) {
+                            toOnDragDropped.accept(row, row.getItem(), event);
+                        }
+                    });
         }
         if (toOnDragEntered != null) {
-            row.setOnDragEntered(event -> {
-                if (!row.isEmpty()) {
-                    toOnDragEntered.accept(row.getItem(), event);
-                }
-            });
+            row.setOnDragEntered(
+                    event -> {
+                        if (!row.isEmpty()) {
+                            toOnDragEntered.accept(row.getItem(), event);
+                        }
+                    });
         }
         if (toOnDragExited != null) {
-            row.setOnDragExited(event -> {
-                if (!row.isEmpty()) {
-                    toOnDragExited.accept(row, row.getItem(), event);
-                }
-            });
+            row.setOnDragExited(
+                    event -> {
+                        if (!row.isEmpty()) {
+                            toOnDragExited.accept(row, row.getItem(), event);
+                        }
+                    });
         }
         if (toOnDragOver != null) {
-            row.setOnDragOver(event -> {
-                if (!row.isEmpty()) {
-                    toOnDragOver.accept(row, row.getItem(), event);
-                }
-            });
+            row.setOnDragOver(
+                    event -> {
+                        if (!row.isEmpty()) {
+                            toOnDragOver.accept(row, row.getItem(), event);
+                        }
+                    });
         }
 
         if (toOnMouseDragEntered != null) {
-            row.setOnMouseDragEntered(event -> {
-                if (!row.isEmpty()) {
-                    toOnMouseDragEntered.accept(row, row.getItem(), event);
-                }
-            });
+            row.setOnMouseDragEntered(
+                    event -> {
+                        if (!row.isEmpty()) {
+                            toOnMouseDragEntered.accept(row, row.getItem(), event);
+                        }
+                    });
         }
         return row;
     }
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
index b7688c3b250b..c59a103a3bf1 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
@@ -1,9 +1,8 @@
 package org.jabref.gui.util;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Function;
+import com.tobiasdiez.easybind.Subscription;
+
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
 
 import javafx.application.Platform;
 import javafx.css.PseudoClass;
@@ -16,17 +15,21 @@
 import javafx.util.Callback;
 import javafx.util.StringConverter;
 
-import com.tobiasdiez.easybind.Subscription;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
 
-public class ViewModelTextFieldTableCellVisualizationFactory<S, T> implements Callback<TableColumn<S, T>, TableCell<S, T>> {
+public class ViewModelTextFieldTableCellVisualizationFactory<S, T>
+        implements Callback<TableColumn<S, T>, TableCell<S, T>> {
 
     private static final PseudoClass INVALID_PSEUDO_CLASS = PseudoClass.getPseudoClass("invalid");
 
     private Function<S, ValidationStatus> validationStatusProperty;
     private StringConverter<T> stringConverter;
 
-    public ViewModelTextFieldTableCellVisualizationFactory<S, T> withValidation(Function<S, ValidationStatus> validationStatusProperty) {
+    public ViewModelTextFieldTableCellVisualizationFactory<S, T> withValidation(
+            Function<S, ValidationStatus> validationStatusProperty) {
         this.validationStatusProperty = validationStatusProperty;
         return this;
     }
@@ -45,11 +48,16 @@ public TextFieldTableCell<S, T> call(TableColumn<S, T> param) {
             public void startEdit() {
                 super.startEdit();
 
-                // The textfield is lazily created and not already present when a TableCell is created.
-                lookupTextField().ifPresent(textField -> Platform.runLater(() -> {
-                    textField.requestFocus();
-                    textField.selectAll();
-                }));
+                // The textfield is lazily created and not already present when a TableCell is
+                // created.
+                lookupTextField()
+                        .ifPresent(
+                                textField ->
+                                        Platform.runLater(
+                                                () -> {
+                                                    textField.requestFocus();
+                                                    textField.selectAll();
+                                                }));
             }
 
             /**
@@ -61,10 +69,12 @@ private Optional<TextField> lookupTextField() {
                 if (getGraphic() instanceof TextField) {
                     return Optional.of((TextField) getGraphic());
                 } else {
-                    // Could be an HBox with some graphic and a TextField if a graphic is specified for the TableCell
+                    // Could be an HBox with some graphic and a TextField if a graphic is specified
+                    // for the TableCell
                     if (getGraphic() instanceof HBox) {
                         HBox hbox = (HBox) getGraphic();
-                        if ((hbox.getChildren().size() > 1) && hbox.getChildren().get(1) instanceof TextField) {
+                        if ((hbox.getChildren().size() > 1)
+                                && hbox.getChildren().get(1) instanceof TextField) {
                             return Optional.of((TextField) hbox.getChildren().get(1));
                         }
                     }
@@ -88,14 +98,20 @@ public void updateItem(T item, boolean empty) {
                 } else {
                     S viewModel = getTableRow().getItem();
                     if (validationStatusProperty != null) {
-                        validationStatusProperty.apply(viewModel)
-                                                .getHighestMessage()
-                                                .ifPresent(message -> setTooltip(new Tooltip(message.getMessage())));
-
-                        subscriptions.add(BindingsHelper.includePseudoClassWhen(
-                                this,
-                                INVALID_PSEUDO_CLASS,
-                                validationStatusProperty.apply(viewModel).validProperty().not()));
+                        validationStatusProperty
+                                .apply(viewModel)
+                                .getHighestMessage()
+                                .ifPresent(
+                                        message -> setTooltip(new Tooltip(message.getMessage())));
+
+                        subscriptions.add(
+                                BindingsHelper.includePseudoClassWhen(
+                                        this,
+                                        INVALID_PSEUDO_CLASS,
+                                        validationStatusProperty
+                                                .apply(viewModel)
+                                                .validProperty()
+                                                .not()));
                     }
                 }
             }
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java
index 7bc6f8dda489..bfcfe14b8401 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java
@@ -47,7 +47,8 @@ public ViewModelTreeCellFactory<T> withTooltip(Callback<T, String> toTooltip) {
         return this;
     }
 
-    public ViewModelTreeCellFactory<T> withOnMouseClickedEvent(Callback<T, EventHandler<? super MouseEvent>> toOnMouseClickedEvent) {
+    public ViewModelTreeCellFactory<T> withOnMouseClickedEvent(
+            Callback<T, EventHandler<? super MouseEvent>> toOnMouseClickedEvent) {
         this.toOnMouseClickedEvent = toOnMouseClickedEvent;
         return this;
     }
@@ -66,18 +67,20 @@ public TreeCell<T> call(TreeView<T> tree) {
                     return null;
                 };
 
-        StringConverter<TreeItem<T>> converter = new StringConverter<>() {
-            @Override
-            public String toString(TreeItem<T> treeItem) {
-                return treeItem == null || treeItem.getValue() == null || toText == null ?
-                        "" : toText.call(treeItem.getValue());
-            }
+        StringConverter<TreeItem<T>> converter =
+                new StringConverter<>() {
+                    @Override
+                    public String toString(TreeItem<T> treeItem) {
+                        return treeItem == null || treeItem.getValue() == null || toText == null
+                                ? ""
+                                : toText.call(treeItem.getValue());
+                    }
 
-            @Override
-            public TreeItem<T> fromString(String string) {
-                throw new UnsupportedOperationException("Not supported.");
-            }
-        };
+                    @Override
+                    public TreeItem<T> fromString(String string) {
+                        throw new UnsupportedOperationException("Not supported.");
+                    }
+                };
         return new CheckBoxTreeCell<>(getSelectedProperty, converter);
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java
index fb7972fd152d..e0871fa84bbb 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java
@@ -16,7 +16,8 @@
  *
  * @param <S> view model
  */
-public class ViewModelTreeTableCellFactory<S> implements Callback<TreeTableColumn<S, S>, TreeTableCell<S, S>> {
+public class ViewModelTreeTableCellFactory<S>
+        implements Callback<TreeTableColumn<S, S>, TreeTableCell<S, S>> {
 
     private Callback<S, String> toText;
     private Callback<S, Node> toGraphic;
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java
index cb97c9c2433a..125edebcf5e6 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java
@@ -1,12 +1,6 @@
 package org.jabref.gui.util;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Function;
+import com.tobiasdiez.easybind.Subscription;
 
 import javafx.beans.value.ObservableValue;
 import javafx.css.PseudoClass;
@@ -24,10 +18,18 @@
 import javafx.scene.input.MouseEvent;
 import javafx.util.Callback;
 
-import com.tobiasdiez.easybind.Subscription;
 import org.reactfx.util.TriConsumer;
 
-public class ViewModelTreeTableRowFactory<S> implements Callback<TreeTableView<S>, TreeTableRow<S>> {
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+public class ViewModelTreeTableRowFactory<S>
+        implements Callback<TreeTableView<S>, TreeTableRow<S>> {
     private BiConsumer<S, ? super MouseEvent> onMouseClickedEvent;
     private BiConsumer<S, ? super MouseEvent> onMousePressedEvent;
     private Consumer<TreeTableRow<S>> toCustomInitializer;
@@ -38,86 +40,109 @@ public class ViewModelTreeTableRowFactory<S> implements Callback<TreeTableView<S
     private TriConsumer<TreeTableRow<S>, S, ? super DragEvent> toOnDragExited;
     private TriConsumer<TreeTableRow<S>, S, ? super DragEvent> toOnDragOver;
     private TriConsumer<TreeTableRow<S>, S, ? super MouseDragEvent> toOnMouseDragEntered;
-    private final Map<EventType<? extends Event>, BiConsumer<S, ? super Event>> eventFilters = new HashMap<>();
-    private final Map<PseudoClass, Callback<TreeTableRow<S>, ObservableValue<Boolean>>> pseudoClasses = new HashMap<>();
+    private final Map<EventType<? extends Event>, BiConsumer<S, ? super Event>> eventFilters =
+            new HashMap<>();
+    private final Map<PseudoClass, Callback<TreeTableRow<S>, ObservableValue<Boolean>>>
+            pseudoClasses = new HashMap<>();
 
-    public ViewModelTreeTableRowFactory<S> withOnMouseClickedEvent(BiConsumer<S, ? super MouseEvent> event) {
+    public ViewModelTreeTableRowFactory<S> withOnMouseClickedEvent(
+            BiConsumer<S, ? super MouseEvent> event) {
         this.onMouseClickedEvent = event;
         return this;
     }
 
-    public ViewModelTreeTableRowFactory<S> withOnMousePressedEvent(BiConsumer<S, ? super MouseEvent> event) {
+    public ViewModelTreeTableRowFactory<S> withOnMousePressedEvent(
+            BiConsumer<S, ? super MouseEvent> event) {
         this.onMousePressedEvent = event;
         return this;
     }
 
-    public ViewModelTreeTableRowFactory<S> withCustomInitializer(Consumer<TreeTableRow<S>> customInitializer) {
+    public ViewModelTreeTableRowFactory<S> withCustomInitializer(
+            Consumer<TreeTableRow<S>> customInitializer) {
         this.toCustomInitializer = customInitializer;
         return this;
     }
 
-    public ViewModelTreeTableRowFactory<S> withContextMenu(Function<S, ContextMenu> contextMenuFactory) {
+    public ViewModelTreeTableRowFactory<S> withContextMenu(
+            Function<S, ContextMenu> contextMenuFactory) {
         this.contextMenuFactory = contextMenuFactory;
         return this;
     }
 
-    public ViewModelTreeTableRowFactory<S> setOnDragDetected(TriConsumer<TreeTableRow<S>, S, ? super MouseEvent> toOnDragDetected) {
+    public ViewModelTreeTableRowFactory<S> setOnDragDetected(
+            TriConsumer<TreeTableRow<S>, S, ? super MouseEvent> toOnDragDetected) {
         this.toOnDragDetected = toOnDragDetected;
         return this;
     }
 
-    public ViewModelTreeTableRowFactory<S> setOnDragDetected(BiConsumer<S, ? super MouseEvent> toOnDragDetected) {
-        this.toOnDragDetected = (row, viewModel, event) -> toOnDragDetected.accept(viewModel, event);
+    public ViewModelTreeTableRowFactory<S> setOnDragDetected(
+            BiConsumer<S, ? super MouseEvent> toOnDragDetected) {
+        this.toOnDragDetected =
+                (row, viewModel, event) -> toOnDragDetected.accept(viewModel, event);
         return this;
     }
 
-    public ViewModelTreeTableRowFactory<S> setOnDragDropped(TriConsumer<TreeTableRow<S>, S, ? super DragEvent> toOnDragDropped) {
+    public ViewModelTreeTableRowFactory<S> setOnDragDropped(
+            TriConsumer<TreeTableRow<S>, S, ? super DragEvent> toOnDragDropped) {
         this.toOnDragDropped = toOnDragDropped;
         return this;
     }
 
-    public ViewModelTreeTableRowFactory<S> setOnDragDropped(BiConsumer<S, ? super DragEvent> toOnDragDropped) {
-        return setOnDragDropped((row, viewModel, event) -> toOnDragDropped.accept(viewModel, event));
+    public ViewModelTreeTableRowFactory<S> setOnDragDropped(
+            BiConsumer<S, ? super DragEvent> toOnDragDropped) {
+        return setOnDragDropped(
+                (row, viewModel, event) -> toOnDragDropped.accept(viewModel, event));
     }
 
-    public ViewModelTreeTableRowFactory<S> setOnDragEntered(BiConsumer<S, ? super DragEvent> toOnDragEntered) {
+    public ViewModelTreeTableRowFactory<S> setOnDragEntered(
+            BiConsumer<S, ? super DragEvent> toOnDragEntered) {
         this.toOnDragEntered = toOnDragEntered;
         return this;
     }
 
-    public ViewModelTreeTableRowFactory<S> setOnMouseDragEntered(TriConsumer<TreeTableRow<S>, S, ? super MouseDragEvent> toOnDragEntered) {
+    public ViewModelTreeTableRowFactory<S> setOnMouseDragEntered(
+            TriConsumer<TreeTableRow<S>, S, ? super MouseDragEvent> toOnDragEntered) {
         this.toOnMouseDragEntered = toOnDragEntered;
         return this;
     }
 
-    public ViewModelTreeTableRowFactory<S> setOnMouseDragEntered(BiConsumer<S, ? super MouseDragEvent> toOnDragEntered) {
-        return setOnMouseDragEntered((row, viewModel, event) -> toOnDragEntered.accept(viewModel, event));
+    public ViewModelTreeTableRowFactory<S> setOnMouseDragEntered(
+            BiConsumer<S, ? super MouseDragEvent> toOnDragEntered) {
+        return setOnMouseDragEntered(
+                (row, viewModel, event) -> toOnDragEntered.accept(viewModel, event));
     }
 
-    public ViewModelTreeTableRowFactory<S> setOnDragExited(TriConsumer<TreeTableRow<S>, S, ? super DragEvent> toOnDragExited) {
+    public ViewModelTreeTableRowFactory<S> setOnDragExited(
+            TriConsumer<TreeTableRow<S>, S, ? super DragEvent> toOnDragExited) {
         this.toOnDragExited = toOnDragExited;
         return this;
     }
 
-    public ViewModelTreeTableRowFactory<S> setOnDragExited(BiConsumer<S, ? super DragEvent> toOnDragExited) {
+    public ViewModelTreeTableRowFactory<S> setOnDragExited(
+            BiConsumer<S, ? super DragEvent> toOnDragExited) {
         return setOnDragExited((row, viewModel, event) -> toOnDragExited.accept(viewModel, event));
     }
 
-    public ViewModelTreeTableRowFactory<S> setOnDragOver(TriConsumer<TreeTableRow<S>, S, ? super DragEvent> toOnDragOver) {
+    public ViewModelTreeTableRowFactory<S> setOnDragOver(
+            TriConsumer<TreeTableRow<S>, S, ? super DragEvent> toOnDragOver) {
         this.toOnDragOver = toOnDragOver;
         return this;
     }
 
-    public ViewModelTreeTableRowFactory<S> setOnDragOver(BiConsumer<S, ? super DragEvent> toOnDragOver) {
+    public ViewModelTreeTableRowFactory<S> setOnDragOver(
+            BiConsumer<S, ? super DragEvent> toOnDragOver) {
         return setOnDragOver((row, viewModel, event) -> toOnDragOver.accept(viewModel, event));
     }
 
-    public ViewModelTreeTableRowFactory<S> withPseudoClass(PseudoClass pseudoClass, Callback<TreeTableRow<S>, ObservableValue<Boolean>> toCondition) {
+    public ViewModelTreeTableRowFactory<S> withPseudoClass(
+            PseudoClass pseudoClass,
+            Callback<TreeTableRow<S>, ObservableValue<Boolean>> toCondition) {
         this.pseudoClasses.putIfAbsent(pseudoClass, toCondition);
         return this;
     }
 
-    public ViewModelTreeTableRowFactory<S> withEventFilter(EventType<? extends Event> event, BiConsumer<S, ? super Event> toCondition) {
+    public ViewModelTreeTableRowFactory<S> withEventFilter(
+            EventType<? extends Event> event, BiConsumer<S, ? super Event> toCondition) {
         this.eventFilters.putIfAbsent(event, toCondition);
         return this;
     }
@@ -141,30 +166,42 @@ protected void updateItem(S row, boolean empty) {
 
                 if (contextMenuFactory != null) {
                     // We only create the context menu when really necessary
-                    setOnContextMenuRequested(event -> {
-                        if (!isEmpty()) {
-                            setContextMenu(contextMenuFactory.apply(row));
-                            getContextMenu().show(this, event.getScreenX(), event.getScreenY());
-                        }
-                        event.consume();
-                    });
+                    setOnContextMenuRequested(
+                            event -> {
+                                if (!isEmpty()) {
+                                    setContextMenu(contextMenuFactory.apply(row));
+                                    getContextMenu()
+                                            .show(this, event.getScreenX(), event.getScreenY());
+                                }
+                                event.consume();
+                            });
 
                     // Activate context menu if user presses the "context menu" key
-                    treeTableView.addEventHandler(KeyEvent.KEY_RELEASED, event -> {
-                        boolean rowFocused = !isEmpty() && treeTableView.getFocusModel().getFocusedIndex() == getIndex();
-                        if (event.getCode() == KeyCode.CONTEXT_MENU && rowFocused) {
-                            // Get center of focused cell
-                            Bounds anchorBounds = getBoundsInParent();
-                            double x = anchorBounds.getMinX() + anchorBounds.getWidth() / 2;
-                            double y = anchorBounds.getMinY() + anchorBounds.getHeight() / 2;
-                            Point2D screenPosition = getParent().localToScreen(x, y);
-
-                            if (getContextMenu() == null) {
-                                setContextMenu(contextMenuFactory.apply(getItem()));
-                            }
-                            getContextMenu().show(this, screenPosition.getX(), screenPosition.getY());
-                        }
-                    });
+                    treeTableView.addEventHandler(
+                            KeyEvent.KEY_RELEASED,
+                            event -> {
+                                boolean rowFocused =
+                                        !isEmpty()
+                                                && treeTableView.getFocusModel().getFocusedIndex()
+                                                        == getIndex();
+                                if (event.getCode() == KeyCode.CONTEXT_MENU && rowFocused) {
+                                    // Get center of focused cell
+                                    Bounds anchorBounds = getBoundsInParent();
+                                    double x = anchorBounds.getMinX() + anchorBounds.getWidth() / 2;
+                                    double y =
+                                            anchorBounds.getMinY() + anchorBounds.getHeight() / 2;
+                                    Point2D screenPosition = getParent().localToScreen(x, y);
+
+                                    if (getContextMenu() == null) {
+                                        setContextMenu(contextMenuFactory.apply(getItem()));
+                                    }
+                                    getContextMenu()
+                                            .show(
+                                                    this,
+                                                    screenPosition.getX(),
+                                                    screenPosition.getY());
+                                }
+                            });
                 }
 
                 if (!empty && (row != null)) {
@@ -197,19 +234,24 @@ protected void updateItem(S row, boolean empty) {
                     }
 
                     if (toOnMouseDragEntered != null) {
-                        setOnMouseDragEntered(event -> toOnMouseDragEntered.accept(this, getItem(), event));
+                        setOnMouseDragEntered(
+                                event -> toOnMouseDragEntered.accept(this, getItem(), event));
                     }
 
-                    for (Map.Entry<EventType<?>, BiConsumer<S, ? super Event>> eventFilter : eventFilters.entrySet()) {
-                        addEventFilter(eventFilter.getKey(), event -> eventFilter.getValue().accept(getItem(), event));
+                    for (Map.Entry<EventType<?>, BiConsumer<S, ? super Event>> eventFilter :
+                            eventFilters.entrySet()) {
+                        addEventFilter(
+                                eventFilter.getKey(),
+                                event -> eventFilter.getValue().accept(getItem(), event));
                     }
 
-                    for (Map.Entry<PseudoClass, Callback<TreeTableRow<S>, ObservableValue<Boolean>>> pseudoClassWithCondition : pseudoClasses.entrySet()) {
-                        ObservableValue<Boolean> condition = pseudoClassWithCondition.getValue().call(this);
-                        subscriptions.add(BindingsHelper.includePseudoClassWhen(
-                                this,
-                                pseudoClassWithCondition.getKey(),
-                                condition));
+                    for (Map.Entry<PseudoClass, Callback<TreeTableRow<S>, ObservableValue<Boolean>>>
+                            pseudoClassWithCondition : pseudoClasses.entrySet()) {
+                        ObservableValue<Boolean> condition =
+                                pseudoClassWithCondition.getValue().call(this);
+                        subscriptions.add(
+                                BindingsHelper.includePseudoClassWhen(
+                                        this, pseudoClassWithCondition.getKey(), condition));
                     }
                 }
             }
diff --git a/src/main/java/org/jabref/gui/util/ZipFileChooser.java b/src/main/java/org/jabref/gui/util/ZipFileChooser.java
index dd8fd8b63e52..67e44167481b 100644
--- a/src/main/java/org/jabref/gui/util/ZipFileChooser.java
+++ b/src/main/java/org/jabref/gui/util/ZipFileChooser.java
@@ -1,15 +1,5 @@
 package org.jabref.gui.util;
 
-import java.io.IOException;
-import java.nio.file.FileSystem;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.FormatStyle;
-import java.util.stream.Collectors;
-
 import javafx.beans.property.ReadOnlyLongWrapper;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.FXCollections;
@@ -21,6 +11,16 @@
 
 import org.jabref.logic.l10n.Localization;
 
+import java.io.IOException;
+import java.nio.file.FileSystem;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
+import java.util.stream.Collectors;
+
 /**
  * Dialog to allow users to choose a file contained in a ZIP file.
  */
@@ -36,47 +36,53 @@ public ZipFileChooser(FileSystem zipFile) throws IOException {
 
         TableView<Path> table = new TableView<>(getSelectableZipEntries(zipFile));
         TableColumn<Path, String> nameColumn = new TableColumn<>(Localization.lang("Name"));
-        TableColumn<Path, String> modifiedColumn = new TableColumn<>(Localization.lang("Last modified"));
+        TableColumn<Path, String> modifiedColumn =
+                new TableColumn<>(Localization.lang("Last modified"));
         TableColumn<Path, Number> sizeColumn = new TableColumn<>(Localization.lang("Size"));
         table.getColumns().add(nameColumn);
         table.getColumns().add(modifiedColumn);
         table.getColumns().add(sizeColumn);
-        nameColumn.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().toString()));
-        modifiedColumn.setCellValueFactory(data -> {
-            try {
-                return new ReadOnlyStringWrapper(
-                        ZonedDateTime.ofInstant(Files.getLastModifiedTime(data.getValue()).toInstant(),
-                                ZoneId.systemDefault())
-                                     .format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)));
-            } catch (IOException e) {
-                // Ignore
-                return new ReadOnlyStringWrapper("");
-            }
-        });
-        sizeColumn.setCellValueFactory(data -> {
-            try {
-                return new ReadOnlyLongWrapper(Files.size(data.getValue()));
-            } catch (IOException e) {
-                // Ignore
-                return new ReadOnlyLongWrapper(0);
-            }
-        });
+        nameColumn.setCellValueFactory(
+                data -> new ReadOnlyStringWrapper(data.getValue().toString()));
+        modifiedColumn.setCellValueFactory(
+                data -> {
+                    try {
+                        return new ReadOnlyStringWrapper(
+                                ZonedDateTime.ofInstant(
+                                                Files.getLastModifiedTime(data.getValue())
+                                                        .toInstant(),
+                                                ZoneId.systemDefault())
+                                        .format(
+                                                DateTimeFormatter.ofLocalizedDateTime(
+                                                        FormatStyle.MEDIUM)));
+                    } catch (IOException e) {
+                        // Ignore
+                        return new ReadOnlyStringWrapper("");
+                    }
+                });
+        sizeColumn.setCellValueFactory(
+                data -> {
+                    try {
+                        return new ReadOnlyLongWrapper(Files.size(data.getValue()));
+                    } catch (IOException e) {
+                        // Ignore
+                        return new ReadOnlyLongWrapper(0);
+                    }
+                });
         table.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
 
         getDialogPane().setContent(table);
 
-        getDialogPane().getButtonTypes().setAll(
-                ButtonType.OK,
-                ButtonType.CANCEL
-        );
+        getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
 
-        setResultConverter(button -> {
-            if (button == ButtonType.OK) {
-                return table.getSelectionModel().getSelectedItem();
-            } else {
-                return null;
-            }
-        });
+        setResultConverter(
+                button -> {
+                    if (button == ButtonType.OK) {
+                        return table.getSelectionModel().getSelectedItem();
+                    } else {
+                        return null;
+                    }
+                });
     }
 
     /**
@@ -85,12 +91,13 @@ public ZipFileChooser(FileSystem zipFile) throws IOException {
      * @param zipFile ZIP-File
      * @return entries that can be selected
      */
-    private static ObservableList<Path> getSelectableZipEntries(FileSystem zipFile) throws IOException {
+    private static ObservableList<Path> getSelectableZipEntries(FileSystem zipFile)
+            throws IOException {
         Path rootDir = zipFile.getRootDirectories().iterator().next();
 
         return FXCollections.observableArrayList(
                 Files.walk(rootDir)
-                     .filter(file -> file.endsWith(".class"))
-                     .collect(Collectors.toList()));
+                        .filter(file -> file.endsWith(".class"))
+                        .collect(Collectors.toList()));
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/comparator/NumericFieldComparator.java b/src/main/java/org/jabref/gui/util/comparator/NumericFieldComparator.java
index f428bc3106c3..3d6f07608529 100644
--- a/src/main/java/org/jabref/gui/util/comparator/NumericFieldComparator.java
+++ b/src/main/java/org/jabref/gui/util/comparator/NumericFieldComparator.java
@@ -1,9 +1,9 @@
 package org.jabref.gui.util.comparator;
 
-import java.util.Comparator;
-
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Comparator;
+
 /**
  * Comparator for numeric cases. The purpose of this class is to add the numeric comparison, because values are sorted
  * as if they were strings.
@@ -16,7 +16,8 @@ public int compare(String val1, String val2) {
             return 0;
         }
 
-        // Similar implementation as in {@link org.jabref.logic.bibtex.comparator.FieldComparator.compare}.
+        // Similar implementation as in {@link
+        // org.jabref.logic.bibtex.comparator.FieldComparator.compare}.
         int i1;
         boolean i1present;
         try {
diff --git a/src/main/java/org/jabref/gui/util/comparator/RankingFieldComparator.java b/src/main/java/org/jabref/gui/util/comparator/RankingFieldComparator.java
index 79f6ff49aa53..66ed434c8194 100644
--- a/src/main/java/org/jabref/gui/util/comparator/RankingFieldComparator.java
+++ b/src/main/java/org/jabref/gui/util/comparator/RankingFieldComparator.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.util.comparator;
 
+import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
+
 import java.util.Comparator;
 import java.util.Optional;
 
-import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
-
 /**
  * Comparator for rankings.
  * <p>
@@ -13,7 +13,8 @@
 public class RankingFieldComparator implements Comparator<Optional<SpecialFieldValueViewModel>> {
 
     @Override
-    public int compare(Optional<SpecialFieldValueViewModel> val1, Optional<SpecialFieldValueViewModel> val2) {
+    public int compare(
+            Optional<SpecialFieldValueViewModel> val1, Optional<SpecialFieldValueViewModel> val2) {
         if (val1.isPresent()) {
             if (val2.isPresent()) {
                 int compareToRes = val1.get().getValue().compareTo(val2.get().getValue());
diff --git a/src/main/java/org/jabref/gui/util/comparator/SpecialFieldComparator.java b/src/main/java/org/jabref/gui/util/comparator/SpecialFieldComparator.java
index 4c3575ad1148..41498b4f2ccc 100644
--- a/src/main/java/org/jabref/gui/util/comparator/SpecialFieldComparator.java
+++ b/src/main/java/org/jabref/gui/util/comparator/SpecialFieldComparator.java
@@ -1,14 +1,15 @@
 package org.jabref.gui.util.comparator;
 
+import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
+
 import java.util.Comparator;
 import java.util.Optional;
 
-import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
-
 public class SpecialFieldComparator implements Comparator<Optional<SpecialFieldValueViewModel>> {
 
     @Override
-    public int compare(Optional<SpecialFieldValueViewModel> val1, Optional<SpecialFieldValueViewModel> val2) {
+    public int compare(
+            Optional<SpecialFieldValueViewModel> val1, Optional<SpecialFieldValueViewModel> val2) {
         if (val1.isPresent()) {
             if (val2.isPresent()) {
                 return val1.get().getValue().compareTo(val2.get().getValue());
diff --git a/src/main/java/org/jabref/gui/util/component/TemporalAccessorPicker.java b/src/main/java/org/jabref/gui/util/component/TemporalAccessorPicker.java
index 4b40aeb5e4f4..6bd213fa185b 100644
--- a/src/main/java/org/jabref/gui/util/component/TemporalAccessorPicker.java
+++ b/src/main/java/org/jabref/gui/util/component/TemporalAccessorPicker.java
@@ -1,5 +1,16 @@
 package org.jabref.gui.util.component;
 
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.DatePicker;
+import javafx.util.StringConverter;
+
+import org.jabref.gui.fieldeditors.contextmenu.EditorContextAction;
+import org.jabref.gui.util.BindingsHelper;
+import org.jabref.model.entry.Date;
+import org.jabref.model.strings.StringUtil;
+
 import java.time.DateTimeException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -12,17 +23,6 @@
 import java.time.temporal.TemporalQueries;
 import java.util.Objects;
 
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.DatePicker;
-import javafx.util.StringConverter;
-
-import org.jabref.gui.fieldeditors.contextmenu.EditorContextAction;
-import org.jabref.gui.util.BindingsHelper;
-import org.jabref.model.entry.Date;
-import org.jabref.model.strings.StringUtil;
-
 /**
  * A date picker with configurable datetime format where both date and time can be changed via the text field and the
  * date can additionally be changed via the JavaFX default date picker. Also supports incomplete dates.
@@ -40,24 +40,35 @@
  * Inspiration taken from <a href="https://github.com/edvin/tornadofx-controls/blob/master/src/main/java/tornadofx/control/DateTimePicker.java">Controlsfx DateTimePicker</a>
  */
 public class TemporalAccessorPicker extends DatePicker {
-    private final ObjectProperty<TemporalAccessor> temporalAccessorValue = new SimpleObjectProperty<>(null);
+    private final ObjectProperty<TemporalAccessor> temporalAccessorValue =
+            new SimpleObjectProperty<>(null);
 
-    private final DateTimeFormatter defaultFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
-    private final ObjectProperty<StringConverter<TemporalAccessor>> converter = new SimpleObjectProperty<>(null);
+    private final DateTimeFormatter defaultFormatter =
+            DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+    private final ObjectProperty<StringConverter<TemporalAccessor>> converter =
+            new SimpleObjectProperty<>(null);
 
     public TemporalAccessorPicker() {
         setConverter(new InternalConverter());
 
         // Synchronize changes of the underlying date value with the temporalAccessorValue
-        BindingsHelper.bindBidirectional(valueProperty(), temporalAccessorValue,
+        BindingsHelper.bindBidirectional(
+                valueProperty(),
+                temporalAccessorValue,
                 TemporalAccessorPicker::addCurrentTime,
                 TemporalAccessorPicker::getDate);
 
-        getEditor().setOnContextMenuRequested(event -> {
-            ContextMenu contextMenu = new ContextMenu();
-            contextMenu.getItems().setAll(EditorContextAction.getDefaultContextMenuItems(getEditor()));
-            contextMenu.show(this, event.getScreenX(), event.getScreenY());
-        });
+        getEditor()
+                .setOnContextMenuRequested(
+                        event -> {
+                            ContextMenu contextMenu = new ContextMenu();
+                            contextMenu
+                                    .getItems()
+                                    .setAll(
+                                            EditorContextAction.getDefaultContextMenuItems(
+                                                    getEditor()));
+                            contextMenu.show(this, event.getScreenX(), event.getScreenY());
+                        });
     }
 
     private static TemporalAccessor addCurrentTime(LocalDate date) {
@@ -99,25 +110,26 @@ public final ObjectProperty<StringConverter<TemporalAccessor>> stringConverterPr
     }
 
     public final StringConverter<TemporalAccessor> getStringConverter() {
-        StringConverter<TemporalAccessor> newConverter = new StringConverter<>() {
-            @Override
-            public String toString(TemporalAccessor value) {
-                return defaultFormatter.format(value);
-            }
+        StringConverter<TemporalAccessor> newConverter =
+                new StringConverter<>() {
+                    @Override
+                    public String toString(TemporalAccessor value) {
+                        return defaultFormatter.format(value);
+                    }
 
-            @Override
-            public TemporalAccessor fromString(String value) {
-                if (StringUtil.isNotBlank(value)) {
-                    try {
-                        return defaultFormatter.parse(value);
-                    } catch (DateTimeParseException exception) {
-                        return Date.parse(value).map(Date::toTemporalAccessor).orElse(null);
+                    @Override
+                    public TemporalAccessor fromString(String value) {
+                        if (StringUtil.isNotBlank(value)) {
+                            try {
+                                return defaultFormatter.parse(value);
+                            } catch (DateTimeParseException exception) {
+                                return Date.parse(value).map(Date::toTemporalAccessor).orElse(null);
+                            }
+                        } else {
+                            return null;
+                        }
                     }
-                } else {
-                    return null;
-                }
-            }
-        };
+                };
         return Objects.requireNonNullElseGet(stringConverterProperty().get(), () -> newConverter);
     }
 
diff --git a/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadChangeListener.java b/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadChangeListener.java
index 29d31651d5b4..705dded9b3d5 100644
--- a/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadChangeListener.java
+++ b/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadChangeListener.java
@@ -13,7 +13,8 @@ public UiThreadChangeListener(ChangeListener<T> delegate) {
 
     @Override
     public void changed(ObservableValue<? extends T> observable, T oldValue, T newValue) {
-        UiThreadHelper.ensureUiThreadExecution(() -> delegate.changed(observable, oldValue, newValue));
+        UiThreadHelper.ensureUiThreadExecution(
+                () -> delegate.changed(observable, oldValue, newValue));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadObservableList.java b/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadObservableList.java
index 175562114807..1b836654ef98 100644
--- a/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadObservableList.java
+++ b/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadObservableList.java
@@ -1,14 +1,14 @@
 package org.jabref.gui.util.uithreadaware;
 
+import javafx.beans.InvalidationListener;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 
-import javafx.beans.InvalidationListener;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-
 /**
  * This class can be used to wrap an @see ObservableList inside it. When wrapped, any Listener listening for updates to the wrapped ObservableList (for example because of a binding to it) is ensured to be notified on the JavaFX Application Thread. It should be used to implement bindings where updates come in from a background thread but should be reflected in the UI where it is necessary that changes to the UI are performed on the JavaFX Application thread.
  *
diff --git a/src/main/java/org/jabref/http/dto/BibEntryDTO.java b/src/main/java/org/jabref/http/dto/BibEntryDTO.java
index 1e36564072d3..1e53e1b7fa62 100644
--- a/src/main/java/org/jabref/http/dto/BibEntryDTO.java
+++ b/src/main/java/org/jabref/http/dto/BibEntryDTO.java
@@ -1,7 +1,6 @@
 package org.jabref.http.dto;
 
-import java.io.IOException;
-import java.io.StringWriter;
+import com.google.common.base.MoreObjects;
 
 import org.jabref.logic.bibtex.BibEntryWriter;
 import org.jabref.logic.bibtex.FieldPreferences;
@@ -11,11 +10,12 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.SharedBibEntryData;
-
-import com.google.common.base.MoreObjects;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.StringWriter;
+
 /**
  * The data transfer object (DTO) for an BibEntry
  *
@@ -24,22 +24,34 @@
  * @param citationKey the citation key (duplicated from BibEntry to ease processing by the client)
  * @param bibtex the BibEntry as BibTeX string (see ADR-0027 for more information, why we don't use a HashMap / JSON)
  */
-public record BibEntryDTO(SharedBibEntryData sharingMetadata, String userComments, String citationKey, String bibtex) implements Comparable<BibEntryDTO> {
+public record BibEntryDTO(
+        SharedBibEntryData sharingMetadata, String userComments, String citationKey, String bibtex)
+        implements Comparable<BibEntryDTO> {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(BibEntryDTO.class);
 
-    public BibEntryDTO(BibEntry bibEntry, BibDatabaseMode bibDatabaseMode, FieldPreferences fieldWriterPreferences, BibEntryTypesManager bibEntryTypesManager) {
-        this(bibEntry.getSharedBibEntryData(),
+    public BibEntryDTO(
+            BibEntry bibEntry,
+            BibDatabaseMode bibDatabaseMode,
+            FieldPreferences fieldWriterPreferences,
+            BibEntryTypesManager bibEntryTypesManager) {
+        this(
+                bibEntry.getSharedBibEntryData(),
                 bibEntry.getUserComments(),
                 bibEntry.getCitationKey().orElse(""),
-                convertToString(bibEntry, bibDatabaseMode, fieldWriterPreferences, bibEntryTypesManager)
-        );
+                convertToString(
+                        bibEntry, bibDatabaseMode, fieldWriterPreferences, bibEntryTypesManager));
     }
 
-    private static String convertToString(BibEntry entry, BibDatabaseMode bibDatabaseMode, FieldPreferences fieldWriterPreferences, BibEntryTypesManager bibEntryTypesManager) {
+    private static String convertToString(
+            BibEntry entry,
+            BibDatabaseMode bibDatabaseMode,
+            FieldPreferences fieldWriterPreferences,
+            BibEntryTypesManager bibEntryTypesManager) {
         StringWriter rawEntry = new StringWriter();
         BibWriter bibWriter = new BibWriter(rawEntry, "\n");
-        BibEntryWriter bibtexEntryWriter = new BibEntryWriter(new FieldWriter(fieldWriterPreferences), bibEntryTypesManager);
+        BibEntryWriter bibtexEntryWriter =
+                new BibEntryWriter(new FieldWriter(fieldWriterPreferences), bibEntryTypesManager);
         try {
             bibtexEntryWriter.write(entry, bibWriter, bibDatabaseMode);
         } catch (IOException e) {
@@ -62,10 +74,10 @@ public int compareTo(BibEntryDTO o) {
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
-                          .add("sharingMetadata", sharingMetadata)
-                          .add("userComments", userComments)
-                          .add("citationkey", citationKey)
-                          .add("bibtex", bibtex)
-                          .toString();
+                .add("sharingMetadata", sharingMetadata)
+                .add("userComments", userComments)
+                .add("citationkey", citationKey)
+                .add("bibtex", bibtex)
+                .toString();
     }
 }
diff --git a/src/main/java/org/jabref/http/dto/GsonFactory.java b/src/main/java/org/jabref/http/dto/GsonFactory.java
index 77da67f9ba46..87cf212a1860 100644
--- a/src/main/java/org/jabref/http/dto/GsonFactory.java
+++ b/src/main/java/org/jabref/http/dto/GsonFactory.java
@@ -2,17 +2,15 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+
 import org.glassfish.hk2.api.Factory;
 
 public class GsonFactory implements Factory<Gson> {
     @Override
     public Gson provide() {
-        return new GsonBuilder()
-                .setPrettyPrinting()
-                .create();
+        return new GsonBuilder().setPrettyPrinting().create();
     }
 
     @Override
-    public void dispose(Gson instance) {
-    }
+    public void dispose(Gson instance) {}
 }
diff --git a/src/main/java/org/jabref/http/dto/SimpleHttpResponse.java b/src/main/java/org/jabref/http/dto/SimpleHttpResponse.java
index a07a9b304d9d..f1c5b4834a0f 100644
--- a/src/main/java/org/jabref/http/dto/SimpleHttpResponse.java
+++ b/src/main/java/org/jabref/http/dto/SimpleHttpResponse.java
@@ -1,5 +1,7 @@
 package org.jabref.http.dto;
 
+import org.jsoup.HttpStatusException;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -7,8 +9,6 @@
 import java.net.HttpURLConnection;
 import java.nio.charset.StandardCharsets;
 
-import org.jsoup.HttpStatusException;
-
 public record SimpleHttpResponse(int statusCode, String responseMessage, String responseBody) {
     private static final int MAX_RESPONSE_LENGTH = 1024; // 1 KB
 
@@ -19,7 +19,10 @@ public SimpleHttpResponse(int statusCode, String responseMessage, String respons
     }
 
     public SimpleHttpResponse(HttpURLConnection connection) {
-        this(getStatusCode(connection), getResponseMessage(connection), getResponseBodyDefaultEmpty(connection));
+        this(
+                getStatusCode(connection),
+                getResponseMessage(connection),
+                getResponseBodyDefaultEmpty(connection));
     }
 
     public SimpleHttpResponse(HttpStatusException e) {
@@ -28,11 +31,16 @@ public SimpleHttpResponse(HttpStatusException e) {
 
     @Override
     public String toString() {
-        return "SimpleHttpResponse{" +
-                "statusCode=" + statusCode +
-                ", responseMessage='" + responseMessage + '\'' +
-                ", responseBody='" + responseBody + '\'' +
-                '}';
+        return "SimpleHttpResponse{"
+                + "statusCode="
+                + statusCode
+                + ", responseMessage='"
+                + responseMessage
+                + '\''
+                + ", responseBody='"
+                + responseBody
+                + '\''
+                + '}';
     }
 
     private static int getStatusCode(HttpURLConnection connection) {
@@ -77,7 +85,8 @@ private static String truncateResponseBody(String responseBody) {
         if (bytes.length > MAX_RESPONSE_LENGTH) {
             // Truncate the response body to 1 KB and append "... (truncated)"
             // Response is in English, thus we append English text - and not localized text
-            return new String(bytes, 0, MAX_RESPONSE_LENGTH, StandardCharsets.UTF_8) + "... (truncated)";
+            return new String(bytes, 0, MAX_RESPONSE_LENGTH, StandardCharsets.UTF_8)
+                    + "... (truncated)";
         }
         // Return the original response body if it's within the 1 KB limit
         return responseBody;
@@ -100,7 +109,8 @@ private static String getResponseBody(HttpURLConnection connection) throws IOExc
         try (BufferedReader in = new BufferedReader(new InputStreamReader(errorStream))) {
             String inputLine;
             StringBuilder content = new StringBuilder();
-            while ((content.length() < MAX_RESPONSE_LENGTH) && (inputLine = in.readLine()) != null) {
+            while ((content.length() < MAX_RESPONSE_LENGTH)
+                    && (inputLine = in.readLine()) != null) {
                 content.append(inputLine);
             }
             return truncateResponseBody(content.toString());
diff --git a/src/main/java/org/jabref/http/server/Application.java b/src/main/java/org/jabref/http/server/Application.java
index 9ad975f16a84..3693a139c4d0 100644
--- a/src/main/java/org/jabref/http/server/Application.java
+++ b/src/main/java/org/jabref/http/server/Application.java
@@ -1,24 +1,27 @@
 package org.jabref.http.server;
 
-import java.util.Set;
-
-import org.jabref.http.dto.GsonFactory;
-
 import jakarta.inject.Inject;
 import jakarta.ws.rs.ApplicationPath;
+
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
+import org.jabref.http.dto.GsonFactory;
+
+import java.util.Set;
 
 @ApplicationPath("/")
 public class Application extends jakarta.ws.rs.core.Application {
 
-    @Inject
-    ServiceLocator serviceLocator;
+    @Inject ServiceLocator serviceLocator;
 
     @Override
     public Set<Class<?>> getClasses() {
         initialize();
-        return Set.of(RootResource.class, LibrariesResource.class, LibraryResource.class, CORSFilter.class);
+        return Set.of(
+                RootResource.class,
+                LibrariesResource.class,
+                LibraryResource.class,
+                CORSFilter.class);
     }
 
     /**
diff --git a/src/main/java/org/jabref/http/server/CORSFilter.java b/src/main/java/org/jabref/http/server/CORSFilter.java
index 7489305808f1..d14a747ed129 100644
--- a/src/main/java/org/jabref/http/server/CORSFilter.java
+++ b/src/main/java/org/jabref/http/server/CORSFilter.java
@@ -8,7 +8,8 @@
 @Provider
 public class CORSFilter implements ContainerResponseFilter {
     @Override
-    public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) {
+    public void filter(
+            ContainerRequestContext requestContext, ContainerResponseContext responseContext) {
         String requestOrigin = requestContext.getHeaderString("Origin");
         if (requestOrigin == null) {
             // IntelliJ's rest client is calling
@@ -16,8 +17,12 @@ public void filter(ContainerRequestContext requestContext, ContainerResponseCont
         } else if (requestOrigin.contains("://localhost")) {
             responseContext.getHeaders().add("Access-Control-Allow-Origin", requestOrigin);
         }
-        responseContext.getHeaders().add("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
-        responseContext.getHeaders().add("Access-Control-Allow-Headers", "origin, content-type, accept");
+        responseContext
+                .getHeaders()
+                .add("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
+        responseContext
+                .getHeaders()
+                .add("Access-Control-Allow-Headers", "origin, content-type, accept");
         responseContext.getHeaders().add("Access-Control-Allow-Credentials", "false");
     }
 }
diff --git a/src/main/java/org/jabref/http/server/LibrariesResource.java b/src/main/java/org/jabref/http/server/LibrariesResource.java
index 2c3c7e078f79..c15edf276242 100644
--- a/src/main/java/org/jabref/http/server/LibrariesResource.java
+++ b/src/main/java/org/jabref/http/server/LibrariesResource.java
@@ -1,28 +1,29 @@
 package org.jabref.http.server;
 
-import java.util.List;
-
-import org.jabref.logic.preferences.CliPreferences;
-import org.jabref.logic.util.io.BackupFileUtil;
-
 import com.google.gson.Gson;
+
 import jakarta.inject.Inject;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 
+import org.jabref.logic.preferences.CliPreferences;
+import org.jabref.logic.util.io.BackupFileUtil;
+
+import java.util.List;
+
 @Path("libraries")
 public class LibrariesResource {
-    @Inject
-    CliPreferences preferences;
+    @Inject CliPreferences preferences;
 
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public String get() {
-        List<String> fileNamesWithUniqueSuffix = preferences.getLastFilesOpenedPreferences().getLastFilesOpened().stream()
-                                                            .map(p -> p.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(p))
-                                                            .toList();
+        List<String> fileNamesWithUniqueSuffix =
+                preferences.getLastFilesOpenedPreferences().getLastFilesOpened().stream()
+                        .map(p -> p.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(p))
+                        .toList();
         return new Gson().toJson(fileNamesWithUniqueSuffix);
     }
 }
diff --git a/src/main/java/org/jabref/http/server/LibraryResource.java b/src/main/java/org/jabref/http/server/LibraryResource.java
index 8e4b3f7ef180..b32849b4be38 100644
--- a/src/main/java/org/jabref/http/server/LibraryResource.java
+++ b/src/main/java/org/jabref/http/server/LibraryResource.java
@@ -1,22 +1,8 @@
 package org.jabref.http.server;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.List;
-import java.util.Objects;
-
-import org.jabref.http.JabrefMediaType;
-import org.jabref.http.dto.BibEntryDTO;
-import org.jabref.logic.citationstyle.JabRefItemDataProvider;
-import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.importer.fileformat.BibtexImporter;
-import org.jabref.logic.preferences.CliPreferences;
-import org.jabref.logic.util.io.BackupFileUtil;
-import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import com.airhacks.afterburner.injection.Injector;
 import com.google.gson.Gson;
+
 import jakarta.inject.Inject;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.InternalServerErrorException;
@@ -26,28 +12,52 @@
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
+
+import org.jabref.http.JabrefMediaType;
+import org.jabref.http.dto.BibEntryDTO;
+import org.jabref.logic.citationstyle.JabRefItemDataProvider;
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.importer.fileformat.BibtexImporter;
+import org.jabref.logic.preferences.CliPreferences;
+import org.jabref.logic.util.io.BackupFileUtil;
+import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.Objects;
+
 @Path("libraries/{id}")
 public class LibraryResource {
     public static final Logger LOGGER = LoggerFactory.getLogger(LibraryResource.class);
 
-    @Inject
-    CliPreferences preferences;
+    @Inject CliPreferences preferences;
 
-    @Inject
-    Gson gson;
+    @Inject Gson gson;
 
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public String getJson(@PathParam("id") String id) {
         ParserResult parserResult = getParserResult(id);
-        BibEntryTypesManager entryTypesManager = Injector.instantiateModelOrService(BibEntryTypesManager.class);
-        List<BibEntryDTO> list = parserResult.getDatabase().getEntries().stream()
-                                             .peek(bibEntry -> bibEntry.getSharedBibEntryData().setSharedID(Objects.hash(bibEntry)))
-                                             .map(entry -> new BibEntryDTO(entry, parserResult.getDatabaseContext().getMode(), preferences.getFieldPreferences(), entryTypesManager))
-                                             .toList();
+        BibEntryTypesManager entryTypesManager =
+                Injector.instantiateModelOrService(BibEntryTypesManager.class);
+        List<BibEntryDTO> list =
+                parserResult.getDatabase().getEntries().stream()
+                        .peek(
+                                bibEntry ->
+                                        bibEntry.getSharedBibEntryData()
+                                                .setSharedID(Objects.hash(bibEntry)))
+                        .map(
+                                entry ->
+                                        new BibEntryDTO(
+                                                entry,
+                                                parserResult.getDatabaseContext().getMode(),
+                                                preferences.getFieldPreferences(),
+                                                entryTypesManager))
+                        .toList();
         return gson.toJson(list);
     }
 
@@ -56,7 +66,8 @@ public String getJson(@PathParam("id") String id) {
     public String getClsItemJson(@PathParam("id") String id) {
         ParserResult parserResult = getParserResult(id);
         JabRefItemDataProvider jabRefItemDataProvider = new JabRefItemDataProvider();
-        jabRefItemDataProvider.setData(parserResult.getDatabaseContext(), new BibEntryTypesManager());
+        jabRefItemDataProvider.setData(
+                parserResult.getDatabaseContext(), new BibEntryTypesManager());
         return jabRefItemDataProvider.toJson();
     }
 
@@ -64,7 +75,11 @@ private ParserResult getParserResult(String id) {
         java.nio.file.Path library = getLibraryPath(id);
         ParserResult parserResult;
         try {
-            parserResult = new BibtexImporter(preferences.getImportFormatPreferences(), new DummyFileUpdateMonitor()).importDatabase(library);
+            parserResult =
+                    new BibtexImporter(
+                                    preferences.getImportFormatPreferences(),
+                                    new DummyFileUpdateMonitor())
+                            .importDatabase(library);
         } catch (IOException e) {
             LOGGER.warn("Could not find open library file {}", library, e);
             throw new InternalServerErrorException("Could not parse library", e);
@@ -83,16 +98,16 @@ public Response getBibtex(@PathParam("id") String id) {
             LOGGER.error("Could not read library {}", library, e);
             throw new InternalServerErrorException("Could not read library " + library, e);
         }
-        return Response.ok()
-                .entity(libraryAsString)
-                .build();
+        return Response.ok().entity(libraryAsString).build();
     }
 
     private java.nio.file.Path getLibraryPath(String id) {
-        return preferences.getLastFilesOpenedPreferences().getLastFilesOpened()
-                          .stream()
-                          .filter(p -> (p.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(p)).equals(id))
-                          .findAny()
-                          .orElseThrow(NotFoundException::new);
+        return preferences.getLastFilesOpenedPreferences().getLastFilesOpened().stream()
+                .filter(
+                        p ->
+                                (p.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(p))
+                                        .equals(id))
+                .findAny()
+                .orElseThrow(NotFoundException::new);
     }
 }
diff --git a/src/main/java/org/jabref/http/server/PreferencesFactory.java b/src/main/java/org/jabref/http/server/PreferencesFactory.java
index aadac431462f..669ede808b3b 100644
--- a/src/main/java/org/jabref/http/server/PreferencesFactory.java
+++ b/src/main/java/org/jabref/http/server/PreferencesFactory.java
@@ -1,10 +1,9 @@
 package org.jabref.http.server;
 
+import org.glassfish.hk2.api.Factory;
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.preferences.JabRefCliPreferences;
 
-import org.glassfish.hk2.api.Factory;
-
 public class PreferencesFactory implements Factory<CliPreferences> {
     @Override
     public CliPreferences provide() {
@@ -12,6 +11,5 @@ public CliPreferences provide() {
     }
 
     @Override
-    public void dispose(CliPreferences instance) {
-    }
+    public void dispose(CliPreferences instance) {}
 }
diff --git a/src/main/java/org/jabref/http/server/Server.java b/src/main/java/org/jabref/http/server/Server.java
index 050fe29b2695..a00b529eb74c 100644
--- a/src/main/java/org/jabref/http/server/Server.java
+++ b/src/main/java/org/jabref/http/server/Server.java
@@ -1,24 +1,26 @@
 package org.jabref.http.server;
 
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
+import jakarta.ws.rs.SeBootstrap;
 
-import javax.net.ssl.SSLContext;
+import net.harawata.appdirs.AppDirsFactory;
 
+import org.glassfish.grizzly.ssl.SSLContextConfigurator;
 import org.jabref.architecture.AllowedToUseStandardStreams;
 import org.jabref.logic.os.OS;
-
-import jakarta.ws.rs.SeBootstrap;
-import net.harawata.appdirs.AppDirsFactory;
-import org.glassfish.grizzly.ssl.SSLContextConfigurator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 
-@AllowedToUseStandardStreams("This is a CLI application. It resides in the package http.server to be close to the other http server related classes.")
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.net.ssl.SSLContext;
+
+@AllowedToUseStandardStreams(
+        "This is a CLI application. It resides in the package http.server to be close to the other http server related classes.")
 public class Server {
     private static final Logger LOGGER = LoggerFactory.getLogger(Server.class);
 
@@ -32,18 +34,23 @@ public static void main(final String[] args) throws InterruptedException {
         SLF4JBridgeHandler.removeHandlersForRootLogger();
         SLF4JBridgeHandler.install();
 
-        final List<Path> lastFilesOpened = List.of(); // JabRefCliPreferences.getInstance().getGuiPreferences().getLastFilesOpened();
+        final List<Path> lastFilesOpened =
+                List
+                        .of(); // JabRefCliPreferences.getInstance().getGuiPreferences().getLastFilesOpened();
 
-        // The server serves the last opened files (see org.jabref.http.server.LibraryResource.getLibraryPath)
+        // The server serves the last opened files (see
+        // org.jabref.http.server.LibraryResource.getLibraryPath)
         // In a testing environment, this might be difficult to handle
-        // This is a quick solution. The architectural fine solution would use some http context or other @Inject_ed variables in org.jabref.http.server.LibraryResource
+        // This is a quick solution. The architectural fine solution would use some http context or
+        // other @Inject_ed variables in org.jabref.http.server.LibraryResource
         if (args.length > 0) {
             LOGGER.debug("Command line parameters passed");
-            List<Path> filesToAdd = Arrays.stream(args)
-                                          .map(Path::of)
-                                          .filter(Files::exists)
-                                          .filter(path -> !lastFilesOpened.contains(path))
-                                          .toList();
+            List<Path> filesToAdd =
+                    Arrays.stream(args)
+                            .map(Path::of)
+                            .filter(Files::exists)
+                            .filter(path -> !lastFilesOpened.contains(path))
+                            .toList();
 
             LOGGER.debug("Adding following files to the list of opened libraries: {}", filesToAdd);
 
@@ -57,7 +64,9 @@ public static void main(final String[] args) throws InterruptedException {
             LOGGER.debug("still no library available to serve, serve the demo library");
             // Server.class.getResource("...") is always null here, thus trying relative path
             // Path bibPath = Path.of(Server.class.getResource("http-server-demo.bib").toURI());
-            Path bibPath = Path.of("src/main/resources/org/jabref/http/server/http-server-demo.bib").toAbsolutePath();
+            Path bibPath =
+                    Path.of("src/main/resources/org/jabref/http/server/http-server-demo.bib")
+                            .toAbsolutePath();
             LOGGER.debug("Location of demo library: {}", bibPath);
             lastFilesOpened.add(bibPath);
         }
@@ -72,40 +81,47 @@ public static void main(final String[] args) throws InterruptedException {
 
     private static void startServer() {
         SSLContext sslContext = getSslContext();
-        SeBootstrap.Configuration configuration = SeBootstrap.Configuration
-                .builder()
-                .sslContext(sslContext)
-                .protocol("HTTPS")
-                .port(6051)
-                .build();
+        SeBootstrap.Configuration configuration =
+                SeBootstrap.Configuration.builder()
+                        .sslContext(sslContext)
+                        .protocol("HTTPS")
+                        .port(6051)
+                        .build();
         LOGGER.debug("Starting server...");
-        SeBootstrap.start(Application.class, configuration).thenAccept(instance -> {
-            LOGGER.debug("Server started.");
-            instance.stopOnShutdown(stopResult ->
-                    LOGGER.debug("Stop result: {} [Native stop result: {}].", stopResult,
-                            stopResult.unwrap(Object.class)));
-            final URI uri = instance.configuration().baseUri();
-            LOGGER.debug("Instance {} running at {} [Native handle: {}].%n", instance, uri,
-                    instance.unwrap(Object.class));
-            LOGGER.debug("Send SIGKILL to shutdown.");
-            serverInstance = instance;
-        });
+        SeBootstrap.start(Application.class, configuration)
+                .thenAccept(
+                        instance -> {
+                            LOGGER.debug("Server started.");
+                            instance.stopOnShutdown(
+                                    stopResult ->
+                                            LOGGER.debug(
+                                                    "Stop result: {} [Native stop result: {}].",
+                                                    stopResult,
+                                                    stopResult.unwrap(Object.class)));
+                            final URI uri = instance.configuration().baseUri();
+                            LOGGER.debug(
+                                    "Instance {} running at {} [Native handle: {}].%n",
+                                    instance, uri, instance.unwrap(Object.class));
+                            LOGGER.debug("Send SIGKILL to shutdown.");
+                            serverInstance = instance;
+                        });
     }
 
     private static SSLContext getSslContext() {
         SSLContextConfigurator sslContextConfig = new SSLContextConfigurator();
-        Path serverKeyStore = Path.of(AppDirsFactory.getInstance()
-                                         .getUserDataDir(
-                                                 OS.APP_DIR_APP_NAME,
-                                                 "ssl",
-                                                 OS.APP_DIR_APP_AUTHOR))
-                       .resolve("server.p12");
+        Path serverKeyStore =
+                Path.of(
+                                AppDirsFactory.getInstance()
+                                        .getUserDataDir(
+                                                OS.APP_DIR_APP_NAME, "ssl", OS.APP_DIR_APP_AUTHOR))
+                        .resolve("server.p12");
         if (Files.exists(serverKeyStore)) {
             sslContextConfig.setKeyStoreFile(serverKeyStore.toString());
             sslContextConfig.setKeyStorePass("changeit");
         } else {
             LOGGER.error("Could not find server key store {}.", serverKeyStore);
-            LOGGER.error("One create one by following the steps described in [http-server.md](/docs/code-howtos/http-server.md), which is rendered at <https://devdocs.jabref.org/code-howtos/http-server.html>");
+            LOGGER.error(
+                    "One create one by following the steps described in [http-server.md](/docs/code-howtos/http-server.md), which is rendered at <https://devdocs.jabref.org/code-howtos/http-server.html>");
         }
         return sslContextConfig.createSSLContext(false);
     }
diff --git a/src/main/java/org/jabref/logic/FilePreferences.java b/src/main/java/org/jabref/logic/FilePreferences.java
index 17f469f8f8f5..fb0f9f2504e1 100644
--- a/src/main/java/org/jabref/logic/FilePreferences.java
+++ b/src/main/java/org/jabref/logic/FilePreferences.java
@@ -1,8 +1,5 @@
 package org.jabref.logic;
 
-import java.nio.file.Path;
-import java.util.Optional;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -12,12 +9,16 @@
 
 import org.jabref.model.strings.StringUtil;
 
+import java.nio.file.Path;
+import java.util.Optional;
+
 /**
  *  Preferences for the linked files
  */
 public class FilePreferences {
 
-    public static final String[] DEFAULT_FILENAME_PATTERNS = new String[] {"[bibtexkey]", "[bibtexkey] - [title]"};
+    public static final String[] DEFAULT_FILENAME_PATTERNS =
+            new String[] {"[bibtexkey]", "[bibtexkey] - [title]"};
 
     private final StringProperty userAndHost = new SimpleStringProperty();
     private final SimpleStringProperty mainFileDirectory = new SimpleStringProperty();
@@ -33,19 +34,20 @@ public class FilePreferences {
     private final BooleanProperty moveToTrash = new SimpleBooleanProperty();
     private final BooleanProperty shouldKeepDownloadUrl = new SimpleBooleanProperty();
 
-    public FilePreferences(String userAndHost,
-                           String mainFileDirectory,
-                           boolean storeFilesRelativeToBibFile,
-                           String fileNamePattern,
-                           String fileDirectoryPattern,
-                           boolean downloadLinkedFiles,
-                           boolean fulltextIndexLinkedFiles,
-                           Path workingDirectory,
-                           boolean createBackup,
-                           Path backupDirectory,
-                           boolean confirmDeleteLinkedFile,
-                           boolean moveToTrash,
-                           boolean shouldKeepDownloadUrl) {
+    public FilePreferences(
+            String userAndHost,
+            String mainFileDirectory,
+            boolean storeFilesRelativeToBibFile,
+            String fileNamePattern,
+            String fileDirectoryPattern,
+            boolean downloadLinkedFiles,
+            boolean fulltextIndexLinkedFiles,
+            Path workingDirectory,
+            boolean createBackup,
+            Path backupDirectory,
+            boolean confirmDeleteLinkedFile,
+            boolean moveToTrash,
+            boolean shouldKeepDownloadUrl) {
         this.userAndHost.setValue(userAndHost);
         this.mainFileDirectory.setValue(mainFileDirectory);
         this.storeFilesRelativeToBibFile.setValue(storeFilesRelativeToBibFile);
diff --git a/src/main/java/org/jabref/logic/InternalPreferences.java b/src/main/java/org/jabref/logic/InternalPreferences.java
index 722446408a34..6e70f9fe6cfb 100644
--- a/src/main/java/org/jabref/logic/InternalPreferences.java
+++ b/src/main/java/org/jabref/logic/InternalPreferences.java
@@ -1,7 +1,5 @@
 package org.jabref.logic;
 
-import java.nio.file.Path;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -11,6 +9,8 @@
 
 import org.jabref.logic.util.Version;
 
+import java.nio.file.Path;
+
 public class InternalPreferences {
 
     private final ObjectProperty<Version> ignoredVersion;
@@ -19,11 +19,12 @@ public class InternalPreferences {
     private final StringProperty userAndHost;
     private final BooleanProperty memoryStickMode;
 
-    public InternalPreferences(Version ignoredVersion,
-                               boolean versionCheck,
-                               Path exportPath,
-                               String userAndHost,
-                               boolean memoryStickMode) {
+    public InternalPreferences(
+            Version ignoredVersion,
+            boolean versionCheck,
+            Path exportPath,
+            String userAndHost,
+            boolean memoryStickMode) {
         this.ignoredVersion = new SimpleObjectProperty<>(ignoredVersion);
         this.versionCheckEnabled = new SimpleBooleanProperty(versionCheck);
         this.lastPreferencesExportPath = new SimpleObjectProperty<>(exportPath);
diff --git a/src/main/java/org/jabref/logic/JabRefException.java b/src/main/java/org/jabref/logic/JabRefException.java
index 4caad91fa1db..ac707e8e4201 100644
--- a/src/main/java/org/jabref/logic/JabRefException.java
+++ b/src/main/java/org/jabref/logic/JabRefException.java
@@ -34,7 +34,9 @@ public JabRefException(Throwable cause) {
     public String getLocalizedMessage() {
         if (localizedMessage == null) {
             String message = getMessage();
-            LOGGER.debug("No localized exception message defined. Falling back to getMessage() ({}).", message);
+            LOGGER.debug(
+                    "No localized exception message defined. Falling back to getMessage() ({}).",
+                    message);
             return message;
         } else {
             return localizedMessage;
diff --git a/src/main/java/org/jabref/logic/LibraryPreferences.java b/src/main/java/org/jabref/logic/LibraryPreferences.java
index 64ca8501de02..af32852b4172 100644
--- a/src/main/java/org/jabref/logic/LibraryPreferences.java
+++ b/src/main/java/org/jabref/logic/LibraryPreferences.java
@@ -13,9 +13,10 @@ public class LibraryPreferences {
     private final BooleanProperty alwaysReformatOnSave;
     private final BooleanProperty autoSave;
 
-    public LibraryPreferences(BibDatabaseMode defaultBibDatabaseMode,
-                              boolean alwaysReformatOnSave,
-                              boolean autoSave) {
+    public LibraryPreferences(
+            BibDatabaseMode defaultBibDatabaseMode,
+            boolean alwaysReformatOnSave,
+            boolean autoSave) {
         this.defaultBibDatabaseMode = new SimpleObjectProperty<>(defaultBibDatabaseMode);
         this.alwaysReformatOnSave = new SimpleBooleanProperty(alwaysReformatOnSave);
         this.autoSave = new SimpleBooleanProperty(autoSave);
diff --git a/src/main/java/org/jabref/logic/UiCommand.java b/src/main/java/org/jabref/logic/UiCommand.java
index 1fc8a699ce59..d7d1f3593928 100644
--- a/src/main/java/org/jabref/logic/UiCommand.java
+++ b/src/main/java/org/jabref/logic/UiCommand.java
@@ -1,15 +1,15 @@
 package org.jabref.logic;
 
-import java.util.List;
-
 import org.jabref.logic.importer.ParserResult;
 
+import java.util.List;
+
 public sealed interface UiCommand {
-    record BlankWorkspace() implements UiCommand { }
+    record BlankWorkspace() implements UiCommand {}
 
-    record JumpToEntryKey(String citationKey) implements UiCommand { }
+    record JumpToEntryKey(String citationKey) implements UiCommand {}
 
-    record OpenDatabases(List<ParserResult> parserResults) implements UiCommand { }
+    record OpenDatabases(List<ParserResult> parserResults) implements UiCommand {}
 
-    record AutoSetFileLinks(List<ParserResult> parserResults) implements UiCommand { }
+    record AutoSetFileLinks(List<ParserResult> parserResults) implements UiCommand {}
 }
diff --git a/src/main/java/org/jabref/logic/WatchServiceUnavailableException.java b/src/main/java/org/jabref/logic/WatchServiceUnavailableException.java
index e669bef855bb..c76f09953812 100644
--- a/src/main/java/org/jabref/logic/WatchServiceUnavailableException.java
+++ b/src/main/java/org/jabref/logic/WatchServiceUnavailableException.java
@@ -1,7 +1,8 @@
 package org.jabref.logic;
 
 public class WatchServiceUnavailableException extends JabRefException {
-    public WatchServiceUnavailableException(final String message, final String localizedMessage, final Throwable cause) {
+    public WatchServiceUnavailableException(
+            final String message, final String localizedMessage, final Throwable cause) {
         super(message, localizedMessage, cause);
     }
 }
diff --git a/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java b/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
index b17fa670867c..686b60346766 100644
--- a/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
+++ b/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
@@ -1,71 +1,86 @@
 package org.jabref.logic.ai;
 
-import java.util.List;
-import java.util.Map;
-
 import org.jabref.model.ai.AiProvider;
 import org.jabref.model.ai.EmbeddingModel;
 
+import java.util.List;
+import java.util.Map;
+
 public class AiDefaultPreferences {
-    public static final Map<AiProvider, List<String>> AVAILABLE_CHAT_MODELS = Map.of(
-            AiProvider.OPEN_AI, List.of("gpt-4o-mini", "gpt-4o", "gpt-4", "gpt-4-turbo", "gpt-3.5-turbo"),
-            // "mistral" and "mixtral" are not language mistakes.
-            AiProvider.MISTRAL_AI, List.of("open-mistral-nemo", "open-mistral-7b", "open-mixtral-8x7b", "open-mixtral-8x22b", "mistral-large-latest"),
-            AiProvider.GEMINI, List.of("gemini-1.5-flash", "gemini-1.5-pro", "gemini-1.0-pro"),
-            AiProvider.HUGGING_FACE, List.of()
-    );
+    public static final Map<AiProvider, List<String>> AVAILABLE_CHAT_MODELS =
+            Map.of(
+                    AiProvider.OPEN_AI,
+                            List.of(
+                                    "gpt-4o-mini",
+                                    "gpt-4o",
+                                    "gpt-4",
+                                    "gpt-4-turbo",
+                                    "gpt-3.5-turbo"),
+                    // "mistral" and "mixtral" are not language mistakes.
+                    AiProvider.MISTRAL_AI,
+                            List.of(
+                                    "open-mistral-nemo",
+                                    "open-mistral-7b",
+                                    "open-mixtral-8x7b",
+                                    "open-mixtral-8x22b",
+                                    "mistral-large-latest"),
+                    AiProvider.GEMINI,
+                            List.of("gemini-1.5-flash", "gemini-1.5-pro", "gemini-1.0-pro"),
+                    AiProvider.HUGGING_FACE, List.of());
 
-    public static final Map<AiProvider, String> PROVIDERS_PRIVACY_POLICIES = Map.of(
-            AiProvider.OPEN_AI, "https://openai.com/policies/privacy-policy/",
-            AiProvider.MISTRAL_AI, "https://mistral.ai/terms/#privacy-policy",
-            AiProvider.GEMINI, "https://ai.google.dev/gemini-api/terms",
-            AiProvider.HUGGING_FACE, "https://huggingface.co/privacy"
-    );
+    public static final Map<AiProvider, String> PROVIDERS_PRIVACY_POLICIES =
+            Map.of(
+                    AiProvider.OPEN_AI, "https://openai.com/policies/privacy-policy/",
+                    AiProvider.MISTRAL_AI, "https://mistral.ai/terms/#privacy-policy",
+                    AiProvider.GEMINI, "https://ai.google.dev/gemini-api/terms",
+                    AiProvider.HUGGING_FACE, "https://huggingface.co/privacy");
 
-    public static final Map<AiProvider, String> PROVIDERS_API_URLS = Map.of(
-            AiProvider.OPEN_AI, "https://api.openai.com/v1",
-            AiProvider.MISTRAL_AI, "https://api.mistral.ai/v1",
-            AiProvider.GEMINI, "https://generativelanguage.googleapis.com/v1beta/",
-            AiProvider.HUGGING_FACE, "https://huggingface.co/api"
-    );
+    public static final Map<AiProvider, String> PROVIDERS_API_URLS =
+            Map.of(
+                    AiProvider.OPEN_AI, "https://api.openai.com/v1",
+                    AiProvider.MISTRAL_AI, "https://api.mistral.ai/v1",
+                    AiProvider.GEMINI, "https://generativelanguage.googleapis.com/v1beta/",
+                    AiProvider.HUGGING_FACE, "https://huggingface.co/api");
 
-    public static final Map<AiProvider, Map<String, Integer>> CONTEXT_WINDOW_SIZES = Map.of(
-            AiProvider.OPEN_AI, Map.of(
-                    "gpt-4o-mini", 128000,
-                    "gpt-4o", 128000,
-                    "gpt-4", 8192,
-                    "gpt-4-turbo", 128000,
-                    "gpt-3.5-turbo", 16385
-            ),
-            AiProvider.MISTRAL_AI, Map.of(
-                    "mistral-large-latest", 128000,
-                    "open-mistral-nemo", 128000,
-                    "open-mistral-7b", 32000,
-                    "open-mixtral-8x7b", 32000,
-                    "open-mixtral-8x22b", 64000
-            ),
-            AiProvider.GEMINI, Map.of(
-                    "gemini-1.5-flash", 1048576,
-                    "gemini-1.5-pro", 2097152,
-                    "gemini-1.0-pro", 32000
-            )
-    );
+    public static final Map<AiProvider, Map<String, Integer>> CONTEXT_WINDOW_SIZES =
+            Map.of(
+                    AiProvider.OPEN_AI,
+                            Map.of(
+                                    "gpt-4o-mini", 128000,
+                                    "gpt-4o", 128000,
+                                    "gpt-4", 8192,
+                                    "gpt-4-turbo", 128000,
+                                    "gpt-3.5-turbo", 16385),
+                    AiProvider.MISTRAL_AI,
+                            Map.of(
+                                    "mistral-large-latest", 128000,
+                                    "open-mistral-nemo", 128000,
+                                    "open-mistral-7b", 32000,
+                                    "open-mixtral-8x7b", 32000,
+                                    "open-mixtral-8x22b", 64000),
+                    AiProvider.GEMINI,
+                            Map.of(
+                                    "gemini-1.5-flash", 1048576,
+                                    "gemini-1.5-pro", 2097152,
+                                    "gemini-1.0-pro", 32000));
 
     public static final boolean ENABLE_CHAT = false;
 
     public static final AiProvider PROVIDER = AiProvider.OPEN_AI;
 
-    public static final Map<AiProvider, String> CHAT_MODELS = Map.of(
-            AiProvider.OPEN_AI, "gpt-4o-mini",
-            AiProvider.MISTRAL_AI, "open-mixtral-8x22b",
-            AiProvider.GEMINI, "gemini-1.5-flash",
-            AiProvider.HUGGING_FACE, ""
-    );
+    public static final Map<AiProvider, String> CHAT_MODELS =
+            Map.of(
+                    AiProvider.OPEN_AI, "gpt-4o-mini",
+                    AiProvider.MISTRAL_AI, "open-mixtral-8x22b",
+                    AiProvider.GEMINI, "gemini-1.5-flash",
+                    AiProvider.HUGGING_FACE, "");
 
     public static final boolean CUSTOMIZE_SETTINGS = false;
 
-    public static final EmbeddingModel EMBEDDING_MODEL = EmbeddingModel.SENTENCE_TRANSFORMERS_ALL_MINILM_L12_V2;
-    public static final String SYSTEM_MESSAGE = "You are an AI assistant that analyses research papers. You answer questions about papers. You will be supplied with the necessary information. The supplied information will contain mentions of papers in form '@citationKey'. Whenever you refer to a paper, use its citation key in the same form with @ symbol. Whenever you find relevant information, always use the citation key. Here are the papers you are analyzing:\n";
+    public static final EmbeddingModel EMBEDDING_MODEL =
+            EmbeddingModel.SENTENCE_TRANSFORMERS_ALL_MINILM_L12_V2;
+    public static final String SYSTEM_MESSAGE =
+            "You are an AI assistant that analyses research papers. You answer questions about papers. You will be supplied with the necessary information. The supplied information will contain mentions of papers in form '@citationKey'. Whenever you refer to a paper, use its citation key in the same form with @ symbol. Whenever you find relevant information, always use the citation key. Here are the papers you are analyzing:\n";
     public static final double TEMPERATURE = 0.7;
     public static final int DOCUMENT_SPLITTER_CHUNK_SIZE = 300;
     public static final int DOCUMENT_SPLITTER_OVERLAP = 100;
diff --git a/src/main/java/org/jabref/logic/ai/AiPreferences.java b/src/main/java/org/jabref/logic/ai/AiPreferences.java
index d3c8bb345aea..d7888b009f44 100644
--- a/src/main/java/org/jabref/logic/ai/AiPreferences.java
+++ b/src/main/java/org/jabref/logic/ai/AiPreferences.java
@@ -1,7 +1,7 @@
 package org.jabref.logic.ai;
 
-import java.util.List;
-import java.util.Objects;
+import com.github.javakeyring.Keyring;
+import com.github.javakeyring.PasswordAccessException;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
@@ -18,12 +18,12 @@
 import org.jabref.model.ai.AiProvider;
 import org.jabref.model.ai.EmbeddingModel;
 import org.jabref.model.strings.StringUtil;
-
-import com.github.javakeyring.Keyring;
-import com.github.javakeyring.PasswordAccessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Objects;
+
 public class AiPreferences {
     private static final Logger LOGGER = LoggerFactory.getLogger(AiPreferences.class);
 
@@ -57,26 +57,26 @@ public class AiPreferences {
 
     private Runnable apiKeyChangeListener;
 
-    public AiPreferences(boolean enableAi,
-                         AiProvider aiProvider,
-                         String openAiChatModel,
-                         String mistralAiChatModel,
-                         String geminiChatModel,
-                         String huggingFaceChatModel,
-                         boolean customizeExpertSettings,
-                         String openAiApiBaseUrl,
-                         String mistralAiApiBaseUrl,
-                         String geminiApiBaseUrl,
-                         String huggingFaceApiBaseUrl,
-                         EmbeddingModel embeddingModel,
-                         String instruction,
-                         double temperature,
-                         int contextWindowSize,
-                         int documentSplitterChunkSize,
-                         int documentSplitterOverlapSize,
-                         int ragMaxResultsCount,
-                         double ragMinScore
-    ) {
+    public AiPreferences(
+            boolean enableAi,
+            AiProvider aiProvider,
+            String openAiChatModel,
+            String mistralAiChatModel,
+            String geminiChatModel,
+            String huggingFaceChatModel,
+            boolean customizeExpertSettings,
+            String openAiApiBaseUrl,
+            String mistralAiApiBaseUrl,
+            String geminiApiBaseUrl,
+            String huggingFaceApiBaseUrl,
+            EmbeddingModel embeddingModel,
+            String instruction,
+            double temperature,
+            int contextWindowSize,
+            int documentSplitterChunkSize,
+            int documentSplitterOverlapSize,
+            int ragMaxResultsCount,
+            double ragMinScore) {
         this.enableAi = new SimpleBooleanProperty(enableAi);
 
         this.aiProvider = new SimpleObjectProperty<>(aiProvider);
@@ -105,12 +105,18 @@ public AiPreferences(boolean enableAi,
 
     public String getApiKeyForAiProvider(AiProvider aiProvider) {
         try (final Keyring keyring = Keyring.create()) {
-            return keyring.getPassword(KEYRING_AI_SERVICE, KEYRING_AI_SERVICE_ACCOUNT + "-" + aiProvider.name());
+            return keyring.getPassword(
+                    KEYRING_AI_SERVICE, KEYRING_AI_SERVICE_ACCOUNT + "-" + aiProvider.name());
         } catch (PasswordAccessException e) {
-            LOGGER.debug("No API key stored for provider {}. Returning an empty string", aiProvider.getLabel());
+            LOGGER.debug(
+                    "No API key stored for provider {}. Returning an empty string",
+                    aiProvider.getLabel());
             return "";
         } catch (Exception e) {
-            LOGGER.warn("JabRef could not open keyring for retrieving {} API token", aiProvider.getLabel(), e);
+            LOGGER.warn(
+                    "JabRef could not open keyring for retrieving {} API token",
+                    aiProvider.getLabel(),
+                    e);
             return "";
         }
     }
@@ -119,15 +125,25 @@ public void storeAiApiKeyInKeyring(AiProvider aiProvider, String newKey) {
         try (final Keyring keyring = Keyring.create()) {
             if (StringUtil.isNullOrEmpty(newKey)) {
                 try {
-                    keyring.deletePassword(KEYRING_AI_SERVICE, KEYRING_AI_SERVICE_ACCOUNT + "-" + aiProvider.name());
+                    keyring.deletePassword(
+                            KEYRING_AI_SERVICE,
+                            KEYRING_AI_SERVICE_ACCOUNT + "-" + aiProvider.name());
                 } catch (PasswordAccessException ex) {
-                    LOGGER.debug("API key for provider {} not stored in keyring. JabRef does not store an empty key.", aiProvider.getLabel());
+                    LOGGER.debug(
+                            "API key for provider {} not stored in keyring. JabRef does not store an empty key.",
+                            aiProvider.getLabel());
                 }
             } else {
-                keyring.setPassword(KEYRING_AI_SERVICE, KEYRING_AI_SERVICE_ACCOUNT + "-" + aiProvider.name(), newKey);
+                keyring.setPassword(
+                        KEYRING_AI_SERVICE,
+                        KEYRING_AI_SERVICE_ACCOUNT + "-" + aiProvider.name(),
+                        newKey);
             }
         } catch (Exception e) {
-            LOGGER.warn("JabRef could not open keyring for storing {} API token", aiProvider.getLabel(), e);
+            LOGGER.warn(
+                    "JabRef could not open keyring for storing {} API token",
+                    aiProvider.getLabel(),
+                    e);
         }
     }
 
@@ -320,10 +336,18 @@ public int getContextWindowSize() {
             return contextWindowSize.get();
         } else {
             return switch (aiProvider.get()) {
-                case OPEN_AI -> AiDefaultPreferences.getContextWindowSize(AiProvider.OPEN_AI, openAiChatModel.get());
-                case MISTRAL_AI -> AiDefaultPreferences.getContextWindowSize(AiProvider.MISTRAL_AI, mistralAiChatModel.get());
-                case HUGGING_FACE -> AiDefaultPreferences.getContextWindowSize(AiProvider.HUGGING_FACE, huggingFaceChatModel.get());
-                case GEMINI -> AiDefaultPreferences.getContextWindowSize(AiProvider.GEMINI, geminiChatModel.get());
+                case OPEN_AI ->
+                        AiDefaultPreferences.getContextWindowSize(
+                                AiProvider.OPEN_AI, openAiChatModel.get());
+                case MISTRAL_AI ->
+                        AiDefaultPreferences.getContextWindowSize(
+                                AiProvider.MISTRAL_AI, mistralAiChatModel.get());
+                case HUGGING_FACE ->
+                        AiDefaultPreferences.getContextWindowSize(
+                                AiProvider.HUGGING_FACE, huggingFaceChatModel.get());
+                case GEMINI ->
+                        AiDefaultPreferences.getContextWindowSize(
+                                AiProvider.GEMINI, geminiChatModel.get());
             };
         }
     }
@@ -402,69 +426,72 @@ public void setRagMinScore(double ragMinScore) {
      * @param runnable The runnable that should be executed when the preferences change.
      */
     public void addListenerToEmbeddingsParametersChange(Runnable runnable) {
-        embeddingModel.addListener((observableValue, oldValue, newValue) -> {
-            if (newValue != oldValue) {
-                runnable.run();
-            }
-        });
-
-        documentSplitterChunkSize.addListener((observableValue, oldValue, newValue) -> {
-            if (!Objects.equals(newValue, oldValue)) {
-                runnable.run();
-            }
-        });
-
-        documentSplitterOverlapSize.addListener((observableValue, oldValue, newValue) -> {
-            if (!Objects.equals(newValue, oldValue)) {
-                runnable.run();
-            }
-        });
+        embeddingModel.addListener(
+                (observableValue, oldValue, newValue) -> {
+                    if (newValue != oldValue) {
+                        runnable.run();
+                    }
+                });
+
+        documentSplitterChunkSize.addListener(
+                (observableValue, oldValue, newValue) -> {
+                    if (!Objects.equals(newValue, oldValue)) {
+                        runnable.run();
+                    }
+                });
+
+        documentSplitterOverlapSize.addListener(
+                (observableValue, oldValue, newValue) -> {
+                    if (!Objects.equals(newValue, oldValue)) {
+                        runnable.run();
+                    }
+                });
     }
 
     public void addListenerToChatModels(Runnable runnable) {
-        List<Property<?>> observables = List.of(openAiChatModel, mistralAiChatModel, huggingFaceChatModel);
+        List<Property<?>> observables =
+                List.of(openAiChatModel, mistralAiChatModel, huggingFaceChatModel);
 
-        observables.forEach(obs -> obs.addListener((observableValue, oldValue, newValue) -> {
-            if (!newValue.equals(oldValue)) {
-                runnable.run();
-            }
-        }));
+        observables.forEach(
+                obs ->
+                        obs.addListener(
+                                (observableValue, oldValue, newValue) -> {
+                                    if (!newValue.equals(oldValue)) {
+                                        runnable.run();
+                                    }
+                                }));
     }
 
     public void addListenerToApiBaseUrls(Runnable runnable) {
-        List<Property<?>> observables = List.of(openAiApiBaseUrl, mistralAiApiBaseUrl, huggingFaceApiBaseUrl);
+        List<Property<?>> observables =
+                List.of(openAiApiBaseUrl, mistralAiApiBaseUrl, huggingFaceApiBaseUrl);
 
-        observables.forEach(obs -> obs.addListener((observableValue, oldValue, newValue) -> {
-            if (!newValue.equals(oldValue)) {
-                runnable.run();
-            }
-        }));
+        observables.forEach(
+                obs ->
+                        obs.addListener(
+                                (observableValue, oldValue, newValue) -> {
+                                    if (!newValue.equals(oldValue)) {
+                                        runnable.run();
+                                    }
+                                }));
     }
 
     public String getSelectedChatModel() {
         return switch (aiProvider.get()) {
-            case OPEN_AI ->
-                    openAiChatModel.get();
-            case MISTRAL_AI ->
-                    mistralAiChatModel.get();
-            case HUGGING_FACE ->
-                    huggingFaceChatModel.get();
-            case GEMINI ->
-                    geminiChatModel.get();
+            case OPEN_AI -> openAiChatModel.get();
+            case MISTRAL_AI -> mistralAiChatModel.get();
+            case HUGGING_FACE -> huggingFaceChatModel.get();
+            case GEMINI -> geminiChatModel.get();
         };
     }
 
     public String getSelectedApiBaseUrl() {
         if (customizeExpertSettings.get()) {
             return switch (aiProvider.get()) {
-                case OPEN_AI ->
-                        openAiApiBaseUrl.get();
-                case MISTRAL_AI ->
-                        mistralAiApiBaseUrl.get();
-                case HUGGING_FACE ->
-                        huggingFaceApiBaseUrl.get();
-                case GEMINI ->
-                        geminiApiBaseUrl.get();
+                case OPEN_AI -> openAiApiBaseUrl.get();
+                case MISTRAL_AI -> mistralAiApiBaseUrl.get();
+                case HUGGING_FACE -> huggingFaceApiBaseUrl.get();
+                case GEMINI -> geminiApiBaseUrl.get();
             };
         } else {
             return AiDefaultPreferences.PROVIDERS_API_URLS.get(aiProvider.get());
diff --git a/src/main/java/org/jabref/logic/ai/AiService.java b/src/main/java/org/jabref/logic/ai/AiService.java
index 30655f1721c9..823816a4c235 100644
--- a/src/main/java/org/jabref/logic/ai/AiService.java
+++ b/src/main/java/org/jabref/logic/ai/AiService.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.ai;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -19,7 +18,8 @@
 import org.jabref.logic.util.NotificationService;
 import org.jabref.logic.util.TaskExecutor;
 
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  *  The main class for the AI functionality.
@@ -34,13 +34,14 @@ public class AiService implements AutoCloseable {
     private static final String SUMMARIES_FILE_NAME = "summaries.mv";
 
     // This field is used to shut down AI-related background tasks.
-    // If a background task processes a big document and has a loop, then the task should check the status
+    // If a background task processes a big document and has a loop, then the task should check the
+    // status
     // of this property for being true. If it's true, then it should abort the cycle.
     private final BooleanProperty shutdownSignal = new SimpleBooleanProperty(false);
 
-    private final ExecutorService cachedThreadPool = Executors.newCachedThreadPool(
-            new ThreadFactoryBuilder().setNameFormat("ai-retrieval-pool-%d").build()
-    );
+    private final ExecutorService cachedThreadPool =
+            Executors.newCachedThreadPool(
+                    new ThreadFactoryBuilder().setNameFormat("ai-retrieval-pool-%d").build());
 
     private final MVStoreEmbeddingStore mvStoreEmbeddingStore;
     private final MVStoreFullyIngestedDocumentsTracker mvStoreFullyIngestedDocumentsTracker;
@@ -52,29 +53,52 @@ public class AiService implements AutoCloseable {
     private final IngestionService ingestionService;
     private final SummariesService summariesService;
 
-    public AiService(AiPreferences aiPreferences,
-                     FilePreferences filePreferences,
-                     NotificationService notificationService,
-                     TaskExecutor taskExecutor
-    ) {
+    public AiService(
+            AiPreferences aiPreferences,
+            FilePreferences filePreferences,
+            NotificationService notificationService,
+            TaskExecutor taskExecutor) {
         this.jabRefChatLanguageModel = new JabRefChatLanguageModel(aiPreferences);
 
-        this.mvStoreEmbeddingStore = new MVStoreEmbeddingStore(Directories.getAiFilesDirectory().resolve(EMBEDDINGS_FILE_NAME), notificationService);
-        this.mvStoreFullyIngestedDocumentsTracker = new MVStoreFullyIngestedDocumentsTracker(Directories.getAiFilesDirectory().resolve(FULLY_INGESTED_FILE_NAME), notificationService);
-        this.mvStoreSummariesStorage = new MVStoreSummariesStorage(Directories.getAiFilesDirectory().resolve(SUMMARIES_FILE_NAME), notificationService);
-
-        this.jabRefEmbeddingModel = new JabRefEmbeddingModel(aiPreferences, notificationService, taskExecutor);
-        this.aiChatService = new AiChatService(aiPreferences, jabRefChatLanguageModel, jabRefEmbeddingModel, mvStoreEmbeddingStore, cachedThreadPool);
-        this.ingestionService = new IngestionService(
-                aiPreferences,
-                shutdownSignal,
-                jabRefEmbeddingModel,
-                mvStoreEmbeddingStore,
-                mvStoreFullyIngestedDocumentsTracker,
-                filePreferences,
-                taskExecutor
-        );
-        this.summariesService = new SummariesService(aiPreferences, mvStoreSummariesStorage, jabRefChatLanguageModel, shutdownSignal, filePreferences, taskExecutor);
+        this.mvStoreEmbeddingStore =
+                new MVStoreEmbeddingStore(
+                        Directories.getAiFilesDirectory().resolve(EMBEDDINGS_FILE_NAME),
+                        notificationService);
+        this.mvStoreFullyIngestedDocumentsTracker =
+                new MVStoreFullyIngestedDocumentsTracker(
+                        Directories.getAiFilesDirectory().resolve(FULLY_INGESTED_FILE_NAME),
+                        notificationService);
+        this.mvStoreSummariesStorage =
+                new MVStoreSummariesStorage(
+                        Directories.getAiFilesDirectory().resolve(SUMMARIES_FILE_NAME),
+                        notificationService);
+
+        this.jabRefEmbeddingModel =
+                new JabRefEmbeddingModel(aiPreferences, notificationService, taskExecutor);
+        this.aiChatService =
+                new AiChatService(
+                        aiPreferences,
+                        jabRefChatLanguageModel,
+                        jabRefEmbeddingModel,
+                        mvStoreEmbeddingStore,
+                        cachedThreadPool);
+        this.ingestionService =
+                new IngestionService(
+                        aiPreferences,
+                        shutdownSignal,
+                        jabRefEmbeddingModel,
+                        mvStoreEmbeddingStore,
+                        mvStoreFullyIngestedDocumentsTracker,
+                        filePreferences,
+                        taskExecutor);
+        this.summariesService =
+                new SummariesService(
+                        aiPreferences,
+                        mvStoreSummariesStorage,
+                        jabRefChatLanguageModel,
+                        shutdownSignal,
+                        filePreferences,
+                        taskExecutor);
     }
 
     public JabRefChatLanguageModel getChatLanguageModel() {
diff --git a/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java b/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
index 8a802847d5b4..ca27bff92ff9 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
@@ -1,23 +1,5 @@
 package org.jabref.logic.ai.chatting;
 
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.stream.Collectors;
-
-import javafx.beans.property.StringProperty;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-
-import org.jabref.logic.ai.AiDefaultPreferences;
-import org.jabref.logic.ai.AiPreferences;
-import org.jabref.logic.ai.ingestion.FileEmbeddingsManager;
-import org.jabref.logic.ai.util.ErrorMessage;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.CanonicalBibEntry;
-import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.util.ListUtil;
-
 import dev.langchain4j.chain.Chain;
 import dev.langchain4j.chain.ConversationalRetrievalChain;
 import dev.langchain4j.data.message.AiMessage;
@@ -37,10 +19,29 @@
 import dev.langchain4j.store.embedding.EmbeddingStore;
 import dev.langchain4j.store.embedding.filter.Filter;
 import dev.langchain4j.store.embedding.filter.MetadataFilterBuilder;
+
 import jakarta.annotation.Nullable;
+
+import javafx.beans.property.StringProperty;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+
+import org.jabref.logic.ai.AiDefaultPreferences;
+import org.jabref.logic.ai.AiPreferences;
+import org.jabref.logic.ai.ingestion.FileEmbeddingsManager;
+import org.jabref.logic.ai.util.ErrorMessage;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.CanonicalBibEntry;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.util.ListUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.stream.Collectors;
+
 public class AiChatLogic {
     private static final Logger LOGGER = LoggerFactory.getLogger(AiChatLogic.class);
 
@@ -58,16 +59,16 @@ public class AiChatLogic {
     private ChatMemory chatMemory;
     private Chain<String, String> chain;
 
-    public AiChatLogic(AiPreferences aiPreferences,
-                       ChatLanguageModel chatLanguageModel,
-                       EmbeddingModel embeddingModel,
-                       EmbeddingStore<TextSegment> embeddingStore,
-                       Executor cachedThreadPool,
-                       StringProperty name,
-                       ObservableList<ChatMessage> chatHistory,
-                       ObservableList<BibEntry> entries,
-                       BibDatabaseContext bibDatabaseContext
-    ) {
+    public AiChatLogic(
+            AiPreferences aiPreferences,
+            ChatLanguageModel chatLanguageModel,
+            EmbeddingModel embeddingModel,
+            EmbeddingStore<TextSegment> embeddingStore,
+            Executor cachedThreadPool,
+            StringProperty name,
+            ObservableList<ChatMessage> chatHistory,
+            ObservableList<BibEntry> entries,
+            BibDatabaseContext bibDatabaseContext) {
         this.aiPreferences = aiPreferences;
         this.chatLanguageModel = chatLanguageModel;
         this.embeddingModel = embeddingModel;
@@ -85,8 +86,12 @@ public AiChatLogic(AiPreferences aiPreferences,
     }
 
     private void setupListeningToPreferencesChanges() {
-        aiPreferences.instructionProperty().addListener(obs -> setSystemMessage(aiPreferences.getInstruction()));
-        aiPreferences.contextWindowSizeProperty().addListener(obs -> rebuildFull(chatMemory.messages()));
+        aiPreferences
+                .instructionProperty()
+                .addListener(obs -> setSystemMessage(aiPreferences.getInstruction()));
+        aiPreferences
+                .contextWindowSizeProperty()
+                .addListener(obs -> rebuildFull(chatMemory.messages()));
     }
 
     private void rebuildFull(List<ChatMessage> chatMessages) {
@@ -95,12 +100,14 @@ private void rebuildFull(List<ChatMessage> chatMessages) {
     }
 
     private void rebuildChatMemory(List<ChatMessage> chatMessages) {
-        this.chatMemory = TokenWindowChatMemory
-                .builder()
-                .maxTokens(aiPreferences.getContextWindowSize(), new OpenAiTokenizer())
-                .build();
+        this.chatMemory =
+                TokenWindowChatMemory.builder()
+                        .maxTokens(aiPreferences.getContextWindowSize(), new OpenAiTokenizer())
+                        .build();
 
-        chatMessages.stream().filter(chatMessage -> !(chatMessage instanceof ErrorMessage)).forEach(chatMemory::add);
+        chatMessages.stream()
+                .filter(chatMessage -> !(chatMessage instanceof ErrorMessage))
+                .forEach(chatMemory::add);
 
         setSystemMessage(aiPreferences.getInstruction());
     }
@@ -113,37 +120,33 @@ private void rebuildChain() {
             // You must not pass an empty list to langchain4j {@link IsIn} filter.
             filter = null;
         } else {
-            filter = MetadataFilterBuilder
-                    .metadataKey(FileEmbeddingsManager.LINK_METADATA_KEY)
-                    .isIn(linkedFiles
-                            .stream()
-                            .map(LinkedFile::getLink)
-                            .toList()
-                    );
+            filter =
+                    MetadataFilterBuilder.metadataKey(FileEmbeddingsManager.LINK_METADATA_KEY)
+                            .isIn(linkedFiles.stream().map(LinkedFile::getLink).toList());
         }
 
-        ContentRetriever contentRetriever = EmbeddingStoreContentRetriever
-                .builder()
-                .embeddingStore(embeddingStore)
-                .filter(filter)
-                .embeddingModel(embeddingModel)
-                .maxResults(aiPreferences.getRagMaxResultsCount())
-                .minScore(aiPreferences.getRagMinScore())
-                .build();
-
-        RetrievalAugmentor retrievalAugmentor = DefaultRetrievalAugmentor
-                .builder()
-                .contentRetriever(contentRetriever)
-                .contentInjector(new JabRefContentInjector(bibDatabaseContext))
-                .executor(cachedThreadPool)
-                .build();
-
-        this.chain = ConversationalRetrievalChain
-                .builder()
-                .chatLanguageModel(chatLanguageModel)
-                .retrievalAugmentor(retrievalAugmentor)
-                .chatMemory(chatMemory)
-                .build();
+        ContentRetriever contentRetriever =
+                EmbeddingStoreContentRetriever.builder()
+                        .embeddingStore(embeddingStore)
+                        .filter(filter)
+                        .embeddingModel(embeddingModel)
+                        .maxResults(aiPreferences.getRagMaxResultsCount())
+                        .minScore(aiPreferences.getRagMinScore())
+                        .build();
+
+        RetrievalAugmentor retrievalAugmentor =
+                DefaultRetrievalAugmentor.builder()
+                        .contentRetriever(contentRetriever)
+                        .contentInjector(new JabRefContentInjector(bibDatabaseContext))
+                        .executor(cachedThreadPool)
+                        .build();
+
+        this.chain =
+                ConversationalRetrievalChain.builder()
+                        .chatLanguageModel(chatLanguageModel)
+                        .retrievalAugmentor(retrievalAugmentor)
+                        .chatMemory(chatMemory)
+                        .build();
     }
 
     private void setSystemMessage(String systemMessage) {
@@ -151,7 +154,10 @@ private void setSystemMessage(String systemMessage) {
     }
 
     private String augmentSystemMessage(String systemMessage) {
-        String entriesInfo = entries.stream().map(CanonicalBibEntry::getCanonicalRepresentation).collect(Collectors.joining("\n"));
+        String entriesInfo =
+                entries.stream()
+                        .map(CanonicalBibEntry::getCanonicalRepresentation)
+                        .collect(Collectors.joining("\n"));
 
         return systemMessage + "\n" + entriesInfo;
     }
@@ -159,7 +165,8 @@ private String augmentSystemMessage(String systemMessage) {
     public AiMessage execute(UserMessage message) {
         // Message will be automatically added to ChatMemory through ConversationalRetrievalChain.
 
-        LOGGER.info("Sending message to AI provider ({}) for answering in {}: {}",
+        LOGGER.info(
+                "Sending message to AI provider ({}) for answering in {}: {}",
                 AiDefaultPreferences.PROVIDERS_API_URLS.get(aiPreferences.getAiProvider()),
                 name.get(),
                 message.singleText());
@@ -168,7 +175,8 @@ public AiMessage execute(UserMessage message) {
         AiMessage result = new AiMessage(chain.execute(message.singleText()));
         chatHistory.add(result);
 
-        LOGGER.debug("Message was answered by the AI provider for {}: {}", name.get(), result.text());
+        LOGGER.debug(
+                "Message was answered by the AI provider for {}: {}", name.get(), result.text());
 
         return result;
     }
diff --git a/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java b/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java
index d12b20ec502c..5decc7c4e673 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java
@@ -1,6 +1,10 @@
 package org.jabref.logic.ai.chatting;
 
-import java.util.concurrent.Executor;
+import dev.langchain4j.data.message.ChatMessage;
+import dev.langchain4j.data.segment.TextSegment;
+import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.embedding.EmbeddingModel;
+import dev.langchain4j.store.embedding.EmbeddingStore;
 
 import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
@@ -9,11 +13,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
-import dev.langchain4j.data.message.ChatMessage;
-import dev.langchain4j.data.segment.TextSegment;
-import dev.langchain4j.model.chat.ChatLanguageModel;
-import dev.langchain4j.model.embedding.EmbeddingModel;
-import dev.langchain4j.store.embedding.EmbeddingStore;
+import java.util.concurrent.Executor;
 
 public class AiChatService {
     private final AiPreferences aiPreferences;
@@ -22,12 +22,12 @@ public class AiChatService {
     private final EmbeddingStore<TextSegment> embeddingStore;
     private final Executor cachedThreadPool;
 
-    public AiChatService(AiPreferences aiPreferences,
-                       ChatLanguageModel chatLanguageModel,
-                       EmbeddingModel embeddingModel,
-                       EmbeddingStore<TextSegment> embeddingStore,
-                       Executor cachedThreadPool
-    ) {
+    public AiChatService(
+            AiPreferences aiPreferences,
+            ChatLanguageModel chatLanguageModel,
+            EmbeddingModel embeddingModel,
+            EmbeddingStore<TextSegment> embeddingStore,
+            Executor cachedThreadPool) {
         this.aiPreferences = aiPreferences;
         this.chatLanguageModel = chatLanguageModel;
         this.embeddingModel = embeddingModel;
@@ -39,8 +39,7 @@ public AiChatLogic makeChat(
             StringProperty name,
             ObservableList<ChatMessage> chatHistory,
             ObservableList<BibEntry> entries,
-            BibDatabaseContext bibDatabaseContext
-    ) {
+            BibDatabaseContext bibDatabaseContext) {
         return new AiChatLogic(
                 aiPreferences,
                 chatLanguageModel,
@@ -50,7 +49,6 @@ public AiChatLogic makeChat(
                 name,
                 chatHistory,
                 entries,
-                bibDatabaseContext
-        );
+                bibDatabaseContext);
     }
 }
diff --git a/src/main/java/org/jabref/logic/ai/chatting/JabRefContentInjector.java b/src/main/java/org/jabref/logic/ai/chatting/JabRefContentInjector.java
index d9762f12e7ca..d56959783e98 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/JabRefContentInjector.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/JabRefContentInjector.java
@@ -1,23 +1,25 @@
 package org.jabref.logic.ai.chatting;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
+import static org.jabref.logic.ai.ingestion.FileEmbeddingsManager.LINK_METADATA_KEY;
 
 import dev.langchain4j.data.message.UserMessage;
 import dev.langchain4j.model.input.PromptTemplate;
 import dev.langchain4j.rag.content.Content;
 import dev.langchain4j.rag.content.injector.ContentInjector;
 
-import static org.jabref.logic.ai.ingestion.FileEmbeddingsManager.LINK_METADATA_KEY;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class JabRefContentInjector implements ContentInjector {
-    public static final PromptTemplate DEFAULT_PROMPT_TEMPLATE = PromptTemplate.from("{{userMessage}}\n\nAnswer using the following information:\n{{contents}}");
+    public static final PromptTemplate DEFAULT_PROMPT_TEMPLATE =
+            PromptTemplate.from(
+                    "{{userMessage}}\n\nAnswer using the following information:\n{{contents}}");
 
     private final BibDatabaseContext bibDatabaseContext;
 
@@ -27,7 +29,8 @@ public JabRefContentInjector(BibDatabaseContext bibDatabaseContext) {
 
     @Override
     public UserMessage inject(List<Content> list, UserMessage userMessage) {
-        String contentText = list.stream().map(this::contentToString).collect(Collectors.joining("\n\n"));
+        String contentText =
+                list.stream().map(this::contentToString).collect(Collectors.joining("\n\n"));
 
         String res = applyPrompt(userMessage.singleText(), contentText);
         return new UserMessage(res);
@@ -41,10 +44,11 @@ private String contentToString(Content content) {
             return text;
         }
 
-        String keys = findEntriesByLink(link)
-                .filter(entry -> entry.getCitationKey().isPresent())
-                .map(entry -> "@" + entry.getCitationKey().get())
-                .collect(Collectors.joining(", "));
+        String keys =
+                findEntriesByLink(link)
+                        .filter(entry -> entry.getCitationKey().isPresent())
+                        .map(entry -> "@" + entry.getCitationKey().get())
+                        .collect(Collectors.joining(", "));
 
         if (keys.isEmpty()) {
             return text;
@@ -54,7 +58,11 @@ private String contentToString(Content content) {
     }
 
     private Stream<BibEntry> findEntriesByLink(String link) {
-        return bibDatabaseContext.getEntries().stream().filter(entry -> entry.getFiles().stream().anyMatch(file -> file.getLink().equals(link)));
+        return bibDatabaseContext.getEntries().stream()
+                .filter(
+                        entry ->
+                                entry.getFiles().stream()
+                                        .anyMatch(file -> file.getLink().equals(link)));
     }
 
     private String applyPrompt(String userMessage, String contents) {
diff --git a/src/main/java/org/jabref/logic/ai/chatting/chathistory/ChatHistoryStorage.java b/src/main/java/org/jabref/logic/ai/chatting/chathistory/ChatHistoryStorage.java
index 1a30a4332e71..280551a8fe73 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/chathistory/ChatHistoryStorage.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/chathistory/ChatHistoryStorage.java
@@ -1,14 +1,15 @@
 package org.jabref.logic.ai.chatting.chathistory;
 
+import dev.langchain4j.data.message.ChatMessage;
+
 import java.nio.file.Path;
 import java.util.List;
 
-import dev.langchain4j.data.message.ChatMessage;
-
 public interface ChatHistoryStorage {
     List<ChatMessage> loadMessagesForEntry(Path bibDatabasePath, String citationKey);
 
-    void storeMessagesForEntry(Path bibDatabasePath, String citationKey, List<ChatMessage> messages);
+    void storeMessagesForEntry(
+            Path bibDatabasePath, String citationKey, List<ChatMessage> messages);
 
     List<ChatMessage> loadMessagesForGroup(Path bibDatabasePath, String name);
 
diff --git a/src/main/java/org/jabref/logic/ai/chatting/chathistory/storages/MVStoreChatHistoryStorage.java b/src/main/java/org/jabref/logic/ai/chatting/chathistory/storages/MVStoreChatHistoryStorage.java
index 31e13930b3e9..3028212d8940 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/chathistory/storages/MVStoreChatHistoryStorage.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/chathistory/storages/MVStoreChatHistoryStorage.java
@@ -1,24 +1,25 @@
 package org.jabref.logic.ai.chatting.chathistory.storages;
 
-import java.io.Serializable;
-import java.nio.file.Path;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import dev.langchain4j.data.message.AiMessage;
+import dev.langchain4j.data.message.ChatMessage;
+import dev.langchain4j.data.message.UserMessage;
+
+import kotlin.ranges.IntRange;
 
 import org.jabref.logic.ai.chatting.chathistory.ChatHistoryStorage;
 import org.jabref.logic.ai.util.ErrorMessage;
 import org.jabref.logic.ai.util.MVStoreBase;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.NotificationService;
-
-import dev.langchain4j.data.message.AiMessage;
-import dev.langchain4j.data.message.ChatMessage;
-import dev.langchain4j.data.message.UserMessage;
-import kotlin.ranges.IntRange;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.Serializable;
+import java.nio.file.Path;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
 public class MVStoreChatHistoryStorage extends MVStoreBase implements ChatHistoryStorage {
     private static final String ENTRY_CHAT_HISTORY_PREFIX = "entry";
     private static final String GROUP_CHAT_HISTORY_PREFIX = "group";
@@ -36,14 +37,13 @@ private static String getContentFromLangchainMessage(ChatMessage chatMessage) {
             String content;
 
             switch (chatMessage) {
-                case AiMessage aiMessage ->
-                        content = aiMessage.text();
-                case UserMessage userMessage ->
-                        content = userMessage.singleText();
-                case ErrorMessage errorMessage ->
-                        content = errorMessage.getText();
+                case AiMessage aiMessage -> content = aiMessage.text();
+                case UserMessage userMessage -> content = userMessage.singleText();
+                case ErrorMessage errorMessage -> content = errorMessage.getText();
                 default -> {
-                    LOGGER.warn("ChatHistoryRecord supports only AI, user. and error messages, but added message has other type: {}", chatMessage.type().name());
+                    LOGGER.warn(
+                            "ChatHistoryRecord supports only AI, user. and error messages, but added message has other type: {}",
+                            chatMessage.type().name());
                     return "";
                 }
             }
@@ -59,7 +59,9 @@ public ChatMessage toLangchainMessage() {
             } else if (className.equals(ErrorMessage.class.getName())) {
                 return new ErrorMessage(content);
             } else {
-                LOGGER.warn("ChatHistoryRecord supports only AI and user messages, but retrieved message has other type: {}. Will treat as an AI message.", className);
+                LOGGER.warn(
+                        "ChatHistoryRecord supports only AI and user messages, but retrieved message has other type: {}. Will treat as an AI message.",
+                        className);
                 return new AiMessage(content);
             }
         }
@@ -75,7 +77,8 @@ public List<ChatMessage> loadMessagesForEntry(Path bibDatabasePath, String citat
     }
 
     @Override
-    public void storeMessagesForEntry(Path bibDatabasePath, String citationKey, List<ChatMessage> messages) {
+    public void storeMessagesForEntry(
+            Path bibDatabasePath, String citationKey, List<ChatMessage> messages) {
         storeMessagesForMap(getMapForEntry(bibDatabasePath, citationKey), messages);
     }
 
@@ -85,29 +88,32 @@ public List<ChatMessage> loadMessagesForGroup(Path bibDatabasePath, String name)
     }
 
     @Override
-    public void storeMessagesForGroup(Path bibDatabasePath, String name, List<ChatMessage> messages) {
+    public void storeMessagesForGroup(
+            Path bibDatabasePath, String name, List<ChatMessage> messages) {
         storeMessagesForMap(getMapForGroup(bibDatabasePath, name), messages);
     }
 
     private List<ChatMessage> loadMessagesFromMap(Map<Integer, ChatHistoryRecord> map) {
         return map
                 .entrySet()
-                // We need to check all keys, because upon deletion, there can be "holes" in the integer.
+                // We need to check all keys, because upon deletion, there can be "holes" in the
+                // integer.
                 .stream()
                 .sorted(Comparator.comparingInt(Map.Entry::getKey))
                 .map(entry -> entry.getValue().toLangchainMessage())
                 .toList();
     }
 
-    private void storeMessagesForMap(Map<Integer, ChatHistoryRecord> map, List<ChatMessage> messages) {
+    private void storeMessagesForMap(
+            Map<Integer, ChatHistoryRecord> map, List<ChatMessage> messages) {
         map.clear();
 
-        new IntRange(0, messages.size() - 1).forEach(i ->
-                map.put(i, ChatHistoryRecord.fromLangchainMessage(messages.get(i)))
-        );
+        new IntRange(0, messages.size() - 1)
+                .forEach(i -> map.put(i, ChatHistoryRecord.fromLangchainMessage(messages.get(i))));
     }
 
-    private Map<Integer, ChatHistoryRecord> getMapForEntry(Path bibDatabasePath, String citationKey) {
+    private Map<Integer, ChatHistoryRecord> getMapForEntry(
+            Path bibDatabasePath, String citationKey) {
         return getMap(bibDatabasePath, ENTRY_CHAT_HISTORY_PREFIX, citationKey);
     }
 
@@ -126,6 +132,7 @@ protected String errorMessageForOpening() {
 
     @Override
     protected String errorMessageForOpeningLocalized() {
-        return Localization.lang("An error occurred while opening chat history storage. Chat history of entries and groups will not be stored in the next session.");
+        return Localization.lang(
+                "An error occurred while opening chat history storage. Chat history of entries and groups will not be stored in the next session.");
     }
 }
diff --git a/src/main/java/org/jabref/logic/ai/chatting/model/JabRefChatLanguageModel.java b/src/main/java/org/jabref/logic/ai/chatting/model/JabRefChatLanguageModel.java
index 92fc11df4844..4e9e63280ba3 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/model/JabRefChatLanguageModel.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/model/JabRefChatLanguageModel.java
@@ -1,17 +1,7 @@
 package org.jabref.logic.ai.chatting.model;
 
-import java.net.http.HttpClient;
-import java.time.Duration;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.jabref.logic.ai.AiPreferences;
-import org.jabref.logic.ai.chatting.AiChatLogic;
-import org.jabref.logic.l10n.Localization;
-
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
 import dev.langchain4j.data.message.AiMessage;
 import dev.langchain4j.data.message.ChatMessage;
 import dev.langchain4j.memory.ChatMemory;
@@ -21,6 +11,17 @@
 import dev.langchain4j.model.mistralai.MistralAiChatModel;
 import dev.langchain4j.model.output.Response;
 
+import org.jabref.logic.ai.AiPreferences;
+import org.jabref.logic.ai.chatting.AiChatLogic;
+import org.jabref.logic.l10n.Localization;
+
+import java.net.http.HttpClient;
+import java.time.Duration;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 /**
  * Wrapper around langchain4j chat language model.
  * <p>
@@ -33,15 +34,19 @@ public class JabRefChatLanguageModel implements ChatLanguageModel, AutoCloseable
     private final AiPreferences aiPreferences;
 
     private final HttpClient httpClient;
-    private final ExecutorService executorService = Executors.newSingleThreadExecutor(
-            new ThreadFactoryBuilder().setNameFormat("ai-api-connection-pool-%d").build()
-    );
+    private final ExecutorService executorService =
+            Executors.newSingleThreadExecutor(
+                    new ThreadFactoryBuilder().setNameFormat("ai-api-connection-pool-%d").build());
 
     private Optional<ChatLanguageModel> langchainChatModel = Optional.empty();
 
     public JabRefChatLanguageModel(AiPreferences aiPreferences) {
         this.aiPreferences = aiPreferences;
-        this.httpClient = HttpClient.newBuilder().connectTimeout(CONNECTION_TIMEOUT).executor(executorService).build();
+        this.httpClient =
+                HttpClient.newBuilder()
+                        .connectTimeout(CONNECTION_TIMEOUT)
+                        .executor(executorService)
+                        .build();
 
         setupListeningToPreferencesChanges();
     }
@@ -61,55 +66,63 @@ private void rebuild() {
 
         switch (aiPreferences.getAiProvider()) {
             case OPEN_AI -> {
-                langchainChatModel = Optional.of(new JvmOpenAiChatLanguageModel(aiPreferences, httpClient));
+                langchainChatModel =
+                        Optional.of(new JvmOpenAiChatLanguageModel(aiPreferences, httpClient));
             }
 
             case MISTRAL_AI -> {
-                langchainChatModel = Optional.of(MistralAiChatModel
-                        .builder()
-                        .apiKey(apiKey)
-                        .modelName(aiPreferences.getSelectedChatModel())
-                        .temperature(aiPreferences.getTemperature())
-                        .baseUrl(aiPreferences.getSelectedApiBaseUrl())
-                        .logRequests(true)
-                        .logResponses(true)
-                        .build()
-                );
+                langchainChatModel =
+                        Optional.of(
+                                MistralAiChatModel.builder()
+                                        .apiKey(apiKey)
+                                        .modelName(aiPreferences.getSelectedChatModel())
+                                        .temperature(aiPreferences.getTemperature())
+                                        .baseUrl(aiPreferences.getSelectedApiBaseUrl())
+                                        .logRequests(true)
+                                        .logResponses(true)
+                                        .build());
             }
 
             case GEMINI -> {
                 // NOTE: {@link GoogleAiGeminiChatModel} doesn't support API base url.
-                langchainChatModel = Optional.of(GoogleAiGeminiChatModel
-                        .builder()
-                        .apiKey(apiKey)
-                        .modelName(aiPreferences.getSelectedChatModel())
-                        .temperature(aiPreferences.getTemperature())
-                        .logRequestsAndResponses(true)
-                        .build()
-                );
+                langchainChatModel =
+                        Optional.of(
+                                GoogleAiGeminiChatModel.builder()
+                                        .apiKey(apiKey)
+                                        .modelName(aiPreferences.getSelectedChatModel())
+                                        .temperature(aiPreferences.getTemperature())
+                                        .logRequestsAndResponses(true)
+                                        .build());
             }
 
             case HUGGING_FACE -> {
                 // NOTE: {@link HuggingFaceChatModel} doesn't support API base url.
-                langchainChatModel = Optional.of(HuggingFaceChatModel
-                        .builder()
-                        .accessToken(apiKey)
-                        .modelId(aiPreferences.getSelectedChatModel())
-                        .temperature(aiPreferences.getTemperature())
-                        .timeout(Duration.ofMinutes(2))
-                        .build()
-                );
+                langchainChatModel =
+                        Optional.of(
+                                HuggingFaceChatModel.builder()
+                                        .accessToken(apiKey)
+                                        .modelId(aiPreferences.getSelectedChatModel())
+                                        .temperature(aiPreferences.getTemperature())
+                                        .timeout(Duration.ofMinutes(2))
+                                        .build());
             }
         }
     }
 
     private void setupListeningToPreferencesChanges() {
-        // Setting "langchainChatModel" to "Optional.empty()" will trigger a rebuild on the next usage
+        // Setting "langchainChatModel" to "Optional.empty()" will trigger a rebuild on the next
+        // usage
 
         aiPreferences.enableAiProperty().addListener(obs -> langchainChatModel = Optional.empty());
-        aiPreferences.aiProviderProperty().addListener(obs -> langchainChatModel = Optional.empty());
-        aiPreferences.customizeExpertSettingsProperty().addListener(obs -> langchainChatModel = Optional.empty());
-        aiPreferences.temperatureProperty().addListener(obs -> langchainChatModel = Optional.empty());
+        aiPreferences
+                .aiProviderProperty()
+                .addListener(obs -> langchainChatModel = Optional.empty());
+        aiPreferences
+                .customizeExpertSettingsProperty()
+                .addListener(obs -> langchainChatModel = Optional.empty());
+        aiPreferences
+                .temperatureProperty()
+                .addListener(obs -> langchainChatModel = Optional.empty());
 
         aiPreferences.addListenerToChatModels(() -> langchainChatModel = Optional.empty());
         aiPreferences.addListenerToApiBaseUrls(() -> langchainChatModel = Optional.empty());
@@ -128,9 +141,15 @@ public Response<AiMessage> generate(List<ChatMessage> list) {
 
         if (langchainChatModel.isEmpty()) {
             if (!aiPreferences.getEnableAi()) {
-                throw new RuntimeException(Localization.lang("In order to use AI chat, you need to enable chatting with attached PDF files in JabRef preferences (AI tab)."));
-            } else if (aiPreferences.getApiKeyForAiProvider(aiPreferences.getAiProvider()).isEmpty()) {
-                throw new RuntimeException(Localization.lang("In order to use AI chat, set an API key inside JabRef preferences (AI tab)."));
+                throw new RuntimeException(
+                        Localization.lang(
+                                "In order to use AI chat, you need to enable chatting with attached PDF files in JabRef preferences (AI tab)."));
+            } else if (aiPreferences
+                    .getApiKeyForAiProvider(aiPreferences.getAiProvider())
+                    .isEmpty()) {
+                throw new RuntimeException(
+                        Localization.lang(
+                                "In order to use AI chat, set an API key inside JabRef preferences (AI tab)."));
             } else {
                 rebuild();
                 if (langchainChatModel.isEmpty()) {
diff --git a/src/main/java/org/jabref/logic/ai/chatting/model/JvmOpenAiChatLanguageModel.java b/src/main/java/org/jabref/logic/ai/chatting/model/JvmOpenAiChatLanguageModel.java
index 023a503d2aa2..a42076f98e4d 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/model/JvmOpenAiChatLanguageModel.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/model/JvmOpenAiChatLanguageModel.java
@@ -1,10 +1,5 @@
 package org.jabref.logic.ai.chatting.model;
 
-import java.net.http.HttpClient;
-import java.util.List;
-
-import org.jabref.logic.ai.AiPreferences;
-
 import dev.langchain4j.data.message.AiMessage;
 import dev.langchain4j.data.message.ChatMessage;
 import dev.langchain4j.data.message.SystemMessage;
@@ -14,14 +9,20 @@
 import dev.langchain4j.model.output.FinishReason;
 import dev.langchain4j.model.output.Response;
 import dev.langchain4j.model.output.TokenUsage;
+
 import io.github.stefanbratanov.jvm.openai.ChatClient;
 import io.github.stefanbratanov.jvm.openai.ChatCompletion;
 import io.github.stefanbratanov.jvm.openai.CreateChatCompletionRequest;
 import io.github.stefanbratanov.jvm.openai.OpenAI;
 import io.github.stefanbratanov.jvm.openai.Usage;
+
+import org.jabref.logic.ai.AiPreferences;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.http.HttpClient;
+import java.util.List;
+
 public class JvmOpenAiChatLanguageModel implements ChatLanguageModel {
     private static final Logger LOGGER = LoggerFactory.getLogger(JvmOpenAiChatLanguageModel.class);
 
@@ -32,35 +33,62 @@ public class JvmOpenAiChatLanguageModel implements ChatLanguageModel {
     public JvmOpenAiChatLanguageModel(AiPreferences aiPreferences, HttpClient httpClient) {
         this.aiPreferences = aiPreferences;
 
-        OpenAI openAI = OpenAI
-                .newBuilder(aiPreferences.getApiKeyForAiProvider(aiPreferences.getAiProvider()))
-                .httpClient(httpClient)
-                .baseUrl(aiPreferences.getSelectedApiBaseUrl())
-                .build();
+        OpenAI openAI =
+                OpenAI.newBuilder(
+                                aiPreferences.getApiKeyForAiProvider(aiPreferences.getAiProvider()))
+                        .httpClient(httpClient)
+                        .baseUrl(aiPreferences.getSelectedApiBaseUrl())
+                        .build();
 
         this.chatClient = openAI.chatClient();
     }
 
     @Override
     public Response<AiMessage> generate(List<ChatMessage> list) {
-        LOGGER.debug("Generating response from jvm-openai chat model with {} messages: {}", list.size(), list);
+        LOGGER.debug(
+                "Generating response from jvm-openai chat model with {} messages: {}",
+                list.size(),
+                list);
 
         List<io.github.stefanbratanov.jvm.openai.ChatMessage> messages =
-                list.stream().map(chatMessage -> (io.github.stefanbratanov.jvm.openai.ChatMessage) switch (chatMessage) {
-                    case AiMessage aiMessage -> io.github.stefanbratanov.jvm.openai.ChatMessage.assistantMessage(aiMessage.text());
-                    case SystemMessage systemMessage -> io.github.stefanbratanov.jvm.openai.ChatMessage.systemMessage(systemMessage.text());
-                    case ToolExecutionResultMessage toolExecutionResultMessage -> io.github.stefanbratanov.jvm.openai.ChatMessage.toolMessage(toolExecutionResultMessage.text(), toolExecutionResultMessage.id());
-                    case UserMessage userMessage -> io.github.stefanbratanov.jvm.openai.ChatMessage.userMessage(userMessage.singleText());
-                    default -> throw new IllegalStateException("unknown conversion of chat message from langchain4j to jvm-openai");
-                }).toList();
-
-        CreateChatCompletionRequest request = CreateChatCompletionRequest
-                .newBuilder()
-                .model(aiPreferences.getSelectedChatModel())
-                .temperature(aiPreferences.getTemperature())
-                .n(1)
-                .messages(messages)
-                .build();
+                list.stream()
+                        .map(
+                                chatMessage ->
+                                        (io.github.stefanbratanov.jvm.openai.ChatMessage)
+                                                switch (chatMessage) {
+                                                    case AiMessage aiMessage ->
+                                                            io.github.stefanbratanov.jvm.openai
+                                                                    .ChatMessage.assistantMessage(
+                                                                    aiMessage.text());
+                                                    case SystemMessage systemMessage ->
+                                                            io.github.stefanbratanov.jvm.openai
+                                                                    .ChatMessage.systemMessage(
+                                                                    systemMessage.text());
+                                                    case ToolExecutionResultMessage
+                                                                            toolExecutionResultMessage ->
+                                                            io.github.stefanbratanov.jvm.openai
+                                                                    .ChatMessage.toolMessage(
+                                                                    toolExecutionResultMessage
+                                                                            .text(),
+                                                                    toolExecutionResultMessage
+                                                                            .id());
+                                                    case UserMessage userMessage ->
+                                                            io.github.stefanbratanov.jvm.openai
+                                                                    .ChatMessage.userMessage(
+                                                                    userMessage.singleText());
+                                                    default ->
+                                                            throw new IllegalStateException(
+                                                                    "unknown conversion of chat message from langchain4j to jvm-openai");
+                                                })
+                        .toList();
+
+        CreateChatCompletionRequest request =
+                CreateChatCompletionRequest.newBuilder()
+                        .model(aiPreferences.getSelectedChatModel())
+                        .temperature(aiPreferences.getTemperature())
+                        .n(1)
+                        .messages(messages)
+                        .build();
 
         ChatCompletion chatCompletion = chatClient.createChatCompletion(request);
         Usage usage = chatCompletion.usage();
@@ -79,6 +107,9 @@ public Response<AiMessage> generate(List<ChatMessage> list) {
 
         ChatCompletion.Choice choice = choices.getFirst();
 
-        return new Response<>(new AiMessage(choice.message().content()), new TokenUsage(usage.promptTokens(), usage.completionTokens()), FinishReason.OTHER);
+        return new Response<>(
+                new AiMessage(choice.message().content()),
+                new TokenUsage(usage.promptTokens(), usage.completionTokens()),
+                FinishReason.OTHER);
     }
 }
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/FileEmbeddingsManager.java b/src/main/java/org/jabref/logic/ai/ingestion/FileEmbeddingsManager.java
index a9a4063a80db..268333c314a7 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/FileEmbeddingsManager.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/FileEmbeddingsManager.java
@@ -1,7 +1,10 @@
 package org.jabref.logic.ai.ingestion;
 
-import java.util.List;
-import java.util.Optional;
+import dev.langchain4j.data.document.Document;
+import dev.langchain4j.data.segment.TextSegment;
+import dev.langchain4j.model.embedding.EmbeddingModel;
+import dev.langchain4j.store.embedding.EmbeddingStore;
+import dev.langchain4j.store.embedding.filter.MetadataFilterBuilder;
 
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
@@ -9,11 +12,8 @@
 import org.jabref.logic.ai.AiPreferences;
 import org.jabref.model.entry.LinkedFile;
 
-import dev.langchain4j.data.document.Document;
-import dev.langchain4j.data.segment.TextSegment;
-import dev.langchain4j.model.embedding.EmbeddingModel;
-import dev.langchain4j.store.embedding.EmbeddingStore;
-import dev.langchain4j.store.embedding.filter.MetadataFilterBuilder;
+import java.util.List;
+import java.util.Optional;
 
 /**
  * This class is responsible for managing the embeddings cache. The cache is saved in a local user directory.
@@ -37,12 +37,12 @@ public class FileEmbeddingsManager {
     private final FullyIngestedDocumentsTracker fullyIngestedDocumentsTracker;
     private final LowLevelIngestor lowLevelIngestor;
 
-    public FileEmbeddingsManager(AiPreferences aiPreferences,
-                                 ReadOnlyBooleanProperty shutdownSignal,
-                                 EmbeddingModel embeddingModel,
-                                 EmbeddingStore<TextSegment> embeddingStore,
-                                 FullyIngestedDocumentsTracker fullyIngestedDocumentsTracker
-    ) {
+    public FileEmbeddingsManager(
+            AiPreferences aiPreferences,
+            ReadOnlyBooleanProperty shutdownSignal,
+            EmbeddingModel embeddingModel,
+            EmbeddingStore<TextSegment> embeddingStore,
+            FullyIngestedDocumentsTracker fullyIngestedDocumentsTracker) {
         this.aiPreferences = aiPreferences;
         this.shutdownSignal = shutdownSignal;
         this.embeddingStore = embeddingStore;
@@ -56,17 +56,25 @@ private void setupListeningToPreferencesChanges() {
         aiPreferences.addListenerToEmbeddingsParametersChange(embeddingStore::removeAll);
     }
 
-    public void addDocument(String link, Document document, long modificationTimeInSeconds, IntegerProperty workDone, IntegerProperty workMax) throws InterruptedException {
+    public void addDocument(
+            String link,
+            Document document,
+            long modificationTimeInSeconds,
+            IntegerProperty workDone,
+            IntegerProperty workMax)
+            throws InterruptedException {
         document.metadata().put(LINK_METADATA_KEY, link);
         lowLevelIngestor.ingestDocument(document, shutdownSignal, workDone, workMax);
 
         if (!shutdownSignal.get()) {
-            fullyIngestedDocumentsTracker.markDocumentAsFullyIngested(link, modificationTimeInSeconds);
+            fullyIngestedDocumentsTracker.markDocumentAsFullyIngested(
+                    link, modificationTimeInSeconds);
         }
     }
 
     public void removeDocument(String link) {
-        embeddingStore.removeAll(MetadataFilterBuilder.metadataKey(LINK_METADATA_KEY).isEqualTo(link));
+        embeddingStore.removeAll(
+                MetadataFilterBuilder.metadataKey(LINK_METADATA_KEY).isEqualTo(link));
         fullyIngestedDocumentsTracker.unmarkDocumentAsFullyIngested(link);
     }
 
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/FileToDocument.java b/src/main/java/org/jabref/logic/ai/ingestion/FileToDocument.java
index 0d8cb119906d..690d5fd17d38 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/FileToDocument.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/FileToDocument.java
@@ -1,20 +1,20 @@
 package org.jabref.logic.ai.ingestion;
 
-import java.io.StringWriter;
-import java.nio.file.Path;
-import java.util.Optional;
+import dev.langchain4j.data.document.Document;
 
 import javafx.beans.property.ReadOnlyBooleanProperty;
 
+import org.apache.pdfbox.pdmodel.PDDocument;
 import org.jabref.logic.pdf.InterruptablePDFTextStripper;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.logic.xmp.XmpUtilReader;
-
-import dev.langchain4j.data.document.Document;
-import org.apache.pdfbox.pdmodel.PDDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.StringWriter;
+import java.nio.file.Path;
+import java.util.Optional;
+
 public class FileToDocument {
     private static final Logger LOGGER = LoggerFactory.getLogger(FileToDocument.class);
 
@@ -28,19 +28,23 @@ public Optional<Document> fromFile(Path path) {
         if (FileUtil.isPDFFile(path)) {
             return fromPdfFile(path);
         } else {
-            LOGGER.info("Unsupported file type of file: {}. Currently, only PDF files are supported", path);
+            LOGGER.info(
+                    "Unsupported file type of file: {}. Currently, only PDF files are supported",
+                    path);
             return Optional.empty();
         }
     }
 
     private Optional<Document> fromPdfFile(Path path) {
-        // This method is private to ensure that the path is really pointing to PDF file (determined by extension).
+        // This method is private to ensure that the path is really pointing to PDF file (determined
+        // by extension).
 
         try (PDDocument document = new XmpUtilReader().loadWithAutomaticDecryption(path)) {
             int lastPage = document.getNumberOfPages();
             StringWriter writer = new StringWriter();
 
-            InterruptablePDFTextStripper stripper = new InterruptablePDFTextStripper(shutdownSignal);
+            InterruptablePDFTextStripper stripper =
+                    new InterruptablePDFTextStripper(shutdownSignal);
             stripper.setStartPage(1);
             stripper.setEndPage(lastPage);
             stripper.writeText(document, writer);
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsForSeveralTask.java b/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsForSeveralTask.java
index 0bb1626a035a..6af31c21c19d 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsForSeveralTask.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsForSeveralTask.java
@@ -1,9 +1,5 @@
 package org.jabref.logic.ai.ingestion;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Future;
-
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.StringProperty;
 import javafx.util.Pair;
@@ -17,17 +13,21 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Future;
+
 /**
  * This task generates embeddings for several {@link LinkedFile} (typically used for groups).
  * It will check if embeddings were already generated.
  * And it also will store the embeddings.
  */
 public class GenerateEmbeddingsForSeveralTask extends BackgroundTask<Void> {
-    private static final Logger LOGGER = LoggerFactory.getLogger(GenerateEmbeddingsForSeveralTask.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(GenerateEmbeddingsForSeveralTask.class);
 
     private final StringProperty name;
     private final List<ProcessingInfo<LinkedFile, Void>> linkedFiles;
@@ -48,8 +48,7 @@ public GenerateEmbeddingsForSeveralTask(
             BibDatabaseContext bibDatabaseContext,
             FilePreferences filePreferences,
             TaskExecutor taskExecutor,
-            ReadOnlyBooleanProperty shutdownSignal
-    ) {
+            ReadOnlyBooleanProperty shutdownSignal) {
         this.name = name;
         this.linkedFiles = linkedFiles;
         this.fileEmbeddingsManager = fileEmbeddingsManager;
@@ -64,7 +63,10 @@ public GenerateEmbeddingsForSeveralTask(
     private void configure(StringProperty name) {
         showToUser(true);
         titleProperty().set(Localization.lang("Generating embeddings for %0", name.get()));
-        name.addListener((o, oldValue, newValue) -> titleProperty().set(Localization.lang("Generating embeddings for %0", newValue)));
+        name.addListener(
+                (o, oldValue, newValue) ->
+                        titleProperty()
+                                .set(Localization.lang("Generating embeddings for %0", newValue)));
 
         progressCounter.increaseWorkMax(linkedFiles.size());
         progressCounter.listenToAllProperties(this::updateProgress);
@@ -76,24 +78,26 @@ public Void call() throws Exception {
         LOGGER.debug("Starting embeddings generation of several files for {}", name.get());
 
         List<Pair<? extends Future<?>, String>> futures = new ArrayList<>();
-        linkedFiles
-                .stream()
-                .map(processingInfo -> {
-                    processingInfo.setState(ProcessingState.PROCESSING);
-                    return new Pair<>(
-                            new GenerateEmbeddingsTask(
-                                    processingInfo.getObject(),
-                                    fileEmbeddingsManager,
-                                    bibDatabaseContext,
-                                    filePreferences,
-                                    shutdownSignal
-                            )
-                                    .onSuccess(v -> processingInfo.setState(ProcessingState.SUCCESS))
-                                    .onFailure(processingInfo::setException)
-                                    .onFinished(() -> progressCounter.increaseWorkDone(1))
-                                    .executeWith(taskExecutor),
-                            processingInfo.getObject().getLink());
-                })
+        linkedFiles.stream()
+                .map(
+                        processingInfo -> {
+                            processingInfo.setState(ProcessingState.PROCESSING);
+                            return new Pair<>(
+                                    new GenerateEmbeddingsTask(
+                                                    processingInfo.getObject(),
+                                                    fileEmbeddingsManager,
+                                                    bibDatabaseContext,
+                                                    filePreferences,
+                                                    shutdownSignal)
+                                            .onSuccess(
+                                                    v ->
+                                                            processingInfo.setState(
+                                                                    ProcessingState.SUCCESS))
+                                            .onFailure(processingInfo::setException)
+                                            .onFinished(() -> progressCounter.increaseWorkDone(1))
+                                            .executeWith(taskExecutor),
+                                    processingInfo.getObject().getLink());
+                        })
                 .forEach(futures::add);
 
         for (Pair<? extends Future<?>, String> pair : futures) {
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsTask.java b/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsTask.java
index 11bf406ca558..474d8e1cf44d 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsTask.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/GenerateEmbeddingsTask.java
@@ -1,11 +1,6 @@
 package org.jabref.logic.ai.ingestion;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
+import dev.langchain4j.data.document.Document;
 
 import javafx.beans.property.ReadOnlyBooleanProperty;
 
@@ -15,11 +10,16 @@
 import org.jabref.logic.util.ProgressCounter;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
-
-import dev.langchain4j.data.document.Document;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+
 /**
  * This task generates embeddings for a {@link LinkedFile}.
  * It will check if embeddings were already generated.
@@ -36,12 +36,12 @@ public class GenerateEmbeddingsTask extends BackgroundTask<Void> {
 
     private final ProgressCounter progressCounter = new ProgressCounter();
 
-    public GenerateEmbeddingsTask(LinkedFile linkedFile,
-                                  FileEmbeddingsManager fileEmbeddingsManager,
-                                  BibDatabaseContext bibDatabaseContext,
-                                  FilePreferences filePreferences,
-                                  ReadOnlyBooleanProperty shutdownSignal
-    ) {
+    public GenerateEmbeddingsTask(
+            LinkedFile linkedFile,
+            FileEmbeddingsManager fileEmbeddingsManager,
+            BibDatabaseContext bibDatabaseContext,
+            FilePreferences filePreferences,
+            ReadOnlyBooleanProperty shutdownSignal) {
         this.linkedFile = linkedFile;
         this.fileEmbeddingsManager = fileEmbeddingsManager;
         this.bibDatabaseContext = bibDatabaseContext;
@@ -52,7 +52,10 @@ public GenerateEmbeddingsTask(LinkedFile linkedFile,
     }
 
     private void configure(LinkedFile linkedFile) {
-        titleProperty().set(Localization.lang("Generating embeddings for file '%0'", linkedFile.getLink()));
+        titleProperty()
+                .set(
+                        Localization.lang(
+                                "Generating embeddings for file '%0'", linkedFile.getLink()));
 
         progressCounter.listenToAllProperties(this::updateProgress);
     }
@@ -64,7 +67,9 @@ public Void call() throws Exception {
         try {
             ingestLinkedFile(linkedFile);
         } catch (InterruptedException e) {
-            LOGGER.debug("There is a embeddings generation task for file \"{}\". It will be cancelled, because user quits JabRef.", linkedFile.getLink());
+            LOGGER.debug(
+                    "There is a embeddings generation task for file \"{}\". It will be cancelled, because user quits JabRef.",
+                    linkedFile.getLink());
         }
 
         LOGGER.debug("Finished embeddings generation task for file \"{}\"", linkedFile.getLink());
@@ -81,20 +86,31 @@ private void ingestLinkedFile(LinkedFile linkedFile) throws InterruptedException
         Optional<Path> path = linkedFile.findIn(bibDatabaseContext, filePreferences);
 
         if (path.isEmpty()) {
-            LOGGER.error("Could not find path for a linked file \"{}\", while generating embeddings", linkedFile.getLink());
-            LOGGER.debug("Unable to generate embeddings for file \"{}\", because it was not found while generating embeddings", linkedFile.getLink());
-            throw new RuntimeException(Localization.lang("Could not find path for a linked file '%0' while generating embeddings.", linkedFile.getLink()));
+            LOGGER.error(
+                    "Could not find path for a linked file \"{}\", while generating embeddings",
+                    linkedFile.getLink());
+            LOGGER.debug(
+                    "Unable to generate embeddings for file \"{}\", because it was not found while generating embeddings",
+                    linkedFile.getLink());
+            throw new RuntimeException(
+                    Localization.lang(
+                            "Could not find path for a linked file '%0' while generating embeddings.",
+                            linkedFile.getLink()));
         }
 
         Optional<Long> modTime = Optional.empty();
         boolean shouldIngest = true;
 
         try {
-            BasicFileAttributes attributes = Files.readAttributes(path.get(), BasicFileAttributes.class);
+            BasicFileAttributes attributes =
+                    Files.readAttributes(path.get(), BasicFileAttributes.class);
 
-            long currentModificationTimeInSeconds = attributes.lastModifiedTime().to(TimeUnit.SECONDS);
+            long currentModificationTimeInSeconds =
+                    attributes.lastModifiedTime().to(TimeUnit.SECONDS);
 
-            Optional<Long> ingestedModificationTimeInSeconds = fileEmbeddingsManager.getIngestedDocumentModificationTimeInSeconds(linkedFile.getLink());
+            Optional<Long> ingestedModificationTimeInSeconds =
+                    fileEmbeddingsManager.getIngestedDocumentModificationTimeInSeconds(
+                            linkedFile.getLink());
 
             if (ingestedModificationTimeInSeconds.isEmpty()) {
                 modTime = Optional.of(currentModificationTimeInSeconds);
@@ -102,13 +118,20 @@ private void ingestLinkedFile(LinkedFile linkedFile) throws InterruptedException
                 if (currentModificationTimeInSeconds > ingestedModificationTimeInSeconds.get()) {
                     modTime = Optional.of(currentModificationTimeInSeconds);
                 } else {
-                    LOGGER.debug("No need to generate embeddings for file \"{}\", because it was already generated", linkedFile.getLink());
+                    LOGGER.debug(
+                            "No need to generate embeddings for file \"{}\", because it was already generated",
+                            linkedFile.getLink());
                     shouldIngest = false;
                 }
             }
         } catch (IOException e) {
-            LOGGER.error("Could not retrieve attributes of a linked file \"{}\"", linkedFile.getLink(), e);
-            LOGGER.warn("Possibly regenerating embeddings for linked file \"{}\"", linkedFile.getLink());
+            LOGGER.error(
+                    "Could not retrieve attributes of a linked file \"{}\"",
+                    linkedFile.getLink(),
+                    e);
+            LOGGER.warn(
+                    "Possibly regenerating embeddings for linked file \"{}\"",
+                    linkedFile.getLink());
         }
 
         if (!shouldIngest) {
@@ -117,11 +140,22 @@ private void ingestLinkedFile(LinkedFile linkedFile) throws InterruptedException
 
         Optional<Document> document = new FileToDocument(shutdownSignal).fromFile(path.get());
         if (document.isPresent()) {
-            fileEmbeddingsManager.addDocument(linkedFile.getLink(), document.get(), modTime.orElse(0L), progressCounter.workDoneProperty(), progressCounter.workMaxProperty());
-            LOGGER.debug("Embeddings for file \"{}\" were generated successfully", linkedFile.getLink());
+            fileEmbeddingsManager.addDocument(
+                    linkedFile.getLink(),
+                    document.get(),
+                    modTime.orElse(0L),
+                    progressCounter.workDoneProperty(),
+                    progressCounter.workMaxProperty());
+            LOGGER.debug(
+                    "Embeddings for file \"{}\" were generated successfully", linkedFile.getLink());
         } else {
-            LOGGER.error("Unable to generate embeddings for file \"{}\", because JabRef was unable to extract text from the file", linkedFile.getLink());
-            throw new RuntimeException(Localization.lang("Unable to generate embeddings for file '%0', because JabRef was unable to extract text from the file", linkedFile.getLink()));
+            LOGGER.error(
+                    "Unable to generate embeddings for file \"{}\", because JabRef was unable to extract text from the file",
+                    linkedFile.getLink());
+            throw new RuntimeException(
+                    Localization.lang(
+                            "Unable to generate embeddings for file '%0', because JabRef was unable to extract text from the file",
+                            linkedFile.getLink()));
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/IngestionService.java b/src/main/java/org/jabref/logic/ai/ingestion/IngestionService.java
index 6d113891a362..921671cd6eb1 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/IngestionService.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/IngestionService.java
@@ -1,9 +1,8 @@
 package org.jabref.logic.ai.ingestion;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import dev.langchain4j.data.segment.TextSegment;
+import dev.langchain4j.model.embedding.EmbeddingModel;
+import dev.langchain4j.store.embedding.EmbeddingStore;
 
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.StringProperty;
@@ -16,16 +15,18 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
 
-import dev.langchain4j.data.segment.TextSegment;
-import dev.langchain4j.model.embedding.EmbeddingModel;
-import dev.langchain4j.store.embedding.EmbeddingStore;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Main class for generating embedding for files.
  * Use this class in the logic and UI.
  */
 public class IngestionService {
-    private final Map<LinkedFile, ProcessingInfo<LinkedFile, Void>> ingestionStatusMap = new HashMap<>();
+    private final Map<LinkedFile, ProcessingInfo<LinkedFile, Void>> ingestionStatusMap =
+            new HashMap<>();
 
     private final List<List<LinkedFile>> listsUnderIngestion = new ArrayList<>();
 
@@ -36,24 +37,24 @@ public class IngestionService {
 
     private final ReadOnlyBooleanProperty shutdownSignal;
 
-    public IngestionService(AiPreferences aiPreferences,
-                            ReadOnlyBooleanProperty shutdownSignal,
-                            EmbeddingModel embeddingModel,
-                            EmbeddingStore<TextSegment> embeddingStore,
-                            FullyIngestedDocumentsTracker fullyIngestedDocumentsTracker,
-                            FilePreferences filePreferences,
-                            TaskExecutor taskExecutor
-    ) {
+    public IngestionService(
+            AiPreferences aiPreferences,
+            ReadOnlyBooleanProperty shutdownSignal,
+            EmbeddingModel embeddingModel,
+            EmbeddingStore<TextSegment> embeddingStore,
+            FullyIngestedDocumentsTracker fullyIngestedDocumentsTracker,
+            FilePreferences filePreferences,
+            TaskExecutor taskExecutor) {
         this.filePreferences = filePreferences;
         this.taskExecutor = taskExecutor;
 
-        this.fileEmbeddingsManager = new FileEmbeddingsManager(
-                aiPreferences,
-                shutdownSignal,
-                embeddingModel,
-                embeddingStore,
-                fullyIngestedDocumentsTracker
-        );
+        this.fileEmbeddingsManager =
+                new FileEmbeddingsManager(
+                        aiPreferences,
+                        shutdownSignal,
+                        embeddingModel,
+                        embeddingStore,
+                        fullyIngestedDocumentsTracker);
 
         this.shutdownSignal = shutdownSignal;
     }
@@ -64,7 +65,8 @@ public IngestionService(AiPreferences aiPreferences,
      * Returned {@link ProcessingInfo} is related to the passed {@link LinkedFile}, so if you call this method twice
      * on the same {@link LinkedFile}, the method will return the same {@link ProcessingInfo}.
      */
-    public ProcessingInfo<LinkedFile, Void> ingest(LinkedFile linkedFile, BibDatabaseContext bibDatabaseContext) {
+    public ProcessingInfo<LinkedFile, Void> ingest(
+            LinkedFile linkedFile, BibDatabaseContext bibDatabaseContext) {
         ProcessingInfo<LinkedFile, Void> processingInfo = getProcessingInfo(linkedFile);
 
         if (processingInfo.getState() == ProcessingState.STOPPED) {
@@ -79,40 +81,69 @@ public ProcessingInfo<LinkedFile, Void> ingest(LinkedFile linkedFile, BibDatabas
      * This method will not start ingesting. If you need to start it, use {@link IngestionService#ingest(LinkedFile, BibDatabaseContext)}.
      */
     public ProcessingInfo<LinkedFile, Void> getProcessingInfo(LinkedFile linkedFile) {
-        return ingestionStatusMap.computeIfAbsent(linkedFile, file -> new ProcessingInfo<>(linkedFile, ProcessingState.STOPPED));
+        return ingestionStatusMap.computeIfAbsent(
+                linkedFile, file -> new ProcessingInfo<>(linkedFile, ProcessingState.STOPPED));
     }
 
     public List<ProcessingInfo<LinkedFile, Void>> getProcessingInfo(List<LinkedFile> linkedFiles) {
         return linkedFiles.stream().map(this::getProcessingInfo).toList();
     }
 
-    public List<ProcessingInfo<LinkedFile, Void>> ingest(StringProperty name, List<LinkedFile> linkedFiles, BibDatabaseContext bibDatabaseContext) {
+    public List<ProcessingInfo<LinkedFile, Void>> ingest(
+            StringProperty name,
+            List<LinkedFile> linkedFiles,
+            BibDatabaseContext bibDatabaseContext) {
         List<ProcessingInfo<LinkedFile, Void>> result = getProcessingInfo(linkedFiles);
 
         if (listsUnderIngestion.contains(linkedFiles)) {
             return result;
         }
 
-        List<ProcessingInfo<LinkedFile, Void>> needToProcess = result.stream().filter(processingInfo -> processingInfo.getState() == ProcessingState.STOPPED).toList();
+        List<ProcessingInfo<LinkedFile, Void>> needToProcess =
+                result.stream()
+                        .filter(
+                                processingInfo ->
+                                        processingInfo.getState() == ProcessingState.STOPPED)
+                        .toList();
         startEmbeddingsGenerationTask(name, needToProcess, bibDatabaseContext);
 
         return result;
     }
 
-    private void startEmbeddingsGenerationTask(LinkedFile linkedFile, BibDatabaseContext bibDatabaseContext, ProcessingInfo<LinkedFile, Void> processingInfo) {
-        new GenerateEmbeddingsTask(linkedFile, fileEmbeddingsManager, bibDatabaseContext, filePreferences, shutdownSignal)
+    private void startEmbeddingsGenerationTask(
+            LinkedFile linkedFile,
+            BibDatabaseContext bibDatabaseContext,
+            ProcessingInfo<LinkedFile, Void> processingInfo) {
+        new GenerateEmbeddingsTask(
+                        linkedFile,
+                        fileEmbeddingsManager,
+                        bibDatabaseContext,
+                        filePreferences,
+                        shutdownSignal)
                 .onSuccess(v -> processingInfo.setState(ProcessingState.SUCCESS))
                 .onFailure(processingInfo::setException)
                 .executeWith(taskExecutor);
     }
 
-    private void startEmbeddingsGenerationTask(StringProperty name, List<ProcessingInfo<LinkedFile, Void>> linkedFiles, BibDatabaseContext bibDatabaseContext) {
-        new GenerateEmbeddingsForSeveralTask(name, linkedFiles, fileEmbeddingsManager, bibDatabaseContext, filePreferences, taskExecutor, shutdownSignal)
+    private void startEmbeddingsGenerationTask(
+            StringProperty name,
+            List<ProcessingInfo<LinkedFile, Void>> linkedFiles,
+            BibDatabaseContext bibDatabaseContext) {
+        new GenerateEmbeddingsForSeveralTask(
+                        name,
+                        linkedFiles,
+                        fileEmbeddingsManager,
+                        bibDatabaseContext,
+                        filePreferences,
+                        taskExecutor,
+                        shutdownSignal)
                 .executeWith(taskExecutor);
     }
 
     public void clearEmbeddingsFor(List<LinkedFile> linkedFiles) {
         fileEmbeddingsManager.clearEmbeddingsFor(linkedFiles);
-        ingestionStatusMap.values().forEach(processingInfo -> processingInfo.setState(ProcessingState.STOPPED));
+        ingestionStatusMap
+                .values()
+                .forEach(processingInfo -> processingInfo.setState(ProcessingState.STOPPED));
     }
 }
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/LowLevelIngestor.java b/src/main/java/org/jabref/logic/ai/ingestion/LowLevelIngestor.java
index fb1d08034b44..6e7242ed511f 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/LowLevelIngestor.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/LowLevelIngestor.java
@@ -1,12 +1,5 @@
 package org.jabref.logic.ai.ingestion;
 
-import java.util.List;
-
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.ReadOnlyBooleanProperty;
-
-import org.jabref.logic.ai.AiPreferences;
-
 import dev.langchain4j.data.document.Document;
 import dev.langchain4j.data.document.DocumentSplitter;
 import dev.langchain4j.data.document.splitter.DocumentSplitters;
@@ -15,6 +8,13 @@
 import dev.langchain4j.store.embedding.EmbeddingStore;
 import dev.langchain4j.store.embedding.EmbeddingStoreIngestor;
 
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+
+import org.jabref.logic.ai.AiPreferences;
+
+import java.util.List;
+
 public class LowLevelIngestor {
     private final AiPreferences aiPreferences;
 
@@ -24,7 +24,10 @@ public class LowLevelIngestor {
     private EmbeddingStoreIngestor ingestor;
     private DocumentSplitter documentSplitter;
 
-    public LowLevelIngestor(AiPreferences aiPreferences, EmbeddingStore<TextSegment> embeddingStore, EmbeddingModel embeddingModel) {
+    public LowLevelIngestor(
+            AiPreferences aiPreferences,
+            EmbeddingStore<TextSegment> embeddingStore,
+            EmbeddingModel embeddingModel) {
         this.aiPreferences = aiPreferences;
         this.embeddingStore = embeddingStore;
         this.embeddingModel = embeddingModel;
@@ -35,16 +38,17 @@ public LowLevelIngestor(AiPreferences aiPreferences, EmbeddingStore<TextSegment>
     }
 
     private void rebuild() {
-        this.documentSplitter = DocumentSplitters
-                .recursive(aiPreferences.getDocumentSplitterChunkSize(),
-                           aiPreferences.getDocumentSplitterOverlapSize());
-
-        this.ingestor = EmbeddingStoreIngestor
-                .builder()
-                .embeddingStore(embeddingStore)
-                .embeddingModel(embeddingModel)
-                .documentSplitter(documentSplitter)
-                .build();
+        this.documentSplitter =
+                DocumentSplitters.recursive(
+                        aiPreferences.getDocumentSplitterChunkSize(),
+                        aiPreferences.getDocumentSplitterOverlapSize());
+
+        this.ingestor =
+                EmbeddingStoreIngestor.builder()
+                        .embeddingStore(embeddingStore)
+                        .embeddingModel(embeddingModel)
+                        .documentSplitter(documentSplitter)
+                        .build();
     }
 
     private void setupListeningToPreferencesChanges() {
@@ -59,7 +63,12 @@ private void setupListeningToPreferencesChanges() {
      * @param document - document to add.
      * @param stopProperty - in case you want to stop the ingestion process, set this property to true.
      */
-    public void ingestDocument(Document document, ReadOnlyBooleanProperty stopProperty, IntegerProperty workDone, IntegerProperty workMax) throws InterruptedException {
+    public void ingestDocument(
+            Document document,
+            ReadOnlyBooleanProperty stopProperty,
+            IntegerProperty workDone,
+            IntegerProperty workMax)
+            throws InterruptedException {
         List<TextSegment> textSegments = documentSplitter.split(document);
         workMax.set(textSegments.size());
 
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/MVStoreEmbeddingStore.java b/src/main/java/org/jabref/logic/ai/ingestion/MVStoreEmbeddingStore.java
index fd24598855b3..f821a578c503 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/MVStoreEmbeddingStore.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/MVStoreEmbeddingStore.java
@@ -1,22 +1,8 @@
 package org.jabref.logic.ai.ingestion;
 
-import java.io.Serializable;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.PriorityQueue;
-import java.util.UUID;
-import java.util.function.Predicate;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
+import static org.jabref.logic.ai.ingestion.FileEmbeddingsManager.LINK_METADATA_KEY;
 
-import org.jabref.logic.ai.util.MVStoreBase;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.NotificationService;
+import static java.util.Comparator.comparingDouble;
 
 import dev.langchain4j.data.document.Metadata;
 import dev.langchain4j.data.embedding.Embedding;
@@ -30,11 +16,27 @@
 import dev.langchain4j.store.embedding.filter.Filter;
 import dev.langchain4j.store.embedding.filter.comparison.IsEqualTo;
 import dev.langchain4j.store.embedding.filter.comparison.IsIn;
+
 import jakarta.annotation.Nullable;
+
 import org.h2.mvstore.MVStore;
+import org.jabref.logic.ai.util.MVStoreBase;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.NotificationService;
 
-import static java.util.Comparator.comparingDouble;
-import static org.jabref.logic.ai.ingestion.FileEmbeddingsManager.LINK_METADATA_KEY;
+import java.io.Serializable;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.PriorityQueue;
+import java.util.UUID;
+import java.util.function.Predicate;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 /**
  * A custom implementation of langchain4j's {@link EmbeddingStore} that uses a {@link MVStore} as an embedded database.
@@ -45,7 +47,8 @@
  */
 public class MVStoreEmbeddingStore extends MVStoreBase implements EmbeddingStore<TextSegment> {
     // `file` field is nullable, because {@link Optional} can't be serialized.
-    private record EmbeddingRecord(@Nullable String file, String content, float[] embeddingVector) implements Serializable { }
+    private record EmbeddingRecord(@Nullable String file, String content, float[] embeddingVector)
+            implements Serializable {}
 
     private static final String EMBEDDINGS_MAP_NAME = "embeddings";
 
@@ -74,7 +77,8 @@ public List<String> addAll(List<Embedding> embeddings) {
 
     @Override
     public void add(String id, Embedding embedding) {
-        // It does not make much sense to store single embedding vector, but this is a requirement from langchain4j's
+        // It does not make much sense to store single embedding vector, but this is a requirement
+        // from langchain4j's
         // {@link EmbeddingStore}.
         embeddingsMap.put(id, new EmbeddingRecord(null, "", embedding.vector()));
     }
@@ -83,13 +87,16 @@ public void add(String id, Embedding embedding) {
     public String add(Embedding embedding, TextSegment textSegment) {
         String id = String.valueOf(UUID.randomUUID());
         String linkedFile = textSegment.metadata().getString(LINK_METADATA_KEY);
-        embeddingsMap.put(id, new EmbeddingRecord(linkedFile, textSegment.text(), embedding.vector()));
+        embeddingsMap.put(
+                id, new EmbeddingRecord(linkedFile, textSegment.text(), embedding.vector()));
         return id;
     }
 
     @Override
     public List<String> addAll(List<Embedding> embeddings, List<TextSegment> embedded) {
-        return IntStream.range(0, embeddings.size()).mapToObj(i -> add(embeddings.get(i), embedded.get(i))).toList();
+        return IntStream.range(0, embeddings.size())
+                .mapToObj(i -> add(embeddings.get(i), embedded.get(i)))
+                .toList();
     }
 
     @Override
@@ -125,28 +132,37 @@ public EmbeddingSearchResult<TextSegment> search(EmbeddingSearchRequest request)
         Comparator<EmbeddingMatch<TextSegment>> comparator = comparingDouble(EmbeddingMatch::score);
         PriorityQueue<EmbeddingMatch<TextSegment>> matches = new PriorityQueue<>(comparator);
 
-        applyFilter(request.filter()).forEach(id -> {
-            EmbeddingRecord eRecord = embeddingsMap.get(id);
-
-            double cosineSimilarity = CosineSimilarity.between(Embedding.from(eRecord.embeddingVector), request.queryEmbedding());
-            double score = RelevanceScore.fromCosineSimilarity(cosineSimilarity);
-
-            if (score >= request.minScore()) {
-                matches.add(
-                        new EmbeddingMatch<>(
-                                score,
-                                id,
-                                Embedding.from(eRecord.embeddingVector),
-                                new TextSegment(
-                                        eRecord.content,
-                                        new Metadata(
-                                                eRecord.file == null ? Map.of() : Map.of(LINK_METADATA_KEY, eRecord.file)))));
-
-                if (matches.size() > request.maxResults()) {
-                    matches.poll();
-                }
-            }
-        });
+        applyFilter(request.filter())
+                .forEach(
+                        id -> {
+                            EmbeddingRecord eRecord = embeddingsMap.get(id);
+
+                            double cosineSimilarity =
+                                    CosineSimilarity.between(
+                                            Embedding.from(eRecord.embeddingVector),
+                                            request.queryEmbedding());
+                            double score = RelevanceScore.fromCosineSimilarity(cosineSimilarity);
+
+                            if (score >= request.minScore()) {
+                                matches.add(
+                                        new EmbeddingMatch<>(
+                                                score,
+                                                id,
+                                                Embedding.from(eRecord.embeddingVector),
+                                                new TextSegment(
+                                                        eRecord.content,
+                                                        new Metadata(
+                                                                eRecord.file == null
+                                                                        ? Map.of()
+                                                                        : Map.of(
+                                                                                LINK_METADATA_KEY,
+                                                                                eRecord.file)))));
+
+                                if (matches.size() > request.maxResults()) {
+                                    matches.poll();
+                                }
+                            }
+                        });
 
         List<EmbeddingMatch<TextSegment>> result = new ArrayList<>(matches);
         result.sort(comparator.reversed());
@@ -164,12 +180,20 @@ private Stream<String> applyFilter(@Nullable Filter filter) {
             case null -> embeddingsMap.keySet().stream();
 
             case IsIn isInFilter when Objects.equals(isInFilter.key(), LINK_METADATA_KEY) ->
-                    filterEntries(entry -> isInFilter.comparisonValues().contains(entry.getValue().file));
-
-            case IsEqualTo isEqualToFilter when Objects.equals(isEqualToFilter.key(), LINK_METADATA_KEY) ->
-                    filterEntries(entry -> isEqualToFilter.comparisonValue().equals(entry.getValue().file));
-
-            default -> throw new IllegalArgumentException("Wrong filter passed to MVStoreEmbeddingStore");
+                    filterEntries(
+                            entry -> isInFilter.comparisonValues().contains(entry.getValue().file));
+
+            case IsEqualTo isEqualToFilter when Objects.equals(
+                            isEqualToFilter.key(), LINK_METADATA_KEY) ->
+                    filterEntries(
+                            entry ->
+                                    isEqualToFilter
+                                            .comparisonValue()
+                                            .equals(entry.getValue().file));
+
+            default ->
+                    throw new IllegalArgumentException(
+                            "Wrong filter passed to MVStoreEmbeddingStore");
         };
     }
 
@@ -184,6 +208,7 @@ protected String errorMessageForOpening() {
 
     @Override
     protected String errorMessageForOpeningLocalized() {
-        return Localization.lang("An error occurred while opening the embeddings cache file. Embeddings will not be stored in the next session.");
+        return Localization.lang(
+                "An error occurred while opening the embeddings cache file. Embeddings will not be stored in the next session.");
     }
 }
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/model/DeepJavaEmbeddingModel.java b/src/main/java/org/jabref/logic/ai/ingestion/model/DeepJavaEmbeddingModel.java
index 560a953a6e36..7afa1fc4b42c 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/model/DeepJavaEmbeddingModel.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/model/DeepJavaEmbeddingModel.java
@@ -1,25 +1,27 @@
 package org.jabref.logic.ai.ingestion.model;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
 import ai.djl.MalformedModelException;
 import ai.djl.inference.Predictor;
 import ai.djl.repository.zoo.Criteria;
 import ai.djl.repository.zoo.ModelNotFoundException;
 import ai.djl.repository.zoo.ZooModel;
 import ai.djl.translate.TranslateException;
+
 import dev.langchain4j.data.embedding.Embedding;
 import dev.langchain4j.data.segment.TextSegment;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.output.Response;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 public class DeepJavaEmbeddingModel implements EmbeddingModel, AutoCloseable {
     private final ZooModel<String, float[]> model;
     private final Predictor<String, float[]> predictor;
 
-    public DeepJavaEmbeddingModel(Criteria<String, float[]> criteria) throws ModelNotFoundException, MalformedModelException, IOException {
+    public DeepJavaEmbeddingModel(Criteria<String, float[]> criteria)
+            throws ModelNotFoundException, MalformedModelException, IOException {
         this.model = criteria.loadModel();
         this.predictor = model.newPredictor();
     }
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/model/JabRefEmbeddingModel.java b/src/main/java/org/jabref/logic/ai/ingestion/model/JabRefEmbeddingModel.java
index 526ade268d1d..eae68eb0b832 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/model/JabRefEmbeddingModel.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/model/JabRefEmbeddingModel.java
@@ -1,9 +1,12 @@
 package org.jabref.logic.ai.ingestion.model;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import com.google.common.eventbus.EventBus;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
+import dev.langchain4j.data.embedding.Embedding;
+import dev.langchain4j.data.segment.TextSegment;
+import dev.langchain4j.model.embedding.EmbeddingModel;
+import dev.langchain4j.model.output.Response;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -12,16 +15,14 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.NotificationService;
 import org.jabref.logic.util.TaskExecutor;
-
-import com.google.common.eventbus.EventBus;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import dev.langchain4j.data.embedding.Embedding;
-import dev.langchain4j.data.segment.TextSegment;
-import dev.langchain4j.model.embedding.EmbeddingModel;
-import dev.langchain4j.model.output.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 /**
  * Wrapper around langchain4j {@link dev.langchain4j.model.embedding.EmbeddingModel}.
  * <p>
@@ -34,23 +35,27 @@ public class JabRefEmbeddingModel implements EmbeddingModel, AutoCloseable {
     private final NotificationService notificationService;
     private final TaskExecutor taskExecutor;
 
-    private final ExecutorService executorService = Executors.newCachedThreadPool(
-            new ThreadFactoryBuilder().setNameFormat("ai-embedding-pool-%d").build()
-    );
+    private final ExecutorService executorService =
+            Executors.newCachedThreadPool(
+                    new ThreadFactoryBuilder().setNameFormat("ai-embedding-pool-%d").build());
 
-    private final ObjectProperty<Optional<DeepJavaEmbeddingModel>> predictorProperty = new SimpleObjectProperty<>(Optional.empty());
+    private final ObjectProperty<Optional<DeepJavaEmbeddingModel>> predictorProperty =
+            new SimpleObjectProperty<>(Optional.empty());
 
     // Used to update the tab content after the data is available
     private final EventBus eventBus = new EventBus();
 
-    public static class EmbeddingModelBuiltEvent { }
+    public static class EmbeddingModelBuiltEvent {}
 
-    public static class EmbeddingModelBuildingErrorEvent { }
+    public static class EmbeddingModelBuildingErrorEvent {}
 
     // Empty if there is no error.
     private String errorWhileBuildingModel = "";
 
-    public JabRefEmbeddingModel(AiPreferences aiPreferences, NotificationService notificationService, TaskExecutor taskExecutor) {
+    public JabRefEmbeddingModel(
+            AiPreferences aiPreferences,
+            NotificationService notificationService,
+            TaskExecutor taskExecutor) {
         this.aiPreferences = aiPreferences;
         this.notificationService = notificationService;
         this.taskExecutor = taskExecutor;
@@ -72,17 +77,21 @@ public void startRebuildingTask() {
         predictorProperty.set(Optional.empty());
 
         new UpdateEmbeddingModelTask(aiPreferences, predictorProperty)
-                .onSuccess(v -> {
-                    LOGGER.info("Embedding model was successfully updated");
-                    errorWhileBuildingModel = "";
-                    eventBus.post(new EmbeddingModelBuiltEvent());
-                })
-                .onFailure(e -> {
-                    LOGGER.error("An error occurred while building the embedding model", e);
-                    notificationService.notify(Localization.lang("An error occurred while building the embedding model"));
-                    errorWhileBuildingModel = e.getMessage();
-                    eventBus.post(new EmbeddingModelBuildingErrorEvent());
-                })
+                .onSuccess(
+                        v -> {
+                            LOGGER.info("Embedding model was successfully updated");
+                            errorWhileBuildingModel = "";
+                            eventBus.post(new EmbeddingModelBuiltEvent());
+                        })
+                .onFailure(
+                        e -> {
+                            LOGGER.error("An error occurred while building the embedding model", e);
+                            notificationService.notify(
+                                    Localization.lang(
+                                            "An error occurred while building the embedding model"));
+                            errorWhileBuildingModel = e.getMessage();
+                            eventBus.post(new EmbeddingModelBuildingErrorEvent());
+                        })
                 .executeWith(taskExecutor);
     }
 
@@ -99,17 +108,23 @@ public String getErrorWhileBuildingModel() {
     }
 
     private void setupListeningToPreferencesChanges() {
-        aiPreferences.enableAiProperty().addListener((obs, oldValue, newValue) -> {
-            if (newValue && predictorProperty.get().isEmpty()) {
-                startRebuildingTask();
-            }
-        });
-
-        aiPreferences.customizeExpertSettingsProperty().addListener((obs, oldValue, newValue) -> {
-            if (newValue && predictorProperty.get().isEmpty()) {
-                startRebuildingTask();
-            }
-        });
+        aiPreferences
+                .enableAiProperty()
+                .addListener(
+                        (obs, oldValue, newValue) -> {
+                            if (newValue && predictorProperty.get().isEmpty()) {
+                                startRebuildingTask();
+                            }
+                        });
+
+        aiPreferences
+                .customizeExpertSettingsProperty()
+                .addListener(
+                        (obs, oldValue, newValue) -> {
+                            if (newValue && predictorProperty.get().isEmpty()) {
+                                startRebuildingTask();
+                            }
+                        });
 
         aiPreferences.embeddingModelProperty().addListener(obs -> startRebuildingTask());
     }
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/model/UpdateEmbeddingModelTask.java b/src/main/java/org/jabref/logic/ai/ingestion/model/UpdateEmbeddingModelTask.java
index da236b69c342..0944ee79132d 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/model/UpdateEmbeddingModelTask.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/model/UpdateEmbeddingModelTask.java
@@ -1,7 +1,9 @@
 package org.jabref.logic.ai.ingestion.model;
 
-import java.io.IOException;
-import java.util.Optional;
+import ai.djl.MalformedModelException;
+import ai.djl.huggingface.translator.TextEmbeddingTranslatorFactory;
+import ai.djl.repository.zoo.Criteria;
+import ai.djl.repository.zoo.ModelNotFoundException;
 
 import javafx.beans.property.ObjectProperty;
 
@@ -9,25 +11,26 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.logic.util.ProgressCounter;
-
-import ai.djl.MalformedModelException;
-import ai.djl.huggingface.translator.TextEmbeddingTranslatorFactory;
-import ai.djl.repository.zoo.Criteria;
-import ai.djl.repository.zoo.ModelNotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.Optional;
+
 public class UpdateEmbeddingModelTask extends BackgroundTask<Void> {
     private static final Logger LOGGER = LoggerFactory.getLogger(UpdateEmbeddingModelTask.class);
 
-    private static final String DJL_EMBEDDING_MODEL_URL_PREFIX = "djl://ai.djl.huggingface.pytorch/";
+    private static final String DJL_EMBEDDING_MODEL_URL_PREFIX =
+            "djl://ai.djl.huggingface.pytorch/";
 
     private final AiPreferences aiPreferences;
     private final ObjectProperty<Optional<DeepJavaEmbeddingModel>> predictorProperty;
 
     private final ProgressCounter progressCounter = new ProgressCounter();
 
-    public UpdateEmbeddingModelTask(AiPreferences aiPreferences, ObjectProperty<Optional<DeepJavaEmbeddingModel>> predictorProperty) {
+    public UpdateEmbeddingModelTask(
+            AiPreferences aiPreferences,
+            ObjectProperty<Optional<DeepJavaEmbeddingModel>> predictorProperty) {
         this.aiPreferences = aiPreferences;
         this.predictorProperty = predictorProperty;
 
@@ -50,7 +53,8 @@ public Void call() {
 
         LOGGER.info("Downloading embedding model...");
 
-        String modelUrl = DJL_EMBEDDING_MODEL_URL_PREFIX + aiPreferences.getEmbeddingModel().getName();
+        String modelUrl =
+                DJL_EMBEDDING_MODEL_URL_PREFIX + aiPreferences.getEmbeddingModel().getName();
 
         Criteria<String, float[]> criteria =
                 Criteria.builder()
@@ -65,13 +69,20 @@ public Void call() {
             predictorProperty.set(Optional.of(new DeepJavaEmbeddingModel(criteria)));
         } catch (ModelNotFoundException e) {
             predictorProperty.set(Optional.empty());
-            throw new RuntimeException(Localization.lang("Unable to find the embedding model by the URL %0", modelUrl), e);
+            throw new RuntimeException(
+                    Localization.lang("Unable to find the embedding model by the URL %0", modelUrl),
+                    e);
         } catch (MalformedModelException e) {
             predictorProperty.set(Optional.empty());
-            throw new RuntimeException(Localization.lang("The model by URL %0 is malformed", modelUrl), e);
+            throw new RuntimeException(
+                    Localization.lang("The model by URL %0 is malformed", modelUrl), e);
         } catch (IOException e) {
             predictorProperty.set(Optional.empty());
-            throw new RuntimeException(Localization.lang("An I/O error occurred while opening the embedding model by URL %0", modelUrl), e);
+            throw new RuntimeException(
+                    Localization.lang(
+                            "An I/O error occurred while opening the embedding model by URL %0",
+                            modelUrl),
+                    e);
         }
 
         progressCounter.stop();
diff --git a/src/main/java/org/jabref/logic/ai/ingestion/storages/MVStoreFullyIngestedDocumentsTracker.java b/src/main/java/org/jabref/logic/ai/ingestion/storages/MVStoreFullyIngestedDocumentsTracker.java
index 1eb9809e0079..c699b9fa5f9f 100644
--- a/src/main/java/org/jabref/logic/ai/ingestion/storages/MVStoreFullyIngestedDocumentsTracker.java
+++ b/src/main/java/org/jabref/logic/ai/ingestion/storages/MVStoreFullyIngestedDocumentsTracker.java
@@ -1,26 +1,31 @@
 package org.jabref.logic.ai.ingestion.storages;
 
-import java.nio.file.Path;
-import java.util.Map;
-import java.util.Optional;
-
 import org.jabref.logic.ai.ingestion.FullyIngestedDocumentsTracker;
 import org.jabref.logic.ai.util.MVStoreBase;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.NotificationService;
 
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.Optional;
+
 /**
  * This class is responsible for recording the information about which documents (or documents) have been fully ingested.
  * <p>
  * The class also records the document modification time.
  */
-public class MVStoreFullyIngestedDocumentsTracker extends MVStoreBase implements FullyIngestedDocumentsTracker {
+public class MVStoreFullyIngestedDocumentsTracker extends MVStoreBase
+        implements FullyIngestedDocumentsTracker {
     private static final String INGESTED_MAP_NAME = "ingested";
 
-    // This map stores the ingested documents. The key is LinkedDocument.getLink(), and the value is the modification time in seconds.
-    // If an entry is present, then it means the document was ingested. Otherwise, document was not ingested.
-    // The reason why we need to track ingested documents is because we cannot use AiEmbeddingsManager and see if there are
-    // any embeddings because when we ingest a document embeddings are generated in series, so if 1 embedding is present
+    // This map stores the ingested documents. The key is LinkedDocument.getLink(), and the value is
+    // the modification time in seconds.
+    // If an entry is present, then it means the document was ingested. Otherwise, document was not
+    // ingested.
+    // The reason why we need to track ingested documents is because we cannot use
+    // AiEmbeddingsManager and see if there are
+    // any embeddings because when we ingest a document embeddings are generated in series, so if 1
+    // embedding is present
     // it doesn't mean the document is fully ingested.
     private final Map<String, Long> ingestedMap;
 
@@ -49,6 +54,7 @@ protected String errorMessageForOpening() {
 
     @Override
     protected String errorMessageForOpeningLocalized() {
-        return Localization.lang("An error occurred while opening the fully ingested documents cache file. Fully ingested documents will not be stored in the next session.");
+        return Localization.lang(
+                "An error occurred while opening the fully ingested documents cache file. Fully ingested documents will not be stored in the next session.");
     }
 }
diff --git a/src/main/java/org/jabref/logic/ai/processingstatus/ProcessingInfo.java b/src/main/java/org/jabref/logic/ai/processingstatus/ProcessingInfo.java
index 080d7dddef82..fbde0b034f35 100644
--- a/src/main/java/org/jabref/logic/ai/processingstatus/ProcessingInfo.java
+++ b/src/main/java/org/jabref/logic/ai/processingstatus/ProcessingInfo.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.ai.processingstatus;
 
-import java.util.Optional;
+import jakarta.annotation.Nullable;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 
-import jakarta.annotation.Nullable;
+import java.util.Optional;
 
 public class ProcessingInfo<O, D> {
     private final O object;
@@ -20,13 +20,15 @@ public ProcessingInfo(O object, ProcessingState state) {
     }
 
     public void setSuccess(@Nullable D data) {
-        // Listeners will probably handle only state property, so be careful to set the data BEFORE setting the state.
+        // Listeners will probably handle only state property, so be careful to set the data BEFORE
+        // setting the state.
         this.data = Optional.ofNullable(data);
         this.state.set(ProcessingState.SUCCESS);
     }
 
     public void setException(Exception exception) {
-        // Listeners will probably handle only state property, so be careful to set the error message BEFORE setting the state.
+        // Listeners will probably handle only state property, so be careful to set the error
+        // message BEFORE setting the state.
         this.exception = Optional.of(exception);
         this.state.set(ProcessingState.ERROR);
     }
diff --git a/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java b/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
index 208de09f4903..fe177a1d9d65 100644
--- a/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
+++ b/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.ai.summarization;
 
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import dev.langchain4j.data.document.Document;
+import dev.langchain4j.data.document.DocumentSplitter;
+import dev.langchain4j.data.document.splitter.DocumentSplitters;
+import dev.langchain4j.data.segment.TextSegment;
+import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.input.Prompt;
+import dev.langchain4j.model.input.PromptTemplate;
 
 import javafx.beans.property.BooleanProperty;
 
@@ -18,17 +18,17 @@
 import org.jabref.logic.util.ProgressCounter;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
-
-import dev.langchain4j.data.document.Document;
-import dev.langchain4j.data.document.DocumentSplitter;
-import dev.langchain4j.data.document.splitter.DocumentSplitters;
-import dev.langchain4j.data.segment.TextSegment;
-import dev.langchain4j.model.chat.ChatLanguageModel;
-import dev.langchain4j.model.input.Prompt;
-import dev.langchain4j.model.input.PromptTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 /**
  * This task generates a new summary for an entry.
  * It will not check if summary was already generated.
@@ -42,8 +42,9 @@ public class GenerateSummaryTask extends BackgroundTask<String> {
     // Be careful when constructing prompt.
     // 1. It should contain variables `bullets` and `chunk`.
     // 2. Variables should be wrapped in `{{` and `}}` and only with them. No whitespace inside.
-    private static final PromptTemplate CHUNK_PROMPT_TEMPLATE = PromptTemplate.from(
-            """
+    private static final PromptTemplate CHUNK_PROMPT_TEMPLATE =
+            PromptTemplate.from(
+                    """
                 Please provide an overview of the following text. It's a part of a scientific paper.
                 The summary should include the main objectives, methodologies used, key findings, and conclusions.
                 Mention any significant experiments, data, or discussions presented in the paper.
@@ -51,19 +52,18 @@ public class GenerateSummaryTask extends BackgroundTask<String> {
                 DOCUMENT:
                 {{document}}
 
-                OVERVIEW:"""
-    );
+                OVERVIEW:""");
 
-    private static final PromptTemplate COMBINE_PROMPT_TEMPLATE = PromptTemplate.from(
-            """
+    private static final PromptTemplate COMBINE_PROMPT_TEMPLATE =
+            PromptTemplate.from(
+                    """
                 You have written an overview of a scientific paper. You have been collecting notes from various parts
                 of the paper. Now your task is to combine all of the notes in one structured message.
 
                 SUMMARIES:
                 {{summaries}}
 
-                FINAL OVERVIEW:"""
-    );
+                FINAL OVERVIEW:""");
 
     private static final int MAX_OVERLAP_SIZE_IN_CHARS = 100;
     private static final int CHAR_TOKEN_FACTOR = 4; // Means, every token is roughly 4 characters.
@@ -78,14 +78,14 @@ public class GenerateSummaryTask extends BackgroundTask<String> {
 
     private final ProgressCounter progressCounter = new ProgressCounter();
 
-    public GenerateSummaryTask(BibDatabaseContext bibDatabaseContext,
-                               String citationKey,
-                               List<LinkedFile> linkedFiles,
-                               ChatLanguageModel chatLanguageModel,
-                               BooleanProperty shutdownSignal,
-                               AiPreferences aiPreferences,
-                               FilePreferences filePreferences
-    ) {
+    public GenerateSummaryTask(
+            BibDatabaseContext bibDatabaseContext,
+            String citationKey,
+            List<LinkedFile> linkedFiles,
+            ChatLanguageModel chatLanguageModel,
+            BooleanProperty shutdownSignal,
+            AiPreferences aiPreferences,
+            FilePreferences filePreferences) {
         this.bibDatabaseContext = bibDatabaseContext;
         this.citationKey = citationKey;
         this.linkedFiles = linkedFiles;
@@ -113,7 +113,9 @@ public String call() throws Exception {
         try {
             result = summarizeAll();
         } catch (InterruptedException e) {
-            LOGGER.debug("There was a summarization task for {}. It will be canceled, because user quits JabRef.", citationKey);
+            LOGGER.debug(
+                    "There was a summarization task for {}. It will be canceled, because user quits JabRef.",
+                    citationKey);
         }
 
         showToUser(false);
@@ -124,7 +126,8 @@ public String call() throws Exception {
 
     private String summarizeAll() throws InterruptedException {
         // Rationale for RuntimeException here:
-        // It follows the same idiom as in langchain4j. See {@link JabRefChatLanguageModel.generate}, this method
+        // It follows the same idiom as in langchain4j. See {@link
+        // JabRefChatLanguageModel.generate}, this method
         // is used internally in the summarization, and it also throws RuntimeExceptions.
 
         // Stream API would look better here, but we need to catch InterruptedException.
@@ -139,10 +142,15 @@ private String summarizeAll() throws InterruptedException {
 
         if (linkedFilesSummary.isEmpty()) {
             doneOneWork(); // Skipped generation of final summary.
-            throw new RuntimeException(Localization.lang("No summary can be generated for entry '%0'. Could not find attached linked files.", citationKey));
+            throw new RuntimeException(
+                    Localization.lang(
+                            "No summary can be generated for entry '%0'. Could not find attached linked files.",
+                            citationKey));
         }
 
-        LOGGER.debug("All summaries for attached files of entry {} are generated. Generating final summary.", citationKey);
+        LOGGER.debug(
+                "All summaries for attached files of entry {} are generated. Generating final summary.",
+                citationKey);
 
         String finalSummary;
 
@@ -160,44 +168,80 @@ private String summarizeAll() throws InterruptedException {
     }
 
     private Optional<String> generateSummary(LinkedFile linkedFile) throws InterruptedException {
-        LOGGER.debug("Generating summary for file \"{}\" of entry {}", linkedFile.getLink(), citationKey);
+        LOGGER.debug(
+                "Generating summary for file \"{}\" of entry {}",
+                linkedFile.getLink(),
+                citationKey);
 
         Optional<Path> path = linkedFile.findIn(bibDatabaseContext, filePreferences);
 
         if (path.isEmpty()) {
-            LOGGER.error("Could not find path for a linked file \"{}\" of entry {}", linkedFile.getLink(), citationKey);
-            LOGGER.debug("Unable to generate summary for file \"{}\" of entry {}, because it was not found", linkedFile.getLink(), citationKey);
+            LOGGER.error(
+                    "Could not find path for a linked file \"{}\" of entry {}",
+                    linkedFile.getLink(),
+                    citationKey);
+            LOGGER.debug(
+                    "Unable to generate summary for file \"{}\" of entry {}, because it was not found",
+                    linkedFile.getLink(),
+                    citationKey);
             return Optional.empty();
         }
 
         Optional<Document> document = new FileToDocument(shutdownSignal).fromFile(path.get());
 
         if (document.isEmpty()) {
-            LOGGER.warn("Could not extract text from a linked file \"{}\" of entry {}. It will be skipped when generating a summary.", linkedFile.getLink(), citationKey);
-            LOGGER.debug("Unable to generate summary for file \"{}\" of entry {}, because it was not found", linkedFile.getLink(), citationKey);
+            LOGGER.warn(
+                    "Could not extract text from a linked file \"{}\" of entry {}. It will be skipped when generating a summary.",
+                    linkedFile.getLink(),
+                    citationKey);
+            LOGGER.debug(
+                    "Unable to generate summary for file \"{}\" of entry {}, because it was not found",
+                    linkedFile.getLink(),
+                    citationKey);
             return Optional.empty();
         }
 
-        String linkedFileSummary = summarizeOneDocument(path.get().toString(), document.get().text());
+        String linkedFileSummary =
+                summarizeOneDocument(path.get().toString(), document.get().text());
 
-        LOGGER.debug("Summary for file \"{}\" of entry {} was generated successfully", linkedFile.getLink(), citationKey);
+        LOGGER.debug(
+                "Summary for file \"{}\" of entry {} was generated successfully",
+                linkedFile.getLink(),
+                citationKey);
         return Optional.of(linkedFileSummary);
     }
 
-    public String summarizeOneDocument(String filePath, String document) throws InterruptedException {
+    public String summarizeOneDocument(String filePath, String document)
+            throws InterruptedException {
         addMoreWork(1); // For the combination of summary chunks.
 
-        DocumentSplitter documentSplitter = DocumentSplitters.recursive(aiPreferences.getContextWindowSize() - MAX_OVERLAP_SIZE_IN_CHARS * 2 - estimateTokenCount(CHUNK_PROMPT_TEMPLATE), MAX_OVERLAP_SIZE_IN_CHARS);
+        DocumentSplitter documentSplitter =
+                DocumentSplitters.recursive(
+                        aiPreferences.getContextWindowSize()
+                                - MAX_OVERLAP_SIZE_IN_CHARS * 2
+                                - estimateTokenCount(CHUNK_PROMPT_TEMPLATE),
+                        MAX_OVERLAP_SIZE_IN_CHARS);
 
-        List<String> chunkSummaries = documentSplitter.split(new Document(document)).stream().map(TextSegment::text).toList();
+        List<String> chunkSummaries =
+                documentSplitter.split(new Document(document)).stream()
+                        .map(TextSegment::text)
+                        .toList();
 
-        LOGGER.debug("The file \"{}\" of entry {} was split into {} chunk(s)", filePath, citationKey, chunkSummaries.size());
+        LOGGER.debug(
+                "The file \"{}\" of entry {} was split into {} chunk(s)",
+                filePath,
+                citationKey,
+                chunkSummaries.size());
 
         int passes = 0;
 
         do {
             passes++;
-            LOGGER.debug("Summarizing chunk(s) for file \"{}\" of entry {} ({} pass)", filePath, citationKey, passes);
+            LOGGER.debug(
+                    "Summarizing chunk(s) for file \"{}\" of entry {} ({} pass)",
+                    filePath,
+                    citationKey,
+                    passes);
 
             addMoreWork(chunkSummaries.size());
 
@@ -208,34 +252,55 @@ public String summarizeOneDocument(String filePath, String document) throws Inte
                     throw new InterruptedException();
                 }
 
-                Prompt prompt = CHUNK_PROMPT_TEMPLATE.apply(Collections.singletonMap("document", chunkSummary));
+                Prompt prompt =
+                        CHUNK_PROMPT_TEMPLATE.apply(
+                                Collections.singletonMap("document", chunkSummary));
 
-                LOGGER.debug("Sending request to AI provider to summarize a chunk from file \"{}\" of entry {}", filePath, citationKey);
+                LOGGER.debug(
+                        "Sending request to AI provider to summarize a chunk from file \"{}\" of entry {}",
+                        filePath,
+                        citationKey);
                 String chunk = chatLanguageModel.generate(prompt.toString());
-                LOGGER.debug("Chunk summary for file \"{}\" of entry {} was generated successfully", filePath, citationKey);
+                LOGGER.debug(
+                        "Chunk summary for file \"{}\" of entry {} was generated successfully",
+                        filePath,
+                        citationKey);
 
                 list.add(chunk);
                 doneOneWork();
             }
 
             chunkSummaries = list;
-        } while (estimateTokenCount(chunkSummaries) > aiPreferences.getContextWindowSize() - estimateTokenCount(COMBINE_PROMPT_TEMPLATE));
+        } while (estimateTokenCount(chunkSummaries)
+                > aiPreferences.getContextWindowSize()
+                        - estimateTokenCount(COMBINE_PROMPT_TEMPLATE));
 
         if (chunkSummaries.size() == 1) {
             doneOneWork(); // No need to call LLM for combination of summary chunks.
-            LOGGER.debug("Summary of the file \"{}\" of entry {} was generated successfully", filePath, citationKey);
+            LOGGER.debug(
+                    "Summary of the file \"{}\" of entry {} was generated successfully",
+                    filePath,
+                    citationKey);
             return chunkSummaries.getFirst();
         }
 
-        Prompt prompt = COMBINE_PROMPT_TEMPLATE.apply(Collections.singletonMap("summaries", String.join("\n\n", chunkSummaries)));
+        Prompt prompt =
+                COMBINE_PROMPT_TEMPLATE.apply(
+                        Collections.singletonMap("summaries", String.join("\n\n", chunkSummaries)));
 
         if (shutdownSignal.get()) {
             throw new InterruptedException();
         }
 
-        LOGGER.debug("Sending request to AI provider to combine summary chunk(s) for file \"{}\" of entry {}", filePath, citationKey);
+        LOGGER.debug(
+                "Sending request to AI provider to combine summary chunk(s) for file \"{}\" of entry {}",
+                filePath,
+                citationKey);
         String result = chatLanguageModel.generate(prompt.toString());
-        LOGGER.debug("Summary of the file \"{}\" of entry {} was generated successfully", filePath, citationKey);
+        LOGGER.debug(
+                "Summary of the file \"{}\" of entry {} was generated successfully",
+                filePath,
+                citationKey);
 
         doneOneWork();
         return result;
diff --git a/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java b/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
index c71db69cdf8c..f3dc2503fafb 100644
--- a/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
+++ b/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
@@ -1,9 +1,6 @@
 package org.jabref.logic.ai.summarization;
 
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
+import dev.langchain4j.model.chat.ChatLanguageModel;
 
 import javafx.beans.property.BooleanProperty;
 
@@ -15,11 +12,14 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-
-import dev.langchain4j.model.chat.ChatLanguageModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
 /**
  * Main class for generating summaries of {@link BibEntry}ies.
  * Use this class in the logic and UI.
@@ -32,7 +32,8 @@
 public class SummariesService {
     private static final Logger LOGGER = LoggerFactory.getLogger(SummariesService.class);
 
-    private final Map<BibEntry, ProcessingInfo<BibEntry, Summary>> summariesStatusMap = new HashMap<>();
+    private final Map<BibEntry, ProcessingInfo<BibEntry, Summary>> summariesStatusMap =
+            new HashMap<>();
 
     private final AiPreferences aiPreferences;
     private final SummariesStorage summariesStorage;
@@ -41,13 +42,13 @@ public class SummariesService {
     private final FilePreferences filePreferences;
     private final TaskExecutor taskExecutor;
 
-    public SummariesService(AiPreferences aiPreferences,
-                            SummariesStorage summariesStorage,
-                            ChatLanguageModel chatLanguageModel,
-                            BooleanProperty shutdownSignal,
-                            FilePreferences filePreferences,
-                            TaskExecutor taskExecutor
-    ) {
+    public SummariesService(
+            AiPreferences aiPreferences,
+            SummariesStorage summariesStorage,
+            ChatLanguageModel chatLanguageModel,
+            BooleanProperty shutdownSignal,
+            FilePreferences filePreferences,
+            TaskExecutor taskExecutor) {
         this.aiPreferences = aiPreferences;
         this.summariesStorage = summariesStorage;
         this.chatLanguageModel = chatLanguageModel;
@@ -62,21 +63,32 @@ public SummariesService(AiPreferences aiPreferences,
      * Returned {@link ProcessingInfo} is related to the passed {@link BibEntry}, so if you call this method twice
      * on the same {@link BibEntry}, the method will return the same {@link ProcessingInfo}.
      */
-    public ProcessingInfo<BibEntry, Summary> summarize(BibEntry bibEntry, BibDatabaseContext bibDatabaseContext) {
-        return summariesStatusMap.computeIfAbsent(bibEntry, file -> {
-            ProcessingInfo<BibEntry, Summary> processingInfo = new ProcessingInfo<>(bibEntry, ProcessingState.PROCESSING);
-            generateSummary(bibEntry, bibDatabaseContext, processingInfo);
-            return processingInfo;
-        });
+    public ProcessingInfo<BibEntry, Summary> summarize(
+            BibEntry bibEntry, BibDatabaseContext bibDatabaseContext) {
+        return summariesStatusMap.computeIfAbsent(
+                bibEntry,
+                file -> {
+                    ProcessingInfo<BibEntry, Summary> processingInfo =
+                            new ProcessingInfo<>(bibEntry, ProcessingState.PROCESSING);
+                    generateSummary(bibEntry, bibDatabaseContext, processingInfo);
+                    return processingInfo;
+                });
     }
 
-    private void generateSummary(BibEntry bibEntry, BibDatabaseContext bibDatabaseContext, ProcessingInfo<BibEntry, Summary> processingInfo) {
+    private void generateSummary(
+            BibEntry bibEntry,
+            BibDatabaseContext bibDatabaseContext,
+            ProcessingInfo<BibEntry, Summary> processingInfo) {
         if (bibDatabaseContext.getDatabasePath().isEmpty()) {
             runGenerateSummaryTask(processingInfo, bibEntry, bibDatabaseContext);
-        } else if (bibEntry.getCitationKey().isEmpty() || CitationKeyCheck.citationKeyIsPresentAndUnique(bibDatabaseContext, bibEntry)) {
+        } else if (bibEntry.getCitationKey().isEmpty()
+                || CitationKeyCheck.citationKeyIsPresentAndUnique(bibDatabaseContext, bibEntry)) {
             runGenerateSummaryTask(processingInfo, bibEntry, bibDatabaseContext);
         } else {
-            Optional<Summary> summary = summariesStorage.get(bibDatabaseContext.getDatabasePath().get(), bibEntry.getCitationKey().get());
+            Optional<Summary> summary =
+                    summariesStorage.get(
+                            bibDatabaseContext.getDatabasePath().get(),
+                            bibEntry.getCitationKey().get());
 
             if (summary.isEmpty()) {
                 runGenerateSummaryTask(processingInfo, bibEntry, bibDatabaseContext);
@@ -94,43 +106,57 @@ public void regenerateSummary(BibEntry bibEntry, BibDatabaseContext bibDatabaseC
         processingInfo.setState(ProcessingState.PROCESSING);
 
         if (bibDatabaseContext.getDatabasePath().isEmpty()) {
-            LOGGER.info("No database path is present. Could not clear stored summary for regeneration");
-        } else if (bibEntry.getCitationKey().isEmpty() || CitationKeyCheck.citationKeyIsPresentAndUnique(bibDatabaseContext, bibEntry)) {
-            LOGGER.info("No valid citation key is present. Could not clear stored summary for regeneration");
+            LOGGER.info(
+                    "No database path is present. Could not clear stored summary for regeneration");
+        } else if (bibEntry.getCitationKey().isEmpty()
+                || CitationKeyCheck.citationKeyIsPresentAndUnique(bibDatabaseContext, bibEntry)) {
+            LOGGER.info(
+                    "No valid citation key is present. Could not clear stored summary for regeneration");
         } else {
-            summariesStorage.clear(bibDatabaseContext.getDatabasePath().get(), bibEntry.getCitationKey().get());
+            summariesStorage.clear(
+                    bibDatabaseContext.getDatabasePath().get(), bibEntry.getCitationKey().get());
         }
 
         generateSummary(bibEntry, bibDatabaseContext, processingInfo);
     }
 
-    private void runGenerateSummaryTask(ProcessingInfo<BibEntry, Summary> processingInfo, BibEntry bibEntry, BibDatabaseContext bibDatabaseContext) {
+    private void runGenerateSummaryTask(
+            ProcessingInfo<BibEntry, Summary> processingInfo,
+            BibEntry bibEntry,
+            BibDatabaseContext bibDatabaseContext) {
         new GenerateSummaryTask(
-                bibDatabaseContext,
-                bibEntry.getCitationKey().orElse("<no citation key>"),
-                bibEntry.getFiles(),
-                chatLanguageModel,
-                shutdownSignal,
-                aiPreferences,
-                filePreferences)
-                .onSuccess(summary -> {
-                    Summary Summary = new Summary(
-                            LocalDateTime.now(),
-                            aiPreferences.getAiProvider(),
-                            aiPreferences.getSelectedChatModel(),
-                            summary
-                    );
-
-                    processingInfo.setSuccess(Summary);
-
-                    if (bibDatabaseContext.getDatabasePath().isEmpty()) {
-                        LOGGER.info("No database path is present. Summary will not be stored in the next sessions");
-                    } else if (CitationKeyCheck.citationKeyIsPresentAndUnique(bibDatabaseContext, bibEntry)) {
-                        LOGGER.info("No valid citation key is present. Summary will not be stored in the next sessions");
-                    } else {
-                        summariesStorage.set(bibDatabaseContext.getDatabasePath().get(), bibEntry.getCitationKey().get(), Summary);
-                    }
-                })
+                        bibDatabaseContext,
+                        bibEntry.getCitationKey().orElse("<no citation key>"),
+                        bibEntry.getFiles(),
+                        chatLanguageModel,
+                        shutdownSignal,
+                        aiPreferences,
+                        filePreferences)
+                .onSuccess(
+                        summary -> {
+                            Summary Summary =
+                                    new Summary(
+                                            LocalDateTime.now(),
+                                            aiPreferences.getAiProvider(),
+                                            aiPreferences.getSelectedChatModel(),
+                                            summary);
+
+                            processingInfo.setSuccess(Summary);
+
+                            if (bibDatabaseContext.getDatabasePath().isEmpty()) {
+                                LOGGER.info(
+                                        "No database path is present. Summary will not be stored in the next sessions");
+                            } else if (CitationKeyCheck.citationKeyIsPresentAndUnique(
+                                    bibDatabaseContext, bibEntry)) {
+                                LOGGER.info(
+                                        "No valid citation key is present. Summary will not be stored in the next sessions");
+                            } else {
+                                summariesStorage.set(
+                                        bibDatabaseContext.getDatabasePath().get(),
+                                        bibEntry.getCitationKey().get(),
+                                        Summary);
+                            }
+                        })
                 .onFailure(processingInfo::setException)
                 .executeWith(taskExecutor);
     }
diff --git a/src/main/java/org/jabref/logic/ai/summarization/Summary.java b/src/main/java/org/jabref/logic/ai/summarization/Summary.java
index f96ab60a6f6d..11bcdaeb7c7b 100644
--- a/src/main/java/org/jabref/logic/ai/summarization/Summary.java
+++ b/src/main/java/org/jabref/logic/ai/summarization/Summary.java
@@ -1,8 +1,9 @@
 package org.jabref.logic.ai.summarization;
 
+import org.jabref.model.ai.AiProvider;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-import org.jabref.model.ai.AiProvider;
-
-public record Summary(LocalDateTime timestamp, AiProvider aiProvider, String model, String content) implements Serializable { }
+public record Summary(LocalDateTime timestamp, AiProvider aiProvider, String model, String content)
+        implements Serializable {}
diff --git a/src/main/java/org/jabref/logic/ai/summarization/storages/MVStoreSummariesStorage.java b/src/main/java/org/jabref/logic/ai/summarization/storages/MVStoreSummariesStorage.java
index 96ad5ef21a48..f33c1d8a084a 100644
--- a/src/main/java/org/jabref/logic/ai/summarization/storages/MVStoreSummariesStorage.java
+++ b/src/main/java/org/jabref/logic/ai/summarization/storages/MVStoreSummariesStorage.java
@@ -1,15 +1,15 @@
 package org.jabref.logic.ai.summarization.storages;
 
-import java.nio.file.Path;
-import java.util.Map;
-import java.util.Optional;
-
 import org.jabref.logic.ai.summarization.SummariesStorage;
 import org.jabref.logic.ai.summarization.Summary;
 import org.jabref.logic.ai.util.MVStoreBase;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.NotificationService;
 
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.Optional;
+
 public class MVStoreSummariesStorage extends MVStoreBase implements SummariesStorage {
     private static final String SUMMARIES_MAP_PREFIX = "summaries";
 
@@ -40,6 +40,7 @@ protected String errorMessageForOpening() {
 
     @Override
     protected String errorMessageForOpeningLocalized() {
-        return Localization.lang("An error occurred while opening summary storage. Summaries of entries will not be stored in the next session.");
+        return Localization.lang(
+                "An error occurred while opening summary storage. Summaries of entries will not be stored in the next session.");
     }
 }
diff --git a/src/main/java/org/jabref/logic/ai/util/CitationKeyCheck.java b/src/main/java/org/jabref/logic/ai/util/CitationKeyCheck.java
index 0fc7678fcb3d..e010c5275f2e 100644
--- a/src/main/java/org/jabref/logic/ai/util/CitationKeyCheck.java
+++ b/src/main/java/org/jabref/logic/ai/util/CitationKeyCheck.java
@@ -4,15 +4,20 @@
 import org.jabref.model.entry.BibEntry;
 
 public class CitationKeyCheck {
-    public static boolean citationKeyIsPresentAndUnique(BibDatabaseContext bibDatabaseContext, BibEntry bibEntry) {
-        return !hasEmptyCitationKey(bibEntry) && bibEntry.getCitationKey().map(key -> citationKeyIsUnique(bibDatabaseContext, key)).orElse(false);
+    public static boolean citationKeyIsPresentAndUnique(
+            BibDatabaseContext bibDatabaseContext, BibEntry bibEntry) {
+        return !hasEmptyCitationKey(bibEntry)
+                && bibEntry.getCitationKey()
+                        .map(key -> citationKeyIsUnique(bibDatabaseContext, key))
+                        .orElse(false);
     }
 
     private static boolean hasEmptyCitationKey(BibEntry bibEntry) {
         return bibEntry.getCitationKey().map(String::isEmpty).orElse(true);
     }
 
-    private static boolean citationKeyIsUnique(BibDatabaseContext bibDatabaseContext, String citationKey) {
+    private static boolean citationKeyIsUnique(
+            BibDatabaseContext bibDatabaseContext, String citationKey) {
         return bibDatabaseContext.getDatabase().getNumberOfCitationKeyOccurrences(citationKey) == 1;
     }
 }
diff --git a/src/main/java/org/jabref/logic/ai/util/MVStoreBase.java b/src/main/java/org/jabref/logic/ai/util/MVStoreBase.java
index 8edf6dd1101c..534a253833a5 100644
--- a/src/main/java/org/jabref/logic/ai/util/MVStoreBase.java
+++ b/src/main/java/org/jabref/logic/ai/util/MVStoreBase.java
@@ -1,17 +1,17 @@
 package org.jabref.logic.ai.util;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.jabref.logic.util.NotificationService;
-
 import jakarta.annotation.Nullable;
+
 import org.h2.mvstore.MVStore;
 import org.h2.mvstore.MVStoreException;
+import org.jabref.logic.util.NotificationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
 public abstract class MVStoreBase implements AutoCloseable {
     private static final Logger LOGGER = LoggerFactory.getLogger(MVStoreBase.class);
 
@@ -29,15 +29,17 @@ public MVStoreBase(Path path, NotificationService dialogService) {
         }
 
         try {
-            this.mvStore = new MVStore.Builder()
-                    .autoCommitDisabled()
-                    .fileName(mvStorePath == null ? null : mvStorePath.toString())
-                    .open();
+            this.mvStore =
+                    new MVStore.Builder()
+                            .autoCommitDisabled()
+                            .fileName(mvStorePath == null ? null : mvStorePath.toString())
+                            .open();
         } catch (MVStoreException e) {
-            this.mvStore = new MVStore.Builder()
-                    .autoCommitDisabled()
-                    .fileName(null) // creates an in memory store
-                    .open();
+            this.mvStore =
+                    new MVStore.Builder()
+                            .autoCommitDisabled()
+                            .fileName(null) // creates an in memory store
+                            .open();
             LOGGER.error(errorMessageForOpening(), e);
         }
     }
diff --git a/src/main/java/org/jabref/logic/auxparser/AuxParserResult.java b/src/main/java/org/jabref/logic/auxparser/AuxParserResult.java
index d9ca4460f74b..cf3a18e63ff5 100644
--- a/src/main/java/org/jabref/logic/auxparser/AuxParserResult.java
+++ b/src/main/java/org/jabref/logic/auxparser/AuxParserResult.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.auxparser;
 
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibtexString;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.BibtexString;
-
 public class AuxParserResult {
 
     private final BibDatabase masterDatabase;
diff --git a/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java b/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java
index 04eab9ccaf82..26b43e6799b0 100644
--- a/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java
+++ b/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java
@@ -1,5 +1,11 @@
 package org.jabref.logic.auxparser;
 
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -11,13 +17,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.StandardField;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * LaTeX Aux to BibTeX Parser
  * <p>
@@ -32,7 +31,8 @@
 public class DefaultAuxParser implements AuxParser {
     private static final Logger LOGGER = LoggerFactory.getLogger(DefaultAuxParser.class);
 
-    private static final Pattern CITE_PATTERN = Pattern.compile("\\\\(citation|abx@aux@cite)(\\{\\d+\\})?\\{(?<citationkey>.+)\\}");
+    private static final Pattern CITE_PATTERN =
+            Pattern.compile("\\\\(citation|abx@aux@cite)(\\{\\d+\\})?\\{(?<citationkey>.+)\\}");
     private static final Pattern INPUT_PATTERN = Pattern.compile("\\\\@input\\{(.+)\\}");
 
     private final BibDatabase masterDatabase;
@@ -83,7 +83,8 @@ private AuxParserResult parseAuxFile(Path auxFile) {
         return result;
     }
 
-    private void matchNestedAux(Path baseAuxFile, AuxParserResult result, List<Path> fileList, String line) {
+    private void matchNestedAux(
+            Path baseAuxFile, AuxParserResult result, List<Path> fileList, String line) {
         Matcher inputMatch = INPUT_PATTERN.matcher(line);
 
         while (inputMatch.find()) {
@@ -141,7 +142,8 @@ private void resolveTags(AuxParserResult result) {
         // Copy database definitions
         if (result.getGeneratedBibDatabase().hasEntries()) {
             result.getGeneratedBibDatabase().copyPreamble(masterDatabase);
-            result.insertStrings(masterDatabase.getUsedStrings(result.getGeneratedBibDatabase().getEntries()));
+            result.insertStrings(
+                    masterDatabase.getUsedStrings(result.getGeneratedBibDatabase().getEntries()));
         }
     }
 
@@ -154,20 +156,25 @@ private void resolveTags(AuxParserResult result) {
     private void resolveCrossReferences(List<BibEntry> entries, AuxParserResult result) {
         List<BibEntry> entriesToInsert = new ArrayList<>();
         for (BibEntry entry : entries) {
-            entry.getField(StandardField.CROSSREF).ifPresent(crossref -> {
-                if (result.getGeneratedBibDatabase().getEntryByCitationKey(crossref).isEmpty()) {
-                    Optional<BibEntry> refEntry = masterDatabase.getEntryByCitationKey(crossref);
-
-                    if (refEntry.isPresent()) {
-                        if (!entriesToInsert.contains(refEntry.get())) {
-                            entriesToInsert.add(refEntry.get());
-                            result.increaseCrossRefEntriesCounter();
-                        }
-                    } else {
-                        result.getUnresolvedKeys().add(crossref);
-                    }
-                }
-            });
+            entry.getField(StandardField.CROSSREF)
+                    .ifPresent(
+                            crossref -> {
+                                if (result.getGeneratedBibDatabase()
+                                        .getEntryByCitationKey(crossref)
+                                        .isEmpty()) {
+                                    Optional<BibEntry> refEntry =
+                                            masterDatabase.getEntryByCitationKey(crossref);
+
+                                    if (refEntry.isPresent()) {
+                                        if (!entriesToInsert.contains(refEntry.get())) {
+                                            entriesToInsert.add(refEntry.get());
+                                            result.increaseCrossRefEntriesCounter();
+                                        }
+                                    } else {
+                                        result.getUnresolvedKeys().add(crossref);
+                                    }
+                                }
+                            });
         }
         insertEntries(entriesToInsert, result);
     }
diff --git a/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java b/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java
index 2d0f63e51dcc..1d7d392f08b1 100644
--- a/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java
@@ -1,19 +1,5 @@
 package org.jabref.logic.bibtex;
 
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
 import org.jabref.logic.exporter.BibWriter;
 import org.jabref.logic.os.OS;
 import org.jabref.model.database.BibDatabaseMode;
@@ -25,10 +11,23 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
 public class BibEntryWriter {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BibEntryWriter.class);
@@ -41,7 +40,8 @@ public BibEntryWriter(FieldWriter fieldWriter, BibEntryTypesManager entryTypesMa
         this.entryTypesManager = entryTypesManager;
     }
 
-    public String serializeAll(List<BibEntry> entries, BibDatabaseMode databaseMode) throws IOException {
+    public String serializeAll(List<BibEntry> entries, BibDatabaseMode databaseMode)
+            throws IOException {
         StringWriter writer = new StringWriter();
         BibWriter bibWriter = new BibWriter(writer, OS.NEWLINE);
         for (BibEntry entry : entries) {
@@ -50,7 +50,8 @@ public String serializeAll(List<BibEntry> entries, BibDatabaseMode databaseMode)
         return writer.toString();
     }
 
-    public void write(BibEntry entry, BibWriter out, BibDatabaseMode bibDatabaseMode) throws IOException {
+    public void write(BibEntry entry, BibWriter out, BibDatabaseMode bibDatabaseMode)
+            throws IOException {
         write(entry, out, bibDatabaseMode, false);
     }
 
@@ -62,7 +63,9 @@ public void write(BibEntry entry, BibWriter out, BibDatabaseMode bibDatabaseMode
      * @param bibDatabaseMode The database mode (bibtex or biblatex)
      * @param reformat        Should the entry be in any case, even if no change occurred?
      */
-    public void write(BibEntry entry, BibWriter out, BibDatabaseMode bibDatabaseMode, Boolean reformat) throws IOException {
+    public void write(
+            BibEntry entry, BibWriter out, BibDatabaseMode bibDatabaseMode, Boolean reformat)
+            throws IOException {
         // if the entry has not been modified, write it as it was
         if (!reformat && !entry.hasChanged()) {
             out.write(entry.getParsedSerialization());
@@ -88,8 +91,8 @@ private void writeUserComments(BibEntry entry, BibWriter out) throws IOException
     /**
      * Writes fields in the order of requiredFields, optionalFields and other fields, but does not sort the fields.
      */
-    private void writeRequiredFieldsFirstRemainingFieldsSecond(BibEntry entry, BibWriter out,
-                                                               BibDatabaseMode bibDatabaseMode) throws IOException {
+    private void writeRequiredFieldsFirstRemainingFieldsSecond(
+            BibEntry entry, BibWriter out, BibDatabaseMode bibDatabaseMode) throws IOException {
         // Write header with type and bibtex-key
         TypedBibEntry typedEntry = new TypedBibEntry(entry, bibDatabaseMode);
         out.write('@' + typedEntry.getTypeForDisplay() + '{');
@@ -103,25 +106,23 @@ private void writeRequiredFieldsFirstRemainingFieldsSecond(BibEntry entry, BibWr
         Optional<BibEntryType> type = entryTypesManager.enrich(entry.getType(), bibDatabaseMode);
         if (type.isPresent()) {
             // Write required fields first
-            List<Field> requiredFields = type.get()
-                                             .getRequiredFields()
-                                             .stream()
-                                             .map(OrFields::getFields)
-                                             .flatMap(Collection::stream)
-                                             .sorted(Comparator.comparing(Field::getName))
-                                             .toList();
+            List<Field> requiredFields =
+                    type.get().getRequiredFields().stream()
+                            .map(OrFields::getFields)
+                            .flatMap(Collection::stream)
+                            .sorted(Comparator.comparing(Field::getName))
+                            .toList();
             for (Field field : requiredFields) {
                 writeField(entry, out, field, indent);
             }
             written.addAll(requiredFields);
 
             // Then optional fields
-            List<Field> optionalFields = type.get()
-                                             .getOptionalFields()
-                                             .stream()
-                                             .map(BibField::field)
-                                             .sorted(Comparator.comparing(Field::getName))
-                                             .toList();
+            List<Field> optionalFields =
+                    type.get().getOptionalFields().stream()
+                            .map(BibField::field)
+                            .sorted(Comparator.comparing(Field::getName))
+                            .toList();
             for (Field field : optionalFields) {
                 writeField(entry, out, field, indent);
             }
@@ -129,10 +130,12 @@ private void writeRequiredFieldsFirstRemainingFieldsSecond(BibEntry entry, BibWr
         }
 
         // Then write remaining fields in alphabetic order.
-        SortedSet<Field> remainingFields = entry.getFields()
-                                                .stream()
-                                                .filter(key -> !written.contains(key))
-                                                .collect(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Field::getName))));
+        SortedSet<Field> remainingFields =
+                entry.getFields().stream()
+                        .filter(key -> !written.contains(key))
+                        .collect(
+                                Collectors.toCollection(
+                                        () -> new TreeSet<>(Comparator.comparing(Field::getName))));
         for (Field field : remainingFields) {
             writeField(entry, out, field, indent);
         }
@@ -154,7 +157,8 @@ private void writeKeyField(BibEntry entry, BibWriter out) throws IOException {
      * @param field the field
      * @throws IOException In case of an IO error
      */
-    private void writeField(BibEntry entry, BibWriter out, Field field, int indent) throws IOException {
+    private void writeField(BibEntry entry, BibWriter out, Field field, int indent)
+            throws IOException {
         Optional<String> value = entry.getField(field);
         // only write field if it is not empty
         // field.ifPresent does not work as an IOException may be thrown
@@ -164,8 +168,20 @@ private void writeField(BibEntry entry, BibWriter out, Field field, int indent)
             try {
                 out.write(fieldWriter.write(field, value.get()));
             } catch (InvalidFieldValueException ex) {
-                LOGGER.warn("Invalid field value {} of field {} of entry {]", value.get(), field, entry.getCitationKey().orElse(""), ex);
-                throw new IOException("Error in field '" + field + " of entry " + entry.getCitationKey().orElse("") + "': " + ex.getMessage(), ex);
+                LOGGER.warn(
+                        "Invalid field value {} of field {} of entry {]",
+                        value.get(),
+                        field,
+                        entry.getCitationKey().orElse(""),
+                        ex);
+                throw new IOException(
+                        "Error in field '"
+                                + field
+                                + " of entry "
+                                + entry.getCitationKey().orElse("")
+                                + "': "
+                                + ex.getMessage(),
+                        ex);
             }
             out.writeLine(",");
         }
@@ -173,12 +189,11 @@ private void writeField(BibEntry entry, BibWriter out, Field field, int indent)
 
     static int getLengthOfLongestFieldName(BibEntry entry) {
         Predicate<Field> isNotCitationKey = field -> InternalField.KEY_FIELD != field;
-        return entry.getFields()
-                    .stream()
-                    .filter(isNotCitationKey)
-                    .mapToInt(field -> field.getName().length())
-                    .max()
-                    .orElse(0);
+        return entry.getFields().stream()
+                .filter(isNotCitationKey)
+                .mapToInt(field -> field.getName().length())
+                .max()
+                .orElse(0);
     }
 
     /**
@@ -195,6 +210,8 @@ static int getLengthOfLongestFieldName(BibEntry entry) {
      */
     static String getFormattedFieldName(Field field, int indent) {
         String fieldName = field.getName();
-        return fieldName.toLowerCase(Locale.ROOT) + StringUtil.repeatSpaces(indent - fieldName.length()) + " = ";
+        return fieldName.toLowerCase(Locale.ROOT)
+                + StringUtil.repeatSpaces(indent - fieldName.length())
+                + " = ";
     }
 }
diff --git a/src/main/java/org/jabref/logic/bibtex/FieldPreferences.java b/src/main/java/org/jabref/logic/bibtex/FieldPreferences.java
index 7390f932c74b..9b3667781b72 100644
--- a/src/main/java/org/jabref/logic/bibtex/FieldPreferences.java
+++ b/src/main/java/org/jabref/logic/bibtex/FieldPreferences.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.bibtex;
 
-import java.util.Collection;
-import java.util.List;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
@@ -10,6 +7,9 @@
 
 import org.jabref.model.entry.field.Field;
 
+import java.util.Collection;
+import java.util.List;
+
 public class FieldPreferences {
 
     private final BooleanProperty resolveStrings = new SimpleBooleanProperty();
@@ -19,9 +19,8 @@ public class FieldPreferences {
     /**
      * @param resolveStrings true - The character {@link FieldWriter#BIBTEX_STRING_START_END_SYMBOL} should be interpreted as indicator of BibTeX strings
      */
-    public FieldPreferences(boolean resolveStrings,
-                            List<Field> resolvableFields,
-                            List<Field> nonWrappableFields) {
+    public FieldPreferences(
+            boolean resolveStrings, List<Field> resolvableFields, List<Field> nonWrappableFields) {
         this.resolveStrings.set(resolveStrings);
         this.resolvableFields = FXCollections.observableArrayList(resolvableFields);
         this.nonWrappableFields = FXCollections.observableArrayList(nonWrappableFields);
diff --git a/src/main/java/org/jabref/logic/bibtex/FieldWriter.java b/src/main/java/org/jabref/logic/bibtex/FieldWriter.java
index 1a6702242eb8..8afef1ca75e6 100644
--- a/src/main/java/org/jabref/logic/bibtex/FieldWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FieldWriter.java
@@ -2,7 +2,6 @@
 
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.InternalField;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,12 +56,20 @@ private static void checkBraces(String text) throws InvalidFieldValueException {
 
         // Then we throw an exception if the error criteria are met.
         if (right != 0 && (left == 0)) {
-            LOGGER.error("Unescaped '}' character without opening bracket ends string prematurely. Field value: {}", text);
-            throw new InvalidFieldValueException("Unescaped '}' character without opening bracket ends string prematurely. Field value: " + text);
+            LOGGER.error(
+                    "Unescaped '}' character without opening bracket ends string prematurely. Field value: {}",
+                    text);
+            throw new InvalidFieldValueException(
+                    "Unescaped '}' character without opening bracket ends string prematurely. Field value: "
+                            + text);
         }
         if (right != 0 && (right < left)) {
-            LOGGER.error("Unescaped '}' character without opening bracket ends string prematurely. Field value: {}", text);
-            throw new InvalidFieldValueException("Unescaped '}' character without opening bracket ends string prematurely. Field value: " + text);
+            LOGGER.error(
+                    "Unescaped '}' character without opening bracket ends string prematurely. Field value: {}",
+                    text);
+            throw new InvalidFieldValueException(
+                    "Unescaped '}' character without opening bracket ends string prematurely. Field value: "
+                            + text);
         }
         if (left != right) {
             LOGGER.error("Braces don't match. Field value: {}", text);
@@ -96,7 +103,8 @@ public String write(Field field, String content) throws InvalidFieldValueExcepti
      * <p>
      * For instance, <code>#jan# - #feb#</code> gets  <code>jan #{ - } # feb</code> (see @link{org.jabref.logic.bibtex.LatexFieldFormatterTests#makeHashEnclosedWordsRealStringsInMonthField()})
      */
-    private String formatAndResolveStrings(String content, Field field) throws InvalidFieldValueException {
+    private String formatAndResolveStrings(String content, Field field)
+            throws InvalidFieldValueException {
         checkBraces(content);
 
         content = content.replace("##", "");
@@ -121,18 +129,27 @@ private String formatAndResolveStrings(String content, Field field) throws Inval
 
             if (pos2 == -1) {
                 if (neverFailOnHashes) {
-                    pos1 = content.length(); // just write out the rest of the text, and throw no exception
+                    pos1 =
+                            content
+                                    .length(); // just write out the rest of the text, and throw no
+                                               // exception
                 } else {
-                    LOGGER.error("The character {} is not allowed in BibTeX strings unless escaped as in '\\{}'. "
+                    LOGGER.error(
+                            "The character {} is not allowed in BibTeX strings unless escaped as in '\\{}'. "
                                     + "In JabRef, use pairs of # characters to indicate a string. "
                                     + "Note that the entry causing the problem has been selected. Field value: {}",
                             BIBTEX_STRING_START_END_SYMBOL,
                             BIBTEX_STRING_START_END_SYMBOL,
                             content);
                     throw new InvalidFieldValueException(
-                            "The character " + BIBTEX_STRING_START_END_SYMBOL + " is not allowed in BibTeX strings unless escaped as in '\\" + BIBTEX_STRING_START_END_SYMBOL + "'.\n"
+                            "The character "
+                                    + BIBTEX_STRING_START_END_SYMBOL
+                                    + " is not allowed in BibTeX strings unless escaped as in '\\"
+                                    + BIBTEX_STRING_START_END_SYMBOL
+                                    + "'.\n"
                                     + "In JabRef, use pairs of # characters to indicate a string.\n"
-                                    + "Note that the entry causing the problem has been selected. Field value: " + content);
+                                    + "Note that the entry causing the problem has been selected. Field value: "
+                                    + content);
                 }
             }
 
@@ -143,7 +160,12 @@ private String formatAndResolveStrings(String content, Field field) throws Inval
                 // We check that the string label is not empty. That means
                 // an occurrence of ## will simply be ignored. Should it instead
                 // cause an error message?
-                writeStringLabel(stringBuilder, content, pos1 + 1, pos2, pos1 == pivot,
+                writeStringLabel(
+                        stringBuilder,
+                        content,
+                        pos1 + 1,
+                        pos2,
+                        pos1 == pivot,
                         (pos2 + 1) == content.length());
             }
 
@@ -183,7 +205,8 @@ private boolean shouldResolveStrings(Field field) {
         return false;
     }
 
-    private String formatWithoutResolvingStrings(String content, Field field) throws InvalidFieldValueException {
+    private String formatWithoutResolvingStrings(String content, Field field)
+            throws InvalidFieldValueException {
         checkBraces(content);
         StringBuilder stringBuilder = new StringBuilder(String.valueOf(FIELD_START));
         stringBuilder.append(content);
@@ -209,8 +232,15 @@ private void writeText(StringBuilder stringBuilder, String text, int startPos, i
      * @param isFirst       true if the label to write is the first one to write
      * @param isLast        true if the label to write is the last one to write
      */
-    private void writeStringLabel(StringBuilder stringBuilder, String text, int startPos, int endPos, boolean isFirst, boolean isLast) {
-        String line = (isFirst ? "" : " # ") + text.substring(startPos, endPos) + (isLast ? "" : " # ");
+    private void writeStringLabel(
+            StringBuilder stringBuilder,
+            String text,
+            int startPos,
+            int endPos,
+            boolean isFirst,
+            boolean isLast) {
+        String line =
+                (isFirst ? "" : " # ") + text.substring(startPos, endPos) + (isLast ? "" : " # ");
         stringBuilder.append(line);
     }
 }
diff --git a/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java b/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
index 2a3c9ef665a6..98c383d68bae 100644
--- a/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
@@ -1,26 +1,32 @@
 package org.jabref.logic.bibtex;
 
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.strings.StringUtil;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.strings.StringUtil;
-
 public class FileFieldWriter {
 
-    private FileFieldWriter() {
-    }
+    private FileFieldWriter() {}
 
     public static String getStringRepresentation(List<LinkedFile> fields) {
         String[][] array = new String[fields.size()][];
         int i = 0;
         for (LinkedFile entry : fields) {
             if (StringUtil.isNullOrEmpty(entry.getSourceUrl())) {
-                array[i] = new String[] {entry.getDescription(), entry.getLink(), entry.getFileType()};
+                array[i] =
+                        new String[] {entry.getDescription(), entry.getLink(), entry.getFileType()};
             } else {
-                array[i] = new String[] {entry.getDescription(), entry.getLink(), entry.getFileType(), entry.getSourceUrl()};
+                array[i] =
+                        new String[] {
+                            entry.getDescription(),
+                            entry.getLink(),
+                            entry.getFileType(),
+                            entry.getSourceUrl()
+                        };
             }
             i++;
         }
@@ -40,8 +46,8 @@ public static String getStringRepresentation(LinkedFile field) {
      */
     public static String encodeStringArray(String[][] values) {
         return Arrays.stream(values)
-                     .map(FileFieldWriter::encodeStringArray)
-                     .collect(Collectors.joining(";"));
+                .map(FileFieldWriter::encodeStringArray)
+                .collect(Collectors.joining(";"));
     }
 
     /**
@@ -52,9 +58,7 @@ public static String encodeStringArray(String[][] values) {
      * @return The encoded String.
      */
     private static String encodeStringArray(String[] entry) {
-        return Arrays.stream(entry)
-                     .map(FileFieldWriter::quote)
-                     .collect(Collectors.joining(":"));
+        return Arrays.stream(entry).map(FileFieldWriter::quote).collect(Collectors.joining(":"));
     }
 
     public static String quote(String s) {
diff --git a/src/main/java/org/jabref/logic/bibtex/TypedBibEntry.java b/src/main/java/org/jabref/logic/bibtex/TypedBibEntry.java
index bbdfd08e69d9..5e1ad96a32b7 100644
--- a/src/main/java/org/jabref/logic/bibtex/TypedBibEntry.java
+++ b/src/main/java/org/jabref/logic/bibtex/TypedBibEntry.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.bibtex;
 
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
@@ -10,6 +7,9 @@
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypesManager;
 
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * Wrapper around a {@link BibEntry} offering methods for {@link BibDatabaseMode}-dependent results
  */
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java b/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java
index c4161345061c..03148858b445 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java
@@ -1,21 +1,20 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
 import org.jabref.logic.database.DuplicateCheck;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.StandardField;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
 public class BibDatabaseDiff {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BibDatabaseDiff.class);
@@ -27,9 +26,11 @@ public class BibDatabaseDiff {
     private final List<BibEntryDiff> entryDiffs;
 
     private BibDatabaseDiff(BibDatabaseContext originalDatabase, BibDatabaseContext newDatabase) {
-        metaDataDiff = MetaDataDiff.compare(originalDatabase.getMetaData(), newDatabase.getMetaData());
+        metaDataDiff =
+                MetaDataDiff.compare(originalDatabase.getMetaData(), newDatabase.getMetaData());
         preambleDiff = PreambleDiff.compare(originalDatabase, newDatabase);
-        bibStringDiffs = BibStringDiff.compare(originalDatabase.getDatabase(), newDatabase.getDatabase());
+        bibStringDiffs =
+                BibStringDiff.compare(originalDatabase.getDatabase(), newDatabase.getDatabase());
         entryDiffs = getBibEntryDiffs(originalDatabase, newDatabase);
         if (LOGGER.isDebugEnabled() && !isEmpty()) {
             LOGGER.debug("Differences detected");
@@ -41,21 +42,27 @@ private BibDatabaseDiff(BibDatabaseContext originalDatabase, BibDatabaseContext
     }
 
     private boolean isEmpty() {
-        return metaDataDiff.isEmpty() && preambleDiff.isEmpty() && bibStringDiffs.isEmpty() && entryDiffs.isEmpty();
+        return metaDataDiff.isEmpty()
+                && preambleDiff.isEmpty()
+                && bibStringDiffs.isEmpty()
+                && entryDiffs.isEmpty();
     }
 
-    private List<BibEntryDiff> getBibEntryDiffs(BibDatabaseContext originalDatabase, BibDatabaseContext newDatabase) {
+    private List<BibEntryDiff> getBibEntryDiffs(
+            BibDatabaseContext originalDatabase, BibDatabaseContext newDatabase) {
         final List<BibEntryDiff> entryDiffs;
         // Sort both databases according to a common sort key.
         EntryComparator comparator = getEntryComparator();
-        List<BibEntry> originalEntriesSorted = originalDatabase.getDatabase().getEntriesSorted(comparator);
+        List<BibEntry> originalEntriesSorted =
+                originalDatabase.getDatabase().getEntriesSorted(comparator);
         List<BibEntry> newEntriesSorted = newDatabase.getDatabase().getEntriesSorted(comparator);
 
         // Ignore empty entries
         originalEntriesSorted.removeIf(BibEntry::isEmpty);
         newEntriesSorted.removeIf(BibEntry::isEmpty);
 
-        entryDiffs = compareEntries(originalEntriesSorted, newEntriesSorted, originalDatabase.getMode());
+        entryDiffs =
+                compareEntries(originalEntriesSorted, newEntriesSorted, originalDatabase.getMode());
         return entryDiffs;
     }
 
@@ -66,7 +73,8 @@ private static EntryComparator getEntryComparator() {
         return comparator;
     }
 
-    private static List<BibEntryDiff> compareEntries(List<BibEntry> originalEntries, List<BibEntry> newEntries, BibDatabaseMode mode) {
+    private static List<BibEntryDiff> compareEntries(
+            List<BibEntry> originalEntries, List<BibEntry> newEntries, BibDatabaseMode mode) {
         List<BibEntryDiff> differences = new ArrayList<>();
 
         // Prevent IndexOutOfBoundException
@@ -79,14 +87,17 @@ private static List<BibEntryDiff> compareEntries(List<BibEntry> originalEntries,
         Set<Integer> matchedEntries = new HashSet<>(newEntries.size());
         Set<BibEntry> notMatched = new HashSet<>(originalEntries.size());
 
-        // Loop through the entries of the original database, looking for exact matches in the new one.
-        // We must finish scanning for exact matches before looking for near matches, to avoid an exact
+        // Loop through the entries of the original database, looking for exact matches in the new
+        // one.
+        // We must finish scanning for exact matches before looking for near matches, to avoid an
+        // exact
         // match being "stolen" from another entry.
         mainLoop:
         for (BibEntry originalEntry : originalEntries) {
             for (int i = 0; i < newEntries.size(); i++) {
                 if (!matchedEntries.contains(i)) {
-                    double score = DuplicateCheck.compareEntriesStrictly(originalEntry, newEntries.get(i));
+                    double score =
+                            DuplicateCheck.compareEntriesStrictly(originalEntry, newEntries.get(i));
                     if (score > 1) {
                         matchedEntries.add(i);
                         continue mainLoop;
@@ -98,15 +109,18 @@ private static List<BibEntryDiff> compareEntries(List<BibEntry> originalEntries,
             notMatched.add(originalEntry);
         }
 
-        // Now we've found all exact matches, look through the remaining entries, looking for close matches.
+        // Now we've found all exact matches, look through the remaining entries, looking for close
+        // matches.
         DuplicateCheck duplicateCheck = new DuplicateCheck(new BibEntryTypesManager());
         for (BibEntry originalEntry : notMatched) {
-            // These two variables will keep track of which entry most closely matches the one we're looking at.
+            // These two variables will keep track of which entry most closely matches the one we're
+            // looking at.
             double bestMatch = 0;
             int bestMatchIndex = 0;
             for (int i = 0; i < newEntries.size(); i++) {
                 if (!matchedEntries.contains(i)) {
-                    double score = DuplicateCheck.compareEntriesStrictly(originalEntry, newEntries.get(i));
+                    double score =
+                            DuplicateCheck.compareEntriesStrictly(originalEntry, newEntries.get(i));
                     if (score > bestMatch) {
                         bestMatch = score;
                         bestMatchIndex = i;
@@ -124,7 +138,8 @@ private static List<BibEntryDiff> compareEntries(List<BibEntry> originalEntries,
             }
         }
 
-        // Finally, look if there are still untouched entries in the new database. These may have been added.
+        // Finally, look if there are still untouched entries in the new database. These may have
+        // been added.
         for (int i = 0; i < newEntries.size(); i++) {
             if (!matchedEntries.contains(i)) {
                 differences.add(new BibEntryDiff(null, newEntries.get(i)));
@@ -135,7 +150,9 @@ private static List<BibEntryDiff> compareEntries(List<BibEntry> originalEntries,
     }
 
     private static boolean hasEqualCitationKey(BibEntry oneEntry, BibEntry twoEntry) {
-        return oneEntry.hasCitationKey() && twoEntry.hasCitationKey() && oneEntry.getCitationKey().equals(twoEntry.getCitationKey());
+        return oneEntry.hasCitationKey()
+                && twoEntry.hasCitationKey()
+                && oneEntry.getCitationKey().equals(twoEntry.getCitationKey());
     }
 
     public static BibDatabaseDiff compare(BibDatabaseContext base, BibDatabaseContext changed) {
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java b/src/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java
index 0d79d4dfd976..0e94d24fd065 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java
@@ -1,12 +1,10 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.StringJoiner;
-
 import org.jabref.model.entry.BibEntry;
 
-public record BibEntryDiff(
-        BibEntry originalEntry,
-        BibEntry newEntry) {
+import java.util.StringJoiner;
+
+public record BibEntryDiff(BibEntry originalEntry, BibEntry newEntry) {
 
     @Override
     public String toString() {
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java b/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java
index 65fe125a765b..86ba78d1a55f 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.bibtex.comparator;
 
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibtexString;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -9,9 +12,6 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.BibtexString;
-
 public class BibStringDiff {
 
     private final BibtexString originalString;
@@ -22,7 +22,8 @@ public class BibStringDiff {
         this.newString = newString;
     }
 
-    public static List<BibStringDiff> compare(BibDatabase originalDatabase, BibDatabase newDatabase) {
+    public static List<BibStringDiff> compare(
+            BibDatabase originalDatabase, BibDatabase newDatabase) {
         if (originalDatabase.hasNoStrings() && newDatabase.hasNoStrings()) {
             return Collections.emptyList();
         }
@@ -34,10 +35,10 @@ public static List<BibStringDiff> compare(BibDatabase originalDatabase, BibDatab
 
         // First try to match by string names.
         for (BibtexString original : originalDatabase.getStringValues()) {
-            Optional<BibtexString> match = newDatabase
-                    .getStringValues().stream()
-                    .filter(test -> test.getName().equals(original.getName()))
-                    .findAny();
+            Optional<BibtexString> match =
+                    newDatabase.getStringValues().stream()
+                            .filter(test -> test.getName().equals(original.getName()))
+                            .findAny();
             if (match.isPresent()) {
                 // We have found a string with a matching name.
                 if (!Objects.equals(original.getContent(), match.get().getContent())) {
@@ -51,14 +52,15 @@ public static List<BibStringDiff> compare(BibDatabase originalDatabase, BibDatab
             }
         }
 
-        // See if we can detect a name change for those entries that we couldn't match, based on their content
+        // See if we can detect a name change for those entries that we couldn't match, based on
+        // their content
         for (Iterator<BibtexString> iterator = notMatched.iterator(); iterator.hasNext(); ) {
             BibtexString original = iterator.next();
 
-            Optional<BibtexString> match = newDatabase
-                    .getStringValues().stream()
-                    .filter(test -> test.getContent().equals(original.getContent()))
-                    .findAny();
+            Optional<BibtexString> match =
+                    newDatabase.getStringValues().stream()
+                            .filter(test -> test.getContent().equals(original.getContent()))
+                            .findAny();
             if (match.isPresent()) {
                 // We have found a string with the same content. It cannot have the same
                 // name, or we would have found it above.
@@ -73,10 +75,11 @@ public static List<BibStringDiff> compare(BibDatabase originalDatabase, BibDatab
             differences.add(new BibStringDiff(original, null));
         }
 
-        // Finally, see if there are remaining strings in the new database. They must have been added.
+        // Finally, see if there are remaining strings in the new database. They must have been
+        // added.
         newDatabase.getStringValues().stream()
-                   .filter(test -> !used.contains(test))
-                   .forEach(newString -> differences.add(new BibStringDiff(null, newString)));
+                .filter(test -> !used.contains(test))
+                .forEach(newString -> differences.add(new BibStringDiff(null, newString)));
 
         return differences;
     }
@@ -99,7 +102,8 @@ public boolean equals(Object other) {
         }
 
         BibStringDiff that = (BibStringDiff) other;
-        return Objects.equals(newString, that.newString) && Objects.equals(originalString, that.originalString);
+        return Objects.equals(newString, that.newString)
+                && Objects.equals(originalString, that.originalString);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java b/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java
index 36df24c09e7d..3c0a408c7739 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.bibtex.comparator;
 
+import org.jabref.model.entry.BibtexString;
+
 import java.util.Comparator;
 import java.util.Locale;
 
-import org.jabref.model.entry.BibtexString;
-
 public class BibtexStringComparator implements Comparator<BibtexString> {
 
     private final boolean considerRefs;
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java b/src/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java
index f988c3c96b68..eb9aed391676 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.Comparator;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
+import java.util.Comparator;
+
 /**
  * Compares Bibtex entries based on their 'crossref' fields. Entries including
  * this field are deemed smaller than entries without this field. This serves
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java b/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java
index ec91a76ee5fd..be75b5603895 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java
@@ -1,15 +1,15 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.Comparator;
-import java.util.Locale;
-import java.util.Objects;
-
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldProperty;
 import org.jabref.model.entry.field.InternalField;
 
+import java.util.Comparator;
+import java.util.Locale;
+import java.util.Objects;
+
 /**
  * This implementation of Comparator takes care of most of the details of sorting BibTeX entries in JabRef. It is
  * structured as a node in a linked list of comparators, where each node can contain a link to a new comparator that
@@ -31,7 +31,8 @@ public class EntryComparator implements Comparator<BibEntry> {
      * @param field the field to sort on
      * @param next the next comparator to use (if the current comparator results in equality)
      */
-    public EntryComparator(boolean binary, boolean descending, Field field, Comparator<BibEntry> next) {
+    public EntryComparator(
+            boolean binary, boolean descending, Field field, Comparator<BibEntry> next) {
         this.binary = binary;
         this.sortField = field;
         this.descending = descending;
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java b/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java
index e1e2ff77782e..b74e5cd6ed69 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java
@@ -1,12 +1,5 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.text.Collator;
-import java.text.ParseException;
-import java.text.RuleBasedCollator;
-import java.util.Comparator;
-import java.util.Locale;
-import java.util.Optional;
-
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Month;
@@ -18,6 +11,13 @@
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.strings.StringUtil;
 
+import java.text.Collator;
+import java.text.ParseException;
+import java.text.RuleBasedCollator;
+import java.util.Comparator;
+import java.util.Locale;
+import java.util.Optional;
+
 /**
  * A comparator for BibEntry fields
  */
@@ -26,7 +26,11 @@ public class FieldComparator implements Comparator<BibEntry> {
     private static final Collator COLLATOR = getCollator();
 
     enum FieldType {
-        NAME, TYPE, YEAR, MONTH, OTHER
+        NAME,
+        TYPE,
+        YEAR,
+        MONTH,
+        OTHER
     }
 
     private final OrFields fields;
@@ -52,7 +56,9 @@ public FieldComparator(OrFields fields, boolean descending) {
     private static Collator getCollator() {
         try {
             return new RuleBasedCollator(
-                    ((RuleBasedCollator) Collator.getInstance()).getRules().replace("<'\u005f'", "<' '<'\u005f'"));
+                    ((RuleBasedCollator) Collator.getInstance())
+                            .getRules()
+                            .replace("<'\u005f'", "<' '<'\u005f'"));
         } catch (ParseException e) {
             return Collator.getInstance();
         }
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java b/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java
index 35c2e5a13383..e3442c55a04d 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.Optional;
-
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.metadata.MetaData;
 
+import java.util.Optional;
+
 public class GroupDiff {
     private final GroupTreeNode originalGroupRoot;
     private final GroupTreeNode newGroupRoot;
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java b/src/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java
index f46851fa0985..24b6e1976284 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.Comparator;
-
 import org.jabref.model.entry.BibEntry;
 
+import java.util.Comparator;
+
 /**
  * Comparator for sorting BibEntry objects based on their ID. This
  * can be used to sort entries back into the order they were created,
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java b/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
index be9a0fd8c0d3..4b3cb876d0c6 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
@@ -1,11 +1,5 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.logic.citationkeypattern.CitationKeyPattern;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPatterns;
 import org.jabref.logic.groups.DefaultGroupsFactory;
@@ -14,6 +8,12 @@
 import org.jabref.model.metadata.ContentSelectors;
 import org.jabref.model.metadata.MetaData;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
 public class MetaDataDiff {
     public enum DifferenceType {
         CONTENT_SELECTOR,
@@ -30,8 +30,8 @@ public enum DifferenceType {
         USER_FILE_DIRECTORY
     }
 
-    public record Difference(DifferenceType differenceType, Object originalObject, Object newObject) {
-    }
+    public record Difference(
+            DifferenceType differenceType, Object originalObject, Object newObject) {}
 
     private final Optional<GroupDiff> groupDiff;
     private final MetaData originalMetaData;
@@ -48,7 +48,10 @@ public static Optional<MetaDataDiff> compare(MetaData originalMetaData, MetaData
             return Optional.empty();
         } else {
             MetaDataDiff diff = new MetaDataDiff(originalMetaData, newMetaData);
-            List<Difference> differences = diff.getDifferences(new GlobalCitationKeyPatterns(CitationKeyPattern.NULL_CITATION_KEY_PATTERN));
+            List<Difference> differences =
+                    diff.getDifferences(
+                            new GlobalCitationKeyPatterns(
+                                    CitationKeyPattern.NULL_CITATION_KEY_PATTERN));
             if (differences.isEmpty()) {
                 return Optional.empty();
             }
@@ -63,16 +66,22 @@ private static boolean isDefaultContentSelectors(ContentSelectors contentSelecto
         if (contentSelectors.getContentSelectors().isEmpty()) {
             return true;
         }
-        Map<Field, List<String>> fieldKeywordsMap = ContentSelectors.getFieldKeywordsMap(contentSelectors.getContentSelectors());
+        Map<Field, List<String>> fieldKeywordsMap =
+                ContentSelectors.getFieldKeywordsMap(contentSelectors.getContentSelectors());
         return ContentSelectors.isDefaultMap(fieldKeywordsMap);
     }
 
-    private void addToListIfDiff(List<Difference> changes, DifferenceType differenceType, Object originalObject, Object newObject) {
+    private void addToListIfDiff(
+            List<Difference> changes,
+            DifferenceType differenceType,
+            Object originalObject,
+            Object newObject) {
         if (!Objects.equals(originalObject, newObject)) {
             if (differenceType == DifferenceType.CONTENT_SELECTOR) {
                 ContentSelectors originalContentSelectors = (ContentSelectors) originalObject;
                 ContentSelectors newContentSelectors = (ContentSelectors) newObject;
-                if (isDefaultContentSelectors(originalContentSelectors) && isDefaultContentSelectors(newContentSelectors)) {
+                if (isDefaultContentSelectors(originalContentSelectors)
+                        && isDefaultContentSelectors(newContentSelectors)) {
                     return;
                 }
             } else if (differenceType == DifferenceType.GROUPS) {
@@ -102,20 +111,63 @@ private boolean isDefaultGroup(Optional<GroupTreeNode> groups) {
      */
     public List<Difference> getDifferences(GlobalCitationKeyPatterns globalCitationKeyPatterns) {
         List<Difference> changes = new ArrayList<>();
-        addToListIfDiff(changes, DifferenceType.PROTECTED, originalMetaData.isProtected(), newMetaData.isProtected());
-        addToListIfDiff(changes, DifferenceType.GROUPS, originalMetaData.getGroups(), newMetaData.getGroups());
-        addToListIfDiff(changes, DifferenceType.ENCODING, originalMetaData.getEncoding(), newMetaData.getEncoding());
-        addToListIfDiff(changes, DifferenceType.SAVE_SORT_ORDER, originalMetaData.getSaveOrder(), newMetaData.getSaveOrder());
-        addToListIfDiff(changes, DifferenceType.KEY_PATTERNS,
+        addToListIfDiff(
+                changes,
+                DifferenceType.PROTECTED,
+                originalMetaData.isProtected(),
+                newMetaData.isProtected());
+        addToListIfDiff(
+                changes,
+                DifferenceType.GROUPS,
+                originalMetaData.getGroups(),
+                newMetaData.getGroups());
+        addToListIfDiff(
+                changes,
+                DifferenceType.ENCODING,
+                originalMetaData.getEncoding(),
+                newMetaData.getEncoding());
+        addToListIfDiff(
+                changes,
+                DifferenceType.SAVE_SORT_ORDER,
+                originalMetaData.getSaveOrder(),
+                newMetaData.getSaveOrder());
+        addToListIfDiff(
+                changes,
+                DifferenceType.KEY_PATTERNS,
                 originalMetaData.getCiteKeyPatterns(globalCitationKeyPatterns),
                 newMetaData.getCiteKeyPatterns(globalCitationKeyPatterns));
-        addToListIfDiff(changes, DifferenceType.USER_FILE_DIRECTORY, originalMetaData.getUserFileDirectories(), newMetaData.getUserFileDirectories());
-        addToListIfDiff(changes, DifferenceType.LATEX_FILE_DIRECTORY, originalMetaData.getLatexFileDirectories(), newMetaData.getLatexFileDirectories());
-        addToListIfDiff(changes, DifferenceType.DEFAULT_KEY_PATTERN, originalMetaData.getDefaultCiteKeyPattern(), newMetaData.getDefaultCiteKeyPattern());
-        addToListIfDiff(changes, DifferenceType.SAVE_ACTIONS, originalMetaData.getSaveActions(), newMetaData.getSaveActions());
-        addToListIfDiff(changes, DifferenceType.MODE, originalMetaData.getMode(), newMetaData.getMode());
-        addToListIfDiff(changes, DifferenceType.GENERAL_FILE_DIRECTORY, originalMetaData.getDefaultFileDirectory(), newMetaData.getDefaultFileDirectory());
-        addToListIfDiff(changes, DifferenceType.CONTENT_SELECTOR, originalMetaData.getContentSelectors(), newMetaData.getContentSelectors());
+        addToListIfDiff(
+                changes,
+                DifferenceType.USER_FILE_DIRECTORY,
+                originalMetaData.getUserFileDirectories(),
+                newMetaData.getUserFileDirectories());
+        addToListIfDiff(
+                changes,
+                DifferenceType.LATEX_FILE_DIRECTORY,
+                originalMetaData.getLatexFileDirectories(),
+                newMetaData.getLatexFileDirectories());
+        addToListIfDiff(
+                changes,
+                DifferenceType.DEFAULT_KEY_PATTERN,
+                originalMetaData.getDefaultCiteKeyPattern(),
+                newMetaData.getDefaultCiteKeyPattern());
+        addToListIfDiff(
+                changes,
+                DifferenceType.SAVE_ACTIONS,
+                originalMetaData.getSaveActions(),
+                newMetaData.getSaveActions());
+        addToListIfDiff(
+                changes, DifferenceType.MODE, originalMetaData.getMode(), newMetaData.getMode());
+        addToListIfDiff(
+                changes,
+                DifferenceType.GENERAL_FILE_DIRECTORY,
+                originalMetaData.getDefaultFileDirectory(),
+                newMetaData.getDefaultFileDirectory());
+        addToListIfDiff(
+                changes,
+                DifferenceType.CONTENT_SELECTOR,
+                originalMetaData.getContentSelectors(),
+                newMetaData.getContentSelectors());
         return changes;
     }
 
@@ -132,11 +184,16 @@ public Optional<GroupDiff> getGroupDifferences() {
 
     @Override
     public String toString() {
-        return "MetaDataDiff{" +
-                "groupDiff=" + groupDiff +
-                ", originalMetaData=" + originalMetaData +
-                ", newMetaData=" + getNewMetaData() +
-                ", getDifferences()=" + getDifferences(new GlobalCitationKeyPatterns(CitationKeyPattern.NULL_CITATION_KEY_PATTERN)) +
-                '}';
+        return "MetaDataDiff{"
+                + "groupDiff="
+                + groupDiff
+                + ", originalMetaData="
+                + originalMetaData
+                + ", newMetaData="
+                + getNewMetaData()
+                + ", getDifferences()="
+                + getDifferences(
+                        new GlobalCitationKeyPatterns(CitationKeyPattern.NULL_CITATION_KEY_PATTERN))
+                + '}';
     }
 }
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java b/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java
index a89ab3c88ef7..52b4087b4840 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.bibtex.comparator;
 
+import org.jabref.model.database.BibDatabaseContext;
+
 import java.util.Objects;
 import java.util.Optional;
 
-import org.jabref.model.database.BibDatabaseContext;
-
 public class PreambleDiff {
 
     private final String originalPreamble;
@@ -15,13 +15,15 @@ public class PreambleDiff {
         this.newPreamble = newPreamble;
     }
 
-    public static Optional<PreambleDiff> compare(BibDatabaseContext originalDatabase, BibDatabaseContext newDatabase) {
+    public static Optional<PreambleDiff> compare(
+            BibDatabaseContext originalDatabase, BibDatabaseContext newDatabase) {
         Optional<String> originalPreamble = originalDatabase.getDatabase().getPreamble();
         Optional<String> newPreamble = newDatabase.getDatabase().getPreamble();
         if (originalPreamble.equals(newPreamble)) {
             return Optional.empty();
         } else {
-            return Optional.of(new PreambleDiff(originalPreamble.orElse(""), newPreamble.orElse("")));
+            return Optional.of(
+                    new PreambleDiff(originalPreamble.orElse(""), newPreamble.orElse("")));
         }
     }
 
@@ -43,7 +45,8 @@ public boolean equals(Object other) {
         }
 
         PreambleDiff that = (PreambleDiff) other;
-        return Objects.equals(newPreamble, that.newPreamble) && Objects.equals(originalPreamble, that.originalPreamble);
+        return Objects.equals(newPreamble, that.newPreamble)
+                && Objects.equals(originalPreamble, that.originalPreamble);
     }
 
     @Override
@@ -53,9 +56,13 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "PreambleDiff{" +
-                "originalPreamble='" + originalPreamble + '\'' +
-                ", newPreamble='" + newPreamble + '\'' +
-                '}';
+        return "PreambleDiff{"
+                + "originalPreamble='"
+                + originalPreamble
+                + '\''
+                + ", newPreamble='"
+                + newPreamble
+                + '\''
+                + '}';
     }
 }
diff --git a/src/main/java/org/jabref/logic/bst/BstEntry.java b/src/main/java/org/jabref/logic/bst/BstEntry.java
index c0aaf2c08a7e..dfe7f66d9ac9 100644
--- a/src/main/java/org/jabref/logic/bst/BstEntry.java
+++ b/src/main/java/org/jabref/logic/bst/BstEntry.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.bst;
 
+import org.jabref.model.entry.BibEntry;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jabref.model.entry.BibEntry;
-
 public class BstEntry {
 
     public final BibEntry entry;
diff --git a/src/main/java/org/jabref/logic/bst/BstFunctions.java b/src/main/java/org/jabref/logic/bst/BstFunctions.java
index 2d4b286dd948..9c1f877514f9 100644
--- a/src/main/java/org/jabref/logic/bst/BstFunctions.java
+++ b/src/main/java/org/jabref/logic/bst/BstFunctions.java
@@ -1,12 +1,9 @@
 package org.jabref.logic.bst;
 
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import com.google.common.annotations.VisibleForTesting;
 
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.tree.ParseTree;
 import org.jabref.logic.bst.util.BstCaseChanger;
 import org.jabref.logic.bst.util.BstNameFormatter;
 import org.jabref.logic.bst.util.BstPurifier;
@@ -15,13 +12,16 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
-
-import com.google.common.annotations.VisibleForTesting;
-import org.antlr.v4.runtime.ParserRuleContext;
-import org.antlr.v4.runtime.tree.ParseTree;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class BstFunctions {
     private static final Logger LOGGER = LoggerFactory.getLogger(BstFunctions.class);
     private static final Pattern ADD_PERIOD_PATTERN = Pattern.compile("([^.?!}\\s])(}|\\s)*$");
@@ -41,17 +41,20 @@ public interface BstFunction {
 
         void execute(BstVMVisitor visitor, ParserRuleContext ctx);
 
-        default void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEntryContext) {
+        default void execute(
+                BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEntryContext) {
             this.execute(visitor, ctx);
         }
     }
 
-    public BstFunctions(BstVMContext bstVMContext,
-                        StringBuilder bbl) {
+    public BstFunctions(BstVMContext bstVMContext, StringBuilder bbl) {
         this.strings = bstVMContext.strings();
         this.integers = bstVMContext.integers();
         this.functions = bstVMContext.functions();
-        this.preamble = Optional.ofNullable(bstVMContext.bibDatabase()).flatMap(BibDatabase::getPreamble).orElse("");
+        this.preamble =
+                Optional.ofNullable(bstVMContext.bibDatabase())
+                        .flatMap(BibDatabase::getPreamble)
+                        .orElse("");
         this.stack = bstVMContext.stack();
 
         this.bbl = bbl;
@@ -108,7 +111,9 @@ protected Map<String, BstFunction> getBuiltInFunctions() {
      */
     private void bstIsGreaterThan(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.size() < 2) {
-            throw new BstVMException("Not enough operands on stack for operation > (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation > (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o2 = stack.pop();
         Object o1 = stack.pop();
@@ -133,7 +138,9 @@ private void bstIsLowerThan(BstVMVisitor visitor, ParserRuleContext ctx) {
         Object o1 = stack.pop();
 
         if (!((o1 instanceof Integer) && (o2 instanceof Integer))) {
-            throw new BstVMException("Can only compare two integers with < (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Can only compare two integers with < (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         stack.push(((Integer) o1).compareTo((Integer) o2) < 0 ? BstVM.TRUE : BstVM.FALSE);
@@ -145,7 +152,9 @@ private void bstIsLowerThan(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstEquals(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.size() < 2) {
-            throw new BstVMException("Not enough operands on stack for operation = (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation = (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o1 = stack.pop();
         Object o2 = stack.pop();
@@ -168,13 +177,17 @@ private void bstEquals(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstAdd(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.size() < 2) {
-            throw new BstVMException("Not enough operands on stack for operation + (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation + (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o2 = stack.pop();
         Object o1 = stack.pop();
 
         if (!((o1 instanceof Integer) && (o2 instanceof Integer))) {
-            throw new BstVMException("Can only compare two integers with + (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Can only compare two integers with + (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         stack.push((Integer) o1 + (Integer) o2);
@@ -186,13 +199,17 @@ private void bstAdd(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstSubtract(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.size() < 2) {
-            throw new BstVMException("Not enough operands on stack for operation - (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation - (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o2 = stack.pop();
         Object o1 = stack.pop();
 
         if (!((o1 instanceof Integer) && (o2 instanceof Integer))) {
-            throw new BstVMException("Can only subtract two integers with - (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Can only subtract two integers with - (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         stack.push((Integer) o1 - (Integer) o2);
@@ -205,7 +222,9 @@ private void bstSubtract(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstConcat(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.size() < 2) {
-            throw new BstVMException("Not enough operands on stack for operation * (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation * (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o2 = stack.pop();
         Object o1 = stack.pop();
@@ -220,7 +239,9 @@ private void bstConcat(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (!((o1 instanceof String) && (o2 instanceof String))) {
             LOGGER.error("o1: {} ({})", o1, o1.getClass());
             LOGGER.error("o2: {} ({})", o2, o2.getClass());
-            throw new BstVMException("Can only concatenate two String with * (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Can only concatenate two String with * (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         stack.push(o1.toString() + o2);
@@ -240,13 +261,16 @@ public void execute(BstVMVisitor visitor, ParserRuleContext ctx) {
         @Override
         public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEntry) {
             if (stack.size() < 2) {
-                throw new BstVMException("Not enough operands on stack for operation := (line %d)".formatted(ctx.start.getLine()));
+                throw new BstVMException(
+                        "Not enough operands on stack for operation := (line %d)"
+                                .formatted(ctx.start.getLine()));
             }
             Object o1 = stack.pop();
             Object o2 = stack.pop();
 
             if (!(o1 instanceof BstVMVisitor.Identifier identifier)) {
-                throw new BstVMException("Invalid parameters (line %d)".formatted(ctx.start.getLine()));
+                throw new BstVMException(
+                        "Invalid parameters (line %d)".formatted(ctx.start.getLine()));
             }
             String name = identifier.name();
 
@@ -269,7 +293,8 @@ public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEnt
                     integers.put(name, value);
                 }
             } else {
-                throw new BstVMException("Invalid parameters (line %d)".formatted(ctx.start.getLine()));
+                throw new BstVMException(
+                        "Invalid parameters (line %d)".formatted(ctx.start.getLine()));
             }
         }
     }
@@ -281,12 +306,16 @@ public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEnt
      */
     private void bstAddPeriod(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.isEmpty()) {
-            throw new BstVMException("Not enough operands on stack for operation add.period$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation add.period$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o1 = stack.pop();
 
         if (!(o1 instanceof String s)) {
-            throw new BstVMException("Can only add a period to a string for add.period$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Can only add a period to a string for add.period$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         Matcher m = ADD_PERIOD_PATTERN.matcher(s);
@@ -318,7 +347,9 @@ private void bstAddPeriod(BstVMVisitor visitor, ParserRuleContext ctx) {
     public class BstCallTypeFunction implements BstFunction {
         @Override
         public void execute(BstVMVisitor visitor, ParserRuleContext ctx) {
-            throw new BstVMException("Call.type$ can only be called from within a context (ITERATE or REVERSE). (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Call.type$ can only be called from within a context (ITERATE or REVERSE). (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         @Override
@@ -358,17 +389,23 @@ public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEnt
      */
     private void bstChangeCase(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.size() < 2) {
-            throw new BstVMException("Not enough operands on stack for operation change.case$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation change.case$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         Object o1 = stack.pop();
         if (!((o1 instanceof String format) && (format.length() == 1))) {
-            throw new BstVMException("A format string of length 1 is needed for change.case$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "A format string of length 1 is needed for change.case$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         Object o2 = stack.pop();
         if (!(o2 instanceof String toChange)) {
-            throw new BstVMException("A string is needed as second parameter for change.case$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "A string is needed as second parameter for change.case$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         stack.push(BstCaseChanger.changeCase(toChange, BstCaseChanger.FormatMode.of(format)));
@@ -381,12 +418,16 @@ private void bstChangeCase(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstChrToInt(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.isEmpty()) {
-            throw new BstVMException("Not enough operands on stack for operation chr.to.int$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation chr.to.int$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o1 = stack.pop();
 
         if (!((o1 instanceof String s) && (((String) o1).length() == 1))) {
-            throw new BstVMException("Can only perform chr.to.int$ on string with length 1 (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Can only perform chr.to.int$ on string with length 1 (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         stack.push((int) s.charAt(0));
@@ -399,7 +440,8 @@ private void bstChrToInt(BstVMVisitor visitor, ParserRuleContext ctx) {
     public class BstCiteFunction implements BstFunction {
         @Override
         public void execute(BstVMVisitor visitor, ParserRuleContext ctx) {
-            throw new BstVMException("Must have an entry to cite$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Must have an entry to cite$ (line %d)".formatted(ctx.start.getLine()));
         }
 
         @Override
@@ -418,7 +460,9 @@ public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEnt
      */
     private void bstDuplicate(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.isEmpty()) {
-            throw new BstVMException("Not enough operands on stack for operation duplicate$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation duplicate$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o1 = stack.pop();
 
@@ -433,7 +477,9 @@ private void bstDuplicate(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstEmpty(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.isEmpty()) {
-            throw new BstVMException("Not enough operands on stack for operation empty$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation empty$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o1 = stack.pop();
 
@@ -444,7 +490,9 @@ private void bstEmpty(BstVMVisitor visitor, ParserRuleContext ctx) {
         }
 
         if (!(o1 instanceof String s)) {
-            throw new BstVMException("Operand does not match function empty$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Operand does not match function empty$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         boolean result = s.trim().isEmpty();
@@ -465,7 +513,9 @@ private void bstEmpty(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstFormatName(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.size() < 3) {
-            throw new BstVMException("Not enough operands on stack for operation format.name$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation format.name$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o1 = stack.pop();
         Object o2 = stack.pop();
@@ -486,7 +536,9 @@ private void bstFormatName(BstVMVisitor visitor, ParserRuleContext ctx) {
         } else {
             AuthorList a = AuthorList.parse(names);
             if (name > a.getNumberOfAuthors()) {
-                throw new BstVMException("Author Out of Bounds. Number %d invalid for %s (line %d)".formatted(name, names, ctx.start.getLine()));
+                throw new BstVMException(
+                        "Author Out of Bounds. Number %d invalid for %s (line %d)"
+                                .formatted(name, names, ctx.start.getLine()));
             }
             Author author = a.getAuthor(name - 1);
 
@@ -502,7 +554,9 @@ private void bstFormatName(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstIf(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.size() < 3) {
-            throw new BstVMException("Not enough operands on stack for if$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for if$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         Object f1 = stack.pop();
@@ -512,7 +566,9 @@ private void bstIf(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (!((f1 instanceof BstVMVisitor.Identifier) || (f1 instanceof ParseTree))
                 && ((f2 instanceof BstVMVisitor.Identifier) || (f2 instanceof ParseTree))
                 && (i instanceof Integer)) {
-            throw new BstVMException("Expecting two functions and an integer for if$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Expecting two functions and an integer for if$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         if (((Integer) i) > 0) {
@@ -539,12 +595,16 @@ private void callIdentifierOrTree(Object f, BstVMVisitor visitor, ParserRuleCont
      */
     private void bstIntToChr(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.isEmpty()) {
-            throw new BstVMException("Not enough operands on stack for operation int.to.chr$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation int.to.chr$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o1 = stack.pop();
 
         if (!(o1 instanceof Integer i)) {
-            throw new BstVMException("Can only perform operation int.to.chr$ on an Integer (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Can only perform operation int.to.chr$ on an Integer (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         stack.push(String.valueOf((char) i.intValue()));
@@ -556,12 +616,16 @@ private void bstIntToChr(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstIntToStr(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.isEmpty()) {
-            throw new BstVMException("Not enough operands on stack for operation int.to.str$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation int.to.str$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o1 = stack.pop();
 
         if (!(o1 instanceof Integer)) {
-            throw new BstVMException("Can only transform an integer to an string using int.to.str$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Can only transform an integer to an string using int.to.str$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         stack.push(o1.toString());
@@ -573,7 +637,9 @@ private void bstIntToStr(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstMissing(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.isEmpty()) {
-            throw new BstVMException("Not enough operands on stack for operation missing$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation missing$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o1 = stack.pop();
 
@@ -583,7 +649,9 @@ private void bstMissing(BstVMVisitor visitor, ParserRuleContext ctx) {
         }
 
         if (!(o1 instanceof String)) {
-            LOGGER.warn("Not a string or missing field in operation missing$ (line %d)".formatted(ctx.start.getLine()));
+            LOGGER.warn(
+                    "Not a string or missing field in operation missing$ (line %d)"
+                            .formatted(ctx.start.getLine()));
             stack.push(BstVM.TRUE);
             return;
         }
@@ -610,12 +678,16 @@ private void bstNewLine(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstNumNames(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.isEmpty()) {
-            throw new BstVMException("Not enough operands on stack for operation num.names$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation num.names$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o1 = stack.pop();
 
         if (!(o1 instanceof String s)) {
-            throw new BstVMException("Need a string at the top of the stack for num.names$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Need a string at the top of the stack for num.names$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         stack.push(AuthorList.parse(s).getNumberOfAuthors());
@@ -648,7 +720,9 @@ private void bstPreamble(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstPurify(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.isEmpty()) {
-            throw new BstVMException("Not enough operands on stack for operation purify$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation purify$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o1 = stack.pop();
 
@@ -697,14 +771,20 @@ private void bstStack(BstVMVisitor visitor, ParserRuleContext ctx) {
     @VisibleForTesting
     void bstSubstring(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.size() < 3) {
-            throw new BstVMException("Not enough operands on stack for operation substring$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation substring$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o1 = stack.pop();
         Object o2 = stack.pop();
         Object o3 = stack.pop();
 
-        if (!((o1 instanceof Integer length) && (o2 instanceof Integer start) && (o3 instanceof String string))) {
-            throw new BstVMException("Expecting two integers and a string for substring$ (line %d)".formatted(ctx.start.getLine()));
+        if (!((o1 instanceof Integer length)
+                && (o2 instanceof Integer start)
+                && (o3 instanceof String string))) {
+            throw new BstVMException(
+                    "Expecting two integers and a string for substring$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         if (length > (Integer.MAX_VALUE / 2)) {
@@ -744,7 +824,9 @@ void bstSubstring(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstSwap(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.size() < 2) {
-            throw new BstVMException("Not enough operands on stack for operation swap$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation swap$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object f1 = stack.pop();
         Object f2 = stack.pop();
@@ -766,12 +848,16 @@ private void bstSwap(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstTextLength(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.isEmpty()) {
-            throw new BstVMException("Not enough operands on stack for operation text.length$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation text.length$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o1 = stack.pop();
 
         if (!(o1 instanceof String s)) {
-            throw new BstVMException("Can only perform operation on a string text.length$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Can only perform operation on a string text.length$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         char[] c = s.toCharArray();
@@ -822,19 +908,25 @@ private void bstTextLength(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstTextPrefix(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.size() < 2) {
-            throw new BstVMException("Not enough operands on stack for operation text.prefix$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation text.prefix$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
 
         Object o1 = stack.pop();
         if (!(o1 instanceof Integer)) {
-            LOGGER.warn("An integer is needed as first parameter to text.prefix$ (line {})", ctx.start.getLine());
+            LOGGER.warn(
+                    "An integer is needed as first parameter to text.prefix$ (line {})",
+                    ctx.start.getLine());
             stack.push("");
             return;
         }
 
         Object o2 = stack.pop();
         if (!(o2 instanceof String)) {
-            LOGGER.warn("A string is needed as second parameter to text.prefix$ (line {})", ctx.start.getLine());
+            LOGGER.warn(
+                    "A string is needed as second parameter to text.prefix$ (line {})",
+                    ctx.start.getLine());
             stack.push("");
             return;
         }
@@ -856,7 +948,8 @@ private void bstTop(BstVMVisitor visitor, ParserRuleContext ctx) {
     public class BstTypeFunction implements BstFunction {
         @Override
         public void execute(BstVMVisitor visitor, ParserRuleContext ctx) {
-            throw new BstVMException("type$ need a context (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "type$ need a context (line %d)".formatted(ctx.start.getLine()));
         }
 
         @Override
@@ -886,14 +979,17 @@ private void bstWarning(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstWhile(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.size() < 2) {
-            throw new BstVMException("Not enough operands on stack for operation while$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation while$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object f2 = stack.pop();
         Object f1 = stack.pop();
 
         if (!((f1 instanceof BstVMVisitor.Identifier) || (f1 instanceof ParseTree))
                 && ((f2 instanceof BstVMVisitor.Identifier) || (f2 instanceof ParseTree))) {
-            throw new BstVMException("Expecting two functions for while$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Expecting two functions for while$ (line %d)".formatted(ctx.start.getLine()));
         }
 
         do {
@@ -901,8 +997,9 @@ private void bstWhile(BstVMVisitor visitor, ParserRuleContext ctx) {
 
             Object i = stack.pop();
             if (!(i instanceof Integer)) {
-                throw new BstVMException("First parameter to while has to return an integer but was %s (line %d)"
-                        .formatted(i.toString(), ctx.start.getLine()));
+                throw new BstVMException(
+                        "First parameter to while has to return an integer but was %s (line %d)"
+                                .formatted(i.toString(), ctx.start.getLine()));
             }
             if ((Integer) i <= 0) {
                 break;
@@ -922,7 +1019,9 @@ private void bstWhile(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstWidth(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.isEmpty()) {
-            throw new BstVMException("Not enough operands on stack for operation width$ (line %d)".formatted(ctx.start.getLine()));
+            throw new BstVMException(
+                    "Not enough operands on stack for operation width$ (line %d)"
+                            .formatted(ctx.start.getLine()));
         }
         Object o1 = stack.pop();
 
diff --git a/src/main/java/org/jabref/logic/bst/BstPreviewLayout.java b/src/main/java/org/jabref/logic/bst/BstPreviewLayout.java
index f32b9e21e6fb..8a0826a296dc 100644
--- a/src/main/java/org/jabref/logic/bst/BstPreviewLayout.java
+++ b/src/main/java/org/jabref/logic/bst/BstPreviewLayout.java
@@ -1,10 +1,5 @@
 package org.jabref.logic.bst;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-
 import org.jabref.logic.cleanup.ConvertToBibtexCleanup;
 import org.jabref.logic.formatter.bibtexfields.RemoveNewlinesFormatter;
 import org.jabref.logic.l10n.Localization;
@@ -15,10 +10,14 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
 public final class BstPreviewLayout implements PreviewLayout {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BstPreviewLayout.class);
@@ -62,10 +61,12 @@ public String generatePreview(BibEntry originalEntry, BibDatabaseContext databas
         // Remove all comments
         result = result.replaceAll("%.*", "");
         // Remove all LaTeX comments
-        // The RemoveLatexCommandsFormatter keeps the words inside latex environments. Therefore, we remove them manually
+        // The RemoveLatexCommandsFormatter keeps the words inside latex environments. Therefore, we
+        // remove them manually
         result = result.replace("\\begin{thebibliography}{1}", "");
         result = result.replace("\\end{thebibliography}", "");
-        // The RemoveLatexCommandsFormatter keeps the word inside the latex command, but we want to remove that completely
+        // The RemoveLatexCommandsFormatter keeps the word inside the latex command, but we want to
+        // remove that completely
         result = result.replaceAll("\\\\bibitem[{].*[}]", "");
         // We want to replace \newblock by a space instead of completely removing it
         result = result.replace("\\newblock", " ");
diff --git a/src/main/java/org/jabref/logic/bst/BstVM.java b/src/main/java/org/jabref/logic/bst/BstVM.java
index eb90c9a971f4..29dc3f79b832 100644
--- a/src/main/java/org/jabref/logic/bst/BstVM.java
+++ b/src/main/java/org/jabref/logic/bst/BstVM.java
@@ -1,16 +1,5 @@
 package org.jabref.logic.bst;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.Deque;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.BibEntry;
-
 import org.antlr.v4.runtime.BailErrorStrategy;
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.CharStream;
@@ -20,6 +9,16 @@
 import org.antlr.v4.runtime.Recognizer;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
 import org.antlr.v4.runtime.tree.ParseTree;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 public class BstVM {
 
@@ -70,12 +69,15 @@ public String render(Collection<BibEntry> bibEntries, BibDatabase bibDatabase) {
         Objects.requireNonNull(bibEntries);
 
         // needs to be modifiable due to sort operations later
-        List<BstEntry> entries = bibEntries.stream().map(BstEntry::new).collect(Collectors.toList());
+        List<BstEntry> entries =
+                bibEntries.stream().map(BstEntry::new).collect(Collectors.toList());
 
         StringBuilder resultBuffer = new StringBuilder();
 
         BstVMContext bstVMContext = new BstVMContext(entries, bibDatabase, path);
-        bstVMContext.functions().putAll(new BstFunctions(bstVMContext, resultBuffer).getBuiltInFunctions());
+        bstVMContext
+                .functions()
+                .putAll(new BstFunctions(bstVMContext, resultBuffer).getBuiltInFunctions());
         bstVMContext.integers().put("entry.max$", Integer.MAX_VALUE);
         bstVMContext.integers().put("global.max$", Integer.MAX_VALUE);
 
@@ -95,7 +97,8 @@ protected Deque<Object> getStack() {
         if (latestContext != null) {
             return latestContext.stack();
         } else {
-            throw new BstVMException("BstVM must have rendered at least once to provide the latest stack");
+            throw new BstVMException(
+                    "BstVM must have rendered at least once to provide the latest stack");
         }
     }
 
@@ -103,10 +106,16 @@ private static class ThrowingErrorListener extends BaseErrorListener {
         public static final ThrowingErrorListener INSTANCE = new ThrowingErrorListener();
 
         @Override
-        public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol,
-                                int line, int charPositionInLine, String msg, RecognitionException e)
+        public void syntaxError(
+                Recognizer<?, ?> recognizer,
+                Object offendingSymbol,
+                int line,
+                int charPositionInLine,
+                String msg,
+                RecognitionException e)
                 throws ParseCancellationException {
-            throw new ParseCancellationException("line " + line + ":" + charPositionInLine + " " + msg);
+            throw new ParseCancellationException(
+                    "line " + line + ":" + charPositionInLine + " " + msg);
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/bst/BstVMContext.java b/src/main/java/org/jabref/logic/bst/BstVMContext.java
index 472ec047734c..0c10d4a4acc3 100644
--- a/src/main/java/org/jabref/logic/bst/BstVMContext.java
+++ b/src/main/java/org/jabref/logic/bst/BstVMContext.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.bst;
 
+import org.jabref.model.database.BibDatabase;
+
 import java.nio.file.Path;
 import java.util.Deque;
 import java.util.HashMap;
@@ -8,17 +10,23 @@
 import java.util.Map;
 import java.util.Optional;
 
-import org.jabref.model.database.BibDatabase;
-
-public record BstVMContext(List<BstEntry> entries,
-                           Map<String, String> strings,
-                           Map<String, Integer> integers,
-                           Map<String, BstFunctions.BstFunction> functions,
-                           Deque<Object> stack,
-                           BibDatabase bibDatabase,
-                           Optional<Path> path) {
+public record BstVMContext(
+        List<BstEntry> entries,
+        Map<String, String> strings,
+        Map<String, Integer> integers,
+        Map<String, BstFunctions.BstFunction> functions,
+        Deque<Object> stack,
+        BibDatabase bibDatabase,
+        Optional<Path> path) {
     public BstVMContext(List<BstEntry> entries, BibDatabase bibDatabase, Path path) {
         // LinkedList instead of ArrayDeque, because we (currently) need null support
-        this(entries, new HashMap<>(), new HashMap<>(), new HashMap<>(), new LinkedList<>(), bibDatabase, Optional.ofNullable(path));
+        this(
+                entries,
+                new HashMap<>(),
+                new HashMap<>(),
+                new HashMap<>(),
+                new LinkedList<>(),
+                bibDatabase,
+                Optional.ofNullable(path));
     }
 }
diff --git a/src/main/java/org/jabref/logic/bst/BstVMVisitor.java b/src/main/java/org/jabref/logic/bst/BstVMVisitor.java
index f2b64ae45f48..616ade9b061e 100644
--- a/src/main/java/org/jabref/logic/bst/BstVMVisitor.java
+++ b/src/main/java/org/jabref/logic/bst/BstVMVisitor.java
@@ -1,11 +1,8 @@
 package org.jabref.logic.bst;
 
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.TerminalNode;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.bibtex.FieldWriter;
 import org.jabref.logic.bibtex.InvalidFieldValueException;
@@ -13,13 +10,15 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.StandardField;
-
-import org.antlr.v4.runtime.ParserRuleContext;
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.antlr.v4.runtime.tree.TerminalNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+
 class BstVMVisitor extends BstBaseVisitor<Integer> {
     private static final Logger LOGGER = LoggerFactory.getLogger(BstVMVisitor.class);
 
@@ -28,8 +27,7 @@ class BstVMVisitor extends BstBaseVisitor<Integer> {
 
     private BstEntry selectedBstEntry = null;
 
-    public record Identifier(String name) {
-    }
+    public record Identifier(String name) {}
 
     public BstVMVisitor(BstVMContext bstVMContext, StringBuilder bbl) {
         this.bstVMContext = bstVMContext;
@@ -60,47 +58,62 @@ public Integer visitIntegersCommand(BstParser.IntegersCommandContext ctx) {
     public Integer visitFunctionCommand(BstParser.FunctionCommandContext ctx) {
         String name = ctx.id.getText();
         LOGGER.trace("Function: {}", name);
-        bstVMContext.functions().put(name,
-                (visitor, functionContext) -> visitor.visit(ctx.function));
+        bstVMContext
+                .functions()
+                .put(name, (visitor, functionContext) -> visitor.visit(ctx.function));
         return BstVM.TRUE;
     }
 
     @Override
     public Integer visitMacroCommand(BstParser.MacroCommandContext ctx) {
         String replacement = ctx.repl.getText().substring(1, ctx.repl.getText().length() - 1);
-        bstVMContext.functions().put(ctx.id.getText(),
-                (visitor, functionContext) -> bstVMContext.stack().push(replacement));
+        bstVMContext
+                .functions()
+                .put(
+                        ctx.id.getText(),
+                        (visitor, functionContext) -> bstVMContext.stack().push(replacement));
         return BstVM.TRUE;
     }
 
     @Override
     public Integer visitReadCommand(BstParser.ReadCommandContext ctx) {
-        FieldWriter fieldWriter = new FieldWriter(new FieldPreferences(true, List.of(StandardField.MONTH), Collections.emptyList()));
+        FieldWriter fieldWriter =
+                new FieldWriter(
+                        new FieldPreferences(
+                                true, List.of(StandardField.MONTH), Collections.emptyList()));
         for (BstEntry e : bstVMContext.entries()) {
             for (Map.Entry<String, String> mEntry : e.fields.entrySet()) {
                 Field field = FieldFactory.parseField(mEntry.getKey());
-                String fieldValue = e.entry.getResolvedFieldOrAlias(field, bstVMContext.bibDatabase())
-                                           .map(content -> {
-                                               try {
-                                                   String result = fieldWriter.write(field, content);
-                                                   if (result.startsWith("{")) {
-                                                       // Strip enclosing {} from the output
-                                                       return result.substring(1, result.length() - 1);
-                                                   }
-                                                   if (field == StandardField.MONTH) {
-                                                       // We don't have the internal BibTeX strings at hand.
-                                                       // Thus, we look up the full month name in the generic table.
-                                                       return Month.parse(result)
-                                                                   .map(Month::getFullName)
-                                                                   .orElse(result);
-                                                   }
-                                                   return result;
-                                               } catch (InvalidFieldValueException invalidFieldValueException) {
-                                                   // in case there is something wrong with the content, just return the content itself
-                                                   return content;
-                                               }
-                                           })
-                                           .orElse(null);
+                String fieldValue =
+                        e.entry
+                                .getResolvedFieldOrAlias(field, bstVMContext.bibDatabase())
+                                .map(
+                                        content -> {
+                                            try {
+                                                String result = fieldWriter.write(field, content);
+                                                if (result.startsWith("{")) {
+                                                    // Strip enclosing {} from the output
+                                                    return result.substring(1, result.length() - 1);
+                                                }
+                                                if (field == StandardField.MONTH) {
+                                                    // We don't have the internal BibTeX strings at
+                                                    // hand.
+                                                    // Thus, we look up the full month name in the
+                                                    // generic table.
+                                                    return Month.parse(result)
+                                                            .map(Month::getFullName)
+                                                            .orElse(result);
+                                                }
+                                                return result;
+                                            } catch (
+                                                    InvalidFieldValueException
+                                                            invalidFieldValueException) {
+                                                // in case there is something wrong with the
+                                                // content, just return the content itself
+                                                return content;
+                                            }
+                                        })
+                                .orElse(null);
                 mEntry.setValue(fieldValue);
             }
         }
@@ -140,7 +153,8 @@ public Integer visitIterateCommand(BstParser.IterateCommandContext ctx) {
 
     @Override
     public Integer visitReverseCommand(BstParser.ReverseCommandContext ctx) {
-        ListIterator<BstEntry> i = bstVMContext.entries().listIterator(bstVMContext.entries().size());
+        ListIterator<BstEntry> i =
+                bstVMContext.entries().listIterator(bstVMContext.entries().size());
         while (i.hasPrevious()) {
             this.selectedBstEntry = i.previous();
             visit(ctx.bstFunction());
@@ -262,9 +276,13 @@ public Integer visitStackitem(BstParser.StackitemContext ctx) {
                             bstVMContext.stack().push(s.substring(1, s.length() - 1));
                         }
                         case BstParser.INTEGER ->
-                                bstVMContext.stack().push(Integer.parseInt(token.getText().substring(1)));
+                                bstVMContext
+                                        .stack()
+                                        .push(Integer.parseInt(token.getText().substring(1)));
                         case BstParser.QUOTED ->
-                                bstVMContext.stack().push(new Identifier(token.getText().substring(1)));
+                                bstVMContext
+                                        .stack()
+                                        .push(new Identifier(token.getText().substring(1)));
                     }
                 } else if (childNode instanceof BstParser.StackContext) {
                     bstVMContext.stack().push(childNode);
@@ -272,9 +290,11 @@ public Integer visitStackitem(BstParser.StackitemContext ctx) {
                     this.visit(childNode);
                 }
             } catch (BstVMException e) {
-                bstVMContext.path().ifPresentOrElse(
-                        path -> LOGGER.error("{} ({})", e.getMessage(), path, e),
-                        () -> LOGGER.error("", e));
+                bstVMContext
+                        .path()
+                        .ifPresentOrElse(
+                                path -> LOGGER.error("{} ({})", e.getMessage(), path, e),
+                                () -> LOGGER.error("", e));
                 throw e;
             }
         }
diff --git a/src/main/java/org/jabref/logic/bst/util/BstCaseChanger.java b/src/main/java/org/jabref/logic/bst/util/BstCaseChanger.java
index 1af4472c2633..8f5676a1e391 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstCaseChanger.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstCaseChanger.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.bst.util;
 
-import java.util.Locale;
-import java.util.Optional;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Locale;
+import java.util.Optional;
+
 public final class BstCaseChanger {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BstCaseChanger.class);
@@ -17,7 +17,8 @@ public final class BstCaseChanger {
     private int braceLevel;
 
     public enum FormatMode {
-        // First character and character after a ":" as upper case - everything else in lower case. Obey {}.
+        // First character and character after a ":" as upper case - everything else in lower case.
+        // Obey {}.
         TITLE_LOWERS('t'),
 
         // All characters lower case - Obey {}
@@ -26,13 +27,16 @@ public enum FormatMode {
         // all characters upper case - Obey {}
         ALL_UPPERS('u');
 
-        // the following would have to be done if the functionality of CaseChangers would be included here
-        // However, we decided against it and will probably do the other way round: https://github.com/JabRef/jabref/pull/215#issuecomment-146981624
+        // the following would have to be done if the functionality of CaseChangers would be
+        // included here
+        // However, we decided against it and will probably do the other way round:
+        // https://github.com/JabRef/jabref/pull/215#issuecomment-146981624
 
         // Each word should start with a capital letter
         // EACH_FIRST_UPPERS('f'),
 
-        // Converts all words to upper case, but converts articles, prepositions, and conjunctions to lower case
+        // Converts all words to upper case, but converts articles, prepositions, and conjunctions
+        // to lower case
         // Capitalizes first and last word
         // Does not change words starting with "{"
         // DIFFERENCE to old CaseChangers.TITLE: last word is NOT capitalized in all cases
@@ -67,8 +71,7 @@ public static FormatMode of(final String bstFormat) {
         }
     }
 
-    private BstCaseChanger() {
-    }
+    private BstCaseChanger() {}
 
     /**
      * Changes case of the given string s
@@ -97,7 +100,8 @@ private String doChangeCase(String s, FormatMode format) {
                     i++;
                     continue;
                 }
-                if ((format == FormatMode.TITLE_LOWERS) && ((i == 0) || (prevColon && Character.isWhitespace(c[i - 1])))) {
+                if ((format == FormatMode.TITLE_LOWERS)
+                        && ((i == 0) || (prevColon && Character.isWhitespace(c[i - 1])))) {
                     sb.append('{');
                     i++;
                     prevColon = false;
@@ -177,7 +181,8 @@ private int convertSpecialChar(StringBuilder sb, char[] c, int start, FormatMode
      *
      * @return the new position
      */
-    private int convertAccented(char[] c, int start, String s, StringBuilder sb, FormatMode format) {
+    private int convertAccented(
+            char[] c, int start, String s, StringBuilder sb, FormatMode format) {
         int pos = start;
         pos += s.length();
 
@@ -221,13 +226,13 @@ private int convertNonControl(char[] c, int start, StringBuilder sb, FormatMode
                 sb.append(Character.toUpperCase(c[pos]));
                 pos++;
             }
-            default ->
-                    LOGGER.info("convertNonControl - Unknown format: {}", format);
+            default -> LOGGER.info("convertNonControl - Unknown format: {}", format);
         }
         return pos;
     }
 
-    private int convertCharIfBraceLevelIsZero(char[] c, int start, StringBuilder sb, FormatMode format) {
+    private int convertCharIfBraceLevelIsZero(
+            char[] c, int start, StringBuilder sb, FormatMode format) {
         int i = start;
         switch (format) {
             case TITLE_LOWERS -> {
@@ -242,12 +247,9 @@ private int convertCharIfBraceLevelIsZero(char[] c, int start, StringBuilder sb,
                     prevColon = false;
                 }
             }
-            case ALL_LOWERS ->
-                    sb.append(Character.toLowerCase(c[i]));
-            case ALL_UPPERS ->
-                    sb.append(Character.toUpperCase(c[i]));
-            default ->
-                    LOGGER.info("convertCharIfBraceLevelIsZero - Unknown format: {}", format);
+            case ALL_LOWERS -> sb.append(Character.toLowerCase(c[i]));
+            case ALL_UPPERS -> sb.append(Character.toUpperCase(c[i]));
+            default -> LOGGER.info("convertCharIfBraceLevelIsZero - Unknown format: {}", format);
         }
         i++;
         return i;
diff --git a/src/main/java/org/jabref/logic/bst/util/BstNameFormatter.java b/src/main/java/org/jabref/logic/bst/util/BstNameFormatter.java
index a49b1527a8d6..e3b3a8c22b63 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstNameFormatter.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstNameFormatter.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.bst.util;
 
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import org.jabref.logic.bst.BstVMException;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 /**
  * From Bibtex:
  *
@@ -31,8 +30,7 @@
 public class BstNameFormatter {
     private static final Logger LOGGER = LoggerFactory.getLogger(BstNameFormatter.class);
 
-    private BstNameFormatter() {
-    }
+    private BstNameFormatter() {}
 
     /**
      * Formats the nth author of the author name list by a given format string
@@ -45,7 +43,10 @@ public static String formatName(String authorsNameList, int whichName, String fo
         AuthorList al = AuthorList.parse(authorsNameList);
 
         if ((whichName < 1) && (whichName > al.getNumberOfAuthors())) {
-            LOGGER.warn("AuthorList {} does not contain an author with number {}", authorsNameList, whichName);
+            LOGGER.warn(
+                    "AuthorList {} does not contain an author with number {}",
+                    authorsNameList,
+                    whichName);
             return "";
         }
         return BstNameFormatter.formatName(al.getAuthor(whichName - 1), formatString);
@@ -81,7 +82,10 @@ public static String formatName(Author author, String format) {
                     }
                     if ((braceLevel == 1) && Character.isLetter(c[i])) {
                         if ("fvlj".indexOf(c[i]) == -1) {
-                            LOGGER.warn("Format string in format.name$ may only contain fvlj on brace level 1 in group {}: {}", group, format);
+                            LOGGER.warn(
+                                    "Format string in format.name$ may only contain fvlj on brace level 1 in group {}: {}",
+                                    group,
+                                    format);
                         } else {
                             level1Chars.append(c[i]);
                         }
@@ -96,19 +100,22 @@ public static String formatName(Author author, String format) {
                 }
 
                 if (control.length() > 2) {
-                    LOGGER.warn("Format string in format.name$ may only be one or two character long on brace level 1 in group {}: {}", group, format);
+                    LOGGER.warn(
+                            "Format string in format.name$ may only be one or two character long on brace level 1 in group {}: {}",
+                            group,
+                            format);
                 }
 
                 char type = control.charAt(0);
 
-                Optional<String> tokenS = switch (type) {
-                    case 'f' -> author.getGivenName();
-                    case 'v' -> author.getNamePrefix();
-                    case 'l' -> author.getFamilyName();
-                    case 'j' -> author.getNameSuffix();
-                    default ->
-                            throw new BstVMException("Internal error");
-                };
+                Optional<String> tokenS =
+                        switch (type) {
+                            case 'f' -> author.getGivenName();
+                            case 'v' -> author.getNamePrefix();
+                            case 'l' -> author.getFamilyName();
+                            case 'j' -> author.getNameSuffix();
+                            default -> throw new BstVMException("Internal error");
+                        };
 
                 if (tokenS.isEmpty()) {
                     i++;
@@ -122,7 +129,10 @@ public static String formatName(Author author, String format) {
                     if (control.charAt(1) == control.charAt(0)) {
                         abbreviateThatIsSingleLetter = false;
                     } else {
-                        LOGGER.warn("Format string in format.name$ may only contain one type of vlfj on brace level 1 in group {}: {}", group, format);
+                        LOGGER.warn(
+                                "Format string in format.name$ may only contain one type of vlfj on brace level 1 in group {}: {}",
+                                group,
+                                format);
                     }
                 }
 
@@ -156,8 +166,10 @@ public static String formatName(Author author, String format) {
                             if (abbreviateThatIsSingleLetter) {
                                 String[] dashes = token.split("-");
 
-                                token = Arrays.stream(dashes).map(BstNameFormatter::getFirstCharOfString)
-                                              .collect(Collectors.joining(".-"));
+                                token =
+                                        Arrays.stream(dashes)
+                                                .map(BstNameFormatter::getFirstCharOfString)
+                                                .collect(Collectors.joining(".-"));
                             }
 
                             // Output token
@@ -172,7 +184,11 @@ public static String formatName(Author author, String format) {
                                     // No clue what this means (What the hell are tokens anyway???
                                     // if (lex_class[name_sep_char[cur_token]] = sep_char) then
                                     //    append_ex_buf_char_and_check (name_sep_char[cur_token])
-                                    if ((k == (tokens.length - 2)) || (BstNameFormatter.numberOfChars(sb.substring(groupStart, sb.length()), 3) < 3)) {
+                                    if ((k == (tokens.length - 2))
+                                            || (BstNameFormatter.numberOfChars(
+                                                            sb.substring(groupStart, sb.length()),
+                                                            3)
+                                                    < 3)) {
                                         sb.append('~');
                                     } else {
                                         sb.append(' ');
@@ -196,9 +212,12 @@ public static String formatName(Author author, String format) {
                 }
                 if (sb.length() > 0) {
                     boolean noDisTie = false;
-                    if ((sb.charAt(sb.length() - 1) == '~') &&
-                            ((BstNameFormatter.numberOfChars(sb.substring(groupStart, sb.length()), 4) >= 4) ||
-                                    ((sb.length() > 1) && (noDisTie = sb.charAt(sb.length() - 2) == '~')))) {
+                    if ((sb.charAt(sb.length() - 1) == '~')
+                            && ((BstNameFormatter.numberOfChars(
+                                                    sb.substring(groupStart, sb.length()), 4)
+                                            >= 4)
+                                    || ((sb.length() > 1)
+                                            && (noDisTie = sb.charAt(sb.length() - 2) == '~')))) {
                         sb.deleteCharAt(sb.length() - 1);
                         if (!noDisTie) {
                             sb.append(' ');
diff --git a/src/main/java/org/jabref/logic/bst/util/BstPurifier.java b/src/main/java/org/jabref/logic/bst/util/BstPurifier.java
index 2b0fce0b7353..e45f3fc0684d 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstPurifier.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstPurifier.java
@@ -16,8 +16,7 @@
 public class BstPurifier {
     private static final Logger LOGGER = LoggerFactory.getLogger(BstPurifier.class);
 
-    private BstPurifier() {
-    }
+    private BstPurifier() {}
 
     public static String purify(String toPurify) {
         StringBuilder sb = new StringBuilder();
diff --git a/src/main/java/org/jabref/logic/bst/util/BstTextPrefixer.java b/src/main/java/org/jabref/logic/bst/util/BstTextPrefixer.java
index ffe123ec68e2..92c5617cc078 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstTextPrefixer.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstTextPrefixer.java
@@ -20,8 +20,7 @@
 public class BstTextPrefixer {
     private static final Logger LOGGER = LoggerFactory.getLogger(BstTextPrefixer.class);
 
-    private BstTextPrefixer() {
-    }
+    private BstTextPrefixer() {}
 
     public static String textPrefix(int numOfChars, String toPrefix) {
         StringBuilder sb = new StringBuilder();
@@ -49,7 +48,9 @@ private static void handleOpeningBrace(char[] cs, PrefixState prefixState, char
             return;
         }
         prefixState.braceLevel++;
-        if ((prefixState.braceLevel == 1) && (prefixState.index < cs.length) && (cs[prefixState.index] == '\\')) {
+        if ((prefixState.braceLevel == 1)
+                && (prefixState.index < cs.length)
+                && (cs[prefixState.index] == '\\')) {
             prefixState.index++; // skip backslash
             while ((prefixState.index < cs.length) && (prefixState.braceLevel > 0)) {
                 if (cs[prefixState.index] == '}') {
@@ -78,6 +79,7 @@ private static class PrefixState {
         public int index;
         public int braceLevel;
         public int numOfChars;
+
         public PrefixState(int index, int braceLevel, int numOfChars) {
             this.index = index;
             this.braceLevel = braceLevel;
diff --git a/src/main/java/org/jabref/logic/bst/util/BstWidthCalculator.java b/src/main/java/org/jabref/logic/bst/util/BstWidthCalculator.java
index 873b75cebb84..70da505a6fcd 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstWidthCalculator.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstWidthCalculator.java
@@ -134,8 +134,7 @@ public class BstWidthCalculator {
         }
     }
 
-    private BstWidthCalculator() {
-    }
+    private BstWidthCalculator() {}
 
     private static int getSpecialCharWidth(char[] c, int pos) {
         if ((pos + 1) < c.length) {
diff --git a/src/main/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatterns.java b/src/main/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatterns.java
index 4a026a5bd5e6..5a5036be0bca 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatterns.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatterns.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.citationkeypattern;
 
+import org.jabref.model.entry.types.EntryType;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.jabref.model.entry.types.EntryType;
-
 /**
  * A small table, where an entry type is associated with a Bibtex key pattern (an
  * <code>ArrayList</code>). A parent CitationKeyPattern can be set.
@@ -40,7 +40,8 @@ public boolean equals(Object o) {
             return false;
         }
         AbstractCitationKeyPatterns that = (AbstractCitationKeyPatterns) o;
-        return Objects.equals(defaultPattern, that.defaultPattern) && Objects.equals(data, that.data);
+        return Objects.equals(defaultPattern, that.defaultPattern)
+                && Objects.equals(data, that.data);
     }
 
     @Override
@@ -103,7 +104,8 @@ public Set<EntryType> getAllKeys() {
     }
 
     public Map<EntryType, CitationKeyPattern> getPatterns() {
-        return data.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+        return data.entrySet().stream()
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
     }
 
     public abstract CitationKeyPattern getLastLevelCitationKeyPattern(EntryType key);
diff --git a/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java b/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
index 0447f748cef9..2c928194de17 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
@@ -1,23 +1,6 @@
 package org.jabref.logic.citationkeypattern;
 
-import java.math.BigInteger;
-import java.text.Normalizer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Scanner;
-import java.util.StringJoiner;
-import java.util.StringTokenizer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
+import com.google.common.annotations.VisibleForTesting;
 
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.formatter.Formatters;
@@ -35,11 +18,28 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.LatexToUnicodeAdapter;
 import org.jabref.model.strings.StringUtil;
-
-import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.math.BigInteger;
+import java.text.Normalizer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Scanner;
+import java.util.StringJoiner;
+import java.util.StringTokenizer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 /**
  * This class provides methods to expand bracketed expressions, such as
  * <code>[year]_[author]_[firstpage]</code>, using information from a provided BibEntry. The above-mentioned expression would yield
@@ -76,17 +76,18 @@ public class BracketedPattern {
     /**
      * Matches uppercase english letters between "({" and "})", which should be used to abbreviate the name of an institution
      */
-
     private static final Pattern INLINE_ABBREVIATION = Pattern.compile("(?<=\\(\\{)[A-Z]+(?=}\\))");
 
     /**
      * Matches with "dep"/"dip", case-insensitive
      */
-    private static final Pattern DEPARTMENTS = Pattern.compile("^d[ei]p.*", Pattern.CASE_INSENSITIVE);
+    private static final Pattern DEPARTMENTS =
+            Pattern.compile("^d[ei]p.*", Pattern.CASE_INSENSITIVE);
 
     private static final Pattern WHITESPACE = Pattern.compile("\\p{javaWhitespace}");
 
-    private static final RemoveEnclosingBracesFormatter ENCLOSING_BRACES_FORMATTER = new RemoveEnclosingBracesFormatter();
+    private static final RemoveEnclosingBracesFormatter ENCLOSING_BRACES_FORMATTER =
+            new RemoveEnclosingBracesFormatter();
 
     private enum Institution {
         SCHOOL,
@@ -97,17 +98,20 @@ private enum Institution {
         /**
          * Matches "uni" followed by "v" or "b", at the start of a string or after a space, case insensitive
          */
-        private static final Pattern UNIVERSITIES = Pattern.compile("^uni(v|b|$).*", Pattern.CASE_INSENSITIVE);
+        private static final Pattern UNIVERSITIES =
+                Pattern.compile("^uni(v|b|$).*", Pattern.CASE_INSENSITIVE);
 
         /**
          * Matches with "tech", case-insensitive
          */
-        private static final Pattern TECHNOLOGICAL_INSTITUTES = Pattern.compile("^tech.*", Pattern.CASE_INSENSITIVE);
+        private static final Pattern TECHNOLOGICAL_INSTITUTES =
+                Pattern.compile("^tech.*", Pattern.CASE_INSENSITIVE);
 
         /**
          * Matches with "dep"/"dip"/"lab", case insensitive
          */
-        private static final Pattern DEPARTMENTS_OR_LABS = Pattern.compile("^(d[ei]p|lab).*", Pattern.CASE_INSENSITIVE);
+        private static final Pattern DEPARTMENTS_OR_LABS =
+                Pattern.compile("^(d[ei]p|lab).*", Pattern.CASE_INSENSITIVE);
 
         /**
          * Find which types of institutions have words in common with the given name parts.
@@ -192,7 +196,8 @@ public String expand(BibEntry bibentry, Character keywordDelimiter, BibDatabase
      * @param database         The database for field resolving. May be null.
      * @return The expanded pattern. Not null.
      */
-    public static String expandBrackets(String pattern, Character keywordDelimiter, BibEntry entry, BibDatabase database) {
+    public static String expandBrackets(
+            String pattern, Character keywordDelimiter, BibEntry entry, BibDatabase database) {
         Objects.requireNonNull(pattern);
         Objects.requireNonNull(entry);
         return expandBrackets(pattern, expandBracketContent(keywordDelimiter, entry, database));
@@ -207,16 +212,23 @@ public static String expandBrackets(String pattern, Character keywordDelimiter,
      * @param database         The {@link BibDatabase} for field resolving. May be null.
      * @return a function accepting a bracketed expression and returning the result of expanding it
      */
-    public static Function<String, String> expandBracketContent(Character keywordDelimiter, BibEntry entry, BibDatabase database) {
+    public static Function<String, String> expandBracketContent(
+            Character keywordDelimiter, BibEntry entry, BibDatabase database) {
         return (String bracket) -> {
             String expandedPattern;
             List<String> fieldParts = parseFieldAndModifiers(bracket);
             // check whether there is a modifier on the end such as
             // ":lower":
-            expandedPattern = getFieldValue(entry, fieldParts.getFirst(), keywordDelimiter, database);
+            expandedPattern =
+                    getFieldValue(entry, fieldParts.getFirst(), keywordDelimiter, database);
             if (fieldParts.size() > 1) {
                 // apply modifiers:
-                expandedPattern = applyModifiers(expandedPattern, fieldParts, 1, expandBracketContent(keywordDelimiter, entry, database));
+                expandedPattern =
+                        applyModifiers(
+                                expandedPattern,
+                                fieldParts,
+                                1,
+                                expandBracketContent(keywordDelimiter, entry, database));
             }
             return expandedPattern;
         };
@@ -230,7 +242,8 @@ public static Function<String, String> expandBracketContent(Character keywordDel
      *                              and expanding it
      * @return The expanded pattern. Not null.
      */
-    public static String expandBrackets(String pattern, Function<String, String> bracketContentHandler) {
+    public static String expandBrackets(
+            String pattern, Function<String, String> bracketContentHandler) {
         Objects.requireNonNull(pattern);
         StringBuilder expandedPattern = new StringBuilder();
         StringTokenizer parsedPattern = new StringTokenizer(pattern, "\\[]\"", true);
@@ -310,7 +323,7 @@ private static String contentBetweenBrackets(StringTokenizer tokenizer, final St
      * @param tokenizer     the tokenizer producing the tokens
      */
     private static void appendQuote(StringBuilder stringBuilder, StringTokenizer tokenizer) {
-        stringBuilder.append("\"");  // We know that the previous token was \"
+        stringBuilder.append("\""); // We know that the previous token was \"
         String token = "";
         while (tokenizer.hasMoreTokens() && !"\"".equals(token)) {
             token = tokenizer.nextToken();
@@ -327,21 +340,27 @@ private static void appendQuote(StringBuilder stringBuilder, StringTokenizer tok
      * @param database         The database to use for field resolving. May be null.
      * @return String containing the evaluation result. Empty string if the pattern cannot be resolved.
      */
-    public static String getFieldValue(BibEntry entry, String pattern, Character keywordDelimiter, BibDatabase database) {
+    public static String getFieldValue(
+            BibEntry entry, String pattern, Character keywordDelimiter, BibDatabase database) {
         try {
             if (pattern.startsWith("auth") || pattern.startsWith("pureauth")) {
                 // result the author
-                String unparsedAuthors = entry.getResolvedFieldOrAlias(StandardField.AUTHOR, database).orElse("");
+                String unparsedAuthors =
+                        entry.getResolvedFieldOrAlias(StandardField.AUTHOR, database).orElse("");
 
                 if (pattern.startsWith("pure")) {
-                    // "pure" is used in the context of authors to resolve to authors only and not fallback to editors
+                    // "pure" is used in the context of authors to resolve to authors only and not
+                    // fallback to editors
                     // The other functionality of the pattern "ForeIni", ... is the same
-                    // Thus, remove the "pure" prefix so the remaining code in this section functions correctly
+                    // Thus, remove the "pure" prefix so the remaining code in this section
+                    // functions correctly
                     //
                     pattern = pattern.substring(4);
                 } else if (unparsedAuthors.isEmpty()) {
                     // special feature: A pattern starting with "auth" falls back to the editor
-                    unparsedAuthors = entry.getResolvedFieldOrAlias(StandardField.EDITOR, database).orElse("");
+                    unparsedAuthors =
+                            entry.getResolvedFieldOrAlias(StandardField.EDITOR, database)
+                                    .orElse("");
                 }
 
                 AuthorList authorList = createAuthorList(unparsedAuthors);
@@ -380,8 +399,8 @@ public static String getFieldValue(BibEntry entry, String pattern, Character key
                     return authIniN(authorList, num);
                 } else if (pattern.matches("auth[\\d]+_[\\d]+")) {
                     String[] nums = pattern.substring(4).split("_");
-                    return authNofMth(authorList, Integer.parseInt(nums[0]),
-                            Integer.parseInt(nums[1]));
+                    return authNofMth(
+                            authorList, Integer.parseInt(nums[0]), Integer.parseInt(nums[1]));
                 } else if (pattern.matches("auth\\d+")) {
                     // authN. First N chars of the first author's last name.
                     int num = Integer.parseInt(pattern.substring(4));
@@ -391,12 +410,14 @@ public static String getFieldValue(BibEntry entry, String pattern, Character key
                 } else {
                     // This "auth" business was a dead end, so just
                     // use it literally:
-                    return entry.getResolvedFieldOrAlias(FieldFactory.parseField(pattern), database).orElse("");
+                    return entry.getResolvedFieldOrAlias(FieldFactory.parseField(pattern), database)
+                            .orElse("");
                 }
             } else if (pattern.startsWith("ed")) {
                 // Gather all markers starting with "ed" here, so we
                 // don't have to check all the time.
-                String unparsedEditors = entry.getResolvedFieldOrAlias(StandardField.EDITOR, database).orElse("");
+                String unparsedEditors =
+                        entry.getResolvedFieldOrAlias(StandardField.EDITOR, database).orElse("");
                 AuthorList editorList = createAuthorList(unparsedEditors);
 
                 switch (pattern) {
@@ -423,9 +444,8 @@ public static String getFieldValue(BibEntry entry, String pattern, Character key
                     return authIniN(editorList, num);
                 } else if (pattern.matches("edtr[\\d]+_[\\d]+")) {
                     String[] nums = pattern.substring(4).split("_");
-                    return authNofMth(editorList,
-                            Integer.parseInt(nums[0]),
-                            Integer.parseInt(nums[1]));
+                    return authNofMth(
+                            editorList, Integer.parseInt(nums[0]), Integer.parseInt(nums[1]));
                 } else if (pattern.matches("edtr\\d+")) {
                     String fa = firstAuthor(editorList);
                     int num = Integer.parseInt(pattern.substring(4));
@@ -436,35 +456,56 @@ public static String getFieldValue(BibEntry entry, String pattern, Character key
                 } else {
                     // This "ed" business was a dead end, so just
                     // use it literally:
-                    return entry.getResolvedFieldOrAlias(FieldFactory.parseField(pattern), database).orElse("");
+                    return entry.getResolvedFieldOrAlias(FieldFactory.parseField(pattern), database)
+                            .orElse("");
                 }
             } else if ("firstpage".equals(pattern)) {
-                return firstPage(entry.getResolvedFieldOrAlias(StandardField.PAGES, database).orElse(""));
+                return firstPage(
+                        entry.getResolvedFieldOrAlias(StandardField.PAGES, database).orElse(""));
             } else if ("pageprefix".equals(pattern)) {
-                return pagePrefix(entry.getResolvedFieldOrAlias(StandardField.PAGES, database).orElse(""));
+                return pagePrefix(
+                        entry.getResolvedFieldOrAlias(StandardField.PAGES, database).orElse(""));
             } else if ("lastpage".equals(pattern)) {
-                return lastPage(entry.getResolvedFieldOrAlias(StandardField.PAGES, database).orElse(""));
+                return lastPage(
+                        entry.getResolvedFieldOrAlias(StandardField.PAGES, database).orElse(""));
             } else if ("title".equals(pattern)) {
-                return camelizeSignificantWordsInTitle(entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse(""));
+                return camelizeSignificantWordsInTitle(
+                        entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse(""));
             } else if ("fulltitle".equals(pattern)) {
                 return entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse("");
             } else if ("shorttitle".equals(pattern)) {
-                return getTitleWords(3,
-                        removeSmallWords(entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse("")));
+                return getTitleWords(
+                        3,
+                        removeSmallWords(
+                                entry.getResolvedFieldOrAlias(StandardField.TITLE, database)
+                                        .orElse("")));
             } else if ("shorttitleINI".equals(pattern)) {
                 return keepLettersAndDigitsOnly(
-                        applyModifiers(getTitleWordsWithSpaces(3, entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse("")),
-                                Collections.singletonList("abbr"), 0, Function.identity()));
+                        applyModifiers(
+                                getTitleWordsWithSpaces(
+                                        3,
+                                        entry.getResolvedFieldOrAlias(StandardField.TITLE, database)
+                                                .orElse("")),
+                                Collections.singletonList("abbr"),
+                                0,
+                                Function.identity()));
             } else if ("veryshorttitle".equals(pattern)) {
-                return getTitleWords(1,
-                        removeSmallWords(entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse("")));
+                return getTitleWords(
+                        1,
+                        removeSmallWords(
+                                entry.getResolvedFieldOrAlias(StandardField.TITLE, database)
+                                        .orElse("")));
             } else if (pattern.matches("camel[\\d]+")) {
                 int num = Integer.parseInt(pattern.substring(5));
-                return getCamelizedTitle_N(entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse(""), num);
+                return getCamelizedTitle_N(
+                        entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse(""),
+                        num);
             } else if ("camel".equals(pattern)) {
-                return getCamelizedTitle(entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse(""));
+                return getCamelizedTitle(
+                        entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse(""));
             } else if ("shortyear".equals(pattern)) {
-                String yearString = entry.getResolvedFieldOrAlias(StandardField.YEAR, database).orElse("");
+                String yearString =
+                        entry.getResolvedFieldOrAlias(StandardField.YEAR, database).orElse("");
                 if (yearString.isEmpty()) {
                     return yearString;
                     // In press/in preparation/submitted
@@ -476,11 +517,13 @@ public static String getFieldValue(BibEntry entry, String pattern, Character key
                     return yearString;
                 }
             } else if ("entrytype".equals(pattern)) {
-                return entry.getResolvedFieldOrAlias(InternalField.TYPE_HEADER, database).orElse("");
+                return entry.getResolvedFieldOrAlias(InternalField.TYPE_HEADER, database)
+                        .orElse("");
             } else if (pattern.matches("keyword\\d+")) {
                 // according to LabelPattern.php, it returns keyword number n
                 int num = Integer.parseInt(pattern.substring(7));
-                KeywordList separatedKeywords = entry.getResolvedKeywords(keywordDelimiter, database);
+                KeywordList separatedKeywords =
+                        entry.getResolvedKeywords(keywordDelimiter, database);
                 if (separatedKeywords.size() < num) {
                     // not enough keywords
                     return "";
@@ -496,7 +539,8 @@ public static String getFieldValue(BibEntry entry, String pattern, Character key
                 } else {
                     num = Integer.MAX_VALUE;
                 }
-                KeywordList separatedKeywords = entry.getResolvedKeywords(keywordDelimiter, database);
+                KeywordList separatedKeywords =
+                        entry.getResolvedKeywords(keywordDelimiter, database);
                 StringBuilder sb = new StringBuilder();
                 int i = 0;
                 for (Keyword keyword : separatedKeywords) {
@@ -511,7 +555,8 @@ public static String getFieldValue(BibEntry entry, String pattern, Character key
                 return sb.toString();
             } else {
                 // we haven't seen any special demands
-                return entry.getResolvedFieldOrAlias(FieldFactory.parseField(pattern), database).orElse("");
+                return entry.getResolvedFieldOrAlias(FieldFactory.parseField(pattern), database)
+                        .orElse("");
             }
         } catch (NullPointerException ex) {
             LOGGER.debug("Problem making expanding bracketed expression", ex);
@@ -528,21 +573,36 @@ public static String getFieldValue(BibEntry entry, String pattern, Character key
      */
     private static AuthorList createAuthorList(String unparsedAuthors) {
         return AuthorList.parse(unparsedAuthors).getAuthors().stream()
-                         .map(author -> {
-                             // If the author is an institution, use an institution key instead of the full name
-                             String lastName = author.getFamilyName()
-                                                     .map(lastPart -> isInstitution(author) ?
-                                                             generateInstitutionKey(lastPart) :
-                                                             LatexToUnicodeAdapter.format(lastPart))
-                                                     .orElse(null);
-                             return new Author(
-                                     author.getGivenName().map(LatexToUnicodeAdapter::format).orElse(null),
-                                     author.getGivenNameAbbreviated().map(LatexToUnicodeAdapter::format).orElse(null),
-                                     author.getNamePrefix().map(LatexToUnicodeAdapter::format).orElse(null),
-                                     lastName,
-                                     author.getNameSuffix().map(LatexToUnicodeAdapter::format).orElse(null));
-                         })
-                         .collect(AuthorList.collect());
+                .map(
+                        author -> {
+                            // If the author is an institution, use an institution key instead of
+                            // the full name
+                            String lastName =
+                                    author.getFamilyName()
+                                            .map(
+                                                    lastPart ->
+                                                            isInstitution(author)
+                                                                    ? generateInstitutionKey(
+                                                                            lastPart)
+                                                                    : LatexToUnicodeAdapter.format(
+                                                                            lastPart))
+                                            .orElse(null);
+                            return new Author(
+                                    author.getGivenName()
+                                            .map(LatexToUnicodeAdapter::format)
+                                            .orElse(null),
+                                    author.getGivenNameAbbreviated()
+                                            .map(LatexToUnicodeAdapter::format)
+                                            .orElse(null),
+                                    author.getNamePrefix()
+                                            .map(LatexToUnicodeAdapter::format)
+                                            .orElse(null),
+                                    lastName,
+                                    author.getNameSuffix()
+                                            .map(LatexToUnicodeAdapter::format)
+                                            .orElse(null));
+                        })
+                .collect(AuthorList.collect());
     }
 
     /**
@@ -552,8 +612,11 @@ private static AuthorList createAuthorList(String unparsedAuthors) {
      * @return true if only the last name is present and it contains at least one whitespace character.
      */
     private static boolean isInstitution(Author author) {
-        return author.getGivenName().isEmpty() && author.getGivenNameAbbreviated().isEmpty() && author.getNameSuffix().isEmpty()
-                && author.getNamePrefix().isEmpty() && author.getFamilyName().isPresent()
+        return author.getGivenName().isEmpty()
+                && author.getGivenNameAbbreviated().isEmpty()
+                && author.getNameSuffix().isEmpty()
+                && author.getNamePrefix().isEmpty()
+                && author.getFamilyName().isPresent()
                 && WHITESPACE.matcher(author.getFamilyName().get()).find();
     }
 
@@ -566,7 +629,11 @@ private static boolean isInstitution(Author author) {
      * @param expandBracketContent a function to expand the content in the parentheses.
      * @return The modified label.
      */
-    static String applyModifiers(final String label, final List<String> parts, final int offset, Function<String, String> expandBracketContent) {
+    static String applyModifiers(
+            final String label,
+            final List<String> parts,
+            final int offset,
+            Function<String, String> expandBracketContent) {
         String resultingLabel = label;
         for (int j = offset; j < parts.size(); j++) {
             String modifier = parts.get(j);
@@ -574,8 +641,8 @@ static String applyModifiers(final String label, final List<String> parts, final
             if ("abbr".equals(modifier)) {
                 // Abbreviate - that is,
                 StringBuilder abbreviateSB = new StringBuilder();
-                String[] words = resultingLabel.replaceAll("[\\{\\}']", "")
-                                               .split("[\\(\\) \r\n\"]");
+                String[] words =
+                        resultingLabel.replaceAll("[\\{\\}']", "").split("[\\(\\) \r\n\"]");
                 for (String word : words) {
                     if (!word.isEmpty()) {
                         abbreviateSB.append(word.charAt(0));
@@ -586,10 +653,17 @@ static String applyModifiers(final String label, final List<String> parts, final
                 Optional<Formatter> formatter = Formatters.getFormatterForModifier(modifier);
                 if (formatter.isPresent()) {
                     resultingLabel = formatter.get().format(resultingLabel);
-                } else if (!modifier.isEmpty() && (modifier.length() >= 2) && (modifier.charAt(0) == '(') && modifier.endsWith(")")) {
-                    // Alternate text modifier in parentheses. Should be inserted if the label is empty
+                } else if (!modifier.isEmpty()
+                        && (modifier.length() >= 2)
+                        && (modifier.charAt(0) == '(')
+                        && modifier.endsWith(")")) {
+                    // Alternate text modifier in parentheses. Should be inserted if the label is
+                    // empty
                     if (label.isEmpty() && (modifier.length() > 2)) {
-                        resultingLabel = expandBrackets(modifier.substring(1, modifier.length() - 1), expandBracketContent);
+                        resultingLabel =
+                                expandBrackets(
+                                        modifier.substring(1, modifier.length() - 1),
+                                        expandBracketContent);
                     }
                 } else {
                     LOGGER.warn("Key generator warning: unknown modifier '{}'.", modifier);
@@ -619,7 +693,8 @@ private static String formatTitle(String title) {
         while (piv < ss.length()) {
             current = new StringBuilder();
             // Get the next word:
-            while ((piv < ss.length()) && !Character.isWhitespace(ss.charAt(piv))
+            while ((piv < ss.length())
+                    && !Character.isWhitespace(ss.charAt(piv))
                     && (ss.charAt(piv) != '-')) {
                 current.append(ss.charAt(piv));
                 piv++;
@@ -731,10 +806,10 @@ public static String removeSmallWords(String title) {
         String formattedTitle = formatTitle(title);
 
         try (Scanner titleScanner = new Scanner(formattedTitle)) {
-            return titleScanner.tokens()
-                               .filter(Predicate.not(
-                                       Word::isSmallerWord))
-                               .collect(Collectors.joining(" "));
+            return titleScanner
+                    .tokens()
+                    .filter(Predicate.not(Word::isSmallerWord))
+                    .collect(Collectors.joining(" "));
         }
     }
 
@@ -746,17 +821,15 @@ private static String getTitleWordsWithSpaces(int number, String title) {
 
     private static String getSomeWords(int number, String string) {
         try (Scanner titleScanner = new Scanner(string)) {
-            return titleScanner.tokens()
-                               .limit(number)
-                               .collect(Collectors.joining(" "));
+            return titleScanner.tokens().limit(number).collect(Collectors.joining(" "));
         }
     }
 
     private static String keepLettersAndDigitsOnly(String in) {
         return in.codePoints()
-                 .filter(Character::isLetterOrDigit)
-                 .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
-                 .toString();
+                .filter(Character::isLetterOrDigit)
+                .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
+                .toString();
     }
 
     /**
@@ -768,9 +841,13 @@ private static String keepLettersAndDigitsOnly(String in) {
      */
     private static String firstAuthor(AuthorList authorList) {
         return authorList.getAuthors().stream()
-                         .findFirst()
-                         .flatMap(author -> author.getFamilyName().isPresent() ? author.getFamilyName() : author.getNamePrefix())
-                         .orElse("");
+                .findFirst()
+                .flatMap(
+                        author ->
+                                author.getFamilyName().isPresent()
+                                        ? author.getFamilyName()
+                                        : author.getNamePrefix())
+                .orElse("");
     }
 
     /**
@@ -782,10 +859,10 @@ private static String firstAuthor(AuthorList authorList) {
      */
     private static String firstAuthorForenameInitials(AuthorList authorList) {
         return authorList.getAuthors().stream()
-                         .findFirst()
-                         .flatMap(Author::getGivenNameAbbreviated)
-                         .map(s -> s.substring(0, 1))
-                         .orElse("");
+                .findFirst()
+                .flatMap(Author::getGivenNameAbbreviated)
+                .map(s -> s.substring(0, 1))
+                .orElse("");
     }
 
     /**
@@ -796,8 +873,9 @@ private static String firstAuthorForenameInitials(AuthorList authorList) {
      * never return null.
      */
     private static String firstAuthorVonAndLast(AuthorList authorList) {
-        return authorList.isEmpty() ? "" :
-                authorList.getAuthor(0).getNamePrefixAndFamilyName().replace(" ", "");
+        return authorList.isEmpty()
+                ? ""
+                : authorList.getAuthor(0).getNamePrefixAndFamilyName().replace(" ", "");
     }
 
     /**
@@ -810,7 +888,11 @@ private static String lastAuthor(AuthorList authorList) {
         if (authorList.isEmpty()) {
             return "";
         }
-        return authorList.getAuthors().get(authorList.getNumberOfAuthors() - 1).getFamilyName().orElse("");
+        return authorList
+                .getAuthors()
+                .get(authorList.getNumberOfAuthors() - 1)
+                .getFamilyName()
+                .orElse("");
     }
 
     /**
@@ -824,8 +906,11 @@ private static String lastAuthorForenameInitials(AuthorList authorList) {
         if (authorList.isEmpty()) {
             return "";
         }
-        return authorList.getAuthor(authorList.getNumberOfAuthors() - 1).getGivenNameAbbreviated().map(s -> s.substring(0, 1))
-                         .orElse("");
+        return authorList
+                .getAuthor(authorList.getNumberOfAuthors() - 1)
+                .getGivenNameAbbreviated()
+                .map(s -> s.substring(0, 1))
+                .orElse("");
     }
 
     /**
@@ -851,8 +936,9 @@ static String allAuthors(AuthorList authorList) {
     public static String authorsAlpha(AuthorList authorList) {
         StringBuilder alphaStyle = new StringBuilder();
         int numberOfAuthors = authorList.getNumberOfAuthors();
-        boolean andOthersPresent = numberOfAuthors > 1 &&
-                authorList.getAuthor(numberOfAuthors - 1).equals(Author.OTHERS);
+        boolean andOthersPresent =
+                numberOfAuthors > 1
+                        && authorList.getAuthor(numberOfAuthors - 1).equals(Author.OTHERS);
 
         if (numberOfAuthors == 1 || andOthersPresent) {
             // Single author or "and others" case
@@ -899,23 +985,25 @@ private static String getOrganizationInitials(String orgName) {
      * @return a string consisting of authors' last names separated by a `delimiter` and with any authors excess of
      * `maxAuthors` replaced with `suffix`
      */
-    public static String joinAuthorsOnLastName(AuthorList authorList, int maxAuthors, String delimiter, final String suffix) {
+    public static String joinAuthorsOnLastName(
+            AuthorList authorList, int maxAuthors, String delimiter, final String suffix) {
         final String finalSuffix = authorList.getNumberOfAuthors() > maxAuthors ? suffix : "";
         return authorList.getAuthors().stream()
-                         .map(author -> {
-                             if (author.equals(Author.OTHERS)) {
-                                 if (suffix.startsWith(delimiter)) {
-                                     return Optional.of(suffix.substring(delimiter.length()));
-                                 } else {
-                                     return Optional.of(suffix);
-                                 }
-                             } else {
-                                 return author.getFamilyName();
-                             }
-                         })
-                         .flatMap(Optional::stream)
-                         .limit(maxAuthors)
-                         .collect(Collectors.joining(delimiter, "", finalSuffix));
+                .map(
+                        author -> {
+                            if (author.equals(Author.OTHERS)) {
+                                if (suffix.startsWith(delimiter)) {
+                                    return Optional.of(suffix.substring(delimiter.length()));
+                                } else {
+                                    return Optional.of(suffix);
+                                }
+                            } else {
+                                return author.getFamilyName();
+                            }
+                        })
+                .flatMap(Optional::stream)
+                .limit(maxAuthors)
+                .collect(Collectors.joining(delimiter, "", finalSuffix));
     }
 
     /**
@@ -962,9 +1050,11 @@ static String authEtal(AuthorList authorList, String delim, String append) {
             return "";
         }
         if ((authorList.getNumberOfAuthors() <= 2)
-                && ((authorList.getNumberOfAuthors() == 1) || !authorList.getAuthor(1).equals(Author.OTHERS))) {
+                && ((authorList.getNumberOfAuthors() == 1)
+                        || !authorList.getAuthor(1).equals(Author.OTHERS))) {
             // in case 1 or two authors, just name them
-            // exception: If the second author is "and others", then do the appendix handling (in the other branch)
+            // exception: If the second author is "and others", then do the appendix handling (in
+            // the other branch)
             return joinAuthorsOnLastName(authorList, 2, delim, "");
         } else {
             return authorList.getAuthor(0).getFamilyName().orElse("") + append;
@@ -987,8 +1077,11 @@ private static String authNofMth(AuthorList authorList, int n, int m) {
         if (lastAuthor.equals(Author.OTHERS)) {
             return "+";
         }
-        String lastName = lastAuthor.getFamilyName()
-                                    .map(CitationKeyGenerator::removeDefaultUnwantedCharacters).orElse("");
+        String lastName =
+                lastAuthor
+                        .getFamilyName()
+                        .map(CitationKeyGenerator::removeDefaultUnwantedCharacters)
+                        .orElse("");
         return lastName.length() > n ? lastName.substring(0, n) : lastName;
     }
 
@@ -1033,16 +1126,14 @@ static String authIniN(AuthorList authorList, int n) {
         }
 
         final int numberOfAuthors = authorList.getNumberOfAuthors();
-        final boolean lastAuthorIsOthers = authorList.getAuthor(numberOfAuthors - 1).equals(Author.OTHERS);
+        final boolean lastAuthorIsOthers =
+                authorList.getAuthor(numberOfAuthors - 1).equals(Author.OTHERS);
         if (n >= numberOfAuthors && lastAuthorIsOthers) {
             final int limit = Math.min(n - 1, numberOfAuthors - 1);
             // special handling if the last author is "Others"
             // This gets the single char "+" only
-            AuthorList allButOthers = AuthorList.of(
-                    authorList.getAuthors()
-                              .stream()
-                              .limit(limit)
-                              .toList());
+            AuthorList allButOthers =
+                    AuthorList.of(authorList.getAuthors().stream().limit(limit).toList());
             return authIniN(allButOthers, n - 1) + "+";
         }
 
@@ -1075,12 +1166,13 @@ public static String firstPage(String pages) {
         // FIXME: incorrectly exracts the first page when pages are
         // specified with ellipse, e.g. "213-6", which should stand
         // for "213-216". S.G.
-        return NOT_DECIMAL_DIGIT.splitAsStream(pages)
-                                .filter(Predicate.not(String::isBlank))
-                                .map(BigInteger::new)
-                                .min(BigInteger::compareTo)
-                                .map(BigInteger::toString)
-                                .orElse("");
+        return NOT_DECIMAL_DIGIT
+                .splitAsStream(pages)
+                .filter(Predicate.not(String::isBlank))
+                .map(BigInteger::new)
+                .min(BigInteger::compareTo)
+                .map(BigInteger::toString)
+                .orElse("");
     }
 
     /**
@@ -1106,12 +1198,13 @@ public static String pagePrefix(String pages) {
      * @throws NullPointerException if pages is null.
      */
     public static String lastPage(String pages) {
-        return NOT_DECIMAL_DIGIT.splitAsStream(pages)
-                                .filter(Predicate.not(String::isBlank))
-                                .map(BigInteger::new)
-                                .max(BigInteger::compareTo)
-                                .map(BigInteger::toString)
-                                .orElse("");
+        return NOT_DECIMAL_DIGIT
+                .splitAsStream(pages)
+                .filter(Predicate.not(String::isBlank))
+                .map(BigInteger::new)
+                .max(BigInteger::compareTo)
+                .map(BigInteger::toString)
+                .orElse("");
     }
 
     /**
@@ -1219,8 +1312,8 @@ protected static List<String> parseFieldAndModifiers(String arg) {
      *         <li>null if content is null</li>
      *         </ul>
      */
-     @VisibleForTesting
-     static String generateInstitutionKey(String content) {
+    @VisibleForTesting
+    static String generateInstitutionKey(String content) {
         if (content == null) {
             return null;
         }
@@ -1234,11 +1327,15 @@ static String generateInstitutionKey(String content) {
 
         Optional<String> unicodeFormattedName = LatexToUnicodeAdapter.parse(content);
         if (unicodeFormattedName.isEmpty()) {
-            LOGGER.warn("{} could not be converted to unicode. This can result in an incorrect or missing institute citation key", content);
+            LOGGER.warn(
+                    "{} could not be converted to unicode. This can result in an incorrect or missing institute citation key",
+                    content);
         }
-        String result = unicodeFormattedName.orElse(Normalizer.normalize(content, Normalizer.Form.NFC));
+        String result =
+                unicodeFormattedName.orElse(Normalizer.normalize(content, Normalizer.Form.NFC));
 
-        // Special characters can't be allowed past this point because the citation key generator might replace them with multiple mixed-case characters
+        // Special characters can't be allowed past this point because the citation key generator
+        // might replace them with multiple mixed-case characters
         result = StringUtil.replaceSpecialCharacters(result);
 
         String[] institutionNameTokens = result.split(",");
@@ -1269,7 +1366,7 @@ static String generateInstitutionKey(String content) {
                     department = institutionNameTokens[index - 1];
                 }
             } else if ((tokenTypes.contains(Institution.SCHOOL)
-                    || tokenTypes.contains(Institution.DEPARTMENT))
+                            || tokenTypes.contains(Institution.DEPARTMENT))
                     && (institutionNameTokens.length > 1)) {
                 // School is an abbreviation of all the words beginning with a
                 // capital letter excluding: department, school and faculty words.
@@ -1296,10 +1393,11 @@ static String generateInstitutionKey(String content) {
                 // A part not matching university, department nor school
                 if (tokenParts.size() >= 3) {
                     // If there are more than 3 parts, only keep the first character of each word
-                    final int[] codePoints = tokenParts.stream()
-                                                       .filter(Predicate.not(String::isBlank))
-                                                       .mapToInt(s -> s.codePointAt(0))
-                                                       .toArray();
+                    final int[] codePoints =
+                            tokenParts.stream()
+                                    .filter(Predicate.not(String::isBlank))
+                                    .mapToInt(s -> s.codePointAt(0))
+                                    .toArray();
                     rest = new String(codePoints, 0, codePoints.length);
                 } else {
                     rest = String.join("", tokenParts);
@@ -1333,9 +1431,10 @@ private static List<String> getValidInstitutionNameParts(String name) {
         // Cleanup: remove unnecessary words.
         for (String part : name.replaceAll("\\{[A-Z]+}", "").split("[ \\-_]")) {
             if ((!part.isEmpty() // remove empty
-                    && !ignore.contains(part.toLowerCase(Locale.ENGLISH)) // remove ignored words
-                    && (part.charAt(part.length() - 1) != '.')
-                    && Character.isUpperCase(part.charAt(0)))
+                            && !ignore.contains(
+                                    part.toLowerCase(Locale.ENGLISH)) // remove ignored words
+                            && (part.charAt(part.length() - 1) != '.')
+                            && Character.isUpperCase(part.charAt(0)))
                     || ((part.length() >= 3) && "uni".equalsIgnoreCase(part.substring(0, 3)))) {
                 nameParts.add(part);
             }
diff --git a/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java b/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java
index 9438194a2d2f..317c99475068 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java
@@ -1,22 +1,21 @@
 package org.jabref.logic.citationkeypattern;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.regex.PatternSyntaxException;
-
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.regex.PatternSyntaxException;
+
 /**
  * This is the utility class of the LabelPattern package.
  */
@@ -36,20 +35,29 @@ public class CitationKeyGenerator extends BracketedPattern {
     private static final Logger LOGGER = LoggerFactory.getLogger(CitationKeyGenerator.class);
 
     // Source of disallowed characters : https://tex.stackexchange.com/a/408548/9075
-    private static final List<Character> DISALLOWED_CHARACTERS = Arrays.asList('{', '}', '(', ')', ',', '=', '\\', '"', '#', '%', '~', '\'');
+    private static final List<Character> DISALLOWED_CHARACTERS =
+            Arrays.asList('{', '}', '(', ')', ',', '=', '\\', '"', '#', '%', '~', '\'');
 
     private final AbstractCitationKeyPatterns citeKeyPattern;
     private final BibDatabase database;
     private final CitationKeyPatternPreferences citationKeyPatternPreferences;
     private final String unwantedCharacters;
 
-    public CitationKeyGenerator(BibDatabaseContext bibDatabaseContext, CitationKeyPatternPreferences citationKeyPatternPreferences) {
-        this(bibDatabaseContext.getMetaData().getCiteKeyPatterns(citationKeyPatternPreferences.getKeyPatterns()),
+    public CitationKeyGenerator(
+            BibDatabaseContext bibDatabaseContext,
+            CitationKeyPatternPreferences citationKeyPatternPreferences) {
+        this(
+                bibDatabaseContext
+                        .getMetaData()
+                        .getCiteKeyPatterns(citationKeyPatternPreferences.getKeyPatterns()),
                 bibDatabaseContext.getDatabase(),
                 citationKeyPatternPreferences);
     }
 
-    public CitationKeyGenerator(AbstractCitationKeyPatterns citeKeyPattern, BibDatabase database, CitationKeyPatternPreferences citationKeyPatternPreferences) {
+    public CitationKeyGenerator(
+            AbstractCitationKeyPatterns citeKeyPattern,
+            BibDatabase database,
+            CitationKeyPatternPreferences citationKeyPatternPreferences) {
         this.citeKeyPattern = Objects.requireNonNull(citeKeyPattern);
         this.database = Objects.requireNonNull(database);
         this.citationKeyPatternPreferences = Objects.requireNonNull(citationKeyPatternPreferences);
@@ -65,7 +73,8 @@ public CitationKeyGenerator(AbstractCitationKeyPatterns citeKeyPattern, BibDatab
     private static String getAppendix(int number) {
         if (number >= APPENDIX_CHARACTERS.length()) {
             int lastChar = number % APPENDIX_CHARACTERS.length();
-            return getAppendix((number / APPENDIX_CHARACTERS.length()) - 1) + APPENDIX_CHARACTERS.charAt(lastChar);
+            return getAppendix((number / APPENDIX_CHARACTERS.length()) - 1)
+                    + APPENDIX_CHARACTERS.charAt(lastChar);
         } else {
             return APPENDIX_CHARACTERS.substring(number, number + 1);
         }
@@ -76,12 +85,15 @@ public static String removeDefaultUnwantedCharacters(String key) {
     }
 
     public static String removeUnwantedCharacters(String key, String unwantedCharacters) {
-        String newKey = key.chars()
-                           .filter(c -> unwantedCharacters.indexOf(c) == -1)
-                           .filter(c -> !DISALLOWED_CHARACTERS.contains((char) c))
-                           .collect(StringBuilder::new,
-                                   StringBuilder::appendCodePoint, StringBuilder::append)
-                           .toString();
+        String newKey =
+                key.chars()
+                        .filter(c -> unwantedCharacters.indexOf(c) == -1)
+                        .filter(c -> !DISALLOWED_CHARACTERS.contains((char) c))
+                        .collect(
+                                StringBuilder::new,
+                                StringBuilder::appendCodePoint,
+                                StringBuilder::append)
+                        .toString();
 
         // Replace non-English characters like umlauts etc. with a sensible
         // letter or letter combination that bibtex can accept.
@@ -122,13 +134,15 @@ private String appendLettersToKey(String key, String oldKey) {
             occurrences--; // No change, so we can accept one dupe.
         }
 
-        boolean alwaysAddLetter = citationKeyPatternPreferences.getKeySuffix()
-                == CitationKeyPatternPreferences.KeySuffix.ALWAYS;
+        boolean alwaysAddLetter =
+                citationKeyPatternPreferences.getKeySuffix()
+                        == CitationKeyPatternPreferences.KeySuffix.ALWAYS;
 
         if (alwaysAddLetter || occurrences != 0) {
             // The key is already in use, so we must modify it.
-            boolean firstLetterA = citationKeyPatternPreferences.getKeySuffix()
-                    == CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A;
+            boolean firstLetterA =
+                    citationKeyPatternPreferences.getKeySuffix()
+                            == CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A;
 
             int number = !alwaysAddLetter && !firstLetterA ? 1 : 0;
             String moddedKey;
@@ -163,7 +177,10 @@ private String replaceWithRegex(String key) {
             try {
                 key = key.replaceAll(regex, replacement);
             } catch (PatternSyntaxException e) {
-                LOGGER.warn("There is a syntax error in the regular expression \"{}\" used to generate a citation key", regex, e);
+                LOGGER.warn(
+                        "There is a syntax error in the regular expression \"{}\" used to generate a citation key",
+                        regex,
+                        e);
             }
         }
         return key;
@@ -173,10 +190,12 @@ private String createCitationKeyFromPattern(BibEntry entry) {
         // get the type of entry
         EntryType entryType = entry.getType();
         CitationKeyPattern citationKeyPattern = citeKeyPattern.getValue(entryType);
-        if (citationKeyPattern == null || CitationKeyPattern.NULL_CITATION_KEY_PATTERN.equals(citationKeyPattern)) {
+        if (citationKeyPattern == null
+                || CitationKeyPattern.NULL_CITATION_KEY_PATTERN.equals(citationKeyPattern)) {
             return "";
         }
-        return expandBrackets(citationKeyPattern.stringRepresentation(), expandBracketContent(entry));
+        return expandBrackets(
+                citationKeyPattern.stringRepresentation(), expandBracketContent(entry));
     }
 
     /**
@@ -192,12 +211,16 @@ private Function<String, String> expandBracketContent(BibEntry entry) {
             String expandedPattern;
             List<String> fieldParts = parseFieldAndModifiers(bracket);
 
-            expandedPattern = removeUnwantedCharacters(getFieldValue(entry, fieldParts.getFirst(), keywordDelimiter, database), unwantedCharacters);
+            expandedPattern =
+                    removeUnwantedCharacters(
+                            getFieldValue(entry, fieldParts.getFirst(), keywordDelimiter, database),
+                            unwantedCharacters);
             // check whether there is a modifier on the end such as
             // ":lower":
             if (fieldParts.size() > 1) {
                 // apply modifiers:
-                expandedPattern = applyModifiers(expandedPattern, fieldParts, 1, expandBracketContent(entry));
+                expandedPattern =
+                        applyModifiers(expandedPattern, fieldParts, 1, expandBracketContent(entry));
             }
             return cleanKey(expandedPattern, unwantedCharacters);
         };
diff --git a/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyPatternPreferences.java b/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyPatternPreferences.java
index 200fc352eade..8a77c1fbd8a1 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyPatternPreferences.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyPatternPreferences.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.citationkeypattern;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
@@ -8,14 +10,12 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
-import com.google.common.annotations.VisibleForTesting;
-
 public class CitationKeyPatternPreferences {
 
     public enum KeySuffix {
-        ALWAYS,         // CiteKeyA, CiteKeyB, CiteKeyC ...
-        SECOND_WITH_A,  // CiteKey, CiteKeyA, CiteKeyB ...
-        SECOND_WITH_B   // CiteKey, CiteKeyB, CiteKeyC ...
+        ALWAYS, // CiteKeyA, CiteKeyB, CiteKeyC ...
+        SECOND_WITH_A, // CiteKey, CiteKeyA, CiteKeyB ...
+        SECOND_WITH_B // CiteKey, CiteKeyB, CiteKeyC ...
     }
 
     private final BooleanProperty shouldAvoidOverwriteCiteKey = new SimpleBooleanProperty();
@@ -25,20 +25,22 @@ public enum KeySuffix {
     private final StringProperty keyPatternRegex = new SimpleStringProperty();
     private final StringProperty keyPatternReplacement = new SimpleStringProperty();
     private final StringProperty unwantedCharacters = new SimpleStringProperty();
-    private final ObjectProperty<GlobalCitationKeyPatterns> keyPatterns = new SimpleObjectProperty<>();
+    private final ObjectProperty<GlobalCitationKeyPatterns> keyPatterns =
+            new SimpleObjectProperty<>();
     private final String defaultPattern;
     private final ReadOnlyObjectProperty<Character> keywordDelimiter;
 
-    public CitationKeyPatternPreferences(boolean shouldAvoidOverwriteCiteKey,
-                                         boolean shouldWarnBeforeOverwriteCiteKey,
-                                         boolean shouldGenerateCiteKeysBeforeSaving,
-                                         KeySuffix keySuffix,
-                                         String keyPatternRegex,
-                                         String keyPatternReplacement,
-                                         String unwantedCharacters,
-                                         GlobalCitationKeyPatterns keyPatterns,
-                                         String defaultPattern,
-                                         ReadOnlyObjectProperty<Character> keywordDelimiter) {
+    public CitationKeyPatternPreferences(
+            boolean shouldAvoidOverwriteCiteKey,
+            boolean shouldWarnBeforeOverwriteCiteKey,
+            boolean shouldGenerateCiteKeysBeforeSaving,
+            KeySuffix keySuffix,
+            String keyPatternRegex,
+            String keyPatternReplacement,
+            String unwantedCharacters,
+            GlobalCitationKeyPatterns keyPatterns,
+            String defaultPattern,
+            ReadOnlyObjectProperty<Character> keywordDelimiter) {
 
         this.shouldAvoidOverwriteCiteKey.set(shouldAvoidOverwriteCiteKey);
         this.shouldWarnBeforeOverwriteCiteKey.set(shouldWarnBeforeOverwriteCiteKey);
@@ -54,18 +56,20 @@ public CitationKeyPatternPreferences(boolean shouldAvoidOverwriteCiteKey,
     }
 
     @VisibleForTesting
-    public CitationKeyPatternPreferences(boolean shouldAvoidOverwriteCiteKey,
-                                         boolean shouldWarnBeforeOverwriteCiteKey,
-                                         boolean shouldGenerateCiteKeysBeforeSaving,
-                                         KeySuffix keySuffix,
-                                         String keyPatternRegex,
-                                         String keyPatternReplacement,
-                                         String unwantedCharacters,
-                                         GlobalCitationKeyPatterns keyPatterns,
-                                         String defaultPattern,
-                                         Character keywordDelimiter) {
-
-        this(shouldAvoidOverwriteCiteKey,
+    public CitationKeyPatternPreferences(
+            boolean shouldAvoidOverwriteCiteKey,
+            boolean shouldWarnBeforeOverwriteCiteKey,
+            boolean shouldGenerateCiteKeysBeforeSaving,
+            KeySuffix keySuffix,
+            String keyPatternRegex,
+            String keyPatternReplacement,
+            String unwantedCharacters,
+            GlobalCitationKeyPatterns keyPatterns,
+            String defaultPattern,
+            Character keywordDelimiter) {
+
+        this(
+                shouldAvoidOverwriteCiteKey,
                 shouldWarnBeforeOverwriteCiteKey,
                 shouldGenerateCiteKeysBeforeSaving,
                 keySuffix,
diff --git a/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java b/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
index 734690679bbe..258fd0f4a05e 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
@@ -1,18 +1,18 @@
 package org.jabref.logic.citationstyle;
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import de.undercouch.citeproc.CSL;
+import de.undercouch.citeproc.DefaultAbbreviationProvider;
+import de.undercouch.citeproc.output.Bibliography;
+import de.undercouch.citeproc.output.Citation;
 
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 
-import de.undercouch.citeproc.CSL;
-import de.undercouch.citeproc.DefaultAbbreviationProvider;
-import de.undercouch.citeproc.output.Bibliography;
-import de.undercouch.citeproc.output.Citation;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * Provides an adapter class to CSL. It holds a CSL instance under the hood that is only recreated when
@@ -43,7 +43,13 @@ public class CSLAdapter {
      *
      * @param databaseContext {@link BibDatabaseContext} is used to be able to resolve fields and their aliases
      */
-    public synchronized List<String> makeBibliography(List<BibEntry> bibEntries, String style, CitationStyleOutputFormat outputFormat, BibDatabaseContext databaseContext, BibEntryTypesManager entryTypesManager) throws IOException, IllegalArgumentException {
+    public synchronized List<String> makeBibliography(
+            List<BibEntry> bibEntries,
+            String style,
+            CitationStyleOutputFormat outputFormat,
+            BibDatabaseContext databaseContext,
+            BibEntryTypesManager entryTypesManager)
+            throws IOException, IllegalArgumentException {
         dataProvider.setData(bibEntries, databaseContext, entryTypesManager);
         initialize(style, outputFormat);
         cslInstance.registerCitationItems(dataProvider.getIds());
@@ -51,11 +57,22 @@ public synchronized List<String> makeBibliography(List<BibEntry> bibEntries, Str
         return Arrays.asList(bibliography.getEntries());
     }
 
-    public synchronized Citation makeCitation(List<BibEntry> bibEntries, String style, CitationStyleOutputFormat outputFormat, BibDatabaseContext databaseContext, BibEntryTypesManager entryTypesManager) throws IOException {
+    public synchronized Citation makeCitation(
+            List<BibEntry> bibEntries,
+            String style,
+            CitationStyleOutputFormat outputFormat,
+            BibDatabaseContext databaseContext,
+            BibEntryTypesManager entryTypesManager)
+            throws IOException {
         dataProvider.setData(bibEntries, databaseContext, entryTypesManager);
         initialize(style, outputFormat);
         cslInstance.registerCitationItems(dataProvider.getIds());
-        return cslInstance.makeCitation(bibEntries.stream().map(entry -> entry.getCitationKey().orElse("")).toList()).getFirst();
+        return cslInstance
+                .makeCitation(
+                        bibEntries.stream()
+                                .map(entry -> entry.getCitationKey().orElse(""))
+                                .toList())
+                .getFirst();
     }
 
     /**
@@ -65,12 +82,19 @@ public synchronized Citation makeCitation(List<BibEntry> bibEntries, String styl
      * @param newFormat usually HTML or RTF.
      * @throws IOException An error occurred in the underlying JavaScript framework
      */
-    private void initialize(String newStyle, CitationStyleOutputFormat newFormat) throws IOException {
-        final boolean newCslInstanceNeedsToBeCreated = (cslInstance == null) || !Objects.equals(newStyle, style);
+    private void initialize(String newStyle, CitationStyleOutputFormat newFormat)
+            throws IOException {
+        final boolean newCslInstanceNeedsToBeCreated =
+                (cslInstance == null) || !Objects.equals(newStyle, style);
         if (newCslInstanceNeedsToBeCreated) {
             // lang and forceLang are set to the default values of other CSL constructors
-            cslInstance = new CSL(dataProvider, new JabRefLocaleProvider(),
-                    new DefaultAbbreviationProvider(), newStyle, "en-US");
+            cslInstance =
+                    new CSL(
+                            dataProvider,
+                            new JabRefLocaleProvider(),
+                            new DefaultAbbreviationProvider(),
+                            newStyle,
+                            "en-US");
             style = newStyle;
         }
 
diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java b/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
index 649a925e63be..f3383fad3aa5 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
@@ -1,5 +1,13 @@
 package org.jabref.logic.citationstyle;
 
+import com.google.common.annotations.VisibleForTesting;
+
+import org.jabref.architecture.AllowedToUseClassGetResource;
+import org.jabref.logic.openoffice.style.OOStyle;
+import org.jabref.logic.util.StandardFileType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
@@ -22,18 +30,11 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.jabref.architecture.AllowedToUseClassGetResource;
-import org.jabref.logic.openoffice.style.OOStyle;
-import org.jabref.logic.util.StandardFileType;
-
-import com.google.common.annotations.VisibleForTesting;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Representation of a CitationStyle. Stores its name, the file path and the style itself
  */
-@AllowedToUseClassGetResource("org.jabref.logic.citationstyle.CitationStyle.discoverCitationStyles reads the whole path to discover all available styles. Should be converted to a build-time job.")
+@AllowedToUseClassGetResource(
+        "org.jabref.logic.citationstyle.CitationStyle.discoverCitationStyles reads the whole path to discover all available styles. Should be converted to a build-time job.")
 public class CitationStyle implements OOStyle {
 
     public static final String DEFAULT = "/ieee.csl";
@@ -48,7 +49,11 @@ public class CitationStyle implements OOStyle {
     private final boolean isNumericStyle;
     private final String source;
 
-    private CitationStyle(final String filename, final String title, final boolean isNumericStyle, final String source) {
+    private CitationStyle(
+            final String filename,
+            final String title,
+            final boolean isNumericStyle,
+            final String source) {
         this.filePath = Objects.requireNonNull(filename);
         this.title = Objects.requireNonNull(title);
         this.isNumericStyle = isNumericStyle;
@@ -58,7 +63,8 @@ private CitationStyle(final String filename, final String title, final boolean i
     /**
      * Creates an CitationStyle instance out of the style string
      */
-    private static Optional<CitationStyle> createCitationStyleFromSource(final InputStream source, final String filename) {
+    private static Optional<CitationStyle> createCitationStyleFromSource(
+            final InputStream source, final String filename) {
         try {
             String content = new String(source.readAllBytes());
 
@@ -67,15 +73,19 @@ private static Optional<CitationStyle> createCitationStyleFromSource(final Input
                 return Optional.empty();
             }
 
-            return Optional.of(new CitationStyle(filename, styleInfo.get().title(), styleInfo.get().isNumericStyle(), content));
+            return Optional.of(
+                    new CitationStyle(
+                            filename,
+                            styleInfo.get().title(),
+                            styleInfo.get().isNumericStyle(),
+                            content));
         } catch (IOException e) {
             LOGGER.error("Error while parsing source", e);
             return Optional.empty();
         }
     }
 
-    public record StyleInfo(String title, boolean isNumericStyle) {
-    }
+    public record StyleInfo(String title, boolean isNumericStyle) {}
 
     @VisibleForTesting
     static Optional<StyleInfo> parseStyleInfo(String filename, String content) {
@@ -104,7 +114,8 @@ static Optional<StyleInfo> parseStyleInfo(String filename, String content) {
                             }
                         }
                         case "category" -> {
-                            String citationFormat = reader.getAttributeValue(null, "citation-format");
+                            String citationFormat =
+                                    reader.getAttributeValue(null, "citation-format");
                             if (citationFormat != null) {
                                 isNumericStyle = "numeric".equals(citationFormat);
                             }
@@ -150,7 +161,10 @@ public static Optional<CitationStyle> createCitationStyleFromFile(final String s
         String internalFile = STYLES_ROOT + (styleFile.startsWith("/") ? "" : "/") + styleFile;
         Path internalFilePath = Path.of(internalFile);
         boolean isExternalFile = Files.exists(internalFilePath);
-        try (InputStream inputStream = isExternalFile ? Files.newInputStream(internalFilePath) : CitationStyle.class.getResourceAsStream(internalFile)) {
+        try (InputStream inputStream =
+                isExternalFile
+                        ? Files.newInputStream(internalFilePath)
+                        : CitationStyle.class.getResourceAsStream(internalFile)) {
             if (inputStream == null) {
                 LOGGER.error("Could not find file: {}", styleFile);
                 return Optional.empty();
@@ -170,7 +184,8 @@ public static Optional<CitationStyle> createCitationStyleFromFile(final String s
      * @return default citation style
      */
     public static CitationStyle getDefault() {
-        return createCitationStyleFromFile(DEFAULT).orElse(new CitationStyle("", "Empty", false, ""));
+        return createCitationStyleFromFile(DEFAULT)
+                .orElse(new CitationStyle("", "Empty", false, ""));
     }
 
     /**
@@ -183,7 +198,8 @@ public static List<CitationStyle> discoverCitationStyles() {
             return STYLES;
         }
 
-        // TODO: The list of files should be determined at build time (instead of the dynamic method in discoverCitationStylesInPath(path))
+        // TODO: The list of files should be determined at build time (instead of the dynamic method
+        // in discoverCitationStylesInPath(path))
 
         URL url = CitationStyle.class.getResource(STYLES_ROOT + DEFAULT);
         if (url == null) {
@@ -197,21 +213,21 @@ public static List<CitationStyle> discoverCitationStyles() {
             STYLES.addAll(discoverCitationStylesInPath(path));
 
             return STYLES;
-        } catch (URISyntaxException
-                 | IOException e) {
+        } catch (URISyntaxException | IOException e) {
             LOGGER.error("something went wrong while searching available CitationStyles", e);
             return Collections.emptyList();
         }
     }
 
     private static List<CitationStyle> discoverCitationStylesInPath(Path path) throws IOException {
-        try (Stream<Path> stream = Files.find(path, 1, (file, attr) -> file.toString().endsWith("csl"))) {
+        try (Stream<Path> stream =
+                Files.find(path, 1, (file, attr) -> file.toString().endsWith("csl"))) {
             return stream.map(Path::getFileName)
-                         .map(Path::toString)
-                         .map(CitationStyle::createCitationStyleFromFile)
-                         .filter(Optional::isPresent)
-                         .map(Optional::get)
-                         .collect(Collectors.toList());
+                    .map(Path::toString)
+                    .map(CitationStyle::createCitationStyleFromFile)
+                    .filter(Optional::isPresent)
+                    .map(Optional::get)
+                    .collect(Collectors.toList());
         }
     }
 
@@ -219,7 +235,8 @@ private static List<CitationStyle> discoverCitationStylesInPath(Path path) throw
      * Checks if the given style file is a CitationStyle
      */
     public static boolean isCitationStyleFile(String styleFile) {
-        return StandardFileType.CITATION_STYLE.getExtensions().stream().anyMatch(styleFile::endsWith);
+        return StandardFileType.CITATION_STYLE.getExtensions().stream()
+                .anyMatch(styleFile::endsWith);
     }
 
     public String getTitle() {
diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java b/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java
index f94aaef26d93..ae06e4913398 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java
@@ -1,6 +1,9 @@
 package org.jabref.logic.citationstyle;
 
-import java.util.Objects;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.eventbus.Subscribe;
 
 import org.jabref.logic.preview.PreviewLayout;
 import org.jabref.model.database.BibDatabaseContext;
@@ -8,10 +11,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.event.EntryChangedEvent;
 
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.eventbus.Subscribe;
+import java.util.Objects;
 
 /**
  * Caches the generated Citations for quicker access
@@ -25,16 +25,21 @@ public class CitationStyleCache {
     private final LoadingCache<BibEntry, String> citationStyleCache;
 
     public CitationStyleCache(BibDatabaseContext databaseContext) {
-        citationStyleCache = CacheBuilder.newBuilder().maximumSize(CACHE_SIZE).build(new CacheLoader<BibEntry, String>() {
-            @Override
-            public String load(BibEntry entry) {
-                if (citationStyle != null) {
-                    return citationStyle.generatePreview(entry, databaseContext);
-                } else {
-                    return "";
-                }
-            }
-        });
+        citationStyleCache =
+                CacheBuilder.newBuilder()
+                        .maximumSize(CACHE_SIZE)
+                        .build(
+                                new CacheLoader<BibEntry, String>() {
+                                    @Override
+                                    public String load(BibEntry entry) {
+                                        if (citationStyle != null) {
+                                            return citationStyle.generatePreview(
+                                                    entry, databaseContext);
+                                        } else {
+                                            return "";
+                                        }
+                                    }
+                                });
         databaseContext.getDatabase().registerListener(new BibDatabaseEntryListener());
     }
 
diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java b/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java
index 0a5a079c86e5..3be021b5f477 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java
@@ -1,19 +1,19 @@
 package org.jabref.logic.citationstyle;
 
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
+import de.undercouch.citeproc.output.Citation;
 
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
-
-import de.undercouch.citeproc.output.Citation;
 import org.jbibtex.TokenMgrException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Facade to unify the access to the citation style engine. Use these methods if you need rendered BibTeX item(s) in a
  * given journal style. This class uses {@link CSLAdapter} to create output.
@@ -23,15 +23,17 @@ public class CitationStyleGenerator {
     private static final Logger LOGGER = LoggerFactory.getLogger(CitationStyleGenerator.class);
     private static final CSLAdapter CSL_ADAPTER = new CSLAdapter();
 
-    private CitationStyleGenerator() {
-    }
+    private CitationStyleGenerator() {}
 
     /**
      * Generates a Citation based on a given list of entries and a style with a default {@link BibDatabaseContext}
      *
      * @implNote the citation is generated using JavaScript which may take some time, better call it from outside the main Thread
      */
-    protected static String generateBibliography(List<BibEntry> bibEntries, CitationStyle style, BibEntryTypesManager entryTypesManager) {
+    protected static String generateBibliography(
+            List<BibEntry> bibEntries,
+            CitationStyle style,
+            BibEntryTypesManager entryTypesManager) {
         return generateBibliography(bibEntries, style.getSource(), entryTypesManager);
     }
 
@@ -40,8 +42,15 @@ protected static String generateBibliography(List<BibEntry> bibEntries, Citation
      *
      * @implNote the citation is generated using JavaScript which may take some time, better call it from outside the main Thread
      */
-    protected static String generateBibliography(List<BibEntry> bibEntries, String style, BibEntryTypesManager entryTypesManager) {
-        return generateBibliography(bibEntries, style, CitationStyleOutputFormat.HTML, new BibDatabaseContext(), entryTypesManager).getFirst();
+    protected static String generateBibliography(
+            List<BibEntry> bibEntries, String style, BibEntryTypesManager entryTypesManager) {
+        return generateBibliography(
+                        bibEntries,
+                        style,
+                        CitationStyleOutputFormat.HTML,
+                        new BibDatabaseContext(),
+                        entryTypesManager)
+                .getFirst();
     }
 
     /**
@@ -49,12 +58,25 @@ protected static String generateBibliography(List<BibEntry> bibEntries, String s
      *
      * @implNote the citation is generated using JavaScript which may take some time, better call it from outside the main Thread
      */
-    public static List<String> generateBibliography(List<BibEntry> bibEntries, String style, CitationStyleOutputFormat outputFormat, BibDatabaseContext databaseContext, BibEntryTypesManager entryTypesManager) {
-        return generateBibliographies(bibEntries, style, outputFormat, databaseContext, entryTypesManager);
+    public static List<String> generateBibliography(
+            List<BibEntry> bibEntries,
+            String style,
+            CitationStyleOutputFormat outputFormat,
+            BibDatabaseContext databaseContext,
+            BibEntryTypesManager entryTypesManager) {
+        return generateBibliographies(
+                bibEntries, style, outputFormat, databaseContext, entryTypesManager);
     }
 
-    public static Citation generateCitation(List<BibEntry> bibEntries, String style, CitationStyleOutputFormat outputFormat, BibDatabaseContext databaseContext, BibEntryTypesManager entryTypesManager) throws IOException {
-        return CSL_ADAPTER.makeCitation(bibEntries, style, outputFormat, databaseContext, entryTypesManager);
+    public static Citation generateCitation(
+            List<BibEntry> bibEntries,
+            String style,
+            CitationStyleOutputFormat outputFormat,
+            BibDatabaseContext databaseContext,
+            BibEntryTypesManager entryTypesManager)
+            throws IOException {
+        return CSL_ADAPTER.makeCitation(
+                bibEntries, style, outputFormat, databaseContext, entryTypesManager);
     }
 
     /**
@@ -62,23 +84,34 @@ public static Citation generateCitation(List<BibEntry> bibEntries, String style,
      *
      * @implNote The citations are generated using JavaScript which may take some time, better call it from outside the main thread.
      */
-    public static List<String> generateBibliographies(List<BibEntry> bibEntries, String style, CitationStyleOutputFormat outputFormat, BibDatabaseContext databaseContext, BibEntryTypesManager entryTypesManager) {
+    public static List<String> generateBibliographies(
+            List<BibEntry> bibEntries,
+            String style,
+            CitationStyleOutputFormat outputFormat,
+            BibDatabaseContext databaseContext,
+            BibEntryTypesManager entryTypesManager) {
         try {
-            return CSL_ADAPTER.makeBibliography(bibEntries, style, outputFormat, databaseContext, entryTypesManager);
+            return CSL_ADAPTER.makeBibliography(
+                    bibEntries, style, outputFormat, databaseContext, entryTypesManager);
         } catch (IllegalArgumentException e) {
-            LOGGER.error("Could not generate BibEntry citation. The CSL engine could not create a preview for your item.", e);
-            return Collections.singletonList(Localization.lang("Cannot generate preview based on selected citation style."));
+            LOGGER.error(
+                    "Could not generate BibEntry citation. The CSL engine could not create a preview for your item.",
+                    e);
+            return Collections.singletonList(
+                    Localization.lang("Cannot generate preview based on selected citation style."));
         } catch (IOException | ArrayIndexOutOfBoundsException e) {
             LOGGER.error("Could not generate BibEntry citation", e);
-            return Collections.singletonList(Localization.lang("Cannot generate preview based on selected citation style."));
+            return Collections.singletonList(
+                    Localization.lang("Cannot generate preview based on selected citation style."));
         } catch (TokenMgrException e) {
             LOGGER.error("Bad character inside BibEntry", e);
             // sadly one cannot easily retrieve the bad char from the TokenMgrError
-            return Collections.singletonList(Localization.lang("Cannot generate preview based on selected citation style.") +
-                    outputFormat.getLineSeparator() +
-                    Localization.lang("Bad character inside entry") +
-                    outputFormat.getLineSeparator() +
-                    e.getLocalizedMessage());
+            return Collections.singletonList(
+                    Localization.lang("Cannot generate preview based on selected citation style.")
+                            + outputFormat.getLineSeparator()
+                            + Localization.lang("Bad character inside entry")
+                            + outputFormat.getLineSeparator()
+                            + e.getLocalizedMessage());
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java b/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java
index 2c11793df424..5aade23c90a7 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java
@@ -3,7 +3,6 @@
 import org.jabref.logic.os.OS;
 
 public enum CitationStyleOutputFormat {
-
     HTML("html", OS.NEWLINE + "<br>" + OS.NEWLINE),
     TEXT("text", "");
 
diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStylePreviewLayout.java b/src/main/java/org/jabref/logic/citationstyle/CitationStylePreviewLayout.java
index 12feae5483e3..583cf8048ec5 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStylePreviewLayout.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStylePreviewLayout.java
@@ -1,24 +1,31 @@
 package org.jabref.logic.citationstyle;
 
-import java.util.List;
-
 import org.jabref.logic.preview.PreviewLayout;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 
+import java.util.List;
+
 public final class CitationStylePreviewLayout implements PreviewLayout {
     private final CitationStyle citationStyle;
     private final BibEntryTypesManager bibEntryTypesManager;
 
-    public CitationStylePreviewLayout(CitationStyle citationStyle, BibEntryTypesManager bibEntryTypesManager) {
+    public CitationStylePreviewLayout(
+            CitationStyle citationStyle, BibEntryTypesManager bibEntryTypesManager) {
         this.citationStyle = citationStyle;
         this.bibEntryTypesManager = bibEntryTypesManager;
     }
 
     @Override
     public String generatePreview(BibEntry entry, BibDatabaseContext databaseContext) {
-        return CitationStyleGenerator.generateBibliography(List.of(entry), citationStyle.getSource(), CitationStyleOutputFormat.HTML, databaseContext, bibEntryTypesManager).getFirst();
+        return CitationStyleGenerator.generateBibliography(
+                        List.of(entry),
+                        citationStyle.getSource(),
+                        CitationStyleOutputFormat.HTML,
+                        databaseContext,
+                        bibEntryTypesManager)
+                .getFirst();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java b/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
index 85b20dd3eecd..59e3ae927370 100644
--- a/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
+++ b/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
@@ -1,13 +1,9 @@
 package org.jabref.logic.citationstyle;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;
-import java.util.SequencedCollection;
-import java.util.stream.Collectors;
+import de.undercouch.citeproc.ItemDataProvider;
+import de.undercouch.citeproc.bibtex.BibTeXConverter;
+import de.undercouch.citeproc.csl.CSLItemData;
+import de.undercouch.citeproc.helper.json.StringJsonBuilderFactory;
 
 import org.jabref.logic.formatter.bibtexfields.RemoveNewlinesFormatter;
 import org.jabref.logic.integrity.PagesChecker;
@@ -21,15 +17,19 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.LatexToUnicodeAdapter;
-
-import de.undercouch.citeproc.ItemDataProvider;
-import de.undercouch.citeproc.bibtex.BibTeXConverter;
-import de.undercouch.citeproc.csl.CSLItemData;
-import de.undercouch.citeproc.helper.json.StringJsonBuilderFactory;
 import org.jbibtex.BibTeXEntry;
 import org.jbibtex.DigitStringValue;
 import org.jbibtex.Key;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.SequencedCollection;
+import java.util.stream.Collectors;
+
 /**
  * Custom {@link ItemDataProvider} that allows to set the data so that we don't have to instantiate a new CSL object
  * every time.
@@ -97,55 +97,70 @@ public JabRefItemDataProvider() {
      * </tbody>
      * </table>
      */
-    private CSLItemData bibEntryToCSLItemData(BibEntry originalBibEntry, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager) {
-        // We need to make a deep copy, because we modify the entry according to the logic presented at
+    private CSLItemData bibEntryToCSLItemData(
+            BibEntry originalBibEntry,
+            BibDatabaseContext bibDatabaseContext,
+            BibEntryTypesManager entryTypesManager) {
+        // We need to make a deep copy, because we modify the entry according to the logic presented
+        // at
         // https://github.com/JabRef/jabref/issues/8372#issuecomment-1014941935
         BibEntry bibEntry = (BibEntry) originalBibEntry.clone();
         String citeKey = bibEntry.getCitationKey().orElse("");
-        BibTeXEntry bibTeXEntry = new BibTeXEntry(new Key(bibEntry.getType().getName()), new Key(citeKey));
+        BibTeXEntry bibTeXEntry =
+                new BibTeXEntry(new Key(bibEntry.getType().getName()), new Key(citeKey));
 
         // Not every field is already generated into latex free fields
         RemoveNewlinesFormatter removeNewlinesFormatter = new RemoveNewlinesFormatter();
 
-        Optional<BibEntryType> entryType = entryTypesManager.enrich(bibEntry.getType(), bibDatabaseContext.getMode());
+        Optional<BibEntryType> entryType =
+                entryTypesManager.enrich(bibEntry.getType(), bibDatabaseContext.getMode());
 
         if (bibEntry.getType().equals(StandardEntryType.Article)) {
             // Patch bibEntry to contain the right BibTeX (not BibLaTeX) fields
-            // Note that we do not need to convert from "pages" to "page", because CiteProc already handles it
+            // Note that we do not need to convert from "pages" to "page", because CiteProc already
+            // handles it
             // See BibTeXConverter
             if (bibDatabaseContext.isBiblatexMode()) {
                 // Map "number" to CSL "issue", unless no number exists
                 Optional<String> numberField = bibEntry.getField(StandardField.NUMBER);
-                numberField.ifPresent(number -> {
+                numberField.ifPresent(
+                        number -> {
                             bibEntry.setField(StandardField.ISSUE, number);
                             bibEntry.clearField(StandardField.NUMBER);
-                        }
-                );
-
-                bibEntry.getField(StandardField.EID).ifPresent(eid -> {
-                    if (!bibEntry.hasField(StandardField.NUMBER)) {
-                        bibEntry.setField(StandardField.NUMBER, eid);
-                        bibEntry.clearField(StandardField.EID);
-                    }
-                });
+                        });
+
+                bibEntry.getField(StandardField.EID)
+                        .ifPresent(
+                                eid -> {
+                                    if (!bibEntry.hasField(StandardField.NUMBER)) {
+                                        bibEntry.setField(StandardField.NUMBER, eid);
+                                        bibEntry.clearField(StandardField.EID);
+                                    }
+                                });
             } else {
                 // BibTeX mode
-                bibEntry.getField(StandardField.NUMBER).ifPresent(number -> {
-                    bibEntry.setField(StandardField.ISSUE, number);
-                    bibEntry.clearField(StandardField.NUMBER);
-                });
-                bibEntry.getField(StandardField.PAGES).ifPresent(pages -> {
-                    if (pages.toLowerCase(Locale.ROOT).startsWith("article ")) {
-                        pages = pages.substring("Article ".length());
-                        bibEntry.setField(StandardField.NUMBER, pages);
-                    }
-                });
-                bibEntry.getField(StandardField.EID).ifPresent(eid -> {
-                    if (!bibEntry.hasField(StandardField.PAGES)) {
-                        bibEntry.setField(StandardField.PAGES, eid);
-                        bibEntry.clearField(StandardField.EID);
-                    }
-                });
+                bibEntry.getField(StandardField.NUMBER)
+                        .ifPresent(
+                                number -> {
+                                    bibEntry.setField(StandardField.ISSUE, number);
+                                    bibEntry.clearField(StandardField.NUMBER);
+                                });
+                bibEntry.getField(StandardField.PAGES)
+                        .ifPresent(
+                                pages -> {
+                                    if (pages.toLowerCase(Locale.ROOT).startsWith("article ")) {
+                                        pages = pages.substring("Article ".length());
+                                        bibEntry.setField(StandardField.NUMBER, pages);
+                                    }
+                                });
+                bibEntry.getField(StandardField.EID)
+                        .ifPresent(
+                                eid -> {
+                                    if (!bibEntry.hasField(StandardField.PAGES)) {
+                                        bibEntry.setField(StandardField.PAGES, eid);
+                                        bibEntry.clearField(StandardField.EID);
+                                    }
+                                });
             }
         }
 
@@ -160,13 +175,19 @@ private CSLItemData bibEntryToCSLItemData(BibEntry originalBibEntry, BibDatabase
             bibEntry.getResolvedFieldOrAlias(key, bibDatabaseContext.getDatabase())
                     .map(removeNewlinesFormatter::format)
                     .map(LatexToUnicodeAdapter::format)
-                    .ifPresent(value -> {
-                        if (StandardField.MONTH == key) {
-                            // Change month from #mon# to mon because CSL does not support the former format
-                            value = bibEntry.getMonth().map(Month::getShortName).orElse(value);
-                        }
-                        bibTeXEntry.addField(new Key(key.getName()), new DigitStringValue(value));
-                    });
+                    .ifPresent(
+                            value -> {
+                                if (StandardField.MONTH == key) {
+                                    // Change month from #mon# to mon because CSL does not support
+                                    // the former format
+                                    value =
+                                            bibEntry.getMonth()
+                                                    .map(Month::getShortName)
+                                                    .orElse(value);
+                                }
+                                bibTeXEntry.addField(
+                                        new Key(key.getName()), new DigitStringValue(value));
+                            });
         }
         return BIBTEX_CONVERTER.toItemData(bibTeXEntry);
     }
@@ -174,17 +195,22 @@ private CSLItemData bibEntryToCSLItemData(BibEntry originalBibEntry, BibDatabase
     /**
      * Fills the data with all entries in given bibDatabaseContext
      */
-    public void setData(BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager) {
+    public void setData(
+            BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager) {
         this.setData(bibDatabaseContext.getEntries(), bibDatabaseContext, entryTypesManager);
     }
 
-    public void setData(List<BibEntry> data, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager) {
+    public void setData(
+            List<BibEntry> data,
+            BibDatabaseContext bibDatabaseContext,
+            BibEntryTypesManager entryTypesManager) {
         this.data.clear();
         this.data.addAll(data);
         this.bibDatabaseContext = bibDatabaseContext;
         this.entryTypesManager = entryTypesManager;
 
-        // Quick solution to always use BibLaTeX mode at the checker to allow pages ranges with single dash, too
+        // Quick solution to always use BibLaTeX mode at the checker to allow pages ranges with
+        // single dash, too
         // Example: pages = {1-2}
         BibDatabaseContext ctx = new BibDatabaseContext();
         ctx.setMode(BibDatabaseMode.BIBLATEX);
@@ -194,25 +220,24 @@ public void setData(List<BibEntry> data, BibDatabaseContext bibDatabaseContext,
     @Override
     public CSLItemData retrieveItem(String id) {
         return data.stream()
-                   .filter(entry -> entry.getCitationKey().orElse("").equals(id))
-                   .map(entry -> bibEntryToCSLItemData(entry, bibDatabaseContext, entryTypesManager))
-                   .findFirst().orElse(null);
+                .filter(entry -> entry.getCitationKey().orElse("").equals(id))
+                .map(entry -> bibEntryToCSLItemData(entry, bibDatabaseContext, entryTypesManager))
+                .findFirst()
+                .orElse(null);
     }
 
     @Override
     public Collection<String> getIds() {
-        return data.stream()
-                   .map(entry -> entry.getCitationKey().orElse(""))
-                   .toList();
+        return data.stream().map(entry -> entry.getCitationKey().orElse("")).toList();
     }
 
     public String toJson() {
         List<BibEntry> entries = bibDatabaseContext.getEntries();
         this.setData(entries, bibDatabaseContext, entryTypesManager);
         return entries.stream()
-                      .map(entry -> bibEntryToCSLItemData(entry, bibDatabaseContext, entryTypesManager))
-                      .map(item -> item.toJson(stringJsonBuilderFactory.createJsonBuilder()))
-                      .map(String.class::cast)
-                      .collect(Collectors.joining(",", "[", "]"));
+                .map(entry -> bibEntryToCSLItemData(entry, bibDatabaseContext, entryTypesManager))
+                .map(item -> item.toJson(stringJsonBuilderFactory.createJsonBuilder()))
+                .map(String.class::cast)
+                .collect(Collectors.joining(",", "[", "]"));
     }
 }
diff --git a/src/main/java/org/jabref/logic/citationstyle/JabRefLocaleProvider.java b/src/main/java/org/jabref/logic/citationstyle/JabRefLocaleProvider.java
index 7698c1f509d4..e6392715d5c2 100644
--- a/src/main/java/org/jabref/logic/citationstyle/JabRefLocaleProvider.java
+++ b/src/main/java/org/jabref/logic/citationstyle/JabRefLocaleProvider.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.citationstyle;
 
+import de.undercouch.citeproc.LocaleProvider;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
@@ -7,10 +12,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import de.undercouch.citeproc.LocaleProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * A {@link LocaleProvider} that loads locales from a directory in the current module.
  * <p>
@@ -26,16 +27,21 @@ public class JabRefLocaleProvider implements LocaleProvider {
 
     @Override
     public String retrieveLocale(String lang) {
-        return locales.computeIfAbsent(lang, locale -> {
-            try (InputStream inputStream = getClass().getResourceAsStream(LOCALES_ROOT + "/locales-" + locale + ".xml")) {
-                if (inputStream == null) {
-                    throw new IllegalArgumentException("Unable to load locale " + locale);
-                }
-                return new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
-            } catch (IOException e) {
-                LOGGER.error("failed to read locale {}", locale, e);
-                throw new UncheckedIOException("failed to read locale " + locale, e);
-            }
-        });
+        return locales.computeIfAbsent(
+                lang,
+                locale -> {
+                    try (InputStream inputStream =
+                            getClass()
+                                    .getResourceAsStream(
+                                            LOCALES_ROOT + "/locales-" + locale + ".xml")) {
+                        if (inputStream == null) {
+                            throw new IllegalArgumentException("Unable to load locale " + locale);
+                        }
+                        return new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
+                    } catch (IOException e) {
+                        LOGGER.error("failed to read locale {}", locale, e);
+                        throw new UncheckedIOException("failed to read locale " + locale, e);
+                    }
+                });
     }
 }
diff --git a/src/main/java/org/jabref/logic/cleanup/CleanupJob.java b/src/main/java/org/jabref/logic/cleanup/CleanupJob.java
index a36f12a2408c..c74d9a445341 100644
--- a/src/main/java/org/jabref/logic/cleanup/CleanupJob.java
+++ b/src/main/java/org/jabref/logic/cleanup/CleanupJob.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.cleanup;
 
-import java.util.List;
-
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 
+import java.util.List;
+
 @FunctionalInterface
 public interface CleanupJob {
 
diff --git a/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java b/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java
index cda23a6d57fb..cb4cb6d5f3c5 100644
--- a/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java
+++ b/src/main/java/org/jabref/logic/cleanup/CleanupPreferences.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.cleanup;
 
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.Set;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
 
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.Set;
+
 public class CleanupPreferences {
 
     private final ObservableSet<CleanupStep> activeJobs;
@@ -26,7 +26,8 @@ public CleanupPreferences(FieldFormatterCleanups formatterCleanups) {
         this(EnumSet.noneOf(CleanupStep.class), formatterCleanups);
     }
 
-    public CleanupPreferences(EnumSet<CleanupStep> activeJobs, FieldFormatterCleanups formatterCleanups) {
+    public CleanupPreferences(
+            EnumSet<CleanupStep> activeJobs, FieldFormatterCleanups formatterCleanups) {
         this.activeJobs = FXCollections.observableSet(activeJobs);
         this.fieldFormatterCleanups = new SimpleObjectProperty<>(formatterCleanups);
     }
diff --git a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
index e9b01ad70810..deaf10666108 100644
--- a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
+++ b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
@@ -1,22 +1,25 @@
 package org.jabref.logic.cleanup;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 public class CleanupWorker {
 
     private final BibDatabaseContext databaseContext;
     private final FilePreferences filePreferences;
     private final TimestampPreferences timestampPreferences;
 
-    public CleanupWorker(BibDatabaseContext databaseContext, FilePreferences filePreferences, TimestampPreferences timestampPreferences) {
+    public CleanupWorker(
+            BibDatabaseContext databaseContext,
+            FilePreferences filePreferences,
+            TimestampPreferences timestampPreferences) {
         this.databaseContext = databaseContext;
         this.filePreferences = filePreferences;
         this.timestampPreferences = timestampPreferences;
@@ -52,38 +55,26 @@ private List<CleanupJob> determineCleanupActions(CleanupPreferences preset) {
 
     private CleanupJob toJob(CleanupPreferences.CleanupStep action) {
         return switch (action) {
-            case CLEAN_UP_DOI ->
-                    new DoiCleanup();
-            case CLEANUP_EPRINT ->
-                    new EprintCleanup();
-            case CLEAN_UP_URL ->
-                    new URLCleanup();
-            case MAKE_PATHS_RELATIVE ->
-                    new RelativePathsCleanup(databaseContext, filePreferences);
-            case RENAME_PDF ->
-                    new RenamePdfCleanup(false, databaseContext, filePreferences);
+            case CLEAN_UP_DOI -> new DoiCleanup();
+            case CLEANUP_EPRINT -> new EprintCleanup();
+            case CLEAN_UP_URL -> new URLCleanup();
+            case MAKE_PATHS_RELATIVE -> new RelativePathsCleanup(databaseContext, filePreferences);
+            case RENAME_PDF -> new RenamePdfCleanup(false, databaseContext, filePreferences);
             case RENAME_PDF_ONLY_RELATIVE_PATHS ->
                     new RenamePdfCleanup(true, databaseContext, filePreferences);
-            case CLEAN_UP_UPGRADE_EXTERNAL_LINKS ->
-                    new UpgradePdfPsToFileCleanup();
+            case CLEAN_UP_UPGRADE_EXTERNAL_LINKS -> new UpgradePdfPsToFileCleanup();
             case CLEAN_UP_DELETED_LINKED_FILES ->
                     new RemoveLinksToNotExistentFiles(databaseContext, filePreferences);
-            case CONVERT_TO_BIBLATEX ->
-                    new ConvertToBiblatexCleanup();
-            case CONVERT_TO_BIBTEX ->
-                    new ConvertToBibtexCleanup();
+            case CONVERT_TO_BIBLATEX -> new ConvertToBiblatexCleanup();
+            case CONVERT_TO_BIBTEX -> new ConvertToBibtexCleanup();
             case CONVERT_TIMESTAMP_TO_CREATIONDATE ->
                     new TimeStampToCreationDate(timestampPreferences);
             case CONVERT_TIMESTAMP_TO_MODIFICATIONDATE ->
                     new TimeStampToModificationDate(timestampPreferences);
-            case MOVE_PDF ->
-                    new MoveFilesCleanup(databaseContext, filePreferences);
-            case FIX_FILE_LINKS ->
-                    new FileLinksCleanup();
-            case CLEAN_UP_ISSN ->
-                    new ISSNCleanup();
-            default ->
-                    throw new UnsupportedOperationException(action.name());
+            case MOVE_PDF -> new MoveFilesCleanup(databaseContext, filePreferences);
+            case FIX_FILE_LINKS -> new FileLinksCleanup();
+            case CLEAN_UP_ISSN -> new ISSNCleanup();
+            default -> throw new UnsupportedOperationException(action.name());
         };
     }
 }
diff --git a/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java b/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java
index 19a54049cc31..36eb65ff6378 100644
--- a/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java
@@ -1,10 +1,5 @@
 package org.jabref.logic.cleanup;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Date;
@@ -13,6 +8,11 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
 /**
  * Converts the entry to biblatex format.
  */
@@ -21,37 +21,49 @@ public class ConvertToBiblatexCleanup implements CleanupJob {
     @Override
     public List<FieldChange> cleanup(BibEntry entry) {
         List<FieldChange> changes = new ArrayList<>();
-        for (Map.Entry<Field, Field> alias : EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.entrySet()) {
+        for (Map.Entry<Field, Field> alias :
+                EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.entrySet()) {
             Field oldField = alias.getKey();
             Field newField = alias.getValue();
-            entry.getField(oldField).ifPresent(oldValue -> {
-                if (!oldValue.isEmpty() && (entry.getField(newField).isEmpty())) {
-                    // There is content in the old field and no value in the new, so just copy
-                    entry.setField(newField, oldValue).ifPresent(changes::add);
-                    entry.clearField(oldField).ifPresent(changes::add);
-                }
-            });
+            entry.getField(oldField)
+                    .ifPresent(
+                            oldValue -> {
+                                if (!oldValue.isEmpty() && (entry.getField(newField).isEmpty())) {
+                                    // There is content in the old field and no value in the new, so
+                                    // just copy
+                                    entry.setField(newField, oldValue).ifPresent(changes::add);
+                                    entry.clearField(oldField).ifPresent(changes::add);
+                                }
+                            });
         }
         // Dates: create date out of year and month, save it and delete old fields
         // If there already exists a non blank/empty value for the field date, it is not overwritten
         if (StringUtil.isBlank(entry.getField(StandardField.DATE))) {
-            entry.getFieldOrAlias(StandardField.DATE).ifPresent(newDate -> {
-                entry.setField(StandardField.DATE, newDate).ifPresent(changes::add);
-                entry.clearField(StandardField.YEAR).ifPresent(changes::add);
-                entry.clearField(StandardField.MONTH).ifPresent(changes::add);
-            });
+            entry.getFieldOrAlias(StandardField.DATE)
+                    .ifPresent(
+                            newDate -> {
+                                entry.setField(StandardField.DATE, newDate).ifPresent(changes::add);
+                                entry.clearField(StandardField.YEAR).ifPresent(changes::add);
+                                entry.clearField(StandardField.MONTH).ifPresent(changes::add);
+                            });
         } else {
-            // If the year from date field is filled and equal to year it should be removed the year field
-            entry.getFieldOrAlias(StandardField.DATE).ifPresent(date -> {
-                Optional<Date> newDate = Date.parse(date);
-                Optional<Date> checkDate = Date.parse(entry.getFieldOrAlias(StandardField.YEAR),
-                        entry.getFieldOrAlias(StandardField.MONTH), Optional.empty());
+            // If the year from date field is filled and equal to year it should be removed the year
+            // field
+            entry.getFieldOrAlias(StandardField.DATE)
+                    .ifPresent(
+                            date -> {
+                                Optional<Date> newDate = Date.parse(date);
+                                Optional<Date> checkDate =
+                                        Date.parse(
+                                                entry.getFieldOrAlias(StandardField.YEAR),
+                                                entry.getFieldOrAlias(StandardField.MONTH),
+                                                Optional.empty());
 
-                if (checkDate.equals(newDate)) {
-                    entry.clearField(StandardField.YEAR).ifPresent(changes::add);
-                    entry.clearField(StandardField.MONTH).ifPresent(changes::add);
-                }
-            });
+                                if (checkDate.equals(newDate)) {
+                                    entry.clearField(StandardField.YEAR).ifPresent(changes::add);
+                                    entry.clearField(StandardField.MONTH).ifPresent(changes::add);
+                                }
+                            });
         }
         return changes;
     }
diff --git a/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java b/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java
index a4e6a5e64d14..970dc9b36d26 100644
--- a/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java
@@ -1,9 +1,5 @@
 package org.jabref.logic.cleanup;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.EntryConverter;
@@ -11,6 +7,10 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Converts the entry to biblatex format.
  */
@@ -22,30 +22,48 @@ public List<FieldChange> cleanup(BibEntry entry) {
 
         // Dates: get date and fill year and month
         // If there already exists a non blank/empty value for the field, then it is not overwritten
-        entry.getPublicationDate().ifPresent(date -> {
-            if (StringUtil.isBlank(entry.getField(StandardField.YEAR))) {
-                date.getYear().flatMap(year -> entry.setField(StandardField.YEAR, year.toString())).ifPresent(changes::add);
-            }
+        entry.getPublicationDate()
+                .ifPresent(
+                        date -> {
+                            if (StringUtil.isBlank(entry.getField(StandardField.YEAR))) {
+                                date.getYear()
+                                        .flatMap(
+                                                year ->
+                                                        entry.setField(
+                                                                StandardField.YEAR,
+                                                                year.toString()))
+                                        .ifPresent(changes::add);
+                            }
 
-            if (StringUtil.isBlank(entry.getField(StandardField.MONTH))) {
-                date.getMonth().flatMap(month -> entry.setField(StandardField.MONTH, month.getJabRefFormat())).ifPresent(changes::add);
-            }
+                            if (StringUtil.isBlank(entry.getField(StandardField.MONTH))) {
+                                date.getMonth()
+                                        .flatMap(
+                                                month ->
+                                                        entry.setField(
+                                                                StandardField.MONTH,
+                                                                month.getJabRefFormat()))
+                                        .ifPresent(changes::add);
+                            }
 
-            if (!changes.isEmpty()) {
-                entry.clearField(StandardField.DATE).ifPresent(changes::add);
-            }
-        });
+                            if (!changes.isEmpty()) {
+                                entry.clearField(StandardField.DATE).ifPresent(changes::add);
+                            }
+                        });
 
-        for (Map.Entry<Field, Field> alias : EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.entrySet()) {
+        for (Map.Entry<Field, Field> alias :
+                EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.entrySet()) {
             Field oldField = alias.getValue();
             Field newField = alias.getKey();
-            entry.getField(oldField).ifPresent(oldValue -> {
-                if (!oldValue.isEmpty() && (entry.getField(newField).isEmpty())) {
-                    // There is content in the old field and no value in the new, so just copy
-                    entry.setField(newField, oldValue).ifPresent(changes::add);
-                    entry.clearField(oldField).ifPresent(changes::add);
-                }
-            });
+            entry.getField(oldField)
+                    .ifPresent(
+                            oldValue -> {
+                                if (!oldValue.isEmpty() && (entry.getField(newField).isEmpty())) {
+                                    // There is content in the old field and no value in the new, so
+                                    // just copy
+                                    entry.setField(newField, oldValue).ifPresent(changes::add);
+                                    entry.clearField(oldField).ifPresent(changes::add);
+                                }
+                            });
         }
         return changes;
     }
diff --git a/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java b/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java
index 1cb3f2d04e3f..d6a05464e75b 100644
--- a/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java
@@ -1,12 +1,5 @@
 package org.jabref.logic.cleanup;
 
-import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.logic.formatter.bibtexfields.ClearFormatter;
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
@@ -16,6 +9,13 @@
 import org.jabref.model.entry.identifier.ArXivIdentifier;
 import org.jabref.model.entry.identifier.DOI;
 
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * Formats the DOI (e.g. removes http part) and also infers DOIs from the note, url, eprint or ee fields.
  */
@@ -24,8 +24,12 @@ public class DoiCleanup implements CleanupJob {
     /**
      * Fields to check for DOIs.
      */
-    private static final List<Field> FIELDS = Arrays.asList(StandardField.NOTE, StandardField.URL, StandardField.EPRINT,
-            new UnknownField("ee"));
+    private static final List<Field> FIELDS =
+            Arrays.asList(
+                    StandardField.NOTE,
+                    StandardField.URL,
+                    StandardField.EPRINT,
+                    new UnknownField("ee"));
 
     @Override
     public List<FieldChange> cleanup(BibEntry entry) {
@@ -46,14 +50,16 @@ public List<FieldChange> cleanup(BibEntry entry) {
                 if (!doiFieldValue.equals(newValue)) {
                     entry.setField(StandardField.DOI, newValue);
 
-                    FieldChange change = new FieldChange(entry, StandardField.DOI, doiFieldValue, newValue);
+                    FieldChange change =
+                            new FieldChange(entry, StandardField.DOI, doiFieldValue, newValue);
                     changes.add(change);
                 }
 
                 // Doi field seems to contain Doi -> cleanup note, url, ee field
                 for (Field field : FIELDS) {
-                    entry.getField(field).flatMap(DOI::parse)
-                         .ifPresent(unused -> removeFieldValue(entry, field, changes));
+                    entry.getField(field)
+                            .flatMap(DOI::parse)
+                            .ifPresent(unused -> removeFieldValue(entry, field, changes));
                 }
             }
         } else {
@@ -65,18 +71,23 @@ public List<FieldChange> cleanup(BibEntry entry) {
 
                 if (doi.isPresent()) {
                     // Update Doi
-                    Optional<FieldChange> change = entry.setField(StandardField.DOI, doi.get().getDOI());
+                    Optional<FieldChange> change =
+                            entry.setField(StandardField.DOI, doi.get().getDOI());
                     change.ifPresent(changes::add);
                     removeFieldValue(entry, field, changes);
                 }
 
                 if (StandardField.EPRINT == field) {
-                    fieldContentOpt.flatMap(ArXivIdentifier::parse)
-                                   .flatMap(ArXivIdentifier::inferDOI)
-                                   .ifPresent(inferredDoi -> {
-                                       Optional<FieldChange> change = entry.setField(StandardField.DOI, inferredDoi.getDOI());
-                                       change.ifPresent(changes::add);
-                                   });
+                    fieldContentOpt
+                            .flatMap(ArXivIdentifier::parse)
+                            .flatMap(ArXivIdentifier::inferDOI)
+                            .ifPresent(
+                                    inferredDoi -> {
+                                        Optional<FieldChange> change =
+                                                entry.setField(
+                                                        StandardField.DOI, inferredDoi.getDOI());
+                                        change.ifPresent(changes::add);
+                                    });
                 }
             }
         }
diff --git a/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java b/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java
index abc56b9db6ac..963e9730f19a 100644
--- a/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java
@@ -1,16 +1,16 @@
 package org.jabref.logic.cleanup;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.ArXivIdentifier;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * Formats the DOI (e.g. removes http part) and also moves DOIs from note, url or ee field to the doi field.
  *
@@ -25,8 +25,15 @@ public List<FieldChange> cleanup(BibEntry entry) {
         Optional<String> version = entry.getField(StandardField.VERSION);
         Optional<String> institution = entry.getField(StandardField.INSTITUTION);
 
-        for (Field field : Arrays.asList(StandardField.URL, StandardField.JOURNAL, StandardField.JOURNALTITLE, StandardField.NOTE, StandardField.EID)) {
-            Optional<ArXivIdentifier> arXivIdentifier = entry.getField(field).flatMap(ArXivIdentifier::parse);
+        for (Field field :
+                Arrays.asList(
+                        StandardField.URL,
+                        StandardField.JOURNAL,
+                        StandardField.JOURNALTITLE,
+                        StandardField.NOTE,
+                        StandardField.EID)) {
+            Optional<ArXivIdentifier> arXivIdentifier =
+                    entry.getField(field).flatMap(ArXivIdentifier::parse);
 
             if (arXivIdentifier.isPresent()) {
                 String normalizedEprint = arXivIdentifier.get().getNormalized();
@@ -36,28 +43,26 @@ public List<FieldChange> cleanup(BibEntry entry) {
                 }
 
                 if (institution.isPresent() && "arxiv".equalsIgnoreCase(institution.get())) {
-                    entry.clearField(StandardField.INSTITUTION)
-                         .ifPresent(changes::add);
+                    entry.clearField(StandardField.INSTITUTION).ifPresent(changes::add);
                 }
 
-                entry.setField(StandardField.EPRINT, normalizedEprint)
-                     .ifPresent(changes::add);
+                entry.setField(StandardField.EPRINT, normalizedEprint).ifPresent(changes::add);
 
-                entry.setField(StandardField.EPRINTTYPE, "arxiv")
-                     .ifPresent(changes::add);
+                entry.setField(StandardField.EPRINTTYPE, "arxiv").ifPresent(changes::add);
 
-                arXivIdentifier.get().getClassification().ifPresent(classification ->
-                        entry.setField(StandardField.EPRINTCLASS, classification)
-                             .ifPresent(changes::add)
-                );
+                arXivIdentifier
+                        .get()
+                        .getClassification()
+                        .ifPresent(
+                                classification ->
+                                        entry.setField(StandardField.EPRINTCLASS, classification)
+                                                .ifPresent(changes::add));
 
-                entry.clearField(field)
-                     .ifPresent(changes::add);
+                entry.clearField(field).ifPresent(changes::add);
 
                 if (field.equals(StandardField.URL)) {
                     // If we clear the URL field, we should also clear the URL-date field
-                    entry.clearField(StandardField.URLDATE)
-                         .ifPresent(changes::add);
+                    entry.clearField(StandardField.URLDATE).ifPresent(changes::add);
                 }
             }
         }
diff --git a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
index 3528cdc5df94..2f2adf1aecb1 100644
--- a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
@@ -1,11 +1,5 @@
 package org.jabref.logic.cleanup;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.event.EntriesEventSource;
@@ -13,6 +7,12 @@
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.InternalField;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
 /**
  * Formats a given entry field with the specified formatter.
  */
diff --git a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
index 6b5d2d587d81..bdc200799bc9 100644
--- a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
+++ b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
@@ -1,16 +1,5 @@
 package org.jabref.logic.cleanup;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.StringJoiner;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.formatter.Formatters;
 import org.jabref.logic.formatter.IdentityFormatter;
 import org.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;
@@ -29,10 +18,20 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.StringJoiner;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class FieldFormatterCleanups {
 
     public static final List<FieldFormatterCleanup> DEFAULT_SAVE_ACTIONS;
@@ -55,27 +54,47 @@ public class FieldFormatterCleanups {
      * <p>
      * Example: <code>pages[normalize_page_numbers]title[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]</code>
      */
-    private static final Pattern FIELD_FORMATTER_CLEANUP_PATTERN = Pattern.compile("([^\\[]+)\\[([^]]+)]");
+    private static final Pattern FIELD_FORMATTER_CLEANUP_PATTERN =
+            Pattern.compile("([^\\[]+)\\[([^]]+)]");
 
     static {
-        DEFAULT_SAVE_ACTIONS = List.of(
-                new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter()),
-                new FieldFormatterCleanup(StandardField.DATE, new NormalizeDateFormatter()),
-                new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter()),
-                new FieldFormatterCleanup(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD, new ReplaceUnicodeLigaturesFormatter()));
-
-        List<FieldFormatterCleanup> recommendedBibtexFormatters = new ArrayList<>(DEFAULT_SAVE_ACTIONS);
-        recommendedBibtexFormatters.addAll(List.of(
-                new FieldFormatterCleanup(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD, new HtmlToLatexFormatter()),
-                new FieldFormatterCleanup(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD, new UnicodeToLatexFormatter()),
-                new FieldFormatterCleanup(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD, new OrdinalsToSuperscriptFormatter())));
+        DEFAULT_SAVE_ACTIONS =
+                List.of(
+                        new FieldFormatterCleanup(
+                                StandardField.PAGES, new NormalizePagesFormatter()),
+                        new FieldFormatterCleanup(StandardField.DATE, new NormalizeDateFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.MONTH, new NormalizeMonthFormatter()),
+                        new FieldFormatterCleanup(
+                                InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD,
+                                new ReplaceUnicodeLigaturesFormatter()));
+
+        List<FieldFormatterCleanup> recommendedBibtexFormatters =
+                new ArrayList<>(DEFAULT_SAVE_ACTIONS);
+        recommendedBibtexFormatters.addAll(
+                List.of(
+                        new FieldFormatterCleanup(
+                                InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD,
+                                new HtmlToLatexFormatter()),
+                        new FieldFormatterCleanup(
+                                InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD,
+                                new UnicodeToLatexFormatter()),
+                        new FieldFormatterCleanup(
+                                InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD,
+                                new OrdinalsToSuperscriptFormatter())));
         RECOMMEND_BIBTEX_ACTIONS = Collections.unmodifiableList(recommendedBibtexFormatters);
 
-        List<FieldFormatterCleanup> recommendedBiblatexFormatters = new ArrayList<>(DEFAULT_SAVE_ACTIONS);
-        recommendedBiblatexFormatters.addAll(List.of(
-                new FieldFormatterCleanup(StandardField.TITLE, new HtmlToUnicodeFormatter()),
-                new FieldFormatterCleanup(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD, new LatexToUnicodeFormatter())));
-        // DO NOT ADD OrdinalsToSuperscriptFormatter here, because this causes issues. See https://github.com/JabRef/jabref/issues/2596.
+        List<FieldFormatterCleanup> recommendedBiblatexFormatters =
+                new ArrayList<>(DEFAULT_SAVE_ACTIONS);
+        recommendedBiblatexFormatters.addAll(
+                List.of(
+                        new FieldFormatterCleanup(
+                                StandardField.TITLE, new HtmlToUnicodeFormatter()),
+                        new FieldFormatterCleanup(
+                                InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD,
+                                new LatexToUnicodeFormatter())));
+        // DO NOT ADD OrdinalsToSuperscriptFormatter here, because this causes issues. See
+        // https://github.com/JabRef/jabref/issues/2596.
         RECOMMEND_BIBLATEX_ACTIONS = Collections.unmodifiableList(recommendedBiblatexFormatters);
     }
 
@@ -90,7 +109,8 @@ public FieldFormatterCleanups(boolean enabled, List<FieldFormatterCleanup> actio
     /**
      * Note: String parsing is done at {@link FieldFormatterCleanups#parse(String)}
      */
-    public static String getMetaDataString(List<FieldFormatterCleanup> actionList, String newLineSeparator) {
+    public static String getMetaDataString(
+            List<FieldFormatterCleanup> actionList, String newLineSeparator) {
         // First, group all formatters by the field for which they apply
         // Order of the list should be kept
         Map<Field, List<String>> groupedByField = new LinkedHashMap<>();
@@ -163,26 +183,28 @@ public static List<FieldFormatterCleanup> parse(String formatterString) {
 
             String fieldString = matcher.group(2);
 
-            List<FieldFormatterCleanup> fieldFormatterCleanups = Arrays.stream(fieldString.split(","))
-                                                                       .map(FieldFormatterCleanups::getFormatterFromString)
-                                                                       .map(formatter -> new FieldFormatterCleanup(field, formatter))
-                                                                       .toList();
+            List<FieldFormatterCleanup> fieldFormatterCleanups =
+                    Arrays.stream(fieldString.split(","))
+                            .map(FieldFormatterCleanups::getFormatterFromString)
+                            .map(formatter -> new FieldFormatterCleanup(field, formatter))
+                            .toList();
             result.addAll(fieldFormatterCleanups);
         }
         return result;
     }
 
     static Formatter getFormatterFromString(String formatterName) {
-        return Formatters
-                .getFormatterForKey(formatterName)
-                .orElseGet(() -> {
-                    if (!"identity".equals(formatterName)) {
-                        // The identity formatter is not listed in the formatters list, but is still valid
-                        // Therefore, we log errors in other cases only
-                        LOGGER.info("Formatter {} not found.", formatterName);
-                    }
-                    return new IdentityFormatter();
-                });
+        return Formatters.getFormatterForKey(formatterName)
+                .orElseGet(
+                        () -> {
+                            if (!"identity".equals(formatterName)) {
+                                // The identity formatter is not listed in the formatters list, but
+                                // is still valid
+                                // Therefore, we log errors in other cases only
+                                LOGGER.info("Formatter {} not found.", formatterName);
+                            }
+                            return new IdentityFormatter();
+                        });
     }
 
     @Override
@@ -203,9 +225,6 @@ public boolean equals(Object obj) {
 
     @Override
     public String toString() {
-        return "FieldFormatterCleanups{" +
-                "enabled=" + enabled + "," +
-                "actions=" + actions +
-                "}";
+        return "FieldFormatterCleanups{" + "enabled=" + enabled + "," + "actions=" + actions + "}";
     }
 }
diff --git a/src/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java b/src/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java
index 5e89cacbbecc..0a582de4e3bf 100644
--- a/src/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java
@@ -1,15 +1,15 @@
 package org.jabref.logic.cleanup;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.logic.bibtex.FileFieldWriter;
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * Fixes the format of the file field. For example, if the file link is empty but the description wrongly contains the path.
  */
@@ -24,11 +24,13 @@ public List<FieldChange> cleanup(BibEntry entry) {
 
         List<LinkedFile> fileList = entry.getFiles();
 
-        // Parsing automatically moves a single description to link, so we just need to write the fileList back again
+        // Parsing automatically moves a single description to link, so we just need to write the
+        // fileList back again
         String newValue = FileFieldWriter.getStringRepresentation(fileList);
         if (!oldValue.get().equals(newValue)) {
             entry.setField(StandardField.FILE, newValue);
-            FieldChange change = new FieldChange(entry, StandardField.FILE, oldValue.get(), newValue);
+            FieldChange change =
+                    new FieldChange(entry, StandardField.FILE, oldValue.get(), newValue);
             return Collections.singletonList(change);
         }
         return Collections.emptyList();
diff --git a/src/main/java/org/jabref/logic/cleanup/ISSNCleanup.java b/src/main/java/org/jabref/logic/cleanup/ISSNCleanup.java
index e703c296c75d..bab2871babc2 100644
--- a/src/main/java/org/jabref/logic/cleanup/ISSNCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/ISSNCleanup.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.cleanup;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.ISSN;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
 public class ISSNCleanup implements CleanupJob {
 
     @Override
@@ -21,7 +21,8 @@ public List<FieldChange> cleanup(BibEntry entry) {
         ISSN issn = new ISSN(issnString.get());
         if (issn.isCanBeCleaned()) {
             String newValue = issn.getCleanedISSN();
-            FieldChange change = new FieldChange(entry, StandardField.ISSN, issnString.get(), newValue);
+            FieldChange change =
+                    new FieldChange(entry, StandardField.ISSN, issnString.get(), newValue);
             entry.setField(StandardField.ISSN, newValue);
             return Collections.singletonList(change);
         }
diff --git a/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java b/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java
index 86b04f816f2f..c95538c2e49f 100644
--- a/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.cleanup;
 
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.util.OptionalUtil;
 
+import java.util.List;
+import java.util.Optional;
+
 /**
  * Moves the content of one field to another field.
  */
@@ -23,8 +23,8 @@ public MoveFieldCleanup(Field sourceField, Field targetField) {
 
     @Override
     public List<FieldChange> cleanup(BibEntry entry) {
-        Optional<FieldChange> setFieldChange = entry.getField(sourceField).flatMap(
-                value -> entry.setField(targetField, value));
+        Optional<FieldChange> setFieldChange =
+                entry.getField(sourceField).flatMap(value -> entry.setField(targetField, value));
         Optional<FieldChange> clearFieldChange = entry.clearField(sourceField);
         return OptionalUtil.toList(setFieldChange, clearFieldChange);
     }
diff --git a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
index c05a5c1a807e..dbb7ee6b6a0f 100644
--- a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
@@ -1,11 +1,5 @@
 package org.jabref.logic.cleanup;
 
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.externalfiles.LinkedFileHandler;
 import org.jabref.model.FieldChange;
@@ -13,10 +7,15 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.OptionalUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 public class MoveFilesCleanup implements CleanupJob {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MoveFilesCleanup.class);
@@ -35,7 +34,8 @@ public List<FieldChange> cleanup(BibEntry entry) {
 
         boolean changed = false;
         for (LinkedFile file : files) {
-            LinkedFileHandler fileHandler = new LinkedFileHandler(file, entry, databaseContext, filePreferences);
+            LinkedFileHandler fileHandler =
+                    new LinkedFileHandler(file, entry, databaseContext, filePreferences);
             try {
                 boolean fileChanged = fileHandler.moveToDefaultDirectory();
                 if (fileChanged) {
diff --git a/src/main/java/org/jabref/logic/cleanup/NormalizeWhitespacesCleanup.java b/src/main/java/org/jabref/logic/cleanup/NormalizeWhitespacesCleanup.java
index bebdce4534af..aa610525c547 100644
--- a/src/main/java/org/jabref/logic/cleanup/NormalizeWhitespacesCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/NormalizeWhitespacesCleanup.java
@@ -1,9 +1,5 @@
 package org.jabref.logic.cleanup;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.formatter.bibtexfields.NormalizeWhitespaceFormatter;
 import org.jabref.model.FieldChange;
@@ -11,6 +7,10 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 public class NormalizeWhitespacesCleanup implements CleanupJob {
 
     private static final Collection<Field> NO_TEXT_FIELDS = FieldFactory.getNotTextFields();
diff --git a/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java b/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java
index 46ee41fcce3f..50f98c056aab 100644
--- a/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java
@@ -1,12 +1,5 @@
 package org.jabref.logic.cleanup;
 
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.FieldChange;
@@ -14,12 +7,20 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 public class RelativePathsCleanup implements CleanupJob {
 
     private final BibDatabaseContext databaseContext;
     private final FilePreferences filePreferences;
 
-    public RelativePathsCleanup(BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+    public RelativePathsCleanup(
+            BibDatabaseContext databaseContext, FilePreferences filePreferences) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
         this.filePreferences = Objects.requireNonNull(filePreferences);
     }
@@ -38,13 +39,17 @@ public List<FieldChange> cleanup(BibEntry entry) {
                 newFileName = oldFileName;
             } else {
                 // only try to transform local file path to relative one
-                newFileName = FileUtil
-                        .relativize(Path.of(oldFileName), databaseContext, filePreferences)
-                        .toString();
+                newFileName =
+                        FileUtil.relativize(Path.of(oldFileName), databaseContext, filePreferences)
+                                .toString();
             }
             LinkedFile newFileEntry = fileEntry;
             if (!oldFileName.equals(newFileName)) {
-                newFileEntry = new LinkedFile(fileEntry.getDescription(), Path.of(newFileName), fileEntry.getFileType());
+                newFileEntry =
+                        new LinkedFile(
+                                fileEntry.getDescription(),
+                                Path.of(newFileName),
+                                fileEntry.getFileType());
                 changed = true;
             }
             newFileList.add(newFileEntry);
diff --git a/src/main/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFiles.java b/src/main/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFiles.java
index 4ba12d0bf741..7389dd843f9d 100644
--- a/src/main/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFiles.java
+++ b/src/main/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFiles.java
@@ -1,12 +1,5 @@
 package org.jabref.logic.cleanup;
 
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.logic.FilePreferences;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
@@ -14,11 +7,19 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.OptionalUtil;
 
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 public class RemoveLinksToNotExistentFiles implements CleanupJob {
     private final BibDatabaseContext databaseContext;
     private final FilePreferences filePreferences;
 
-    public RemoveLinksToNotExistentFiles(BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+    public RemoveLinksToNotExistentFiles(
+            BibDatabaseContext databaseContext, FilePreferences filePreferences) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
         this.filePreferences = Objects.requireNonNull(filePreferences);
     }
diff --git a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
index 5152fddee41c..a4fd70cfdbb8 100644
--- a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
@@ -1,12 +1,5 @@
 package org.jabref.logic.cleanup;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.externalfiles.LinkedFileHandler;
 import org.jabref.model.FieldChange;
@@ -14,10 +7,16 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.OptionalUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 public class RenamePdfCleanup implements CleanupJob {
     private static final Logger LOGGER = LoggerFactory.getLogger(RenamePdfCleanup.class);
 
@@ -25,7 +24,10 @@ public class RenamePdfCleanup implements CleanupJob {
     private final boolean onlyRelativePaths;
     private final FilePreferences filePreferences;
 
-    public RenamePdfCleanup(boolean onlyRelativePaths, BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+    public RenamePdfCleanup(
+            boolean onlyRelativePaths,
+            BibDatabaseContext databaseContext,
+            FilePreferences filePreferences) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
         this.onlyRelativePaths = onlyRelativePaths;
         this.filePreferences = filePreferences;
@@ -41,7 +43,8 @@ public List<FieldChange> cleanup(BibEntry entry) {
                 continue;
             }
 
-            LinkedFileHandler fileHandler = new LinkedFileHandler(file, entry, databaseContext, filePreferences);
+            LinkedFileHandler fileHandler =
+                    new LinkedFileHandler(file, entry, databaseContext, filePreferences);
             try {
                 boolean changedFile = fileHandler.renameToSuggestedName();
                 if (changedFile) {
diff --git a/src/main/java/org/jabref/logic/cleanup/TimeStampToCreationDate.java b/src/main/java/org/jabref/logic/cleanup/TimeStampToCreationDate.java
index 2d69a2248535..1a81f02e4f67 100644
--- a/src/main/java/org/jabref/logic/cleanup/TimeStampToCreationDate.java
+++ b/src/main/java/org/jabref/logic/cleanup/TimeStampToCreationDate.java
@@ -1,13 +1,5 @@
 package org.jabref.logic.cleanup;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
@@ -16,6 +8,14 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * This class handles the migration from timestamp field to creationdate and modificationdate fields.
  * <p>
@@ -67,19 +67,30 @@ private int getMonth(Date date) {
     public List<FieldChange> cleanup(BibEntry entry) {
         // Query entries for their timestamp field entries
         if (entry.getField(timeStampField).isPresent()) {
-            Optional<String> formattedTimeStamp = formatTimeStamp(entry.getField(timeStampField).get());
+            Optional<String> formattedTimeStamp =
+                    formatTimeStamp(entry.getField(timeStampField).get());
             if (formattedTimeStamp.isEmpty()) {
                 // In case the timestamp could not be parsed, do nothing to not lose data
                 return Collections.emptyList();
             }
-            // Setting the EventSource is necessary to circumvent the update of the modification date during timestamp migration
+            // Setting the EventSource is necessary to circumvent the update of the modification
+            // date during timestamp migration
             entry.clearField(timeStampField, EntriesEventSource.CLEANUP_TIMESTAMP);
             List<FieldChange> changeList = new ArrayList<>();
             FieldChange changeTo;
             // Add removal of timestamp field
-            changeList.add(new FieldChange(entry, StandardField.TIMESTAMP, formattedTimeStamp.get(), ""));
-            entry.setField(StandardField.CREATIONDATE, formattedTimeStamp.get(), EntriesEventSource.CLEANUP_TIMESTAMP);
-            changeTo = new FieldChange(entry, StandardField.CREATIONDATE, entry.getField(StandardField.CREATIONDATE).orElse(""), formattedTimeStamp.get());
+            changeList.add(
+                    new FieldChange(entry, StandardField.TIMESTAMP, formattedTimeStamp.get(), ""));
+            entry.setField(
+                    StandardField.CREATIONDATE,
+                    formattedTimeStamp.get(),
+                    EntriesEventSource.CLEANUP_TIMESTAMP);
+            changeTo =
+                    new FieldChange(
+                            entry,
+                            StandardField.CREATIONDATE,
+                            entry.getField(StandardField.CREATIONDATE).orElse(""),
+                            formattedTimeStamp.get());
             changeList.add(changeTo);
             return changeList;
         }
diff --git a/src/main/java/org/jabref/logic/cleanup/TimeStampToModificationDate.java b/src/main/java/org/jabref/logic/cleanup/TimeStampToModificationDate.java
index 6006484f7ff5..82adb9b1d0a4 100644
--- a/src/main/java/org/jabref/logic/cleanup/TimeStampToModificationDate.java
+++ b/src/main/java/org/jabref/logic/cleanup/TimeStampToModificationDate.java
@@ -1,13 +1,5 @@
 package org.jabref.logic.cleanup;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
@@ -16,6 +8,14 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * This class handles the migration from timestamp field to creationdate and modificationdate fields.
  * <p>
@@ -67,19 +67,30 @@ private int getMonth(Date date) {
     public List<FieldChange> cleanup(BibEntry entry) {
         // Query entries for their timestamp field entries
         if (entry.getField(timeStampField).isPresent()) {
-            Optional<String> formattedTimeStamp = formatTimeStamp(entry.getField(timeStampField).get());
+            Optional<String> formattedTimeStamp =
+                    formatTimeStamp(entry.getField(timeStampField).get());
             if (formattedTimeStamp.isEmpty()) {
                 // In case the timestamp could not be parsed, do nothing to not lose data
                 return Collections.emptyList();
             }
-            // Setting the EventSource is necessary to circumvent the update of the modification date during timestamp migration
+            // Setting the EventSource is necessary to circumvent the update of the modification
+            // date during timestamp migration
             entry.clearField(timeStampField, EntriesEventSource.CLEANUP_TIMESTAMP);
             List<FieldChange> changeList = new ArrayList<>();
             FieldChange changeTo;
             // Add removal of timestamp field
-            changeList.add(new FieldChange(entry, StandardField.TIMESTAMP, formattedTimeStamp.get(), ""));
-            entry.setField(StandardField.MODIFICATIONDATE, formattedTimeStamp.get(), EntriesEventSource.CLEANUP_TIMESTAMP);
-            changeTo = new FieldChange(entry, StandardField.MODIFICATIONDATE, entry.getField(StandardField.MODIFICATIONDATE).orElse(""), formattedTimeStamp.get());
+            changeList.add(
+                    new FieldChange(entry, StandardField.TIMESTAMP, formattedTimeStamp.get(), ""));
+            entry.setField(
+                    StandardField.MODIFICATIONDATE,
+                    formattedTimeStamp.get(),
+                    EntriesEventSource.CLEANUP_TIMESTAMP);
+            changeTo =
+                    new FieldChange(
+                            entry,
+                            StandardField.MODIFICATIONDATE,
+                            entry.getField(StandardField.MODIFICATIONDATE).orElse(""),
+                            formattedTimeStamp.get());
             changeList.add(changeTo);
             return changeList;
         }
diff --git a/src/main/java/org/jabref/logic/cleanup/URLCleanup.java b/src/main/java/org/jabref/logic/cleanup/URLCleanup.java
index 5429f84853b4..3334c247e282 100644
--- a/src/main/java/org/jabref/logic/cleanup/URLCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/URLCleanup.java
@@ -1,10 +1,5 @@
 package org.jabref.logic.cleanup;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.formatter.bibtexfields.NormalizeDateFormatter;
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
@@ -12,6 +7,11 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * Checks whether URL exists in note field, and stores it under url field.
  */
@@ -23,10 +23,11 @@ public class URLCleanup implements CleanupJob {
      * In order to be functional, we made the necessary adjustments regarding Java
      * features (mainly doubled backslashes).
      */
-    private static final String URL_REGEX = "(?i)\\b((?:https?://|www\\d{0,3}[.]|[a-z0-9.\\-]+[.]"
-            + "[a-z]{2,4}/)(?:[^\\s()<>\\\\]+|\\(([^\\s()<>\\\\]+|(\\([^\\s()"
-            + "<>\\\\]+\\)))*\\))+(?:\\(([^\\s()<>\\\\]+|(\\([^\\s()<>\\\\]+\\"
-            + ")))*\\)|[^\\s`!()\\[\\]{};:'\".,<>?«»“”‘’]))";
+    private static final String URL_REGEX =
+            "(?i)\\b((?:https?://|www\\d{0,3}[.]|[a-z0-9.\\-]+[.]"
+                    + "[a-z]{2,4}/)(?:[^\\s()<>\\\\]+|\\(([^\\s()<>\\\\]+|(\\([^\\s()"
+                    + "<>\\\\]+\\)))*\\))+(?:\\(([^\\s()<>\\\\]+|(\\([^\\s()<>\\\\]+\\"
+                    + ")))*\\)|[^\\s`!()\\[\\]{};:'\".,<>?«»“”‘’]))";
     public static final Pattern URL_PATTERN = Pattern.compile(URL_REGEX, Pattern.CASE_INSENSITIVE);
 
     private static final String DATE_TERMS_REGEX = "accessed on|visited on|retrieved on|viewed on";
@@ -35,8 +36,10 @@ public class URLCleanup implements CleanupJob {
     private static final Field URL_FIELD = StandardField.URL;
     private static final Field URLDATE_FIELD = StandardField.URLDATE;
 
-    private static final Pattern DATE_TERMS_PATTERN = Pattern.compile(DATE_TERMS_REGEX, Pattern.CASE_INSENSITIVE);
-    private static final Pattern DATE_PATTERN = Pattern.compile(Date.DATE_REGEX, Pattern.CASE_INSENSITIVE);
+    private static final Pattern DATE_TERMS_PATTERN =
+            Pattern.compile(DATE_TERMS_REGEX, Pattern.CASE_INSENSITIVE);
+    private static final Pattern DATE_PATTERN =
+            Pattern.compile(Date.DATE_REGEX, Pattern.CASE_INSENSITIVE);
     private final NormalizeDateFormatter formatter = new NormalizeDateFormatter();
 
     @Override
@@ -53,20 +56,21 @@ public List<FieldChange> cleanup(BibEntry entry) {
             String url = urlMatcher.group();
 
             // Remove the URL from the NoteFieldValue
-            String newNoteFieldValue = noteFieldValue
-                    .replace(url, "")
-
-                    /*
-                     * The following regex erases unnecessary remaining
-                     * content in note field. Explanation:
-                     * <ul>
-                     *     <li>"(, )?": Matches an optional comma followed by a space</li>
-                     *     <li>"\\?": Matches an optional backslash</li>
-                     *     <li>"url\{\}": Matches the literal string "url{}"</li>
-                     * </ul>
-                     * Note that the backslashes are doubled as Java requirement
-                     */
-                    .replaceAll("(, )?\\\\?url\\{\\}(, )?", "");
+            String newNoteFieldValue =
+                    noteFieldValue
+                            .replace(url, "")
+
+                            /*
+                             * The following regex erases unnecessary remaining
+                             * content in note field. Explanation:
+                             * <ul>
+                             *     <li>"(, )?": Matches an optional comma followed by a space</li>
+                             *     <li>"\\?": Matches an optional backslash</li>
+                             *     <li>"url\{\}": Matches the literal string "url{}"</li>
+                             * </ul>
+                             * Note that the backslashes are doubled as Java requirement
+                             */
+                            .replaceAll("(, )?\\\\?url\\{\\}(, )?", "");
 
             /*
              * In case the url and note fields hold the same URL, then we just
@@ -84,14 +88,16 @@ public List<FieldChange> cleanup(BibEntry entry) {
 
             if (dateTermsMatcher.find()) {
                 String term = dateTermsMatcher.group();
-                newNoteFieldValue = newNoteFieldValue
-                        .replace(term, "");
+                newNoteFieldValue = newNoteFieldValue.replace(term, "");
                 if (dateMatcher.find()) {
                     String date = dateMatcher.group();
                     String formattedDate = formatter.format(date);
-                    newNoteFieldValue = newNoteFieldValue
-                            .replace(date, "").trim()
-                            .replaceAll("^,|,$", "").trim(); // either starts or ends with a comma
+                    newNoteFieldValue =
+                            newNoteFieldValue
+                                    .replace(date, "")
+                                    .trim()
+                                    .replaceAll("^,|,$", "")
+                                    .trim(); // either starts or ends with a comma
 
                     // Same approach with the URL cleanup.
                     if (entry.hasField(URLDATE_FIELD)) {
diff --git a/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java b/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java
index 731a3ed6f0d8..852261ad1d6c 100644
--- a/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java
@@ -1,11 +1,5 @@
 package org.jabref.logic.cleanup;
 
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.jabref.logic.bibtex.FileFieldWriter;
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
@@ -13,6 +7,12 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Collects file links from the ps and pdf fields, and add them to the list contained in the file field.
  */
@@ -36,17 +36,24 @@ public List<FieldChange> cleanup(BibEntry entry) {
         List<LinkedFile> fileList = new ArrayList<>(entry.getFiles());
         int oldItemCount = fileList.size();
         for (Map.Entry<Field, String> field : fields.entrySet()) {
-            entry.getField(field.getKey()).ifPresent(fieldContent -> {
-                if (fieldContent.trim().isEmpty()) {
-                    return;
-                }
-                Path path = Path.of(fieldContent);
-                LinkedFile flEntry = new LinkedFile(path.getFileName().toString(), path, field.getValue());
-                fileList.add(flEntry);
-
-                entry.clearField(field.getKey());
-                changes.add(new FieldChange(entry, field.getKey(), fieldContent, null));
-            });
+            entry.getField(field.getKey())
+                    .ifPresent(
+                            fieldContent -> {
+                                if (fieldContent.trim().isEmpty()) {
+                                    return;
+                                }
+                                Path path = Path.of(fieldContent);
+                                LinkedFile flEntry =
+                                        new LinkedFile(
+                                                path.getFileName().toString(),
+                                                path,
+                                                field.getValue());
+                                fileList.add(flEntry);
+
+                                entry.clearField(field.getKey());
+                                changes.add(
+                                        new FieldChange(entry, field.getKey(), fieldContent, null));
+                            });
         }
 
         if (fileList.size() != oldItemCount) {
diff --git a/src/main/java/org/jabref/logic/crawler/Crawler.java b/src/main/java/org/jabref/logic/crawler/Crawler.java
index 52b834a7017b..e59c2ccd7205 100644
--- a/src/main/java/org/jabref/logic/crawler/Crawler.java
+++ b/src/main/java/org/jabref/logic/crawler/Crawler.java
@@ -1,9 +1,6 @@
 package org.jabref.logic.crawler;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.List;
-
+import org.eclipse.jgit.api.errors.GitAPIException;
 import org.jabref.logic.exporter.SaveException;
 import org.jabref.logic.git.SlrGitHandler;
 import org.jabref.logic.importer.ParseException;
@@ -12,7 +9,9 @@
 import org.jabref.model.study.QueryResult;
 import org.jabref.model.util.FileUpdateMonitor;
 
-import org.eclipse.jgit.api.errors.GitAPIException;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
 
 /**
  * This class provides a service for SLR support by conducting an automated search and persistance
@@ -32,24 +31,29 @@ public class Crawler {
      *
      * @param studyRepositoryRoot The path to the study repository
      */
-    public Crawler(Path studyRepositoryRoot,
-                   SlrGitHandler gitHandler,
-                   CliPreferences preferences,
-                   BibEntryTypesManager bibEntryTypesManager,
-                   FileUpdateMonitor fileUpdateMonitor) throws IllegalArgumentException, IOException, ParseException {
-        this.studyRepository = new StudyRepository(
-                studyRepositoryRoot,
-                gitHandler,
-                preferences,
-                fileUpdateMonitor,
-                bibEntryTypesManager);
-        StudyCatalogToFetcherConverter studyCatalogToFetcherConverter = new StudyCatalogToFetcherConverter(
-                studyRepository.getActiveLibraryEntries(),
-                preferences.getImportFormatPreferences(),
-                preferences.getImporterPreferences());
-        this.studyFetcher = new StudyFetcher(
-                studyCatalogToFetcherConverter.getActiveFetchers(),
-                studyRepository.getSearchQueryStrings());
+    public Crawler(
+            Path studyRepositoryRoot,
+            SlrGitHandler gitHandler,
+            CliPreferences preferences,
+            BibEntryTypesManager bibEntryTypesManager,
+            FileUpdateMonitor fileUpdateMonitor)
+            throws IllegalArgumentException, IOException, ParseException {
+        this.studyRepository =
+                new StudyRepository(
+                        studyRepositoryRoot,
+                        gitHandler,
+                        preferences,
+                        fileUpdateMonitor,
+                        bibEntryTypesManager);
+        StudyCatalogToFetcherConverter studyCatalogToFetcherConverter =
+                new StudyCatalogToFetcherConverter(
+                        studyRepository.getActiveLibraryEntries(),
+                        preferences.getImportFormatPreferences(),
+                        preferences.getImporterPreferences());
+        this.studyFetcher =
+                new StudyFetcher(
+                        studyCatalogToFetcherConverter.getActiveFetchers(),
+                        studyRepository.getSearchQueryStrings());
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverter.java b/src/main/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverter.java
index b0f0c26be4d6..88fed91136b2 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverter.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverter.java
@@ -1,16 +1,16 @@
 package org.jabref.logic.crawler;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.logic.importer.WebFetchers;
 import org.jabref.model.study.StudyDatabase;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * Converts library entries from the given study into their corresponding fetchers.
  */
@@ -19,9 +19,10 @@ class StudyCatalogToFetcherConverter {
     private final ImportFormatPreferences importFormatPreferences;
     private final ImporterPreferences importerPreferences;
 
-    public StudyCatalogToFetcherConverter(List<StudyDatabase> libraryEntries,
-                                          ImportFormatPreferences importFormatPreferences,
-                                          ImporterPreferences importerPreferences) {
+    public StudyCatalogToFetcherConverter(
+            List<StudyDatabase> libraryEntries,
+            ImportFormatPreferences importFormatPreferences,
+            ImporterPreferences importerPreferences) {
         this.libraryEntries = libraryEntries;
         this.importFormatPreferences = importFormatPreferences;
         this.importerPreferences = importerPreferences;
@@ -44,11 +45,12 @@ public List<SearchBasedFetcher> getActiveFetchers() {
      * @param libraryEntries List of entries
      * @return List of fetcher instances
      */
-    private List<SearchBasedFetcher> getFetchersFromLibraryEntries(List<StudyDatabase> libraryEntries) {
+    private List<SearchBasedFetcher> getFetchersFromLibraryEntries(
+            List<StudyDatabase> libraryEntries) {
         return libraryEntries.parallelStream()
-                             .map(this::createFetcherFromLibraryEntry)
-                             .filter(Objects::nonNull)
-                             .collect(Collectors.toList());
+                .map(this::createFetcherFromLibraryEntry)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
     }
 
     /**
@@ -58,11 +60,16 @@ private List<SearchBasedFetcher> getFetchersFromLibraryEntries(List<StudyDatabas
      * @return An instance of the fetcher defined by the library entry.
      */
     private SearchBasedFetcher createFetcherFromLibraryEntry(StudyDatabase studyDatabase) {
-        Set<SearchBasedFetcher> searchBasedFetchers = WebFetchers.getSearchBasedFetchers(importFormatPreferences, importerPreferences);
+        Set<SearchBasedFetcher> searchBasedFetchers =
+                WebFetchers.getSearchBasedFetchers(importFormatPreferences, importerPreferences);
         String libraryNameFromFetcher = studyDatabase.getName();
         return searchBasedFetchers.stream()
-                                  .filter(searchBasedFetcher -> searchBasedFetcher.getName().equalsIgnoreCase(libraryNameFromFetcher))
-                                  .findAny()
-                                  .orElse(null);
+                .filter(
+                        searchBasedFetcher ->
+                                searchBasedFetcher
+                                        .getName()
+                                        .equalsIgnoreCase(libraryNameFromFetcher))
+                .findAny()
+                .orElse(null);
     }
 }
diff --git a/src/main/java/org/jabref/logic/crawler/StudyFetcher.java b/src/main/java/org/jabref/logic/crawler/StudyFetcher.java
index ebb77530aa93..ff90769f2b93 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyFetcher.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyFetcher.java
@@ -1,10 +1,5 @@
 package org.jabref.logic.crawler;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.PagedSearchBasedFetcher;
 import org.jabref.logic.importer.SearchBasedFetcher;
@@ -12,10 +7,14 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.study.FetchResult;
 import org.jabref.model.study.QueryResult;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
  * Delegates the search of the provided set of targeted E-Libraries with the provided queries to the E-Library specific fetchers,
  * and aggregates the results returned by the fetchers by query and E-Library.
@@ -27,7 +26,8 @@ class StudyFetcher {
     private final List<SearchBasedFetcher> activeFetchers;
     private final List<String> searchQueries;
 
-    StudyFetcher(List<SearchBasedFetcher> activeFetchers, List<String> searchQueries) throws IllegalArgumentException {
+    StudyFetcher(List<SearchBasedFetcher> activeFetchers, List<String> searchQueries)
+            throws IllegalArgumentException {
         this.searchQueries = searchQueries;
         this.activeFetchers = activeFetchers;
     }
@@ -39,8 +39,8 @@ class StudyFetcher {
      */
     public List<QueryResult> crawl() {
         return searchQueries.parallelStream()
-                            .map(this::getQueryResult)
-                            .collect(Collectors.toList());
+                .map(this::getQueryResult)
+                .collect(Collectors.toList());
     }
 
     private QueryResult getQueryResult(String searchQuery) {
@@ -55,18 +55,24 @@ private QueryResult getQueryResult(String searchQuery) {
      */
     private List<FetchResult> performSearchOnQuery(String searchQuery) {
         return activeFetchers.parallelStream()
-                             .map(fetcher -> performSearchOnQueryForFetcher(searchQuery, fetcher))
-                             .filter(Objects::nonNull)
-                             .collect(Collectors.toList());
+                .map(fetcher -> performSearchOnQueryForFetcher(searchQuery, fetcher))
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
     }
 
-    private FetchResult performSearchOnQueryForFetcher(String searchQuery, SearchBasedFetcher fetcher) {
+    private FetchResult performSearchOnQueryForFetcher(
+            String searchQuery, SearchBasedFetcher fetcher) {
         try {
             List<BibEntry> fetchResult = new ArrayList<>();
             if (fetcher instanceof PagedSearchBasedFetcher basedFetcher) {
-                int pages = (int) Math.ceil(((double) MAX_AMOUNT_OF_RESULTS_PER_FETCHER) / basedFetcher.getPageSize());
+                int pages =
+                        (int)
+                                Math.ceil(
+                                        ((double) MAX_AMOUNT_OF_RESULTS_PER_FETCHER)
+                                                / basedFetcher.getPageSize());
                 for (int page = 0; page < pages; page++) {
-                    fetchResult.addAll(basedFetcher.performSearchPaged(searchQuery, page).getContent());
+                    fetchResult.addAll(
+                            basedFetcher.performSearchPaged(searchQuery, page).getContent());
                 }
             } else {
                 fetchResult = fetcher.performSearch(searchQuery);
diff --git a/src/main/java/org/jabref/logic/crawler/StudyRepository.java b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
index 474d56a9afe7..0acdcc19f8fa 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyRepository.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
@@ -1,16 +1,6 @@
 package org.jabref.logic.crawler;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.charset.UnsupportedCharsetException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.List;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
+import org.eclipse.jgit.api.errors.GitAPIException;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.database.DatabaseMerger;
 import org.jabref.logic.exporter.AtomicFileWriter;
@@ -36,11 +26,20 @@
 import org.jabref.model.study.StudyDatabase;
 import org.jabref.model.study.StudyQuery;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import org.eclipse.jgit.api.errors.GitAPIException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.charset.UnsupportedCharsetException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 /**
  * This class manages all aspects of the study process related to the repository.
  *
@@ -57,7 +56,8 @@ public class StudyRepository {
     private static final Pattern MATCH_COLON = Pattern.compile(":");
     private static final Pattern MATCH_ILLEGAL_CHARACTERS = Pattern.compile("[^A-Za-z0-9_.\\s=-]");
 
-    // Currently we make assumptions about the configuration: the remotes, work and search branch names
+    // Currently we make assumptions about the configuration: the remotes, work and search branch
+    // names
     private static final String REMOTE = "origin";
     private static final String WORK_BRANCH = "work";
     private static final String SEARCH_BRANCH = "search";
@@ -80,11 +80,13 @@ public class StudyRepository {
      * @throws IOException              Thrown if the given repository does not exist, or the study definition file
      *                                  does not exist
      */
-    public StudyRepository(Path pathToRepository,
-                           SlrGitHandler gitHandler,
-                           CliPreferences preferences,
-                           FileUpdateMonitor fileUpdateMonitor,
-                           BibEntryTypesManager bibEntryTypesManager) throws IOException {
+    public StudyRepository(
+            Path pathToRepository,
+            SlrGitHandler gitHandler,
+            CliPreferences preferences,
+            FileUpdateMonitor fileUpdateMonitor,
+            BibEntryTypesManager bibEntryTypesManager)
+            throws IOException {
         this.repositoryPath = pathToRepository;
         this.gitHandler = gitHandler;
         this.preferences = preferences;
@@ -103,7 +105,8 @@ public StudyRepository(Path pathToRepository,
             LOGGER.error("Could not checkout work branch");
         }
         if (Files.notExists(studyDefinitionFile)) {
-            throw new IOException("The study definition file does not exist in the given repository.");
+            throw new IOException(
+                    "The study definition file does not exist in the given repository.");
         }
         study = parseStudyFile();
         try {
@@ -114,8 +117,13 @@ public StudyRepository(Path pathToRepository,
             gitHandler.createCommitOnCurrentBranch(updateRepositoryStructureMessage, false);
 
             gitHandler.checkoutBranch(SEARCH_BRANCH);
-            // If study definition does not exist on this branch or was changed on work branch, copy it from work
-            boolean studyDefinitionDoesNotExistOrChanged = !(Files.exists(studyDefinitionFile) && new StudyYamlParser().parseStudyYamlFile(studyDefinitionFile).equals(study));
+            // If study definition does not exist on this branch or was changed on work branch, copy
+            // it from work
+            boolean studyDefinitionDoesNotExistOrChanged =
+                    !(Files.exists(studyDefinitionFile)
+                            && new StudyYamlParser()
+                                    .parseStudyYamlFile(studyDefinitionFile)
+                                    .equals(study));
             if (studyDefinitionDoesNotExistOrChanged) {
                 new StudyYamlParser().writeStudyYamlFile(study, studyDefinitionFile);
             }
@@ -134,11 +142,14 @@ public StudyRepository(Path pathToRepository,
     /**
      * Returns entries stored in the repository for a certain query and fetcher
      */
-    public BibDatabaseContext getFetcherResultEntries(String query, String fetcherName) throws IOException {
+    public BibDatabaseContext getFetcherResultEntries(String query, String fetcherName)
+            throws IOException {
         if (Files.exists(getPathToFetcherResultFile(query, fetcherName))) {
-            return OpenDatabase.loadDatabase(getPathToFetcherResultFile(query, fetcherName),
-                    preferences.getImportFormatPreferences(),
-                    fileUpdateMonitor).getDatabaseContext();
+            return OpenDatabase.loadDatabase(
+                            getPathToFetcherResultFile(query, fetcherName),
+                            preferences.getImportFormatPreferences(),
+                            fileUpdateMonitor)
+                    .getDatabaseContext();
         }
         return new BibDatabaseContext();
     }
@@ -148,9 +159,11 @@ public BibDatabaseContext getFetcherResultEntries(String query, String fetcherNa
      */
     public BibDatabaseContext getQueryResultEntries(String query) throws IOException {
         if (Files.exists(getPathToQueryResultFile(query))) {
-            return OpenDatabase.loadDatabase(getPathToQueryResultFile(query),
-                    preferences.getImportFormatPreferences(),
-                    fileUpdateMonitor).getDatabaseContext();
+            return OpenDatabase.loadDatabase(
+                            getPathToQueryResultFile(query),
+                            preferences.getImportFormatPreferences(),
+                            fileUpdateMonitor)
+                    .getDatabaseContext();
         }
         return new BibDatabaseContext();
     }
@@ -160,9 +173,11 @@ public BibDatabaseContext getQueryResultEntries(String query) throws IOException
      */
     public BibDatabaseContext getStudyResultEntries() throws IOException {
         if (Files.exists(getPathToStudyResultFile())) {
-            return OpenDatabase.loadDatabase(getPathToStudyResultFile(),
-                    preferences.getImportFormatPreferences(),
-                    fileUpdateMonitor).getDatabaseContext();
+            return OpenDatabase.loadDatabase(
+                            getPathToStudyResultFile(),
+                            preferences.getImportFormatPreferences(),
+                            fileUpdateMonitor)
+                    .getDatabaseContext();
         }
         return new BibDatabaseContext();
     }
@@ -183,10 +198,9 @@ private Study parseStudyFile() throws IOException {
      * @return List of all queries as Strings.
      */
     public List<String> getSearchQueryStrings() {
-        return study.getQueries()
-                    .parallelStream()
-                    .map(StudyQuery::getQuery)
-                    .collect(Collectors.toList());
+        return study.getQueries().parallelStream()
+                .map(StudyQuery::getQuery)
+                .collect(Collectors.toList());
     }
 
     /**
@@ -196,10 +210,9 @@ public List<String> getSearchQueryStrings() {
      * @throws IllegalArgumentException If a transformation from Library entry to LibraryDefinition fails
      */
     public List<StudyDatabase> getActiveLibraryEntries() throws IllegalArgumentException {
-        return study.getDatabases()
-                    .parallelStream()
-                    .filter(StudyDatabase::isEnabled)
-                    .collect(Collectors.toList());
+        return study.getDatabases().parallelStream()
+                .filter(StudyDatabase::isEnabled)
+                .collect(Collectors.toList());
     }
 
     public Study getStudy() {
@@ -218,21 +231,24 @@ public Study getStudy() {
      *     <li>Update the remote tracking branches of the work and search branch</li>
      * </ol>
      */
-    public void persist(List<QueryResult> crawlResults) throws IOException, GitAPIException, SaveException {
+    public void persist(List<QueryResult> crawlResults)
+            throws IOException, GitAPIException, SaveException {
         updateWorkAndSearchBranch();
 
         gitHandler.checkoutBranch(SEARCH_BRANCH);
         persistResults(crawlResults);
         try {
             // First commit changes to search branch and update remote
-            String commitMessage = "Conducted search: " + LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS);
+            String commitMessage =
+                    "Conducted search: " + LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS);
             boolean newSearchResults = gitHandler.createCommitOnCurrentBranch(commitMessage, false);
             gitHandler.checkoutBranch(WORK_BRANCH);
             if (!newSearchResults) {
                 return;
             }
             // Patch new results into work branch
-            gitHandler.appendLatestSearchResultsOntoCurrentBranch(commitMessage + " - Patch", SEARCH_BRANCH);
+            gitHandler.appendLatestSearchResultsOntoCurrentBranch(
+                    commitMessage + " - Patch", SEARCH_BRANCH);
             // Update both remote tracked branches
             updateRemoteSearchAndWorkBranch();
         } catch (GitAPIException e) {
@@ -281,14 +297,18 @@ private void updateWorkAndSearchBranch() throws IOException, GitAPIException {
      */
     private void setUpRepositoryStructureForQueriesAndFetchers() throws IOException {
         // Cannot use stream here since IOException has to be thrown
-        StudyCatalogToFetcherConverter converter = new StudyCatalogToFetcherConverter(
-                this.getActiveLibraryEntries(),
-                preferences.getImportFormatPreferences(),
-                preferences.getImporterPreferences());
+        StudyCatalogToFetcherConverter converter =
+                new StudyCatalogToFetcherConverter(
+                        this.getActiveLibraryEntries(),
+                        preferences.getImportFormatPreferences(),
+                        preferences.getImporterPreferences());
         for (String query : this.getSearchQueryStrings()) {
             createQueryResultFolder(query);
-            converter.getActiveFetchers()
-                     .forEach(searchBasedFetcher -> createFetcherResultFile(query, searchBasedFetcher));
+            converter
+                    .getActiveFetchers()
+                    .forEach(
+                            searchBasedFetcher ->
+                                    createFetcherResultFile(query, searchBasedFetcher));
             createQueryResultFile(query);
         }
         createStudyResultFile();
@@ -331,7 +351,8 @@ private void createBibFile(Path file) {
             try {
                 Files.createFile(file);
             } catch (IOException e) {
-                throw new IllegalStateException("Error during creation of repository structure.", e);
+                throw new IllegalStateException(
+                        "Error during creation of repository structure.", e);
             }
         }
     }
@@ -382,14 +403,16 @@ private String computeIDForQuery(String query) {
      * @param crawlResults The results that shall be persisted.
      */
     private void persistResults(List<QueryResult> crawlResults) throws IOException, SaveException {
-        DatabaseMerger merger = new DatabaseMerger(preferences.getBibEntryPreferences().getKeywordSeparator());
+        DatabaseMerger merger =
+                new DatabaseMerger(preferences.getBibEntryPreferences().getKeywordSeparator());
         BibDatabase newStudyResultEntries = new BibDatabase();
 
         for (QueryResult result : crawlResults) {
             BibDatabase queryResultEntries = new BibDatabase();
             for (FetchResult fetcherResult : result.getResultsPerFetcher()) {
                 BibDatabase fetcherEntries = fetcherResult.getFetchResult();
-                BibDatabaseContext existingFetcherResult = getFetcherResultEntries(result.getQuery(), fetcherResult.getFetcherName());
+                BibDatabaseContext existingFetcherResult =
+                        getFetcherResultEntries(result.getQuery(), fetcherResult.getFetcherName());
 
                 // Merge new entries into fetcher result file
                 merger.merge(existingFetcherResult.getDatabase(), fetcherEntries);
@@ -400,7 +423,10 @@ private void persistResults(List<QueryResult> crawlResults) throws IOException,
                 // Aggregate each fetcher result into the query result
                 merger.merge(queryResultEntries, fetcherEntries);
 
-                writeResultToFile(getPathToFetcherResultFile(result.getQuery(), fetcherResult.getFetcherName()), existingFetcherResult);
+                writeResultToFile(
+                        getPathToFetcherResultFile(
+                                result.getQuery(), fetcherResult.getFetcherName()),
+                        existingFetcherResult);
             }
             BibDatabaseContext existingQueryEntries = getQueryResultEntries(result.getQuery());
 
@@ -420,33 +446,51 @@ private void persistResults(List<QueryResult> crawlResults) throws IOException,
     }
 
     private void generateCiteKeys(BibDatabaseContext existingEntries, BibDatabase targetEntries) {
-        CitationKeyGenerator citationKeyGenerator = new CitationKeyGenerator(existingEntries,
-                preferences.getCitationKeyPatternPreferences());
-        targetEntries.getEntries().stream().filter(bibEntry -> !bibEntry.hasCitationKey()).forEach(citationKeyGenerator::generateAndSetKey);
+        CitationKeyGenerator citationKeyGenerator =
+                new CitationKeyGenerator(
+                        existingEntries, preferences.getCitationKeyPatternPreferences());
+        targetEntries.getEntries().stream()
+                .filter(bibEntry -> !bibEntry.hasCitationKey())
+                .forEach(citationKeyGenerator::generateAndSetKey);
     }
 
-    private void writeResultToFile(Path pathToFile, BibDatabaseContext context) throws SaveException {
-        try (AtomicFileWriter fileWriter = new AtomicFileWriter(pathToFile, StandardCharsets.UTF_8)) {
-            SelfContainedSaveConfiguration saveConfiguration = (SelfContainedSaveConfiguration) new SelfContainedSaveConfiguration()
-                    .withSaveOrder(context.getMetaData().getSaveOrder().map(so -> SelfContainedSaveOrder.of(so)).orElse(SaveOrder.getDefaultSaveOrder()))
-                    .withReformatOnSave(preferences.getLibraryPreferences().shouldAlwaysReformatOnSave());
+    private void writeResultToFile(Path pathToFile, BibDatabaseContext context)
+            throws SaveException {
+        try (AtomicFileWriter fileWriter =
+                new AtomicFileWriter(pathToFile, StandardCharsets.UTF_8)) {
+            SelfContainedSaveConfiguration saveConfiguration =
+                    (SelfContainedSaveConfiguration)
+                            new SelfContainedSaveConfiguration()
+                                    .withSaveOrder(
+                                            context.getMetaData()
+                                                    .getSaveOrder()
+                                                    .map(so -> SelfContainedSaveOrder.of(so))
+                                                    .orElse(SaveOrder.getDefaultSaveOrder()))
+                                    .withReformatOnSave(
+                                            preferences
+                                                    .getLibraryPreferences()
+                                                    .shouldAlwaysReformatOnSave());
             BibWriter bibWriter = new BibWriter(fileWriter, OS.NEWLINE);
-            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
-                    bibWriter,
-                    saveConfiguration,
-                    preferences.getFieldPreferences(),
-                    preferences.getCitationKeyPatternPreferences(),
-                    bibEntryTypesManager);
+            BibtexDatabaseWriter databaseWriter =
+                    new BibtexDatabaseWriter(
+                            bibWriter,
+                            saveConfiguration,
+                            preferences.getFieldPreferences(),
+                            preferences.getCitationKeyPatternPreferences(),
+                            bibEntryTypesManager);
             databaseWriter.saveDatabase(context);
         } catch (UnsupportedCharsetException ex) {
-            throw new SaveException(Localization.lang("Character encoding UTF-8 is not supported.", ex));
+            throw new SaveException(
+                    Localization.lang("Character encoding UTF-8 is not supported.", ex));
         } catch (IOException ex) {
             throw new SaveException("Problems saving", ex);
         }
     }
 
     private Path getPathToFetcherResultFile(String query, String fetcherName) {
-        return repositoryPath.resolve(trimNameAndAddID(query)).resolve(FileNameCleaner.cleanFileName(fetcherName) + ".bib");
+        return repositoryPath
+                .resolve(trimNameAndAddID(query))
+                .resolve(FileNameCleaner.cleanFileName(fetcherName) + ".bib");
     }
 
     private Path getPathToQueryResultFile(String query) {
diff --git a/src/main/java/org/jabref/logic/crawler/StudyYamlParser.java b/src/main/java/org/jabref/logic/crawler/StudyYamlParser.java
index 618dd18c42b7..ca35e5f8c866 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyYamlParser.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyYamlParser.java
@@ -1,16 +1,16 @@
 package org.jabref.logic.crawler;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
+
+import org.jabref.model.study.Study;
+
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Path;
 
-import org.jabref.model.study.Study;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
-
 /**
  * Example use: <code>new StudyYamlParser().parseStudyYamlFile(studyDefinitionFile);</code>
  */
@@ -30,8 +30,11 @@ public Study parseStudyYamlFile(Path studyYamlFile) throws IOException {
      * Writes the given study instance into a yaml file to the given path
      */
     public void writeStudyYamlFile(Study study, Path studyYamlFile) throws IOException {
-        ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory().disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER)
-                                                                    .enable(YAMLGenerator.Feature.MINIMIZE_QUOTES));
+        ObjectMapper yamlMapper =
+                new ObjectMapper(
+                        new YAMLFactory()
+                                .disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER)
+                                .enable(YAMLGenerator.Feature.MINIMIZE_QUOTES));
         yamlMapper.writeValue(studyYamlFile.toFile(), study);
     }
 }
diff --git a/src/main/java/org/jabref/logic/database/DatabaseMerger.java b/src/main/java/org/jabref/logic/database/DatabaseMerger.java
index 013b2e141b6b..a76ce380b23b 100644
--- a/src/main/java/org/jabref/logic/database/DatabaseMerger.java
+++ b/src/main/java/org/jabref/logic/database/DatabaseMerger.java
@@ -1,9 +1,5 @@
 package org.jabref.logic.database;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseModeDetection;
@@ -15,10 +11,13 @@
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.metadata.ContentSelector;
 import org.jabref.model.metadata.MetaData;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 public class DatabaseMerger {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseMerger.class);
@@ -47,7 +46,8 @@ public synchronized void merge(BibDatabase target, BibDatabase other) {
      *
      * @param other The other databases that is merged into this database
      */
-    public synchronized void merge(BibDatabaseContext target, BibDatabaseContext other, String otherFileName) {
+    public synchronized void merge(
+            BibDatabaseContext target, BibDatabaseContext other, String otherFileName) {
         mergeEntries(target.getDatabase(), other.getDatabase());
         mergeStrings(target.getDatabase(), other.getDatabase());
         mergeMetaData(target.getMetaData(), other.getMetaData(), otherFileName, other.getEntries());
@@ -55,10 +55,18 @@ public synchronized void merge(BibDatabaseContext target, BibDatabaseContext oth
 
     private void mergeEntries(BibDatabase target, BibDatabase other) {
         DuplicateCheck duplicateCheck = new DuplicateCheck(new BibEntryTypesManager());
-        List<BibEntry> newEntries = other.getEntries().stream()
-                                         // Remove all entries that are already part of the database (duplicate)
-                                         .filter(entry -> duplicateCheck.containsDuplicate(target, entry, BibDatabaseModeDetection.inferMode(target)).isEmpty())
-                                         .collect(Collectors.toList());
+        List<BibEntry> newEntries =
+                other.getEntries().stream()
+                        // Remove all entries that are already part of the database (duplicate)
+                        .filter(
+                                entry ->
+                                        duplicateCheck
+                                                .containsDuplicate(
+                                                        target,
+                                                        entry,
+                                                        BibDatabaseModeDetection.inferMode(target))
+                                                .isEmpty())
+                        .collect(Collectors.toList());
         target.insertEntries(newEntries);
     }
 
@@ -67,9 +75,14 @@ public void mergeStrings(BibDatabase target, BibDatabase other) {
             String bibtexStringName = bibtexString.getName();
             if (target.hasStringByName(bibtexStringName)) {
                 String importedContent = bibtexString.getContent();
-                String existingContent = target.getStringByName(bibtexStringName).get().getContent();
+                String existingContent =
+                        target.getStringByName(bibtexStringName).get().getContent();
                 if (!importedContent.equals(existingContent)) {
-                    LOGGER.info("String contents differ for {}: {} != {}", bibtexStringName, importedContent, existingContent);
+                    LOGGER.info(
+                            "String contents differ for {}: {} != {}",
+                            bibtexStringName,
+                            importedContent,
+                            existingContent);
                     int suffix = 1;
                     String newName = bibtexStringName + "_" + suffix;
                     while (target.hasStringByName(newName)) {
@@ -79,7 +92,10 @@ public void mergeStrings(BibDatabase target, BibDatabase other) {
                     BibtexString newBibtexString = new BibtexString(newName, importedContent);
                     // TODO undo/redo
                     target.addString(newBibtexString);
-                    LOGGER.info("New string added: {} = {}", newBibtexString.getName(), newBibtexString.getContent());
+                    LOGGER.info(
+                            "New string added: {} = {}",
+                            newBibtexString.getName(),
+                            newBibtexString.getContent());
                 }
             } else {
                 // TODO undo/redo
@@ -93,7 +109,8 @@ public void mergeStrings(BibDatabase target, BibDatabase other) {
      * @param other         the metaData to merge into the target
      * @param otherFilename the filename of the other library. Pass "unknown" if not known.
      */
-    public void mergeMetaData(MetaData target, MetaData other, String otherFilename, List<BibEntry> allOtherEntries) {
+    public void mergeMetaData(
+            MetaData target, MetaData other, String otherFilename, List<BibEntry> allOtherEntries) {
         Objects.requireNonNull(other);
         Objects.requireNonNull(otherFilename);
         Objects.requireNonNull(allOtherEntries);
@@ -102,34 +119,43 @@ public void mergeMetaData(MetaData target, MetaData other, String otherFilename,
         mergeContentSelectors(target, other);
     }
 
-    private void mergeGroups(MetaData target, MetaData other, String otherFilename, List<BibEntry> allOtherEntries) {
-        // Adds the specified node as a child of the current root. The group contained in <b>newGroups</b> must not be of
-        // type AllEntriesGroup, since every tree has exactly one AllEntriesGroup (its root). The <b>newGroups</b> are
+    private void mergeGroups(
+            MetaData target, MetaData other, String otherFilename, List<BibEntry> allOtherEntries) {
+        // Adds the specified node as a child of the current root. The group contained in
+        // <b>newGroups</b> must not be of
+        // type AllEntriesGroup, since every tree has exactly one AllEntriesGroup (its root). The
+        // <b>newGroups</b> are
         // inserted directly, i.e. they are not deepCopy()'d.
-        other.getGroups().ifPresent(newGroups -> {
-            // ensure that there is always only one AllEntriesGroup in the resulting database
-            // "Rename" the AllEntriesGroup of the imported database to "Imported"
-            if (newGroups.getGroup() instanceof AllEntriesGroup) {
-                // create a dummy group
-                try {
-                    // This will cause a bug if the group already exists
-                    // There will be group where the two groups are merged
-                    String newGroupName = otherFilename;
-                    ExplicitGroup group = new ExplicitGroup(
-                            "Imported " + newGroupName,
-                            GroupHierarchyType.INDEPENDENT,
-                            keywordDelimiter);
-                    newGroups.setGroup(group);
-                    group.add(allOtherEntries);
-                } catch (IllegalArgumentException e) {
-                    LOGGER.error("Problem appending entries to group", e);
-                }
-            }
-            target.getGroups().ifPresentOrElse(
-                    newGroups::moveTo,
-                    // target does not contain any groups, so we can just use the new groups
-                    () -> target.setGroups(newGroups));
-        });
+        other.getGroups()
+                .ifPresent(
+                        newGroups -> {
+                            // ensure that there is always only one AllEntriesGroup in the resulting
+                            // database
+                            // "Rename" the AllEntriesGroup of the imported database to "Imported"
+                            if (newGroups.getGroup() instanceof AllEntriesGroup) {
+                                // create a dummy group
+                                try {
+                                    // This will cause a bug if the group already exists
+                                    // There will be group where the two groups are merged
+                                    String newGroupName = otherFilename;
+                                    ExplicitGroup group =
+                                            new ExplicitGroup(
+                                                    "Imported " + newGroupName,
+                                                    GroupHierarchyType.INDEPENDENT,
+                                                    keywordDelimiter);
+                                    newGroups.setGroup(group);
+                                    group.add(allOtherEntries);
+                                } catch (IllegalArgumentException e) {
+                                    LOGGER.error("Problem appending entries to group", e);
+                                }
+                            }
+                            target.getGroups()
+                                    .ifPresentOrElse(
+                                            newGroups::moveTo,
+                                            // target does not contain any groups, so we can just
+                                            // use the new groups
+                                            () -> target.setGroups(newGroups));
+                        });
     }
 
     private void mergeContentSelectors(MetaData target, MetaData other) {
diff --git a/src/main/java/org/jabref/logic/database/DuplicateCheck.java b/src/main/java/org/jabref/logic/database/DuplicateCheck.java
index d3f7d58fa3f4..217030bf5cba 100644
--- a/src/main/java/org/jabref/logic/database/DuplicateCheck.java
+++ b/src/main/java/org/jabref/logic/database/DuplicateCheck.java
@@ -1,14 +1,6 @@
 package org.jabref.logic.database;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
+import com.google.common.collect.Sets;
 
 import org.jabref.logic.os.OS;
 import org.jabref.logic.util.strings.StringSimilarity;
@@ -26,16 +18,25 @@
 import org.jabref.model.entry.identifier.ISBN;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
-
-import com.google.common.collect.Sets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * This class contains utility method for duplicate checking of entries.
  */
 public class DuplicateCheck {
-    private static final double DUPLICATE_THRESHOLD = 0.75; // The overall threshold to signal a duplicate pair
+    private static final double DUPLICATE_THRESHOLD =
+            0.75; // The overall threshold to signal a duplicate pair
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DuplicateCheck.class);
     /*
@@ -75,7 +76,15 @@ public DuplicateCheck(BibEntryTypesManager entryTypesManager) {
     private static boolean haveSameIdentifier(final BibEntry one, final BibEntry two) {
         return one.getFields().stream()
                 .filter(field -> field.getProperties().contains(FieldProperty.IDENTIFIER))
-                .anyMatch(field -> two.getField(field).map(content -> one.getField(field).orElseThrow().equals(content)).orElse(false));
+                .anyMatch(
+                        field ->
+                                two.getField(field)
+                                        .map(
+                                                content ->
+                                                        one.getField(field)
+                                                                .orElseThrow()
+                                                                .equals(content))
+                                        .orElse(false));
     }
 
     private static boolean haveDifferentEntryType(final BibEntry one, final BibEntry two) {
@@ -85,23 +94,30 @@ private static boolean haveDifferentEntryType(final BibEntry one, final BibEntry
     private static boolean haveDifferentEditions(final BibEntry one, final BibEntry two) {
         final Optional<String> editionOne = one.getField(StandardField.EDITION);
         final Optional<String> editionTwo = two.getField(StandardField.EDITION);
-        return editionOne.isPresent() &&
-                editionTwo.isPresent() &&
-                !editionOne.get().equals(editionTwo.get());
+        return editionOne.isPresent()
+                && editionTwo.isPresent()
+                && !editionOne.get().equals(editionTwo.get());
     }
 
-    private static boolean haveDifferentChaptersOrPagesOfTheSameBook(final BibEntry one, final BibEntry two) {
-        return (compareSingleField(StandardField.AUTHOR, one, two) == EQUAL) &&
-                (compareSingleField(StandardField.TITLE, one, two) == EQUAL) &&
-                ((compareSingleField(StandardField.CHAPTER, one, two) == NOT_EQUAL) ||
-                        (compareSingleField(StandardField.PAGES, one, two) == NOT_EQUAL));
+    private static boolean haveDifferentChaptersOrPagesOfTheSameBook(
+            final BibEntry one, final BibEntry two) {
+        return (compareSingleField(StandardField.AUTHOR, one, two) == EQUAL)
+                && (compareSingleField(StandardField.TITLE, one, two) == EQUAL)
+                && ((compareSingleField(StandardField.CHAPTER, one, two) == NOT_EQUAL)
+                        || (compareSingleField(StandardField.PAGES, one, two) == NOT_EQUAL));
     }
 
-    private static double[] compareRequiredFields(final BibEntryType type, final BibEntry one, final BibEntry two) {
+    private static double[] compareRequiredFields(
+            final BibEntryType type, final BibEntry one, final BibEntry two) {
         final Set<OrFields> requiredFields = type.getRequiredFields();
         return requiredFields.isEmpty()
                 ? new double[] {0., 0.}
-                : DuplicateCheck.compareFieldSet(requiredFields.stream().map(OrFields::getPrimary).collect(Collectors.toSet()), one, two);
+                : DuplicateCheck.compareFieldSet(
+                        requiredFields.stream()
+                                .map(OrFields::getPrimary)
+                                .collect(Collectors.toSet()),
+                        one,
+                        two);
     }
 
     private static boolean isFarFromThreshold(double value) {
@@ -111,22 +127,26 @@ private static boolean isFarFromThreshold(double value) {
         return value - DuplicateCheck.DUPLICATE_THRESHOLD > DuplicateCheck.DOUBT_RANGE;
     }
 
-    private static boolean compareOptionalFields(final BibEntryType type,
-                                                 final BibEntry one,
-                                                 final BibEntry two,
-                                                 final double[] req) {
+    private static boolean compareOptionalFields(
+            final BibEntryType type, final BibEntry one, final BibEntry two, final double[] req) {
         final Set<BibField> optionalFields = type.getOptionalFields();
         if (optionalFields.isEmpty()) {
             return req[0] >= DuplicateCheck.DUPLICATE_THRESHOLD;
         }
-        final double[] opt = DuplicateCheck.compareFieldSet(optionalFields.stream().map(BibField::field).collect(Collectors.toSet()), one, two);
-        final double numerator = (DuplicateCheck.REQUIRED_WEIGHT * req[0] * req[1]) + (opt[0] * opt[1]);
+        final double[] opt =
+                DuplicateCheck.compareFieldSet(
+                        optionalFields.stream().map(BibField::field).collect(Collectors.toSet()),
+                        one,
+                        two);
+        final double numerator =
+                (DuplicateCheck.REQUIRED_WEIGHT * req[0] * req[1]) + (opt[0] * opt[1]);
         final double denominator = (req[1] * DuplicateCheck.REQUIRED_WEIGHT) + opt[1];
         final double totValue = numerator / denominator;
         return totValue >= DuplicateCheck.DUPLICATE_THRESHOLD;
     }
 
-    private static double[] compareFieldSet(final Collection<Field> fields, final BibEntry one, final BibEntry two) {
+    private static double[] compareFieldSet(
+            final Collection<Field> fields, final BibEntry one, final BibEntry two) {
         if (fields.isEmpty()) {
             return new double[] {0.0, 0.0};
         }
@@ -149,7 +169,8 @@ private static double[] compareFieldSet(final Collection<Field> fields, final Bi
         return new double[] {0.0, 0.0};
     }
 
-    private static int compareSingleField(final Field field, final BibEntry one, final BibEntry two) {
+    private static int compareSingleField(
+            final Field field, final BibEntry one, final BibEntry two) {
         final Optional<String> optionalStringOne = one.getFieldLatexFree(field);
         final Optional<String> optionalStringTwo = two.getFieldLatexFree(field);
         if (optionalStringOne.isEmpty()) {
@@ -181,8 +202,14 @@ private static int compareSingleField(final Field field, final BibEntry one, fin
     private static int compareAuthorField(final String stringOne, final String stringTwo) {
         // Specific for name fields.
         // Harmonise case:
-        final String authorOne = AuthorList.fixAuthorLastNameOnlyCommas(stringOne, false).replace(" and ", " ").toLowerCase(Locale.ROOT);
-        final String authorTwo = AuthorList.fixAuthorLastNameOnlyCommas(stringTwo, false).replace(" and ", " ").toLowerCase(Locale.ROOT);
+        final String authorOne =
+                AuthorList.fixAuthorLastNameOnlyCommas(stringOne, false)
+                        .replace(" and ", " ")
+                        .toLowerCase(Locale.ROOT);
+        final String authorTwo =
+                AuthorList.fixAuthorLastNameOnlyCommas(stringTwo, false)
+                        .replace(" and ", " ")
+                        .toLowerCase(Locale.ROOT);
         final double similarity = DuplicateCheck.correlateByWords(authorOne, authorTwo);
         if (similarity > 0.8) {
             return EQUAL;
@@ -211,7 +238,8 @@ private static int comparePagesField(final String stringOne, final String string
     private static int compareJournalField(final String stringOne, final String stringTwo) {
         final String processedStringOne = stringOne.replace(".", "").toLowerCase(Locale.ROOT);
         final String processedStringTwo = stringTwo.replace(".", "").toLowerCase(Locale.ROOT);
-        final double similarity = DuplicateCheck.correlateByWords(processedStringOne, processedStringTwo);
+        final double similarity =
+                DuplicateCheck.correlateByWords(processedStringOne, processedStringTwo);
         if (similarity > 0.8) {
             return EQUAL;
         }
@@ -225,9 +253,12 @@ private static int compareChapterField(final String stringOne, final String stri
     }
 
     private static int compareField(final String stringOne, final String stringTwo) {
-        final String processedStringOne = StringUtil.unifyLineBreaks(stringOne.toLowerCase(Locale.ROOT).trim(), OS.NEWLINE);
-        final String processedStringTwo = StringUtil.unifyLineBreaks(stringTwo.toLowerCase(Locale.ROOT).trim(), OS.NEWLINE);
-        final double similarity = DuplicateCheck.correlateByWords(processedStringOne, processedStringTwo);
+        final String processedStringOne =
+                StringUtil.unifyLineBreaks(stringOne.toLowerCase(Locale.ROOT).trim(), OS.NEWLINE);
+        final String processedStringTwo =
+                StringUtil.unifyLineBreaks(stringTwo.toLowerCase(Locale.ROOT).trim(), OS.NEWLINE);
+        final double similarity =
+                DuplicateCheck.correlateByWords(processedStringOne, processedStringTwo);
         if (similarity > 0.8) {
             return EQUAL;
         }
@@ -260,8 +291,8 @@ private static boolean isSingleFieldEqual(BibEntry one, BibEntry two, Field fiel
         if (stringOne.isEmpty() || stringTwo.isEmpty()) {
             return false;
         }
-        return StringUtil.unifyLineBreaks(stringOne.get(), OS.NEWLINE).equals(
-                StringUtil.unifyLineBreaks(stringTwo.get(), OS.NEWLINE));
+        return StringUtil.unifyLineBreaks(stringOne.get(), OS.NEWLINE)
+                .equals(StringUtil.unifyLineBreaks(stringTwo.get(), OS.NEWLINE));
     }
 
     /**
@@ -307,38 +338,48 @@ private static double similarity(final String first, final String second) {
         if (longerLength == 0) {
             return 1.0;
         }
-        final double distanceIgnoredCase = new StringSimilarity().editDistanceIgnoreCase(longer, shorter);
+        final double distanceIgnoredCase =
+                new StringSimilarity().editDistanceIgnoreCase(longer, shorter);
         final double similarity = (longerLength - distanceIgnoredCase) / longerLength;
-        LOGGER.trace("Longer string: {} Shorter string: {} Similarity: {}", longer, shorter, similarity);
+        LOGGER.trace(
+                "Longer string: {} Shorter string: {} Similarity: {}", longer, shorter, similarity);
         return similarity;
     }
 
     /**
      * Checks if the two entries represent the same publication.
      */
-    public boolean isDuplicate(final BibEntry one, final BibEntry two, final BibDatabaseMode bibDatabaseMode) {
+    public boolean isDuplicate(
+            final BibEntry one, final BibEntry two, final BibDatabaseMode bibDatabaseMode) {
         // Checks DOI and other identifiers
         if (haveSameIdentifier(one, two)) {
             return true;
         }
 
-        if (haveDifferentEntryType(one, two) ||
-                haveDifferentEditions(one, two) ||
-                haveDifferentChaptersOrPagesOfTheSameBook(one, two)) {
+        if (haveDifferentEntryType(one, two)
+                || haveDifferentEditions(one, two)
+                || haveDifferentChaptersOrPagesOfTheSameBook(one, two)) {
             return false;
         }
 
         // In case an ISBN is present, it is a strong indicator that the entries are equal.
-        // Only in InBook, InCollection, or Article the ISBN may be equal and the publication on different pages (and thus not equal)
+        // Only in InBook, InCollection, or Article the ISBN may be equal and the publication on
+        // different pages (and thus not equal)
         Optional<ISBN> oneISBN = one.getISBN();
         Optional<ISBN> twoISBN = two.getISBN();
-        if (oneISBN.isPresent() && twoISBN.isPresent()
+        if (oneISBN.isPresent()
+                && twoISBN.isPresent()
                 && Objects.equals(oneISBN, twoISBN)
-                && !Set.of(StandardEntryType.Article, StandardEntryType.InBook, StandardEntryType.InCollection).contains(one.getType())) {
+                && !Set.of(
+                                StandardEntryType.Article,
+                                StandardEntryType.InBook,
+                                StandardEntryType.InCollection)
+                        .contains(one.getType())) {
             return true;
         }
 
-        final Optional<BibEntryType> type = entryTypesManager.enrich(one.getType(), bibDatabaseMode);
+        final Optional<BibEntryType> type =
+                entryTypesManager.enrich(one.getType(), bibDatabaseMode);
         if (type.isPresent()) {
             BibEntryType entryType = type.get();
             final double[] reqCmpResult = compareRequiredFields(entryType, one, two);
@@ -353,9 +394,11 @@ public boolean isDuplicate(final BibEntry one, final BibEntry two, final BibData
                 return true;
             }
         }
-        // if type is not present, so simply compare fields without any distinction between optional/required
+        // if type is not present, so simply compare fields without any distinction between
+        // optional/required
         // In case both required and optional fields are equal, we also use this fallback
-        return compareFieldSet(Sets.union(one.getFields(), two.getFields()), one, two)[0] >= DuplicateCheck.DUPLICATE_THRESHOLD;
+        return compareFieldSet(Sets.union(one.getFields(), two.getFields()), one, two)[0]
+                >= DuplicateCheck.DUPLICATE_THRESHOLD;
     }
 
     /**
@@ -368,10 +411,13 @@ public boolean isDuplicate(final BibEntry one, final BibEntry two, final BibData
      * @param entry    The entry of which we are looking for duplicates.
      * @return The first duplicate entry found. Empty Optional if no duplicates are found.
      */
-    public Optional<BibEntry> containsDuplicate(final BibDatabase database,
-                                                final BibEntry entry,
-                                                final BibDatabaseMode bibDatabaseMode) {
-
-        return database.getEntries().stream().filter(other -> isDuplicate(entry, other, bibDatabaseMode)).findFirst();
+    public Optional<BibEntry> containsDuplicate(
+            final BibDatabase database,
+            final BibEntry entry,
+            final BibDatabaseMode bibDatabaseMode) {
+
+        return database.getEntries().stream()
+                .filter(other -> isDuplicate(entry, other, bibDatabaseMode))
+                .findFirst();
     }
 }
diff --git a/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java b/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
index 6a7f56472fa3..b248ce8e9812 100644
--- a/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
+++ b/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.exporter;
 
+import org.jabref.logic.util.BackupFileType;
+import org.jabref.logic.util.io.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.FileOutputStream;
 import java.io.FilterOutputStream;
 import java.io.IOException;
@@ -13,12 +18,6 @@
 import java.util.EnumSet;
 import java.util.Set;
 
-import org.jabref.logic.util.BackupFileType;
-import org.jabref.logic.util.io.FileUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * A file output stream that is similar to the standard {@link FileOutputStream}, except that all writes are first
  * redirected to a temporary file. When the stream is closed, the temporary file (atomically) replaces the target file.
@@ -49,7 +48,8 @@ public class AtomicFileOutputStream extends FilterOutputStream {
     private static final Logger LOGGER = LoggerFactory.getLogger(AtomicFileOutputStream.class);
 
     private static final String TEMPORARY_EXTENSION = ".tmp";
-    private static final String SAVE_EXTENSION = "." + BackupFileType.SAVE.getExtensions().getFirst();
+    private static final String SAVE_EXTENSION =
+            "." + BackupFileType.SAVE.getExtensions().getFirst();
 
     /**
      * The file we want to create/replace.
@@ -79,8 +79,13 @@ public class AtomicFileOutputStream extends FilterOutputStream {
      * @param keepBackup whether to keep the backup file (.sav) after a successful write process
      */
     public AtomicFileOutputStream(Path path, boolean keepBackup) throws IOException {
-        // Files.newOutputStream(getPathOfTemporaryFile(path)) leads to a "sun.nio.ch.ChannelOutputStream", which does not offer "lock"
-        this(path, getPathOfTemporaryFile(path), new FileOutputStream(getPathOfTemporaryFile(path).toFile()), keepBackup);
+        // Files.newOutputStream(getPathOfTemporaryFile(path)) leads to a
+        // "sun.nio.ch.ChannelOutputStream", which does not offer "lock"
+        this(
+                path,
+                getPathOfTemporaryFile(path),
+                new FileOutputStream(getPathOfTemporaryFile(path).toFile()),
+                keepBackup);
     }
 
     /**
@@ -96,7 +101,12 @@ public AtomicFileOutputStream(Path path) throws IOException {
     /**
      * Required for proper testing
      */
-    AtomicFileOutputStream(Path path, Path pathOfTemporaryFile, OutputStream temporaryFileOutputStream, boolean keepBackup) throws IOException {
+    AtomicFileOutputStream(
+            Path path,
+            Path pathOfTemporaryFile,
+            OutputStream temporaryFileOutputStream,
+            boolean keepBackup)
+            throws IOException {
         super(temporaryFileOutputStream);
         this.targetFile = path;
         this.temporaryFile = pathOfTemporaryFile;
@@ -104,20 +114,26 @@ public AtomicFileOutputStream(Path path) throws IOException {
         this.keepBackup = keepBackup;
 
         try {
-            // Lock files (so that at least not another JabRef instance writes at the same time to the same tmp file)
+            // Lock files (so that at least not another JabRef instance writes at the same time to
+            // the same tmp file)
             if (out instanceof FileOutputStream stream) {
                 try {
                     temporaryFileLock = stream.getChannel().tryLock();
                 } catch (IOException ex) {
                     // workaround for https://bugs.openjdk.org/browse/JDK-8167023
-                    LOGGER.warn("Could not acquire file lock. Maybe we are on a network drive?", ex);
+                    LOGGER.warn(
+                            "Could not acquire file lock. Maybe we are on a network drive?", ex);
                     temporaryFileLock = null;
                 }
             } else {
                 temporaryFileLock = null;
             }
         } catch (OverlappingFileLockException exception) {
-            throw new IOException("Could not obtain write access to " + temporaryFile + ". Maybe another instance of JabRef is currently writing to the same file?", exception);
+            throw new IOException(
+                    "Could not obtain write access to "
+                            + temporaryFile
+                            + ". Maybe another instance of JabRef is currently writing to the same file?",
+                    exception);
         }
     }
 
@@ -204,13 +220,17 @@ public void close() throws IOException {
                 return;
             }
 
-            // We successfully wrote everything to the temporary file, lets copy it to the correct place
-            // First, make backup of original file and try to save file permissions to restore them later (by default: 664)
-            Set<PosixFilePermission> oldFilePermissions = EnumSet.of(PosixFilePermission.OWNER_READ,
-                    PosixFilePermission.OWNER_WRITE,
-                    PosixFilePermission.GROUP_READ,
-                    PosixFilePermission.GROUP_WRITE,
-                    PosixFilePermission.OTHERS_READ);
+            // We successfully wrote everything to the temporary file, lets copy it to the correct
+            // place
+            // First, make backup of original file and try to save file permissions to restore them
+            // later (by default: 664)
+            Set<PosixFilePermission> oldFilePermissions =
+                    EnumSet.of(
+                            PosixFilePermission.OWNER_READ,
+                            PosixFilePermission.OWNER_WRITE,
+                            PosixFilePermission.GROUP_READ,
+                            PosixFilePermission.GROUP_WRITE,
+                            PosixFilePermission.OTHERS_READ);
             if (Files.exists(targetFile)) {
                 try {
                     Files.copy(targetFile, backupFile, StandardCopyOption.REPLACE_EXISTING);
@@ -221,14 +241,21 @@ public void close() throws IOException {
                     try {
                         oldFilePermissions = Files.getPosixFilePermissions(targetFile);
                     } catch (IOException exception) {
-                        LOGGER.warn("Error getting file permissions for file {}.", targetFile, exception);
+                        LOGGER.warn(
+                                "Error getting file permissions for file {}.",
+                                targetFile,
+                                exception);
                     }
                 }
             }
 
             try {
                 // Move temporary file (replace original if it exists)
-                Files.move(temporaryFile, targetFile, StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
+                Files.move(
+                        temporaryFile,
+                        targetFile,
+                        StandardCopyOption.ATOMIC_MOVE,
+                        StandardCopyOption.REPLACE_EXISTING);
             } catch (Exception e) {
                 LOGGER.warn("Could not move temporary file", e);
                 throw e;
@@ -239,7 +266,8 @@ public void close() throws IOException {
                 try {
                     Files.setPosixFilePermissions(targetFile, oldFilePermissions);
                 } catch (IOException exception) {
-                    LOGGER.warn("Error writing file permissions to file {}.", targetFile, exception);
+                    LOGGER.warn(
+                            "Error writing file permissions to file {}.", targetFile, exception);
                 }
             }
 
@@ -273,4 +301,3 @@ public void write(int b) throws IOException {
         }
     }
 }
-
diff --git a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
index c8fc121184ed..add097e70225 100644
--- a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
@@ -1,21 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
 import org.jabref.logic.bibtex.comparator.CrossRefEntryComparator;
@@ -42,9 +26,24 @@
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.model.strings.StringUtil;
-
 import org.jooq.lambda.Unchecked;
 
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * A generic writer for our database. This is independent of the concrete serialization format.
  * For instance, we could also write out YAML or XML by subclassing this class.
@@ -55,9 +54,13 @@
  */
 public abstract class BibDatabaseWriter {
 
-    public enum SaveType { WITH_JABREF_META_DATA, PLAIN_BIBTEX }
+    public enum SaveType {
+        WITH_JABREF_META_DATA,
+        PLAIN_BIBTEX
+    }
 
-    private static final Pattern REFERENCE_PATTERN = Pattern.compile("(#[A-Za-z]+#)"); // Used to detect string references in strings
+    private static final Pattern REFERENCE_PATTERN =
+            Pattern.compile("(#[A-Za-z]+#)"); // Used to detect string references in strings
     protected final BibWriter bibWriter;
     protected final SelfContainedSaveConfiguration saveConfiguration;
     protected final CitationKeyPatternPreferences keyPatternPreferences;
@@ -65,11 +68,12 @@ public enum SaveType { WITH_JABREF_META_DATA, PLAIN_BIBTEX }
     protected final BibEntryTypesManager entryTypesManager;
     protected final FieldPreferences fieldPreferences;
 
-    public BibDatabaseWriter(BibWriter bibWriter,
-                             SelfContainedSaveConfiguration saveConfiguration,
-                             FieldPreferences fieldPreferences,
-                             CitationKeyPatternPreferences keyPatternPreferences,
-                             BibEntryTypesManager entryTypesManager) {
+    public BibDatabaseWriter(
+            BibWriter bibWriter,
+            SelfContainedSaveConfiguration saveConfiguration,
+            FieldPreferences fieldPreferences,
+            CitationKeyPatternPreferences keyPatternPreferences,
+            BibEntryTypesManager entryTypesManager) {
         this.bibWriter = Objects.requireNonNull(bibWriter);
         this.saveConfiguration = saveConfiguration;
         this.keyPatternPreferences = keyPatternPreferences;
@@ -78,22 +82,28 @@ public BibDatabaseWriter(BibWriter bibWriter,
         assert saveConfiguration.getSaveOrder().getOrderType() != SaveOrder.OrderType.TABLE;
     }
 
-    private static List<FieldChange> applySaveActions(List<BibEntry> toChange, MetaData metaData, FieldPreferences fieldPreferences) {
+    private static List<FieldChange> applySaveActions(
+            List<BibEntry> toChange, MetaData metaData, FieldPreferences fieldPreferences) {
         List<FieldChange> changes = new ArrayList<>();
 
         Optional<FieldFormatterCleanups> saveActions = metaData.getSaveActions();
-        saveActions.ifPresent(actions -> {
-            // save actions defined -> apply for every entry
-            for (BibEntry entry : toChange) {
-                changes.addAll(actions.applySaveActions(entry));
-            }
-        });
+        saveActions.ifPresent(
+                actions -> {
+                    // save actions defined -> apply for every entry
+                    for (BibEntry entry : toChange) {
+                        changes.addAll(actions.applySaveActions(entry));
+                    }
+                });
 
         // Trim and normalize all white spaces
-        FieldFormatterCleanup trimWhiteSpaces = new FieldFormatterCleanup(InternalField.INTERNAL_ALL_FIELD, new TrimWhitespaceFormatter());
-        NormalizeWhitespacesCleanup normalizeWhitespacesCleanup = new NormalizeWhitespacesCleanup(fieldPreferences);
+        FieldFormatterCleanup trimWhiteSpaces =
+                new FieldFormatterCleanup(
+                        InternalField.INTERNAL_ALL_FIELD, new TrimWhitespaceFormatter());
+        NormalizeWhitespacesCleanup normalizeWhitespacesCleanup =
+                new NormalizeWhitespacesCleanup(fieldPreferences);
         for (BibEntry entry : toChange) {
-            // Only apply the trimming if the entry itself has other changes (e.g., by the user or by save actions)
+            // Only apply the trimming if the entry itself has other changes (e.g., by the user or
+            // by save actions)
             if (entry.hasChanged()) {
                 changes.addAll(trimWhiteSpaces.cleanup(entry));
                 changes.addAll(normalizeWhitespacesCleanup.cleanup(entry));
@@ -103,7 +113,8 @@ private static List<FieldChange> applySaveActions(List<BibEntry> toChange, MetaD
         return changes;
     }
 
-    public static List<FieldChange> applySaveActions(BibEntry entry, MetaData metaData, FieldPreferences fieldPreferences) {
+    public static List<FieldChange> applySaveActions(
+            BibEntry entry, MetaData metaData, FieldPreferences fieldPreferences) {
         return applySaveActions(List.of(entry), metaData, fieldPreferences);
     }
 
@@ -111,7 +122,8 @@ private static List<Comparator<BibEntry>> getSaveComparators(SaveOrder saveOrder
         List<Comparator<BibEntry>> comparators = new ArrayList<>();
 
         // Take care, using CrossRefEntry-Comparator, that referred entries occur after referring
-        // ones. This is a necessary requirement for BibTeX to be able to resolve referenced entries correctly.
+        // ones. This is a necessary requirement for BibTeX to be able to resolve referenced entries
+        // correctly.
         comparators.add(new CrossRefEntryComparator());
 
         if (saveOrder.getOrderType() == SaveOrder.OrderType.ORIGINAL) {
@@ -119,9 +131,8 @@ private static List<Comparator<BibEntry>> getSaveComparators(SaveOrder saveOrder
             comparators.add(new IdComparator());
         } else {
             // use configured sorting strategy
-            List<FieldComparator> fieldComparators = saveOrder.getSortCriteria().stream()
-                                                              .map(FieldComparator::new)
-                                                              .toList();
+            List<FieldComparator> fieldComparators =
+                    saveOrder.getSortCriteria().stream().map(FieldComparator::new).toList();
             comparators.addAll(fieldComparators);
             comparators.add(new FieldComparator(InternalField.KEY_FIELD));
         }
@@ -134,7 +145,8 @@ private static List<Comparator<BibEntry>> getSaveComparators(SaveOrder saveOrder
      * non-database save operation (such as the exportDatabase call), we do not wish to use the global preference of
      * saving in standard order.
      */
-    public static List<BibEntry> getSortedEntries(List<BibEntry> entriesToSort, SelfContainedSaveOrder saveOrder) {
+    public static List<BibEntry> getSortedEntries(
+            List<BibEntry> entriesToSort, SelfContainedSaveOrder saveOrder) {
         Objects.requireNonNull(entriesToSort);
         Objects.requireNonNull(saveOrder);
 
@@ -154,10 +166,10 @@ public List<FieldChange> getSaveActionsFieldChanges() {
      * Saves the complete database.
      */
     public void saveDatabase(BibDatabaseContext bibDatabaseContext) throws IOException {
-        List<BibEntry> entries = bibDatabaseContext.getDatabase().getEntries()
-                                                .stream()
-                                                .filter(entry -> !entry.isEmpty())
-                                                .toList();
+        List<BibEntry> entries =
+                bibDatabaseContext.getDatabase().getEntries().stream()
+                        .filter(entry -> !entry.isEmpty())
+                        .toList();
         savePartOfDatabase(bibDatabaseContext, entries);
     }
 
@@ -166,13 +178,16 @@ public void saveDatabase(BibDatabaseContext bibDatabaseContext) throws IOExcepti
      *
      * @param entries A list of entries to save. The list itself is not modified in this code
      */
-    public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEntry> entries) throws IOException {
-        Optional<String> sharedDatabaseIDOptional = bibDatabaseContext.getDatabase().getSharedDatabaseID();
+    public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEntry> entries)
+            throws IOException {
+        Optional<String> sharedDatabaseIDOptional =
+                bibDatabaseContext.getDatabase().getSharedDatabaseID();
         sharedDatabaseIDOptional.ifPresent(Unchecked.consumer(id -> writeDatabaseID(id)));
 
         // Some file formats write something at the start of the file (like the encoding)
         if (saveConfiguration.getSaveType() == SaveType.WITH_JABREF_META_DATA) {
-            Charset charset = bibDatabaseContext.getMetaData().getEncoding().orElse(StandardCharsets.UTF_8);
+            Charset charset =
+                    bibDatabaseContext.getMetaData().getEncoding().orElse(StandardCharsets.UTF_8);
             writeProlog(bibDatabaseContext, charset);
         }
 
@@ -185,11 +200,14 @@ public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEn
         writeStrings(bibDatabaseContext.getDatabase());
 
         // Write database entries.
-        List<BibEntry> sortedEntries = getSortedEntries(entries, saveConfiguration.getSelfContainedSaveOrder());
+        List<BibEntry> sortedEntries =
+                getSortedEntries(entries, saveConfiguration.getSelfContainedSaveOrder());
 
-        // FIXME: "Clean" architecture violation: We modify the entries here, which should not happen during a write
+        // FIXME: "Clean" architecture violation: We modify the entries here, which should not
+        // happen during a write
         //        The cleanup should be done before the write operation
-        List<FieldChange> saveActionChanges = applySaveActions(sortedEntries, bibDatabaseContext.getMetaData(), fieldPreferences);
+        List<FieldChange> saveActionChanges =
+                applySaveActions(sortedEntries, bibDatabaseContext.getMetaData(), fieldPreferences);
         saveActionsFieldChanges.addAll(saveActionChanges);
         if (keyPatternPreferences.shouldGenerateCiteKeysBeforeSaving()) {
             List<FieldChange> keyChanges = generateCitationKeys(bibDatabaseContext, sortedEntries);
@@ -205,8 +223,11 @@ public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEn
             // types (*not* all customized standard types) must be written.
             if (entryTypesManager.isCustomType(entry.getType(), bibDatabaseContext.getMode())) {
                 // If user-defined entry type, then add it
-                // Otherwise (enrich returns empty optional) it is a completely unknown entry type, so ignore it
-                entryTypesManager.enrich(entry.getType(), bibDatabaseContext.getMode()).ifPresent(typesToWrite::add);
+                // Otherwise (enrich returns empty optional) it is a completely unknown entry type,
+                // so ignore it
+                entryTypesManager
+                        .enrich(entry.getType(), bibDatabaseContext.getMode())
+                        .ifPresent(typesToWrite::add);
             }
 
             writeEntry(entry, bibDatabaseContext.getMode());
@@ -224,7 +245,8 @@ public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEn
         writeEpilogue(bibDatabaseContext.getDatabase().getEpilog());
     }
 
-    protected abstract void writeProlog(BibDatabaseContext bibDatabaseContext, Charset encoding) throws IOException;
+    protected abstract void writeProlog(BibDatabaseContext bibDatabaseContext, Charset encoding)
+            throws IOException;
 
     protected abstract void writeEntry(BibEntry entry, BibDatabaseMode mode) throws IOException;
 
@@ -233,18 +255,20 @@ public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEn
     /**
      * Writes all data to the specified writer, using each object's toString() method.
      */
-    protected void writeMetaData(MetaData metaData, GlobalCitationKeyPatterns globalCiteKeyPattern) throws IOException {
+    protected void writeMetaData(MetaData metaData, GlobalCitationKeyPatterns globalCiteKeyPattern)
+            throws IOException {
         Objects.requireNonNull(metaData);
 
-        Map<String, String> serializedMetaData = MetaDataSerializer.getSerializedStringMap(metaData,
-                globalCiteKeyPattern);
+        Map<String, String> serializedMetaData =
+                MetaDataSerializer.getSerializedStringMap(metaData, globalCiteKeyPattern);
 
         for (Map.Entry<String, String> metaItem : serializedMetaData.entrySet()) {
             writeMetaDataItem(metaItem);
         }
     }
 
-    protected abstract void writeMetaDataItem(Map.Entry<String, String> metaItem) throws IOException;
+    protected abstract void writeMetaDataItem(Map.Entry<String, String> metaItem)
+            throws IOException;
 
     protected abstract void writePreamble(String preamble) throws IOException;
 
@@ -257,11 +281,11 @@ protected void writeMetaData(MetaData metaData, GlobalCitationKeyPatterns global
      * @param database The database whose strings we should write.
      */
     private void writeStrings(BibDatabase database) throws IOException {
-        List<BibtexString> strings = database.getStringKeySet()
-                                             .stream()
-                                             .map(database::getString)
-                                             .sorted(new BibtexStringComparator(true))
-                                             .toList();
+        List<BibtexString> strings =
+                database.getStringKeySet().stream()
+                        .map(database::getString)
+                        .sorted(new BibtexStringComparator(true))
+                        .toList();
         // First, make a Map of all entries:
         Map<String, BibtexString> remaining = new HashMap<>();
         int maxKeyLength = 0;
@@ -281,13 +305,16 @@ private void writeStrings(BibDatabase database) throws IOException {
         bibWriter.finishBlock();
     }
 
-    protected void writeString(BibtexString bibtexString, Map<String, BibtexString> remaining, int maxKeyLength)
+    protected void writeString(
+            BibtexString bibtexString, Map<String, BibtexString> remaining, int maxKeyLength)
             throws IOException {
         // First remove this from the "remaining" list so it can't cause problem with circular refs:
         remaining.remove(bibtexString.getName());
 
-        // Then we go through the string looking for references to other strings. If we find references
-        // to strings that we will write, but still haven't, we write those before proceeding. This ensures
+        // Then we go through the string looking for references to other strings. If we find
+        // references
+        // to strings that we will write, but still haven't, we write those before proceeding. This
+        // ensures
         // that the string order will be acceptable for BibTeX.
         String content = bibtexString.getContent();
         Matcher m;
@@ -297,7 +324,8 @@ protected void writeString(BibtexString bibtexString, Map<String, BibtexString>
             content = content.substring(restIndex);
             String label = foundLabel.substring(1, foundLabel.length() - 1);
 
-            // If the label we found exists as a key in the "remaining" Map, we go on and write it now:
+            // If the label we found exists as a key in the "remaining" Map, we go on and write it
+            // now:
             if (remaining.containsKey(label)) {
                 BibtexString referred = remaining.get(label);
                 writeString(referred, remaining, maxKeyLength);
@@ -321,9 +349,11 @@ protected void writeEntryTypeDefinitions(SortedSet<BibEntryType> types) throws I
     /**
      * Generate keys for all entries that are lacking keys.
      */
-    protected List<FieldChange> generateCitationKeys(BibDatabaseContext databaseContext, List<BibEntry> entries) {
+    protected List<FieldChange> generateCitationKeys(
+            BibDatabaseContext databaseContext, List<BibEntry> entries) {
         List<FieldChange> changes = new ArrayList<>();
-        CitationKeyGenerator keyGenerator = new CitationKeyGenerator(databaseContext, keyPatternPreferences);
+        CitationKeyGenerator keyGenerator =
+                new CitationKeyGenerator(databaseContext, keyPatternPreferences);
         for (BibEntry bes : entries) {
             Optional<String> oldKey = bes.getCitationKey();
             if (StringUtil.isBlank(oldKey)) {
diff --git a/src/main/java/org/jabref/logic/exporter/BibWriter.java b/src/main/java/org/jabref/logic/exporter/BibWriter.java
index f69316535426..e3ab19e6cf64 100644
--- a/src/main/java/org/jabref/logic/exporter/BibWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibWriter.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.exporter;
 
+import org.jabref.model.strings.StringUtil;
+
 import java.io.IOException;
 import java.io.Writer;
 
-import org.jabref.model.strings.StringUtil;
-
 /**
  * Class to write to a .bib file. Used by {@link BibtexDatabaseWriter}
  */
diff --git a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
index 2c1a1533083e..ddd5cbd20a77 100644
--- a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
@@ -1,11 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.io.IOException;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-
 import org.jabref.logic.bibtex.BibEntryWriter;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.bibtex.FieldWriter;
@@ -20,10 +14,15 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.Writer;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
 /**
  * Writes a .bib file following the BibTeX / BibLaTeX format using the provided {@link BibWriter}.
  * Reading is done by {@link org.jabref.logic.importer.fileformat.BibtexImporter}.
@@ -38,25 +37,29 @@ public class BibtexDatabaseWriter extends BibDatabaseWriter {
     private static final String PREAMBLE_PREFIX = "@Preamble";
     private static final String STRING_PREFIX = "@String";
 
-    public BibtexDatabaseWriter(BibWriter bibWriter,
-                                SelfContainedSaveConfiguration saveConfiguration,
-                                FieldPreferences fieldPreferences,
-                                CitationKeyPatternPreferences citationKeyPatternPreferences,
-                                BibEntryTypesManager entryTypesManager) {
-        super(bibWriter,
+    public BibtexDatabaseWriter(
+            BibWriter bibWriter,
+            SelfContainedSaveConfiguration saveConfiguration,
+            FieldPreferences fieldPreferences,
+            CitationKeyPatternPreferences citationKeyPatternPreferences,
+            BibEntryTypesManager entryTypesManager) {
+        super(
+                bibWriter,
                 saveConfiguration,
                 fieldPreferences,
                 citationKeyPatternPreferences,
                 entryTypesManager);
     }
 
-    public BibtexDatabaseWriter(Writer writer,
-                                String newline,
-                                SelfContainedSaveConfiguration saveConfiguration,
-                                FieldPreferences fieldPreferences,
-                                CitationKeyPatternPreferences citationKeyPatternPreferences,
-                                BibEntryTypesManager entryTypesManager) {
-        super(new BibWriter(writer, newline),
+    public BibtexDatabaseWriter(
+            Writer writer,
+            String newline,
+            SelfContainedSaveConfiguration saveConfiguration,
+            FieldPreferences fieldPreferences,
+            CitationKeyPatternPreferences citationKeyPatternPreferences,
+            BibEntryTypesManager entryTypesManager) {
+        super(
+                new BibWriter(writer, newline),
                 saveConfiguration,
                 fieldPreferences,
                 citationKeyPatternPreferences,
@@ -107,14 +110,19 @@ protected void writeString(BibtexString bibtexString, int maxKeyLength) throws I
             bibWriter.writeLine(userComments);
         }
 
-        bibWriter.write(STRING_PREFIX + "{" + bibtexString.getName() + StringUtil
-                .repeatSpaces(maxKeyLength - bibtexString.getName().length()) + " = ");
+        bibWriter.write(
+                STRING_PREFIX
+                        + "{"
+                        + bibtexString.getName()
+                        + StringUtil.repeatSpaces(maxKeyLength - bibtexString.getName().length())
+                        + " = ");
         if (bibtexString.getContent().isEmpty()) {
             bibWriter.write("{}");
         } else {
             try {
-                String formatted = new FieldWriter(fieldPreferences)
-                        .write(InternalField.BIBTEX_STRING, bibtexString.getContent());
+                String formatted =
+                        new FieldWriter(fieldPreferences)
+                                .write(InternalField.BIBTEX_STRING, bibtexString.getContent());
                 bibWriter.write(formatted);
             } catch (InvalidFieldValueException ex) {
                 throw new IOException(ex);
@@ -133,12 +141,15 @@ protected void writeEntryTypeDefinition(BibEntryType customType) throws IOExcept
     }
 
     @Override
-    protected void writeProlog(BibDatabaseContext bibDatabaseContext, Charset encoding) throws IOException {
+    protected void writeProlog(BibDatabaseContext bibDatabaseContext, Charset encoding)
+            throws IOException {
         // We write the encoding if
         //   - it is provided (!= null)
         //   - explicitly set in the .bib file OR not equal to UTF_8
         // Otherwise, we do not write anything and return
-        if ((encoding == null) || (!bibDatabaseContext.getMetaData().getEncodingExplicitlySupplied() && (encoding.equals(StandardCharsets.UTF_8)))) {
+        if ((encoding == null)
+                || (!bibDatabaseContext.getMetaData().getEncodingExplicitlySupplied()
+                        && (encoding.equals(StandardCharsets.UTF_8)))) {
             return;
         }
 
@@ -157,7 +168,8 @@ protected void writeDatabaseID(String sharedDatabaseID) throws IOException {
 
     @Override
     protected void writeEntry(BibEntry entry, BibDatabaseMode mode) throws IOException {
-        BibEntryWriter bibtexEntryWriter = new BibEntryWriter(new FieldWriter(fieldPreferences), entryTypesManager);
+        BibEntryWriter bibtexEntryWriter =
+                new BibEntryWriter(new FieldWriter(fieldPreferences), entryTypesManager);
         bibtexEntryWriter.write(entry, bibWriter, mode, saveConfiguration.shouldReformatFile());
     }
 }
diff --git a/src/main/java/org/jabref/logic/exporter/CffExporter.java b/src/main/java/org/jabref/logic/exporter/CffExporter.java
index 210453e4e21a..c95833a30fad 100644
--- a/src/main/java/org/jabref/logic/exporter/CffExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/CffExporter.java
@@ -1,17 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.io.FileWriter;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.Author;
@@ -24,65 +12,107 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
 public class CffExporter extends Exporter {
     // Fields that are taken 1:1 from BibTeX to CFF
-    public static final List<String> UNMAPPED_FIELDS = List.of(
-            "abbreviation", "collection-doi", "collection-title", "collection-type", "commit", "copyright",
-            "data-type", "database", "date-accessed", "date-downloaded", "date-published", "department", "end",
-            "entry", "filename", "format", "issue-date", "issue-title", "license-url", "loc-end", "loc-start",
-            "medium", "nihmsid", "number-volumes", "patent-states", "pmcid", "repository-artifact", "repository-code",
-            "scope", "section", "start", "term", "thesis-type", "volume-title", "year-original"
-    );
+    public static final List<String> UNMAPPED_FIELDS =
+            List.of(
+                    "abbreviation",
+                    "collection-doi",
+                    "collection-title",
+                    "collection-type",
+                    "commit",
+                    "copyright",
+                    "data-type",
+                    "database",
+                    "date-accessed",
+                    "date-downloaded",
+                    "date-published",
+                    "department",
+                    "end",
+                    "entry",
+                    "filename",
+                    "format",
+                    "issue-date",
+                    "issue-title",
+                    "license-url",
+                    "loc-end",
+                    "loc-start",
+                    "medium",
+                    "nihmsid",
+                    "number-volumes",
+                    "patent-states",
+                    "pmcid",
+                    "repository-artifact",
+                    "repository-code",
+                    "scope",
+                    "section",
+                    "start",
+                    "term",
+                    "thesis-type",
+                    "volume-title",
+                    "year-original");
 
-    public static final Map<Field, String> FIELDS_MAP = Map.ofEntries(
-            Map.entry(StandardField.ABSTRACT, "abstract"),
-            Map.entry(StandardField.DATE, "date-released"),
-            Map.entry(StandardField.DOI, "doi"),
-            Map.entry(StandardField.KEYWORDS, "keywords"),
-            Map.entry(BiblatexSoftwareField.LICENSE, "license"),
-            Map.entry(StandardField.COMMENT, "message"),
-            Map.entry(BiblatexSoftwareField.REPOSITORY, "repository"),
-            Map.entry(StandardField.TITLE, "title"),
-            Map.entry(StandardField.URL, "url"),
-            Map.entry(StandardField.VERSION, "version"),
-            Map.entry(StandardField.EDITION, "edition"),
-            Map.entry(StandardField.ISBN, "isbn"),
-            Map.entry(StandardField.ISSN, "issn"),
-            Map.entry(StandardField.ISSUE, "issue"),
-            Map.entry(StandardField.JOURNAL, "journal"),
-            Map.entry(StandardField.MONTH, "month"),
-            Map.entry(StandardField.NOTE, "notes"),
-            Map.entry(StandardField.NUMBER, "number"),
-            Map.entry(StandardField.PAGES, "pages"),
-            Map.entry(StandardField.PUBSTATE, "status"),
-            Map.entry(StandardField.VOLUME, "volume"),
-            Map.entry(StandardField.YEAR, "year")
-    );
+    public static final Map<Field, String> FIELDS_MAP =
+            Map.ofEntries(
+                    Map.entry(StandardField.ABSTRACT, "abstract"),
+                    Map.entry(StandardField.DATE, "date-released"),
+                    Map.entry(StandardField.DOI, "doi"),
+                    Map.entry(StandardField.KEYWORDS, "keywords"),
+                    Map.entry(BiblatexSoftwareField.LICENSE, "license"),
+                    Map.entry(StandardField.COMMENT, "message"),
+                    Map.entry(BiblatexSoftwareField.REPOSITORY, "repository"),
+                    Map.entry(StandardField.TITLE, "title"),
+                    Map.entry(StandardField.URL, "url"),
+                    Map.entry(StandardField.VERSION, "version"),
+                    Map.entry(StandardField.EDITION, "edition"),
+                    Map.entry(StandardField.ISBN, "isbn"),
+                    Map.entry(StandardField.ISSN, "issn"),
+                    Map.entry(StandardField.ISSUE, "issue"),
+                    Map.entry(StandardField.JOURNAL, "journal"),
+                    Map.entry(StandardField.MONTH, "month"),
+                    Map.entry(StandardField.NOTE, "notes"),
+                    Map.entry(StandardField.NUMBER, "number"),
+                    Map.entry(StandardField.PAGES, "pages"),
+                    Map.entry(StandardField.PUBSTATE, "status"),
+                    Map.entry(StandardField.VOLUME, "volume"),
+                    Map.entry(StandardField.YEAR, "year"));
 
-    public static final Map<EntryType, String> TYPES_MAP = Map.ofEntries(
-        Map.entry(StandardEntryType.Article, "article"),
-        Map.entry(StandardEntryType.Book, "book"),
-        Map.entry(StandardEntryType.Booklet, "pamphlet"),
-        Map.entry(StandardEntryType.Proceedings, "conference"),
-        Map.entry(StandardEntryType.InProceedings, "conference-paper"),
-        Map.entry(StandardEntryType.Misc, "misc"),
-        Map.entry(StandardEntryType.Manual, "manual"),
-        Map.entry(StandardEntryType.Software, "software"),
-        Map.entry(StandardEntryType.Dataset, "dataset"),
-        Map.entry(StandardEntryType.Report, "report"),
-        Map.entry(StandardEntryType.Unpublished, "unpublished")
-    );
+    public static final Map<EntryType, String> TYPES_MAP =
+            Map.ofEntries(
+                    Map.entry(StandardEntryType.Article, "article"),
+                    Map.entry(StandardEntryType.Book, "book"),
+                    Map.entry(StandardEntryType.Booklet, "pamphlet"),
+                    Map.entry(StandardEntryType.Proceedings, "conference"),
+                    Map.entry(StandardEntryType.InProceedings, "conference-paper"),
+                    Map.entry(StandardEntryType.Misc, "misc"),
+                    Map.entry(StandardEntryType.Manual, "manual"),
+                    Map.entry(StandardEntryType.Software, "software"),
+                    Map.entry(StandardEntryType.Dataset, "dataset"),
+                    Map.entry(StandardEntryType.Report, "report"),
+                    Map.entry(StandardEntryType.Unpublished, "unpublished"));
 
     public CffExporter() {
         super("cff", "CFF", StandardFileType.CFF);
     }
 
     @Override
-    public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries) throws Exception {
+    public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries)
+            throws Exception {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(file);
         Objects.requireNonNull(entries);
@@ -108,7 +138,8 @@ public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry>
         boolean mainIsDummy = false;
         int countOfSoftwareAndDataSetEntries = 0;
         for (BibEntry entry : entriesToTransform) {
-            if (entry.getType() == StandardEntryType.Software || entry.getType() == StandardEntryType.Dataset) {
+            if (entry.getType() == StandardEntryType.Software
+                    || entry.getType() == StandardEntryType.Dataset) {
                 main = entry;
                 countOfSoftwareAndDataSetEntries++;
             }
@@ -117,7 +148,8 @@ public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry>
             // If there is only one software or dataset entry, use it as the main entry
             entriesToTransform.remove(main);
         } else {
-            // If there are no software or dataset entries, create a dummy main entry holding the given entries
+            // If there are no software or dataset entries, create a dummy main entry holding the
+            // given entries
             main = new BibEntry(StandardEntryType.Software);
             mainIsDummy = true;
         }
@@ -128,7 +160,8 @@ public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry>
         // Preferred citation
         if (main.hasField(StandardField.CITES)) {
             String citeKey = main.getField(StandardField.CITES).orElse("").split(",")[0];
-            List<BibEntry> citedEntries = databaseContext.getDatabase().getEntriesByCitationKey(citeKey);
+            List<BibEntry> citedEntries =
+                    databaseContext.getDatabase().getEntriesByCitationKey(citeKey);
             entriesToTransform.removeAll(citedEntries);
             if (!citedEntries.isEmpty()) {
                 BibEntry citedEntry = citedEntries.getFirst();
@@ -139,15 +172,15 @@ public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry>
         // References
         List<Map<String, Object>> related = new ArrayList<>();
         if (main.hasField(StandardField.RELATED)) {
-            main.getEntryLinkList(StandardField.RELATED, databaseContext.getDatabase())
-                .stream()
-                .map(link -> link.getLinkedEntry())
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .forEach(entry -> {
-                    related.add(transformEntry(entry, false, false));
-                    entriesToTransform.remove(entry);
-                });
+            main.getEntryLinkList(StandardField.RELATED, databaseContext.getDatabase()).stream()
+                    .map(link -> link.getLinkedEntry())
+                    .filter(Optional::isPresent)
+                    .map(Optional::get)
+                    .forEach(
+                            entry -> {
+                                related.add(transformEntry(entry, false, false));
+                                entriesToTransform.remove(entry);
+                            });
         }
 
         // Add remaining entries as references
@@ -174,8 +207,10 @@ private Map<String, Object> transformEntry(BibEntry entry, boolean main, boolean
             cffData.put("cff-version", "1.2.0");
 
             // Mandatory message field
-            String message = fields.getOrDefault(StandardField.COMMENT,
-                    "If you use this software, please cite it using the metadata from this file.");
+            String message =
+                    fields.getOrDefault(
+                            StandardField.COMMENT,
+                            "If you use this software, please cite it using the metadata from this file.");
             cffData.put("message", message);
             fields.remove(StandardField.COMMENT);
         }
@@ -186,8 +221,8 @@ private Map<String, Object> transformEntry(BibEntry entry, boolean main, boolean
         fields.remove(StandardField.TITLE);
 
         // Mandatory authors field
-        List<Author> authors = AuthorList.parse(fields.getOrDefault(StandardField.AUTHOR, ""))
-                                         .getAuthors();
+        List<Author> authors =
+                AuthorList.parse(fields.getOrDefault(StandardField.AUTHOR, "")).getAuthors();
         parseAuthors(cffData, authors);
         fields.remove(StandardField.AUTHOR);
 
@@ -226,22 +261,23 @@ private Map<String, Object> transformEntry(BibEntry entry, boolean main, boolean
 
     private void parseAuthors(Map<String, Object> data, List<Author> authors) {
         List<Map<String, String>> authorsList = new ArrayList<>();
-        authors.forEach(author -> {
-            Map<String, String> authorMap = new LinkedHashMap<>();
-            if (author.getFamilyName().isPresent()) {
-                authorMap.put("family-names", author.getFamilyName().get());
-            }
-            if (author.getGivenName().isPresent()) {
-                authorMap.put("given-names", author.getGivenName().get());
-            }
-            if (author.getNamePrefix().isPresent()) {
-                authorMap.put("name-particle", author.getNamePrefix().get());
-            }
-            if (author.getNameSuffix().isPresent()) {
-                authorMap.put("name-suffix", author.getNameSuffix().get());
-            }
-            authorsList.add(authorMap);
-        });
+        authors.forEach(
+                author -> {
+                    Map<String, String> authorMap = new LinkedHashMap<>();
+                    if (author.getFamilyName().isPresent()) {
+                        authorMap.put("family-names", author.getFamilyName().get());
+                    }
+                    if (author.getGivenName().isPresent()) {
+                        authorMap.put("given-names", author.getGivenName().get());
+                    }
+                    if (author.getNamePrefix().isPresent()) {
+                        authorMap.put("name-particle", author.getNamePrefix().get());
+                    }
+                    if (author.getNameSuffix().isPresent()) {
+                        authorMap.put("name-suffix", author.getNameSuffix().get());
+                    }
+                    authorsList.add(authorMap);
+                });
         data.put("authors", authorsList.isEmpty() ? List.of(Map.of("name", "/")) : authorsList);
     }
 
@@ -252,7 +288,9 @@ private void parseDate(Map<String, Object> data, String date) {
             return;
         }
         Date parsedDate = parsedDateOpt.get();
-        if (parsedDate.getYear().isPresent() && parsedDate.getMonth().isPresent() && parsedDate.getDay().isPresent()) {
+        if (parsedDate.getYear().isPresent()
+                && parsedDate.getMonth().isPresent()
+                && parsedDate.getDay().isPresent()) {
             data.put("date-released", parsedDate.getNormalized());
             return;
         }
@@ -260,4 +298,3 @@ private void parseDate(Map<String, Object> data, String date) {
         parsedDate.getYear().ifPresent(year -> data.put("year", year));
     }
 }
-
diff --git a/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java b/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java
index 9ec5f64dda3c..9a0c521c2da6 100644
--- a/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java
@@ -1,17 +1,15 @@
 package org.jabref.logic.exporter;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
+import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
+import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
 import org.jabref.logic.bibtex.BibEntryWriter;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.bibtex.FieldWriter;
@@ -24,20 +22,21 @@
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
-
-import org.apache.pdfbox.Loader;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
-import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
-import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
-import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
 /**
  * A custom exporter to write bib entries to an embedded bib file.
  */
@@ -50,7 +49,10 @@ public class EmbeddedBibFilePdfExporter extends Exporter {
     private final BibEntryTypesManager bibEntryTypesManager;
     private final FieldPreferences fieldPreferences;
 
-    public EmbeddedBibFilePdfExporter(BibDatabaseMode bibDatabaseMode, BibEntryTypesManager bibEntryTypesManager, FieldPreferences fieldPreferences) {
+    public EmbeddedBibFilePdfExporter(
+            BibDatabaseMode bibDatabaseMode,
+            BibEntryTypesManager bibEntryTypesManager,
+            FieldPreferences fieldPreferences) {
         super("bib", "Embedded BibTeX", StandardFileType.PDF);
         this.bibDatabaseMode = bibDatabaseMode;
         this.bibEntryTypesManager = bibEntryTypesManager;
@@ -63,7 +65,8 @@ public EmbeddedBibFilePdfExporter(BibDatabaseMode bibDatabaseMode, BibEntryTypes
      * @param entries         a list containing all entries that should be exported
      */
     @Override
-    public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries) throws Exception {
+    public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries)
+            throws Exception {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(file);
         Objects.requireNonNull(entries);
@@ -77,7 +80,8 @@ public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry>
                     contentStream.beginText();
                     contentStream.newLineAtOffset(25, 500);
                     contentStream.setFont(new PDType1Font(Standard14Fonts.FontName.HELVETICA), 12);
-                    contentStream.showText("This PDF was created by JabRef. It demonstrates the embedding of BibTeX data in PDF files. Please open the file metadata view of your PDF viewer to see the attached files.");
+                    contentStream.showText(
+                            "This PDF was created by JabRef. It demonstrates the embedding of BibTeX data in PDF files. Please open the file metadata view of your PDF viewer to see the attached files.");
                     contentStream.endText();
                 }
                 document.save(file.toString());
@@ -133,7 +137,8 @@ private void embedBibTex(String bibTeX, Path path) throws IOException {
                 fileSpecification = new PDComplexFileSpecification();
             }
             if (efTree != null) {
-                InputStream inputStream = new ByteArrayInputStream(bibTeX.getBytes(StandardCharsets.UTF_8));
+                InputStream inputStream =
+                        new ByteArrayInputStream(bibTeX.getBytes(StandardCharsets.UTF_8));
                 fileSpecification.setFile(EMBEDDED_FILE_NAME);
                 PDEmbeddedFile embeddedFile = new PDEmbeddedFile(document, inputStream);
                 embeddedFile.setSubtype("text/x-bibtex");
@@ -144,7 +149,9 @@ private void embedBibTex(String bibTeX, Path path) throws IOException {
                     try {
                         names.put(EMBEDDED_FILE_NAME, fileSpecification);
                     } catch (UnsupportedOperationException e) {
-                        throw new IOException(Localization.lang("File '%0' is write protected.", path.toString()));
+                        throw new IOException(
+                                Localization.lang(
+                                        "File '%0' is write protected.", path.toString()));
                     }
                 }
 
diff --git a/src/main/java/org/jabref/logic/exporter/EndnoteXmlExporter.java b/src/main/java/org/jabref/logic/exporter/EndnoteXmlExporter.java
index dcdcaafef5d1..72469b767274 100644
--- a/src/main/java/org/jabref/logic/exporter/EndnoteXmlExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/EndnoteXmlExporter.java
@@ -1,5 +1,21 @@
 package org.jabref.logic.exporter;
 
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.Author;
+import org.jabref.model.entry.AuthorList;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryPreferences;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.field.UnknownField;
+import org.jabref.model.entry.types.EntryType;
+import org.jabref.model.entry.types.IEEETranEntryType;
+import org.jabref.model.entry.types.StandardEntryType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -18,29 +34,12 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.Author;
-import org.jabref.model.entry.AuthorList;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.BibEntryPreferences;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.entry.field.UnknownField;
-import org.jabref.model.entry.types.EntryType;
-import org.jabref.model.entry.types.IEEETranEntryType;
-import org.jabref.model.entry.types.StandardEntryType;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
 public class EndnoteXmlExporter extends Exporter {
 
-    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactory.newInstance();
+    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY =
+            DocumentBuilderFactory.newInstance();
 
-    private record EndNoteType(String name, Integer number) {
-    }
+    private record EndNoteType(String name, Integer number) {}
 
     private static final Map<EntryType, EndNoteType> ENTRY_TYPE_MAPPING = new HashMap<>();
 
@@ -49,16 +48,19 @@ private record EndNoteType(String name, Integer number) {
         ENTRY_TYPE_MAPPING.put(StandardEntryType.Book, new EndNoteType("Book", 2));
         ENTRY_TYPE_MAPPING.put(StandardEntryType.InBook, new EndNoteType("Book Section", 3));
         ENTRY_TYPE_MAPPING.put(StandardEntryType.InCollection, new EndNoteType("Book Section", 4));
-        ENTRY_TYPE_MAPPING.put(StandardEntryType.Proceedings, new EndNoteType("Conference Proceedings", 5));
+        ENTRY_TYPE_MAPPING.put(
+                StandardEntryType.Proceedings, new EndNoteType("Conference Proceedings", 5));
         ENTRY_TYPE_MAPPING.put(StandardEntryType.MastersThesis, new EndNoteType("Thesis", 6));
         ENTRY_TYPE_MAPPING.put(StandardEntryType.PhdThesis, new EndNoteType("Thesis", 7));
         ENTRY_TYPE_MAPPING.put(StandardEntryType.TechReport, new EndNoteType("Report", 8));
         ENTRY_TYPE_MAPPING.put(StandardEntryType.Unpublished, new EndNoteType("Manuscript", 9));
-        ENTRY_TYPE_MAPPING.put(StandardEntryType.InProceedings, new EndNoteType("Conference Paper", 10));
+        ENTRY_TYPE_MAPPING.put(
+                StandardEntryType.InProceedings, new EndNoteType("Conference Paper", 10));
         ENTRY_TYPE_MAPPING.put(StandardEntryType.Conference, new EndNoteType("Conference", 11));
         ENTRY_TYPE_MAPPING.put(IEEETranEntryType.Patent, new EndNoteType("Patent", 12));
         ENTRY_TYPE_MAPPING.put(StandardEntryType.Online, new EndNoteType("Web Page", 13));
-        ENTRY_TYPE_MAPPING.put(IEEETranEntryType.Electronic, new EndNoteType("Electronic Article", 14));
+        ENTRY_TYPE_MAPPING.put(
+                IEEETranEntryType.Electronic, new EndNoteType("Electronic Article", 14));
         ENTRY_TYPE_MAPPING.put(StandardEntryType.Misc, new EndNoteType("Generic", 15));
     }
 
@@ -101,7 +103,8 @@ public EndnoteXmlExporter(BibEntryPreferences bibEntryPreferences) {
     }
 
     @Override
-    public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries) throws Exception {
+    public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries)
+            throws Exception {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(file);
         Objects.requireNonNull(entries);
@@ -136,11 +139,13 @@ public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry>
                 Field field = fieldMapping.getKey();
                 String xmlElement = fieldMapping.getValue();
 
-                entry.getField(field).ifPresent(value -> {
-                    Element fieldElement = document.createElement(xmlElement);
-                    fieldElement.setTextContent(value);
-                    recordElement.appendChild(fieldElement);
-                });
+                entry.getField(field)
+                        .ifPresent(
+                                value -> {
+                                    Element fieldElement = document.createElement(xmlElement);
+                                    fieldElement.setTextContent(value);
+                                    recordElement.appendChild(fieldElement);
+                                });
             }
         }
 
@@ -151,70 +156,93 @@ public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry>
     }
 
     private static void mapTitle(BibEntry entry, Document document, Element recordElement) {
-        entry.getFieldOrAlias(StandardField.TITLE).ifPresent(title -> {
-            Element titlesElement = document.createElement("titles");
-
-            Element titleElement = document.createElement("title");
-            titleElement.setTextContent(title);
-            titlesElement.appendChild(titleElement);
-
-            entry.getField(new UnknownField("alt-title")).ifPresent(altTitle -> {
-                Element altTitleElement = document.createElement("alt-title");
-                altTitleElement.setTextContent(altTitle);
-                titlesElement.appendChild(altTitleElement);
-            });
-
-            entry.getField(StandardField.BOOKTITLE).ifPresent(secondaryTitle -> {
-                Element secondaryTitleElement = document.createElement("secondary-title");
-                secondaryTitleElement.setTextContent(secondaryTitle);
-                titlesElement.appendChild(secondaryTitleElement);
-            });
-
-            recordElement.appendChild(titlesElement);
-        });
+        entry.getFieldOrAlias(StandardField.TITLE)
+                .ifPresent(
+                        title -> {
+                            Element titlesElement = document.createElement("titles");
+
+                            Element titleElement = document.createElement("title");
+                            titleElement.setTextContent(title);
+                            titlesElement.appendChild(titleElement);
+
+                            entry.getField(new UnknownField("alt-title"))
+                                    .ifPresent(
+                                            altTitle -> {
+                                                Element altTitleElement =
+                                                        document.createElement("alt-title");
+                                                altTitleElement.setTextContent(altTitle);
+                                                titlesElement.appendChild(altTitleElement);
+                                            });
+
+                            entry.getField(StandardField.BOOKTITLE)
+                                    .ifPresent(
+                                            secondaryTitle -> {
+                                                Element secondaryTitleElement =
+                                                        document.createElement("secondary-title");
+                                                secondaryTitleElement.setTextContent(
+                                                        secondaryTitle);
+                                                titlesElement.appendChild(secondaryTitleElement);
+                                            });
+
+                            recordElement.appendChild(titlesElement);
+                        });
     }
 
     private static void mapJournalTitle(BibEntry entry, Document document, Element recordElement) {
-        entry.getFieldOrAlias(StandardField.JOURNAL).ifPresent(journalTitle -> {
-            Element periodicalElement = document.createElement("periodical");
-            Element fullTitleElement = document.createElement("full-title");
-            fullTitleElement.setTextContent(journalTitle);
-            periodicalElement.appendChild(fullTitleElement);
-            recordElement.appendChild(periodicalElement);
-        });
+        entry.getFieldOrAlias(StandardField.JOURNAL)
+                .ifPresent(
+                        journalTitle -> {
+                            Element periodicalElement = document.createElement("periodical");
+                            Element fullTitleElement = document.createElement("full-title");
+                            fullTitleElement.setTextContent(journalTitle);
+                            periodicalElement.appendChild(fullTitleElement);
+                            recordElement.appendChild(periodicalElement);
+                        });
     }
 
-    private void mapKeywords(BibDatabase bibDatabase, BibEntry entry, Document document, Element recordElement) {
-        entry.getFieldOrAlias(StandardField.KEYWORDS).ifPresent(keywords -> {
-            Element keywordsElement = document.createElement("keywords");
-            entry.getResolvedKeywords(bibEntryPreferences.getKeywordSeparator(), bibDatabase).forEach(keyword -> {
-                Element keywordElement = document.createElement("keyword");
-                // Hierarchical keywords are separated by the '>' character. See {@link } for details.
-                keywordElement.setTextContent(keyword.get());
-                keywordsElement.appendChild(keywordElement);
-            });
-            recordElement.appendChild(keywordsElement);
-        });
+    private void mapKeywords(
+            BibDatabase bibDatabase, BibEntry entry, Document document, Element recordElement) {
+        entry.getFieldOrAlias(StandardField.KEYWORDS)
+                .ifPresent(
+                        keywords -> {
+                            Element keywordsElement = document.createElement("keywords");
+                            entry.getResolvedKeywords(
+                                            bibEntryPreferences.getKeywordSeparator(), bibDatabase)
+                                    .forEach(
+                                            keyword -> {
+                                                Element keywordElement =
+                                                        document.createElement("keyword");
+                                                // Hierarchical keywords are separated by the '>'
+                                                // character. See {@link } for details.
+                                                keywordElement.setTextContent(keyword.get());
+                                                keywordsElement.appendChild(keywordElement);
+                                            });
+                            recordElement.appendChild(keywordsElement);
+                        });
     }
 
     private static void mapUrls(BibEntry entry, Document document, Element recordElement) {
         Element urlsElement = document.createElement("urls");
 
-        entry.getFieldOrAlias(StandardField.FILE).ifPresent(fileField -> {
-            Element pdfUrlsElement = document.createElement("pdf-urls");
-            Element urlElement = document.createElement("url");
-            urlElement.setTextContent(fileField);
-            pdfUrlsElement.appendChild(urlElement);
-            urlsElement.appendChild(pdfUrlsElement);
-        });
-
-        entry.getFieldOrAlias(StandardField.URL).ifPresent(url -> {
-            Element webUrlsElement = document.createElement("web-urls");
-            Element urlElement = document.createElement("url");
-            urlElement.setTextContent(url);
-            webUrlsElement.appendChild(urlElement);
-            urlsElement.appendChild(webUrlsElement);
-        });
+        entry.getFieldOrAlias(StandardField.FILE)
+                .ifPresent(
+                        fileField -> {
+                            Element pdfUrlsElement = document.createElement("pdf-urls");
+                            Element urlElement = document.createElement("url");
+                            urlElement.setTextContent(fileField);
+                            pdfUrlsElement.appendChild(urlElement);
+                            urlsElement.appendChild(pdfUrlsElement);
+                        });
+
+        entry.getFieldOrAlias(StandardField.URL)
+                .ifPresent(
+                        url -> {
+                            Element webUrlsElement = document.createElement("web-urls");
+                            Element urlElement = document.createElement("url");
+                            urlElement.setTextContent(url);
+                            webUrlsElement.appendChild(urlElement);
+                            urlsElement.appendChild(webUrlsElement);
+                        });
 
         if (urlsElement.hasChildNodes()) {
             recordElement.appendChild(urlsElement);
@@ -223,29 +251,38 @@ private static void mapUrls(BibEntry entry, Document document, Element recordEle
 
     private static void mapDates(BibEntry entry, Document document, Element recordElement) {
         Element datesElement = document.createElement("dates");
-        entry.getFieldOrAlias(StandardField.YEAR).ifPresent(year -> {
-            Element yearElement = document.createElement("year");
-            yearElement.setTextContent(year);
-            datesElement.appendChild(yearElement);
-        });
-        entry.getFieldOrAlias(StandardField.MONTH).ifPresent(month -> {
-            Element yearElement = document.createElement("month");
-            yearElement.setTextContent(month);
-            datesElement.appendChild(yearElement);
-        });
-        entry.getFieldOrAlias(StandardField.DAY).ifPresent(day -> {
-            Element yearElement = document.createElement("day");
-            yearElement.setTextContent(day);
-            datesElement.appendChild(yearElement);
-        });
-        // We need to use getField here - getFieldOrAlias for Date tries to convert year, month, and day to a date, which we do not want
-        entry.getField(StandardField.DATE).ifPresent(date -> {
-            Element pubDatesElement = document.createElement("pub-dates");
-            Element dateElement = document.createElement("date");
-            dateElement.setTextContent(date);
-            pubDatesElement.appendChild(dateElement);
-            datesElement.appendChild(pubDatesElement);
-        });
+        entry.getFieldOrAlias(StandardField.YEAR)
+                .ifPresent(
+                        year -> {
+                            Element yearElement = document.createElement("year");
+                            yearElement.setTextContent(year);
+                            datesElement.appendChild(yearElement);
+                        });
+        entry.getFieldOrAlias(StandardField.MONTH)
+                .ifPresent(
+                        month -> {
+                            Element yearElement = document.createElement("month");
+                            yearElement.setTextContent(month);
+                            datesElement.appendChild(yearElement);
+                        });
+        entry.getFieldOrAlias(StandardField.DAY)
+                .ifPresent(
+                        day -> {
+                            Element yearElement = document.createElement("day");
+                            yearElement.setTextContent(day);
+                            datesElement.appendChild(yearElement);
+                        });
+        // We need to use getField here - getFieldOrAlias for Date tries to convert year, month, and
+        // day to a date, which we do not want
+        entry.getField(StandardField.DATE)
+                .ifPresent(
+                        date -> {
+                            Element pubDatesElement = document.createElement("pub-dates");
+                            Element dateElement = document.createElement("date");
+                            dateElement.setTextContent(date);
+                            pubDatesElement.appendChild(dateElement);
+                            datesElement.appendChild(pubDatesElement);
+                        });
         if (datesElement.hasChildNodes()) {
             recordElement.appendChild(datesElement);
         }
@@ -260,10 +297,16 @@ private static void mapEntryType(BibEntry entry, Document document, Element reco
         recordElement.appendChild(refTypeElement);
     }
 
-    private static void createMetaInformationElements(BibDatabaseContext databaseContext, Document document, Element recordElement) {
+    private static void createMetaInformationElements(
+            BibDatabaseContext databaseContext, Document document, Element recordElement) {
         Element databaseElement = document.createElement("database");
         databaseElement.setAttribute("name", "MyLibrary");
-        String name = databaseContext.getDatabasePath().map(Path::getFileName).map(Path::toString).orElse("MyLibrary");
+        String name =
+                databaseContext
+                        .getDatabasePath()
+                        .map(Path::getFileName)
+                        .map(Path::toString)
+                        .orElse("MyLibrary");
         databaseElement.setTextContent(name);
         recordElement.appendChild(databaseElement);
 
@@ -273,20 +316,26 @@ private static void createMetaInformationElements(BibDatabaseContext databaseCon
         recordElement.appendChild(sourceAppElement);
     }
 
-    private static void mapAuthorAndEditor(BibEntry entry, Document document, Element recordElement) {
+    private static void mapAuthorAndEditor(
+            BibEntry entry, Document document, Element recordElement) {
         Element contributorsElement = document.createElement("contributors");
-        entry.getField(StandardField.AUTHOR).ifPresent(authors -> {
-            addPersons(authors, document, contributorsElement, "authors");
-        });
-        entry.getField(StandardField.EDITOR).ifPresent(editors -> {
-            addPersons(editors, document, contributorsElement, "secondary-authors");
-        });
+        entry.getField(StandardField.AUTHOR)
+                .ifPresent(
+                        authors -> {
+                            addPersons(authors, document, contributorsElement, "authors");
+                        });
+        entry.getField(StandardField.EDITOR)
+                .ifPresent(
+                        editors -> {
+                            addPersons(editors, document, contributorsElement, "secondary-authors");
+                        });
         if (contributorsElement.hasChildNodes()) {
             recordElement.appendChild(contributorsElement);
         }
     }
 
-    private static void addPersons(String authors, Document document, Element contributorsElement, String wrapTagName) {
+    private static void addPersons(
+            String authors, Document document, Element contributorsElement, String wrapTagName) {
         Element container = document.createElement(wrapTagName);
         AuthorList parsedPersons = AuthorList.parse(authors).latexFree();
         for (Author person : parsedPersons) {
diff --git a/src/main/java/org/jabref/logic/exporter/ExportPreferences.java b/src/main/java/org/jabref/logic/exporter/ExportPreferences.java
index 5c6be44c4079..594f81f1d9b4 100644
--- a/src/main/java/org/jabref/logic/exporter/ExportPreferences.java
+++ b/src/main/java/org/jabref/logic/exporter/ExportPreferences.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.nio.file.Path;
-import java.util.List;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -12,6 +9,9 @@
 
 import org.jabref.model.metadata.SaveOrder;
 
+import java.nio.file.Path;
+import java.util.List;
+
 public class ExportPreferences {
 
     private final StringProperty lastExportExtension;
@@ -19,10 +19,11 @@ public class ExportPreferences {
     private final ObjectProperty<SaveOrder> exportSaveOrder;
     private final ObservableList<TemplateExporter> customExporters;
 
-    public ExportPreferences(String lastExportExtension,
-                             Path exportWorkingDirectory,
-                             SaveOrder exportSaveOrder,
-                             List<TemplateExporter> customExporters) {
+    public ExportPreferences(
+            String lastExportExtension,
+            Path exportWorkingDirectory,
+            SaveOrder exportSaveOrder,
+            List<TemplateExporter> customExporters) {
         this.lastExportExtension = new SimpleStringProperty(lastExportExtension);
         this.exportWorkingDirectory = new SimpleObjectProperty<>(exportWorkingDirectory);
         this.exportSaveOrder = new SimpleObjectProperty<>(exportSaveOrder);
diff --git a/src/main/java/org/jabref/logic/exporter/Exporter.java b/src/main/java/org/jabref/logic/exporter/Exporter.java
index 393290827039..e999a3ae058b 100644
--- a/src/main/java/org/jabref/logic/exporter/Exporter.java
+++ b/src/main/java/org/jabref/logic/exporter/Exporter.java
@@ -1,11 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.util.FileType;
@@ -13,6 +7,12 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
 public abstract class Exporter {
 
     private final String id;
@@ -58,9 +58,16 @@ public String toString() {
      * @param file            the file to write to
      * @param entries         a list containing all entries that should be exported
      */
-    public abstract void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries) throws Exception;
+    public abstract void export(
+            BibDatabaseContext databaseContext, Path file, List<BibEntry> entries) throws Exception;
 
-    public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries, List<Path> fileDirForDatabase, JournalAbbreviationRepository abbreviationRepository) throws Exception {
+    public void export(
+            BibDatabaseContext databaseContext,
+            Path file,
+            List<BibEntry> entries,
+            List<Path> fileDirForDatabase,
+            JournalAbbreviationRepository abbreviationRepository)
+            throws Exception {
         export(databaseContext, file, entries);
     }
 
@@ -75,18 +82,25 @@ public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry>
      * @return whether any file was written on
      * @throws Exception if the writing fails
      */
-    public boolean exportToAllFilesOfEntry(BibDatabaseContext databaseContext,
-                                           FilePreferences filePreferences,
-                                           BibEntry entryToWriteOn,
-                                           List<BibEntry> entriesToWrite,
-                                           JournalAbbreviationRepository abbreviationRepository) throws Exception {
+    public boolean exportToAllFilesOfEntry(
+            BibDatabaseContext databaseContext,
+            FilePreferences filePreferences,
+            BibEntry entryToWriteOn,
+            List<BibEntry> entriesToWrite,
+            JournalAbbreviationRepository abbreviationRepository)
+            throws Exception {
         boolean writtenToAFile = false;
 
         for (LinkedFile file : entryToWriteOn.getFiles()) {
             if (file.getFileType().equals(fileType.getName())) {
                 Optional<Path> filePath = file.findIn(databaseContext, filePreferences);
                 if (filePath.isPresent()) {
-                    export(databaseContext, filePath.get(), entriesToWrite, Collections.emptyList(), abbreviationRepository);
+                    export(
+                            databaseContext,
+                            filePath.get(),
+                            entriesToWrite,
+                            Collections.emptyList(),
+                            abbreviationRepository);
                     writtenToAFile = true;
                 }
             }
@@ -108,10 +122,12 @@ public boolean exportToAllFilesOfEntry(BibDatabaseContext databaseContext,
      * @return whether the file was written on at least once
      * @throws Exception if the writing fails
      */
-    public boolean exportToFileByPath(BibDatabaseContext databaseContext,
-                                      FilePreferences filePreferences,
-                                      Path filePath,
-                                      JournalAbbreviationRepository abbreviationRepository) throws Exception {
+    public boolean exportToFileByPath(
+            BibDatabaseContext databaseContext,
+            FilePreferences filePreferences,
+            Path filePath,
+            JournalAbbreviationRepository abbreviationRepository)
+            throws Exception {
         if (!Files.exists(filePath)) {
             return false;
         }
@@ -119,9 +135,17 @@ public boolean exportToFileByPath(BibDatabaseContext databaseContext,
         for (BibEntry entry : databaseContext.getEntries()) {
             for (LinkedFile linkedFile : entry.getFiles()) {
                 if (linkedFile.getFileType().equals(fileType.getName())) {
-                    Optional<Path> linkedFilePath = linkedFile.findIn(databaseContext.getFileDirectories(filePreferences));
-                    if (linkedFilePath.isPresent() && Files.exists(linkedFilePath.get()) && Files.isSameFile(linkedFilePath.get(), filePath)) {
-                        export(databaseContext, filePath, List.of(entry), Collections.emptyList(), abbreviationRepository);
+                    Optional<Path> linkedFilePath =
+                            linkedFile.findIn(databaseContext.getFileDirectories(filePreferences));
+                    if (linkedFilePath.isPresent()
+                            && Files.exists(linkedFilePath.get())
+                            && Files.isSameFile(linkedFilePath.get(), filePath)) {
+                        export(
+                                databaseContext,
+                                filePath,
+                                List.of(entry),
+                                Collections.emptyList(),
+                                abbreviationRepository);
                         writtenABibEntry = true;
                     }
                 }
diff --git a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
index 8f5f61afdf3b..11f131855596 100644
--- a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
+++ b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
@@ -1,11 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
@@ -16,6 +10,12 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.metadata.SelfContainedSaveOrder;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 public class ExporterFactory {
 
     private final List<Exporter> exporters;
@@ -24,44 +24,197 @@ private ExporterFactory(List<Exporter> exporters) {
         this.exporters = Objects.requireNonNull(exporters);
     }
 
-    public static ExporterFactory create(CliPreferences preferences,
-                                         BibEntryTypesManager entryTypesManager) {
+    public static ExporterFactory create(
+            CliPreferences preferences, BibEntryTypesManager entryTypesManager) {
 
-        List<TemplateExporter> customFormats = preferences.getExportPreferences().getCustomExporters();
+        List<TemplateExporter> customFormats =
+                preferences.getExportPreferences().getCustomExporters();
         LayoutFormatterPreferences layoutPreferences = preferences.getLayoutFormatterPreferences();
-        SelfContainedSaveOrder saveOrder = SelfContainedSaveOrder.of(preferences.getSelfContainedExportConfiguration().getSaveOrder());
+        SelfContainedSaveOrder saveOrder =
+                SelfContainedSaveOrder.of(
+                        preferences.getSelfContainedExportConfiguration().getSaveOrder());
         XmpPreferences xmpPreferences = preferences.getXmpPreferences();
         FieldPreferences fieldPreferences = preferences.getFieldPreferences();
-        BibDatabaseMode bibDatabaseMode = preferences.getLibraryPreferences().getDefaultBibDatabaseMode();
+        BibDatabaseMode bibDatabaseMode =
+                preferences.getLibraryPreferences().getDefaultBibDatabaseMode();
 
         List<Exporter> exporters = new ArrayList<>();
 
         // Initialize build-in exporters
-        exporters.add(new TemplateExporter("HTML", "html", "html", null, StandardFileType.HTML, layoutPreferences, saveOrder));
-        exporters.add(new TemplateExporter(Localization.lang("Simple HTML"), "simplehtml", "simplehtml", null, StandardFileType.HTML, layoutPreferences, saveOrder));
-        exporters.add(new TemplateExporter("DocBook 5.1", "docbook5", "docbook5", null, StandardFileType.XML, layoutPreferences, saveOrder));
-        exporters.add(new TemplateExporter("DocBook 4", "docbook4", "docbook4", null, StandardFileType.XML, layoutPreferences, saveOrder));
-        exporters.add(new TemplateExporter("DIN 1505", "din1505", "din1505winword", "din1505", StandardFileType.RTF, layoutPreferences, saveOrder));
-        exporters.add(new TemplateExporter("BibO RDF", "bibordf", "bibordf", null, StandardFileType.RDF, layoutPreferences, saveOrder));
-        exporters.add(new TemplateExporter(Localization.lang("HTML table"), "tablerefs", "tablerefs", "tablerefs", StandardFileType.HTML, layoutPreferences, saveOrder));
-        exporters.add(new TemplateExporter(Localization.lang("HTML list"), "listrefs", "listrefs", "listrefs", StandardFileType.HTML, layoutPreferences, saveOrder));
-        exporters.add(new TemplateExporter(Localization.lang("HTML table (with Abstract & BibTeX)"), "tablerefsabsbib", "tablerefsabsbib", "tablerefsabsbib", StandardFileType.HTML, layoutPreferences, saveOrder));
-        exporters.add(new TemplateExporter("Harvard RTF", "harvard", "harvard", "harvard", StandardFileType.RTF, layoutPreferences, saveOrder));
-        exporters.add(new TemplateExporter("ISO 690 RTF", "iso690rtf", "iso690RTF", "iso690rtf", StandardFileType.RTF, layoutPreferences, saveOrder));
-        exporters.add(new TemplateExporter("ISO 690", "iso690txt", "iso690", "iso690txt", StandardFileType.TXT, layoutPreferences, saveOrder));
-        exporters.add(new TemplateExporter("Endnote", "endnote", "EndNote", "endnote", StandardFileType.TXT, layoutPreferences, saveOrder));
-        exporters.add(new TemplateExporter("OpenOffice/LibreOffice CSV", "oocsv", "openoffice-csv", "openoffice", StandardFileType.CSV, layoutPreferences, saveOrder));
-        exporters.add(new TemplateExporter("RIS", "ris", "ris", "ris", StandardFileType.RIS, layoutPreferences, saveOrder, BlankLineBehaviour.DELETE_BLANKS));
-        exporters.add(new TemplateExporter("MIS Quarterly", "misq", "misq", "misq", StandardFileType.RTF, layoutPreferences, saveOrder));
-        exporters.add(new TemplateExporter("CSL YAML", "yaml", "yaml", null, StandardFileType.YAML, layoutPreferences, saveOrder, BlankLineBehaviour.DELETE_BLANKS));
-        exporters.add(new TemplateExporter("Hayagriva YAML", "hayagrivayaml", "hayagrivayaml", null, StandardFileType.YAML, layoutPreferences, saveOrder, BlankLineBehaviour.DELETE_BLANKS));
+        exporters.add(
+                new TemplateExporter(
+                        "HTML",
+                        "html",
+                        "html",
+                        null,
+                        StandardFileType.HTML,
+                        layoutPreferences,
+                        saveOrder));
+        exporters.add(
+                new TemplateExporter(
+                        Localization.lang("Simple HTML"),
+                        "simplehtml",
+                        "simplehtml",
+                        null,
+                        StandardFileType.HTML,
+                        layoutPreferences,
+                        saveOrder));
+        exporters.add(
+                new TemplateExporter(
+                        "DocBook 5.1",
+                        "docbook5",
+                        "docbook5",
+                        null,
+                        StandardFileType.XML,
+                        layoutPreferences,
+                        saveOrder));
+        exporters.add(
+                new TemplateExporter(
+                        "DocBook 4",
+                        "docbook4",
+                        "docbook4",
+                        null,
+                        StandardFileType.XML,
+                        layoutPreferences,
+                        saveOrder));
+        exporters.add(
+                new TemplateExporter(
+                        "DIN 1505",
+                        "din1505",
+                        "din1505winword",
+                        "din1505",
+                        StandardFileType.RTF,
+                        layoutPreferences,
+                        saveOrder));
+        exporters.add(
+                new TemplateExporter(
+                        "BibO RDF",
+                        "bibordf",
+                        "bibordf",
+                        null,
+                        StandardFileType.RDF,
+                        layoutPreferences,
+                        saveOrder));
+        exporters.add(
+                new TemplateExporter(
+                        Localization.lang("HTML table"),
+                        "tablerefs",
+                        "tablerefs",
+                        "tablerefs",
+                        StandardFileType.HTML,
+                        layoutPreferences,
+                        saveOrder));
+        exporters.add(
+                new TemplateExporter(
+                        Localization.lang("HTML list"),
+                        "listrefs",
+                        "listrefs",
+                        "listrefs",
+                        StandardFileType.HTML,
+                        layoutPreferences,
+                        saveOrder));
+        exporters.add(
+                new TemplateExporter(
+                        Localization.lang("HTML table (with Abstract & BibTeX)"),
+                        "tablerefsabsbib",
+                        "tablerefsabsbib",
+                        "tablerefsabsbib",
+                        StandardFileType.HTML,
+                        layoutPreferences,
+                        saveOrder));
+        exporters.add(
+                new TemplateExporter(
+                        "Harvard RTF",
+                        "harvard",
+                        "harvard",
+                        "harvard",
+                        StandardFileType.RTF,
+                        layoutPreferences,
+                        saveOrder));
+        exporters.add(
+                new TemplateExporter(
+                        "ISO 690 RTF",
+                        "iso690rtf",
+                        "iso690RTF",
+                        "iso690rtf",
+                        StandardFileType.RTF,
+                        layoutPreferences,
+                        saveOrder));
+        exporters.add(
+                new TemplateExporter(
+                        "ISO 690",
+                        "iso690txt",
+                        "iso690",
+                        "iso690txt",
+                        StandardFileType.TXT,
+                        layoutPreferences,
+                        saveOrder));
+        exporters.add(
+                new TemplateExporter(
+                        "Endnote",
+                        "endnote",
+                        "EndNote",
+                        "endnote",
+                        StandardFileType.TXT,
+                        layoutPreferences,
+                        saveOrder));
+        exporters.add(
+                new TemplateExporter(
+                        "OpenOffice/LibreOffice CSV",
+                        "oocsv",
+                        "openoffice-csv",
+                        "openoffice",
+                        StandardFileType.CSV,
+                        layoutPreferences,
+                        saveOrder));
+        exporters.add(
+                new TemplateExporter(
+                        "RIS",
+                        "ris",
+                        "ris",
+                        "ris",
+                        StandardFileType.RIS,
+                        layoutPreferences,
+                        saveOrder,
+                        BlankLineBehaviour.DELETE_BLANKS));
+        exporters.add(
+                new TemplateExporter(
+                        "MIS Quarterly",
+                        "misq",
+                        "misq",
+                        "misq",
+                        StandardFileType.RTF,
+                        layoutPreferences,
+                        saveOrder));
+        exporters.add(
+                new TemplateExporter(
+                        "CSL YAML",
+                        "yaml",
+                        "yaml",
+                        null,
+                        StandardFileType.YAML,
+                        layoutPreferences,
+                        saveOrder,
+                        BlankLineBehaviour.DELETE_BLANKS));
+        exporters.add(
+                new TemplateExporter(
+                        "Hayagriva YAML",
+                        "hayagrivayaml",
+                        "hayagrivayaml",
+                        null,
+                        StandardFileType.YAML,
+                        layoutPreferences,
+                        saveOrder,
+                        BlankLineBehaviour.DELETE_BLANKS));
         exporters.add(new OpenOfficeDocumentCreator());
         exporters.add(new OpenDocumentSpreadsheetCreator());
         exporters.add(new MSBibExporter());
         exporters.add(new ModsExporter());
         exporters.add(new XmpExporter(xmpPreferences));
         exporters.add(new XmpPdfExporter(xmpPreferences));
-        exporters.add(new EmbeddedBibFilePdfExporter(bibDatabaseMode, entryTypesManager, fieldPreferences));
+        exporters.add(
+                new EmbeddedBibFilePdfExporter(
+                        bibDatabaseMode, entryTypesManager, fieldPreferences));
         exporters.add(new CffExporter());
         exporters.add(new EndnoteXmlExporter(preferences.getBibEntryPreferences()));
 
@@ -87,6 +240,8 @@ public List<Exporter> getExporters() {
      * @return The exporter, or an empty option if no exporter with that name is registered.
      */
     public Optional<Exporter> getExporterByName(String consoleName) {
-        return exporters.stream().filter(exporter -> exporter.getId().equalsIgnoreCase(consoleName)).findFirst();
+        return exporters.stream()
+                .filter(exporter -> exporter.getId().equalsIgnoreCase(consoleName))
+                .findFirst();
     }
 }
diff --git a/src/main/java/org/jabref/logic/exporter/GroupSerializer.java b/src/main/java/org/jabref/logic/exporter/GroupSerializer.java
index cdcc34a0842e..b0b2d28cb1a2 100644
--- a/src/main/java/org/jabref/logic/exporter/GroupSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/GroupSerializer.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javafx.scene.paint.Color;
 
 import org.jabref.logic.util.MetadataSerializationConfiguration;
@@ -21,6 +18,9 @@
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class GroupSerializer {
     private static String serializeAllEntriesGroup() {
         return MetadataSerializationConfiguration.ALL_ENTRIES_GROUP_ID;
@@ -29,7 +29,11 @@ private static String serializeAllEntriesGroup() {
     private String serializeExplicitGroup(ExplicitGroup group) {
         StringBuilder sb = new StringBuilder();
         sb.append(MetadataSerializationConfiguration.EXPLICIT_GROUP_ID);
-        sb.append(StringUtil.quote(group.getName(), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        sb.append(
+                StringUtil.quote(
+                        group.getName(),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
         sb.append(group.getHierarchicalContext().ordinal());
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
@@ -43,13 +47,25 @@ private String serializeKeywordGroup(KeywordGroup group) {
         Boolean isRegex = group instanceof RegexKeywordGroup;
         StringBuilder sb = new StringBuilder();
         sb.append(MetadataSerializationConfiguration.KEYWORD_GROUP_ID);
-        sb.append(StringUtil.quote(group.getName(), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        sb.append(
+                StringUtil.quote(
+                        group.getName(),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
         sb.append(group.getHierarchicalContext().ordinal());
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
-        sb.append(StringUtil.quote(group.getSearchField().getName(), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        sb.append(
+                StringUtil.quote(
+                        group.getSearchField().getName(),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
-        sb.append(StringUtil.quote(group.getSearchExpression(), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        sb.append(
+                StringUtil.quote(
+                        group.getSearchExpression(),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
         sb.append(StringUtil.booleanToBinaryString(group.isCaseSensitive()));
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
@@ -64,15 +80,27 @@ private String serializeKeywordGroup(KeywordGroup group) {
     private String serializeSearchGroup(SearchGroup group) {
         StringBuilder sb = new StringBuilder();
         sb.append(MetadataSerializationConfiguration.SEARCH_GROUP_ID);
-        sb.append(StringUtil.quote(group.getName(), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        sb.append(
+                StringUtil.quote(
+                        group.getName(),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
         sb.append(group.getHierarchicalContext().ordinal());
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
-        sb.append(StringUtil.quote(group.getSearchExpression(), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        sb.append(
+                StringUtil.quote(
+                        group.getSearchExpression(),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
-        sb.append(StringUtil.booleanToBinaryString(group.getSearchFlags().contains(SearchFlags.CASE_SENSITIVE)));
+        sb.append(
+                StringUtil.booleanToBinaryString(
+                        group.getSearchFlags().contains(SearchFlags.CASE_SENSITIVE)));
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
-        sb.append(StringUtil.booleanToBinaryString(group.getSearchFlags().contains(SearchFlags.REGULAR_EXPRESSION)));
+        sb.append(
+                StringUtil.booleanToBinaryString(
+                        group.getSearchFlags().contains(SearchFlags.REGULAR_EXPRESSION)));
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
 
         appendGroupDetails(sb, group);
@@ -129,18 +157,27 @@ private String serializeGroup(AbstractGroup group) {
         } else if (group instanceof TexGroup texGroup) {
             return serializeTexGroup(texGroup);
         } else {
-            throw new UnsupportedOperationException("Don't know how to serialize group" + group.getClass().getName());
+            throw new UnsupportedOperationException(
+                    "Don't know how to serialize group" + group.getClass().getName());
         }
     }
 
     private String serializeTexGroup(TexGroup group) {
         StringBuilder sb = new StringBuilder();
         sb.append(MetadataSerializationConfiguration.TEX_GROUP_ID);
-        sb.append(StringUtil.quote(group.getName(), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        sb.append(
+                StringUtil.quote(
+                        group.getName(),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
         sb.append(group.getHierarchicalContext().ordinal());
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
-        sb.append(StringUtil.quote(FileUtil.toPortableString(group.getFilePath()), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        sb.append(
+                StringUtil.quote(
+                        FileUtil.toPortableString(group.getFilePath()),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
 
         appendGroupDetails(sb, group);
@@ -152,14 +189,22 @@ private String serializeAutomaticPersonsGroup(AutomaticPersonsGroup group) {
         StringBuilder sb = new StringBuilder();
         sb.append(MetadataSerializationConfiguration.AUTOMATIC_PERSONS_GROUP_ID);
         appendAutomaticGroupDetails(sb, group);
-        sb.append(StringUtil.quote(group.getField().getName(), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        sb.append(
+                StringUtil.quote(
+                        group.getField().getName(),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
         appendGroupDetails(sb, group);
         return sb.toString();
     }
 
     private void appendAutomaticGroupDetails(StringBuilder builder, AutomaticGroup group) {
-        builder.append(StringUtil.quote(group.getName(), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        builder.append(
+                StringUtil.quote(
+                        group.getName(),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
         builder.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
         builder.append(group.getHierarchicalContext().ordinal());
         builder.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
@@ -169,11 +214,23 @@ private String serializeAutomaticKeywordGroup(AutomaticKeywordGroup group) {
         StringBuilder sb = new StringBuilder();
         sb.append(MetadataSerializationConfiguration.AUTOMATIC_KEYWORD_GROUP_ID);
         appendAutomaticGroupDetails(sb, group);
-        sb.append(StringUtil.quote(group.getField().getName(), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
-        sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
-        sb.append(StringUtil.quote(group.getKeywordDelimiter().toString(), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
-        sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
-        sb.append(StringUtil.quote(group.getKeywordHierarchicalDelimiter().toString(), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        sb.append(
+                StringUtil.quote(
+                        group.getField().getName(),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
+        sb.append(
+                StringUtil.quote(
+                        group.getKeywordDelimiter().toString(),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
+        sb.append(
+                StringUtil.quote(
+                        group.getKeywordHierarchicalDelimiter().toString(),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
         appendGroupDetails(sb, group);
         return sb.toString();
diff --git a/src/main/java/org/jabref/logic/exporter/MSBibExporter.java b/src/main/java/org/jabref/logic/exporter/MSBibExporter.java
index ea80cefc7f4a..f6982f26d5f4 100644
--- a/src/main/java/org/jabref/logic/exporter/MSBibExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/MSBibExporter.java
@@ -1,5 +1,11 @@
 package org.jabref.logic.exporter;
 
+import org.jabref.logic.msbib.MSBibDatabase;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jspecify.annotations.NonNull;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
@@ -14,13 +20,6 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.jabref.logic.msbib.MSBibDatabase;
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-
-import org.jspecify.annotations.NonNull;
-
 /**
  * TemplateExporter for exporting in MSBIB XML format.
  */
@@ -34,9 +33,11 @@ public MSBibExporter() {
     }
 
     @Override
-    public void export(@NonNull BibDatabaseContext databaseContext,
-                       @NonNull Path file,
-                       @NonNull List<BibEntry> entries) throws SaveException {
+    public void export(
+            @NonNull BibDatabaseContext databaseContext,
+            @NonNull Path file,
+            @NonNull List<BibEntry> entries)
+            throws SaveException {
         Objects.requireNonNull(databaseContext); // required by test case
         if (entries.isEmpty()) {
             return;
@@ -52,7 +53,9 @@ public void export(@NonNull BibDatabaseContext databaseContext,
                 Transformer trans = transformerFactory.newTransformer();
                 trans.setOutputProperty(OutputKeys.INDENT, "yes");
                 trans.transform(source, result);
-            } catch (TransformerException | IllegalArgumentException | TransformerFactoryConfigurationError e) {
+            } catch (TransformerException
+                    | IllegalArgumentException
+                    | TransformerFactoryConfigurationError e) {
                 throw new SaveException(e);
             }
         } catch (IOException ex) {
diff --git a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
index 4b8f625ea15c..cd6af24d3aca 100644
--- a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
@@ -1,13 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.StringJoiner;
-import java.util.TreeMap;
-
 import org.jabref.logic.citationkeypattern.AbstractCitationKeyPatterns;
 import org.jabref.logic.citationkeypattern.CitationKeyPattern;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPatterns;
@@ -22,66 +14,114 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.StringJoiner;
+import java.util.TreeMap;
+
 /**
  * Reading is done at {@link org.jabref.logic.importer.util.MetaDataParser}
  */
 public class MetaDataSerializer {
 
-    private MetaDataSerializer() {
-    }
+    private MetaDataSerializer() {}
 
     /**
      * Writes all data in the format &lt;key, serialized data>.
      */
-    public static Map<String, String> getSerializedStringMap(MetaData metaData,
-                                                             GlobalCitationKeyPatterns globalCiteKeyPatterns) {
+    public static Map<String, String> getSerializedStringMap(
+            MetaData metaData, GlobalCitationKeyPatterns globalCiteKeyPatterns) {
 
         // metadata-key, list of contents
         //  - contents to be separated by OS.NEWLINE
-        //  - each meta data item is written as separate @Comment entry - see org.jabref.logic.exporter.BibtexDatabaseWriter.writeMetaDataItem
+        //  - each meta data item is written as separate @Comment entry - see
+        // org.jabref.logic.exporter.BibtexDatabaseWriter.writeMetaDataItem
         Map<String, List<String>> stringyMetaData = new HashMap<>();
 
         // First write all meta data except groups
-        metaData.getSaveOrder().ifPresent(
-                saveOrderConfig -> stringyMetaData.put(MetaData.SAVE_ORDER_CONFIG, saveOrderConfig.getAsStringList()));
-        metaData.getSaveActions().ifPresent(
-                saveActions -> stringyMetaData.put(MetaData.SAVE_ACTIONS, getAsStringList(saveActions, OS.NEWLINE)));
+        metaData.getSaveOrder()
+                .ifPresent(
+                        saveOrderConfig ->
+                                stringyMetaData.put(
+                                        MetaData.SAVE_ORDER_CONFIG,
+                                        saveOrderConfig.getAsStringList()));
+        metaData.getSaveActions()
+                .ifPresent(
+                        saveActions ->
+                                stringyMetaData.put(
+                                        MetaData.SAVE_ACTIONS,
+                                        getAsStringList(saveActions, OS.NEWLINE)));
         if (metaData.isProtected()) {
             stringyMetaData.put(MetaData.PROTECTED_FLAG_META, Collections.singletonList("true"));
         }
         stringyMetaData.putAll(serializeCiteKeyPatterns(metaData, globalCiteKeyPatterns));
-        metaData.getMode().ifPresent(
-                mode -> stringyMetaData.put(MetaData.DATABASE_TYPE, Collections.singletonList(mode.getAsString())));
-        metaData.getDefaultFileDirectory().ifPresent(
-                path -> stringyMetaData.put(MetaData.FILE_DIRECTORY, Collections.singletonList(path.trim())));
-        metaData.getUserFileDirectories().forEach((user, path) -> stringyMetaData
-                .put(MetaData.FILE_DIRECTORY + '-' + user, Collections.singletonList(path.trim())));
-        metaData.getLatexFileDirectories().forEach((user, path) -> stringyMetaData
-                .put(MetaData.FILE_DIRECTORY_LATEX + '-' + user, Collections.singletonList(path.toString().trim())));
-        metaData.getVersionDBStructure().ifPresent(
-                versionDBStructure -> stringyMetaData.put(MetaData.VERSION_DB_STRUCT, Collections.singletonList(versionDBStructure.trim())));
+        metaData.getMode()
+                .ifPresent(
+                        mode ->
+                                stringyMetaData.put(
+                                        MetaData.DATABASE_TYPE,
+                                        Collections.singletonList(mode.getAsString())));
+        metaData.getDefaultFileDirectory()
+                .ifPresent(
+                        path ->
+                                stringyMetaData.put(
+                                        MetaData.FILE_DIRECTORY,
+                                        Collections.singletonList(path.trim())));
+        metaData.getUserFileDirectories()
+                .forEach(
+                        (user, path) ->
+                                stringyMetaData.put(
+                                        MetaData.FILE_DIRECTORY + '-' + user,
+                                        Collections.singletonList(path.trim())));
+        metaData.getLatexFileDirectories()
+                .forEach(
+                        (user, path) ->
+                                stringyMetaData.put(
+                                        MetaData.FILE_DIRECTORY_LATEX + '-' + user,
+                                        Collections.singletonList(path.toString().trim())));
+        metaData.getVersionDBStructure()
+                .ifPresent(
+                        versionDBStructure ->
+                                stringyMetaData.put(
+                                        MetaData.VERSION_DB_STRUCT,
+                                        Collections.singletonList(versionDBStructure.trim())));
 
         for (ContentSelector selector : metaData.getContentSelectorsSorted()) {
-            stringyMetaData.put(MetaData.SELECTOR_META_PREFIX + selector.getField().getName(), selector.getValues());
+            stringyMetaData.put(
+                    MetaData.SELECTOR_META_PREFIX + selector.getField().getName(),
+                    selector.getValues());
         }
 
         Map<String, String> serializedMetaData = serializeMetaData(stringyMetaData);
 
         // Write groups if present.
         // Skip this if only the root node exists (which is always the AllEntriesGroup).
-        metaData.getGroups().filter(root -> root.getNumberOfChildren() > 0).ifPresent(
-                root -> serializedMetaData.put(MetaData.GROUPSTREE, serializeGroups(root)));
+        metaData.getGroups()
+                .filter(root -> root.getNumberOfChildren() > 0)
+                .ifPresent(
+                        root -> serializedMetaData.put(MetaData.GROUPSTREE, serializeGroups(root)));
 
-        metaData.getGroupSearchSyntaxVersion().ifPresent(
-                version -> serializedMetaData.put(MetaData.GROUPS_SEARCH_SYNTAX_VERSION, version.toString()));
+        metaData.getGroupSearchSyntaxVersion()
+                .ifPresent(
+                        version ->
+                                serializedMetaData.put(
+                                        MetaData.GROUPS_SEARCH_SYNTAX_VERSION, version.toString()));
 
         // finally add all unknown meta data items to the serialization map
         Map<String, List<String>> unknownMetaData = metaData.getUnknownMetaData();
         for (Map.Entry<String, List<String>> entry : unknownMetaData.entrySet()) {
             // The last "MetaData.SEPARATOR_STRING" adds compatibility to JabRef v5.9 and earlier
-            StringJoiner value = new StringJoiner(MetaData.SEPARATOR_STRING + OS.NEWLINE, OS.NEWLINE, MetaData.SEPARATOR_STRING + OS.NEWLINE);
+            StringJoiner value =
+                    new StringJoiner(
+                            MetaData.SEPARATOR_STRING + OS.NEWLINE,
+                            OS.NEWLINE,
+                            MetaData.SEPARATOR_STRING + OS.NEWLINE);
             for (String line : entry.getValue()) {
-                value.add(line.replace(MetaData.SEPARATOR_STRING, "\\" + MetaData.SEPARATOR_STRING));
+                value.add(
+                        line.replace(MetaData.SEPARATOR_STRING, "\\" + MetaData.SEPARATOR_STRING));
             }
             serializedMetaData.put(entry.getKey(), value.toString());
         }
@@ -89,7 +129,8 @@ public static Map<String, String> getSerializedStringMap(MetaData metaData,
         return serializedMetaData;
     }
 
-    private static Map<String, String> serializeMetaData(Map<String, List<String>> stringyMetaData) {
+    private static Map<String, String> serializeMetaData(
+            Map<String, List<String>> stringyMetaData) {
         Map<String, String> serializedMetaData = new TreeMap<>();
         for (Map.Entry<String, List<String>> metaItem : stringyMetaData.entrySet()) {
             List<String> itemList = metaItem.getValue();
@@ -100,7 +141,8 @@ private static Map<String, String> serializeMetaData(Map<String, List<String>> s
 
             boolean isSaveActions = metaItem.getKey().equals(MetaData.SAVE_ACTIONS);
             // The last "MetaData.SEPARATOR_STRING" adds compatibility to JabRef v5.9 and earlier
-            StringJoiner joiner = new StringJoiner(MetaData.SEPARATOR_STRING, "", MetaData.SEPARATOR_STRING);
+            StringJoiner joiner =
+                    new StringJoiner(MetaData.SEPARATOR_STRING, "", MetaData.SEPARATOR_STRING);
             boolean lastWasSaveActionsEnablement = false;
             for (String dataItem : itemList) {
                 String string;
@@ -109,11 +151,14 @@ private static Map<String, String> serializeMetaData(Map<String, List<String>> s
                 } else {
                     string = "";
                 }
-                string += StringUtil.quote(dataItem, MetaData.SEPARATOR_STRING, MetaData.ESCAPE_CHARACTER);
+                string +=
+                        StringUtil.quote(
+                                dataItem, MetaData.SEPARATOR_STRING, MetaData.ESCAPE_CHARACTER);
                 // in case of save actions, add an additional newline after the enabled flag
-                lastWasSaveActionsEnablement = isSaveActions
-                        && (FieldFormatterCleanups.ENABLED.equals(dataItem)
-                        || FieldFormatterCleanups.DISABLED.equals(dataItem));
+                lastWasSaveActionsEnablement =
+                        isSaveActions
+                                && (FieldFormatterCleanups.ENABLED.equals(dataItem)
+                                        || FieldFormatterCleanups.DISABLED.equals(dataItem));
                 joiner.add(string);
             }
             String serializedItem = joiner.toString();
@@ -125,9 +170,11 @@ private static Map<String, String> serializeMetaData(Map<String, List<String>> s
         return serializedMetaData;
     }
 
-    private static Map<String, List<String>> serializeCiteKeyPatterns(MetaData metaData, GlobalCitationKeyPatterns globalCitationKeyPatterns) {
+    private static Map<String, List<String>> serializeCiteKeyPatterns(
+            MetaData metaData, GlobalCitationKeyPatterns globalCitationKeyPatterns) {
         Map<String, List<String>> stringyPattern = new HashMap<>();
-        AbstractCitationKeyPatterns citationKeyPattern = metaData.getCiteKeyPatterns(globalCitationKeyPatterns);
+        AbstractCitationKeyPatterns citationKeyPattern =
+                metaData.getCiteKeyPatterns(globalCitationKeyPatterns);
         for (EntryType key : citationKeyPattern.getAllKeys()) {
             if (!citationKeyPattern.isDefaultValue(key)) {
                 List<String> data = new ArrayList<>();
@@ -136,7 +183,10 @@ private static Map<String, List<String>> serializeCiteKeyPatterns(MetaData metaD
                 stringyPattern.put(metaDataKey, data);
             }
         }
-        if ((citationKeyPattern.getDefaultValue() != null) && !citationKeyPattern.getDefaultValue().equals(CitationKeyPattern.NULL_CITATION_KEY_PATTERN)) {
+        if ((citationKeyPattern.getDefaultValue() != null)
+                && !citationKeyPattern
+                        .getDefaultValue()
+                        .equals(CitationKeyPattern.NULL_CITATION_KEY_PATTERN)) {
             List<String> data = new ArrayList<>();
             data.add(citationKeyPattern.getDefaultValue().stringRepresentation());
             stringyPattern.put(MetaData.KEYPATTERNDEFAULT, data);
@@ -149,7 +199,9 @@ private static String serializeGroups(GroupTreeNode root) {
         stringBuilder.append(OS.NEWLINE);
 
         for (String groupNode : new GroupSerializer().serializeTree(root)) {
-            stringBuilder.append(StringUtil.quote(groupNode, MetaData.SEPARATOR_STRING, MetaData.ESCAPE_CHARACTER));
+            stringBuilder.append(
+                    StringUtil.quote(
+                            groupNode, MetaData.SEPARATOR_STRING, MetaData.ESCAPE_CHARACTER));
             stringBuilder.append(MetaData.SEPARATOR_STRING);
             stringBuilder.append(OS.NEWLINE);
         }
@@ -157,20 +209,18 @@ private static String serializeGroups(GroupTreeNode root) {
     }
 
     public static String serializeCustomEntryTypes(BibEntryType entryType) {
-        return MetaData.ENTRYTYPE_FLAG +
-                entryType.getType().getName() +
-                ": req[" +
-                FieldFactory.serializeOrFieldsList(entryType.getRequiredFields()) +
-                "] opt[" +
-                FieldFactory.serializeFieldsList(
-                        entryType.getOptionalFields()
-                                 .stream()
-                                 .map(BibField::field)
-                                 .toList()) +
-                "]";
+        return MetaData.ENTRYTYPE_FLAG
+                + entryType.getType().getName()
+                + ": req["
+                + FieldFactory.serializeOrFieldsList(entryType.getRequiredFields())
+                + "] opt["
+                + FieldFactory.serializeFieldsList(
+                        entryType.getOptionalFields().stream().map(BibField::field).toList())
+                + "]";
     }
 
-    public static List<String> getAsStringList(FieldFormatterCleanups fieldFormatterCleanups, String delimiter) {
+    public static List<String> getAsStringList(
+            FieldFormatterCleanups fieldFormatterCleanups, String delimiter) {
         List<String> stringRepresentation = new ArrayList<>();
 
         if (fieldFormatterCleanups.isEnabled()) {
@@ -179,8 +229,9 @@ public static List<String> getAsStringList(FieldFormatterCleanups fieldFormatter
             stringRepresentation.add(FieldFormatterCleanups.DISABLED);
         }
 
-        String formatterString = FieldFormatterCleanups.getMetaDataString(
-                fieldFormatterCleanups.getConfiguredActions(), delimiter);
+        String formatterString =
+                FieldFormatterCleanups.getMetaDataString(
+                        fieldFormatterCleanups.getConfiguredActions(), delimiter);
         stringRepresentation.add(formatterString);
         return stringRepresentation;
     }
diff --git a/src/main/java/org/jabref/logic/exporter/ModsExporter.java b/src/main/java/org/jabref/logic/exporter/ModsExporter.java
index 893f93980b9a..9130f2f267f7 100644
--- a/src/main/java/org/jabref/logic/exporter/ModsExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/ModsExporter.java
@@ -1,5 +1,15 @@
 package org.jabref.logic.exporter;
 
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.field.UnknownField;
+import org.jabref.model.entry.types.EntryType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringReader;
@@ -24,17 +34,6 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.entry.field.UnknownField;
-import org.jabref.model.entry.types.EntryType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * TemplateExporter for exporting in MODS XML format.
  */
@@ -43,7 +42,8 @@ class ModsExporter extends Exporter {
     private static final String MODS_NAMESPACE_URI = "http://www.loc.gov/mods/v3";
     private static final String MINUS = "-";
     private static final String DOUBLE_MINUS = "--";
-    private static final String MODS_SCHEMA_LOCATION = "http://www.loc.gov/standards/mods/v3/mods-3-6.xsd";
+    private static final String MODS_SCHEMA_LOCATION =
+            "http://www.loc.gov/standards/mods/v3/mods-3-6.xsd";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ModsExporter.class);
 
@@ -52,7 +52,9 @@ public ModsExporter() {
     }
 
     @Override
-    public void export(final BibDatabaseContext databaseContext, final Path file, List<BibEntry> entries) throws SaveException {
+    public void export(
+            final BibDatabaseContext databaseContext, final Path file, List<BibEntry> entries)
+            throws SaveException {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(entries);
         if (entries.isEmpty()) { // Only export if entries exist
@@ -151,22 +153,31 @@ private XMLStreamWriter createWriter(StringWriter sw) throws XMLStreamException
         writer.writeNamespace("mods", MODS_NAMESPACE_URI);
         writer.writeNamespace("ns2", "http://www.w3.org/1999/xlink");
         writer.writeNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
-        writer.writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "schemaLocation", MODS_SCHEMA_LOCATION);
+        writer.writeAttribute(
+                "xsi",
+                "http://www.w3.org/2001/XMLSchema-instance",
+                "schemaLocation",
+                MODS_SCHEMA_LOCATION);
         return writer;
     }
 
-    private void writerFormatted(Path file, StringWriter sw) throws TransformerException, IOException {
+    private void writerFormatted(Path file, StringWriter sw)
+            throws TransformerException, IOException {
         Transformer transformer = TransformerFactory.newInstance().newTransformer();
         transformer.setOutputProperty(OutputKeys.INDENT, "yes");
         transformer.setOutputProperty(OutputKeys.STANDALONE, "yes");
         transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
 
         try (OutputStream outputStream = Files.newOutputStream(file)) {
-            transformer.transform(new StreamSource(new StringReader(sw.toString())), new StreamResult(outputStream));
+            transformer.transform(
+                    new StreamSource(new StringReader(sw.toString())),
+                    new StreamResult(outputStream));
         }
     }
 
-    private void writeOriginInformation(XMLStreamWriter writer, List<String> originItems, Map<Field, String> fieldMap) throws XMLStreamException {
+    private void writeOriginInformation(
+            XMLStreamWriter writer, List<String> originItems, Map<Field, String> fieldMap)
+            throws XMLStreamException {
         if (originItems.isEmpty()) {
             writer.writeEmptyElement("mods", "originInfo", MODS_NAMESPACE_URI);
         } else {
@@ -180,7 +191,9 @@ private void writeOriginInformation(XMLStreamWriter writer, List<String> originI
         }
     }
 
-    private void writeRelatedInformation(XMLStreamWriter writer, List<String> parts, Map<Field, String> fieldMap) throws XMLStreamException {
+    private void writeRelatedInformation(
+            XMLStreamWriter writer, List<String> parts, Map<Field, String> fieldMap)
+            throws XMLStreamException {
         writer.writeStartElement("mods", "relatedItem", MODS_NAMESPACE_URI);
         writer.writeAttribute("type", "host");
 
@@ -200,7 +213,9 @@ private void writeRelatedInformation(XMLStreamWriter writer, List<String> parts,
         writer.writeEndElement(); // end typeOfResource
     }
 
-    private void writePartInformation(XMLStreamWriter writer, List<String> parts, Map<Field, String> fieldMap) throws XMLStreamException {
+    private void writePartInformation(
+            XMLStreamWriter writer, List<String> parts, Map<Field, String> fieldMap)
+            throws XMLStreamException {
         if (parts.isEmpty()) {
             writer.writeEmptyElement("mods", "part", MODS_NAMESPACE_URI);
         } else {
@@ -303,7 +318,8 @@ private void addUrl(XMLStreamWriter writer, String value) throws XMLStreamExcept
         writer.writeEndElement();
     }
 
-    private void addJournal(XMLStreamWriter writer, String value) throws XMLStreamException { // this may also need to be called within second for loop?
+    private void addJournal(XMLStreamWriter writer, String value)
+            throws XMLStreamException { // this may also need to be called within second for loop?
         // Start TitleInfoDefinition
         writer.writeStartElement("mods", "titleInfo", MODS_NAMESPACE_URI);
 
@@ -358,7 +374,8 @@ private void handleAuthors(XMLStreamWriter writer, String value) throws XMLStrea
             writer.writeAttribute("type", "personal");
 
             if (author.contains(",")) {
-                // if author contains ","  then this indicates that the author has a forename and family name
+                // if author contains ","  then this indicates that the author has a forename and
+                // family name
                 int commaIndex = author.indexOf(',');
                 String familyName = author.substring(0, commaIndex);
                 writer.writeStartElement("mods", "namePart", MODS_NAMESPACE_URI);
@@ -389,7 +406,8 @@ private void handleAuthors(XMLStreamWriter writer, String value) throws XMLStrea
         }
     }
 
-    private void addIdentifier(XMLStreamWriter writer, Field field, String value) throws XMLStreamException {
+    private void addIdentifier(XMLStreamWriter writer, Field field, String value)
+            throws XMLStreamException {
 
         if (new UnknownField("citekey").equals(field)) {
             writer.writeStartElement("mods", "mods", MODS_NAMESPACE_URI);
@@ -401,7 +419,8 @@ private void addIdentifier(XMLStreamWriter writer, Field field, String value) th
         writer.writeEndElement(); // end identifier
     }
 
-    private void addStartAndEndPage(XMLStreamWriter writer, String value, String minus) throws XMLStreamException {
+    private void addStartAndEndPage(XMLStreamWriter writer, String value, String minus)
+            throws XMLStreamException {
         int minusIndex = value.indexOf(minus);
         String startPage = value.substring(0, minusIndex);
         String endPage = "";
@@ -421,7 +440,8 @@ private void addStartAndEndPage(XMLStreamWriter writer, String value, String min
         writer.writeEndElement();
     }
 
-    private void addDetail(XMLStreamWriter writer, Field field, String value) throws XMLStreamException {
+    private void addDetail(XMLStreamWriter writer, Field field, String value)
+            throws XMLStreamException {
         writer.writeStartElement("mods", "detail", MODS_NAMESPACE_URI);
         writer.writeAttribute("type", field.getName());
         writer.writeStartElement("mods", "number", MODS_NAMESPACE_URI);
@@ -430,7 +450,8 @@ private void addDetail(XMLStreamWriter writer, Field field, String value) throws
         writer.writeEndElement(); // end detail
     }
 
-    private void addOriginInformation(XMLStreamWriter writer, Field field, String value) throws XMLStreamException {
+    private void addOriginInformation(XMLStreamWriter writer, Field field, String value)
+            throws XMLStreamException {
 
         if (field.equals(StandardField.YEAR)) {
             addDate(writer, "dateIssued", value);
@@ -442,7 +463,8 @@ private void addOriginInformation(XMLStreamWriter writer, Field field, String va
             addDate(writer, "dateCaptured", value);
         } else if (StandardField.PUBLISHER == field) {
             writer.writeStartElement("mods", "publisher", MODS_NAMESPACE_URI);
-            writer.writeAttribute("xsi", MODS_NAMESPACE_URI, "type", "mods:stringPlusLanguagePlusSupplied");
+            writer.writeAttribute(
+                    "xsi", MODS_NAMESPACE_URI, "type", "mods:stringPlusLanguagePlusSupplied");
             writer.writeCharacters(value);
             writer.writeEndElement();
         } else if (field.equals(new UnknownField("issuance"))) {
@@ -466,7 +488,8 @@ private void addOriginInformation(XMLStreamWriter writer, Field field, String va
         }
     }
 
-    private void addDate(XMLStreamWriter writer, String dateName, String value) throws XMLStreamException {
+    private void addDate(XMLStreamWriter writer, String dateName, String value)
+            throws XMLStreamException {
         writer.writeStartElement("mods", dateName, MODS_NAMESPACE_URI);
         writer.writeAttribute("keyDate", "yes");
         writer.writeCharacters(value);
diff --git a/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java b/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java
index cbba07c7d192..d4fb8e949e25 100644
--- a/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java
+++ b/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java
@@ -1,12 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-
 import org.jabref.logic.bibtex.comparator.FieldComparator;
 import org.jabref.logic.bibtex.comparator.FieldComparatorStack;
 import org.jabref.logic.layout.format.GetOpenOfficeType;
@@ -19,22 +12,32 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
 class OOCalcDatabase {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OOCalcDatabase.class);
     private static final Field REPORT_TYPE_FIELD = new UnknownField("reporttype");
-    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactory.newInstance();
+    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY =
+            DocumentBuilderFactory.newInstance();
 
     private final List<BibEntry> entries = new ArrayList<>();
-    private final List<Field> toExportFields = Stream.concat(FieldFactory.getStandardFieldsWithCitationKey().stream(), Stream.of(REPORT_TYPE_FIELD))
-                                                     .collect(Collectors.toList());
+    private final List<Field> toExportFields =
+            Stream.concat(
+                            FieldFactory.getStandardFieldsWithCitationKey().stream(),
+                            Stream.of(REPORT_TYPE_FIELD))
+                    .collect(Collectors.toList());
 
     public OOCalcDatabase(BibDatabase bibtex, List<BibEntry> entries) {
         this.entries.addAll(entries != null ? entries : bibtex.getEntries());
@@ -78,13 +81,23 @@ private void addEntryRow(BibEntry entry, Element table, Document document) {
         final Element row = document.createElement("table:table-row");
 
         addTableCell(document, row, new GetOpenOfficeType().format(entry.getType().getName()));
-        toExportFields.forEach(field -> {
-            if (field.equals(StandardField.TITLE)) {
-                addTableCell(document, row, new RemoveWhitespace().format(new RemoveBrackets().format(getField(entry, StandardField.TITLE))));
-            } else {
-                addTableCell(document, row, getField(entry, field));
-            }
-        });
+        toExportFields.forEach(
+                field -> {
+                    if (field.equals(StandardField.TITLE)) {
+                        addTableCell(
+                                document,
+                                row,
+                                new RemoveWhitespace()
+                                        .format(
+                                                new RemoveBrackets()
+                                                        .format(
+                                                                getField(
+                                                                        entry,
+                                                                        StandardField.TITLE))));
+                    } else {
+                        addTableCell(document, row, getField(entry, field));
+                    }
+                });
 
         table.appendChild(row);
     }
diff --git a/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java b/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java
index be7b3e44504c..33eff05d057b 100644
--- a/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java
+++ b/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java
@@ -1,12 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
 import org.jabref.logic.bibtex.comparator.FieldComparator;
 import org.jabref.logic.bibtex.comparator.FieldComparatorStack;
 import org.jabref.logic.layout.format.GetOpenOfficeType;
@@ -18,17 +11,24 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
 class OpenDocumentRepresentation {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OpenDocumentRepresentation.class);
-    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactory.newInstance();
+    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY =
+            DocumentBuilderFactory.newInstance();
 
     private final List<BibEntry> entries;
 
@@ -62,13 +62,17 @@ public Document getDOMrepresentation() {
             result = dbuild.newDocument();
             Element collection = result.createElement("office:document-content");
             // collection.setAttribute("xmlns", "http://openoffice.org/2000/office");
-            collection.setAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
-            collection.setAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
+            collection.setAttribute(
+                    "xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
+            collection.setAttribute(
+                    "xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
             collection.setAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
-            collection.setAttribute("xmlns:table", "urn:oasis:names:tc:opendocument:xmlns:table:1.0");
+            collection.setAttribute(
+                    "xmlns:table", "urn:oasis:names:tc:opendocument:xmlns:table:1.0");
             collection.setAttribute("xmlns:meta", "urn:oasis:names:tc:opendocument:xmlns:meta:1.0");
             collection.setAttribute("office:version", "1.0");
-            collection.setAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
+            collection.setAttribute(
+                    "xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
             collection.setAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink");
             Element el = result.createElement("office:scripts");
             collection.appendChild(el);
@@ -149,13 +153,27 @@ public Document getDOMrepresentation() {
                 addTableCell(result, row, getField(e, StandardField.ADDRESS));
                 addTableCell(result, row, getField(e, StandardField.ASSIGNEE));
                 addTableCell(result, row, getField(e, StandardField.ANNOTE));
-                addTableCell(result, row, getField(e, StandardField.AUTHOR)); // new AuthorLastFirst().format(getField(e, StandardField.AUTHOR_FIELD)));
+                addTableCell(
+                        result,
+                        row,
+                        getField(
+                                e,
+                                StandardField
+                                        .AUTHOR)); // new AuthorLastFirst().format(getField(e,
+                                                   // StandardField.AUTHOR_FIELD)));
                 addTableCell(result, row, getField(e, StandardField.BOOKTITLE));
                 addTableCell(result, row, getField(e, StandardField.CHAPTER));
                 addTableCell(result, row, getField(e, StandardField.DAY));
                 addTableCell(result, row, getField(e, StandardField.DAYFILED));
                 addTableCell(result, row, getField(e, StandardField.EDITION));
-                addTableCell(result, row, getField(e, StandardField.EDITOR)); // new AuthorLastFirst().format(getField(e, StandardField.EDITOR_FIELD)));
+                addTableCell(
+                        result,
+                        row,
+                        getField(
+                                e,
+                                StandardField
+                                        .EDITOR)); // new AuthorLastFirst().format(getField(e,
+                                                   // StandardField.EDITOR_FIELD)));
                 addTableCell(result, row, getField(e, StandardField.HOWPUBLISHED));
                 addTableCell(result, row, getField(e, StandardField.INSTITUTION));
                 addTableCell(result, row, getField(e, StandardField.JOURNAL));
@@ -171,7 +189,13 @@ public Document getDOMrepresentation() {
                 addTableCell(result, row, getField(e, StandardField.REVISION));
                 addTableCell(result, row, getField(e, StandardField.SCHOOL));
                 addTableCell(result, row, getField(e, StandardField.SERIES));
-                addTableCell(result, row, new RemoveWhitespace().format(new RemoveBrackets().format(getField(e, StandardField.TITLE))));
+                addTableCell(
+                        result,
+                        row,
+                        new RemoveWhitespace()
+                                .format(
+                                        new RemoveBrackets()
+                                                .format(getField(e, StandardField.TITLE))));
                 addTableCell(result, row, getField(e, new UnknownField("reporttype")));
                 addTableCell(result, row, getField(e, StandardField.VOLUME));
                 addTableCell(result, row, getField(e, StandardField.YEAR));
diff --git a/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java b/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
index d58c57a73315..df39d8b5c02a 100644
--- a/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
+++ b/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
@@ -1,5 +1,13 @@
 package org.jabref.logic.exporter;
 
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -25,18 +33,10 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class OpenDocumentSpreadsheetCreator extends Exporter {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OpenDocumentSpreadsheetCreator.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(OpenDocumentSpreadsheetCreator.class);
 
     /**
      * Creates a new instance of OpenOfficeDocumentCreator
@@ -45,9 +45,11 @@ public OpenDocumentSpreadsheetCreator() {
         super("ods", Localization.lang("OpenDocument spreadsheet"), StandardFileType.ODS);
     }
 
-    private static void storeOpenDocumentSpreadsheetFile(Path file, InputStream source) throws IOException {
+    private static void storeOpenDocumentSpreadsheetFile(Path file, InputStream source)
+            throws IOException {
 
-        try (ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(file)))) {
+        try (ZipOutputStream out =
+                new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(file)))) {
             // addResourceFile("mimetype", "/resource/ods/mimetype", out);
             ZipEntry ze = new ZipEntry("mimetype");
             String mime = "application/vnd.oasis.opendocument.spreadsheet";
@@ -73,14 +75,16 @@ private static void storeOpenDocumentSpreadsheetFile(Path file, InputStream sour
 
             // Add manifest (required for OOo 2.0) and "meta.xml": These are in the
             // resource/ods directory, and are copied verbatim into the zip file.
-            OpenDocumentSpreadsheetCreator.addResourceFile("meta.xml", "/resource/ods/meta.xml", out);
+            OpenDocumentSpreadsheetCreator.addResourceFile(
+                    "meta.xml", "/resource/ods/meta.xml", out);
 
-            OpenDocumentSpreadsheetCreator.addResourceFile("META-INF/manifest.xml", "/resource/ods/manifest.xml", out);
+            OpenDocumentSpreadsheetCreator.addResourceFile(
+                    "META-INF/manifest.xml", "/resource/ods/manifest.xml", out);
         }
     }
 
-    private static void exportOpenDocumentSpreadsheet(Path file, BibDatabase database, List<BibEntry> entries)
-            throws IOException {
+    private static void exportOpenDocumentSpreadsheet(
+            Path file, BibDatabase database, List<BibEntry> entries) throws IOException {
 
         // First store the xml formatted content to a temporary file.
         File tmpFile = File.createTempFile("opendocument", null);
@@ -97,19 +101,23 @@ private static void exportOpenDocumentSpreadsheet(Path file, BibDatabase databas
     }
 
     @Override
-    public void export(final BibDatabaseContext databaseContext, final Path file,
-                       List<BibEntry> entries) throws IOException {
+    public void export(
+            final BibDatabaseContext databaseContext, final Path file, List<BibEntry> entries)
+            throws IOException {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(entries);
         if (!entries.isEmpty()) { // Only export if entries exists
-            OpenDocumentSpreadsheetCreator.exportOpenDocumentSpreadsheet(file, databaseContext.getDatabase(), entries);
+            OpenDocumentSpreadsheetCreator.exportOpenDocumentSpreadsheet(
+                    file, databaseContext.getDatabase(), entries);
         }
     }
 
-    private static void exportOpenDocumentSpreadsheetXML(File tmpFile, BibDatabase database, List<BibEntry> entries) {
+    private static void exportOpenDocumentSpreadsheetXML(
+            File tmpFile, BibDatabase database, List<BibEntry> entries) {
         OpenDocumentRepresentation od = new OpenDocumentRepresentation(database, entries);
 
-        try (Writer ps = new OutputStreamWriter(new FileOutputStream(tmpFile), StandardCharsets.UTF_8)) {
+        try (Writer ps =
+                new OutputStreamWriter(new FileOutputStream(tmpFile), StandardCharsets.UTF_8)) {
             DOMSource source = new DOMSource(od.getDOMrepresentation());
             StreamResult result = new StreamResult(ps);
             Transformer trans = TransformerFactory.newInstance().newTransformer();
@@ -120,7 +128,8 @@ private static void exportOpenDocumentSpreadsheetXML(File tmpFile, BibDatabase d
         }
     }
 
-    private static void addResourceFile(String name, String resource, ZipOutputStream out) throws IOException {
+    private static void addResourceFile(String name, String resource, ZipOutputStream out)
+            throws IOException {
         ZipEntry zipEntry = new ZipEntry(name);
         out.putNextEntry(zipEntry);
         OpenDocumentSpreadsheetCreator.addFromResource(resource, out);
diff --git a/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java b/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java
index e31cb7bd2439..c3e383bc4d69 100644
--- a/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java
+++ b/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java
@@ -1,5 +1,12 @@
 package org.jabref.logic.exporter;
 
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -24,14 +31,6 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class OpenOfficeDocumentCreator extends Exporter {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OpenOfficeDocumentCreator.class);
@@ -44,7 +43,8 @@ public OpenOfficeDocumentCreator() {
     }
 
     private static void storeOpenOfficeFile(Path file, InputStream source) throws Exception {
-        try (ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(file)))) {
+        try (ZipOutputStream out =
+                new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(file)))) {
             ZipEntry zipEntry = new ZipEntry("content.xml");
             out.putNextEntry(zipEntry);
             int c;
@@ -55,14 +55,17 @@ private static void storeOpenOfficeFile(Path file, InputStream source) throws Ex
 
             // Add manifest (required for OOo 2.0), "meta.xml", "mimetype" files. These are in the
             // resource/openoffice directory, and are copied verbatim into the zip file.
-            OpenOfficeDocumentCreator.addResourceFile("meta.xml", "/resource/openoffice/meta.xml", out);
-            OpenOfficeDocumentCreator.addResourceFile("mimetype", "/resource/openoffice/mimetype", out);
-            OpenOfficeDocumentCreator.addResourceFile("META-INF/manifest.xml", "/resource/openoffice/manifest.xml",
-                    out);
+            OpenOfficeDocumentCreator.addResourceFile(
+                    "meta.xml", "/resource/openoffice/meta.xml", out);
+            OpenOfficeDocumentCreator.addResourceFile(
+                    "mimetype", "/resource/openoffice/mimetype", out);
+            OpenOfficeDocumentCreator.addResourceFile(
+                    "META-INF/manifest.xml", "/resource/openoffice/manifest.xml", out);
         }
     }
 
-    private static void exportOpenOfficeCalc(Path file, BibDatabase database, List<BibEntry> entries) throws Exception {
+    private static void exportOpenOfficeCalc(
+            Path file, BibDatabase database, List<BibEntry> entries) throws Exception {
         // First store the xml formatted content to a temporary file.
         File tmpFile = File.createTempFile("oocalc", null);
         OpenOfficeDocumentCreator.exportOpenOfficeCalcXML(tmpFile, database, entries);
@@ -79,19 +82,23 @@ private static void exportOpenOfficeCalc(Path file, BibDatabase database, List<B
     }
 
     @Override
-    public void export(final BibDatabaseContext databaseContext, final Path file,
-                       List<BibEntry> entries) throws Exception {
+    public void export(
+            final BibDatabaseContext databaseContext, final Path file, List<BibEntry> entries)
+            throws Exception {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(entries);
         if (!entries.isEmpty()) { // Do not export if no entries
-            OpenOfficeDocumentCreator.exportOpenOfficeCalc(file, databaseContext.getDatabase(), entries);
+            OpenOfficeDocumentCreator.exportOpenOfficeCalc(
+                    file, databaseContext.getDatabase(), entries);
         }
     }
 
-    private static void exportOpenOfficeCalcXML(File tmpFile, BibDatabase database, List<BibEntry> entries) {
+    private static void exportOpenOfficeCalcXML(
+            File tmpFile, BibDatabase database, List<BibEntry> entries) {
         OOCalcDatabase od = new OOCalcDatabase(database, entries);
 
-        try (Writer ps = new OutputStreamWriter(new FileOutputStream(tmpFile), StandardCharsets.UTF_8)) {
+        try (Writer ps =
+                new OutputStreamWriter(new FileOutputStream(tmpFile), StandardCharsets.UTF_8)) {
             DOMSource source = new DOMSource(od.getDOMrepresentation());
             StreamResult result = new StreamResult(ps);
             Transformer trans = TransformerFactory.newInstance().newTransformer();
@@ -102,7 +109,8 @@ private static void exportOpenOfficeCalcXML(File tmpFile, BibDatabase database,
         }
     }
 
-    private static void addResourceFile(String name, String resource, ZipOutputStream out) throws IOException {
+    private static void addResourceFile(String name, String resource, ZipOutputStream out)
+            throws IOException {
         ZipEntry zipEntry = new ZipEntry(name);
         out.putNextEntry(zipEntry);
         OpenOfficeDocumentCreator.addFromResource(resource, out);
diff --git a/src/main/java/org/jabref/logic/exporter/SaveConfiguration.java b/src/main/java/org/jabref/logic/exporter/SaveConfiguration.java
index 358659113e5b..9103bbab2c4f 100644
--- a/src/main/java/org/jabref/logic/exporter/SaveConfiguration.java
+++ b/src/main/java/org/jabref/logic/exporter/SaveConfiguration.java
@@ -13,10 +13,11 @@ public class SaveConfiguration {
     private boolean makeBackup;
     private BibDatabaseWriter.SaveType saveType;
 
-    public SaveConfiguration(SaveOrder saveOrder,
-                             Boolean makeBackup,
-                             BibDatabaseWriter.SaveType saveType,
-                             Boolean reformatFile) {
+    public SaveConfiguration(
+            SaveOrder saveOrder,
+            Boolean makeBackup,
+            BibDatabaseWriter.SaveType saveType,
+            Boolean reformatFile) {
         this.saveOrder = saveOrder;
         this.makeBackup = makeBackup;
         this.saveType = saveType;
@@ -24,7 +25,8 @@ public SaveConfiguration(SaveOrder saveOrder,
     }
 
     public SaveConfiguration() {
-        this(SaveOrder.getDefaultSaveOrder(),
+        this(
+                SaveOrder.getDefaultSaveOrder(),
                 false,
                 BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
                 false);
diff --git a/src/main/java/org/jabref/logic/exporter/SaveException.java b/src/main/java/org/jabref/logic/exporter/SaveException.java
index b3e8c2171c9d..b21a53fcce93 100644
--- a/src/main/java/org/jabref/logic/exporter/SaveException.java
+++ b/src/main/java/org/jabref/logic/exporter/SaveException.java
@@ -9,11 +9,13 @@
  */
 public class SaveException extends Exception {
 
-    public static final SaveException FILE_LOCKED = new SaveException(
-            "Could not save, file locked by another JabRef instance.",
-            Localization.lang("Could not save, file locked by another JabRef instance."));
-    public static final SaveException BACKUP_CREATION = new SaveException("Unable to create backup",
-            Localization.lang("Unable to create backup"));
+    public static final SaveException FILE_LOCKED =
+            new SaveException(
+                    "Could not save, file locked by another JabRef instance.",
+                    Localization.lang("Could not save, file locked by another JabRef instance."));
+    public static final SaveException BACKUP_CREATION =
+            new SaveException(
+                    "Unable to create backup", Localization.lang("Unable to create backup"));
 
     private BibEntry entry;
     private int status;
diff --git a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
index fe74b5123080..d2a6e932651e 100644
--- a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
@@ -1,21 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
 import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.Layout;
@@ -30,10 +14,25 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.metadata.SelfContainedSaveOrder;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
 /**
  * Base class for export formats based on templates.
  */
@@ -64,11 +63,12 @@ public class TemplateExporter extends Exporter {
      * @param directory   Directory in which to find the layout file.
      * @param extension   Should contain the . (for instance .txt).
      */
-    public TemplateExporter(String displayName,
-                            String consoleName,
-                            String lfFileName,
-                            String directory,
-                            FileType extension) {
+    public TemplateExporter(
+            String displayName,
+            String consoleName,
+            String lfFileName,
+            String directory,
+            FileType extension) {
         this(displayName, consoleName, lfFileName, directory, extension, null, null, null);
     }
 
@@ -79,12 +79,14 @@ public TemplateExporter(String displayName,
      * @param lfFileName        Name of the main layout file.
      * @param extension         May or may not contain the . (for instance .txt).
      */
-    public TemplateExporter(String name,
-                            String lfFileName,
-                            String extension,
-                            LayoutFormatterPreferences layoutPreferences,
-                            SelfContainedSaveOrder saveOrder) {
-        this(name,
+    public TemplateExporter(
+            String name,
+            String lfFileName,
+            String extension,
+            LayoutFormatterPreferences layoutPreferences,
+            SelfContainedSaveOrder saveOrder) {
+        this(
+                name,
                 name,
                 lfFileName,
                 null,
@@ -102,14 +104,23 @@ public TemplateExporter(String name,
      * @param directory         Directory in which to find the layout file.
      * @param extension         Should contain the . (for instance .txt).
      */
-    public TemplateExporter(String displayName,
-                            String consoleName,
-                            String lfFileName,
-                            String directory,
-                            FileType extension,
-                            LayoutFormatterPreferences layoutPreferences,
-                            SelfContainedSaveOrder saveOrder) {
-        this(displayName, consoleName, lfFileName, directory, extension, layoutPreferences, saveOrder, null);
+    public TemplateExporter(
+            String displayName,
+            String consoleName,
+            String lfFileName,
+            String directory,
+            FileType extension,
+            LayoutFormatterPreferences layoutPreferences,
+            SelfContainedSaveOrder saveOrder) {
+        this(
+                displayName,
+                consoleName,
+                lfFileName,
+                directory,
+                extension,
+                layoutPreferences,
+                saveOrder,
+                null);
     }
 
     /**
@@ -123,17 +134,19 @@ public TemplateExporter(String displayName,
      * @param layoutPreferences Preferences for layout
      * @param blankLineBehaviour how to behave regarding blank lines.
      */
-    public TemplateExporter(String displayName,
-                            String consoleName,
-                            String lfFileName,
-                            String directory,
-                            FileType extension,
-                            LayoutFormatterPreferences layoutPreferences,
-                            SelfContainedSaveOrder saveOrder,
-                            BlankLineBehaviour blankLineBehaviour) {
+    public TemplateExporter(
+            String displayName,
+            String consoleName,
+            String lfFileName,
+            String directory,
+            FileType extension,
+            LayoutFormatterPreferences layoutPreferences,
+            SelfContainedSaveOrder saveOrder,
+            BlankLineBehaviour blankLineBehaviour) {
         super(consoleName, displayName, extension);
         if (Objects.requireNonNull(lfFileName).endsWith(LAYOUT_EXTENSION)) {
-            this.lfFileName = lfFileName.substring(0, lfFileName.length() - LAYOUT_EXTENSION.length());
+            this.lfFileName =
+                    lfFileName.substring(0, lfFileName.length() - LAYOUT_EXTENSION.length());
         } else {
             this.lfFileName = lfFileName;
         }
@@ -192,22 +205,32 @@ private Reader getReader(String filename) throws IOException {
     }
 
     @Override
-    public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries) throws Exception {
-        export(databaseContext, file, entries, Collections.emptyList(), JournalAbbreviationLoader.loadBuiltInRepository());
+    public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries)
+            throws Exception {
+        export(
+                databaseContext,
+                file,
+                entries,
+                Collections.emptyList(),
+                JournalAbbreviationLoader.loadBuiltInRepository());
     }
 
     @Override
-    public void export(final BibDatabaseContext databaseContext,
-                       final Path file,
-                       List<BibEntry> entries,
-                       List<Path> fileDirForDatabase,
-                       JournalAbbreviationRepository abbreviationRepository) throws Exception {
+    public void export(
+            final BibDatabaseContext databaseContext,
+            final Path file,
+            List<BibEntry> entries,
+            List<Path> fileDirForDatabase,
+            JournalAbbreviationRepository abbreviationRepository)
+            throws Exception {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(entries);
 
         Charset encodingToUse = StandardCharsets.UTF_8;
 
-        if (entries.isEmpty()) { // Do not export if no entries to export -- avoids exports with only template text
+        if (entries
+                .isEmpty()) { // Do not export if no entries to export -- avoids exports with only
+                              // template text
             return;
         }
 
@@ -215,14 +238,20 @@ public void export(final BibDatabaseContext databaseContext,
             Layout beginLayout = null;
 
             // Check if this export filter has bundled name formatters:
-            // Add these to the preferences, so all layouts have access to the custom name formatters:
+            // Add these to the preferences, so all layouts have access to the custom name
+            // formatters:
             readFormatterFile();
 
             List<String> missingFormatters = new ArrayList<>(1);
 
             // Print header
             try (Reader reader = getReader(lfFileName + BEGIN_INFIX + LAYOUT_EXTENSION)) {
-                LayoutHelper layoutHelper = new LayoutHelper(reader, fileDirForDatabase, layoutPreferences, abbreviationRepository);
+                LayoutHelper layoutHelper =
+                        new LayoutHelper(
+                                reader,
+                                fileDirForDatabase,
+                                layoutPreferences,
+                                abbreviationRepository);
                 beginLayout = layoutHelper.getLayoutFromText();
             } catch (IOException ex) {
                 // If an exception was cast, export filter doesn't have a begin
@@ -244,7 +273,12 @@ public void export(final BibDatabaseContext databaseContext,
             Layout defLayout;
             LayoutHelper layoutHelper;
             try (Reader reader = getReader(lfFileName + LAYOUT_EXTENSION)) {
-                layoutHelper = new LayoutHelper(reader, fileDirForDatabase, layoutPreferences, abbreviationRepository);
+                layoutHelper =
+                        new LayoutHelper(
+                                reader,
+                                fileDirForDatabase,
+                                layoutPreferences,
+                                abbreviationRepository);
                 defLayout = layoutHelper.getLayoutFromText();
             }
             if (defLayout != null) {
@@ -264,9 +298,15 @@ public void export(final BibDatabaseContext databaseContext,
                 if (layouts.containsKey(type)) {
                     layout = layouts.get(type);
                 } else {
-                    try (Reader reader = getReader(lfFileName + '.' + type.getName() + LAYOUT_EXTENSION)) {
+                    try (Reader reader =
+                            getReader(lfFileName + '.' + type.getName() + LAYOUT_EXTENSION)) {
                         // We try to get a type-specific layout for this entry.
-                        layoutHelper = new LayoutHelper(reader, fileDirForDatabase, layoutPreferences, abbreviationRepository);
+                        layoutHelper =
+                                new LayoutHelper(
+                                        reader,
+                                        fileDirForDatabase,
+                                        layoutPreferences,
+                                        abbreviationRepository);
                         layout = layoutHelper.getLayoutFromText();
                         layouts.put(type, layout);
                         if (layout != null) {
@@ -283,7 +323,9 @@ public void export(final BibDatabaseContext databaseContext,
                 // Write the entry
                 if (layout != null) {
                     if (blankLineBehaviour == BlankLineBehaviour.DELETE_BLANKS) {
-                        String[] lines = layout.doLayout(entry, databaseContext.getDatabase()).split(BLANK_LINE_PATTERN);
+                        String[] lines =
+                                layout.doLayout(entry, databaseContext.getDatabase())
+                                        .split(BLANK_LINE_PATTERN);
                         for (String line : lines) {
                             if (!line.isBlank() && !line.isEmpty()) {
                                 ps.write(line + OS.NEWLINE);
@@ -298,7 +340,12 @@ public void export(final BibDatabaseContext databaseContext,
             // Print footer
             Layout endLayout = null;
             try (Reader reader = getReader(lfFileName + END_INFIX + LAYOUT_EXTENSION)) {
-                layoutHelper = new LayoutHelper(reader, fileDirForDatabase, layoutPreferences, abbreviationRepository);
+                layoutHelper =
+                        new LayoutHelper(
+                                reader,
+                                fileDirForDatabase,
+                                layoutPreferences,
+                                abbreviationRepository);
                 endLayout = layoutHelper.getLayoutFromText();
             } catch (IOException ex) {
                 // If an exception was thrown, export filter doesn't have an end
diff --git a/src/main/java/org/jabref/logic/exporter/XmpExporter.java b/src/main/java/org/jabref/logic/exporter/XmpExporter.java
index 23730852ee08..b6cd636cfe93 100644
--- a/src/main/java/org/jabref/logic/exporter/XmpExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/XmpExporter.java
@@ -1,12 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.logic.xmp.XmpUtilWriter;
@@ -14,6 +7,13 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * A custom exporter to write bib entries to a .xmp file for further processing
  * in other scenarios and applications. The xmp metadata are written in dublin
@@ -36,7 +36,8 @@ public XmpExporter(XmpPreferences xmpPreferences) {
      * @param entries         a list containing all entries that should be exported
      */
     @Override
-    public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries) throws Exception {
+    public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries)
+            throws Exception {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(file);
         Objects.requireNonNull(entries);
@@ -45,13 +46,18 @@ public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry>
             return;
         }
 
-        // This is a distinction between writing all entries from the supplied list to a single .xmp file,
+        // This is a distinction between writing all entries from the supplied list to a single .xmp
+        // file,
         // or write every entry to a separate file.
         if (file.getFileName().toString().trim().equals(XMP_SPLIT_DIRECTORY_INDICATOR)) {
             for (BibEntry entry : entries) {
                 // Avoid situations, where two citation keys are null
                 Path entryFile;
-                String suffix = entry.getId() + "_" + entry.getField(InternalField.KEY_FIELD).orElse("null") + ".xmp";
+                String suffix =
+                        entry.getId()
+                                + "_"
+                                + entry.getField(InternalField.KEY_FIELD).orElse("null")
+                                + ".xmp";
                 if (file.getParent() == null) {
                     entryFile = Path.of(suffix);
                 } else {
@@ -65,7 +71,9 @@ public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry>
     }
 
     private void writeBibToXmp(Path file, List<BibEntry> entries) throws IOException {
-        String xmpContent = new XmpUtilWriter(this.xmpPreferences).generateXmpStringWithoutXmpDeclaration(entries);
+        String xmpContent =
+                new XmpUtilWriter(this.xmpPreferences)
+                        .generateXmpStringWithoutXmpDeclaration(entries);
         Files.writeString(file, xmpContent);
     }
 }
diff --git a/src/main/java/org/jabref/logic/exporter/XmpPdfExporter.java b/src/main/java/org/jabref/logic/exporter/XmpPdfExporter.java
index e9eaeeb56a0d..f82c2de2ded6 100644
--- a/src/main/java/org/jabref/logic/exporter/XmpPdfExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/XmpPdfExporter.java
@@ -1,26 +1,25 @@
 package org.jabref.logic.exporter;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Objects;
-
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.logic.xmp.XmpUtilWriter;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+
 public class XmpPdfExporter extends Exporter {
     private static final Logger LOGGER = LoggerFactory.getLogger(XmpPdfExporter.class);
 
@@ -32,7 +31,8 @@ public XmpPdfExporter(XmpPreferences xmpPreferences) {
     }
 
     @Override
-    public void export(BibDatabaseContext databaseContext, Path pdfFile, List<BibEntry> entries) throws Exception {
+    public void export(BibDatabaseContext databaseContext, Path pdfFile, List<BibEntry> entries)
+            throws Exception {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(pdfFile);
         Objects.requireNonNull(entries);
@@ -48,14 +48,16 @@ public void export(BibDatabaseContext databaseContext, Path pdfFile, List<BibEnt
                     contentStream.beginText();
                     contentStream.newLineAtOffset(25, 500);
                     contentStream.setFont(new PDType1Font(Standard14Fonts.FontName.HELVETICA), 12);
-                    contentStream.showText("This PDF was created by JabRef. It demonstrates the embedding of XMP data in PDF files. Please open the file metadata view of your PDF viewer to see the attached files. Note that the normal usage is to embed the BibTeX data in an existing PDF.");
+                    contentStream.showText(
+                            "This PDF was created by JabRef. It demonstrates the embedding of XMP data in PDF files. Please open the file metadata view of your PDF viewer to see the attached files. Note that the normal usage is to embed the BibTeX data in an existing PDF.");
                     contentStream.endText();
                 }
                 document.save(filePath.toString());
             } catch (IOException e) {
                 LOGGER.error("Could not create PDF file", e);
             }
-            new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile, entries, databaseContext.getDatabase());
+            new XmpUtilWriter(xmpPreferences)
+                    .writeXmp(pdfFile, entries, databaseContext.getDatabase());
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/externalfiles/DateRange.java b/src/main/java/org/jabref/logic/externalfiles/DateRange.java
index 17181a7f5bf4..56f54c29eb13 100644
--- a/src/main/java/org/jabref/logic/externalfiles/DateRange.java
+++ b/src/main/java/org/jabref/logic/externalfiles/DateRange.java
@@ -12,7 +12,7 @@ public enum DateRange {
     private final String dateRange;
 
     DateRange(String dateRange) {
-       this.dateRange = dateRange;
+        this.dateRange = dateRange;
     }
 
     public static DateRange parse(String name) {
diff --git a/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java b/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
index e75b1df26838..aefcc9b7091a 100644
--- a/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
+++ b/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.externalfiles;
 
-import java.io.IOException;
-import java.nio.file.Path;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.OpenDatabase;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fileformat.PdfMergeMetadataImporter;
 import org.jabref.model.util.FileUpdateMonitor;
 
+import java.io.IOException;
+import java.nio.file.Path;
+
 public class ExternalFilesContentImporter {
 
     private final ImportFormatPreferences importFormatPreferences;
@@ -21,11 +21,12 @@ public ParserResult importPDFContent(Path file) {
         try {
             return new PdfMergeMetadataImporter(importFormatPreferences).importDatabase(file);
         } catch (IOException e) {
-           return ParserResult.fromError(e);
+            return ParserResult.fromError(e);
         }
     }
 
-    public ParserResult importFromBibFile(Path bibFile, FileUpdateMonitor fileUpdateMonitor) throws IOException {
+    public ParserResult importFromBibFile(Path bibFile, FileUpdateMonitor fileUpdateMonitor)
+            throws IOException {
         return OpenDatabase.loadDatabase(bibFile, importFormatPreferences, fileUpdateMonitor);
     }
 }
diff --git a/src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java b/src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java
index b7ef25f335f2..caacc3600e7d 100644
--- a/src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java
+++ b/src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java
@@ -1,22 +1,21 @@
 package org.jabref.logic.externalfiles;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Stream;
-
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Stream;
+
 public class LinkedFileHandler {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LinkedFileHandler.class);
@@ -27,10 +26,11 @@ public class LinkedFileHandler {
 
     private final LinkedFile fileEntry;
 
-    public LinkedFileHandler(LinkedFile fileEntry,
-                             BibEntry entry,
-                             BibDatabaseContext databaseContext,
-                             FilePreferences filePreferences) {
+    public LinkedFileHandler(
+            LinkedFile fileEntry,
+            BibEntry entry,
+            BibDatabaseContext databaseContext,
+            FilePreferences filePreferences) {
         this.fileEntry = fileEntry;
         this.entry = entry;
         this.databaseContext = Objects.requireNonNull(databaseContext);
@@ -51,16 +51,24 @@ public boolean moveToDefaultDirectory() throws IOException {
 
         String targetDirectoryName = "";
         if (!filePreferences.getFileDirectoryPattern().isEmpty()) {
-            targetDirectoryName = FileUtil.createDirNameFromPattern(
-                    databaseContext.getDatabase(),
-                    entry,
-                    filePreferences.getFileDirectoryPattern());
+            targetDirectoryName =
+                    FileUtil.createDirNameFromPattern(
+                            databaseContext.getDatabase(),
+                            entry,
+                            filePreferences.getFileDirectoryPattern());
         }
 
-        Path targetPath = targetDirectory.get().resolve(targetDirectoryName).resolve(oldFile.get().getFileName());
+        Path targetPath =
+                targetDirectory
+                        .get()
+                        .resolve(targetDirectoryName)
+                        .resolve(oldFile.get().getFileName());
         if (Files.exists(targetPath)) {
             // We do not overwrite already existing files
-            LOGGER.debug("The file {} would have been moved to {}. However, there exists already a file with that name so we do nothing.", oldFile.get(), targetPath);
+            LOGGER.debug(
+                    "The file {} would have been moved to {}. However, there exists already a file with that name so we do nothing.",
+                    oldFile.get(),
+                    targetPath);
             return false;
         } else {
             // Make sure sub-directories exist
@@ -71,7 +79,8 @@ public boolean moveToDefaultDirectory() throws IOException {
         Files.move(oldFile.get(), targetPath);
 
         // Update path
-        fileEntry.setLink(FileUtil.relativize(targetPath, databaseContext, filePreferences).toString());
+        fileEntry.setLink(
+                FileUtil.relativize(targetPath, databaseContext, filePreferences).toString());
         return true;
     }
 
@@ -79,7 +88,8 @@ public boolean renameToSuggestedName() throws IOException {
         return renameToName(getSuggestedFileName(), false);
     }
 
-    public boolean renameToName(String targetFileName, boolean overwriteExistingFile) throws IOException {
+    public boolean renameToName(String targetFileName, boolean overwriteExistingFile)
+            throws IOException {
         Optional<Path> oldFile = fileEntry.findIn(databaseContext, filePreferences);
         if (oldFile.isEmpty()) {
             return false;
@@ -89,13 +99,18 @@ public boolean renameToName(String targetFileName, boolean overwriteExistingFile
         final Path newPath = oldPath.resolveSibling(targetFileName);
 
         String expandedOldFilePath = oldPath.toString();
-        boolean pathsDifferOnlyByCase = newPath.toString().equalsIgnoreCase(expandedOldFilePath)
-                && !newPath.toString().equals(expandedOldFilePath);
+        boolean pathsDifferOnlyByCase =
+                newPath.toString().equalsIgnoreCase(expandedOldFilePath)
+                        && !newPath.toString().equals(expandedOldFilePath);
 
-        // Since Files.exists is sometimes not case-sensitive, the check pathsDifferOnlyByCase ensures that we
+        // Since Files.exists is sometimes not case-sensitive, the check pathsDifferOnlyByCase
+        // ensures that we
         // nonetheless rename files to a new name which just differs by case.
         if (Files.exists(newPath) && !pathsDifferOnlyByCase && !overwriteExistingFile) {
-            LOGGER.debug("The file {} would have been moved to {}. However, there exists already a file with that name so we do nothing.", oldPath, newPath);
+            LOGGER.debug(
+                    "The file {} would have been moved to {}. However, there exists already a file with that name so we do nothing.",
+                    oldPath,
+                    newPath);
             return false;
         }
 
@@ -109,7 +124,8 @@ public boolean renameToName(String targetFileName, boolean overwriteExistingFile
         }
 
         // Update path
-        fileEntry.setLink(FileUtil.relativize(newPath, databaseContext, filePreferences).toString());
+        fileEntry.setLink(
+                FileUtil.relativize(newPath, databaseContext, filePreferences).toString());
 
         return true;
     }
@@ -122,9 +138,14 @@ public String getSuggestedFileName() {
     }
 
     public String getSuggestedFileName(String extension) {
-        String targetFileName = FileUtil.createFileNameFromPattern(databaseContext.getDatabase(), entry, filePreferences.getFileNamePattern()).trim()
-                + '.'
-                + extension;
+        String targetFileName =
+                FileUtil.createFileNameFromPattern(
+                                        databaseContext.getDatabase(),
+                                        entry,
+                                        filePreferences.getFileNamePattern())
+                                .trim()
+                        + '.'
+                        + extension;
 
         // Only create valid file names
         return FileUtil.getValidFileName(targetFileName);
@@ -136,17 +157,26 @@ public String getSuggestedFileName(String extension) {
      * @return First identified path that matches an existing file.  This name can be used in subsequent calls to
      * override the existing file.
      */
-    public Optional<Path> findExistingFile(LinkedFile linkedFile, BibEntry entry, String targetFileName) {
+    public Optional<Path> findExistingFile(
+            LinkedFile linkedFile, BibEntry entry, String targetFileName) {
         // The .get() is legal without check because the method will always return a value.
-        Path targetFilePath = linkedFile.findIn(databaseContext, filePreferences)
-                                     .get().getParent().resolve(targetFileName);
+        Path targetFilePath =
+                linkedFile
+                        .findIn(databaseContext, filePreferences)
+                        .get()
+                        .getParent()
+                        .resolve(targetFileName);
         Path oldFilePath = linkedFile.findIn(databaseContext, filePreferences).get();
         // Check if file already exists in directory with different case.
         // This is necessary because other entries may have such a file.
         Optional<Path> matchedByDiffCase = Optional.empty();
         try (Stream<Path> stream = Files.list(oldFilePath.getParent())) {
-            matchedByDiffCase = stream.filter(name -> name.toString().equalsIgnoreCase(targetFilePath.toString()))
-                                      .findFirst();
+            matchedByDiffCase =
+                    stream.filter(
+                                    name ->
+                                            name.toString()
+                                                    .equalsIgnoreCase(targetFilePath.toString()))
+                            .findFirst();
         } catch (IOException e) {
             LOGGER.error("Could not get the list of files in target directory", e);
         }
diff --git a/src/main/java/org/jabref/logic/formatter/Formatters.java b/src/main/java/org/jabref/logic/formatter/Formatters.java
index fb827f9ab8ea..e042c3a75f5a 100644
--- a/src/main/java/org/jabref/logic/formatter/Formatters.java
+++ b/src/main/java/org/jabref/logic/formatter/Formatters.java
@@ -1,14 +1,5 @@
 package org.jabref.logic.formatter;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.formatter.bibtexfields.CleanupUrlFormatter;
 import org.jabref.logic.formatter.bibtexfields.ClearFormatter;
@@ -41,6 +32,15 @@
 import org.jabref.logic.layout.format.LatexToUnicodeFormatter;
 import org.jabref.logic.layout.format.ReplaceUnicodeLigaturesFormatter;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 public class Formatters {
     private static final Pattern TRUNCATE_PATTERN = Pattern.compile("\\Atruncate\\d+\\z");
 
@@ -50,16 +50,14 @@ public class Formatters {
         keyToFormatterMap = getAll().stream().collect(Collectors.toMap(Formatter::getKey, f -> f));
     }
 
-    private Formatters() {
-    }
+    private Formatters() {}
 
     public static List<Formatter> getConverters() {
         return Arrays.asList(
                 new HtmlToLatexFormatter(),
                 new HtmlToUnicodeFormatter(),
                 new LatexToUnicodeFormatter(),
-                new UnicodeToLatexFormatter()
-        );
+                new UnicodeToLatexFormatter());
     }
 
     public static List<Formatter> getCaseChangers() {
@@ -68,8 +66,7 @@ public static List<Formatter> getCaseChangers() {
                 new LowerCaseFormatter(),
                 new SentenceCaseFormatter(),
                 new TitleCaseFormatter(),
-                new UpperCaseFormatter()
-        );
+                new UpperCaseFormatter());
     }
 
     public static List<Formatter> getOthers() {
@@ -92,8 +89,7 @@ public static List<Formatter> getOthers() {
                 new ShortenDOIFormatter(),
                 new NormalizeUnicodeFormatter(),
                 new ReplaceUnicodeLigaturesFormatter(),
-                new UnprotectTermsFormatter()
-        );
+                new UnprotectTermsFormatter());
     }
 
     public static List<Formatter> getAll() {
@@ -106,7 +102,9 @@ public static List<Formatter> getAll() {
 
     public static Optional<Formatter> getFormatterForKey(String name) {
         Objects.requireNonNull(name);
-        return keyToFormatterMap.containsKey(name) ? Optional.of(keyToFormatterMap.get(name)) : Optional.empty();
+        return keyToFormatterMap.containsKey(name)
+                ? Optional.of(keyToFormatterMap.get(name))
+                : Optional.empty();
     }
 
     public static Optional<Formatter> getFormatterForModifier(String modifier) {
diff --git a/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java b/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java
index c5f63de22faa..fe8b65c344e3 100644
--- a/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter;
 
-import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Objects;
+
 /**
  * It may seem useless, but is needed as a fallback option
  */
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatter.java
index 3d787e1f28b2..dfe6df14ee06 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatter.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Objects;
+
 public class AddBracesFormatter extends Formatter {
 
     @Override
@@ -21,8 +21,11 @@ public String getKey() {
     public String format(String value) {
         Objects.requireNonNull(value);
 
-        if ((value.length() >= 2) && (value.charAt(0) != '{') && (value.charAt(value.length() - 1) != '}')) {
-            // Title does not start with { and does not end with }, then this formatter can be applied
+        if ((value.length() >= 2)
+                && (value.charAt(0) != '{')
+                && (value.charAt(value.length() - 1) != '}')) {
+            // Title does not start with { and does not end with }, then this formatter can be
+            // applied
             return "{" + value + "}";
         } else {
             return value;
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java
index d14596de2081..2078e9a7404f 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import org.jabref.logic.cleanup.Formatter;
+import org.jabref.logic.l10n.Localization;
+
 import java.net.URLDecoder;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -7,9 +10,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.cleanup.Formatter;
-import org.jabref.logic.l10n.Localization;
-
 /**
  * Cleanup URL link.
  * <p>
@@ -49,9 +49,7 @@ public String getKey() {
      */
     @Override
     public String format(String url) {
-        var toDecode = Objects
-                .requireNonNull(url, "Null url")
-                .replaceAll("\\+", "%2b");
+        var toDecode = Objects.requireNonNull(url, "Null url").replaceAll("\\+", "%2b");
         Matcher matcher = PATTERN_URL.matcher(toDecode);
         if (matcher.find()) {
             return URLDecoder.decode(matcher.group(1), StandardCharsets.UTF_8);
@@ -61,15 +59,16 @@ public String format(String url) {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Cleanup URL link by removing special symbols and extracting simple link");
+        return Localization.lang(
+                "Cleanup URL link by removing special symbols and extracting simple link");
     }
 
     @Override
     public String getExampleInput() {
-        return "https://www.google.de/url?sa=t&rct=j&q=&esrc=s&source=web&cd=11&cad=" +
-               "rja&uact=8&ved=0ahUKEwjg3ZrB_ZPXAhVGuhoKHYdOBOg4ChAWCCYwAA&url=" +
-               "http%3A%2F%2Fwww.focus.de%2Fgesundheit%2Fratgeber%2Fherz%2Ftest%2" +
-               "Flebenserwartung-werden-sie-100-jahre-alt_aid_363828.html" +
-               "&usg=AOvVaw1G6m2jf-pTHYkXceii4hXU";
+        return "https://www.google.de/url?sa=t&rct=j&q=&esrc=s&source=web&cd=11&cad="
+                + "rja&uact=8&ved=0ahUKEwjg3ZrB_ZPXAhVGuhoKHYdOBOg4ChAWCCYwAA&url="
+                + "http%3A%2F%2Fwww.focus.de%2Fgesundheit%2Fratgeber%2Fherz%2Ftest%2"
+                + "Flebenserwartung-werden-sie-100-jahre-alt_aid_363828.html"
+                + "&usg=AOvVaw1G6m2jf-pTHYkXceii4hXU";
     }
 }
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java
index ec54760965be..bf3bef93f613 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Objects;
+
 public class ClearFormatter extends Formatter {
 
     @Override
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatter.java
index bc9423ea08a4..c2196c15fd3c 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatter.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Objects;
+
 public class EscapeAmpersandsFormatter extends Formatter {
 
     @Override
@@ -72,7 +72,9 @@ public String format(String value) {
 
             // We add a backslash before any ampersand characters, with one exception: if
             // we are inside an \\url{...} command, we should write it as it is. Maybe.
-            if ((c == '&') && !escape && !(inCommand && "url".contentEquals(commandName))
+            if ((c == '&')
+                    && !escape
+                    && !(inCommand && "url".contentEquals(commandName))
                     && (nestedEnvironments == 0)) {
                 result.append("\\&");
             } else {
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatter.java
index d3f537086140..91f176bb7cb9 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatter.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-import java.util.regex.Matcher;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Objects;
+import java.util.regex.Matcher;
+
 public class EscapeDollarSignFormatter extends Formatter {
 
     @Override
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java
index 8a5a3c1a3b4a..fb6654ea154b 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Objects;
+import java.util.regex.Pattern;
+
 public class EscapeUnderscoresFormatter extends Formatter {
 
     private static final Pattern UNDERSCORES = Pattern.compile("_");
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java
index 4278bacc8d29..6e89d892403e 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.logic.util.strings.HTMLUnicodeConversionMaps;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Objects;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * The inverse operation is "somehow" contained in {@link org.jabref.logic.openoffice.style.OOPreFormatter}
  */
@@ -22,8 +21,10 @@ public class HtmlToLatexFormatter extends Formatter implements LayoutFormatter {
 
     private static final Pattern REMOVE_TAGS_PATTERN = Pattern.compile("<[^>]{1,100}>");
     private static final Pattern ESCAPED_PATTERN = Pattern.compile("&#([x]*)([0]*)(\\p{XDigit}+);");
-    private static final Pattern ESCAPED_PATTERN2 = Pattern.compile("(.)&#([x]*)([0]*)(\\p{XDigit}+);");
-    private static final Pattern ESCAPED_PATTERN3 = Pattern.compile("&#([x]*)([0]*)(\\p{XDigit}+);");
+    private static final Pattern ESCAPED_PATTERN2 =
+            Pattern.compile("(.)&#([x]*)([0]*)(\\p{XDigit}+);");
+    private static final Pattern ESCAPED_PATTERN3 =
+            Pattern.compile("&#([x]*)([0]*)(\\p{XDigit}+);");
     private static final Pattern ESCAPED_PATTERN4 = Pattern.compile("&(\\w+);");
 
     @Override
@@ -37,14 +38,18 @@ public String format(String text) {
         // Deal with the form <sup>k</sup>and <sub>k</sub>
         result = result.replaceAll("<[ ]?sup>([^<]+)</sup>", "\\\\textsuperscript\\{$1\\}");
         result = result.replaceAll("<[ ]?sub>([^<]+)</sub>", "\\\\textsubscript\\{$1\\}");
-        // Note that (at least) the IEEE Xplore fetcher must be fixed as it relies on the current way to
+        // Note that (at least) the IEEE Xplore fetcher must be fixed as it relies on the current
+        // way to
         // remove tags for its image alt-tag to equation converter
         result = REMOVE_TAGS_PATTERN.matcher(result).replaceAll("");
 
         // Handle text based HTML entities
         Set<String> patterns = HTMLUnicodeConversionMaps.HTML_LATEX_CONVERSION_MAP.keySet();
         for (String pattern : patterns) {
-            result = result.replace(pattern, HTMLUnicodeConversionMaps.HTML_LATEX_CONVERSION_MAP.get(pattern));
+            result =
+                    result.replace(
+                            pattern,
+                            HTMLUnicodeConversionMaps.HTML_LATEX_CONVERSION_MAP.get(pattern));
         }
 
         // Handle numerical HTML entities
@@ -52,8 +57,12 @@ public String format(String text) {
         while (m.find()) {
             int num = Integer.decode(m.group(1).replace("x", "#") + m.group(3));
             if (HTMLUnicodeConversionMaps.NUMERICAL_LATEX_CONVERSION_MAP.containsKey(num)) {
-                result = result.replaceAll("\\\\?&#" + m.group(1) + m.group(2) + m.group(3) + ";",
-                        Matcher.quoteReplacement(HTMLUnicodeConversionMaps.NUMERICAL_LATEX_CONVERSION_MAP.get(num)));
+                result =
+                        result.replaceAll(
+                                "\\\\?&#" + m.group(1) + m.group(2) + m.group(3) + ";",
+                                Matcher.quoteReplacement(
+                                        HTMLUnicodeConversionMaps.NUMERICAL_LATEX_CONVERSION_MAP
+                                                .get(num)));
             }
         }
 
@@ -63,14 +72,28 @@ public String format(String text) {
             int num = Integer.decode(m.group(2).replace("x", "#") + m.group(4));
             if (HTMLUnicodeConversionMaps.ESCAPED_ACCENTS.containsKey(num)) {
                 if ("i".equals(m.group(1))) {
-                    result = result.replace(m.group(1) + "&#" + m.group(2) + m.group(3) + m.group(4) + ";",
-                            "{\\" + HTMLUnicodeConversionMaps.ESCAPED_ACCENTS.get(num) + "{\\i}}");
+                    result =
+                            result.replace(
+                                    m.group(1) + "&#" + m.group(2) + m.group(3) + m.group(4) + ";",
+                                    "{\\"
+                                            + HTMLUnicodeConversionMaps.ESCAPED_ACCENTS.get(num)
+                                            + "{\\i}}");
                 } else if ("j".equals(m.group(1))) {
-                    result = result.replace(m.group(1) + "&#" + m.group(2) + m.group(3) + m.group(4) + ";",
-                            "{\\" + HTMLUnicodeConversionMaps.ESCAPED_ACCENTS.get(num) + "{\\j}}");
+                    result =
+                            result.replace(
+                                    m.group(1) + "&#" + m.group(2) + m.group(3) + m.group(4) + ";",
+                                    "{\\"
+                                            + HTMLUnicodeConversionMaps.ESCAPED_ACCENTS.get(num)
+                                            + "{\\j}}");
                 } else {
-                    result = result.replace(m.group(1) + "&#" + m.group(2) + m.group(3) + m.group(4) + ";",
-                            "{\\" + HTMLUnicodeConversionMaps.ESCAPED_ACCENTS.get(num) + "{" + m.group(1) + "}}");
+                    result =
+                            result.replace(
+                                    m.group(1) + "&#" + m.group(2) + m.group(3) + m.group(4) + ";",
+                                    "{\\"
+                                            + HTMLUnicodeConversionMaps.ESCAPED_ACCENTS.get(num)
+                                            + "{"
+                                            + m.group(1)
+                                            + "}}");
                 }
             }
         }
@@ -79,7 +102,13 @@ public String format(String text) {
         m = ESCAPED_PATTERN3.matcher(result);
         while (m.find()) {
             int num = Integer.decode(m.group(1).replace("x", "#") + m.group(3));
-            LOGGER.warn("HTML escaped char not converted: {}{}{} = {}", m.group(1), m.group(2), m.group(3), " = ", num);
+            LOGGER.warn(
+                    "HTML escaped char not converted: {}{}{} = {}",
+                    m.group(1),
+                    m.group(2),
+                    m.group(3),
+                    " = ",
+                    num);
         }
 
         // Remove $$ in case of two adjacent conversions
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java
index 6d5c970d0e59..c20f6494ca26 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java
@@ -1,12 +1,11 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import org.apache.commons.text.StringEscapeUtils;
 import org.jabref.architecture.AllowedToUseApacheCommonsLang3;
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.LayoutFormatter;
 
-import org.apache.commons.text.StringEscapeUtils;
-
 @AllowedToUseApacheCommonsLang3("There is no equivalent in Google's Guava")
 public class HtmlToUnicodeFormatter extends Formatter implements LayoutFormatter {
 
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java
index 5415156bb7b5..0d138841bd5f 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java
@@ -1,22 +1,24 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.regex.Pattern;
+
 /**
  * Simplifies LaTeX syntax. {@see org.jabref.logic.layout.format.RemoveLatexCommandsFormatter} for a formatter removing LaTeX commands completely.
  */
 public class LatexCleanupFormatter extends Formatter {
 
-    private static final Pattern REMOVE_REDUNDANT = Pattern
-            .compile("(?<!\\\\[\\p{Alpha}]{0,100}\\{[^\\}]{0,100})\\}([-/ ]?)\\{");
+    private static final Pattern REMOVE_REDUNDANT =
+            Pattern.compile("(?<!\\\\[\\p{Alpha}]{0,100}\\{[^\\}]{0,100})\\}([-/ ]?)\\{");
 
     private static final Pattern REPLACE_WITH_AT = Pattern.compile("(^|[^\\\\$])\\$");
     private static final Pattern REPLACE_EVERY_OTHER_AT = Pattern.compile("([^@]*)@@([^@]*)@@");
-    private static final Pattern MOVE_NUMBERS_WITH_OPERATORS = Pattern.compile("([0-9\\(\\.]+[ ]?[-+/]?[ ]?)\\$");
-    private static final Pattern MOVE_NUMBERS_RIGHT_INTO_EQUATION = Pattern.compile("@@([ ]?[-+/]?[ ]?[0-9\\)\\.]+)");
+    private static final Pattern MOVE_NUMBERS_WITH_OPERATORS =
+            Pattern.compile("([0-9\\(\\.]+[ ]?[-+/]?[ ]?)\\$");
+    private static final Pattern MOVE_NUMBERS_RIGHT_INTO_EQUATION =
+            Pattern.compile("@@([ ]?[-+/]?[ ]?[0-9\\)\\.]+)");
     private static final Pattern ESCAPE_PERCENT_SIGN_ONCE = Pattern.compile("(^|[^\\\\%])%");
 
     @Override
@@ -33,25 +35,46 @@ public String getKey() {
     public String format(String oldString) {
         String newValue = oldString;
 
-        // Remove redundant $, {, and }, but not if the } is part of a command argument: \mbox{-}{GPS} should not be adjusted
+        // Remove redundant $, {, and }, but not if the } is part of a command argument:
+        // \mbox{-}{GPS} should not be adjusted
         newValue = newValue.replace("$$", "");
         newValue = REMOVE_REDUNDANT.matcher(newValue).replaceAll("$1");
 
         // Move numbers, +, -, /, and brackets into equations
-        newValue = REPLACE_WITH_AT.matcher(newValue).replaceAll("$1@@"); // Replace $, but not \$ with @@
-
-        newValue = REPLACE_EVERY_OTHER_AT.matcher(newValue).replaceAll("$1\\$$2@@"); // Replace every other @@ with $
-        // newValue = newValue.replaceAll("([0-9\\(\\.]+) \\$","\\$$1\\\\ "); // Move numbers followed by a space left of $ inside the equation, e.g., 0.35 $\mu$m
-
-        newValue = MOVE_NUMBERS_WITH_OPERATORS.matcher(newValue).replaceAll("\\$$1"); // Move numbers, possibly with operators +, -, or /,  left of $ into the equation
-        newValue = MOVE_NUMBERS_RIGHT_INTO_EQUATION.matcher(newValue).replaceAll(" $1@@"); // Move numbers right of @@ into the equation
+        newValue =
+                REPLACE_WITH_AT
+                        .matcher(newValue)
+                        .replaceAll("$1@@"); // Replace $, but not \$ with @@
+
+        newValue =
+                REPLACE_EVERY_OTHER_AT
+                        .matcher(newValue)
+                        .replaceAll("$1\\$$2@@"); // Replace every other @@ with $
+        // newValue = newValue.replaceAll("([0-9\\(\\.]+) \\$","\\$$1\\\\ "); // Move numbers
+        // followed by a space left of $ inside the equation, e.g., 0.35 $\mu$m
+
+        newValue =
+                MOVE_NUMBERS_WITH_OPERATORS
+                        .matcher(newValue)
+                        .replaceAll(
+                                "\\$$1"); // Move numbers, possibly with operators +, -, or /,  left
+                                          // of $ into the equation
+        newValue =
+                MOVE_NUMBERS_RIGHT_INTO_EQUATION
+                        .matcher(newValue)
+                        .replaceAll(" $1@@"); // Move numbers right of @@ into the equation
 
         newValue = newValue.replace("@@", "$"); // Replace all @@ with $
         newValue = newValue.replace("  ", " "); // Clean up
         newValue = newValue.replace("$$", "");
         newValue = newValue.replace(" )$", ")$");
 
-        newValue = ESCAPE_PERCENT_SIGN_ONCE.matcher(newValue).replaceAll("$1\\\\%"); // escape %, but do not escapee \% again,  used for comments in TeX
+        newValue =
+                ESCAPE_PERCENT_SIGN_ONCE
+                        .matcher(newValue)
+                        .replaceAll(
+                                "$1\\\\%"); // escape %, but do not escapee \% again,  used for
+                                            // comments in TeX
 
         return newValue;
     }
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java
index 385b36996ca5..7d6d949fb1b4 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Optional;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.Date;
 
+import java.util.Optional;
+
 /**
  * This class transforms date to the format yyyy-mm-dd or yyyy-mm..
  */
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java
index 5dcc74847d2c..7b6f430a77fa 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.Month;
 
+import java.util.Objects;
+import java.util.Optional;
+
 public class NormalizeMonthFormatter extends Formatter {
 
     @Override
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java
index 10383eb983d8..7ff44d503f02 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.AuthorList;
 
+import java.util.Objects;
+
 /**
  * Formatter normalizing a list of person names to the BibTeX format.
  */
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java
index 8bdb2aef9b40..5d6c916c96a0 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.formatter.casechanger.UnprotectTermsFormatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * This class includes sensible defaults for consistent formatting of BibTeX page numbers.
  * <p>
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeUnicodeFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeUnicodeFormatter.java
index 8d39cbe1c86f..1974ea6350aa 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeUnicodeFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeUnicodeFormatter.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.text.Normalizer;
-
 import org.jabref.logic.cleanup.Formatter;
 
+import java.text.Normalizer;
+
 /**
  * Clean up field values by formatting Unicode values by using the <a href="https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms">Normal form "Normalization Form Canonical Composition" (NFC)</a>: Characters are decomposed and then recomposed by canonical equivalence.
  *
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeWhitespaceFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeWhitespaceFormatter.java
index bda0735ebfe3..4297d4a330c7 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeWhitespaceFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeWhitespaceFormatter.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 
+import java.util.Objects;
+import java.util.regex.Pattern;
+
 /**
  * Replaces two subsequent whitespaces (and tabs) to one space in case of single-line fields. In case of multine fields,
  * the field content is kept as is.
@@ -43,7 +43,8 @@ public String format(String fieldContent, Field field) {
             return fieldContent;
         }
 
-        // Replace multiple whitespaces by one. We need to keep the leading and trailing whitespace to enable constructs such as "#kopp# and #breit#"
+        // Replace multiple whitespaces by one. We need to keep the leading and trailing whitespace
+        // to enable constructs such as "#kopp# and #breit#"
         return WHITESPACE.matcher(fieldContent).replaceAll(" ");
     }
 
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java
index ff30823e416a..fd022b0bbf36 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java
@@ -1,20 +1,21 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import org.jabref.logic.cleanup.Formatter;
+import org.jabref.logic.l10n.Localization;
+
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.cleanup.Formatter;
-import org.jabref.logic.l10n.Localization;
-
 /**
  * This class transforms ordinal numbers into LaTeX superscripts.
  */
 public class OrdinalsToSuperscriptFormatter extends Formatter {
 
     // find possible superscripts on word boundaries
-    private static final Pattern SUPERSCRIPT_DETECT_PATTERN = Pattern.compile("\\b(\\d+)(st|nd|rd|th)\\b",
-            Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+    private static final Pattern SUPERSCRIPT_DETECT_PATTERN =
+            Pattern.compile(
+                    "\\b(\\d+)(st|nd|rd|th)\\b", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
 
     private static final String SUPERSCRIPT_REPLACE_PATTERN = "$1\\\\textsuperscript{$2}";
 
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java
index 26859a82699c..3a36d1317b70 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import org.jabref.logic.cleanup.Formatter;
+import org.jabref.logic.l10n.Localization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -7,30 +12,33 @@
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import org.jabref.logic.cleanup.Formatter;
-import org.jabref.logic.l10n.Localization;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class RegexFormatter extends Formatter {
     public static final String KEY = "regex";
     private static final Logger LOGGER = LoggerFactory.getLogger(RegexFormatter.class);
     private static final Pattern ESCAPED_OPENING_CURLY_BRACE = Pattern.compile("\\\\\\{");
     private static final Pattern ESCAPED_CLOSING_CURLY_BRACE = Pattern.compile("\\\\\\}");
+
     /**
      * Matches text enclosed in curly brackets. The capturing group is used to prevent part of the input from being
      * replaced.
      */
     private static final Pattern ENCLOSED_IN_CURLY_BRACES = Pattern.compile("\\{.*?}");
+
     private static final String REGEX_CAPTURING_GROUP = "regex";
     private static final String REPLACEMENT_CAPTURING_GROUP = "replacement";
+
     /**
      * Matches a valid argument to the constructor. Two capturing groups are used to parse the {@link
      * RegexFormatter#regex} and {@link RegexFormatter#replacement} used in {@link RegexFormatter#format(String)}
      */
-    private static final Pattern CONSTRUCTOR_ARGUMENT = Pattern.compile(
-            "^\\(\"(?<" + REGEX_CAPTURING_GROUP + ">.*?)\" *?, *?\"(?<" + REPLACEMENT_CAPTURING_GROUP + ">.*)\"\\)$");
+    private static final Pattern CONSTRUCTOR_ARGUMENT =
+            Pattern.compile(
+                    "^\\(\"(?<"
+                            + REGEX_CAPTURING_GROUP
+                            + ">.*?)\" *?, *?\"(?<"
+                            + REPLACEMENT_CAPTURING_GROUP
+                            + ">.*)\"\\)$");
+
     // Magic arbitrary unicode char, which will never appear in bibtex files
     private static final String PLACEHOLDER_FOR_PROTECTED_GROUP = Character.toString('\u0A14');
     private static final String PLACEHOLDER_FOR_OPENING_CURLY_BRACE = Character.toString('\u0A15');
@@ -79,7 +87,10 @@ private String replaceHonoringProtectedGroups(final String input) {
         try {
             workingString = workingString.replaceAll(regex, replacement);
         } catch (PatternSyntaxException e) {
-            LOGGER.warn("There is a syntax error in the regular expression \"{}\" used by the regex modifier", regex, e);
+            LOGGER.warn(
+                    "There is a syntax error in the regular expression \"{}\" used by the regex modifier",
+                    regex,
+                    e);
             return input;
         }
 
@@ -97,10 +108,13 @@ public String format(final String input) {
         }
 
         Matcher escapedOpeningCurlyBrace = ESCAPED_OPENING_CURLY_BRACE.matcher(input);
-        String inputWithPlaceholder = escapedOpeningCurlyBrace.replaceAll(PLACEHOLDER_FOR_OPENING_CURLY_BRACE);
+        String inputWithPlaceholder =
+                escapedOpeningCurlyBrace.replaceAll(PLACEHOLDER_FOR_OPENING_CURLY_BRACE);
 
-        Matcher escapedClosingCurlyBrace = ESCAPED_CLOSING_CURLY_BRACE.matcher(inputWithPlaceholder);
-        inputWithPlaceholder = escapedClosingCurlyBrace.replaceAll(PLACEHOLDER_FOR_CLOSING_CURLY_BRACE);
+        Matcher escapedClosingCurlyBrace =
+                ESCAPED_CLOSING_CURLY_BRACE.matcher(inputWithPlaceholder);
+        inputWithPlaceholder =
+                escapedClosingCurlyBrace.replaceAll(PLACEHOLDER_FOR_CLOSING_CURLY_BRACE);
 
         final String regexMatchesReplaced = replaceHonoringProtectedGroups(inputWithPlaceholder);
 
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveDigitsFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveDigitsFormatter.java
index 124b7dc89078..9df95bb3e1fc 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveDigitsFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveDigitsFormatter.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Objects;
+import java.util.regex.Pattern;
+
 public class RemoveDigitsFormatter extends Formatter {
 
     private static final Pattern DIGITS = Pattern.compile("[ ]\\d+");
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveEnclosingBracesFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveEnclosingBracesFormatter.java
index 31b071aac122..5e616f164731 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveEnclosingBracesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveEnclosingBracesFormatter.java
@@ -2,7 +2,6 @@
 
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
-
 import org.jspecify.annotations.NullMarked;
 
 @NullMarked
@@ -31,8 +30,9 @@ public String getExampleInput() {
     @Override
     public String format(String value) {
         String formatted = value;
-        while ((formatted.length() >= 2) && (formatted.charAt(0) == '{') && (formatted.charAt(formatted.length() - 1)
-                == '}')) {
+        while ((formatted.length() >= 2)
+                && (formatted.charAt(0) == '{')
+                && (formatted.charAt(formatted.length() - 1) == '}')) {
             String trimmed = formatted.substring(1, formatted.length() - 1);
 
             // It could be that the removed braces were not matching
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java
index b31099fcc1a3..91f68af49b1c 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Objects;
+import java.util.regex.Pattern;
+
 /**
  * Removes all hyphenated line breaks in the string.
  */
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java
index 8f24a0aee0e3..f0f75fe8e11b 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Objects;
+import java.util.regex.Pattern;
+
 /**
  * Removes all line breaks in the string.
  */
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveRedundantSpacesFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveRedundantSpacesFormatter.java
index 6cdd0ff373b2..3893d868875a 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveRedundantSpacesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveRedundantSpacesFormatter.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Objects;
+import java.util.regex.Pattern;
+
 /**
  * Finds any occurrence of consecutive spaces and replaces it with a single space
  */
@@ -31,7 +31,8 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Replaces consecutive spaces with a single space in the field content.");
+        return Localization.lang(
+                "Replaces consecutive spaces with a single space in the field content.");
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveWordEnclosingAndOuterEnclosingBracesFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveWordEnclosingAndOuterEnclosingBracesFormatter.java
index c70c7315ebe3..9f6d93d56fb5 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveWordEnclosingAndOuterEnclosingBracesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveWordEnclosingAndOuterEnclosingBracesFormatter.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-import java.util.StringJoiner;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
-
 import org.jspecify.annotations.NullMarked;
 
+import java.util.Objects;
+import java.util.StringJoiner;
+
 /**
  * Removes start and end brace both at the complete string and at beginning/end of a word
  * <p>
@@ -22,7 +21,8 @@
 @NullMarked
 public class RemoveWordEnclosingAndOuterEnclosingBracesFormatter extends Formatter {
 
-    private static final RemoveEnclosingBracesFormatter REMOVE_ENCLOSING_BRACES_FORMATTER = new RemoveEnclosingBracesFormatter();
+    private static final RemoveEnclosingBracesFormatter REMOVE_ENCLOSING_BRACES_FORMATTER =
+            new RemoveEnclosingBracesFormatter();
 
     @Override
     public String getName() {
@@ -36,7 +36,8 @@ public String getKey() {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Removes braces encapsulating a complete word and the complete field content.");
+        return Localization.lang(
+                "Removes braces encapsulating a complete word and the complete field content.");
     }
 
     @Override
@@ -55,7 +56,8 @@ public String format(String input) {
             return input;
         }
 
-        // We need to first remove the outer braces to have double braces at the last word working (e.g., {In {CDMA}})
+        // We need to first remove the outer braces to have double braces at the last word working
+        // (e.g., {In {CDMA}})
         input = REMOVE_ENCLOSING_BRACES_FORMATTER.format(input);
 
         String[] split = input.split(" ");
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormater.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormater.java
index 3d42f46a68cf..dcc8378fac17 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormater.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormater.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Objects;
+import java.util.regex.Pattern;
+
 /**
  * Replaces any tab with a space
  */
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatter.java
index 56ee1af1c0f7..0a2f859c6909 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatter.java
@@ -1,22 +1,22 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.importer.util.ShortDOIService;
 import org.jabref.logic.importer.util.ShortDOIServiceException;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.DOI;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Objects;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+
 public class ShortenDOIFormatter extends Formatter {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ShortenDOIFormatter.class);
-    private static final Predicate<String> SHORT_DOI_FORMAT = Pattern.compile("^10/[a-zA-Z0-9]+$").asPredicate();
+    private static final Predicate<String> SHORT_DOI_FORMAT =
+            Pattern.compile("^10/[a-zA-Z0-9]+$").asPredicate();
 
     @Override
     public String getName() {
@@ -31,15 +31,19 @@ public String getKey() {
     @Override
     public String format(String value) {
         Objects.requireNonNull(value);
-        return SHORT_DOI_FORMAT.test(value) ? value : DOI.parse(value)
-                  .map(doi -> {
-                      try {
-                          return new ShortDOIService().getShortDOI(doi).getDOI();
-                      } catch (ShortDOIServiceException e) {
-                          LOGGER.error(e.getMessage(), e);
-                          return value;
-                      }
-                  }).orElse(value);
+        return SHORT_DOI_FORMAT.test(value)
+                ? value
+                : DOI.parse(value)
+                        .map(
+                                doi -> {
+                                    try {
+                                        return new ShortDOIService().getShortDOI(doi).getDOI();
+                                    } catch (ShortDOIServiceException e) {
+                                        LOGGER.error(e.getMessage(), e);
+                                        return value;
+                                    }
+                                })
+                        .orElse(value);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java
index 4e4d87788f0d..67e0c39b7810 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java
@@ -1,13 +1,12 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Objects;
+
 /**
  * Trim all whitespace characters (as defined in Java) in the beginning and at the end of the string.
  */
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java
index d1ffcbc66d91..4c8629696a0d 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java
@@ -1,19 +1,19 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Map;
-import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.logic.util.strings.HTMLUnicodeConversionMaps;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+import java.util.Objects;
+
 public class UnicodeToLatexFormatter extends Formatter implements LayoutFormatter {
 
-    public static final NormalizeUnicodeFormatter UNICODE_NORMALIZER = new NormalizeUnicodeFormatter();
+    public static final NormalizeUnicodeFormatter UNICODE_NORMALIZER =
+            new NormalizeUnicodeFormatter();
     private static final Logger LOGGER = LoggerFactory.getLogger(UnicodeToLatexFormatter.class);
 
     @Override
@@ -27,8 +27,8 @@ public String format(String text) {
         result = UNICODE_NORMALIZER.format(result);
 
         // Standard symbols
-        for (Map.Entry<String, String> unicodeLatexPair : HTMLUnicodeConversionMaps.UNICODE_LATEX_CONVERSION_MAP
-                .entrySet()) {
+        for (Map.Entry<String, String> unicodeLatexPair :
+                HTMLUnicodeConversionMaps.UNICODE_LATEX_CONVERSION_MAP.entrySet()) {
             result = result.replace(unicodeLatexPair.getKey(), unicodeLatexPair.getValue());
         }
 
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java
index 2f9413f92963..67ef74a64e67 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java
@@ -1,95 +1,101 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import org.jabref.logic.cleanup.Formatter;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.strings.StringLengthComparator;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
-import org.jabref.logic.cleanup.Formatter;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.strings.StringLengthComparator;
-
 public class UnitsToLatexFormatter extends Formatter {
 
-    private static final List<String> UNIT_LIST = Arrays.asList(
-            "A", // Ampere
-            "Ah", // Ampere hours
-            "B", // Byte
-            "Bq", // Bequerel
-            "C", // Coulomb
-            "F", // Farad
-            "Gy", // Gray
-            "H", // Henry
-            "Hz", // Hertz
-            "J", // Joule
-            "K", // Kelvin
-            "N", // Newton
-            "\\$\\\\Omega\\$", // Ohm
-            "Pa", // Pascal
-            "S", // Siemens, Samples
-            "Sa", // Samples
-            "Sv", // Sv
-            "T", // Tesla
-            "V", // Volt
-            "VA", // Volt ampere
-            "W", // Watt
-            "Wb", // Weber
-            "Wh", // Watt hours
-            "bar", // bar
-            "b", // bit
-            "cd", // candela
-            "dB", // decibel
-            "dBm", // decibel
-            "dBc", // decibel
-            "eV", // electron volts
-            "inch", // inch
-            "kat", // katal
-            "lm", // lumen
-            "lx", // lux
-            "m", // meters
-            "mol", // mol
-            "rad", // radians
-            "s", // seconds
-            "sr" // steradians
-    );
-
-    private static final List<String> UNIT_PREFIX_LIST = Arrays.asList(
-            "y", // yocto
-            "z", // zepto
-            "a", // atto
-            "f", // femto
-            "p", // pico
-            "n", // nano
-            "\\$\\\\mu\\$", // micro
-            "u", // micro
-            "m", // milli
-            "c", // centi
-            "d", // deci
-            "", // no prefix
-            "da", // deca
-            "h", // hekto
-            "k", // kilo
-            "M", // mega
-            "G", // giga
-            "T", // tera
-            "P", // peta
-            "E", // exa
-            "Z", // zetta
-            "Y" // yotta
-    );
+    private static final List<String> UNIT_LIST =
+            Arrays.asList(
+                    "A", // Ampere
+                    "Ah", // Ampere hours
+                    "B", // Byte
+                    "Bq", // Bequerel
+                    "C", // Coulomb
+                    "F", // Farad
+                    "Gy", // Gray
+                    "H", // Henry
+                    "Hz", // Hertz
+                    "J", // Joule
+                    "K", // Kelvin
+                    "N", // Newton
+                    "\\$\\\\Omega\\$", // Ohm
+                    "Pa", // Pascal
+                    "S", // Siemens, Samples
+                    "Sa", // Samples
+                    "Sv", // Sv
+                    "T", // Tesla
+                    "V", // Volt
+                    "VA", // Volt ampere
+                    "W", // Watt
+                    "Wb", // Weber
+                    "Wh", // Watt hours
+                    "bar", // bar
+                    "b", // bit
+                    "cd", // candela
+                    "dB", // decibel
+                    "dBm", // decibel
+                    "dBc", // decibel
+                    "eV", // electron volts
+                    "inch", // inch
+                    "kat", // katal
+                    "lm", // lumen
+                    "lx", // lux
+                    "m", // meters
+                    "mol", // mol
+                    "rad", // radians
+                    "s", // seconds
+                    "sr" // steradians
+                    );
+
+    private static final List<String> UNIT_PREFIX_LIST =
+            Arrays.asList(
+                    "y", // yocto
+                    "z", // zepto
+                    "a", // atto
+                    "f", // femto
+                    "p", // pico
+                    "n", // nano
+                    "\\$\\\\mu\\$", // micro
+                    "u", // micro
+                    "m", // milli
+                    "c", // centi
+                    "d", // deci
+                    "", // no prefix
+                    "da", // deca
+                    "h", // hekto
+                    "k", // kilo
+                    "M", // mega
+                    "G", // giga
+                    "T", // tera
+                    "P", // peta
+                    "E", // exa
+                    "Z", // zetta
+                    "Y" // yotta
+                    );
 
     private final List<String> prefixUnitCombinations;
 
     public UnitsToLatexFormatter() {
-        prefixUnitCombinations = new ArrayList<>(
-                UnitsToLatexFormatter.UNIT_LIST.size() * UnitsToLatexFormatter.UNIT_PREFIX_LIST.size());
+        prefixUnitCombinations =
+                new ArrayList<>(
+                        UnitsToLatexFormatter.UNIT_LIST.size()
+                                * UnitsToLatexFormatter.UNIT_PREFIX_LIST.size());
         for (String unit : UnitsToLatexFormatter.UNIT_LIST) {
             for (String prefix : UnitsToLatexFormatter.UNIT_PREFIX_LIST) {
                 prefixUnitCombinations.add(prefix + unit);
             }
         }
-        Collections.sort(prefixUnitCombinations, new StringLengthComparator()); // Sort based on string length
+        Collections.sort(
+                prefixUnitCombinations,
+                new StringLengthComparator()); // Sort based on string length
     }
 
     @Override
@@ -99,18 +105,30 @@ public String format(String text) {
             return text;
         }
 
-        // Replace the hyphen in 12-bit etc with a non-breaking hyphen, will also avoid bad casing of 12-Bit
+        // Replace the hyphen in 12-bit etc with a non-breaking hyphen, will also avoid bad casing
+        // of 12-Bit
         String result = text.replaceAll("([0-9,\\.]+)-([Bb][Ii][Tt])", "$1\\\\mbox\\{-\\}$2");
 
-        // Replace the space in 12 bit etc with a non-breaking space, will also avoid bad casing of 12 Bit
+        // Replace the space in 12 bit etc with a non-breaking space, will also avoid bad casing of
+        // 12 Bit
         result = result.replaceAll("([0-9,\\.]+) ([Bb][Ii][Tt])", "$1~$2");
 
         // For each word in the list
         for (String listOfWord : prefixUnitCombinations) {
-            // Add {} if the character before is a space, -, /, (, [, or } or if it is at the start of the string but not if it is followed by a }
-            result = result.replaceAll("([0-9])(" + listOfWord + ")", "$1\\{$2\\}"); // Only add brackets to keep case
-            result = result.replaceAll("([0-9])-(" + listOfWord + ")", "$1\\\\mbox\\{-\\}\\{$2\\}"); // Replace hyphen with non-break hyphen
-            result = result.replaceAll("([0-9]) (" + listOfWord + ")", "$1~\\{$2\\}"); // Replace space with a hard space
+            // Add {} if the character before is a space, -, /, (, [, or } or if it is at the start
+            // of the string but not if it is followed by a }
+            result =
+                    result.replaceAll(
+                            "([0-9])(" + listOfWord + ")",
+                            "$1\\{$2\\}"); // Only add brackets to keep case
+            result =
+                    result.replaceAll(
+                            "([0-9])-(" + listOfWord + ")",
+                            "$1\\\\mbox\\{-\\}\\{$2\\}"); // Replace hyphen with non-break hyphen
+            result =
+                    result.replaceAll(
+                            "([0-9]) (" + listOfWord + ")",
+                            "$1~\\{$2\\}"); // Replace space with a hard space
         }
 
         return result;
diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java b/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java
index 002a4a6be95f..c359157e7603 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.formatter.casechanger;
 
-import java.util.List;
-import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 import org.jabref.logic.util.strings.StringLengthComparator;
 
+import java.util.List;
+import java.util.Objects;
+
 /**
  * Adds {} brackets around acronyms, month names and countries to preserve their case.
  *
@@ -27,8 +27,12 @@ private String format(String text, List<String> listOfWords) {
         listOfWords.sort(new StringLengthComparator());
         // For each word in the list
         for (String listOfWord : listOfWords) {
-            // Add {} if the character before is a space, -, /, (, [, ", or } or if it is at the start of the string but not if it is followed by a }
-            result = result.replaceAll("(^|[- /\\[(}\"])" + listOfWord + "($|[^a-zA-Z}])", "$1\\{" + listOfWord + "\\}$2");
+            // Add {} if the character before is a space, -, /, (, [, ", or } or if it is at the
+            // start of the string but not if it is followed by a }
+            result =
+                    result.replaceAll(
+                            "(^|[- /\\[(}\"])" + listOfWord + "($|[^a-zA-Z}])",
+                            "$1\\{" + listOfWord + "\\}$2");
         }
         // Remove the empty brackets
         result = result.replace("{}", "");
diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java b/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java
index 5f73c4839db9..772fcd49d55d 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.formatter.casechanger;
 
-import java.util.stream.Collectors;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.stream.Collectors;
+
 public class SentenceCaseFormatter extends Formatter {
 
     @Override
@@ -23,22 +23,21 @@ public String getKey() {
      */
     @Override
     public String format(String input) {
-        return StringUtil.getStringAsSentences(input)
-                .stream()
+        return StringUtil.getStringAsSentences(input).stream()
                 .map(new LowerCaseFormatter()::format)
                 .map(Title::new)
-                .map(title -> {
-                    title.getFirstWord().ifPresent(Word::toUpperFirst);
-                    return title;
-                })
+                .map(
+                        title -> {
+                            title.getFirstWord().ifPresent(Word::toUpperFirst);
+                            return title;
+                        })
                 .map(Object::toString)
                 .collect(Collectors.joining(" "));
     }
 
     @Override
     public String getDescription() {
-        return Localization.lang(
-                "Capitalize the first word, changes other words to lower case.");
+        return Localization.lang("Capitalize the first word, changes other words to lower case.");
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java b/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java
index 857cc6a772b1..9eb5d7cc9bd4 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.formatter.casechanger;
 
-import java.util.stream.Collectors;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.stream.Collectors;
+
 public class TitleCaseFormatter extends Formatter {
 
     @Override
@@ -25,25 +25,29 @@ public String getKey() {
      */
     @Override
     public String format(String input) {
-        return StringUtil.getStringAsSentences(input)
-                .stream()
-                .map(sentence -> {
-                    Title title = new Title(sentence);
+        return StringUtil.getStringAsSentences(input).stream()
+                .map(
+                        sentence -> {
+                            Title title = new Title(sentence);
 
-                    title.getWords().stream().filter(Word::isSmallerWord).forEach(Word::toLowerCase);
-                    title.getWords().stream().filter(Word::isLargerWord).forEach(Word::toUpperFirstTitle);
+                            title.getWords().stream()
+                                    .filter(Word::isSmallerWord)
+                                    .forEach(Word::toLowerCase);
+                            title.getWords().stream()
+                                    .filter(Word::isLargerWord)
+                                    .forEach(Word::toUpperFirstTitle);
 
-                    title.getFirstWord().ifPresent(Word::toUpperFirstTitle);
-                    title.getLastWord().ifPresent(Word::toUpperFirstTitle);
+                            title.getFirstWord().ifPresent(Word::toUpperFirstTitle);
+                            title.getLastWord().ifPresent(Word::toUpperFirstTitle);
 
-                    for (int i = 0; i < (title.getWords().size() - 2); i++) {
-                        if (title.getWords().get(i).endsWithColon()) {
-                            title.getWords().get(i + 1).toUpperFirstTitle();
-                        }
-                    }
+                            for (int i = 0; i < (title.getWords().size() - 2); i++) {
+                                if (title.getWords().get(i).endsWithColon()) {
+                                    title.getWords().get(i + 1).toUpperFirstTitle();
+                                }
+                            }
 
-                    return title.toString();
-                })
+                            return title.toString();
+                        })
                 .collect(Collectors.joining(" "));
     }
 
diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatter.java b/src/main/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatter.java
index cc2d5ab2096a..35402d22c814 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatter.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.casechanger;
 
-import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Objects;
+
 /**
  * Remove {} braces around words in case they appear balanced
  *
@@ -14,7 +14,8 @@ public class UnprotectTermsFormatter extends Formatter {
 
     @Override
     public String format(String text) {
-        // similar implementation at {@link org.jabref.logic.formatter.bibtexfields.RemoveBracesFormatter.hasNegativeBraceCount}
+        // similar implementation at {@link
+        // org.jabref.logic.formatter.bibtexfields.RemoveBracesFormatter.hasNegativeBraceCount}
         Objects.requireNonNull(text);
         if (text.isEmpty()) {
             return text;
@@ -42,8 +43,7 @@ public String format(String text) {
 
     @Override
     public String getDescription() {
-        return Localization.lang(
-                "Removes all balanced {} braces around words.");
+        return Localization.lang("Removes all balanced {} braces around words.");
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java b/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java
index b3c52eebe1c1..fe3df0a9b5e6 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java
@@ -29,8 +29,7 @@ public String format(String input) {
 
     @Override
     public String getDescription() {
-        return Localization.lang(
-                "CHANGES ALL LETTERS TO UPPER CASE.");
+        return Localization.lang("CHANGES ALL LETTERS TO UPPER CASE.");
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/Word.java b/src/main/java/org/jabref/logic/formatter/casechanger/Word.java
index 394ed753ee93..85a471944720 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/Word.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/Word.java
@@ -18,12 +18,15 @@ public final class Word {
      */
     public static final Set<String> SMALLER_WORDS;
 
-    public static final Set<Character> DASHES = Set.of('-', '~', '⸗', '〰', '᐀', '֊', '־', '‐', '‑', '‒',
-            '–', '—', '―', '⁓', '⁻', '₋', '−', '⸺', '⸻',
-            '〜', '゠', '︱', '︲', '﹘', '﹣', '－');
+    public static final Set<Character> DASHES =
+            Set.of(
+                    '-', '~', '⸗', '〰', '᐀', '֊', '־', '‐', '‑', '‒', '–', '—', '―', '⁓', '⁻', '₋',
+                    '−', '⸺', '⸻', '〜', '゠', '︱', '︲', '﹘', '﹣', '－');
 
-    // Conjunctions used as part of Title case capitalisation to specifically check if word is conjunction or not
-    public static final Set<String> CONJUNCTIONS = Set.of("and", "but", "for", "nor", "or", "so", "yet");
+    // Conjunctions used as part of Title case capitalisation to specifically check if word is
+    // conjunction or not
+    public static final Set<String> CONJUNCTIONS =
+            Set.of("and", "but", "for", "nor", "or", "so", "yet");
 
     private final char[] chars;
 
@@ -36,14 +39,22 @@ public final class Word {
         smallerWords.addAll(Arrays.asList("a", "an", "the"));
 
         // Prepositions
-        smallerWords.addAll(Arrays.asList("above", "about", "across", "against", "along", "among", "around", "at", "before", "behind", "below", "beneath", "beside", "between", "beyond", "by", "down", "during", "except", "for", "from", "in", "inside", "into", "like", "near", "of", "off", "on", "onto", "since", "to", "toward", "through", "under", "until", "up", "upon", "with", "within", "without"));
-
-        // Conjunctions used as part of all case capitalisation to check if it is a small word or not
+        smallerWords.addAll(
+                Arrays.asList(
+                        "above", "about", "across", "against", "along", "among", "around", "at",
+                        "before", "behind", "below", "beneath", "beside", "between", "beyond", "by",
+                        "down", "during", "except", "for", "from", "in", "inside", "into", "like",
+                        "near", "of", "off", "on", "onto", "since", "to", "toward", "through",
+                        "under", "until", "up", "upon", "with", "within", "without"));
+
+        // Conjunctions used as part of all case capitalisation to check if it is a small word or
+        // not
         smallerWords.addAll(CONJUNCTIONS);
 
-        SMALLER_WORDS = smallerWords.stream()
-                                    .map(word -> word.toLowerCase(Locale.ROOT))
-                                    .collect(Collectors.toUnmodifiableSet());
+        SMALLER_WORDS =
+                smallerWords.stream()
+                        .map(word -> word.toLowerCase(Locale.ROOT))
+                        .collect(Collectors.toUnmodifiableSet());
     }
 
     public Word(char[] chars, boolean[] protectedChars) {
@@ -51,7 +62,8 @@ public Word(char[] chars, boolean[] protectedChars) {
         this.protectedChars = Objects.requireNonNull(protectedChars);
 
         if (this.chars.length != this.protectedChars.length) {
-            throw new IllegalArgumentException("the chars and the protectedChars array must be of same length");
+            throw new IllegalArgumentException(
+                    "the chars and the protectedChars array must be of same length");
         }
     }
 
@@ -87,9 +99,8 @@ public void toLowerCase() {
     public void toUpperFirst() {
         for (int i = 0; i < chars.length; i++) {
             if (!protectedChars[i]) {
-                chars[i] = i == 0 ?
-                        Character.toUpperCase(chars[i]) :
-                        Character.toLowerCase(chars[i]);
+                chars[i] =
+                        i == 0 ? Character.toUpperCase(chars[i]) : Character.toLowerCase(chars[i]);
             }
         }
     }
@@ -97,9 +108,10 @@ public void toUpperFirst() {
     public void toUpperFirstIgnoreHyphen() {
         for (int i = 0; i < chars.length; i++) {
             if (!protectedChars[i]) {
-                chars[i] = i == 0 || (DASHES.contains(chars[i - 1])) ?
-                        Character.toUpperCase(chars[i]) :
-                        Character.toLowerCase(chars[i]);
+                chars[i] =
+                        i == 0 || (DASHES.contains(chars[i - 1]))
+                                ? Character.toUpperCase(chars[i])
+                                : Character.toLowerCase(chars[i]);
             }
         }
     }
@@ -107,28 +119,30 @@ public void toUpperFirstIgnoreHyphen() {
     public void toUpperFirstTitle() {
         for (int i = 0; i < chars.length; i++) {
             if (!protectedChars[i]) {
-                chars[i] = i == 0 || (DASHES.contains(chars[i - 1]) && isConjunction(chars, i)) ?
-                        Character.toUpperCase(chars[i]) :
-                        Character.toLowerCase(chars[i]);
+                chars[i] =
+                        i == 0 || (DASHES.contains(chars[i - 1]) && isConjunction(chars, i))
+                                ? Character.toUpperCase(chars[i])
+                                : Character.toLowerCase(chars[i]);
             }
         }
     }
 
     private boolean isConjunction(char[] chars, int i) {
         String word = "";
-            while (i < chars.length && !DASHES.contains(chars[i])) {
-                word += chars[i];
-                i++;
-            }
+        while (i < chars.length && !DASHES.contains(chars[i])) {
+            word += chars[i];
+            i++;
+        }
         return !CONJUNCTIONS.contains(word);
     }
 
     public void stripConsonants() {
         for (int i = 0; i < chars.length; i++) {
             if (!protectedChars[i]) {
-                chars[i] = i == 0 || DASHES.contains(chars[i - 1]) ?
-                        Character.toUpperCase(chars[i]) :
-                        Character.toLowerCase(chars[i]);
+                chars[i] =
+                        i == 0 || DASHES.contains(chars[i - 1])
+                                ? Character.toUpperCase(chars[i])
+                                : Character.toLowerCase(chars[i]);
             }
         }
     }
diff --git a/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java b/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java
index 0c2ccd0ed5e5..de3b4bfabba1 100644
--- a/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.minifier;
 
-import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Objects;
+
 /**
  * Replaces three or more authors with and others
  */
@@ -42,7 +42,8 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Shortens lists of persons if there are more than 2 persons to \"et al.\".");
+        return Localization.lang(
+                "Shortens lists of persons if there are more than 2 persons to \"et al.\".");
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/formatter/minifier/TruncateFormatter.java b/src/main/java/org/jabref/logic/formatter/minifier/TruncateFormatter.java
index 8ee8f76ffc1b..274c2f386395 100644
--- a/src/main/java/org/jabref/logic/formatter/minifier/TruncateFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/minifier/TruncateFormatter.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.minifier;
 
-import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
+import java.util.Objects;
+
 public class TruncateFormatter extends Formatter {
     private final int TRUNCATE_AFTER;
     private final String KEY;
diff --git a/src/main/java/org/jabref/logic/git/GitHandler.java b/src/main/java/org/jabref/logic/git/GitHandler.java
index 77a786814285..d48b3ecf5c93 100644
--- a/src/main/java/org/jabref/logic/git/GitHandler.java
+++ b/src/main/java/org/jabref/logic/git/GitHandler.java
@@ -1,12 +1,5 @@
 package org.jabref.logic.git;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Optional;
-
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.RmCommand;
 import org.eclipse.jgit.api.Status;
@@ -18,6 +11,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+
 /**
  * This class handles the updating of the local and remote git repository that is located at the repository path
  * This provides an easy-to-use interface to manage a git repository
@@ -28,7 +28,8 @@ public class GitHandler {
     final File repositoryPathAsFile;
     String gitUsername = Optional.ofNullable(System.getenv("GIT_EMAIL")).orElse("");
     String gitPassword = Optional.ofNullable(System.getenv("GIT_PW")).orElse("");
-    final CredentialsProvider credentialsProvider = new UsernamePasswordCredentialsProvider(gitUsername, gitPassword);
+    final CredentialsProvider credentialsProvider =
+            new UsernamePasswordCredentialsProvider(gitUsername, gitPassword);
 
     /**
      * Initialize the handler for the given repository
@@ -40,20 +41,14 @@ public GitHandler(Path repositoryPath) {
         this.repositoryPathAsFile = this.repositoryPath.toFile();
         if (!isGitRepository()) {
             try {
-                Git.init()
-                   .setDirectory(repositoryPathAsFile)
-                   .setInitialBranch("main")
-                   .call();
+                Git.init().setDirectory(repositoryPathAsFile).setInitialBranch("main").call();
                 setupGitIgnore();
                 String initialCommit = "Initial commit";
                 if (!createCommitOnCurrentBranch(initialCommit, false)) {
                     // Maybe, setupGitIgnore failed and did not add something
                     // Then, we create an empty commit
                     try (Git git = Git.open(repositoryPathAsFile)) {
-                        git.commit()
-                           .setAllowEmpty(true)
-                           .setMessage(initialCommit)
-                           .call();
+                        git.commit().setAllowEmpty(true).setMessage(initialCommit).call();
                     }
                 }
             } catch (GitAPIException | IOException e) {
@@ -68,7 +63,9 @@ void setupGitIgnore() {
             try (InputStream inputStream = this.getClass().getResourceAsStream("git.gitignore")) {
                 Files.copy(inputStream, gitignore);
             } catch (IOException e) {
-                LOGGER.error("Error occurred during copying of the gitignore file into the git repository.", e);
+                LOGGER.error(
+                        "Error occurred during copying of the gitignore file into the git repository.",
+                        e);
             }
         }
     }
@@ -77,8 +74,10 @@ void setupGitIgnore() {
      * Returns true if the given path points to a directory that is a git repository (contains a .git folder)
      */
     boolean isGitRepository() {
-        // For some reason the solution from https://www.eclipse.org/lists/jgit-dev/msg01892.html does not work
-        // This solution is quite simple but might not work in special cases, for us it should suffice.
+        // For some reason the solution from https://www.eclipse.org/lists/jgit-dev/msg01892.html
+        // does not work
+        // This solution is quite simple but might not work in special cases, for us it should
+        // suffice.
         return Files.exists(Path.of(repositoryPath.toString(), ".git"));
     }
 
@@ -91,10 +90,10 @@ public void checkoutBranch(String branchToCheckout) throws IOException, GitAPIEx
         try (Git git = Git.open(this.repositoryPathAsFile)) {
             Optional<Ref> branch = getRefForBranch(branchToCheckout);
             git.checkout()
-               // If the branch does not exist, create it
-               .setCreateBranch(branch.isEmpty())
-               .setName(branchToCheckout)
-               .call();
+                    // If the branch does not exist, create it
+                    .setCreateBranch(branch.isEmpty())
+                    .setName(branchToCheckout)
+                    .call();
         }
     }
 
@@ -104,11 +103,9 @@ public void checkoutBranch(String branchToCheckout) throws IOException, GitAPIEx
      */
     Optional<Ref> getRefForBranch(String branchName) throws GitAPIException, IOException {
         try (Git git = Git.open(this.repositoryPathAsFile)) {
-            return git.branchList()
-                      .call()
-                      .stream()
-                      .filter(ref -> ref.getName().equals("refs/heads/" + branchName))
-                      .findAny();
+            return git.branchList().call().stream()
+                    .filter(ref -> ref.getName().equals("refs/heads/" + branchName))
+                    .findAny();
         }
     }
 
@@ -118,28 +115,22 @@ Optional<Ref> getRefForBranch(String branchName) throws GitAPIException, IOExcep
      * @param amend Whether to amend to the last commit (true), or not (false)
      * @return Returns true if a new commit was created. This is the case if the repository was not clean on method invocation
      */
-    public boolean createCommitOnCurrentBranch(String commitMessage, boolean amend) throws IOException, GitAPIException {
+    public boolean createCommitOnCurrentBranch(String commitMessage, boolean amend)
+            throws IOException, GitAPIException {
         boolean commitCreated = false;
         try (Git git = Git.open(this.repositoryPathAsFile)) {
             Status status = git.status().call();
             if (!status.isClean()) {
                 commitCreated = true;
                 // Add new and changed files to index
-                git.add()
-                   .addFilepattern(".")
-                   .call();
+                git.add().addFilepattern(".").call();
                 // Add all removed files to index
                 if (!status.getMissing().isEmpty()) {
-                    RmCommand removeCommand = git.rm()
-                                                 .setCached(true);
+                    RmCommand removeCommand = git.rm().setCached(true);
                     status.getMissing().forEach(removeCommand::addFilepattern);
                     removeCommand.call();
                 }
-                git.commit()
-                   .setAmend(amend)
-                   .setAllowEmpty(false)
-                   .setMessage(commitMessage)
-                   .call();
+                git.commit().setAmend(amend).setAllowEmpty(false).setMessage(commitMessage).call();
             }
         }
         return commitCreated;
@@ -151,7 +142,8 @@ public boolean createCommitOnCurrentBranch(String commitMessage, boolean amend)
      * @param targetBranch the name of the branch that is merged into
      * @param sourceBranch the name of the branch that gets merged
      */
-    public void mergeBranches(String targetBranch, String sourceBranch, MergeStrategy mergeStrategy) throws IOException, GitAPIException {
+    public void mergeBranches(String targetBranch, String sourceBranch, MergeStrategy mergeStrategy)
+            throws IOException, GitAPIException {
         String currentBranch = this.getCurrentlyCheckedOutBranch();
         try (Git git = Git.open(this.repositoryPathAsFile)) {
             Optional<Ref> sourceBranchRef = getRefForBranch(sourceBranch);
@@ -161,10 +153,10 @@ public void mergeBranches(String targetBranch, String sourceBranch, MergeStrateg
             }
             this.checkoutBranch(targetBranch);
             git.merge()
-               .include(sourceBranchRef.get())
-               .setStrategy(mergeStrategy)
-               .setMessage("Merge search branch into working branch.")
-               .call();
+                    .include(sourceBranchRef.get())
+                    .setStrategy(mergeStrategy)
+                    .setMessage("Merge search branch into working branch.")
+                    .call();
         }
         this.checkoutBranch(currentBranch);
     }
@@ -176,9 +168,7 @@ public void mergeBranches(String targetBranch, String sourceBranch, MergeStrateg
     public void pushCommitsToRemoteRepository() throws IOException {
         try (Git git = Git.open(this.repositoryPathAsFile)) {
             try {
-                git.push()
-                   .setCredentialsProvider(credentialsProvider)
-                   .call();
+                git.push().setCredentialsProvider(credentialsProvider).call();
             } catch (GitAPIException e) {
                 LOGGER.info("Failed to push");
             }
@@ -188,9 +178,7 @@ public void pushCommitsToRemoteRepository() throws IOException {
     public void pullOnCurrentBranch() throws IOException {
         try (Git git = Git.open(this.repositoryPathAsFile)) {
             try {
-                git.pull()
-                   .setCredentialsProvider(credentialsProvider)
-                   .call();
+                git.pull().setCredentialsProvider(credentialsProvider).call();
             } catch (GitAPIException e) {
                 LOGGER.info("Failed to push");
             }
diff --git a/src/main/java/org/jabref/logic/git/SlrGitHandler.java b/src/main/java/org/jabref/logic/git/SlrGitHandler.java
index ec015edfc184..c8c5e732f3fd 100644
--- a/src/main/java/org/jabref/logic/git/SlrGitHandler.java
+++ b/src/main/java/org/jabref/logic/git/SlrGitHandler.java
@@ -1,5 +1,16 @@
 package org.jabref.logic.git;
 
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.diff.DiffEntry;
+import org.eclipse.jgit.diff.DiffFormatter;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.ObjectReader;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.treewalk.CanonicalTreeParser;
+import org.jabref.logic.crawler.StudyRepository;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -11,18 +22,6 @@
 import java.util.Optional;
 import java.util.StringJoiner;
 
-import org.jabref.logic.crawler.StudyRepository;
-
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.diff.DiffEntry;
-import org.eclipse.jgit.diff.DiffFormatter;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.ObjectReader;
-import org.eclipse.jgit.lib.Ref;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.treewalk.CanonicalTreeParser;
-
 public class SlrGitHandler extends GitHandler {
 
     /**
@@ -34,7 +33,8 @@ public SlrGitHandler(Path repositoryPath) {
         super(repositoryPath);
     }
 
-    public void appendLatestSearchResultsOntoCurrentBranch(String patchMessage, String searchBranchName) throws IOException, GitAPIException {
+    public void appendLatestSearchResultsOntoCurrentBranch(
+            String patchMessage, String searchBranchName) throws IOException, GitAPIException {
         // Calculate and apply new search results to work branch
         String patch = calculatePatchOfNewSearchResults(searchBranchName);
         Map<Path, String> result = parsePatchForAddedEntries(patch);
@@ -49,7 +49,8 @@ public void appendLatestSearchResultsOntoCurrentBranch(String patchMessage, Stri
      * @param sourceBranch The name of the branch that is the target of the calculation
      * @return Returns the patch (diff) between the head of the sourceBranch and its previous commit HEAD^1
      */
-    String calculatePatchOfNewSearchResults(String sourceBranch) throws IOException, GitAPIException {
+    String calculatePatchOfNewSearchResults(String sourceBranch)
+            throws IOException, GitAPIException {
         try (Git git = Git.open(this.repositoryPathAsFile)) {
             Optional<Ref> sourceBranchRef = getRefForBranch(sourceBranch);
             if (sourceBranchRef.isEmpty()) {
@@ -104,7 +105,9 @@ Map<Path, String> parsePatchForAddedEntries(String patch) throws IOException, Gi
                 // If the diff is related to a different file, save the diff for the previous file
                 if (!(relativePath == null || joiner == null)) {
                     if (!relativePath.contains(StudyRepository.STUDY_DEFINITION_FILE_NAME)) {
-                        diffsPerFile.put(Path.of(repositoryPath.toString(), relativePath), joiner.toString());
+                        diffsPerFile.put(
+                                Path.of(repositoryPath.toString(), relativePath),
+                                joiner.toString());
                     }
                 }
                 // Find the relative path of the file that is related with the current diff
@@ -138,20 +141,25 @@ Map<Path, String> parsePatchForAddedEntries(String patch) throws IOException, Gi
      * The patch is inserted between the encoding and the contents of the bib files.
      */
     void applyPatch(Map<Path, String> patch) {
-        patch.keySet().forEach(path -> {
-            try {
-                String currentContent = Files.readString(path);
-                String prefix = "";
-                if (currentContent.startsWith("% Encoding:")) {
-                    int endOfEncoding = currentContent.indexOf("\n");
-                    // Include Encoding and the empty line
-                    prefix = currentContent.substring(0, endOfEncoding + 1) + "\n";
-                    currentContent = currentContent.substring(endOfEncoding + 2);
-                }
-                Files.writeString(path, prefix + patch.get(path) + currentContent, StandardCharsets.UTF_8);
-            } catch (IOException e) {
-                LOGGER.error("Could not apply patch.");
-            }
-        });
+        patch.keySet()
+                .forEach(
+                        path -> {
+                            try {
+                                String currentContent = Files.readString(path);
+                                String prefix = "";
+                                if (currentContent.startsWith("% Encoding:")) {
+                                    int endOfEncoding = currentContent.indexOf("\n");
+                                    // Include Encoding and the empty line
+                                    prefix = currentContent.substring(0, endOfEncoding + 1) + "\n";
+                                    currentContent = currentContent.substring(endOfEncoding + 2);
+                                }
+                                Files.writeString(
+                                        path,
+                                        prefix + patch.get(path) + currentContent,
+                                        StandardCharsets.UTF_8);
+                            } catch (IOException e) {
+                                LOGGER.error("Could not apply patch.");
+                            }
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java b/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
index d59599165cc7..ade708d4c1bc 100644
--- a/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
+++ b/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
@@ -10,8 +10,7 @@ public class DefaultGroupsFactory {
 
     public static final String ALL_ENTRIES_GROUP_DEFAULT_ICON = "ALL_ENTRIES_GROUP_ICON";
 
-    private DefaultGroupsFactory() {
-    }
+    private DefaultGroupsFactory() {}
 
     public static AllEntriesGroup getAllEntriesGroup() {
         AllEntriesGroup group = new AllEntriesGroup(Localization.lang("All entries"));
diff --git a/src/main/java/org/jabref/logic/help/HelpFile.java b/src/main/java/org/jabref/logic/help/HelpFile.java
index c4f91c541539..f6812d47a5dc 100644
--- a/src/main/java/org/jabref/logic/help/HelpFile.java
+++ b/src/main/java/org/jabref/logic/help/HelpFile.java
@@ -10,15 +10,18 @@ public enum HelpFile {
     CONTENTS(""), // this is always the index
     ENTRY_EDITOR("advanced/entryeditor"),
     STRING_EDITOR("setup/stringeditor"),
-    GROUPS("finding-sorting-and-cleaning-entries/groups#groups-structure-creating-and-removing-groups"),
+    GROUPS(
+            "finding-sorting-and-cleaning-entries/groups#groups-structure-creating-and-removing-groups"),
     SPECIAL_FIELDS("finding-sorting-and-cleaning-entries/specialfields"),
     CITATION_KEY_PATTERN("setup/citationkeypatterns"),
     OWNER("advanced/entryeditor/owner"),
     TIMESTAMP("advanced/entryeditor/timestamp"),
-    CUSTOM_EXPORTS_NAME_FORMATTER("collaborative-work/export/customexports#using-custom-name-formatters"),
+    CUSTOM_EXPORTS_NAME_FORMATTER(
+            "collaborative-work/export/customexports#using-custom-name-formatters"),
     GENERAL_FIELDS("setup/generalfields"),
     REMOTE("advanced/remote"),
-    REGEX_SEARCH("finding-sorting-and-cleaning-entries/filelinks#using-regular-expression-search-for-auto-linking"),
+    REGEX_SEARCH(
+            "finding-sorting-and-cleaning-entries/filelinks#using-regular-expression-search-for-auto-linking"),
     PREVIEW("setup/preview"),
     AUTOSAVE("advanced/autosave"),
     // The help page covers both OO and LO.
diff --git a/src/main/java/org/jabref/logic/importer/AuthorListParser.java b/src/main/java/org/jabref/logic/importer/AuthorListParser.java
index c02697695713..769556a331ea 100644
--- a/src/main/java/org/jabref/logic/importer/AuthorListParser.java
+++ b/src/main/java/org/jabref/logic/importer/AuthorListParser.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.importer;
 
+import org.jabref.model.entry.Author;
+import org.jabref.model.entry.AuthorList;
+import org.jabref.model.strings.StringUtil;
+import org.jspecify.annotations.NonNull;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -12,17 +17,11 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import org.jabref.model.entry.Author;
-import org.jabref.model.entry.AuthorList;
-import org.jabref.model.strings.StringUtil;
-
-import org.jspecify.annotations.NonNull;
-
 public class AuthorListParser {
 
     // Avoid partition where these values are contained
-    private final static Set<String> AVOID_TERMS_IN_LOWER_CASE = Set.of(
-            "jr", "sr", "jnr", "snr", "von", "zu", "van", "der");
+    private static final Set<String> AVOID_TERMS_IN_LOWER_CASE =
+            Set.of("jr", "sr", "jnr", "snr", "von", "zu", "van", "der");
 
     private static final int TOKEN_GROUP_LENGTH = 4; // number of entries for a token
 
@@ -34,32 +33,38 @@ public class AuthorListParser {
     private static final int OFFSET_TOKEN_TERM = 2; // Character -- token terminator (either " " or
     // "-") comma)
     // Constant HashSet containing names of TeX special characters
-    private static final Set<String> TEX_NAMES = Set.of(
-            "aa", "ae", "l", "o", "oe", "i", "AA", "AE", "L", "O", "OE", "j");
+    private static final Set<String> TEX_NAMES =
+            Set.of("aa", "ae", "l", "o", "oe", "i", "AA", "AE", "L", "O", "OE", "j");
 
-    private static final Pattern STARTS_WITH_CAPITAL_LETTER_DOT_OR_DASH = Pattern.compile("^[A-Z](\\.[ -]| ?-)");
+    private static final Pattern STARTS_WITH_CAPITAL_LETTER_DOT_OR_DASH =
+            Pattern.compile("^[A-Z](\\.[ -]| ?-)");
 
     /**
      * the raw bibtex author/editor field
      */
     private String original;
+
     /**
      * index of the start in original, for example to point to 'abc' in 'abc xyz', tokenStart=2
      */
     private int tokenStart;
+
     /**
      * index of the end in original, for example to point to 'abc' in 'abc xyz', tokenEnd=5
      */
     private int tokenEnd;
+
     /**
      * end of token abbreviation (always: tokenStart < tokenAbbrEnd <= tokenEnd), only valid if getToken returns
      * Token.WORD
      */
     private int tokenAbbrEnd;
+
     /**
      * either space of dash
      */
     private char tokenTerm;
+
     /**
      * true if upper-case token, false if lower-case
      */
@@ -70,9 +75,11 @@ public class AuthorListParser {
      *
      * @return New string with correct separation
      */
-    private static StringBuilder buildWithAffix(Collection<Integer> indexArray, List<String> nameList) {
+    private static StringBuilder buildWithAffix(
+            Collection<Integer> indexArray, List<String> nameList) {
         StringBuilder stringBuilder = new StringBuilder();
-        // avoidedTimes needs to be increased by the count of avoided terms for correct odd/even calculation
+        // avoidedTimes needs to be increased by the count of avoided terms for correct odd/even
+        // calculation
         int avoidedTimes = 0;
         for (int i = 0; i < nameList.size(); i++) {
             if (indexArray.contains(i)) {
@@ -86,7 +93,8 @@ private static StringBuilder buildWithAffix(Collection<Integer> indexArray, List
                     // Hit separation between last name and firstname --> comma has to be kept
                     stringBuilder.append(',');
                 } else {
-                    // Hit separation between full names (e.g., Ali Babar, M. and Dingsøyr, T.) --> semicolon has to be used
+                    // Hit separation between full names (e.g., Ali Babar, M. and Dingsøyr, T.) -->
+                    // semicolon has to be used
                     // Will be treated correctly by AuthorList.parse(authors);
                     stringBuilder.append(';');
                 }
@@ -95,14 +103,14 @@ private static StringBuilder buildWithAffix(Collection<Integer> indexArray, List
         return stringBuilder;
     }
 
-    private record SimpleNormalFormResult(String authors, boolean andOthersPresent) {
-    }
+    private record SimpleNormalFormResult(String authors, boolean andOthersPresent) {}
 
     private static SimpleNormalFormResult getSimpleNormalForm(String listOfNames) {
         listOfNames = listOfNames.replace(" -", "-").trim();
 
         // Handling of "and others"
-        // Remove it from the list; it will be added at the very end of this method as special Author.OTHERS
+        // Remove it from the list; it will be added at the very end of this method as special
+        // Author.OTHERS
         final String andOthersSuffix = " and others";
         final boolean andOthersPresent;
         if (StringUtil.endsWithIgnoreCase(listOfNames, andOthersSuffix)) {
@@ -152,19 +160,25 @@ public AuthorList parse(@NonNull String listOfNames) {
         final boolean authorsContainAND = listOfNames.toUpperCase(Locale.ENGLISH).contains(" AND ");
         final boolean authorsContainOpeningBrace = listOfNames.contains("{");
         final boolean authorsContainSemicolon = listOfNames.contains(";");
-        final boolean authorsContainTwoOrMoreCommas = (listOfNames.length() - listOfNames.replace(",", "").length()) >= 2;
-        if (!authorsContainAND && !authorsContainOpeningBrace && !authorsContainSemicolon && authorsContainTwoOrMoreCommas) {
+        final boolean authorsContainTwoOrMoreCommas =
+                (listOfNames.length() - listOfNames.replace(",", "").length()) >= 2;
+        if (!authorsContainAND
+                && !authorsContainOpeningBrace
+                && !authorsContainSemicolon
+                && authorsContainTwoOrMoreCommas) {
             List<String> arrayNameList = Arrays.asList(listOfNames.split(","));
 
             // Delete spaces for correct case identification
             arrayNameList.replaceAll(String::trim);
 
             // Looking for space between pre- and lastname
-            boolean spaceInAllParts = arrayNameList.stream().filter(name -> name.contains(" "))
-                                                   .count() == arrayNameList.size();
+            boolean spaceInAllParts =
+                    arrayNameList.stream().filter(name -> name.contains(" ")).count()
+                            == arrayNameList.size();
 
             // We hit the comma name separator case
-            // Usually the getAsLastFirstNamesWithAnd method would separate them if pre- and lastname are separated with "and"
+            // Usually the getAsLastFirstNamesWithAnd method would separate them if pre- and
+            // lastname are separated with "and"
             // If not, we check if spaces separate pre- and lastname
             if (spaceInAllParts) {
                 listOfNames = listOfNames.replace(",", " and");
@@ -178,7 +192,8 @@ public AuthorList parse(@NonNull String listOfNames) {
                 Collection<Integer> avoidIndex = new HashSet<>();
 
                 for (int i = 0; i < arrayNameList.size(); i++) {
-                    if (AVOID_TERMS_IN_LOWER_CASE.contains(arrayNameList.get(i).toLowerCase(Locale.ROOT))) {
+                    if (AVOID_TERMS_IN_LOWER_CASE.contains(
+                            arrayNameList.get(i).toLowerCase(Locale.ROOT))) {
                         avoidIndex.add(i);
                         valuePartsCount--;
                     }
@@ -223,9 +238,18 @@ private static String checkNamesCommaSeparated(String listOfNames) {
             if (matcher.find()) {
                 String namesBeforeAndString = listOfNames.substring(0, commandAndPos);
                 String[] namesBeforeAnd = namesBeforeAndString.split(", ");
-                if (Arrays.stream(namesBeforeAnd).allMatch(name -> STARTS_WITH_CAPITAL_LETTER_DOT_OR_DASH.matcher(name).find())) {
+                if (Arrays.stream(namesBeforeAnd)
+                        .allMatch(
+                                name ->
+                                        STARTS_WITH_CAPITAL_LETTER_DOT_OR_DASH
+                                                .matcher(name)
+                                                .find())) {
                     // Format found
-                    listOfNames = Arrays.stream(namesBeforeAnd).collect(Collectors.joining(" and ", "", " and " + lastContainedName));
+                    listOfNames =
+                            Arrays.stream(namesBeforeAnd)
+                                    .collect(
+                                            Collectors.joining(
+                                                    " and ", "", " and " + lastContainedName));
                 }
             }
         }
@@ -273,8 +297,11 @@ private Optional<Author> getAuthor() {
                     }
                     if (vonStart < 0) {
                         if (!tokenCase) {
-                            int previousTermToken = (tokens.size() - TOKEN_GROUP_LENGTH - TOKEN_GROUP_LENGTH) + OFFSET_TOKEN_TERM;
-                            if ((previousTermToken >= 0) && tokens.get(previousTermToken).equals('-')) {
+                            int previousTermToken =
+                                    (tokens.size() - TOKEN_GROUP_LENGTH - TOKEN_GROUP_LENGTH)
+                                            + OFFSET_TOKEN_TERM;
+                            if ((previousTermToken >= 0)
+                                    && tokens.get(previousTermToken).equals('-')) {
                                 // We are in a first name which contained a hyphen
                                 break;
                             }
@@ -389,18 +416,40 @@ private Optional<Author> getAuthor() {
         }
 
         // Third step: do actual splitting, construct Author object
-        String firstPart = firstPartStart < 0 ? null : concatTokens(tokens, firstPartStart, firstPartEnd, OFFSET_TOKEN, false);
-        String firstAbbr = firstPartStart < 0 ? null : concatTokens(tokens, firstPartStart, firstPartEnd, OFFSET_TOKEN_ABBR, true);
-        String vonPart = vonPartStart < 0 ? null : concatTokens(tokens, vonPartStart, vonPartEnd, OFFSET_TOKEN, false);
-        String lastPart = lastPartStart < 0 ? null : concatTokens(tokens, lastPartStart, lastPartEnd, OFFSET_TOKEN, false);
-        String jrPart = jrPartStart < 0 ? null : concatTokens(tokens, jrPartStart, jrPartEnd, OFFSET_TOKEN, false);
-
-        if ((commaFirst < 0) && (firstPart != null) && (lastPart != null) && lastPart.equals(lastPart.toUpperCase(Locale.ROOT)) && (lastPart.length() < 5)
-                && (Character.UnicodeScript.of(lastPart.charAt(0)) != Character.UnicodeScript.HAN)) {
+        String firstPart =
+                firstPartStart < 0
+                        ? null
+                        : concatTokens(tokens, firstPartStart, firstPartEnd, OFFSET_TOKEN, false);
+        String firstAbbr =
+                firstPartStart < 0
+                        ? null
+                        : concatTokens(
+                                tokens, firstPartStart, firstPartEnd, OFFSET_TOKEN_ABBR, true);
+        String vonPart =
+                vonPartStart < 0
+                        ? null
+                        : concatTokens(tokens, vonPartStart, vonPartEnd, OFFSET_TOKEN, false);
+        String lastPart =
+                lastPartStart < 0
+                        ? null
+                        : concatTokens(tokens, lastPartStart, lastPartEnd, OFFSET_TOKEN, false);
+        String jrPart =
+                jrPartStart < 0
+                        ? null
+                        : concatTokens(tokens, jrPartStart, jrPartEnd, OFFSET_TOKEN, false);
+
+        if ((commaFirst < 0)
+                && (firstPart != null)
+                && (lastPart != null)
+                && lastPart.equals(lastPart.toUpperCase(Locale.ROOT))
+                && (lastPart.length() < 5)
+                && (Character.UnicodeScript.of(lastPart.charAt(0))
+                        != Character.UnicodeScript.HAN)) {
             // In case there is NO comma (e.g., Obama B) AND
             // the last part is a small string in complete upper case,
             // we interpret it as initial of the first name
-            // This is the case for example in "Smith SH" which we think of as lastname=Smith and firstname=SH
+            // This is the case for example in "Smith SH" which we think of as lastname=Smith and
+            // firstname=SH
             // The length < 5 constraint should allow for "Smith S.H." as input
             return Optional.of(new Author(lastPart, lastPart, vonPart, firstPart, jrPart));
         } else {
@@ -421,7 +470,8 @@ private Optional<Author> getAuthor() {
      *                 do not add.
      * @return the result of concatenation.
      */
-    private String concatTokens(List<Object> tokens, int start, int end, int offset, boolean dotAfter) {
+    private String concatTokens(
+            List<Object> tokens, int start, int end, int offset, boolean dotAfter) {
         StringBuilder result = new StringBuilder();
         // Here we always have start < end
         result.append((String) tokens.get(start + offset));
@@ -506,7 +556,10 @@ private Token getToken() {
             }
             if (!firstLetterIsFound && (currentBackslash < 0) && Character.isLetter(c)) {
                 if (bracesLevel == 0) {
-                    tokenCase = Character.isUpperCase(c) || (Character.UnicodeScript.of(c) == Character.UnicodeScript.HAN);
+                    tokenCase =
+                            Character.isUpperCase(c)
+                                    || (Character.UnicodeScript.of(c)
+                                            == Character.UnicodeScript.HAN);
                 } else {
                     // If this is a particle in braces, always treat it as if it starts with
                     // an upper case letter. Otherwise a name such as "{van den Bergen}, Hans"
diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index 83d939a30853..4ebd1d3b4db9 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.importer;
 
-import java.util.Optional;
-import java.util.stream.Stream;
-
 import org.jabref.logic.importer.fetcher.ArXivFetcher;
 import org.jabref.logic.importer.fetcher.DoiFetcher;
 import org.jabref.logic.importer.fetcher.isbntobibtex.IsbnFetcher;
@@ -11,6 +8,9 @@
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.identifier.ISBN;
 
+import java.util.Optional;
+import java.util.stream.Stream;
+
 public class CompositeIdFetcher {
 
     private final ImportFormatPreferences importFormatPreferences;
@@ -22,17 +22,20 @@ public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
     public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
         Optional<DOI> doi = DOI.findInText(identifier);
         if (doi.isPresent()) {
-            return new DoiFetcher(importFormatPreferences).performSearchById(doi.get().getNormalized());
+            return new DoiFetcher(importFormatPreferences)
+                    .performSearchById(doi.get().getNormalized());
         }
         Optional<ArXivIdentifier> arXivIdentifier = ArXivIdentifier.parse(identifier);
         if (arXivIdentifier.isPresent()) {
-            return new ArXivFetcher(importFormatPreferences).performSearchById(arXivIdentifier.get().getNormalized());
+            return new ArXivFetcher(importFormatPreferences)
+                    .performSearchById(arXivIdentifier.get().getNormalized());
         }
         Optional<ISBN> isbn = ISBN.parse(identifier);
         if (isbn.isPresent()) {
             return new IsbnFetcher(importFormatPreferences)
                     // .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences))
-                    // .addRetryFetcher(new DoiToBibtexConverterComIsbnFetcher(importFormatPreferences))
+                    // .addRetryFetcher(new
+                    // DoiToBibtexConverterComIsbnFetcher(importFormatPreferences))
                     .performSearchById(isbn.get().getNormalized());
         }
         /* TODO: IACR is currently disabled, because it needs to be reworked: https://github.com/JabRef/jabref/issues/8876
diff --git a/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java b/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java
index 2cc1544a93fb..3d7f05ba3eef 100644
--- a/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.importer;
 
-import java.util.List;
-
 import org.jabref.model.entry.BibEntry;
 
+import java.util.List;
+
 /**
  * Searches web resources for bibliographic information based on a {@link BibEntry}.
  * Useful to <b>complete</b> an existing entry with fetched information.
diff --git a/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java
index 38a010c62ce5..9064df63064d 100644
--- a/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.importer;
 
+import org.jabref.model.entry.BibEntry;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -10,10 +13,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import org.jabref.model.entry.BibEntry;
-
-import org.slf4j.LoggerFactory;
-
 /**
  * Provides a convenient interface for entry-based fetcher, which follow the usual three-step procedure:
  * 1. Open a URL based on the entry
@@ -27,7 +26,8 @@ public interface EntryBasedParserFetcher extends EntryBasedFetcher, ParserFetche
      *
      * @param entry the entry to look information for
      */
-    URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedURLException, FetcherException;
+    URL getURLForEntry(BibEntry entry)
+            throws URISyntaxException, MalformedURLException, FetcherException;
 
     /**
      * Returns the parser used to convert the response to a list of {@link BibEntry}.
@@ -55,9 +55,12 @@ default List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
 
             return fetchedEntries;
         } catch (IOException e) {
-            // TODO: Catch HTTP Response 401 errors and report that user has no rights to access resource
-            //       Same TODO as in org.jabref.logic.net.URLDownload.openConnection. Code should be reused.
-            LoggerFactory.getLogger(EntryBasedParserFetcher.class).error("Could not fetch from URL {}", urlForEntry, e);
+            // TODO: Catch HTTP Response 401 errors and report that user has no rights to access
+            // resource
+            //       Same TODO as in org.jabref.logic.net.URLDownload.openConnection. Code should be
+            // reused.
+            LoggerFactory.getLogger(EntryBasedParserFetcher.class)
+                    .error("Could not fetch from URL {}", urlForEntry, e);
             throw new FetcherException(urlForEntry, "A network error occurred", e);
         } catch (ParseException e) {
             throw new FetcherException(urlForEntry, "An internal parser error occurred", e);
diff --git a/src/main/java/org/jabref/logic/importer/FetcherClientException.java b/src/main/java/org/jabref/logic/importer/FetcherClientException.java
index a5780cc08ff5..bbd9051a5942 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherClientException.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherClientException.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.importer;
 
-import java.net.URL;
-
 import org.jabref.http.dto.SimpleHttpResponse;
 
+import java.net.URL;
+
 /**
  * Should be thrown when you encounter an HTTP status code error &gt;= 400 and &lt; 500.
  */
diff --git a/src/main/java/org/jabref/logic/importer/FetcherException.java b/src/main/java/org/jabref/logic/importer/FetcherException.java
index cd82a392fb9a..44535f310f03 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherException.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherException.java
@@ -1,20 +1,20 @@
 package org.jabref.logic.importer;
 
-import java.io.IOException;
-import java.net.URL;
-import java.util.Optional;
-import java.util.regex.Pattern;
-
 import org.jabref.http.dto.SimpleHttpResponse;
 import org.jabref.logic.JabRefException;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.URL;
+import java.util.Optional;
+import java.util.regex.Pattern;
+
 public class FetcherException extends JabRefException {
     private static final Logger LOGGER = LoggerFactory.getLogger(FetcherException.class);
-    private static final Pattern API_KEY_PATTERN = Pattern.compile("(?i)(api|key|api[-_]?key)=[^&]*");
+    private static final Pattern API_KEY_PATTERN =
+            Pattern.compile("(?i)(api|key|api[-_]?key)=[^&]*");
     private static String REDACTED_STRING = "[REDACTED]";
 
     private final String url;
@@ -72,12 +72,22 @@ public FetcherException(String errorMessage, String localizedMessage, Throwable
 
     @Override
     public String getLocalizedMessage() {
-        // TODO: This should be moved to a separate class converting "any" exception object to a localized message
-        // TODO: 5% of the "new-ers" pass a "real" localized message. See org.jabref.logic.importer.fetcher.GoogleScholar.addHitsFromQuery. We should maybe make use of this (and rewrite the whole message handling)
-        // TODO: Try to convert IOException to some more meaningful information here (or at org.jabref.gui.DialogService.showErrorDialogAndWait(org.jabref.logic.importer.FetcherException)). See also org.jabref.logic.net.URLDownload.openConnection
+        // TODO: This should be moved to a separate class converting "any" exception object to a
+        // localized message
+        // TODO: 5% of the "new-ers" pass a "real" localized message. See
+        // org.jabref.logic.importer.fetcher.GoogleScholar.addHitsFromQuery. We should maybe make
+        // use of this (and rewrite the whole message handling)
+        // TODO: Try to convert IOException to some more meaningful information here (or at
+        // org.jabref.gui.DialogService.showErrorDialogAndWait(org.jabref.logic.importer.FetcherException)). See also org.jabref.logic.net.URLDownload.openConnection
         if (httpResponse != null) {
             // We decided to not "translate" technical terms (URL, HTTP)
-            return getPrefix() + "URL: %s\nHTTP %d %s\n%s".formatted(getRedactedUrl(), httpResponse.statusCode(), httpResponse.responseMessage(), httpResponse.responseBody());
+            return getPrefix()
+                    + "URL: %s\nHTTP %d %s\n%s"
+                            .formatted(
+                                    getRedactedUrl(),
+                                    httpResponse.statusCode(),
+                                    httpResponse.responseMessage(),
+                                    httpResponse.responseBody());
         } else if (url != null) {
             return getPrefix() + "URL: %s".formatted(getRedactedUrl());
         } else {
diff --git a/src/main/java/org/jabref/logic/importer/FetcherResult.java b/src/main/java/org/jabref/logic/importer/FetcherResult.java
index 1561b7a1b125..d3a06bbb136d 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherResult.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherResult.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.importer;
 
-import java.net.URL;
-
 import org.jabref.logic.importer.fetcher.TrustLevel;
 
+import java.net.URL;
+
 public final class FetcherResult {
     private final TrustLevel trust;
     private final URL source;
diff --git a/src/main/java/org/jabref/logic/importer/FetcherServerException.java b/src/main/java/org/jabref/logic/importer/FetcherServerException.java
index ed67992b65d9..0bb6f79b9b3a 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherServerException.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherServerException.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.importer;
 
-import java.net.URL;
-
 import org.jabref.http.dto.SimpleHttpResponse;
 
+import java.net.URL;
+
 /**
  *  Should be thrown when you encounter a http status code error >= 500
  */
diff --git a/src/main/java/org/jabref/logic/importer/FulltextFetcher.java b/src/main/java/org/jabref/logic/importer/FulltextFetcher.java
index a6438be2adef..be01e8daa1dd 100644
--- a/src/main/java/org/jabref/logic/importer/FulltextFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/FulltextFetcher.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer;
 
+import org.jabref.logic.importer.fetcher.TrustLevel;
+import org.jabref.model.entry.BibEntry;
+
 import java.io.IOException;
 import java.net.URL;
 import java.util.Optional;
 
-import org.jabref.logic.importer.fetcher.TrustLevel;
-import org.jabref.model.entry.BibEntry;
-
 /**
  * This interface is used for classes that try to resolve a full-text PDF url for a BibTex entry.
  * Implementing classes should specialize on specific article sites.
diff --git a/src/main/java/org/jabref/logic/importer/FulltextFetchers.java b/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
index 2b8a86dd8423..4994e9b9f5bb 100644
--- a/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
@@ -1,5 +1,13 @@
 package org.jabref.logic.importer;
 
+import org.jabref.logic.net.URLDownload;
+import org.jabref.logic.util.HeadlessExecutorService;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.identifier.DOI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -15,15 +23,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 
-import org.jabref.logic.net.URLDownload;
-import org.jabref.logic.util.HeadlessExecutorService;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.entry.identifier.DOI;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Utility class for trying to resolve URLs to full-text PDF for articles.
  *
@@ -37,16 +36,19 @@ public class FulltextFetchers {
 
     private final Set<FulltextFetcher> finders = new HashSet<>();
 
-    private final Predicate<String> isPDF = url -> {
-        try {
-            return new URLDownload(url).isPdf();
-        } catch (MalformedURLException e) {
-            LOGGER.warn("URL returned by fulltext fetcher is invalid");
-        }
-        return false;
-    };
-
-    public FulltextFetchers(ImportFormatPreferences importFormatPreferences, ImporterPreferences importerPreferences) {
+    private final Predicate<String> isPDF =
+            url -> {
+                try {
+                    return new URLDownload(url).isPdf();
+                } catch (MalformedURLException e) {
+                    LOGGER.warn("URL returned by fulltext fetcher is invalid");
+                }
+                return false;
+            };
+
+    public FulltextFetchers(
+            ImportFormatPreferences importFormatPreferences,
+            ImporterPreferences importerPreferences) {
         this(WebFetchers.getFullTextFetchers(importFormatPreferences, importerPreferences));
     }
 
@@ -63,23 +65,28 @@ public Optional<URL> findFullTextPDF(BibEntry entry) {
             findDoiForEntry(clonedEntry);
         }
 
-        List<Future<Optional<FetcherResult>>> result = HeadlessExecutorService.INSTANCE.executeAll(getCallables(clonedEntry, finders), FETCHER_TIMEOUT, TimeUnit.SECONDS);
+        List<Future<Optional<FetcherResult>>> result =
+                HeadlessExecutorService.INSTANCE.executeAll(
+                        getCallables(clonedEntry, finders), FETCHER_TIMEOUT, TimeUnit.SECONDS);
 
         return result.stream()
-                     .map(FulltextFetchers::getResults)
-                     .filter(Optional::isPresent)
-                     .map(Optional::get)
-                     .filter(res -> (res.getSource()) != null)
-                     .sorted(Comparator.comparingInt((FetcherResult res) -> res.getTrust().getTrustScore()).reversed())
-                     .map(FetcherResult::getSource)
-                     .findFirst();
+                .map(FulltextFetchers::getResults)
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .filter(res -> (res.getSource()) != null)
+                .sorted(
+                        Comparator.comparingInt(
+                                        (FetcherResult res) -> res.getTrust().getTrustScore())
+                                .reversed())
+                .map(FetcherResult::getSource)
+                .findFirst();
     }
 
     private void findDoiForEntry(BibEntry clonedEntry) {
         try {
             WebFetchers.getIdFetcherForIdentifier(DOI.class)
-                       .findIdentifier(clonedEntry)
-                       .ifPresent(e -> clonedEntry.setField(StandardField.DOI, e.getDOI()));
+                    .findIdentifier(clonedEntry)
+                    .ifPresent(e -> clonedEntry.setField(StandardField.DOI, e.getDOI()));
         } catch (FetcherException e) {
             LOGGER.debug("Failed to find DOI", e);
         }
@@ -100,8 +107,8 @@ private Callable<Optional<FetcherResult>> getCallable(BibEntry entry, FulltextFe
         return () -> {
             try {
                 return fetcher.findFullText(entry)
-                              .filter(url -> isPDF.test(url.toString()))
-                              .map(url -> new FetcherResult(fetcher.getTrustLevel(), url));
+                        .filter(url -> isPDF.test(url.toString()))
+                        .map(url -> new FetcherResult(fetcher.getTrustLevel(), url));
             } catch (IOException | FetcherException e) {
                 LOGGER.debug("Failed to find fulltext PDF at given URL", e);
             }
@@ -109,9 +116,8 @@ private Callable<Optional<FetcherResult>> getCallable(BibEntry entry, FulltextFe
         };
     }
 
-    private List<Callable<Optional<FetcherResult>>> getCallables(BibEntry entry, Set<FulltextFetcher> fetchers) {
-        return fetchers.stream()
-                       .map(f -> getCallable(entry, f))
-                       .toList();
+    private List<Callable<Optional<FetcherResult>>> getCallables(
+            BibEntry entry, Set<FulltextFetcher> fetchers) {
+        return fetchers.stream().map(f -> getCallable(entry, f)).toList();
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java b/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java
index 62caee591996..59758bc0483f 100644
--- a/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.importer;
 
-import java.util.Optional;
-
 import org.jabref.model.entry.BibEntry;
 
+import java.util.Optional;
+
 /**
  * Searches web resources for bibliographic information based on an identifier.
  * Examples are ISBN numbers and DOIs.
diff --git a/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
index 55a7e1e615a6..5e5e2e83f431 100644
--- a/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.importer;
 
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.strings.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -8,12 +13,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.strings.StringUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Provides a convenient interface for ID-based fetcher, which follow the usual three-step procedure:
  * 1. Open a URL based on the search query
@@ -53,7 +52,10 @@ default Optional<BibEntry> performSearchById(String identifier) throws FetcherEx
                 return Optional.empty();
             }
             if (fetchedEntries.size() > 1) {
-                LOGGER.info("Fetcher {} found more than one result for identifier {}. We will use the first entry.", getName(), identifier);
+                LOGGER.info(
+                        "Fetcher {} found more than one result for identifier {}. We will use the first entry.",
+                        getName(),
+                        identifier);
             }
             BibEntry entry = fetchedEntries.getFirst();
             doPostCleanup(entry);
diff --git a/src/main/java/org/jabref/logic/importer/IdFetcher.java b/src/main/java/org/jabref/logic/importer/IdFetcher.java
index 110ad4b3038c..b9dbee45e5b3 100644
--- a/src/main/java/org/jabref/logic/importer/IdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdFetcher.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.importer;
 
-import java.util.Optional;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.identifier.Identifier;
 
+import java.util.Optional;
+
 /**
  * Looks for article identifier based on already present bibliographic information.
  */
diff --git a/src/main/java/org/jabref/logic/importer/IdParserFetcher.java b/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
index fe6245455eb5..c613c557a7d8 100644
--- a/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.importer;
 
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.identifier.Identifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -11,12 +16,6 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.identifier.Identifier;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Provides a convenient interface for {@link IdFetcher}, which follow the usual three-step procedure:
  * 1. Open a URL based on the search query
@@ -32,7 +31,8 @@ public interface IdParserFetcher<T extends Identifier> extends IdFetcher<T>, Par
      *
      * @param entry the entry to look information for
      */
-    URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedURLException, FetcherException;
+    URL getURLForEntry(BibEntry entry)
+            throws URISyntaxException, MalformedURLException, FetcherException;
 
     /**
      * Returns the parser used to convert the response to a list of {@link BibEntry}.
@@ -46,7 +46,8 @@ public interface IdParserFetcher<T extends Identifier> extends IdFetcher<T>, Par
      *                       the result)
      * @param fetchedEntries list of entries returned by the web service
      */
-    Optional<T> extractIdentifier(BibEntry inputEntry, List<BibEntry> fetchedEntries) throws FetcherException;
+    Optional<T> extractIdentifier(BibEntry inputEntry, List<BibEntry> fetchedEntries)
+            throws FetcherException;
 
     @Override
     default Optional<T> findIdentifier(BibEntry entry) throws FetcherException {
diff --git a/src/main/java/org/jabref/logic/importer/ImportCleanup.java b/src/main/java/org/jabref/logic/importer/ImportCleanup.java
index 8ba167f59b1d..66328e96b1da 100644
--- a/src/main/java/org/jabref/logic/importer/ImportCleanup.java
+++ b/src/main/java/org/jabref/logic/importer/ImportCleanup.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.importer;
 
-import java.util.Collection;
-
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.cleanup.NormalizeWhitespacesCleanup;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
-
 import org.jspecify.annotations.NonNull;
 
+import java.util.Collection;
+
 /**
  * Cleanup of imported entries to be processable by JabRef
  */
@@ -23,7 +22,8 @@ protected ImportCleanup(FieldPreferences fieldPreferences) {
     /**
      * Kind of builder for a cleanup
      */
-    public static ImportCleanup targeting(BibDatabaseMode mode, @NonNull FieldPreferences fieldPreferences) {
+    public static ImportCleanup targeting(
+            BibDatabaseMode mode, @NonNull FieldPreferences fieldPreferences) {
         return switch (mode) {
             case BIBTEX -> new ImportCleanupBibtex(fieldPreferences);
             case BIBLATEX -> new ImportCleanupBiblatex(fieldPreferences);
diff --git a/src/main/java/org/jabref/logic/importer/ImportCleanupBiblatex.java b/src/main/java/org/jabref/logic/importer/ImportCleanupBiblatex.java
index 269b489212a6..e481043db14f 100644
--- a/src/main/java/org/jabref/logic/importer/ImportCleanupBiblatex.java
+++ b/src/main/java/org/jabref/logic/importer/ImportCleanupBiblatex.java
@@ -6,7 +6,8 @@
 
 public class ImportCleanupBiblatex extends ImportCleanup {
 
-    private final ConvertToBiblatexCleanup convertToBiblatexCleanup = new ConvertToBiblatexCleanup();
+    private final ConvertToBiblatexCleanup convertToBiblatexCleanup =
+            new ConvertToBiblatexCleanup();
 
     public ImportCleanupBiblatex(FieldPreferences fieldPreferences) {
         super(fieldPreferences);
@@ -21,7 +22,7 @@ public ImportCleanupBiblatex(FieldPreferences fieldPreferences) {
     @Override
     public BibEntry doPostCleanup(BibEntry entry) {
         entry = super.doPostCleanup(entry);
-         convertToBiblatexCleanup.cleanup(entry);
-         return entry;
+        convertToBiblatexCleanup.cleanup(entry);
+        return entry;
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java b/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
index 9d113c6b9702..7a1a0010a3a5 100644
--- a/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
@@ -13,5 +13,4 @@ public record ImportFormatPreferences(
         FieldPreferences fieldPreferences,
         XmpPreferences xmpPreferences,
         DOIPreferences doiPreferences,
-        GrobidPreferences grobidPreferences) {
-}
+        GrobidPreferences grobidPreferences) {}
diff --git a/src/main/java/org/jabref/logic/importer/ImportFormatReader.java b/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
index cb963a46c574..6386b31b712d 100644
--- a/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
+++ b/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
@@ -1,14 +1,5 @@
 package org.jabref.logic.importer;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.importer.fileformat.BiblioscapeImporter;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
@@ -37,6 +28,15 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileUpdateMonitor;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
 public class ImportFormatReader {
 
     public static final String BIBTEX_FORMAT = "BibTeX";
@@ -52,10 +52,11 @@ public class ImportFormatReader {
     private final FileUpdateMonitor fileUpdateMonitor;
     private final CitationKeyPatternPreferences citationKeyPatternPreferences;
 
-    public ImportFormatReader(ImporterPreferences importerPreferences,
-                              ImportFormatPreferences importFormatPreferences,
-                              CitationKeyPatternPreferences citationKeyPatternPreferences,
-                              FileUpdateMonitor fileUpdateMonitor) {
+    public ImportFormatReader(
+            ImporterPreferences importerPreferences,
+            ImportFormatPreferences importFormatPreferences,
+            CitationKeyPatternPreferences citationKeyPatternPreferences,
+            FileUpdateMonitor fileUpdateMonitor) {
         this.importerPreferences = importerPreferences;
         this.importFormatPreferences = importFormatPreferences;
         this.fileUpdateMonitor = fileUpdateMonitor;
@@ -137,8 +138,7 @@ public SortedSet<Importer> getImportFormats() {
         return new TreeSet<>(this.formats);
     }
 
-    public record UnknownFormatImport(String format, ParserResult parserResult) {
-    }
+    public record UnknownFormatImport(String format, ParserResult parserResult) {}
 
     /**
      * Tries to import a file by iterating through the available import filters,
@@ -148,18 +148,24 @@ public record UnknownFormatImport(String format, ParserResult parserResult) {
      *
      * @throws ImportException if the import fails (for example, if no suitable importer is found)
      */
-    public UnknownFormatImport importUnknownFormat(Path filePath, FileUpdateMonitor fileMonitor) throws ImportException {
+    public UnknownFormatImport importUnknownFormat(Path filePath, FileUpdateMonitor fileMonitor)
+            throws ImportException {
         Objects.requireNonNull(filePath);
 
         try {
-            UnknownFormatImport unknownFormatImport = importUnknownFormat(importer -> importer.importDatabase(filePath), importer -> importer.isRecognizedFormat(filePath));
+            UnknownFormatImport unknownFormatImport =
+                    importUnknownFormat(
+                            importer -> importer.importDatabase(filePath),
+                            importer -> importer.isRecognizedFormat(filePath));
             unknownFormatImport.parserResult.setPath(filePath);
             return unknownFormatImport;
         } catch (ImportException e) {
             // If all importers fail, try to read the file as BibTeX
             try {
-                ParserResult parserResult = OpenDatabase.loadDatabase(filePath, importFormatPreferences, fileMonitor);
-                if (parserResult.getDatabase().hasEntries() || !parserResult.getDatabase().hasNoStrings()) {
+                ParserResult parserResult =
+                        OpenDatabase.loadDatabase(filePath, importFormatPreferences, fileMonitor);
+                if (parserResult.getDatabase().hasEntries()
+                        || !parserResult.getDatabase().hasNoStrings()) {
                     parserResult.setPath(filePath);
                     return new UnknownFormatImport(ImportFormatReader.BIBTEX_FORMAT, parserResult);
                 } else {
@@ -167,7 +173,8 @@ public UnknownFormatImport importUnknownFormat(Path filePath, FileUpdateMonitor
                 }
             } catch (IOException ignore) {
                 // Ignored
-                throw new ImportException(Localization.lang("Could not find a suitable import format."));
+                throw new ImportException(
+                        Localization.lang("Could not find a suitable import format."));
             }
         }
     }
@@ -181,7 +188,10 @@ public UnknownFormatImport importUnknownFormat(Path filePath, FileUpdateMonitor
      * @return an UnknownFormatImport with the imported entries and metadata
      * @throws ImportException if the import fails (for example, if no suitable importer is found)
      */
-    private UnknownFormatImport importUnknownFormat(CheckedFunction<Importer, ParserResult> importDatabase, CheckedFunction<Importer, Boolean> isRecognizedFormat) throws ImportException {
+    private UnknownFormatImport importUnknownFormat(
+            CheckedFunction<Importer, ParserResult> importDatabase,
+            CheckedFunction<Importer, Boolean> isRecognizedFormat)
+            throws ImportException {
         // stores ref to best result, gets updated at the next loop
         List<BibEntry> bestResult = null;
         int bestResultCount = 0;
@@ -236,6 +246,8 @@ public interface CheckedFunction<T, R> {
     public UnknownFormatImport importUnknownFormat(String data) throws ImportException {
         Objects.requireNonNull(data);
 
-        return importUnknownFormat(importer -> importer.importDatabase(data), importer -> importer.isRecognizedFormat(data));
+        return importUnknownFormat(
+                importer -> importer.importDatabase(data),
+                importer -> importer.isRecognizedFormat(data));
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/Importer.java b/src/main/java/org/jabref/logic/importer/Importer.java
index d991b087d3bf..f885290dfaaf 100644
--- a/src/main/java/org/jabref/logic/importer/Importer.java
+++ b/src/main/java/org/jabref/logic/importer/Importer.java
@@ -1,5 +1,14 @@
 package org.jabref.logic.importer;
 
+import com.ibm.icu.text.CharsetDetector;
+import com.ibm.icu.text.CharsetMatch;
+
+import org.jabref.logic.util.FileType;
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.database.BibDatabaseModeDetection;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -14,15 +23,6 @@
 import java.util.Arrays;
 import java.util.Objects;
 
-import org.jabref.logic.util.FileType;
-import org.jabref.logic.util.io.FileUtil;
-import org.jabref.model.database.BibDatabaseModeDetection;
-
-import com.ibm.icu.text.CharsetDetector;
-import com.ibm.icu.text.CharsetMatch;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Role of an importer for JabRef.
  */
@@ -63,7 +63,7 @@ public boolean isRecognizedFormat(Path filePath) throws IOException {
      */
     public boolean isRecognizedFormat(String data) throws IOException {
         try (StringReader stringReader = new StringReader(data);
-             BufferedReader bufferedReader = new BufferedReader(stringReader)) {
+                BufferedReader bufferedReader = new BufferedReader(stringReader)) {
             return isRecognizedFormat(bufferedReader);
         }
     }
@@ -94,14 +94,17 @@ public ParserResult importDatabase(Path filePath) throws IOException {
 
             Charset charset = StandardCharsets.UTF_8;
 
-            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(bufferedInputStream, charset));
+            BufferedReader bufferedReader =
+                    new BufferedReader(new InputStreamReader(bufferedInputStream, charset));
             ParserResult parserResult = importDatabase(bufferedReader);
             parserResult.getMetaData().setEncoding(charset);
             parserResult.setPath(filePath);
 
             // Make sure the mode is always set
             if (parserResult.getMetaData().getMode().isEmpty()) {
-                parserResult.getMetaData().setMode(BibDatabaseModeDetection.inferMode(parserResult.getDatabase()));
+                parserResult
+                        .getMetaData()
+                        .setMode(BibDatabaseModeDetection.inferMode(parserResult.getDatabase()));
             }
             return parserResult;
         }
@@ -110,8 +113,10 @@ public ParserResult importDatabase(Path filePath) throws IOException {
     protected static Charset getCharset(BufferedInputStream bufferedInputStream) {
         Charset defaultCharSet = StandardCharsets.UTF_8;
 
-        // This reads the first 8000 bytes only, thus the default size of 8192 of the bufferedInputStream is OK.
-        // See https://github.com/unicode-org/icu/blob/06ef8867f35befee7340e35082fefc9d3561d230/icu4j/main/classes/core/src/com/ibm/icu/text/CharsetDetector.java#L125 for details
+        // This reads the first 8000 bytes only, thus the default size of 8192 of the
+        // bufferedInputStream is OK.
+        // See
+        // https://github.com/unicode-org/icu/blob/06ef8867f35befee7340e35082fefc9d3561d230/icu4j/main/classes/core/src/com/ibm/icu/text/CharsetDetector.java#L125 for details
         CharsetDetector charsetDetector = new CharsetDetector();
         try {
             charsetDetector.setText(bufferedInputStream);
@@ -146,7 +151,7 @@ protected static Charset getCharset(BufferedInputStream bufferedInputStream) {
      */
     public ParserResult importDatabase(String data) throws IOException {
         try (StringReader stringReader = new StringReader(data);
-             BufferedReader bufferedReader = new BufferedReader(stringReader)) {
+                BufferedReader bufferedReader = new BufferedReader(stringReader)) {
             return importDatabase(bufferedReader);
         }
     }
diff --git a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
index c706ff467991..e5cab9173534 100644
--- a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
@@ -1,10 +1,5 @@
 package org.jabref.logic.importer;
 
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -16,6 +11,11 @@
 import org.jabref.logic.importer.fileformat.CustomImporter;
 import org.jabref.logic.preferences.FetcherApiKey;
 
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
 public class ImporterPreferences {
 
     private final BooleanProperty importerEnabled;
@@ -26,14 +26,16 @@ public class ImporterPreferences {
     private final ObservableSet<CustomImporter> customImporters;
     private final BooleanProperty persistCustomKeys;
     private final ObservableList<String> catalogs;
-    public ImporterPreferences(boolean importerEnabled,
-                               boolean generateNewKeyOnImport,
-                               Path importWorkingDirectory,
-                               boolean warnAboutDuplicatesOnImport,
-                               Set<CustomImporter> customImporters,
-                               Set<FetcherApiKey> apiKeys,
-                               boolean persistCustomKeys,
-                               List<String> catalogs) {
+
+    public ImporterPreferences(
+            boolean importerEnabled,
+            boolean generateNewKeyOnImport,
+            Path importWorkingDirectory,
+            boolean warnAboutDuplicatesOnImport,
+            Set<CustomImporter> customImporters,
+            Set<FetcherApiKey> apiKeys,
+            boolean persistCustomKeys,
+            List<String> catalogs) {
         this.importerEnabled = new SimpleBooleanProperty(importerEnabled);
         this.generateNewKeyOnImport = new SimpleBooleanProperty(generateNewKeyOnImport);
         this.importWorkingDirectory = new SimpleObjectProperty<>(importWorkingDirectory);
@@ -119,10 +121,10 @@ public void setPersistCustomKeys(boolean persistCustomKeys) {
 
     public Optional<String> getApiKey(String name) {
         return apiKeys.stream()
-                      .filter(key -> key.getName().equalsIgnoreCase(name))
-                      .filter(FetcherApiKey::shouldUse)
-                      .findFirst()
-                      .map(FetcherApiKey::getKey);
+                .filter(key -> key.getName().equalsIgnoreCase(name))
+                .filter(FetcherApiKey::shouldUse)
+                .findFirst()
+                .map(FetcherApiKey::getKey);
     }
 
     public void setCatalogs(List<String> catalogs) {
@@ -131,6 +133,6 @@ public void setCatalogs(List<String> catalogs) {
     }
 
     public ObservableList<String> getCatalogs() {
-          return catalogs;
+        return catalogs;
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/OpenDatabase.java b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
index 9edcc2c3df23..4b9e36251703 100644
--- a/src/main/java/org/jabref/logic/importer/OpenDatabase.java
+++ b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
@@ -1,10 +1,5 @@
 package org.jabref.logic.importer;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
-
 import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.migrations.ConvertLegacyExplicitGroups;
 import org.jabref.migrations.ConvertMarkingToGroups;
@@ -12,10 +7,14 @@
 import org.jabref.migrations.SpecialFieldsToSeparateFields;
 import org.jabref.model.util.FileUpdateMonitor;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+
 public class OpenDatabase {
 
-    private OpenDatabase() {
-    }
+    private OpenDatabase() {}
 
     /**
      * Load database (bib-file)
@@ -23,20 +22,25 @@ private OpenDatabase() {
      * @param fileToOpen Name of the BIB-file to open
      * @return ParserResult which never is null
      */
-    public static ParserResult loadDatabase(Path fileToOpen, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor)
+    public static ParserResult loadDatabase(
+            Path fileToOpen,
+            ImportFormatPreferences importFormatPreferences,
+            FileUpdateMonitor fileMonitor)
             throws IOException {
-        ParserResult result = new BibtexImporter(importFormatPreferences, fileMonitor).importDatabase(fileToOpen);
-        performLoadDatabaseMigrations(result, importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
+        ParserResult result =
+                new BibtexImporter(importFormatPreferences, fileMonitor).importDatabase(fileToOpen);
+        performLoadDatabaseMigrations(
+                result, importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
         return result;
     }
 
-    private static void performLoadDatabaseMigrations(ParserResult parserResult,
-                                                      Character keywordDelimited) {
-        List<PostOpenMigration> postOpenMigrations = Arrays.asList(
-                new ConvertLegacyExplicitGroups(),
-                new ConvertMarkingToGroups(),
-                new SpecialFieldsToSeparateFields(keywordDelimited)
-        );
+    private static void performLoadDatabaseMigrations(
+            ParserResult parserResult, Character keywordDelimited) {
+        List<PostOpenMigration> postOpenMigrations =
+                Arrays.asList(
+                        new ConvertLegacyExplicitGroups(),
+                        new ConvertMarkingToGroups(),
+                        new SpecialFieldsToSeparateFields(keywordDelimited));
 
         for (PostOpenMigration migration : postOpenMigrations) {
             migration.performMigration(parserResult);
diff --git a/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java b/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java
index bafae1764857..7791b4db04f8 100644
--- a/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.importer;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.paging.Page;
-
 import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.paging.Page;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public interface PagedSearchBasedFetcher extends SearchBasedFetcher {
 
@@ -19,21 +18,24 @@ public interface PagedSearchBasedFetcher extends SearchBasedFetcher {
      * @param pageNumber       requested site number indexed from 0
      * @return Page with search results
      */
-    Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber) throws FetcherException;
+    Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
+            throws FetcherException;
 
     /**
      * @param searchQuery query string that can be parsed into a lucene query
      * @param pageNumber  requested site number indexed from 0
      * @return Page with search results
      */
-    default Page<BibEntry> performSearchPaged(String searchQuery, int pageNumber) throws FetcherException {
+    default Page<BibEntry> performSearchPaged(String searchQuery, int pageNumber)
+            throws FetcherException {
         if (searchQuery.isBlank()) {
             return new Page<>(searchQuery, pageNumber, Collections.emptyList());
         }
         SyntaxParser parser = new StandardSyntaxParser();
         final String NO_EXPLICIT_FIELD = "default";
         try {
-            return this.performSearchPaged(parser.parse(searchQuery, NO_EXPLICIT_FIELD), pageNumber);
+            return this.performSearchPaged(
+                    parser.parse(searchQuery, NO_EXPLICIT_FIELD), pageNumber);
         } catch (QueryNodeParseException e) {
             throw new FetcherException("An error occurred during parsing of the query.");
         }
diff --git a/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java
index db8bae8ddf06..3d14b03e12d3 100644
--- a/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.importer;
 
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.paging.Page;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -7,21 +11,19 @@
 import java.net.URL;
 import java.util.List;
 
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.paging.Page;
-
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-
-public interface PagedSearchBasedParserFetcher extends SearchBasedParserFetcher, PagedSearchBasedFetcher, ParserFetcher {
+public interface PagedSearchBasedParserFetcher
+        extends SearchBasedParserFetcher, PagedSearchBasedFetcher, ParserFetcher {
 
     @Override
-    default Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber) throws FetcherException {
+    default Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
+            throws FetcherException {
         // ADR-0014
         URL urlForQuery;
         try {
             urlForQuery = getURLForQuery(luceneQuery, pageNumber);
         } catch (URISyntaxException | MalformedURLException e) {
-            throw new FetcherException("Search URI crafted from complex search query is malformed", e);
+            throw new FetcherException(
+                    "Search URI crafted from complex search query is malformed", e);
         }
         return new Page<>(luceneQuery.toString(), pageNumber, getBibEntries(urlForQuery));
     }
@@ -44,10 +46,12 @@ private List<BibEntry> getBibEntries(URL urlForQuery) throws FetcherException {
      * @param luceneQuery the search query
      * @param pageNumber  the number of the page indexed from 0
      */
-    URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException;
+    URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
+            throws URISyntaxException, MalformedURLException;
 
     @Override
-    default URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException {
+    default URL getURLForQuery(QueryNode luceneQuery)
+            throws URISyntaxException, MalformedURLException {
         return getURLForQuery(luceneQuery, 0);
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/Parser.java b/src/main/java/org/jabref/logic/importer/Parser.java
index 86674d78c1f0..549e07502aa9 100644
--- a/src/main/java/org/jabref/logic/importer/Parser.java
+++ b/src/main/java/org/jabref/logic/importer/Parser.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer;
 
+import org.jabref.model.entry.BibEntry;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-import org.jabref.model.entry.BibEntry;
-
 /**
  * A parser converts an {@link InputStream} into a list of {@link BibEntry}.
  */
diff --git a/src/main/java/org/jabref/logic/importer/ParserResult.java b/src/main/java/org/jabref/logic/importer/ParserResult.java
index 60dd5af278ad..4dddf3da9449 100644
--- a/src/main/java/org/jabref/logic/importer/ParserResult.java
+++ b/src/main/java/org/jabref/logic/importer/ParserResult.java
@@ -1,5 +1,12 @@
 package org.jabref.logic.importer;
 
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.database.BibDatabases;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryType;
+import org.jabref.model.metadata.MetaData;
+
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -10,13 +17,6 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.database.BibDatabases;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.BibEntryType;
-import org.jabref.model.metadata.MetaData;
-
 public class ParserResult {
     private final Set<BibEntryType> entryTypes;
     private final List<String> warnings = new ArrayList<>();
@@ -147,10 +147,10 @@ public void setDatabaseContext(BibDatabaseContext bibDatabaseContext) {
     }
 
     public boolean isEmpty() {
-        return !this.getDatabase().hasEntries() &&
-                this.getDatabase().hasNoStrings() &&
-                this.getDatabase().getPreamble().isEmpty() &&
-                this.getMetaData().isEmpty();
+        return !this.getDatabase().hasEntries()
+                && this.getDatabase().hasNoStrings()
+                && this.getDatabase().getPreamble().isEmpty()
+                && this.getMetaData().isEmpty();
     }
 
     public boolean getChangedOnMigration() {
diff --git a/src/main/java/org/jabref/logic/importer/QueryParser.java b/src/main/java/org/jabref/logic/importer/QueryParser.java
index 65359122ff2d..c78b79439f9c 100644
--- a/src/main/java/org/jabref/logic/importer/QueryParser.java
+++ b/src/main/java/org/jabref/logic/importer/QueryParser.java
@@ -1,5 +1,12 @@
 package org.jabref.logic.importer;
 
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
+import org.apache.lucene.queryparser.flexible.standard.StandardQueryParser;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryVisitor;
+import org.jabref.logic.importer.fetcher.ComplexSearchQuery;
+
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashSet;
@@ -7,14 +14,6 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.jabref.logic.importer.fetcher.ComplexSearchQuery;
-
-import org.apache.lucene.index.Term;
-import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
-import org.apache.lucene.queryparser.flexible.standard.StandardQueryParser;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.QueryVisitor;
-
 /**
  * This class converts a query string written in lucene syntax into a complex  query.
  *
@@ -34,8 +33,10 @@ public Optional<ComplexSearchQuery> parseQueryStringIntoComplexQuery(String quer
             StandardQueryParser parser = new StandardQueryParser();
             Query luceneQuery = parser.parse(query, "default");
             Set<Term> terms = new HashSet<>();
-            // This implementation collects all terms from the leaves of the query tree independent of the internal boolean structure
-            // If further capabilities are required in the future the visitor and ComplexSearchQuery has to be adapted accordingly.
+            // This implementation collects all terms from the leaves of the query tree independent
+            // of the internal boolean structure
+            // If further capabilities are required in the future the visitor and ComplexSearchQuery
+            // has to be adapted accordingly.
             QueryVisitor visitor = QueryVisitor.termCollector(terms);
             luceneQuery.visit(visitor);
 
diff --git a/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java b/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java
index 34858548f7ee..70b4a9005049 100644
--- a/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.importer;
 
-import java.util.Collections;
-import java.util.List;
-
-import org.jabref.model.entry.BibEntry;
+import static org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer.NO_EXPLICIT_FIELD;
 
 import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
+import org.jabref.model.entry.BibEntry;
 
-import static org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer.NO_EXPLICIT_FIELD;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Searches web resources for bibliographic information based on a free-text query.
diff --git a/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java
index 4df75fb981f1..0945c899f4bb 100644
--- a/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.importer;
 
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import org.jabref.model.entry.BibEntry;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -7,10 +10,6 @@
 import java.net.URL;
 import java.util.List;
 
-import org.jabref.model.entry.BibEntry;
-
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-
 /**
  * Provides a convenient interface for search-based fetcher, which follows the usual three-step procedure:
  * <ol>
@@ -32,7 +31,6 @@
  *     We need multi inheritance, because a fetcher might implement multiple query types (such as id fetching {@link IdBasedFetcher}), complete entry {@link EntryBasedFetcher}, and search-based fetcher (this class).
  * </p>
  */
-
 public interface SearchBasedParserFetcher extends SearchBasedFetcher, ParserFetcher {
 
     /**
@@ -49,7 +47,8 @@ default List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherExcept
         try {
             urlForQuery = getURLForQuery(luceneQuery);
         } catch (URISyntaxException | MalformedURLException | FetcherException e) {
-            throw new FetcherException("Search URI crafted from complex search query is malformed", e);
+            throw new FetcherException(
+                    "Search URI crafted from complex search query is malformed", e);
         }
         return getBibEntries(urlForQuery);
     }
@@ -64,7 +63,8 @@ private List<BibEntry> getBibEntries(URL urlForQuery) throws FetcherException {
             throw new FetcherException(urlForQuery, e);
         } catch (ParseException e) {
             // Regular expression to redact API keys from the error message
-            throw new FetcherException(urlForQuery, "An internal parser error occurred while fetching", e);
+            throw new FetcherException(
+                    urlForQuery, "An internal parser error occurred while fetching", e);
         }
     }
 
@@ -78,5 +78,6 @@ private List<BibEntry> getBibEntries(URL urlForQuery) throws FetcherException {
      *
      * @param luceneQuery the root node of the lucene query
      */
-    URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException;
+    URL getURLForQuery(QueryNode luceneQuery)
+            throws URISyntaxException, MalformedURLException, FetcherException;
 }
diff --git a/src/main/java/org/jabref/logic/importer/WebFetcher.java b/src/main/java/org/jabref/logic/importer/WebFetcher.java
index a1745cba6d19..267c50327074 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetcher.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.importer;
 
-import java.net.URL;
-import java.util.Optional;
-
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.net.URLDownload;
 
+import java.net.URL;
+import java.util.Optional;
+
 /**
  * Searches web resources for bibliographic information.
  */
diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index de6c8b795451..d841be533de3 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -1,12 +1,9 @@
 package org.jabref.logic.importer;
 
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
+import static org.jabref.model.entry.field.StandardField.DOI;
+import static org.jabref.model.entry.field.StandardField.EPRINT;
+import static org.jabref.model.entry.field.StandardField.ISBN;
+import static org.jabref.model.entry.field.StandardField.ISSN;
 
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.importer.fetcher.ACMPortalFetcher;
@@ -55,28 +52,27 @@
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.identifier.Identifier;
 
-import static org.jabref.model.entry.field.StandardField.DOI;
-import static org.jabref.model.entry.field.StandardField.EPRINT;
-import static org.jabref.model.entry.field.StandardField.ISBN;
-import static org.jabref.model.entry.field.StandardField.ISSN;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 public class WebFetchers {
 
-    private WebFetchers() {
-    }
+    private WebFetchers() {}
 
-    public static Optional<IdBasedFetcher> getIdBasedFetcherForField(Field field, ImportFormatPreferences importFormatPreferences) {
+    public static Optional<IdBasedFetcher> getIdBasedFetcherForField(
+            Field field, ImportFormatPreferences importFormatPreferences) {
         IdBasedFetcher fetcher;
 
         switch (field) {
-            case DOI ->
-                    fetcher = new DoiFetcher(importFormatPreferences);
-            case ISBN ->
-                    fetcher = new IsbnFetcher(importFormatPreferences);
-            case EPRINT ->
-                    fetcher = new ArXivFetcher(importFormatPreferences);
-            case ISSN ->
-                    fetcher = new IssnFetcher();
+            case DOI -> fetcher = new DoiFetcher(importFormatPreferences);
+            case ISBN -> fetcher = new IsbnFetcher(importFormatPreferences);
+            case EPRINT -> fetcher = new ArXivFetcher(importFormatPreferences);
+            case ISSN -> fetcher = new IssnFetcher();
             case null, default -> {
                 return Optional.empty();
             }
@@ -89,7 +85,8 @@ public static <T extends Identifier> IdFetcher<T> getIdFetcherForIdentifier(Clas
         if (clazz == DOI.class) {
             return (IdFetcher<T>) new CrossRef();
         } else {
-            throw new IllegalArgumentException("No fetcher found for identifier" + clazz.getCanonicalName());
+            throw new IllegalArgumentException(
+                    "No fetcher found for identifier" + clazz.getCanonicalName());
         }
     }
 
@@ -103,7 +100,9 @@ public static Optional<IdFetcher<? extends Identifier>> getIdFetcherForField(Fie
     /**
      * @return sorted set containing search based fetchers
      */
-    public static SortedSet<SearchBasedFetcher> getSearchBasedFetchers(ImportFormatPreferences importFormatPreferences, ImporterPreferences importerPreferences) {
+    public static SortedSet<SearchBasedFetcher> getSearchBasedFetchers(
+            ImportFormatPreferences importFormatPreferences,
+            ImporterPreferences importerPreferences) {
         SortedSet<SearchBasedFetcher> set = new TreeSet<>(new CompositeSearchFirstComparator());
         set.add(new ArXivFetcher(importFormatPreferences));
         set.add(new ISIDOREFetcher());
@@ -137,14 +136,15 @@ public static SortedSet<SearchBasedFetcher> getSearchBasedFetchers(ImportFormatP
     /**
      * @return sorted set containing id based fetchers
      */
-    public static SortedSet<IdBasedFetcher> getIdBasedFetchers(ImportFormatPreferences importFormatPreferences,
-                                                               ImporterPreferences importerPreferences) {
+    public static SortedSet<IdBasedFetcher> getIdBasedFetchers(
+            ImportFormatPreferences importFormatPreferences,
+            ImporterPreferences importerPreferences) {
         SortedSet<IdBasedFetcher> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
         set.add(new ArXivFetcher(importFormatPreferences));
         set.add(new AstrophysicsDataSystem(importFormatPreferences, importerPreferences));
         set.add(new IsbnFetcher(importFormatPreferences));
-                // .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences)));
-                // .addRetryFetcher(new DoiToBibtexConverterComIsbnFetcher(importFormatPreferences)));
+        // .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences)));
+        // .addRetryFetcher(new DoiToBibtexConverterComIsbnFetcher(importFormatPreferences)));
         set.add(new DiVA(importFormatPreferences));
         set.add(new DoiFetcher(importFormatPreferences));
         set.add(new MedlineFetcher());
@@ -160,10 +160,11 @@ public static SortedSet<IdBasedFetcher> getIdBasedFetchers(ImportFormatPreferenc
         return set;
     }
 
-    public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImporterPreferences importerPreferences,
-                                                                     ImportFormatPreferences importFormatPreferences,
-                                                                     FilePreferences filePreferences,
-                                                                     BibDatabaseContext databaseContext) {
+    public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(
+            ImporterPreferences importerPreferences,
+            ImportFormatPreferences importFormatPreferences,
+            FilePreferences filePreferences,
+            BibDatabaseContext databaseContext) {
         SortedSet<EntryBasedFetcher> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
         set.add(new INSPIREFetcher(importFormatPreferences));
         set.add(new AstrophysicsDataSystem(importFormatPreferences, importerPreferences));
@@ -171,7 +172,7 @@ public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImporterPrefere
         set.add(new IsbnFetcher(importFormatPreferences));
         set.add(new IssnFetcher());
         // .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences)));
-                // .addRetryFetcher(new DoiToBibtexConverterComIsbnFetcher(importFormatPreferences)));
+        // .addRetryFetcher(new DoiToBibtexConverterComIsbnFetcher(importFormatPreferences)));
         set.add(new MathSciNet(importFormatPreferences));
         set.add(new CrossRef());
         set.add(new ZbMATH(importFormatPreferences));
@@ -180,7 +181,9 @@ public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImporterPrefere
 
         // Uses the PDFs - and then uses the parsed DOI. Makes it 10% a web fetcher.
         // We list it here, because otherwise, it would be much more effort (other UI button, ...)
-        set.add(new PdfMergeMetadataImporter.EntryBasedFetcherWrapper(importFormatPreferences, filePreferences, databaseContext));
+        set.add(
+                new PdfMergeMetadataImporter.EntryBasedFetcherWrapper(
+                        importFormatPreferences, filePreferences, databaseContext));
 
         return set;
     }
@@ -188,7 +191,8 @@ public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImporterPrefere
     /**
      * @return sorted set containing id fetchers
      */
-    public static SortedSet<IdFetcher<? extends Identifier>> getIdFetchers(ImportFormatPreferences importFormatPreferences) {
+    public static SortedSet<IdFetcher<? extends Identifier>> getIdFetchers(
+            ImportFormatPreferences importFormatPreferences) {
         SortedSet<IdFetcher<?>> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
         set.add(new CrossRef());
         set.add(new ArXivFetcher(importFormatPreferences));
@@ -198,7 +202,9 @@ public static SortedSet<IdFetcher<? extends Identifier>> getIdFetchers(ImportFor
     /**
      * @return set containing fulltext fetchers
      */
-    public static Set<FulltextFetcher> getFullTextFetchers(ImportFormatPreferences importFormatPreferences, ImporterPreferences importerPreferences) {
+    public static Set<FulltextFetcher> getFullTextFetchers(
+            ImportFormatPreferences importFormatPreferences,
+            ImporterPreferences importerPreferences) {
         Set<FulltextFetcher> fetchers = new HashSet<>();
 
         // Original
@@ -226,7 +232,9 @@ public static Set<FulltextFetcher> getFullTextFetchers(ImportFormatPreferences i
     /**
      * @return set containing customizable api key fetchers
      */
-    public static Set<CustomizableKeyFetcher> getCustomizableKeyFetchers(ImportFormatPreferences importFormatPreferences, ImporterPreferences importerPreferences) {
+    public static Set<CustomizableKeyFetcher> getCustomizableKeyFetchers(
+            ImportFormatPreferences importFormatPreferences,
+            ImporterPreferences importerPreferences) {
         Set<CustomizableKeyFetcher> fetchers = new HashSet<>();
         fetchers.add(new IEEE(importFormatPreferences, importerPreferences));
         fetchers.add(new SpringerFetcher(importerPreferences));
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java
index 93572f9b041b..784623452908 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java
@@ -1,20 +1,19 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.CookieHandler;
-import java.net.CookieManager;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Optional;
-
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.SearchBasedParserFetcher;
 import org.jabref.logic.importer.fetcher.transformers.DefaultQueryTransformer;
 import org.jabref.logic.importer.fileformat.ACMPortalParser;
 
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import java.net.CookieHandler;
+import java.net.CookieManager;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Optional;
 
 public class ACMPortalFetcher implements SearchBasedParserFetcher {
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ACS.java b/src/main/java/org/jabref/logic/importer/fetcher/ACS.java
index 11cf1fd9ca32..c0eff81a7fec 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ACS.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ACS.java
@@ -1,22 +1,21 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.logic.importer.FulltextFetcher;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
-
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * FulltextFetcher implementation that attempts to find a PDF URL at <a href="https://pubs.acs.org/">ACS</a>.
  */
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java
index 80899dd511b2..eb307ba61534 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.URISyntaxException;
-import java.util.Optional;
-
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.IdBasedParserFetcher;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -10,6 +7,9 @@
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.model.entry.identifier.ISBN;
 
+import java.net.URISyntaxException;
+import java.util.Optional;
+
 public abstract class AbstractIsbnFetcher implements IdBasedParserFetcher {
 
     protected final ImportFormatPreferences importFormatPreferences;
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ApsFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/ApsFetcher.java
index 88de237ab9b0..93bc2906d710 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ApsFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ApsFetcher.java
@@ -1,22 +1,22 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Objects;
-import java.util.Optional;
+import kong.unirest.core.Unirest;
 
 import org.jabref.logic.importer.FulltextFetcher;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
-
-import kong.unirest.core.Unirest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * FulltextFetcher implementation that attempts to find a PDF URL at APS. Also see the <a
  * href="https://harvest.aps.org/docs/harvest-api">API</a>, although it isn't currently used.
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ArXivFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/ArXivFetcher.java
index b943398c760e..6d832ad378ce 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ArXivFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ArXivFetcher.java
@@ -1,29 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.cleanup.EprintCleanup;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.FetcherException;
@@ -48,15 +26,36 @@
 import org.jabref.model.paging.Page;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.OptionalUtil;
-
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
 
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 /**
  * Fetcher for ArXiv that merges fields from arXiv-issued DOIs (and user-issued ones when applicable) to get more information overall.
  * <p>
@@ -71,7 +70,11 @@
  * @see <a href="https://arxiv.org/help/api/index">ArXiv API</a> for an overview of the API
  * @see <a href="https://arxiv.org/help/api/user-manual#_calling_the_api">ArXiv API User's Manual</a> for a detailed description on how to use the API
  */
-public class ArXivFetcher implements FulltextFetcher, PagedSearchBasedFetcher, IdBasedFetcher, IdFetcher<ArXivIdentifier> {
+public class ArXivFetcher
+        implements FulltextFetcher,
+                PagedSearchBasedFetcher,
+                IdBasedFetcher,
+                IdFetcher<ArXivIdentifier> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ArXivFetcher.class);
 
@@ -83,7 +86,8 @@ public class ArXivFetcher implements FulltextFetcher, PagedSearchBasedFetcher, I
      *   - KEYWORDS: More descriptive
      *   - AUTHOR: Better formatted (last name, rest of name)
      */
-    private static final Set<Field> CHOSEN_AUTOMATIC_DOI_FIELDS = Set.of(StandardField.KEYWORDS, StandardField.AUTHOR);
+    private static final Set<Field> CHOSEN_AUTOMATIC_DOI_FIELDS =
+            Set.of(StandardField.KEYWORDS, StandardField.AUTHOR);
 
     /*
      * Reason behind choice of these fields:
@@ -92,11 +96,15 @@ public class ArXivFetcher implements FulltextFetcher, PagedSearchBasedFetcher, I
      *      if applicable
      *   - KEY_FIELD: Usually, the KEY_FIELD retrieved from user-assigned DOIs are 'nicer' (instead of a DOI link, it's usually contains one author and the year)
      */
-    private static final Set<Field> CHOSEN_MANUAL_DOI_FIELDS = Set.of(StandardField.DOI, StandardField.PUBLISHER, InternalField.KEY_FIELD);
+    private static final Set<Field> CHOSEN_MANUAL_DOI_FIELDS =
+            Set.of(StandardField.DOI, StandardField.PUBLISHER, InternalField.KEY_FIELD);
 
-    private static final Map<String, String> ARXIV_KEYWORDS_WITH_COMMA_REPLACEMENTS = Map.of(
-            "Computational Engineering, Finance, and Science", "Computational Engineering / Finance / Science",
-            "Distributed, Parallel, and Cluster Computing", "Distributed / Parallel / Cluster Computing");
+    private static final Map<String, String> ARXIV_KEYWORDS_WITH_COMMA_REPLACEMENTS =
+            Map.of(
+                    "Computational Engineering, Finance, and Science",
+                            "Computational Engineering / Finance / Science",
+                    "Distributed, Parallel, and Cluster Computing",
+                            "Distributed / Parallel / Cluster Computing");
 
     private final ArXiv arXiv;
     private final DoiFetcher doiFetcher;
@@ -143,17 +151,25 @@ public Optional<HelpFile> getHelpPage() {
     private void adaptKeywordsFrom(BibEntry bibEntry) {
         Optional<String> allKeywords = bibEntry.getField(StandardField.KEYWORDS);
         if (allKeywords.isPresent()) {
-            // With the use of ArXiv-issued DOI's KEYWORDS field, some of those keywords might contain comma. As this is the
-            // default keyword separator, replace the commas of these instances with some other character
+            // With the use of ArXiv-issued DOI's KEYWORDS field, some of those keywords might
+            // contain comma. As this is the
+            // default keyword separator, replace the commas of these instances with some other
+            // character
             // (see ARXIV_KEYWORDS_WITH_COMMA_REPLACEMENTS variable)
-            for (Map.Entry<String, String> entry : ARXIV_KEYWORDS_WITH_COMMA_REPLACEMENTS.entrySet()) {
-                allKeywords = Optional.of(allKeywords.get().replaceAll(entry.getKey(), entry.getValue()));
+            for (Map.Entry<String, String> entry :
+                    ARXIV_KEYWORDS_WITH_COMMA_REPLACEMENTS.entrySet()) {
+                allKeywords =
+                        Optional.of(allKeywords.get().replaceAll(entry.getKey(), entry.getValue()));
             }
 
-            String filteredKeywords = KeywordList.merge(
-                    allKeywords.get(),
-                    "",
-                    importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).toString();
+            String filteredKeywords =
+                    KeywordList.merge(
+                                    allKeywords.get(),
+                                    "",
+                                    importFormatPreferences
+                                            .bibEntryPreferences()
+                                            .getKeywordSeparator())
+                            .toString();
             bibEntry.setField(StandardField.KEYWORDS, filteredKeywords);
         }
     }
@@ -180,7 +196,8 @@ private static String getAutomaticDoi(String arXivId) {
      * @return ArXiv-issued DOI, or Empty, if method could not retrieve it
      */
     private static Optional<String> getAutomaticDoi(BibEntry arXivBibEntry) {
-        // As the input should always contain a EPRINT if created from inner 'ArXiv' class, don't bother doing a check that might call
+        // As the input should always contain a EPRINT if created from inner 'ArXiv' class, don't
+        // bother doing a check that might call
         // ArXiv's API again (method 'findIdentifier')
         Optional<String> entryEprint = arXivBibEntry.getField(StandardField.EPRINT);
         if (entryEprint.isEmpty()) {
@@ -229,7 +246,8 @@ private static Optional<String> getManualDoi(BibEntry arXivBibEntry) {
      * @param bibEntryFuture A CompletableFuture that parallelize the API fetching process
      * @return the fetch result
      */
-    private static Optional<BibEntry> waitForBibEntryRetrieval(CompletableFuture<Optional<BibEntry>> bibEntryFuture) throws FetcherException {
+    private static Optional<BibEntry> waitForBibEntryRetrieval(
+            CompletableFuture<Optional<BibEntry>> bibEntryFuture) throws FetcherException {
         try {
             return bibEntryFuture.join();
         } catch (CompletionException e) {
@@ -249,7 +267,11 @@ private static Optional<BibEntry> waitForBibEntryRetrieval(CompletableFuture<Opt
      * @param priorityFields Which fields from "bibEntryFuture" to prioritize, replacing them on "arXivEntry"
      * @param id Identifier used in initiating the "bibEntryFuture" future (for logging). This is usually a DOI, but can be anything.
      */
-    private void mergeArXivEntryWithFutureDoiEntry(BibEntry arXivEntry, CompletableFuture<Optional<BibEntry>> bibEntryFuture, Set<Field> priorityFields, String id) {
+    private void mergeArXivEntryWithFutureDoiEntry(
+            BibEntry arXivEntry,
+            CompletableFuture<Optional<BibEntry>> bibEntryFuture,
+            Set<Field> priorityFields,
+            String id) {
         Optional<BibEntry> bibEntry;
         try {
             bibEntry = waitForBibEntryRetrieval(bibEntryFuture);
@@ -262,7 +284,9 @@ private void mergeArXivEntryWithFutureDoiEntry(BibEntry arXivEntry, CompletableF
             adaptKeywordsFrom(bibEntry.get());
             arXivEntry.mergeWith(bibEntry.get(), priorityFields);
         } else {
-            LOGGER.error("Future BibEntry for id '{}' was completed, but no entry was found (skipping merge).", id);
+            LOGGER.error(
+                    "Future BibEntry for id '{}' was completed, but no entry was found (skipping merge).",
+                    id);
         }
     }
 
@@ -272,13 +296,17 @@ private void mergeArXivEntryWithFutureDoiEntry(BibEntry arXivEntry, CompletableF
      * @param arXivBibEntry An existing entry to be updated with new/modified fields
      */
     private void inplaceAsyncInfuseArXivWithDoi(BibEntry arXivBibEntry) {
-        CompletableFuture<Optional<BibEntry>> arXivBibEntryCompletedFuture = CompletableFuture.completedFuture(Optional.of(arXivBibEntry));
-        Optional<ArXivIdentifier> arXivBibEntryId = arXivBibEntry.getField(StandardField.EPRINT).flatMap(ArXivIdentifier::parse);
+        CompletableFuture<Optional<BibEntry>> arXivBibEntryCompletedFuture =
+                CompletableFuture.completedFuture(Optional.of(arXivBibEntry));
+        Optional<ArXivIdentifier> arXivBibEntryId =
+                arXivBibEntry.getField(StandardField.EPRINT).flatMap(ArXivIdentifier::parse);
 
         try {
             this.inplaceAsyncInfuseArXivWithDoi(arXivBibEntryCompletedFuture, arXivBibEntryId);
         } catch (FetcherException e) {
-            LOGGER.error("FetcherException should not be found here, as main Bibtex Entry already exists (and failing additional fetches should be skipped)", e);
+            LOGGER.error(
+                    "FetcherException should not be found here, as main Bibtex Entry already exists (and failing additional fetches should be skipped)",
+                    e);
         }
     }
 
@@ -289,7 +317,10 @@ private void inplaceAsyncInfuseArXivWithDoi(BibEntry arXivBibEntry) {
      * @param arXivId An ArXiv ID for the main reference (from ArXiv), so that the retrieval of ArXiv-issued DOI metadata can be faster
      * @throws FetcherException when failed to fetch the main ArtXiv Bibtex entry ('arXivBibEntryFuture').
      */
-    private void inplaceAsyncInfuseArXivWithDoi(CompletableFuture<Optional<BibEntry>> arXivBibEntryFuture, Optional<ArXivIdentifier> arXivId) throws FetcherException {
+    private void inplaceAsyncInfuseArXivWithDoi(
+            CompletableFuture<Optional<BibEntry>> arXivBibEntryFuture,
+            Optional<ArXivIdentifier> arXivId)
+            throws FetcherException {
 
         Optional<CompletableFuture<Optional<BibEntry>>> automaticDoiBibEntryFuture;
         Optional<BibEntry> arXivBibEntry;
@@ -297,19 +328,24 @@ private void inplaceAsyncInfuseArXivWithDoi(CompletableFuture<Optional<BibEntry>
         Optional<String> automaticDoi;
         Optional<String> manualDoi;
 
-        // We can accelerate the processing time by initiating a parallel request for DOIFetcher with an ArXiv-issued DOI alongside the ArXiv fetching itself,
-        // BUT ONLY IF we have a valid arXivId. If not, the ArXiv entry must be retrieved before, which invalidates this optimization (although we can still speed
-        // up the process by running both the ArXiv-assigned and user-assigned DOI fetching at the same time, if an entry has this last information)
+        // We can accelerate the processing time by initiating a parallel request for DOIFetcher
+        // with an ArXiv-issued DOI alongside the ArXiv fetching itself,
+        // BUT ONLY IF we have a valid arXivId. If not, the ArXiv entry must be retrieved before,
+        // which invalidates this optimization (although we can still speed
+        // up the process by running both the ArXiv-assigned and user-assigned DOI fetching at the
+        // same time, if an entry has this last information)
         if (arXivId.isPresent()) {
             automaticDoi = Optional.of(ArXivFetcher.getAutomaticDoi(arXivId.get()));
-            automaticDoiBibEntryFuture = Optional.of(doiFetcher.asyncPerformSearchById(automaticDoi.get()));
+            automaticDoiBibEntryFuture =
+                    Optional.of(doiFetcher.asyncPerformSearchById(automaticDoi.get()));
 
             arXivBibEntry = ArXivFetcher.waitForBibEntryRetrieval(arXivBibEntryFuture);
             if (arXivBibEntry.isEmpty()) {
                 return;
             }
         } else {
-            // If ArXiv fetch fails (FetcherException), exception must be passed onwards for the transparency of this class (original ArXiv fetcher does the same)
+            // If ArXiv fetch fails (FetcherException), exception must be passed onwards for the
+            // transparency of this class (original ArXiv fetcher does the same)
             arXivBibEntry = ArXivFetcher.waitForBibEntryRetrieval(arXivBibEntryFuture);
             if (arXivBibEntry.isEmpty()) {
                 return;
@@ -320,12 +356,23 @@ private void inplaceAsyncInfuseArXivWithDoi(CompletableFuture<Optional<BibEntry>
         }
 
         manualDoi = ArXivFetcher.getManualDoi(arXivBibEntry.get());
-        Optional<CompletableFuture<Optional<BibEntry>>> manualDoiBibEntryFuture = manualDoi.map(doiFetcher::asyncPerformSearchById);
-
-        automaticDoiBibEntryFuture.ifPresent(future ->
-                mergeArXivEntryWithFutureDoiEntry(arXivBibEntry.get(), future, CHOSEN_AUTOMATIC_DOI_FIELDS, automaticDoi.get()));
-        manualDoiBibEntryFuture.ifPresent(future ->
-                mergeArXivEntryWithFutureDoiEntry(arXivBibEntry.get(), future, CHOSEN_MANUAL_DOI_FIELDS, manualDoi.get()));
+        Optional<CompletableFuture<Optional<BibEntry>>> manualDoiBibEntryFuture =
+                manualDoi.map(doiFetcher::asyncPerformSearchById);
+
+        automaticDoiBibEntryFuture.ifPresent(
+                future ->
+                        mergeArXivEntryWithFutureDoiEntry(
+                                arXivBibEntry.get(),
+                                future,
+                                CHOSEN_AUTOMATIC_DOI_FIELDS,
+                                automaticDoi.get()));
+        manualDoiBibEntryFuture.ifPresent(
+                future ->
+                        mergeArXivEntryWithFutureDoiEntry(
+                                arXivBibEntry.get(),
+                                future,
+                                CHOSEN_MANUAL_DOI_FIELDS,
+                                manualDoi.get()));
     }
 
     /**
@@ -336,7 +383,8 @@ private void inplaceAsyncInfuseArXivWithDoi(CompletableFuture<Optional<BibEntry>
      * @return A list of entries matching the complex query
      */
     @Override
-    public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber) throws FetcherException {
+    public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
+            throws FetcherException {
 
         Page<BibEntry> result = arXiv.performSearchPaged(luceneQuery, pageNumber);
         if (this.doiFetcher == null) {
@@ -345,25 +393,30 @@ public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
 
         ExecutorService executor = Executors.newFixedThreadPool(getPageSize() * 2);
 
-        Collection<CompletableFuture<BibEntry>> futureSearchResult = result.getContent()
-                                                                       .stream()
-                                                                       .map(bibEntry ->
-                                                                               CompletableFuture.supplyAsync(() -> {
-                                                                                   this.inplaceAsyncInfuseArXivWithDoi(bibEntry);
-                                                                                   return bibEntry;
-                                                                               }, executor))
-                                                                       .toList();
-
-        Collection<BibEntry> modifiedSearchResult = futureSearchResult.stream()
-                                      .map(CompletableFuture::join)
-                                      .collect(Collectors.toList());
+        Collection<CompletableFuture<BibEntry>> futureSearchResult =
+                result.getContent().stream()
+                        .map(
+                                bibEntry ->
+                                        CompletableFuture.supplyAsync(
+                                                () -> {
+                                                    this.inplaceAsyncInfuseArXivWithDoi(bibEntry);
+                                                    return bibEntry;
+                                                },
+                                                executor))
+                        .toList();
+
+        Collection<BibEntry> modifiedSearchResult =
+                futureSearchResult.stream()
+                        .map(CompletableFuture::join)
+                        .collect(Collectors.toList());
 
         return new Page<>(result.getQuery(), result.getPageNumber(), modifiedSearchResult);
     }
 
     @Override
     public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
-        CompletableFuture<Optional<BibEntry>> arXivBibEntryPromise = arXiv.asyncPerformSearchById(identifier);
+        CompletableFuture<Optional<BibEntry>> arXivBibEntryPromise =
+                arXiv.asyncPerformSearchById(identifier);
         if (this.doiFetcher != null) {
             inplaceAsyncInfuseArXivWithDoi(arXivBibEntryPromise, ArXivIdentifier.parse(identifier));
         }
@@ -391,13 +444,18 @@ public String getIdentifierName() {
      * <a href="https://github.com/nathangrigg/arxiv2bib">arxiv2bib</a> which is <a href="https://arxiv2bibtex.org/">live</a>
      * <a href="https://gitlab.c3sl.ufpr.br/portalmec/dspace-portalmec/blob/aa209d15082a9870f9daac42c78a35490ce77b52/dspace-api/src/main/java/org/dspace/submit/lookup/ArXivService.java">dspace-portalmec</a>
      */
-    protected static class ArXiv implements FulltextFetcher, PagedSearchBasedFetcher, IdBasedFetcher, IdFetcher<ArXivIdentifier> {
+    protected static class ArXiv
+            implements FulltextFetcher,
+                    PagedSearchBasedFetcher,
+                    IdBasedFetcher,
+                    IdFetcher<ArXivIdentifier> {
 
         private static final Logger LOGGER = LoggerFactory.getLogger(ArXiv.class);
 
         private static final String API_URL = "https://export.arxiv.org/api/query";
 
-        private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactory.newInstance();
+        private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY =
+                DocumentBuilderFactory.newInstance();
 
         private final ImportFormatPreferences importFormatPreferences;
 
@@ -410,11 +468,12 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
             Objects.requireNonNull(entry);
 
             try {
-                Optional<URL> pdfUrl = searchForEntries(entry).stream()
-                                                              .map(ArXivEntry::getPdfUrl)
-                                                              .filter(Optional::isPresent)
-                                                              .map(Optional::get)
-                                                              .findFirst();
+                Optional<URL> pdfUrl =
+                        searchForEntries(entry).stream()
+                                .map(ArXivEntry::getPdfUrl)
+                                .filter(Optional::isPresent)
+                                .map(Optional::get)
+                                .findFirst();
                 pdfUrl.ifPresent(url -> LOGGER.info("Fulltext PDF found @ arXiv."));
                 return pdfUrl;
             } catch (FetcherException e) {
@@ -444,7 +503,8 @@ private Optional<ArXivEntry> searchForEntryById(String id) throws FetcherExcepti
                 return Optional.empty();
             }
 
-            List<ArXivEntry> entries = queryApi("", Collections.singletonList(identifier.get()), 0, 1);
+            List<ArXivEntry> entries =
+                    queryApi("", Collections.singletonList(identifier.get()), 0, 1);
             if (!entries.isEmpty()) {
                 return Optional.of(entries.getFirst());
             } else {
@@ -470,16 +530,19 @@ private List<ArXivEntry> searchForEntries(BibEntry originalEntry) throws Fetcher
 
             // 2. DOI and other fields
             String query;
-            Optional<String> doiString = entry.getField(StandardField.DOI)
-                                              .flatMap(DOI::parse)
-                                              .map(DOI::getNormalized);
+            Optional<String> doiString =
+                    entry.getField(StandardField.DOI).flatMap(DOI::parse).map(DOI::getNormalized);
 
-            // ArXiv-issued DOIs seem to be unsearchable from ArXiv API's "query string", so ignore it
+            // ArXiv-issued DOIs seem to be unsearchable from ArXiv API's "query string", so ignore
+            // it
             if (doiString.isPresent() && ArXivFetcher.isManualDoi(doiString.get())) {
                 query = "doi:" + doiString.get();
             } else {
-                Optional<String> authorQuery = entry.getField(StandardField.AUTHOR).map(author -> "au:" + author);
-                Optional<String> titleQuery = entry.getField(StandardField.TITLE).map(title -> "ti:" + StringUtil.ignoreCurlyBracket(title));
+                Optional<String> authorQuery =
+                        entry.getField(StandardField.AUTHOR).map(author -> "au:" + author);
+                Optional<String> titleQuery =
+                        entry.getField(StandardField.TITLE)
+                                .map(title -> "ti:" + StringUtil.ignoreCurlyBracket(title));
                 query = String.join("+AND+", OptionalUtil.toList(authorQuery, titleQuery));
             }
 
@@ -488,7 +551,9 @@ private List<ArXivEntry> searchForEntries(BibEntry originalEntry) throws Fetcher
                 // Check if entry is a match
                 StringSimilarity match = new StringSimilarity();
                 String arxivTitle = arxivEntry.get().title.orElse("");
-                String entryTitle = StringUtil.ignoreCurlyBracket(entry.getField(StandardField.TITLE).orElse(""));
+                String entryTitle =
+                        StringUtil.ignoreCurlyBracket(
+                                entry.getField(StandardField.TITLE).orElse(""));
                 if (match.isSimilar(arxivTitle, entryTitle)) {
                     return OptionalUtil.toList(arxivEntry);
                 }
@@ -497,11 +562,17 @@ private List<ArXivEntry> searchForEntries(BibEntry originalEntry) throws Fetcher
             return Collections.emptyList();
         }
 
-        private List<ArXivEntry> searchForEntries(String searchQuery, int pageNumber) throws FetcherException {
-            return queryApi(searchQuery, Collections.emptyList(), getPageSize() * pageNumber, getPageSize());
+        private List<ArXivEntry> searchForEntries(String searchQuery, int pageNumber)
+                throws FetcherException {
+            return queryApi(
+                    searchQuery,
+                    Collections.emptyList(),
+                    getPageSize() * pageNumber,
+                    getPageSize());
         }
 
-        private List<ArXivEntry> queryApi(String searchQuery, List<ArXivIdentifier> ids, int start, int maxResults)
+        private List<ArXivEntry> queryApi(
+                String searchQuery, List<ArXivIdentifier> ids, int start, int maxResults)
                 throws FetcherException {
             Document result = callApi(searchQuery, ids, start, maxResults);
             List<Node> entries = XMLUtil.asList(result.getElementsByTagName("entry"));
@@ -525,9 +596,12 @@ private List<ArXivEntry> queryApi(String searchQuery, List<ArXivIdentifier> ids,
          * @return the response from the API as a XML document (Atom 1.0)
          * @throws FetcherException if there was a problem while building the URL or the API was not accessible
          */
-        private Document callApi(String searchQuery, List<ArXivIdentifier> ids, int start, int maxResults) throws FetcherException {
+        private Document callApi(
+                String searchQuery, List<ArXivIdentifier> ids, int start, int maxResults)
+                throws FetcherException {
             if (maxResults > 2000) {
-                throw new IllegalArgumentException("The arXiv API limits the number of maximal results to be 2000");
+                throw new IllegalArgumentException(
+                        "The arXiv API limits the number of maximal results to be 2000");
             }
 
             URIBuilder uriBuilder;
@@ -541,8 +615,11 @@ private Document callApi(String searchQuery, List<ArXivIdentifier> ids, int star
                 uriBuilder.addParameter("search_query", StringUtil.stripAccents(searchQuery));
             }
             if (!ids.isEmpty()) {
-                uriBuilder.addParameter("id_list",
-                        ids.stream().map(ArXivIdentifier::getNormalized).collect(Collectors.joining(",")));
+                uriBuilder.addParameter(
+                        "id_list",
+                        ids.stream()
+                                .map(ArXivIdentifier::getNormalized)
+                                .collect(Collectors.joining(",")));
             }
             uriBuilder.addParameter("start", String.valueOf(start));
             uriBuilder.addParameter("max_results", String.valueOf(maxResults));
@@ -572,7 +649,8 @@ private FetcherException getException(Document error) {
             List<Node> entries = XMLUtil.asList(error.getElementsByTagName("entry"));
 
             // Check if the API returned an error
-            // In case of an error, only one entry will be returned with the error information. For example:
+            // In case of an error, only one entry will be returned with the error information. For
+            // example:
             // https://export.arxiv.org/api/query?id_list=0307015
             // <entry>
             //      <id>https://arxiv.org/api/errors#incorrect_id_format_for_0307015</id>
@@ -582,9 +660,12 @@ private FetcherException getException(Document error) {
             if (entries.size() == 1) {
                 Node node = entries.getFirst();
                 Optional<String> id = XMLUtil.getNodeContent(node, "id");
-                Boolean isError = id.map(idContent -> idContent.startsWith("http://arxiv.org/api/errors")).orElse(false);
+                Boolean isError =
+                        id.map(idContent -> idContent.startsWith("http://arxiv.org/api/errors"))
+                                .orElse(false);
                 if (isError) {
-                    String errorMessage = XMLUtil.getNodeContent(node, "summary").orElse("Unknown error");
+                    String errorMessage =
+                            XMLUtil.getNodeContent(node, "summary").orElse("Unknown error");
                     return new FetcherException(errorMessage);
                 }
             }
@@ -608,49 +689,77 @@ public Optional<HelpFile> getHelpPage() {
          * @return A list of entries matching the complex query
          */
         @Override
-        public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber) throws FetcherException {
+        public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
+                throws FetcherException {
             ArXivQueryTransformer transformer = new ArXivQueryTransformer();
             String transformedQuery = transformer.transformLuceneQuery(luceneQuery).orElse("");
-            List<BibEntry> searchResult = searchForEntries(transformedQuery, pageNumber)
-                    .stream()
-                    .map(arXivEntry -> arXivEntry.toBibEntry(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()))
-                    .collect(Collectors.toList());
+            List<BibEntry> searchResult =
+                    searchForEntries(transformedQuery, pageNumber).stream()
+                            .map(
+                                    arXivEntry ->
+                                            arXivEntry.toBibEntry(
+                                                    importFormatPreferences
+                                                            .bibEntryPreferences()
+                                                            .getKeywordSeparator()))
+                            .collect(Collectors.toList());
 
             return new Page<>(transformedQuery, pageNumber, filterYears(searchResult, transformer));
         }
 
-        private List<BibEntry> filterYears(List<BibEntry> searchResult, ArXivQueryTransformer transformer) {
+        private List<BibEntry> filterYears(
+                List<BibEntry> searchResult, ArXivQueryTransformer transformer) {
             return searchResult.stream()
-                               .filter(entry -> entry.getField(StandardField.DATE).isPresent())
-                               // Filter the date field for year only
-                               .filter(entry -> transformer.getEndYear().isEmpty() || (Integer.parseInt(entry.getField(StandardField.DATE).get().substring(0, 4)) <= transformer.getEndYear().get()))
-                               .filter(entry -> transformer.getStartYear().isEmpty() || (Integer.parseInt(entry.getField(StandardField.DATE).get().substring(0, 4)) >= transformer.getStartYear().get()))
-                               .collect(Collectors.toList());
+                    .filter(entry -> entry.getField(StandardField.DATE).isPresent())
+                    // Filter the date field for year only
+                    .filter(
+                            entry ->
+                                    transformer.getEndYear().isEmpty()
+                                            || (Integer.parseInt(
+                                                            entry.getField(StandardField.DATE)
+                                                                    .get()
+                                                                    .substring(0, 4))
+                                                    <= transformer.getEndYear().get()))
+                    .filter(
+                            entry ->
+                                    transformer.getStartYear().isEmpty()
+                                            || (Integer.parseInt(
+                                                            entry.getField(StandardField.DATE)
+                                                                    .get()
+                                                                    .substring(0, 4))
+                                                    >= transformer.getStartYear().get()))
+                    .collect(Collectors.toList());
         }
 
-        protected CompletableFuture<Optional<BibEntry>> asyncPerformSearchById(String identifier) throws CompletionException {
-            return CompletableFuture.supplyAsync(() -> {
-                try {
-                    return performSearchById(identifier);
-                } catch (FetcherException e) {
-                    throw new CompletionException(e);
-                }
-            });
+        protected CompletableFuture<Optional<BibEntry>> asyncPerformSearchById(String identifier)
+                throws CompletionException {
+            return CompletableFuture.supplyAsync(
+                    () -> {
+                        try {
+                            return performSearchById(identifier);
+                        } catch (FetcherException e) {
+                            throw new CompletionException(e);
+                        }
+                    });
         }
 
         @Override
         public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
             return searchForEntryById(identifier)
-                    .map(arXivEntry -> arXivEntry.toBibEntry(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()));
+                    .map(
+                            arXivEntry ->
+                                    arXivEntry.toBibEntry(
+                                            importFormatPreferences
+                                                    .bibEntryPreferences()
+                                                    .getKeywordSeparator()));
         }
 
         @Override
         public Optional<ArXivIdentifier> findIdentifier(BibEntry entry) throws FetcherException {
             return searchForEntries(entry).stream()
-                                          .map(ArXivEntry::getId)
-                                          .filter(Optional::isPresent)
-                                          .map(Optional::get)
-                                          .findFirst();
+                    .map(ArXivEntry::getId)
+                    .filter(Optional::isPresent)
+                    .map(Optional::get)
+                    .findFirst();
         }
 
         @Override
@@ -685,13 +794,17 @@ public ArXivEntry(Node item) {
                 publishedDate = XMLUtil.getNodeContent(item, "published");
 
                 // Abstract of the article
-                abstractText = XMLUtil.getNodeContent(item, "summary").map(ArXivEntry::correctLineBreaks)
-                                      .map(String::trim).map(BracesCorrector::apply);
+                abstractText =
+                        XMLUtil.getNodeContent(item, "summary")
+                                .map(ArXivEntry::correctLineBreaks)
+                                .map(String::trim)
+                                .map(BracesCorrector::apply);
 
                 // Authors of the article
                 authorNames = new ArrayList<>();
                 for (Node authorNode : XMLUtil.getNodesByName(item, "author")) {
-                    Optional<String> authorName = XMLUtil.getNodeContent(authorNode, "name").map(String::trim);
+                    Optional<String> authorName =
+                            XMLUtil.getNodeContent(authorNode, "name").map(String::trim);
                     authorName.ifPresent(authorNames::add);
                 }
 
@@ -707,13 +820,16 @@ public ArXivEntry(Node item) {
                 for (Node linkNode : XMLUtil.getNodesByName(item, "link")) {
                     Optional<String> linkTitle = XMLUtil.getAttributeContent(linkNode, "title");
                     if (linkTitle.equals(Optional.of("pdf"))) {
-                        pdfUrlParsed = XMLUtil.getAttributeContent(linkNode, "href").map(url -> {
-                            try {
-                                return URI.create(url).toURL();
-                            } catch (MalformedURLException e) {
-                                return null;
-                            }
-                        });
+                        pdfUrlParsed =
+                                XMLUtil.getAttributeContent(linkNode, "href")
+                                        .map(
+                                                url -> {
+                                                    try {
+                                                        return URI.create(url).toURL();
+                                                    } catch (MalformedURLException e) {
+                                                        return null;
+                                                    }
+                                                });
                     }
                 }
                 pdfUrl = pdfUrlParsed;
@@ -725,9 +841,11 @@ public ArXivEntry(Node item) {
                 journalReferenceText = XMLUtil.getNodeContent(item, "arxiv:journal_ref");
 
                 // Primary category
-                // Ex: <arxiv:primary_category xmlns:arxiv="https://arxiv.org/schemas/atom" term="math-ph" scheme="http://arxiv.org/schemas/atom"/>
-                primaryCategory = XMLUtil.getNode(item, "arxiv:primary_category")
-                                         .flatMap(node -> XMLUtil.getAttributeContent(node, "term"));
+                // Ex: <arxiv:primary_category xmlns:arxiv="https://arxiv.org/schemas/atom"
+                // term="math-ph" scheme="http://arxiv.org/schemas/atom"/>
+                primaryCategory =
+                        XMLUtil.getNode(item, "arxiv:primary_category")
+                                .flatMap(node -> XMLUtil.getAttributeContent(node, "term"));
             }
 
             public static String correctLineBreaks(String s) {
@@ -747,7 +865,9 @@ public Optional<URL> getPdfUrl() {
              * Returns the arXiv identifier
              */
             public Optional<String> getIdString() {
-                return urlAbstractPage.flatMap(ArXivIdentifier::parse).map(ArXivIdentifier::getNormalizedWithoutVersion);
+                return urlAbstractPage
+                        .flatMap(ArXivIdentifier::parse)
+                        .map(ArXivIdentifier::getNormalizedWithoutVersion);
             }
 
             public Optional<ArXivIdentifier> getId() {
@@ -759,13 +879,14 @@ public Optional<ArXivIdentifier> getId() {
              */
             public Optional<String> getDate() {
                 // Publication string also contains time, e.g. 2014-05-09T14:49:43Z
-                return publishedDate.map(date -> {
-                    if (date.length() < 10) {
-                        return null;
-                    } else {
-                        return date.substring(0, 10);
-                    }
-                });
+                return publishedDate.map(
+                        date -> {
+                            if (date.length() < 10) {
+                                return null;
+                            } else {
+                                return date.substring(0, 10);
+                            }
+                        });
             }
 
             public BibEntry toBibEntry(Character keywordDelimiter) {
@@ -774,13 +895,23 @@ public BibEntry toBibEntry(Character keywordDelimiter) {
                 bibEntry.setField(StandardField.AUTHOR, String.join(" and ", authorNames));
                 bibEntry.addKeywords(categories, keywordDelimiter);
                 getIdString().ifPresent(id -> bibEntry.setField(StandardField.EPRINT, id));
-                title.ifPresent(titleContent -> bibEntry.setField(StandardField.TITLE, titleContent));
+                title.ifPresent(
+                        titleContent -> bibEntry.setField(StandardField.TITLE, titleContent));
                 doi.ifPresent(doiContent -> bibEntry.setField(StandardField.DOI, doiContent));
-                abstractText.ifPresent(abstractContent -> bibEntry.setField(StandardField.ABSTRACT, abstractContent));
+                abstractText.ifPresent(
+                        abstractContent ->
+                                bibEntry.setField(StandardField.ABSTRACT, abstractContent));
                 getDate().ifPresent(date -> bibEntry.setField(StandardField.DATE, date));
-                primaryCategory.ifPresent(category -> bibEntry.setField(StandardField.EPRINTCLASS, category));
-                journalReferenceText.ifPresent(journal -> bibEntry.setField(StandardField.JOURNAL, journal));
-                getPdfUrl().ifPresent(url -> bibEntry.setFiles(Collections.singletonList(new LinkedFile(url, "PDF"))));
+                primaryCategory.ifPresent(
+                        category -> bibEntry.setField(StandardField.EPRINTCLASS, category));
+                journalReferenceText.ifPresent(
+                        journal -> bibEntry.setField(StandardField.JOURNAL, journal));
+                getPdfUrl()
+                        .ifPresent(
+                                url ->
+                                        bibEntry.setFiles(
+                                                Collections.singletonList(
+                                                        new LinkedFile(url, "PDF"))));
                 return bibEntry;
             }
         }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java b/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
index 373cd0644275..3cf3d6d35067 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
@@ -1,16 +1,11 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONException;
+import kong.unirest.core.json.JSONObject;
 
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.cleanup.MoveFieldCleanup;
 import org.jabref.logic.formatter.bibtexfields.ClearFormatter;
@@ -37,26 +32,36 @@
 import org.jabref.model.paging.Page;
 import org.jabref.model.strings.StringUtil;
 
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONException;
-import kong.unirest.core.json.JSONObject;
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * Fetches data from the SAO/NASA Astrophysics Data System (<a href="https://ui.adsabs.harvard.edu/">https://ui.adsabs.harvard.edu/</a>)
  */
 public class AstrophysicsDataSystem
-        implements IdBasedParserFetcher, PagedSearchBasedParserFetcher, EntryBasedParserFetcher, CustomizableKeyFetcher {
+        implements IdBasedParserFetcher,
+                PagedSearchBasedParserFetcher,
+                EntryBasedParserFetcher,
+                CustomizableKeyFetcher {
 
     private static final String API_SEARCH_URL = "https://api.adsabs.harvard.edu/v1/search/query";
-    private static final String API_EXPORT_URL = "https://api.adsabs.harvard.edu/v1/export/bibtexabs";
+    private static final String API_EXPORT_URL =
+            "https://api.adsabs.harvard.edu/v1/export/bibtexabs";
 
     private static final String API_KEY = new BuildInfo().astrophysicsDataSystemAPIKey;
     private final ImportFormatPreferences preferences;
     private final ImporterPreferences importerPreferences;
 
-    public AstrophysicsDataSystem(ImportFormatPreferences preferences, ImporterPreferences importerPreferences) {
+    public AstrophysicsDataSystem(
+            ImportFormatPreferences preferences, ImporterPreferences importerPreferences) {
         this.preferences = Objects.requireNonNull(preferences);
         this.importerPreferences = importerPreferences;
     }
@@ -87,9 +92,11 @@ public String getName() {
      * @return URL which points to a search request for given query
      */
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder builder = new URIBuilder(API_SEARCH_URL);
-        builder.addParameter("q", new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
+        builder.addParameter(
+                "q", new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
         builder.addParameter("fl", "bibcode");
         builder.addParameter("rows", String.valueOf(getPageSize()));
         builder.addParameter("start", String.valueOf(getPageSize() * pageNumber));
@@ -104,13 +111,13 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISynta
     public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedURLException {
         StringBuilder stringBuilder = new StringBuilder();
 
-        Optional<String> title = entry.getFieldOrAlias(StandardField.TITLE).map(t -> "title:\"" + t + "\"");
-        Optional<String> author = entry.getFieldOrAlias(StandardField.AUTHOR).map(a -> "author:\"" + a + "\"");
+        Optional<String> title =
+                entry.getFieldOrAlias(StandardField.TITLE).map(t -> "title:\"" + t + "\"");
+        Optional<String> author =
+                entry.getFieldOrAlias(StandardField.AUTHOR).map(a -> "author:\"" + a + "\"");
 
         if (title.isPresent()) {
-            stringBuilder.append(title.get())
-                         .append(author.map(s -> " AND " + s)
-                                       .orElse(""));
+            stringBuilder.append(title.get()).append(author.map(s -> " AND " + s).orElse(""));
         } else {
             stringBuilder.append(author.orElse(""));
         }
@@ -128,7 +135,8 @@ public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedUR
      * @return URL which points to a search URL for given identifier
      */
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException {
+    public URL getUrlForIdentifier(String identifier)
+            throws URISyntaxException, MalformedURLException {
         String query = "doi:\"" + identifier + "\" OR " + "bibcode:\"" + identifier + "\"";
         URIBuilder builder = new URIBuilder(API_SEARCH_URL);
         builder.addParameter("q", query);
@@ -148,32 +156,38 @@ public Parser getParser() {
 
     @Override
     public void doPostCleanup(BibEntry entry) {
-        new FieldFormatterCleanup(StandardField.ABSTRACT, new RemoveEnclosingBracesFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.ABSTRACT, new RemoveNewlinesFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.TITLE, new RemoveEnclosingBracesFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.AUTHOR, new NormalizeNamesFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(StandardField.ABSTRACT, new RemoveEnclosingBracesFormatter())
+                .cleanup(entry);
+        new FieldFormatterCleanup(StandardField.ABSTRACT, new RemoveNewlinesFormatter())
+                .cleanup(entry);
+        new FieldFormatterCleanup(StandardField.TITLE, new RemoveEnclosingBracesFormatter())
+                .cleanup(entry);
+        new FieldFormatterCleanup(StandardField.AUTHOR, new NormalizeNamesFormatter())
+                .cleanup(entry);
+        new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter())
+                .cleanup(entry);
 
         // Remove ADS note
         new FieldFormatterCleanup(new UnknownField("adsnote"), new ClearFormatter()).cleanup(entry);
         // Move adsurl to url field
         new MoveFieldCleanup(new UnknownField("adsurl"), StandardField.URL).cleanup(entry);
         entry.getField(StandardField.ABSTRACT)
-             .filter("Not Available <P />"::equals)
-             .ifPresent(abstractText -> entry.clearField(StandardField.ABSTRACT));
+                .filter("Not Available <P />"::equals)
+                .ifPresent(abstractText -> entry.clearField(StandardField.ABSTRACT));
 
         entry.getField(StandardField.ABSTRACT)
-             .map(abstractText -> abstractText.replace("<P />", ""))
-             .map(abstractText -> abstractText.replace("\\textbackslash", ""))
-             .map(String::trim)
-             .ifPresent(abstractText -> entry.setField(StandardField.ABSTRACT, abstractText));
+                .map(abstractText -> abstractText.replace("<P />", ""))
+                .map(abstractText -> abstractText.replace("\\textbackslash", ""))
+                .map(String::trim)
+                .ifPresent(abstractText -> entry.setField(StandardField.ABSTRACT, abstractText));
         // The fetcher adds some garbage (number of found entries etc before)
         entry.setCommentsBeforeEntry("");
     }
 
     @Override
     public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
-        if (entry.getFieldOrAlias(StandardField.TITLE).isEmpty() && entry.getFieldOrAlias(StandardField.AUTHOR).isEmpty()) {
+        if (entry.getFieldOrAlias(StandardField.TITLE).isEmpty()
+                && entry.getFieldOrAlias(StandardField.AUTHOR).isEmpty()) {
             return Collections.emptyList();
         }
 
@@ -229,7 +243,10 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
             return Optional.empty();
         }
         if (fetchedEntries.size() > 1) {
-            LOGGER.info("Fetcher {} found more than one result for identifier {}. We will use the first entry.", getName(), identifier);
+            LOGGER.info(
+                    "Fetcher {} found more than one result for identifier {}. We will use the first entry.",
+                    getName(),
+                    identifier);
         }
         BibEntry entry = fetchedEntries.getFirst();
         return Optional.of(entry);
@@ -239,8 +256,12 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
      * @param identifiers bibcodes for which bibentries ahould be fetched
      * @return list of bibentries matching the bibcodes. Can be empty and differ in size to the size of requested bibcodes
      */
-    private List<BibEntry> performSearchByIds(Collection<String> identifiers) throws FetcherException {
-        List<String> ids = identifiers.stream().filter(identifier -> !StringUtil.isBlank(identifier)).collect(Collectors.toList());
+    private List<BibEntry> performSearchByIds(Collection<String> identifiers)
+            throws FetcherException {
+        List<String> ids =
+                identifiers.stream()
+                        .filter(identifier -> !StringUtil.isBlank(identifier))
+                        .collect(Collectors.toList());
         if (ids.isEmpty()) {
             return Collections.emptyList();
         }
@@ -255,7 +276,9 @@ private List<BibEntry> performSearchByIds(Collection<String> identifiers) throws
         try {
             String postData = buildPostData(ids);
             URLDownload download = new URLDownload(urLforExport);
-            download.addHeader("Authorization", "Bearer " + importerPreferences.getApiKey(getName()).orElse(API_KEY));
+            download.addHeader(
+                    "Authorization",
+                    "Bearer " + importerPreferences.getApiKey(getName()).orElse(API_KEY));
             download.addHeader("ContentType", "application/json");
             download.setPostData(postData);
             String content = download.asString();
@@ -292,7 +315,8 @@ public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherExcepti
     }
 
     @Override
-    public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber) throws FetcherException {
+    public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
+            throws FetcherException {
         URL urlForQuery;
         try {
             urlForQuery = getURLForQuery(luceneQuery, pageNumber);
@@ -308,7 +332,9 @@ public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
     @Override
     public URLDownload getUrlDownload(URL url) {
         URLDownload urlDownload = new URLDownload(url);
-        urlDownload.addHeader("Authorization", "Bearer " + importerPreferences.getApiKey(getName()).orElse(API_KEY));
+        urlDownload.addHeader(
+                "Authorization",
+                "Bearer " + importerPreferences.getApiKey(getName()).orElse(API_KEY));
         return urlDownload;
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java b/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java
index 6f057c34480b..6964fdf28db3 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java
@@ -1,20 +1,19 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Optional;
-
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.logic.net.URLDownload;
 import org.jabref.model.entry.BibEntry;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Optional;
+
 /**
  * Convenience class for getting BibTeX entries from the BibSonomy scraper, from an URL pointing to an entry.
  */
@@ -25,19 +24,29 @@ public class BibsonomyScraper {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BibsonomyScraper.class);
 
-    private BibsonomyScraper() {
-    }
+    private BibsonomyScraper() {}
 
     /**
      * Return a BibEntry by looking up the given url from the BibSonomy scraper.
      */
-    public static Optional<BibEntry> getEntry(String entryUrl, ImportFormatPreferences importFormatPreferences) {
+    public static Optional<BibEntry> getEntry(
+            String entryUrl, ImportFormatPreferences importFormatPreferences) {
         try {
             // Replace special characters by corresponding sequences:
-            String cleanURL = entryUrl.replace("%", "%25").replace(":", "%3A").replace("/", "%2F").replace("?", "%3F")
-                                      .replace("&", "%26").replace("=", "%3D");
-
-            URL url = URI.create(BibsonomyScraper.BIBSONOMY_SCRAPER + cleanURL + BibsonomyScraper.BIBSONOMY_SCRAPER_POST).toURL();
+            String cleanURL =
+                    entryUrl.replace("%", "%25")
+                            .replace(":", "%3A")
+                            .replace("/", "%2F")
+                            .replace("?", "%3F")
+                            .replace("&", "%26")
+                            .replace("=", "%3D");
+
+            URL url =
+                    URI.create(
+                                    BibsonomyScraper.BIBSONOMY_SCRAPER
+                                            + cleanURL
+                                            + BibsonomyScraper.BIBSONOMY_SCRAPER_POST)
+                            .toURL();
             String bibtex = new URLDownload(url).asString();
             return BibtexParser.singleFromString(bibtex, importFormatPreferences);
         } catch (IOException | FetcherException ex) {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java b/src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java
index 99ce61c4ca94..231c16a94d56 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.IntStream;
+import com.google.common.annotations.VisibleForTesting;
 
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONException;
+import kong.unirest.core.json.JSONObject;
+
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.ParseException;
@@ -22,15 +22,16 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import com.google.common.annotations.VisibleForTesting;
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONException;
-import kong.unirest.core.json.JSONObject;
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.tinylog.Logger;
 
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.IntStream;
+
 /**
  * Fetches data from the Biodiversity Heritage Library
  *
@@ -41,7 +42,8 @@ public class BiodiversityLibrary implements SearchBasedParserFetcher, Customizab
     private static final String API_KEY = new BuildInfo().biodiversityHeritageApiKey;
     private static final String BASE_URL = "https://www.biodiversitylibrary.org/api3";
     private static final String RESPONSE_FORMAT = "json";
-    private static final String TEST_URL_WITHOUT_API_KEY = "https://www.biodiversitylibrary.org/api3?apikey=";
+    private static final String TEST_URL_WITHOUT_API_KEY =
+            "https://www.biodiversitylibrary.org/api3?apikey=";
 
     private static final String FETCHER_NAME = "Biodiversity Heritage";
 
@@ -69,7 +71,8 @@ public URL getBaseURL() throws URISyntaxException, MalformedURLException {
         return baseURI.build().toURL();
     }
 
-    public URL getItemMetadataURL(String identifier) throws URISyntaxException, MalformedURLException {
+    public URL getItemMetadataURL(String identifier)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(getBaseURL().toURI());
         uriBuilder.addParameter("op", "GetItemMetadata");
         uriBuilder.addParameter("pages", "f");
@@ -112,7 +115,8 @@ public BibEntry parseBibJSONtoBibtex(JSONObject item, BibEntry entry) throws Fet
 
                 entry.setField(StandardField.DOI, itemsDetails.optString("Doi", ""));
 
-                entry.setField(StandardField.PUBLISHER, itemsDetails.optString("PublisherName", ""));
+                entry.setField(
+                        StandardField.PUBLISHER, itemsDetails.optString("PublisherName", ""));
                 entry.setField(StandardField.DATE, itemsDetails.optString("Date", ""));
                 entry.setField(StandardField.VOLUME, itemsDetails.optString("Volume", ""));
                 entry.setField(StandardField.URL, itemsDetails.optString("PartUrl", ""));
@@ -127,10 +131,13 @@ public BibEntry parseBibJSONtoBibtex(JSONObject item, BibEntry entry) throws Fet
                 }
                 JSONObject itemsDetails = getDetails(url);
                 entry.setField(StandardField.EDITOR, itemsDetails.optString("Sponsor", ""));
-                entry.setField(StandardField.PUBLISHER, itemsDetails.optString("HoldingInstitution", ""));
+                entry.setField(
+                        StandardField.PUBLISHER, itemsDetails.optString("HoldingInstitution", ""));
                 entry.setField(StandardField.LANGUAGE, itemsDetails.optString("Language", ""));
                 entry.setField(StandardField.URL, itemsDetails.optString("ItemUrl", ""));
-                if (itemsDetails.has("Date") && !entry.hasField(StandardField.DATE) && !entry.hasField(StandardField.YEAR)) {
+                if (itemsDetails.has("Date")
+                        && !entry.hasField(StandardField.DATE)
+                        && !entry.hasField(StandardField.YEAR)) {
                     entry.setField(StandardField.DATE, itemsDetails.getString("Date"));
                 }
             }
@@ -170,11 +177,10 @@ private String toAuthors(JSONArray authors) {
 
         // input: list of { "Name": "Author name,"}
         return IntStream.range(0, authors.length())
-                        .mapToObj(authors::getJSONObject)
-                        .map(author -> new Author(
-                                author.optString("Name", ""), "", "", "", ""))
-                        .collect(AuthorList.collect())
-                        .getAsFirstLastNamesWithAnd();
+                .mapToObj(authors::getJSONObject)
+                .map(author -> new Author(author.optString("Name", ""), "", "", "", ""))
+                .collect(AuthorList.collect())
+                .getAsFirstLastNamesWithAnd();
     }
 
     @Override
@@ -208,12 +214,14 @@ public Parser getParser() {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(getBaseURL().toURI());
         BiodiversityLibraryTransformer transformer = new BiodiversityLibraryTransformer();
         uriBuilder.addParameter("op", "PublicationSearch");
         uriBuilder.addParameter("searchtype", "C");
-        uriBuilder.addParameter("searchterm", transformer.transformLuceneQuery(luceneQuery).orElse(""));
+        uriBuilder.addParameter(
+                "searchterm", transformer.transformLuceneQuery(luceneQuery).orElse(""));
         return uriBuilder.build().toURL();
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/BvbFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/BvbFetcher.java
index e570a13f7544..27e1de9efaa2 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/BvbFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/BvbFetcher.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Optional;
-
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.SearchBasedParserFetcher;
 import org.jabref.logic.importer.fetcher.transformers.DefaultQueryTransformer;
 import org.jabref.logic.importer.fileformat.MarcXmlParser;
 
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Optional;
 
 /**
  * Fetcher for <a href="Bibliotheksverbund Bayern (BVB)">https://www.bib-bvb.de/</a>.
@@ -37,7 +36,8 @@ public URL getURLForQuery(QueryNode query) throws URISyntaxException, MalformedU
         uriBuilder.addParameter("version", "1.1");
         uriBuilder.addParameter("recordSchema", "marcxml");
         uriBuilder.addParameter("operation", "searchRetrieve");
-        uriBuilder.addParameter("query", new DefaultQueryTransformer().transformLuceneQuery(query).orElse(""));
+        uriBuilder.addParameter(
+                "query", new DefaultQueryTransformer().transformLuceneQuery(query).orElse(""));
         uriBuilder.addParameter("maximumRecords", "30");
         return uriBuilder.build().toURL();
     }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java b/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java
index c18794653b7d..9b3add13dbd3 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.JsonNode;
+import kong.unirest.core.Unirest;
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONElement;
 
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.http.dto.SimpleHttpResponse;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.FetcherException;
@@ -17,16 +17,16 @@
 import org.jabref.logic.importer.fileformat.CiteSeerParser;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
-import kong.unirest.core.HttpResponse;
-import kong.unirest.core.JsonNode;
-import kong.unirest.core.Unirest;
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONElement;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 public class CiteSeer implements SearchBasedFetcher, FulltextFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CiteSeer.class);
@@ -35,12 +35,12 @@ public class CiteSeer implements SearchBasedFetcher, FulltextFetcher {
 
     private static final String API_URL = "https://citeseerx.ist.psu.edu/api/search";
 
-    private static final String PDF_URL = "https://" + BASE_URL + "/document?repid=rep1&type=pdf&doi=%s";
+    private static final String PDF_URL =
+            "https://" + BASE_URL + "/document?repid=rep1&type=pdf&doi=%s";
 
     private CiteSeerQueryTransformer transformer;
 
-    public CiteSeer() {
-    }
+    public CiteSeer() {}
 
     @Override
     public String getName() {
@@ -57,24 +57,29 @@ public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherExcepti
         // ADR-0014
         try {
             JSONElement payload = getPayloadJSON(luceneQuery);
-            HttpResponse<JsonNode> httpResponse = Unirest.post(API_URL)
-                                                         .header("authority", BASE_URL)
-                                                         .header("accept", "application/json, text/plain, */*")
-                                                         .header("content-type", "application/json;charset=UTF-8")
-                                                         .header("origin", "https://" + BASE_URL)
-                                                         .body(payload)
-                                                         .asJson();
+            HttpResponse<JsonNode> httpResponse =
+                    Unirest.post(API_URL)
+                            .header("authority", BASE_URL)
+                            .header("accept", "application/json, text/plain, */*")
+                            .header("content-type", "application/json;charset=UTF-8")
+                            .header("origin", "https://" + BASE_URL)
+                            .body(payload)
+                            .asJson();
             if (!httpResponse.isSuccess()) {
                 LOGGER.debug("No success");
-                // TODO: body needs to be added to the exception, but we currently only have JSON available, but the error is most probably simple text (or HTML)
-                SimpleHttpResponse simpleHttpResponse = new SimpleHttpResponse(httpResponse.getStatus(), httpResponse.getStatusText(), "");
+                // TODO: body needs to be added to the exception, but we currently only have JSON
+                // available, but the error is most probably simple text (or HTML)
+                SimpleHttpResponse simpleHttpResponse =
+                        new SimpleHttpResponse(
+                                httpResponse.getStatus(), httpResponse.getStatusText(), "");
                 throw new FetcherException(API_URL, simpleHttpResponse);
             }
 
             JsonNode requestResponse = httpResponse.getBody();
-            Optional<JSONArray> jsonResponse = Optional.ofNullable(requestResponse)
-                                                       .map(JsonNode::getObject)
-                                                       .map(response -> response.optJSONArray("response"));
+            Optional<JSONArray> jsonResponse =
+                    Optional.ofNullable(requestResponse)
+                            .map(JsonNode::getObject)
+                            .map(response -> response.optJSONArray("response"));
 
             if (jsonResponse.isEmpty()) {
                 LOGGER.debug("No entries found for query: {}", luceneQuery);
@@ -82,10 +87,12 @@ public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherExcepti
             }
 
             CiteSeerParser parser = new CiteSeerParser();
-            List<BibEntry> fetchedEntries = parser.parseCiteSeerResponse(jsonResponse.orElse(new JSONArray()));
+            List<BibEntry> fetchedEntries =
+                    parser.parseCiteSeerResponse(jsonResponse.orElse(new JSONArray()));
             return fetchedEntries;
         } catch (ParseException ex) {
-            throw new FetcherException("An internal parser error occurred while parsing CiteSeer entries", ex);
+            throw new FetcherException(
+                    "An internal parser error occurred while parsing CiteSeer entries", ex);
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcher.java
index 018a9b4c9c5c..6174db1bd4eb 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcher.java
@@ -1,10 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Arrays;
-
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.formatter.bibtexfields.RemoveDigitsFormatter;
 import org.jabref.logic.formatter.bibtexfields.RemoveNewlinesFormatter;
@@ -20,8 +17,10 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Arrays;
 
 public class CollectionOfComputerScienceBibliographiesFetcher implements SearchBasedParserFetcher {
 
@@ -29,14 +28,20 @@ public class CollectionOfComputerScienceBibliographiesFetcher implements SearchB
 
     private final CollectionOfComputerScienceBibliographiesParser parser;
 
-    public CollectionOfComputerScienceBibliographiesFetcher(ImportFormatPreferences importFormatPreferences) {
+    public CollectionOfComputerScienceBibliographiesFetcher(
+            ImportFormatPreferences importFormatPreferences) {
         this.parser = new CollectionOfComputerScienceBibliographiesParser(importFormatPreferences);
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+            throws URISyntaxException, MalformedURLException {
         return new URIBuilder(BASIC_SEARCH_URL)
-                .addParameter("query", new CollectionOfComputerScienceBibliographiesQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""))
+                .addParameter(
+                        "query",
+                        new CollectionOfComputerScienceBibliographiesQueryTransformer()
+                                .transformLuceneQuery(luceneQuery)
+                                .orElse(""))
                 .addParameter("sort", "score")
                 .build()
                 .toURL();
@@ -54,36 +59,40 @@ public String getName() {
 
     @Override
     public void doPostCleanup(BibEntry entry) {
-        new FieldFormatterCleanup(StandardField.ABSTRACT, new RemoveNewlinesFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.ABSTRACT, new ReplaceTabsBySpaceFormater()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.ABSTRACT, new RemoveRedundantSpacesFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(StandardField.ABSTRACT, new RemoveNewlinesFormatter())
+                .cleanup(entry);
+        new FieldFormatterCleanup(StandardField.ABSTRACT, new ReplaceTabsBySpaceFormater())
+                .cleanup(entry);
+        new FieldFormatterCleanup(StandardField.ABSTRACT, new RemoveRedundantSpacesFormatter())
+                .cleanup(entry);
         new FieldFormatterCleanup(StandardField.EDITOR, new RemoveDigitsFormatter()).cleanup(entry);
         // identifier fields is a key-value field
-        // example: "urn:isbn:978-1-4503-5217-8; doi:10.1145/3129790.3129810; ISI:000505046100032; Scopus 2-s2.0-85037741580"
+        // example: "urn:isbn:978-1-4503-5217-8; doi:10.1145/3129790.3129810; ISI:000505046100032;
+        // Scopus 2-s2.0-85037741580"
         // thus, key can contain multiple ":"; sometimes value separated by " " instead of ":"
         UnknownField identifierField = new UnknownField("identifier");
-        entry.getField(identifierField)
-             .stream()
-             .flatMap(value -> Arrays.stream(value.split("; ")))
-             .forEach(identifierKeyValue -> {
-                 // check for pattern "Scopus 2-..."
-                 String[] identifierKeyValueSplit = identifierKeyValue.split(" ");
-                 if (identifierKeyValueSplit.length == 1) {
-                     // check for pattern "doi:..."
-                     identifierKeyValueSplit = identifierKeyValue.split(":");
-                 }
-                 int length = identifierKeyValueSplit.length;
-                 if (length < 2) {
-                     return;
-                 }
-                 // in the case "urn:isbn:", just "isbn" is used
-                 String key = identifierKeyValueSplit[length - 2];
-                 String value = identifierKeyValueSplit[length - 1];
-                 Field field = FieldFactory.parseField(key);
-                 if (!entry.hasField(field)) {
-                     entry.setField(field, value);
-                 }
-             });
+        entry.getField(identifierField).stream()
+                .flatMap(value -> Arrays.stream(value.split("; ")))
+                .forEach(
+                        identifierKeyValue -> {
+                            // check for pattern "Scopus 2-..."
+                            String[] identifierKeyValueSplit = identifierKeyValue.split(" ");
+                            if (identifierKeyValueSplit.length == 1) {
+                                // check for pattern "doi:..."
+                                identifierKeyValueSplit = identifierKeyValue.split(":");
+                            }
+                            int length = identifierKeyValueSplit.length;
+                            if (length < 2) {
+                                return;
+                            }
+                            // in the case "urn:isbn:", just "isbn" is used
+                            String key = identifierKeyValueSplit[length - 2];
+                            String value = identifierKeyValueSplit[length - 1];
+                            Field field = FieldFactory.parseField(key);
+                            if (!entry.hasField(field)) {
+                                entry.setField(field, value);
+                            }
+                        });
         entry.clearField(identifierField);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParser.java b/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParser.java
index c2f8aebe2be1..0c88575ef0d1 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParser.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParser.java
@@ -1,13 +1,5 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
 import org.jabref.logic.formatter.bibtexfields.HtmlToUnicodeFormatter;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -17,15 +9,26 @@
 import org.jabref.logic.net.URLDownload;
 import org.jabref.model.entry.BibEntry;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 public class CollectionOfComputerScienceBibliographiesParser implements Parser {
 
-    final static Pattern REGEX_FOR_LINKS = Pattern.compile("<item>[\\s\\S]*?<link>([\\s\\S]*?)<\\/link>[\\s\\S]*?<\\/item>");
-    final static Pattern REGEX_FOR_BIBTEX = Pattern.compile("<pre class=\"bibtex\">([\\s\\S]*?)<\\/pre>");
+    static final Pattern REGEX_FOR_LINKS =
+            Pattern.compile("<item>[\\s\\S]*?<link>([\\s\\S]*?)<\\/link>[\\s\\S]*?<\\/item>");
+    static final Pattern REGEX_FOR_BIBTEX =
+            Pattern.compile("<pre class=\"bibtex\">([\\s\\S]*?)<\\/pre>");
 
     final BibtexParser bibtexParser;
     final HtmlToUnicodeFormatter htmlToUnicodeFormatter;
 
-    public CollectionOfComputerScienceBibliographiesParser(ImportFormatPreferences importFormatPreferences) {
+    public CollectionOfComputerScienceBibliographiesParser(
+            ImportFormatPreferences importFormatPreferences) {
         this.bibtexParser = new BibtexParser(importFormatPreferences);
         this.htmlToUnicodeFormatter = new HtmlToUnicodeFormatter();
     }
@@ -34,9 +37,8 @@ public CollectionOfComputerScienceBibliographiesParser(ImportFormatPreferences i
     public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
         try {
             List<String> links = matchRegexFromInputStreamHtml(inputStream, REGEX_FOR_LINKS);
-            String bibtexDataString = parseBibtexStringsFromLinks(links)
-                    .stream()
-                    .collect(Collectors.joining());
+            String bibtexDataString =
+                    parseBibtexStringsFromLinks(links).stream().collect(Collectors.joining());
 
             return bibtexParser.parseEntries(bibtexDataString);
         } catch (IOException | FetcherException e) {
@@ -47,16 +49,18 @@ public List<BibEntry> parseEntries(InputStream inputStream) throws ParseExceptio
     private List<String> matchRegexFromInputStreamHtml(InputStream inputStream, Pattern pattern) {
         try (Scanner scanner = new Scanner(inputStream)) {
             return scanner.findAll(pattern)
-                          .map(match -> htmlToUnicodeFormatter.format(match.group(1)))
-                          .collect(Collectors.toList());
+                    .map(match -> htmlToUnicodeFormatter.format(match.group(1)))
+                    .collect(Collectors.toList());
         }
     }
 
-    private List<String> parseBibtexStringsFromLinks(List<String> links) throws IOException, FetcherException {
+    private List<String> parseBibtexStringsFromLinks(List<String> links)
+            throws IOException, FetcherException {
         List<String> bibtexStringsFromAllLinks = new ArrayList<>();
         for (String link : links) {
             try (InputStream inputStream = new URLDownload(link).asInputStream()) {
-                List<String> bibtexStringsFromLink = matchRegexFromInputStreamHtml(inputStream, REGEX_FOR_BIBTEX);
+                List<String> bibtexStringsFromLink =
+                        matchRegexFromInputStreamHtml(inputStream, REGEX_FOR_BIBTEX);
                 bibtexStringsFromAllLinks.addAll(bibtexStringsFromLink);
             }
         }
@@ -64,4 +68,3 @@ private List<String> parseBibtexStringsFromLinks(List<String> links) throws IOEx
         return bibtexStringsFromAllLinks;
     }
 }
-
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ComplexSearchQuery.java b/src/main/java/org/jabref/logic/importer/fetcher/ComplexSearchQuery.java
index d3484e6d7f68..be5700f5a42a 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ComplexSearchQuery.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ComplexSearchQuery.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.importer.fetcher;
 
+import org.apache.lucene.index.Term;
+import org.jabref.model.strings.StringUtil;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -7,10 +10,6 @@
 import java.util.Optional;
 import java.util.StringJoiner;
 
-import org.jabref.model.strings.StringUtil;
-
-import org.apache.lucene.index.Term;
-
 public class ComplexSearchQuery {
     // Field for non-fielded search
     private final List<String> defaultField;
@@ -23,13 +22,23 @@ public class ComplexSearchQuery {
     private final String journal;
     private final String doi;
 
-    private ComplexSearchQuery(List<String> defaultField, List<String> authors, List<String> titlePhrases, List<String> abstractPhrases, Integer fromYear, Integer toYear, Integer singleYear, String journal, String doi) {
+    private ComplexSearchQuery(
+            List<String> defaultField,
+            List<String> authors,
+            List<String> titlePhrases,
+            List<String> abstractPhrases,
+            Integer fromYear,
+            Integer toYear,
+            Integer singleYear,
+            String journal,
+            String doi) {
         this.defaultField = defaultField;
         this.authors = authors;
         this.titlePhrases = titlePhrases;
         this.abstractPhrases = abstractPhrases;
         this.fromYear = fromYear;
-        // Some APIs do not support, or not fully support, year based search. In these cases, the non applicable parameters are ignored.
+        // Some APIs do not support, or not fully support, year based search. In these cases, the
+        // non applicable parameters are ignored.
         this.toYear = toYear;
         this.journal = journal;
         this.singleYear = singleYear;
@@ -38,21 +47,22 @@ private ComplexSearchQuery(List<String> defaultField, List<String> authors, List
 
     public static ComplexSearchQuery fromTerms(List<Term> terms) {
         ComplexSearchQueryBuilder builder = ComplexSearchQuery.builder();
-        terms.forEach(term -> {
-            String termText = term.text();
-            switch (term.field().toLowerCase()) {
-                case "author" -> builder.author(termText);
-                case "title" -> builder.titlePhrase(termText);
-                case "abstract" -> builder.abstractPhrase(termText);
-                case "journal" -> builder.journal(termText);
-                case "year" -> builder.singleYear(Integer.valueOf(termText));
-                case "year-range" -> builder.parseYearRange(termText);
-                case "doi" -> builder.DOI(termText);
-                case "default" -> builder.defaultFieldPhrase(termText);
-                // add unknown field as default field
-                default -> builder.defaultFieldPhrase(termText);
-            }
-        });
+        terms.forEach(
+                term -> {
+                    String termText = term.text();
+                    switch (term.field().toLowerCase()) {
+                        case "author" -> builder.author(termText);
+                        case "title" -> builder.titlePhrase(termText);
+                        case "abstract" -> builder.abstractPhrase(termText);
+                        case "journal" -> builder.journal(termText);
+                        case "year" -> builder.singleYear(Integer.valueOf(termText));
+                        case "year-range" -> builder.parseYearRange(termText);
+                        case "doi" -> builder.DOI(termText);
+                        case "default" -> builder.defaultFieldPhrase(termText);
+                        // add unknown field as default field
+                        default -> builder.defaultFieldPhrase(termText);
+                    }
+                });
         return builder.build();
     }
 
@@ -108,36 +118,57 @@ public boolean equals(Object o) {
         ComplexSearchQuery that = (ComplexSearchQuery) o;
 
         // Just check for set equality, order does not matter
-        if (!(getDefaultFieldPhrases().containsAll(that.getDefaultFieldPhrases()) && that.getDefaultFieldPhrases().containsAll(getDefaultFieldPhrases()))) {
+        if (!(getDefaultFieldPhrases().containsAll(that.getDefaultFieldPhrases())
+                && that.getDefaultFieldPhrases().containsAll(getDefaultFieldPhrases()))) {
             return false;
         }
-        if (!(getAuthors().containsAll(that.getAuthors()) && that.getAuthors().containsAll(getAuthors()))) {
+        if (!(getAuthors().containsAll(that.getAuthors())
+                && that.getAuthors().containsAll(getAuthors()))) {
             return false;
         }
-        if (!(getTitlePhrases().containsAll(that.getTitlePhrases()) && that.getTitlePhrases().containsAll(getTitlePhrases()))) {
+        if (!(getTitlePhrases().containsAll(that.getTitlePhrases())
+                && that.getTitlePhrases().containsAll(getTitlePhrases()))) {
             return false;
         }
-        if (!(getAbstractPhrases().containsAll(that.getAbstractPhrases()) && that.getAbstractPhrases().containsAll(getAbstractPhrases()))) {
+        if (!(getAbstractPhrases().containsAll(that.getAbstractPhrases())
+                && that.getAbstractPhrases().containsAll(getAbstractPhrases()))) {
             return false;
         }
-        if (getFromYear().isPresent() ? !getFromYear().equals(that.getFromYear()) : that.getFromYear().isPresent()) {
+        if (getFromYear().isPresent()
+                ? !getFromYear().equals(that.getFromYear())
+                : that.getFromYear().isPresent()) {
             return false;
         }
-        if (getToYear().isPresent() ? !getToYear().equals(that.getToYear()) : that.getToYear().isPresent()) {
+        if (getToYear().isPresent()
+                ? !getToYear().equals(that.getToYear())
+                : that.getToYear().isPresent()) {
             return false;
         }
-        if (getSingleYear().isPresent() ? !getSingleYear().equals(that.getSingleYear()) : that.getSingleYear().isPresent()) {
+        if (getSingleYear().isPresent()
+                ? !getSingleYear().equals(that.getSingleYear())
+                : that.getSingleYear().isPresent()) {
             return false;
         }
         if (getDOI().isPresent() ? !getDOI().equals(that.getDOI()) : that.getDOI().isPresent()) {
             return false;
         }
-        return getJournal().isPresent() ? getJournal().equals(that.getJournal()) : that.getJournal().isEmpty();
+        return getJournal().isPresent()
+                ? getJournal().equals(that.getJournal())
+                : that.getJournal().isEmpty();
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(defaultField, getAuthors(), getSingleYear(), getAbstractPhrases(), getFromYear(), getToYear(), getTitlePhrases(), getJournal(), getDOI());
+        return Objects.hash(
+                defaultField,
+                getAuthors(),
+                getSingleYear(),
+                getAbstractPhrases(),
+                getFromYear(),
+                getToYear(),
+                getTitlePhrases(),
+                getJournal(),
+                getDOI());
     }
 
     @Override
@@ -149,10 +180,11 @@ public String toString() {
         getToYear().ifPresent(toYear -> stringJoiner.add(toYear.toString()));
         getJournal().ifPresent(stringJoiner::add);
         getDOI().ifPresent(newElement -> stringJoiner.add("doi:" + newElement));
-        stringJoiner.add(String.join(" ", getTitlePhrases()))
-                    .add(String.join(" ", getDefaultFieldPhrases()))
-                    .add(String.join(" ", getAuthors()))
-                    .add(String.join(" ", getAbstractPhrases()));
+        stringJoiner
+                .add(String.join(" ", getTitlePhrases()))
+                .add(String.join(" ", getDefaultFieldPhrases()))
+                .add(String.join(" ", getAuthors()))
+                .add(String.join(" ", getAbstractPhrases()));
 
         return stringJoiner.toString();
     }
@@ -168,8 +200,7 @@ public static class ComplexSearchQueryBuilder {
         private Integer toYear;
         private Integer singleYear;
 
-        private ComplexSearchQueryBuilder() {
-        }
+        private ComplexSearchQueryBuilder() {}
 
         public ComplexSearchQueryBuilder defaultFieldPhrase(String defaultFieldPhrase) {
             if (Objects.requireNonNull(defaultFieldPhrase).isBlank()) {
@@ -218,7 +249,8 @@ public ComplexSearchQueryBuilder abstractPhrase(String abstractPhrase) {
 
         public ComplexSearchQueryBuilder fromYearAndToYear(Integer fromYear, Integer toYear) {
             if (singleYear != null) {
-                throw new IllegalArgumentException("You can not use single year and year range search.");
+                throw new IllegalArgumentException(
+                        "You can not use single year and year range search.");
             }
             this.fromYear = Objects.requireNonNull(fromYear);
             this.toYear = Objects.requireNonNull(toYear);
@@ -227,7 +259,8 @@ public ComplexSearchQueryBuilder fromYearAndToYear(Integer fromYear, Integer toY
 
         public ComplexSearchQueryBuilder singleYear(Integer singleYear) {
             if (fromYear != null || toYear != null) {
-                throw new IllegalArgumentException("You can not use single year and year range search.");
+                throw new IllegalArgumentException(
+                        "You can not use single year and year range search.");
             }
             this.singleYear = Objects.requireNonNull(singleYear);
             return this;
@@ -250,19 +283,20 @@ public ComplexSearchQueryBuilder DOI(String doi) {
         }
 
         public ComplexSearchQueryBuilder terms(Collection<Term> terms) {
-            terms.forEach(term -> {
-                String termText = term.text();
-                switch (term.field().toLowerCase()) {
-                    case "author" -> this.author(termText);
-                    case "title" -> this.titlePhrase(termText);
-                    case "abstract" -> this.abstractPhrase(termText);
-                    case "journal" -> this.journal(termText);
-                    case "doi" -> this.DOI(termText);
-                    case "year" -> this.singleYear(Integer.valueOf(termText));
-                    case "year-range" -> this.parseYearRange(termText);
-                    case "default" -> this.defaultFieldPhrase(termText);
-                }
-            });
+            terms.forEach(
+                    term -> {
+                        String termText = term.text();
+                        switch (term.field().toLowerCase()) {
+                            case "author" -> this.author(termText);
+                            case "title" -> this.titlePhrase(termText);
+                            case "abstract" -> this.abstractPhrase(termText);
+                            case "journal" -> this.journal(termText);
+                            case "doi" -> this.DOI(termText);
+                            case "year" -> this.singleYear(Integer.valueOf(termText));
+                            case "year-range" -> this.parseYearRange(termText);
+                            case "default" -> this.defaultFieldPhrase(termText);
+                        }
+                    });
             return this;
         }
 
@@ -278,7 +312,16 @@ public ComplexSearchQuery build() throws IllegalStateException {
             if (textSearchFieldsAndYearFieldsAreEmpty()) {
                 throw new IllegalStateException("At least one text field has to be set");
             }
-            return new ComplexSearchQuery(defaultFieldPhrases, authors, titlePhrases, abstractPhrases, fromYear, toYear, singleYear, journal, doi);
+            return new ComplexSearchQuery(
+                    defaultFieldPhrases,
+                    authors,
+                    titlePhrases,
+                    abstractPhrases,
+                    fromYear,
+                    toYear,
+                    singleYear,
+                    journal,
+                    doi);
         }
 
         void parseYearRange(String termText) {
@@ -301,8 +344,13 @@ void parseYearRange(String termText) {
         }
 
         private boolean textSearchFieldsAndYearFieldsAreEmpty() {
-            return this.stringListIsBlank(defaultFieldPhrases) && this.stringListIsBlank(titlePhrases) &&
-                    this.stringListIsBlank(authors) && this.stringListIsBlank(abstractPhrases) && StringUtil.isBlank(journal) && StringUtil.isBlank(doi) && yearFieldsAreEmpty();
+            return this.stringListIsBlank(defaultFieldPhrases)
+                    && this.stringListIsBlank(titlePhrases)
+                    && this.stringListIsBlank(authors)
+                    && this.stringListIsBlank(abstractPhrases)
+                    && StringUtil.isBlank(journal)
+                    && StringUtil.isBlank(doi)
+                    && yearFieldsAreEmpty();
         }
 
         private boolean yearFieldsAreEmpty() {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcher.java
index 224900238b21..e5ba92cd7cb8 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcher.java
@@ -1,21 +1,20 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.model.entry.BibEntry;
-
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 public class CompositeSearchBasedFetcher implements SearchBasedFetcher {
 
     public static final String FETCHER_NAME = "Search pre-configured";
@@ -25,19 +24,30 @@ public class CompositeSearchBasedFetcher implements SearchBasedFetcher {
     private Set<SearchBasedFetcher> fetchers;
     private final int maximumNumberOfReturnedResults;
 
-    public CompositeSearchBasedFetcher(Set<SearchBasedFetcher> searchBasedFetchers, ImporterPreferences importerPreferences, int maximumNumberOfReturnedResults)
+    public CompositeSearchBasedFetcher(
+            Set<SearchBasedFetcher> searchBasedFetchers,
+            ImporterPreferences importerPreferences,
+            int maximumNumberOfReturnedResults)
             throws IllegalArgumentException {
         if (searchBasedFetchers == null) {
             throw new IllegalArgumentException("The set of searchBasedFetchers must not be null!");
         }
 
-        fetchers = searchBasedFetchers.stream()
-                                      // Remove the Composite Fetcher instance from its own fetcher set to prevent a StackOverflow
-                                      .filter(searchBasedFetcher -> searchBasedFetcher != this)
-                                      // Remove any unselected Fetcher instance
-                                      .filter(searchBasedFetcher -> importerPreferences.getCatalogs().stream()
-                                                                                       .anyMatch((name -> name.equals(searchBasedFetcher.getName()))))
-                                      .collect(Collectors.toSet());
+        fetchers =
+                searchBasedFetchers.stream()
+                        // Remove the Composite Fetcher instance from its own fetcher set to prevent
+                        // a StackOverflow
+                        .filter(searchBasedFetcher -> searchBasedFetcher != this)
+                        // Remove any unselected Fetcher instance
+                        .filter(
+                                searchBasedFetcher ->
+                                        importerPreferences.getCatalogs().stream()
+                                                .anyMatch(
+                                                        (name ->
+                                                                name.equals(
+                                                                        searchBasedFetcher
+                                                                                .getName()))))
+                        .collect(Collectors.toSet());
         this.maximumNumberOfReturnedResults = maximumNumberOfReturnedResults;
     }
 
@@ -53,17 +63,22 @@ public Optional<HelpFile> getHelpPage() {
 
     @Override
     public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
-        // All entries have to be converted into one format, this is necessary for the format conversion
+        // All entries have to be converted into one format, this is necessary for the format
+        // conversion
         return fetchers.parallelStream()
-                       .flatMap(searchBasedFetcher -> {
-                           try {
-                               return searchBasedFetcher.performSearch(luceneQuery).stream();
-                           } catch (FetcherException e) {
-                               LOGGER.warn("%s API request failed".formatted(searchBasedFetcher.getName()), e);
-                               return Stream.empty();
-                           }
-                       })
-                       .limit(maximumNumberOfReturnedResults)
-                       .collect(Collectors.toList());
+                .flatMap(
+                        searchBasedFetcher -> {
+                            try {
+                                return searchBasedFetcher.performSearch(luceneQuery).stream();
+                            } catch (FetcherException e) {
+                                LOGGER.warn(
+                                        "%s API request failed"
+                                                .formatted(searchBasedFetcher.getName()),
+                                        e);
+                                return Stream.empty();
+                            }
+                        })
+                .limit(maximumNumberOfReturnedResults)
+                .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java b/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java
index 7a3e20f19a75..4cd85efdd2fb 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java
@@ -1,14 +1,11 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.IntStream;
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONException;
+import kong.unirest.core.json.JSONObject;
 
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.formatter.bibtexfields.ClearFormatter;
 import org.jabref.logic.formatter.bibtexfields.RemoveEnclosingBracesFormatter;
@@ -31,22 +28,30 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.OptionalUtil;
 
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONException;
-import kong.unirest.core.json.JSONObject;
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.IntStream;
 
 /**
  * A class for fetching DOIs from CrossRef
  * <p>
  * See <a href="https://github.com/CrossRef/rest-api-doc">their GitHub page</a> for documentation.
  */
-public class CrossRef implements IdParserFetcher<DOI>, EntryBasedParserFetcher, SearchBasedParserFetcher, IdBasedParserFetcher {
+public class CrossRef
+        implements IdParserFetcher<DOI>,
+                EntryBasedParserFetcher,
+                SearchBasedParserFetcher,
+                IdBasedParserFetcher {
 
     private static final String API_URL = "https://api.crossref.org/works";
 
-    private static final RemoveEnclosingBracesFormatter REMOVE_BRACES_FORMATTER = new RemoveEnclosingBracesFormatter();
+    private static final RemoveEnclosingBracesFormatter REMOVE_BRACES_FORMATTER =
+            new RemoveEnclosingBracesFormatter();
 
     @Override
     public String getName() {
@@ -54,27 +59,33 @@ public String getName() {
     }
 
     @Override
-    public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForEntry(BibEntry entry)
+            throws URISyntaxException, MalformedURLException, FetcherException {
         URIBuilder uriBuilder = new URIBuilder(API_URL);
-        entry.getFieldLatexFree(StandardField.TITLE).ifPresent(title -> uriBuilder.addParameter("query.bibliographic", title));
-        entry.getFieldLatexFree(StandardField.AUTHOR).ifPresent(author -> uriBuilder.addParameter("query.author", author));
-        entry.getFieldLatexFree(StandardField.YEAR).ifPresent(year ->
-                uriBuilder.addParameter("filter", "from-pub-date:" + year)
-        );
+        entry.getFieldLatexFree(StandardField.TITLE)
+                .ifPresent(title -> uriBuilder.addParameter("query.bibliographic", title));
+        entry.getFieldLatexFree(StandardField.AUTHOR)
+                .ifPresent(author -> uriBuilder.addParameter("query.author", author));
+        entry.getFieldLatexFree(StandardField.YEAR)
+                .ifPresent(year -> uriBuilder.addParameter("filter", "from-pub-date:" + year));
         uriBuilder.addParameter("rows", "20"); // = API default
         uriBuilder.addParameter("offset", "0"); // start at beginning
         return uriBuilder.build().toURL();
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(API_URL);
-        uriBuilder.addParameter("query", new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
+        uriBuilder.addParameter(
+                "query",
+                new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
         return uriBuilder.build().toURL();
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException {
+    public URL getUrlForIdentifier(String identifier)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(API_URL + "/" + identifier);
         return uriBuilder.build().toURL();
     }
@@ -112,7 +123,8 @@ public Parser getParser() {
 
     @Override
     public void doPostCleanup(BibEntry entry) {
-        // Sometimes the fetched entry returns the title also in the subtitle field; in this case only keep the title field
+        // Sometimes the fetched entry returns the title also in the subtitle field; in this case
+        // only keep the title field
         if (entry.getField(StandardField.TITLE).equals(entry.getField(StandardField.SUBTITLE))) {
             new FieldFormatterCleanup(StandardField.SUBTITLE, new ClearFormatter()).cleanup(entry);
         }
@@ -122,28 +134,41 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
         try {
             BibEntry entry = new BibEntry();
             entry.setType(convertType(item.getString("type")));
-            entry.setField(StandardField.TITLE,
+            entry.setField(
+                    StandardField.TITLE,
                     Optional.ofNullable(item.optJSONArray("title"))
-                            .map(array -> array.optString(0)).orElse(""));
-            entry.setField(StandardField.SUBTITLE,
+                            .map(array -> array.optString(0))
+                            .orElse(""));
+            entry.setField(
+                    StandardField.SUBTITLE,
                     Optional.ofNullable(item.optJSONArray("subtitle"))
-                            .map(array -> array.optString(0)).orElse(""));
+                            .map(array -> array.optString(0))
+                            .orElse(""));
             entry.setField(StandardField.AUTHOR, toAuthors(item.optJSONArray("author")));
-            entry.setField(StandardField.YEAR,
+            entry.setField(
+                    StandardField.YEAR,
                     Optional.ofNullable(item.optJSONObject("published-print"))
                             .map(array -> array.optJSONArray("date-parts"))
                             .map(array -> array.optJSONArray(0))
                             .map(array -> array.optInt(0))
-                            .map(year -> Integer.toString(year)).orElse("")
-            );
+                            .map(year -> Integer.toString(year))
+                            .orElse(""));
             entry.setField(StandardField.DOI, item.getString("DOI"));
             entry.setField(StandardField.JOURNAL, item.optString("container-title"));
             entry.setField(StandardField.PUBLISHER, item.optString("publisher"));
             entry.setField(StandardField.NUMBER, item.optString("issue"));
-            entry.setField(StandardField.KEYWORDS, Optional.ofNullable(item.optJSONArray("subject")).map(this::getKeywords).orElse(""));
+            entry.setField(
+                    StandardField.KEYWORDS,
+                    Optional.ofNullable(item.optJSONArray("subject"))
+                            .map(this::getKeywords)
+                            .orElse(""));
             entry.setField(StandardField.PAGES, item.optString("page"));
             entry.setField(StandardField.VOLUME, item.optString("volume"));
-            entry.setField(StandardField.ISSN, Optional.ofNullable(item.optJSONArray("ISSN")).map(array -> array.getString(0)).orElse(""));
+            entry.setField(
+                    StandardField.ISSN,
+                    Optional.ofNullable(item.optJSONArray("ISSN"))
+                            .map(array -> array.getString(0))
+                            .orElse(""));
             return entry;
         } catch (JSONException exception) {
             throw new ParseException("CrossRef API JSON format has changed", exception);
@@ -157,12 +182,17 @@ private String toAuthors(JSONArray authors) {
 
         // input: list of {"given":"A.","family":"Riel","affiliation":[]}
         return IntStream.range(0, authors.length())
-                        .mapToObj(authors::getJSONObject)
-                        .map(author -> new Author(
-                                author.optString("given", ""), "", "",
-                                author.optString("family", ""), ""))
-                        .collect(AuthorList.collect())
-                        .getAsFirstLastNamesWithAnd();
+                .mapToObj(authors::getJSONObject)
+                .map(
+                        author ->
+                                new Author(
+                                        author.optString("given", ""),
+                                        "",
+                                        "",
+                                        author.optString("family", ""),
+                                        ""))
+                .collect(AuthorList.collect())
+                .getAsFirstLastNamesWithAnd();
     }
 
     private EntryType convertType(String type) {
@@ -170,9 +200,12 @@ private EntryType convertType(String type) {
     }
 
     @Override
-    public Optional<DOI> extractIdentifier(BibEntry inputEntry, List<BibEntry> fetchedEntries) throws FetcherException {
+    public Optional<DOI> extractIdentifier(BibEntry inputEntry, List<BibEntry> fetchedEntries)
+            throws FetcherException {
 
-        final String entryTitle = REMOVE_BRACES_FORMATTER.format(inputEntry.getFieldLatexFree(StandardField.TITLE).orElse(""));
+        final String entryTitle =
+                REMOVE_BRACES_FORMATTER.format(
+                        inputEntry.getFieldLatexFree(StandardField.TITLE).orElse(""));
         final StringSimilarity stringSimilarity = new StringSimilarity();
 
         for (BibEntry fetchedEntry : fetchedEntries) {
@@ -180,15 +213,22 @@ public Optional<DOI> extractIdentifier(BibEntry inputEntry, List<BibEntry> fetch
             // title
             Optional<String> dataTitle = fetchedEntry.getField(StandardField.TITLE);
 
-            if (OptionalUtil.isPresentAnd(dataTitle, title -> stringSimilarity.isSimilar(entryTitle, title))) {
+            if (OptionalUtil.isPresentAnd(
+                    dataTitle, title -> stringSimilarity.isSimilar(entryTitle, title))) {
                 return fetchedEntry.getDOI();
             }
 
             // subtitle
-            // additional check, as sometimes subtitle is needed but sometimes only duplicates the title
+            // additional check, as sometimes subtitle is needed but sometimes only duplicates the
+            // title
             Optional<String> dataSubtitle = fetchedEntry.getField(StandardField.SUBTITLE);
-            Optional<String> dataWithSubTitle = OptionalUtil.combine(dataTitle, dataSubtitle, (title, subtitle) -> title + " " + subtitle);
-            if (OptionalUtil.isPresentAnd(dataWithSubTitle, titleWithSubtitle -> stringSimilarity.isSimilar(entryTitle, titleWithSubtitle))) {
+            Optional<String> dataWithSubTitle =
+                    OptionalUtil.combine(
+                            dataTitle, dataSubtitle, (title, subtitle) -> title + " " + subtitle);
+            if (OptionalUtil.isPresentAnd(
+                    dataWithSubTitle,
+                    titleWithSubtitle ->
+                            stringSimilarity.isSimilar(entryTitle, titleWithSubtitle))) {
                 return fetchedEntry.getDOI();
             }
         }
@@ -205,7 +245,7 @@ private String getKeywords(JSONArray jsonArray) {
         StringBuilder keywords = new StringBuilder();
 
         for (int i = 0; i < jsonArray.length(); i++) {
-        keywords.append(jsonArray.getString(i));
+            keywords.append(jsonArray.getString(i));
             if (i != jsonArray.length() - 1) {
                 keywords.append(", ");
             }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
index 188dc6c91585..8e189690d65f 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
@@ -1,12 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.cleanup.DoiCleanup;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
@@ -22,8 +17,12 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 /**
  * Fetches BibTeX data from DBLP (dblp.org)
@@ -43,9 +42,11 @@ public DBLPFetcher(ImportFormatPreferences importFormatPreferences) {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(BASIC_SEARCH_URL);
-        uriBuilder.addParameter("q", new DBLPQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
+        uriBuilder.addParameter(
+                "q", new DBLPQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
         uriBuilder.addParameter("h", String.valueOf(100)); // number of hits
         uriBuilder.addParameter("c", String.valueOf(0)); // no need for auto-completion
         uriBuilder.addParameter("f", String.valueOf(0)); // "from", index of first hit to download
@@ -64,12 +65,18 @@ public void doPostCleanup(BibEntry entry) {
         DoiCleanup doiCleaner = new DoiCleanup();
         doiCleaner.cleanup(entry);
 
-        FieldFormatterCleanups cleanups = new FieldFormatterCleanups(true,
-                List.of(
-                        new FieldFormatterCleanup(StandardField.TIMESTAMP, new ClearFormatter()),
-                        // unescape the contents of the URL field, e.g., some\_url\_part becomes some_url_part
-                        new FieldFormatterCleanup(StandardField.URL, new LayoutFormatterBasedFormatter(new RemoveLatexCommandsFormatter()))
-                ));
+        FieldFormatterCleanups cleanups =
+                new FieldFormatterCleanups(
+                        true,
+                        List.of(
+                                new FieldFormatterCleanup(
+                                        StandardField.TIMESTAMP, new ClearFormatter()),
+                                // unescape the contents of the URL field, e.g., some\_url\_part
+                                // becomes some_url_part
+                                new FieldFormatterCleanup(
+                                        StandardField.URL,
+                                        new LayoutFormatterBasedFormatter(
+                                                new RemoveLatexCommandsFormatter()))));
         cleanups.applySaveActions(entry);
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DOABFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DOABFetcher.java
index 3408c6311421..bfc12fddfb93 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DOABFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DOABFetcher.java
@@ -1,13 +1,11 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.StringJoiner;
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONException;
+import kong.unirest.core.json.JSONObject;
 
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.SearchBasedParserFetcher;
 import org.jabref.logic.importer.fetcher.transformers.DefaultQueryTransformer;
@@ -19,11 +17,13 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
 
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONException;
-import kong.unirest.core.json.JSONObject;
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringJoiner;
 
 /**
  * fetches books from https://www.doabooks.org/ through
@@ -38,7 +38,8 @@ public String getName() {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder builder = new URIBuilder(SEARCH_URL);
         String query = new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("");
         // adding quotations for the query for more specified results
@@ -54,7 +55,8 @@ public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, Malf
     @Override
     public Parser getParser() {
         return InputStream -> {
-            // can't use this method JsonReader.toJsonObject(inputStream) because the results are sent in an array
+            // can't use this method JsonReader.toJsonObject(inputStream) because the results are
+            // sent in an array
             // like format resulting in an error when trying to convert them into a json object
             // created a similar method suitable for this case "toJsonArray"
             JSONArray response = JsonReader.toJsonArray(InputStream);
@@ -62,8 +64,10 @@ public Parser getParser() {
                 return Collections.emptyList();
             }
             if (response.length() == 1) {
-                // the information used for bibtex entries are in an array inside the resulting jsonarray
-                // see this query for reference https://directory.doabooks.org/rest/search?query="i open fire"&expand=metadata
+                // the information used for bibtex entries are in an array inside the resulting
+                // jsonarray
+                // see this query for reference https://directory.doabooks.org/rest/search?query="i
+                // open fire"&expand=metadata
                 JSONArray metadataArray = response.getJSONObject(0).getJSONArray("metadata");
                 JSONArray bitstreamArray = response.getJSONObject(0).getJSONArray("bitstreams");
                 BibEntry entry = jsonToBibEntry(metadataArray, bitstreamArray);
@@ -89,7 +93,8 @@ private BibEntry jsonToBibEntry(JSONArray metadataArray, JSONArray bitstreamArra
 
         // Get the ISBN within the BITSTREAM. See the link below:
         // https://directory.doabooks.org/rest/search?query=handle:%2220.500.12854/26303%22&expand=metadata,bitstreams
-        // Note that in many cases, an ISBN cannot be obtained in the metadata, even in the BITSTREAM. See the link below:
+        // Note that in many cases, an ISBN cannot be obtained in the metadata, even in the
+        // BITSTREAM. See the link below:
         // https://directory.doabooks.org/rest/search?query=%22i%20open%20fire%22&expand=metadata,bitstreams
         for (int i = 0; i < bitstreamArray.length(); i++) {
             JSONObject bitstreamObject = bitstreamArray.getJSONObject(i);
@@ -98,9 +103,12 @@ private BibEntry jsonToBibEntry(JSONArray metadataArray, JSONArray bitstreamArra
             for (int k = 0; k < array.length(); k++) {
                 JSONObject metadataInBitstreamObject = array.getJSONObject(k);
                 if ("dc.identifier.isbn".equals(metadataInBitstreamObject.getString("key"))) {
-                    entry.setField(StandardField.ISBN, metadataInBitstreamObject.getString("value"));
-                } else if ("oapen.relation.isbn".equals(metadataInBitstreamObject.getString("key"))) {
-                    entry.setField(StandardField.ISBN, metadataInBitstreamObject.getString("value"));
+                    entry.setField(
+                            StandardField.ISBN, metadataInBitstreamObject.getString("value"));
+                } else if ("oapen.relation.isbn"
+                        .equals(metadataInBitstreamObject.getString("key"))) {
+                    entry.setField(
+                            StandardField.ISBN, metadataInBitstreamObject.getString("value"));
                 }
             }
         }
@@ -110,54 +118,60 @@ private BibEntry jsonToBibEntry(JSONArray metadataArray, JSONArray bitstreamArra
             switch (dataObject.getString("key")) {
                 case "dc.contributor.author" -> {
                     if (dataObject.getString("value").contains("(Ed.)")) {
-                       editorsList.add(toAuthor(namePreprocessing(dataObject.getString("value"))));
+                        editorsList.add(toAuthor(namePreprocessing(dataObject.getString("value"))));
                     } else {
                         authorsList.add(toAuthor(dataObject.getString("value")));
                     }
                 }
                 case "dc.type" -> entry.setType(StandardEntryType.Book);
-                case "dc.date.issued" -> entry.setField(StandardField.DATE, dataObject.getString("value"));
-                case "oapen.identifier.doi" -> entry.setField(StandardField.DOI,
-                        dataObject.getString("value"));
-                case "dc.title" -> entry.setField(StandardField.TITLE,
-                        dataObject.getString("value"));
+                case "dc.date.issued" ->
+                        entry.setField(StandardField.DATE, dataObject.getString("value"));
+                case "oapen.identifier.doi" ->
+                        entry.setField(StandardField.DOI, dataObject.getString("value"));
+                case "dc.title" ->
+                        entry.setField(StandardField.TITLE, dataObject.getString("value"));
                 case "oapen.pages" -> {
                     try {
-                        entry.setField(StandardField.PAGES, String.valueOf(dataObject.getInt("value")));
+                        entry.setField(
+                                StandardField.PAGES, String.valueOf(dataObject.getInt("value")));
                     } catch (JSONException e) {
                         entry.setField(StandardField.PAGES, dataObject.getString("value"));
                     }
                 }
-                case "dc.description.abstract" -> entry.setField(StandardField.ABSTRACT,
-                        dataObject.getString("value"));
-                case "dc.language" -> entry.setField(StandardField.LANGUAGE,
-                        dataObject.getString("value"));
-                case "publisher.name" -> entry.setField(StandardField.PUBLISHER,
-                        dataObject.getString("value"));
-                case "dc.identifier.uri" -> entry.setField(StandardField.URI,
-                        dataObject.getString("value"));
+                case "dc.description.abstract" ->
+                        entry.setField(StandardField.ABSTRACT, dataObject.getString("value"));
+                case "dc.language" ->
+                        entry.setField(StandardField.LANGUAGE, dataObject.getString("value"));
+                case "publisher.name" ->
+                        entry.setField(StandardField.PUBLISHER, dataObject.getString("value"));
+                case "dc.identifier.uri" ->
+                        entry.setField(StandardField.URI, dataObject.getString("value"));
                 case "dc.identifier" -> {
                     if (dataObject.getString("value").contains("http")) {
-                       entry.setField(StandardField.URL, dataObject.getString("value"));
+                        entry.setField(StandardField.URL, dataObject.getString("value"));
                     }
                 }
                 case "dc.subject.other" -> keywordJoiner.add(dataObject.getString("value"));
-                case "dc.contributor.editor" -> editorsList.add(toAuthor(dataObject.getString("value")));
-                case "oapen.volume" -> entry.setField(StandardField.VOLUME,
-                        dataObject.getString("value"));
-                case "oapen.relation.isbn", "dc.identifier.isbn" -> entry.setField(StandardField.ISBN,
-                        dataObject.getString("value"));
-                case "dc.title.alternative" -> entry.setField(StandardField.SUBTITLE,
-                        dataObject.getString("value"));
+                case "dc.contributor.editor" ->
+                        editorsList.add(toAuthor(dataObject.getString("value")));
+                case "oapen.volume" ->
+                        entry.setField(StandardField.VOLUME, dataObject.getString("value"));
+                case "oapen.relation.isbn", "dc.identifier.isbn" ->
+                        entry.setField(StandardField.ISBN, dataObject.getString("value"));
+                case "dc.title.alternative" ->
+                        entry.setField(StandardField.SUBTITLE, dataObject.getString("value"));
                 case "oapen.imprint" -> publisherImprint = dataObject.getString("value");
             }
         }
 
-        entry.setField(StandardField.AUTHOR, AuthorList.of(authorsList).getAsFirstLastNamesWithAnd());
-        entry.setField(StandardField.EDITOR, AuthorList.of(editorsList).getAsFirstLastNamesWithAnd());
+        entry.setField(
+                StandardField.AUTHOR, AuthorList.of(authorsList).getAsFirstLastNamesWithAnd());
+        entry.setField(
+                StandardField.EDITOR, AuthorList.of(editorsList).getAsFirstLastNamesWithAnd());
         entry.setField(StandardField.KEYWORDS, String.valueOf(keywordJoiner));
 
-        // Special condition to check if publisher field is empty. If so, retrieve imprint (if available)
+        // Special condition to check if publisher field is empty. If so, retrieve imprint (if
+        // available)
         if (entry.getField(StandardField.PUBLISHER).isEmpty()) {
             if (!StringUtil.isNullOrEmpty(publisherImprint)) {
                 entry.setField(StandardField.PUBLISHER, publisherImprint);
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java
index 8ffd28203177..052348658257 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java
@@ -1,16 +1,10 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONObject;
 
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Parser;
@@ -22,14 +16,20 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
-
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONObject;
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 /**
  * Fetches data from the Directory of Open Access Journals (DOAJ)
  *
@@ -52,12 +52,19 @@ public DOAJFetcher(ImportFormatPreferences preferences) {
      * @param bibJsonEntry The JSONObject to convert
      * @return the converted BibEntry
      */
-    public static BibEntry parseBibJSONtoBibtex(JSONObject bibJsonEntry, Character keywordSeparator) {
+    public static BibEntry parseBibJSONtoBibtex(
+            JSONObject bibJsonEntry, Character keywordSeparator) {
         // Fields that are directly accessible at the top level BibJson object
-        List<Field> singleFields = List.of(StandardField.YEAR, StandardField.TITLE, StandardField.ABSTRACT, StandardField.MONTH);
+        List<Field> singleFields =
+                List.of(
+                        StandardField.YEAR,
+                        StandardField.TITLE,
+                        StandardField.ABSTRACT,
+                        StandardField.MONTH);
 
         // Fields that are accessible in the journal part of the BibJson object
-        List<Field> journalSingleFields = List.of(StandardField.PUBLISHER, StandardField.NUMBER, StandardField.VOLUME);
+        List<Field> journalSingleFields =
+                List.of(StandardField.PUBLISHER, StandardField.NUMBER, StandardField.VOLUME);
 
         BibEntry entry = new BibEntry(StandardEntryType.Article);
 
@@ -87,8 +94,11 @@ public static BibEntry parseBibJSONtoBibtex(JSONObject bibJsonEntry, Character k
         // Page numbers
         if (bibJsonEntry.has("start_page")) {
             if (bibJsonEntry.has("end_page")) {
-                entry.setField(StandardField.PAGES,
-                        bibJsonEntry.getString("start_page") + "--" + bibJsonEntry.getString("end_page"));
+                entry.setField(
+                        StandardField.PAGES,
+                        bibJsonEntry.getString("start_page")
+                                + "--"
+                                + bibJsonEntry.getString("end_page"));
             } else {
                 entry.setField(StandardField.PAGES, bibJsonEntry.getString("start_page"));
             }
@@ -131,9 +141,11 @@ public static BibEntry parseBibJSONtoBibtex(JSONObject bibJsonEntry, Character k
                 if ("doi".equals(type)) {
                     entry.setField(StandardField.DOI, identifiers.getJSONObject(i).getString("id"));
                 } else if ("pissn".equals(type)) {
-                    entry.setField(StandardField.ISSN, identifiers.getJSONObject(i).getString("id"));
+                    entry.setField(
+                            StandardField.ISSN, identifiers.getJSONObject(i).getString("id"));
                 } else if ("eissn".equals(type)) {
-                    entry.setField(StandardField.ISSN, identifiers.getJSONObject(i).getString("id"));
+                    entry.setField(
+                            StandardField.ISSN, identifiers.getJSONObject(i).getString("id"));
                 }
             }
         }
@@ -184,9 +196,12 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(SEARCH_URL);
-        DOAJFetcher.addPath(uriBuilder, new DefaultLuceneQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
+        DOAJFetcher.addPath(
+                uriBuilder,
+                new DefaultLuceneQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
         // Number of results
         uriBuilder.addParameter("pageSize", "30");
         // Page (not needed so far)
@@ -197,7 +212,10 @@ public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, Malf
     @Override
     public Parser getParser() {
         return inputStream -> {
-            String response = new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.joining(OS.NEWLINE));
+            String response =
+                    new BufferedReader(new InputStreamReader(inputStream))
+                            .lines()
+                            .collect(Collectors.joining(OS.NEWLINE));
             JSONObject jsonObject = new JSONObject(response);
 
             List<BibEntry> entries = new ArrayList<>();
@@ -205,7 +223,10 @@ public Parser getParser() {
                 JSONArray results = jsonObject.getJSONArray("results");
                 for (int i = 0; i < results.length(); i++) {
                     JSONObject bibJsonEntry = results.getJSONObject(i).getJSONObject("bibjson");
-                    BibEntry entry = parseBibJSONtoBibtex(bibJsonEntry, preferences.bibEntryPreferences().getKeywordSeparator());
+                    BibEntry entry =
+                            parseBibJSONtoBibtex(
+                                    bibJsonEntry,
+                                    preferences.bibEntryPreferences().getKeywordSeparator());
                     entries.add(entry);
                 }
             }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java b/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java
index 241c58a3d86d..8c816e3dcb0e 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Optional;
-
+import org.apache.hc.core5.net.URIBuilder;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.IdBasedParserFetcher;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 
-import org.apache.hc.core5.net.URIBuilder;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Optional;
 
 /*
  * http://www.diva-portal.org/smash/aboutdiva.jsf?dswid=-3222
@@ -36,7 +35,8 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException {
+    public URL getUrlForIdentifier(String identifier)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder("http://www.diva-portal.org/smash/getreferences");
 
         uriBuilder.addParameter("referenceFormat", "BibTex");
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
index 2647b73a70f6..d2c082067080 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
@@ -1,17 +1,10 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.regex.Pattern;
+import com.google.common.util.concurrent.RateLimiter;
+
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONException;
+import kong.unirest.core.json.JSONObject;
 
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.formatter.bibtexfields.ClearFormatter;
@@ -32,14 +25,22 @@
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.OptionalUtil;
-
-import com.google.common.util.concurrent.RateLimiter;
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONException;
-import kong.unirest.core.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.regex.Pattern;
+
 public class DoiFetcher implements IdBasedFetcher, EntryBasedFetcher {
 
     public static final String NAME = "DOI";
@@ -50,7 +51,8 @@ public class DoiFetcher implements IdBasedFetcher, EntryBasedFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DoiFetcher.class);
 
-    // 1000 request per 5 minutes. See https://support.datacite.org/docs/is-there-a-rate-limit-for-making-requests-against-the-datacite-apis
+    // 1000 request per 5 minutes. See
+    // https://support.datacite.org/docs/is-there-a-rate-limit-for-making-requests-against-the-datacite-apis
     private static final RateLimiter DATA_CITE_DCN_RATE_LIMITER = RateLimiter.create(3.33);
 
     /*
@@ -79,8 +81,10 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     private void doAPILimiting(String identifier) {
-        // Without a generic API Rate Limiter implemented on the project, use Guava's RateLimiter for avoiding
-        // API throttling when multiple threads are working, specially during DOI Content Negotiations
+        // Without a generic API Rate Limiter implemented on the project, use Guava's RateLimiter
+        // for avoiding
+        // API throttling when multiple threads are working, specially during DOI Content
+        // Negotiations
         Optional<DOI> doi = DOI.parse(identifier);
 
         try {
@@ -93,8 +97,12 @@ private void doAPILimiting(String identifier) {
                     waitingTime = CROSSREF_DCN_RATE_LIMITER.acquire();
                 } // mEDRA does not explicit an API rating
 
-                LOGGER.trace("Thread %s, searching for DOI '%s', waited %.2fs because of API rate limiter".formatted(
-                        Thread.currentThread().threadId(), identifier, waitingTime));
+                LOGGER.trace(
+                        "Thread %s, searching for DOI '%s', waited %.2fs because of API rate limiter"
+                                .formatted(
+                                        Thread.currentThread().threadId(),
+                                        identifier,
+                                        waitingTime));
             }
         } catch (FetcherException | MalformedURLException e) {
             LOGGER.warn("Could not limit DOI API access rate", e);
@@ -103,13 +111,14 @@ private void doAPILimiting(String identifier) {
 
     protected CompletableFuture<Optional<BibEntry>> asyncPerformSearchById(String identifier) {
         doAPILimiting(identifier);
-        return CompletableFuture.supplyAsync(() -> {
-            try {
-                return performSearchById(identifier);
-            } catch (FetcherException e) {
-                throw new CompletionException(e);
-            }
-        });
+        return CompletableFuture.supplyAsync(
+                () -> {
+                    try {
+                        return performSearchById(identifier);
+                    } catch (FetcherException e) {
+                        throw new CompletionException(e);
+                    }
+                });
     }
 
     @Override
@@ -155,10 +164,12 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
                 updateCrossrefAPIRate(openConnection);
             }
 
-            // Check if the entry is an APS journal and add the article id as the page count if page field is missing
+            // Check if the entry is an APS journal and add the article id as the page count if page
+            // field is missing
             if (fetchedEntry.isPresent() && fetchedEntry.get().hasField(StandardField.DOI)) {
                 BibEntry entry = fetchedEntry.get();
-                if (isAPSJournal(entry, entry.getField(StandardField.DOI).get()) && !entry.hasField(StandardField.PAGES)) {
+                if (isAPSJournal(entry, entry.getField(StandardField.DOI).get())
+                        && !entry.hasField(StandardField.PAGES)) {
                     setPageCountToArticleId(entry, entry.getField(StandardField.DOI).get());
                 }
             }
@@ -177,7 +188,8 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
     }
 
     private void doPostCleanup(BibEntry entry) {
-        new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter())
+                .cleanup(entry);
         new FieldFormatterCleanup(StandardField.URL, new ClearFormatter()).cleanup(entry);
         new FieldFormatterCleanup(StandardField.TITLE, new HtmlToLatexFormatter()).cleanup(entry);
     }
@@ -185,19 +197,26 @@ private void doPostCleanup(BibEntry entry) {
     private void updateCrossrefAPIRate(URLConnection existingConnection) {
         try {
             // Assuming this field is given in seconds
-            String xRateLimitInterval = existingConnection.getHeaderField("X-Rate-Limit-Interval").replaceAll("[^\\.0123456789]", "");
+            String xRateLimitInterval =
+                    existingConnection
+                            .getHeaderField("X-Rate-Limit-Interval")
+                            .replaceAll("[^\\.0123456789]", "");
             String xRateLimit = existingConnection.getHeaderField("X-Rate-Limit-Limit");
 
-            double newRate = Double.parseDouble(xRateLimit) / Double.parseDouble(xRateLimitInterval);
+            double newRate =
+                    Double.parseDouble(xRateLimit) / Double.parseDouble(xRateLimitInterval);
             double oldRate = CROSSREF_DCN_RATE_LIMITER.getRate();
 
             // In theory, the actual update might rarely happen...
             if (Math.abs(newRate - oldRate) >= 1.0) {
-                LOGGER.info("Updated Crossref API rate limit from %.2f to %.2f".formatted(oldRate, newRate));
+                LOGGER.info(
+                        "Updated Crossref API rate limit from %.2f to %.2f"
+                                .formatted(oldRate, newRate));
                 CROSSREF_DCN_RATE_LIMITER.setRate(newRate);
             }
         } catch (NullPointerException | IllegalArgumentException e) {
-            LOGGER.warn("Could not deduce Crossref API's rate limit from response header. API might have changed");
+            LOGGER.warn(
+                    "Could not deduce Crossref API's rate limit from response header. API might have changed");
         }
     }
 
@@ -219,7 +238,8 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
     public Optional<String> getAgency(DOI doi) throws FetcherException, MalformedURLException {
         Optional<String> agency = Optional.empty();
         try {
-            URLDownload download = getUrlDownload(URI.create(DOI.AGENCY_RESOLVER + "/" + doi.getDOI()).toURL());
+            URLDownload download =
+                    getUrlDownload(URI.create(DOI.AGENCY_RESOLVER + "/" + doi.getDOI()).toURL());
             JSONObject response = new JSONArray(download.asString()).getJSONObject(0);
             if (response != null) {
                 agency = Optional.ofNullable(response.optString("RA"));
@@ -243,7 +263,9 @@ private boolean isAPSJournal(BibEntry entry, String doiAsString) {
             return false;
         }
         String suffix = doiAsString.substring(doiAsString.lastIndexOf('/') + 1);
-        String organizationId = doiAsString.substring(doiAsString.indexOf('.') + 1, doiAsString.indexOf('/'));
-        return organizationId.equals(APS_JOURNAL_ORG_DOI_ID) && APS_SUFFIX_PATTERN.matcher(suffix).matches();
+        String organizationId =
+                doiAsString.substring(doiAsString.indexOf('.') + 1, doiAsString.indexOf('/'));
+        return organizationId.equals(APS_JOURNAL_ORG_DOI_ID)
+                && APS_SUFFIX_PATTERN.matcher(suffix).matches();
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java b/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
index 81402a3e4995..f7eb764d319c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
@@ -1,17 +1,5 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import org.jabref.logic.importer.FulltextFetcher;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ImporterPreferences;
@@ -21,7 +9,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
-
 import org.jsoup.Connection;
 import org.jsoup.Jsoup;
 import org.jsoup.UnsupportedMimeTypeException;
@@ -31,6 +18,18 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 /**
  * FulltextFetcher implementation that follows the DOI resolution redirects and scans for a full-text PDF URL.
  *
@@ -62,10 +61,11 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         String doiLink;
         if (doiPreferences.isUseCustom()) {
             base = URI.create(doiPreferences.getDefaultBaseURI()).toURL();
-            doiLink = doi.get()
-                         .getExternalURIWithCustomBase(base.toString())
-                         .map(URI::toASCIIString)
-                         .orElse("");
+            doiLink =
+                    doi.get()
+                            .getExternalURIWithCustomBase(base.toString())
+                            .map(URI::toASCIIString)
+                            .orElse("");
         } else {
             base = DOI.RESOLVER.toURL();
             doiLink = doi.get().getURIAsASCIIString();
@@ -109,11 +109,13 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
                 // ACM uses tokens without PDF inside the link
                 // See https://github.com/lehner/LocalCopy for more scrape ideas
                 // link with "PDF" in title tag
-                if (element.attr("title").toLowerCase(Locale.ENGLISH).contains("pdf") && new URLDownload(href).isPdf()) {
+                if (element.attr("title").toLowerCase(Locale.ENGLISH).contains("pdf")
+                        && new URLDownload(href).isPdf()) {
                     return Optional.of(URI.create(href).toURL());
                 }
 
-                if (href.contains("pdf") || hrefText.contains("pdf") && new URLDownload(href).isPdf()) {
+                if (href.contains("pdf")
+                        || hrefText.contains("pdf") && new URLDownload(href).isPdf()) {
                     links.add(URI.create(href).toURL());
                 }
             }
@@ -144,7 +146,8 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
      */
     private Optional<URL> citationMetaTag(Document html) {
         Elements citationPdfUrlElement = html.head().select("meta[name='citation_pdf_url']");
-        Optional<String> citationPdfUrl = citationPdfUrlElement.stream().map(e -> e.attr("content")).findFirst();
+        Optional<String> citationPdfUrl =
+                citationPdfUrlElement.stream().map(e -> e.attr("content")).findFirst();
 
         if (citationPdfUrl.isPresent()) {
             try {
@@ -158,9 +161,7 @@ private Optional<URL> citationMetaTag(Document html) {
 
     private Optional<URL> findEmbeddedLink(Document html, URL base) {
         Elements embedElement = html.body().select("embed[id='pdf']");
-        Optional<String> pdfUrl = embedElement
-                .stream()
-                .map(e -> e.attr("src")).findFirst();
+        Optional<String> pdfUrl = embedElement.stream().map(e -> e.attr("src")).findFirst();
 
         if (pdfUrl.isPresent()) {
             try {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java b/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
index c021916480d2..8068ece8b50c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
@@ -1,20 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.io.StringReader;
-import java.net.HttpCookie;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.FulltextFetcher;
@@ -28,15 +15,27 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.paging.Page;
-
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.HttpCookie;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * FulltextFetcher implementation that attempts to find a PDF URL at GoogleScholar.
  * <p>
@@ -45,7 +44,8 @@
 public class GoogleScholar implements FulltextFetcher, PagedSearchBasedFetcher {
     private static final Logger LOGGER = LoggerFactory.getLogger(GoogleScholar.class);
 
-    private static final Pattern LINK_TO_BIB_PATTERN = Pattern.compile("(https:\\/\\/scholar.googleusercontent.com\\/scholar.bib[^\"]*)");
+    private static final Pattern LINK_TO_BIB_PATTERN =
+            Pattern.compile("(https:\\/\\/scholar.googleusercontent.com\\/scholar.bib[^\"]*)");
 
     private static final String BASIC_SEARCH_URL = "https://scholar.google.ch/scholar?";
 
@@ -130,13 +130,18 @@ public Optional<HelpFile> getHelpPage() {
         return Optional.of(HelpFile.FETCHER_GOOGLE_SCHOLAR);
     }
 
-    private void addHitsFromQuery(List<BibEntry> entryList, String queryURL) throws IOException, FetcherException {
+    private void addHitsFromQuery(List<BibEntry> entryList, String queryURL)
+            throws IOException, FetcherException {
         String content = new URLDownload(queryURL).asString();
 
         if (needsCaptcha(content)) {
             // TODO: Remove "null"
-            throw new FetcherException(queryURL, "Fetching from Google Scholar failed: Captacha hit." +
-                    Localization.lang("This might be caused by reaching the traffic limitation of Google Scholar (see 'Help' for details)."), null);
+            throw new FetcherException(
+                    queryURL,
+                    "Fetching from Google Scholar failed: Captacha hit."
+                            + Localization.lang(
+                                    "This might be caused by reaching the traffic limitation of Google Scholar (see 'Help' for details)."),
+                    null);
         }
 
         Matcher matcher = LINK_TO_BIB_PATTERN.matcher(content);
@@ -179,7 +184,8 @@ private void obtainAndModifyCookie() throws FetcherException {
     }
 
     @Override
-    public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber) throws FetcherException {
+    public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
+            throws FetcherException {
         ScholarQueryTransformer queryTransformer = new ScholarQueryTransformer();
         String transformedQuery = queryTransformer.transformLuceneQuery(luceneQuery).orElse("");
 
@@ -209,12 +215,17 @@ public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
             }
         } catch (IOException e) {
             LOGGER.info("IOException for URL {}", uriBuilder);
-            // if there are too much requests from the same IP adress google is answering with a 503 and redirecting to a captcha challenge
+            // if there are too much requests from the same IP adress google is answering with a 503
+            // and redirecting to a captcha challenge
             // The caught IOException looks for example like this:
-            // java.io.IOException: Server returned HTTP response code: 503 for URL: https://ipv4.google.com/sorry/index?continue=https://scholar.google.com/scholar%3Fhl%3Den%26btnG%3DSearch%26q%3Dbpmn&hl=en&q=CGMSBI0NBDkYuqy9wAUiGQDxp4NLQCWbIEY1HjpH5zFJhv4ANPGdWj0
+            // java.io.IOException: Server returned HTTP response code: 503 for URL:
+            // https://ipv4.google.com/sorry/index?continue=https://scholar.google.com/scholar%3Fhl%3Den%26btnG%3DSearch%26q%3Dbpmn&hl=en&q=CGMSBI0NBDkYuqy9wAUiGQDxp4NLQCWbIEY1HjpH5zFJhv4ANPGdWj0
             if (e.getMessage().contains("Server returned HTTP response code: 503 for URL")) {
-                throw new FetcherException("Fetching from Google Scholar failed.",
-                        Localization.lang("This might be caused by reaching the traffic limitation of Google Scholar (see 'Help' for details)."), e);
+                throw new FetcherException(
+                        "Fetching from Google Scholar failed.",
+                        Localization.lang(
+                                "This might be caused by reaching the traffic limitation of Google Scholar (see 'Help' for details)."),
+                        e);
             } else {
                 URL url;
                 try {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
index 47d4fc35c141..b644103d8401 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
@@ -1,13 +1,6 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.SocketTimeoutException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.http.dto.SimpleHttpResponse;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -15,14 +8,20 @@
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.logic.importer.util.GrobidService;
 import org.jabref.model.entry.BibEntry;
-
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jooq.lambda.Unchecked;
 import org.jooq.lambda.UncheckedException;
 import org.jsoup.HttpStatusException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class GrobidCitationFetcher implements SearchBasedFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GrobidCitationFetcher.class);
@@ -30,11 +29,13 @@ public class GrobidCitationFetcher implements SearchBasedFetcher {
     private final ImportFormatPreferences importFormatPreferences;
     private final GrobidService grobidService;
 
-    public GrobidCitationFetcher(GrobidPreferences grobidPreferences, ImportFormatPreferences importFormatPreferences) {
+    public GrobidCitationFetcher(
+            GrobidPreferences grobidPreferences, ImportFormatPreferences importFormatPreferences) {
         this(importFormatPreferences, new GrobidService(grobidPreferences));
     }
 
-    GrobidCitationFetcher(ImportFormatPreferences importFormatPreferences, GrobidService grobidService) {
+    GrobidCitationFetcher(
+            ImportFormatPreferences importFormatPreferences, GrobidService grobidService) {
         this.importFormatPreferences = importFormatPreferences;
         this.grobidService = grobidService;
     }
@@ -47,7 +48,10 @@ public GrobidCitationFetcher(GrobidPreferences grobidPreferences, ImportFormatPr
      */
     private Optional<BibEntry> parseUsingGrobid(String plainText) throws FetcherException {
         try {
-            return grobidService.processCitation(plainText, importFormatPreferences, GrobidService.ConsolidateCitations.WITH_METADATA);
+            return grobidService.processCitation(
+                    plainText,
+                    importFormatPreferences,
+                    GrobidService.ConsolidateCitations.WITH_METADATA);
         } catch (HttpStatusException e) {
             LOGGER.debug("Could not connect to Grobid", e);
             throw new FetcherException("{grobid}", new SimpleHttpResponse(e));
@@ -70,7 +74,8 @@ public String getName() {
     public List<BibEntry> performSearch(String searchQuery) throws FetcherException {
         List<BibEntry> result;
         try {
-            result = Arrays.stream(searchQuery.split("\\r\\r+|\\n\\n+|\\r\\n(\\r\\n)+"))
+            result =
+                    Arrays.stream(searchQuery.split("\\r\\r+|\\n\\n+|\\r\\n(\\r\\n)+"))
                             .map(String::trim)
                             .filter(str -> !str.isBlank())
                             .map(Unchecked.function(this::parseUsingGrobid))
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java b/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java
index ed6ad0ceff7b..f9f48b07486c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java
@@ -10,9 +10,7 @@ public class GrobidPreferences {
     private final BooleanProperty grobidOptOut;
     private final StringProperty grobidURL;
 
-    public GrobidPreferences(boolean grobidEnabled,
-                             boolean grobidOptOut,
-                             String grobidURL) {
+    public GrobidPreferences(boolean grobidEnabled, boolean grobidOptOut, String grobidURL) {
         this.grobidEnabled = new SimpleBooleanProperty(grobidEnabled);
         this.grobidOptOut = new SimpleBooleanProperty(grobidOptOut);
         this.grobidURL = new SimpleStringProperty(grobidURL);
@@ -42,6 +40,7 @@ public BooleanProperty grobidOptOutProperty() {
     public void setGrobidOptOut(boolean grobidOptOut) {
         this.grobidOptOut.set(grobidOptOut);
     }
+
     // endregion: optout
 
     public String getGrobidURL() {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java
index ae463ba3391f..6f5baebc5ed5 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java
@@ -1,12 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Optional;
-
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.formatter.bibtexfields.NormalizeNamesFormatter;
 import org.jabref.logic.formatter.bibtexfields.NormalizePagesFormatter;
@@ -19,8 +14,12 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Optional;
 
 public class GvkFetcher extends AbstractIsbnFetcher implements SearchBasedParserFetcher {
 
@@ -30,7 +29,9 @@ public class GvkFetcher extends AbstractIsbnFetcher implements SearchBasedParser
      * Searchkeys are used to specify a search request. For example "tit" stands for "title".
      * If no searchkey is used, the default searchkey "all" is used.
      */
-    private final Collection<String> searchKeys = Arrays.asList("all", "tit", "per", "thm", "slw", "txt", "num", "kon", "ppn", "bkl", "erj");
+    private final Collection<String> searchKeys =
+            Arrays.asList(
+                    "all", "tit", "per", "thm", "slw", "txt", "num", "kon", "ppn", "bkl", "erj");
 
     public GvkFetcher(ImportFormatPreferences importFormatPreferences) {
         super(importFormatPreferences);
@@ -47,11 +48,13 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(URL_PATTERN);
         uriBuilder.addParameter("version", "1.1");
         uriBuilder.addParameter("operation", "searchRetrieve");
-        uriBuilder.addParameter("query", new GVKQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
+        uriBuilder.addParameter(
+                "query", new GVKQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
         uriBuilder.addParameter("maximumRecords", "50");
         uriBuilder.addParameter("recordSchema", "picaxml");
         uriBuilder.addParameter("sortKeys", "Year,,1");
@@ -61,7 +64,8 @@ public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, Malf
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException {
+    public URL getUrlForIdentifier(String identifier)
+            throws URISyntaxException, MalformedURLException {
         this.ensureThatIsbnIsValid(identifier);
         URIBuilder uriBuilder = new URIBuilder(URL_PATTERN);
         uriBuilder.addParameter("version", "1.1");
@@ -84,10 +88,16 @@ public Parser getParser() {
     public void doPostCleanup(BibEntry entry) {
         super.doPostCleanup(entry);
 
-        // Fetcher returns page numbers as "30 Seiten" -> remove every non-digit character in the PAGETOTAL field
-        entry.getField(StandardField.PAGETOTAL).ifPresent(pages ->
-                entry.setField(StandardField.PAGETOTAL, pages.replaceAll("[\\D]", "")));
-        new FieldFormatterCleanup(StandardField.PAGETOTAL, new NormalizePagesFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.AUTHOR, new NormalizeNamesFormatter()).cleanup(entry);
+        // Fetcher returns page numbers as "30 Seiten" -> remove every non-digit character in the
+        // PAGETOTAL field
+        entry.getField(StandardField.PAGETOTAL)
+                .ifPresent(
+                        pages ->
+                                entry.setField(
+                                        StandardField.PAGETOTAL, pages.replaceAll("[\\D]", "")));
+        new FieldFormatterCleanup(StandardField.PAGETOTAL, new NormalizePagesFormatter())
+                .cleanup(entry);
+        new FieldFormatterCleanup(StandardField.AUTHOR, new NormalizeNamesFormatter())
+                .cleanup(entry);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java b/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
index 6d1f93e9b65b..ef22de65ed20 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
@@ -1,19 +1,10 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONObject;
 
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.FulltextFetcher;
@@ -31,14 +22,23 @@
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
-
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONObject;
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 /**
  * Class for finding PDF URLs for entries on IEEE.
  * Will first look for URLs of the type <code>https://ieeexplore.ieee.org/stamp/stamp.jsp?[tp=&amp;]arnumber=...</code>.
@@ -46,28 +46,34 @@
  *
  * @see <a href="https://developer.ieee.org/docs">API documentation</a>
  */
-public class IEEE implements FulltextFetcher, PagedSearchBasedParserFetcher, CustomizableKeyFetcher {
+public class IEEE
+        implements FulltextFetcher, PagedSearchBasedParserFetcher, CustomizableKeyFetcher {
 
     public static final String FETCHER_NAME = "IEEEXplore";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(IEEE.class);
 
     private static final String STAMP_BASE_STRING_DOCUMENT = "/stamp/stamp.jsp?tp=&arnumber=";
-    private static final Pattern STAMP_PATTERN = Pattern.compile("(/stamp/stamp.jsp\\?t?p?=?&?arnumber=[0-9]+)");
+    private static final Pattern STAMP_PATTERN =
+            Pattern.compile("(/stamp/stamp.jsp\\?t?p?=?&?arnumber=[0-9]+)");
     private static final Pattern DOCUMENT_PATTERN = Pattern.compile("document/([0-9]+)/");
 
-    private static final Pattern PDF_PATTERN = Pattern.compile("\"(https://ieeexplore.ieee.org/ielx[0-9/]+\\.pdf[^\"]+)\"");
+    private static final Pattern PDF_PATTERN =
+            Pattern.compile("\"(https://ieeexplore.ieee.org/ielx[0-9/]+\\.pdf[^\"]+)\"");
     private static final String IEEE_DOI = "10.1109";
     private static final String BASE_URL = "https://ieeexplore.ieee.org";
     private static final String API_KEY = new BuildInfo().ieeeAPIKey;
-    private static final String TEST_URL_WITHOUT_API_KEY = "https://ieeexploreapi.ieee.org/api/v1/search/articles?max_records=0&apikey=";
+    private static final String TEST_URL_WITHOUT_API_KEY =
+            "https://ieeexploreapi.ieee.org/api/v1/search/articles?max_records=0&apikey=";
 
     private final ImportFormatPreferences importFormatPreferences;
     private final ImporterPreferences importerPreferences;
 
     private IEEEQueryTransformer transformer;
 
-    public IEEE(ImportFormatPreferences importFormatPreferences, ImporterPreferences importerPreferences) {
+    public IEEE(
+            ImportFormatPreferences importFormatPreferences,
+            ImporterPreferences importerPreferences) {
         this.importFormatPreferences = Objects.requireNonNull(importFormatPreferences);
         this.importerPreferences = Objects.requireNonNull(importerPreferences);
     }
@@ -90,29 +96,42 @@ private static BibEntry parseJsonResponse(JSONObject jsonEntry, Character keywor
 
         final List<String> authors = new ArrayList<>();
         JSONObject authorsContainer = jsonEntry.optJSONObject("authors");
-        authorsContainer.getJSONArray("authors").forEach(authorPure -> {
-            JSONObject author = (JSONObject) authorPure;
-            authors.add(author.optString("full_name"));
-        });
+        authorsContainer
+                .getJSONArray("authors")
+                .forEach(
+                        authorPure -> {
+                            JSONObject author = (JSONObject) authorPure;
+                            authors.add(author.optString("full_name"));
+                        });
         entry.setField(StandardField.AUTHOR, String.join(" and ", authors));
         entry.setField(StandardField.LOCATION, jsonEntry.optString("conference_location"));
         entry.setField(StandardField.DOI, jsonEntry.optString("doi"));
         entry.setField(StandardField.YEAR, jsonEntry.optString("publication_year"));
-        entry.setField(StandardField.PAGES, jsonEntry.optString("start_page") + "--" + jsonEntry.optString("end_page"));
+        entry.setField(
+                StandardField.PAGES,
+                jsonEntry.optString("start_page") + "--" + jsonEntry.optString("end_page"));
 
         JSONObject keywordsContainer = jsonEntry.optJSONObject("index_terms");
         if (keywordsContainer != null) {
             if (keywordsContainer.has("ieee_terms")) {
-                keywordsContainer.getJSONObject("ieee_terms").getJSONArray("terms").forEach(data -> {
-                    String keyword = (String) data;
-                    entry.addKeyword(keyword, keywordSeparator);
-                });
+                keywordsContainer
+                        .getJSONObject("ieee_terms")
+                        .getJSONArray("terms")
+                        .forEach(
+                                data -> {
+                                    String keyword = (String) data;
+                                    entry.addKeyword(keyword, keywordSeparator);
+                                });
             }
             if (keywordsContainer.has("author_terms")) {
-                keywordsContainer.getJSONObject("author_terms").getJSONArray("terms").forEach(data -> {
-                    String keyword = (String) data;
-                    entry.addKeyword(keyword, keywordSeparator);
-                });
+                keywordsContainer
+                        .getJSONObject("author_terms")
+                        .getJSONArray("terms")
+                        .forEach(
+                                data -> {
+                                    String keyword = (String) data;
+                                    entry.addKeyword(keyword, keywordSeparator);
+                                });
             }
         }
 
@@ -160,7 +179,9 @@ public Optional<URL> findFullText(BibEntry entry) throws FetcherException {
         // If not, try DOI
         if (stampString.isEmpty()) {
             Optional<DOI> doi = entry.getField(StandardField.DOI).flatMap(DOI::parse);
-            if (doi.isPresent() && doi.get().getDOI().startsWith(IEEE_DOI) && doi.get().getExternalURI().isPresent()) {
+            if (doi.isPresent()
+                    && doi.get().getDOI().startsWith(IEEE_DOI)
+                    && doi.get().getExternalURI().isPresent()) {
                 // Download the HTML page from IEEE
                 URLDownload urlDownload = null;
                 try {
@@ -221,7 +242,10 @@ public TrustLevel getTrustLevel() {
     @Override
     public Parser getParser() {
         return inputStream -> {
-            String response = new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.joining(OS.NEWLINE));
+            String response =
+                    new BufferedReader(new InputStreamReader(inputStream))
+                            .lines()
+                            .collect(Collectors.joining(OS.NEWLINE));
             JSONObject jsonObject = new JSONObject(response);
 
             List<BibEntry> entries = new ArrayList<>();
@@ -229,18 +253,38 @@ public Parser getParser() {
                 JSONArray results = jsonObject.getJSONArray("articles");
                 for (int i = 0; i < results.length(); i++) {
                     JSONObject jsonEntry = results.getJSONObject(i);
-                    BibEntry entry = parseJsonResponse(jsonEntry, importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
+                    BibEntry entry =
+                            parseJsonResponse(
+                                    jsonEntry,
+                                    importFormatPreferences
+                                            .bibEntryPreferences()
+                                            .getKeywordSeparator());
                     boolean addEntry;
                     // In case entry has no year, add it
                     // In case an entry has a year, check if its in the year range
                     // The implementation uses some Java 8 Optional magic to implement that
                     if (entry.hasField(StandardField.YEAR)) {
-                        addEntry = entry.getField(StandardField.YEAR).filter(year -> {
-                            int yearAsInteger = Integer.parseInt(year);
-                            return
-                                    transformer.getStartYear().map(startYear -> yearAsInteger >= startYear).orElse(true) &&
-                                            transformer.getEndYear().map(endYear -> yearAsInteger <= endYear).orElse(true);
-                        }).isPresent();
+                        addEntry =
+                                entry.getField(StandardField.YEAR)
+                                        .filter(
+                                                year -> {
+                                                    int yearAsInteger = Integer.parseInt(year);
+                                                    return transformer
+                                                                    .getStartYear()
+                                                                    .map(
+                                                                            startYear ->
+                                                                                    yearAsInteger
+                                                                                            >= startYear)
+                                                                    .orElse(true)
+                                                            && transformer
+                                                                    .getEndYear()
+                                                                    .map(
+                                                                            endYear ->
+                                                                                    yearAsInteger
+                                                                                            <= endYear)
+                                                                    .orElse(true);
+                                                })
+                                        .isPresent();
                     } else {
                         addEntry = true;
                     }
@@ -274,12 +318,15 @@ public String getTestUrl() {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException {
-        // transformer is stored globally, because we need to filter out the bib entries by the year manually
+    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
+            throws URISyntaxException, MalformedURLException {
+        // transformer is stored globally, because we need to filter out the bib entries by the year
+        // manually
         // the transformer stores the min and max year
         transformer = new IEEEQueryTransformer();
         String transformedQuery = transformer.transformLuceneQuery(luceneQuery).orElse("");
-        URIBuilder uriBuilder = new URIBuilder("https://ieeexploreapi.ieee.org/api/v1/search/articles");
+        URIBuilder uriBuilder =
+                new URIBuilder("https://ieeexploreapi.ieee.org/api/v1/search/articles");
         uriBuilder.addParameter("apikey", getApiKey());
         if (!transformedQuery.isBlank()) {
             uriBuilder.addParameter("querytext", transformedQuery);
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java
index 8038ea2edd05..293b92f83111 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java
@@ -1,12 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.List;
-import java.util.Optional;
-
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.formatter.bibtexfields.ClearFormatter;
 import org.jabref.logic.formatter.bibtexfields.RemoveEnclosingBracesFormatter;
@@ -26,8 +21,12 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.List;
+import java.util.Optional;
 
 /**
  * Fetches data from the INSPIRE database.
@@ -55,9 +54,12 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(INSPIRE_HOST);
-        uriBuilder.addParameter("q", new DefaultLuceneQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
+        uriBuilder.addParameter(
+                "q",
+                new DefaultLuceneQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
         return uriBuilder.build().toURL();
     }
 
@@ -71,12 +73,15 @@ public URLDownload getUrlDownload(URL url) {
     @Override
     public void doPostCleanup(BibEntry entry) {
         // Remove strange "SLACcitation" field
-        new FieldFormatterCleanup(new UnknownField("SLACcitation"), new ClearFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(new UnknownField("SLACcitation"), new ClearFormatter())
+                .cleanup(entry);
 
         // Remove braces around content of "title" field
-        new FieldFormatterCleanup(StandardField.TITLE, new RemoveEnclosingBracesFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(StandardField.TITLE, new RemoveEnclosingBracesFormatter())
+                .cleanup(entry);
 
-        new FieldFormatterCleanup(StandardField.TITLE, new LatexToUnicodeFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(StandardField.TITLE, new LatexToUnicodeFormatter())
+                .cleanup(entry);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ISIDOREFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/ISIDOREFetcher.java
index 208ac5775425..78fe2af15681 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ISIDOREFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ISIDOREFetcher.java
@@ -1,20 +1,9 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.io.PushbackInputStream;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.StringJoiner;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
+import jakarta.ws.rs.core.MediaType;
 
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.PagedSearchBasedParserFetcher;
@@ -25,10 +14,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import jakarta.ws.rs.core.MediaType;
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jooq.lambda.Unchecked;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,6 +23,21 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
+import java.io.IOException;
+import java.io.PushbackInputStream;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.StringJoiner;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 /**
  * Fetcher for <a href="https://isidore.science">ISIDORE</a>```
  * Will take in the link to the website or the last six digits that identify the reference
@@ -49,7 +49,8 @@ public class ISIDOREFetcher implements PagedSearchBasedParserFetcher {
 
     private static final String SOURCE_WEB_SEARCH = "https://api.isidore.science/resource/search";
 
-    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactory.newInstance();
+    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY =
+            DocumentBuilderFactory.newInstance();
 
     @Override
     public Parser getParser() {
@@ -63,7 +64,8 @@ public Parser getParser() {
                 if (pushbackInputStream.available() < 5) {
                     // We guess, it's an error if less than 5
                     pushbackInputStream.unread(data);
-                    String error = new String(pushbackInputStream.readAllBytes(), StandardCharsets.UTF_8);
+                    String error =
+                            new String(pushbackInputStream.readAllBytes(), StandardCharsets.UTF_8);
                     throw new FetcherException(error);
                 }
 
@@ -96,7 +98,8 @@ public URLDownload getUrlDownload(URL url) {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
+            throws URISyntaxException, MalformedURLException {
         ISIDOREQueryTransformer queryTransformer = new ISIDOREQueryTransformer();
         String transformedQuery = queryTransformer.transformLuceneQuery(luceneQuery).orElse("");
         URIBuilder uriBuilder = new URIBuilder(SOURCE_WEB_SEARCH);
@@ -107,9 +110,12 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISynta
         uriBuilder.addParameter("replies", String.valueOf(getPageSize()));
         uriBuilder.addParameter("lang", "en");
         uriBuilder.addParameter("output", "xml");
-        queryTransformer.getParameterMap().forEach((k, v) -> {
-            uriBuilder.addParameter(k, v);
-        });
+        queryTransformer
+                .getParameterMap()
+                .forEach(
+                        (k, v) -> {
+                            uriBuilder.addParameter(k, v);
+                        });
 
         URL url = uriBuilder.build().toURL();
         LOGGER.debug("URl for query {}", url);
@@ -129,13 +135,36 @@ private List<BibEntry> parseXMl(Element element) {
     }
 
     private BibEntry xmlItemToBibEntry(Element itemElement) {
-        return new BibEntry(getType(itemElement.getElementsByTagName("types").item(0).getChildNodes()))
-                .withField(StandardField.TITLE, itemElement.getElementsByTagName("title").item(0).getTextContent().replace("\"", ""))
-                .withField(StandardField.AUTHOR, getAuthor(itemElement.getElementsByTagName("enrichedCreators").item(0)))
-                .withField(StandardField.YEAR, itemElement.getElementsByTagName("date").item(0).getChildNodes().item(1).getTextContent().substring(0, 4))
-                .withField(StandardField.JOURNAL, getJournal(itemElement.getElementsByTagName("dc:source")))
-                .withField(StandardField.PUBLISHER, getPublishers(itemElement.getElementsByTagName("publishers").item(0)))
-                .withField(StandardField.DOI, getDOI(itemElement.getElementsByTagName("ore").item(0).getChildNodes()));
+        return new BibEntry(
+                        getType(itemElement.getElementsByTagName("types").item(0).getChildNodes()))
+                .withField(
+                        StandardField.TITLE,
+                        itemElement
+                                .getElementsByTagName("title")
+                                .item(0)
+                                .getTextContent()
+                                .replace("\"", ""))
+                .withField(
+                        StandardField.AUTHOR,
+                        getAuthor(itemElement.getElementsByTagName("enrichedCreators").item(0)))
+                .withField(
+                        StandardField.YEAR,
+                        itemElement
+                                .getElementsByTagName("date")
+                                .item(0)
+                                .getChildNodes()
+                                .item(1)
+                                .getTextContent()
+                                .substring(0, 4))
+                .withField(
+                        StandardField.JOURNAL,
+                        getJournal(itemElement.getElementsByTagName("dc:source")))
+                .withField(
+                        StandardField.PUBLISHER,
+                        getPublishers(itemElement.getElementsByTagName("publishers").item(0)))
+                .withField(
+                        StandardField.DOI,
+                        getDOI(itemElement.getElementsByTagName("ore").item(0).getChildNodes()));
     }
 
     private String getDOI(NodeList list) {
@@ -176,14 +205,18 @@ private String getAuthor(Node itemElement) {
         // For some reason the author field sometimes has extra numbers and letters.
         StringJoiner stringJoiner = new StringJoiner(" and ");
         for (int i = 1; i < itemElement.getChildNodes().getLength(); i += 2) {
-            String next = removeNumbers(itemElement.getChildNodes().item(i).getTextContent()).replaceAll("\\s+", " ");
+            String next =
+                    removeNumbers(itemElement.getChildNodes().item(i).getTextContent())
+                            .replaceAll("\\s+", " ");
             next = next.replace("\n", "");
             if (next.isBlank()) {
                 continue;
             }
             stringJoiner.add(next);
         }
-        return (stringJoiner.toString().substring(0, stringJoiner.length())).trim().replaceAll("\\s+", " ");
+        return (stringJoiner.toString().substring(0, stringJoiner.length()))
+                .trim()
+                .replaceAll("\\s+", " ");
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
index 65899f49237e..841e64b1bd91 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
@@ -1,14 +1,5 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.FulltextFetcher;
 import org.jabref.logic.importer.IdBasedFetcher;
@@ -20,10 +11,18 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+
 public class IacrEprintFetcher implements FulltextFetcher, IdBasedFetcher {
     public static final String NAME = "IACR eprints";
 
@@ -31,7 +30,8 @@ public class IacrEprintFetcher implements FulltextFetcher, IdBasedFetcher {
 
     private static final Pattern WITHOUT_LETTERS_SPACE = Pattern.compile("[^0-9/]");
 
-    private static final Predicate<String> IDENTIFIER_PREDICATE = Pattern.compile("\\d{4}/\\d{3,5}").asPredicate();
+    private static final Predicate<String> IDENTIFIER_PREDICATE =
+            Pattern.compile("\\d{4}/\\d{3,5}").asPredicate();
     private static final String CITATION_URL_PREFIX = "https://eprint.iacr.org/";
     private static final String DESCRIPTION_URL_PREFIX = "https://eprint.iacr.org/";
     private static final String FULLTEXT_URL_PREFIX = "https://eprint.iacr.org/";
@@ -45,7 +45,8 @@ public IacrEprintFetcher(ImportFormatPreferences prefs) {
 
     @Override
     public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
-        String identifierWithoutLettersAndSpaces = WITHOUT_LETTERS_SPACE.matcher(identifier).replaceAll(" ").trim();
+        String identifierWithoutLettersAndSpaces =
+                WITHOUT_LETTERS_SPACE.matcher(identifier).replaceAll(" ").trim();
 
         if (!IDENTIFIER_PREDICATE.test(identifierWithoutLettersAndSpaces)) {
             throw new FetcherException(Localization.lang("Invalid identifier: '%0'.", identifier));
@@ -60,7 +61,8 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
         return entry;
     }
 
-    private Optional<BibEntry> createEntryFromIacrCitation(String validIdentifier) throws FetcherException {
+    private Optional<BibEntry> createEntryFromIacrCitation(String validIdentifier)
+            throws FetcherException {
         URL url;
         try {
             url = URI.create(CITATION_URL_PREFIX + validIdentifier).toURL();
@@ -71,12 +73,14 @@ private Optional<BibEntry> createEntryFromIacrCitation(String validIdentifier) t
         if (bibtexCitationHtml.contains("No such report found")) {
             throw new FetcherException(Localization.lang("No results found."));
         }
-        String actualEntry = getRequiredValueBetween("<pre id=\"bibtex\">", "</pre>", bibtexCitationHtml);
+        String actualEntry =
+                getRequiredValueBetween("<pre id=\"bibtex\">", "</pre>", bibtexCitationHtml);
 
         try {
             return BibtexParser.singleFromString(actualEntry, prefs);
         } catch (ParseException e) {
-            throw new FetcherException(Localization.lang("Entry from %0 could not be parsed.", "IACR"), e);
+            throw new FetcherException(
+                    Localization.lang("Entry from %0 could not be parsed.", "IACR"), e);
         }
     }
 
@@ -114,14 +118,17 @@ private String getVersion(String identifier, String versionHtml) throws FetcherE
     }
 
     private String getAbstract(String descriptiveHtml) throws FetcherException {
-        String startOfAbstractString = "<h5 class=\"mt-3\">Abstract</h5>\n    <p style=\"white-space: pre-wrap;\">";
-        String abstractText = getRequiredValueBetween(startOfAbstractString, "</p>", descriptiveHtml);
+        String startOfAbstractString =
+                "<h5 class=\"mt-3\">Abstract</h5>\n    <p style=\"white-space: pre-wrap;\">";
+        String abstractText =
+                getRequiredValueBetween(startOfAbstractString, "</p>", descriptiveHtml);
         return abstractText;
     }
 
     private String getDate(String descriptiveHtml) throws FetcherException {
         String startOfHistoryString = "<dt>History</dt>\n      \n      \n      <dd>";
-        String dateStringAsInHtml = getRequiredValueBetween(startOfHistoryString, ":", descriptiveHtml);
+        String dateStringAsInHtml =
+                getRequiredValueBetween(startOfHistoryString, ":", descriptiveHtml);
         return dateStringAsInHtml;
     }
 
@@ -130,10 +137,12 @@ private String getHtml(URL url) throws FetcherException {
         return download.asString();
     }
 
-    private String getRequiredValueBetween(String from, String to, String haystack) throws FetcherException {
+    private String getRequiredValueBetween(String from, String to, String haystack)
+            throws FetcherException {
         String value = StringUtil.substringBetween(haystack, from, to);
         if (value == null) {
-            throw new FetcherException(Localization.lang("Entry from %0 could not be parsed.", "IACR"));
+            throw new FetcherException(
+                    Localization.lang("Entry from %0 could not be parsed.", "IACR"));
         } else {
             return value;
         }
@@ -168,8 +177,10 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherExc
 
             String descriptiveHtml = getHtml(url);
             String startOfFulltextLink = "<a class=\"btn btn-sm btn-outline-dark\"";
-            String fulltextLinkAsInHtml = getRequiredValueBetween(startOfFulltextLink, ".pdf", descriptiveHtml);
-            // There is an additional "\n           href=\"/archive/" we have to remove - and for some reason,
+            String fulltextLinkAsInHtml =
+                    getRequiredValueBetween(startOfFulltextLink, ".pdf", descriptiveHtml);
+            // There is an additional "\n           href=\"/archive/" we have to remove - and for
+            // some reason,
             // getRequiredValueBetween refuses to match across the line break.
             fulltextLinkAsInHtml = fulltextLinkAsInHtml.replaceFirst(".*href=\"/", "").trim();
             String fulltextLink = FULLTEXT_URL_PREFIX + fulltextLinkAsInHtml + ".pdf";
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IssnFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/IssnFetcher.java
index 11f85d123048..3e4134c253b5 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IssnFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IssnFetcher.java
@@ -1,9 +1,5 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.IdBasedFetcher;
@@ -11,12 +7,15 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * Fetcher to generate the BibTex entry from an ISSN.
  * As an ISSN ist just a journal identifier, so we only return journal title and publisher
  * The idea is to use the {@link JournalInformationFetcher} to do a request for a given ISSN.
  */
-
 public class IssnFetcher implements EntryBasedFetcher, IdBasedFetcher {
 
     private final JournalInformationFetcher journalInformationFetcher;
@@ -29,8 +28,12 @@ public IssnFetcher() {
     public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
         Optional<String> issn = entry.getField(StandardField.ISSN);
         if (issn.isPresent()) {
-            Optional<JournalInformation> journalInformation = journalInformationFetcher.getJournalInformation(issn.get(), "");
-            return journalInformation.map(journalInfo -> journalInformationToBibEntry(journalInfo, issn.get())).stream().toList();
+            Optional<JournalInformation> journalInformation =
+                    journalInformationFetcher.getJournalInformation(issn.get(), "");
+            return journalInformation
+                    .map(journalInfo -> journalInformationToBibEntry(journalInfo, issn.get()))
+                    .stream()
+                    .toList();
         }
         return Collections.emptyList();
     }
@@ -42,11 +45,16 @@ public String getName() {
 
     @Override
     public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
-        Optional<JournalInformation> journalInformation = journalInformationFetcher.getJournalInformation(identifier, "");
-        return journalInformation.map(journalInfo -> journalInformationToBibEntry(journalInfo, identifier));
+        Optional<JournalInformation> journalInformation =
+                journalInformationFetcher.getJournalInformation(identifier, "");
+        return journalInformation.map(
+                journalInfo -> journalInformationToBibEntry(journalInfo, identifier));
     }
 
     private BibEntry journalInformationToBibEntry(JournalInformation journalInfo, String issn) {
-        return new BibEntry().withField(StandardField.JOURNALTITLE, journalInfo.title()).withField(StandardField.PUBLISHER, journalInfo.publisher()).withField(StandardField.ISSN, issn);
+        return new BibEntry()
+                .withField(StandardField.JOURNALTITLE, journalInfo.title())
+                .withField(StandardField.PUBLISHER, journalInfo.publisher())
+                .withField(StandardField.ISSN, issn);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/JournalInformationFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/JournalInformationFetcher.java
index 9a6f5c4340c4..4199d25be36f 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/JournalInformationFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/JournalInformationFetcher.java
@@ -1,30 +1,30 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.regex.Pattern;
-
 import javafx.util.Pair;
 
-import org.jabref.logic.importer.FetcherException;
-import org.jabref.logic.importer.WebFetcher;
-import org.jabref.logic.journals.JournalInformation;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.identifier.ISSN;
-
 import kong.unirest.core.HttpResponse;
 import kong.unirest.core.JsonNode;
 import kong.unirest.core.Unirest;
 import kong.unirest.core.json.JSONArray;
 import kong.unirest.core.json.JSONException;
 import kong.unirest.core.json.JSONObject;
+
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.WebFetcher;
+import org.jabref.logic.journals.JournalInformation;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.identifier.ISSN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.regex.Pattern;
+
 /**
  * Fetches journal information from the JabRef Web API
  */
@@ -40,7 +40,8 @@ public String getName() {
         return JournalInformationFetcher.NAME;
     }
 
-    public Optional<JournalInformation> getJournalInformation(String issnString, String journalName) throws FetcherException {
+    public Optional<JournalInformation> getJournalInformation(String issnString, String journalName)
+            throws FetcherException {
         ISSN issn = new ISSN(issnString);
         String cleanedISSN = "";
 
@@ -54,10 +55,11 @@ public Optional<JournalInformation> getJournalInformation(String issnString, Str
 
         JSONObject postData = buildPostData(cleanedISSN, journalName);
 
-        HttpResponse<JsonNode> httpResponse = Unirest.post(API_URL)
-                                                     .header("Content-Type", "application/json")
-                                                     .body(postData)
-                                                     .asJson();
+        HttpResponse<JsonNode> httpResponse =
+                Unirest.post(API_URL)
+                        .header("Content-Type", "application/json")
+                        .body(postData)
+                        .asJson();
 
         if (httpResponse.getBody() != null) {
             JSONObject responseJsonObject = httpResponse.getBody().getObject();
@@ -67,7 +69,8 @@ public Optional<JournalInformation> getJournalInformation(String issnString, Str
         return journalInformationOptional;
     }
 
-    private JournalInformation parseResponse(JSONObject responseJsonObject) throws FetcherException {
+    private JournalInformation parseResponse(JSONObject responseJsonObject)
+            throws FetcherException {
         String title = "";
         String publisher = "";
         String coverageStartYear = "";
@@ -119,19 +122,26 @@ private JournalInformation parseResponse(JSONObject responseJsonObject) throws F
                     if (citationInfo != null) {
                         docsThisYear = parseCitationInfo(citationInfo, "docsThisYear");
                         docsPrevious3Years = parseCitationInfo(citationInfo, "docsPrevious3Years");
-                        citableDocsPrevious3Years = parseCitationInfo(citationInfo, "citableDocsPrevious3Years");
+                        citableDocsPrevious3Years =
+                                parseCitationInfo(citationInfo, "citableDocsPrevious3Years");
                         citesOutgoing = parseCitationInfo(citationInfo, "citesOutgoing");
-                        citesOutgoingPerDoc = parseCitationInfo(citationInfo, "citesOutgoingPerDoc");
-                        citesIncomingByRecentlyPublished = parseCitationInfo(citationInfo, "citesIncomingByRecentlyPublished");
-                        citesIncomingPerDocByRecentlyPublished = parseCitationInfo(citationInfo, "citesIncomingPerDocByRecentlyPublished");
+                        citesOutgoingPerDoc =
+                                parseCitationInfo(citationInfo, "citesOutgoingPerDoc");
+                        citesIncomingByRecentlyPublished =
+                                parseCitationInfo(citationInfo, "citesIncomingByRecentlyPublished");
+                        citesIncomingPerDocByRecentlyPublished =
+                                parseCitationInfo(
+                                        citationInfo, "citesIncomingPerDocByRecentlyPublished");
                         sjrArray = parseCitationInfo(citationInfo, "sjrIndex");
                         snipArray = parseCitationInfo(citationInfo, "snipIndex");
                     }
                 } else {
-                    throw new FetcherException(Localization.lang("ISSN and/or journal name not found in catalog"));
+                    throw new FetcherException(
+                            Localization.lang("ISSN and/or journal name not found in catalog"));
                 }
             } else {
-                throw new FetcherException(Localization.lang("ISSN and/or journal name not found in catalog"));
+                throw new FetcherException(
+                        Localization.lang("ISSN and/or journal name not found in catalog"));
             }
         } catch (JSONException e) {
             throw new FetcherException(Localization.lang("Parsing error"), e);
@@ -156,8 +166,7 @@ private JournalInformation parseResponse(JSONObject responseJsonObject) throws F
                 citesOutgoing,
                 citesOutgoingPerDoc,
                 citesIncomingByRecentlyPublished,
-                citesIncomingPerDocByRecentlyPublished
-        );
+                citesIncomingPerDocByRecentlyPublished);
     }
 
     private static String getConcatenatedString(JSONObject jsonObject, String key) {
@@ -170,7 +179,8 @@ private static String getConcatenatedString(JSONObject jsonObject, String key) {
     }
 
     private JSONObject buildPostData(String issn, String journalName) {
-        String query = """
+        String query =
+                """
                 query GetJournal($issn: String, $name: String) {
                   journal(issn: $issn, name: $name) {
                     id
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/JstorFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/JstorFetcher.java
index 3eb00e2acae7..2c91da91a3b3 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/JstorFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/JstorFetcher.java
@@ -1,18 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.FulltextFetcher;
 import org.jabref.logic.importer.IdBasedParserFetcher;
@@ -25,17 +14,28 @@
 import org.jabref.logic.net.URLDownload;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 /**
  * Fetcher for jstor.org
  **/
-public class JstorFetcher implements SearchBasedParserFetcher, FulltextFetcher, IdBasedParserFetcher {
+public class JstorFetcher
+        implements SearchBasedParserFetcher, FulltextFetcher, IdBasedParserFetcher {
 
     private static final String HOST = "https://www.jstor.org";
     private static final String SEARCH_HOST = HOST + "/open/search";
@@ -49,9 +49,11 @@ public JstorFetcher(ImportFormatPreferences importFormatPreferences) {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(SEARCH_HOST);
-        uriBuilder.addParameter("Query", new JstorQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
+        uriBuilder.addParameter(
+                "Query", new JstorQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
         return uriBuilder.build().toURL();
     }
 
@@ -76,8 +78,10 @@ public URL getUrlForIdentifier(String identifier) throws MalformedURLException {
     public Parser getParser() {
         return inputStream -> {
             BibtexParser parser = new BibtexParser(importFormatPreferences);
-            String text = new BufferedReader(
-                    new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines().collect(Collectors.joining());
+            String text =
+                    new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))
+                            .lines()
+                            .collect(Collectors.joining());
 
             // does the input stream contain bibtex ?
             if (text.startsWith("@")) {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/LOBIDFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/LOBIDFetcher.java
index 68a10e8ab628..e1400d3d409c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/LOBIDFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/LOBIDFetcher.java
@@ -1,17 +1,10 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONObject;
 
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedParserFetcher;
 import org.jabref.logic.importer.Parser;
@@ -22,14 +15,21 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONObject;
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
 /**
  * Fetches data from the LOBID API
  *
@@ -57,10 +57,18 @@ public LOBIDFetcher(ImporterPreferences importerPreferences) {
      * @return URL
      */
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(API_URL);
-        uriBuilder.addParameter("q", new LOBIDQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")); // search query
-        uriBuilder.addParameter("from", String.valueOf(getPageSize() * pageNumber)); // from entry number, starts indexing at 0
+        uriBuilder.addParameter(
+                "q",
+                new LOBIDQueryTransformer()
+                        .transformLuceneQuery(luceneQuery)
+                        .orElse("")); // search query
+        uriBuilder.addParameter(
+                "from",
+                String.valueOf(
+                        getPageSize() * pageNumber)); // from entry number, starts indexing at 0
         uriBuilder.addParameter("size", String.valueOf(getPageSize()));
         uriBuilder.addParameter("format", "json");
         return uriBuilder.build().toURL();
@@ -69,7 +77,10 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISynta
     @Override
     public Parser getParser() {
         return inputStream -> {
-            String response = new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.joining(OS.NEWLINE));
+            String response =
+                    new BufferedReader(new InputStreamReader(inputStream))
+                            .lines()
+                            .collect(Collectors.joining(OS.NEWLINE));
             JSONObject jsonObject = new JSONObject(response);
 
             List<BibEntry> entries = new ArrayList<>();
@@ -95,10 +106,11 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) {
         JSONArray typeArray = jsonEntry.optJSONArray("type");
         String types = "";
         if (typeArray != null) {
-            List<String> typeList = IntStream.range(0, typeArray.length())
-                                             .mapToObj(typeArray::optString)
-                                             .filter(type -> !type.isEmpty())
-                                             .toList();
+            List<String> typeList =
+                    IntStream.range(0, typeArray.length())
+                            .mapToObj(typeArray::optString)
+                            .filter(type -> !type.isEmpty())
+                            .toList();
             types = String.join(", ", typeList);
             entry.setField(StandardField.TYPE, types);
         }
@@ -127,7 +139,8 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) {
         entry.setField(StandardField.ISSN, getFirstArrayElement(jsonEntry, "issn"));
         entry.setField(StandardField.TITLE, jsonEntry.optString("title", ""));
         entry.setField(StandardField.ABSTRACT, getFirstArrayElement(jsonEntry, "note"));
-        entry.setField(StandardField.TITLEADDON, getFirstArrayElement(jsonEntry, "otherTitleInformation"));
+        entry.setField(
+                StandardField.TITLEADDON, getFirstArrayElement(jsonEntry, "otherTitleInformation"));
         entry.setField(StandardField.EDITION, getFirstArrayElement(jsonEntry, "edition"));
 
         // authors
@@ -142,13 +155,18 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) {
         // publication
         Optional.ofNullable(jsonEntry.optJSONArray("publication"))
                 .map(array -> array.getJSONObject(0))
-                .ifPresent(publication -> {
-                    entry.setField(StandardField.PUBLISHER, getFirstArrayElement(publication, "publishedBy"));
-                    entry.setField(StandardField.LOCATION, getFirstArrayElement(publication, "location"));
-                    String date = publication.optString("startDate");
-                    entry.setField(StandardField.DATE, date);
-                    entry.setField(StandardField.YEAR, date);
-                });
+                .ifPresent(
+                        publication -> {
+                            entry.setField(
+                                    StandardField.PUBLISHER,
+                                    getFirstArrayElement(publication, "publishedBy"));
+                            entry.setField(
+                                    StandardField.LOCATION,
+                                    getFirstArrayElement(publication, "location"));
+                            String date = publication.optString("startDate");
+                            entry.setField(StandardField.DATE, date);
+                            entry.setField(StandardField.YEAR, date);
+                        });
 
         // url
         JSONObject describedBy = jsonEntry.optJSONObject("describedBy");
@@ -159,21 +177,23 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) {
         // language
         JSONArray languageArray = jsonEntry.optJSONArray("language");
         if (languageArray != null) {
-            List<String> languageList = IntStream.range(0, languageArray.length())
-                                                 .mapToObj(languageArray::getJSONObject)
-                                                 .filter(Objects::nonNull)
-                                                 .map(language -> language.optString("label"))
-                                                 .toList();
+            List<String> languageList =
+                    IntStream.range(0, languageArray.length())
+                            .mapToObj(languageArray::getJSONObject)
+                            .filter(Objects::nonNull)
+                            .map(language -> language.optString("label"))
+                            .toList();
             entry.setField(StandardField.LANGUAGE, String.join(" and ", languageList));
         }
 
         // keywords
         JSONArray keywordArray = jsonEntry.optJSONArray("subjectslabels");
         if (keywordArray != null) {
-            List<String> keywordList = IntStream.range(0, keywordArray.length())
-                                             .mapToObj(keywordArray::optString)
-                                             .filter(keyword -> !keyword.isEmpty())
-                                             .toList();
+            List<String> keywordList =
+                    IntStream.range(0, keywordArray.length())
+                            .mapToObj(keywordArray::optString)
+                            .filter(keyword -> !keyword.isEmpty())
+                            .toList();
             entry.setField(StandardField.KEYWORDS, String.join(", ", keywordList));
         }
 
@@ -182,17 +202,17 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) {
 
     private static List<String> getAuthorNames(JSONArray authors) {
         return IntStream.range(0, authors.length())
-                        .mapToObj(authors::getJSONObject)
-                        .map(author -> author.optJSONObject("agent"))
-                        .filter(Objects::nonNull)
-                        .map(agent -> agent.optString("label"))
-                        .toList();
+                .mapToObj(authors::getJSONObject)
+                .map(author -> author.optJSONObject("agent"))
+                .filter(Objects::nonNull)
+                .map(agent -> agent.optString("label"))
+                .toList();
     }
 
     private static String getFirstArrayElement(JSONObject jsonEntry, String key) {
         return Optional.ofNullable(jsonEntry.optJSONArray(key))
-                       .map(array -> array.getString(0))
-                       .orElse("");
+                .map(array -> array.getString(0))
+                .orElse("");
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java b/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java
index 6471c36aae6e..1bc1943b942b 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-
+import org.apache.hc.core5.net.URIBuilder;
 import org.jabref.logic.importer.IdBasedParserFetcher;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.fileformat.ModsImporter;
 
-import org.apache.hc.core5.net.URIBuilder;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
 
 /**
  * Fetcher for the Library of Congress Control Number (LCCN) using https://lccn.loc.gov/
@@ -28,7 +27,8 @@ public String getName() {
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException {
+    public URL getUrlForIdentifier(String identifier)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder("https://lccn.loc.gov/" + identifier + "/mods");
         return uriBuilder.build().toURL();
     }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java b/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
index 2a8662f10950..b315a5d2c899 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
@@ -1,19 +1,12 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
+import kong.unirest.core.JsonNode;
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONException;
+import kong.unirest.core.json.JSONObject;
 
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.cleanup.DoiCleanup;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.cleanup.MoveFieldCleanup;
@@ -35,31 +28,39 @@
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
-import kong.unirest.core.JsonNode;
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONException;
-import kong.unirest.core.json.JSONObject;
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
 /**
  * Fetches data from the <a href="http://www.ams.org/mathscinet">MathSciNet</a> API.
  */
-public class MathSciNet implements SearchBasedParserFetcher, EntryBasedParserFetcher, IdBasedParserFetcher {
+public class MathSciNet
+        implements SearchBasedParserFetcher, EntryBasedParserFetcher, IdBasedParserFetcher {
     private static final Logger LOGGER = LoggerFactory.getLogger(MathSciNet.class);
 
-    private static final Map<StandardField, List<String>> FIELD_MAPPINGS = Map.of(
-            StandardField.TITLE, List.of("titles", "title"),
-            StandardField.YEAR, List.of("issue", "issue", "pubYear"),
-            StandardField.JOURNAL, List.of("issue", "issue", "journal", "shortTitle"),
-            StandardField.VOLUME, List.of("issue", "issue", "volume"),
-            StandardField.NUMBER, List.of("issue", "issue", "number"),
-            StandardField.PAGES, List.of("paging", "paging", "text"),
-            StandardField.ISSN, List.of("issue", "issue", "journal", "issn")
-    );
+    private static final Map<StandardField, List<String>> FIELD_MAPPINGS =
+            Map.of(
+                    StandardField.TITLE, List.of("titles", "title"),
+                    StandardField.YEAR, List.of("issue", "issue", "pubYear"),
+                    StandardField.JOURNAL, List.of("issue", "issue", "journal", "shortTitle"),
+                    StandardField.VOLUME, List.of("issue", "issue", "volume"),
+                    StandardField.NUMBER, List.of("issue", "issue", "number"),
+                    StandardField.PAGES, List.of("paging", "paging", "text"),
+                    StandardField.ISSN, List.of("issue", "issue", "journal", "issn"));
 
     private final ImportFormatPreferences preferences;
 
@@ -77,14 +78,16 @@ public String getName() {
      * without subscription and, moreover, is optimized for finding a publication based on partial information.
      */
     @Override
-    public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForEntry(BibEntry entry)
+            throws URISyntaxException, MalformedURLException, FetcherException {
         Optional<String> mrNumberInEntry = entry.getField(StandardField.MR_NUMBER);
         if (mrNumberInEntry.isPresent()) {
             // We are lucky and already know the id, so use it instead
             return getUrlForIdentifier(mrNumberInEntry.get());
         }
 
-        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mathscinet/api/freetools/mrlookup");
+        URIBuilder uriBuilder =
+                new URIBuilder("https://mathscinet.ams.org/mathscinet/api/freetools/mrlookup");
 
         uriBuilder.addParameter("author", entry.getFieldOrAlias(StandardField.AUTHOR).orElse(""));
         uriBuilder.addParameter("title", entry.getFieldOrAlias(StandardField.TITLE).orElse(""));
@@ -97,17 +100,25 @@ public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedUR
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException {
-        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mathscinet/api/publications/search");
-        uriBuilder.addParameter("query", new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")); // query
+    public URL getURLForQuery(QueryNode luceneQuery)
+            throws URISyntaxException, MalformedURLException {
+        URIBuilder uriBuilder =
+                new URIBuilder("https://mathscinet.ams.org/mathscinet/api/publications/search");
+        uriBuilder.addParameter(
+                "query",
+                new DefaultQueryTransformer()
+                        .transformLuceneQuery(luceneQuery)
+                        .orElse("")); // query
         uriBuilder.addParameter("currentPage", "1"); // start index
         uriBuilder.addParameter("pageSize", "100"); // page size
         return uriBuilder.build().toURL();
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException {
-        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mathscinet/api/publications/format");
+    public URL getUrlForIdentifier(String identifier)
+            throws URISyntaxException, MalformedURLException {
+        URIBuilder uriBuilder =
+                new URIBuilder("https://mathscinet.ams.org/mathscinet/api/publications/format");
         uriBuilder.addParameter("formats", "bib");
         uriBuilder.addParameter("ids", identifier); // identifier
 
@@ -117,12 +128,16 @@ public URL getUrlForIdentifier(String identifier) throws URISyntaxException, Mal
     @Override
     public Parser getParser() {
         return inputStream -> {
-            String response = new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.joining(OS.NEWLINE));
+            String response =
+                    new BufferedReader(new InputStreamReader(inputStream))
+                            .lines()
+                            .collect(Collectors.joining(OS.NEWLINE));
             List<BibEntry> entries = new ArrayList<>();
             BibtexParser bibtexParser = new BibtexParser(preferences, new DummyFileUpdateMonitor());
 
             try {
-                // Depending on the type of query we might get either a json object or directly a json array
+                // Depending on the type of query we might get either a json object or directly a
+                // json array
                 JsonNode node = new JsonNode(response);
 
                 if (node.isArray()) {
@@ -138,9 +153,11 @@ public Parser getParser() {
                     var element = node.getObject();
 
                     if (element.has("all")) {
-                        JSONArray entriesArray = element.getJSONObject("all").getJSONArray("results");
+                        JSONArray entriesArray =
+                                element.getJSONObject("all").getJSONArray("results");
                         for (int i = 0; i < entriesArray.length(); i++) {
-                            String bibTexFormat = entriesArray.getJSONObject(i).getString("bibTexFormat");
+                            String bibTexFormat =
+                                    entriesArray.getJSONObject(i).getString("bibTexFormat");
                             entries.addAll(bibtexParser.parseEntries(bibTexFormat));
                         }
                     } else if (element.has("results")) {
@@ -179,11 +196,16 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
                 value.ifPresent(v -> entry.setField(field, v));
             }
 
-            // Handle articleUrl and mrnumber fields separately, as they are non-nested properties in the JSON and can be retrieved as Strings directly
+            // Handle articleUrl and mrnumber fields separately, as they are non-nested properties
+            // in the JSON and can be retrieved as Strings directly
             String doi = item.optString("articleUrl");
             if (!doi.isEmpty()) {
                 try {
-                    DOI.parse(doi).ifPresent(validDoi -> entry.setField(StandardField.DOI, validDoi.getNormalized()));
+                    DOI.parse(doi)
+                            .ifPresent(
+                                    validDoi ->
+                                            entry.setField(
+                                                    StandardField.DOI, validDoi.getNormalized()));
                 } catch (IllegalArgumentException e) {
                     // If DOI parsing fails, use the original DOI string
                     entry.setField(StandardField.DOI, doi);
@@ -206,13 +228,15 @@ private Optional<String> toAuthors(JSONArray authors) {
             return Optional.empty();
         }
 
-        String authorsString = IntStream.range(0, authors.length())
-                                        .mapToObj(authors::getJSONObject)
-                                        .map(author -> {
-                                            String name = author.optString("name", "");
-                                            return fixStringEncoding(name);
-                                        })
-                                        .collect(Collectors.joining(" and "));
+        String authorsString =
+                IntStream.range(0, authors.length())
+                        .mapToObj(authors::getJSONObject)
+                        .map(
+                                author -> {
+                                    String name = author.optString("name", "");
+                                    return fixStringEncoding(name);
+                                })
+                        .collect(Collectors.joining(" and "));
 
         return Optional.of(authorsString);
     }
@@ -250,7 +274,6 @@ private Optional<String> getOthers(JSONObject item, List<String> keys) {
      * If we don't convert to the correct character set, the parser outputs anomalous characters.
      * This is observed in case of non-UTF-8 characters, such as accented characters.
      */
-
     private String fixStringEncoding(String value) {
         return new String(value.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
     }
@@ -259,7 +282,8 @@ private String fixStringEncoding(String value) {
     public void doPostCleanup(BibEntry entry) {
         new MoveFieldCleanup(AMSField.FJOURNAL, StandardField.JOURNAL).cleanup(entry);
         new MoveFieldCleanup(new UnknownField("mrclass"), StandardField.KEYWORDS).cleanup(entry);
-        new FieldFormatterCleanup(new UnknownField("mrreviewer"), new ClearFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(new UnknownField("mrreviewer"), new ClearFormatter())
+                .cleanup(entry);
         new DoiCleanup().cleanup(entry);
         new FieldFormatterCleanup(StandardField.URL, new ClearFormatter()).cleanup(entry);
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
index 1ff01428aa61..e6f755d48d5e 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
@@ -1,23 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.formatter.bibtexfields.ClearFormatter;
 import org.jabref.logic.formatter.bibtexfields.NormalizeMonthFormatter;
@@ -34,12 +18,27 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
 /**
  * Fetch or search from PubMed <a href="http://www.ncbi.nlm.nih.gov/sites/entrez/">www.ncbi.nlm.nih.gov</a>
  * The MedlineFetcher fetches the entries from the PubMed database.
@@ -49,8 +48,10 @@ public class MedlineFetcher implements IdBasedParserFetcher, SearchBasedFetcher
     private static final Logger LOGGER = LoggerFactory.getLogger(MedlineFetcher.class);
 
     private static final int NUMBER_TO_FETCH = 50;
-    private static final String ID_URL = "https://eutils.ncbi.nlm.nih.gov/entrez/eutils/efetch.fcgi";
-    private static final String SEARCH_URL = "https://eutils.ncbi.nlm.nih.gov/entrez/eutils/esearch.fcgi";
+    private static final String ID_URL =
+            "https://eutils.ncbi.nlm.nih.gov/entrez/eutils/efetch.fcgi";
+    private static final String SEARCH_URL =
+            "https://eutils.ncbi.nlm.nih.gov/entrez/eutils/esearch.fcgi";
 
     private int numberOfResultsFound;
 
@@ -98,7 +99,8 @@ private List<String> getPubMedIdsFromQuery(String query) throws FetcherException
                         break;
 
                     case XMLStreamConstants.END_ELEMENT:
-                        // Everything relevant is listed before the IdList. So we break the loop right after the IdList tag closes.
+                        // Everything relevant is listed before the IdList. So we break the loop
+                        // right after the IdList tag closes.
                         if ("IdList".equals(streamReader.getName().toString())) {
                             break fetchLoop;
                         }
@@ -108,9 +110,12 @@ private List<String> getPubMedIdsFromQuery(String query) throws FetcherException
             streamReader.close();
             return idList;
         } catch (IOException | URISyntaxException e) {
-            throw new FetcherException("Unable to get PubMed IDs", Localization.lang("Unable to get PubMed IDs"), e);
+            throw new FetcherException(
+                    "Unable to get PubMed IDs", Localization.lang("Unable to get PubMed IDs"), e);
         } catch (XMLStreamException e) {
-            throw new FetcherException("Error while parsing ID list", Localization.lang("Error while parsing ID list"),
+            throw new FetcherException(
+                    "Error while parsing ID list",
+                    Localization.lang("Error while parsing ID list"),
                     e);
         }
     }
@@ -126,7 +131,8 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException {
+    public URL getUrlForIdentifier(String identifier)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(ID_URL);
         uriBuilder.addParameter("db", "pubmed");
         uriBuilder.addParameter("retmode", "xml");
@@ -141,12 +147,16 @@ public Parser getParser() {
 
     @Override
     public void doPostCleanup(BibEntry entry) {
-        new FieldFormatterCleanup(new UnknownField("journal-abbreviation"), new ClearFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(new UnknownField("journal-abbreviation"), new ClearFormatter())
+                .cleanup(entry);
         new FieldFormatterCleanup(new UnknownField("status"), new ClearFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(new UnknownField("copyright"), new ClearFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(new UnknownField("copyright"), new ClearFormatter())
+                .cleanup(entry);
 
-        new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.AUTHOR, new NormalizeNamesFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter())
+                .cleanup(entry);
+        new FieldFormatterCleanup(StandardField.AUTHOR, new NormalizeNamesFormatter())
+                .cleanup(entry);
     }
 
     private URL createSearchUrl(String query) throws URISyntaxException, MalformedURLException {
@@ -170,8 +180,13 @@ private List<BibEntry> fetchMedline(List<String> ids) throws FetcherException {
             // Separate the IDs with a comma to search multiple entries
             URL fetchURL = getUrlForIdentifier(String.join(",", ids));
             URLConnection data = fetchURL.openConnection();
-            ParserResult result = new MedlineImporter().importDatabase(
-                    new BufferedReader(new InputStreamReader(data.getInputStream(), StandardCharsets.UTF_8)));
+            ParserResult result =
+                    new MedlineImporter()
+                            .importDatabase(
+                                    new BufferedReader(
+                                            new InputStreamReader(
+                                                    data.getInputStream(),
+                                                    StandardCharsets.UTF_8)));
             if (result.hasWarnings()) {
                 LOGGER.warn(result.getErrorMessage());
             }
@@ -179,11 +194,15 @@ private List<BibEntry> fetchMedline(List<String> ids) throws FetcherException {
             resultList.forEach(this::doPostCleanup);
             return resultList;
         } catch (URISyntaxException | MalformedURLException e) {
-            throw new FetcherException("Error while generating fetch URL",
-                    Localization.lang("Error while generating fetch URL"), e);
+            throw new FetcherException(
+                    "Error while generating fetch URL",
+                    Localization.lang("Error while generating fetch URL"),
+                    e);
         } catch (IOException e) {
-            throw new FetcherException("Error while fetching from Medline",
-                    Localization.lang("Error while fetching from %0", "Medline"), e);
+            throw new FetcherException(
+                    "Error while fetching from Medline",
+                    Localization.lang("Error while fetching from %0", "Medline"),
+                    e);
         }
     }
 
@@ -204,10 +223,13 @@ public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherExcepti
                 return Collections.emptyList();
             }
             if (numberOfResultsFound > NUMBER_TO_FETCH) {
-                LOGGER.info("{} results found. Only 50 relevant results will be fetched by default.", numberOfResultsFound);
+                LOGGER.info(
+                        "{} results found. Only 50 relevant results will be fetched by default.",
+                        numberOfResultsFound);
             }
 
-            // pass the list of ids to fetchMedline to download them. like a id fetcher for mutliple ids
+            // pass the list of ids to fetchMedline to download them. like a id fetcher for mutliple
+            // ids
             entryList = fetchMedline(idList);
 
             return entryList;
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/Medra.java b/src/main/java/org/jabref/logic/importer/fetcher/Medra.java
index 7566f50f4d88..7a22a32706bb 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/Medra.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/Medra.java
@@ -1,12 +1,8 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Optional;
-import java.util.stream.IntStream;
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONException;
+import kong.unirest.core.json.JSONObject;
 
 import org.jabref.logic.cleanup.DoiCleanup;
 import org.jabref.logic.importer.IdBasedParserFetcher;
@@ -22,9 +18,13 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONException;
-import kong.unirest.core.json.JSONObject;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.stream.IntStream;
 
 /**
  * A class for fetching DOIs from Medra
@@ -59,12 +59,14 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
             return new BibEntry(convertType(item.getString("type")))
                     .withField(StandardField.TITLE, item.getString("title"))
                     .withField(StandardField.AUTHOR, toAuthors(item.optJSONArray("author")))
-                    .withField(StandardField.YEAR,
+                    .withField(
+                            StandardField.YEAR,
                             Optional.ofNullable(item.optJSONObject("issued"))
                                     .map(array -> array.optJSONArray("date-parts"))
                                     .map(array -> array.optJSONArray(0))
                                     .map(array -> array.optInt(0))
-                                    .map(year -> Integer.toString(year)).orElse(""))
+                                    .map(year -> Integer.toString(year))
+                                    .orElse(""))
                     .withField(StandardField.DOI, item.getString("DOI"))
                     .withField(StandardField.PAGES, item.optString("page"))
                     .withField(StandardField.ISSN, item.optString("ISSN"))
@@ -87,12 +89,20 @@ private String toAuthors(JSONArray authors) {
         }
         // input: list of {"literal":"A."}
         return IntStream.range(0, authors.length())
-                        .mapToObj(authors::getJSONObject)
-                        .map(author -> author.has("literal") ? // quickly route through the literal string
-                                new Author(author.getString("literal"), "", "", "", "") :
-                                new Author(author.optString("given", ""), "", "", author.optString("family", ""), ""))
-                        .collect(AuthorList.collect())
-                        .getAsFirstLastNamesWithAnd();
+                .mapToObj(authors::getJSONObject)
+                .map(
+                        author ->
+                                author.has("literal")
+                                        ? // quickly route through the literal string
+                                        new Author(author.getString("literal"), "", "", "", "")
+                                        : new Author(
+                                                author.optString("given", ""),
+                                                "",
+                                                "",
+                                                author.optString("family", ""),
+                                                ""))
+                .collect(AuthorList.collect())
+                .getAsFirstLastNamesWithAnd();
     }
 
     @Override
@@ -103,7 +113,8 @@ public URLDownload getUrlDownload(URL url) {
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException {
+    public URL getUrlForIdentifier(String identifier)
+            throws URISyntaxException, MalformedURLException {
         return URI.create(API_URL + "/" + identifier).toURL();
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
index 570e9777a3f7..3a7144c650f2 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
@@ -1,14 +1,6 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Optional;
-
+import org.apache.hc.core5.net.URIBuilder;
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ParserResult;
@@ -19,11 +11,18 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
-import org.apache.hc.core5.net.URIBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * This class is responsible for getting the recommendations from Mr. DLib
  */
@@ -32,7 +31,8 @@ public class MrDLibFetcher implements EntryBasedFetcher {
     private static final String NAME = "MDL_FETCHER";
     private static final String MDL_JABREF_PARTNER_ID = "1";
     private static final String MDL_URL = "api.mr-dlib.org";
-    private static final String DEFAULT_MRDLIB_ERROR_MESSAGE = Localization.lang("Error while fetching recommendations from Mr.DLib.");
+    private static final String DEFAULT_MRDLIB_ERROR_MESSAGE =
+            Localization.lang("Error while fetching recommendations from Mr.DLib.");
     private final String LANGUAGE;
     private final Version VERSION;
     private String heading;
@@ -117,7 +117,8 @@ private String makeServerRequest(URL url) throws FetcherException {
      * @param queryWithTitle the query holds the title of the selected entry. Used to make a query to the MDL Server
      * @return the string used to make the query at mdl server
      */
-    private URL constructQuery(String queryWithTitle) throws URISyntaxException, MalformedURLException {
+    private URL constructQuery(String queryWithTitle)
+            throws URISyntaxException, MalformedURLException {
         // The encoding does not work for / so we convert them by our own
         queryWithTitle = queryWithTitle.replace("/", " ");
         URIBuilder builder = new URIBuilder();
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MrDlibPreferences.java b/src/main/java/org/jabref/logic/importer/fetcher/MrDlibPreferences.java
index acf52b8a7e68..2b54f3c4b52c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MrDlibPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MrDlibPreferences.java
@@ -10,7 +10,11 @@ public class MrDlibPreferences {
     private final BooleanProperty sendOs;
     private final BooleanProperty sendTimezone;
 
-    public MrDlibPreferences(boolean acceptRecommendations, boolean shouldSendLanguage, boolean shouldSendOs, boolean shouldSendTimezone) {
+    public MrDlibPreferences(
+            boolean acceptRecommendations,
+            boolean shouldSendLanguage,
+            boolean shouldSendOs,
+            boolean shouldSendTimezone) {
         this.acceptRecommendations = new SimpleBooleanProperty(acceptRecommendations);
         this.sendLanguage = new SimpleBooleanProperty(shouldSendLanguage);
         this.sendOs = new SimpleBooleanProperty(shouldSendOs);
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java b/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java
index 9e12625e4fdd..36789c6093b9 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java
@@ -1,24 +1,24 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Objects;
-import java.util.Optional;
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.JsonNode;
+import kong.unirest.core.Unirest;
+import kong.unirest.core.UnirestException;
 
 import org.jabref.logic.importer.FulltextFetcher;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
-
-import kong.unirest.core.HttpResponse;
-import kong.unirest.core.JsonNode;
-import kong.unirest.core.Unirest;
-import kong.unirest.core.UnirestException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * A fulltext fetcher that uses <a href="https://oadoi.org/">oaDOI</a>.
  *
@@ -33,8 +33,7 @@ public class OpenAccessDoi implements FulltextFetcher {
     public Optional<URL> findFullText(BibEntry entry) throws IOException {
         Objects.requireNonNull(entry);
 
-        Optional<DOI> doi = entry.getField(StandardField.DOI)
-                                 .flatMap(DOI::parse);
+        Optional<DOI> doi = entry.getField(StandardField.DOI).flatMap(DOI::parse);
 
         if (doi.isEmpty()) {
             return Optional.empty();
@@ -53,25 +52,27 @@ public TrustLevel getTrustLevel() {
     }
 
     public Optional<URL> findFullText(DOI doi) throws UnirestException {
-        HttpResponse<JsonNode> request = Unirest.get(API_URL + doi.getDOI() + "?email=developers@jabref.org")
-                                                .header("accept", "application/json")
-                                                .asJson();
+        HttpResponse<JsonNode> request =
+                Unirest.get(API_URL + doi.getDOI() + "?email=developers@jabref.org")
+                        .header("accept", "application/json")
+                        .asJson();
 
         return Optional.of(request)
-                       .map(HttpResponse::getBody)
-                       .filter(Objects::nonNull)
-                       .map(JsonNode::getObject)
-                       .filter(Objects::nonNull)
-                       .map(root -> root.optJSONObject("best_oa_location"))
-                       .filter(Objects::nonNull)
-                       .map(location -> location.optString("url"))
-                       .flatMap(url -> {
-                           try {
-                               return Optional.of(URI.create(url).toURL());
-                           } catch (MalformedURLException e) {
-                               LOGGER.debug("Could not determine URL to fetch full text from", e);
-                               return Optional.empty();
-                           }
-                       });
+                .map(HttpResponse::getBody)
+                .filter(Objects::nonNull)
+                .map(JsonNode::getObject)
+                .filter(Objects::nonNull)
+                .map(root -> root.optJSONObject("best_oa_location"))
+                .filter(Objects::nonNull)
+                .map(location -> location.optString("url"))
+                .flatMap(
+                        url -> {
+                            try {
+                                return Optional.of(URI.create(url).toURL());
+                            } catch (MalformedURLException e) {
+                                LOGGER.debug("Could not determine URL to fetch full text from", e);
+                                return Optional.empty();
+                            }
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ResearchGate.java b/src/main/java/org/jabref/logic/importer/fetcher/ResearchGate.java
index 6e4f3269fdd3..e25f0bc7bcc5 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ResearchGate.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ResearchGate.java
@@ -1,18 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.FulltextFetcher;
@@ -27,9 +16,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
-
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jsoup.Connection;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -37,6 +23,19 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class ResearchGate implements FulltextFetcher, EntryBasedFetcher, SearchBasedFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ResearchGate.class);
@@ -44,7 +43,8 @@ public class ResearchGate implements FulltextFetcher, EntryBasedFetcher, SearchB
     private static final String GOOGLE_SEARCH = "https://www.google.com/search?q=";
     private static final String GOOGLE_SITE = "%20site:researchgate.net";
     private static final String SEARCH = "https://www.researchgate.net/search.Search.html?";
-    private static final String SEARCH_FOR_BIB_ENTRY = "https://www.researchgate.net/lite.publication.PublicationDownloadCitationModal.downloadCitation.html?fileType=BibTeX&citation=citationAndAbstract&publicationUid=";
+    private static final String SEARCH_FOR_BIB_ENTRY =
+            "https://www.researchgate.net/lite.publication.PublicationDownloadCitationModal.downloadCitation.html?fileType=BibTeX&citation=citationAndAbstract&publicationUid=";
     private final ImportFormatPreferences formatPreferences;
 
     public ResearchGate(ImportFormatPreferences importFormatPreferences) {
@@ -128,15 +128,18 @@ Optional<String> getURLByString(String query) throws IOException, FetcherExcepti
 
             URLDownload urlDownload = new URLDownload(source.toString());
             urlDownload.getCookieFromUrl();
-            Document html = Jsoup.connect(source.toString())
-                                 .userAgent(URLDownload.USER_AGENT)
-                                 .referrer("www.google.com")
-                                 .ignoreHttpErrors(true)
-                                 .get();
+            Document html =
+                    Jsoup.connect(source.toString())
+                            .userAgent(URLDownload.USER_AGENT)
+                            .referrer("www.google.com")
+                            .ignoreHttpErrors(true)
+                            .get();
 
-            link = HOST + Objects.requireNonNull(html.getElementById("content"))
-                                 .select("a[href^=publication/]")
-                                 .attr("href");
+            link =
+                    HOST
+                            + Objects.requireNonNull(html.getElementById("content"))
+                                    .select("a[href^=publication/]")
+                                    .attr("href");
             if (link.contains("?")) {
                 link = link.substring(0, link.indexOf("?"));
             }
@@ -156,14 +159,14 @@ Optional<String> getURLByDoi(DOI doi) throws IOException, NullPointerException {
 
             source = new URIBuilder(GOOGLE_SEARCH + doi.getDOI() + GOOGLE_SITE);
             Connection connection = Jsoup.connect(source.toString());
-            Document html = connection
-                    .cookieStore(connection.cookieStore())
-                    .userAgent(URLDownload.USER_AGENT)
-                    .ignoreHttpErrors(true)
-                    .get();
+            Document html =
+                    connection
+                            .cookieStore(connection.cookieStore())
+                            .userAgent(URLDownload.USER_AGENT)
+                            .ignoreHttpErrors(true)
+                            .get();
 
-            link = Objects.requireNonNull(html.getElementById("search"))
-                          .select("a").attr("href");
+            link = Objects.requireNonNull(html.getElementById("search")).select("a").attr("href");
         } catch (URISyntaxException e) {
             return Optional.empty();
         }
@@ -173,10 +176,10 @@ Optional<String> getURLByDoi(DOI doi) throws IOException, NullPointerException {
 
     private Document getPage(URL url) throws IOException {
         return Jsoup.connect(url.toString())
-                    .userAgent(URLDownload.USER_AGENT)
-                    .referrer("www.google.com")
-                    .ignoreHttpErrors(true)
-                    .get();
+                .userAgent(URLDownload.USER_AGENT)
+                .referrer("www.google.com")
+                .ignoreHttpErrors(true)
+                .get();
     }
 
     /**
@@ -187,7 +190,8 @@ private Document getPage(URL url) throws IOException {
      * @param luceneQuery the search query.
      * @return A URL that lets us download a .bib file
      */
-    private static URL getUrlForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException {
+    private static URL getUrlForQuery(QueryNode luceneQuery)
+            throws URISyntaxException, MalformedURLException {
         String query = new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("");
         URIBuilder source = new URIBuilder(SEARCH);
         source.addParameter("type", "publication");
@@ -229,14 +233,19 @@ public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherExcepti
         }
 
         Elements sol = html.getElementsByClass("nova-legacy-v-publication-item__title");
-        List<String> urls = sol.select("a").eachAttr("href").stream()
-                               .filter(stream -> stream.contains("publication/"))
-                               .map(resultStream -> resultStream.substring(resultStream.indexOf("publication/") + 12, resultStream.indexOf("_")))
-                               .map(idStream -> SEARCH_FOR_BIB_ENTRY + idStream)
-                               .map(this::getInputStream)
-                               .filter(Objects::nonNull)
-                               .map(stream -> stream.lines().collect(Collectors.joining(OS.NEWLINE)))
-                               .toList();
+        List<String> urls =
+                sol.select("a").eachAttr("href").stream()
+                        .filter(stream -> stream.contains("publication/"))
+                        .map(
+                                resultStream ->
+                                        resultStream.substring(
+                                                resultStream.indexOf("publication/") + 12,
+                                                resultStream.indexOf("_")))
+                        .map(idStream -> SEARCH_FOR_BIB_ENTRY + idStream)
+                        .map(this::getInputStream)
+                        .filter(Objects::nonNull)
+                        .map(stream -> stream.lines().collect(Collectors.joining(OS.NEWLINE)))
+                        .toList();
 
         List<BibEntry> list = new ArrayList<>();
         for (String bib : urls) {
@@ -283,4 +292,3 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
         return performSearch(new RTFChars().format(title.get()));
     }
 }
-
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java
index 43849ff3319c..b01c7d0fae8e 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Locale;
-import java.util.Optional;
-
+import org.apache.hc.core5.net.URIBuilder;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.IdBasedParserFetcher;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 
-import org.apache.hc.core5.net.URIBuilder;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Locale;
+import java.util.Optional;
 
 /*
  * https://datatracker.ietf.org
@@ -21,7 +20,7 @@
  */
 public class RfcFetcher implements IdBasedParserFetcher {
 
-    private final static String DRAFT_PREFIX = "draft";
+    private static final String DRAFT_PREFIX = "draft";
     private final ImportFormatPreferences importFormatPreferences;
 
     public RfcFetcher(ImportFormatPreferences importFormatPreferences) {
@@ -45,14 +44,18 @@ public Optional<HelpFile> getHelpPage() {
      * @return the URL of the RFC resource
      */
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException {
+    public URL getUrlForIdentifier(String identifier)
+            throws URISyntaxException, MalformedURLException {
         String prefixedIdentifier = identifier.toLowerCase(Locale.ENGLISH);
         // if not a "draft" version
-        if ((!prefixedIdentifier.startsWith(DRAFT_PREFIX)) && (!prefixedIdentifier.startsWith("rfc"))) {
+        if ((!prefixedIdentifier.startsWith(DRAFT_PREFIX))
+                && (!prefixedIdentifier.startsWith("rfc"))) {
             // Add "rfc" prefix if user's search entry was numerical
             prefixedIdentifier = "rfc" + prefixedIdentifier;
         }
-        URIBuilder uriBuilder = new URIBuilder("https://datatracker.ietf.org/doc/" + prefixedIdentifier + "/bibtex/");
+        URIBuilder uriBuilder =
+                new URIBuilder(
+                        "https://datatracker.ietf.org/doc/" + prefixedIdentifier + "/bibtex/");
         return uriBuilder.build().toURL();
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcher.java
index 3c1521e18615..9de7f80f76ee 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcher.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.IntStream;
+import jakarta.ws.rs.core.MediaType;
 
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONException;
+import kong.unirest.core.json.JSONObject;
+
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.importer.PagedSearchBasedParserFetcher;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.Parser;
@@ -19,16 +19,17 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import jakarta.ws.rs.core.MediaType;
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONException;
-import kong.unirest.core.json.JSONObject;
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.IntStream;
+
 public class ScholarArchiveFetcher implements PagedSearchBasedParserFetcher {
 
     public static final String FETCHER_NAME = "ScholarArchive";
@@ -45,9 +46,12 @@ public class ScholarArchiveFetcher implements PagedSearchBasedParserFetcher {
      * @return URL
      */
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(API_URL);
-        uriBuilder.addParameter("q", new ScholarArchiveQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
+        uriBuilder.addParameter(
+                "q",
+                new ScholarArchiveQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
         uriBuilder.addParameter("from", String.valueOf(getPageSize() * pageNumber));
         uriBuilder.addParameter("size", String.valueOf(getPageSize()));
         uriBuilder.addParameter("format", "json");
@@ -98,12 +102,17 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) throws ParseException {
             JSONObject biblio = jsonEntry.optJSONObject("biblio");
 
             JSONArray abstracts = jsonEntry.getJSONArray("abstracts");
-            String foundAbstract = IntStream.range(0, abstracts.length())
-                                            .mapToObj(abstracts::getJSONObject)
-                                            .map(object -> object.optString("body"))
-                                            .findFirst().orElse("");
-
-            String url = Optional.ofNullable(jsonEntry.optJSONObject("fulltext")).map(fullText -> fullText.optString("access_url")).orElse("");
+            String foundAbstract =
+                    IntStream.range(0, abstracts.length())
+                            .mapToObj(abstracts::getJSONObject)
+                            .map(object -> object.optString("body"))
+                            .findFirst()
+                            .orElse("");
+
+            String url =
+                    Optional.ofNullable(jsonEntry.optJSONObject("fulltext"))
+                            .map(fullText -> fullText.optString("access_url"))
+                            .orElse("");
 
             // publication type
             String type = biblio.optString("release_type");
@@ -138,7 +147,8 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) throws ParseException {
                     authorList.add(authors.getString(i));
                 }
                 AuthorList parsedAuthors = AuthorList.parse(String.join(" and ", authorList));
-                entry.setField(StandardField.AUTHOR, parsedAuthors.getAsLastFirstNamesWithAnd(false));
+                entry.setField(
+                        StandardField.AUTHOR, parsedAuthors.getAsLastFirstNamesWithAnd(false));
             }
 
             if (biblio.has("issns")) {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java b/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
index cb7498e43888..60eb6dd65a60 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.JsonNode;
+import kong.unirest.core.Unirest;
+import kong.unirest.core.UnirestException;
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONException;
+import kong.unirest.core.json.JSONObject;
 
 import org.jabref.logic.importer.FulltextFetcher;
 import org.jabref.logic.importer.ImporterPreferences;
@@ -15,14 +15,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
-
-import kong.unirest.core.HttpResponse;
-import kong.unirest.core.JsonNode;
-import kong.unirest.core.Unirest;
-import kong.unirest.core.UnirestException;
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONException;
-import kong.unirest.core.json.JSONObject;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Node;
@@ -30,6 +22,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 /**
  * FulltextFetcher implementation that attempts to find a PDF URL at <a href="https://www.sciencedirect.com/">ScienceDirect</a>.
  * See <a href="https://dev.elsevier.com/">https://dev.elsevier.com/</a>.
@@ -62,11 +62,12 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
             return Optional.empty();
         }
         // Scrape the web page as desktop client (not as mobile client!)
-        Document html = Jsoup.connect(urlFromDoi)
-                             .userAgent(URLDownload.USER_AGENT)
-                             .referrer("https://www.google.com")
-                             .ignoreHttpErrors(true)
-                             .get();
+        Document html =
+                Jsoup.connect(urlFromDoi)
+                        .userAgent(URLDownload.USER_AGENT)
+                        .referrer("https://www.google.com")
+                        .ignoreHttpErrors(true)
+                        .get();
 
         // Retrieve PDF link from meta data (most recent)
         Elements metaLinks = html.getElementsByAttributeValue("name", "citation_pdf_url");
@@ -79,19 +80,19 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         // This page contains the link to the PDF in some JavaScript code embedded in the web page.
         // Example page: https://www.sciencedirect.com/science/article/pii/S1674775515001079
 
-        Optional<JSONObject> pdfDownloadOptional = html
-                .getElementsByAttributeValue("type", "application/json")
-                .stream()
-                .flatMap(element -> element.getElementsByTag("script").stream())
-                // The first DOM child of the script element is the script itself (represented as HTML text)
-                .map(element -> element.childNode(0))
-                .map(Node::toString)
-                .map(JSONObject::new)
-                .filter(json -> json.has("article"))
-                .map(json -> json.getJSONObject("article"))
-                .filter(json -> json.has("pdfDownload"))
-                .map(json -> json.getJSONObject("pdfDownload"))
-                .findAny();
+        Optional<JSONObject> pdfDownloadOptional =
+                html.getElementsByAttributeValue("type", "application/json").stream()
+                        .flatMap(element -> element.getElementsByTag("script").stream())
+                        // The first DOM child of the script element is the script itself
+                        // (represented as HTML text)
+                        .map(element -> element.childNode(0))
+                        .map(Node::toString)
+                        .map(JSONObject::new)
+                        .filter(json -> json.has("article"))
+                        .map(json -> json.getJSONObject("article"))
+                        .filter(json -> json.has("pdfDownload"))
+                        .map(json -> json.getJSONObject("pdfDownload"))
+                        .findAny();
 
         if (pdfDownloadOptional.isEmpty()) {
             LOGGER.debug("No 'pdfDownload' key found in JSON information");
@@ -108,14 +109,17 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         } else if (pdfDownload.has("urlMetadata")) {
             JSONObject urlMetadata = pdfDownload.getJSONObject("urlMetadata");
             JSONObject queryParamsObject = urlMetadata.getJSONObject("queryParams");
-            String queryParameters = queryParamsObject.keySet().stream()
-                                                      .map(key -> "%s=%s".formatted(key, queryParamsObject.getString(key)))
-                                                      .collect(Collectors.joining("&"));
-            fullLinkToPdf = "https://www.sciencedirect.com/%s/%s%s?%s".formatted(
-                    urlMetadata.getString("path"),
-                    urlMetadata.getString("pii"),
-                    urlMetadata.getString("pdfExtension"),
-                    queryParameters);
+            String queryParameters =
+                    queryParamsObject.keySet().stream()
+                            .map(key -> "%s=%s".formatted(key, queryParamsObject.getString(key)))
+                            .collect(Collectors.joining("&"));
+            fullLinkToPdf =
+                    "https://www.sciencedirect.com/%s/%s%s?%s"
+                            .formatted(
+                                    urlMetadata.getString("path"),
+                                    urlMetadata.getString("pii"),
+                                    urlMetadata.getString("pdfExtension"),
+                                    queryParameters);
         } else {
             LOGGER.debug("No suitable data in JSON information");
             return Optional.empty();
@@ -139,15 +143,19 @@ private String getUrlByDoi(String doi) throws UnirestException {
         String sciLink = "";
         try {
             String request = API_URL + doi;
-            HttpResponse<JsonNode> jsonResponse = Unirest.get(request)
-                                                         .header("X-ELS-APIKey", importerPreferences.getApiKey(getName()).orElse(API_KEY))
-                                                         .queryString("httpAccept", "application/json")
-                                                         .asJson();
+            HttpResponse<JsonNode> jsonResponse =
+                    Unirest.get(request)
+                            .header(
+                                    "X-ELS-APIKey",
+                                    importerPreferences.getApiKey(getName()).orElse(API_KEY))
+                            .queryString("httpAccept", "application/json")
+                            .asJson();
 
             JSONObject json = jsonResponse.getBody().getObject();
-            JSONArray links = json.getJSONObject("full-text-retrieval-response")
-                                  .getJSONObject("coredata")
-                                  .getJSONArray("link");
+            JSONArray links =
+                    json.getJSONObject("full-text-retrieval-response")
+                            .getJSONObject("coredata")
+                            .getJSONArray("link");
 
             for (int i = 0; i < links.length(); i++) {
                 JSONObject link = links.getJSONObject(i);
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java b/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java
index 1a03c17c55e2..67ff9cabcd71 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java
@@ -1,18 +1,11 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONException;
+import kong.unirest.core.json.JSONObject;
 
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.FulltextFetcher;
@@ -29,23 +22,35 @@
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
-
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONException;
-import kong.unirest.core.json.JSONObject;
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SemanticScholar implements FulltextFetcher, PagedSearchBasedParserFetcher, EntryBasedFetcher, CustomizableKeyFetcher {
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class SemanticScholar
+        implements FulltextFetcher,
+                PagedSearchBasedParserFetcher,
+                EntryBasedFetcher,
+                CustomizableKeyFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SemanticScholar.class);
 
     private static final String SOURCE_ID_SEARCH = "https://api.semanticscholar.org/v1/paper/";
-    private static final String SOURCE_WEB_SEARCH = "https://api.semanticscholar.org/graph/v1/paper/search?";
+    private static final String SOURCE_WEB_SEARCH =
+            "https://api.semanticscholar.org/graph/v1/paper/search?";
     private final ImporterPreferences importerPreferences;
 
     public SemanticScholar(ImporterPreferences importerPreferences) {
@@ -67,20 +72,23 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherExc
         Objects.requireNonNull(entry);
 
         Optional<DOI> doi = entry.getField(StandardField.DOI).flatMap(DOI::parse);
-        Optional<ArXivIdentifier> arXiv = entry.getField(StandardField.EPRINT).flatMap(ArXivIdentifier::parse);
+        Optional<ArXivIdentifier> arXiv =
+                entry.getField(StandardField.EPRINT).flatMap(ArXivIdentifier::parse);
 
         Document html = null;
         if (doi.isPresent()) {
             try {
                 // Retrieve PDF link
                 String source = SOURCE_ID_SEARCH + doi.get().getDOI();
-                var jsoupRequest = Jsoup.connect(getURLBySource(source))
-                                        .userAgent(URLDownload.USER_AGENT)
-                                        .header("Accept", "text/html; charset=utf-8")
-                                        .referrer("https://www.google.com")
-                                        .ignoreHttpErrors(true);
-                importerPreferences.getApiKey(getName()).ifPresent(
-                        key -> jsoupRequest.header("x-api-key", key));
+                var jsoupRequest =
+                        Jsoup.connect(getURLBySource(source))
+                                .userAgent(URLDownload.USER_AGENT)
+                                .header("Accept", "text/html; charset=utf-8")
+                                .referrer("https://www.google.com")
+                                .ignoreHttpErrors(true);
+                importerPreferences
+                        .getApiKey(getName())
+                        .ifPresent(key -> jsoupRequest.header("x-api-key", key));
                 html = jsoupRequest.get();
             } catch (IOException e) {
                 LOGGER.info("Error for pdf lookup with DOI");
@@ -93,13 +101,15 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherExc
                 arXivString = "arXiv:" + arXivString;
             }
             String source = SOURCE_ID_SEARCH + arXivString;
-            var jsoupRequest = Jsoup.connect(getURLBySource(source))
-                                    .userAgent(URLDownload.USER_AGENT)
-                                    .referrer("https://www.google.com")
-                                    .header("Accept", "text/html; charset=utf-8")
-                                    .ignoreHttpErrors(true);
-            importerPreferences.getApiKey(getName()).ifPresent(
-                    key -> jsoupRequest.header("x-api-key", key));
+            var jsoupRequest =
+                    Jsoup.connect(getURLBySource(source))
+                            .userAgent(URLDownload.USER_AGENT)
+                            .referrer("https://www.google.com")
+                            .header("Accept", "text/html; charset=utf-8")
+                            .ignoreHttpErrors(true);
+            importerPreferences
+                    .getApiKey(getName())
+                    .ifPresent(key -> jsoupRequest.header("x-api-key", key));
             html = jsoupRequest.get();
         }
         if (html == null) {
@@ -134,13 +144,19 @@ String getURLBySource(String source) throws IOException, FetcherException {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(SOURCE_WEB_SEARCH);
-        uriBuilder.addParameter("query", new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
+        uriBuilder.addParameter(
+                "query",
+                new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
         uriBuilder.addParameter("offset", String.valueOf(pageNumber * getPageSize()));
-        uriBuilder.addParameter("limit", String.valueOf(Math.min(getPageSize(), 10000 - pageNumber * getPageSize())));
+        uriBuilder.addParameter(
+                "limit",
+                String.valueOf(Math.min(getPageSize(), 10000 - pageNumber * getPageSize())));
         // All fields need to be specified
-        uriBuilder.addParameter("fields", "paperId,externalIds,url,title,abstract,venue,year,authors");
+        uriBuilder.addParameter(
+                "fields", "paperId,externalIds,url,title,abstract,venue,year,authors");
         URL result = uriBuilder.build().toURL();
         LOGGER.debug("URL for query: {}", result);
         return result;
@@ -152,7 +168,6 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISynta
     @Override
     public Parser getParser() {
         return inputStream -> {
-
             JSONObject response = JsonReader.toJsonObject(inputStream);
             LOGGER.debug("Response for Parser: {}", response);
             if (response.isEmpty()) {
@@ -195,11 +210,12 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
             entry.setField(StandardField.VENUE, item.optString("venue"));
             entry.setField(StandardField.YEAR, item.optString("year"));
 
-            entry.setField(StandardField.AUTHOR,
+            entry.setField(
+                    StandardField.AUTHOR,
                     IntStream.range(0, item.optJSONArray("authors").length())
-                             .mapToObj(item.optJSONArray("authors")::getJSONObject)
-                             .map(author -> author.has("name") ? author.getString("name") : "")
-                             .collect(Collectors.joining(" and ")));
+                            .mapToObj(item.optJSONArray("authors")::getJSONObject)
+                            .map(author -> author.has("name") ? author.getString("name") : "")
+                            .collect(Collectors.joining(" and ")));
 
             JSONObject externalIds = item.optJSONObject("externalIds");
             entry.setField(StandardField.DOI, externalIds.optString("DOI"));
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java
index 895fa66d0989..3896d3d95bd1 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java
@@ -1,16 +1,12 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import com.google.common.base.Strings;
+
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONObject;
 
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedParserFetcher;
@@ -24,15 +20,20 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import com.google.common.base.Strings;
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONObject;
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 /**
  * Fetches data from the Springer
  *
@@ -47,7 +48,8 @@ public class SpringerFetcher implements PagedSearchBasedParserFetcher, Customiza
     private static final String API_URL = "https://api.springernature.com/meta/v1/json";
     private static final String API_KEY = new BuildInfo().springerNatureAPIKey;
     // Springer query using the parameter 'q=doi:10.1007/s11276-008-0131-4s=1' will respond faster
-    private static final String TEST_URL_WITHOUT_API_KEY = "https://api.springernature.com/meta/v1/json?q=doi:10.1007/s11276-008-0131-4s=1&p=1&api_key=";
+    private static final String TEST_URL_WITHOUT_API_KEY =
+            "https://api.springernature.com/meta/v1/json?q=doi:10.1007/s11276-008-0131-4s=1&p=1&api_key=";
 
     private final ImporterPreferences importerPreferences;
 
@@ -63,8 +65,15 @@ public SpringerFetcher(ImporterPreferences importerPreferences) {
      */
     public static BibEntry parseSpringerJSONtoBibtex(JSONObject springerJsonEntry) {
         // Fields that are directly accessible at the top level Json object
-        Field[] singleFieldStrings = {StandardField.ISSN, StandardField.VOLUME, StandardField.ABSTRACT, StandardField.DOI, StandardField.TITLE, StandardField.NUMBER,
-                StandardField.PUBLISHER};
+        Field[] singleFieldStrings = {
+            StandardField.ISSN,
+            StandardField.VOLUME,
+            StandardField.ABSTRACT,
+            StandardField.DOI,
+            StandardField.TITLE,
+            StandardField.NUMBER,
+            StandardField.PUBLISHER
+        };
 
         BibEntry entry = new BibEntry();
         Field nametype;
@@ -109,10 +118,15 @@ public static BibEntry parseSpringerJSONtoBibtex(JSONObject springerJsonEntry) {
         }
 
         // Page numbers
-        if (springerJsonEntry.has("startingPage") && !springerJsonEntry.getString("startingPage").isEmpty()) {
-            if (springerJsonEntry.has("endingPage") && !springerJsonEntry.getString("endingPage").isEmpty()) {
-                entry.setField(StandardField.PAGES,
-                        springerJsonEntry.getString("startingPage") + "--" + springerJsonEntry.getString("endingPage"));
+        if (springerJsonEntry.has("startingPage")
+                && !springerJsonEntry.getString("startingPage").isEmpty()) {
+            if (springerJsonEntry.has("endingPage")
+                    && !springerJsonEntry.getString("endingPage").isEmpty()) {
+                entry.setField(
+                        StandardField.PAGES,
+                        springerJsonEntry.getString("startingPage")
+                                + "--"
+                                + springerJsonEntry.getString("endingPage"));
             } else {
                 entry.setField(StandardField.PAGES, springerJsonEntry.getString("startingPage"));
             }
@@ -129,16 +143,20 @@ public static BibEntry parseSpringerJSONtoBibtex(JSONObject springerJsonEntry) {
             if (urls == null) {
                 entry.setField(StandardField.URL, springerJsonEntry.optString("url"));
             } else {
-                urls.forEach(data -> {
-                    JSONObject url = (JSONObject) data;
-                    if ("pdf".equalsIgnoreCase(url.optString("format"))) {
-                        try {
-                            entry.addFile(new LinkedFile(URI.create(url.optString("value")).toURL(), "PDF"));
-                        } catch (MalformedURLException e) {
-                            LOGGER.info("Malformed URL: {}", url.optString("value"));
-                        }
-                    }
-                });
+                urls.forEach(
+                        data -> {
+                            JSONObject url = (JSONObject) data;
+                            if ("pdf".equalsIgnoreCase(url.optString("format"))) {
+                                try {
+                                    entry.addFile(
+                                            new LinkedFile(
+                                                    URI.create(url.optString("value")).toURL(),
+                                                    "PDF"));
+                                } catch (MalformedURLException e) {
+                                    LOGGER.info("Malformed URL: {}", url.optString("value"));
+                                }
+                            }
+                        });
             }
         }
 
@@ -153,11 +171,14 @@ public static BibEntry parseSpringerJSONtoBibtex(JSONObject springerJsonEntry) {
         }
 
         // Clean up abstract (often starting with Abstract)
-        entry.getField(StandardField.ABSTRACT).ifPresent(abstractContents -> {
-            if (abstractContents.startsWith("Abstract")) {
-                entry.setField(StandardField.ABSTRACT, abstractContents.substring(8));
-            }
-        });
+        entry.getField(StandardField.ABSTRACT)
+                .ifPresent(
+                        abstractContents -> {
+                            if (abstractContents.startsWith("Abstract")) {
+                                entry.setField(
+                                        StandardField.ABSTRACT, abstractContents.substring(8));
+                            }
+                        });
 
         return entry;
     }
@@ -185,11 +206,20 @@ public String getTestUrl() {
      * @return URL
      */
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(API_URL);
-        uriBuilder.addParameter("q", new SpringerQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")); // Search query
-        uriBuilder.addParameter("api_key", importerPreferences.getApiKey(getName()).orElse(API_KEY)); // API key
-        uriBuilder.addParameter("s", String.valueOf(getPageSize() * pageNumber + 1)); // Start entry, starts indexing at 1
+        uriBuilder.addParameter(
+                "q",
+                new SpringerQueryTransformer()
+                        .transformLuceneQuery(luceneQuery)
+                        .orElse("")); // Search query
+        uriBuilder.addParameter(
+                "api_key", importerPreferences.getApiKey(getName()).orElse(API_KEY)); // API key
+        uriBuilder.addParameter(
+                "s",
+                String.valueOf(
+                        getPageSize() * pageNumber + 1)); // Start entry, starts indexing at 1
         uriBuilder.addParameter("p", String.valueOf(getPageSize())); // Page size
         return uriBuilder.build().toURL();
     }
@@ -199,7 +229,8 @@ private String constructComplexQueryString(ComplexSearchQuery complexSearchQuery
         complexSearchQuery.getAuthors().forEach(author -> searchTerms.add("name:" + author));
         complexSearchQuery.getTitlePhrases().forEach(title -> searchTerms.add("title:" + title));
         complexSearchQuery.getJournal().ifPresent(journal -> searchTerms.add("journal:" + journal));
-        // Since Springer API does not support year range search, we ignore formYear and toYear and use "singleYear" only
+        // Since Springer API does not support year range search, we ignore formYear and toYear and
+        // use "singleYear" only
         complexSearchQuery.getSingleYear().ifPresent(year -> searchTerms.add("date:" + year + "*"));
         searchTerms.addAll(complexSearchQuery.getDefaultFieldPhrases());
         return String.join(" AND ", searchTerms);
@@ -208,7 +239,10 @@ private String constructComplexQueryString(ComplexSearchQuery complexSearchQuery
     @Override
     public Parser getParser() {
         return inputStream -> {
-            String response = new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.joining(OS.NEWLINE));
+            String response =
+                    new BufferedReader(new InputStreamReader(inputStream))
+                            .lines()
+                            .collect(Collectors.joining(OS.NEWLINE));
             JSONObject jsonObject = new JSONObject(response);
 
             List<BibEntry> entries = new ArrayList<>();
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java b/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java
index 7a8551fb451a..c48c81f99a15 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Objects;
-import java.util.Optional;
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.JsonNode;
+import kong.unirest.core.Unirest;
+import kong.unirest.core.UnirestException;
+import kong.unirest.core.json.JSONObject;
 
 import org.jabref.logic.importer.FulltextFetcher;
 import org.jabref.logic.importer.ImporterPreferences;
@@ -13,15 +12,16 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
-
-import kong.unirest.core.HttpResponse;
-import kong.unirest.core.JsonNode;
-import kong.unirest.core.Unirest;
-import kong.unirest.core.UnirestException;
-import kong.unirest.core.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * FulltextFetcher implementation that attempts to find a PDF URL at SpringerLink.
  * <p>
@@ -54,17 +54,29 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         }
         // Available in catalog?
         try {
-            HttpResponse<JsonNode> jsonResponse = Unirest.get(API_URL)
-                                                         .queryString("api_key", importerPreferences.getApiKey(getName()).orElse(API_KEY))
-                                                         .queryString("q", "doi:%s".formatted(doi.get().getDOI()))
-                                                         .asJson();
+            HttpResponse<JsonNode> jsonResponse =
+                    Unirest.get(API_URL)
+                            .queryString(
+                                    "api_key",
+                                    importerPreferences.getApiKey(getName()).orElse(API_KEY))
+                            .queryString("q", "doi:%s".formatted(doi.get().getDOI()))
+                            .asJson();
             if (jsonResponse.getBody() != null) {
                 JSONObject json = jsonResponse.getBody().getObject();
                 int results = json.getJSONArray("result").getJSONObject(0).getInt("total");
 
                 if (results > 0) {
                     LOGGER.info("Fulltext PDF found @ Springer.");
-                    return Optional.of(new URI("http", null, CONTENT_HOST, -1, "/content/pdf/%s.pdf".formatted(doi.get().getDOI()), null, null).toURL());
+                    return Optional.of(
+                            new URI(
+                                            "http",
+                                            null,
+                                            CONTENT_HOST,
+                                            -1,
+                                            "/content/pdf/%s.pdf".formatted(doi.get().getDOI()),
+                                            null,
+                                            null)
+                                    .toURL());
                 }
             }
         } catch (UnirestException | URISyntaxException e) {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java
index ce10b69b6dac..13d7379ba7d2 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java
@@ -1,7 +1,5 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Optional;
-
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.IdBasedFetcher;
@@ -12,6 +10,8 @@
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Optional;
+
 public class TitleFetcher implements IdBasedFetcher {
 
     private final ImportFormatPreferences preferences;
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ZbMATH.java b/src/main/java/org/jabref/logic/importer/fetcher/ZbMATH.java
index b02c19d9025f..56e44263a560 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ZbMATH.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ZbMATH.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.JsonNode;
+import kong.unirest.core.Unirest;
+import kong.unirest.core.json.JSONArray;
 
+import org.apache.hc.core5.net.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.cleanup.MoveFieldCleanup;
 import org.jabref.logic.formatter.bibtexfields.RemoveEnclosingBracesFormatter;
@@ -24,17 +24,18 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 
-import kong.unirest.core.HttpResponse;
-import kong.unirest.core.JsonNode;
-import kong.unirest.core.Unirest;
-import kong.unirest.core.json.JSONArray;
-import org.apache.hc.core5.net.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * Fetches data from the Zentralblatt Math (https://www.zbmath.org/)
  */
-public class ZbMATH implements SearchBasedParserFetcher, IdBasedParserFetcher, EntryBasedParserFetcher {
+public class ZbMATH
+        implements SearchBasedParserFetcher, IdBasedParserFetcher, EntryBasedParserFetcher {
 
     private final ImportFormatPreferences preferences;
 
@@ -48,7 +49,8 @@ public String getName() {
     }
 
     @Override
-    public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForEntry(BibEntry entry)
+            throws URISyntaxException, MalformedURLException, FetcherException {
         Optional<String> zblidInEntry = entry.getField(StandardField.ZBL_NUMBER);
         if (zblidInEntry.isPresent()) {
             // zbmath id is already present
@@ -59,20 +61,27 @@ public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedUR
         uriBuilder.addParameter("n", "1"); // return only the best matching entry
         uriBuilder.addParameter("m", "5"); // return only entries with a score of at least 5
 
-        entry.getFieldOrAlias(StandardField.TITLE).ifPresent(title -> uriBuilder.addParameter("t", title));
-        entry.getFieldOrAlias(StandardField.JOURNAL).ifPresent(journal -> uriBuilder.addParameter("j", journal));
-        entry.getFieldOrAlias(StandardField.YEAR).ifPresent(year -> uriBuilder.addParameter("y", year));
+        entry.getFieldOrAlias(StandardField.TITLE)
+                .ifPresent(title -> uriBuilder.addParameter("t", title));
+        entry.getFieldOrAlias(StandardField.JOURNAL)
+                .ifPresent(journal -> uriBuilder.addParameter("j", journal));
+        entry.getFieldOrAlias(StandardField.YEAR)
+                .ifPresent(year -> uriBuilder.addParameter("y", year));
         entry.getFieldOrAlias(StandardField.PAGINATION)
-             .ifPresent(pagination -> uriBuilder.addParameter("p", pagination));
-        entry.getFieldOrAlias(StandardField.VOLUME).ifPresent(volume -> uriBuilder.addParameter("v", volume));
-        entry.getFieldOrAlias(StandardField.ISSUE).ifPresent(issue -> uriBuilder.addParameter("i", issue));
+                .ifPresent(pagination -> uriBuilder.addParameter("p", pagination));
+        entry.getFieldOrAlias(StandardField.VOLUME)
+                .ifPresent(volume -> uriBuilder.addParameter("v", volume));
+        entry.getFieldOrAlias(StandardField.ISSUE)
+                .ifPresent(issue -> uriBuilder.addParameter("i", issue));
 
         if (entry.getFieldOrAlias(StandardField.AUTHOR).isPresent()) {
             // replace "and" by ";" as citation matching API uses ";" for separation
-            AuthorList authors = AuthorList.parse(entry.getFieldOrAlias(StandardField.AUTHOR).get());
-            String authorsWithSemicolon = authors.getAuthors().stream()
-                                                 .map(author -> author.getFamilyGiven(false))
-                                                 .collect(Collectors.joining(";"));
+            AuthorList authors =
+                    AuthorList.parse(entry.getFieldOrAlias(StandardField.AUTHOR).get());
+            String authorsWithSemicolon =
+                    authors.getAuthors().stream()
+                            .map(author -> author.getFamilyGiven(false))
+                            .collect(Collectors.joining(";"));
             uriBuilder.addParameter("a", authorsWithSemicolon);
         }
 
@@ -82,17 +91,12 @@ public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedUR
         to get the bibtex data.
          */
         String urlString = uriBuilder.build().toString();
-        HttpResponse<JsonNode> response = Unirest.get(urlString)
-                                                 .asJson();
+        HttpResponse<JsonNode> response = Unirest.get(urlString).asJson();
         String zblid = null;
         if (response.getStatus() == 200) {
-            JSONArray result = response.getBody()
-                                       .getObject()
-                                       .getJSONArray("results");
+            JSONArray result = response.getBody().getObject().getJSONArray("results");
             if (!result.isEmpty()) {
-                zblid = result.getJSONObject(0)
-                              .get("zbl_id")
-                              .toString();
+                zblid = result.getJSONObject(0).get("zbl_id").toString();
             }
         }
         if (zblid == null) {
@@ -104,16 +108,23 @@ public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedUR
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder("https://zbmath.org/bibtexoutput/");
-        uriBuilder.addParameter("q", new ZbMathQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")); // search all fields
+        uriBuilder.addParameter(
+                "q",
+                new ZbMathQueryTransformer()
+                        .transformLuceneQuery(luceneQuery)
+                        .orElse("")); // search all fields
         uriBuilder.addParameter("start", "0"); // start index
-        uriBuilder.addParameter("count", "200"); // should return up to 200 items (instead of default 100)
+        uriBuilder.addParameter(
+                "count", "200"); // should return up to 200 items (instead of default 100)
         return uriBuilder.build().toURL();
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException {
+    public URL getUrlForIdentifier(String identifier)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder("https://zbmath.org/bibtexoutput/");
         String query = "an:".concat(identifier); // use an: to search for a zbMATH identifier
         uriBuilder.addParameter("q", query);
@@ -131,7 +142,9 @@ public Parser getParser() {
     public void doPostCleanup(BibEntry entry) {
         new MoveFieldCleanup(new UnknownField("msc2010"), StandardField.KEYWORDS).cleanup(entry);
         new MoveFieldCleanup(AMSField.FJOURNAL, StandardField.JOURNAL).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.JOURNAL, new RemoveEnclosingBracesFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.TITLE, new RemoveEnclosingBracesFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(StandardField.JOURNAL, new RemoveEnclosingBracesFormatter())
+                .cleanup(entry);
+        new FieldFormatterCleanup(StandardField.TITLE, new RemoveEnclosingBracesFormatter())
+                .cleanup(entry);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/DoiToBibtexConverterComIsbnFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/DoiToBibtexConverterComIsbnFetcher.java
index 66bd0235ee6c..ece97ac61b39 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/DoiToBibtexConverterComIsbnFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/DoiToBibtexConverterComIsbnFetcher.java
@@ -1,13 +1,10 @@
 package org.jabref.logic.importer.fetcher.isbntobibtex;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONException;
+import kong.unirest.core.json.JSONObject;
 
+import org.apache.hc.core5.net.URIBuilder;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.Parser;
@@ -18,10 +15,13 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
 
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONException;
-import kong.unirest.core.json.JSONObject;
-import org.apache.hc.core5.net.URIBuilder;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 /**
  * Fetcher for ISBN using <a href="https://doi-to-bibtex-converter.herokuapp.com">doi-to-bibtex-converter.herokuapp</a>.
@@ -39,7 +39,8 @@ public String getName() {
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException {
+    public URL getUrlForIdentifier(String identifier)
+            throws URISyntaxException, MalformedURLException {
         this.ensureThatIsbnIsValid(identifier);
         return new URIBuilder(BASE_URL)
                 .setPathSegments("getInfo.php")
@@ -68,8 +69,7 @@ public Parser getParser() {
     }
 
     @Override
-    public void doPostCleanup(BibEntry entry) {
-    }
+    public void doPostCleanup(BibEntry entry) {}
 
     private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
         try {
@@ -92,16 +92,16 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
 
     private String getElementFromJSONArrayByKey(JSONArray jsonArray, String key) {
         return IntStream.range(0, jsonArray.length())
-                        .mapToObj(jsonArray::getJSONObject)
-                        .map(obj -> obj.getString(key))
-                        .findFirst()
-                        .orElse("");
+                .mapToObj(jsonArray::getJSONObject)
+                .map(obj -> obj.getString(key))
+                .findFirst()
+                .orElse("");
     }
 
     private StandardEntryType evaluateBibEntryTypeFromString(String type) {
         return Stream.of(StandardEntryType.values())
-                     .filter(entryType -> entryType.name().equalsIgnoreCase(type))
-                     .findAny()
-                     .orElse(StandardEntryType.Book);
+                .filter(entryType -> entryType.name().equalsIgnoreCase(type))
+                .findAny()
+                .orElse(StandardEntryType.Book);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/EbookDeIsbnFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/EbookDeIsbnFetcher.java
index f55ba6eaa760..70625dcc4803 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/EbookDeIsbnFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/EbookDeIsbnFetcher.java
@@ -1,9 +1,6 @@
 package org.jabref.logic.importer.fetcher.isbntobibtex;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-
+import org.apache.hc.core5.net.URIBuilder;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.formatter.bibtexfields.NormalizeNamesFormatter;
 import org.jabref.logic.formatter.bibtexfields.NormalizePagesFormatter;
@@ -12,7 +9,9 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-import org.apache.hc.core5.net.URIBuilder;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
 
 /**
  * Fetcher for ISBN using <a href="https://www.ebook.de">https://www.ebook.de</a>.
@@ -30,12 +29,10 @@ public String getName() {
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException {
+    public URL getUrlForIdentifier(String identifier)
+            throws URISyntaxException, MalformedURLException {
         this.ensureThatIsbnIsValid(identifier);
-        return new URIBuilder(BASE_URL)
-                .addParameter("isbn", identifier)
-                .build()
-                .toURL();
+        return new URIBuilder(BASE_URL).addParameter("isbn", identifier).build().toURL();
     }
 
     @Override
@@ -44,10 +41,16 @@ public void doPostCleanup(BibEntry entry) {
         // DO NOT add following code:
         // new FieldFormatterCleanup(StandardField.URL, new ClearFormatter()).cleanup(entry);
 
-        // Fetcher returns page numbers as "30 Seiten" -> remove every non-digit character in the PAGETOTAL field
-        entry.getField(StandardField.PAGETOTAL).ifPresent(pages ->
-                entry.setField(StandardField.PAGETOTAL, pages.replaceAll("[\\D]", "")));
-        new FieldFormatterCleanup(StandardField.PAGETOTAL, new NormalizePagesFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.AUTHOR, new NormalizeNamesFormatter()).cleanup(entry);
+        // Fetcher returns page numbers as "30 Seiten" -> remove every non-digit character in the
+        // PAGETOTAL field
+        entry.getField(StandardField.PAGETOTAL)
+                .ifPresent(
+                        pages ->
+                                entry.setField(
+                                        StandardField.PAGETOTAL, pages.replaceAll("[\\D]", "")));
+        new FieldFormatterCleanup(StandardField.PAGETOTAL, new NormalizePagesFormatter())
+                .cleanup(entry);
+        new FieldFormatterCleanup(StandardField.AUTHOR, new NormalizeNamesFormatter())
+                .cleanup(entry);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcher.java
index 7df0fb6fab57..07a25cdabbd1 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcher.java
@@ -1,13 +1,5 @@
 package org.jabref.logic.importer.fetcher.isbntobibtex;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
@@ -19,10 +11,17 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.ISBN;
 import org.jabref.model.util.OptionalUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Pattern;
+
 /**
  * Fetcher to generate the Bibtex entry from an ISBN.
  * The default fetcher is the {@link OpenLibraryIsbnFetcher}.
@@ -39,7 +38,8 @@ public class IsbnFetcher implements EntryBasedFetcher, IdBasedFetcher {
 
     public IsbnFetcher(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
-        OpenLibraryIsbnFetcher openLibraryIsbnFetcher = new OpenLibraryIsbnFetcher(importFormatPreferences);
+        OpenLibraryIsbnFetcher openLibraryIsbnFetcher =
+                new OpenLibraryIsbnFetcher(importFormatPreferences);
         this.gvkIsbnFetcher = new GvkFetcher(importFormatPreferences);
         this.retryIsbnFetcher = new ArrayList<>();
         this.addRetryFetcher(openLibraryIsbnFetcher);
@@ -71,13 +71,17 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
                 throw ex;
             }
         } finally {
-            // do not move the iterator in the loop as this would always return a new one and thus create and endless loop
+            // do not move the iterator in the loop as this would always return a new one and thus
+            // create and endless loop
             Iterator<AbstractIsbnFetcher> iterator = retryIsbnFetcher.iterator();
             while (bibEntry.isEmpty() && iterator.hasNext()) {
                 LOGGER.debug("Trying using the alternate ISBN fetchers to find an entry.");
 
                 AbstractIsbnFetcher fetcher = iterator.next();
-                LOGGER.debug("No entry found for ISBN {}; trying {} next.", identifier, fetcher.getName());
+                LOGGER.debug(
+                        "No entry found for ISBN {}; trying {} next.",
+                        identifier,
+                        fetcher.getName());
                 bibEntry = fetcher.performSearchById(identifier);
             }
         }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/OpenLibraryIsbnFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/OpenLibraryIsbnFetcher.java
index cb8e7267d77b..180258069ae6 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/OpenLibraryIsbnFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/OpenLibraryIsbnFetcher.java
@@ -1,15 +1,12 @@
 package org.jabref.logic.importer.fetcher.isbntobibtex;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
+import kong.unirest.core.JsonNode;
+import kong.unirest.core.Unirest;
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONException;
+import kong.unirest.core.json.JSONObject;
 
+import org.apache.hc.core5.net.URIBuilder;
 import org.jabref.logic.importer.AuthorListParser;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParseException;
@@ -23,16 +20,19 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
-
-import kong.unirest.core.JsonNode;
-import kong.unirest.core.Unirest;
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONException;
-import kong.unirest.core.json.JSONObject;
-import org.apache.hc.core5.net.URIBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
 /**
  * Fetcher for OpenLibrary.
  * <a href="https://openlibrary.org/dev/docs/api/books">API documentation</a>.
@@ -52,7 +52,8 @@ public String getName() {
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException {
+    public URL getUrlForIdentifier(String identifier)
+            throws URISyntaxException, MalformedURLException {
         this.ensureThatIsbnIsValid(identifier);
         return new URIBuilder(BASE_URL)
                 .setPathSegments("isbn", identifier + ".json")
@@ -79,8 +80,7 @@ public Parser getParser() {
     }
 
     @Override
-    public void doPostCleanup(BibEntry entry) {
-    }
+    public void doPostCleanup(BibEntry entry) {}
 
     private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
         try {
@@ -92,20 +92,30 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
             }
             entry.setField(StandardField.AUTHOR, authors);
             entry.setField(StandardField.PAGES, item.optString("number_of_pages"));
-            entry.setField(StandardField.ISBN,
-                    Optional.ofNullable(item.optJSONArray("isbn_13")).map(array -> array.getString(0))
-                            .or(() -> Optional.ofNullable(item.optJSONArray("isbn_10")).map(array -> array.getString(0)))
+            entry.setField(
+                    StandardField.ISBN,
+                    Optional.ofNullable(item.optJSONArray("isbn_13"))
+                            .map(array -> array.getString(0))
+                            .or(
+                                    () ->
+                                            Optional.ofNullable(item.optJSONArray("isbn_10"))
+                                                    .map(array -> array.getString(0)))
                             .orElse(""));
-            entry.setField(StandardField.TITLE,
+            entry.setField(
+                    StandardField.TITLE,
                     Optional.ofNullable(item.optString("full_title", null))
                             .or(() -> Optional.ofNullable(item.optString("title", null)))
                             .orElse(""));
             entry.setField(StandardField.SUBTITLE, item.optString("subtitle"));
-            Optional<String> yearOpt = Date.parse(item.optString("publish_date")).flatMap(Date::getYear).map(
-                    Object::toString);
+            Optional<String> yearOpt =
+                    Date.parse(item.optString("publish_date"))
+                            .flatMap(Date::getYear)
+                            .map(Object::toString);
             yearOpt.ifPresent(year -> entry.setField(StandardField.YEAR, year));
-            entry.setField(StandardField.PUBLISHER,
-                    Optional.ofNullable(item.optJSONArray("publishers")).map(array -> array.getString(0))
+            entry.setField(
+                    StandardField.PUBLISHER,
+                    Optional.ofNullable(item.optJSONArray("publishers"))
+                            .map(array -> array.getString(0))
                             .orElse(""));
             return entry;
         } catch (JSONException exception) {
@@ -118,10 +128,10 @@ private String toAuthors(JSONArray authors) {
             return "";
         }
         return IntStream.range(0, authors.length())
-                        .mapToObj(authors::getJSONObject)
-                        .map(authorObject -> toAuthor(authorObject.getString("key")))
-                        .collect(AuthorList.collect())
-                        .getAsLastFirstNamesWithAnd(false);
+                .mapToObj(authors::getJSONObject)
+                .map(authorObject -> toAuthor(authorObject.getString("key")))
+                .collect(AuthorList.collect())
+                .getAsLastFirstNamesWithAnd(false);
     }
 
     private Author toAuthor(String key) {
@@ -131,7 +141,9 @@ private Author toAuthor(String key) {
             return new Author(null, null, null, null, null);
         }
         JSONObject result = authorResponse.getObject();
-        Optional<String> nameOptional = Optional.ofNullable(result.optString("personal_name", null)).or(() -> Optional.ofNullable(result.optString("name", null)));
+        Optional<String> nameOptional =
+                Optional.ofNullable(result.optString("personal_name", null))
+                        .or(() -> Optional.ofNullable(result.optString("name", null)));
         if (nameOptional.isEmpty()) {
             LOGGER.warn("Could not parse author name");
             return new Author(null, null, null, null, null);
@@ -146,12 +158,13 @@ private String fromWorksToAuthors(JSONArray works) {
             return "";
         }
 
-        List<Author> authors = IntStream.range(0, works.length())
-                                          .mapToObj(works::getJSONObject)
-                                          .map(obj -> obj.getString("key"))
-                                          .map(worksLink -> BASE_URL + worksLink + ".json")
-                                          .flatMap(this::fromWorkToAuthors)
-                                          .collect(Collectors.toList());
+        List<Author> authors =
+                IntStream.range(0, works.length())
+                        .mapToObj(works::getJSONObject)
+                        .map(obj -> obj.getString("key"))
+                        .map(worksLink -> BASE_URL + worksLink + ".json")
+                        .flatMap(this::fromWorkToAuthors)
+                        .collect(Collectors.toList());
         return AuthorList.of(authors).getAsLastFirstNamesWithAnd(false);
     }
 
@@ -163,7 +176,9 @@ private Stream<Author> fromWorkToAuthors(String link) {
         }
 
         return IntStream.range(0, authors.length())
-                        .mapToObj(authors::getJSONObject)
-                        .map(authorObject -> toAuthor(authorObject.getJSONObject("author").getString("key")));
+                .mapToObj(authors::getJSONObject)
+                .map(
+                        authorObject ->
+                                toAuthor(authorObject.getJSONObject("author").getString("key")));
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/AbstractQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/AbstractQueryTransformer.java
index d644789c4874..137afa93c119 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/AbstractQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/AbstractQueryTransformer.java
@@ -1,20 +1,19 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
-import java.util.StringJoiner;
-import java.util.stream.Collectors;
-
-import org.jabref.model.strings.StringUtil;
-
 import org.apache.lucene.queryparser.flexible.core.nodes.BooleanQueryNode;
 import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode;
 import org.apache.lucene.queryparser.flexible.core.nodes.GroupQueryNode;
 import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode;
 import org.apache.lucene.queryparser.flexible.core.nodes.OrQueryNode;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import org.jabref.model.strings.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Optional;
+import java.util.StringJoiner;
+import java.util.stream.Collectors;
+
 /**
  * In case the transformer contains state for a query transformation (such as the {@link IEEEQueryTransformer}), it has to be noted at the JavaDoc.
  * Otherwise, a single instance QueryTransformer can be used.
@@ -40,10 +39,11 @@ protected Optional<String> transform(BooleanQueryNode query) {
             delimiter = getLogicalAndOperator();
         }
 
-        String result = query.getChildren().stream()
-                             .map(this::transform)
-                             .flatMap(Optional::stream)
-                             .collect(Collectors.joining(delimiter, "(", ")"));
+        String result =
+                query.getChildren().stream()
+                        .map(this::transform)
+                        .flatMap(Optional::stream)
+                        .collect(Collectors.joining(delimiter, "(", ")"));
         if ("()".equals(result)) {
             return Optional.empty();
         }
@@ -193,7 +193,9 @@ protected String createKeyValuePair(String fieldAsString, String term) {
     }
 
     protected String createKeyValuePair(String fieldAsString, String term, String separator) {
-        return "%s%s%s".formatted(fieldAsString, separator, StringUtil.quoteStringIfSpaceIsContained(term));
+        return "%s%s%s"
+                .formatted(
+                        fieldAsString, separator, StringUtil.quoteStringIfSpaceIsContained(term));
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/CiteSeerQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/CiteSeerQueryTransformer.java
index 695ac6431168..8462ee9c1923 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/CiteSeerQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/CiteSeerQueryTransformer.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Calendar;
-import java.util.Optional;
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONObject;
 
 import org.jabref.model.strings.StringUtil;
 
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONObject;
+import java.util.Calendar;
+import java.util.Optional;
 
 public class CiteSeerQueryTransformer extends AbstractQueryTransformer {
 
@@ -67,15 +67,15 @@ protected String handleYear(String year) {
 
     @Override
     protected String handleYearRange(String yearRange) {
-         parseYearRange(yearRange);
-         if (endYear == Integer.MAX_VALUE) { // invalid year range
-             Calendar calendar = Calendar.getInstance();
-             this.getJSONPayload().put("yearEnd", calendar.get(Calendar.YEAR));
-             return "";
-         }
-         this.getJSONPayload().put("yearStart", startYear);
-         this.getJSONPayload().put("yearEnd", endYear);
-         return yearRange;
+        parseYearRange(yearRange);
+        if (endYear == Integer.MAX_VALUE) { // invalid year range
+            Calendar calendar = Calendar.getInstance();
+            this.getJSONPayload().put("yearEnd", calendar.get(Calendar.YEAR));
+            return "";
+        }
+        this.getJSONPayload().put("yearStart", startYear);
+        this.getJSONPayload().put("yearEnd", endYear);
+        return yearRange;
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/CollectionOfComputerScienceBibliographiesQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/CollectionOfComputerScienceBibliographiesQueryTransformer.java
index d3a64078f3ab..92b7fcbd931f 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/CollectionOfComputerScienceBibliographiesQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/CollectionOfComputerScienceBibliographiesQueryTransformer.java
@@ -2,7 +2,8 @@
 
 import org.jabref.model.strings.StringUtil;
 
-public class CollectionOfComputerScienceBibliographiesQueryTransformer extends AbstractQueryTransformer {
+public class CollectionOfComputerScienceBibliographiesQueryTransformer
+        extends AbstractQueryTransformer {
 
     @Override
     protected String getLogicalAndOperator() {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/DBLPQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/DBLPQueryTransformer.java
index 0c7878c59356..e5ce7d3b31b4 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/DBLPQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/DBLPQueryTransformer.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/GVKQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/GVKQueryTransformer.java
index 7b649a89078a..30af8443e9ee 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/GVKQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/GVKQueryTransformer.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Optional;
+
 public class GVKQueryTransformer extends YearRangeByFilteringQueryTransformer {
     private static final Logger LOGGER = LoggerFactory.getLogger(GVKQueryTransformer.class);
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/IEEEQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/IEEEQueryTransformer.java
index 9cadd20718f2..a0ee538f9f26 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/IEEEQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/IEEEQueryTransformer.java
@@ -1,17 +1,18 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
-
 import org.jabref.logic.formatter.casechanger.Word;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Optional;
+
 /**
  * Needs to be instantiated for each new query
  *
  * Stop words are ignored. See ADR-0022.
  */
 public class IEEEQueryTransformer extends YearRangeByFilteringQueryTransformer {
-    // These have to be integrated into the IEEE query URL as these are just supported as query parameters
+    // These have to be integrated into the IEEE query URL as these are just supported as query
+    // parameters
     // Journal is wrapped in quotes by the transformer
     private String journal;
     private String articleNumber;
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/ISIDOREQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/ISIDOREQueryTransformer.java
index fb2abe606335..1ca61fd24b5d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/ISIDOREQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/ISIDOREQueryTransformer.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
-
 import org.jabref.logic.formatter.casechanger.Word;
 import org.jabref.model.entry.AuthorList;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+
 public class ISIDOREQueryTransformer extends YearRangeByFilteringQueryTransformer {
 
     public static final int MAX_TERMS = 4;
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/ScholarArchiveQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/ScholarArchiveQueryTransformer.java
index 18f845219013..01788233ac89 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/ScholarArchiveQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/ScholarArchiveQueryTransformer.java
@@ -65,7 +65,3 @@ protected String handleYearRange(String yearRange) {
         return "publication.startDate:[" + startYear + " TO " + endYear + "]";
     }
 }
-
-
-
-
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/ScholarQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/ScholarQueryTransformer.java
index a1556d5cbac8..a22e549bd812 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/ScholarQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/ScholarQueryTransformer.java
@@ -1,7 +1,8 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
 public class ScholarQueryTransformer extends YearAndYearRangeByFilteringQueryTransformer {
-    // Start year and end year have to be integrated into the query URL itself as these are just supported as query parameters
+    // Start year and end year have to be integrated into the query URL itself as these are just
+    // supported as query parameters
     private int startYear = Integer.MAX_VALUE;
     private int endYear = Integer.MIN_VALUE;
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/YearAndYearRangeByFilteringQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/YearAndYearRangeByFilteringQueryTransformer.java
index fe348bf3acd9..daf2ef909eb7 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/YearAndYearRangeByFilteringQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/YearAndYearRangeByFilteringQueryTransformer.java
@@ -4,7 +4,8 @@
  * This is a query transformer for a fetcher, which does not support server-side filtering by year and year-range.
  * Thus, JabRef (as client) filters for years and year ranges on client-side.
  */
-public abstract class YearAndYearRangeByFilteringQueryTransformer extends YearRangeByFilteringQueryTransformer {
+public abstract class YearAndYearRangeByFilteringQueryTransformer
+        extends YearRangeByFilteringQueryTransformer {
 
     @Override
     protected String handleYear(String year) {
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/ACMPortalParser.java b/src/main/java/org/jabref/logic/importer/fileformat/ACMPortalParser.java
index e1eef008b2c0..28930b0928b1 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/ACMPortalParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/ACMPortalParser.java
@@ -1,19 +1,13 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.CookieHandler;
-import java.net.CookieManager;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import com.google.common.base.CaseFormat;
+import com.google.common.base.Enums;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 
+import org.apache.hc.core5.net.URIBuilder;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.Parser;
@@ -23,19 +17,25 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.Enums;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import org.apache.hc.core5.net.URIBuilder;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.CookieHandler;
+import java.net.CookieManager;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 public class ACMPortalParser implements Parser {
 
     private static final String HOST = "https://dl.acm.org";
@@ -117,7 +117,8 @@ public List<BibEntry> getBibEntriesFromDoiList(List<String> doiList) throws Fetc
      * @param doiList DOI List
      * @return query URL
      */
-    public URL getUrlFromDoiList(List<String> doiList) throws URISyntaxException, MalformedURLException {
+    public URL getUrlFromDoiList(List<String> doiList)
+            throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(DOI_URL);
         uriBuilder.addParameter("targetFile", "custom-bibtex");
         uriBuilder.addParameter("format", "bibTex");
@@ -130,8 +131,11 @@ private StandardEntryType typeStrToEnum(String typeStr) {
         if ("PAPER_CONFERENCE".equals(typeStr)) {
             type = StandardEntryType.Conference;
         } else {
-            String upperUnderscoreTyeStr = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, typeStr);
-            type = Enums.getIfPresent(StandardEntryType.class, upperUnderscoreTyeStr).or(StandardEntryType.Article);
+            String upperUnderscoreTyeStr =
+                    CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, typeStr);
+            type =
+                    Enums.getIfPresent(StandardEntryType.class, upperUnderscoreTyeStr)
+                            .or(StandardEntryType.Article);
         }
         return type;
     }
@@ -157,8 +161,11 @@ public BibEntry parseBibEntry(String jsonStr) {
         if (jsonObject.has("issued")) {
             JsonObject issued = jsonObject.get("issued").getAsJsonObject();
             if (issued.has("date-parts")) {
-                JsonArray dateArray = issued.get("date-parts").getAsJsonArray().get(0).getAsJsonArray();
-                StandardField[] dateField = {StandardField.YEAR, StandardField.MONTH, StandardField.DAY};
+                JsonArray dateArray =
+                        issued.get("date-parts").getAsJsonArray().get(0).getAsJsonArray();
+                StandardField[] dateField = {
+                    StandardField.YEAR, StandardField.MONTH, StandardField.DAY
+                };
                 for (int i = 0; i < dateArray.size(); i++) {
                     bibEntry.setField(dateField[i], dateArray.get(i).getAsString());
                 }
@@ -170,11 +177,13 @@ public BibEntry parseBibEntry(String jsonStr) {
         }
 
         if (jsonObject.has("collection-title")) {
-            bibEntry.setField(StandardField.SERIES, jsonObject.get("collection-title").getAsString());
+            bibEntry.setField(
+                    StandardField.SERIES, jsonObject.get("collection-title").getAsString());
         }
 
         if (jsonObject.has("container-title")) {
-            bibEntry.setField(StandardField.BOOKTITLE, jsonObject.get("container-title").getAsString());
+            bibEntry.setField(
+                    StandardField.BOOKTITLE, jsonObject.get("container-title").getAsString());
         }
 
         if (jsonObject.has("DOI")) {
@@ -191,12 +200,14 @@ public BibEntry parseBibEntry(String jsonStr) {
 
         if (jsonObject.has("keyword")) {
             String[] keywords = jsonObject.get("keyword").getAsString().split(", ");
-            String sortedKeywords = Arrays.stream(keywords).sorted().collect(Collectors.joining(", "));
+            String sortedKeywords =
+                    Arrays.stream(keywords).sorted().collect(Collectors.joining(", "));
             bibEntry.setField(StandardField.KEYWORDS, sortedKeywords);
         }
 
         if (jsonObject.has("number-of-pages")) {
-            bibEntry.setField(StandardField.PAGETOTAL, jsonObject.get("number-of-pages").getAsString());
+            bibEntry.setField(
+                    StandardField.PAGETOTAL, jsonObject.get("number-of-pages").getAsString());
         }
 
         if (jsonObject.has("page")) {
@@ -208,7 +219,8 @@ public BibEntry parseBibEntry(String jsonStr) {
         }
 
         if (jsonObject.has("publisher-place")) {
-            bibEntry.setField(StandardField.ADDRESS, jsonObject.get("publisher-place").getAsString());
+            bibEntry.setField(
+                    StandardField.ADDRESS, jsonObject.get("publisher-place").getAsString());
         }
 
         if (jsonObject.has("title")) {
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibliographyFromPdfImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/BibliographyFromPdfImporter.java
index 9f7cd053bfdd..1b44bd26fd89 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibliographyFromPdfImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibliographyFromPdfImporter.java
@@ -1,16 +1,10 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import com.google.common.annotations.VisibleForTesting;
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.text.PDFTextStripper;
 import org.jabref.architecture.AllowedToUseApacheCommonsLang3;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
@@ -30,14 +24,20 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.text.PDFTextStripper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * Parses the references from the "References" section from a PDF
  * <p>
@@ -50,30 +50,37 @@ public class BibliographyFromPdfImporter extends Importer {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BibliographyFromPdfImporter.class);
 
-    private static final Pattern REFERENCES = Pattern.compile("References", Pattern.CASE_INSENSITIVE);
-    private static final Pattern REFERENCE_PATTERN = Pattern.compile("\\[(\\d+)\\](.*?)(?=\\[|$)", Pattern.DOTALL);
+    private static final Pattern REFERENCES =
+            Pattern.compile("References", Pattern.CASE_INSENSITIVE);
+    private static final Pattern REFERENCE_PATTERN =
+            Pattern.compile("\\[(\\d+)\\](.*?)(?=\\[|$)", Pattern.DOTALL);
     private static final Pattern YEAR_AT_END = Pattern.compile(", (\\d{4})\\.$");
     private static final Pattern YEAR = Pattern.compile(", (\\d{4})(.*)");
     private static final Pattern PAGES = Pattern.compile(", pp\\. (\\d+--?\\d+)\\.?(.*)");
     private static final Pattern PAGE = Pattern.compile(", p\\. (\\d+)(.*)");
     private static final Pattern SERIES = Pattern.compile(", ser\\. ([^.,]+)(.*)");
-    private static final Pattern MONTH_RANGE_AND_YEAR = Pattern.compile(", ([A-Z][a-z]{2,7}\\.?)-[A-Z][a-z]{2,7}\\.? (\\d+)(.*)");
-    private static final Pattern MONTH_AND_YEAR = Pattern.compile(", ([A-Z][a-z]{2,7}\\.? \\d+),? ?(.*)");
+    private static final Pattern MONTH_RANGE_AND_YEAR =
+            Pattern.compile(", ([A-Z][a-z]{2,7}\\.?)-[A-Z][a-z]{2,7}\\.? (\\d+)(.*)");
+    private static final Pattern MONTH_AND_YEAR =
+            Pattern.compile(", ([A-Z][a-z]{2,7}\\.? \\d+),? ?(.*)");
     private static final Pattern VOLUME = Pattern.compile(", vol\\. (\\d+)(.*)");
     private static final Pattern NO = Pattern.compile(", no\\. (\\d+)(.*)");
     private static final Pattern PROCEEDINGS_INDICATION = Pattern.compile("^in (Proc\\. )?(.*)");
     private static final Pattern WORKSHOP = Pattern.compile("Workshop");
-    private static final Pattern AUTHORS_AND_TITLE_AT_BEGINNING = Pattern.compile("^([^“]+), “(.*?)(”,|,”) ");
+    private static final Pattern AUTHORS_AND_TITLE_AT_BEGINNING =
+            Pattern.compile("^([^“]+), “(.*?)(”,|,”) ");
     private static final Pattern TITLE = Pattern.compile("“(.*?)”, (.*)");
 
     private final CitationKeyPatternPreferences citationKeyPatternPreferences;
-    private final NormalizeUnicodeFormatter normalizeUnicodeFormatter = new NormalizeUnicodeFormatter();
+    private final NormalizeUnicodeFormatter normalizeUnicodeFormatter =
+            new NormalizeUnicodeFormatter();
 
     public BibliographyFromPdfImporter() {
         this.citationKeyPatternPreferences = null;
     }
 
-    public BibliographyFromPdfImporter(CitationKeyPatternPreferences citationKeyPatternPreferences) {
+    public BibliographyFromPdfImporter(
+            CitationKeyPatternPreferences citationKeyPatternPreferences) {
         this.citationKeyPatternPreferences = citationKeyPatternPreferences;
     }
 
@@ -85,8 +92,9 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     @Override
     public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
-        throw new UnsupportedOperationException("BibliopgraphyFromPdfImporter does not support importDatabase(BufferedReader reader)."
-                + "Instead use importDatabase(Path filePath).");
+        throw new UnsupportedOperationException(
+                "BibliopgraphyFromPdfImporter does not support importDatabase(BufferedReader reader)."
+                        + "Instead use importDatabase(Path filePath).");
     }
 
     @Override
@@ -96,7 +104,8 @@ public String getName() {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Reads the references from the 'References' section of a PDF file.");
+        return Localization.lang(
+                "Reads the references from the 'References' section of a PDF file.");
     }
 
     @Override
@@ -124,15 +133,16 @@ public ParserResult importDatabase(Path filePath) {
         }
 
         // Generate citation keys for result
-        CitationKeyGenerator citationKeyGenerator = new CitationKeyGenerator(parserResult.getDatabaseContext(), citationKeyPatternPreferences);
+        CitationKeyGenerator citationKeyGenerator =
+                new CitationKeyGenerator(
+                        parserResult.getDatabaseContext(), citationKeyPatternPreferences);
         parserResult.getDatabase().getEntries().forEach(citationKeyGenerator::generateAndSetKey);
 
         return parserResult;
     }
 
     @VisibleForTesting
-    record IntermediateData(String number, String reference) {
-    }
+    record IntermediateData(String number, String reference) {}
 
     /**
      * In: <code>"[1] ...\n...\n...[2]...\n...\n...\n[3]..."</code><br>
@@ -142,8 +152,8 @@ private List<BibEntry> getEntriesFromPDFContent(String contents) {
         List<IntermediateData> referencesStrings = getIntermediateData(contents);
 
         return referencesStrings.stream()
-                                .map(data -> parseReference(data.number(), data.reference()))
-                                .toList();
+                .map(data -> parseReference(data.number(), data.reference()))
+                .toList();
     }
 
     @VisibleForTesting
@@ -181,7 +191,9 @@ private static boolean containsWordReferences(String result) {
         return matcher.find();
     }
 
-    private String prependToResult(String currentText, PDDocument document, PDFTextStripper stripper, int pageNumber) throws IOException {
+    private String prependToResult(
+            String currentText, PDDocument document, PDFTextStripper stripper, int pageNumber)
+            throws IOException {
         String pageContents = getPageContents(document, stripper, pageNumber);
         String result = pageContents + currentText;
         if (!containsWordReferences(pageContents) && (pageNumber > 0)) {
@@ -190,7 +202,8 @@ private String prependToResult(String currentText, PDDocument document, PDFTextS
         return result;
     }
 
-    private static String getPageContents(PDDocument document, PDFTextStripper stripper, int lastPage) throws IOException {
+    private static String getPageContents(
+            PDDocument document, PDFTextStripper stripper, int lastPage) throws IOException {
         stripper.setStartPage(lastPage);
         stripper.setEndPage(lastPage);
         StringWriter writer = new StringWriter();
@@ -207,15 +220,15 @@ private static String getPageContents(PDDocument document, PDFTextStripper strip
     BibEntry parseReference(String number, String reference) {
         reference = normalizeUnicodeFormatter.format(reference);
         String originalReference = "[" + number + "] " + reference;
-        BibEntry result = new BibEntry(StandardEntryType.Article)
-                .withCitationKey(number);
+        BibEntry result = new BibEntry(StandardEntryType.Article).withCitationKey(number);
 
-        reference = reference
-                .replace(".-", "-")
-                // Unicode en dash (used as page separator)
-                .replace("–", "-")
-                // Remove "- " introduced by linebreaks in the PDF
-                .replaceAll("([^ ])- ", "$1");
+        reference =
+                reference
+                        .replace(".-", "-")
+                        // Unicode en dash (used as page separator)
+                        .replace("–", "-")
+                        // Remove "- " introduced by linebreaks in the PDF
+                        .replaceAll("([^ ])- ", "$1");
 
         // Move URL to URL field
         Matcher urlPatternMatcher = URLCleanup.URL_PATTERN.matcher(reference);
@@ -228,8 +241,11 @@ BibEntry parseReference(String number, String reference) {
             }
         }
 
-        // J. Knaster et al., “Overview of the IFMIF/EVEDA project”, Nucl. Fusion, vol. 57, p. 102016, 2017. doi:10.1088/ 1741-4326/aa6a6a
-        // Y. Shimosaki et al., “Lattice design for 5 MeV – 125 mA CW RFQ operation in LIPAc”, in Proc. IPAC’19, Mel- bourne, Australia, May 2019, pp. 977-979. doi:10.18429/ JACoW-IPAC2019-MOPTS051
+        // J. Knaster et al., “Overview of the IFMIF/EVEDA project”, Nucl. Fusion, vol. 57, p.
+        // 102016, 2017. doi:10.1088/ 1741-4326/aa6a6a
+        // Y. Shimosaki et al., “Lattice design for 5 MeV – 125 mA CW RFQ operation in LIPAc”, in
+        // Proc. IPAC’19, Mel- bourne, Australia, May 2019, pp. 977-979. doi:10.18429/
+        // JACoW-IPAC2019-MOPTS051
         int pos = reference.indexOf("doi:");
         if (pos >= 0) {
             String doi = reference.substring(pos + "doi:".length()).trim();
@@ -238,29 +254,49 @@ BibEntry parseReference(String number, String reference) {
             reference = reference.substring(0, pos).trim();
         }
 
-        reference = updateEntryAndReferenceIfMatches(reference, PAGES, result, StandardField.PAGES).newReference;
+        reference =
+                updateEntryAndReferenceIfMatches(reference, PAGES, result, StandardField.PAGES)
+                        .newReference;
 
-        // J. Knaster et al., “Overview of the IFMIF/EVEDA project”, Nucl. Fusion, vol. 57, p. 102016
-        // Y. Shimosaki et al., “Lattice design for 5 MeV – 125 mA CW RFQ operation in LIPAc”, in Proc. IPAC’19, Mel- bourne, Australia, May 2019
-        reference = updateEntryAndReferenceIfMatches(reference, PAGE, result, StandardField.PAGES).newReference;
+        // J. Knaster et al., “Overview of the IFMIF/EVEDA project”, Nucl. Fusion, vol. 57, p.
+        // 102016
+        // Y. Shimosaki et al., “Lattice design for 5 MeV – 125 mA CW RFQ operation in LIPAc”, in
+        // Proc. IPAC’19, Mel- bourne, Australia, May 2019
+        reference =
+                updateEntryAndReferenceIfMatches(reference, PAGE, result, StandardField.PAGES)
+                        .newReference;
 
-        reference = updateEntryAndReferenceIfMatches(reference, SERIES, result, StandardField.SERIES).newReference;
+        reference =
+                updateEntryAndReferenceIfMatches(reference, SERIES, result, StandardField.SERIES)
+                        .newReference;
 
         Matcher matcher = MONTH_RANGE_AND_YEAR.matcher(reference);
         if (matcher.find()) {
             // strip out second monthp
-            reference = reference.substring(0, matcher.start()) + ", " + matcher.group(1) + " " + matcher.group(2) + matcher.group(3);
+            reference =
+                    reference.substring(0, matcher.start())
+                            + ", "
+                            + matcher.group(1)
+                            + " "
+                            + matcher.group(2)
+                            + matcher.group(3);
         }
 
         // J. Knaster et al., “Overview of the IFMIF/EVEDA project”, Nucl. Fusion, vol. 57
-        // Y. Shimosaki et al., “Lattice design for 5 MeV – 125 mA CW RFQ operation in LIPAc”, in Proc. IPAC’19, Mel- bourne, Australia, May 2019
+        // Y. Shimosaki et al., “Lattice design for 5 MeV – 125 mA CW RFQ operation in LIPAc”, in
+        // Proc. IPAC’19, Mel- bourne, Australia, May 2019
         matcher = MONTH_AND_YEAR.matcher(reference);
         if (matcher.find()) {
             Optional<Date> parsedDate = Date.parse(matcher.group(1));
             if (parsedDate.isPresent()) {
                 Date date = parsedDate.get();
-                date.getYear().ifPresent(year -> result.setField(StandardField.YEAR, year.toString()));
-                date.getMonth().ifPresent(month -> result.setField(StandardField.MONTH, month.getJabRefFormat()));
+                date.getYear()
+                        .ifPresent(year -> result.setField(StandardField.YEAR, year.toString()));
+                date.getMonth()
+                        .ifPresent(
+                                month ->
+                                        result.setField(
+                                                StandardField.MONTH, month.getJabRefFormat()));
 
                 String prefix = reference.substring(0, matcher.start()).trim();
                 String suffix = matcher.group(2);
@@ -273,50 +309,66 @@ BibEntry parseReference(String number, String reference) {
             }
         }
 
-        // J. Knaster et al., “Overview of the IFMIF/EVEDA project”, Nucl. Fusion, vol. 57, p. 102016, 2017.
-        // Y. Shimosaki et al., “Lattice design for 5 MeV – 125 mA CW RFQ operation in LIPAc”, in Proc. IPAC’19, Mel- bourne, Australia, May 2019, pp. 977-979
+        // J. Knaster et al., “Overview of the IFMIF/EVEDA project”, Nucl. Fusion, vol. 57, p.
+        // 102016, 2017.
+        // Y. Shimosaki et al., “Lattice design for 5 MeV – 125 mA CW RFQ operation in LIPAc”, in
+        // Proc. IPAC’19, Mel- bourne, Australia, May 2019, pp. 977-979
         matcher = YEAR_AT_END.matcher(reference);
         if (matcher.find()) {
             result.setField(StandardField.YEAR, matcher.group(1));
             reference = reference.substring(0, matcher.start()).trim();
         }
 
-        reference = updateEntryAndReferenceIfMatches(reference, YEAR, result, StandardField.YEAR).newReference;
+        reference =
+                updateEntryAndReferenceIfMatches(reference, YEAR, result, StandardField.YEAR)
+                        .newReference;
 
         // J. Knaster et al., “Overview of the IFMIF/EVEDA project”, Nucl. Fusion, vol. 57
-        // Y. Shimosaki et al., “Lattice design for 5 MeV – 125 mA CW RFQ operation in LIPAc”, in Proc. IPAC’19, Mel- bourne, Australia
-        EntryUpdateResult entryUpdateResult = updateEntryAndReferenceIfMatches(reference, VOLUME, result, StandardField.VOLUME);
+        // Y. Shimosaki et al., “Lattice design for 5 MeV – 125 mA CW RFQ operation in LIPAc”, in
+        // Proc. IPAC’19, Mel- bourne, Australia
+        EntryUpdateResult entryUpdateResult =
+                updateEntryAndReferenceIfMatches(reference, VOLUME, result, StandardField.VOLUME);
         boolean volumeFound = entryUpdateResult.modified;
         reference = entryUpdateResult.newReference;
 
-        entryUpdateResult = updateEntryAndReferenceIfMatches(reference, NO, result, StandardField.NUMBER);
+        entryUpdateResult =
+                updateEntryAndReferenceIfMatches(reference, NO, result, StandardField.NUMBER);
         boolean numberFound = entryUpdateResult.modified;
         reference = entryUpdateResult.newReference;
 
         // J. Knaster et al., “Overview of the IFMIF/EVEDA project”, Nucl. Fusion
-        // Y. Shimosaki et al., “Lattice design for 5 MeV – 125 mA CW RFQ operation in LIPAc”, in Proc. IPAC’19, Mel- bourne, Australia
+        // Y. Shimosaki et al., “Lattice design for 5 MeV – 125 mA CW RFQ operation in LIPAc”, in
+        // Proc. IPAC’19, Mel- bourne, Australia
         matcher = AUTHORS_AND_TITLE_AT_BEGINNING.matcher(reference);
         if (matcher.find()) {
             String authors = matcher.group(1).replaceAll("et al\\.?", "and others");
 
             // Alternative: AuthorList.fixAuthorFirstNameFirst(authors) only
-            // However, this does not work with special cases. Thus, we do a simple transformation only.
-            String fixedAuthors = AuthorListParser.normalizeSimply(authors).orElseGet(() -> AuthorList.fixAuthorFirstNameFirst(authors));
+            // However, this does not work with special cases. Thus, we do a simple transformation
+            // only.
+            String fixedAuthors =
+                    AuthorListParser.normalizeSimply(authors)
+                            .orElseGet(() -> AuthorList.fixAuthorFirstNameFirst(authors));
 
             result.setField(StandardField.AUTHOR, fixedAuthors);
-            result.setField(StandardField.TITLE, matcher.group(2).replaceAll("et al\\.?", "and others"));
+            result.setField(
+                    StandardField.TITLE, matcher.group(2).replaceAll("et al\\.?", "and others"));
             reference = reference.substring(matcher.end()).trim();
         } else {
             // No authors present
             // Example: “AF4.1.1 SRF Linac Engineering Design Report”, Internal note.
-            reference = updateEntryAndReferenceIfMatches(reference, TITLE, result, StandardField.TITLE).newReference;
+            reference =
+                    updateEntryAndReferenceIfMatches(reference, TITLE, result, StandardField.TITLE)
+                            .newReference;
         }
 
         // Nucl. Fusion
         // in Proc. IPAC’19, Mel- bourne, Australia
-        // presented at th 8th DITANET Topical Workshop on Beam Position Monitors, CERN, Geneva, Switzreland
+        // presented at th 8th DITANET Topical Workshop on Beam Position Monitors, CERN, Geneva,
+        // Switzreland
         List<String> stringsToRemove = List.of("presented at", "to be presented at");
-        // need to use "for" loop instead of "stream().foreach", because "reference" is modified inside the loop
+        // need to use "for" loop instead of "stream().foreach", because "reference" is modified
+        // inside the loop
         for (String check : stringsToRemove) {
             if (reference.startsWith(check)) {
                 reference = reference.substring(check.length()).trim();
@@ -352,8 +404,10 @@ BibEntry parseReference(String number, String reference) {
             }
             if (lastDot > offset) {
                 String textAfterDot = bookTitle.substring(offset + lastDot + 1).trim();
-                // We use Apache Commons here, because it is fastest - see table at https://stackoverflow.com/a/35242882/873282
-                if (!textAfterDot.contains("http") && (StringUtils.countMatches(textAfterDot, ' ') <= 1)) {
+                // We use Apache Commons here, because it is fastest - see table at
+                // https://stackoverflow.com/a/35242882/873282
+                if (!textAfterDot.contains("http")
+                        && (StringUtils.countMatches(textAfterDot, ' ') <= 1)) {
                     bookTitle = bookTitle.substring(0, offset + lastDot).trim();
                     if (bookTitle.startsWith("in ")) {
                         bookTitle = bookTitle.substring(3);
@@ -381,7 +435,9 @@ BibEntry parseReference(String number, String reference) {
                 result.setField(StandardField.NOTE, reference);
                 result.setType(StandardEntryType.TechReport);
             } else {
-                LOGGER.debug("Falling back to journal even if no volume and no number was found. Reference: {}", reference);
+                LOGGER.debug(
+                        "Falling back to journal even if no volume and no number was found. Reference: {}",
+                        reference);
                 result.setField(StandardField.JOURNAL, reference);
             }
         } else {
@@ -402,7 +458,8 @@ BibEntry parseReference(String number, String reference) {
     /**
      * @param pattern A pattern matching two groups: The first one to take, the second one to leave at the end of the string
      */
-    private static EntryUpdateResult updateEntryAndReferenceIfMatches(String reference, Pattern pattern, BibEntry result, Field field) {
+    private static EntryUpdateResult updateEntryAndReferenceIfMatches(
+            String reference, Pattern pattern, BibEntry result, Field field) {
         Matcher matcher;
         matcher = pattern.matcher(reference);
         if (!matcher.find()) {
@@ -414,6 +471,5 @@ private static EntryUpdateResult updateEntryAndReferenceIfMatches(String referen
         return new EntryUpdateResult(true, reference);
     }
 
-    private record EntryUpdateResult(boolean modified, String newReference) {
-    }
+    private record EntryUpdateResult(boolean modified, String newReference) {}
 }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java
index 6809ee550609..9f9cab8796f2 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java
@@ -1,14 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
@@ -19,6 +10,15 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+
 /**
  * Imports a Biblioscape Tag File. The format is described on
  * http://www.biblioscape.com/download/Biblioscape8.pdf Several
@@ -39,7 +39,8 @@ public StandardFileType getFileType() {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Imports a Biblioscape Tag File.\nSeveral Biblioscape field types are ignored. Others are only included in the BibTeX field \"comment\".");
+        return Localization.lang(
+                "Imports a Biblioscape Tag File.\nSeveral Biblioscape field types are ignored. Others are only included in the BibTeX field \"comment\".");
     }
 
     @Override
@@ -72,114 +73,82 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 // add item
                 for (Map.Entry<String, StringBuilder> entry : lines.entrySet()) {
                     if ("AU".equals(entry.getKey())) {
-                        hm.put(StandardField.AUTHOR, entry.getValue()
-                                                          .toString());
+                        hm.put(StandardField.AUTHOR, entry.getValue().toString());
                     } else if ("TI".equals(entry.getKey())) {
-                        titleTI = entry.getValue()
-                                       .toString();
+                        titleTI = entry.getValue().toString();
                     } else if ("ST".equals(entry.getKey())) {
-                        titleST = entry.getValue()
-                                       .toString();
+                        titleST = entry.getValue().toString();
                     } else if ("YP".equals(entry.getKey())) {
-                        hm.put(StandardField.YEAR, entry
-                                .getValue().toString());
+                        hm.put(StandardField.YEAR, entry.getValue().toString());
                     } else if ("VL".equals(entry.getKey())) {
-                        hm.put(StandardField.VOLUME, entry
-                                .getValue().toString());
+                        hm.put(StandardField.VOLUME, entry.getValue().toString());
                     } else if ("NB".equals(entry.getKey())) {
-                        hm.put(StandardField.NUMBER, entry
-                                .getValue().toString());
+                        hm.put(StandardField.NUMBER, entry.getValue().toString());
                     } else if ("PS".equals(entry.getKey())) {
-                        pages[0] = entry.getValue()
-                                        .toString();
+                        pages[0] = entry.getValue().toString();
                     } else if ("PE".equals(entry.getKey())) {
-                        pages[1] = entry.getValue()
-                                        .toString();
+                        pages[1] = entry.getValue().toString();
                     } else if ("KW".equals(entry.getKey())) {
-                        hm.put(StandardField.KEYWORDS, entry
-                                .getValue().toString());
+                        hm.put(StandardField.KEYWORDS, entry.getValue().toString());
                     } else if ("RT".equals(entry.getKey())) {
-                        type[0] = entry.getValue()
-                                       .toString();
+                        type[0] = entry.getValue().toString();
                     } else if ("SB".equals(entry.getKey())) {
-                        comments.add("Subject: "
-                                + entry.getValue());
+                        comments.add("Subject: " + entry.getValue());
                     } else if ("SA".equals(entry.getKey())) {
-                        comments
-                                .add("Secondary Authors: " + entry.getValue());
+                        comments.add("Secondary Authors: " + entry.getValue());
                     } else if ("NT".equals(entry.getKey())) {
-                        hm.put(StandardField.NOTE, entry
-                                .getValue().toString());
+                        hm.put(StandardField.NOTE, entry.getValue().toString());
                     } else if ("PB".equals(entry.getKey())) {
-                        hm.put(StandardField.PUBLISHER, entry
-                                .getValue().toString());
+                        hm.put(StandardField.PUBLISHER, entry.getValue().toString());
                     } else if ("TA".equals(entry.getKey())) {
-                        comments
-                                .add("Tertiary Authors: " + entry.getValue());
+                        comments.add("Tertiary Authors: " + entry.getValue());
                     } else if ("TT".equals(entry.getKey())) {
-                        comments
-                                .add("Tertiary Title: " + entry.getValue());
+                        comments.add("Tertiary Title: " + entry.getValue());
                     } else if ("ED".equals(entry.getKey())) {
-                        hm.put(StandardField.EDITION, entry
-                                .getValue().toString());
+                        hm.put(StandardField.EDITION, entry.getValue().toString());
                     } else if ("TW".equals(entry.getKey())) {
-                        type[1] = entry.getValue()
-                                       .toString();
+                        type[1] = entry.getValue().toString();
                     } else if ("QA".equals(entry.getKey())) {
-                        comments
-                                .add("Quaternary Authors: " + entry.getValue());
+                        comments.add("Quaternary Authors: " + entry.getValue());
                     } else if ("QT".equals(entry.getKey())) {
-                        comments
-                                .add("Quaternary Title: " + entry.getValue());
+                        comments.add("Quaternary Title: " + entry.getValue());
                     } else if ("IS".equals(entry.getKey())) {
-                        hm.put(StandardField.ISBN, entry
-                                .getValue().toString());
+                        hm.put(StandardField.ISBN, entry.getValue().toString());
                     } else if ("AB".equals(entry.getKey())) {
-                        hm.put(StandardField.ABSTRACT, entry
-                                .getValue().toString());
+                        hm.put(StandardField.ABSTRACT, entry.getValue().toString());
                     } else if ("AD".equals(entry.getKey())) {
-                        address = entry.getValue()
-                                       .toString();
+                        address = entry.getValue().toString();
                     } else if ("LG".equals(entry.getKey())) {
-                        hm.put(StandardField.LANGUAGE, entry
-                                .getValue().toString());
+                        hm.put(StandardField.LANGUAGE, entry.getValue().toString());
                     } else if ("CO".equals(entry.getKey())) {
-                        country = entry.getValue()
-                                       .toString();
+                        country = entry.getValue().toString();
                     } else if ("UR".equals(entry.getKey()) || "AT".equals(entry.getKey())) {
                         String s = entry.getValue().toString().trim();
-                        hm.put(s.startsWith("http://") || s.startsWith("ftp://") ? StandardField.URL
-                                : StandardField.PDF, entry.getValue().toString());
+                        hm.put(
+                                s.startsWith("http://") || s.startsWith("ftp://")
+                                        ? StandardField.URL
+                                        : StandardField.PDF,
+                                entry.getValue().toString());
                     } else if ("C1".equals(entry.getKey())) {
-                        comments.add("Custom1: "
-                                + entry.getValue());
+                        comments.add("Custom1: " + entry.getValue());
                     } else if ("C2".equals(entry.getKey())) {
-                        comments.add("Custom2: "
-                                + entry.getValue());
+                        comments.add("Custom2: " + entry.getValue());
                     } else if ("C3".equals(entry.getKey())) {
-                        comments.add("Custom3: "
-                                + entry.getValue());
+                        comments.add("Custom3: " + entry.getValue());
                     } else if ("C4".equals(entry.getKey())) {
-                        comments.add("Custom4: "
-                                + entry.getValue());
+                        comments.add("Custom4: " + entry.getValue());
                     } else if ("C5".equals(entry.getKey())) {
-                        comments.add("Custom5: "
-                                + entry.getValue());
+                        comments.add("Custom5: " + entry.getValue());
                     } else if ("C6".equals(entry.getKey())) {
-                        comments.add("Custom6: "
-                                + entry.getValue());
+                        comments.add("Custom6: " + entry.getValue());
                     } else if ("DE".equals(entry.getKey())) {
-                        hm.put(StandardField.ANNOTE, entry
-                                .getValue().toString());
+                        hm.put(StandardField.ANNOTE, entry.getValue().toString());
                     } else if ("CA".equals(entry.getKey())) {
-                        comments.add("Categories: "
-                                + entry.getValue());
+                        comments.add("Categories: " + entry.getValue());
                     } else if ("TH".equals(entry.getKey())) {
-                        comments.add("Short Title: "
-                                + entry.getValue());
+                        comments.add("Short Title: " + entry.getValue());
                     } else if ("SE".equals(entry.getKey())) {
-                        hm.put(StandardField.CHAPTER, entry
-                                .getValue().toString());
+                        hm.put(StandardField.CHAPTER, entry.getValue().toString());
                         // else if (entry.getKey().equals("AC"))
                         //   hm.put("",entry.getValue().toString());
                         // else if (entry.getKey().equals("LP"))
@@ -208,8 +177,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         bibtexType = StandardEntryType.InProceedings;
                     } else if (type[i].contains("report")) {
                         bibtexType = StandardEntryType.TechReport;
-                    } else if (type[i].contains("thesis")
-                            && type[i].contains("master")) {
+                    } else if (type[i].contains("thesis") && type[i].contains("master")) {
                         bibtexType = StandardEntryType.MastersThesis;
                     } else if (type[i].contains("thesis")) {
                         bibtexType = StandardEntryType.PhdThesis;
@@ -243,12 +211,17 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
 
                 // concatenate pages
                 if ((pages[0] != null) || (pages[1] != null)) {
-                    hm.put(StandardField.PAGES, (pages[0] == null ? "" : pages[0]) + (pages[1] == null ? "" : "--" + pages[1]));
+                    hm.put(
+                            StandardField.PAGES,
+                            (pages[0] == null ? "" : pages[0])
+                                    + (pages[1] == null ? "" : "--" + pages[1]));
                 }
 
                 // concatenate address and country
                 if (address != null) {
-                    hm.put(StandardField.ADDRESS, address + (country == null ? "" : ", " + country));
+                    hm.put(
+                            StandardField.ADDRESS,
+                            address + (country == null ? "" : ", " + country));
                 }
 
                 if (!comments.isEmpty()) { // set comment if present
@@ -265,7 +238,8 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 continue;
             }
             // new key
-            if (line.startsWith("--") && (line.length() >= 7)
+            if (line.startsWith("--")
+                    && (line.length() >= 7)
                     && "-- ".equals(line.substring(4, 7))) {
                 previousLine = new StringBuilder(line.substring(7));
                 lines.put(line.substring(2, 4), previousLine);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java
index e78f4d7db2ef..010acb82d396 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java
@@ -1,5 +1,16 @@
 package org.jabref.logic.importer.fileformat;
 
+import org.jabref.logic.exporter.SaveConfiguration;
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.Importer;
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.database.BibDatabaseModeDetection;
+import org.jabref.model.util.FileUpdateMonitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -13,18 +24,6 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import org.jabref.logic.exporter.SaveConfiguration;
-import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.Importer;
-import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.model.database.BibDatabaseModeDetection;
-import org.jabref.model.util.FileUpdateMonitor;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * This is a full class to read .bib files. It is used for <code>--import</code> and <code>--importToOpen </code>, too.
  */
@@ -38,7 +37,8 @@ public class BibtexImporter extends Importer {
     private final ImportFormatPreferences importFormatPreferences;
     private final FileUpdateMonitor fileMonitor;
 
-    public BibtexImporter(ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor) {
+    public BibtexImporter(
+            ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor) {
         this.importFormatPreferences = importFormatPreferences;
         this.fileMonitor = fileMonitor;
     }
@@ -63,14 +63,19 @@ public ParserResult importDatabase(Path filePath) throws IOException {
         CharsetDecoder decoder = result.encoding().newDecoder();
         decoder.onMalformedInput(CodingErrorAction.REPLACE);
 
-        try (InputStreamReader inputStreamReader = new InputStreamReader(Files.newInputStream(filePath), decoder);
-             BufferedReader reader = new BufferedReader(inputStreamReader)) {
+        try (InputStreamReader inputStreamReader =
+                        new InputStreamReader(Files.newInputStream(filePath), decoder);
+                BufferedReader reader = new BufferedReader(inputStreamReader)) {
             ParserResult parserResult = this.importDatabase(reader);
             parserResult.getMetaData().setEncoding(result.encoding());
-            parserResult.getMetaData().setEncodingExplicitlySupplied(result.encodingExplicitlySupplied());
+            parserResult
+                    .getMetaData()
+                    .setEncodingExplicitlySupplied(result.encodingExplicitlySupplied());
             parserResult.setPath(filePath);
             if (parserResult.getMetaData().getMode().isEmpty()) {
-                parserResult.getMetaData().setMode(BibDatabaseModeDetection.inferMode(parserResult.getDatabase()));
+                parserResult
+                        .getMetaData()
+                        .setMode(BibDatabaseModeDetection.inferMode(parserResult.getDatabase()));
             }
             return parserResult;
         }
@@ -85,10 +90,12 @@ public static Charset getEncoding(Path filePath) throws IOException {
      * If there is none present, {@link com.ibm.icu.text.CharsetDetector#CharsetDetector()} is used.
      */
     private static EncodingResult getEncodingResult(Path filePath) throws IOException {
-        // We want to check if there is a JabRef encoding heading in the file, because that would tell us
+        // We want to check if there is a JabRef encoding heading in the file, because that would
+        // tell us
         // which character encoding is used.
 
-        // In general, we have to use InputStream and not a Reader, because a Reader requires an encoding specification.
+        // In general, we have to use InputStream and not a Reader, because a Reader requires an
+        // encoding specification.
         // We do not want to do a byte-by-byte reading or doing wild try/catch magic.
         // We therefore use a charset detection library and then read JabRefs "% Encoding" mark
 
@@ -116,8 +123,7 @@ private static EncodingResult getEncodingResult(Path filePath) throws IOExceptio
         return result;
     }
 
-    private record EncodingResult(Charset encoding, boolean encodingExplicitlySupplied) {
-    }
+    private record EncodingResult(Charset encoding, boolean encodingExplicitlySupplied) {}
 
     /**
      * This method does not set the metadata encoding information. The caller needs to set the encoding of the supplied
@@ -151,9 +157,11 @@ private static Optional<Charset> getSuppliedEncoding(BufferedReader reader) {
             String line;
             while ((line = reader.readLine()) != null) {
                 line = line.trim();
-                // % = char 37, we might have some bom chars in front that we need to skip, so we use index of
+                // % = char 37, we might have some bom chars in front that we need to skip, so we
+                // use index of
                 var percentPos = line.indexOf('%', 0);
-                // Line does not start with %, so there are no comment lines for us and we can stop parsing
+                // Line does not start with %, so there are no comment lines for us and we can stop
+                // parsing
                 if (percentPos == -1) {
                     return Optional.empty();
                 }
@@ -164,12 +172,15 @@ private static Optional<Charset> getSuppliedEncoding(BufferedReader reader) {
                 if (line.startsWith(BibtexImporter.SIGNATURE)) {
                     // Signature line, so keep reading and skip to next line
                 } else if (line.startsWith(SaveConfiguration.ENCODING_PREFIX)) {
-                    // Line starts with "Encoding: ", so the rest of the line should contain the name of the encoding
+                    // Line starts with "Encoding: ", so the rest of the line should contain the
+                    // name of the encoding
                     // Except if there is already a @ symbol signaling the starting of a BibEntry
                     Integer atSymbolIndex = line.indexOf('@');
                     String encoding;
                     if (atSymbolIndex > 0) {
-                        encoding = line.substring(SaveConfiguration.ENCODING_PREFIX.length(), atSymbolIndex);
+                        encoding =
+                                line.substring(
+                                        SaveConfiguration.ENCODING_PREFIX.length(), atSymbolIndex);
                     } else {
                         encoding = line.substring(SaveConfiguration.ENCODING_PREFIX.length());
                     }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
index ebb1282a787b..5a1584625a82 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
@@ -1,29 +1,11 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PushbackReader;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.nio.file.Path;
-import java.util.Base64;
-import java.util.Collection;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
+import static org.jabref.logic.util.MetadataSerializationConfiguration.GROUP_QUOTE_CHAR;
+import static org.jabref.logic.util.MetadataSerializationConfiguration.GROUP_TYPE_SUFFIX;
 
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
+import com.dd.plist.BinaryPropertyListParser;
+import com.dd.plist.NSDictionary;
+import com.dd.plist.NSString;
 
 import org.jabref.logic.bibtex.FieldWriter;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
@@ -54,10 +36,6 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import com.dd.plist.BinaryPropertyListParser;
-import com.dd.plist.NSDictionary;
-import com.dd.plist.NSString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -65,8 +43,30 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-import static org.jabref.logic.util.MetadataSerializationConfiguration.GROUP_QUOTE_CHAR;
-import static org.jabref.logic.util.MetadataSerializationConfiguration.GROUP_TYPE_SUFFIX;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PushbackReader;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.nio.file.Path;
+import java.util.Base64;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 
 /**
  * Class for importing BibTeX-files.
@@ -91,7 +91,8 @@ public class BibtexParser implements Parser {
     private static final Logger LOGGER = LoggerFactory.getLogger(BibtexParser.class);
     private static final Integer LOOKAHEAD = 1024;
     private static final String BIB_DESK_ROOT_GROUP_NAME = "BibDeskGroups";
-    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactory.newInstance();
+    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY =
+            DocumentBuilderFactory.newInstance();
     private final Deque<Character> pureTextFromFile = new LinkedList<>();
     private final ImportFormatPreferences importFormatPreferences;
     private PushbackReader pushbackReader;
@@ -105,7 +106,8 @@ public class BibtexParser implements Parser {
 
     private GroupTreeNode bibDeskGroupTreeNode;
 
-    public BibtexParser(ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor) {
+    public BibtexParser(
+            ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor) {
         this.importFormatPreferences = Objects.requireNonNull(importFormatPreferences);
         this.metaDataParser = new MetaDataParser(fileMonitor);
         this.parsedBibdeskGroups = new HashMap<>();
@@ -122,8 +124,11 @@ public BibtexParser(ImportFormatPreferences importFormatPreferences) {
      *
      * @return An {@code Optional<BibEntry>. Optional.empty()} if non was found or an error occurred.
      */
-    public static Optional<BibEntry> singleFromString(String bibtexString, ImportFormatPreferences importFormatPreferences) throws ParseException {
-        Collection<BibEntry> entries = new BibtexParser(importFormatPreferences).parseEntries(bibtexString);
+    public static Optional<BibEntry> singleFromString(
+            String bibtexString, ImportFormatPreferences importFormatPreferences)
+            throws ParseException {
+        Collection<BibEntry> entries =
+                new BibtexParser(importFormatPreferences).parseEntries(bibtexString);
         if ((entries == null) || entries.isEmpty()) {
             return Optional.empty();
         }
@@ -240,17 +245,16 @@ private ParserResult parseFileContent() throws IOException {
             switch (entryType) {
                 case "preamble" -> {
                     database.setPreamble(parsePreamble());
-                    // Consume a new line which separates the preamble from the next part (if the file was written with JabRef)
+                    // Consume a new line which separates the preamble from the next part (if the
+                    // file was written with JabRef)
                     skipOneNewline();
                     // the preamble is saved verbatim anyway, so the text read so far can be dropped
                     dumpTextReadSoFarToString();
                 }
-                case "string" ->
-                        parseBibtexString();
-                case "comment" ->
-                        parseJabRefComment(meta);
+                case "string" -> parseBibtexString();
+                case "comment" -> parseJabRefComment(meta);
                 default ->
-                    // Not a comment, preamble, or string. Thus, it is an entry
+                        // Not a comment, preamble, or string. Thus, it is an entry
                         parseAndAddEntry(entryType);
             }
 
@@ -260,26 +264,39 @@ private ParserResult parseFileContent() throws IOException {
         addBibDeskGroupEntriesToJabRefGroups();
 
         try {
-            MetaData metaData = metaDataParser.parse(
-                    meta,
-                    importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
+            MetaData metaData =
+                    metaDataParser.parse(
+                            meta,
+                            importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
             if (bibDeskGroupTreeNode != null) {
-                metaData.getGroups().ifPresentOrElse(existingGroupTree -> {
-                            var existingGroups = meta.get(MetaData.GROUPSTREE);
-                            // We only have one Group BibDeskGroup with n children
-                            // instead of iterating through the whole group structure every time we just search in the metadata for the group name
-                            var groupsToAdd = bibDeskGroupTreeNode.getChildren()
-                                                                  .stream().
-                                                                  filter(Predicate.not(groupTreeNode -> existingGroups.contains(GROUP_TYPE_SUFFIX + groupTreeNode.getName() + GROUP_QUOTE_CHAR)));
-                            groupsToAdd.forEach(existingGroupTree::moveTo);
-                        },
-                        // metadata does not contain any groups, so we need to create an AllEntriesGroup and add the other groups as children
-                        () -> {
-                            GroupTreeNode rootNode = new GroupTreeNode(DefaultGroupsFactory.getAllEntriesGroup());
-                            bibDeskGroupTreeNode.moveTo(rootNode);
-                            metaData.setGroups(rootNode);
-                        }
-                );
+                metaData.getGroups()
+                        .ifPresentOrElse(
+                                existingGroupTree -> {
+                                    var existingGroups = meta.get(MetaData.GROUPSTREE);
+                                    // We only have one Group BibDeskGroup with n children
+                                    // instead of iterating through the whole group structure every
+                                    // time we just search in the metadata for the group name
+                                    var groupsToAdd =
+                                            bibDeskGroupTreeNode.getChildren().stream()
+                                                    .filter(
+                                                            Predicate.not(
+                                                                    groupTreeNode ->
+                                                                            existingGroups.contains(
+                                                                                    GROUP_TYPE_SUFFIX
+                                                                                            + groupTreeNode
+                                                                                                    .getName()
+                                                                                            + GROUP_QUOTE_CHAR)));
+                                    groupsToAdd.forEach(existingGroupTree::moveTo);
+                                },
+                                // metadata does not contain any groups, so we need to create an
+                                // AllEntriesGroup and add the other groups as children
+                                () -> {
+                                    GroupTreeNode rootNode =
+                                            new GroupTreeNode(
+                                                    DefaultGroupsFactory.getAllEntriesGroup());
+                                    bibDeskGroupTreeNode.moveTo(rootNode);
+                                    metaData.setGroups(rootNode);
+                                });
             }
             parserResult.setMetaData(metaData);
         } catch (ParseException exception) {
@@ -294,10 +311,13 @@ private ParserResult parseFileContent() throws IOException {
     }
 
     private void checkEpilog() {
-        // This is an incomplete and inaccurate try to verify if something went wrong with previous parsing activity even though there were no warnings so far
+        // This is an incomplete and inaccurate try to verify if something went wrong with previous
+        // parsing activity even though there were no warnings so far
         // regex looks for something like 'identifier = blabla ,'
-        if (!parserResult.hasWarnings() && Pattern.compile("\\w+\\s*=.*,").matcher(database.getEpilog()).find()) {
-            parserResult.addWarning("following BibTex fragment has not been parsed:\n" + database.getEpilog());
+        if (!parserResult.hasWarnings()
+                && Pattern.compile("\\w+\\s*=.*,").matcher(database.getEpilog()).find()) {
+            parserResult.addWarning(
+                    "following BibTex fragment has not been parsed:\n" + database.getEpilog());
         }
     }
 
@@ -322,20 +342,28 @@ private void parseAndAddEntry(String type) {
             BibEntry entry = parseEntry(type);
             // store comments collected without type definition
             entry.setCommentsBeforeEntry(
-                    commentsAndEntryTypeDefinition.substring(0, commentsAndEntryTypeDefinition.lastIndexOf('@')));
+                    commentsAndEntryTypeDefinition.substring(
+                            0, commentsAndEntryTypeDefinition.lastIndexOf('@')));
 
             // store complete parsed serialization (comments, type definition + type contents)
 
-            String parsedSerialization = commentsAndEntryTypeDefinition + dumpTextReadSoFarToString();
+            String parsedSerialization =
+                    commentsAndEntryTypeDefinition + dumpTextReadSoFarToString();
             entry.setParsedSerialization(parsedSerialization);
 
             database.insertEntry(entry);
         } catch (IOException ex) {
             // This makes the parser more robust:
-            // If an exception is thrown when parsing an entry, drop the entry and try to resume parsing.
+            // If an exception is thrown when parsing an entry, drop the entry and try to resume
+            // parsing.
             LOGGER.warn("Could not parse entry", ex);
-            parserResult.addWarning(Localization.lang("Error occurred when parsing entry") + ": '" + ex.getMessage()
-                    + "'. " + "\n\n" + Localization.lang("JabRef skipped the entry."));
+            parserResult.addWarning(
+                    Localization.lang("Error occurred when parsing entry")
+                            + ": '"
+                            + ex.getMessage()
+                            + "'. "
+                            + "\n\n"
+                            + Localization.lang("JabRef skipped the entry."));
         }
     }
 
@@ -345,16 +373,19 @@ private void parseJabRefComment(Map<String, String> meta) {
             buffer = parseBracketedFieldContent();
         } catch (IOException e) {
             // if we get an IO Exception here, then we have an unbracketed comment,
-            // which means that we should just return and the comment will be picked up as arbitrary text
+            // which means that we should just return and the comment will be picked up as arbitrary
+            // text
             // by the parser
             LOGGER.info("Found unbracketed comment");
             return;
         }
 
         // We remove all line breaks in the metadata
-        // These have been inserted to prevent too long lines when the file was saved, and are not part of the data.
+        // These have been inserted to prevent too long lines when the file was saved, and are not
+        // part of the data.
         String comment = buffer.toString().replaceAll("[\\x0d\\x0a]", "");
-        if (comment.substring(0, Math.min(comment.length(), MetaData.META_FLAG.length())).equals(MetaData.META_FLAG)) {
+        if (comment.substring(0, Math.min(comment.length(), MetaData.META_FLAG.length()))
+                .equals(MetaData.META_FLAG)) {
             if (comment.startsWith(MetaData.META_FLAG)) {
                 String rest = comment.substring(MetaData.META_FLAG.length());
 
@@ -367,15 +398,19 @@ private void parseJabRefComment(Map<String, String> meta) {
                     dumpTextReadSoFarToString();
                 }
             }
-        } else if (comment.substring(0, Math.min(comment.length(), MetaData.ENTRYTYPE_FLAG.length()))
-                          .equals(MetaData.ENTRYTYPE_FLAG)) {
+        } else if (comment.substring(
+                        0, Math.min(comment.length(), MetaData.ENTRYTYPE_FLAG.length()))
+                .equals(MetaData.ENTRYTYPE_FLAG)) {
             // A custom entry type can also be stored in a
             // "@comment"
             Optional<BibEntryType> typ = MetaDataParser.parseCustomEntryType(comment);
             if (typ.isPresent()) {
                 entryTypes.add(typ.get());
             } else {
-                parserResult.addWarning(Localization.lang("Ill-formed entrytype comment in BIB file") + ": " + comment);
+                parserResult.addWarning(
+                        Localization.lang("Ill-formed entrytype comment in BIB file")
+                                + ": "
+                                + comment);
             }
 
             // custom entry types are always re-written by JabRef and not stored in the file
@@ -397,13 +432,17 @@ private void addBibDeskGroupEntriesToJabRefGroups() {
             String[] citationKeys = parsedBibdeskGroups.get(groupName).split(",");
             for (String citation : citationKeys) {
                 Optional<BibEntry> bibEntry = database.getEntryByCitationKey(citation);
-                Optional<String> groupValue = bibEntry.flatMap(entry -> entry.getField(StandardField.GROUPS));
+                Optional<String> groupValue =
+                        bibEntry.flatMap(entry -> entry.getField(StandardField.GROUPS));
                 if (groupValue.isEmpty()) { // if the citation does not belong to a group already
                     bibEntry.flatMap(entry -> entry.setField(StandardField.GROUPS, groupName));
                 } else if (!groupValue.get().contains(groupName)) {
-                    // if the citation does belong to a group already and is not yet assigned to the same group, we concatenate
+                    // if the citation does belong to a group already and is not yet assigned to the
+                    // same group, we concatenate
                     String concatGroup = groupValue.get() + "," + groupName;
-                    bibEntry.flatMap(entryByCitationKey -> entryByCitationKey.setField(StandardField.GROUPS, concatGroup));
+                    bibEntry.flatMap(
+                            entryByCitationKey ->
+                                    entryByCitationKey.setField(StandardField.GROUPS, concatGroup));
                 }
             }
         }
@@ -412,16 +451,28 @@ private void addBibDeskGroupEntriesToJabRefGroups() {
     /**
      * Parses comment types found in BibDesk, to migrate BibDesk Static Groups to JabRef.
      */
-    private void parseBibDeskComment(String comment, Map<String, String> meta) throws ParseException {
-        String xml = comment.substring(MetaData.BIBDESK_STATIC_FLAG.length() + 1, comment.length() - 1);
+    private void parseBibDeskComment(String comment, Map<String, String> meta)
+            throws ParseException {
+        String xml =
+                comment.substring(MetaData.BIBDESK_STATIC_FLAG.length() + 1, comment.length() - 1);
         try {
             // Build a document to handle the xml tags
-            Document doc = DOCUMENT_BUILDER_FACTORY.newDocumentBuilder().parse(new ByteArrayInputStream(xml.getBytes()));
+            Document doc =
+                    DOCUMENT_BUILDER_FACTORY
+                            .newDocumentBuilder()
+                            .parse(new ByteArrayInputStream(xml.getBytes()));
             doc.getDocumentElement().normalize();
 
             NodeList dictList = doc.getElementsByTagName("dict");
             meta.putIfAbsent(MetaData.DATABASE_TYPE, "bibtex;");
-            bibDeskGroupTreeNode = GroupTreeNode.fromGroup(new ExplicitGroup(BIB_DESK_ROOT_GROUP_NAME, GroupHierarchyType.INDEPENDENT, importFormatPreferences.bibEntryPreferences().getKeywordSeparator()));
+            bibDeskGroupTreeNode =
+                    GroupTreeNode.fromGroup(
+                            new ExplicitGroup(
+                                    BIB_DESK_ROOT_GROUP_NAME,
+                                    GroupHierarchyType.INDEPENDENT,
+                                    importFormatPreferences
+                                            .bibEntryPreferences()
+                                            .getKeywordSeparator()));
 
             // Since each static group has their own dict element, we iterate through them
             for (int i = 0; i < dictList.getLength(); i++) {
@@ -436,13 +487,20 @@ private void parseBibDeskComment(String comment, Map<String, String> meta) throw
                 for (int j = 0; j < keyList.getLength(); j++) {
                     if (keyList.item(j).getTextContent().matches("group name")) {
                         groupName = stringList.item(j).getTextContent();
-                        var staticGroup = new ExplicitGroup(groupName, GroupHierarchyType.INDEPENDENT, importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
+                        var staticGroup =
+                                new ExplicitGroup(
+                                        groupName,
+                                        GroupHierarchyType.INDEPENDENT,
+                                        importFormatPreferences
+                                                .bibEntryPreferences()
+                                                .getKeywordSeparator());
                         bibDeskGroupTreeNode.addSubgroup(staticGroup);
                     } else if (keyList.item(j).getTextContent().matches("keys")) {
                         citationKeys = stringList.item(j).getTextContent(); // adds group entries
                     }
                 }
-                // Adds the group name and citation keys to the field so all the entries can be added in the groups once parsed
+                // Adds the group name and citation keys to the field so all the entries can be
+                // added in the groups once parsed
                 parsedBibdeskGroups.putIfAbsent(groupName, citationKeys);
             }
         } catch (ParserConfigurationException | IOException | SAXException e) {
@@ -455,7 +513,8 @@ private void parseBibtexString() throws IOException {
         try {
             database.addString(bibtexString);
         } catch (KeyCollisionException ex) {
-            parserResult.addWarning(Localization.lang("Duplicate string name: '%0'", bibtexString.getName()));
+            parserResult.addWarning(
+                    Localization.lang("Duplicate string name: '%0'", bibtexString.getName()));
         }
     }
 
@@ -468,7 +527,8 @@ private String dumpTextReadSoFarToString() {
         String result = getPureTextFromFile();
         int indexOfAt = result.indexOf("@");
 
-        // if there is no entry found, simply return the content (necessary to parse text remaining after the last entry)
+        // if there is no entry found, simply return the content (necessary to parse text remaining
+        // after the last entry)
         if (indexOfAt == -1) {
             return purgeEOFCharacters(result);
         } else if (result.contains(BibtexDatabaseWriter.DATABASE_ID_PREFIX)) {
@@ -501,9 +561,9 @@ private String purge(String context, String stringToPurge) {
             runningIndex++;
         }
         // strip empty lines
-        while ((runningIndex < indexOfAt) &&
-                ((context.charAt(runningIndex) == '\r') ||
-                        (context.charAt(runningIndex) == '\n'))) {
+        while ((runningIndex < indexOfAt)
+                && ((context.charAt(runningIndex) == '\r')
+                        || (context.charAt(runningIndex) == '\n'))) {
             runningIndex++;
         }
         return context.substring(runningIndex);
@@ -621,9 +681,7 @@ private char[] peekTwoCharacters() throws IOException {
         char character2 = (char) read();
         unread(character2);
         unread(character1);
-        return new char[] {
-                character1, character2
-        };
+        return new char[] {character1, character2};
     }
 
     private int read() throws IOException {
@@ -734,7 +792,9 @@ private void parseField(BibEntry entry) throws IOException {
                     entry.setField(field, entry.getField(field).orElse("") + " and " + content);
                 } else if (StandardField.KEYWORDS == field) {
                     // TODO: multiple keywords fields should be combined to one
-                    entry.addKeyword(content, importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
+                    entry.addKeyword(
+                            content,
+                            importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
                 }
             } else {
                 // If a BibDesk File Field is encountered
@@ -742,8 +802,10 @@ private void parseField(BibEntry entry) throws IOException {
                     try {
                         byte[] decodedBytes = Base64.getDecoder().decode(content);
 
-                        // Parse the base64 encoded binary plist to get the relative (to the .bib file) path
-                        NSDictionary plist = (NSDictionary) BinaryPropertyListParser.parse(decodedBytes);
+                        // Parse the base64 encoded binary plist to get the relative (to the .bib
+                        // file) path
+                        NSDictionary plist =
+                                (NSDictionary) BinaryPropertyListParser.parse(decodedBytes);
 
                         if (plist.containsKey("relativePath")) {
                             NSString relativePath = (NSString) plist.objectForKey("relativePath");
@@ -752,10 +814,15 @@ private void parseField(BibEntry entry) throws IOException {
                             LinkedFile file = new LinkedFile("", path, "");
                             entry.addFile(file);
                         } else {
-                            LOGGER.error("Could not find attribute 'relativePath' for entry {} in decoded BibDesk field bdsk-file...) ", entry);
+                            LOGGER.error(
+                                    "Could not find attribute 'relativePath' for entry {} in decoded BibDesk field bdsk-file...) ",
+                                    entry);
                         }
                     } catch (Exception e) {
-                        LOGGER.error("Could not parse Bibdesk files content (field: bdsk-file...) for entry {}", entry, e);
+                        LOGGER.error(
+                                "Could not parse Bibdesk files content (field: bdsk-file...) for entry {}",
+                                entry,
+                                e);
                     }
                 } else {
                     entry.setField(field, content);
@@ -786,17 +853,24 @@ private String parseFieldContent(Field field) throws IOException {
                 String number = parseTextToken();
                 value.append(number);
             } else if (character == '#') {
-                // Here, we hit the case of BibTeX string concatenation. E.g., "author = Kopp # Kolb".
+                // Here, we hit the case of BibTeX string concatenation. E.g., "author = Kopp #
+                // Kolb".
                 // We did NOT hit org.jabref.logic.bibtex.FieldWriter#BIBTEX_STRING_START_END_SYMBOL
                 // See also ADR-0024
                 consume('#');
             } else {
                 String textToken = parseTextToken();
                 if (textToken.isEmpty()) {
-                    throw new IOException("Error in line " + line + " or above: "
-                            + "Empty text token.\nThis could be caused " + "by a missing comma between two fields.");
+                    throw new IOException(
+                            "Error in line "
+                                    + line
+                                    + " or above: "
+                                    + "Empty text token.\nThis could be caused "
+                                    + "by a missing comma between two fields.");
                 }
-                value.append(FieldWriter.BIBTEX_STRING_START_END_SYMBOL).append(textToken).append(FieldWriter.BIBTEX_STRING_START_END_SYMBOL);
+                value.append(FieldWriter.BIBTEX_STRING_START_END_SYMBOL)
+                        .append(textToken)
+                        .append(FieldWriter.BIBTEX_STRING_START_END_SYMBOL);
             }
             skipWhitespace();
         }
@@ -816,7 +890,8 @@ private String parseTextToken() throws IOException {
                 return token.toString();
             }
 
-            if (Character.isLetterOrDigit((char) character) || (":-_*+./'".indexOf(character) >= 0)) {
+            if (Character.isLetterOrDigit((char) character)
+                    || (":-_*+./'".indexOf(character) >= 0)) {
                 token.append((char) character);
             } else {
                 unread(character);
@@ -841,7 +916,9 @@ private String fixKey() throws IOException {
             currentChar = (char) read();
             key.append(currentChar);
             lookaheadUsed++;
-        } while ((currentChar != ',') && (currentChar != '\n') && (currentChar != '=')
+        } while ((currentChar != ',')
+                && (currentChar != '\n')
+                && (currentChar != '=')
                 && (lookaheadUsed < BibtexParser.LOOKAHEAD));
 
         // Consumed a char too much, back into reader and remove from key:
@@ -882,19 +959,25 @@ private String fixKey() throws IOException {
                         // Finished, now reverse newKey and remove whitespaces:
                         key = newKey.reverse();
                         parserResult.addWarning(
-                                Localization.lang("Line %0: Found corrupted citation key %1.", String.valueOf(line), key.toString()));
+                                Localization.lang(
+                                        "Line %0: Found corrupted citation key %1.",
+                                        String.valueOf(line), key.toString()));
                     }
                 }
                 break;
 
             case ',':
                 parserResult.addWarning(
-                        Localization.lang("Line %0: Found corrupted citation key %1 (contains whitespaces).", String.valueOf(line), key.toString()));
+                        Localization.lang(
+                                "Line %0: Found corrupted citation key %1 (contains whitespaces).",
+                                String.valueOf(line), key.toString()));
                 break;
 
             case '\n':
                 parserResult.addWarning(
-                        Localization.lang("Line %0: Found corrupted citation key %1 (comma missing).", String.valueOf(line), key.toString()));
+                        Localization.lang(
+                                "Line %0: Found corrupted citation key %1 (comma missing).",
+                                String.valueOf(line), key.toString()));
                 break;
 
             default:
@@ -948,8 +1031,10 @@ private String parseKey() throws IOException {
                 return token.toString();
             }
 
-            if (!Character.isWhitespace((char) character) && (Character.isLetterOrDigit((char) character)
-                    || (character == ':') || ("#{}~,=\uFFFD".indexOf(character) == -1))) {
+            if (!Character.isWhitespace((char) character)
+                    && (Character.isLetterOrDigit((char) character)
+                            || (character == ':')
+                            || ("#{}~,=\uFFFD".indexOf(character) == -1))) {
                 token.append((char) character);
             } else {
                 if (Character.isWhitespace((char) character)) {
@@ -967,8 +1052,14 @@ private String parseKey() throws IOException {
                     // the entry lacked a comma signifying the end of the key.
                     return token.toString();
                 } else {
-                    throw new IOException("Error in line " + line + ":" + "Character '" + (char) character + "' is not "
-                            + "allowed in citation keys.");
+                    throw new IOException(
+                            "Error in line "
+                                    + line
+                                    + ":"
+                                    + "Character '"
+                                    + (char) character
+                                    + "' is not "
+                                    + "allowed in citation keys.");
                 }
             }
         }
@@ -1046,13 +1137,16 @@ private StringBuilder parseBracketedFieldContent() throws IOException {
             if (character == '}') {
                 if (lastCharacter == '\\') {
                     // We hit `\}`
-                    // It could be that a user has a backslash at the end of the entry, but intended to put a file path
+                    // It could be that a user has a backslash at the end of the entry, but intended
+                    // to put a file path
                     // We want to be relaxed at that case
                     // First described at https://github.com/JabRef/jabref/issues/9668
                     char[] nextTwoCharacters = peekTwoCharacters();
                     // Check for "\},\n" - Example context: `  path = {c:\temp\},\n`
-                    // On Windows, it could be "\},\r\n", thus we rely in OS.NEWLINE.charAt(0) (which returns '\r' or '\n').
-                    //   In all cases, we should check for '\n' as the file could be encoded with Linux line endings on Windows.
+                    // On Windows, it could be "\},\r\n", thus we rely in OS.NEWLINE.charAt(0)
+                    // (which returns '\r' or '\n').
+                    //   In all cases, we should check for '\n' as the file could be encoded with
+                    // Linux line endings on Windows.
                     // We hit '\}\r` or `\}\n`
                     // Heuristics: Unwanted escaping of }
                     //
@@ -1062,7 +1156,10 @@ private StringBuilder parseBracketedFieldContent() throws IOException {
                     //   This is already done
                     //
                     // 2. Treat `}` as closing bracket
-                    isClosingBracket = (nextTwoCharacters[0] == ',') && ((nextTwoCharacters[1] == OS.NEWLINE.charAt(0)) || (nextTwoCharacters[1] == '\n'));
+                    isClosingBracket =
+                            (nextTwoCharacters[0] == ',')
+                                    && ((nextTwoCharacters[1] == OS.NEWLINE.charAt(0))
+                                            || (nextTwoCharacters[1] == '\n'));
                 } else {
                     isClosingBracket = true;
                 }
@@ -1117,7 +1214,12 @@ private void consume(char expected) throws IOException {
 
         if (character != expected) {
             throw new IOException(
-                    "Error in line " + line + ": Expected " + expected + " but received " + (char) character);
+                    "Error in line "
+                            + line
+                            + ": Expected "
+                            + expected
+                            + " but received "
+                            + (char) character);
         }
     }
 
@@ -1141,8 +1243,15 @@ private void consume(char firstOption, char secondOption) throws IOException {
         int character = read();
 
         if ((character != firstOption) && (character != secondOption)) {
-            throw new IOException("Error in line " + line + ": Expected " + firstOption + " or " + secondOption
-                    + " but received " + (char) character);
+            throw new IOException(
+                    "Error in line "
+                            + line
+                            + ": Expected "
+                            + firstOption
+                            + " or "
+                            + secondOption
+                            + " but received "
+                            + (char) character);
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CffImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/CffImporter.java
index 7b8ce084367c..f71a02dc98cc 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CffImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CffImporter.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.google.common.collect.HashBiMap;
 
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
@@ -24,16 +23,19 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import com.google.common.collect.HashBiMap;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class CffImporter extends Importer {
 
-    public static final Map<String, Field> FIELDS_MAP = HashBiMap.create(CffExporter.FIELDS_MAP).inverse();
-    public static final Map<String, EntryType> TYPES_MAP = HashBiMap.create(CffExporter.TYPES_MAP).inverse();
+    public static final Map<String, Field> FIELDS_MAP =
+            HashBiMap.create(CffExporter.FIELDS_MAP).inverse();
+    public static final Map<String, EntryType> TYPES_MAP =
+            HashBiMap.create(CffExporter.TYPES_MAP).inverse();
 
     private final CitationKeyPatternPreferences citationKeyPatternPreferences;
 
@@ -58,7 +60,8 @@ public String getId() {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Importer for the CFF format, which is intended to make software and datasets citable.");
+        return Localization.lang(
+                "Importer for the CFF format, which is intended to make software and datasets citable.");
     }
 
     // POJO classes for yaml data
@@ -80,8 +83,7 @@ private static class CffFormat {
         @JsonProperty("references")
         private List<CffReference> references;
 
-        public CffFormat() {
-        }
+        public CffFormat() {}
 
         @JsonAnySetter
         private void setValues(String key, String value) {
@@ -92,8 +94,7 @@ private void setValues(String key, String value) {
     private static class CffEntity {
         private final HashMap<String, String> values = new HashMap<>();
 
-        public CffEntity() {
-        }
+        public CffEntity() {}
 
         @JsonAnySetter
         private void setValues(String key, String value) {
@@ -104,11 +105,11 @@ private void setValues(String key, String value) {
     private static class CffIdentifier {
         @JsonProperty("type")
         private String type;
+
         @JsonProperty("value")
         private String value;
 
-        public CffIdentifier() {
-        }
+        public CffIdentifier() {}
     }
 
     private static class CffReference {
@@ -159,8 +160,7 @@ private static class CffReference {
         @JsonProperty("type")
         private String type;
 
-        public CffReference() {
-        }
+        public CffReference() {}
 
         @JsonAnySetter
         private void setValues(String key, String value) {
@@ -179,7 +179,8 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
 
         // Parse main entry
         HashMap<Field, String> entryMap = new HashMap<>();
-        EntryType entryType = TYPES_MAP.getOrDefault(citation.values.get("type"), StandardEntryType.Software);
+        EntryType entryType =
+                TYPES_MAP.getOrDefault(citation.values.get("type"), StandardEntryType.Software);
         citation.values.remove("type");
 
         // Translate CFF author format to JabRef author format
@@ -195,9 +196,8 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
 
         // Select DOI to keep
         if ((entryMap.get(StandardField.DOI) == null) && (citation.ids != null)) {
-            List<CffIdentifier> doiIds = citation.ids.stream()
-                            .filter(id -> "doi".equals(id.type))
-                            .toList();
+            List<CffIdentifier> doiIds =
+                    citation.ids.stream().filter(id -> "doi".equals(id.type)).toList();
             if (doiIds.size() == 1) {
                 entryMap.put(StandardField.DOI, doiIds.getFirst().value);
             }
@@ -205,18 +205,23 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
 
         // Select SWHID to keep
         if (citation.ids != null) {
-            List<String> swhIds = citation.ids.stream()
-                                           .filter(id -> "swh".equals(id.type))
-                                           .map(id -> id.value)
-                                           .toList();
+            List<String> swhIds =
+                    citation.ids.stream()
+                            .filter(id -> "swh".equals(id.type))
+                            .map(id -> id.value)
+                            .toList();
 
             if (swhIds.size() == 1) {
                 entryMap.put(BiblatexSoftwareField.SWHID, swhIds.getFirst());
             } else if (swhIds.size() > 1) {
-                List<String> relSwhIds = swhIds.stream()
-                                               .filter(id -> id.split(":").length > 3) // quick filter for invalid swhids
-                                               .filter(id -> "rel".equals(id.split(":")[2]))
-                                               .toList();
+                List<String> relSwhIds =
+                        swhIds.stream()
+                                .filter(
+                                        id ->
+                                                id.split(":").length
+                                                        > 3) // quick filter for invalid swhids
+                                .filter(id -> "rel".equals(id.split(":")[2]))
+                                .toList();
                 if (relSwhIds.size() == 1) {
                     entryMap.put(BiblatexSoftwareField.SWHID, relSwhIds.getFirst());
                 }
@@ -242,7 +247,8 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         }
 
         ParserResult res = new ParserResult(entriesList);
-        CitationKeyGenerator gen = new CitationKeyGenerator(res.getDatabaseContext(), citationKeyPatternPreferences);
+        CitationKeyGenerator gen =
+                new CitationKeyGenerator(res.getDatabaseContext(), citationKeyPatternPreferences);
 
         if (preferred != null) {
             gen.generateAndSetKey(preferred);
@@ -250,12 +256,15 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         }
 
         if (references != null) {
-            references.forEach(ref -> {
-                gen.generateAndSetKey(ref);
-                String citeKey = ref.getCitationKey().orElse("");
-                String related = entry.getField(StandardField.RELATED).orElse("");
-                entry.setField(StandardField.RELATED, related.isEmpty() ? citeKey : related + "," + citeKey);
-            });
+            references.forEach(
+                    ref -> {
+                        gen.generateAndSetKey(ref);
+                        String citeKey = ref.getCitationKey().orElse("");
+                        String related = entry.getField(StandardField.RELATED).orElse("");
+                        entry.setField(
+                                StandardField.RELATED,
+                                related.isEmpty() ? citeKey : related + "," + citeKey);
+                    });
         }
         return res;
     }
@@ -276,13 +285,19 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
 
     private String parseAuthors(List<CffEntity> authors) {
         return authors.stream()
-                      .map(author -> author.values)
-                      .map(vals -> vals.get("name") != null ?
-                              new Author(vals.get("name"), "", "", "", "") :
-                              new Author(vals.get("given-names"), null, vals.get("name-particle"),
-                                      vals.get("family-names"), vals.get("name-suffix")))
-                      .collect(AuthorList.collect())
-                      .getAsFirstLastNamesWithAnd();
+                .map(author -> author.values)
+                .map(
+                        vals ->
+                                vals.get("name") != null
+                                        ? new Author(vals.get("name"), "", "", "", "")
+                                        : new Author(
+                                                vals.get("given-names"),
+                                                null,
+                                                vals.get("name-particle"),
+                                                vals.get("family-names"),
+                                                vals.get("name-suffix")))
+                .collect(AuthorList.collect())
+                .getAsFirstLastNamesWithAnd();
     }
 
     private BibEntry parseEntry(CffReference reference) {
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CitaviXmlImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/CitaviXmlImporter.java
index 78b0400932ce..4458c58024bf 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CitaviXmlImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CitaviXmlImporter.java
@@ -1,5 +1,35 @@
 package org.jabref.logic.importer.fileformat;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
+
+import org.apache.commons.io.ByteOrderMark;
+import org.apache.commons.io.input.BOMInputStream;
+import org.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;
+import org.jabref.logic.formatter.bibtexfields.NormalizePagesFormatter;
+import org.jabref.logic.importer.Importer;
+import org.jabref.logic.importer.Parser;
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.importer.fileformat.citavi.CitaviExchangeData;
+import org.jabref.logic.importer.fileformat.citavi.CitaviExchangeData.KnowledgeItems;
+import org.jabref.logic.importer.fileformat.citavi.CitaviExchangeData.KnowledgeItems.KnowledgeItem;
+import org.jabref.logic.importer.fileformat.citavi.CitaviExchangeData.Persons.Person;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.entry.Author;
+import org.jabref.model.entry.AuthorList;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Keyword;
+import org.jabref.model.entry.KeywordList;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.EntryType;
+import org.jabref.model.entry.types.IEEETranEntryType;
+import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.model.strings.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,42 +58,13 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;
-import org.jabref.logic.formatter.bibtexfields.NormalizePagesFormatter;
-import org.jabref.logic.importer.Importer;
-import org.jabref.logic.importer.Parser;
-import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.importer.fileformat.citavi.CitaviExchangeData;
-import org.jabref.logic.importer.fileformat.citavi.CitaviExchangeData.KnowledgeItems;
-import org.jabref.logic.importer.fileformat.citavi.CitaviExchangeData.KnowledgeItems.KnowledgeItem;
-import org.jabref.logic.importer.fileformat.citavi.CitaviExchangeData.Persons.Person;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.model.entry.Author;
-import org.jabref.model.entry.AuthorList;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.Keyword;
-import org.jabref.model.entry.KeywordList;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.entry.types.EntryType;
-import org.jabref.model.entry.types.IEEETranEntryType;
-import org.jabref.model.entry.types.StandardEntryType;
-import org.jabref.model.strings.StringUtil;
-
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Unmarshaller;
-import org.apache.commons.io.ByteOrderMark;
-import org.apache.commons.io.input.BOMInputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class CitaviXmlImporter extends Importer implements Parser {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CitaviXmlImporter.class);
     private static final byte UUID_LENGTH = 36;
     private static final byte UUID_SEMICOLON_OFFSET_INDEX = 37;
-    private static final EnumSet<QuotationTypeMapping> QUOTATION_TYPES = EnumSet.allOf(QuotationTypeMapping.class);
+    private static final EnumSet<QuotationTypeMapping> QUOTATION_TYPES =
+            EnumSet.allOf(QuotationTypeMapping.class);
     private final HtmlToLatexFormatter htmlToLatexFormatter = new HtmlToLatexFormatter();
     private final NormalizePagesFormatter pagesFormatter = new NormalizePagesFormatter();
 
@@ -177,11 +178,10 @@ private List<BibEntry> parseDataList(CitaviExchangeData data) {
             this.refIdWithPublishers = buildPublisherList(refPublishers.getOnetoN());
         }
 
-        bibEntries = data
-                         .getReferences().getReference()
-                         .stream()
-                         .map(this::parseData)
-                         .collect(Collectors.toList());
+        bibEntries =
+                data.getReferences().getReference().stream()
+                        .map(this::parseData)
+                        .collect(Collectors.toList());
 
         return bibEntries;
     }
@@ -217,19 +217,24 @@ private BibEntry parseData(CitaviExchangeData.References.Reference data) {
         Optional.ofNullable(getPublisher(data))
                 .ifPresent(value -> entry.setField(StandardField.PUBLISHER, clean(value)));
         Optional.ofNullable(getKnowledgeItem(data))
-                .ifPresent(value -> entry.setField(StandardField.COMMENT, StringUtil.unifyLineBreaks(value, "\n")));
+                .ifPresent(
+                        value ->
+                                entry.setField(
+                                        StandardField.COMMENT,
+                                        StringUtil.unifyLineBreaks(value, "\n")));
         return entry;
     }
 
     private EntryType getType(CitaviExchangeData.References.Reference data) {
         return Optional.ofNullable(data.getReferenceType())
-                       .map(CitaviXmlImporter::convertRefNameToType)
-                       .orElse(StandardEntryType.Article);
+                .map(CitaviXmlImporter::convertRefNameToType)
+                .orElse(StandardEntryType.Article);
     }
 
     private static EntryType convertRefNameToType(String refName) {
         return switch (refName.toLowerCase().trim()) {
-            case "artwork", "generic", "musicalbum", "audioorvideodocument", "movie" -> StandardEntryType.Misc;
+            case "artwork", "generic", "musicalbum", "audioorvideodocument", "movie" ->
+                    StandardEntryType.Misc;
             case "electronic article" -> IEEETranEntryType.Electronic;
             case "book section" -> StandardEntryType.InBook;
             case "book", "bookedited", "audiobook" -> StandardEntryType.Book;
@@ -283,14 +288,29 @@ private Map<String, String> buildPersonList(List<String> authorsOrEditors) {
             List<Author> jabrefAuthors = new ArrayList<>();
 
             for (String personId : personIds) {
-                // Store persons we already encountered, we can have the same author multiple times in the whole database
-                knownPersons.computeIfAbsent(personId, k -> {
-                    Optional<Person> person = persons.getPerson().stream().filter(p -> p.getId().equals(k)).findFirst();
-                    return person.map(p -> new Author(p.getFirstName(), "", "", p.getLastName(), "")).orElse(null);
-                });
+                // Store persons we already encountered, we can have the same author multiple times
+                // in the whole database
+                knownPersons.computeIfAbsent(
+                        personId,
+                        k -> {
+                            Optional<Person> person =
+                                    persons.getPerson().stream()
+                                            .filter(p -> p.getId().equals(k))
+                                            .findFirst();
+                            return person.map(
+                                            p ->
+                                                    new Author(
+                                                            p.getFirstName(),
+                                                            "",
+                                                            "",
+                                                            p.getLastName(),
+                                                            ""))
+                                    .orElse(null);
+                        });
                 jabrefAuthors.add(knownPersons.get(personId));
             }
-            String stringifiedAuthors = AuthorList.of(jabrefAuthors).getAsLastFirstNamesWithAnd(false);
+            String stringifiedAuthors =
+                    AuthorList.of(jabrefAuthors).getAsLastFirstNamesWithAnd(false);
             refToPerson.put(refId, stringifiedAuthors);
         }
         return refToPerson;
@@ -309,10 +329,15 @@ private Map<String, String> buildKeywordList(List<String> keywordsList) {
 
             for (String keywordId : keywordIds) {
                 // store keywords already encountered
-                knownKeywords.computeIfAbsent(keywordId, k -> {
-                    Optional<CitaviExchangeData.Keywords.Keyword> keyword = keywords.getKeyword().stream().filter(p -> p.getId().equals(k)).findFirst();
-                    return keyword.map(kword -> new Keyword(kword.getName())).orElse(null);
-                });
+                knownKeywords.computeIfAbsent(
+                        keywordId,
+                        k -> {
+                            Optional<CitaviExchangeData.Keywords.Keyword> keyword =
+                                    keywords.getKeyword().stream()
+                                            .filter(p -> p.getId().equals(k))
+                                            .findFirst();
+                            return keyword.map(kword -> new Keyword(kword.getName())).orElse(null);
+                        });
                 jabrefKeywords.add(knownKeywords.get(keywordId));
             }
 
@@ -336,10 +361,17 @@ private Map<String, String> buildPublisherList(List<String> publishersList) {
 
             for (String pubId : publisherIds) {
                 // store publishers already encountered
-                knownPublishers.computeIfAbsent(pubId, k -> {
-                    Optional<CitaviExchangeData.Publishers.Publisher> publisher = publishers.getPublisher().stream().filter(p -> p.getId().equals(k)).findFirst();
-                    return publisher.map(CitaviExchangeData.Publishers.Publisher::getName).orElse(null);
-                });
+                knownPublishers.computeIfAbsent(
+                        pubId,
+                        k -> {
+                            Optional<CitaviExchangeData.Publishers.Publisher> publisher =
+                                    publishers.getPublisher().stream()
+                                            .filter(p -> p.getId().equals(k))
+                                            .findFirst();
+                            return publisher
+                                    .map(CitaviExchangeData.Publishers.Publisher::getName)
+                                    .orElse(null);
+                        });
                 jabrefPublishers.add(knownPublishers.get(pubId));
             }
 
@@ -372,21 +404,33 @@ private String getPublisher(CitaviExchangeData.References.Reference data) {
 
     private String getKnowledgeItem(CitaviExchangeData.References.Reference data) {
         StringJoiner comment = new StringJoiner("\n\n");
-        List<KnowledgeItem> foundItems = knowledgeItems.getKnowledgeItem().stream().filter(p -> data.getId().equals(p.getReferenceID())).toList();
+        List<KnowledgeItem> foundItems =
+                knowledgeItems.getKnowledgeItem().stream()
+                        .filter(p -> data.getId().equals(p.getReferenceID()))
+                        .toList();
         for (KnowledgeItem knowledgeItem : foundItems) {
-            Optional<String> title = Optional.ofNullable(knowledgeItem.getCoreStatement()).filter(Predicate.not(String::isEmpty));
+            Optional<String> title =
+                    Optional.ofNullable(knowledgeItem.getCoreStatement())
+                            .filter(Predicate.not(String::isEmpty));
             title.ifPresent(t -> comment.add("# " + cleanUpText(t)));
 
-            Optional<String> text = Optional.ofNullable(knowledgeItem.getText()).filter(Predicate.not(String::isEmpty));
+            Optional<String> text =
+                    Optional.ofNullable(knowledgeItem.getText())
+                            .filter(Predicate.not(String::isEmpty));
             text.ifPresent(t -> comment.add(cleanUpText(t)));
 
-            Optional<Integer> pages = Optional.of(knowledgeItem.getPageRangeNumber()).filter(range -> range != -1);
+            Optional<Integer> pages =
+                    Optional.of(knowledgeItem.getPageRangeNumber()).filter(range -> range != -1);
             pages.ifPresent(p -> comment.add("page range: " + p));
 
-            Optional<String> quotationTypeDesc = Optional.of(knowledgeItem.getQuotationType()).flatMap(type ->
-                                                                    QUOTATION_TYPES.stream()
-                                                                    .filter(qt -> type == qt.getCitaviIndexType())
-                                                                    .map(QuotationTypeMapping::getName).findFirst());
+            Optional<String> quotationTypeDesc =
+                    Optional.of(knowledgeItem.getQuotationType())
+                            .flatMap(
+                                    type ->
+                                            QUOTATION_TYPES.stream()
+                                                    .filter(qt -> type == qt.getCitaviIndexType())
+                                                    .map(QuotationTypeMapping::getName)
+                                                    .findFirst());
             quotationTypeDesc.ifPresent(qt -> comment.add("quotation type: %s".formatted(qt)));
 
             Optional<Short> quotationIndex = Optional.of(knowledgeItem.getQuotationIndex());
@@ -403,14 +447,14 @@ String cleanUpText(String text) {
     }
 
     private String removeSpacesBeforeLineBreak(String string) {
-        return string.replaceAll(" +\r\n", "\r\n")
-              .replaceAll(" +\n", "\n");
+        return string.replaceAll(" +\r\n", "\r\n").replaceAll(" +\n", "\n");
     }
 
     private void initUnmarshaller() throws JAXBException {
         if (unmarshaller == null) {
             // Lazy init because this is expensive
-            JAXBContext context = JAXBContext.newInstance("org.jabref.logic.importer.fileformat.citavi");
+            JAXBContext context =
+                    JAXBContext.newInstance("org.jabref.logic.importer.fileformat.citavi");
             unmarshaller = context.createUnmarshaller();
         }
     }
@@ -431,15 +475,19 @@ private Object unmarshallRoot(BufferedReader reader) throws XMLStreamException,
     @Override
     public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
-        throw new UnsupportedOperationException("CitaviXmlImporter does not support importDatabase(BufferedReader reader). "
-                                                + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
+        throw new UnsupportedOperationException(
+                "CitaviXmlImporter does not support importDatabase(BufferedReader reader). "
+                        + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
     }
 
     @Override
     public List<BibEntry> parseEntries(InputStream inputStream) {
         try {
             return importDatabase(
-                                  new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))).getDatabase().getEntries();
+                            new BufferedReader(
+                                    new InputStreamReader(inputStream, StandardCharsets.UTF_8)))
+                    .getDatabase()
+                    .getEntries();
         } catch (IOException e) {
             LOGGER.error(e.getLocalizedMessage(), e);
         }
@@ -465,13 +513,15 @@ private BufferedReader getReaderFromZip(Path filePath) throws IOException {
                         new BOMInputStream(
                                 Files.newInputStream(newFile, StandardOpenOption.READ),
                                 false,
-                                ByteOrderMark.UTF_8, ByteOrderMark.UTF_16BE, ByteOrderMark.UTF_16LE, ByteOrderMark.UTF_32BE, ByteOrderMark.UTF_32LE)));
+                                ByteOrderMark.UTF_8,
+                                ByteOrderMark.UTF_16BE,
+                                ByteOrderMark.UTF_16LE,
+                                ByteOrderMark.UTF_32BE,
+                                ByteOrderMark.UTF_32LE)));
     }
 
     private String clean(String input) {
-        String result = StringUtil.unifyLineBreaks(input, " ")
-                         .trim()
-                         .replaceAll(" +", " ");
+        String result = StringUtil.unifyLineBreaks(input, " ").trim().replaceAll(" +", " ");
         return htmlToLatexFormatter.format(result);
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CiteSeerParser.java b/src/main/java/org/jabref/logic/importer/fileformat/CiteSeerParser.java
index 45939f8e1951..31a8c58baac7 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CiteSeerParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CiteSeerParser.java
@@ -1,10 +1,7 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.net.CookieHandler;
-import java.net.CookieManager;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONObject;
 
 import org.jabref.logic.importer.AuthorListParser;
 import org.jabref.logic.importer.ParseException;
@@ -12,8 +9,11 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
 
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONObject;
+import java.net.CookieHandler;
+import java.net.CookieManager;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 
 public class CiteSeerParser {
 
@@ -42,7 +42,9 @@ private BibEntry parseBibEntry(JSONObject jsonObj) {
         bibEntry.setField(StandardField.YEAR, jsonObj.optString("year"));
         bibEntry.setField(StandardField.PUBLISHER, jsonObj.optString("publisher"));
         bibEntry.setField(StandardField.ABSTRACT, jsonObj.optString("abstract"));
-        bibEntry.setField(StandardField.AUTHOR, parseAuthors(Optional.ofNullable(jsonObj.optJSONArray("authors"))));
+        bibEntry.setField(
+                StandardField.AUTHOR,
+                parseAuthors(Optional.ofNullable(jsonObj.optJSONArray("authors"))));
         bibEntry.setField(StandardField.JOURNAL, jsonObj.optString("journal"));
         bibEntry.setField(StandardField.URL, jsonObj.optString("source"));
         return bibEntry;
@@ -56,9 +58,13 @@ private String parseAuthors(Optional<JSONArray> authorsOpt) {
         JSONArray authorsArray = authorsOpt.get();
         StringBuilder authorsStringBuilder = new StringBuilder();
         for (int i = 0; i < authorsArray.length() - 1; i++) {
-            authorsStringBuilder.append(StringUtil.shaveString(authorsArray.getString(i))).append(separator);
+            authorsStringBuilder
+                    .append(StringUtil.shaveString(authorsArray.getString(i)))
+                    .append(separator);
         }
         authorsStringBuilder.append(authorsArray.getString(authorsArray.length() - 1));
-        return new AuthorListParser().parse(authorsStringBuilder.toString()).getAsLastFirstNamesWithAnd(false);
+        return new AuthorListParser()
+                .parse(authorsStringBuilder.toString())
+                .getAsLastFirstNamesWithAnd(false);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java b/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java
index 2ffeba043373..8b6dfcdb2e21 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java
@@ -1,5 +1,13 @@
 package org.jabref.logic.importer.fileformat;
 
+import org.jabref.logic.importer.ParseException;
+import org.jabref.logic.importer.Parser;
+import org.jabref.logic.os.OS;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -10,14 +18,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import org.jabref.logic.importer.ParseException;
-import org.jabref.logic.importer.Parser;
-import org.jabref.logic.os.OS;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.entry.types.StandardEntryType;
-
 /**
  * implemented by reverse-engineering <a href="https://github.com/SeerLabs/CiteSeerX/blob/4df28a98083be2829ec4c56ebbac09eb7772d379/src/java/edu/psu/citeseerx/domain/BiblioTransformer.java#L155-L249">the implementation by CiteSeerX</a>
  */
@@ -35,7 +35,10 @@ public class CoinsParser implements Parser {
 
     @Override
     public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
-        String data = new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.joining(OS.NEWLINE));
+        String data =
+                new BufferedReader(new InputStreamReader(inputStream))
+                        .lines()
+                        .collect(Collectors.joining(OS.NEWLINE));
         BibEntry entry = new BibEntry();
 
         appendData(data, entry, DOI, StandardField.DOI);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java
index b5192be5509e..50e50dcd9b9e 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java
@@ -1,12 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
@@ -18,6 +11,13 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
 /**
  * Importer for COPAC format.
  * <p>
@@ -135,11 +135,24 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                     case "NT- " ->
                             setOrAppend(b, StandardField.NOTE, line.substring(4).trim(), ", ");
                     case "PD- " ->
-                            setOrAppend(b, new UnknownField("physicaldimensions"), line.substring(4).trim(), ", ");
+                            setOrAppend(
+                                    b,
+                                    new UnknownField("physicaldimensions"),
+                                    line.substring(4).trim(),
+                                    ", ");
                     case "DT- " ->
-                            setOrAppend(b, new UnknownField("documenttype"), line.substring(4).trim(), ", ");
+                            setOrAppend(
+                                    b,
+                                    new UnknownField("documenttype"),
+                                    line.substring(4).trim(),
+                                    ", ");
                     default ->
-                            setOrAppend(b, FieldFactory.parseField(StandardEntryType.Book, line.substring(0, 2)), line.substring(4).trim(), ", ");
+                            setOrAppend(
+                                    b,
+                                    FieldFactory.parseField(
+                                            StandardEntryType.Book, line.substring(0, 2)),
+                                    line.substring(4).trim(),
+                                    ", ");
                 }
             }
             results.add(b);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java
index 392074470aac..7a6eb8ef94ae 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.importer.fileformat;
 
+import org.jabref.logic.importer.ImportException;
+import org.jabref.logic.importer.Importer;
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.util.FileType;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.net.URL;
@@ -9,11 +14,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import org.jabref.logic.importer.ImportException;
-import org.jabref.logic.importer.Importer;
-import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.util.FileType;
-
 /**
  * Object with data for a custom importer.
  *
@@ -38,7 +38,7 @@ public CustomImporter(String basePath, String className) throws ImportException
 
     private static Importer load(URL basePathURL, String className)
             throws IOException, ReflectiveOperationException {
-        try (URLClassLoader cl = new URLClassLoader(new URL[]{basePathURL})) {
+        try (URLClassLoader cl = new URLClassLoader(new URL[] {basePathURL})) {
             Class<?> clazz = Class.forName(className, true, cl);
             return (Importer) clazz.getDeclaredConstructor().newInstance();
         }
@@ -66,7 +66,8 @@ public boolean equals(Object other) {
             return false;
         }
 
-        return Objects.equals(className, otherImporter.className) && Objects.equals(basePath, otherImporter.basePath);
+        return Objects.equals(className, otherImporter.className)
+                && Objects.equals(basePath, otherImporter.basePath);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java
index 2112f9f43508..a13fac4a384b 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java
@@ -1,13 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
@@ -21,6 +13,14 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
 /**
  * Importer for the Refer/Endnote format.
  * modified to use article number for pages if pages are missing (some
@@ -53,7 +53,8 @@ public String getId() {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Importer for the Refer/Endnote format. Modified to use article number for pages if pages are missing.");
+        return Localization.lang(
+                "Importer for the Refer/Endnote format. Modified to use article number for pages if pages are missing.");
     }
 
     @Override
@@ -141,8 +142,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                             editor.append(" and ").append(val);
                         }
                     }
-                    case "T" ->
-                            hm.put(StandardField.TITLE, val);
+                    case "T" -> hm.put(StandardField.TITLE, val);
                     case "0" -> {
                         if (val.indexOf("Journal") == 0) {
                             type = StandardEntryType.Article;
@@ -165,24 +165,21 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                             type = BibEntry.DEFAULT_TYPE; //
                         }
                     }
-                    case "7" ->
-                            hm.put(StandardField.EDITION, val);
-                    case "C" ->
-                            hm.put(StandardField.ADDRESS, val);
-                    case "D" ->
-                            hm.put(StandardField.YEAR, val);
-                    case "8" ->
-                            hm.put(StandardField.DATE, val);
+                    case "7" -> hm.put(StandardField.EDITION, val);
+                    case "C" -> hm.put(StandardField.ADDRESS, val);
+                    case "D" -> hm.put(StandardField.YEAR, val);
+                    case "8" -> hm.put(StandardField.DATE, val);
                     case "J" ->
-                        // "Alternate journal. Let's set it only if no journal
-                        // has been set with %B.
+                            // "Alternate journal. Let's set it only if no journal
+                            // has been set with %B.
                             hm.putIfAbsent(StandardField.JOURNAL, val);
                     case "B" -> {
                         // This prefix stands for "journal" in a journal entry, and
                         // "series" in a book entry.
                         if (type.equals(StandardEntryType.Article)) {
                             hm.put(StandardField.JOURNAL, val);
-                        } else if (type.equals(StandardEntryType.Book) || type.equals(StandardEntryType.InBook)) {
+                        } else if (type.equals(StandardEntryType.Book)
+                                || type.equals(StandardEntryType.InBook)) {
                             hm.put(StandardField.SERIES, val);
                         } else {
                             /* type = inproceedings */
@@ -197,14 +194,13 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         }
                     }
                     case "P" ->
-                        // replace single dash page ranges (23-45) with double dashes (23--45):
-                            hm.put(StandardField.PAGES, val.replaceAll("([0-9]) *- *([0-9])", "$1--$2"));
-                    case "V" ->
-                            hm.put(StandardField.VOLUME, val);
-                    case "N" ->
-                            hm.put(StandardField.NUMBER, val);
-                    case "U" ->
-                            hm.put(StandardField.URL, val);
+                            // replace single dash page ranges (23-45) with double dashes (23--45):
+                            hm.put(
+                                    StandardField.PAGES,
+                                    val.replaceAll("([0-9]) *- *([0-9])", "$1--$2"));
+                    case "V" -> hm.put(StandardField.VOLUME, val);
+                    case "N" -> hm.put(StandardField.NUMBER, val);
+                    case "U" -> hm.put(StandardField.URL, val);
                     case "R" -> {
                         String doi = val;
                         if (doi.startsWith("doi:")) {
@@ -221,10 +217,8 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                             hm.put(StandardField.NOTE, val);
                         }
                     }
-                    case "K" ->
-                            hm.put(StandardField.KEYWORDS, val);
-                    case "X" ->
-                            hm.put(StandardField.ABSTRACT, val);
+                    case "K" -> hm.put(StandardField.KEYWORDS, val);
+                    case "X" -> hm.put(StandardField.ABSTRACT, val);
                     case "9" -> {
                         if (val.indexOf("Ph.D.") == 0) {
                             type = StandardEntryType.PhdThesis;
@@ -253,7 +247,8 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 hm.put(StandardField.EDITOR, fixAuthor(editor.toString()));
             }
             // if pages missing and article number given, use the article number
-            if (((hm.get(StandardField.PAGES) == null) || "-".equals(hm.get(StandardField.PAGES))) && !"".equals(artnum)) {
+            if (((hm.get(StandardField.PAGES) == null) || "-".equals(hm.get(StandardField.PAGES)))
+                    && !"".equals(artnum)) {
                 hm.put(StandardField.PAGES, artnum);
             }
 
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java
index ec89f849cd4e..d7958537a81d 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java
@@ -1,23 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.StringJoiner;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.events.XMLEvent;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParseException;
@@ -33,61 +15,78 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.StringJoiner;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.events.XMLEvent;
+
 public class EndnoteXmlImporter extends Importer implements Parser {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EndnoteXmlImporter.class);
 
-    private static final Map<EntryType, String> ENTRY_TYPE_MAPPING = Map.ofEntries(
-            Map.entry(StandardEntryType.Article, "Journal Article"),
-            Map.entry(StandardEntryType.Book, "Book"),
-            Map.entry(StandardEntryType.InBook, "Book Section"),
-            Map.entry(StandardEntryType.InCollection, "Book Section"),
-            Map.entry(StandardEntryType.Proceedings, "Conference Proceedings"),
-            Map.entry(StandardEntryType.MastersThesis, "Thesis"),
-            Map.entry(StandardEntryType.PhdThesis, "Thesis"),
-            Map.entry(StandardEntryType.TechReport, "Report"),
-            Map.entry(StandardEntryType.Unpublished, "Manuscript"),
-            Map.entry(StandardEntryType.InProceedings, "Conference Paper"),
-            Map.entry(StandardEntryType.Conference, "Conference"),
-            Map.entry(IEEETranEntryType.Patent, "Patent"),
-            Map.entry(StandardEntryType.Online, "Web Page"),
-            Map.entry(IEEETranEntryType.Electronic, "Electronic Article"),
-            Map.entry(StandardEntryType.Misc, "Generic")
-    );
-
-    private static final Map<Field, String> FIELD_MAPPING = Map.ofEntries(
-            Map.entry(StandardField.TITLE, "title"),
-            Map.entry(StandardField.AUTHOR, "authors"),
-            Map.entry(StandardField.EDITOR, "secondary-authors"),
-            Map.entry(StandardField.BOOKTITLE, "secondary-title"),
-            Map.entry(StandardField.EDITION, "edition"),
-            Map.entry(StandardField.SERIES, "tertiary-title"),
-            Map.entry(StandardField.VOLUME, "volume"),
-            Map.entry(StandardField.NUMBER, "number"),
-            Map.entry(StandardField.ISSUE, "issue"),
-            Map.entry(StandardField.PAGES, "pages"),
-            Map.entry(StandardField.LOCATION, "pub-location"),
-            Map.entry(StandardField.CHAPTER, "section"),
-            Map.entry(StandardField.HOWPUBLISHED, "work-type"),
-            Map.entry(StandardField.PUBLISHER, "publisher"),
-            Map.entry(StandardField.ISBN, "isbn"),
-            Map.entry(StandardField.ISSN, "issn"),
-            Map.entry(StandardField.DOI, "electronic-resource-num"),
-            Map.entry(StandardField.URL, "web-urls"),
-            Map.entry(StandardField.FILE, "pdf-urls"),
-            Map.entry(StandardField.ABSTRACT, "abstract"),
-            Map.entry(StandardField.KEYWORDS, "keywords"),
-            Map.entry(StandardField.PAGETOTAL, "page-total"),
-            Map.entry(StandardField.NOTE, "notes"),
-            //  Map.entry(StandardField.LABEL, "label"), // We omit this field
-            Map.entry(StandardField.LANGUAGE, "language"),
-            // Map.entry(StandardField.KEY, "foreign-keys"),  // We omit this field
-            Map.entry(StandardField.ADDRESS, "auth-address")
-    );
+    private static final Map<EntryType, String> ENTRY_TYPE_MAPPING =
+            Map.ofEntries(
+                    Map.entry(StandardEntryType.Article, "Journal Article"),
+                    Map.entry(StandardEntryType.Book, "Book"),
+                    Map.entry(StandardEntryType.InBook, "Book Section"),
+                    Map.entry(StandardEntryType.InCollection, "Book Section"),
+                    Map.entry(StandardEntryType.Proceedings, "Conference Proceedings"),
+                    Map.entry(StandardEntryType.MastersThesis, "Thesis"),
+                    Map.entry(StandardEntryType.PhdThesis, "Thesis"),
+                    Map.entry(StandardEntryType.TechReport, "Report"),
+                    Map.entry(StandardEntryType.Unpublished, "Manuscript"),
+                    Map.entry(StandardEntryType.InProceedings, "Conference Paper"),
+                    Map.entry(StandardEntryType.Conference, "Conference"),
+                    Map.entry(IEEETranEntryType.Patent, "Patent"),
+                    Map.entry(StandardEntryType.Online, "Web Page"),
+                    Map.entry(IEEETranEntryType.Electronic, "Electronic Article"),
+                    Map.entry(StandardEntryType.Misc, "Generic"));
+
+    private static final Map<Field, String> FIELD_MAPPING =
+            Map.ofEntries(
+                    Map.entry(StandardField.TITLE, "title"),
+                    Map.entry(StandardField.AUTHOR, "authors"),
+                    Map.entry(StandardField.EDITOR, "secondary-authors"),
+                    Map.entry(StandardField.BOOKTITLE, "secondary-title"),
+                    Map.entry(StandardField.EDITION, "edition"),
+                    Map.entry(StandardField.SERIES, "tertiary-title"),
+                    Map.entry(StandardField.VOLUME, "volume"),
+                    Map.entry(StandardField.NUMBER, "number"),
+                    Map.entry(StandardField.ISSUE, "issue"),
+                    Map.entry(StandardField.PAGES, "pages"),
+                    Map.entry(StandardField.LOCATION, "pub-location"),
+                    Map.entry(StandardField.CHAPTER, "section"),
+                    Map.entry(StandardField.HOWPUBLISHED, "work-type"),
+                    Map.entry(StandardField.PUBLISHER, "publisher"),
+                    Map.entry(StandardField.ISBN, "isbn"),
+                    Map.entry(StandardField.ISSN, "issn"),
+                    Map.entry(StandardField.DOI, "electronic-resource-num"),
+                    Map.entry(StandardField.URL, "web-urls"),
+                    Map.entry(StandardField.FILE, "pdf-urls"),
+                    Map.entry(StandardField.ABSTRACT, "abstract"),
+                    Map.entry(StandardField.KEYWORDS, "keywords"),
+                    Map.entry(StandardField.PAGETOTAL, "page-total"),
+                    Map.entry(StandardField.NOTE, "notes"),
+                    //  Map.entry(StandardField.LABEL, "label"), // We omit this field
+                    Map.entry(StandardField.LANGUAGE, "language"),
+                    // Map.entry(StandardField.KEY, "foreign-keys"),  // We omit this field
+                    Map.entry(StandardField.ADDRESS, "auth-address"));
     private static final UnknownField FIELD_ALT_TITLE = new UnknownField("alt-title");
 
     private final ImportFormatPreferences preferences;
@@ -175,11 +174,12 @@ private BibEntry parseRecord(XMLStreamReader reader) throws XMLStreamException {
                 switch (elementName) {
                     case "ref-type" -> {
                         String refType = reader.getAttributeValue(null, "name");
-                        EntryType entryType = ENTRY_TYPE_MAPPING.entrySet().stream()
-                                                                .filter(e -> e.getValue().equals(refType))
-                                                                .map(Map.Entry::getKey)
-                                                                .findFirst()
-                                                                .orElse(StandardEntryType.Misc);
+                        EntryType entryType =
+                                ENTRY_TYPE_MAPPING.entrySet().stream()
+                                        .filter(e -> e.getValue().equals(refType))
+                                        .map(Map.Entry::getKey)
+                                        .findFirst()
+                                        .orElse(StandardEntryType.Misc);
                         entry.setType(entryType);
                     }
                     case "contributors" -> {
@@ -206,11 +206,12 @@ private BibEntry parseRecord(XMLStreamReader reader) throws XMLStreamException {
                     //    entry.setField(new UnknownField("accession-num"), accessionNumber);
                     // }
                     default -> {
-                        Field field = FIELD_MAPPING.entrySet().stream()
-                                                   .filter(e -> e.getValue().equals(elementName))
-                                                   .map(Map.Entry::getKey)
-                                                   .findFirst()
-                                                   .orElse(null);
+                        Field field =
+                                FIELD_MAPPING.entrySet().stream()
+                                        .filter(e -> e.getValue().equals(elementName))
+                                        .map(Map.Entry::getKey)
+                                        .findFirst()
+                                        .orElse(null);
                         if (field != null) {
                             String value = parseElementContent(reader, elementName);
                             entry.setField(field, value);
@@ -221,7 +222,10 @@ private BibEntry parseRecord(XMLStreamReader reader) throws XMLStreamException {
         }
 
         // Cleanup: Remove alt-title if it matches the journal
-        String journalOrBooktitle = entry.getField(StandardField.JOURNAL).or(() -> entry.getField(StandardField.BOOKTITLE)).orElse("");
+        String journalOrBooktitle =
+                entry.getField(StandardField.JOURNAL)
+                        .or(() -> entry.getField(StandardField.BOOKTITLE))
+                        .orElse("");
         if (entry.hasField(FIELD_ALT_TITLE)) {
             String altTitle = entry.getField(FIELD_ALT_TITLE).orElse("");
             if (journalOrBooktitle.equals(altTitle)) {
@@ -232,7 +236,8 @@ private BibEntry parseRecord(XMLStreamReader reader) throws XMLStreamException {
         return entry;
     }
 
-    private void parseContributors(XMLStreamReader reader, BibEntry entry) throws XMLStreamException {
+    private void parseContributors(XMLStreamReader reader, BibEntry entry)
+            throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isEndElement(reader, "contributors")) {
@@ -243,7 +248,9 @@ private void parseContributors(XMLStreamReader reader, BibEntry entry) throws XM
         }
     }
 
-    private void extractPersons(XMLStreamReader reader, String elementName, BibEntry entry, StandardField author) throws XMLStreamException {
+    private void extractPersons(
+            XMLStreamReader reader, String elementName, BibEntry entry, StandardField author)
+            throws XMLStreamException {
         if (isStartElement(reader, elementName)) {
             StringJoiner persons = new StringJoiner(" and ");
             while (reader.hasNext()) {
@@ -284,10 +291,10 @@ private void parseTitles(XMLStreamReader reader, BibEntry entry) throws XMLStrea
                             entry.setField(StandardField.BOOKTITLE, secondaryTitle);
                         }
                     }
-                     case "alt-title" -> {
+                    case "alt-title" -> {
                         String altTitle = parseElementContent(reader, "alt-title");
                         entry.setField(FIELD_ALT_TITLE, altTitle);
-                     }
+                    }
                 }
             }
         }
@@ -306,7 +313,8 @@ private void parsePeriodical(XMLStreamReader reader, BibEntry entry) throws XMLS
         }
     }
 
-    private void parseJournalOrBookTitle(XMLStreamReader reader, BibEntry entry) throws XMLStreamException {
+    private void parseJournalOrBookTitle(XMLStreamReader reader, BibEntry entry)
+            throws XMLStreamException {
         String elementName = reader.getName().getLocalPart();
         switch (elementName) {
             case "full-title", "abbr-2", "abbr-1", "abbr-3" -> {
@@ -422,7 +430,8 @@ private void parseDates(XMLStreamReader reader, BibEntry entry) throws XMLStream
         }
     }
 
-    private String parseElementContent(XMLStreamReader reader, String elementName) throws XMLStreamException {
+    private String parseElementContent(XMLStreamReader reader, String elementName)
+            throws XMLStreamException {
         StringBuilder content = new StringBuilder();
         while (reader.hasNext()) {
             reader.next();
@@ -462,7 +471,10 @@ private boolean isEndElement(XMLStreamReader reader) {
     public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
         try {
             return importDatabase(
-                    new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))).getDatabase().getEntries();
+                            new BufferedReader(
+                                    new InputStreamReader(inputStream, StandardCharsets.UTF_8)))
+                    .getDatabase()
+                    .getEntries();
         } catch (IOException e) {
             LOGGER.error("Could not import file", e);
         }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java
index dd0e60dc0113..f95edbb41919 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java
@@ -1,13 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
@@ -20,6 +12,14 @@
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.entry.types.StandardEntryType;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
 /**
  * INSPEC format importer.
  */
@@ -83,17 +83,15 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 String f3 = s.substring(0, 2);
                 String frest = s.substring(5);
                 switch (f3) {
-                    case "TI" ->
-                            h.put(StandardField.TITLE, frest);
-                    case "PY" ->
-                            h.put(StandardField.YEAR, frest);
+                    case "TI" -> h.put(StandardField.TITLE, frest);
+                    case "PY" -> h.put(StandardField.YEAR, frest);
                     case "AU" ->
-                            h.put(StandardField.AUTHOR,
-                                    AuthorList.fixAuthorLastNameFirst(frest.replace(",-", ", ").replace(";", " and ")));
-                    case "AB" ->
-                            h.put(StandardField.ABSTRACT, frest);
-                    case "ID" ->
-                            h.put(StandardField.KEYWORDS, frest);
+                            h.put(
+                                    StandardField.AUTHOR,
+                                    AuthorList.fixAuthorLastNameFirst(
+                                            frest.replace(",-", ", ").replace(";", " and ")));
+                    case "AB" -> h.put(StandardField.ABSTRACT, frest);
+                    case "ID" -> h.put(StandardField.KEYWORDS, frest);
                     case "SO" -> {
                         int m = frest.indexOf('.');
                         if (m >= 0) {
@@ -119,7 +117,8 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         frest = frest.trim();
                         if ("Journal-Paper".equals(frest)) {
                             type = StandardEntryType.Article;
-                        } else if ("Conference-Paper".equals(frest) || "Conference-Paper; Journal-Paper".equals(frest)) {
+                        } else if ("Conference-Paper".equals(frest)
+                                || "Conference-Paper; Journal-Paper".equals(frest)) {
                             type = StandardEntryType.InProceedings;
                         } else {
                             type = EntryTypeFactory.parse(frest.replace(" ", ""));
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
index 0a25cebe4692..13dec9032406 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
@@ -1,17 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.formatter.casechanger.TitleCaseFormatter;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
@@ -25,10 +13,21 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * <p>
  * Importer for the ISI Web of Science, INSPEC and Medline format.
@@ -51,7 +50,8 @@ public class IsiImporter extends Importer {
 
     // 2006.09.05: Modified pattern to avoid false positives for other files due to an
     // extra | at the end:
-    private static final Pattern ISI_PATTERN = Pattern.compile("FN ISI Export Format|VR 1.|PY \\d{4}");
+    private static final Pattern ISI_PATTERN =
+            Pattern.compile("FN ISI Export Format|VR 1.|PY \\d{4}");
 
     private static final String EOL = "EOLEOL";
     private static final Pattern EOL_PATTERN = Pattern.compile(EOL);
@@ -98,7 +98,12 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
     }
 
     public static void processSubSup(Map<Field, String> map) {
-        Field[] subsup = {StandardField.TITLE, StandardField.ABSTRACT, StandardField.COMMENT, new UnknownField("notes")};
+        Field[] subsup = {
+            StandardField.TITLE,
+            StandardField.ABSTRACT,
+            StandardField.COMMENT,
+            new UnknownField("notes")
+        };
 
         for (Field aSubsup : subsup) {
             if (map.containsKey(aSubsup)) {
@@ -220,10 +225,11 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                             type = StandardEntryType.InProceedings;
                         }
                     }
-                    case "JO" ->
-                            hm.put(StandardField.BOOKTITLE, value);
+                    case "JO" -> hm.put(StandardField.BOOKTITLE, value);
                     case "AU" -> {
-                        String author = IsiImporter.isiAuthorsConvert(EOL_PATTERN.matcher(value).replaceAll(" and "));
+                        String author =
+                                IsiImporter.isiAuthorsConvert(
+                                        EOL_PATTERN.matcher(value).replaceAll(" and "));
 
                         // if there is already someone there then append with "and"
                         if (hm.get(StandardField.AUTHOR) != null) {
@@ -234,7 +240,9 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                     case "TI" ->
                             hm.put(StandardField.TITLE, EOL_PATTERN.matcher(value).replaceAll(" "));
                     case "SO", "JA" ->
-                            hm.put(StandardField.JOURNAL, EOL_PATTERN.matcher(value).replaceAll(" "));
+                            hm.put(
+                                    StandardField.JOURNAL,
+                                    EOL_PATTERN.matcher(value).replaceAll(" "));
                     case "ID", "KW" -> {
                         value = EOL_PATTERN.matcher(value).replaceAll(" ");
                         String existingKeywords = hm.get(StandardField.KEYWORDS);
@@ -246,9 +254,10 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         hm.put(StandardField.KEYWORDS, existingKeywords);
                     }
                     case "AB" ->
-                            hm.put(StandardField.ABSTRACT, EOL_PATTERN.matcher(value).replaceAll(" "));
-                    case "BP", "BR", "SP" ->
-                            pages = value;
+                            hm.put(
+                                    StandardField.ABSTRACT,
+                                    EOL_PATTERN.matcher(value).replaceAll(" "));
+                    case "BP", "BR", "SP" -> pages = value;
                     case "EP" -> {
                         int detpos = value.indexOf(' ');
 
@@ -258,20 +267,13 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         }
                         pages = pages + "--" + value;
                     }
-                    case "PS" ->
-                            pages = IsiImporter.parsePages(value);
-                    case "AR" ->
-                            pages = value;
-                    case "IS" ->
-                            hm.put(StandardField.NUMBER, value);
-                    case "PY" ->
-                            hm.put(StandardField.YEAR, value);
-                    case "VL" ->
-                            hm.put(StandardField.VOLUME, value);
-                    case "PU" ->
-                            hm.put(StandardField.PUBLISHER, value);
-                    case "DI" ->
-                            hm.put(StandardField.DOI, value);
+                    case "PS" -> pages = IsiImporter.parsePages(value);
+                    case "AR" -> pages = value;
+                    case "IS" -> hm.put(StandardField.NUMBER, value);
+                    case "PY" -> hm.put(StandardField.YEAR, value);
+                    case "VL" -> hm.put(StandardField.VOLUME, value);
+                    case "PU" -> hm.put(StandardField.PUBLISHER, value);
+                    case "DI" -> hm.put(StandardField.DOI, value);
                     case "PD" -> {
                         String month = IsiImporter.parseMonth(value);
                         if (month != null) {
@@ -281,17 +283,24 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                     case "DT" -> {
                         if ("Review".equals(value)) {
                             type = StandardEntryType.Article; // set "Review" in Note/Comment?
-                        } else if (value.startsWith("Article") || value.startsWith("Journal") || "article".equals(PT)) {
+                        } else if (value.startsWith("Article")
+                                || value.startsWith("Journal")
+                                || "article".equals(PT)) {
                             type = StandardEntryType.Article;
                         } else {
                             type = BibEntry.DEFAULT_TYPE;
                         }
                     }
                     case "CR" ->
-                            hm.put(new UnknownField("CitedReferences"), EOL_PATTERN.matcher(value).replaceAll(" ; ").trim());
+                            hm.put(
+                                    new UnknownField("CitedReferences"),
+                                    EOL_PATTERN.matcher(value).replaceAll(" ; ").trim());
                     default -> {
                         // Preserve all other entries except
-                        if ("ER".equals(beg) || "EF".equals(beg) || "VR".equals(beg) || "FN".equals(beg)) {
+                        if ("ER".equals(beg)
+                                || "EF".equals(beg)
+                                || "VR".equals(beg)
+                                || "FN".equals(beg)) {
                             continue;
                         }
                         hm.put(FieldFactory.parseField(type, beg), value);
@@ -359,7 +368,9 @@ static String parseMonth(String value) {
                     return month.get().getJabRefFormat();
                 }
             } catch (NumberFormatException e) {
-                LOGGER.info("The import file in ISI format cannot parse part of the content in PD into integers (If there is no month or PD displayed in the imported entity, this may be the reason)", e);
+                LOGGER.info(
+                        "The import file in ISI format cannot parse part of the content in PD into integers (If there is no month or PD displayed in the imported entity, this may be the reason)",
+                        e);
             }
         }
         return null;
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MarcXmlParser.java b/src/main/java/org/jabref/logic/importer/fileformat/MarcXmlParser.java
index 1e918099990a..192983d52860 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MarcXmlParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MarcXmlParser.java
@@ -1,20 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.time.DateTimeException;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.jabref.logic.importer.AuthorListParser;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.Parser;
@@ -27,7 +12,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -36,6 +20,21 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.time.DateTimeException;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 /**
  * A parser for the bavarian flavour (Bibliotheksverbund Bayern) of the marc xml standard
  * <p>
@@ -56,7 +55,8 @@
  */
 public class MarcXmlParser implements Parser {
     private static final Logger LOGGER = LoggerFactory.getLogger(MarcXmlParser.class);
-    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactory.newInstance();
+    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY =
+            DocumentBuilderFactory.newInstance();
 
     @Override
     public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
@@ -170,22 +170,21 @@ private void putPersonalName(BibEntry bibEntry, Element datafield) {
 
         if (StringUtil.isNotBlank(author) && StringUtil.isNotBlank(relation)) {
             name = new AuthorListParser().parse(author);
-            Optional<StandardField> field = Optional.ofNullable(
-                    switch (relation) {
-                        case "aut" ->
-                                StandardField.AUTHOR;
-                        case "edt" ->
-                                StandardField.EDITOR;
-                        case "pbl" ->
-                                StandardField.PUBLISHER;
-                        default ->
-                                null;
-                    });
+            Optional<StandardField> field =
+                    Optional.ofNullable(
+                            switch (relation) {
+                                case "aut" -> StandardField.AUTHOR;
+                                case "edt" -> StandardField.EDITOR;
+                                case "pbl" -> StandardField.PUBLISHER;
+                                default -> null;
+                            });
 
             if (field.isPresent()) {
                 String ind1 = datafield.getAttribute("ind1");
                 String brackedName;
-                if (field.get() == StandardField.PUBLISHER && StringUtil.isNotBlank(ind1) && "2".equals(ind1)) {
+                if (field.get() == StandardField.PUBLISHER
+                        && StringUtil.isNotBlank(ind1)
+                        && "2".equals(ind1)) {
                     // ind == 2 -> Corporate publisher
                     brackedName = "{" + name.getAsFirstLastNamesWithAnd() + "}";
                 } else {
@@ -193,7 +192,9 @@ private void putPersonalName(BibEntry bibEntry, Element datafield) {
                 }
 
                 if (bibEntry.getField(field.get()).isPresent()) {
-                    bibEntry.setField(field.get(), bibEntry.getField(field.get()).get().concat(" and " + brackedName));
+                    bibEntry.setField(
+                            field.get(),
+                            bibEntry.getField(field.get()).get().concat(" and " + brackedName));
                 } else {
                     bibEntry.setField(field.get(), brackedName);
                 }
@@ -284,8 +285,13 @@ private void putPublication(BibEntry bibEntry, Element datafield) {
     private void putPhysicalDescription(BibEntry bibEntry, Element datafield) {
         String pagetotal = getSubfield("a", datafield);
 
-        if (StringUtil.isNotBlank(pagetotal) && (pagetotal.contains("pages") || pagetotal.contains("p.") || pagetotal.contains("S") || pagetotal.contains("Seiten"))) {
-            pagetotal = pagetotal.replaceAll(".*?(\\d+)(?:\\s*Seiten|\\s*S|\\s*pages|\\s*p).*", "$1");
+        if (StringUtil.isNotBlank(pagetotal)
+                && (pagetotal.contains("pages")
+                        || pagetotal.contains("p.")
+                        || pagetotal.contains("S")
+                        || pagetotal.contains("Seiten"))) {
+            pagetotal =
+                    pagetotal.replaceAll(".*?(\\d+)(?:\\s*Seiten|\\s*S|\\s*pages|\\s*p).*", "$1");
             bibEntry.setField(StandardField.PAGETOTAL, pagetotal);
         }
     }
@@ -329,9 +335,13 @@ private void putSummary(BibEntry bibEntry, Element datafield) {
         String summary = getSubfield("a", datafield);
 
         String ind1 = datafield.getAttribute("ind1");
-        if (StringUtil.isNotBlank(summary) && StringUtil.isNotBlank(ind1) && "3".equals(ind1)) { // Abstract
+        if (StringUtil.isNotBlank(summary)
+                && StringUtil.isNotBlank(ind1)
+                && "3".equals(ind1)) { // Abstract
             if (bibEntry.getField(StandardField.ABSTRACT).isPresent()) {
-                bibEntry.setField(StandardField.ABSTRACT, bibEntry.getField(StandardField.ABSTRACT).get().concat(summary));
+                bibEntry.setField(
+                        StandardField.ABSTRACT,
+                        bibEntry.getField(StandardField.ABSTRACT).get().concat(summary));
             } else {
                 bibEntry.setField(StandardField.ABSTRACT, summary);
             }
@@ -380,7 +390,9 @@ private void putDoi(BibEntry bibEntry, Element datafield) {
         String ind1 = datafield.getAttribute("ind1");
         String resource = getSubfield("u", datafield);
 
-        if ("e".equals(ind1) && StringUtil.isNotBlank("u") && StringUtil.isNotBlank(resource)) { // DOI
+        if ("e".equals(ind1)
+                && StringUtil.isNotBlank("u")
+                && StringUtil.isNotBlank(resource)) { // DOI
             String fulltext = getSubfield("3", datafield);
             handleVolltext(bibEntry, fulltext, resource, StandardField.DOI);
         }
@@ -398,10 +410,13 @@ private void putElectronicLocation(BibEntry bibEntry, Element datafield) {
         }
     }
 
-    private static void handleVolltext(BibEntry bibEntry, String fieldName, String resource, Field fallBackField) {
+    private static void handleVolltext(
+            BibEntry bibEntry, String fieldName, String resource, Field fallBackField) {
         if ("Volltext".equals(fieldName) && StringUtil.isNotBlank(resource)) {
             try {
-                LinkedFile linkedFile = new LinkedFile("", URI.create(resource).toURL(), StandardFileType.PDF.getName());
+                LinkedFile linkedFile =
+                        new LinkedFile(
+                                "", URI.create(resource).toURL(), StandardFileType.PDF.getName());
                 bibEntry.setFiles(List.of(linkedFile));
             } catch (MalformedURLException | IllegalArgumentException e) {
                 LOGGER.info("Malformed URL: {}", resource);
@@ -412,27 +427,31 @@ private static void handleVolltext(BibEntry bibEntry, String fieldName, String r
     }
 
     private void putNotes(BibEntry bibEntry, Element datafield) {
-        String[] notes = new String[] {
-                getSubfield("a", datafield),
-                getSubfield("0", datafield),
-                getSubfield("h", datafield),
-                getSubfield("S", datafield),
-                getSubfield("c", datafield),
-                getSubfield("f", datafield),
-                getSubfield("i", datafield),
-                getSubfield("k", datafield),
-                getSubfield("l", datafield),
-                getSubfield("z", datafield),
-                getSubfield("3", datafield),
-                getSubfield("5", datafield)
-        };
-
-        String notesJoined = Arrays.stream(notes)
-                                   .filter(StringUtil::isNotBlank)
-                                   .collect(Collectors.joining("\n\n"));
+        String[] notes =
+                new String[] {
+                    getSubfield("a", datafield),
+                    getSubfield("0", datafield),
+                    getSubfield("h", datafield),
+                    getSubfield("S", datafield),
+                    getSubfield("c", datafield),
+                    getSubfield("f", datafield),
+                    getSubfield("i", datafield),
+                    getSubfield("k", datafield),
+                    getSubfield("l", datafield),
+                    getSubfield("z", datafield),
+                    getSubfield("3", datafield),
+                    getSubfield("5", datafield)
+                };
+
+        String notesJoined =
+                Arrays.stream(notes)
+                        .filter(StringUtil::isNotBlank)
+                        .collect(Collectors.joining("\n\n"));
 
         if (bibEntry.getField(StandardField.NOTE).isPresent()) {
-            bibEntry.setField(StandardField.NOTE, bibEntry.getField(StandardField.NOTE).get().concat(notesJoined));
+            bibEntry.setField(
+                    StandardField.NOTE,
+                    bibEntry.getField(StandardField.NOTE).get().concat(notesJoined));
         } else {
             bibEntry.setField(StandardField.NOTE, notesJoined);
         }
@@ -453,7 +472,10 @@ private String getSubfield(String a, Element datafield) {
     private List<String> getSubfields(String a, Element datafield) {
         List<Element> subfields = getChildren("subfield", datafield);
 
-        return subfields.stream().filter(field -> field.getAttribute("code").equals(a)).map(Node::getTextContent).toList();
+        return subfields.stream()
+                .filter(field -> field.getAttribute("code").equals(a))
+                .map(Node::getTextContent)
+                .toList();
     }
 
     private Element getChild(String name, Element e) {
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
index 3a18c4c04765..0a40ef5f4bae 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
@@ -1,24 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.events.XMLEvent;
-
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.Parser;
@@ -40,10 +21,28 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.events.XMLEvent;
+
 /**
  * Importer for the Medline/Pubmed format.
  * <p>
@@ -135,7 +134,8 @@ public ParserResult importDatabase(BufferedReader input) throws IOException {
         return new ParserResult(bibItems);
     }
 
-    private void parseBookArticle(XMLStreamReader reader, List<BibEntry> bibItems, String startElement)
+    private void parseBookArticle(
+            XMLStreamReader reader, List<BibEntry> bibItems, String startElement)
             throws XMLStreamException {
         Map<Field, String> fields = new HashMap<>();
 
@@ -167,7 +167,8 @@ private void parseBookArticle(XMLStreamReader reader, List<BibEntry> bibItems, S
         bibItems.add(entry);
     }
 
-    private void parseBookDocument(XMLStreamReader reader, Map<Field, String> fields, String startElement)
+    private void parseBookDocument(
+            XMLStreamReader reader, Map<Field, String> fields, String startElement)
             throws XMLStreamException {
         // multiple occurrences of the following fields can be present
         List<String> sectionTitleList = new ArrayList<>();
@@ -240,7 +241,8 @@ private void parseBookDocument(XMLStreamReader reader, Map<Field, String> fields
         }
     }
 
-    private void parseBookInformation(XMLStreamReader reader, Map<Field, String> fields, String startElement)
+    private void parseBookInformation(
+            XMLStreamReader reader, Map<Field, String> fields, String startElement)
             throws XMLStreamException {
         List<String> isbnList = new ArrayList<>();
         List<String> titleList = new ArrayList<>();
@@ -259,7 +261,8 @@ private void parseBookInformation(XMLStreamReader reader, Map<Field, String> fie
                     case "PublisherLocation" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("publocation"), reader.getText());
+                            putIfValueNotNull(
+                                    fields, new UnknownField("publocation"), reader.getText());
                         }
                     }
                     case "BookTitle" -> {
@@ -292,7 +295,8 @@ private void parseBookInformation(XMLStreamReader reader, Map<Field, String> fie
                     case "ReportNumber" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("reportnumber"), reader.getText());
+                            putIfValueNotNull(
+                                    fields, new UnknownField("reportnumber"), reader.getText());
                         }
                     }
                     case "ELocationID" -> {
@@ -325,7 +329,8 @@ private void parseBookInformation(XMLStreamReader reader, Map<Field, String> fie
         }
     }
 
-    private void handleElocationId(Map<Field, String> fields, XMLStreamReader reader, String eidType) {
+    private void handleElocationId(
+            Map<Field, String> fields, XMLStreamReader reader, String eidType) {
         if ("doi".equals(eidType)) {
             fields.put(StandardField.DOI, reader.getText());
         }
@@ -334,7 +339,8 @@ private void handleElocationId(Map<Field, String> fields, XMLStreamReader reader
         }
     }
 
-    private void parseSections(XMLStreamReader reader, List<String> sectionTitleList) throws XMLStreamException {
+    private void parseSections(XMLStreamReader reader, List<String> sectionTitleList)
+            throws XMLStreamException {
         int sectionLevel = 0;
 
         while (reader.hasNext()) {
@@ -394,7 +400,8 @@ private void parseArticle(XMLStreamReader reader, List<BibEntry> bibItems, Strin
         bibItems.add(entry);
     }
 
-    private void parsePubmedData(XMLStreamReader reader, Map<Field, String> fields, String startElement)
+    private void parsePubmedData(
+            XMLStreamReader reader, Map<Field, String> fields, String startElement)
             throws XMLStreamException {
         String publicationStatus = "";
         List<ArticleId> articleIdList = new ArrayList<>();
@@ -433,7 +440,8 @@ private void parsePubmedData(XMLStreamReader reader, Map<Field, String> fields,
         }
     }
 
-    private void parseMedlineCitation(XMLStreamReader reader, Map<Field, String> fields, String startElement)
+    private void parseMedlineCitation(
+            XMLStreamReader reader, Map<Field, String> fields, String startElement)
             throws XMLStreamException {
         // multiple occurrences of the following fields can be present
         List<String> citationSubsets = new ArrayList<>();
@@ -494,7 +502,8 @@ private void parseMedlineCitation(XMLStreamReader reader, Map<Field, String> fie
                     case "NumberOfReferences" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("references"), reader.getText());
+                            putIfValueNotNull(
+                                    fields, new UnknownField("references"), reader.getText());
                         }
                     }
                     case "PersonalNameSubject" -> {
@@ -546,13 +555,16 @@ private void parseMedlineCitation(XMLStreamReader reader, Map<Field, String> fie
         addOtherId(fields, otherIdList);
         addKeywords(fields, keywordList);
         if (!spaceFlightMissionList.isEmpty()) {
-            fields.put(new UnknownField("space-flight-mission"), String.join(", ", spaceFlightMissionList));
+            fields.put(
+                    new UnknownField("space-flight-mission"),
+                    String.join(", ", spaceFlightMissionList));
         }
         addInvestigators(fields, investigatorList);
         addNotes(fields, generalNoteList);
     }
 
-    private void parseInvestigator(XMLStreamReader reader, List<Investigator> investigatorList, String startElement)
+    private void parseInvestigator(
+            XMLStreamReader reader, List<Investigator> investigatorList, String startElement)
             throws XMLStreamException {
         String lastName = "";
         String foreName = "";
@@ -592,7 +604,10 @@ private void parseInvestigator(XMLStreamReader reader, List<Investigator> invest
         investigatorList.add(new Investigator(lastName, foreName, affiliationList));
     }
 
-    private void parsePersonalNameSubject(XMLStreamReader reader, List<PersonalNameSubject> personalNameSubjectList, String startElement)
+    private void parsePersonalNameSubject(
+            XMLStreamReader reader,
+            List<PersonalNameSubject> personalNameSubjectList,
+            String startElement)
             throws XMLStreamException {
         String lastName = "";
         String foreName = "";
@@ -625,7 +640,8 @@ private void parsePersonalNameSubject(XMLStreamReader reader, List<PersonalNameS
         personalNameSubjectList.add(new PersonalNameSubject(lastName, foreName));
     }
 
-    private void parseMeshHeading(XMLStreamReader reader, List<MeshHeading> meshHeadingList, String startElement)
+    private void parseMeshHeading(
+            XMLStreamReader reader, List<MeshHeading> meshHeadingList, String startElement)
             throws XMLStreamException {
         String descriptorName = "";
         List<String> qualifierNames = new ArrayList<>();
@@ -658,7 +674,8 @@ private void parseMeshHeading(XMLStreamReader reader, List<MeshHeading> meshHead
         meshHeadingList.add(new MeshHeading(descriptorName, qualifierNames));
     }
 
-    private void parseGeneSymbolList(XMLStreamReader reader, Map<Field, String> fields, String startElement)
+    private void parseGeneSymbolList(
+            XMLStreamReader reader, Map<Field, String> fields, String startElement)
             throws XMLStreamException {
         List<String> geneSymbols = new ArrayList<>();
 
@@ -684,7 +701,8 @@ private void parseGeneSymbolList(XMLStreamReader reader, Map<Field, String> fiel
         }
     }
 
-    private void parseChemicalList(XMLStreamReader reader, Map<Field, String> fields, String startElement)
+    private void parseChemicalList(
+            XMLStreamReader reader, Map<Field, String> fields, String startElement)
             throws XMLStreamException {
         List<String> chemicalNames = new ArrayList<>();
 
@@ -708,7 +726,8 @@ private void parseChemicalList(XMLStreamReader reader, Map<Field, String> fields
         fields.put(new UnknownField("chemicals"), String.join(", ", chemicalNames));
     }
 
-    private void parseMedlineJournalInfo(XMLStreamReader reader, Map<Field, String> fields, String startElement)
+    private void parseMedlineJournalInfo(
+            XMLStreamReader reader, Map<Field, String> fields, String startElement)
             throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
@@ -718,13 +737,17 @@ private void parseMedlineJournalInfo(XMLStreamReader reader, Map<Field, String>
                     case "Country" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("country"), reader.getText());
+                            putIfValueNotNull(
+                                    fields, new UnknownField("country"), reader.getText());
                         }
                     }
                     case "MedlineTA" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("journal-abbreviation"), reader.getText());
+                            putIfValueNotNull(
+                                    fields,
+                                    new UnknownField("journal-abbreviation"),
+                                    reader.getText());
                         }
                     }
                     case "NlmUniqueID" -> {
@@ -736,7 +759,8 @@ private void parseMedlineJournalInfo(XMLStreamReader reader, Map<Field, String>
                     case "ISSNLinking" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("issn-linking"), reader.getText());
+                            putIfValueNotNull(
+                                    fields, new UnknownField("issn-linking"), reader.getText());
                         }
                     }
                 }
@@ -748,7 +772,8 @@ private void parseMedlineJournalInfo(XMLStreamReader reader, Map<Field, String>
         }
     }
 
-    private void parseArticleInformation(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
+    private void parseArticleInformation(XMLStreamReader reader, Map<Field, String> fields)
+            throws XMLStreamException {
         List<String> titleList = new ArrayList<>();
         String pubmodel = reader.getAttributeValue(null, "PubModel");
         fields.put(new UnknownField("pubmodel"), pubmodel);
@@ -794,7 +819,8 @@ private void parseArticleInformation(XMLStreamReader reader, Map<Field, String>
         }
     }
 
-    private void parseJournal(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
+    private void parseJournal(XMLStreamReader reader, Map<Field, String> fields)
+            throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isStartXMLEvent(reader)) {
@@ -843,13 +869,13 @@ private void parseDate(XMLStreamReader reader, Map<Field, String> fields, String
         Optional<String> day = Optional.empty();
 
         // mapping from date XML element to field name
-        Map<String, String> dateFieldMap = Map.of(
-                "DateCreated", "created",
-                "DateCompleted", "completed",
-                "DateRevised", "revised",
-                "ContributionDate", "contribution",
-                "PubDate", ""
-        );
+        Map<String, String> dateFieldMap =
+                Map.of(
+                        "DateCreated", "created",
+                        "DateCompleted", "completed",
+                        "DateRevised", "revised",
+                        "ContributionDate", "contribution",
+                        "PubDate", "");
 
         while (reader.hasNext()) {
             reader.next();
@@ -883,8 +909,11 @@ private void parseDate(XMLStreamReader reader, Map<Field, String> fields, String
         }
 
         Optional<Date> date = Date.parse(year, month, day);
-        date.ifPresent(dateValue ->
-                fields.put(new UnknownField(dateFieldMap.get(startElement)), dateValue.getNormalized()));
+        date.ifPresent(
+                dateValue ->
+                        fields.put(
+                                new UnknownField(dateFieldMap.get(startElement)),
+                                dateValue.getNormalized()));
     }
 
     private void addArticleIdList(Map<Field, String> fields, List<ArticleId> articleIdList) {
@@ -893,7 +922,9 @@ private void addArticleIdList(Map<Field, String> fields, List<ArticleId> article
                 if ("pubmed".equals(id.idType())) {
                     fields.computeIfAbsent(StandardField.PMID, k -> id.content());
                 } else {
-                    fields.computeIfAbsent(FieldFactory.parseField(StandardEntryType.Article, id.idType()), k -> id.content());
+                    fields.computeIfAbsent(
+                            FieldFactory.parseField(StandardEntryType.Article, id.idType()),
+                            k -> id.content());
                 }
             }
         }
@@ -957,12 +988,15 @@ private void addKeywords(Map<Field, String> fields, List<String> keywordList) {
     private void addOtherId(Map<Field, String> fields, List<OtherId> otherIdList) {
         for (OtherId id : otherIdList) {
             if (!id.source().isBlank() && !id.content().isBlank()) {
-                fields.put(FieldFactory.parseField(StandardEntryType.Article, id.source()), id.content());
+                fields.put(
+                        FieldFactory.parseField(StandardEntryType.Article, id.source()),
+                        id.content());
             }
         }
     }
 
-    private void addPersonalNames(Map<Field, String> fields, List<PersonalNameSubject> personalNameSubjectList) {
+    private void addPersonalNames(
+            Map<Field, String> fields, List<PersonalNameSubject> personalNameSubjectList) {
         if (fields.get(StandardField.AUTHOR) == null) {
             // if no authors appear, then add the personal names as authors
             List<String> personalNames = new ArrayList<>();
@@ -999,7 +1033,8 @@ private void addMeshHeading(Map<Field, String> fields, List<MeshHeading> meshHea
         }
     }
 
-    private void addPubDate(XMLStreamReader reader, Map<Field, String> fields, String startElement) throws XMLStreamException {
+    private void addPubDate(XMLStreamReader reader, Map<Field, String> fields, String startElement)
+            throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isStartXMLEvent(reader)) {
@@ -1021,7 +1056,11 @@ private void addPubDate(XMLStreamReader reader, Map<Field, String> fields, Strin
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
                             Optional<Month> month = Month.parse(reader.getText());
-                            month.ifPresent(monthValue -> fields.put(StandardField.MONTH, monthValue.getJabRefFormat()));
+                            month.ifPresent(
+                                    monthValue ->
+                                            fields.put(
+                                                    StandardField.MONTH,
+                                                    monthValue.getJabRefFormat()));
                         }
                     }
                     case "Season" -> {
@@ -1051,7 +1090,8 @@ private void addAbstract(XMLStreamReader reader, Map<Field, String> fields, Stri
                     case "CopyrightInformation" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("copyright"), reader.getText());
+                            putIfValueNotNull(
+                                    fields, new UnknownField("copyright"), reader.getText());
                         }
                     }
                     case "AbstractText" -> {
@@ -1075,7 +1115,8 @@ private void addAbstract(XMLStreamReader reader, Map<Field, String> fields, Stri
      * We ignore the tags and return only the characters present in the enclosing parent element.
      *
      */
-    private void handleTextElement(XMLStreamReader reader, List<String> textList, String startElement)
+    private void handleTextElement(
+            XMLStreamReader reader, List<String> textList, String startElement)
             throws XMLStreamException {
         StringBuilder result = new StringBuilder();
 
@@ -1106,7 +1147,8 @@ private void handleTextElement(XMLStreamReader reader, List<String> textList, St
         textList.add(result.toString().trim());
     }
 
-    private void addPagination(XMLStreamReader reader, Map<Field, String> fields, String startElement)
+    private void addPagination(
+            XMLStreamReader reader, Map<Field, String> fields, String startElement)
             throws XMLStreamException {
         String startPage = "";
         String endPage = "";
@@ -1119,7 +1161,8 @@ private void addPagination(XMLStreamReader reader, Map<Field, String> fields, St
                     case "MedlinePgn" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, StandardField.PAGES, fixPageRange(reader.getText()));
+                            putIfValueNotNull(
+                                    fields, StandardField.PAGES, fixPageRange(reader.getText()));
                         }
                     }
                     case "StartPage" -> {
@@ -1135,7 +1178,8 @@ private void addPagination(XMLStreamReader reader, Map<Field, String> fields, St
                         if (isCharacterXMLEvent(reader)) {
                             endPage = reader.getText();
                             // but it should not happen, that a endpage appears without startpage
-                            fields.put(StandardField.PAGES, fixPageRange(startPage + "-" + endPage));
+                            fields.put(
+                                    StandardField.PAGES, fixPageRange(startPage + "-" + endPage));
                         }
                     }
                 }
@@ -1152,7 +1196,9 @@ private String extractYear(String medlineDate) {
         return medlineDate.substring(0, 4);
     }
 
-    private void handleAuthorList(XMLStreamReader reader, Map<Field, String> fields, String startElement) throws XMLStreamException {
+    private void handleAuthorList(
+            XMLStreamReader reader, Map<Field, String> fields, String startElement)
+            throws XMLStreamException {
         List<String> authorNames = new ArrayList<>();
 
         while (reader.hasNext()) {
@@ -1174,7 +1220,8 @@ private void handleAuthorList(XMLStreamReader reader, Map<Field, String> fields,
         fields.put(StandardField.AUTHOR, String.join(" and ", authorNames));
     }
 
-    private void parseAuthor(XMLStreamReader reader, List<String> authorNames) throws XMLStreamException {
+    private void parseAuthor(XMLStreamReader reader, List<String> authorNames)
+            throws XMLStreamException {
         StringBuilder authorName = new StringBuilder();
         List<String> collectiveNames = new ArrayList<>();
 
@@ -1258,7 +1305,10 @@ private boolean isEndXMLEvent(XMLStreamReader reader) {
     public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
         try {
             return importDatabase(
-                    new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))).getDatabase().getEntries();
+                            new BufferedReader(
+                                    new InputStreamReader(inputStream, StandardCharsets.UTF_8)))
+                    .getDatabase()
+                    .getEntries();
         } catch (IOException e) {
             LOGGER.error(e.getLocalizedMessage(), e);
         }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
index 64281fc28128..4ecf75e77fcd 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
@@ -1,14 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
@@ -22,6 +13,15 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Pattern;
+
 /**
  * Importer for the MEDLINE Plain format.
  * <p>
@@ -32,7 +32,8 @@ public class MedlinePlainImporter extends Importer {
     private static final Pattern PMID_PATTERN = Pattern.compile("PMID.*-.*");
     private static final Pattern PMC_PATTERN = Pattern.compile("PMC.*-.*");
     private static final Pattern PMCR_PATTERN = Pattern.compile("PMCR.*-.*");
-    private static final Pattern CREATE_DATE_PATTERN = Pattern.compile("\\d{4}/[0123]?\\d/\\s?[012]\\d:[0-5]\\d");
+    private static final Pattern CREATE_DATE_PATTERN =
+            Pattern.compile("\\d{4}/[0123]?\\d/\\s?[012]\\d:[0-5]\\d");
     private static final Pattern COMPLETE_DATE_PATTERN = Pattern.compile("\\d{8}");
     private final ImportFormatPreferences importFormatPreferences;
 
@@ -67,7 +68,8 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         // (i.e., PubMed Unique Identifier, PubMed Central Identifier, PubMed Central Release)
         String str;
         while ((str = reader.readLine()) != null) {
-            if (PMID_PATTERN.matcher(str).find() || PMC_PATTERN.matcher(str).find()
+            if (PMID_PATTERN.matcher(str).find()
+                    || PMC_PATTERN.matcher(str).find()
                     || PMCR_PATTERN.matcher(str).find()) {
                 return true;
             }
@@ -80,10 +82,15 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         List<BibEntry> bibitems = new ArrayList<>();
 
         // use optional here, so that no exception will be thrown if the file is empty
-        String linesAsString = reader.lines().reduce((line, nextline) -> line + "\n" + nextline).orElse("");
+        String linesAsString =
+                reader.lines().reduce((line, nextline) -> line + "\n" + nextline).orElse("");
 
-        String[] entries = linesAsString.replace("\u2013", "-").replace("\u2014", "--").replace("\u2015", "--")
-                                        .split("\\n\\n");
+        String[] entries =
+                linesAsString
+                        .replace("\u2013", "-")
+                        .replace("\u2014", "--")
+                        .replace("\u2015", "--")
+                        .split("\\n\\n");
 
         for (String entry1 : entries) {
             if (entry1.trim().isEmpty() || !entry1.contains("-")) {
@@ -108,7 +115,8 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         continue;
                     }
                     if (lines[j + 1].charAt(4) != '-') {
-                        if ((!current.isEmpty()) && !Character.isWhitespace(current.charAt(current.length() - 1))) {
+                        if ((!current.isEmpty())
+                                && !Character.isWhitespace(current.charAt(current.length() - 1))) {
                             current.append(' ');
                         }
                         current.append(lines[j + 1].trim());
@@ -185,35 +193,41 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 }
 
                 switch (label) {
-                    case "IRAD",
-                         "IR",
-                         "FIR" -> {
-                        fieldConversionMap.merge(new UnknownField("investigator"), value, (a, b) -> a + ", " + b);
+                    case "IRAD", "IR", "FIR" -> {
+                        fieldConversionMap.merge(
+                                new UnknownField("investigator"), value, (a, b) -> a + ", " + b);
                     }
-                    case "MH",
-                         "OT" -> {
+                    case "MH", "OT" -> {
                         if (!fieldConversionMap.containsKey(StandardField.KEYWORDS)) {
                             fieldConversionMap.put(StandardField.KEYWORDS, value);
                         } else {
-                            fieldConversionMap.compute(StandardField.KEYWORDS, (k, kw) -> kw + importFormatPreferences.bibEntryPreferences().getKeywordSeparator() + " " + value);
+                            fieldConversionMap.compute(
+                                    StandardField.KEYWORDS,
+                                    (k, kw) ->
+                                            kw
+                                                    + importFormatPreferences
+                                                            .bibEntryPreferences()
+                                                            .getKeywordSeparator()
+                                                    + " "
+                                                    + value);
                         }
                     }
                     case "CON",
-                         "CIN",
-                         "EIN",
-                         "EFR",
-                         "CRI",
-                         "CRF",
-                         "PRIN",
-                         "PROF",
-                         "RPI",
-                         "RPF",
-                         "RIN",
-                         "ROF",
-                         "UIN",
-                         "UOF",
-                         "SPIN",
-                         "ORI" -> {
+                            "CIN",
+                            "EIN",
+                            "EFR",
+                            "CRI",
+                            "CRF",
+                            "PRIN",
+                            "PROF",
+                            "RPI",
+                            "RPF",
+                            "RIN",
+                            "ROF",
+                            "UIN",
+                            "UOF",
+                            "SPIN",
+                            "ORI" -> {
                         if (!comment.isEmpty()) {
                             comment.append("\n");
                         }
@@ -244,27 +258,22 @@ private boolean checkLineValidity(String line) {
     private EntryType addSourceType(String value, EntryType type) {
         String val = value.toLowerCase(Locale.ENGLISH);
         return switch (val) {
-            case "book" ->
-                    StandardEntryType.Book;
+            case "book" -> StandardEntryType.Book;
             case "journal article",
-                 "classical article",
-                 "corrected and republished article",
-                 "historical article",
-                 "introductory journal article",
-                 "newspaper article" ->
+                            "classical article",
+                            "corrected and republished article",
+                            "historical article",
+                            "introductory journal article",
+                            "newspaper article" ->
                     StandardEntryType.Article;
             case "clinical conference",
-                 "consensus development conference",
-                 "consensus development conference, nih" ->
+                            "consensus development conference",
+                            "consensus development conference, nih" ->
                     StandardEntryType.Conference;
-            case "technical report" ->
-                    StandardEntryType.TechReport;
-            case "editorial" ->
-                    StandardEntryType.InProceedings;
-            case "overall" ->
-                    StandardEntryType.Proceedings;
-            default ->
-                    type;
+            case "technical report" -> StandardEntryType.TechReport;
+            case "editorial" -> StandardEntryType.InProceedings;
+            case "overall" -> StandardEntryType.Proceedings;
+            default -> type;
         };
     }
 
@@ -305,7 +314,10 @@ private void addIDs(Map<Field, String> hm, String lab, String value) {
             } else if (value.indexOf('[') > 0) {
                 int startOfIdentifier = value.indexOf('[');
                 int endOfIdentifier = value.indexOf(']');
-                key = new UnknownField("article-" + value.substring(startOfIdentifier + 1, endOfIdentifier));
+                key =
+                        new UnknownField(
+                                "article-"
+                                        + value.substring(startOfIdentifier + 1, endOfIdentifier));
                 idValue = value.substring(0, startOfIdentifier - 1);
             }
             hm.put(key, idValue);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
index e38743f294a2..145469add2cc 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
@@ -1,5 +1,27 @@
 package org.jabref.logic.importer.fileformat;
 
+import com.google.common.base.Joiner;
+
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.Importer;
+import org.jabref.logic.importer.ParseException;
+import org.jabref.logic.importer.Parser;
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.importer.fileformat.mods.Identifier;
+import org.jabref.logic.importer.fileformat.mods.Name;
+import org.jabref.logic.importer.fileformat.mods.RecordInfo;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Date;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.field.UnknownField;
+import org.jabref.model.entry.types.EntryTypeFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -22,28 +44,6 @@
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.events.XMLEvent;
 
-import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.Importer;
-import org.jabref.logic.importer.ParseException;
-import org.jabref.logic.importer.Parser;
-import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.importer.fileformat.mods.Identifier;
-import org.jabref.logic.importer.fileformat.mods.Name;
-import org.jabref.logic.importer.fileformat.mods.RecordInfo;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.Date;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.FieldFactory;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.entry.field.UnknownField;
-import org.jabref.model.entry.types.EntryTypeFactory;
-
-import com.google.common.base.Joiner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Importer for the MODS format.<br>
  * More details about the format can be found here <a href="http://www.loc.gov/standards/mods/">http://www.loc.gov/standards/mods/</a>. <br>
@@ -58,7 +58,8 @@ public class ModsImporter extends Importer implements Parser {
     private final XMLInputFactory xmlInputFactory;
 
     public ModsImporter(ImportFormatPreferences importFormatPreferences) {
-        keywordSeparator = importFormatPreferences.bibEntryPreferences().getKeywordSeparator() + " ";
+        keywordSeparator =
+                importFormatPreferences.bibEntryPreferences().getKeywordSeparator() + " ";
         xmlInputFactory = XMLInputFactory.newInstance();
         // prevent xxe (https://rules.sonarsource.com/java/RSPEC-2755)
         // Not supported by aalto-xml
@@ -87,7 +88,8 @@ public ParserResult importDatabase(BufferedReader input) throws IOException {
         return new ParserResult(bibItems);
     }
 
-    private void parseModsCollection(List<BibEntry> bibItems, XMLStreamReader reader) throws XMLStreamException {
+    private void parseModsCollection(List<BibEntry> bibItems, XMLStreamReader reader)
+            throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isStartXMLEvent(reader) && "mods".equals(reader.getName().getLocalPart())) {
@@ -107,7 +109,8 @@ private void parseModsCollection(List<BibEntry> bibItems, XMLStreamReader reader
         }
     }
 
-    private void parseModsGroup(Map<Field, String> fields, XMLStreamReader reader, BibEntry entry) throws XMLStreamException {
+    private void parseModsGroup(Map<Field, String> fields, XMLStreamReader reader, BibEntry entry)
+            throws XMLStreamException {
         // These elements (subject, keywords and authors) can appear more than once,
         // so they are collected in lists
         List<String> notes = new ArrayList<>();
@@ -188,7 +191,8 @@ private void parseModsGroup(Map<Field, String> fields, XMLStreamReader reader, B
      * Also, if there appears a title field, then this indicates that is the name of the journal
      * which the article belongs to.
      */
-    private void parseRelatedItem(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
+    private void parseRelatedItem(XMLStreamReader reader, Map<Field, String> fields)
+            throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isStartXMLEvent(reader)) {
@@ -214,7 +218,8 @@ private void parseRelatedItem(XMLStreamReader reader, Map<Field, String> fields)
         }
     }
 
-    private void handleExtent(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
+    private void handleExtent(XMLStreamReader reader, Map<Field, String> fields)
+            throws XMLStreamException {
         String total = "";
         String startPage = "";
         String endPage = "";
@@ -254,14 +259,16 @@ private void handleExtent(XMLStreamReader reader, Map<Field, String> fields) thr
         } else if (!startPage.isBlank()) {
             putIfValueNotNull(fields, StandardField.PAGES, startPage);
             if (!endPage.isBlank()) {
-                // if end appears, then there has to be a start page appeared, so get it and put it together with
+                // if end appears, then there has to be a start page appeared, so get it and put it
+                // together with
                 // the end page
                 fields.put(StandardField.PAGES, startPage + "-" + endPage);
             }
         }
     }
 
-    private void handleDetail(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
+    private void handleDetail(XMLStreamReader reader, Map<Field, String> fields)
+            throws XMLStreamException {
         String type = reader.getAttributeValue(null, "type");
         Set<String> detailElementSet = Set.of("number", "caption", "title");
 
@@ -283,7 +290,8 @@ private void handleDetail(XMLStreamReader reader, Map<Field, String> fields) thr
         }
     }
 
-    private void parseName(XMLStreamReader reader, Map<Field, String> fields, List<String> authors) throws XMLStreamException {
+    private void parseName(XMLStreamReader reader, Map<Field, String> fields, List<String> authors)
+            throws XMLStreamException {
         List<Name> names = new ArrayList<>();
 
         while (reader.hasNext()) {
@@ -293,7 +301,8 @@ private void parseName(XMLStreamReader reader, Map<Field, String> fields, List<S
                 if ("affiliation".equals(reader.getName().getLocalPart())) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
-                        putIfValueNotNull(fields, new UnknownField("affiliation"), reader.getText());
+                        putIfValueNotNull(
+                                fields, new UnknownField("affiliation"), reader.getText());
                     }
                 } else if ("namePart".equals(reader.getName().getLocalPart())) {
                     String type = reader.getAttributeValue(null, "type");
@@ -312,7 +321,8 @@ private void parseName(XMLStreamReader reader, Map<Field, String> fields, List<S
         handleAuthorsInNamePart(names, authors);
     }
 
-    private void parseOriginInfo(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
+    private void parseOriginInfo(XMLStreamReader reader, Map<Field, String> fields)
+            throws XMLStreamException {
         List<String> places = new ArrayList<>();
 
         while (reader.hasNext()) {
@@ -324,7 +334,8 @@ private void parseOriginInfo(XMLStreamReader reader, Map<Field, String> fields)
                     case "issuance" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("issuance"), reader.getText());
+                            putIfValueNotNull(
+                                    fields, new UnknownField("issuance"), reader.getText());
                         }
                     }
                     case "placeTerm" -> {
@@ -362,7 +373,9 @@ private void parseOriginInfo(XMLStreamReader reader, Map<Field, String> fields)
         putIfListIsNotEmpty(fields, places, StandardField.ADDRESS, ", ");
     }
 
-    private void parseSubject(XMLStreamReader reader, Map<Field, String> fields, List<String> keywords) throws XMLStreamException {
+    private void parseSubject(
+            XMLStreamReader reader, Map<Field, String> fields, List<String> keywords)
+            throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
 
@@ -383,7 +396,8 @@ private void parseSubject(XMLStreamReader reader, Map<Field, String> fields, Lis
                     case "country" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("country"), reader.getText());
+                            putIfValueNotNull(
+                                    fields, new UnknownField("country"), reader.getText());
                         }
                     }
                 }
@@ -395,7 +409,8 @@ private void parseSubject(XMLStreamReader reader, Map<Field, String> fields, Lis
         }
     }
 
-    private void parseRecordInfo(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
+    private void parseRecordInfo(XMLStreamReader reader, Map<Field, String> fields)
+            throws XMLStreamException {
         RecordInfo recordInfoDefinition = new RecordInfo();
         List<String> recordContents = recordInfoDefinition.recordContents();
         List<String> languages = recordInfoDefinition.languages();
@@ -428,7 +443,8 @@ private void parseRecordInfo(XMLStreamReader reader, Map<Field, String> fields)
         putIfListIsNotEmpty(fields, languages, StandardField.LANGUAGE, ", ");
     }
 
-    private void parseLanguage(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
+    private void parseLanguage(XMLStreamReader reader, Map<Field, String> fields)
+            throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
 
@@ -445,7 +461,8 @@ private void parseLanguage(XMLStreamReader reader, Map<Field, String> fields) th
         }
     }
 
-    private void parseTitle(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
+    private void parseTitle(XMLStreamReader reader, Map<Field, String> fields)
+            throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
 
@@ -462,7 +479,8 @@ private void parseTitle(XMLStreamReader reader, Map<Field, String> fields) throw
         }
     }
 
-    private void parseLocationAndUrl(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
+    private void parseLocationAndUrl(XMLStreamReader reader, Map<Field, String> fields)
+            throws XMLStreamException {
         List<String> locations = new ArrayList<>();
         List<String> urls = new ArrayList<>();
 
@@ -508,7 +526,8 @@ private void parseIdentifier(Map<Field, String> fields, Identifier identifier, B
             entry.setCitationKey(identifier.value());
         } else if (!"local".equals(type) && !"citekey".equals(type)) {
             // put all identifiers (doi, issn, isbn,...) except of local and citekey
-            putIfValueNotNull(fields, FieldFactory.parseField(identifier.type()), identifier.value());
+            putIfValueNotNull(
+                    fields, FieldFactory.parseField(identifier.type()), identifier.value());
         }
     }
 
@@ -517,14 +536,20 @@ private void putDate(Map<Field, String> fields, String elementName, String date)
             Optional<Date> optionalParsedDate = Date.parse(date);
             switch (elementName) {
                 case "dateIssued" -> {
-                    optionalParsedDate
-                            .ifPresent(parsedDate -> fields.put(StandardField.DATE, parsedDate.getNormalized()));
+                    optionalParsedDate.ifPresent(
+                            parsedDate ->
+                                    fields.put(StandardField.DATE, parsedDate.getNormalized()));
 
-                    optionalParsedDate.flatMap(Date::getYear)
+                    optionalParsedDate
+                            .flatMap(Date::getYear)
                             .ifPresent(year -> fields.put(StandardField.YEAR, year.toString()));
 
-                    optionalParsedDate.flatMap(Date::getMonth)
-                            .ifPresent(month -> fields.put(StandardField.MONTH, month.getJabRefFormat()));
+                    optionalParsedDate
+                            .flatMap(Date::getMonth)
+                            .ifPresent(
+                                    month ->
+                                            fields.put(
+                                                    StandardField.MONTH, month.getJabRefFormat()));
                 }
                 case "dateCreated" -> {
                     // If there was no year in date issued, then take the year from date created
@@ -532,18 +557,25 @@ private void putDate(Map<Field, String> fields, String elementName, String date)
                     fields.put(new UnknownField("created"), date);
                 }
                 case "dateCaptured" -> {
-                    optionalParsedDate
-                            .ifPresent(parsedDate -> fields.put(StandardField.CREATIONDATE, parsedDate.getNormalized()));
+                    optionalParsedDate.ifPresent(
+                            parsedDate ->
+                                    fields.put(
+                                            StandardField.CREATIONDATE,
+                                            parsedDate.getNormalized()));
                 }
                 case "dateModified" -> {
-                    optionalParsedDate
-                            .ifPresent(parsedDate -> fields.put(StandardField.MODIFICATIONDATE, parsedDate.getNormalized()));
+                    optionalParsedDate.ifPresent(
+                            parsedDate ->
+                                    fields.put(
+                                            StandardField.MODIFICATIONDATE,
+                                            parsedDate.getNormalized()));
                 }
             }
         }
     }
 
-    private void putIfListIsNotEmpty(Map<Field, String> fields, List<String> list, Field key, String separator) {
+    private void putIfListIsNotEmpty(
+            Map<Field, String> fields, List<String> list, Field key, String separator) {
         if (!list.isEmpty()) {
             fields.put(key, list.stream().collect(Collectors.joining(separator)));
         }
@@ -562,8 +594,10 @@ private void handleAuthorsInNamePart(List<Name> names, List<String> authors) {
                 namePartValue = namePartValue.replaceAll(",$", "");
                 authors.add(namePartValue);
             } else if ("family".equals(type) && (name.value() != null)) {
-                // family should come first, so if family appears we can set the author then comes before
-                // we have to check if forename and family name are not empty in case it's the first author
+                // family should come first, so if family appears we can set the author then comes
+                // before
+                // we have to check if forename and family name are not empty in case it's the first
+                // author
                 if (!foreName.isEmpty() && !familyName.isEmpty()) {
                     // now set and add the old author
                     author = familyName + ", " + Joiner.on(" ").join(foreName);
@@ -631,7 +665,11 @@ public String getDescription() {
     @Override
     public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
         try {
-            return importDatabase(new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))).getDatabase().getEntries();
+            return importDatabase(
+                            new BufferedReader(
+                                    new InputStreamReader(inputStream, StandardCharsets.UTF_8)))
+                    .getDatabase()
+                    .getEntries();
         } catch (IOException e) {
             LOGGER.error(e.getLocalizedMessage(), e);
         }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
index c2879810f89e..466e4ef643e5 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
@@ -3,13 +3,8 @@
  */
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
+import kong.unirest.core.json.JSONException;
+import kong.unirest.core.json.JSONObject;
 
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
@@ -17,12 +12,17 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
-import kong.unirest.core.json.JSONException;
-import kong.unirest.core.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * Handles importing of recommended articles to be displayed in the Related Articles tab.
  */
@@ -92,8 +92,7 @@ private String convertToString(BufferedReader input) {
     /**
      * Small pair-class to ensure the right order of the recommendations.
      */
-    private record RankedBibEntry(BibEntry entry, Integer rank) {
-    }
+    private record RankedBibEntry(BibEntry entry, Integer rank) {}
 
     /**
      * Parses the input from the server to a ParserResult
@@ -119,8 +118,10 @@ private void parse(BufferedReader input) throws IOException {
         }
 
         // Sort bib entries according to rank
-        rankedBibEntries.sort(Comparator.comparing((RankedBibEntry rankedBibEntry) -> rankedBibEntry.rank));
-        List<BibEntry> bibEntries = rankedBibEntries.stream().map(e -> e.entry).collect(Collectors.toList());
+        rankedBibEntries.sort(
+                Comparator.comparing((RankedBibEntry rankedBibEntry) -> rankedBibEntry.rank));
+        List<BibEntry> bibEntries =
+                rankedBibEntries.stream().map(e -> e.entry).collect(Collectors.toList());
 
         bibDatabase.insertEntries(bibEntries);
         parserResult = new ParserResult(bibDatabase);
@@ -128,7 +129,8 @@ private void parse(BufferedReader input) throws IOException {
         JSONObject label = recommendationSetJson.getJSONObject("label");
         recommendationsHeading = label.getString("label-text");
         recommendationsDescription = label.getString("label-description");
-        recommendationSetId = recommendationSetJson.getBigInteger("recommendation_set_id").toString();
+        recommendationSetId =
+                recommendationSetJson.getBigInteger("recommendation_set_id").toString();
     }
 
     /**
@@ -141,12 +143,30 @@ private RankedBibEntry populateBibEntry(JSONObject recommendation) {
         BibEntry current = new BibEntry();
 
         // parse each of the relevant fields into variables
-        String authors = isRecommendationFieldPresent(recommendation, "authors") ? recommendation.getString("authors") : "";
-        String title = isRecommendationFieldPresent(recommendation, "title") ? recommendation.getString("title") : "";
-        String year = isRecommendationFieldPresent(recommendation, "published_year") ? Integer.toString(recommendation.getInt("published_year")) : "";
-        String journal = isRecommendationFieldPresent(recommendation, "published_in") ? recommendation.getString("published_in") : "";
-        String url = isRecommendationFieldPresent(recommendation, "url") ? recommendation.getString("url") : "";
-        Integer rank = isRecommendationFieldPresent(recommendation, "recommendation_id") ? recommendation.getInt("recommendation_id") : 100;
+        String authors =
+                isRecommendationFieldPresent(recommendation, "authors")
+                        ? recommendation.getString("authors")
+                        : "";
+        String title =
+                isRecommendationFieldPresent(recommendation, "title")
+                        ? recommendation.getString("title")
+                        : "";
+        String year =
+                isRecommendationFieldPresent(recommendation, "published_year")
+                        ? Integer.toString(recommendation.getInt("published_year"))
+                        : "";
+        String journal =
+                isRecommendationFieldPresent(recommendation, "published_in")
+                        ? recommendation.getString("published_in")
+                        : "";
+        String url =
+                isRecommendationFieldPresent(recommendation, "url")
+                        ? recommendation.getString("url")
+                        : "";
+        Integer rank =
+                isRecommendationFieldPresent(recommendation, "recommendation_id")
+                        ? recommendation.getInt("recommendation_id")
+                        : 100;
 
         // Populate bib entry with relevant data
         current.setField(StandardField.AUTHOR, authors);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java
index c633f88d09e1..4eaf1c48fc78 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java
@@ -1,19 +1,10 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.Objects;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.msbib.MSBibDatabase;
 import org.jabref.logic.util.StandardFileType;
-
 import org.jspecify.annotations.NullMarked;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,6 +14,14 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.Objects;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 /**
  * Importer for the MS Office 2007 XML bibliography format
  */
@@ -31,8 +30,10 @@ public class MsBibImporter extends Importer {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MsBibImporter.class);
     private static final String DISABLEDTD = "http://apache.org/xml/features/disallow-doctype-decl";
-    private static final String DISABLEEXTERNALDTD = "http://apache.org/xml/features/nonvalidating/load-external-dtd";
-    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY = makeSafeDocBuilderFactory(DocumentBuilderFactory.newInstance());
+    private static final String DISABLEEXTERNALDTD =
+            "http://apache.org/xml/features/nonvalidating/load-external-dtd";
+    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY =
+            makeSafeDocBuilderFactory(DocumentBuilderFactory.newInstance());
 
     /**
      * The correct behavior is to return false if it is certain that the file is
@@ -45,22 +46,23 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         Document docin;
         try {
             DocumentBuilder dbuild = DOCUMENT_BUILDER_FACTORY.newDocumentBuilder();
-            dbuild.setErrorHandler(new ErrorHandler() {
-                @Override
-                public void warning(SAXParseException exception) throws SAXException {
-                    // ignore warnings
-                }
-
-                @Override
-                public void fatalError(SAXParseException exception) throws SAXException {
-                    throw exception;
-                }
-
-                @Override
-                public void error(SAXParseException exception) throws SAXException {
-                    throw exception;
-                }
-            });
+            dbuild.setErrorHandler(
+                    new ErrorHandler() {
+                        @Override
+                        public void warning(SAXParseException exception) throws SAXException {
+                            // ignore warnings
+                        }
+
+                        @Override
+                        public void fatalError(SAXParseException exception) throws SAXException {
+                            throw exception;
+                        }
+
+                        @Override
+                        public void error(SAXParseException exception) throws SAXException {
+                            throw exception;
+                        }
+                    });
 
             docin = dbuild.parse(new InputSource(reader));
         } catch (Exception e) {
@@ -111,7 +113,10 @@ private static DocumentBuilderFactory makeSafeDocBuilderFactory(DocumentBuilderF
             dBuild.setXIncludeAware(false);
             dBuild.setExpandEntityReferences(false);
         } catch (ParserConfigurationException e) {
-            LOGGER.warn("Builder not fully configured. Feature:'{}' is probably not supported by current XML processor. {}", feature, e);
+            LOGGER.warn(
+                    "Builder not fully configured. Feature:'{}' is probably not supported by current XML processor. {}",
+                    feature,
+                    e);
         }
 
         return dBuild;
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java
index c9019585e7ec..29eb07b6828d 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java
@@ -1,14 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
@@ -23,25 +14,39 @@
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.entry.types.StandardEntryType;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * Imports an Ovid file.
  */
 public class OvidImporter extends Importer {
 
-    private static final Pattern OVID_SOURCE_PATTERN = Pattern
-            .compile("Source ([ \\w&\\-,:]+)\\.[ ]+([0-9]+)\\(([\\w\\-]+)\\):([0-9]+\\-?[0-9]+?)\\,.*([0-9][0-9][0-9][0-9])");
+    private static final Pattern OVID_SOURCE_PATTERN =
+            Pattern.compile(
+                    "Source ([ \\w&\\-,:]+)\\.[ ]+([0-9]+)\\(([\\w\\-]+)\\):([0-9]+\\-?[0-9]+?)\\,.*([0-9][0-9][0-9][0-9])");
 
-    private static final Pattern OVID_SOURCE_PATTERN_NO_ISSUE = Pattern
-            .compile("Source ([ \\w&\\-,:]+)\\.[ ]+([0-9]+):([0-9]+\\-?[0-9]+?)\\,.*([0-9][0-9][0-9][0-9])");
+    private static final Pattern OVID_SOURCE_PATTERN_NO_ISSUE =
+            Pattern.compile(
+                    "Source ([ \\w&\\-,:]+)\\.[ ]+([0-9]+):([0-9]+\\-?[0-9]+?)\\,.*([0-9][0-9][0-9][0-9])");
 
-    private static final Pattern OVID_SOURCE_PATTERN_2 = Pattern.compile(
-            "([ \\w&\\-,]+)\\. Vol ([0-9]+)\\(([\\w\\-]+)\\) ([A-Za-z]+) ([0-9][0-9][0-9][0-9]), ([0-9]+\\-?[0-9]+)");
+    private static final Pattern OVID_SOURCE_PATTERN_2 =
+            Pattern.compile(
+                    "([ \\w&\\-,]+)\\. Vol ([0-9]+)\\(([\\w\\-]+)\\) ([A-Za-z]+) ([0-9][0-9][0-9][0-9]), ([0-9]+\\-?[0-9]+)");
 
-    private static final Pattern INCOLLECTION_PATTERN = Pattern.compile(
-            "(.+)\\(([0-9][0-9][0-9][0-9])\\)\\. ([ \\w&\\-,:]+)\\.[ ]+\\(pp. ([0-9]+\\-?[0-9]+?)\\).[A-Za-z0-9, ]+pp\\. "
-                    + "([\\w, ]+): ([\\w, ]+)");
-    private static final Pattern BOOK_PATTERN = Pattern.compile(
-            "\\(([0-9][0-9][0-9][0-9])\\)\\. [A-Za-z, ]+([0-9]+) pp\\. ([\\w, ]+): ([\\w, ]+)");
+    private static final Pattern INCOLLECTION_PATTERN =
+            Pattern.compile(
+                    "(.+)\\(([0-9][0-9][0-9][0-9])\\)\\. ([ \\w&\\-,:]+)\\.[ ]+\\(pp. ([0-9]+\\-?[0-9]+?)\\).[A-Za-z0-9, ]+pp\\. "
+                            + "([\\w, ]+): ([\\w, ]+)");
+    private static final Pattern BOOK_PATTERN =
+            Pattern.compile(
+                    "\\(([0-9][0-9][0-9][0-9])\\)\\. [A-Za-z, ]+([0-9]+) pp\\. ([\\w, ]+): ([\\w, ]+)");
 
     private static final String OVID_PATTERN_STRING = "<[0-9]+>";
     private static final Pattern OVID_PATTERN = Pattern.compile(OVID_PATTERN_STRING);
@@ -99,10 +104,12 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 String fieldName = field.substring(0, linebreak).trim();
                 String content = field.substring(linebreak).trim();
 
-                // Check if this is the author field (due to a minor special treatment for this field):
-                boolean isAuthor = (fieldName.indexOf("Author") == 0)
-                        && !fieldName.contains("Author Keywords")
-                        && !fieldName.contains("Author e-mail");
+                // Check if this is the author field (due to a minor special treatment for this
+                // field):
+                boolean isAuthor =
+                        (fieldName.indexOf("Author") == 0)
+                                && !fieldName.contains("Author Keywords")
+                                && !fieldName.contains("Author e-mail");
 
                 // Remove unnecessary dots at the end of lines, unless this is the author field,
                 // in which case a dot at the end could be significant:
@@ -127,19 +134,23 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         h.put(StandardField.ISSUE, matcher.group(3));
                         h.put(StandardField.PAGES, matcher.group(4));
                         h.put(StandardField.YEAR, matcher.group(5));
-                    } else if ((matcher = OvidImporter.OVID_SOURCE_PATTERN_NO_ISSUE.matcher(content)).find()) { // may be missing the issue
+                    } else if ((matcher =
+                                    OvidImporter.OVID_SOURCE_PATTERN_NO_ISSUE.matcher(content))
+                            .find()) { // may be missing the issue
                         h.put(StandardField.JOURNAL, matcher.group(1));
                         h.put(StandardField.VOLUME, matcher.group(2));
                         h.put(StandardField.PAGES, matcher.group(3));
                         h.put(StandardField.YEAR, matcher.group(4));
-                    } else if ((matcher = OvidImporter.OVID_SOURCE_PATTERN_2.matcher(content)).find()) {
+                    } else if ((matcher = OvidImporter.OVID_SOURCE_PATTERN_2.matcher(content))
+                            .find()) {
                         h.put(StandardField.JOURNAL, matcher.group(1));
                         h.put(StandardField.VOLUME, matcher.group(2));
                         h.put(StandardField.ISSUE, matcher.group(3));
                         h.put(StandardField.MONTH, matcher.group(4));
                         h.put(StandardField.YEAR, matcher.group(5));
                         h.put(StandardField.PAGES, matcher.group(6));
-                    } else if ((matcher = OvidImporter.INCOLLECTION_PATTERN.matcher(content)).find()) {
+                    } else if ((matcher = OvidImporter.INCOLLECTION_PATTERN.matcher(content))
+                            .find()) {
                         h.put(StandardField.EDITOR, matcher.group(1).replace(" (Ed)", ""));
                         h.put(StandardField.YEAR, matcher.group(2));
                         h.put(StandardField.BOOKTITLE, matcher.group(3));
@@ -197,9 +208,13 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
             }
 
             // Set the entrytype properly:
-            EntryType entryType = h.containsKey(InternalField.TYPE_HEADER) ? EntryTypeFactory.parse(h.get(InternalField.TYPE_HEADER)) : BibEntry.DEFAULT_TYPE;
+            EntryType entryType =
+                    h.containsKey(InternalField.TYPE_HEADER)
+                            ? EntryTypeFactory.parse(h.get(InternalField.TYPE_HEADER))
+                            : BibEntry.DEFAULT_TYPE;
             h.remove(InternalField.TYPE_HEADER);
-            if (entryType.equals(StandardEntryType.Book) && h.containsKey(new UnknownField("chaptertitle"))) {
+            if (entryType.equals(StandardEntryType.Book)
+                    && h.containsKey(new UnknownField("chaptertitle"))) {
                 // This means we have an "incollection" entry.
                 entryType = StandardEntryType.InCollection;
                 // Move the "chaptertitle" to just "title":
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
index 5006eed92c90..fae2f36dc82a 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
@@ -1,17 +1,9 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import com.google.common.base.Strings;
 
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.text.PDFTextStripper;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
@@ -27,9 +19,17 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
 
-import com.google.common.base.Strings;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.text.PDFTextStripper;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * PdfContentImporter parses data of the first page of the PDF and creates a BibTeX entry.
@@ -141,9 +141,11 @@ private String streamlineNames(String names) {
                         // last name found
                         res = res.concat(removeNonLettersAtEnd(splitNames[i]));
 
-                        if (!splitNames[i].isEmpty() && Character.isLowerCase(splitNames[i].charAt(0))) {
+                        if (!splitNames[i].isEmpty()
+                                && Character.isLowerCase(splitNames[i].charAt(0))) {
                             // it is probably be "van", "vom", ...
-                            // we just rely on the fact that these things are written in lower case letters
+                            // we just rely on the fact that these things are written in lower case
+                            // letters
                             // do NOT finish name
                             res = res.concat(" ");
                         } else {
@@ -158,7 +160,8 @@ private String streamlineNames(String names) {
                         } else {
                             res = res.concat(" and ");
                         }
-                        if ("et".equalsIgnoreCase(splitNames[i]) && (splitNames.length > (i + 1))
+                        if ("et".equalsIgnoreCase(splitNames[i])
+                                && (splitNames.length > (i + 1))
                                 && "al.".equalsIgnoreCase(splitNames[i + 1])) {
                             res = res.concat("others");
                             break;
@@ -166,7 +169,7 @@ private String streamlineNames(String names) {
                             res = res.concat(splitNames[i]).concat(" ");
                             workedOnFirstOrMiddle = true;
                         }
-                    }  // do nothing, just increment i at the end of this iteration
+                    } // do nothing, just increment i at the end of this iteration
                 }
                 i++;
             } while (i < splitNames.length);
@@ -186,8 +189,9 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     @Override
     public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
-        throw new UnsupportedOperationException("PdfContentImporter does not support importDatabase(BufferedReader reader)."
-                + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
+        throw new UnsupportedOperationException(
+                "PdfContentImporter does not support importDatabase(BufferedReader reader)."
+                        + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
     }
 
     @Override
@@ -203,7 +207,8 @@ public ParserResult importDatabase(Path filePath) {
             return ParserResult.fromError(exception);
         }
 
-        result.forEach(entry -> entry.addFile(new LinkedFile("", filePath.toAbsolutePath(), "PDF")));
+        result.forEach(
+                entry -> entry.addFile(new LinkedFile("", filePath.toAbsolutePath(), "PDF")));
         return new ParserResult(result);
     }
 
@@ -218,11 +223,14 @@ Optional<BibEntry> getEntryFromPDFContent(String firstpageContents, String lineS
         // curString (mostly) contains the current block
         //   the different lines are joined into one and thereby separated by " "
 
-        String firstpageContentsUnifiedLineBreaks = StringUtil.unifyLineBreaks(firstpageContents, lineSeparator);
+        String firstpageContentsUnifiedLineBreaks =
+                StringUtil.unifyLineBreaks(firstpageContents, lineSeparator);
 
         lines = firstpageContentsUnifiedLineBreaks.split(lineSeparator);
 
-        lineIndex = 0; // to prevent array index out of bounds exception on second run we need to reset i to zero
+        lineIndex =
+                0; // to prevent array index out of bounds exception on second run we need to reset
+                   // i to zero
 
         proceedToNextNonEmptyLine();
         if (lineIndex >= lines.length) {
@@ -288,7 +296,7 @@ Optional<BibEntry> getEntryFromPDFContent(String firstpageContents, String lineS
             } else {
                 if (!"".equals(curString)) {
                     author = author.concat(" and ").concat(curString);
-                }  // if lines[i] is "and" then "" is returned by streamlineNames -> do nothing
+                } // if lines[i] is "and" then "" is returned by streamlineNames -> do nothing
             }
             lineIndex++;
         }
@@ -298,15 +306,21 @@ Optional<BibEntry> getEntryFromPDFContent(String firstpageContents, String lineS
         // then, abstract and keywords follow
         while (lineIndex < lines.length) {
             curString = lines[lineIndex];
-            if ((curString.length() >= "Abstract".length()) && "Abstract".equalsIgnoreCase(curString.substring(0, "Abstract".length()))) {
+            if ((curString.length() >= "Abstract".length())
+                    && "Abstract".equalsIgnoreCase(curString.substring(0, "Abstract".length()))) {
                 if (curString.length() == "Abstract".length()) {
                     // only word "abstract" found -- skip line
                     curString = "";
                 } else {
-                    curString = curString.substring("Abstract".length() + 1).trim().concat(System.lineSeparator());
+                    curString =
+                            curString
+                                    .substring("Abstract".length() + 1)
+                                    .trim()
+                                    .concat(System.lineSeparator());
                 }
                 lineIndex++;
-                // fillCurStringWithNonEmptyLines() cannot be used as that uses " " as line separator
+                // fillCurStringWithNonEmptyLines() cannot be used as that uses " " as line
+                // separator
                 // whereas we need linebreak as separator
                 while ((lineIndex < lines.length) && !"".equals(lines[lineIndex])) {
                     curString = curString.concat(lines[lineIndex]).concat(System.lineSeparator());
@@ -314,7 +328,8 @@ Optional<BibEntry> getEntryFromPDFContent(String firstpageContents, String lineS
                 }
                 abstractT = curString.trim();
                 lineIndex++;
-            } else if ((curString.length() >= "Keywords".length()) && "Keywords".equalsIgnoreCase(curString.substring(0, "Keywords".length()))) {
+            } else if ((curString.length() >= "Keywords".length())
+                    && "Keywords".equalsIgnoreCase(curString.substring(0, "Keywords".length()))) {
                 if (curString.length() == "Keywords".length()) {
                     // only word "Keywords" found -- skip line
                     curString = "";
@@ -364,9 +379,15 @@ Optional<BibEntry> getEntryFromPDFContent(String firstpageContents, String lineS
                 editor = streamlineNames(curString.substring(0, pos - 1));
 
                 int edslength = "(Eds.)".length();
-                int posWithEditor = pos + edslength + 2; // +2 because of ":" after (Eds.) and the subsequent space
+                int posWithEditor =
+                        pos + edslength
+                                + 2; // +2 because of ":" after (Eds.) and the subsequent space
                 if (posWithEditor > curString.length()) {
-                    curString = curString.substring(posWithEditor - 2); // we don't have any spaces after Eds so we substract the 2
+                    curString =
+                            curString.substring(
+                                    posWithEditor
+                                            - 2); // we don't have any spaces after Eds so we
+                                                  // substract the 2
                 } else {
                     curString = curString.substring(posWithEditor);
                 }
@@ -588,6 +609,7 @@ public StandardFileType getFileType() {
 
     @Override
     public String getDescription() {
-        return Localization.lang("This importer parses data of the first page of the PDF and creates a BibTeX entry. Currently, Springer and IEEE formats are supported.");
+        return Localization.lang(
+                "This importer parses data of the first page of the PDF and creates a BibTeX entry. Currently, Springer and IEEE formats are supported.");
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporter.java
index 0406488f8bab..23a3671af459 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporter.java
@@ -1,13 +1,14 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
+import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDNameTreeNode;
+import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
+import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationFileAttachment;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParseException;
@@ -19,15 +20,13 @@
 import org.jabref.logic.xmp.XmpUtilReader;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
-import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.common.PDNameTreeNode;
-import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
-import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationFileAttachment;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * PdfEmbeddedBibFileImporter imports an embedded Bib-File from the PDF.
@@ -48,15 +47,17 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     @Override
     public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
-        throw new UnsupportedOperationException("PdfEmbeddedBibFileImporter does not support importDatabase(BufferedReader reader). "
-                + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
+        throw new UnsupportedOperationException(
+                "PdfEmbeddedBibFileImporter does not support importDatabase(BufferedReader reader). "
+                        + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
     }
 
     @Override
     public ParserResult importDatabase(String data) throws IOException {
         Objects.requireNonNull(data);
-        throw new UnsupportedOperationException("PdfEmbeddedBibFileImporter does not support importDatabase(String data). "
-                + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
+        throw new UnsupportedOperationException(
+                "PdfEmbeddedBibFileImporter does not support importDatabase(String data). "
+                        + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
     }
 
     @Override
@@ -74,8 +75,8 @@ public ParserResult importDatabase(Path filePath) {
      * Extraction of embedded files in pdfs adapted from:
      * Adapted from <a href="https://svn.apache.org/repos/asf/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.javaj">...</a>
      */
-
-    private List<BibEntry> getEmbeddedBibFileEntries(PDDocument document) throws IOException, ParseException {
+    private List<BibEntry> getEmbeddedBibFileEntries(PDDocument document)
+            throws IOException, ParseException {
         List<BibEntry> allParsedEntries = new ArrayList<>();
         PDDocumentNameDictionary nameDictionary = document.getDocumentCatalog().getNames();
         if (nameDictionary != null) {
@@ -99,7 +100,8 @@ private List<BibEntry> getEmbeddedBibFileEntries(PDDocument document) throws IOE
         for (PDPage page : document.getPages()) {
             for (PDAnnotation annotation : page.getAnnotations()) {
                 if (annotation instanceof PDAnnotationFileAttachment annotationFileAttachment) {
-                    PDComplexFileSpecification fileSpec = (PDComplexFileSpecification) annotationFileAttachment.getFile();
+                    PDComplexFileSpecification fileSpec =
+                            (PDComplexFileSpecification) annotationFileAttachment.getFile();
                     allParsedEntries.addAll(extractAndParseFile(getEmbeddedFile(fileSpec)));
                 }
             }
@@ -107,7 +109,8 @@ private List<BibEntry> getEmbeddedBibFileEntries(PDDocument document) throws IOE
         return allParsedEntries;
     }
 
-    private List<BibEntry> extractAndParseFiles(Map<String, PDComplexFileSpecification> names) throws IOException, ParseException {
+    private List<BibEntry> extractAndParseFiles(Map<String, PDComplexFileSpecification> names)
+            throws IOException, ParseException {
         List<BibEntry> allParsedEntries = new ArrayList<>();
         for (Map.Entry<String, PDComplexFileSpecification> entry : names.entrySet()) {
             String filename = entry.getKey();
@@ -120,7 +123,8 @@ private List<BibEntry> extractAndParseFiles(Map<String, PDComplexFileSpecificati
         return allParsedEntries;
     }
 
-    private List<BibEntry> extractAndParseFile(PDEmbeddedFile embeddedFile) throws IOException, ParseException {
+    private List<BibEntry> extractAndParseFile(PDEmbeddedFile embeddedFile)
+            throws IOException, ParseException {
         return bibtexParser.parseEntries(embeddedFile.createInputStream());
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfGrobidImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfGrobidImporter.java
index 95ee3f4b6f8a..23d551fea60f 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfGrobidImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfGrobidImporter.java
@@ -1,12 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
@@ -17,6 +10,13 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * Wraps the GrobidService function to be used as an Importer.
  */
@@ -61,7 +61,8 @@ public ParserResult importDatabase(Path filePath) {
         Objects.requireNonNull(filePath);
         try {
             List<BibEntry> result = grobidService.processPDF(filePath, importFormatPreferences);
-            result.forEach(entry -> entry.addFile(new LinkedFile("", filePath.toAbsolutePath(), "PDF")));
+            result.forEach(
+                    entry -> entry.addFile(new LinkedFile("", filePath.toAbsolutePath(), "PDF")));
             return new ParserResult(result);
         } catch (Exception exception) {
             return ParserResult.fromError(exception);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
index 197a99e543cb..a21597bd0bb8 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
@@ -1,15 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
@@ -27,10 +17,19 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+
 /**
  * Tries to import BibTeX data trying multiple PDF content importers and merging the results.
  * See {@Link org.jabref.logic.importer.fileformat.PdfMergeMetadataImporter#metadataImporters} for the list of importers used.
@@ -65,15 +64,17 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     @Override
     public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
-        throw new UnsupportedOperationException("PdfMergeMetadataImporter does not support importDatabase(BufferedReader reader). "
-                + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
+        throw new UnsupportedOperationException(
+                "PdfMergeMetadataImporter does not support importDatabase(BufferedReader reader). "
+                        + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
     }
 
     @Override
     public ParserResult importDatabase(String data) throws IOException {
         Objects.requireNonNull(data);
-        throw new UnsupportedOperationException("PdfMergeMetadataImporter does not support importDatabase(String data). "
-                + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
+        throw new UnsupportedOperationException(
+                "PdfMergeMetadataImporter does not support importDatabase(String data). "
+                        + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
     }
 
     @Override
@@ -81,7 +82,8 @@ public ParserResult importDatabase(Path filePath) throws IOException {
         List<BibEntry> candidates = new ArrayList<>();
 
         for (Importer metadataImporter : metadataImporters) {
-            List<BibEntry> extractedEntries = metadataImporter.importDatabase(filePath).getDatabase().getEntries();
+            List<BibEntry> extractedEntries =
+                    metadataImporter.importDatabase(filePath).getDatabase().getEntries();
             if (extractedEntries.isEmpty()) {
                 continue;
             }
@@ -94,19 +96,29 @@ public ParserResult importDatabase(Path filePath) throws IOException {
         for (BibEntry candidate : candidates) {
             if (candidate.hasField(StandardField.DOI)) {
                 try {
-                    new DoiFetcher(importFormatPreferences).performSearchById(candidate.getField(StandardField.DOI).get()).ifPresent(fetchedCandidates::add);
+                    new DoiFetcher(importFormatPreferences)
+                            .performSearchById(candidate.getField(StandardField.DOI).get())
+                            .ifPresent(fetchedCandidates::add);
                 } catch (FetcherException e) {
-                    LOGGER.error("Fetching failed for DOI \"{}\".", candidate.getField(StandardField.DOI).get(), e);
+                    LOGGER.error(
+                            "Fetching failed for DOI \"{}\".",
+                            candidate.getField(StandardField.DOI).get(),
+                            e);
                 }
             }
             if (candidate.hasField(StandardField.ISBN)) {
                 try {
                     new IsbnFetcher(importFormatPreferences)
                             // .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences))
-                            // .addRetryFetcher(new DoiToBibtexConverterComIsbnFetcher(importFormatPreferences))
-                            .performSearchById(candidate.getField(StandardField.ISBN).get()).ifPresent(fetchedCandidates::add);
+                            // .addRetryFetcher(new
+                            // DoiToBibtexConverterComIsbnFetcher(importFormatPreferences))
+                            .performSearchById(candidate.getField(StandardField.ISBN).get())
+                            .ifPresent(fetchedCandidates::add);
                 } catch (FetcherException e) {
-                    LOGGER.error("Fetching failed for ISBN \"{}\".", candidate.getField(StandardField.ISBN).get(), e);
+                    LOGGER.error(
+                            "Fetching failed for ISBN \"{}\".",
+                            candidate.getField(StandardField.ISBN).get(),
+                            e);
                 }
             }
         }
@@ -118,10 +130,12 @@ public ParserResult importDatabase(Path filePath) throws IOException {
             }
             Set<Field> presentFields = entry.getFields();
             for (Map.Entry<Field, String> fieldEntry : candidate.getFieldMap().entrySet()) {
-                // Don't merge FILE fields that point to a stored file as we set that to filePath anyway.
+                // Don't merge FILE fields that point to a stored file as we set that to filePath
+                // anyway.
                 // Nevertheless, retain online links.
-                if (StandardField.FILE == fieldEntry.getKey() &&
-                        FileFieldParser.parse(fieldEntry.getValue()).stream().noneMatch(LinkedFile::isOnlineLink)) {
+                if (StandardField.FILE == fieldEntry.getKey()
+                        && FileFieldParser.parse(fieldEntry.getValue()).stream()
+                                .noneMatch(LinkedFile::isOnlineLink)) {
                     continue;
                 }
                 // Only overwrite non-present fields
@@ -131,7 +145,8 @@ public ParserResult importDatabase(Path filePath) throws IOException {
             }
         }
 
-        // We use the absolute path here as we do not know the context where this import will be used.
+        // We use the absolute path here as we do not know the context where this import will be
+        // used.
         // The caller is responsible for making the path relative if necessary.
         entry.addFile(new LinkedFile("", filePath, StandardFileType.PDF.getName()));
         return new ParserResult(List.of(entry));
@@ -149,16 +164,22 @@ public StandardFileType getFileType() {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Imports BibTeX data from a PDF using multiple strategies (e.g., XMP, embedded BibTeX, text parsing, Grobid, and DOI lookup) and merges the result.");
+        return Localization.lang(
+                "Imports BibTeX data from a PDF using multiple strategies (e.g., XMP, embedded BibTeX, text parsing, Grobid, and DOI lookup) and merges the result.");
     }
 
-    public static class EntryBasedFetcherWrapper extends PdfMergeMetadataImporter implements EntryBasedFetcher {
+    public static class EntryBasedFetcherWrapper extends PdfMergeMetadataImporter
+            implements EntryBasedFetcher {
 
-        private static final Logger LOGGER = LoggerFactory.getLogger(EntryBasedFetcherWrapper.class);
+        private static final Logger LOGGER =
+                LoggerFactory.getLogger(EntryBasedFetcherWrapper.class);
         private final FilePreferences filePreferences;
         private final BibDatabaseContext databaseContext;
 
-        public EntryBasedFetcherWrapper(ImportFormatPreferences importFormatPreferences, FilePreferences filePreferences, BibDatabaseContext context) {
+        public EntryBasedFetcherWrapper(
+                ImportFormatPreferences importFormatPreferences,
+                FilePreferences filePreferences,
+                BibDatabaseContext context) {
             super(importFormatPreferences);
             this.filePreferences = filePreferences;
             this.databaseContext = context;
@@ -172,7 +193,10 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
                     try {
                         ParserResult result = importDatabase(filePath.get());
                         if (!result.isEmpty()) {
-                            return FileUtil.relativize(result.getDatabase().getEntries(), databaseContext, filePreferences);
+                            return FileUtil.relativize(
+                                    result.getDatabase().getEntries(),
+                                    databaseContext,
+                                    filePreferences);
                         }
                     } catch (IOException e) {
                         LOGGER.error("Cannot read {}", filePath.get(), e);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporter.java
index 9848075eedf1..caf9c15aafc1 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporter.java
@@ -1,12 +1,7 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Objects;
-
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.text.PDFTextStripper;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParseException;
@@ -18,8 +13,12 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.text.PDFTextStripper;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * This importer imports a verbatim BibTeX entry from the first page of the PDF.
@@ -40,15 +39,17 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     @Override
     public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
-        throw new UnsupportedOperationException("PdfVerbatimBibTextImporter does not support importDatabase(BufferedReader reader)."
-                + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
+        throw new UnsupportedOperationException(
+                "PdfVerbatimBibTextImporter does not support importDatabase(BufferedReader reader)."
+                        + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
     }
 
     @Override
     public ParserResult importDatabase(String data) throws IOException {
         Objects.requireNonNull(data);
-        throw new UnsupportedOperationException("PdfVerbatimBibTextImporter does not support importDatabase(String data)."
-                + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
+        throw new UnsupportedOperationException(
+                "PdfVerbatimBibTextImporter does not support importDatabase(String data)."
+                        + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
     }
 
     @Override
@@ -64,7 +65,8 @@ public ParserResult importDatabase(Path filePath) {
             return ParserResult.fromError(e);
         }
 
-        result.forEach(entry -> entry.addFile(new LinkedFile("", filePath.toAbsolutePath(), "PDF")));
+        result.forEach(
+                entry -> entry.addFile(new LinkedFile("", filePath.toAbsolutePath(), "PDF")));
         result.forEach(entry -> entry.setCommentsBeforeEntry(""));
         return new ParserResult(result);
     }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java
index f9398633b786..7e703ac3ab7c 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java
@@ -1,10 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Objects;
-
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
@@ -13,6 +8,11 @@
 import org.jabref.logic.xmp.XmpUtilReader;
 import org.jabref.logic.xmp.XmpUtilShared;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Objects;
+
 /**
  * Wraps the XMPUtility function to be used as an Importer.
  */
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PicaXmlParser.java b/src/main/java/org/jabref/logic/importer/fileformat/PicaXmlParser.java
index ed5e89dd8a92..49c0cdbea632 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PicaXmlParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PicaXmlParser.java
@@ -1,14 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.Parser;
 import org.jabref.model.entry.BibEntry;
@@ -17,7 +8,6 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -26,9 +16,19 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 public class PicaXmlParser implements Parser {
     private static final Logger LOGGER = LoggerFactory.getLogger(PicaXmlParser.class);
-    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactory.newInstance();
+    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY =
+            DocumentBuilderFactory.newInstance();
 
     @Override
     public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
@@ -60,7 +60,8 @@ private List<BibEntry> parseEntries(Document content) {
                 e = getChild("record", e);
                 if (e != null) {
                     BibEntry bibEntry = parseEntry(e);
-                    // TODO: Add filtering on years (based on org.jabref.logic.importer.fetcher.transformers.YearRangeByFilteringQueryTransformer.getStartYear)
+                    // TODO: Add filtering on years (based on
+                    // org.jabref.logic.importer.fetcher.transformers.YearRangeByFilteringQueryTransformer.getStartYear)
                     result.add(bibEntry);
                 }
             }
@@ -100,7 +101,8 @@ private BibEntry parseEntry(Element e) {
             String tag = datafield.getAttribute("tag");
             LOGGER.debug("tag: {}", tag);
 
-            // genre/type of the entry https://swbtools.bsz-bw.de/cgi-bin/k10plushelp.pl?cmd=kat&val=0500&katalog=Standard
+            // genre/type of the entry
+            // https://swbtools.bsz-bw.de/cgi-bin/k10plushelp.pl?cmd=kat&val=0500&katalog=Standard
             if ("002@".equals(tag)) {
                 bibliographicGenre = getSubfield("0", datafield);
                 if (bibliographicGenre == null) {
@@ -307,8 +309,10 @@ private BibEntry parseEntry(Element e) {
             }
 
             // URLs behandeln
-            if ("009P".equals(tag) && ("03".equals(datafield.getAttribute("occurrence"))
-                    || "05".equals(datafield.getAttribute("occurrence"))) && (url == null)) {
+            if ("009P".equals(tag)
+                    && ("03".equals(datafield.getAttribute("occurrence"))
+                            || "05".equals(datafield.getAttribute("occurrence")))
+                    && (url == null)) {
                 url = getSubfield("a", datafield);
             }
         }
@@ -373,10 +377,13 @@ private BibEntry parseEntry(Element e) {
         }
         if (!StringUtil.isNullOrEmpty(subtitle)) {
             // ensure that first letter is an upper case letter
-            // there could be the edge case that the string is only one character long, therefore, this special treatment
-            // this is Apache commons lang StringUtils.capitalize (https://commons.apache.org/proper/commons-lang/javadocs/api-release/org/apache/commons/lang3/StringUtils.html#capitalize%28java.lang.String%29), but we don't want to add an additional dependency  ('org.apache.commons:commons-lang3:3.4')
-            StringBuilder newSubtitle = new StringBuilder(
-                    Character.toString(Character.toUpperCase(subtitle.charAt(0))));
+            // there could be the edge case that the string is only one character long, therefore,
+            // this special treatment
+            // this is Apache commons lang StringUtils.capitalize
+            // (https://commons.apache.org/proper/commons-lang/javadocs/api-release/org/apache/commons/lang3/StringUtils.html#capitalize%28java.lang.String%29), but we don't want to add an additional dependency  ('org.apache.commons:commons-lang3:3.4')
+            StringBuilder newSubtitle =
+                    new StringBuilder(
+                            Character.toString(Character.toUpperCase(subtitle.charAt(0))));
             if (subtitle.length() > 1) {
                 newSubtitle.append(subtitle.substring(1));
             }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
index 19df88f09792..7792aece51e7 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
@@ -1,13 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
@@ -18,10 +10,17 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * Imports a New Economics Papers-Message from the REPEC-NEP Service.
  * <p>
@@ -143,7 +142,8 @@ public class RepecNepImporter extends Importer {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RepecNepImporter.class);
 
-    private static final Collection<String> RECOGNIZED_FIELDS = Arrays.asList("Keywords", "JEL", "Date", "URL", "By");
+    private static final Collection<String> RECOGNIZED_FIELDS =
+            Arrays.asList("Keywords", "JEL", "Date", "URL", "By");
     private final ImportFormatPreferences importFormatPreferences;
     private int line;
     private String lastLine = "";
@@ -171,7 +171,8 @@ public StandardFileType getFileType() {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Imports a New Economics Papers-Message from the REPEC-NEP Service.");
+        return Localization.lang(
+                "Imports a New Economics Papers-Message from the REPEC-NEP Service.");
     }
 
     @Override
@@ -185,8 +186,8 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
             startOfMessage.append(tmpLine);
             tmpLine = reader.readLine();
         }
-        return startOfMessage.toString().contains("NEP: New Economics Papers") || startOfMessage.toString().contains(
-                "nep.repec.org");
+        return startOfMessage.toString().contains("NEP: New Economics Papers")
+                || startOfMessage.toString().contains("nep.repec.org");
     }
 
     private boolean startsWithKeyword(Collection<String> keywords) {
@@ -221,8 +222,12 @@ private void readLine(BufferedReader in) throws IOException {
     private String readMultipleLines(BufferedReader in) throws IOException {
         StringBuilder result = new StringBuilder(this.lastLine.trim());
         readLine(in);
-        while ((this.lastLine != null) && !this.lastLine.trim().isEmpty() && !startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS) && !isStartOfWorkingPaper()) {
-            result.append(this.lastLine.isEmpty() ? this.lastLine.trim() : " " + this.lastLine.trim());
+        while ((this.lastLine != null)
+                && !this.lastLine.trim().isEmpty()
+                && !startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS)
+                && !isStartOfWorkingPaper()) {
+            result.append(
+                    this.lastLine.isEmpty() ? this.lastLine.trim() : " " + this.lastLine.trim());
             readLine(in);
         }
         return result.toString();
@@ -248,7 +253,9 @@ private void parseAuthors(BibEntry be, BufferedReader in) throws IOException {
         // read authors and institutions
         List<String> authors = new ArrayList<>();
         StringBuilder institutions = new StringBuilder();
-        while ((this.lastLine != null) && !this.lastLine.isEmpty() && !startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS)) {
+        while ((this.lastLine != null)
+                && !this.lastLine.isEmpty()
+                && !startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS)) {
             // read single author
             String author;
             StringBuilder institution = new StringBuilder();
@@ -256,12 +263,16 @@ private void parseAuthors(BibEntry be, BufferedReader in) throws IOException {
             if (this.lastLine.indexOf('(') >= 0) {
                 author = this.lastLine.substring(0, this.lastLine.indexOf('(')).trim();
                 institutionDone = this.lastLine.indexOf(')') >= 1;
-                institution
-                        .append(this.lastLine.substring(this.lastLine.indexOf('(') + 1,
-                                institutionDone && (this.lastLine
-                                        .indexOf(')') > (this.lastLine.indexOf('(') + 1)) ? this.lastLine
-                                        .indexOf(')') : this.lastLine.length())
-                                             .trim());
+                institution.append(
+                        this.lastLine
+                                .substring(
+                                        this.lastLine.indexOf('(') + 1,
+                                        institutionDone
+                                                        && (this.lastLine.indexOf(')')
+                                                                > (this.lastLine.indexOf('(') + 1))
+                                                ? this.lastLine.indexOf(')')
+                                                : this.lastLine.length())
+                                .trim());
             } else {
                 author = this.lastLine.trim();
                 institutionDone = true;
@@ -270,8 +281,14 @@ private void parseAuthors(BibEntry be, BufferedReader in) throws IOException {
             readLine(in);
             while (!institutionDone && (this.lastLine != null)) {
                 institutionDone = this.lastLine.indexOf(')') >= 1;
-                institution.append(this.lastLine
-                        .substring(0, institutionDone ? this.lastLine.indexOf(')') : this.lastLine.length()).trim());
+                institution.append(
+                        this.lastLine
+                                .substring(
+                                        0,
+                                        institutionDone
+                                                ? this.lastLine.indexOf(')')
+                                                : this.lastLine.length())
+                                .trim());
                 readLine(in);
             }
 
@@ -279,7 +296,9 @@ private void parseAuthors(BibEntry be, BufferedReader in) throws IOException {
 
             if (!institution.isEmpty()) {
                 institutions.append(
-                        institutions.isEmpty() ? institution.toString() : " and " + institution.toString());
+                        institutions.isEmpty()
+                                ? institution.toString()
+                                : " and " + institution.toString());
             }
         }
 
@@ -308,8 +327,8 @@ private void parseAbstract(BibEntry be, BufferedReader in) throws IOException {
      * Implements grammar rule "AdditionalFields".
      *
      */
-    private void parseAdditionalFields(BibEntry be, boolean multilineUrlFieldAllowed, BufferedReader in)
-            throws IOException {
+    private void parseAdditionalFields(
+            BibEntry be, boolean multilineUrlFieldAllowed, BufferedReader in) throws IOException {
 
         // one empty line is possible before fields start
         if ((this.lastLine != null) && this.lastLine.trim().isEmpty()) {
@@ -317,17 +336,28 @@ private void parseAdditionalFields(BibEntry be, boolean multilineUrlFieldAllowed
         }
 
         // read other fields
-        while ((this.lastLine != null) && !isStartOfWorkingPaper() && (startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS) || "".equals(this.lastLine))) {
-            // if multiple lines for a field are allowed and field consists of multiple lines, join them
-            String keyword = "".equals(this.lastLine) ? "" : this.lastLine.substring(0, this.lastLine.indexOf(':')).trim();
+        while ((this.lastLine != null)
+                && !isStartOfWorkingPaper()
+                && (startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS)
+                        || "".equals(this.lastLine))) {
+            // if multiple lines for a field are allowed and field consists of multiple lines, join
+            // them
+            String keyword =
+                    "".equals(this.lastLine)
+                            ? ""
+                            : this.lastLine.substring(0, this.lastLine.indexOf(':')).trim();
             // skip keyword
-            this.lastLine = "".equals(this.lastLine) ? "" : this.lastLine.substring(this.lastLine.indexOf(':') + 1).trim();
+            this.lastLine =
+                    "".equals(this.lastLine)
+                            ? ""
+                            : this.lastLine.substring(this.lastLine.indexOf(':') + 1).trim();
 
             if ("Keywords".equals(keyword)) {
                 // parse keywords field
                 String content = readMultipleLines(in);
                 String[] keywords = content.split("[,;]");
-                be.addKeywords(Arrays.asList(keywords),
+                be.addKeywords(
+                        Arrays.asList(keywords),
                         importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
             } else if ("JEL".equals(keyword)) {
                 // parse JEL field
@@ -360,7 +390,9 @@ private void parseAdditionalFields(BibEntry be, boolean multilineUrlFieldAllowed
      * section, we have a working paper entry we are interested in
      */
     private boolean isStartOfWorkingPaper() {
-        return this.lastLine.matches("\\d+\\.\\s.*") && !this.inOverviewSection && this.preLine.trim().isEmpty();
+        return this.lastLine.matches("\\d+\\.\\s.*")
+                && !this.inOverviewSection
+                && this.preLine.trim().isEmpty();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java
index fd1d26864da2..d3b4f7e6fd0d 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java
@@ -1,19 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.time.Year;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.StringJoiner;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
@@ -29,6 +15,20 @@
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.time.Year;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.StringJoiner;
+import java.util.regex.Pattern;
+
 public class RisImporter extends Importer {
 
     private static final Pattern RECOGNIZED_FORMAT_PATTERN = Pattern.compile("TY {2}- .*");
@@ -60,10 +60,15 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         List<BibEntry> bibEntries = new ArrayList<>();
 
         // use optional here, so that no exception will be thrown if the file is empty
-        String linesAsString = reader.lines().reduce((line, nextline) -> line + "\n" + nextline).orElse("");
+        String linesAsString =
+                reader.lines().reduce((line, nextline) -> line + "\n" + nextline).orElse("");
 
-        String[] entries = linesAsString.replace("\u2013", "-").replace("\u2014", "--").replace("\u2015", "--")
-                                        .split("ER {2}-.*(\\n)*");
+        String[] entries =
+                linesAsString
+                        .replace("\u2013", "-")
+                        .replace("\u2014", "--")
+                        .replace("\u2015", "--")
+                        .split("ER {2}-.*(\\n)*");
 
         // stores all the date tags from highest to lowest priority
         List<String> dateTags = Arrays.asList("Y1", "PY", "DA", "Y2");
@@ -91,8 +96,10 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 StringBuilder current = new StringBuilder(lines[j]);
                 boolean done = false;
                 while (!done && (j < (lines.length - 1))) {
-                    if ((lines[j + 1].length() >= 6) && !"  - ".equals(lines[j + 1].substring(2, 6))) {
-                        if ((!current.isEmpty()) && !Character.isWhitespace(current.charAt(current.length() - 1))
+                    if ((lines[j + 1].length() >= 6)
+                            && !"  - ".equals(lines[j + 1].substring(2, 6))) {
+                        if ((!current.isEmpty())
+                                && !Character.isWhitespace(current.charAt(current.length() - 1))
                                 && !Character.isWhitespace(lines[j + 1].charAt(0))) {
                             current.append(' ');
                         }
@@ -133,16 +140,23 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         if (oldVal == null) {
                             fields.put(StandardField.TITLE, value);
                         } else {
-                            if (oldVal.endsWith(":") || oldVal.endsWith(".") || oldVal.endsWith("?")) {
+                            if (oldVal.endsWith(":")
+                                    || oldVal.endsWith(".")
+                                    || oldVal.endsWith("?")) {
                                 fields.put(StandardField.TITLE, oldVal + " " + value);
                             } else {
                                 fields.put(StandardField.TITLE, oldVal + ": " + value);
                             }
                         }
-                        fields.put(StandardField.TITLE, fields.get(StandardField.TITLE).replaceAll("\\s+", " ")); // Normalize whitespaces
+                        fields.put(
+                                StandardField.TITLE,
+                                fields.get(StandardField.TITLE)
+                                        .replaceAll("\\s+", " ")); // Normalize whitespaces
                     } else if ("BT".equals(tag)) {
                         fields.put(StandardField.BOOKTITLE, value);
-                    } else if (("T2".equals(tag) || "J2".equals(tag) || "JA".equals(tag)) && ((fields.get(StandardField.JOURNAL) == null) || "".equals(fields.get(StandardField.JOURNAL)))) {
+                    } else if (("T2".equals(tag) || "J2".equals(tag) || "JA".equals(tag))
+                            && ((fields.get(StandardField.JOURNAL) == null)
+                                    || "".equals(fields.get(StandardField.JOURNAL)))) {
                         // if there is no journal title, then put second title as journal title
                         fields.put(StandardField.JOURNAL, value);
                     } else if ("JO".equals(tag) || "J1".equals(tag) || "JF".equals(tag)) {
@@ -150,7 +164,11 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         fields.put(StandardField.JOURNAL, value);
                     } else if ("T3".equals(tag)) {
                         fields.put(StandardField.SERIES, value);
-                    } else if ("AU".equals(tag) || "A1".equals(tag) || "A2".equals(tag) || "A3".equals(tag) || "A4".equals(tag)) {
+                    } else if ("AU".equals(tag)
+                            || "A1".equals(tag)
+                            || "A2".equals(tag)
+                            || "A3".equals(tag)
+                            || "A4".equals(tag)) {
                         if ("".equals(author)) {
                             author = value;
                         } else {
@@ -174,7 +192,10 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         fields.put(new UnknownField("caption"), value);
                     } else if ("DB".equals(tag)) {
                         fields.put(new UnknownField("database"), value);
-                    } else if ("IS".equals(tag) || "AN".equals(tag) || "C7".equals(tag) || "M1".equals(tag)) {
+                    } else if ("IS".equals(tag)
+                            || "AN".equals(tag)
+                            || "C7".equals(tag)
+                            || "M1".equals(tag)) {
                         fields.put(StandardField.NUMBER, value);
                     } else if ("SP".equals(tag)) {
                         startPage = value;
@@ -203,7 +224,8 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         }
                     } else if ("UR".equals(tag) || "L2".equals(tag) || "LK".equals(tag)) {
                         fields.put(StandardField.URL, value);
-                    } else if (((tagPriority = dateTags.indexOf(tag)) != -1) && (value.length() >= 4)) {
+                    } else if (((tagPriority = dateTags.indexOf(tag)) != -1)
+                            && (value.length() >= 4)) {
                         if (tagPriority < datePriority) {
                             String readYear = value.substring(0, 4);
                             try {
@@ -296,20 +318,22 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
             }
 
             // Remove empty fields
-            fields.entrySet().removeIf(key -> (key.getValue() == null) || key.getValue().trim().isEmpty());
+            fields.entrySet()
+                    .removeIf(key -> (key.getValue() == null) || key.getValue().trim().isEmpty());
 
             // Create final entry
             BibEntry entry = new BibEntry(type);
             entry.setField(fields);
-            // month has a special treatment as we use the separate method "setMonth" of BibEntry instead of directly setting the value
+            // month has a special treatment as we use the separate method "setMonth" of BibEntry
+            // instead of directly setting the value
             month.ifPresent(entry::setMonth);
             bibEntries.add(entry);
         }
         return new ParserResult(bibEntries);
     }
 
-  private void addDoi(Map<Field, String> hm, String val) {
-      Optional<DOI> parsedDoi = DOI.parse(val);
-      parsedDoi.ifPresent(doi -> hm.put(StandardField.DOI, doi.getDOI()));
-  }
+    private void addDoi(Map<Field, String> hm, String val) {
+        Optional<DOI> parsedDoi = DOI.parse(val);
+        parsedDoi.ifPresent(doi -> hm.put(StandardField.DOI, doi.getDOI()));
+    }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/medline/ArticleId.java b/src/main/java/org/jabref/logic/importer/fileformat/medline/ArticleId.java
index 3a8be1b9b630..f7ae9a1b8daa 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/medline/ArticleId.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/medline/ArticleId.java
@@ -1,7 +1,3 @@
 package org.jabref.logic.importer.fileformat.medline;
 
-public record ArticleId(
-        String idType,
-        String content
-) {
-}
+public record ArticleId(String idType, String content) {}
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/medline/Investigator.java b/src/main/java/org/jabref/logic/importer/fileformat/medline/Investigator.java
index 64ea31e62062..04cbfe7dc8fe 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/medline/Investigator.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/medline/Investigator.java
@@ -2,9 +2,4 @@
 
 import java.util.List;
 
-public record Investigator(
-        String lastName,
-        String foreName,
-        List<String> affiliationList
-) {
-}
+public record Investigator(String lastName, String foreName, List<String> affiliationList) {}
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/medline/MeshHeading.java b/src/main/java/org/jabref/logic/importer/fileformat/medline/MeshHeading.java
index a78f65f9727a..9bf8ad84831a 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/medline/MeshHeading.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/medline/MeshHeading.java
@@ -2,8 +2,4 @@
 
 import java.util.List;
 
-public record MeshHeading(
-        String descriptorName,
-        List<String> qualifierNames
-) {
-}
+public record MeshHeading(String descriptorName, List<String> qualifierNames) {}
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/medline/OtherId.java b/src/main/java/org/jabref/logic/importer/fileformat/medline/OtherId.java
index 4429436c3328..658ed36ed0be 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/medline/OtherId.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/medline/OtherId.java
@@ -1,7 +1,3 @@
 package org.jabref.logic.importer.fileformat.medline;
 
-public record OtherId(
-        String source,
-        String content
-) {
-}
+public record OtherId(String source, String content) {}
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/medline/PersonalNameSubject.java b/src/main/java/org/jabref/logic/importer/fileformat/medline/PersonalNameSubject.java
index bda9c6aefff9..dd2667ef4771 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/medline/PersonalNameSubject.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/medline/PersonalNameSubject.java
@@ -1,7 +1,3 @@
 package org.jabref.logic.importer.fileformat.medline;
 
-public record PersonalNameSubject(
-        String lastName,
-        String foreName
-) {
-}
+public record PersonalNameSubject(String lastName, String foreName) {}
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/mods/Identifier.java b/src/main/java/org/jabref/logic/importer/fileformat/mods/Identifier.java
index 5c2fc3b26c2c..a9a6acf21cb6 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/mods/Identifier.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/mods/Identifier.java
@@ -1,6 +1,3 @@
 package org.jabref.logic.importer.fileformat.mods;
 
-public record Identifier(
-        String type,
-        String value) {
-}
+public record Identifier(String type, String value) {}
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/mods/Name.java b/src/main/java/org/jabref/logic/importer/fileformat/mods/Name.java
index 90ef2c267bab..1968c0bbb55d 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/mods/Name.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/mods/Name.java
@@ -1,6 +1,3 @@
 package org.jabref.logic.importer.fileformat.mods;
 
-public record Name(
-        String value,
-        String type) {
-}
+public record Name(String value, String type) {}
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/mods/RecordInfo.java b/src/main/java/org/jabref/logic/importer/fileformat/mods/RecordInfo.java
index f7cb6d5d68f7..82e398c32262 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/mods/RecordInfo.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/mods/RecordInfo.java
@@ -4,19 +4,17 @@
 import java.util.List;
 import java.util.Set;
 
-public record RecordInfo(
-        List<String> recordContents,
-        List<String> languages) {
+public record RecordInfo(List<String> recordContents, List<String> languages) {
 
-    public static Set<String> elementNameSet = Set.of(
-            "recordContentSource",
-            "recordCreationDate",
-            "recordChangeDate",
-            "recordIdentifier",
-            "recordOrigin",
-            "descriptionStandard",
-            "recordInfoNote"
-    );
+    public static Set<String> elementNameSet =
+            Set.of(
+                    "recordContentSource",
+                    "recordCreationDate",
+                    "recordChangeDate",
+                    "recordIdentifier",
+                    "recordOrigin",
+                    "descriptionStandard",
+                    "recordInfoNote");
 
     public RecordInfo() {
         this(new ArrayList<>(), new ArrayList<>());
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java b/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java
index 4d767c23b2a3..cc7fd28b1625 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java
@@ -1,5 +1,6 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference
+// Implementation, v2.2.4
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
 // Any modifications to this file will be lost upon recompilation of the source schema.
 // Generated on: 2016.09.28 at 06:51:34 PM CEST
@@ -7,11 +8,12 @@
 
 // This needs to be in the src/main/java to ensure that the Namespace is mapped to the prefix "mods"
 // this cannot be done by a gradle task at the moment
-@XmlSchema(namespace = "http://www.loc.gov/mods/v3", xmlns = {
-        @XmlNs(prefix = "mods", namespaceURI = "http://www.loc.gov/mods/v3")}, elementFormDefault = XmlNsForm.QUALIFIED)
+@XmlSchema(
+        namespace = "http://www.loc.gov/mods/v3",
+        xmlns = {@XmlNs(prefix = "mods", namespaceURI = "http://www.loc.gov/mods/v3")},
+        elementFormDefault = XmlNsForm.QUALIFIED)
 package org.jabref.logic.importer.fileformat.mods;
 
 import jakarta.xml.bind.annotation.XmlNs;
 import jakarta.xml.bind.annotation.XmlNsForm;
 import jakarta.xml.bind.annotation.XmlSchema;
-
diff --git a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
index 695c0a48cbe1..56b1ebebfa56 100644
--- a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.importer.util;
 
+import org.jabref.model.entry.LinkedFile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.nio.file.InvalidPathException;
@@ -7,11 +11,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jabref.model.entry.LinkedFile;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class FileFieldParser {
     private static final Logger LOGGER = LoggerFactory.getLogger(FileFieldParser.class);
 
@@ -44,7 +43,8 @@ public FileFieldParser(String value) {
      * </ul>
      */
     public static List<LinkedFile> parse(String value) {
-        // We need state to have a more clean code. Thus, we instantiate the class and then return the result
+        // We need state to have a more clean code. Thus, we instantiate the class and then return
+        // the result
         FileFieldParser fileFieldParser = new FileFieldParser(value);
         return fileFieldParser.parse();
     }
@@ -95,16 +95,20 @@ public List<LinkedFile> parse() {
                 charactersOfCurrentElement.append(c);
                 inXmlChar = false;
             } else if (!escaped && (c == ':')) {
-                if ((linkedFileData.size() == 1) && // we already parsed the description
+                if ((linkedFileData.size() == 1)
+                        && // we already parsed the description
                         (charactersOfCurrentElement.length() == 1)) { // we parsed one character
                     // special case of Windows paths
                     // Example: ":c:\test.pdf:PDF"
-                    // We are at the second : (position 3 in the example) and "just" add it to the current element
+                    // We are at the second : (position 3 in the example) and "just" add it to the
+                    // current element
                     charactersOfCurrentElement.append(c);
                     windowsPath = true;
-                    // special case for zotero absolute path on windows that do not have a colon in front
+                    // special case for zotero absolute path on windows that do not have a colon in
+                    // front
                     // e.g. A:\zotero\paper.pdf
-                } else if (charactersOfCurrentElement.length() == 1 && value.charAt(i + 1) == '\\') {
+                } else if (charactersOfCurrentElement.length() == 1
+                        && value.charAt(i + 1) == '\\') {
                     charactersOfCurrentElement.append(c);
                     windowsPath = true;
                 } else {
@@ -157,7 +161,9 @@ static LinkedFile convert(List<String> entry) {
         LinkedFile field = null;
         if (LinkedFile.isOnlineLink(entry.get(1))) {
             try {
-                field = new LinkedFile(entry.getFirst(), URI.create(entry.get(1)).toURL(), entry.get(2));
+                field =
+                        new LinkedFile(
+                                entry.getFirst(), URI.create(entry.get(1)).toURL(), entry.get(2));
             } catch (MalformedURLException e) {
                 // in case the URL is malformed, store it nevertheless
                 field = new LinkedFile(entry.getFirst(), entry.get(1), entry.get(2));
@@ -165,7 +171,8 @@ static LinkedFile convert(List<String> entry) {
         } else {
             String pathStr = entry.get(1);
             if (pathStr.contains("//")) {
-                // In case the path contains //, we assume it is a malformed URL, not a malformed path.
+                // In case the path contains //, we assume it is a malformed URL, not a malformed
+                // path.
                 // On linux, the double slash would be converted to a single slash.
                 field = new LinkedFile(entry.getFirst(), pathStr, entry.get(2));
             } else {
@@ -185,9 +192,13 @@ static LinkedFile convert(List<String> entry) {
         }
 
         // link is the only mandatory field
-        if (field.getDescription().isEmpty() && field.getLink().isEmpty() && !field.getFileType().isEmpty()) {
+        if (field.getDescription().isEmpty()
+                && field.getLink().isEmpty()
+                && !field.getFileType().isEmpty()) {
             field = new LinkedFile("", Path.of(field.getFileType()), "");
-        } else if (!field.getDescription().isEmpty() && field.getLink().isEmpty() && field.getFileType().isEmpty()) {
+        } else if (!field.getDescription().isEmpty()
+                && field.getLink().isEmpty()
+                && field.getFileType().isEmpty()) {
             field = new LinkedFile("", Path.of(field.getDescription()), "");
         }
         entry.clear();
diff --git a/src/main/java/org/jabref/logic/importer/util/GrobidService.java b/src/main/java/org/jabref/logic/importer/util/GrobidService.java
index 39789ba7d88c..1cf4e1b608d2 100644
--- a/src/main/java/org/jabref/logic/importer/util/GrobidService.java
+++ b/src/main/java/org/jabref/logic/importer/util/GrobidService.java
@@ -1,23 +1,22 @@
 package org.jabref.logic.importer.util;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.model.entry.BibEntry;
-
 import org.jsoup.Connection;
 import org.jsoup.Jsoup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * Implements an API to a GROBID server, as described at
  * https://grobid.readthedocs.io/en/latest/Grobid-service/#grobid-web-services
@@ -33,7 +32,9 @@ public class GrobidService {
     private static final Logger LOGGER = LoggerFactory.getLogger(GrobidService.class);
 
     public enum ConsolidateCitations {
-        NO(0), WITH_METADATA(1), WITH_DOI_ONLY(2);
+        NO(0),
+        WITH_METADATA(1),
+        WITH_DOI_ONLY(2);
         private final int code;
 
         ConsolidateCitations(int code) {
@@ -60,65 +61,90 @@ public GrobidService(GrobidPreferences grobidPreferences) {
      * @return A BibEntry for the String
      * @throws IOException if an I/O exception during the call occurred or no BibTeX entry could be determined
      */
-    public Optional<BibEntry> processCitation(String rawCitation, ImportFormatPreferences importFormatPreferences, ConsolidateCitations consolidateCitations) throws IOException, ParseException {
-        Connection.Response response = Jsoup.connect(grobidPreferences.getGrobidURL() + "/api/processCitation")
-                .header("Accept", MediaTypes.APPLICATION_BIBTEX)
-                .data("citations", rawCitation)
-                .data("consolidateCitations", String.valueOf(consolidateCitations.getCode()))
-                .method(Connection.Method.POST)
-                .ignoreContentType(true)
-                .timeout(100_000)
-                .execute();
+    public Optional<BibEntry> processCitation(
+            String rawCitation,
+            ImportFormatPreferences importFormatPreferences,
+            ConsolidateCitations consolidateCitations)
+            throws IOException, ParseException {
+        Connection.Response response =
+                Jsoup.connect(grobidPreferences.getGrobidURL() + "/api/processCitation")
+                        .header("Accept", MediaTypes.APPLICATION_BIBTEX)
+                        .data("citations", rawCitation)
+                        .data(
+                                "consolidateCitations",
+                                String.valueOf(consolidateCitations.getCode()))
+                        .method(Connection.Method.POST)
+                        .ignoreContentType(true)
+                        .timeout(100_000)
+                        .execute();
         String httpResponse = response.body();
         LOGGER.debug("raw citation -> response: {}, {}", rawCitation, httpResponse);
 
-        if (httpResponse == null || "@misc{-1,\n  author = {}\n}\n".equals(httpResponse) || httpResponse.equals("@misc{-1,\n  author = {" + rawCitation + "}\n}\n")) { // This filters empty BibTeX entries
+        if (httpResponse == null
+                || "@misc{-1,\n  author = {}\n}\n".equals(httpResponse)
+                || httpResponse.equals(
+                        "@misc{-1,\n  author = {"
+                                + rawCitation
+                                + "}\n}\n")) { // This filters empty BibTeX entries
             throw new IOException("The GROBID server response does not contain anything.");
         }
 
         return BibtexParser.singleFromString(httpResponse, importFormatPreferences);
     }
 
-    public List<BibEntry> processPDF(Path filePath, ImportFormatPreferences importFormatPreferences) throws IOException, ParseException {
-        Connection.Response response = Jsoup.connect(grobidPreferences.getGrobidURL() + "/api/processHeaderDocument")
-                .header("Accept", MediaTypes.APPLICATION_BIBTEX)
-                .data("input", filePath.toString(), Files.newInputStream(filePath))
-                .method(Connection.Method.POST)
-                .ignoreContentType(true)
-                .timeout(20000)
-                .execute();
+    public List<BibEntry> processPDF(Path filePath, ImportFormatPreferences importFormatPreferences)
+            throws IOException, ParseException {
+        Connection.Response response =
+                Jsoup.connect(grobidPreferences.getGrobidURL() + "/api/processHeaderDocument")
+                        .header("Accept", MediaTypes.APPLICATION_BIBTEX)
+                        .data("input", filePath.toString(), Files.newInputStream(filePath))
+                        .method(Connection.Method.POST)
+                        .ignoreContentType(true)
+                        .timeout(20000)
+                        .execute();
 
         String httpResponse = response.body();
 
         return getBibEntries(importFormatPreferences, httpResponse);
     }
 
-    public List<BibEntry> processReferences(List<Path> pathList, ImportFormatPreferences importFormatPreferences) throws IOException, ParseException {
+    public List<BibEntry> processReferences(
+            List<Path> pathList, ImportFormatPreferences importFormatPreferences)
+            throws IOException, ParseException {
         List<BibEntry> entries = new ArrayList<>();
-        for (Path filePath: pathList) {
+        for (Path filePath : pathList) {
             entries.addAll(processReferences(filePath, importFormatPreferences));
         }
 
         return entries;
     }
 
-    public List<BibEntry> processReferences(Path filePath, ImportFormatPreferences importFormatPreferences) throws IOException, ParseException {
-        Connection.Response response = Jsoup.connect(grobidPreferences.getGrobidURL() + "/api/processReferences")
-                                            .header("Accept", MediaTypes.APPLICATION_BIBTEX)
-                                            .data("input", filePath.toString(), Files.newInputStream(filePath))
-                                            .data("consolidateCitations", String.valueOf(ConsolidateCitations.WITH_METADATA))
-                                            .method(Connection.Method.POST)
-                                            .ignoreContentType(true)
-                                            .timeout(20000)
-                                            .execute();
+    public List<BibEntry> processReferences(
+            Path filePath, ImportFormatPreferences importFormatPreferences)
+            throws IOException, ParseException {
+        Connection.Response response =
+                Jsoup.connect(grobidPreferences.getGrobidURL() + "/api/processReferences")
+                        .header("Accept", MediaTypes.APPLICATION_BIBTEX)
+                        .data("input", filePath.toString(), Files.newInputStream(filePath))
+                        .data(
+                                "consolidateCitations",
+                                String.valueOf(ConsolidateCitations.WITH_METADATA))
+                        .method(Connection.Method.POST)
+                        .ignoreContentType(true)
+                        .timeout(20000)
+                        .execute();
 
         String httpResponse = response.body();
 
         return getBibEntries(importFormatPreferences, httpResponse);
     }
 
-    private static List<BibEntry> getBibEntries(ImportFormatPreferences importFormatPreferences, String httpResponse) throws IOException, ParseException {
-        if (httpResponse == null || "@misc{-1,\n  author = {}\n}\n".equals(httpResponse)) { // This filters empty BibTeX entries
+    private static List<BibEntry> getBibEntries(
+            ImportFormatPreferences importFormatPreferences, String httpResponse)
+            throws IOException, ParseException {
+        if (httpResponse == null
+                || "@misc{-1,\n  author = {}\n}\n"
+                        .equals(httpResponse)) { // This filters empty BibTeX entries
             throw new IOException("The GROBID server response does not contain anything.");
         }
 
diff --git a/src/main/java/org/jabref/logic/importer/util/GroupsParser.java b/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
index 35ed1908479a..c05f8fe94360 100644
--- a/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
@@ -1,11 +1,5 @@
 package org.jabref.logic.importer.util;
 
-import java.io.IOException;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.util.EnumSet;
-import java.util.List;
-
 import org.jabref.logic.auxparser.DefaultAuxParser;
 import org.jabref.logic.groups.DefaultGroupsFactory;
 import org.jabref.logic.importer.ParseException;
@@ -30,10 +24,15 @@
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.util.EnumSet;
+import java.util.List;
+
 /**
  * Converts string representation of groups to a parsed {@link GroupTreeNode}.
  */
@@ -41,10 +40,13 @@ public class GroupsParser {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GroupsParser.class);
 
-    private GroupsParser() {
-    }
+    private GroupsParser() {}
 
-    public static GroupTreeNode importGroups(List<String> orderedData, Character keywordSeparator, FileUpdateMonitor fileMonitor, MetaData metaData)
+    public static GroupTreeNode importGroups(
+            List<String> orderedData,
+            Character keywordSeparator,
+            FileUpdateMonitor fileMonitor,
+            MetaData metaData)
             throws ParseException {
         try {
             GroupTreeNode cursor = null;
@@ -61,7 +63,12 @@ public static GroupTreeNode importGroups(List<String> orderedData, Character key
                     throw new ParseException("Expected \"" + string + "\" to contain whitespace");
                 }
                 int level = Integer.parseInt(string.substring(0, spaceIndex));
-                AbstractGroup group = GroupsParser.fromString(string.substring(spaceIndex + 1), keywordSeparator, fileMonitor, metaData);
+                AbstractGroup group =
+                        GroupsParser.fromString(
+                                string.substring(spaceIndex + 1),
+                                keywordSeparator,
+                                fileMonitor,
+                                metaData);
                 GroupTreeNode newNode = GroupTreeNode.fromGroup(group);
                 if (cursor == null) {
                     // create new root
@@ -78,8 +85,9 @@ public static GroupTreeNode importGroups(List<String> orderedData, Character key
             }
             return root;
         } catch (ParseException e) {
-            throw new ParseException(Localization
-                    .lang("Group tree could not be parsed. If you save the BibTeX library, all groups will be lost."),
+            throw new ParseException(
+                    Localization.lang(
+                            "Group tree could not be parsed. If you save the BibTeX library, all groups will be lost."),
                     e);
         }
     }
@@ -91,7 +99,8 @@ public static GroupTreeNode importGroups(List<String> orderedData, Character key
      * @return New instance of the encoded group.
      * @throws ParseException If an error occurred and a group could not be created, e.g. due to a malformed regular expression.
      */
-    public static AbstractGroup fromString(String s, Character keywordSeparator, FileUpdateMonitor fileMonitor, MetaData metaData)
+    public static AbstractGroup fromString(
+            String s, Character keywordSeparator, FileUpdateMonitor fileMonitor, MetaData metaData)
             throws ParseException {
         if (s.startsWith(MetadataSerializationConfiguration.KEYWORD_GROUP_ID)) {
             return keywordGroupFromString(s, keywordSeparator);
@@ -121,23 +130,47 @@ public static AbstractGroup fromString(String s, Character keywordSeparator, Fil
         throw new ParseException("Unknown group: " + s);
     }
 
-    private static AbstractGroup texGroupFromString(String string, FileUpdateMonitor fileMonitor, MetaData metaData) throws ParseException {
-        QuotedStringTokenizer tok = new QuotedStringTokenizer(string.substring(MetadataSerializationConfiguration.TEX_GROUP_ID
-                .length()), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+    private static AbstractGroup texGroupFromString(
+            String string, FileUpdateMonitor fileMonitor, MetaData metaData) throws ParseException {
+        QuotedStringTokenizer tok =
+                new QuotedStringTokenizer(
+                        string.substring(MetadataSerializationConfiguration.TEX_GROUP_ID.length()),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
 
-        String name = StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
-        GroupHierarchyType context = GroupHierarchyType.getByNumberOrDefault(Integer.parseInt(tok.nextToken()));
+        String name =
+                StringUtil.unquote(
+                        tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+        GroupHierarchyType context =
+                GroupHierarchyType.getByNumberOrDefault(Integer.parseInt(tok.nextToken()));
         try {
             Path path = Path.of(tok.nextToken());
             try {
-                TexGroup newGroup = TexGroup.create(name, context, path, new DefaultAuxParser(new BibDatabase()), fileMonitor, metaData);
+                TexGroup newGroup =
+                        TexGroup.create(
+                                name,
+                                context,
+                                path,
+                                new DefaultAuxParser(new BibDatabase()),
+                                fileMonitor,
+                                metaData);
                 addGroupDetails(tok, newGroup);
                 return newGroup;
             } catch (IOException ex) {
                 // Problem accessing file -> create without file monitoring
-                LOGGER.warn("Could not access file {}. The group {} will not reflect changes to the aux file.", path, name, ex);
+                LOGGER.warn(
+                        "Could not access file {}. The group {} will not reflect changes to the aux file.",
+                        path,
+                        name,
+                        ex);
 
-                TexGroup newGroup = TexGroup.create(name, context, path, new DefaultAuxParser(new BibDatabase()), metaData);
+                TexGroup newGroup =
+                        TexGroup.create(
+                                name,
+                                context,
+                                path,
+                                new DefaultAuxParser(new BibDatabase()),
+                                metaData);
                 addGroupDetails(tok, newGroup);
                 return newGroup;
             }
@@ -148,14 +181,27 @@ private static AbstractGroup texGroupFromString(String string, FileUpdateMonitor
 
     private static AbstractGroup automaticPersonsGroupFromString(String string) {
         if (!string.startsWith(MetadataSerializationConfiguration.AUTOMATIC_PERSONS_GROUP_ID)) {
-            throw new IllegalArgumentException("KeywordGroup cannot be created from \"" + string + "\".");
+            throw new IllegalArgumentException(
+                    "KeywordGroup cannot be created from \"" + string + "\".");
         }
-        QuotedStringTokenizer tok = new QuotedStringTokenizer(string.substring(MetadataSerializationConfiguration.AUTOMATIC_PERSONS_GROUP_ID
-                .length()), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+        QuotedStringTokenizer tok =
+                new QuotedStringTokenizer(
+                        string.substring(
+                                MetadataSerializationConfiguration.AUTOMATIC_PERSONS_GROUP_ID
+                                        .length()),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
 
-        String name = StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
-        GroupHierarchyType context = GroupHierarchyType.getByNumberOrDefault(Integer.parseInt(tok.nextToken()));
-        Field field = FieldFactory.parseField(StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        String name =
+                StringUtil.unquote(
+                        tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+        GroupHierarchyType context =
+                GroupHierarchyType.getByNumberOrDefault(Integer.parseInt(tok.nextToken()));
+        Field field =
+                FieldFactory.parseField(
+                        StringUtil.unquote(
+                                tok.nextToken(),
+                                MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
         AutomaticPersonsGroup newGroup = new AutomaticPersonsGroup(name, context, field);
         addGroupDetails(tok, newGroup);
         return newGroup;
@@ -163,17 +209,39 @@ private static AbstractGroup automaticPersonsGroupFromString(String string) {
 
     private static AbstractGroup automaticKeywordGroupFromString(String string) {
         if (!string.startsWith(MetadataSerializationConfiguration.AUTOMATIC_KEYWORD_GROUP_ID)) {
-            throw new IllegalArgumentException("KeywordGroup cannot be created from \"" + string + "\".");
+            throw new IllegalArgumentException(
+                    "KeywordGroup cannot be created from \"" + string + "\".");
         }
-        QuotedStringTokenizer tok = new QuotedStringTokenizer(string.substring(MetadataSerializationConfiguration.AUTOMATIC_KEYWORD_GROUP_ID
-                .length()), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+        QuotedStringTokenizer tok =
+                new QuotedStringTokenizer(
+                        string.substring(
+                                MetadataSerializationConfiguration.AUTOMATIC_KEYWORD_GROUP_ID
+                                        .length()),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
 
-        String name = StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
-        GroupHierarchyType context = GroupHierarchyType.getByNumberOrDefault(Integer.parseInt(tok.nextToken()));
-        Field field = FieldFactory.parseField(StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
-        Character delimiter = StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR).charAt(0);
-        Character hierarchicalDelimiter = StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR).charAt(0);
-        AutomaticKeywordGroup newGroup = new AutomaticKeywordGroup(name, context, field, delimiter, hierarchicalDelimiter);
+        String name =
+                StringUtil.unquote(
+                        tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+        GroupHierarchyType context =
+                GroupHierarchyType.getByNumberOrDefault(Integer.parseInt(tok.nextToken()));
+        Field field =
+                FieldFactory.parseField(
+                        StringUtil.unquote(
+                                tok.nextToken(),
+                                MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        Character delimiter =
+                StringUtil.unquote(
+                                tok.nextToken(),
+                                MetadataSerializationConfiguration.GROUP_QUOTE_CHAR)
+                        .charAt(0);
+        Character hierarchicalDelimiter =
+                StringUtil.unquote(
+                                tok.nextToken(),
+                                MetadataSerializationConfiguration.GROUP_QUOTE_CHAR)
+                        .charAt(0);
+        AutomaticKeywordGroup newGroup =
+                new AutomaticKeywordGroup(name, context, field, delimiter, hierarchicalDelimiter);
         addGroupDetails(tok, newGroup);
         return newGroup;
     }
@@ -183,40 +251,74 @@ private static AbstractGroup automaticKeywordGroupFromString(String string) {
      *
      * @param s The String representation obtained from KeywordGroup.toString()
      */
-    private static KeywordGroup keywordGroupFromString(String s, Character keywordSeparator) throws ParseException {
+    private static KeywordGroup keywordGroupFromString(String s, Character keywordSeparator)
+            throws ParseException {
         if (!s.startsWith(MetadataSerializationConfiguration.KEYWORD_GROUP_ID)) {
-            throw new IllegalArgumentException("KeywordGroup cannot be created from \"" + s + "\".");
+            throw new IllegalArgumentException(
+                    "KeywordGroup cannot be created from \"" + s + "\".");
         }
-        QuotedStringTokenizer tok = new QuotedStringTokenizer(s.substring(MetadataSerializationConfiguration.KEYWORD_GROUP_ID
-                .length()), MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+        QuotedStringTokenizer tok =
+                new QuotedStringTokenizer(
+                        s.substring(MetadataSerializationConfiguration.KEYWORD_GROUP_ID.length()),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
 
-        String name = StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
-        GroupHierarchyType context = GroupHierarchyType.getByNumberOrDefault(Integer.parseInt(tok.nextToken()));
-        Field field = FieldFactory.parseField(StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
-        String expression = StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+        String name =
+                StringUtil.unquote(
+                        tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+        GroupHierarchyType context =
+                GroupHierarchyType.getByNumberOrDefault(Integer.parseInt(tok.nextToken()));
+        Field field =
+                FieldFactory.parseField(
+                        StringUtil.unquote(
+                                tok.nextToken(),
+                                MetadataSerializationConfiguration.GROUP_QUOTE_CHAR));
+        String expression =
+                StringUtil.unquote(
+                        tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
         boolean caseSensitive = Integer.parseInt(tok.nextToken()) == 1;
         boolean regExp = Integer.parseInt(tok.nextToken()) == 1;
         KeywordGroup newGroup;
         if (regExp) {
             newGroup = new RegexKeywordGroup(name, context, field, expression, caseSensitive);
         } else {
-            newGroup = new WordKeywordGroup(name, context, field, expression, caseSensitive, keywordSeparator, false);
+            newGroup =
+                    new WordKeywordGroup(
+                            name,
+                            context,
+                            field,
+                            expression,
+                            caseSensitive,
+                            keywordSeparator,
+                            false);
         }
         addGroupDetails(tok, newGroup);
         return newGroup;
     }
 
-    private static ExplicitGroup explicitGroupFromString(String input, Character keywordSeparator) throws ParseException {
+    private static ExplicitGroup explicitGroupFromString(String input, Character keywordSeparator)
+            throws ParseException {
         if (!input.startsWith(MetadataSerializationConfiguration.EXPLICIT_GROUP_ID)) {
-            throw new IllegalArgumentException("ExplicitGroup cannot be created from \"" + input + "\".");
+            throw new IllegalArgumentException(
+                    "ExplicitGroup cannot be created from \"" + input + "\".");
         }
-        QuotedStringTokenizer tok = new QuotedStringTokenizer(input.substring(MetadataSerializationConfiguration.EXPLICIT_GROUP_ID.length()),
-                MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+        QuotedStringTokenizer tok =
+                new QuotedStringTokenizer(
+                        input.substring(
+                                MetadataSerializationConfiguration.EXPLICIT_GROUP_ID.length()),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
 
-        String name = StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+        String name =
+                StringUtil.unquote(
+                        tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
         try {
             int context = Integer.parseInt(tok.nextToken());
-            ExplicitGroup newGroup = new ExplicitGroup(name, GroupHierarchyType.getByNumberOrDefault(context), keywordSeparator);
+            ExplicitGroup newGroup =
+                    new ExplicitGroup(
+                            name,
+                            GroupHierarchyType.getByNumberOrDefault(context),
+                            keywordSeparator);
             addGroupDetails(tok, newGroup);
             return newGroup;
         } catch (NumberFormatException exception) {
@@ -224,17 +326,30 @@ private static ExplicitGroup explicitGroupFromString(String input, Character key
         }
     }
 
-    private static ExplicitGroup legacyExplicitGroupFromString(String input, Character keywordSeparator) throws ParseException {
+    private static ExplicitGroup legacyExplicitGroupFromString(
+            String input, Character keywordSeparator) throws ParseException {
         if (!input.startsWith(MetadataSerializationConfiguration.LEGACY_EXPLICIT_GROUP_ID)) {
-            throw new IllegalArgumentException("ExplicitGroup cannot be created from \"" + input + "\".");
+            throw new IllegalArgumentException(
+                    "ExplicitGroup cannot be created from \"" + input + "\".");
         }
-        QuotedStringTokenizer tok = new QuotedStringTokenizer(input.substring(MetadataSerializationConfiguration.LEGACY_EXPLICIT_GROUP_ID.length()),
-                MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+        QuotedStringTokenizer tok =
+                new QuotedStringTokenizer(
+                        input.substring(
+                                MetadataSerializationConfiguration.LEGACY_EXPLICIT_GROUP_ID
+                                        .length()),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
 
-        String name = StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+        String name =
+                StringUtil.unquote(
+                        tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
         try {
             int context = Integer.parseInt(tok.nextToken());
-            ExplicitGroup newGroup = new ExplicitGroup(name, GroupHierarchyType.getByNumberOrDefault(context), keywordSeparator);
+            ExplicitGroup newGroup =
+                    new ExplicitGroup(
+                            name,
+                            GroupHierarchyType.getByNumberOrDefault(context),
+                            keywordSeparator);
             GroupsParser.addLegacyEntryKeys(tok, newGroup);
             return newGroup;
         } catch (NumberFormatException exception) {
@@ -250,14 +365,17 @@ private static ExplicitGroup legacyExplicitGroupFromString(String input, Charact
      */
     private static void addLegacyEntryKeys(QuotedStringTokenizer tok, ExplicitGroup group) {
         while (tok.hasMoreTokens()) {
-            String key = StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+            String key =
+                    StringUtil.unquote(
+                            tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
             group.addLegacyEntryKey(key);
         }
     }
 
     private static AbstractGroup allEntriesGroupFromString(String s) {
         if (!s.startsWith(MetadataSerializationConfiguration.ALL_ENTRIES_GROUP_ID)) {
-            throw new IllegalArgumentException("AllEntriesGroup cannot be created from \"" + s + "\".");
+            throw new IllegalArgumentException(
+                    "AllEntriesGroup cannot be created from \"" + s + "\".");
         }
         return DefaultGroupsFactory.getAllEntriesGroup();
     }
@@ -271,12 +389,19 @@ private static AbstractGroup searchGroupFromString(String s) {
         if (!s.startsWith(MetadataSerializationConfiguration.SEARCH_GROUP_ID)) {
             throw new IllegalArgumentException("SearchGroup cannot be created from \"" + s + "\".");
         }
-        QuotedStringTokenizer tok = new QuotedStringTokenizer(s.substring(MetadataSerializationConfiguration.SEARCH_GROUP_ID.length()),
-                MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR, MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+        QuotedStringTokenizer tok =
+                new QuotedStringTokenizer(
+                        s.substring(MetadataSerializationConfiguration.SEARCH_GROUP_ID.length()),
+                        MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
+                        MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
 
-        String name = StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+        String name =
+                StringUtil.unquote(
+                        tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
         int context = Integer.parseInt(tok.nextToken());
-        String expression = StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
+        String expression =
+                StringUtil.unquote(
+                        tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR);
         EnumSet<SearchFlags> searchFlags = EnumSet.noneOf(SearchFlags.class);
         if (Integer.parseInt(tok.nextToken()) == 1) {
             searchFlags.add(SearchFlags.CASE_SENSITIVE);
@@ -286,9 +411,12 @@ private static AbstractGroup searchGroupFromString(String s) {
         }
         // version 0 contained 4 additional booleans to specify search
         // fields; these are ignored now, all fields are always searched
-        SearchGroup searchGroup = new SearchGroup(name,
-                GroupHierarchyType.getByNumberOrDefault(context), expression, searchFlags
-        );
+        SearchGroup searchGroup =
+                new SearchGroup(
+                        name,
+                        GroupHierarchyType.getByNumberOrDefault(context),
+                        expression,
+                        searchFlags);
         addGroupDetails(tok, searchGroup);
         return searchGroup;
     }
diff --git a/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java b/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java
index f6ca61e7b55e..d34de4afbd06 100644
--- a/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.importer.util;
 
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
@@ -14,6 +11,9 @@
 import org.jabref.model.entry.identifier.MathSciNetId;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Objects;
+import java.util.Optional;
+
 public class IdentifierParser {
     private final BibEntry entry;
 
diff --git a/src/main/java/org/jabref/logic/importer/util/JsonReader.java b/src/main/java/org/jabref/logic/importer/util/JsonReader.java
index 51a8798169eb..c57c5ba4c3f2 100644
--- a/src/main/java/org/jabref/logic/importer/util/JsonReader.java
+++ b/src/main/java/org/jabref/logic/importer/util/JsonReader.java
@@ -1,15 +1,15 @@
 package org.jabref.logic.importer.util;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
-import org.jabref.logic.importer.ParseException;
-
 import kong.unirest.core.json.JSONArray;
 import kong.unirest.core.json.JSONException;
 import kong.unirest.core.json.JSONObject;
 
+import org.jabref.logic.importer.ParseException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
 /**
  * Converts an {@link InputStream} into a {@link JSONObject}.
  */
diff --git a/src/main/java/org/jabref/logic/importer/util/MathMLParser.java b/src/main/java/org/jabref/logic/importer/util/MathMLParser.java
index 39975d0ceed5..564c5fa4df89 100644
--- a/src/main/java/org/jabref/logic/importer/util/MathMLParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MathMLParser.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.importer.util;
 
+import org.jabref.architecture.AllowedToUseClassGetResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -12,11 +16,6 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.jabref.architecture.AllowedToUseClassGetResource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 @AllowedToUseClassGetResource("to determine the root directory")
 public class MathMLParser {
     private static final Logger LOGGER = LoggerFactory.getLogger(MathMLParser.class);
@@ -41,7 +40,10 @@ public static String parse(XMLStreamReader reader) {
             Source xmlSource = new StreamSource(new StringReader(xmlContent));
 
             // No SystemId required, because no relative URLs need to be resolved
-            Source xsltSource = new StreamSource(xsltResource, MathMLParser.class.getResource(XSLT_FILE_PATH).toExternalForm());
+            Source xsltSource =
+                    new StreamSource(
+                            xsltResource,
+                            MathMLParser.class.getResource(XSLT_FILE_PATH).toExternalForm());
 
             TransformerFactory transformerFactory = TransformerFactory.newInstance();
             Transformer transformer = transformerFactory.newTransformer(xsltSource);
@@ -59,4 +61,3 @@ public static String parse(XMLStreamReader reader) {
         return latexResult;
     }
 }
-
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index 46b5bf7aeb9e..cd0f6009553c 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -1,17 +1,5 @@
 package org.jabref.logic.importer.util;
 
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.citationkeypattern.CitationKeyPattern;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
@@ -34,10 +22,21 @@
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.regex.Pattern;
+
 /**
  * Writing is done at {@link org.jabref.logic.exporter.MetaDataSerializer}.
  */
@@ -49,12 +48,16 @@ public class MetaDataParser {
     private static final Pattern SINGLE_BACKSLASH = Pattern.compile("[^\\\\]\\\\[^\\\\]");
 
     static {
-        DEFAULT_SAVE_ACTIONS = List.of(
-                new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter()),
-                new FieldFormatterCleanup(StandardField.DATE, new NormalizeDateFormatter()),
-                new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter()),
-                new FieldFormatterCleanup(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD,
-                        new ReplaceUnicodeLigaturesFormatter()));
+        DEFAULT_SAVE_ACTIONS =
+                List.of(
+                        new FieldFormatterCleanup(
+                                StandardField.PAGES, new NormalizePagesFormatter()),
+                        new FieldFormatterCleanup(StandardField.DATE, new NormalizeDateFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.MONTH, new NormalizeMonthFormatter()),
+                        new FieldFormatterCleanup(
+                                InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD,
+                                new ReplaceUnicodeLigaturesFormatter()));
     }
 
     public MetaDataParser(FileUpdateMonitor fileMonitor) {
@@ -71,18 +74,23 @@ public static Optional<BibEntryType> parseCustomEntryType(String comment) {
 
         int indexEndOfRequiredFields = fieldsDescription.indexOf(']');
         int indexEndOfOptionalFields = fieldsDescription.indexOf(']', indexEndOfRequiredFields + 1);
-        if ((indexEndOfRequiredFields < 4) || (indexEndOfOptionalFields < (indexEndOfRequiredFields + 6))) {
+        if ((indexEndOfRequiredFields < 4)
+                || (indexEndOfOptionalFields < (indexEndOfRequiredFields + 6))) {
             return Optional.empty();
         }
         EntryType type = EntryTypeFactory.parse(rest.substring(0, indexEndOfName));
         String reqFields = fieldsDescription.substring(4, indexEndOfRequiredFields);
-        String optFields = fieldsDescription.substring(indexEndOfRequiredFields + 6, indexEndOfOptionalFields);
-        BibEntryTypeBuilder entryTypeBuilder = new BibEntryTypeBuilder()
-                .withType(type)
-                .withRequiredFields(FieldFactory.parseOrFieldsList(reqFields))
-                // Important fields are optional fields, but displayed first. Thus, they do not need to be separated by "/".
-                // See org.jabref.model.entry.field.FieldPriority for details on important optional fields.
-                .withImportantFields(FieldFactory.parseFieldList(optFields));
+        String optFields =
+                fieldsDescription.substring(indexEndOfRequiredFields + 6, indexEndOfOptionalFields);
+        BibEntryTypeBuilder entryTypeBuilder =
+                new BibEntryTypeBuilder()
+                        .withType(type)
+                        .withRequiredFields(FieldFactory.parseOrFieldsList(reqFields))
+                        // Important fields are optional fields, but displayed first. Thus, they do
+                        // not need to be separated by "/".
+                        // See org.jabref.model.entry.field.FieldPriority for details on important
+                        // optional fields.
+                        .withImportantFields(FieldFactory.parseFieldList(optFields));
         if (entryTypeBuilder.hasWarnings()) {
             LOGGER.warn("Following custom entry type definition has duplicate fields: {}", comment);
             return Optional.empty();
@@ -93,7 +101,8 @@ public static Optional<BibEntryType> parseCustomEntryType(String comment) {
     /**
      * Parses the given data map and returns a new resulting {@link MetaData} instance.
      */
-    public MetaData parse(Map<String, String> data, Character keywordSeparator) throws ParseException {
+    public MetaData parse(Map<String, String> data, Character keywordSeparator)
+            throws ParseException {
         return parse(new MetaData(), data, keywordSeparator);
     }
 
@@ -102,11 +111,13 @@ public MetaData parse(Map<String, String> data, Character keywordSeparator) thro
      *
      * @return the given metaData instance (which is modified, too)
      */
-    public MetaData parse(MetaData metaData, Map<String, String> data, Character keywordSeparator) throws ParseException {
+    public MetaData parse(MetaData metaData, Map<String, String> data, Character keywordSeparator)
+            throws ParseException {
         CitationKeyPattern defaultCiteKeyPattern = CitationKeyPattern.NULL_CITATION_KEY_PATTERN;
         Map<EntryType, CitationKeyPattern> nonDefaultCiteKeyPatterns = new HashMap<>();
 
-        // process groups (GROUPSTREE and GROUPSTREE_LEGACY) at the very end (otherwise it can happen that not all dependent data are set)
+        // process groups (GROUPSTREE and GROUPSTREE_LEGACY) at the very end (otherwise it can
+        // happen that not all dependent data are set)
         List<Map.Entry<String, String>> entryList = new ArrayList<>(data.entrySet());
         entryList.sort(groupsLast());
 
@@ -114,11 +125,21 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
             List<String> values = getAsList(entry.getValue());
 
             if (entry.getKey().startsWith(MetaData.PREFIX_KEYPATTERN)) {
-                EntryType entryType = EntryTypeFactory.parse(entry.getKey().substring(MetaData.PREFIX_KEYPATTERN.length()));
-                nonDefaultCiteKeyPatterns.put(entryType, new CitationKeyPattern(getSingleItem(values)));
+                EntryType entryType =
+                        EntryTypeFactory.parse(
+                                entry.getKey().substring(MetaData.PREFIX_KEYPATTERN.length()));
+                nonDefaultCiteKeyPatterns.put(
+                        entryType, new CitationKeyPattern(getSingleItem(values)));
             } else if (entry.getKey().startsWith(MetaData.SELECTOR_META_PREFIX)) {
-                // edge case, it might be one special field e.g. article from biblatex-apa, but we can't distinguish this from any other field and rather prefer to handle it as UnknownField
-                metaData.addContentSelector(ContentSelectors.parse(FieldFactory.parseField(entry.getKey().substring(MetaData.SELECTOR_META_PREFIX.length())), StringUtil.unquote(entry.getValue(), MetaData.ESCAPE_CHARACTER)));
+                // edge case, it might be one special field e.g. article from biblatex-apa, but we
+                // can't distinguish this from any other field and rather prefer to handle it as
+                // UnknownField
+                metaData.addContentSelector(
+                        ContentSelectors.parse(
+                                FieldFactory.parseField(
+                                        entry.getKey()
+                                                .substring(MetaData.SELECTOR_META_PREFIX.length())),
+                                StringUtil.unquote(entry.getValue(), MetaData.ESCAPE_CHARACTER)));
             } else if (entry.getKey().equals(MetaData.FILE_DIRECTORY)) {
                 metaData.setDefaultFileDirectory(parseDirectory(entry.getValue()));
             } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + '-')) {
@@ -144,8 +165,10 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
                 }
             } else if (entry.getKey().equals(MetaData.SAVE_ORDER_CONFIG)) {
                 metaData.setSaveOrder(SaveOrder.parse(values));
-            } else if (entry.getKey().equals(MetaData.GROUPSTREE) || entry.getKey().equals(MetaData.GROUPSTREE_LEGACY)) {
-                metaData.setGroups(GroupsParser.importGroups(values, keywordSeparator, fileMonitor, metaData));
+            } else if (entry.getKey().equals(MetaData.GROUPSTREE)
+                    || entry.getKey().equals(MetaData.GROUPSTREE_LEGACY)) {
+                metaData.setGroups(
+                        GroupsParser.importGroups(values, keywordSeparator, fileMonitor, metaData));
             } else if (entry.getKey().equals(MetaData.GROUPS_SEARCH_SYNTAX_VERSION)) {
                 Version version = Version.parse(getSingleItem(values));
                 metaData.setGroupSearchSyntaxVersion(version);
@@ -157,7 +180,8 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
             }
         }
 
-        if (!defaultCiteKeyPattern.equals(CitationKeyPattern.NULL_CITATION_KEY_PATTERN) || !nonDefaultCiteKeyPatterns.isEmpty()) {
+        if (!defaultCiteKeyPattern.equals(CitationKeyPattern.NULL_CITATION_KEY_PATTERN)
+                || !nonDefaultCiteKeyPatterns.isEmpty()) {
             metaData.setCiteKeyPattern(defaultCiteKeyPattern, nonDefaultCiteKeyPatterns);
         }
 
@@ -189,8 +213,14 @@ static String parseDirectory(String value) {
     }
 
     private static Comparator<? super Map.Entry<String, String>> groupsLast() {
-        return (s1, s2) -> MetaData.GROUPSTREE.equals(s1.getKey()) || MetaData.GROUPSTREE_LEGACY.equals(s1.getKey()) ? 1 :
-                MetaData.GROUPSTREE.equals(s2.getKey()) || MetaData.GROUPSTREE_LEGACY.equals(s2.getKey()) ? -1 : 0;
+        return (s1, s2) ->
+                MetaData.GROUPSTREE.equals(s1.getKey())
+                                || MetaData.GROUPSTREE_LEGACY.equals(s1.getKey())
+                        ? 1
+                        : MetaData.GROUPSTREE.equals(s2.getKey())
+                                        || MetaData.GROUPSTREE_LEGACY.equals(s2.getKey())
+                                ? -1
+                                : 0;
     }
 
     /**
@@ -231,10 +261,12 @@ private static Optional<String> getNextUnit(Reader reader) throws IOException {
         StringBuilder res = new StringBuilder();
         while ((c = reader.read()) != -1) {
             if (escape) {
-                // at org.jabref.logic.exporter.MetaDataSerializer.serializeMetaData, only MetaData.SEPARATOR_CHARACTER, MetaData.ESCAPE_CHARACTER are quoted
+                // at org.jabref.logic.exporter.MetaDataSerializer.serializeMetaData, only
+                // MetaData.SEPARATOR_CHARACTER, MetaData.ESCAPE_CHARACTER are quoted
                 // That means ; and \\
                 char character = (char) c;
-                if (character != MetaData.SEPARATOR_CHARACTER && character != MetaData.ESCAPE_CHARACTER) {
+                if (character != MetaData.SEPARATOR_CHARACTER
+                        && character != MetaData.ESCAPE_CHARACTER) {
                     // Keep the escape character
                     res.append("\\");
                 }
@@ -254,12 +286,15 @@ private static Optional<String> getNextUnit(Reader reader) throws IOException {
         return Optional.empty();
     }
 
-    public static FieldFormatterCleanups fieldFormatterCleanupsParse(List<String> formatterMetaList) {
+    public static FieldFormatterCleanups fieldFormatterCleanupsParse(
+            List<String> formatterMetaList) {
         if ((formatterMetaList != null) && (formatterMetaList.size() >= 2)) {
-            boolean enablementStatus = FieldFormatterCleanups.ENABLED.equals(formatterMetaList.getFirst());
+            boolean enablementStatus =
+                    FieldFormatterCleanups.ENABLED.equals(formatterMetaList.getFirst());
             String formatterString = formatterMetaList.get(1);
 
-            return new FieldFormatterCleanups(enablementStatus, FieldFormatterCleanups.parse(formatterString));
+            return new FieldFormatterCleanups(
+                    enablementStatus, FieldFormatterCleanups.parse(formatterString));
         } else {
             // return default actions
             return new FieldFormatterCleanups(false, DEFAULT_SAVE_ACTIONS);
diff --git a/src/main/java/org/jabref/logic/importer/util/ShortDOIService.java b/src/main/java/org/jabref/logic/importer/util/ShortDOIService.java
index e9c6446fc19f..eaadbc943993 100644
--- a/src/main/java/org/jabref/logic/importer/util/ShortDOIService.java
+++ b/src/main/java/org/jabref/logic/importer/util/ShortDOIService.java
@@ -1,18 +1,18 @@
 package org.jabref.logic.importer.util;
 
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
+import kong.unirest.core.json.JSONException;
+import kong.unirest.core.json.JSONObject;
 
+import org.apache.hc.core5.net.URIBuilder;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.net.URLDownload;
 import org.jabref.model.entry.identifier.DOI;
 
-import kong.unirest.core.json.JSONException;
-import kong.unirest.core.json.JSONObject;
-import org.apache.hc.core5.net.URIBuilder;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
 
 /**
  * Class for obtaining shortened DOI names. See <a href="https://shortdoi.org">https://shortdoi.org</a>.
diff --git a/src/main/java/org/jabref/logic/importer/util/StaxParser.java b/src/main/java/org/jabref/logic/importer/util/StaxParser.java
index 10037d79a51e..d8676ce372e6 100644
--- a/src/main/java/org/jabref/logic/importer/util/StaxParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/StaxParser.java
@@ -60,7 +60,8 @@ public static String getXMLContent(XMLStreamReader reader) throws XMLStreamExcep
                 content.append(getXMLComment(reader));
             } else if (event == XMLStreamConstants.PROCESSING_INSTRUCTION) {
                 content.append(getXMLProcessingInstruction(reader));
-            } else if (event == XMLStreamConstants.SPACE || event == XMLStreamConstants.ENTITY_REFERENCE) {
+            } else if (event == XMLStreamConstants.SPACE
+                    || event == XMLStreamConstants.ENTITY_REFERENCE) {
                 content.append(getXMLText(reader));
             }
         }
@@ -87,7 +88,11 @@ private static String getXMLStartTag(XMLStreamReader reader, boolean addNamespac
         }
 
         for (int i = 0; i < reader.getAttributeCount(); i++) {
-            startTag.append(" ").append(reader.getAttributeLocalName(i)).append("=\"").append(reader.getAttributeValue(i)).append("\"");
+            startTag.append(" ")
+                    .append(reader.getAttributeLocalName(i))
+                    .append("=\"")
+                    .append(reader.getAttributeValue(i))
+                    .append("\"");
         }
 
         if (reader.isEndElement()) {
@@ -103,9 +108,9 @@ private static String getXMLEndTag(XMLStreamReader reader) {
         String prefix = reader.getPrefix();
 
         endTag.append("</")
-              .append(prefix != null && !prefix.isBlank() ? prefix + ":" : "")
-              .append(reader.getName().getLocalPart())
-              .append(">");
+                .append(prefix != null && !prefix.isBlank() ? prefix + ":" : "")
+                .append(reader.getName().getLocalPart())
+                .append(">");
 
         return endTag.toString();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java b/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
index 4072b35b8b98..7ef5caf2c00e 100644
--- a/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.integrity;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import com.google.common.base.CharMatcher;
 
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
-import com.google.common.base.CharMatcher;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 public class ASCIICharacterChecker implements EntryChecker {
 
@@ -21,8 +21,11 @@ public List<IntegrityMessage> check(BibEntry entry) {
         for (Map.Entry<Field, String> field : entry.getFieldMap().entrySet()) {
             boolean asciiOnly = CharMatcher.ascii().matchesAllOf(field.getValue());
             if (!asciiOnly) {
-                results.add(new IntegrityMessage(Localization.lang("Non-ASCII encoded character found"), entry,
-                        field.getKey()));
+                results.add(
+                        new IntegrityMessage(
+                                Localization.lang("Non-ASCII encoded character found"),
+                                entry,
+                                field.getKey()));
             }
         }
         return results;
diff --git a/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java b/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java
index 0c456ad5ba91..4a75c30f7550 100644
--- a/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java
@@ -1,16 +1,16 @@
 package org.jabref.logic.integrity;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
 public class AbbreviationChecker implements EntryChecker {
 
     private final JournalAbbreviationRepository abbreviationRepository;
@@ -26,7 +26,13 @@ public List<IntegrityMessage> check(BibEntry entry) {
         for (Field field : fields) {
             Optional<String> value = entry.getFieldLatexFree(field);
             value.filter(abbreviationRepository::isAbbreviatedName)
-                 .ifPresent(val -> messages.add(new IntegrityMessage(Localization.lang("abbreviation detected"), entry, field)));
+                    .ifPresent(
+                            val ->
+                                    messages.add(
+                                            new IntegrityMessage(
+                                                    Localization.lang("abbreviation detected"),
+                                                    entry,
+                                                    field)));
         }
         return messages;
     }
diff --git a/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java b/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java
index 43098173dfa6..bd2f04f06e24 100644
--- a/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java
@@ -1,10 +1,6 @@
 package org.jabref.logic.integrity;
 
-import java.util.List;
-import java.util.Map;
-import java.util.regex.MatchResult;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
+import com.google.common.base.CharMatcher;
 
 import javafx.util.Pair;
 
@@ -13,7 +9,11 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 
-import com.google.common.base.CharMatcher;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.MatchResult;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 /**
  * Checks if the BibEntry contains unescaped ampersands.
@@ -28,20 +28,31 @@ public class AmpersandChecker implements EntryChecker {
     @Override
     public List<IntegrityMessage> check(BibEntry entry) {
         return entry.getFieldMap().entrySet().stream()
-                    .filter(field -> FieldFactory.isLatexField(field.getKey()))
-                    // We use "flatMap" instead of filtering later, because we assume there won't be that much error messages - and construction of Stream.empty() is faster than construction of a new Tuple2 (including lifting long to Long)
-                    .flatMap(AmpersandChecker::getUnescapedAmpersandsWithCount)
-                    .map(pair -> new IntegrityMessage(Localization.lang("Found %0 unescaped '&'", pair.getValue()), entry, pair.getKey()))
-                    .toList();
+                .filter(field -> FieldFactory.isLatexField(field.getKey()))
+                // We use "flatMap" instead of filtering later, because we assume there won't be
+                // that much error messages - and construction of Stream.empty() is faster than
+                // construction of a new Tuple2 (including lifting long to Long)
+                .flatMap(AmpersandChecker::getUnescapedAmpersandsWithCount)
+                .map(
+                        pair ->
+                                new IntegrityMessage(
+                                        Localization.lang(
+                                                "Found %0 unescaped '&'", pair.getValue()),
+                                        entry,
+                                        pair.getKey()))
+                .toList();
     }
 
-    private static Stream<Pair<Field, Long>> getUnescapedAmpersandsWithCount(Map.Entry<Field, String> entry) {
+    private static Stream<Pair<Field, Long>> getUnescapedAmpersandsWithCount(
+            Map.Entry<Field, String> entry) {
         // counts the number of even \ occurrences preceding an &
-        long unescapedAmpersands = BACKSLASH_PRECEDED_AMPERSAND.matcher(entry.getValue())
-                                                               .results()
-                                                               .map(MatchResult::group)
-                                                               .filter(m -> CharMatcher.is('\\').countIn(m) % 2 == 0)
-                                                               .count();
+        long unescapedAmpersands =
+                BACKSLASH_PRECEDED_AMPERSAND
+                        .matcher(entry.getValue())
+                        .results()
+                        .map(MatchResult::group)
+                        .filter(m -> CharMatcher.is('\\').countIn(m) % 2 == 0)
+                        .count();
         if (unescapedAmpersands == 0) {
             return Stream.empty();
         }
diff --git a/src/main/java/org/jabref/logic/integrity/BibStringChecker.java b/src/main/java/org/jabref/logic/integrity/BibStringChecker.java
index 6581e9296584..173ef8342145 100644
--- a/src/main/java/org/jabref/logic/integrity/BibStringChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BibStringChecker.java
@@ -1,24 +1,30 @@
 package org.jabref.logic.integrity;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.bibtex.FieldWriter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * Checks, if there is an even number of unescaped # (FieldWriter.BIBTEX_STRING_START_END_SYMBOL)
  */
 public class BibStringChecker implements EntryChecker {
 
-    // Detect FieldWriter.BIBTEX_STRING_START_END_SYMBOL (#) if it doesn't have a \ in front of it or if it starts the string
-    private static final Pattern UNESCAPED_HASH = Pattern.compile("(?<!\\\\)" + FieldWriter.BIBTEX_STRING_START_END_SYMBOL + "|^" + FieldWriter.BIBTEX_STRING_START_END_SYMBOL);
+    // Detect FieldWriter.BIBTEX_STRING_START_END_SYMBOL (#) if it doesn't have a \ in front of it
+    // or if it starts the string
+    private static final Pattern UNESCAPED_HASH =
+            Pattern.compile(
+                    "(?<!\\\\)"
+                            + FieldWriter.BIBTEX_STRING_START_END_SYMBOL
+                            + "|^"
+                            + FieldWriter.BIBTEX_STRING_START_END_SYMBOL);
 
     @Override
     public List<IntegrityMessage> check(BibEntry entry) {
@@ -35,8 +41,11 @@ public List<IntegrityMessage> check(BibEntry entry) {
                 }
                 if ((hashCount & 1) == 1) { // Check if odd
                     // # is FieldWriter.BIBTEX_STRING_START_END_SYMBOL
-                    results.add(new IntegrityMessage(Localization.lang("odd number of unescaped '#'"), entry,
-                            field.getKey()));
+                    results.add(
+                            new IntegrityMessage(
+                                    Localization.lang("odd number of unescaped '#'"),
+                                    entry,
+                                    field.getKey()));
                 }
             }
         }
diff --git a/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java b/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java
index b83e3039e933..c7ff467bf1a2 100644
--- a/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.types.EntryTypeFactory;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * BibTeX mode only checker
  */
@@ -20,8 +20,12 @@ public class BibTeXEntryTypeChecker implements EntryChecker {
     public List<IntegrityMessage> check(BibEntry entry) {
         if (EntryTypeFactory.isExclusiveBiblatex(entry.getType())) {
             return Collections.singletonList(
-                    new IntegrityMessage(Localization.lang("Entry type %0 is only defined for Biblatex but not for BibTeX", entry.getType().getDisplayName()), entry, InternalField.KEY_FIELD)
-            );
+                    new IntegrityMessage(
+                            Localization.lang(
+                                    "Entry type %0 is only defined for Biblatex but not for BibTeX",
+                                    entry.getType().getDisplayName()),
+                            entry,
+                            InternalField.KEY_FIELD));
         }
         return Collections.emptyList();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java b/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java
index 3ed8b36a6e72..54e871fd6f0e 100644
--- a/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.integrity;
 
-import java.util.Locale;
-import java.util.Optional;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Locale;
+import java.util.Optional;
+
 public class BooktitleChecker implements ValueChecker {
 
     @Override
diff --git a/src/main/java/org/jabref/logic/integrity/BracesCorrector.java b/src/main/java/org/jabref/logic/integrity/BracesCorrector.java
index 691287c72cce..6846c9c14383 100644
--- a/src/main/java/org/jabref/logic/integrity/BracesCorrector.java
+++ b/src/main/java/org/jabref/logic/integrity/BracesCorrector.java
@@ -5,7 +5,8 @@
 
 public class BracesCorrector {
 
-    private static final Pattern PATTERN_ESCAPED_CURLY_BRACES = Pattern.compile("(\\\\\\{)|(\\\\\\})");
+    private static final Pattern PATTERN_ESCAPED_CURLY_BRACES =
+            Pattern.compile("(\\\\\\{)|(\\\\\\})");
 
     public static String apply(String input) {
         if (input == null) {
@@ -15,7 +16,9 @@ public static String apply(String input) {
             String addedBraces = input;
             String c = matcher.replaceAll("");
 
-            long diff = c.chars().filter(ch -> ch == '{').count() - c.chars().filter(ch -> ch == '}').count();
+            long diff =
+                    c.chars().filter(ch -> ch == '{').count()
+                            - c.chars().filter(ch -> ch == '}').count();
             while (diff != 0) {
                 if (diff < 0) {
                     addedBraces = "{" + addedBraces;
diff --git a/src/main/java/org/jabref/logic/integrity/BracketChecker.java b/src/main/java/org/jabref/logic/integrity/BracketChecker.java
index bff56b03770f..8cf2c7265a95 100644
--- a/src/main/java/org/jabref/logic/integrity/BracketChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BracketChecker.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Optional;
+
 public class BracketChecker implements ValueChecker {
 
     @Override
diff --git a/src/main/java/org/jabref/logic/integrity/CitationKeyChecker.java b/src/main/java/org/jabref/logic/integrity/CitationKeyChecker.java
index 931bdd1a52ec..2a2f482fb617 100644
--- a/src/main/java/org/jabref/logic/integrity/CitationKeyChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/CitationKeyChecker.java
@@ -1,15 +1,15 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * Currently only checks the key if there is an author, year, and title present.
  */
@@ -26,8 +26,11 @@ public List<IntegrityMessage> check(BibEntry entry) {
 
         if (StringUtil.isBlank(entry.getCitationKey())) {
             String authorTitleYear = entry.getAuthorTitleYear(100);
-            return Collections.singletonList(new IntegrityMessage(
-                    Localization.lang("empty citation key") + ": " + authorTitleYear, entry, InternalField.KEY_FIELD));
+            return Collections.singletonList(
+                    new IntegrityMessage(
+                            Localization.lang("empty citation key") + ": " + authorTitleYear,
+                            entry,
+                            InternalField.KEY_FIELD));
         }
 
         return Collections.emptyList();
diff --git a/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java b/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
index 47d7bff811ad..d20d11099335 100644
--- a/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
@@ -1,10 +1,5 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.l10n.Localization;
@@ -12,12 +7,19 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 public class CitationKeyDeviationChecker implements EntryChecker {
 
     private final BibDatabaseContext bibDatabaseContext;
     private final CitationKeyPatternPreferences citationKeyPatternPreferences;
 
-    public CitationKeyDeviationChecker(BibDatabaseContext bibDatabaseContext, CitationKeyPatternPreferences citationKeyPatternPreferences) {
+    public CitationKeyDeviationChecker(
+            BibDatabaseContext bibDatabaseContext,
+            CitationKeyPatternPreferences citationKeyPatternPreferences) {
         this.bibDatabaseContext = Objects.requireNonNull(bibDatabaseContext);
         this.citationKeyPatternPreferences = Objects.requireNonNull(citationKeyPatternPreferences);
     }
@@ -32,11 +34,16 @@ public List<IntegrityMessage> check(BibEntry entry) {
         String key = valuekey.get();
 
         // generate new key
-        String generatedKey = new CitationKeyGenerator(bibDatabaseContext, citationKeyPatternPreferences).generateKey(entry);
+        String generatedKey =
+                new CitationKeyGenerator(bibDatabaseContext, citationKeyPatternPreferences)
+                        .generateKey(entry);
 
         if (!Objects.equals(key, generatedKey)) {
-            return Collections.singletonList(new IntegrityMessage(
-                    Localization.lang("Citation key deviates from generated key"), entry, InternalField.KEY_FIELD));
+            return Collections.singletonList(
+                    new IntegrityMessage(
+                            Localization.lang("Citation key deviates from generated key"),
+                            entry,
+                            InternalField.KEY_FIELD));
         }
 
         return Collections.emptyList();
diff --git a/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java b/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java
index ae222225e269..9efd65d20e19 100644
--- a/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java
@@ -1,15 +1,15 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 public class CitationKeyDuplicationChecker implements EntryChecker {
 
     private final BibDatabase database;
@@ -28,7 +28,8 @@ public List<IntegrityMessage> check(BibEntry entry) {
         boolean isDuplicate = database.isDuplicateCitationKeyExisting(citeKey.get());
         if (isDuplicate) {
             return Collections.singletonList(
-                    new IntegrityMessage(Localization.lang("Duplicate citation key"), entry, StandardField.KEY));
+                    new IntegrityMessage(
+                            Localization.lang("Duplicate citation key"), entry, StandardField.KEY));
         }
         return Collections.emptyList();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/DatabaseChecker.java b/src/main/java/org/jabref/logic/integrity/DatabaseChecker.java
index 0f03cccce633..e9285733d9c7 100644
--- a/src/main/java/org/jabref/logic/integrity/DatabaseChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DatabaseChecker.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.integrity;
 
-import java.util.List;
-
 import org.jabref.model.database.BibDatabase;
 
+import java.util.List;
+
 @FunctionalInterface
 public interface DatabaseChecker {
     List<IntegrityMessage> check(BibDatabase database);
diff --git a/src/main/java/org/jabref/logic/integrity/DateChecker.java b/src/main/java/org/jabref/logic/integrity/DateChecker.java
index a79e37994e86..33d882107cda 100644
--- a/src/main/java/org/jabref/logic/integrity/DateChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DateChecker.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.Date;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Optional;
+
 public class DateChecker implements ValueChecker {
 
     @Override
diff --git a/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java b/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java
index 41dfcdfba1a7..5a5f2bcbcfa1 100644
--- a/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java
@@ -1,8 +1,7 @@
 package org.jabref.logic.integrity;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 
 import javafx.collections.ObservableList;
 
@@ -12,8 +11,9 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class DoiDuplicationChecker implements DatabaseChecker {
 
@@ -22,14 +22,23 @@ public List<IntegrityMessage> check(BibDatabase database) {
         ObservableList<BibEntry> bibEntries = database.getEntries();
         BiMap<DOI, List<BibEntry>> duplicateMap = HashBiMap.create(bibEntries.size());
         for (BibEntry bibEntry : bibEntries) {
-            bibEntry.getDOI().ifPresent(doi ->
-                    duplicateMap.computeIfAbsent(doi, absentDoi -> new ArrayList<>()).add(bibEntry));
+            bibEntry.getDOI()
+                    .ifPresent(
+                            doi ->
+                                    duplicateMap
+                                            .computeIfAbsent(doi, absentDoi -> new ArrayList<>())
+                                            .add(bibEntry));
         }
 
         return duplicateMap.inverse().keySet().stream()
-                           .filter(list -> list.size() > 1)
-                           .flatMap(list -> list.stream())
-                           .map(item -> new IntegrityMessage(Localization.lang("Same DOI used in multiple entries"), item, StandardField.DOI))
-                           .collect(Collectors.toList());
+                .filter(list -> list.size() > 1)
+                .flatMap(list -> list.stream())
+                .map(
+                        item ->
+                                new IntegrityMessage(
+                                        Localization.lang("Same DOI used in multiple entries"),
+                                        item,
+                                        StandardField.DOI))
+                .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java b/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java
index a78c8b4d0eaf..1d841cd01d10 100644
--- a/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Optional;
+
 public class DoiValidityChecker implements ValueChecker {
     @Override
     public Optional<String> checkValue(String value) {
diff --git a/src/main/java/org/jabref/logic/integrity/EditionChecker.java b/src/main/java/org/jabref/logic/integrity/EditionChecker.java
index 697ca38e85c2..be00b1132656 100644
--- a/src/main/java/org/jabref/logic/integrity/EditionChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EditionChecker.java
@@ -1,19 +1,20 @@
 package org.jabref.logic.integrity;
 
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.strings.StringUtil;
+
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.strings.StringUtil;
-
 public class EditionChecker implements ValueChecker {
 
-    private static final Predicate<String> FIRST_LETTER_CAPITALIZED = Pattern.compile("^[A-Z]").asPredicate();
-    private static final Predicate<String> ONLY_NUMERALS_OR_LITERALS = Pattern.compile("^([0-9]+|[^0-9].+)$")
-                                                                              .asPredicate();
+    private static final Predicate<String> FIRST_LETTER_CAPITALIZED =
+            Pattern.compile("^[A-Z]").asPredicate();
+    private static final Predicate<String> ONLY_NUMERALS_OR_LITERALS =
+            Pattern.compile("^([0-9]+|[^0-9].+)$").asPredicate();
     private static final Predicate<String> ONLY_NUMERALS = Pattern.compile("[0-9]+").asPredicate();
     private static final String FIRST_EDITION = "1";
 
diff --git a/src/main/java/org/jabref/logic/integrity/EntryChecker.java b/src/main/java/org/jabref/logic/integrity/EntryChecker.java
index bcbe0e797691..67e911bd2e9d 100644
--- a/src/main/java/org/jabref/logic/integrity/EntryChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EntryChecker.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.integrity;
 
-import java.util.List;
-
 import org.jabref.model.entry.BibEntry;
 
+import java.util.List;
+
 @FunctionalInterface
 public interface EntryChecker {
     List<IntegrityMessage> check(BibEntry entry);
diff --git a/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java b/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
index 8827e8a21692..305afd4b9c63 100644
--- a/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
@@ -1,17 +1,17 @@
 package org.jabref.logic.integrity;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.Set;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldProperty;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Set;
+
 public class EntryLinkChecker implements EntryChecker {
 
     private final BibDatabase database;
@@ -25,12 +25,19 @@ public List<IntegrityMessage> check(BibEntry entry) {
         List<IntegrityMessage> result = new ArrayList<>();
         for (Entry<Field, String> field : entry.getFieldMap().entrySet()) {
             Set<FieldProperty> properties = field.getKey().getProperties();
-            if (properties.contains(FieldProperty.MULTIPLE_ENTRY_LINK) || properties.contains(FieldProperty.SINGLE_ENTRY_LINK)) {
+            if (properties.contains(FieldProperty.MULTIPLE_ENTRY_LINK)
+                    || properties.contains(FieldProperty.SINGLE_ENTRY_LINK)) {
                 entry.getEntryLinkList(field.getKey(), database).stream()
-                     .filter(parsedEntryLink -> parsedEntryLink.getLinkedEntry().isEmpty())
-                     .forEach(parsedEntryLink -> result.add(new IntegrityMessage(
-                             Localization.lang("Referenced citation key '%0' does not exist", parsedEntryLink.getKey()),
-                             entry, field.getKey())));
+                        .filter(parsedEntryLink -> parsedEntryLink.getLinkedEntry().isEmpty())
+                        .forEach(
+                                parsedEntryLink ->
+                                        result.add(
+                                                new IntegrityMessage(
+                                                        Localization.lang(
+                                                                "Referenced citation key '%0' does not exist",
+                                                                parsedEntryLink.getKey()),
+                                                        entry,
+                                                        field.getKey())));
             }
         }
         return result;
diff --git a/src/main/java/org/jabref/logic/integrity/FieldChecker.java b/src/main/java/org/jabref/logic/integrity/FieldChecker.java
index fa809a884cbc..a972d9dba21d 100644
--- a/src/main/java/org/jabref/logic/integrity/FieldChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/FieldChecker.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.integrity;
 
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.util.OptionalUtil;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.util.OptionalUtil;
-
 /**
  * This is a "proxy" to use a {@link ValueChecker} as {@link EntryChecker}.
  * The "proxy" is configured using the field to handle and the value checker to apply.
@@ -29,6 +29,8 @@ public List<IntegrityMessage> check(BibEntry entry) {
             return Collections.emptyList();
         }
 
-        return OptionalUtil.toList(checker.checkValue(value.get()).map(message -> new IntegrityMessage(message, entry, field)));
+        return OptionalUtil.toList(
+                checker.checkValue(value.get())
+                        .map(message -> new IntegrityMessage(message, entry, field)));
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/FieldCheckers.java b/src/main/java/org/jabref/logic/integrity/FieldCheckers.java
index 9f8b24eab2cd..f8a96d589756 100644
--- a/src/main/java/org/jabref/logic/integrity/FieldCheckers.java
+++ b/src/main/java/org/jabref/logic/integrity/FieldCheckers.java
@@ -1,8 +1,7 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
 
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
@@ -12,19 +11,32 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class FieldCheckers {
 
     private final Multimap<Field, ValueChecker> fieldChecker;
 
-    public FieldCheckers(BibDatabaseContext databaseContext, FilePreferences filePreferences,
-                         JournalAbbreviationRepository abbreviationRepository, boolean allowIntegerEdition) {
-        fieldChecker = getAllMap(databaseContext, filePreferences, abbreviationRepository, allowIntegerEdition);
+    public FieldCheckers(
+            BibDatabaseContext databaseContext,
+            FilePreferences filePreferences,
+            JournalAbbreviationRepository abbreviationRepository,
+            boolean allowIntegerEdition) {
+        fieldChecker =
+                getAllMap(
+                        databaseContext,
+                        filePreferences,
+                        abbreviationRepository,
+                        allowIntegerEdition);
     }
 
-    private static Multimap<Field, ValueChecker> getAllMap(BibDatabaseContext databaseContext, FilePreferences filePreferences, JournalAbbreviationRepository abbreviationRepository, boolean allowIntegerEdition) {
+    private static Multimap<Field, ValueChecker> getAllMap(
+            BibDatabaseContext databaseContext,
+            FilePreferences filePreferences,
+            JournalAbbreviationRepository abbreviationRepository,
+            boolean allowIntegerEdition) {
         ArrayListMultimap<Field, ValueChecker> fieldCheckers = ArrayListMultimap.create(50, 10);
 
         for (Field field : FieldFactory.getPersonNameFields()) {
@@ -34,7 +46,8 @@ private static Multimap<Field, ValueChecker> getAllMap(BibDatabaseContext databa
         fieldCheckers.put(StandardField.TITLE, new BracketChecker());
         fieldCheckers.put(StandardField.TITLE, new TitleChecker(databaseContext));
         fieldCheckers.put(StandardField.DOI, new DoiValidityChecker());
-        fieldCheckers.put(StandardField.EDITION, new EditionChecker(databaseContext, allowIntegerEdition));
+        fieldCheckers.put(
+                StandardField.EDITION, new EditionChecker(databaseContext, allowIntegerEdition));
         fieldCheckers.put(StandardField.FILE, new FileChecker(databaseContext, filePreferences));
         fieldCheckers.put(StandardField.HOWPUBLISHED, new HowPublishedChecker(databaseContext));
         fieldCheckers.put(StandardField.ISBN, new ISBNChecker());
@@ -59,15 +72,12 @@ private static Multimap<Field, ValueChecker> getAllMap(BibDatabaseContext databa
     }
 
     public List<FieldChecker> getAll() {
-        return fieldChecker
-                .entries()
-                .stream()
+        return fieldChecker.entries().stream()
                 .map(pair -> new FieldChecker(pair.getKey(), pair.getValue()))
                 .collect(Collectors.toList());
     }
 
     public Collection<ValueChecker> getForField(Field field) {
-        return fieldChecker
-                .get(field);
+        return fieldChecker.get(field);
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/FileChecker.java b/src/main/java/org/jabref/logic/integrity/FileChecker.java
index d59e3c5d1eab..ea3c5c229a1d 100644
--- a/src/main/java/org/jabref/logic/integrity/FileChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/FileChecker.java
@@ -1,11 +1,5 @@
 package org.jabref.logic.integrity;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.importer.util.FileFieldParser;
 import org.jabref.logic.l10n.Localization;
@@ -13,6 +7,12 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.strings.StringUtil;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class FileChecker implements ValueChecker {
 
     private final BibDatabaseContext context;
@@ -29,10 +29,10 @@ public Optional<String> checkValue(String value) {
             return Optional.empty();
         }
 
-        List<LinkedFile> linkedFiles = FileFieldParser
-                .parse(value).stream()
-                .filter(file -> !file.isOnlineLink())
-                .collect(Collectors.toList());
+        List<LinkedFile> linkedFiles =
+                FileFieldParser.parse(value).stream()
+                        .filter(file -> !file.isOnlineLink())
+                        .collect(Collectors.toList());
 
         for (LinkedFile file : linkedFiles) {
             Optional<Path> linkedFile = file.findIn(context, filePreferences);
diff --git a/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java b/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java
index b987a1f541a4..703cca81da59 100644
--- a/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.integrity;
 
-import java.util.List;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.FieldProperty;
 
+import java.util.List;
+import java.util.regex.Pattern;
+
 /**
  * Checks, if there are any HTML encoded characters in non-verbatim fields.
  */
@@ -17,9 +17,14 @@ public class HTMLCharacterChecker implements EntryChecker {
     @Override
     public List<IntegrityMessage> check(BibEntry entry) {
         return entry.getFieldMap().entrySet().stream()
-                    .filter(field -> !field.getKey().getProperties().contains(FieldProperty.VERBATIM))
-                    .filter(field -> HTML_CHARACTER_PATTERN.matcher(field.getValue()).find())
-                    .map(field -> new IntegrityMessage(Localization.lang("HTML encoded character found"), entry, field.getKey()))
-                    .toList();
+                .filter(field -> !field.getKey().getProperties().contains(FieldProperty.VERBATIM))
+                .filter(field -> HTML_CHARACTER_PATTERN.matcher(field.getValue()).find())
+                .map(
+                        field ->
+                                new IntegrityMessage(
+                                        Localization.lang("HTML encoded character found"),
+                                        entry,
+                                        field.getKey()))
+                .toList();
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java b/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java
index 75e358732fa1..ef51df312f32 100644
--- a/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java
@@ -1,17 +1,18 @@
 package org.jabref.logic.integrity;
 
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.strings.StringUtil;
+
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.strings.StringUtil;
-
 public class HowPublishedChecker implements ValueChecker {
 
-    private static final Predicate<String> FIRST_LETTER_CAPITALIZED = Pattern.compile("^[^a-z]").asPredicate();
+    private static final Predicate<String> FIRST_LETTER_CAPITALIZED =
+            Pattern.compile("^[^a-z]").asPredicate();
 
     private final BibDatabaseContext databaseContext;
 
diff --git a/src/main/java/org/jabref/logic/integrity/ISBNChecker.java b/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
index c774dc9148a6..b454a75b82c3 100644
--- a/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.ISBN;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Optional;
+
 public class ISBNChecker implements ValueChecker {
 
     @Override
diff --git a/src/main/java/org/jabref/logic/integrity/ISSNChecker.java b/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
index f7205d195b56..0338b57b3710 100644
--- a/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.ISSN;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Optional;
+
 public class ISSNChecker implements ValueChecker {
 
     @Override
diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
index aa83fe037dd0..04840b29e914 100644
--- a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
@@ -1,9 +1,5 @@
 package org.jabref.logic.integrity;
 
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
@@ -12,45 +8,61 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
 public class IntegrityCheck {
 
     private final BibDatabaseContext bibDatabaseContext;
     private final FieldCheckers fieldCheckers;
     private final List<EntryChecker> entryCheckers;
 
-    public IntegrityCheck(BibDatabaseContext bibDatabaseContext,
-                          FilePreferences filePreferences,
-                          CitationKeyPatternPreferences citationKeyPatternPreferences,
-                          JournalAbbreviationRepository journalAbbreviationRepository,
-                          boolean allowIntegerEdition) {
+    public IntegrityCheck(
+            BibDatabaseContext bibDatabaseContext,
+            FilePreferences filePreferences,
+            CitationKeyPatternPreferences citationKeyPatternPreferences,
+            JournalAbbreviationRepository journalAbbreviationRepository,
+            boolean allowIntegerEdition) {
         this.bibDatabaseContext = bibDatabaseContext;
 
-        fieldCheckers = new FieldCheckers(bibDatabaseContext,
-                filePreferences,
-                journalAbbreviationRepository,
-                allowIntegerEdition);
-
-        entryCheckers = new ArrayList<>(List.of(
-                new CitationKeyChecker(),
-                new TypeChecker(),
-                new BibStringChecker(),
-                new HTMLCharacterChecker(),
-                new EntryLinkChecker(bibDatabaseContext.getDatabase()),
-                new CitationKeyDeviationChecker(bibDatabaseContext, citationKeyPatternPreferences),
-                new CitationKeyDuplicationChecker(bibDatabaseContext.getDatabase()),
-                new AmpersandChecker(),
-                new LatexIntegrityChecker(),
-                new JournalInAbbreviationListChecker(StandardField.JOURNAL, journalAbbreviationRepository)));
+        fieldCheckers =
+                new FieldCheckers(
+                        bibDatabaseContext,
+                        filePreferences,
+                        journalAbbreviationRepository,
+                        allowIntegerEdition);
+
+        entryCheckers =
+                new ArrayList<>(
+                        List.of(
+                                new CitationKeyChecker(),
+                                new TypeChecker(),
+                                new BibStringChecker(),
+                                new HTMLCharacterChecker(),
+                                new EntryLinkChecker(bibDatabaseContext.getDatabase()),
+                                new CitationKeyDeviationChecker(
+                                        bibDatabaseContext, citationKeyPatternPreferences),
+                                new CitationKeyDuplicationChecker(bibDatabaseContext.getDatabase()),
+                                new AmpersandChecker(),
+                                new LatexIntegrityChecker(),
+                                new JournalInAbbreviationListChecker(
+                                        StandardField.JOURNAL, journalAbbreviationRepository)));
 
         if (bibDatabaseContext.isBiblatexMode()) {
-            entryCheckers.add(new UTF8Checker(bibDatabaseContext.getMetaData().getEncoding().orElse(StandardCharsets.UTF_8)));
+            entryCheckers.add(
+                    new UTF8Checker(
+                            bibDatabaseContext
+                                    .getMetaData()
+                                    .getEncoding()
+                                    .orElse(StandardCharsets.UTF_8)));
         } else {
-            entryCheckers.addAll(List.of(
-                    new ASCIICharacterChecker(),
-                    new NoBibtexFieldChecker(),
-                    new UnicodeNormalFormCanonicalCompositionCheck(),
-                    new BibTeXEntryTypeChecker())
-            );
+            entryCheckers.addAll(
+                    List.of(
+                            new ASCIICharacterChecker(),
+                            new NoBibtexFieldChecker(),
+                            new UnicodeNormalFormCanonicalCompositionCheck(),
+                            new BibTeXEntryTypeChecker()));
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java b/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java
index 74c0c638c7a6..ded8b679b3d1 100644
--- a/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java
@@ -3,14 +3,16 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
-public record IntegrityMessage(
-        String message,
-        BibEntry entry,
-        Field field) implements Cloneable {
+public record IntegrityMessage(String message, BibEntry entry, Field field) implements Cloneable {
 
     @Override
     public String toString() {
-        return "[" + entry().getCitationKey().orElse(entry().getAuthorTitleYear(50)) + "] in " + field.getDisplayName() + ": " + message();
+        return "["
+                + entry().getCitationKey().orElse(entry().getAuthorTitleYear(50))
+                + "] in "
+                + field.getDisplayName()
+                + ": "
+                + message();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java b/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java
index 88269b27dd7a..d465aab05168 100644
--- a/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java
@@ -1,21 +1,22 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 public class JournalInAbbreviationListChecker implements EntryChecker {
 
     private final Field field;
     private final JournalAbbreviationRepository abbreviationRepository;
 
-    public JournalInAbbreviationListChecker(Field field, JournalAbbreviationRepository abbreviationRepository) {
+    public JournalInAbbreviationListChecker(
+            Field field, JournalAbbreviationRepository abbreviationRepository) {
         this.field = Objects.requireNonNull(field);
         this.abbreviationRepository = Objects.requireNonNull(abbreviationRepository);
     }
@@ -29,7 +30,11 @@ public List<IntegrityMessage> check(BibEntry entry) {
 
         final String journal = value.get();
         if (!abbreviationRepository.isKnownName(journal)) {
-            return Collections.singletonList(new IntegrityMessage(Localization.lang("journal not found in abbreviation list"), entry, field));
+            return Collections.singletonList(
+                    new IntegrityMessage(
+                            Localization.lang("journal not found in abbreviation list"),
+                            entry,
+                            field));
         }
 
         return Collections.emptyList();
diff --git a/src/main/java/org/jabref/logic/integrity/LatexIntegrityChecker.java b/src/main/java/org/jabref/logic/integrity/LatexIntegrityChecker.java
index d2de418349ce..2a1fa200b79e 100644
--- a/src/main/java/org/jabref/logic/integrity/LatexIntegrityChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/LatexIntegrityChecker.java
@@ -1,13 +1,6 @@
 package org.jabref.logic.integrity;
 
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.stream.Stream;
+import static uk.ac.ed.ph.snuggletex.definitions.Globals.TEXT_MODE_ONLY;
 
 import javafx.util.Pair;
 
@@ -15,9 +8,9 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import uk.ac.ed.ph.snuggletex.ErrorCode;
 import uk.ac.ed.ph.snuggletex.InputError;
 import uk.ac.ed.ph.snuggletex.SnuggleEngine;
@@ -27,7 +20,14 @@
 import uk.ac.ed.ph.snuggletex.definitions.CoreErrorCode;
 import uk.ac.ed.ph.snuggletex.definitions.CoreErrorGroup;
 
-import static uk.ac.ed.ph.snuggletex.definitions.Globals.TEXT_MODE_ONLY;
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.stream.Stream;
 
 /**
  * Similar check to {@link HTMLCharacterChecker}.
@@ -40,17 +40,20 @@ public class LatexIntegrityChecker implements EntryChecker {
     private static final Logger LOGGER = LoggerFactory.getLogger(LatexIntegrityChecker.class);
     private static final SnuggleEngine ENGINE = new SnuggleEngine();
     private static final SnuggleSession SESSION;
-    private static final ResourceBundle ERROR_MESSAGES = ENGINE.getPackages().getFirst().getErrorMessageBundle();
+    private static final ResourceBundle ERROR_MESSAGES =
+            ENGINE.getPackages().getFirst().getErrorMessageBundle();
     private static final Set<ErrorCode> EXCLUDED_ERRORS = new HashSet<>();
 
     static {
         SnugglePackage snugglePackage = ENGINE.getPackages().getFirst();
         snugglePackage.addComplexCommand("textgreater", false, 0, TEXT_MODE_ONLY, null, null, null);
         snugglePackage.addComplexCommand("textless", false, 0, TEXT_MODE_ONLY, null, null, null);
-        snugglePackage.addComplexCommand("textbackslash", false, 0, TEXT_MODE_ONLY, null, null, null);
+        snugglePackage.addComplexCommand(
+                "textbackslash", false, 0, TEXT_MODE_ONLY, null, null, null);
         snugglePackage.addComplexCommand("textbar", false, 0, TEXT_MODE_ONLY, null, null, null);
         // ENGINE.getPackages().get(0).addComplexCommandOneArg()
-              // engine.getPackages().get(0).addComplexCommandOneArg("text", false, ALL_MODES,LR, StyleDeclarationInterpretation.NORMALSIZE, null, TextFlowContext.ALLOW_INLINE);
+        // engine.getPackages().get(0).addComplexCommandOneArg("text", false, ALL_MODES,LR,
+        // StyleDeclarationInterpretation.NORMALSIZE, null, TextFlowContext.ALLOW_INLINE);
 
         SESSION = ENGINE.createSession();
         SESSION.getConfiguration().setFailingFast(true);
@@ -62,17 +65,29 @@ public class LatexIntegrityChecker implements EntryChecker {
     @Override
     public List<IntegrityMessage> check(BibEntry entry) {
         return entry.getFieldMap().entrySet().stream()
-                    .filter(field -> FieldFactory.isLatexField(field.getKey()))
-                    .flatMap(LatexIntegrityChecker::getUnescapedAmpersandsWithCount)
-                    // Exclude all DOM building errors as this functionality is not used.
-                    .filter(pair -> !pair.getValue().getErrorCode().getErrorGroup().equals(CoreErrorGroup.TDE))
-                    .filter(pair -> !EXCLUDED_ERRORS.contains(pair.getValue().getErrorCode()))
-                    .map(pair ->
-                            new IntegrityMessage(errorMessageFormatHelper(pair.getValue().getErrorCode(), pair.getValue().getArguments()), entry, pair.getKey()))
-                    .toList();
+                .filter(field -> FieldFactory.isLatexField(field.getKey()))
+                .flatMap(LatexIntegrityChecker::getUnescapedAmpersandsWithCount)
+                // Exclude all DOM building errors as this functionality is not used.
+                .filter(
+                        pair ->
+                                !pair.getValue()
+                                        .getErrorCode()
+                                        .getErrorGroup()
+                                        .equals(CoreErrorGroup.TDE))
+                .filter(pair -> !EXCLUDED_ERRORS.contains(pair.getValue().getErrorCode()))
+                .map(
+                        pair ->
+                                new IntegrityMessage(
+                                        errorMessageFormatHelper(
+                                                pair.getValue().getErrorCode(),
+                                                pair.getValue().getArguments()),
+                                        entry,
+                                        pair.getKey()))
+                .toList();
     }
 
-    private static Stream<Pair<Field, InputError>> getUnescapedAmpersandsWithCount(Map.Entry<Field, String> entry) {
+    private static Stream<Pair<Field, InputError>> getUnescapedAmpersandsWithCount(
+            Map.Entry<Field, String> entry) {
         SESSION.reset();
         SnuggleInput input = new SnuggleInput(entry.getValue());
         try {
@@ -86,13 +101,16 @@ private static Stream<Pair<Field, InputError>> getUnescapedAmpersandsWithCount(M
         }
         // Retrieve the first error only because it is likely to be more meaningful.
         // Displaying all (subsequent) faults may lead to confusion.
-        // We further get a slight performance benefit from failing fast (see static config in class header).
+        // We further get a slight performance benefit from failing fast (see static config in class
+        // header).
         InputError error = SESSION.getErrors().getFirst();
         return Stream.of(new Pair<>(entry.getKey(), error));
     }
 
-    public static String errorMessageFormatHelper(ErrorCode snuggleTexErrorCode, Object... arguments) {
-        String snuggletexMessagePattern = LatexIntegrityChecker.ERROR_MESSAGES.getString(snuggleTexErrorCode.getName());
+    public static String errorMessageFormatHelper(
+            ErrorCode snuggleTexErrorCode, Object... arguments) {
+        String snuggletexMessagePattern =
+                LatexIntegrityChecker.ERROR_MESSAGES.getString(snuggleTexErrorCode.getName());
         String snuggletexErrorMessage = MessageFormat.format(snuggletexMessagePattern, arguments);
         return Localization.lang("LaTeX Warning: %0", snuggletexErrorMessage);
     }
diff --git a/src/main/java/org/jabref/logic/integrity/MonthChecker.java b/src/main/java/org/jabref/logic/integrity/MonthChecker.java
index f3b34b8f901a..16dcf71af520 100644
--- a/src/main/java/org/jabref/logic/integrity/MonthChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/MonthChecker.java
@@ -1,21 +1,22 @@
 package org.jabref.logic.integrity;
 
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.strings.StringUtil;
+
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.strings.StringUtil;
-
 public class MonthChecker implements ValueChecker {
 
-    private static final Predicate<String> ONLY_AN_INTEGER = Pattern.compile("[1-9]|10|11|12")
-                                                                    .asPredicate();
-    private static final Predicate<String> MONTH_NORMALIZED = Pattern
-            .compile("#jan#|#feb#|#mar#|#apr#|#may#|#jun#|#jul#|#aug#|#sep#|#oct#|#nov#|#dec#")
-            .asPredicate();
+    private static final Predicate<String> ONLY_AN_INTEGER =
+            Pattern.compile("[1-9]|10|11|12").asPredicate();
+    private static final Predicate<String> MONTH_NORMALIZED =
+            Pattern.compile(
+                            "#jan#|#feb#|#mar#|#apr#|#may#|#jun#|#jul#|#aug#|#sep#|#oct#|#nov#|#dec#")
+                    .asPredicate();
 
     private final BibDatabaseContext bibDatabaseContextMonth;
 
diff --git a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
index feb29ad750d4..4dcc80185924 100644
--- a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
@@ -1,9 +1,5 @@
 package org.jabref.logic.integrity;
 
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.BibField;
@@ -12,30 +8,41 @@
 import org.jabref.model.entry.types.BiblatexEntryTypeDefinitions;
 import org.jabref.model.entry.types.BibtexEntryTypeDefinitions;
 
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * This checker checks whether the entry does not contain any field appearing only in biblatex (and not in BibTeX)
  */
 public class NoBibtexFieldChecker implements EntryChecker {
 
     private Set<Field> getAllBiblatexOnlyFields() {
-        Set<BibField> allBibtexFields = BibtexEntryTypeDefinitions.ALL.stream().flatMap(type -> type.getAllBibFields().stream()).collect(Collectors.toSet());
+        Set<BibField> allBibtexFields =
+                BibtexEntryTypeDefinitions.ALL.stream()
+                        .flatMap(type -> type.getAllBibFields().stream())
+                        .collect(Collectors.toSet());
         return BiblatexEntryTypeDefinitions.ALL.stream()
-                                               .flatMap(type -> type.getAllBibFields().stream())
-                                               .filter(field -> !allBibtexFields.contains(field))
-                                               .map(BibField::field)
-                                               // these fields are displayed by JabRef as default
-                                               .filter(field -> !field.equals(StandardField.ABSTRACT))
-                                               .filter(field -> !field.equals(StandardField.COMMENT))
-                                               .filter(field -> !field.equals(StandardField.DOI))
-                                               .filter(field -> !field.equals(StandardField.URL))
-                                               .collect(Collectors.toSet());
+                .flatMap(type -> type.getAllBibFields().stream())
+                .filter(field -> !allBibtexFields.contains(field))
+                .map(BibField::field)
+                // these fields are displayed by JabRef as default
+                .filter(field -> !field.equals(StandardField.ABSTRACT))
+                .filter(field -> !field.equals(StandardField.COMMENT))
+                .filter(field -> !field.equals(StandardField.DOI))
+                .filter(field -> !field.equals(StandardField.URL))
+                .collect(Collectors.toSet());
     }
 
     @Override
     public List<IntegrityMessage> check(BibEntry entry) {
         final Set<Field> allBiblatexOnlyFields = getAllBiblatexOnlyFields();
         return entry.getFields().stream()
-                    .filter(allBiblatexOnlyFields::contains)
-                    .map(name -> new IntegrityMessage(Localization.lang("biblatex field only"), entry, name)).collect(Collectors.toList());
+                .filter(allBiblatexOnlyFields::contains)
+                .map(
+                        name ->
+                                new IntegrityMessage(
+                                        Localization.lang("biblatex field only"), entry, name))
+                .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/NoteChecker.java b/src/main/java/org/jabref/logic/integrity/NoteChecker.java
index db80442d1e96..fdbfa1d989ce 100644
--- a/src/main/java/org/jabref/logic/integrity/NoteChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/NoteChecker.java
@@ -1,17 +1,18 @@
 package org.jabref.logic.integrity;
 
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.strings.StringUtil;
+
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.strings.StringUtil;
-
 public class NoteChecker implements ValueChecker {
 
-    private static final Predicate<String> FIRST_LETTER_CAPITALIZED = Pattern.compile("^[^a-z]").asPredicate();
+    private static final Predicate<String> FIRST_LETTER_CAPITALIZED =
+            Pattern.compile("^[^a-z]").asPredicate();
 
     private final BibDatabaseContext bibDatabaseContextEdition;
 
@@ -32,7 +33,8 @@ public Optional<String> checkValue(String value) {
         }
 
         // BibTeX
-        if (!bibDatabaseContextEdition.isBiblatexMode() && !FIRST_LETTER_CAPITALIZED.test(value.trim())) {
+        if (!bibDatabaseContextEdition.isBiblatexMode()
+                && !FIRST_LETTER_CAPITALIZED.test(value.trim())) {
             return Optional.of(Localization.lang("should have the first letter capitalized"));
         }
 
diff --git a/src/main/java/org/jabref/logic/integrity/PagesChecker.java b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
index d21caa310ff6..08c15d7d57d6 100644
--- a/src/main/java/org/jabref/logic/integrity/PagesChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
@@ -1,34 +1,37 @@
 package org.jabref.logic.integrity;
 
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.strings.StringUtil;
+
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.strings.StringUtil;
-
 public class PagesChecker implements ValueChecker {
 
-    private static final String PAGES_EXP_BIBTEX = ""
-            + "\\A"                 // begin String
-            + "[A-Za-z]?\\d*"       // optional prefix and number
-            + "("
-            + "(\\+|-{2}|\u2013)"   // separator, must contain exactly two dashes
-            + "[A-Za-z]?\\d*"       // optional prefix and number
-            + ")?"
-            + "\\z";                // end String
+    private static final String PAGES_EXP_BIBTEX =
+            ""
+                    + "\\A" // begin String
+                    + "[A-Za-z]?\\d*" // optional prefix and number
+                    + "("
+                    + "(\\+|-{2}|\u2013)" // separator, must contain exactly two dashes
+                    + "[A-Za-z]?\\d*" // optional prefix and number
+                    + ")?"
+                    + "\\z"; // end String
 
-    // See https://packages.oth-regensburg.de/ctan/macros/latex/contrib/biblatex/doc/biblatex.pdf#subsubsection.3.15.3 for valid content
-    private static final String PAGES_EXP_BIBLATEX = ""
-            + "\\A"               // begin String
-            + "[A-Za-z]?\\d*"     // optional prefix and number
-            + "("
-            + "(\\+|-{1,2}|\u2013)" // separator
-            + "[A-Za-z]?\\d*"     // optional prefix and number
-            + ")?"
-            + "\\z";              // end String
+    // See
+    // https://packages.oth-regensburg.de/ctan/macros/latex/contrib/biblatex/doc/biblatex.pdf#subsubsection.3.15.3 for valid content
+    private static final String PAGES_EXP_BIBLATEX =
+            ""
+                    + "\\A" // begin String
+                    + "[A-Za-z]?\\d*" // optional prefix and number
+                    + "("
+                    + "(\\+|-{1,2}|\u2013)" // separator
+                    + "[A-Za-z]?\\d*" // optional prefix and number
+                    + ")?"
+                    + "\\z"; // end String
 
     private final Predicate<String> isValidPageNumber;
 
diff --git a/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java b/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java
index 59c39fea13ea..6739d03a846c 100644
--- a/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.integrity;
 
-import java.util.Locale;
-import java.util.Optional;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.format.RemoveBrackets;
 import org.jabref.model.database.BibDatabaseContext;
@@ -10,6 +7,9 @@
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Locale;
+import java.util.Optional;
+
 public class PersonNamesChecker implements ValueChecker {
 
     private final BibDatabaseMode bibMode;
@@ -25,9 +25,11 @@ public Optional<String> checkValue(String value) {
         }
 
         String valueTrimmedAndLowerCase = value.trim().toLowerCase(Locale.ROOT);
-        if (valueTrimmedAndLowerCase.startsWith("and ") || valueTrimmedAndLowerCase.startsWith(",")) {
+        if (valueTrimmedAndLowerCase.startsWith("and ")
+                || valueTrimmedAndLowerCase.startsWith(",")) {
             return Optional.of(Localization.lang("should start with a name"));
-        } else if (valueTrimmedAndLowerCase.endsWith(" and") || valueTrimmedAndLowerCase.endsWith(",")) {
+        } else if (valueTrimmedAndLowerCase.endsWith(" and")
+                || valueTrimmedAndLowerCase.endsWith(",")) {
             return Optional.of(Localization.lang("should end with a name"));
         }
 
@@ -39,7 +41,10 @@ public Optional<String> checkValue(String value) {
         AuthorList authorList = AuthorList.parse(value);
         if (!authorList.getAsLastFirstNamesWithAnd(false).equals(value)
                 && !authorList.getAsFirstLastNamesWithAnd().equals(value)) {
-            return Optional.of(Localization.lang("Names are not in the standard %0 format.", bibMode.getFormattedName()));
+            return Optional.of(
+                    Localization.lang(
+                            "Names are not in the standard %0 format.",
+                            bibMode.getFormattedName()));
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/TitleChecker.java b/src/main/java/org/jabref/logic/integrity/TitleChecker.java
index 824c8673f46c..18ffadf1e394 100644
--- a/src/main/java/org/jabref/logic/integrity/TitleChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/TitleChecker.java
@@ -1,18 +1,19 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+
 public class TitleChecker implements ValueChecker {
 
     private static final Pattern INSIDE_CURLY_BRAKETS = Pattern.compile("\\{[^}\\{]*\\}");
     private static final Pattern DELIMITERS = Pattern.compile("\\.|\\!|\\?|\\;|\\:|\\[");
-    private static final Predicate<String> HAS_CAPITAL_LETTERS = Pattern.compile("[\\p{Lu}\\p{Lt}]").asPredicate();
+    private static final Predicate<String> HAS_CAPITAL_LETTERS =
+            Pattern.compile("[\\p{Lu}\\p{Lt}]").asPredicate();
 
     private final BibDatabaseContext databaseContext;
 
@@ -40,7 +41,8 @@ public Optional<String> checkValue(String value) {
             return Optional.empty();
         }
 
-        String valueOnlySpacesWithinCurlyBraces = INSIDE_CURLY_BRAKETS.matcher(value).replaceAll("");
+        String valueOnlySpacesWithinCurlyBraces =
+                INSIDE_CURLY_BRAKETS.matcher(value).replaceAll("");
 
         String[] splitTitle = DELIMITERS.split(valueOnlySpacesWithinCurlyBraces);
         for (String subTitle : splitTitle) {
@@ -48,7 +50,9 @@ public Optional<String> checkValue(String value) {
             if (!subTitle.isEmpty()) {
                 subTitle = subTitle.substring(1);
                 if (HAS_CAPITAL_LETTERS.test(subTitle)) {
-                    return Optional.of(Localization.lang("capital letters are not masked using curly brackets {}"));
+                    return Optional.of(
+                            Localization.lang(
+                                    "capital letters are not masked using curly brackets {}"));
                 }
             }
         }
diff --git a/src/main/java/org/jabref/logic/integrity/TypeChecker.java b/src/main/java/org/jabref/logic/integrity/TypeChecker.java
index a22663e53bfc..f8c76b4eb8a7 100644
--- a/src/main/java/org/jabref/logic/integrity/TypeChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/TypeChecker.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
 public class TypeChecker implements EntryChecker {
 
     @Override
@@ -19,8 +19,11 @@ public List<IntegrityMessage> check(BibEntry entry) {
         }
 
         if (StandardEntryType.Proceedings == entry.getType()) {
-            return Collections.singletonList(new IntegrityMessage(
-                    Localization.lang("wrong entry type as proceedings has page numbers"), entry, StandardField.PAGES));
+            return Collections.singletonList(
+                    new IntegrityMessage(
+                            Localization.lang("wrong entry type as proceedings has page numbers"),
+                            entry,
+                            StandardField.PAGES));
         }
 
         return Collections.emptyList();
diff --git a/src/main/java/org/jabref/logic/integrity/UTF8Checker.java b/src/main/java/org/jabref/logic/integrity/UTF8Checker.java
index 534b99cd47fc..d9cff59f3d1b 100644
--- a/src/main/java/org/jabref/logic/integrity/UTF8Checker.java
+++ b/src/main/java/org/jabref/logic/integrity/UTF8Checker.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.integrity;
 
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+
 import java.nio.ByteBuffer;
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
@@ -9,10 +13,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
-
 public class UTF8Checker implements EntryChecker {
     private final Charset charset;
 
@@ -41,8 +41,11 @@ public List<IntegrityMessage> check(BibEntry entry) {
         for (Map.Entry<Field, String> field : entry.getFieldMap().entrySet()) {
             boolean utfOnly = UTF8EncodingChecker(field.getValue().getBytes(charset));
             if (!utfOnly) {
-                results.add(new IntegrityMessage(Localization.lang("Non-UTF-8 encoded field found"), entry,
-                        field.getKey()));
+                results.add(
+                        new IntegrityMessage(
+                                Localization.lang("Non-UTF-8 encoded field found"),
+                                entry,
+                                field.getKey()));
             }
         }
         return results;
diff --git a/src/main/java/org/jabref/logic/integrity/UnicodeNormalFormCanonicalCompositionCheck.java b/src/main/java/org/jabref/logic/integrity/UnicodeNormalFormCanonicalCompositionCheck.java
index c8767a689c23..038328a9ff85 100644
--- a/src/main/java/org/jabref/logic/integrity/UnicodeNormalFormCanonicalCompositionCheck.java
+++ b/src/main/java/org/jabref/logic/integrity/UnicodeNormalFormCanonicalCompositionCheck.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.integrity;
 
-import java.text.Normalizer;
-import java.util.List;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 
+import java.text.Normalizer;
+import java.util.List;
+
 /**
  * Detect any Unicode characters that is not in NFC format. NFC:  <a href="https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms">Normal form "Normalization Form Canonical Composition" (NFC)</a>: Characters are decomposed and then recomposed by canonical equivalence.
  *
@@ -15,12 +15,15 @@ public class UnicodeNormalFormCanonicalCompositionCheck implements EntryChecker
 
     @Override
     public List<IntegrityMessage> check(BibEntry entry) {
-        return entry.getFieldMap()
-                    .entrySet()
-                    .stream()
-                    .filter(field -> !Normalizer.isNormalized(field.getValue(), Normalizer.Form.NFC))
-                    .map(field -> new IntegrityMessage(Localization.lang("Value is not in Unicode's Normalization Form \"Canonical Composition\" (NFC) format"), entry,
-                            field.getKey()))
-                    .toList();
+        return entry.getFieldMap().entrySet().stream()
+                .filter(field -> !Normalizer.isNormalized(field.getValue(), Normalizer.Form.NFC))
+                .map(
+                        field ->
+                                new IntegrityMessage(
+                                        Localization.lang(
+                                                "Value is not in Unicode's Normalization Form \"Canonical Composition\" (NFC) format"),
+                                        entry,
+                                        field.getKey()))
+                .toList();
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/UrlChecker.java b/src/main/java/org/jabref/logic/integrity/UrlChecker.java
index 8d99968ac968..1d15dd77d209 100644
--- a/src/main/java/org/jabref/logic/integrity/UrlChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/UrlChecker.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Optional;
+
 public class UrlChecker implements ValueChecker {
 
     @Override
@@ -14,7 +14,9 @@ public Optional<String> checkValue(String value) {
         }
 
         if (!value.contains("://")) {
-            return Optional.of(Localization.lang("should contain a protocol") + ": http[s]://, file://, ftp://, ...");
+            return Optional.of(
+                    Localization.lang("should contain a protocol")
+                            + ": http[s]://, file://, ftp://, ...");
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/ValidCitationKeyChecker.java b/src/main/java/org/jabref/logic/integrity/ValidCitationKeyChecker.java
index e23fcb2b41e9..61890502f346 100644
--- a/src/main/java/org/jabref/logic/integrity/ValidCitationKeyChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ValidCitationKeyChecker.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
-
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Optional;
+
 /**
  * Makes sure the key is legal
  */
diff --git a/src/main/java/org/jabref/logic/integrity/YearChecker.java b/src/main/java/org/jabref/logic/integrity/YearChecker.java
index 3dc98f75d2d4..7d988b702ee6 100644
--- a/src/main/java/org/jabref/logic/integrity/YearChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/YearChecker.java
@@ -1,17 +1,18 @@
 package org.jabref.logic.integrity;
 
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.strings.StringUtil;
+
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.strings.StringUtil;
-
 public class YearChecker implements ValueChecker {
 
-    private static final Predicate<String> CONTAINS_FOUR_DIGIT = Pattern.compile("([^0-9]|^)[0-9]{4}([^0-9]|$)")
-                                                                        .asPredicate();
-    private static final Predicate<String> ENDS_WITH_FOUR_DIGIT = Pattern.compile("[0-9]{4}$").asPredicate();
+    private static final Predicate<String> CONTAINS_FOUR_DIGIT =
+            Pattern.compile("([^0-9]|^)[0-9]{4}([^0-9]|$)").asPredicate();
+    private static final Predicate<String> ENDS_WITH_FOUR_DIGIT =
+            Pattern.compile("[0-9]{4}$").asPredicate();
     private static final String PUNCTUATION_MARKS = "[(){},.;!?<>%&$]";
 
     /**
@@ -32,7 +33,8 @@ public Optional<String> checkValue(String value) {
         }
 
         if (!ENDS_WITH_FOUR_DIGIT.test(value.replaceAll(PUNCTUATION_MARKS, ""))) {
-            return Optional.of(Localization.lang("last four nonpunctuation characters should be numerals"));
+            return Optional.of(
+                    Localization.lang("last four nonpunctuation characters should be numerals"));
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/journals/Abbreviation.java b/src/main/java/org/jabref/logic/journals/Abbreviation.java
index 8c0b166543f9..fb57ea1bace3 100644
--- a/src/main/java/org/jabref/logic/journals/Abbreviation.java
+++ b/src/main/java/org/jabref/logic/journals/Abbreviation.java
@@ -19,14 +19,19 @@ public Abbreviation(String name, String abbreviation) {
     }
 
     public Abbreviation(String name, String abbreviation, String shortestUniqueAbbreviation) {
-        this(name,
+        this(
+                name,
                 abbreviation,
                 // "L. N." becomes "L  N ", we need to remove the double spaces inbetween
                 abbreviation.replace(".", " ").replace("  ", " ").trim(),
                 shortestUniqueAbbreviation.trim());
     }
 
-    private Abbreviation(String name, String abbreviation, String dotlessAbbreviation, String shortestUniqueAbbreviation) {
+    private Abbreviation(
+            String name,
+            String abbreviation,
+            String dotlessAbbreviation,
+            String shortestUniqueAbbreviation) {
         this.name = name.intern();
         this.abbreviation = abbreviation.intern();
         this.dotlessAbbreviation = dotlessAbbreviation.intern();
@@ -49,7 +54,8 @@ public String getShortestUniqueAbbreviation() {
     }
 
     public boolean isDefaultShortestUniqueAbbreviation() {
-        return (shortestUniqueAbbreviation.isEmpty()) || this.shortestUniqueAbbreviation.equals(this.abbreviation);
+        return (shortestUniqueAbbreviation.isEmpty())
+                || this.shortestUniqueAbbreviation.equals(this.abbreviation);
     }
 
     public String getDotlessAbbreviation() {
@@ -75,8 +81,11 @@ public String getNext(String current) {
         String currentTrimmed = current.trim();
 
         if (getDotlessAbbreviation().equals(currentTrimmed)) {
-            return getShortestUniqueAbbreviation().equals(getAbbreviation()) ? getName() : getShortestUniqueAbbreviation();
-        } else if (getShortestUniqueAbbreviation().equals(currentTrimmed) && !getShortestUniqueAbbreviation().equals(getAbbreviation())) {
+            return getShortestUniqueAbbreviation().equals(getAbbreviation())
+                    ? getName()
+                    : getShortestUniqueAbbreviation();
+        } else if (getShortestUniqueAbbreviation().equals(currentTrimmed)
+                && !getShortestUniqueAbbreviation().equals(getAbbreviation())) {
             return getName();
         } else if (getName().equals(currentTrimmed)) {
             return getAbbreviation();
@@ -87,11 +96,12 @@ public String getNext(String current) {
 
     @Override
     public String toString() {
-        return "Abbreviation{name=%s, abbreviation=%s, dotlessAbbreviation=%s, shortestUniqueAbbreviation=%s}".formatted(
-                this.name,
-                this.abbreviation,
-                this.dotlessAbbreviation,
-                this.shortestUniqueAbbreviation);
+        return "Abbreviation{name=%s, abbreviation=%s, dotlessAbbreviation=%s, shortestUniqueAbbreviation=%s}"
+                .formatted(
+                        this.name,
+                        this.abbreviation,
+                        this.dotlessAbbreviation,
+                        this.shortestUniqueAbbreviation);
     }
 
     @Override
@@ -103,7 +113,9 @@ public boolean equals(Object o) {
             return false;
         }
         Abbreviation that = (Abbreviation) o;
-        return getName().equals(that.getName()) && getAbbreviation().equals(that.getAbbreviation()) && getShortestUniqueAbbreviation().equals(that.getShortestUniqueAbbreviation());
+        return getName().equals(that.getName())
+                && getAbbreviation().equals(that.getAbbreviation())
+                && getShortestUniqueAbbreviation().equals(that.getShortestUniqueAbbreviation());
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/journals/AbbreviationFormat.java b/src/main/java/org/jabref/logic/journals/AbbreviationFormat.java
index 21734cad692f..d7b4eefe7ab3 100644
--- a/src/main/java/org/jabref/logic/journals/AbbreviationFormat.java
+++ b/src/main/java/org/jabref/logic/journals/AbbreviationFormat.java
@@ -8,11 +8,11 @@ public final class AbbreviationFormat {
     public static final char ESCAPE = '\\';
     public static final char QUOTE = '"';
 
-    private AbbreviationFormat() {
-    }
+    private AbbreviationFormat() {}
 
     public static CSVFormat getCSVFormatWithDelimiter(char delimiter) {
-        return CSVFormat.DEFAULT.builder()
+        return CSVFormat.DEFAULT
+                .builder()
                 .setIgnoreEmptyLines(true)
                 .setDelimiter(delimiter)
                 .setEscape(ESCAPE)
diff --git a/src/main/java/org/jabref/logic/journals/AbbreviationParser.java b/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
index 291016c1259c..08c85cdb7a47 100644
--- a/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
+++ b/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.journals;
 
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -9,9 +12,6 @@
 import java.util.Collection;
 import java.util.LinkedHashSet;
 
-import org.apache.commons.csv.CSVParser;
-import org.apache.commons.csv.CSVRecord;
-
 /**
  * Reads abbreviation files (CSV format) into a list of Abbreviations.
  */
@@ -32,7 +32,10 @@ public class AbbreviationParser {
     void readJournalListFromFile(Path file) throws IOException {
         char delimiter = detectDelimiter(file);
 
-        try (CSVParser csvParser = new CSVParser(Files.newBufferedReader(file, StandardCharsets.UTF_8), AbbreviationFormat.getCSVFormatWithDelimiter(delimiter))) {
+        try (CSVParser csvParser =
+                new CSVParser(
+                        Files.newBufferedReader(file, StandardCharsets.UTF_8),
+                        AbbreviationFormat.getCSVFormatWithDelimiter(delimiter))) {
             for (CSVRecord csvRecord : csvParser) {
                 String name = csvRecord.size() > 0 ? csvRecord.get(0) : "";
                 String abbreviation = csvRecord.size() > 1 ? csvRecord.get(1) : "";
@@ -43,7 +46,8 @@ void readJournalListFromFile(Path file) throws IOException {
                     return;
                 }
 
-                Abbreviation abbreviationToAdd = new Abbreviation(name, abbreviation, shortestUniqueAbbreviation);
+                Abbreviation abbreviationToAdd =
+                        new Abbreviation(name, abbreviation, shortestUniqueAbbreviation);
                 abbreviations.add(abbreviationToAdd);
             }
         }
@@ -57,9 +61,9 @@ private char detectDelimiter(Path file) throws IOException {
                 return NO_DELIMITER;
             }
             return Arrays.stream(DELIMITERS)
-                         .filter(s -> line.contains(s.toString()))
-                         .findFirst()
-                         .orElse(NO_DELIMITER);
+                    .filter(s -> line.contains(s.toString()))
+                    .findFirst()
+                    .orElse(NO_DELIMITER);
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java b/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java
index e60954c521b5..5585c9f74fc4 100644
--- a/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java
+++ b/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.journals;
 
+import org.apache.commons.csv.CSVPrinter;
+
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
@@ -7,15 +9,12 @@
 import java.nio.file.Path;
 import java.util.List;
 
-import org.apache.commons.csv.CSVPrinter;
-
 /**
  * This class provides handy static methods to save abbreviations to the file system.
  */
 public final class AbbreviationWriter {
 
-    private AbbreviationWriter() {
-    }
+    private AbbreviationWriter() {}
 
     /**
      * This method will write the list of abbreviations to a file on the file system specified by the given path. If the
@@ -24,14 +23,22 @@ private AbbreviationWriter() {
      * @param path          to a file (doesn't have to exist just yet)
      * @param abbreviations as a list specifying which entries should be written
      */
-    public static void writeOrCreate(Path path, List<Abbreviation> abbreviations) throws IOException {
-        try (OutputStreamWriter writer = new OutputStreamWriter(Files.newOutputStream(path), StandardCharsets.UTF_8);
-             CSVPrinter csvPrinter = new CSVPrinter(writer, AbbreviationFormat.getCSVFormatWithDefaultDilimeter())) {
+    public static void writeOrCreate(Path path, List<Abbreviation> abbreviations)
+            throws IOException {
+        try (OutputStreamWriter writer =
+                        new OutputStreamWriter(
+                                Files.newOutputStream(path), StandardCharsets.UTF_8);
+                CSVPrinter csvPrinter =
+                        new CSVPrinter(
+                                writer, AbbreviationFormat.getCSVFormatWithDefaultDilimeter())) {
             for (Abbreviation entry : abbreviations) {
                 if (entry.isDefaultShortestUniqueAbbreviation()) {
                     csvPrinter.printRecord(entry.getName(), entry.getAbbreviation());
                 } else {
-                    csvPrinter.printRecord(entry.getName(), entry.getAbbreviation(), entry.getShortestUniqueAbbreviation());
+                    csvPrinter.printRecord(
+                            entry.getName(),
+                            entry.getAbbreviation(),
+                            entry.getShortestUniqueAbbreviation());
                 }
             }
         }
diff --git a/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java b/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
index 141d66c44ee7..ad930e5950e5 100644
--- a/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
+++ b/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.journals;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -8,9 +11,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * <p>
  *   This class loads abbreviations from a CSV file and stores them into a MV file ({@link #readAbbreviationsFromCsvFile(Path)}
@@ -24,18 +24,22 @@ public class JournalAbbreviationLoader {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(JournalAbbreviationLoader.class);
 
-    public static Collection<Abbreviation> readAbbreviationsFromCsvFile(Path file) throws IOException {
+    public static Collection<Abbreviation> readAbbreviationsFromCsvFile(Path file)
+            throws IOException {
         LOGGER.debug("Reading journal list from file {}", file);
         AbbreviationParser parser = new AbbreviationParser();
         parser.readJournalListFromFile(file);
         return parser.getAbbreviations();
     }
 
-    public static JournalAbbreviationRepository loadRepository(JournalAbbreviationPreferences journalAbbreviationPreferences) {
+    public static JournalAbbreviationRepository loadRepository(
+            JournalAbbreviationPreferences journalAbbreviationPreferences) {
         JournalAbbreviationRepository repository;
 
         // Initialize with built-in list
-        try (InputStream resourceAsStream = JournalAbbreviationRepository.class.getResourceAsStream("/journals/journal-list.mv")) {
+        try (InputStream resourceAsStream =
+                JournalAbbreviationRepository.class.getResourceAsStream(
+                        "/journals/journal-list.mv")) {
             if (resourceAsStream == null) {
                 LOGGER.warn("There is no journal-list.mv. We use a default journal list");
                 repository = new JournalAbbreviationRepository();
@@ -60,7 +64,8 @@ public static JournalAbbreviationRepository loadRepository(JournalAbbreviationPr
             Collections.reverse(lists);
             for (String filename : lists) {
                 try {
-                    repository.addCustomAbbreviations(readAbbreviationsFromCsvFile(Path.of(filename)));
+                    repository.addCustomAbbreviations(
+                            readAbbreviationsFromCsvFile(Path.of(filename)));
                 } catch (IOException e) {
                     LOGGER.error("Cannot read external journal list file {}", filename, e);
                 }
diff --git a/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java b/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java
index fb256bbe8ab1..aff4d4a83c55 100644
--- a/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java
+++ b/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java
@@ -1,19 +1,19 @@
 package org.jabref.logic.journals;
 
-import java.util.List;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
+import java.util.List;
+
 public class JournalAbbreviationPreferences {
 
     private final ObservableList<String> externalJournalLists;
     private final BooleanProperty useFJournalField;
 
-    public JournalAbbreviationPreferences(List<String> externalJournalLists,
-                                          boolean useFJournalField) {
+    public JournalAbbreviationPreferences(
+            List<String> externalJournalLists, boolean useFJournalField) {
         this.externalJournalLists = FXCollections.observableArrayList(externalJournalLists);
         this.useFJournalField = new SimpleBooleanProperty(useFJournalField);
     }
diff --git a/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java b/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
index bfc8053d4882..e26a778395da 100644
--- a/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
+++ b/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.journals;
 
+import org.h2.mvstore.MVMap;
+import org.h2.mvstore.MVStore;
+
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.HashMap;
@@ -11,9 +14,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.h2.mvstore.MVMap;
-import org.h2.mvstore.MVStore;
-
 /**
  * A repository for all journal abbreviations, including add and find methods.
  */
@@ -31,21 +31,27 @@ public class JournalAbbreviationRepository {
      */
     public JournalAbbreviationRepository(Path journalList) {
         MVMap<String, Abbreviation> mvFullToAbbreviationObject;
-        try (MVStore store = new MVStore.Builder().readOnly().fileName(journalList.toAbsolutePath().toString()).open()) {
+        try (MVStore store =
+                new MVStore.Builder()
+                        .readOnly()
+                        .fileName(journalList.toAbsolutePath().toString())
+                        .open()) {
             mvFullToAbbreviationObject = store.openMap("FullToAbbreviation");
-            mvFullToAbbreviationObject.forEach((name, abbreviation) -> {
-                String abbrevationString = abbreviation.getAbbreviation();
-                String shortestUniqueAbbreviation = abbreviation.getShortestUniqueAbbreviation();
-                Abbreviation newAbbreviation = new Abbreviation(
-                        name,
-                        abbrevationString,
-                        shortestUniqueAbbreviation
-                );
-                fullToAbbreviationObject.put(name, newAbbreviation);
-                abbreviationToAbbreviationObject.put(abbrevationString, newAbbreviation);
-                dotlessToAbbreviationObject.put(newAbbreviation.getDotlessAbbreviation(), newAbbreviation);
-                shortestUniqueToAbbreviationObject.put(shortestUniqueAbbreviation, newAbbreviation);
-            });
+            mvFullToAbbreviationObject.forEach(
+                    (name, abbreviation) -> {
+                        String abbrevationString = abbreviation.getAbbreviation();
+                        String shortestUniqueAbbreviation =
+                                abbreviation.getShortestUniqueAbbreviation();
+                        Abbreviation newAbbreviation =
+                                new Abbreviation(
+                                        name, abbrevationString, shortestUniqueAbbreviation);
+                        fullToAbbreviationObject.put(name, newAbbreviation);
+                        abbreviationToAbbreviationObject.put(abbrevationString, newAbbreviation);
+                        dotlessToAbbreviationObject.put(
+                                newAbbreviation.getDotlessAbbreviation(), newAbbreviation);
+                        shortestUniqueToAbbreviationObject.put(
+                                shortestUniqueAbbreviation, newAbbreviation);
+                    });
         }
     }
 
@@ -53,11 +59,7 @@ public JournalAbbreviationRepository(Path journalList) {
      * Initializes the repository with demonstration data. Used if no abbreviation file is found.
      */
     public JournalAbbreviationRepository() {
-        Abbreviation newAbbreviation = new Abbreviation(
-                "Demonstration",
-                "Demo",
-                "Dem"
-        );
+        Abbreviation newAbbreviation = new Abbreviation("Demonstration", "Demo", "Dem");
         fullToAbbreviationObject.put("Demonstration", newAbbreviation);
         abbreviationToAbbreviationObject.put("Demo", newAbbreviation);
         dotlessToAbbreviationObject.put("Demo", newAbbreviation);
@@ -90,7 +92,8 @@ public boolean isKnownName(String journalName) {
             return false;
         }
         String journal = journalName.trim().replaceAll(Matcher.quoteReplacement("\\&"), "&");
-        return customAbbreviations.stream().anyMatch(abbreviation -> isMatched(journal, abbreviation))
+        return customAbbreviations.stream()
+                        .anyMatch(abbreviation -> isMatched(journal, abbreviation))
                 || fullToAbbreviationObject.containsKey(journal)
                 || abbreviationToAbbreviationObject.containsKey(journal)
                 || dotlessToAbbreviationObject.containsKey(journal)
@@ -106,7 +109,8 @@ public boolean isAbbreviatedName(String journalName) {
             return false;
         }
         String journal = journalName.trim().replaceAll(Matcher.quoteReplacement("\\&"), "&");
-        return customAbbreviations.stream().anyMatch(abbreviation -> isMatchedAbbreviated(journal, abbreviation))
+        return customAbbreviations.stream()
+                        .anyMatch(abbreviation -> isMatchedAbbreviated(journal, abbreviation))
                 || abbreviationToAbbreviationObject.containsKey(journal)
                 || dotlessToAbbreviationObject.containsKey(journal)
                 || shortestUniqueToAbbreviationObject.containsKey(journal);
@@ -121,9 +125,10 @@ public Optional<Abbreviation> get(String input) {
         // Clean up input: trim and unescape ampersand
         String journal = input.trim().replaceAll(Matcher.quoteReplacement("\\&"), "&");
 
-        Optional<Abbreviation> customAbbreviation = customAbbreviations.stream()
-                                                                       .filter(abbreviation -> isMatched(journal, abbreviation))
-                                                                       .findFirst();
+        Optional<Abbreviation> customAbbreviation =
+                customAbbreviations.stream()
+                        .filter(abbreviation -> isMatched(journal, abbreviation))
+                        .findFirst();
         if (customAbbreviation.isPresent()) {
             return customAbbreviation;
         }
@@ -139,7 +144,8 @@ public void addCustomAbbreviation(Abbreviation abbreviation) {
 
         // We do NOT want to keep duplicates
         // The set automatically "removes" duplicates
-        // What is a duplicate? An abbreviation is NOT the same if any field is NOT equal (e.g., if the shortest unique differs, the abbreviation is NOT the same)
+        // What is a duplicate? An abbreviation is NOT the same if any field is NOT equal (e.g., if
+        // the shortest unique differs, the abbreviation is NOT the same)
         customAbbreviations.add(abbreviation);
     }
 
diff --git a/src/main/java/org/jabref/logic/journals/JournalInformation.java b/src/main/java/org/jabref/logic/journals/JournalInformation.java
index 406735325c8b..531596b27462 100644
--- a/src/main/java/org/jabref/logic/journals/JournalInformation.java
+++ b/src/main/java/org/jabref/logic/journals/JournalInformation.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.journals;
 
-import java.util.List;
-
 import javafx.util.Pair;
 
+import java.util.List;
+
 public record JournalInformation(
         String title,
         String publisher,
@@ -23,6 +23,4 @@ public record JournalInformation(
         List<Pair<Integer, Double>> citesOutgoing,
         List<Pair<Integer, Double>> citesOutgoingPerDoc,
         List<Pair<Integer, Double>> citesIncomingByRecentlyPublished,
-        List<Pair<Integer, Double>> citesIncomingPerDocByRecentlyPublished
-) {
-}
+        List<Pair<Integer, Double>> citesIncomingPerDocByRecentlyPublished) {}
diff --git a/src/main/java/org/jabref/logic/l10n/Encodings.java b/src/main/java/org/jabref/logic/l10n/Encodings.java
index ac5efb19b545..23e5a9d6ec9f 100644
--- a/src/main/java/org/jabref/logic/l10n/Encodings.java
+++ b/src/main/java/org/jabref/logic/l10n/Encodings.java
@@ -8,17 +8,20 @@ public class Encodings {
 
     public static final Charset[] ENCODINGS;
     public static final String[] ENCODINGS_DISPLAYNAMES;
-    private static List<Charset> encodingsList = Charset.availableCharsets().values().stream().distinct()
-                                                        .collect(Collectors.toList());
+    private static List<Charset> encodingsList =
+            Charset.availableCharsets().values().stream().distinct().collect(Collectors.toList());
 
-    private Encodings() {
-    }
+    private Encodings() {}
 
     static {
-        List<String> encodingsStringList = encodingsList.stream().map(Charset::displayName).distinct()
-                                                        .collect(Collectors.toList());
+        List<String> encodingsStringList =
+                encodingsList.stream()
+                        .map(Charset::displayName)
+                        .distinct()
+                        .collect(Collectors.toList());
         ENCODINGS = encodingsList.toArray(new Charset[encodingsList.size()]);
-        ENCODINGS_DISPLAYNAMES = encodingsStringList.toArray(new String[encodingsStringList.size()]);
+        ENCODINGS_DISPLAYNAMES =
+                encodingsStringList.toArray(new String[encodingsStringList.size()]);
     }
 
     public static List<Charset> getCharsets() {
diff --git a/src/main/java/org/jabref/logic/l10n/Language.java b/src/main/java/org/jabref/logic/l10n/Language.java
index 9d3e9958fb86..fbff22355695 100644
--- a/src/main/java/org/jabref/logic/l10n/Language.java
+++ b/src/main/java/org/jabref/logic/l10n/Language.java
@@ -42,6 +42,7 @@ public enum Language {
     private static final Pattern IS_NOT_LATIN = Pattern.compile("[^\\p{IsLatin}]");
     private final String displayName;
     private final String id;
+
     /**
      * @param id Typically as 639-1 code
      */
@@ -53,7 +54,8 @@ public enum Language {
     public static Optional<Locale> convertToSupportedLocale(Language language) {
         Objects.requireNonNull(language);
 
-        // Very important to split languages like pt_BR into two parts, because otherwise the country would be treated lowercase and create problems in loading
+        // Very important to split languages like pt_BR into two parts, because otherwise the
+        // country would be treated lowercase and create problems in loading
         String[] languageParts = language.getId().split("_");
         Locale locale;
         if (languageParts.length == 1) {
@@ -77,11 +79,13 @@ public String getId() {
 
     public static List<Language> getSorted() {
         return Arrays.stream(values())
-                .sorted(Comparator.comparing(language -> removeNonLatinCharacters(language.getDisplayName())))
+                .sorted(
+                        Comparator.comparing(
+                                language -> removeNonLatinCharacters(language.getDisplayName())))
                 .toList();
     }
 
     private static String removeNonLatinCharacters(String input) {
-       return IS_NOT_LATIN.matcher(input).replaceAll("");
+        return IS_NOT_LATIN.matcher(input).replaceAll("");
     }
 }
diff --git a/src/main/java/org/jabref/logic/l10n/Localization.java b/src/main/java/org/jabref/logic/l10n/Localization.java
index c5dcacc5cf5d..6645395d061d 100644
--- a/src/main/java/org/jabref/logic/l10n/Localization.java
+++ b/src/main/java/org/jabref/logic/l10n/Localization.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.l10n;
 
+import org.jabref.architecture.AllowedToUseStandardStreams;
+import org.slf4j.LoggerFactory;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -14,10 +17,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.jabref.architecture.AllowedToUseStandardStreams;
-
-import org.slf4j.LoggerFactory;
-
 /**
  * Provides handling for messages and menu entries in the preferred language of the user.
  * <p>
@@ -33,14 +32,14 @@
  * The access to this is given by the functions {@link Localization#lang(String, String...)} and
  * that developers should use whenever they use strings for the e.g. GUI that need to be translatable.
  */
-@AllowedToUseStandardStreams("Needs to have acess to System.err because it's called very early before our loggers")
+@AllowedToUseStandardStreams(
+        "Needs to have acess to System.err because it's called very early before our loggers")
 public class Localization {
     static final String RESOURCE_PREFIX = "l10n/JabRef";
     private static Locale locale;
     private static LocalizationBundle localizedMessages;
 
-    private Localization() {
-    }
+    private Localization() {}
 
     /**
      * Public access to all messages that are not menu-entries
@@ -68,7 +67,11 @@ public static void setLanguage(Language language) {
         Optional<Locale> knownLanguage = Language.convertToSupportedLocale(language);
         final Locale defaultLocale = Locale.getDefault();
         if (knownLanguage.isEmpty()) {
-            LoggerFactory.getLogger(Localization.class).warn("Language {} is not supported by JabRef (Default: {})", language, defaultLocale);
+            LoggerFactory.getLogger(Localization.class)
+                    .warn(
+                            "Language {} is not supported by JabRef (Default: {})",
+                            language,
+                            defaultLocale);
             setLanguage(Language.ENGLISH);
             return;
         }
@@ -84,7 +87,11 @@ public static void setLanguage(Language language) {
             createResourceBundles(locale);
         } catch (MissingResourceException ex) {
             // should not happen as we have scripts to enforce this
-            LoggerFactory.getLogger(Localization.class).warn("Could not find bundles for language {}, switching to full english language", locale, ex);
+            LoggerFactory.getLogger(Localization.class)
+                    .warn(
+                            "Could not find bundles for language {}, switching to full english language",
+                            locale,
+                            ex);
             setLanguage(Language.ENGLISH);
         }
     }
@@ -123,12 +130,14 @@ private static void createResourceBundles(Locale locale) {
      */
     private static Map<String, String> createLookupMap(ResourceBundle baseBundle) {
         final ArrayList<String> baseKeys = Collections.list(baseBundle.getKeys());
-        return new HashMap<>(baseKeys.stream().collect(
-                Collectors.toMap(
-                        // not required to unescape content, because that is already done by the ResourceBundle itself
-                        key -> key,
-                        baseBundle::getString)
-        ));
+        return new HashMap<>(
+                baseKeys.stream()
+                        .collect(
+                                Collectors.toMap(
+                                        // not required to unescape content, because that is already
+                                        // done by the ResourceBundle itself
+                                        key -> key,
+                                        baseBundle::getString)));
     }
 
     /**
@@ -145,7 +154,11 @@ private static String lookup(LocalizationBundle bundle, String key, String... pa
 
         String translation = bundle.containsKey(key) ? bundle.getString(key) : "";
         if (translation.isEmpty()) {
-            LoggerFactory.getLogger(Localization.class).warn("Warning: could not get translation for \"{}\" for locale {}", key, Locale.getDefault());
+            LoggerFactory.getLogger(Localization.class)
+                    .warn(
+                            "Warning: could not get translation for \"{}\" for locale {}",
+                            key,
+                            Locale.getDefault());
             translation = key;
         }
         return new LocalizationKeyParams(translation, params).replacePlaceholders();
@@ -165,8 +178,7 @@ private static class LocalizationBundle extends ResourceBundle {
         @Override
         public final Object handleGetObject(String key) {
             Objects.requireNonNull(key);
-            return Optional.ofNullable(lookup.get(key))
-                           .orElse(key);
+            return Optional.ofNullable(lookup.get(key)).orElse(key);
         }
 
         @Override
@@ -186,4 +198,3 @@ public boolean containsKey(String key) {
         }
     }
 }
-
diff --git a/src/main/java/org/jabref/logic/l10n/LocalizationKey.java b/src/main/java/org/jabref/logic/l10n/LocalizationKey.java
index c58a32bc53df..7d494919eff2 100644
--- a/src/main/java/org/jabref/logic/l10n/LocalizationKey.java
+++ b/src/main/java/org/jabref/logic/l10n/LocalizationKey.java
@@ -16,14 +16,15 @@ public class LocalizationKey {
     private LocalizationKey(String key) {
         this.key = key;
         // space, #, !, = and : are not allowed in properties file keys
-        // # and ! are only disallowed at the beginning of the key but easier to escape every instance
-        this.escapedPropertyKey = key
-                .replace("\n", "\\n")
-                .replace(" ", "\\ ")
-                .replace("#", "\\#")
-                .replace("!", "\\!")
-                .replace("=", "\\=")
-                .replace(":", "\\:");
+        // # and ! are only disallowed at the beginning of the key but easier to escape every
+        // instance
+        this.escapedPropertyKey =
+                key.replace("\n", "\\n")
+                        .replace(" ", "\\ ")
+                        .replace("#", "\\#")
+                        .replace("!", "\\!")
+                        .replace("=", "\\=")
+                        .replace(":", "\\:");
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/l10n/LocalizationLocator.java b/src/main/java/org/jabref/logic/l10n/LocalizationLocator.java
index 90034e8440ad..9a749a923458 100644
--- a/src/main/java/org/jabref/logic/l10n/LocalizationLocator.java
+++ b/src/main/java/org/jabref/logic/l10n/LocalizationLocator.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.l10n;
 
-import java.util.ResourceBundle;
-
 import com.airhacks.afterburner.views.ResourceLocator;
 
+import java.util.ResourceBundle;
+
 public class LocalizationLocator implements ResourceLocator {
     @Override
     public ResourceBundle getResourceBundle(String s) {
diff --git a/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java b/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java
index 44209654bb6c..250e9b72cbaf 100644
--- a/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java
@@ -11,8 +11,7 @@ public abstract class AbstractParamLayoutFormatter implements ParamLayoutFormatt
 
     private static final char SEPARATOR = ',';
 
-    protected AbstractParamLayoutFormatter() {
-    }
+    protected AbstractParamLayoutFormatter() {}
 
     /**
      * Parse an argument string and return the parts of the argument. The parts are
diff --git a/src/main/java/org/jabref/logic/layout/Layout.java b/src/main/java/org/jabref/logic/layout/Layout.java
index 65587b1f81b0..682fd3df3d49 100644
--- a/src/main/java/org/jabref/logic/layout/Layout.java
+++ b/src/main/java/org/jabref/logic/layout/Layout.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.layout;
 
-import java.nio.charset.Charset;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class Layout {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Layout.class);
@@ -22,10 +21,11 @@ public class Layout {
 
     private final List<String> missingFormatters = new ArrayList<>();
 
-    public Layout(List<StringInt> parsedEntries,
-                  List<Path> fileDirForDatabase,
-                  LayoutFormatterPreferences layoutPreferences,
-                  JournalAbbreviationRepository abbreviationRepository) {
+    public Layout(
+            List<StringInt> parsedEntries,
+            List<Path> fileDirForDatabase,
+            LayoutFormatterPreferences layoutPreferences,
+            JournalAbbreviationRepository abbreviationRepository) {
         List<LayoutEntry> tmpEntries = new ArrayList<>(parsedEntries.size());
 
         List<StringInt> blockEntries = null;
@@ -49,11 +49,15 @@ public Layout(List<StringInt> parsedEntries,
                     if ((blockStart != null) && (blockEntries != null)) {
                         if (blockStart.equals(parsedEntry.s)) {
                             blockEntries.add(parsedEntry);
-                            le = new LayoutEntry(blockEntries,
-                                    parsedEntry.i == LayoutHelper.IS_FIELD_END ? LayoutHelper.IS_FIELD_START : LayoutHelper.IS_GROUP_START,
-                                    fileDirForDatabase,
-                                    layoutPreferences,
-                                    abbreviationRepository);
+                            le =
+                                    new LayoutEntry(
+                                            blockEntries,
+                                            parsedEntry.i == LayoutHelper.IS_FIELD_END
+                                                    ? LayoutHelper.IS_FIELD_START
+                                                    : LayoutHelper.IS_GROUP_START,
+                                            fileDirForDatabase,
+                                            layoutPreferences,
+                                            abbreviationRepository);
                             tmpEntries.add(le);
                             blockEntries = null;
                         } else {
@@ -68,7 +72,12 @@ public Layout(List<StringInt> parsedEntries,
             }
 
             if (blockEntries == null) {
-                tmpEntries.add(new LayoutEntry(parsedEntry, fileDirForDatabase, layoutPreferences, abbreviationRepository));
+                tmpEntries.add(
+                        new LayoutEntry(
+                                parsedEntry,
+                                fileDirForDatabase,
+                                layoutPreferences,
+                                abbreviationRepository));
             } else {
                 blockEntries.add(parsedEntry);
             }
diff --git a/src/main/java/org/jabref/logic/layout/LayoutEntry.java b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
index 5ea2222e4c80..c3e46451b428 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutEntry.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
@@ -1,15 +1,5 @@
 package org.jabref.logic.layout;
 
-import java.nio.charset.Charset;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;
 import org.jabref.logic.formatter.bibtexfields.UnicodeToLatexFormatter;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
@@ -92,10 +82,19 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
 class LayoutEntry {
     private static final Logger LOGGER = LoggerFactory.getLogger(LayoutEntry.class);
 
@@ -112,36 +111,37 @@ class LayoutEntry {
     private final LayoutFormatterPreferences preferences;
     private final JournalAbbreviationRepository abbreviationRepository;
 
-    public LayoutEntry(StringInt si,
-                       List<Path> fileDirForDatabase,
-                       LayoutFormatterPreferences preferences,
-                       JournalAbbreviationRepository abbreviationRepository) {
+    public LayoutEntry(
+            StringInt si,
+            List<Path> fileDirForDatabase,
+            LayoutFormatterPreferences preferences,
+            JournalAbbreviationRepository abbreviationRepository) {
         this.preferences = preferences;
         this.abbreviationRepository = abbreviationRepository;
-        this.fileDirForDatabase = Objects.requireNonNullElse(fileDirForDatabase, Collections.emptyList());
+        this.fileDirForDatabase =
+                Objects.requireNonNullElse(fileDirForDatabase, Collections.emptyList());
 
         type = si.i;
         switch (type) {
-            case LayoutHelper.IS_LAYOUT_TEXT ->
-                    text = si.s;
-            case LayoutHelper.IS_SIMPLE_COMMAND ->
-                    text = si.s.trim();
-            case LayoutHelper.IS_OPTION_FIELD ->
-                    doOptionField(si.s);
+            case LayoutHelper.IS_LAYOUT_TEXT -> text = si.s;
+            case LayoutHelper.IS_SIMPLE_COMMAND -> text = si.s.trim();
+            case LayoutHelper.IS_OPTION_FIELD -> doOptionField(si.s);
             default -> {
                 // IS_FIELD_START and IS_FIELD_END
             }
         }
     }
 
-    public LayoutEntry(List<StringInt> parsedEntries,
-                       int layoutType,
-                       List<Path> fileDirForDatabase,
-                       LayoutFormatterPreferences preferences,
-                       JournalAbbreviationRepository abbreviationRepository) {
+    public LayoutEntry(
+            List<StringInt> parsedEntries,
+            int layoutType,
+            List<Path> fileDirForDatabase,
+            LayoutFormatterPreferences preferences,
+            JournalAbbreviationRepository abbreviationRepository) {
         this.preferences = preferences;
         this.abbreviationRepository = abbreviationRepository;
-        this.fileDirForDatabase = Objects.requireNonNullElse(fileDirForDatabase, Collections.emptyList());
+        this.fileDirForDatabase =
+                Objects.requireNonNullElse(fileDirForDatabase, Collections.emptyList());
 
         List<LayoutEntry> tmpEntries = new ArrayList<>();
         String blockStart = parsedEntries.getFirst().s;
@@ -165,9 +165,17 @@ public LayoutEntry(List<StringInt> parsedEntries,
                 case LayoutHelper.IS_GROUP_END:
                     if (blockStart.equals(parsedEntry.s)) {
                         blockEntries.add(parsedEntry);
-                        int groupType = parsedEntry.i == LayoutHelper.IS_GROUP_END ? LayoutHelper.IS_GROUP_START :
-                                LayoutHelper.IS_FIELD_START;
-                        LayoutEntry le = new LayoutEntry(blockEntries, groupType, fileDirForDatabase, preferences, abbreviationRepository);
+                        int groupType =
+                                parsedEntry.i == LayoutHelper.IS_GROUP_END
+                                        ? LayoutHelper.IS_GROUP_START
+                                        : LayoutHelper.IS_FIELD_START;
+                        LayoutEntry le =
+                                new LayoutEntry(
+                                        blockEntries,
+                                        groupType,
+                                        fileDirForDatabase,
+                                        preferences,
+                                        abbreviationRepository);
                         tmpEntries.add(le);
                         blockEntries = null;
                     } else {
@@ -183,7 +191,12 @@ public LayoutEntry(List<StringInt> parsedEntries,
             }
 
             if (blockEntries == null) {
-                tmpEntries.add(new LayoutEntry(parsedEntry, fileDirForDatabase, preferences, abbreviationRepository));
+                tmpEntries.add(
+                        new LayoutEntry(
+                                parsedEntry,
+                                fileDirForDatabase,
+                                preferences,
+                                abbreviationRepository));
             } else {
                 blockEntries.add(parsedEntry);
             }
@@ -205,7 +218,9 @@ public String doLayout(BibEntry bibtex, BibDatabase database) {
             case LayoutHelper.IS_LAYOUT_TEXT:
                 return text;
             case LayoutHelper.IS_SIMPLE_COMMAND:
-                String value = bibtex.getResolvedFieldOrAlias(FieldFactory.parseField(text), database).orElse("");
+                String value =
+                        bibtex.getResolvedFieldOrAlias(FieldFactory.parseField(text), database)
+                                .orElse("");
 
                 // If a post formatter has been set, call it:
                 if (postFormatter != null) {
@@ -224,7 +239,8 @@ public String doLayout(BibEntry bibtex, BibDatabase database) {
                 // Printing the encoding name is not supported in entry layouts, only
                 // in begin/end layouts. This prevents breakage if some users depend
                 // on a field called "encoding". We simply return this field instead:
-                return bibtex.getResolvedFieldOrAlias(new UnknownField("encoding"), database).orElse(null);
+                return bibtex.getResolvedFieldOrAlias(new UnknownField("encoding"), database)
+                        .orElse(null);
             default:
                 return "";
         }
@@ -236,14 +252,20 @@ private String handleOptionField(BibEntry bibtex, BibDatabase database) {
         if (InternalField.TYPE_HEADER.getName().equals(text)) {
             fieldEntry = bibtex.getType().getDisplayName();
         } else if (InternalField.OBSOLETE_TYPE_HEADER.getName().equals(text)) {
-            LOGGER.warn("'{}' is an obsolete name for the entry type. Please update your layout to use '{}' instead.", InternalField.OBSOLETE_TYPE_HEADER, InternalField.TYPE_HEADER);
+            LOGGER.warn(
+                    "'{}' is an obsolete name for the entry type. Please update your layout to use '{}' instead.",
+                    InternalField.OBSOLETE_TYPE_HEADER,
+                    InternalField.TYPE_HEADER);
             fieldEntry = bibtex.getType().getDisplayName();
         } else {
             // changed section begin - arudert
             // resolve field (recognized by leading backslash) or text
-            fieldEntry = text.startsWith("\\") ? bibtex
-                    .getResolvedFieldOrAlias(FieldFactory.parseField(text.substring(1)), database)
-                    .orElse("") : BibDatabase.getText(text, database);
+            fieldEntry =
+                    text.startsWith("\\")
+                            ? bibtex.getResolvedFieldOrAlias(
+                                            FieldFactory.parseField(text.substring(1)), database)
+                                    .orElse("")
+                            : BibDatabase.getText(text, database);
             // changed section end - arudert
         }
 
@@ -272,7 +294,10 @@ private String handleFieldOrGroupStart(BibEntry bibtex, BibDatabase database) {
             field = Optional.empty();
             for (String part : parts) {
                 negated = part.startsWith("!");
-                field = bibtex.getResolvedFieldOrAlias(FieldFactory.parseField(negated ? part.substring(1).trim() : part), database);
+                field =
+                        bibtex.getResolvedFieldOrAlias(
+                                FieldFactory.parseField(negated ? part.substring(1).trim() : part),
+                                database);
                 if (field.isPresent() == negated) {
                     break;
                 }
@@ -283,15 +308,19 @@ private String handleFieldOrGroupStart(BibEntry bibtex, BibDatabase database) {
             field = Optional.empty();
             for (String part : parts) {
                 negated = part.startsWith("!");
-                field = bibtex.getResolvedFieldOrAlias(FieldFactory.parseField(negated ? part.substring(1).trim() : part), database);
+                field =
+                        bibtex.getResolvedFieldOrAlias(
+                                FieldFactory.parseField(negated ? part.substring(1).trim() : part),
+                                database);
                 if (field.isPresent() ^ negated) {
                     break;
                 }
             }
         }
 
-        if ((field.isPresent() == negated) || ((type == LayoutHelper.IS_GROUP_START)
-                && field.get().equalsIgnoreCase(LayoutHelper.getCurrentGroup()))) {
+        if ((field.isPresent() == negated)
+                || ((type == LayoutHelper.IS_GROUP_START)
+                        && field.get().equalsIgnoreCase(LayoutHelper.getCurrentGroup()))) {
             return null;
         } else {
             if (type == LayoutHelper.IS_GROUP_START) {
@@ -319,7 +348,8 @@ private String handleFieldOrGroupStart(BibEntry bibtex, BibDatabase database) {
                         int eol = 0;
 
                         while ((eol < fieldText.length())
-                                && ((fieldText.charAt(eol) == '\n') || (fieldText.charAt(eol) == '\r'))) {
+                                && ((fieldText.charAt(eol) == '\n')
+                                        || (fieldText.charAt(eol) == '\r'))) {
                             eol++;
                         }
 
@@ -349,15 +379,18 @@ public String doLayout(BibDatabaseContext databaseContext, Charset encoding) {
                 return text;
 
             case LayoutHelper.IS_SIMPLE_COMMAND:
-                throw new UnsupportedOperationException("bibtex entry fields not allowed in begin or end layout");
+                throw new UnsupportedOperationException(
+                        "bibtex entry fields not allowed in begin or end layout");
 
             case LayoutHelper.IS_FIELD_START:
             case LayoutHelper.IS_GROUP_START:
-                throw new UnsupportedOperationException("field and group starts not allowed in begin or end layout");
+                throw new UnsupportedOperationException(
+                        "field and group starts not allowed in begin or end layout");
 
             case LayoutHelper.IS_FIELD_END:
             case LayoutHelper.IS_GROUP_END:
-                throw new UnsupportedOperationException("field and group ends not allowed in begin or end layout");
+                throw new UnsupportedOperationException(
+                        "field and group ends not allowed in begin or end layout");
 
             case LayoutHelper.IS_OPTION_FIELD:
                 String field = BibDatabase.getText(text, databaseContext.getDatabase());
@@ -378,7 +411,11 @@ public String doLayout(BibDatabaseContext databaseContext, Charset encoding) {
 
             case LayoutHelper.IS_FILENAME:
             case LayoutHelper.IS_FILEPATH:
-                return databaseContext.getDatabasePath().map(Path::toAbsolutePath).map(Path::toString).orElse("");
+                return databaseContext
+                        .getDatabasePath()
+                        .map(Path::toAbsolutePath)
+                        .map(Path::toString)
+                        .orElse("");
 
             default:
                 break;
@@ -454,7 +491,7 @@ private LayoutFormatter getLayoutFormatterByName(String name) {
             case "Iso690NamesAuthors" -> new Iso690NamesAuthors();
             case "JournalAbbreviator" -> new JournalAbbreviator(abbreviationRepository);
             case "LastPage" -> new LastPage();
-// For backward compatibility
+            // For backward compatibility
             case "FormatChars", "LatexToUnicode" -> new LatexToUnicodeFormatter();
             case "NameFormatter" -> new NameFormatter();
             case "NoSpaceBetweenAbbreviations" -> new NoSpaceBetweenAbbreviations();
@@ -478,7 +515,8 @@ private LayoutFormatter getLayoutFormatterByName(String name) {
             case "IfPlural" -> new IfPlural();
             case "Replace" -> new Replace();
             case "WrapContent" -> new WrapContent();
-            case "WrapFileLinks" -> new WrapFileLinks(fileDirForDatabase, preferences.getMainFileDirectory());
+            case "WrapFileLinks" ->
+                    new WrapFileLinks(fileDirForDatabase, preferences.getMainFileDirectory());
             case "Markdown" -> new MarkdownFormatter();
             case "CSLType" -> new CSLType();
             case "ShortMonth" -> new ShortMonthFormatter();
@@ -494,7 +532,8 @@ private LayoutFormatter getLayoutFormatterByName(String name) {
     private List<LayoutFormatter> getOptionalLayout(String formatterName) {
         List<List<String>> formatterStrings = parseMethodsCalls(formatterName);
         List<LayoutFormatter> results = new ArrayList<>(formatterStrings.size());
-        Map<String, String> userNameFormatter = NameFormatter.getNameFormatters(preferences.getNameFormatterPreferences());
+        Map<String, String> userNameFormatter =
+                NameFormatter.getNameFormatters(preferences.getNameFormatterPreferences());
         for (List<String> strings : formatterStrings) {
             String nameFormatterName = strings.getFirst().trim();
 
@@ -511,7 +550,8 @@ private List<LayoutFormatter> getOptionalLayout(String formatterName) {
             LayoutFormatter formatter = getLayoutFormatterByName(nameFormatterName);
             if (formatter != null) {
                 // If this formatter accepts an argument, check if we have one, and set it if so
-                if ((formatter instanceof ParamLayoutFormatter layoutFormatter) && (strings.size() >= 2)) {
+                if ((formatter instanceof ParamLayoutFormatter layoutFormatter)
+                        && (strings.size() >= 2)) {
                     layoutFormatter.setArgument(strings.get(1));
                 }
                 results.add(formatter);
@@ -568,7 +608,10 @@ public static List<List<String>> parseMethodsCalls(String calls) {
                             i++;
                             boolean escaped = false;
                             while (((i + 1) < c.length)
-                                    && !(!escaped && (c[i] == '"') && (c[i + 1] == ')') && (bracelevel == 0))) {
+                                    && !(!escaped
+                                            && (c[i] == '"')
+                                            && (c[i + 1] == ')')
+                                            && (bracelevel == 0))) {
                                 if (c[i] == '\\') {
                                     escaped = !escaped;
                                 } else if (c[i] == '(') {
diff --git a/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java b/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java
index 8aecd2786087..048de3c79c50 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.layout;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
 import javafx.beans.property.StringProperty;
 
 import org.jabref.logic.layout.format.NameFormatterPreferences;
 import org.jabref.logic.preferences.DOIPreferences;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
 public class LayoutFormatterPreferences {
 
     private final NameFormatterPreferences nameFormatterPreferences;
@@ -17,9 +17,10 @@ public class LayoutFormatterPreferences {
     private final StringProperty mainFileDirectoryProperty;
     private final Map<String, String> customExportNameFormatters = new HashMap<>();
 
-    public LayoutFormatterPreferences(NameFormatterPreferences nameFormatterPreferences,
-                                      DOIPreferences doiPreferences,
-                                      StringProperty mainFileDirectoryProperty) {
+    public LayoutFormatterPreferences(
+            NameFormatterPreferences nameFormatterPreferences,
+            DOIPreferences doiPreferences,
+            StringProperty mainFileDirectoryProperty) {
         this.nameFormatterPreferences = nameFormatterPreferences;
         this.mainFileDirectoryProperty = mainFileDirectoryProperty;
         this.doiPreferences = doiPreferences;
diff --git a/src/main/java/org/jabref/logic/layout/LayoutHelper.java b/src/main/java/org/jabref/logic/layout/LayoutHelper.java
index 1a923f17b643..d348681b5c46 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutHelper.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutHelper.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.layout;
 
+import org.jabref.logic.journals.JournalAbbreviationRepository;
+
 import java.io.IOException;
 import java.io.PushbackReader;
 import java.io.Reader;
@@ -10,8 +12,6 @@
 import java.util.Locale;
 import java.util.Objects;
 
-import org.jabref.logic.journals.JournalAbbreviationRepository;
-
 /**
  * Helper class to get a Layout object.
  *
@@ -44,19 +44,21 @@ public class LayoutHelper {
     private final JournalAbbreviationRepository abbreviationRepository;
     private boolean endOfFile;
 
-    public LayoutHelper(Reader in,
-                        List<Path> fileDirForDatabase,
-                        LayoutFormatterPreferences preferences,
-                        JournalAbbreviationRepository abbreviationRepository) {
+    public LayoutHelper(
+            Reader in,
+            List<Path> fileDirForDatabase,
+            LayoutFormatterPreferences preferences,
+            JournalAbbreviationRepository abbreviationRepository) {
         this.in = new PushbackReader(Objects.requireNonNull(in), 2);
         this.preferences = Objects.requireNonNull(preferences);
         this.abbreviationRepository = abbreviationRepository;
         this.fileDirForDatabase = fileDirForDatabase;
     }
 
-    public LayoutHelper(Reader in,
-                        LayoutFormatterPreferences preferences,
-                        JournalAbbreviationRepository abbreviationRepository) {
+    public LayoutHelper(
+            Reader in,
+            LayoutFormatterPreferences preferences,
+            JournalAbbreviationRepository abbreviationRepository) {
         this(in, Collections.emptyList(), preferences, abbreviationRepository);
     }
 
@@ -64,8 +66,10 @@ public Layout getLayoutFromText() throws IOException {
         parse();
 
         for (StringInt parsedEntry : parsedEntries) {
-            if ((parsedEntry.i == LayoutHelper.IS_SIMPLE_COMMAND) || (parsedEntry.i == LayoutHelper.IS_FIELD_START)
-                    || (parsedEntry.i == LayoutHelper.IS_FIELD_END) || (parsedEntry.i == LayoutHelper.IS_GROUP_START)
+            if ((parsedEntry.i == LayoutHelper.IS_SIMPLE_COMMAND)
+                    || (parsedEntry.i == LayoutHelper.IS_FIELD_START)
+                    || (parsedEntry.i == LayoutHelper.IS_FIELD_END)
+                    || (parsedEntry.i == LayoutHelper.IS_GROUP_START)
                     || (parsedEntry.i == LayoutHelper.IS_GROUP_END)) {
                 parsedEntry.s = parsedEntry.s.trim().toLowerCase(Locale.ROOT);
             }
@@ -146,7 +150,10 @@ private void doBracketedOptionField() throws IOException {
 
                 return;
             }
-            if (!inQuotes && ((c == ']') || (c == '[') || (doneWithOptions && ((c == '{') || (c == '}'))))) {
+            if (!inQuotes
+                    && ((c == ']')
+                            || (c == '[')
+                            || (doneWithOptions && ((c == '{') || (c == '}'))))) {
                 if ((c == ']') || (doneWithOptions && (c == '}'))) {
                     // changed section start - arudert
                     // buffer may be null for parameters
@@ -159,7 +166,8 @@ private void doBracketedOptionField() throws IOException {
                     } else if (c == '}') {
                         // changed section begin - arudert
                         // bracketed option must be followed by an (optionally empty) parameter
-                        // if empty, the parameter is set to " " (whitespace to avoid that the tokenizer that
+                        // if empty, the parameter is set to " " (whitespace to avoid that the
+                        // tokenizer that
                         // splits the string later on ignores the empty parameter)
                         String parameter = buffer == null ? " " : buffer.toString();
                         if (option == null) {
@@ -193,7 +201,8 @@ private void doBracketedOptionField() throws IOException {
 
                 if (start) {
                     // changed section begin - arudert
-                    // keep the backslash so we know wether this is a fieldname or an ordinary parameter
+                    // keep the backslash so we know wether this is a fieldname or an ordinary
+                    // parameter
                     // if (c != '\\') {
                     buffer.append((char) c);
                     // }
@@ -219,7 +228,8 @@ private void parse() throws IOException {
 
                 // Check for null, otherwise a Layout that finishes with a curly brace throws a NPE
                 if (buffer != null) {
-                    parsedEntries.add(new StringInt(buffer.toString(), LayoutHelper.IS_LAYOUT_TEXT));
+                    parsedEntries.add(
+                            new StringInt(buffer.toString(), LayoutHelper.IS_LAYOUT_TEXT));
                 }
 
                 return;
@@ -227,7 +237,8 @@ private void parse() throws IOException {
 
             if ((c == '\\') && (peek() != '\\') && !escaped) {
                 if (buffer != null) {
-                    parsedEntries.add(new StringInt(buffer.toString(), LayoutHelper.IS_LAYOUT_TEXT));
+                    parsedEntries.add(
+                            new StringInt(buffer.toString(), LayoutHelper.IS_LAYOUT_TEXT));
 
                     buffer = null;
                 }
@@ -272,13 +283,17 @@ private void parseField() throws IOException {
                     if (parsedEntries.isEmpty()) {
                         lastFive.append("unknown");
                     } else {
-                        for (StringInt entry : parsedEntries.subList(Math.max(0, parsedEntries.size() - 6),
-                                parsedEntries.size() - 1)) {
+                        for (StringInt entry :
+                                parsedEntries.subList(
+                                        Math.max(0, parsedEntries.size() - 6),
+                                        parsedEntries.size() - 1)) {
                             lastFive.append(entry.s);
                         }
                     }
                     throw new IOException(
-                            "Backslash parsing error near \'" + lastFive.toString().replace("\n", " ") + '\'');
+                            "Backslash parsing error near \'"
+                                    + lastFive.toString().replace("\n", " ")
+                                    + '\'');
                 }
 
                 if ("begin".equalsIgnoreCase(name)) {
diff --git a/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java b/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java
index 328ea411a3d4..6077fd1c0a0a 100644
--- a/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java
+++ b/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.layout;
 
-import java.io.IOException;
-import java.io.StringReader;
-
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.preview.PreviewLayout;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.StringReader;
+
 /**
  * Implements the preview based JabRef's <a href="https://docs.jabref.org/import-export/export/customexports">Custom export filters</a>.
  */
@@ -24,7 +23,10 @@ public final class TextBasedPreviewLayout implements PreviewLayout {
     private LayoutFormatterPreferences layoutFormatterPreferences;
     private JournalAbbreviationRepository abbreviationRepository;
 
-    public TextBasedPreviewLayout(String text, LayoutFormatterPreferences layoutFormatterPreferences, JournalAbbreviationRepository abbreviationRepository) {
+    public TextBasedPreviewLayout(
+            String text,
+            LayoutFormatterPreferences layoutFormatterPreferences,
+            JournalAbbreviationRepository abbreviationRepository) {
         this.layoutFormatterPreferences = layoutFormatterPreferences;
         this.abbreviationRepository = abbreviationRepository;
         setText(text);
@@ -39,7 +41,9 @@ public void setText(String text) {
         this.text = text;
         StringReader sr = new StringReader(text.replace("__NEWLINE__", "\n"));
         try {
-            layout = new LayoutHelper(sr, layoutFormatterPreferences, abbreviationRepository).getLayoutFromText();
+            layout =
+                    new LayoutHelper(sr, layoutFormatterPreferences, abbreviationRepository)
+                            .getLayoutFromText();
         } catch (IOException e) {
             LOGGER.error("Could not generate layout", e);
         }
diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java b/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java
index dfa1b9d155ce..7125b9b263c3 100644
--- a/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java
+++ b/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java
@@ -18,20 +18,21 @@ public String format(String fieldText) {
         }
         String[] authors = fieldText.split(" and ");
         // CHECKSTYLE:OFF
-        String s = switch (authors.length) {
-            case 1 -> authors[0]; // just no action
-            case 2 -> authors[0] + " & " + authors[1];
-            default -> {
-                int i;
-                int x = authors.length;
-                StringBuilder sb = new StringBuilder();
-                for (i = 0; i < (x - 2); i++) {
-                    sb.append(authors[i]).append("; ");
-                }
-                sb.append(authors[i]).append(" & ").append(authors[i + 1]);
-                yield sb.toString();
-            }
-        };
+        String s =
+                switch (authors.length) {
+                    case 1 -> authors[0]; // just no action
+                    case 2 -> authors[0] + " & " + authors[1];
+                    default -> {
+                        int i;
+                        int x = authors.length;
+                        StringBuilder sb = new StringBuilder();
+                        for (i = 0; i < (x - 2); i++) {
+                            sb.append(authors[i]).append("; ");
+                        }
+                        sb.append(authors[i]).append(" & ").append(authors[i + 1]);
+                        yield sb.toString();
+                    }
+                };
         // CHECKSTYLE:ON
 
         return s;
diff --git a/src/main/java/org/jabref/logic/layout/format/Authors.java b/src/main/java/org/jabref/logic/layout/format/Authors.java
index dd6bef7ad54c..dffcf172347a 100644
--- a/src/main/java/org/jabref/logic/layout/format/Authors.java
+++ b/src/main/java/org/jabref/logic/layout/format/Authors.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.layout.format;
 
+import org.jabref.logic.layout.AbstractParamLayoutFormatter;
+import org.jabref.model.entry.Author;
+import org.jabref.model.entry.AuthorList;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.layout.AbstractParamLayoutFormatter;
-import org.jabref.model.entry.Author;
-import org.jabref.model.entry.AuthorList;
-
 /**
  * Versatile author name formatter that takes arguments to control the formatting style.
  */
@@ -150,7 +150,8 @@ private void handleArgument(String key, String value) {
                 abbrDots = false;
                 lastFirstSeparator = ", ";
             }
-        } else if (Authors.SEPARATORS.contains(key.trim().toLowerCase(Locale.ROOT)) || Authors.LAST_SEPARATORS.contains(key.trim().toLowerCase(Locale.ROOT))) {
+        } else if (Authors.SEPARATORS.contains(key.trim().toLowerCase(Locale.ROOT))
+                || Authors.LAST_SEPARATORS.contains(key.trim().toLowerCase(Locale.ROOT))) {
             // AuthorSep = [Comma | And | Colon | Semicolon | sep=<string>]
             // AuthorLastSep = [And | Comma | Colon | Semicolon | Amp | Oxford | lastsep=<string>]
 
@@ -231,7 +232,10 @@ public String format(String fieldText) {
             for (int i = 0; i < al.getNumberOfAuthors(); i++) {
                 Author a = al.getAuthor(i);
 
-                addSingleName(sb, a, (flMode == Authors.FIRST_FIRST) || ((flMode == Authors.LF_FF) && (i > 0)));
+                addSingleName(
+                        sb,
+                        a,
+                        (flMode == Authors.FIRST_FIRST) || ((flMode == Authors.LF_FF) && (i > 0)));
 
                 if (i < (al.getNumberOfAuthors() - 2)) {
                     sb.append(separator);
@@ -254,10 +258,14 @@ public String format(String fieldText) {
 
     private void addSingleName(StringBuilder sb, Author a, boolean firstFirst) {
         StringBuilder lastNameSB = new StringBuilder();
-        a.getNamePrefix().filter(von -> !von.isEmpty()).ifPresent(von -> lastNameSB.append(von).append(' '));
+        a.getNamePrefix()
+                .filter(von -> !von.isEmpty())
+                .ifPresent(von -> lastNameSB.append(von).append(' '));
         a.getFamilyName().ifPresent(lastNameSB::append);
         String jrSeparator = " ";
-        a.getNameSuffix().filter(jr -> !jr.isEmpty()).ifPresent(jr -> lastNameSB.append(jrSeparator).append(jr));
+        a.getNameSuffix()
+                .filter(jr -> !jr.isEmpty())
+                .ifPresent(jr -> lastNameSB.append(jrSeparator).append(jr));
 
         String firstNameResult = "";
         if (a.getGivenName().isPresent()) {
diff --git a/src/main/java/org/jabref/logic/layout/format/CompositeFormat.java b/src/main/java/org/jabref/logic/layout/format/CompositeFormat.java
index f54ca3a89393..be28c22e47c2 100644
--- a/src/main/java/org/jabref/logic/layout/format/CompositeFormat.java
+++ b/src/main/java/org/jabref/logic/layout/format/CompositeFormat.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.layout.format;
 
+import org.jabref.logic.layout.LayoutFormatter;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.jabref.logic.layout.LayoutFormatter;
-
 /**
  * A layout formatter that is the composite of the given Formatters executed in order.
  */
diff --git a/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java b/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java
index 85bd7e0d9501..615a1dcdad71 100644
--- a/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java
+++ b/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java
@@ -36,8 +36,11 @@ public String format(String fieldText) {
     private static void singleAuthor(StringBuilder sb, String author, int position) {
         sb.append("<bibo:contribution>\n");
         sb.append("  <bibo:Contribution>\n");
-        sb.append("    <bibo:role rdf:resource=\"http://purl.org/ontology/bibo/roles/author\" />\n");
-        sb.append("    <bibo:contributor><foaf:Person foaf:name=\"").append(author).append("\"/></bibo:contributor>\n");
+        sb.append(
+                "    <bibo:role rdf:resource=\"http://purl.org/ontology/bibo/roles/author\" />\n");
+        sb.append("    <bibo:contributor><foaf:Person foaf:name=\"")
+                .append(author)
+                .append("\"/></bibo:contributor>\n");
         sb.append("    <bibo:position>").append(position).append("</bibo:position>\n");
         sb.append("  </bibo:Contribution>\n");
         sb.append("</bibo:contribution>\n");
diff --git a/src/main/java/org/jabref/logic/layout/format/CurrentDate.java b/src/main/java/org/jabref/logic/layout/format/CurrentDate.java
index 6388ec677707..0d17b20ea196 100644
--- a/src/main/java/org/jabref/logic/layout/format/CurrentDate.java
+++ b/src/main/java/org/jabref/logic/layout/format/CurrentDate.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.layout.format;
 
+import org.jabref.logic.layout.LayoutFormatter;
+
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 
-import org.jabref.logic.layout.LayoutFormatter;
-
 /**
  * Inserts the current date (the time a database is being exported).
  *
diff --git a/src/main/java/org/jabref/logic/layout/format/DOICheck.java b/src/main/java/org/jabref/logic/layout/format/DOICheck.java
index ed9f2a6fd7b8..40952bb6aa69 100644
--- a/src/main/java/org/jabref/logic/layout/format/DOICheck.java
+++ b/src/main/java/org/jabref/logic/layout/format/DOICheck.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.layout.format;
 
-import java.net.URI;
-
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.logic.preferences.DOIPreferences;
 import org.jabref.model.entry.identifier.DOI;
 
+import java.net.URI;
+
 /**
  * Used to fix [ 1588028 ] export HTML table DOI URL.
  * <p>
@@ -32,9 +32,10 @@ public String format(String fieldText) {
 
         if (doiPreferences.isUseCustom()) {
             var base = URI.create(doiPreferences.getDefaultBaseURI());
-            return DOI.parse(result).flatMap(doi -> doi.getExternalURIFromBase(base))
-                      .map(URI::toASCIIString)
-                      .orElse(result);
+            return DOI.parse(result)
+                    .flatMap(doi -> doi.getExternalURIFromBase(base))
+                    .map(URI::toASCIIString)
+                    .orElse(result);
         }
 
         return DOI.parse(result).map(DOI::getURIAsASCIIString).orElse(result);
diff --git a/src/main/java/org/jabref/logic/layout/format/DateFormatter.java b/src/main/java/org/jabref/logic/layout/format/DateFormatter.java
index e53a3f7dd95f..2d58b928d170 100644
--- a/src/main/java/org/jabref/logic/layout/format/DateFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/DateFormatter.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.layout.format;
 
+import org.jabref.logic.layout.ParamLayoutFormatter;
+
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 
-import org.jabref.logic.layout.ParamLayoutFormatter;
-
 public class DateFormatter implements ParamLayoutFormatter {
 
     private String formatString = "yyyy-MM-dd"; // Use ISO-format as default
diff --git a/src/main/java/org/jabref/logic/layout/format/DocBookAuthorFormatter.java b/src/main/java/org/jabref/logic/layout/format/DocBookAuthorFormatter.java
index 9d1b426eb814..6f47955fa9df 100644
--- a/src/main/java/org/jabref/logic/layout/format/DocBookAuthorFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/DocBookAuthorFormatter.java
@@ -20,19 +20,34 @@ public void addBody(StringBuilder sb, AuthorList al, String tagName, DocBookVers
                 sb.append("<personname>");
             }
             Author a = al.getAuthor(i);
-            a.getGivenName().filter(first -> !first.isEmpty()).ifPresent(first -> sb.append("<firstname>")
-                                                                                    .append(XML_CHARS.format(first)).append("</firstname>"));
-            a.getNamePrefix().filter(von -> !von.isEmpty()).ifPresent(von -> sb.append("<othername>")
-                                                                               .append(XML_CHARS.format(von)).append("</othername>"));
-            a.getFamilyName().filter(last -> !last.isEmpty()).ifPresent(last -> {
-                sb.append("<surname>").append(XML_CHARS.format(last));
-                a.getNameSuffix().filter(jr -> !jr.isEmpty())
-                 .ifPresent(jr -> sb.append(' ').append(XML_CHARS.format(jr)));
-                sb.append("</surname>");
-                if (version == DocBookVersion.DOCBOOK_5) {
-                    sb.append("</personname>");
-                }
-            });
+            a.getGivenName()
+                    .filter(first -> !first.isEmpty())
+                    .ifPresent(
+                            first ->
+                                    sb.append("<firstname>")
+                                            .append(XML_CHARS.format(first))
+                                            .append("</firstname>"));
+            a.getNamePrefix()
+                    .filter(von -> !von.isEmpty())
+                    .ifPresent(
+                            von ->
+                                    sb.append("<othername>")
+                                            .append(XML_CHARS.format(von))
+                                            .append("</othername>"));
+            a.getFamilyName()
+                    .filter(last -> !last.isEmpty())
+                    .ifPresent(
+                            last -> {
+                                sb.append("<surname>").append(XML_CHARS.format(last));
+                                a.getNameSuffix()
+                                        .filter(jr -> !jr.isEmpty())
+                                        .ifPresent(
+                                                jr -> sb.append(' ').append(XML_CHARS.format(jr)));
+                                sb.append("</surname>");
+                                if (version == DocBookVersion.DOCBOOK_5) {
+                                    sb.append("</personname>");
+                                }
+                            });
 
             if (i < (al.getNumberOfAuthors() - 1)) {
                 sb.append("</").append(tagName).append(">\n       ");
diff --git a/src/main/java/org/jabref/logic/layout/format/FileLink.java b/src/main/java/org/jabref/logic/layout/format/FileLink.java
index 202fba42b9d7..35b7543192d8 100644
--- a/src/main/java/org/jabref/logic/layout/format/FileLink.java
+++ b/src/main/java/org/jabref/logic/layout/format/FileLink.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-
 import org.jabref.logic.importer.util.FileFieldParser;
 import org.jabref.logic.layout.ParamLayoutFormatter;
 import org.jabref.model.entry.LinkedFile;
 
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Export formatter that handles the file link list of JabRef 2.3 and later, by
  * selecting the first file link, if any, specified by the field.
@@ -58,9 +58,7 @@ public String format(String field) {
             dirs = fileDirectories;
         }
 
-        return link.findIn(dirs)
-                   .map(path -> path.normalize().toString())
-                   .orElse(link.getLink());
+        return link.findIn(dirs).map(path -> path.normalize().toString()).orElse(link.getLink());
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/layout/format/HTMLChars.java b/src/main/java/org/jabref/logic/layout/format/HTMLChars.java
index 9776f49a504a..80a667b2857b 100644
--- a/src/main/java/org/jabref/logic/layout/format/HTMLChars.java
+++ b/src/main/java/org/jabref/logic/layout/format/HTMLChars.java
@@ -1,19 +1,21 @@
 package org.jabref.logic.layout.format;
 
-import java.util.Map;
-import java.util.Objects;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.layout.ParamLayoutFormatter;
 import org.jabref.logic.util.strings.HTMLUnicodeConversionMaps;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Map;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
 /**
  * This formatter escapes characters so that they are suitable for HTML.
  */
 public class HTMLChars implements ParamLayoutFormatter {
 
-    private static final Map<String, String> HTML_CHARS = HTMLUnicodeConversionMaps.LATEX_HTML_CONVERSION_MAP;
+    private static final Map<String, String> HTML_CHARS =
+            HTMLUnicodeConversionMaps.LATEX_HTML_CONVERSION_MAP;
+
     /**
      * This regex matches '<b>&</b>' that DO NOT BEGIN an HTML entity.
      * <p>
@@ -21,7 +23,8 @@ public class HTMLChars implements ParamLayoutFormatter {
      * <b>&</b>{@literal #34;} <b>Not Matched</b><br>
      * <b>&</b>Hey <b>Matched</b>
      * */
-    private static final Pattern HTML_ENTITY_PATTERN = Pattern.compile("&(?!(?:[a-z0-9]+|#[0-9]{1,6}|#x[0-9a-fA-F]{1,6});)");
+    private static final Pattern HTML_ENTITY_PATTERN =
+            Pattern.compile("&(?!(?:[a-z0-9]+|#[0-9]{1,6}|#x[0-9a-fA-F]{1,6});)");
 
     private boolean keepCurlyBraces = false;
 
@@ -60,7 +63,8 @@ public String format(String inField) {
                 currentCommand = new StringBuilder();
             } else if (!this.keepCurlyBraces && !incommand && ((c == '{') || (c == '}'))) {
                 // Swallow the brace.
-            } else if (Character.isLetter(c) || StringUtil.SPECIAL_COMMAND_CHARS.contains(String.valueOf(c))) {
+            } else if (Character.isLetter(c)
+                    || StringUtil.SPECIAL_COMMAND_CHARS.contains(String.valueOf(c))) {
                 escaped = false;
 
                 if (!incommand) {
@@ -69,7 +73,8 @@ public String format(String inField) {
                     currentCommand.append(c);
                     testCharCom:
                     if ((currentCommand.length() == 1)
-                            && StringUtil.SPECIAL_COMMAND_CHARS.contains(currentCommand.toString())) {
+                            && StringUtil.SPECIAL_COMMAND_CHARS.contains(
+                                    currentCommand.toString())) {
                         // This indicates that we are in a command of the type
                         // \^o or \~{n}
                         if (i >= (field.length() - 1)) {
@@ -121,7 +126,13 @@ public String format(String inField) {
                             i++;
                         }
                         i += part.length();
-                        sb.append('<').append(tag).append('>').append(part).append("</").append(tag).append('>');
+                        sb.append('<')
+                                .append(tag)
+                                .append('>')
+                                .append(part)
+                                .append("</")
+                                .append(tag)
+                                .append('>');
                     } else if (c == '{') {
                         String argument = StringUtil.getPart(field, i, true);
                         i += this.keepCurlyBraces ? argument.length() + 1 : argument.length();
@@ -175,17 +186,22 @@ public String format(String inField) {
             }
         }
 
-        return sb.toString().replace("~", "&nbsp;"); // Replace any remaining ~ with &nbsp; (non-breaking spaces)
+        return sb.toString()
+                .replace(
+                        "~", "&nbsp;"); // Replace any remaining ~ with &nbsp; (non-breaking spaces)
     }
 
     private String normalizedField(String inField) {
-        // Cannot use StringEscapeUtils#escapeHtml4 because it does not handle LaTeX characters and commands.
-        return HTML_ENTITY_PATTERN.matcher(inField).replaceAll("&amp;") // Replace & with &amp; if it does not begin an HTML entity
-                                  .replaceAll("\\\\&", "&amp;") // Replace \& with &amp;
-                                  .replaceAll("[\\n]{2,}", "<p>") // Replace double line breaks with <p>
-                                  .replace("\n", "<br>") // Replace single line breaks with <br>
-                                  .replace("\\$", "&dollar;") // Replace \$ with &dollar;
-                                  .replaceAll("\\$([^$]*)\\$", this.keepCurlyBraces ? "\\\\{$1\\\\}" : "$1}");
+        // Cannot use StringEscapeUtils#escapeHtml4 because it does not handle LaTeX characters and
+        // commands.
+        return HTML_ENTITY_PATTERN
+                .matcher(inField)
+                .replaceAll("&amp;") // Replace & with &amp; if it does not begin an HTML entity
+                .replaceAll("\\\\&", "&amp;") // Replace \& with &amp;
+                .replaceAll("[\\n]{2,}", "<p>") // Replace double line breaks with <p>
+                .replace("\n", "<br>") // Replace single line breaks with <br>
+                .replace("\\$", "&dollar;") // Replace \$ with &dollar;
+                .replaceAll("\\$([^$]*)\\$", this.keepCurlyBraces ? "\\\\{$1\\\\}" : "$1}");
     }
 
     private String getHTMLTag(String latexCommand) {
@@ -210,7 +226,8 @@ private String getHTMLTag(String latexCommand) {
             case "underline":
                 result = "u";
                 break;
-            // Strikeout, sout is the "standard" command, although it is actually based on the package ulem
+            // Strikeout, sout is the "standard" command, although it is actually based on the
+            // package ulem
             case "sout":
                 result = "s";
                 break;
diff --git a/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java b/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java
index e14028519bd3..44919fa3adb9 100644
--- a/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java
+++ b/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.layout.format;
 
+import org.jabref.logic.layout.LayoutFormatter;
+
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.layout.LayoutFormatter;
-
 /**
  * Will interpret two consecutive newlines as the start of a new paragraph and thus
  * wrap the paragraph in HTML-p-tags.
diff --git a/src/main/java/org/jabref/logic/layout/format/IfPlural.java b/src/main/java/org/jabref/logic/layout/format/IfPlural.java
index c07fbd9712bb..349e7031f050 100644
--- a/src/main/java/org/jabref/logic/layout/format/IfPlural.java
+++ b/src/main/java/org/jabref/logic/layout/format/IfPlural.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.layout.format;
 
-import java.util.List;
-
 import org.jabref.logic.layout.AbstractParamLayoutFormatter;
 
+import java.util.List;
+
 /**
  * This formatter takes two arguments and examines the field text.
  * If the field text represents multiple individuals, that is it contains the string "and"
diff --git a/src/main/java/org/jabref/logic/layout/format/Iso690FormatDate.java b/src/main/java/org/jabref/logic/layout/format/Iso690FormatDate.java
index cf1f05ddae2b..ebe9f77db19c 100644
--- a/src/main/java/org/jabref/logic/layout/format/Iso690FormatDate.java
+++ b/src/main/java/org/jabref/logic/layout/format/Iso690FormatDate.java
@@ -21,7 +21,11 @@ public String format(String s) {
         } else if (date.length == 3) {
             // primer campo día, segundo campo mes y tercer campo año
             // cambiamos al formato año-mes-día
-            sb.append(date[2].trim()).append('-').append(date[1].trim()).append('-').append(date[0].trim());
+            sb.append(date[2].trim())
+                    .append('-')
+                    .append(date[1].trim())
+                    .append('-')
+                    .append(date[0].trim());
         }
         return sb.toString(); // retorna el string creado con la fecha.
     }
diff --git a/src/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java b/src/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java
index c68d1bc65b2d..aaa749d325e4 100644
--- a/src/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java
+++ b/src/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import java.util.Locale;
-
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Locale;
+
 public class Iso690NamesAuthors implements LayoutFormatter {
 
     @Override
@@ -45,17 +45,24 @@ public String format(String s) {
                     // primer campo Nombre
                     name = author[0].trim();
                     // Segundo y tercer campo Apellido1 Apellido2
-                    surname = author[1].trim().toUpperCase(Locale.ROOT) + ' ' + author[2].trim().toUpperCase(Locale.ROOT);
+                    surname =
+                            author[1].trim().toUpperCase(Locale.ROOT)
+                                    + ' '
+                                    + author[2].trim().toUpperCase(Locale.ROOT);
 
                     // añadimos los campos modificados al string final
                     sb.append(surname);
                     sb.append(", ");
                     sb.append(name);
-                } else if (author.length == 4) { // Caso 1.3: Nombre SegundoNombre Apellido1 Apellido2
+                } else if (author.length
+                        == 4) { // Caso 1.3: Nombre SegundoNombre Apellido1 Apellido2
                     // primer y segundo campo Nombre SegundoNombre
                     name = author[0].trim() + ' ' + author[1].trim();
                     // tercer y cuarto campo Apellido1 Apellido2
-                    surname = author[2].trim().toUpperCase(Locale.ROOT) + ' ' + author[3].trim().toUpperCase(Locale.ROOT);
+                    surname =
+                            author[2].trim().toUpperCase(Locale.ROOT)
+                                    + ' '
+                                    + author[3].trim().toUpperCase(Locale.ROOT);
 
                     // añadimos los campos modificados al string final
                     sb.append(surname);
diff --git a/src/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java b/src/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java
index b1dc46b7aba1..e7d3bafc007f 100644
--- a/src/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java
+++ b/src/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import java.util.Objects;
-
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.LayoutFormatter;
 
+import java.util.Objects;
+
 /**
  * JournalAbbreviator formats the given text in an abbreviated form according to the journal abbreviation lists.
  *
diff --git a/src/main/java/org/jabref/logic/layout/format/MarkdownFormatter.java b/src/main/java/org/jabref/logic/layout/format/MarkdownFormatter.java
index 39accb95b8c8..10d5a2156601 100644
--- a/src/main/java/org/jabref/logic/layout/format/MarkdownFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/MarkdownFormatter.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.layout.format;
 
-import java.util.Objects;
-
-import org.jabref.logic.layout.LayoutFormatter;
-
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.util.ast.Node;
 import com.vladsch.flexmark.util.data.MutableDataSet;
 
+import org.jabref.logic.layout.LayoutFormatter;
+
+import java.util.Objects;
+
 public class MarkdownFormatter implements LayoutFormatter {
 
     private final Parser parser;
@@ -22,7 +22,8 @@ public MarkdownFormatter() {
 
     @Override
     public String format(final String fieldText) {
-        Objects.requireNonNull(fieldText, "Field Text should not be null, when handed to formatter");
+        Objects.requireNonNull(
+                fieldText, "Field Text should not be null, when handed to formatter");
 
         Node document = parser.parse(fieldText);
         String html = renderer.render(document);
diff --git a/src/main/java/org/jabref/logic/layout/format/NameFormatter.java b/src/main/java/org/jabref/logic/layout/format/NameFormatter.java
index e88122354354..986b2dae425f 100644
--- a/src/main/java/org/jabref/logic/layout/format/NameFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/NameFormatter.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.layout.format;
 
+import org.jabref.logic.bst.util.BstNameFormatter;
+import org.jabref.logic.layout.LayoutFormatter;
+import org.jabref.model.entry.AuthorList;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import org.jabref.logic.bst.util.BstNameFormatter;
-import org.jabref.logic.layout.LayoutFormatter;
-import org.jabref.model.entry.AuthorList;
-
 /**
  * This layout formatter uses the Bibtex name.format$ method and provides ultimate flexibility:
  *
@@ -74,7 +74,8 @@
  */
 public class NameFormatter implements LayoutFormatter {
 
-    public static final String DEFAULT_FORMAT = "1@*@{ff }{vv }{ll}{, jj}@@*@1@{ff }{vv }{ll}{, jj}@*@, {ff }{vv }{ll}{, jj}";
+    public static final String DEFAULT_FORMAT =
+            "1@*@{ff }{vv }{ll}{, jj}@@*@1@{ff }{vv }{ll}{, jj}@*@, {ff }{vv }{ll}{, jj}";
 
     private String parameter = NameFormatter.DEFAULT_FORMAT;
 
diff --git a/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java b/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java
index 09f614f04e92..3af66ef1768d 100644
--- a/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java
+++ b/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java
@@ -1,16 +1,17 @@
 package org.jabref.logic.layout.format;
 
-import java.util.List;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
+import java.util.List;
+
 public class NameFormatterPreferences {
 
     private final ObservableList<String> nameFormatterKey;
     private final ObservableList<String> nameFormatterValue;
 
-    public NameFormatterPreferences(List<String> nameFormatterKey, List<String> nameFormatterValue) {
+    public NameFormatterPreferences(
+            List<String> nameFormatterKey, List<String> nameFormatterValue) {
         this.nameFormatterKey = FXCollections.observableArrayList(nameFormatterKey);
         this.nameFormatterValue = FXCollections.observableArrayList(nameFormatterValue);
     }
diff --git a/src/main/java/org/jabref/logic/layout/format/Ordinal.java b/src/main/java/org/jabref/logic/layout/format/Ordinal.java
index 645dcae42368..820f6ff224dd 100644
--- a/src/main/java/org/jabref/logic/layout/format/Ordinal.java
+++ b/src/main/java/org/jabref/logic/layout/format/Ordinal.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.layout.format;
 
+import org.jabref.logic.layout.LayoutFormatter;
+
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.layout.LayoutFormatter;
-
 /**
  * Converts number to ordinal
  */
@@ -24,12 +24,13 @@ public String format(String fieldText) {
             String result = m.group(1);
             int value = Integer.parseInt(result);
             // CHECKSTYLE:OFF
-            String ordinalString = switch (value) {
-                case 1 -> "st";
-                case 2 -> "nd";
-                case 3 -> "rd";
-                default -> "th";
-            };
+            String ordinalString =
+                    switch (value) {
+                        case 1 -> "st";
+                        case 2 -> "nd";
+                        case 3 -> "rd";
+                        default -> "th";
+                    };
             // CHECKSTYLE:ON
             m.appendReplacement(sb, result + ordinalString);
         }
diff --git a/src/main/java/org/jabref/logic/layout/format/RTFChars.java b/src/main/java/org/jabref/logic/layout/format/RTFChars.java
index 649e85b7ba35..e3c47d67ef83 100644
--- a/src/main/java/org/jabref/logic/layout/format/RTFChars.java
+++ b/src/main/java/org/jabref/logic/layout/format/RTFChars.java
@@ -4,7 +4,6 @@
 import org.jabref.logic.layout.StringInt;
 import org.jabref.logic.util.strings.RtfCharMap;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,7 +54,8 @@ public String format(String field) {
                     currentCommand.append(c);
                     testCharCom:
                     if ((currentCommand.length() == 1)
-                            && StringUtil.SPECIAL_COMMAND_CHARS.contains(currentCommand.toString())) {
+                            && StringUtil.SPECIAL_COMMAND_CHARS.contains(
+                                    currentCommand.toString())) {
                         // This indicates that we are in a command of the type
                         // \^o or \~{n}
                         if (i >= (field.length() - 1)) {
@@ -120,7 +120,9 @@ public String format(String field) {
                         String command = currentCommand.toString();
                         // Then test if we are dealing with a italics or bold
                         // command. If so, handle.
-                        if ("em".equals(command) || "emph".equals(command) || "textit".equals(command)
+                        if ("em".equals(command)
+                                || "emph".equals(command)
+                                || "textit".equals(command)
                                 || "it".equals(command)) {
                             StringInt part = getPart(field, i, c == '{');
                             i += part.i;
@@ -156,8 +158,11 @@ public String format(String field) {
             }
         }
 
-        return sb.toString().replace("---", "{\\emdash}").replace("--", "{\\endash}").replace("``", "{\\ldblquote}")
-                 .replace("''", "{\\rdblquote}");
+        return sb.toString()
+                .replace("---", "{\\emdash}")
+                .replace("--", "{\\endash}")
+                .replace("``", "{\\ldblquote}")
+                .replace("''", "{\\rdblquote}");
     }
 
     /**
@@ -223,10 +228,20 @@ private String transformSpecialCharacter(long c) {
         if ((240 == c) || (273 == c)) {
             return "d";
         }
-        if (((200 <= c) && (c <= 203)) || (274 == c) || (276 == c) || (278 == c) || (280 == c) || (282 == c)) {
+        if (((200 <= c) && (c <= 203))
+                || (274 == c)
+                || (276 == c)
+                || (278 == c)
+                || (280 == c)
+                || (282 == c)) {
             return "E";
         }
-        if (((232 <= c) && (c <= 235)) || (275 == c) || (277 == c) || (279 == c) || (281 == c) || (283 == c)) {
+        if (((232 <= c) && (c <= 235))
+                || (275 == c)
+                || (277 == c)
+                || (279 == c)
+                || (281 == c)
+                || (283 == c)) {
             return "e";
         }
         if (((284 == c) || (286 == c)) || (288 == c) || (290 == c) || (330 == c)) {
@@ -241,7 +256,12 @@ private String transformSpecialCharacter(long c) {
         if ((293 == c) || (295 == c)) {
             return "h";
         }
-        if (((204 <= c) && (c <= 207)) || (296 == c) || (298 == c) || (300 == c) || (302 == c) || (304 == c)) {
+        if (((204 <= c) && (c <= 207))
+                || (296 == c)
+                || (298 == c)
+                || (300 == c)
+                || (302 == c)
+                || (304 == c)) {
             return "I";
         }
         if (((236 <= c) && (c <= 239)) || (297 == c) || (299 == c) || (301 == c) || (303 == c)) {
@@ -295,10 +315,20 @@ private String transformSpecialCharacter(long c) {
         if ((355 == c) || (359 == c)) {
             return "t";
         }
-        if (((217 <= c) && (c <= 220)) || (360 == c) || (362 == c) || (364 == c) || (366 == c) || (370 == c)) {
+        if (((217 <= c) && (c <= 220))
+                || (360 == c)
+                || (362 == c)
+                || (364 == c)
+                || (366 == c)
+                || (370 == c)) {
             return "U";
         }
-        if (((249 <= c) && (c <= 251)) || (361 == c) || (363 == c) || (365 == c) || (367 == c) || (371 == c)) {
+        if (((249 <= c) && (c <= 251))
+                || (361 == c)
+                || (363 == c)
+                || (365 == c)
+                || (367 == c)
+                || (371 == c)) {
             return "u";
         }
         if (372 == c) {
diff --git a/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java b/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java
index f84d21efca26..7cb52119876e 100644
--- a/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java
@@ -13,13 +13,16 @@ public String format(String field) {
         boolean escaped = false;
         boolean incommand = false;
         int currentFieldPosition;
-        for (currentFieldPosition = 0; currentFieldPosition < field.length(); currentFieldPosition++) {
+        for (currentFieldPosition = 0;
+                currentFieldPosition < field.length();
+                currentFieldPosition++) {
             currentCharacter = field.charAt(currentFieldPosition);
             if (escaped && (currentCharacter == '\\')) {
                 cleanedField.append('\\');
                 escaped = false;
                 // \\ --> first \ begins the command, second \ ends the command
-                // \latexommand\\ -> \latexcommand is the command, terminated by \, which begins a new command
+                // \latexommand\\ -> \latexcommand is the command, terminated by \, which begins a
+                // new command
                 incommand = false;
             } else if (currentCharacter == '\\') {
                 escaped = true;
@@ -27,12 +30,15 @@ public String format(String field) {
                 currentCommand = new StringBuilder();
             } else if (!incommand && ((currentCharacter == '{') || (currentCharacter == '}'))) {
                 // Swallow the brace.
-            } else if (Character.isLetter(currentCharacter) || StringUtil.SPECIAL_COMMAND_CHARS.contains(String.valueOf(currentCharacter))) {
+            } else if (Character.isLetter(currentCharacter)
+                    || StringUtil.SPECIAL_COMMAND_CHARS.contains(
+                            String.valueOf(currentCharacter))) {
                 escaped = false;
                 if (incommand) {
                     currentCommand.append(currentCharacter);
                     if ((currentCommand.length() == 1)
-                            && StringUtil.SPECIAL_COMMAND_CHARS.contains(currentCommand.toString())) {
+                            && StringUtil.SPECIAL_COMMAND_CHARS.contains(
+                                    currentCommand.toString())) {
                         // This indicates that we are in a command of the type \^o or \~{n}
                         incommand = false;
                         escaped = false;
@@ -49,7 +55,9 @@ public String format(String field) {
                     cleanedField.append(currentCharacter);
                 }
             } else {
-                if (!incommand || (!Character.isWhitespace(currentCharacter) && (currentCharacter != '{'))) {
+                if (!incommand
+                        || (!Character.isWhitespace(currentCharacter)
+                                && (currentCharacter != '{'))) {
                     cleanedField.append(currentCharacter);
                 } else {
                     if (!Character.isWhitespace(currentCharacter) && (currentCharacter != '{')) {
@@ -59,7 +67,8 @@ public String format(String field) {
                     }
                     if (incommand) {
                         // eat up all whitespace characters
-                        while (currentFieldPosition + 1 < field.length() && Character.isWhitespace(field.charAt(currentFieldPosition + 1))) {
+                        while (currentFieldPosition + 1 < field.length()
+                                && Character.isWhitespace(field.charAt(currentFieldPosition + 1))) {
                             currentFieldPosition++;
                         }
                     }
diff --git a/src/main/java/org/jabref/logic/layout/format/Replace.java b/src/main/java/org/jabref/logic/layout/format/Replace.java
index 97d8987756a6..146b4e714521 100644
--- a/src/main/java/org/jabref/logic/layout/format/Replace.java
+++ b/src/main/java/org/jabref/logic/layout/format/Replace.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.layout.format;
 
-import java.util.List;
-
 import org.jabref.logic.layout.AbstractParamLayoutFormatter;
 
+import java.util.List;
+
 /**
  * Formatter that does regexp replacement.
  *
diff --git a/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java b/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java
index 1d2db81c090c..56dfb5bfa1f4 100644
--- a/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.layout.format;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.logic.util.strings.UnicodeLigaturesMap;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
 public class ReplaceUnicodeLigaturesFormatter extends Formatter implements LayoutFormatter {
 
     private final Map<Pattern, String> ligaturesMap;
diff --git a/src/main/java/org/jabref/logic/layout/format/RisMonth.java b/src/main/java/org/jabref/logic/layout/format/RisMonth.java
index 02927f9d5bb1..e3713aba0075 100644
--- a/src/main/java/org/jabref/logic/layout/format/RisMonth.java
+++ b/src/main/java/org/jabref/logic/layout/format/RisMonth.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.layout.format;
 
-import java.util.Locale;
-import java.util.Optional;
-
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.model.entry.Month;
 
+import java.util.Locale;
+import java.util.Optional;
+
 public class RisMonth implements LayoutFormatter {
 
     @Override
diff --git a/src/main/java/org/jabref/logic/layout/format/ShortMonthFormatter.java b/src/main/java/org/jabref/logic/layout/format/ShortMonthFormatter.java
index 63bef135801f..3e018fd0f67b 100644
--- a/src/main/java/org/jabref/logic/layout/format/ShortMonthFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/ShortMonthFormatter.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import java.util.Optional;
-
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.model.entry.Month;
 
+import java.util.Optional;
+
 public class ShortMonthFormatter implements LayoutFormatter {
 
     @Override
diff --git a/src/main/java/org/jabref/logic/layout/format/ToLowerCase.java b/src/main/java/org/jabref/logic/layout/format/ToLowerCase.java
index 8dc61700ddff..26610be6c118 100644
--- a/src/main/java/org/jabref/logic/layout/format/ToLowerCase.java
+++ b/src/main/java/org/jabref/logic/layout/format/ToLowerCase.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.layout.format;
 
-import java.util.Locale;
-
 import org.jabref.logic.layout.LayoutFormatter;
 
+import java.util.Locale;
+
 /**
  * Convert the contents to lower case.
  */
diff --git a/src/main/java/org/jabref/logic/layout/format/ToUpperCase.java b/src/main/java/org/jabref/logic/layout/format/ToUpperCase.java
index 419eef5f1185..05464c385e01 100644
--- a/src/main/java/org/jabref/logic/layout/format/ToUpperCase.java
+++ b/src/main/java/org/jabref/logic/layout/format/ToUpperCase.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.layout.format;
 
-import java.util.Locale;
-
 import org.jabref.logic.layout.LayoutFormatter;
 
+import java.util.Locale;
+
 /**
  * Convert the contents to upper case.
  */
diff --git a/src/main/java/org/jabref/logic/layout/format/WrapContent.java b/src/main/java/org/jabref/logic/layout/format/WrapContent.java
index 097b12c7609e..e66cafef14eb 100644
--- a/src/main/java/org/jabref/logic/layout/format/WrapContent.java
+++ b/src/main/java/org/jabref/logic/layout/format/WrapContent.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.layout.format;
 
-import java.util.List;
-
 import org.jabref.logic.layout.AbstractParamLayoutFormatter;
 
+import java.util.List;
+
 /**
  * This formatter outputs the input value after adding a prefix and a postfix,
  * as long as the input value is non-empty. If the input value is empty, an
diff --git a/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java b/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java
index bb365892ea4d..14faeb8ebe17 100644
--- a/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java
+++ b/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.layout.format;
 
+import org.jabref.logic.importer.util.FileFieldParser;
+import org.jabref.logic.layout.AbstractParamLayoutFormatter;
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.entry.LinkedFile;
+
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -7,11 +12,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jabref.logic.importer.util.FileFieldParser;
-import org.jabref.logic.layout.AbstractParamLayoutFormatter;
-import org.jabref.logic.util.io.FileUtil;
-import org.jabref.model.entry.LinkedFile;
-
 /**
  * This formatter iterates over all file links, or all file links of a specified
  * type, outputting a format string given as the first argument. The format string
@@ -202,9 +202,10 @@ public String format(String field) {
                                 dirs = fileDirectories;
                             }
 
-                            String pathString = flEntry.findIn(dirs)
-                                                       .map(path -> path.toAbsolutePath().toString())
-                                                       .orElse(flEntry.getLink());
+                            String pathString =
+                                    flEntry.findIn(dirs)
+                                            .map(path -> path.toAbsolutePath().toString())
+                                            .orElse(flEntry.getLink());
 
                             sb.append(replaceStrings(pathString));
                             break;
@@ -220,7 +221,7 @@ public String format(String field) {
                             break;
                         case FILE_EXTENSION:
                             FileUtil.getFileExtension(flEntry.getLink())
-                                      .ifPresent(extension -> sb.append(replaceStrings(extension)));
+                                    .ifPresent(extension -> sb.append(replaceStrings(extension)));
                             break;
                         case FILE_TYPE:
                             sb.append(replaceStrings(flEntry.getFileType()));
diff --git a/src/main/java/org/jabref/logic/layout/format/XMLChars.java b/src/main/java/org/jabref/logic/layout/format/XMLChars.java
index b7c9f9136e02..06ece8888ded 100644
--- a/src/main/java/org/jabref/logic/layout/format/XMLChars.java
+++ b/src/main/java/org/jabref/logic/layout/format/XMLChars.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.layout.format;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.logic.util.strings.XmlCharsMap;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Changes {\^o} or {\^{o}} to ?
  */
diff --git a/src/main/java/org/jabref/logic/logging/LogMessages.java b/src/main/java/org/jabref/logic/logging/LogMessages.java
index 102c9c39db7a..7af5b8fd4624 100644
--- a/src/main/java/org/jabref/logic/logging/LogMessages.java
+++ b/src/main/java/org/jabref/logic/logging/LogMessages.java
@@ -15,8 +15,7 @@ public class LogMessages {
 
     private final ObservableList<LogEntry> messages = FXCollections.observableArrayList();
 
-    private LogMessages() {
-    }
+    private LogMessages() {}
 
     public static LogMessages getInstance() {
         return instance;
diff --git a/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java b/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java
index 39d5af3a42b8..3be37c2a7be6 100644
--- a/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java
+++ b/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java
@@ -1,5 +1,12 @@
 package org.jabref.logic.msbib;
 
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Month;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.field.UnknownField;
+import org.jabref.model.entry.types.EntryType;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -8,19 +15,11 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.Month;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.entry.field.UnknownField;
-import org.jabref.model.entry.types.EntryType;
-
 public class BibTeXConverter {
 
     private static final String MSBIB_PREFIX = "msbib-";
 
-    private BibTeXConverter() {
-    }
+    private BibTeXConverter() {}
 
     /**
      * Converts an {@link MSBibEntry} to a {@link BibEntry} for import
@@ -52,7 +51,8 @@ public static BibEntry convert(MSBibEntry entry) {
         addAuthor(fieldValues, StandardField.BOOKAUTHOR, entry.bookAuthors);
         addAuthor(fieldValues, StandardField.EDITOR, entry.editors);
         addAuthor(fieldValues, StandardField.TRANSLATOR, entry.translators);
-        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "producername"), entry.producerNames);
+        addAuthor(
+                fieldValues, new UnknownField(MSBIB_PREFIX + "producername"), entry.producerNames);
         addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "composer"), entry.composers);
         addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "conductor"), entry.conductors);
         addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "performer"), entry.performers);
@@ -103,12 +103,16 @@ private static void addAuthor(Map<Field, String> map, Field field, List<MsBibAut
         if (authors == null) {
             return;
         }
-        String allAuthors = authors.stream().map(MsBibAuthor::getLastFirst).collect(Collectors.joining(" and "));
+        String allAuthors =
+                authors.stream()
+                        .map(MsBibAuthor::getLastFirst)
+                        .collect(Collectors.joining(" and "));
 
         map.put(field, allAuthors);
     }
 
-    private static void parseSingleStandardNumber(String type, Field field, String standardNum, Map<Field, String> map) {
+    private static void parseSingleStandardNumber(
+            String type, Field field, String standardNum, Map<Field, String> map) {
         Pattern pattern = Pattern.compile(':' + type + ":(.[^:]+)");
         Matcher matcher = pattern.matcher(standardNum);
         if (matcher.matches()) {
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibConverter.java b/src/main/java/org/jabref/logic/msbib/MSBibConverter.java
index 41f030e9be92..14e5d8bfd392 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibConverter.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibConverter.java
@@ -1,9 +1,5 @@
 package org.jabref.logic.msbib;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.logic.formatter.bibtexfields.RemoveEnclosingBracesFormatter;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
@@ -14,14 +10,18 @@
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
 public class MSBibConverter {
 
     private static final String MSBIB_PREFIX = "msbib-";
     private static final String BIBTEX_PREFIX = "BIBTEX_";
-    private static final RemoveEnclosingBracesFormatter REMOVE_BRACES_FORMATTER = new RemoveEnclosingBracesFormatter();
+    private static final RemoveEnclosingBracesFormatter REMOVE_BRACES_FORMATTER =
+            new RemoveEnclosingBracesFormatter();
 
-    private MSBibConverter() {
-    }
+    private MSBibConverter() {}
 
     public static MSBibEntry convert(BibEntry entry) {
         MSBibEntry result = new MSBibEntry();
@@ -41,11 +41,15 @@ public static MSBibEntry convert(BibEntry entry) {
         }
 
         // Duplicate: also added as BookTitle
-        entry.getFieldLatexFree(StandardField.BOOKTITLE).ifPresent(booktitle -> result.conferenceName = booktitle);
-        entry.getFieldLatexFree(StandardField.PAGES).ifPresent(pages -> result.pages = new PageNumbers(pages));
-        entry.getFieldLatexFree(new UnknownField(MSBIB_PREFIX + "accessed")).ifPresent(accesed -> result.dateAccessed = accesed);
+        entry.getFieldLatexFree(StandardField.BOOKTITLE)
+                .ifPresent(booktitle -> result.conferenceName = booktitle);
+        entry.getFieldLatexFree(StandardField.PAGES)
+                .ifPresent(pages -> result.pages = new PageNumbers(pages));
+        entry.getFieldLatexFree(new UnknownField(MSBIB_PREFIX + "accessed"))
+                .ifPresent(accesed -> result.dateAccessed = accesed);
 
-        entry.getFieldLatexFree(StandardField.URLDATE).ifPresent(acessed -> result.dateAccessed = acessed);
+        entry.getFieldLatexFree(StandardField.URLDATE)
+                .ifPresent(acessed -> result.dateAccessed = acessed);
 
         // TODO: currently this can never happen
         if ("SoundRecording".equals(msBibType)) {
@@ -74,12 +78,19 @@ public static MSBibEntry convert(BibEntry entry) {
 
         // Value must be converted
         entry.getFieldLatexFree(StandardField.LANGUAGE)
-             .ifPresent(lang -> result.fields.put("LCID", String.valueOf(MSBibMapping.getLCID(lang))));
+                .ifPresent(
+                        lang ->
+                                result.fields.put(
+                                        "LCID", String.valueOf(MSBibMapping.getLCID(lang))));
         StringBuilder sbNumber = new StringBuilder();
-        entry.getFieldLatexFree(StandardField.ISBN).ifPresent(isbn -> sbNumber.append(" ISBN: ").append(isbn));
-        entry.getFieldLatexFree(StandardField.ISSN).ifPresent(issn -> sbNumber.append(" ISSN: ").append(issn));
-        entry.getFieldLatexFree(new UnknownField("lccn")).ifPresent(lccn -> sbNumber.append("LCCN: ").append(lccn));
-        entry.getFieldLatexFree(StandardField.MR_NUMBER).ifPresent(mrnumber -> sbNumber.append(" MRN: ").append(mrnumber));
+        entry.getFieldLatexFree(StandardField.ISBN)
+                .ifPresent(isbn -> sbNumber.append(" ISBN: ").append(isbn));
+        entry.getFieldLatexFree(StandardField.ISSN)
+                .ifPresent(issn -> sbNumber.append(" ISSN: ").append(issn));
+        entry.getFieldLatexFree(new UnknownField("lccn"))
+                .ifPresent(lccn -> sbNumber.append("LCCN: ").append(lccn));
+        entry.getFieldLatexFree(StandardField.MR_NUMBER)
+                .ifPresent(mrnumber -> sbNumber.append(" MRN: ").append(mrnumber));
 
         result.standardNumber = sbNumber.toString();
         if (result.standardNumber.isEmpty()) {
@@ -113,12 +124,27 @@ public static MSBibEntry convert(BibEntry entry) {
         }
 
         if (entry.getType().equals(IEEETranEntryType.Patent)) {
-            entry.getField(StandardField.AUTHOR).ifPresent(authors -> result.inventors = getAuthors(entry, authors, StandardField.AUTHOR));
+            entry.getField(StandardField.AUTHOR)
+                    .ifPresent(
+                            authors ->
+                                    result.inventors =
+                                            getAuthors(entry, authors, StandardField.AUTHOR));
         } else {
-            entry.getField(StandardField.AUTHOR).ifPresent(authors -> result.authors = getAuthors(entry, authors, StandardField.AUTHOR));
+            entry.getField(StandardField.AUTHOR)
+                    .ifPresent(
+                            authors ->
+                                    result.authors =
+                                            getAuthors(entry, authors, StandardField.AUTHOR));
         }
-        entry.getField(StandardField.EDITOR).ifPresent(editors -> result.editors = getAuthors(entry, editors, StandardField.EDITOR));
-        entry.getField(StandardField.TRANSLATOR).ifPresent(translator -> result.translators = getAuthors(entry, translator, StandardField.EDITOR));
+        entry.getField(StandardField.EDITOR)
+                .ifPresent(
+                        editors ->
+                                result.editors = getAuthors(entry, editors, StandardField.EDITOR));
+        entry.getField(StandardField.TRANSLATOR)
+                .ifPresent(
+                        translator ->
+                                result.translators =
+                                        getAuthors(entry, translator, StandardField.EDITOR));
 
         return result;
     }
@@ -142,9 +168,8 @@ private static List<MsBibAuthor> getAuthors(BibEntry entry, String authors, Fiel
             authorLatexFree = "{" + authorLatexFree + "}";
         }
 
-        return AuthorList.parse(authorLatexFree).getAuthors()
-                         .stream()
-                         .map(author -> new MsBibAuthor(author, corporate))
-                         .toList();
+        return AuthorList.parse(authorLatexFree).getAuthors().stream()
+                .map(author -> new MsBibAuthor(author, corporate))
+                .toList();
     }
 }
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java b/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
index 10a646f401d6..98c6c9718384 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
@@ -1,5 +1,16 @@
 package org.jabref.logic.msbib;
 
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -12,18 +23,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.BibEntry;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
 /**
  * Microsoft Word bibliography.
  * The class is uesed both for import and export
@@ -31,7 +30,8 @@
  */
 public class MSBibDatabase {
 
-    public static final String NAMESPACE = "http://schemas.openxmlformats.org/officeDocument/2006/bibliography";
+    public static final String NAMESPACE =
+            "http://schemas.openxmlformats.org/officeDocument/2006/bibliography";
     public static final String PREFIX = "b:";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MSBibDatabase.class);
@@ -117,8 +117,10 @@ public Document getDomForExport() {
 
             Element rootNode = document.createElementNS(NAMESPACE, PREFIX + "Sources");
             rootNode.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns", NAMESPACE);
-            rootNode.setAttributeNS("http://www.w3.org/2000/xmlns/",
-                    "xmlns:" + PREFIX.substring(0, PREFIX.length() - 1), NAMESPACE);
+            rootNode.setAttributeNS(
+                    "http://www.w3.org/2000/xmlns/",
+                    "xmlns:" + PREFIX.substring(0, PREFIX.length() - 1),
+                    NAMESPACE);
             rootNode.setAttribute("SelectedStyle", "");
 
             for (MSBibEntry entry : entriesForExport) {
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibEntry.java b/src/main/java/org/jabref/logic/msbib/MSBibEntry.java
index 2366c3a51596..de7d9357b459 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibEntry.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibEntry.java
@@ -1,24 +1,23 @@
 package org.jabref.logic.msbib;
 
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.Date;
 import org.jabref.model.entry.Month;
 import org.jabref.model.strings.StringUtil;
-
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * MSBib entry representation
  *
@@ -74,7 +73,8 @@ class MSBibEntry {
      *  Matches both single locations (only city) like Berlin and full locations like Stroudsburg, PA, USA <br>
      *  tested using http://www.regexpal.com/
      */
-    private final Pattern ADDRESS_PATTERN = Pattern.compile("\\b(\\w+)\\s?[,]?\\s?(\\w*)\\s?[,]?\\s?(\\w*)\\b");
+    private final Pattern ADDRESS_PATTERN =
+            Pattern.compile("\\b(\\w+)\\s?[,]?\\s?(\\w*)\\s?[,]?\\s?(\\w*)\\b");
 
     public MSBibEntry() {
         // empty
@@ -158,9 +158,11 @@ private void populateFromXml(Element entry) {
         String dayAccessed = getXmlElementTextContent("DayAccessed", entry);
         String yearAccessed = getXmlElementTextContent("YearAccessed", entry);
 
-        Optional<Date> parsedDateAcessed = Date.parse(Optional.ofNullable(yearAccessed),
-                Optional.ofNullable(monthAccessed),
-                Optional.ofNullable(dayAccessed));
+        Optional<Date> parsedDateAcessed =
+                Date.parse(
+                        Optional.ofNullable(yearAccessed),
+                        Optional.ofNullable(monthAccessed),
+                        Optional.ofNullable(dayAccessed));
 
         parsedDateAcessed.map(Date::getNormalized).ifPresent(date -> dateAccessed = date);
 
@@ -239,15 +241,18 @@ private List<MsBibAuthor> getSpecificAuthors(String type, Element authors) {
      * @return XmlElement represenation of one entry
      */
     public Element getEntryDom(Document document) {
-        Element rootNode = document.createElementNS(MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + "Source");
+        Element rootNode =
+                document.createElementNS(MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + "Source");
 
         for (Map.Entry<String, String> entry : fields.entrySet()) {
             addField(document, rootNode, entry.getKey(), entry.getValue());
         }
 
-        Optional.ofNullable(dateAccessed).ifPresent(field -> addDateAcessedFields(document, rootNode));
+        Optional.ofNullable(dateAccessed)
+                .ifPresent(field -> addDateAcessedFields(document, rootNode));
 
-        Element allAuthors = document.createElementNS(MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + "Author");
+        Element allAuthors =
+                document.createElementNS(MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + "Author");
 
         addAuthor(document, allAuthors, "Author", authors);
         addAuthor(document, allAuthors, "BookAuthor", bookAuthors);
@@ -298,31 +303,38 @@ private void addField(Document document, Element parent, String name, String val
         if (value == null) {
             return;
         }
-        Element elem = document.createElementNS(MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + name);
+        Element elem =
+                document.createElementNS(MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + name);
         elem.appendChild(document.createTextNode(StringUtil.stripNonValidXMLCharacters(value)));
         parent.appendChild(elem);
     }
 
     // Add authors for export
-    private void addAuthor(Document document, Element allAuthors, String entryName, List<MsBibAuthor> authorsLst) {
+    private void addAuthor(
+            Document document, Element allAuthors, String entryName, List<MsBibAuthor> authorsLst) {
         if (authorsLst == null) {
             return;
         }
-        Element authorTop = document.createElementNS(MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + entryName);
+        Element authorTop =
+                document.createElementNS(MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + entryName);
 
-        Optional<MsBibAuthor> personName = authorsLst.stream()
-                                                     .filter(MsBibAuthor::isCorporate)
-                                                     .findFirst();
+        Optional<MsBibAuthor> personName =
+                authorsLst.stream().filter(MsBibAuthor::isCorporate).findFirst();
         if (personName.isPresent()) {
             MsBibAuthor person = personName.get();
-            Element corporate = document.createElementNS(MSBibDatabase.NAMESPACE,
-                    MSBibDatabase.PREFIX + "Corporate");
+            Element corporate =
+                    document.createElementNS(
+                            MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + "Corporate");
             corporate.setTextContent(person.getLastName());
             authorTop.appendChild(corporate);
         } else {
-            Element nameList = document.createElementNS(MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + "NameList");
+            Element nameList =
+                    document.createElementNS(
+                            MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + "NameList");
             for (MsBibAuthor name : authorsLst) {
-                Element person = document.createElementNS(MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + "Person");
+                Element person =
+                        document.createElementNS(
+                                MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + "Person");
                 addField(document, person, "Last", name.getLastName());
                 addField(document, person, "Middle", name.getMiddleName());
                 addField(document, person, "First", name.getFirstName());
@@ -335,17 +347,28 @@ private void addAuthor(Document document, Element allAuthors, String entryName,
 
     private void addDateAcessedFields(Document document, Element rootNode) {
         Optional<Date> parsedDateAcesseField = Date.parse(dateAccessed);
-        parsedDateAcesseField.flatMap(Date::getYear).map(Object::toString).ifPresent(yearAccessed -> {
-            addField(document, rootNode, "Year" + "Accessed", yearAccessed);
-        });
-
-        parsedDateAcesseField.flatMap(Date::getMonth)
-                             .map(Month::getFullName).ifPresent(monthAcessed -> {
-            addField(document, rootNode, "Month" + "Accessed", monthAcessed);
-        });
-        parsedDateAcesseField.flatMap(Date::getDay).map(Object::toString).ifPresent(dayAccessed -> {
-            addField(document, rootNode, "Day" + "Accessed", dayAccessed);
-        });
+        parsedDateAcesseField
+                .flatMap(Date::getYear)
+                .map(Object::toString)
+                .ifPresent(
+                        yearAccessed -> {
+                            addField(document, rootNode, "Year" + "Accessed", yearAccessed);
+                        });
+
+        parsedDateAcesseField
+                .flatMap(Date::getMonth)
+                .map(Month::getFullName)
+                .ifPresent(
+                        monthAcessed -> {
+                            addField(document, rootNode, "Month" + "Accessed", monthAcessed);
+                        });
+        parsedDateAcesseField
+                .flatMap(Date::getDay)
+                .map(Object::toString)
+                .ifPresent(
+                        dayAccessed -> {
+                            addField(document, rootNode, "Day" + "Accessed", dayAccessed);
+                        });
     }
 
     private void addAddress(Document document, Element parent, String addressToSplit) {
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibMapping.java b/src/main/java/org/jabref/logic/msbib/MSBibMapping.java
index ce27cdcf381a..d05ce70d5b24 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibMapping.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibMapping.java
@@ -1,7 +1,7 @@
 package org.jabref.logic.msbib;
 
-import java.util.HashMap;
-import java.util.Map;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.InternalField;
@@ -11,8 +11,8 @@
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Mapping between Msbib and biblatex All Fields: <a href = "https://msdn.microsoft.com/de-de/library/office/documentformat.openxml.bibliography">List
@@ -28,7 +28,8 @@ public class MSBibMapping {
     private static final Map<EntryType, MSBibEntryType> BIB_ENTRYTYPE_MAPPING = new HashMap<>();
 
     static {
-        // see https://learn.microsoft.com/en-us/openspecs/office_standards/ms-oe376/6c085406-a698-4e12-9d4d-c3b0ee3dbc4a
+        // see
+        // https://learn.microsoft.com/en-us/openspecs/office_standards/ms-oe376/6c085406-a698-4e12-9d4d-c3b0ee3dbc4a
         LANG_TO_LCID.put("basque", 1609);
         LANG_TO_LCID.put("bulgarian", 1026);
         LANG_TO_LCID.put("catalan", 1027);
@@ -107,7 +108,8 @@ public class MSBibMapping {
         BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + StandardField.DAY), "Day");
         BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "accessed"), "Accessed");
         BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "medium"), "Medium");
-        BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "recordingnumber"), "RecordingNumber");
+        BIBLATEX_TO_MS_BIB.put(
+                new UnknownField(MSBIB_PREFIX + "recordingnumber"), "RecordingNumber");
         BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "theater"), "Theater");
         BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "distributor"), "Distributor");
         BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "broadcaster"), "Broadcaster");
@@ -116,20 +118,23 @@ public class MSBibMapping {
         BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "court"), "Court");
         BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "reporter"), "Reporter");
         BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "casenumber"), "CaseNumber");
-        BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "abbreviatedcasenumber"), "AbbreviatedCaseNumber");
-        BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "productioncompany"), "ProductionCompany");
+        BIBLATEX_TO_MS_BIB.put(
+                new UnknownField(MSBIB_PREFIX + "abbreviatedcasenumber"), "AbbreviatedCaseNumber");
+        BIBLATEX_TO_MS_BIB.put(
+                new UnknownField(MSBIB_PREFIX + "productioncompany"), "ProductionCompany");
     }
 
     static {
-        MSBIB_ENTRYTYPE_MAPPING = Map.of(
-                "Book", StandardEntryType.Book,
-                "BookSection", StandardEntryType.Book,
-                "JournalArticle", StandardEntryType.Article,
-                "ArticleInAPeriodical", IEEETranEntryType.Periodical,
-                "ConferenceProceedings", StandardEntryType.InProceedings,
-                "Report", StandardEntryType.TechReport,
-                "Patent", IEEETranEntryType.Patent,
-                "InternetSite", StandardEntryType.Online);
+        MSBIB_ENTRYTYPE_MAPPING =
+                Map.of(
+                        "Book", StandardEntryType.Book,
+                        "BookSection", StandardEntryType.Book,
+                        "JournalArticle", StandardEntryType.Article,
+                        "ArticleInAPeriodical", IEEETranEntryType.Periodical,
+                        "ConferenceProceedings", StandardEntryType.InProceedings,
+                        "Report", StandardEntryType.TechReport,
+                        "Patent", IEEETranEntryType.Patent,
+                        "InternetSite", StandardEntryType.Online);
     }
 
     static {
@@ -139,10 +144,14 @@ public class MSBibMapping {
         BIB_ENTRYTYPE_MAPPING.put(StandardEntryType.Booklet, MSBibEntryType.BookSection);
         BIB_ENTRYTYPE_MAPPING.put(StandardEntryType.InCollection, MSBibEntryType.BookSection);
         BIB_ENTRYTYPE_MAPPING.put(StandardEntryType.Article, MSBibEntryType.JournalArticle);
-        BIB_ENTRYTYPE_MAPPING.put(StandardEntryType.InProceedings, MSBibEntryType.ConferenceProceedings);
-        BIB_ENTRYTYPE_MAPPING.put(StandardEntryType.Conference, MSBibEntryType.ConferenceProceedings);
-        BIB_ENTRYTYPE_MAPPING.put(StandardEntryType.Proceedings, MSBibEntryType.ConferenceProceedings);
-        BIB_ENTRYTYPE_MAPPING.put(StandardEntryType.Collection, MSBibEntryType.ConferenceProceedings);
+        BIB_ENTRYTYPE_MAPPING.put(
+                StandardEntryType.InProceedings, MSBibEntryType.ConferenceProceedings);
+        BIB_ENTRYTYPE_MAPPING.put(
+                StandardEntryType.Conference, MSBibEntryType.ConferenceProceedings);
+        BIB_ENTRYTYPE_MAPPING.put(
+                StandardEntryType.Proceedings, MSBibEntryType.ConferenceProceedings);
+        BIB_ENTRYTYPE_MAPPING.put(
+                StandardEntryType.Collection, MSBibEntryType.ConferenceProceedings);
         BIB_ENTRYTYPE_MAPPING.put(StandardEntryType.TechReport, MSBibEntryType.Report);
         BIB_ENTRYTYPE_MAPPING.put(StandardEntryType.Manual, MSBibEntryType.Report);
         BIB_ENTRYTYPE_MAPPING.put(StandardEntryType.MastersThesis, MSBibEntryType.Report);
@@ -154,8 +163,7 @@ public class MSBibMapping {
         BIB_ENTRYTYPE_MAPPING.put(StandardEntryType.Online, MSBibEntryType.InternetSite);
     }
 
-    private MSBibMapping() {
-    }
+    private MSBibMapping() {}
 
     public static EntryType getBiblatexEntryType(String msbibType) {
         return MSBIB_ENTRYTYPE_MAPPING.getOrDefault(msbibType, StandardEntryType.Misc);
diff --git a/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java b/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java
index 9285a4d9d057..969e82ab8dad 100644
--- a/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java
+++ b/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java
@@ -5,7 +5,8 @@
 
 public class MsBibAuthor {
 
-    private static final RemoveEnclosingBracesFormatter REMOVE_BRACES_FORMATTER = new RemoveEnclosingBracesFormatter();
+    private static final RemoveEnclosingBracesFormatter REMOVE_BRACES_FORMATTER =
+            new RemoveEnclosingBracesFormatter();
 
     private String firstName;
     private String middleName;
@@ -16,16 +17,17 @@ public MsBibAuthor(Author author) {
         this.author = author;
 
         StringBuilder sb = new StringBuilder();
-        author.getGivenName().ifPresent(firstNames -> {
-
-            String[] names = firstNames.split(" ");
-            for (int i = 1; i < names.length; i++) {
-                sb.append(names[i]);
-                sb.append(" ");
-            }
-            this.middleName = sb.toString().trim();
-            this.firstName = names[0];
-        });
+        author.getGivenName()
+                .ifPresent(
+                        firstNames -> {
+                            String[] names = firstNames.split(" ");
+                            for (int i = 1; i < names.length; i++) {
+                                sb.append(names[i]);
+                                sb.append(" ");
+                            }
+                            this.middleName = sb.toString().trim();
+                            this.firstName = names[0];
+                        });
     }
 
     public MsBibAuthor(Author author, boolean isCorporate) {
diff --git a/src/main/java/org/jabref/logic/msbib/PageNumbers.java b/src/main/java/org/jabref/logic/msbib/PageNumbers.java
index 54daca52fd94..5050156a6beb 100644
--- a/src/main/java/org/jabref/logic/msbib/PageNumbers.java
+++ b/src/main/java/org/jabref/logic/msbib/PageNumbers.java
@@ -1,14 +1,15 @@
 package org.jabref.logic.msbib;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class PageNumbers {
-    private static final Pattern PAGE_PATTERN = Pattern.compile("\\s*(\\d+)\\s*-{1,2}\\s*(\\d+)\\s*");
+    private static final Pattern PAGE_PATTERN =
+            Pattern.compile("\\s*(\\d+)\\s*-{1,2}\\s*(\\d+)\\s*");
     private String freeform;
     private int start;
 
diff --git a/src/main/java/org/jabref/logic/net/ProgressInputStream.java b/src/main/java/org/jabref/logic/net/ProgressInputStream.java
index d114cbbe6cbc..c166b26e1b29 100644
--- a/src/main/java/org/jabref/logic/net/ProgressInputStream.java
+++ b/src/main/java/org/jabref/logic/net/ProgressInputStream.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.net;
 
+import javafx.beans.property.LongProperty;
+import javafx.beans.property.SimpleLongProperty;
+
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import javafx.beans.property.LongProperty;
-import javafx.beans.property.SimpleLongProperty;
-
 /**
  * An input stream that keeps track of the amount of bytes already read.
  * Code based on http://stackoverflow.com/a/1339589/873661, but converted to use JavaFX properties instead of listeners
diff --git a/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java b/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java
index f6e3496e8cef..fdd4d8de399a 100644
--- a/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java
+++ b/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java
@@ -14,7 +14,8 @@ protected PasswordAuthentication getPasswordAuthentication() {
             String port = System.getProperty(prot + ".proxyPort", "80");
             String user = System.getProperty(prot + ".proxyUser", "");
             String password = System.getProperty(prot + ".proxyPassword", "");
-            if (getRequestingHost().equalsIgnoreCase(host) && (Integer.parseInt(port) == getRequestingPort())) {
+            if (getRequestingHost().equalsIgnoreCase(host)
+                    && (Integer.parseInt(port) == getRequestingPort())) {
                 return new PasswordAuthentication(user, password.toCharArray());
             }
         }
diff --git a/src/main/java/org/jabref/logic/net/ProxyPreferences.java b/src/main/java/org/jabref/logic/net/ProxyPreferences.java
index dc5311ab1391..990e19450708 100644
--- a/src/main/java/org/jabref/logic/net/ProxyPreferences.java
+++ b/src/main/java/org/jabref/logic/net/ProxyPreferences.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.net;
 
-import java.util.Objects;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
+import java.util.Objects;
+
 public class ProxyPreferences {
 
     private final BooleanProperty useProxy;
@@ -17,13 +17,14 @@ public class ProxyPreferences {
     private final StringProperty password;
     private final BooleanProperty persistPassword;
 
-    public ProxyPreferences(Boolean useProxy,
-                            String hostname,
-                            String port,
-                            Boolean useAuthentication,
-                            String username,
-                            String password,
-                            boolean persistPassword) {
+    public ProxyPreferences(
+            Boolean useProxy,
+            String hostname,
+            String port,
+            Boolean useAuthentication,
+            String username,
+            String password,
+            boolean persistPassword) {
         this.useProxy = new SimpleBooleanProperty(useProxy);
         this.hostname = new SimpleStringProperty(hostname);
         this.port = new SimpleStringProperty(port);
diff --git a/src/main/java/org/jabref/logic/net/ProxyRegisterer.java b/src/main/java/org/jabref/logic/net/ProxyRegisterer.java
index 344f4fd412f7..2f33f32d3fb0 100644
--- a/src/main/java/org/jabref/logic/net/ProxyRegisterer.java
+++ b/src/main/java/org/jabref/logic/net/ProxyRegisterer.java
@@ -2,8 +2,7 @@
 
 public class ProxyRegisterer {
 
-    private ProxyRegisterer() {
-    }
+    private ProxyRegisterer() {}
 
     public static void register(ProxyPreferences proxyPrefs) {
         if (proxyPrefs.shouldUseProxy()) {
@@ -14,7 +13,8 @@ public static void register(ProxyPreferences proxyPrefs) {
             System.setProperty("https.proxyHost", proxyPrefs.getHostname());
             System.setProperty("https.proxyPort", proxyPrefs.getPort());
 
-            // NetworkTabView.java ensures that proxyUsername and proxyPassword are neither null nor empty
+            // NetworkTabView.java ensures that proxyUsername and proxyPassword are neither null nor
+            // empty
             if (proxyPrefs.shouldUseAuthentication()) {
                 System.setProperty("http.proxyUser", proxyPrefs.getUsername());
                 System.setProperty("http.proxyPassword", proxyPrefs.getPassword());
diff --git a/src/main/java/org/jabref/logic/net/URLDownload.java b/src/main/java/org/jabref/logic/net/URLDownload.java
index 6fb9db4cabeb..fec36e4f4640 100644
--- a/src/main/java/org/jabref/logic/net/URLDownload.java
+++ b/src/main/java/org/jabref/logic/net/URLDownload.java
@@ -1,5 +1,18 @@
 package org.jabref.logic.net;
 
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.Unirest;
+import kong.unirest.core.UnirestException;
+
+import org.jabref.http.dto.SimpleHttpResponse;
+import org.jabref.logic.importer.FetcherClientException;
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.FetcherServerException;
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.strings.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -38,19 +51,6 @@
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 
-import org.jabref.http.dto.SimpleHttpResponse;
-import org.jabref.logic.importer.FetcherClientException;
-import org.jabref.logic.importer.FetcherException;
-import org.jabref.logic.importer.FetcherServerException;
-import org.jabref.logic.util.io.FileUtil;
-import org.jabref.model.strings.StringUtil;
-
-import kong.unirest.core.HttpResponse;
-import kong.unirest.core.Unirest;
-import kong.unirest.core.UnirestException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * URL download to a string.
  * <p>
@@ -67,7 +67,8 @@
  */
 public class URLDownload {
 
-    public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:130.0) Gecko/20100101 Firefox/130.0";
+    public static final String USER_AGENT =
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:130.0) Gecko/20100101 Firefox/130.0";
     private static final Logger LOGGER = LoggerFactory.getLogger(URLDownload.class);
     private static final Duration DEFAULT_CONNECT_TIMEOUT = Duration.ofSeconds(30);
     private static final int MAX_RETRIES = 3;
@@ -80,9 +81,9 @@ public class URLDownload {
 
     static {
         Unirest.config()
-               .followRedirects(true)
-               .enableCookieManagement(true)
-               .setDefaultHeader("User-Agent", USER_AGENT);
+                .followRedirects(true)
+                .enableCookieManagement(true)
+                .setDefaultHeader("User-Agent", USER_AGENT);
     }
 
     /**
@@ -103,7 +104,8 @@ public URLDownload(URL source) {
         try {
             sslContext = SSLContext.getInstance("TLSv1.2");
             sslContext.init(null, null, new SecureRandom());
-            // Note: SSL certificates are installed at {@link TrustStoreManager#configureTrustStore(Path)}
+            // Note: SSL certificates are installed at {@link
+            // TrustStoreManager#configureTrustStore(Path)}
         } catch (NoSuchAlgorithmException | KeyManagementException e) {
             LOGGER.error("Could not initialize SSL context", e);
             sslContext = null;
@@ -125,8 +127,10 @@ public Optional<String> getMimeType() {
             do {
                 retries++;
                 HttpResponse<String> response = Unirest.head(urlToCheck).asString();
-                // Check if we have redirects, e.g. arxiv will give otherwise content type html for the original url
-                // We need to do it "manually", because ".followRedirects(true)" only works for GET not for HEAD
+                // Check if we have redirects, e.g. arxiv will give otherwise content type html for
+                // the original url
+                // We need to do it "manually", because ".followRedirects(true)" only works for GET
+                // not for HEAD
                 locationHeader = response.getHeaders().getFirst("location");
                 if (!StringUtil.isNullOrEmpty(locationHeader)) {
                     urlToCheck = locationHeader;
@@ -143,7 +147,12 @@ public Optional<String> getMimeType() {
 
         // Use GET request as alternative if no HEAD request is available
         try {
-            contentType = Unirest.get(source.toString()).asString().getHeaders().get("Content-Type").getFirst();
+            contentType =
+                    Unirest.get(source.toString())
+                            .asString()
+                            .getHeaders()
+                            .get("Content-Type")
+                            .getFirst();
             if (!StringUtil.isNullOrEmpty(contentType)) {
                 return Optional.of(contentType);
             }
@@ -231,9 +240,10 @@ public static String asString(URLConnection existingConnection) throws FetcherEx
      * @param connection an existing connection
      * @return the downloaded string
      */
-    public static String asString(Charset encoding, URLConnection connection) throws FetcherException {
+    public static String asString(Charset encoding, URLConnection connection)
+            throws FetcherException {
         try (InputStream input = new BufferedInputStream(connection.getInputStream());
-             Writer output = new StringWriter()) {
+                Writer output = new StringWriter()) {
             copy(input, output, encoding);
             return output.toString();
         } catch (IOException e) {
@@ -368,8 +378,8 @@ public URLConnection openConnection() throws FetcherException {
             }
 
             if ((status == HttpURLConnection.HTTP_MOVED_TEMP)
-                || (status == HttpURLConnection.HTTP_MOVED_PERM)
-                || (status == HttpURLConnection.HTTP_SEE_OTHER)) {
+                    || (status == HttpURLConnection.HTTP_MOVED_PERM)
+                    || (status == HttpURLConnection.HTTP_SEE_OTHER)) {
                 // get redirect url from "location" header field
                 String newUrl = connection.getHeaderField("location");
                 // open the new connection again
diff --git a/src/main/java/org/jabref/logic/net/ssl/SSLCertificate.java b/src/main/java/org/jabref/logic/net/ssl/SSLCertificate.java
index d2229b87850f..5bdb0a054722 100644
--- a/src/main/java/org/jabref/logic/net/ssl/SSLCertificate.java
+++ b/src/main/java/org/jabref/logic/net/ssl/SSLCertificate.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.net.ssl;
 
+import com.google.common.hash.Hashing;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.nio.file.Path;
@@ -12,10 +17,6 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import com.google.common.hash.Hashing;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class SSLCertificate {
     private static final Logger LOGGER = LoggerFactory.getLogger(SSLCertificate.class);
 
@@ -27,7 +28,14 @@ public class SSLCertificate {
     private final String signatureAlgorithm;
     private final Integer version;
 
-    public SSLCertificate(byte[] encoded, String serialNumber, String issuer, LocalDate validFrom, LocalDate validTo, String signatureAlgorithm, Integer version) {
+    public SSLCertificate(
+            byte[] encoded,
+            String serialNumber,
+            String issuer,
+            LocalDate validFrom,
+            LocalDate validTo,
+            String signatureAlgorithm,
+            Integer version) {
         this.serialNumber = serialNumber;
         this.issuer = issuer;
         this.validFrom = validFrom;
@@ -71,12 +79,19 @@ public String getSHA256Thumbprint() {
     public static Optional<SSLCertificate> fromX509(X509Certificate x509Certificate) {
         Objects.requireNonNull(x509Certificate);
         try {
-            return Optional.of(new SSLCertificate(x509Certificate.getEncoded(), x509Certificate.getSerialNumber().toString(),
-                    x509Certificate.getIssuerX500Principal().getName(),
-                    LocalDate.ofInstant(x509Certificate.getNotBefore().toInstant(), ZoneId.systemDefault()),
-                    LocalDate.ofInstant(x509Certificate.getNotAfter().toInstant(), ZoneId.systemDefault()),
-                    x509Certificate.getSigAlgName(),
-                    x509Certificate.getVersion()));
+            return Optional.of(
+                    new SSLCertificate(
+                            x509Certificate.getEncoded(),
+                            x509Certificate.getSerialNumber().toString(),
+                            x509Certificate.getIssuerX500Principal().getName(),
+                            LocalDate.ofInstant(
+                                    x509Certificate.getNotBefore().toInstant(),
+                                    ZoneId.systemDefault()),
+                            LocalDate.ofInstant(
+                                    x509Certificate.getNotAfter().toInstant(),
+                                    ZoneId.systemDefault()),
+                            x509Certificate.getSigAlgName(),
+                            x509Certificate.getVersion()));
         } catch (CertificateEncodingException e) {
             LOGGER.warn("Error while encoding certificate", e);
         }
@@ -87,7 +102,10 @@ public static Optional<SSLCertificate> fromPath(Path certPath) {
         Objects.requireNonNull(certPath);
         try {
             CertificateFactory certificateFactory = CertificateFactory.getInstance("X509");
-            return fromX509((X509Certificate) certificateFactory.generateCertificate(new FileInputStream(certPath.toFile())));
+            return fromX509(
+                    (X509Certificate)
+                            certificateFactory.generateCertificate(
+                                    new FileInputStream(certPath.toFile())));
         } catch (CertificateException e) {
             LOGGER.warn("Certificate doesn't follow X.509 format", e);
         } catch (FileNotFoundException e) {
diff --git a/src/main/java/org/jabref/logic/net/ssl/TrustStoreManager.java b/src/main/java/org/jabref/logic/net/ssl/TrustStoreManager.java
index 3eaf66591675..c19711480da3 100644
--- a/src/main/java/org/jabref/logic/net/ssl/TrustStoreManager.java
+++ b/src/main/java/org/jabref/logic/net/ssl/TrustStoreManager.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.net.ssl;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,9 +27,6 @@
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * @implNote SSL certificates are installed at {@link TrustStoreManager#configureTrustStore(Path)}
  */
@@ -45,7 +45,10 @@ public TrustStoreManager(Path storePath) {
         try {
             store = KeyStore.getInstance(KeyStore.getDefaultType());
             store.load(new FileInputStream(storePath.toFile()), STORE_PASSWORD.toCharArray());
-        } catch (CertificateException | IOException | NoSuchAlgorithmException | KeyStoreException e) {
+        } catch (CertificateException
+                | IOException
+                | NoSuchAlgorithmException
+                | KeyStoreException e) {
             LOGGER.warn("Error while loading trust store from: {}", storePath.toAbsolutePath(), e);
         }
     }
@@ -56,7 +59,9 @@ public void addCertificate(String alias, Path certPath) {
 
         try {
             CertificateFactory certificateFactory = CertificateFactory.getInstance("X509");
-            store.setCertificateEntry(alias, certificateFactory.generateCertificate(new FileInputStream(certPath.toFile())));
+            store.setCertificateEntry(
+                    alias,
+                    certificateFactory.generateCertificate(new FileInputStream(certPath.toFile())));
         } catch (KeyStoreException | CertificateException | IOException e) {
             LOGGER.warn("Error while adding a new certificate to the truststore: {}", alias, e);
         }
@@ -102,7 +107,10 @@ public int certsCount() {
     public void flush() {
         try {
             store.store(Files.newOutputStream(storePath), STORE_PASSWORD.toCharArray());
-        } catch (KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException e) {
+        } catch (KeyStoreException
+                | IOException
+                | NoSuchAlgorithmException
+                | CertificateException e) {
             LOGGER.warn("Error while flushing trust store", e);
         }
     }
@@ -124,11 +132,11 @@ public void clearCustomCertificates() {
 
     public List<SSLCertificate> getCustomCertificates() {
         return aliases().stream()
-                        .filter(this::isCustomCertificate)
-                        .map(this::getCertificate)
-                        .map(SSLCertificate::fromX509)
-                        .flatMap(Optional::stream)
-                        .collect(Collectors.toList());
+                .filter(this::isCustomCertificate)
+                .map(this::getCertificate)
+                .map(SSLCertificate::fromX509)
+                .flatMap(Optional::stream)
+                .collect(Collectors.toList());
     }
 
     public X509Certificate getCertificate(String alias) {
@@ -151,14 +159,18 @@ public static void createTruststoreFileIfNotExist(Path storePath) {
             LOGGER.debug("Trust store path: {}", storePath.toAbsolutePath());
             if (Files.notExists(storePath)) {
                 Files.createDirectories(storePath.getParent());
-                try (InputStream inputStream = TrustStoreManager.class.getResourceAsStream("/ssl/truststore.jks")) {
+                try (InputStream inputStream =
+                        TrustStoreManager.class.getResourceAsStream("/ssl/truststore.jks")) {
                     Files.copy(inputStream, storePath);
                 }
             }
 
             try {
                 configureTrustStore(storePath);
-            } catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException | CertificateException e) {
+            } catch (KeyManagementException
+                    | NoSuchAlgorithmException
+                    | KeyStoreException
+                    | CertificateException e) {
                 LOGGER.error("Error configuring trust store {}", storePath, e);
             }
         } catch (IOException e) {
@@ -169,21 +181,27 @@ public static void createTruststoreFileIfNotExist(Path storePath) {
     /**
      * @implNote based on https://stackoverflow.com/a/62586564/3450689
      */
-    private static void configureTrustStore(Path myStorePath) throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException,
-        CertificateException, IOException {
+    private static void configureTrustStore(Path myStorePath)
+            throws NoSuchAlgorithmException,
+                    KeyManagementException,
+                    KeyStoreException,
+                    CertificateException,
+                    IOException {
         X509TrustManager jreTrustManager = getJreTrustManager();
         X509TrustManager myTrustManager = getJabRefTrustManager(myStorePath);
 
-        X509TrustManager mergedTrustManager = createMergedTrustManager(jreTrustManager, myTrustManager);
+        X509TrustManager mergedTrustManager =
+                createMergedTrustManager(jreTrustManager, myTrustManager);
         setSystemTrustManager(mergedTrustManager);
     }
 
-    private static X509TrustManager getJreTrustManager() throws NoSuchAlgorithmException, KeyStoreException {
+    private static X509TrustManager getJreTrustManager()
+            throws NoSuchAlgorithmException, KeyStoreException {
         return findDefaultTrustManager(null);
     }
 
-    private static X509TrustManager getJabRefTrustManager(Path myStorePath) throws KeyStoreException, IOException,
-        NoSuchAlgorithmException, CertificateException {
+    private static X509TrustManager getJabRefTrustManager(Path myStorePath)
+            throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException {
         // Adapt to load your keystore
         try (InputStream myKeys = Files.newInputStream(myStorePath)) {
             KeyStore myTrustStore = KeyStore.getInstance("jks");
@@ -194,9 +212,12 @@ private static X509TrustManager getJabRefTrustManager(Path myStorePath) throws K
     }
 
     private static X509TrustManager findDefaultTrustManager(KeyStore keyStore)
-        throws NoSuchAlgorithmException, KeyStoreException {
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-        tmf.init(keyStore); // If keyStore is null, tmf will be initialized with the default trust store
+            throws NoSuchAlgorithmException, KeyStoreException {
+        TrustManagerFactory tmf =
+                TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        tmf.init(
+                keyStore); // If keyStore is null, tmf will be initialized with the default trust
+                           // store
 
         for (TrustManager tm : tmf.getTrustManagers()) {
             if (tm instanceof X509TrustManager manager) {
@@ -206,8 +227,8 @@ private static X509TrustManager findDefaultTrustManager(KeyStore keyStore)
         return null;
     }
 
-    private static X509TrustManager createMergedTrustManager(X509TrustManager jreTrustManager,
-                                                             X509TrustManager customTrustManager) {
+    private static X509TrustManager createMergedTrustManager(
+            X509TrustManager jreTrustManager, X509TrustManager customTrustManager) {
         return new X509TrustManager() {
             @Override
             public X509Certificate[] getAcceptedIssuers() {
@@ -217,7 +238,8 @@ public X509Certificate[] getAcceptedIssuers() {
             }
 
             @Override
-            public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+            public void checkServerTrusted(X509Certificate[] chain, String authType)
+                    throws CertificateException {
                 try {
                     customTrustManager.checkServerTrusted(chain, authType);
                 } catch (CertificateException e) {
@@ -227,7 +249,8 @@ public void checkServerTrusted(X509Certificate[] chain, String authType) throws
             }
 
             @Override
-            public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+            public void checkClientTrusted(X509Certificate[] chain, String authType)
+                    throws CertificateException {
                 // If you're planning to use client-cert auth,
                 // do the same as checking the server.
                 jreTrustManager.checkClientTrusted(chain, authType);
@@ -236,7 +259,7 @@ public void checkClientTrusted(X509Certificate[] chain, String authType) throws
     }
 
     private static void setSystemTrustManager(X509TrustManager mergedTrustManager)
-        throws NoSuchAlgorithmException, KeyManagementException {
+            throws NoSuchAlgorithmException, KeyManagementException {
         SSLContext sslContext = SSLContext.getInstance("TLS");
         sslContext.init(null, new TrustManager[] {mergedTrustManager}, null);
 
diff --git a/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java b/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java
index 2b94b8a1c579..605fc7ba5312 100644
--- a/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java
+++ b/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.openoffice;
 
+import org.jabref.logic.os.OS;
+import org.jabref.logic.util.io.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -12,12 +17,6 @@
 import java.util.function.BiPredicate;
 import java.util.stream.Stream;
 
-import org.jabref.logic.os.OS;
-import org.jabref.logic.util.io.FileUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class OpenOfficeFileSearch {
     private static final Logger LOGGER = LoggerFactory.getLogger(OpenOfficeFileSearch.class);
 
@@ -29,33 +28,55 @@ public class OpenOfficeFileSearch {
     public static List<Path> detectInstallations() {
         if (OS.WINDOWS) {
             List<Path> programDirs = findWindowsOpenOfficeDirs();
-            return programDirs.stream().filter(dir -> FileUtil.find(OpenOfficePreferences.WINDOWS_EXECUTABLE, dir).isPresent()).toList();
+            return programDirs.stream()
+                    .filter(
+                            dir ->
+                                    FileUtil.find(OpenOfficePreferences.WINDOWS_EXECUTABLE, dir)
+                                            .isPresent())
+                    .toList();
         } else if (OS.OS_X) {
             List<Path> programDirs = findOSXOpenOfficeDirs();
-            return programDirs.stream().filter(dir -> FileUtil.find(OpenOfficePreferences.OSX_EXECUTABLE, dir).isPresent()).toList();
+            return programDirs.stream()
+                    .filter(
+                            dir ->
+                                    FileUtil.find(OpenOfficePreferences.OSX_EXECUTABLE, dir)
+                                            .isPresent())
+                    .toList();
         } else if (OS.LINUX) {
             List<Path> programDirs = findLinuxOpenOfficeDirs();
-            return programDirs.stream().filter(dir -> FileUtil.find(OpenOfficePreferences.LINUX_EXECUTABLE, dir).isPresent()).toList();
+            return programDirs.stream()
+                    .filter(
+                            dir ->
+                                    FileUtil.find(OpenOfficePreferences.LINUX_EXECUTABLE, dir)
+                                            .isPresent())
+                    .toList();
         } else {
             return List.of();
         }
     }
 
     private static List<Path> findOpenOfficeDirectories(List<Path> programDirectories) {
-        BiPredicate<Path, BasicFileAttributes> filePredicate = (path, attr) ->
-                attr.isDirectory() && (path.toString().toLowerCase(Locale.ROOT).contains("openoffice")
-                        || path.toString().toLowerCase(Locale.ROOT).contains("libreoffice"));
+        BiPredicate<Path, BasicFileAttributes> filePredicate =
+                (path, attr) ->
+                        attr.isDirectory()
+                                && (path.toString().toLowerCase(Locale.ROOT).contains("openoffice")
+                                        || path.toString()
+                                                .toLowerCase(Locale.ROOT)
+                                                .contains("libreoffice"));
 
         return programDirectories.stream()
-                                 .flatMap(dirs -> {
-                                     try {
-                                         return Files.find(dirs, 1, filePredicate);
-                                     } catch (IOException e) {
-                                         LOGGER.error("Problem searching for openoffice/libreoffice install directory", e);
-                                         return Stream.empty();
-                                     }
-                                 })
-                                 .toList();
+                .flatMap(
+                        dirs -> {
+                            try {
+                                return Files.find(dirs, 1, filePredicate);
+                            } catch (IOException e) {
+                                LOGGER.error(
+                                        "Problem searching for openoffice/libreoffice install directory",
+                                        e);
+                                return Stream.empty();
+                            }
+                        })
+                .toList();
     }
 
     private static List<Path> findWindowsOpenOfficeDirs() {
@@ -73,8 +94,7 @@ private static List<Path> findWindowsOpenOfficeDirs() {
             sourceList.add(Path.of(progFiles));
         }
 
-        return findOpenOfficeDirectories(sourceList)
-                .stream()
+        return findOpenOfficeDirectories(sourceList).stream()
                 // On Windows, the executable is nested in subdirectory "program"
                 .map(dir -> dir.resolve("program"))
                 .toList();
@@ -87,7 +107,8 @@ private static List<Path> findOSXOpenOfficeDirs() {
     }
 
     private static List<Path> findLinuxOpenOfficeDirs() {
-        List<Path> sourceList = Arrays.asList(Path.of("/usr/lib"), Path.of("/usr/lib64"), Path.of("/opt"));
+        List<Path> sourceList =
+                Arrays.asList(Path.of("/usr/lib"), Path.of("/usr/lib64"), Path.of("/opt"));
 
         return findOpenOfficeDirectories(sourceList);
     }
diff --git a/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java b/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java
index b536fd48e0f5..bfba9c2f73cc 100644
--- a/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java
+++ b/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java
@@ -1,7 +1,5 @@
 package org.jabref.logic.openoffice;
 
-import java.util.List;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -13,12 +11,15 @@
 
 import org.jabref.logic.openoffice.style.OOStyle;
 
+import java.util.List;
+
 public class OpenOfficePreferences {
 
     public static final String DEFAULT_WIN_EXEC_PATH = "C:\\Program Files\\LibreOffice\\program";
     public static final String WINDOWS_EXECUTABLE = "soffice.exe";
 
-    public static final String DEFAULT_OSX_EXEC_PATH = "/Applications/LibreOffice.app/Contents/MacOS/soffice";
+    public static final String DEFAULT_OSX_EXEC_PATH =
+            "/Applications/LibreOffice.app/Contents/MacOS/soffice";
     public static final String OSX_EXECUTABLE = "soffice";
 
     public static final String DEFAULT_LINUX_EXEC_PATH = "/usr/lib/libreoffice/program/soffice";
@@ -33,13 +34,14 @@ public class OpenOfficePreferences {
     private final ObjectProperty<OOStyle> currentStyle;
     private final BooleanProperty alwaysAddCitedOnPages;
 
-    public OpenOfficePreferences(String executablePath,
-                                 boolean useAllDatabases,
-                                 boolean syncWhenCiting,
-                                 List<String> externalStyles,
-                                 String currentJStyle,
-                                 OOStyle currentStyle,
-                                 boolean alwaysAddCitedOnPages) {
+    public OpenOfficePreferences(
+            String executablePath,
+            boolean useAllDatabases,
+            boolean syncWhenCiting,
+            List<String> externalStyles,
+            String currentJStyle,
+            OOStyle currentStyle,
+            boolean alwaysAddCitedOnPages) {
         this.executablePath = new SimpleStringProperty(executablePath);
         this.useAllDatabases = new SimpleBooleanProperty(useAllDatabases);
         this.syncWhenCiting = new SimpleBooleanProperty(syncWhenCiting);
diff --git a/src/main/java/org/jabref/logic/openoffice/ReferenceMark.java b/src/main/java/org/jabref/logic/openoffice/ReferenceMark.java
index 9d59e23c3b9b..e34766023923 100644
--- a/src/main/java/org/jabref/logic/openoffice/ReferenceMark.java
+++ b/src/main/java/org/jabref/logic/openoffice/ReferenceMark.java
@@ -1,21 +1,23 @@
 package org.jabref.logic.openoffice;
 
+import io.github.thibaultmeyer.cuid.CUID;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import io.github.thibaultmeyer.cuid.CUID;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class ReferenceMark {
     public static final String[] PREFIXES = {"JABREF_", "CID_"};
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ReferenceMark.class);
 
-    private static final Pattern REFERENCE_MARK_FORMAT = Pattern.compile("^(JABREF_\\w+ CID_\\d+(?:, JABREF_\\w+ CID_\\d+)*) (\\w+)$");
+    private static final Pattern REFERENCE_MARK_FORMAT =
+            Pattern.compile("^(JABREF_\\w+ CID_\\d+(?:, JABREF_\\w+ CID_\\d+)*) (\\w+)$");
     private static final Pattern ENTRY_PATTERN = Pattern.compile("JABREF_(\\w+) CID_(\\w+)");
 
     private final String name;
@@ -35,7 +37,11 @@ public ReferenceMark(String name) {
         parse(name);
     }
 
-    public ReferenceMark(String name, List<String> citationKeys, List<Integer> citationNumbers, String uniqueId) {
+    public ReferenceMark(
+            String name,
+            List<String> citationKeys,
+            List<Integer> citationNumbers,
+            String uniqueId) {
         this.name = name;
         this.citationKeys = citationKeys;
         this.citationNumbers = citationNumbers;
@@ -45,7 +51,9 @@ public ReferenceMark(String name, List<String> citationKeys, List<Integer> citat
     private void parse(String name) {
         Matcher matcher = REFERENCE_MARK_FORMAT.matcher(name);
         if (!matcher.matches()) {
-            LOGGER.warn("CSLReferenceMark: name={} does not match pattern. Assuming random values", name);
+            LOGGER.warn(
+                    "CSLReferenceMark: name={} does not match pattern. Assuming random values",
+                    name);
             this.citationKeys = List.of(CUID.randomCUID2(8).toString());
             this.citationNumbers = List.of(0);
             this.uniqueId = this.citationKeys.getFirst();
@@ -53,7 +61,8 @@ private void parse(String name) {
         }
 
         String entriesString = matcher.group(1).trim();
-        this.uniqueId = matcher.group(2) != null ? matcher.group(2).trim() : CUID.randomCUID2(8).toString();
+        this.uniqueId =
+                matcher.group(2) != null ? matcher.group(2).trim() : CUID.randomCUID2(8).toString();
 
         this.citationKeys = new ArrayList<>();
         this.citationNumbers = new ArrayList<>();
@@ -65,12 +74,18 @@ private void parse(String name) {
         }
 
         if (this.citationKeys.isEmpty() || this.citationNumbers.isEmpty()) {
-            LOGGER.warn("CSLReferenceMark: Failed to parse any entries from name={}. Assuming random values", name);
+            LOGGER.warn(
+                    "CSLReferenceMark: Failed to parse any entries from name={}. Assuming random values",
+                    name);
             this.citationKeys = List.of(CUID.randomCUID2(8).toString());
             this.citationNumbers = List.of(0);
         }
 
-        LOGGER.debug("CSLReferenceMark: citationKeys={} citationNumbers={} uniqueId={}", getCitationKeys(), getCitationNumbers(), getUniqueId());
+        LOGGER.debug(
+                "CSLReferenceMark: citationKeys={} citationNumbers={} uniqueId={}",
+                getCitationKeys(),
+                getCitationNumbers(),
+                getUniqueId());
     }
 
     public String getName() {
diff --git a/src/main/java/org/jabref/logic/openoffice/action/EditInsert.java b/src/main/java/org/jabref/logic/openoffice/action/EditInsert.java
index 9e1f4c46be9b..da30101b32be 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/EditInsert.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/EditInsert.java
@@ -1,9 +1,11 @@
 package org.jabref.logic.openoffice.action;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import com.sun.star.beans.IllegalTypeException;
+import com.sun.star.beans.NotRemoveableException;
+import com.sun.star.beans.PropertyVetoException;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextDocument;
 
 import org.jabref.logic.openoffice.frontend.OOFrontend;
 import org.jabref.logic.openoffice.frontend.UpdateCitationMarkers;
@@ -22,17 +24,14 @@
 import org.jabref.model.openoffice.util.OOListUtil;
 import org.jabref.model.strings.StringUtil;
 
-import com.sun.star.beans.IllegalTypeException;
-import com.sun.star.beans.NotRemoveableException;
-import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 public class EditInsert {
 
-    private EditInsert() {
-    }
+    private EditInsert() {}
 
     /**
      * In insertEntry we receive BibEntry values from the GUI.
@@ -44,7 +43,8 @@ private EditInsert() {
     private static String insertEntryGetCitationKey(BibEntry entry) {
         Optional<String> key = entry.getCitationKey();
         if (key.isEmpty()) {
-            throw new IllegalArgumentException("insertEntryGetCitationKey: cannot cite entries without citation key");
+            throw new IllegalArgumentException(
+                    "insertEntryGetCitationKey: cannot cite entries without citation key");
         }
         return key.get();
     }
@@ -53,21 +53,21 @@ private static String insertEntryGetCitationKey(BibEntry entry) {
      * @param cursor   Where to insert.
      * @param pageInfo A single pageInfo for a list of entries. This is what we get from the GUI.
      */
-    public static void insertCitationGroup(XTextDocument doc,
-                                           OOFrontend frontend,
-                                           XTextCursor cursor,
-                                           List<BibEntry> entries,
-                                           BibDatabase database,
-                                           JStyle style,
-                                           CitationType citationType,
-                                           String pageInfo)
-            throws
-            NoDocumentException,
-            NotRemoveableException,
-            WrappedTargetException,
-            PropertyVetoException,
-            CreationException,
-            IllegalTypeException {
+    public static void insertCitationGroup(
+            XTextDocument doc,
+            OOFrontend frontend,
+            XTextCursor cursor,
+            List<BibEntry> entries,
+            BibDatabase database,
+            JStyle style,
+            CitationType citationType,
+            String pageInfo)
+            throws NoDocumentException,
+                    NotRemoveableException,
+                    WrappedTargetException,
+                    PropertyVetoException,
+                    CreationException,
+                    IllegalTypeException {
 
         List<String> citationKeys = OOListUtil.map(entries, EditInsert::insertEntryGetCitationKey);
 
@@ -87,9 +87,11 @@ public static void insertCitationGroup(XTextDocument doc,
         if (style.isNumberEntries()) {
             citeText = OOText.fromString("[-]"); // A dash only. Only refresh later.
         } else {
-            citeText = style.createCitationMarker(citations,
-                    citationType.inParenthesis(),
-                    NonUniqueCitationMarker.FORGIVEN);
+            citeText =
+                    style.createCitationMarker(
+                            citations,
+                            citationType.inParenthesis(),
+                            NonUniqueCitationMarker.FORGIVEN);
         }
 
         if (StringUtil.isBlank(OOText.toString(citeText))) {
@@ -98,7 +100,8 @@ public static void insertCitationGroup(XTextDocument doc,
 
         try {
             UnoScreenRefresh.lockControllers(doc);
-            UpdateCitationMarkers.createAndFillCitationGroup(frontend,
+            UpdateCitationMarkers.createAndFillCitationGroup(
+                    frontend,
                     doc,
                     citationKeys,
                     pageInfos,
diff --git a/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java b/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java
index 1bd2f71b2ecb..8727a4be5cda 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java
@@ -1,10 +1,12 @@
 package org.jabref.logic.openoffice.action;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import com.sun.star.beans.IllegalTypeException;
+import com.sun.star.beans.NotRemoveableException;
+import com.sun.star.beans.PropertyVetoException;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.text.XTextRange;
 
 import org.jabref.logic.openoffice.frontend.OOFrontend;
 import org.jabref.logic.openoffice.frontend.UpdateCitationMarkers;
@@ -18,36 +20,32 @@
 import org.jabref.model.openoffice.uno.UnoScreenRefresh;
 import org.jabref.model.openoffice.uno.UnoTextRange;
 import org.jabref.model.openoffice.util.OOListUtil;
-
-import com.sun.star.beans.IllegalTypeException;
-import com.sun.star.beans.NotRemoveableException;
-import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextRange;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class EditMerge {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EditMerge.class);
 
-    private EditMerge() {
-    }
+    private EditMerge() {}
 
     /**
      * @return true if modified document
      */
     public static boolean mergeCitationGroups(XTextDocument doc, OOFrontend frontend, JStyle style)
-            throws
-            CreationException,
-            IllegalArgumentException,
-            IllegalTypeException,
-            NoDocumentException,
-            NotRemoveableException,
-            PropertyVetoException,
-            WrappedTargetException {
+            throws CreationException,
+                    IllegalArgumentException,
+                    IllegalTypeException,
+                    NoDocumentException,
+                    NotRemoveableException,
+                    PropertyVetoException,
+                    WrappedTargetException {
 
         boolean madeModifications;
 
@@ -59,9 +57,10 @@ public static boolean mergeCitationGroups(XTextDocument doc, OOFrontend frontend
             for (JoinableGroupData joinableGroupData : joinableGroups) {
                 List<CitationGroup> groups = joinableGroupData.group;
 
-                List<Citation> newCitations = groups.stream()
-                                                     .flatMap(group -> group.citationsInStorageOrder.stream())
-                                                     .collect(Collectors.toList());
+                List<Citation> newCitations =
+                        groups.stream()
+                                .flatMap(group -> group.citationsInStorageOrder.stream())
+                                .collect(Collectors.toList());
 
                 CitationType citationType = groups.getFirst().citationType;
                 List<Optional<OOText>> pageInfos = frontend.backend.combinePageInfos(groups);
@@ -74,7 +73,8 @@ public static boolean mergeCitationGroups(XTextDocument doc, OOFrontend frontend
 
                 /* insertSpaceAfter: no, it is already there (or could be) */
                 boolean insertSpaceAfter = false;
-                UpdateCitationMarkers.createAndFillCitationGroup(frontend,
+                UpdateCitationMarkers.createAndFillCitationGroup(
+                        frontend,
                         doc,
                         citationKeys,
                         pageInfos,
@@ -97,8 +97,7 @@ public static boolean mergeCitationGroups(XTextDocument doc, OOFrontend frontend
      * @param group       A list of consecutive citation groups only separated by spaces.
      * @param groupCursor A cursor covering the XTextRange of each entry in group (and the spaces between them)
      */
-    private record JoinableGroupData(List<CitationGroup> group, XTextCursor groupCursor) {
-    }
+    private record JoinableGroupData(List<CitationGroup> group, XTextCursor groupCursor) {}
 
     private static class ScanState {
 
@@ -142,7 +141,8 @@ void reset() {
      * @param currentRange The XTextRange corresponding to group.
      * @return false if cannot add, true if can.  If returned true, then state.cursorBetween and state.currentGroupCursor are expanded to end at the start of currentRange.
      */
-    private static boolean checkAddToGroup(ScanState state, CitationGroup group, XTextRange currentRange) {
+    private static boolean checkAddToGroup(
+            ScanState state, CitationGroup group, XTextRange currentRange) {
         if (state.currentGroup.isEmpty()) {
             return false;
         }
@@ -158,7 +158,8 @@ private static boolean checkAddToGroup(ScanState state, CitationGroup group, XTe
         }
 
         if (state.prev != null) {
-            // Even if we combine AUTHORYEAR_INTEXT citations, we would not mix them with AUTHORYEAR_PAR
+            // Even if we combine AUTHORYEAR_INTEXT citations, we would not mix them with
+            // AUTHORYEAR_PAR
             if (group.citationType != state.prev.citationType) {
                 return false;
             }
@@ -172,13 +173,14 @@ private static boolean checkAddToGroup(ScanState state, CitationGroup group, XTe
             if (textOrder != -1) {
                 String msg =
                         ("MergeCitationGroups:"
-                                + " \"%s\" supposed to be followed by \"%s\","
-                                + " but %s").formatted(
-                                state.prevRange.getString(),
-                                currentRange.getString(),
-                                (textOrder == 0
-                                        ? "they start at the same position"
-                                        : "the start of the latter precedes the start of the first"));
+                                        + " \"%s\" supposed to be followed by \"%s\","
+                                        + " but %s")
+                                .formatted(
+                                        state.prevRange.getString(),
+                                        currentRange.getString(),
+                                        (textOrder == 0
+                                                ? "they start at the same position"
+                                                : "the start of the latter precedes the start of the first"));
                 LOGGER.warn(msg);
                 return false;
             }
@@ -225,7 +227,8 @@ private static boolean checkAddToGroup(ScanState state, CitationGroup group, XTe
 
             // These two should move in sync:
             if (UnoTextRange.compareEnds(state.cursorBetween, state.currentGroupCursor) != 0) {
-                LOGGER.warn("MergeCitationGroups: cursorBetween.end != currentGroupCursor.end (during expand)");
+                LOGGER.warn(
+                        "MergeCitationGroups: cursorBetween.end != currentGroupCursor.end (during expand)");
                 throw new IllegalStateException("MergeCitationGroups failed");
             }
         }
@@ -236,7 +239,8 @@ private static boolean checkAddToGroup(ScanState state, CitationGroup group, XTe
     /**
      * Add group to state.currentGroup Set state.cursorBetween to start at currentRange.getEnd() Expand state.currentGroupCursor to also cover currentRange Set state.prev to group, state.prevRange to currentRange
      */
-    private static void addToCurrentGroup(ScanState state, CitationGroup group, XTextRange currentRange) {
+    private static void addToCurrentGroup(
+            ScanState state, CitationGroup group, XTextRange currentRange) {
         final boolean isNewGroup = state.currentGroup.isEmpty();
         if (!isNewGroup) {
             Objects.requireNonNull(state.currentGroupCursor);
@@ -254,8 +258,8 @@ private static void addToCurrentGroup(ScanState state, CitationGroup group, XTex
 
         // If new group, create currentGroupCursor
         if (isNewGroup) {
-            state.currentGroupCursor = currentRange.getText()
-                                                    .createTextCursorByRange(currentRange.getStart());
+            state.currentGroupCursor =
+                    currentRange.getText().createTextCursorByRange(currentRange.getStart());
         }
 
         // include currentRange in currentGroupCursor
@@ -275,12 +279,12 @@ private static void addToCurrentGroup(ScanState state, CitationGroup group, XTex
      * Scan the document for joinable groups. Return those found.
      */
     private static List<JoinableGroupData> scan(XTextDocument doc, OOFrontend frontend)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+            throws NoDocumentException, WrappedTargetException {
         List<JoinableGroupData> result = new ArrayList<>();
 
-        List<CitationGroup> groups = frontend.getCitationGroupsSortedWithinPartitions(doc, false /* mapFootnotesToFootnoteMarks */);
+        List<CitationGroup> groups =
+                frontend.getCitationGroupsSortedWithinPartitions(
+                        doc, false /* mapFootnotesToFootnoteMarks */);
         if (groups.isEmpty()) {
             return result;
         }
@@ -288,8 +292,8 @@ private static List<JoinableGroupData> scan(XTextDocument doc, OOFrontend fronte
         ScanState state = new ScanState();
 
         for (CitationGroup group : groups) {
-            XTextRange currentRange = frontend.getMarkRange(doc, group)
-                                               .orElseThrow(IllegalStateException::new);
+            XTextRange currentRange =
+                    frontend.getMarkRange(doc, group).orElseThrow(IllegalStateException::new);
 
             /*
              * Decide if we add group to the group. False when the group is empty.
diff --git a/src/main/java/org/jabref/logic/openoffice/action/EditSeparate.java b/src/main/java/org/jabref/logic/openoffice/action/EditSeparate.java
index 0a67b727d7fb..1155d809b858 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/EditSeparate.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/EditSeparate.java
@@ -1,6 +1,13 @@
 package org.jabref.logic.openoffice.action;
 
-import java.util.List;
+import com.sun.star.beans.IllegalTypeException;
+import com.sun.star.beans.NotRemoveableException;
+import com.sun.star.beans.PropertyVetoException;
+import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.text.XTextRange;
 
 import org.jabref.logic.openoffice.frontend.OOFrontend;
 import org.jabref.logic.openoffice.frontend.UpdateCitationMarkers;
@@ -14,32 +21,21 @@
 import org.jabref.model.openoffice.uno.NoDocumentException;
 import org.jabref.model.openoffice.uno.UnoScreenRefresh;
 
-import com.sun.star.beans.IllegalTypeException;
-import com.sun.star.beans.NotRemoveableException;
-import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextRange;
+import java.util.List;
 
 public class EditSeparate {
 
-    private EditSeparate() {
-    }
+    private EditSeparate() {}
 
-    public static boolean separateCitations(XTextDocument doc,
-                                            OOFrontend frontend,
-                                            List<BibDatabase> databases,
-                                            JStyle style)
-            throws
-            CreationException,
-            IllegalTypeException,
-            NoDocumentException,
-            NotRemoveableException,
-            PropertyVetoException,
-            WrappedTargetException,
-            IllegalArgumentException {
+    public static boolean separateCitations(
+            XTextDocument doc, OOFrontend frontend, List<BibDatabase> databases, JStyle style)
+            throws CreationException,
+                    IllegalTypeException,
+                    NoDocumentException,
+                    NotRemoveableException,
+                    PropertyVetoException,
+                    WrappedTargetException,
+                    IllegalArgumentException {
 
         boolean madeModifications = false;
 
@@ -56,9 +52,8 @@ public static boolean separateCitations(XTextDocument doc,
             UnoScreenRefresh.lockControllers(doc);
 
             for (CitationGroup group : groups) {
-                XTextRange range1 = frontend
-                        .getMarkRange(doc, group)
-                        .orElseThrow(IllegalStateException::new);
+                XTextRange range1 =
+                        frontend.getMarkRange(doc, group).orElseThrow(IllegalStateException::new);
                 XTextCursor textCursor = range1.getText().createTextCursorByRange(range1);
 
                 List<Citation> citations = group.citationsInStorageOrder;
@@ -75,7 +70,8 @@ public static boolean separateCitations(XTextDocument doc,
                     boolean insertSpaceAfter = i != last;
                     Citation citation = citations.get(i);
 
-                    UpdateCitationMarkers.createAndFillCitationGroup(frontend,
+                    UpdateCitationMarkers.createAndFillCitationGroup(
+                            frontend,
                             doc,
                             List.of(citation.citationKey),
                             List.of(citation.getPageInfo()),
diff --git a/src/main/java/org/jabref/logic/openoffice/action/ExportCited.java b/src/main/java/org/jabref/logic/openoffice/action/ExportCited.java
index 4bdc11a7f711..a8d942dd42d4 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/ExportCited.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/ExportCited.java
@@ -1,9 +1,7 @@
 package org.jabref.logic.openoffice.action;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextDocument;
 
 import org.jabref.logic.openoffice.frontend.OOFrontend;
 import org.jabref.model.database.BibDatabase;
@@ -13,19 +11,21 @@
 import org.jabref.model.openoffice.style.CitedKeys;
 import org.jabref.model.openoffice.uno.NoDocumentException;
 
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextDocument;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 public class ExportCited {
 
-    private ExportCited() {
-    }
+    private ExportCited() {}
 
     public static class GenerateDatabaseResult {
         /**
          * null: not done; isEmpty: no unresolved
          */
         public final List<String> unresolvedKeys;
+
         public final BibDatabase newDatabase;
 
         GenerateDatabaseResult(List<String> unresolvedKeys, BibDatabase newDatabase) {
@@ -41,10 +41,9 @@ public static class GenerateDatabaseResult {
      * <p>
      * Cross references (in StandardField.CROSSREF) are followed (not recursively): If the referenced entry is found, it is included in the result. If it is not found, it is silently ignored.
      */
-    public static GenerateDatabaseResult generateDatabase(XTextDocument doc, List<BibDatabase> databases)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+    public static GenerateDatabaseResult generateDatabase(
+            XTextDocument doc, List<BibDatabase> databases)
+            throws NoDocumentException, WrappedTargetException {
 
         OOFrontend frontend = new OOFrontend(doc);
         CitedKeys citationKeys = frontend.citationGroups.getCitedKeysUnordered();
@@ -72,16 +71,17 @@ public static GenerateDatabaseResult generateDatabase(XTextDocument doc, List<Bi
                 // Check if the cloned entry has a cross-reference field
                 clonedEntry
                         .getField(StandardField.CROSSREF)
-                        .ifPresent(crossReference -> {
-                            boolean isNew = !seen.contains(crossReference);
-                            if (isNew) {
-                                // Add it if it is in the current library
-                                loopDatabase
-                                        .getEntryByCitationKey(crossReference)
-                                        .ifPresent(entriesToInsert::add);
-                                seen.add(crossReference);
-                            }
-                        });
+                        .ifPresent(
+                                crossReference -> {
+                                    boolean isNew = !seen.contains(crossReference);
+                                    if (isNew) {
+                                        // Add it if it is in the current library
+                                        loopDatabase
+                                                .getEntryByCitationKey(crossReference)
+                                                .ifPresent(entriesToInsert::add);
+                                        seen.add(crossReference);
+                                    }
+                                });
             }
         }
 
diff --git a/src/main/java/org/jabref/logic/openoffice/action/ManageCitations.java b/src/main/java/org/jabref/logic/openoffice/action/ManageCitations.java
index ccb5eef1e47b..0eed128e1d8b 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/ManageCitations.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/ManageCitations.java
@@ -1,36 +1,32 @@
 package org.jabref.logic.openoffice.action;
 
-import java.util.List;
+import com.sun.star.beans.IllegalTypeException;
+import com.sun.star.beans.PropertyVetoException;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextDocument;
 
 import org.jabref.logic.openoffice.frontend.OOFrontend;
 import org.jabref.model.openoffice.CitationEntry;
 import org.jabref.model.openoffice.uno.NoDocumentException;
 
-import com.sun.star.beans.IllegalTypeException;
-import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextDocument;
+import java.util.List;
 
 public class ManageCitations {
 
-    private ManageCitations() {
-    }
+    private ManageCitations() {}
 
     public static List<CitationEntry> getCitationEntries(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+            throws NoDocumentException, WrappedTargetException {
         OOFrontend frontend = new OOFrontend(doc);
         return frontend.getCitationEntries(doc);
     }
 
     public static void applyCitationEntries(XTextDocument doc, List<CitationEntry> citationEntries)
-            throws
-            NoDocumentException,
-            PropertyVetoException,
-            IllegalTypeException,
-            WrappedTargetException,
-            IllegalArgumentException {
+            throws NoDocumentException,
+                    PropertyVetoException,
+                    IllegalTypeException,
+                    WrappedTargetException,
+                    IllegalArgumentException {
         OOFrontend frontend = new OOFrontend(doc);
         frontend.applyCitationEntries(doc, citationEntries);
     }
diff --git a/src/main/java/org/jabref/logic/openoffice/action/Update.java b/src/main/java/org/jabref/logic/openoffice/action/Update.java
index 7294842e7326..fd82413fa203 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/Update.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/Update.java
@@ -1,7 +1,8 @@
 package org.jabref.logic.openoffice.action;
 
-import java.io.IOException;
-import java.util.List;
+import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextDocument;
 
 import org.jabref.logic.openoffice.frontend.OOFrontend;
 import org.jabref.logic.openoffice.frontend.UpdateBibliography;
@@ -13,35 +14,33 @@
 import org.jabref.model.openoffice.uno.CreationException;
 import org.jabref.model.openoffice.uno.NoDocumentException;
 import org.jabref.model.openoffice.uno.UnoScreenRefresh;
-
-import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextDocument;
 import org.tinylog.Logger;
 
+import java.io.IOException;
+import java.util.List;
+
 /**
  * Update document: citation marks and bibliography
  */
 public class Update {
 
-    private Update() {
-    }
+    private Update() {}
 
     /**
      * @return the list of unresolved citation keys
      */
-    private static List<String> updateDocument(XTextDocument doc,
-                                               OOFrontend frontend,
-                                               List<BibDatabase> databases,
-                                               JStyle style,
-                                               FunctionalTextViewCursor fcursor,
-                                               boolean doUpdateBibliography,
-                                               boolean alwaysAddCitedOnPages)
-            throws
-            CreationException,
-            NoDocumentException,
-            WrappedTargetException,
-            IllegalArgumentException {
+    private static List<String> updateDocument(
+            XTextDocument doc,
+            OOFrontend frontend,
+            List<BibDatabase> databases,
+            JStyle style,
+            FunctionalTextViewCursor fcursor,
+            boolean doUpdateBibliography,
+            boolean alwaysAddCitedOnPages)
+            throws CreationException,
+                    NoDocumentException,
+                    WrappedTargetException,
+                    IllegalArgumentException {
 
         final boolean useLockControllers = true;
 
@@ -56,7 +55,8 @@ private static List<String> updateDocument(XTextDocument doc,
             UpdateCitationMarkers.applyNewCitationMarkers(doc, frontend, style);
 
             if (doUpdateBibliography) {
-                UpdateBibliography.rebuildBibTextSection(doc,
+                UpdateBibliography.rebuildBibTextSection(
+                        doc,
                         frontend,
                         frontend.citationGroups.getBibliography().get(),
                         style,
@@ -64,8 +64,7 @@ private static List<String> updateDocument(XTextDocument doc,
             }
 
             return frontend.citationGroups.getUnresolvedKeys();
-        } catch (
-                IOException e) {
+        } catch (IOException e) {
             Logger.warn("Error while updating document", e);
         } finally {
             if (useLockControllers && UnoScreenRefresh.hasControllersLocked(doc)) {
@@ -98,18 +97,19 @@ public SyncOptions setAlwaysAddCitedOnPages(boolean value) {
         }
     }
 
-    public static List<String> synchronizeDocument(XTextDocument doc,
-                                                   OOFrontend frontend,
-                                                   JStyle style,
-                                                   FunctionalTextViewCursor fcursor,
-                                                   SyncOptions syncOptions)
-            throws
-            CreationException,
-            NoDocumentException,
-            WrappedTargetException,
-            IllegalArgumentException {
-
-        return Update.updateDocument(doc,
+    public static List<String> synchronizeDocument(
+            XTextDocument doc,
+            OOFrontend frontend,
+            JStyle style,
+            FunctionalTextViewCursor fcursor,
+            SyncOptions syncOptions)
+            throws CreationException,
+                    NoDocumentException,
+                    WrappedTargetException,
+                    IllegalArgumentException {
+
+        return Update.updateDocument(
+                doc,
                 frontend,
                 syncOptions.databases,
                 style,
@@ -121,15 +121,15 @@ public static List<String> synchronizeDocument(XTextDocument doc,
     /**
      * Reread document before sync
      */
-    public static List<String> resyncDocument(XTextDocument doc,
-                                              JStyle style,
-                                              FunctionalTextViewCursor fcursor,
-                                              SyncOptions syncOptions)
-            throws
-            CreationException,
-            NoDocumentException,
-            WrappedTargetException,
-            IllegalArgumentException {
+    public static List<String> resyncDocument(
+            XTextDocument doc,
+            JStyle style,
+            FunctionalTextViewCursor fcursor,
+            SyncOptions syncOptions)
+            throws CreationException,
+                    NoDocumentException,
+                    WrappedTargetException,
+                    IllegalArgumentException {
 
         OOFrontend frontend = new OOFrontend(doc);
 
diff --git a/src/main/java/org/jabref/logic/openoffice/backend/Backend52.java b/src/main/java/org/jabref/logic/openoffice/backend/Backend52.java
index 3535e1080502..52557f53e24c 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/Backend52.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/Backend52.java
@@ -1,14 +1,12 @@
 package org.jabref.logic.openoffice.backend;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
+import com.sun.star.beans.IllegalTypeException;
+import com.sun.star.beans.NotRemoveableException;
+import com.sun.star.beans.PropertyVetoException;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.text.XTextRange;
 
 import org.jabref.model.openoffice.CitationEntry;
 import org.jabref.model.openoffice.backend.NamedRange;
@@ -25,17 +23,19 @@
 import org.jabref.model.openoffice.uno.NoDocumentException;
 import org.jabref.model.openoffice.uno.UnoUserDefinedProperty;
 import org.jabref.model.openoffice.util.OOListUtil;
-
-import com.sun.star.beans.IllegalTypeException;
-import com.sun.star.beans.NotRemoveableException;
-import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextRange;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * Backend52, Codec52 and OODataModel.JabRef52 refer to the mode of storage, encoding and what-is-stored in the document under JabRef version 5.2. These basically did not change up to JabRef 5.4.
  */
@@ -57,9 +57,7 @@ public Backend52() {
      * <p>
      * Note: the names returned are in arbitrary order.
      */
-    public List<String> getJabRefReferenceMarkNames(XTextDocument doc)
-            throws
-            NoDocumentException {
+    public List<String> getJabRefReferenceMarkNames(XTextDocument doc) throws NoDocumentException {
         List<String> allNames = this.citationStorageManager.getUsedNames(doc);
         return Codec52.filterIsJabRefReferenceMarkName(allNames);
     }
@@ -69,17 +67,16 @@ public List<String> getJabRefReferenceMarkNames(XTextDocument doc)
      *
      * @param citationGroupNames These are the names that are used.
      */
-    private List<String> findUnusedJabrefPropertyNames(XTextDocument doc,
-                                                       List<String> citationGroupNames) {
+    private List<String> findUnusedJabrefPropertyNames(
+            XTextDocument doc, List<String> citationGroupNames) {
 
         Set<String> citationGroupNamesSet = new HashSet<>(citationGroupNames);
 
         List<String> pageInfoThrash = new ArrayList<>();
         List<String> jabrefPropertyNames =
-                UnoUserDefinedProperty.getListOfNames(doc)
-                                      .stream()
-                                      .filter(Codec52::isJabRefReferenceMarkName)
-                                      .toList();
+                UnoUserDefinedProperty.getListOfNames(doc).stream()
+                        .filter(Codec52::isJabRefReferenceMarkName)
+                        .toList();
         for (String pn : jabrefPropertyNames) {
             if (!citationGroupNamesSet.contains(pn)) {
                 pageInfoThrash.add(pn);
@@ -91,22 +88,22 @@ private List<String> findUnusedJabrefPropertyNames(XTextDocument doc,
     /**
      * @return Optional.empty if all is OK, message text otherwise.
      */
-    public Optional<String> healthReport(XTextDocument doc)
-            throws
-            NoDocumentException {
+    public Optional<String> healthReport(XTextDocument doc) throws NoDocumentException {
         List<String> pageInfoThrash =
                 this.findUnusedJabrefPropertyNames(doc, this.getJabRefReferenceMarkNames(doc));
         if (pageInfoThrash.isEmpty()) {
             return Optional.empty();
         }
 
-        String msg = "Backend52: found unused pageInfo data, with names listed below.\n"
-                + "In LibreOffice you may remove these in [File]/[Properties]/[Custom Properties]\n"
-                + String.join("\n", pageInfoThrash);
+        String msg =
+                "Backend52: found unused pageInfo data, with names listed below.\n"
+                        + "In LibreOffice you may remove these in [File]/[Properties]/[Custom Properties]\n"
+                        + String.join("\n", pageInfoThrash);
         return Optional.of(msg);
     }
 
-    private static void setPageInfoInDataInitial(List<Citation> citations, Optional<OOText> pageInfo) {
+    private static void setPageInfoInDataInitial(
+            List<Citation> citations, Optional<OOText> pageInfo) {
         // attribute to last citation (initially localOrder == storageOrder)
         if (!citations.isEmpty()) {
             citations.getLast().setPageInfo(pageInfo);
@@ -125,31 +122,33 @@ private static Optional<OOText> getPageInfoFromData(CitationGroup group) {
      * @param markName Reference mark name
      */
     public CitationGroup readCitationGroupFromDocumentOrThrow(XTextDocument doc, String markName)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
+            throws WrappedTargetException, NoDocumentException {
 
-        Codec52.ParsedMarkName parsed = Codec52.parseMarkName(markName).orElseThrow(IllegalArgumentException::new);
+        Codec52.ParsedMarkName parsed =
+                Codec52.parseMarkName(markName).orElseThrow(IllegalArgumentException::new);
 
-        List<Citation> citations = parsed.citationKeys.stream()
-                                                       .map(Citation::new)
-                                                       .collect(Collectors.toList());
+        List<Citation> citations =
+                parsed.citationKeys.stream().map(Citation::new).collect(Collectors.toList());
 
-        Optional<OOText> pageInfo = UnoUserDefinedProperty.getStringValue(doc, markName)
-                                                           .map(OOText::fromString);
+        Optional<OOText> pageInfo =
+                UnoUserDefinedProperty.getStringValue(doc, markName).map(OOText::fromString);
         pageInfo = PageInfo.normalizePageInfo(pageInfo);
 
         setPageInfoInDataInitial(citations, pageInfo);
 
-        NamedRange namedRange = citationStorageManager.getNamedRangeFromDocument(doc, markName)
-                                                       .orElseThrow(IllegalArgumentException::new);
+        NamedRange namedRange =
+                citationStorageManager
+                        .getNamedRangeFromDocument(doc, markName)
+                        .orElseThrow(IllegalArgumentException::new);
 
         CitationGroupId groupId = new CitationGroupId(markName);
-        CitationGroup group = new CitationGroup(OODataModel.JabRef52,
-                groupId,
-                parsed.citationType,
-                citations,
-                Optional.of(markName));
+        CitationGroup group =
+                new CitationGroup(
+                        OODataModel.JabRef52,
+                        groupId,
+                        parsed.citationType,
+                        citations,
+                        Optional.of(markName));
         this.cgidToNamedRange.put(groupId, namedRange);
         return group;
     }
@@ -164,19 +163,19 @@ public CitationGroup readCitationGroupFromDocumentOrThrow(XTextDocument doc, Str
      * @param position         Collapsed to its end.
      * @param insertSpaceAfter We insert a space after the mark, that carries on format of characters from the original position.
      */
-    public CitationGroup createCitationGroup(XTextDocument doc,
-                                             List<String> citationKeys,
-                                             List<Optional<OOText>> pageInfos,
-                                             CitationType citationType,
-                                             XTextCursor position,
-                                             boolean insertSpaceAfter)
-            throws
-            CreationException,
-            NoDocumentException,
-            WrappedTargetException,
-            NotRemoveableException,
-            PropertyVetoException,
-            IllegalTypeException {
+    public CitationGroup createCitationGroup(
+            XTextDocument doc,
+            List<String> citationKeys,
+            List<Optional<OOText>> pageInfos,
+            CitationType citationType,
+            XTextCursor position,
+            boolean insertSpaceAfter)
+            throws CreationException,
+                    NoDocumentException,
+                    WrappedTargetException,
+                    NotRemoveableException,
+                    PropertyVetoException,
+                    IllegalTypeException {
 
         Objects.requireNonNull(pageInfos);
         if (pageInfos.size() != citationKeys.size()) {
@@ -199,7 +198,8 @@ public CitationGroup createCitationGroup(XTextDocument doc,
                         cit.setPageInfo(pageInfo);
                     } else {
                         if (pageInfo.isPresent()) {
-                            LOGGER.warn("dataModel JabRef52 only supports pageInfo for the last citation of a group");
+                            LOGGER.warn(
+                                    "dataModel JabRef52 only supports pageInfo for the last citation of a group");
                         }
                     }
                     break;
@@ -207,7 +207,8 @@ public CitationGroup createCitationGroup(XTextDocument doc,
                     cit.setPageInfo(pageInfo);
                     break;
                 default:
-                    throw new IllegalStateException("Unhandled dataModel in Backend52.createCitationGroup");
+                    throw new IllegalStateException(
+                            "Unhandled dataModel in Backend52.createCitationGroup");
             }
         }
 
@@ -216,9 +217,11 @@ public CitationGroup createCitationGroup(XTextDocument doc,
          * the citation keys and citation type in the name of the reference mark. The name of the reference mark
          * has to be unique in the document.
          */
-        final String markName = Codec52.getUniqueMarkName(new HashSet<>(citationStorageManager.getUsedNames(doc)),
-                citationKeys,
-                citationType);
+        final String markName =
+                Codec52.getUniqueMarkName(
+                        new HashSet<>(citationStorageManager.getUsedNames(doc)),
+                        citationKeys,
+                        citationType);
 
         final CitationGroupId groupId = new CitationGroupId(markName);
 
@@ -226,11 +229,9 @@ public CitationGroup createCitationGroup(XTextDocument doc,
          * Apply to document
          */
         boolean withoutBrackets = citationType == CitationType.INVISIBLE_CIT;
-        NamedRange namedRange = this.citationStorageManager.createNamedRange(doc,
-                markName,
-                position,
-                insertSpaceAfter,
-                withoutBrackets);
+        NamedRange namedRange =
+                this.citationStorageManager.createNamedRange(
+                        doc, markName, position, insertSpaceAfter, withoutBrackets);
 
         switch (dataModel) {
             case JabRef52:
@@ -243,16 +244,21 @@ public CitationGroup createCitationGroup(XTextDocument doc,
                     // do not inherit from trash
                     UnoUserDefinedProperty.removeIfExists(doc, markName);
                 }
-                CitationGroup group = new CitationGroup(OODataModel.JabRef52,
-                        groupId,
-                        citationType, citations,
-                        Optional.of(markName));
+                CitationGroup group =
+                        new CitationGroup(
+                                OODataModel.JabRef52,
+                                groupId,
+                                citationType,
+                                citations,
+                                Optional.of(markName));
                 this.cgidToNamedRange.put(groupId, namedRange);
                 return group;
             case JabRef60:
-                throw new IllegalStateException("createCitationGroup for JabRef60 is not implemented yet");
+                throw new IllegalStateException(
+                        "createCitationGroup for JabRef60 is not implemented yet");
             default:
-                throw new IllegalStateException("Unhandled dataModel in Backend52.createCitationGroup");
+                throw new IllegalStateException(
+                        "Unhandled dataModel in Backend52.createCitationGroup");
         }
     }
 
@@ -261,24 +267,27 @@ public CitationGroup createCitationGroup(XTextDocument doc,
      * TODO: JabRef52 combinePageInfos is not reversible. Should warn user to check the result. Or
      *        ask what to do.
      */
-    public static List<Optional<OOText>>
-    combinePageInfosCommon(OODataModel dataModel, List<CitationGroup> joinableGroup) {
+    public static List<Optional<OOText>> combinePageInfosCommon(
+            OODataModel dataModel, List<CitationGroup> joinableGroup) {
         switch (dataModel) {
             case JabRef52:
                 // collect to pageInfos
-                List<Optional<OOText>> pageInfos = OOListUtil.map(joinableGroup,
-                        Backend52::getPageInfoFromData);
+                List<Optional<OOText>> pageInfos =
+                        OOListUtil.map(joinableGroup, Backend52::getPageInfoFromData);
 
                 // Try to do something of the pageInfos.
-                String singlePageInfo = pageInfos.stream()
-                                                  .filter(Optional::isPresent)
-                                                  .map(pi -> OOText.toString(pi.get()))
-                                                  .distinct()
-                                                  .collect(Collectors.joining("; "));
-
-                int totalCitations = joinableGroup.stream()
-                                                   .map(CitationGroup::numberOfCitations)
-                                                   .mapToInt(Integer::intValue).sum();
+                String singlePageInfo =
+                        pageInfos.stream()
+                                .filter(Optional::isPresent)
+                                .map(pi -> OOText.toString(pi.get()))
+                                .distinct()
+                                .collect(Collectors.joining("; "));
+
+                int totalCitations =
+                        joinableGroup.stream()
+                                .map(CitationGroup::numberOfCitations)
+                                .mapToInt(Integer::intValue)
+                                .sum();
                 if ("".equals(singlePageInfo)) {
                     singlePageInfo = null;
                 }
@@ -286,9 +295,11 @@ public CitationGroup createCitationGroup(XTextDocument doc,
 
             case JabRef60:
                 return joinableGroup.stream()
-                                     .flatMap(group -> (group.citationsInStorageOrder.stream()
-                                                                                     .map(Citation::getPageInfo)))
-                                     .collect(Collectors.toList());
+                        .flatMap(
+                                group ->
+                                        (group.citationsInStorageOrder.stream()
+                                                .map(Citation::getPageInfo)))
+                        .collect(Collectors.toList());
             default:
                 throw new IllegalArgumentException("unhandled dataModel here");
         }
@@ -307,10 +318,7 @@ private NamedRange getNamedRangeOrThrow(CitationGroup group) {
     }
 
     public void removeCitationGroup(CitationGroup group, XTextDocument doc)
-            throws
-            WrappedTargetException,
-            NoDocumentException,
-            NotRemoveableException {
+            throws WrappedTargetException, NoDocumentException, NotRemoveableException {
         NamedRange namedRange = getNamedRangeOrThrow(group);
         String refMarkName = namedRange.getRangeName();
         namedRange.removeFromDocument(doc);
@@ -322,9 +330,7 @@ public void removeCitationGroup(CitationGroup group, XTextDocument doc)
      * @return Optional.empty if the reference mark is missing.
      */
     public Optional<XTextRange> getMarkRange(CitationGroup group, XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+            throws NoDocumentException, WrappedTargetException {
 
         NamedRange namedRange = getNamedRangeOrThrow(group);
         return namedRange.getMarkRange(doc);
@@ -333,10 +339,9 @@ public Optional<XTextRange> getMarkRange(CitationGroup group, XTextDocument doc)
     /**
      * Cursor for the reference marks as is: not prepared for filling, but does not need cleanFillCursorForCitationGroup either.
      */
-    public Optional<XTextCursor> getRawCursorForCitationGroup(CitationGroup group, XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+    public Optional<XTextCursor> getRawCursorForCitationGroup(
+            CitationGroup group, XTextDocument doc)
+            throws NoDocumentException, WrappedTargetException {
         NamedRange namedRange = getNamedRangeOrThrow(group);
         return namedRange.getRawCursor(doc);
     }
@@ -345,10 +350,7 @@ public Optional<XTextCursor> getRawCursorForCitationGroup(CitationGroup group, X
      * Must be followed by call to cleanFillCursorForCitationGroup
      */
     public XTextCursor getFillCursorForCitationGroup(CitationGroup group, XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException,
-            CreationException {
+            throws NoDocumentException, WrappedTargetException, CreationException {
 
         NamedRange namedRange = getNamedRangeOrThrow(group);
         return namedRange.getFillCursor(doc);
@@ -358,40 +360,38 @@ public XTextCursor getFillCursorForCitationGroup(CitationGroup group, XTextDocum
      * To be called after getFillCursorForCitationGroup
      */
     public void cleanFillCursorForCitationGroup(CitationGroup group, XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+            throws NoDocumentException, WrappedTargetException {
         NamedRange namedRange = getNamedRangeOrThrow(group);
         namedRange.cleanFillCursor(doc);
     }
 
     public List<CitationEntry> getCitationEntries(XTextDocument doc, CitationGroups citationGroups)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
+            throws WrappedTargetException, NoDocumentException {
 
         switch (dataModel) {
             case JabRef52:
                 // One context per CitationGroup: Backend52 (DataModel.JabRef52)
                 // For DataModel.JabRef60 (Backend60) we need one context per Citation
-                List<CitationEntry> citations = new ArrayList<>(citationGroups.numberOfCitationGroups());
+                List<CitationEntry> citations =
+                        new ArrayList<>(citationGroups.numberOfCitationGroups());
                 for (CitationGroup group : citationGroups.getCitationGroupsUnordered()) {
                     String name = group.groupId.citationGroupIdAsString();
-                    XTextCursor cursor = this
-                            .getRawCursorForCitationGroup(group, doc)
-                            .orElseThrow(IllegalStateException::new);
+                    XTextCursor cursor =
+                            this.getRawCursorForCitationGroup(group, doc)
+                                    .orElseThrow(IllegalStateException::new);
                     String context = GetContext.getCursorStringWithContext(cursor, 30, 30, true);
-                    Optional<String> pageInfo = group.numberOfCitations() > 0
-                            ? (getPageInfoFromData(group)
-                            .map(e -> OOText.toString(e)))
-                            : Optional.empty();
+                    Optional<String> pageInfo =
+                            group.numberOfCitations() > 0
+                                    ? (getPageInfoFromData(group).map(e -> OOText.toString(e)))
+                                    : Optional.empty();
                     CitationEntry entry = new CitationEntry(name, context, pageInfo);
                     citations.add(entry);
                 }
                 return citations;
             case JabRef60:
                 // xx
-                throw new IllegalStateException("getCitationEntries for JabRef60 is not implemented yet");
+                throw new IllegalStateException(
+                        "getCitationEntries for JabRef60 is not implemented yet");
             default:
                 throw new IllegalStateException("getCitationEntries: unhandled dataModel ");
         }
@@ -401,11 +401,10 @@ public List<CitationEntry> getCitationEntries(XTextDocument doc, CitationGroups
      * Only applies to storage. Citation markers are not changed.
      */
     public void applyCitationEntries(XTextDocument doc, List<CitationEntry> citationEntries)
-            throws
-            PropertyVetoException,
-            IllegalTypeException,
-            IllegalArgumentException,
-            WrappedTargetException {
+            throws PropertyVetoException,
+                    IllegalTypeException,
+                    IllegalArgumentException,
+                    WrappedTargetException {
 
         switch (dataModel) {
             case JabRef52:
@@ -414,16 +413,17 @@ public void applyCitationEntries(XTextDocument doc, List<CitationEntry> citation
                     pageInfo = PageInfo.normalizePageInfo(pageInfo);
                     if (pageInfo.isPresent()) {
                         String name = entry.getRefMarkName();
-                        UnoUserDefinedProperty.setStringProperty(doc, name, pageInfo.get().toString());
+                        UnoUserDefinedProperty.setStringProperty(
+                                doc, name, pageInfo.get().toString());
                     }
                 }
                 break;
             case JabRef60:
                 // ToDo: Implement
-                throw new IllegalStateException("applyCitationEntries for JabRef60 is not implemented yet");
+                throw new IllegalStateException(
+                        "applyCitationEntries for JabRef60 is not implemented yet");
             default:
                 throw new IllegalStateException("applyCitationEntries: unhandled dataModel ");
         }
     }
 }
-
diff --git a/src/main/java/org/jabref/logic/openoffice/backend/Codec52.java b/src/main/java/org/jabref/logic/openoffice/backend/Codec52.java
index 5d5675397990..4c441e0ba0e2 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/Codec52.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/Codec52.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.openoffice.backend;
 
+import org.jabref.model.openoffice.style.CitationType;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -9,8 +11,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import org.jabref.model.openoffice.style.CitationType;
-
 /**
  * How and what is encoded in reference mark names under JabRef 5.2.
  * <p>
@@ -23,8 +23,7 @@ class Codec52 {
             // citationType is always "1" "2" or "3"
             Pattern.compile(BIB_CITATION + "(\\d*)_([123])_(.*)");
 
-    private Codec52() {
-    }
+    private Codec52() {}
 
     /**
      * This is what we get back from parsing a refMarkName.
@@ -34,10 +33,12 @@ public static class ParsedMarkName {
          * "", "0", "1" ...
          */
         public final String index;
+
         /**
          * in-text-citation type
          */
         public final CitationType citationType;
+
         /**
          * Citation keys embedded in the reference mark.
          */
@@ -83,9 +84,8 @@ private static int citationTypeToInt(CitationType type) {
      *                     <p>
      *                     Or the first unused in this series, after removals.
      */
-    public static String getUniqueMarkName(Set<String> usedNames,
-                                           List<String> citationKeys,
-                                           CitationType citationType) {
+    public static String getUniqueMarkName(
+            Set<String> usedNames, List<String> citationKeys, CitationType citationType) {
 
         String citationKeysPart = String.join(",", citationKeys);
 
@@ -131,7 +131,7 @@ public static boolean isJabRefReferenceMarkName(String name) {
      */
     public static List<String> filterIsJabRefReferenceMarkName(List<String> names) {
         return names.stream()
-                     .filter(Codec52::isJabRefReferenceMarkName)
-                     .collect(Collectors.toList());
+                .filter(Codec52::isJabRefReferenceMarkName)
+                .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/backend/GetContext.java b/src/main/java/org/jabref/logic/openoffice/backend/GetContext.java
index cad4ca6a6407..245ac9ef3e60 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/GetContext.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/GetContext.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.openoffice.backend;
 
 import com.sun.star.text.XTextCursor;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -11,8 +12,7 @@ public class GetContext {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GetContext.class);
 
-    private GetContext() {
-    }
+    private GetContext() {}
 
     /**
      * Get the text belonging to cursor with up to charBefore and charAfter characters of context.
@@ -23,10 +23,8 @@ private GetContext() {
      * @param charAfter  Number of characters requested.
      * @param htmlMarkup If true, the text belonging to the reference mark is surrounded by bold html tag.
      */
-    public static String getCursorStringWithContext(XTextCursor cursor,
-                                                    int charBefore,
-                                                    int charAfter,
-                                                    boolean htmlMarkup) {
+    public static String getCursorStringWithContext(
+            XTextCursor cursor, int charBefore, int charAfter, boolean htmlMarkup) {
 
         String citPart = cursor.getString();
 
@@ -66,9 +64,12 @@ public static String getCursorStringWithContext(XTextCursor cursor,
 
         String result = cursor.getString();
         if (htmlMarkup) {
-            result = result.substring(0, addedBefore)
-                    + "<b>" + citPart + "</b>"
-                    + result.substring(lengthWithBefore);
+            result =
+                    result.substring(0, addedBefore)
+                            + "<b>"
+                            + citPart
+                            + "</b>"
+                            + result.substring(lengthWithBefore);
         }
         return result.trim();
     }
diff --git a/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeManagerReferenceMark.java b/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeManagerReferenceMark.java
index 37ad5499da5a..dafec6e1764a 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeManagerReferenceMark.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeManagerReferenceMark.java
@@ -1,7 +1,8 @@
 package org.jabref.logic.openoffice.backend;
 
-import java.util.List;
-import java.util.Optional;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextDocument;
 
 import org.jabref.model.openoffice.backend.NamedRange;
 import org.jabref.model.openoffice.backend.NamedRangeManager;
@@ -9,38 +10,31 @@
 import org.jabref.model.openoffice.uno.NoDocumentException;
 import org.jabref.model.openoffice.uno.UnoReferenceMark;
 
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
+import java.util.List;
+import java.util.Optional;
 
 public class NamedRangeManagerReferenceMark implements NamedRangeManager {
 
     @Override
-    public NamedRange createNamedRange(XTextDocument doc,
-                                       String refMarkName,
-                                       XTextCursor position,
-                                       boolean insertSpaceAfter,
-                                       boolean withoutBrackets)
-            throws
-            CreationException {
-        return NamedRangeReferenceMark.create(doc, refMarkName, position, insertSpaceAfter, withoutBrackets);
+    public NamedRange createNamedRange(
+            XTextDocument doc,
+            String refMarkName,
+            XTextCursor position,
+            boolean insertSpaceAfter,
+            boolean withoutBrackets)
+            throws CreationException {
+        return NamedRangeReferenceMark.create(
+                doc, refMarkName, position, insertSpaceAfter, withoutBrackets);
     }
 
     @Override
-    public List<String> getUsedNames(XTextDocument doc)
-            throws
-            NoDocumentException {
+    public List<String> getUsedNames(XTextDocument doc) throws NoDocumentException {
         return UnoReferenceMark.getListOfNames(doc);
     }
 
     @Override
     public Optional<NamedRange> getNamedRangeFromDocument(XTextDocument doc, String refMarkName)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
-        return NamedRangeReferenceMark
-                .getFromDocument(doc, refMarkName)
-                .map(x -> x);
+            throws NoDocumentException, WrappedTargetException {
+        return NamedRangeReferenceMark.getFromDocument(doc, refMarkName).map(x -> x);
     }
 }
-
diff --git a/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java b/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java
index e2f0beb3cd21..2c7b9225602d 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java
@@ -1,6 +1,11 @@
 package org.jabref.logic.openoffice.backend;
 
-import java.util.Optional;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XText;
+import com.sun.star.text.XTextContent;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.text.XTextRange;
 
 import org.jabref.model.openoffice.DocumentAnnotation;
 import org.jabref.model.openoffice.backend.NamedRange;
@@ -8,29 +13,23 @@
 import org.jabref.model.openoffice.uno.NoDocumentException;
 import org.jabref.model.openoffice.uno.UnoCursor;
 import org.jabref.model.openoffice.uno.UnoReferenceMark;
-
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XText;
-import com.sun.star.text.XTextContent;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextRange;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Optional;
+
 public class NamedRangeReferenceMark implements NamedRange {
 
     private static final String ZERO_WIDTH_SPACE = "\u200b";
 
     // for debugging we may want visible bracket
-    private static final boolean
-            REFERENCE_MARK_USE_INVISIBLE_BRACKETS = true; // !debug;
+    private static final boolean REFERENCE_MARK_USE_INVISIBLE_BRACKETS = true; // !debug;
 
-    public static final String
-            REFERENCE_MARK_LEFT_BRACKET = REFERENCE_MARK_USE_INVISIBLE_BRACKETS ? ZERO_WIDTH_SPACE : "<";
+    public static final String REFERENCE_MARK_LEFT_BRACKET =
+            REFERENCE_MARK_USE_INVISIBLE_BRACKETS ? ZERO_WIDTH_SPACE : "<";
 
-    public static final String
-            REFERENCE_MARK_RIGHT_BRACKET = REFERENCE_MARK_USE_INVISIBLE_BRACKETS ? ZERO_WIDTH_SPACE : ">";
+    public static final String REFERENCE_MARK_RIGHT_BRACKET =
+            REFERENCE_MARK_USE_INVISIBLE_BRACKETS ? ZERO_WIDTH_SPACE : ">";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NamedRangeReferenceMark.class);
 
@@ -58,7 +57,8 @@ String getId() {
      * @param numSpaces Number of spaces to insert.
      * @return a new cursor, covering the just-inserted spaces.
      */
-    public static XTextCursor safeInsertSpacesBetweenReferenceMarks(XTextRange position, int numSpaces) {
+    public static XTextCursor safeInsertSpacesBetweenReferenceMarks(
+            XTextRange position, int numSpaces) {
         // Start with an empty cursor at position.getStart();
         XText text = position.getText();
         XTextCursor cursor = text.createTextCursorByRange(position.getStart());
@@ -74,13 +74,13 @@ public static XTextCursor safeInsertSpacesBetweenReferenceMarks(XTextRange posit
         return cursor;
     }
 
-    private static void createReprInDocument(XTextDocument doc,
-                                             String refMarkName,
-                                             XTextCursor position,
-                                             boolean insertSpaceAfter,
-                                             boolean withoutBrackets)
-            throws
-            CreationException {
+    private static void createReprInDocument(
+            XTextDocument doc,
+            String refMarkName,
+            XTextCursor position,
+            boolean insertSpaceAfter,
+            boolean withoutBrackets)
+            throws CreationException {
 
         // The cursor we received: we push it before us.
         position.collapseToEnd();
@@ -97,12 +97,11 @@ private static void createReprInDocument(XTextDocument doc,
 
         final String left = NamedRangeReferenceMark.REFERENCE_MARK_LEFT_BRACKET;
         final String right = NamedRangeReferenceMark.REFERENCE_MARK_RIGHT_BRACKET;
-        String bracketedContent = withoutBrackets
-                ? ""
-                : left + right;
+        String bracketedContent = withoutBrackets ? "" : left + right;
 
         cursor.getText().insertString(cursor, bracketedContent, true);
-        DocumentAnnotation documentAnnotation = new DocumentAnnotation(doc, refMarkName, cursor, true /* absorb */);
+        DocumentAnnotation documentAnnotation =
+                new DocumentAnnotation(doc, refMarkName, cursor, true /* absorb */);
         UnoReferenceMark.create(documentAnnotation);
 
         // eat the first inserted space
@@ -115,13 +114,13 @@ private static void createReprInDocument(XTextDocument doc,
         }
     }
 
-    static NamedRangeReferenceMark create(XTextDocument doc,
-                                          String refMarkName,
-                                          XTextCursor position,
-                                          boolean insertSpaceAfter,
-                                          boolean withoutBrackets)
-            throws
-            CreationException {
+    static NamedRangeReferenceMark create(
+            XTextDocument doc,
+            String refMarkName,
+            XTextCursor position,
+            boolean insertSpaceAfter,
+            boolean withoutBrackets)
+            throws CreationException {
 
         createReprInDocument(doc, refMarkName, position, insertSpaceAfter, withoutBrackets);
         return new NamedRangeReferenceMark(refMarkName);
@@ -131,11 +130,9 @@ static NamedRangeReferenceMark create(XTextDocument doc,
      * @return Optional.empty if there is no corresponding range.
      */
     static Optional<NamedRangeReferenceMark> getFromDocument(XTextDocument doc, String refMarkName)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+            throws NoDocumentException, WrappedTargetException {
         return UnoReferenceMark.getAnchor(doc, refMarkName)
-                                .map(e -> new NamedRangeReferenceMark(refMarkName));
+                .map(e -> new NamedRangeReferenceMark(refMarkName));
     }
 
     /**
@@ -145,9 +142,7 @@ static Optional<NamedRangeReferenceMark> getFromDocument(XTextDocument doc, Stri
      */
     @Override
     public void removeFromDocument(XTextDocument doc)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
+            throws WrappedTargetException, NoDocumentException {
         UnoReferenceMark.removeIfExists(doc, this.getRangeName());
     }
 
@@ -161,9 +156,7 @@ public String getRangeName() {
      */
     @Override
     public Optional<XTextRange> getMarkRange(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+            throws NoDocumentException, WrappedTargetException {
         String name = this.getRangeName();
         return UnoReferenceMark.getAnchor(doc, name);
     }
@@ -175,9 +168,7 @@ public Optional<XTextRange> getMarkRange(XTextDocument doc)
      */
     @Override
     public Optional<XTextCursor> getRawCursor(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+            throws NoDocumentException, WrappedTargetException {
 
         String name = this.getRangeName();
 
@@ -187,7 +178,8 @@ public Optional<XTextCursor> getRawCursor(XTextDocument doc)
             LOGGER.warn("getRawCursor: markAsTextContent({}).isEmpty()", name);
         }
 
-        Optional<XTextCursor> full = UnoCursor.getTextCursorOfTextContentAnchor(markAsTextContent.get());
+        Optional<XTextCursor> full =
+                UnoCursor.getTextCursorOfTextContentAnchor(markAsTextContent.get());
         if (full.isEmpty()) {
             LOGGER.warn("getRawCursor: full.isEmpty()");
             return Optional.empty();
@@ -200,10 +192,7 @@ public Optional<XTextCursor> getRawCursor(XTextDocument doc)
      */
     @Override
     public XTextCursor getFillCursor(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException,
-            CreationException {
+            throws NoDocumentException, WrappedTargetException, CreationException {
 
         String name = this.getRangeName();
 
@@ -215,7 +204,9 @@ public XTextCursor getFillCursor(XTextDocument doc)
             Optional<XTextContent> markAsTextContent = UnoReferenceMark.getAsTextContent(doc, name);
 
             if (markAsTextContent.isEmpty()) {
-                String msg = "getFillCursor: markAsTextContent(%s).isEmpty (attempt %d)".formatted(name, i);
+                String msg =
+                        "getFillCursor: markAsTextContent(%s).isEmpty (attempt %d)"
+                                .formatted(name, i);
                 throw new IllegalStateException(msg);
             }
 
@@ -230,7 +221,8 @@ public XTextCursor getFillCursor(XTextDocument doc)
             LOGGER.debug("getFillCursor: fulltext = '{}'", fullText);
 
             if (fullText.length() >= 2) {
-                LOGGER.debug("getFillCursor: (attempt: {}) fulltext.length() >= 2, break loop%n", i);
+                LOGGER.debug(
+                        "getFillCursor: (attempt: {}) fulltext.length() >= 2, break loop%n", i);
                 break;
             } else {
                 // (fullText.length() < 2)
@@ -320,9 +312,15 @@ public XTextCursor getFillCursor(XTextDocument doc)
             if (debugThisFun) {
                 final short leftLength = (short) left.length();
                 alpha.goRight(leftLength, true);
-                LOGGER.debug("getFillCursor: alpha(7) covers '{}', should be '{}'", alpha.getString(), left);
+                LOGGER.debug(
+                        "getFillCursor: alpha(7) covers '{}', should be '{}'",
+                        alpha.getString(),
+                        left);
                 omega.goLeft(rightLength, true);
-                LOGGER.debug("getFillCursor: omega(8) covers '{}', should be '{}'", omega.getString(), right);
+                LOGGER.debug(
+                        "getFillCursor: omega(8) covers '{}', should be '{}'",
+                        omega.getString(),
+                        right);
             }
         }
 
@@ -346,9 +344,10 @@ public static void checkFillCursor(XTextCursor cursor) {
         if (leftLength > 0) {
             alpha.goLeft(leftLength, true);
             if (!left.equals(alpha.getString())) {
-                String msg = ("checkFillCursor:"
-                        + " ('%s') is not prefixed with REFERENCE_MARK_LEFT_BRACKET, has '%s'").formatted(
-                        cursor.getString(), alpha.getString());
+                String msg =
+                        ("checkFillCursor:"
+                                        + " ('%s') is not prefixed with REFERENCE_MARK_LEFT_BRACKET, has '%s'")
+                                .formatted(cursor.getString(), alpha.getString());
                 throw new IllegalStateException(msg);
             }
         }
@@ -358,9 +357,10 @@ public static void checkFillCursor(XTextCursor cursor) {
         if (rightLength > 0) {
             omega.goRight(rightLength, true);
             if (!right.equals(omega.getString())) {
-                String msg = ("checkFillCursor:"
-                        + " ('%s') is not followed by REFERENCE_MARK_RIGHT_BRACKET, has '%s'").formatted(
-                        cursor.getString(), omega.getString());
+                String msg =
+                        ("checkFillCursor:"
+                                        + " ('%s') is not followed by REFERENCE_MARK_RIGHT_BRACKET, has '%s'")
+                                .formatted(cursor.getString(), omega.getString());
                 throw new IllegalStateException(msg);
             }
         }
@@ -373,15 +373,14 @@ public static void checkFillCursor(XTextCursor cursor) {
      */
     @Override
     public void cleanFillCursor(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+            throws NoDocumentException, WrappedTargetException {
 
         // alwaysRemoveBrackets : full compatibility with JabRef 5.2: brackets are temporary, only
         // exist between getFillCursor and cleanFillCursor.
         final boolean alwaysRemoveBrackets = false;
 
-        // removeBracketsFromEmpty is intended to force removal if we are working on an "Empty citation" (INVISIBLE_CIT).
+        // removeBracketsFromEmpty is intended to force removal if we are working on an "Empty
+        // citation" (INVISIBLE_CIT).
         final boolean removeBracketsFromEmpty = false;
 
         String name = this.getRangeName();
@@ -391,13 +390,17 @@ public void cleanFillCursor(XTextDocument doc)
 
         final String left = REFERENCE_MARK_LEFT_BRACKET;
         if (!fullText.startsWith(left)) {
-            String msg = "cleanFillCursor: (%s) does not start with REFERENCE_MARK_LEFT_BRACKET".formatted(name);
+            String msg =
+                    "cleanFillCursor: (%s) does not start with REFERENCE_MARK_LEFT_BRACKET"
+                            .formatted(name);
             throw new IllegalStateException(msg);
         }
 
         final String right = REFERENCE_MARK_RIGHT_BRACKET;
         if (!fullText.endsWith(right)) {
-            String msg = "cleanFillCursor: (%s) does not end with REFERENCE_MARK_RIGHT_BRACKET".formatted(name);
+            String msg =
+                    "cleanFillCursor: (%s) does not end with REFERENCE_MARK_RIGHT_BRACKET"
+                            .formatted(name);
             throw new IllegalStateException(msg);
         }
 
@@ -410,13 +413,15 @@ public void cleanFillCursor(XTextDocument doc)
             throw new IllegalStateException(msg);
         }
 
-        boolean removeRight = (contentLength >= 1)
-                || ((contentLength == 0) && removeBracketsFromEmpty)
-                || alwaysRemoveBrackets;
+        boolean removeRight =
+                (contentLength >= 1)
+                        || ((contentLength == 0) && removeBracketsFromEmpty)
+                        || alwaysRemoveBrackets;
 
-        boolean removeLeft = (contentLength >= 2)
-                || ((contentLength == 0) && removeBracketsFromEmpty)
-                || alwaysRemoveBrackets;
+        boolean removeLeft =
+                (contentLength >= 2)
+                        || ((contentLength == 0) && removeBracketsFromEmpty)
+                        || alwaysRemoveBrackets;
 
         if (removeRight) {
             XTextCursor omega = full.getText().createTextCursorByRange(full);
diff --git a/src/main/java/org/jabref/logic/openoffice/frontend/OOFrontend.java b/src/main/java/org/jabref/logic/openoffice/frontend/OOFrontend.java
index 1aeec0d23203..65b9361f8944 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/OOFrontend.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/OOFrontend.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.openoffice.frontend;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import com.sun.star.beans.IllegalTypeException;
+import com.sun.star.beans.NotRemoveableException;
+import com.sun.star.beans.PropertyVetoException;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.text.XTextRange;
 
 import org.jabref.logic.JabRefException;
 import org.jabref.logic.l10n.Localization;
@@ -33,23 +33,20 @@
 import org.jabref.model.openoffice.util.OOListUtil;
 import org.jabref.model.openoffice.util.OOVoidResult;
 
-import com.sun.star.beans.IllegalTypeException;
-import com.sun.star.beans.NotRemoveableException;
-import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextRange;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 public class OOFrontend {
 
     public final Backend52 backend;
     public final CitationGroups citationGroups;
 
-    public OOFrontend(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+    public OOFrontend(XTextDocument doc) throws NoDocumentException, WrappedTargetException {
 
         // TODO: dataModel should come from looking at the document and preferences.
         this.backend = new Backend52();
@@ -66,19 +63,13 @@ public OODataModel getDataModel() {
         return backend.dataModel;
     }
 
-    public Optional<String> healthReport(XTextDocument doc)
-            throws
-            NoDocumentException {
+    public Optional<String> healthReport(XTextDocument doc) throws NoDocumentException {
         return backend.healthReport(doc);
     }
 
-    private static Map<CitationGroupId, CitationGroup>
-    readCitationGroupsFromDocument(Backend52 backend,
-                                   XTextDocument doc,
-                                   List<String> citationGroupNames)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
+    private static Map<CitationGroupId, CitationGroup> readCitationGroupsFromDocument(
+            Backend52 backend, XTextDocument doc, List<String> citationGroupNames)
+            throws WrappedTargetException, NoDocumentException {
 
         Map<CitationGroupId, CitationGroup> citationGroups = new HashMap<>();
         for (String name : citationGroupNames) {
@@ -99,17 +90,14 @@ public Optional<String> healthReport(XTextDocument doc)
      *
      * @param mapFootnotesToFootnoteMarks If true, replace ranges in footnotes with the range of the corresponding footnote mark. This is used for numbering the citations.
      */
-    private List<RangeSortable<CitationGroup>> createVisualSortInput(XTextDocument doc,
-                                                                     boolean mapFootnotesToFootnoteMarks)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+    private List<RangeSortable<CitationGroup>> createVisualSortInput(
+            XTextDocument doc, boolean mapFootnotesToFootnoteMarks)
+            throws NoDocumentException, WrappedTargetException {
 
         List<RangeSortEntry<CitationGroup>> sortables = new ArrayList<>();
         for (CitationGroup group : citationGroups.getCitationGroupsUnordered()) {
-            XTextRange range = this
-                    .getMarkRange(doc, group)
-                    .orElseThrow(IllegalStateException::new);
+            XTextRange range =
+                    this.getMarkRange(doc, group).orElseThrow(IllegalStateException::new);
             sortables.add(new RangeSortEntry<>(range, 0, group));
         }
 
@@ -156,20 +144,19 @@ private List<RangeSortable<CitationGroup>> createVisualSortInput(XTextDocument d
      * @param mapFootnotesToFootnoteMarks If true, sort reference marks in footnotes as if they appeared at the corresponding footnote mark.
      * @return citation groups sorted by their visual positions. Limitation: for two column layout visual (top-down, left-right) order does not match the expected (textual) order.
      */
-    private List<CitationGroup> getVisuallySortedCitationGroups(XTextDocument doc,
-                                                                boolean mapFootnotesToFootnoteMarks,
-                                                                FunctionalTextViewCursor fcursor)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
+    private List<CitationGroup> getVisuallySortedCitationGroups(
+            XTextDocument doc,
+            boolean mapFootnotesToFootnoteMarks,
+            FunctionalTextViewCursor fcursor)
+            throws WrappedTargetException, NoDocumentException {
 
-        List<RangeSortable<CitationGroup>> sortables = createVisualSortInput(doc, mapFootnotesToFootnoteMarks);
+        List<RangeSortable<CitationGroup>> sortables =
+                createVisualSortInput(doc, mapFootnotesToFootnoteMarks);
 
-        List<RangeSortable<CitationGroup>> sorted = RangeSortVisual.visualSort(sortables, doc, fcursor);
+        List<RangeSortable<CitationGroup>> sorted =
+                RangeSortVisual.visualSort(sortables, doc, fcursor);
 
-        return sorted.stream()
-                      .map(RangeSortable::getContent)
-                      .collect(Collectors.toList());
+        return sorted.stream().map(RangeSortable::getContent).collect(Collectors.toList());
     }
 
     /**
@@ -177,11 +164,9 @@ private List<CitationGroup> getVisuallySortedCitationGroups(XTextDocument doc,
      * <p>
      * This is (1) sufficient for combineCiteMarkers which looks for consecutive XTextRanges within each XText, (2) not confused by multicolumn layout or multipage display.
      */
-    public List<CitationGroup>
-    getCitationGroupsSortedWithinPartitions(XTextDocument doc, boolean mapFootnotesToFootnoteMarks)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+    public List<CitationGroup> getCitationGroupsSortedWithinPartitions(
+            XTextDocument doc, boolean mapFootnotesToFootnoteMarks)
+            throws NoDocumentException, WrappedTargetException {
         // This is like getVisuallySortedCitationGroups,
         // but we skip the visualSort part.
         List<RangeSortable<CitationGroup>> sortables =
@@ -200,30 +185,27 @@ private List<CitationGroup> getVisuallySortedCitationGroups(XTextDocument doc,
      * @param position         Collapsed to its end.
      * @param insertSpaceAfter If true, we insert a space after the mark, that carries on format of characters from the original position.
      */
-    public CitationGroup createCitationGroup(XTextDocument doc,
-                                             List<String> citationKeys,
-                                             List<Optional<OOText>> pageInfos,
-                                             CitationType citationType,
-                                             XTextCursor position,
-                                             boolean insertSpaceAfter)
-            throws
-            CreationException,
-            NoDocumentException,
-            WrappedTargetException,
-            NotRemoveableException,
-            PropertyVetoException,
-            IllegalTypeException {
+    public CitationGroup createCitationGroup(
+            XTextDocument doc,
+            List<String> citationKeys,
+            List<Optional<OOText>> pageInfos,
+            CitationType citationType,
+            XTextCursor position,
+            boolean insertSpaceAfter)
+            throws CreationException,
+                    NoDocumentException,
+                    WrappedTargetException,
+                    NotRemoveableException,
+                    PropertyVetoException,
+                    IllegalTypeException {
 
         Objects.requireNonNull(pageInfos);
         if (pageInfos.size() != citationKeys.size()) {
             throw new IllegalArgumentException("pageInfos.size != citationKeys.size");
         }
-        CitationGroup group = backend.createCitationGroup(doc,
-                citationKeys,
-                pageInfos,
-                citationType,
-                position,
-                insertSpaceAfter);
+        CitationGroup group =
+                backend.createCitationGroup(
+                        doc, citationKeys, pageInfos, citationType, position, insertSpaceAfter);
 
         this.citationGroups.afterCreateCitationGroup(group);
         return group;
@@ -233,20 +215,14 @@ public CitationGroup createCitationGroup(XTextDocument doc,
      * Remove {@code group} both from the document and notify {@code citationGroups}
      */
     public void removeCitationGroup(CitationGroup group, XTextDocument doc)
-            throws
-            WrappedTargetException,
-            NoDocumentException,
-            NotRemoveableException {
+            throws WrappedTargetException, NoDocumentException, NotRemoveableException {
 
         backend.removeCitationGroup(group, doc);
         this.citationGroups.afterRemoveCitationGroup(group);
     }
 
     public void removeCitationGroups(List<CitationGroup> citationGroups, XTextDocument doc)
-            throws
-            WrappedTargetException,
-            NoDocumentException,
-            NotRemoveableException {
+            throws WrappedTargetException, NoDocumentException, NotRemoveableException {
 
         for (CitationGroup group : citationGroups) {
             removeCitationGroup(group, doc);
@@ -259,17 +235,12 @@ public void removeCitationGroups(List<CitationGroup> citationGroups, XTextDocume
      * @return Optional.empty() if the reference mark is missing.
      */
     public Optional<XTextRange> getMarkRange(XTextDocument doc, CitationGroup group)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+            throws NoDocumentException, WrappedTargetException {
         return backend.getMarkRange(group, doc);
     }
 
     public XTextCursor getFillCursorForCitationGroup(XTextDocument doc, CitationGroup group)
-            throws
-            NoDocumentException,
-            WrappedTargetException,
-            CreationException {
+            throws NoDocumentException, WrappedTargetException, CreationException {
         return backend.getFillCursorForCitationGroup(group, doc);
     }
 
@@ -277,9 +248,7 @@ public XTextCursor getFillCursorForCitationGroup(XTextDocument doc, CitationGrou
      * Remove brackets added by getFillCursorForCitationGroup.
      */
     public void cleanFillCursorForCitationGroup(XTextDocument doc, CitationGroup group)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+            throws NoDocumentException, WrappedTargetException {
 
         backend.cleanFillCursorForCitationGroup(group, doc);
     }
@@ -288,38 +257,39 @@ public void cleanFillCursorForCitationGroup(XTextDocument doc, CitationGroup gro
      * @return A RangeForOverlapCheck for each citation group. result.size() == nRefMarks
      */
     public List<RangeForOverlapCheck<CitationGroupId>> citationRanges(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+            throws NoDocumentException, WrappedTargetException {
 
         List<RangeForOverlapCheck<CitationGroupId>> result =
                 new ArrayList<>(citationGroups.numberOfCitationGroups());
 
         for (CitationGroup group : citationGroups.getCitationGroupsUnordered()) {
-            XTextRange range = this.getMarkRange(doc, group).orElseThrow(IllegalStateException::new);
+            XTextRange range =
+                    this.getMarkRange(doc, group).orElseThrow(IllegalStateException::new);
             String description = group.groupId.citationGroupIdAsString();
-            result.add(new RangeForOverlapCheck<>(range,
-                    group.groupId,
-                    RangeForOverlapCheck.REFERENCE_MARK_KIND,
-                    description));
+            result.add(
+                    new RangeForOverlapCheck<>(
+                            range,
+                            group.groupId,
+                            RangeForOverlapCheck.REFERENCE_MARK_KIND,
+                            description));
         }
         return result;
     }
 
     public List<RangeForOverlapCheck<CitationGroupId>> bibliographyRanges(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+            throws NoDocumentException, WrappedTargetException {
 
         List<RangeForOverlapCheck<CitationGroupId>> result = new ArrayList<>();
 
         Optional<XTextRange> range = UpdateBibliography.getBibliographyRange(doc);
         if (range.isPresent()) {
             String description = "bibliography";
-            result.add(new RangeForOverlapCheck<>(range.get(),
-                    new CitationGroupId("bibliography"),
-                    RangeForOverlapCheck.BIBLIOGRAPHY_MARK_KIND,
-                    description));
+            result.add(
+                    new RangeForOverlapCheck<>(
+                            range.get(),
+                            new CitationGroupId("bibliography"),
+                            RangeForOverlapCheck.BIBLIOGRAPHY_MARK_KIND,
+                            description));
         }
         return result;
     }
@@ -330,10 +300,12 @@ public List<RangeForOverlapCheck<CitationGroupId>> viewCursorRanges(XTextDocumen
         Optional<XTextRange> range = UnoCursor.getViewCursor(doc).map(e -> e);
         if (range.isPresent()) {
             String description = "cursor";
-            result.add(new RangeForOverlapCheck<>(range.get(),
-                    new CitationGroupId("cursor"),
-                    RangeForOverlapCheck.CURSOR_MARK_KIND,
-                    description));
+            result.add(
+                    new RangeForOverlapCheck<>(
+                            range.get(),
+                            new CitationGroupId("cursor"),
+                            RangeForOverlapCheck.CURSOR_MARK_KIND,
+                            description));
         }
         return result;
     }
@@ -343,8 +315,8 @@ public List<RangeForOverlapCheck<CitationGroupId>> viewCursorRanges(XTextDocumen
      * <p>
      * Note: Here we directly communicate to the document, not through the backend. This is because mapping ranges to footnote marks does not depend on how do we mark or structure those ranges.
      */
-    public List<RangeForOverlapCheck<CitationGroupId>>
-    footnoteMarkRanges(XTextDocument doc, List<RangeForOverlapCheck<CitationGroupId>> citationRanges) {
+    public List<RangeForOverlapCheck<CitationGroupId>> footnoteMarkRanges(
+            XTextDocument doc, List<RangeForOverlapCheck<CitationGroupId>> citationRanges) {
         // We partition by XText and use a single range from
         // each partition to get at the corresponding footnotemark range.
 
@@ -354,38 +326,44 @@ public List<RangeForOverlapCheck<CitationGroupId>> viewCursorRanges(XTextDocumen
 
         // Each partition corresponds to an XText, and each footnote has a single XText.
         // (This latter ignores the possibility of XTextContents inserted into footnotes.)
-        // Also: different footnotes cannot share a footnotemark range, we are not creating duplicates.
+        // Also: different footnotes cannot share a footnotemark range, we are not creating
+        // duplicates.
         for (List<RangeForOverlapCheck<CitationGroupId>> partition : partitions.getPartitions()) {
             if (partition.isEmpty()) {
                 continue;
             }
             RangeForOverlapCheck<CitationGroupId> citationRange = partition.getFirst();
 
-            Optional<XTextRange> footnoteMarkRange = UnoTextRange.getFootnoteMarkRange(citationRange.range);
+            Optional<XTextRange> footnoteMarkRange =
+                    UnoTextRange.getFootnoteMarkRange(citationRange.range);
 
             if (footnoteMarkRange.isEmpty()) {
                 // not in footnote
                 continue;
             }
 
-            result.add(new RangeForOverlapCheck<>(footnoteMarkRange.get(),
-                    citationRange.idWithinKind,
-                    RangeForOverlapCheck.FOOTNOTE_MARK_KIND,
-                    "FootnoteMark for " + citationRange.format()));
+            result.add(
+                    new RangeForOverlapCheck<>(
+                            footnoteMarkRange.get(),
+                            citationRange.idWithinKind,
+                            RangeForOverlapCheck.FOOTNOTE_MARK_KIND,
+                            "FootnoteMark for " + citationRange.format()));
         }
         return result;
     }
 
-    static String rangeOverlapsToMessage(List<RangeOverlap<RangeForOverlapCheck<CitationGroupId>>> overlaps) {
+    static String rangeOverlapsToMessage(
+            List<RangeOverlap<RangeForOverlapCheck<CitationGroupId>>> overlaps) {
         if (overlaps.isEmpty()) {
             return "(*no overlaps*)";
         }
 
         StringBuilder msg = new StringBuilder();
         for (RangeOverlap<RangeForOverlapCheck<CitationGroupId>> overlap : overlaps) {
-            String listOfRanges = overlap.valuesForOverlappingRanges.stream()
-                                                                     .map(v -> "'%s'".formatted(v.format()))
-                                                                     .collect(Collectors.joining(", "));
+            String listOfRanges =
+                    overlap.valuesForOverlappingRanges.stream()
+                            .map(v -> "'%s'".formatted(v.format()))
+                            .collect(Collectors.joining(", "));
             msg.append(
                     switch (overlap.kind) {
                         case EQUAL_RANGE -> Localization.lang("Found identical ranges");
@@ -406,13 +384,11 @@ static String rangeOverlapsToMessage(List<RangeOverlap<RangeForOverlapCheck<Cita
      * <p>
      * Returns on first problem found.
      */
-    public OOVoidResult<JabRefException>
-    checkRangeOverlapsWithCursor(XTextDocument doc,
-                                 List<RangeForOverlapCheck<CitationGroupId>> userRanges,
-                                 boolean requireSeparation)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+    public OOVoidResult<JabRefException> checkRangeOverlapsWithCursor(
+            XTextDocument doc,
+            List<RangeForOverlapCheck<CitationGroupId>> userRanges,
+            boolean requireSeparation)
+            throws NoDocumentException, WrappedTargetException {
 
         List<RangeForOverlapCheck<CitationGroupId>> citationRanges = citationRanges(doc);
         List<RangeForOverlapCheck<CitationGroupId>> ranges = new ArrayList<>();
@@ -423,29 +399,26 @@ static String rangeOverlapsToMessage(List<RangeOverlap<RangeForOverlapCheck<Cita
         ranges.addAll(footnoteMarkRanges(doc, citationRanges));
 
         List<RangeOverlap<RangeForOverlapCheck<CitationGroupId>>> overlaps =
-                RangeOverlapBetween.findFirst(doc,
-                        userRanges,
-                        ranges,
-                        requireSeparation);
+                RangeOverlapBetween.findFirst(doc, userRanges, ranges, requireSeparation);
 
         if (overlaps.isEmpty()) {
             return OOVoidResult.ok();
         }
-        return OOVoidResult.error(new JabRefException("Found overlapping or touching ranges",
-                rangeOverlapsToMessage(overlaps)));
+        return OOVoidResult.error(
+                new JabRefException(
+                        "Found overlapping or touching ranges", rangeOverlapsToMessage(overlaps)));
     }
 
     /**
      * @param requireSeparation Report range pairs that only share a boundary.
      * @param reportAtMost      Limit number of overlaps reported (0 for no limit)
      */
-    public OOVoidResult<JabRefException> checkRangeOverlaps(XTextDocument doc,
-                                                            List<RangeForOverlapCheck<CitationGroupId>> userRanges,
-                                                            boolean requireSeparation,
-                                                            int reportAtMost)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+    public OOVoidResult<JabRefException> checkRangeOverlaps(
+            XTextDocument doc,
+            List<RangeForOverlapCheck<CitationGroupId>> userRanges,
+            boolean requireSeparation,
+            int reportAtMost)
+            throws NoDocumentException, WrappedTargetException {
 
         List<RangeForOverlapCheck<CitationGroupId>> citationRanges = citationRanges(doc);
         List<RangeForOverlapCheck<CitationGroupId>> ranges = new ArrayList<>();
@@ -455,13 +428,15 @@ public OOVoidResult<JabRefException> checkRangeOverlaps(XTextDocument doc,
         ranges.addAll(footnoteMarkRanges(doc, citationRanges));
 
         List<RangeOverlap<RangeForOverlapCheck<CitationGroupId>>> overlaps =
-                RangeOverlapWithin.findOverlappingRanges(doc, ranges, requireSeparation, reportAtMost);
+                RangeOverlapWithin.findOverlappingRanges(
+                        doc, ranges, requireSeparation, reportAtMost);
 
         if (overlaps.isEmpty()) {
             return OOVoidResult.ok();
         }
-        return OOVoidResult.error(new JabRefException("Found overlapping or touching ranges",
-                rangeOverlapsToMessage(overlaps)));
+        return OOVoidResult.error(
+                new JabRefException(
+                        "Found overlapping or touching ranges", rangeOverlapsToMessage(overlaps)));
     }
 
     /**
@@ -482,30 +457,26 @@ public OOVoidResult<JabRefException> checkRangeOverlaps(XTextDocument doc,
      * Wish: selecting an entry (or a button in the line) in the GUI could move the cursor in the document to the entry.
      */
     public List<CitationEntry> getCitationEntries(XTextDocument doc)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
+            throws WrappedTargetException, NoDocumentException {
         return this.backend.getCitationEntries(doc, citationGroups);
     }
 
     public void applyCitationEntries(XTextDocument doc, List<CitationEntry> citationEntries)
-            throws
-            PropertyVetoException,
-            IllegalTypeException,
-            IllegalArgumentException,
-            WrappedTargetException {
+            throws PropertyVetoException,
+                    IllegalTypeException,
+                    IllegalArgumentException,
+                    WrappedTargetException {
         this.backend.applyCitationEntries(doc, citationEntries);
     }
 
     public void imposeGlobalOrder(XTextDocument doc, FunctionalTextViewCursor fcursor)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
+            throws WrappedTargetException, NoDocumentException {
 
         boolean mapFootnotesToFootnoteMarks = true;
         List<CitationGroup> sortedCitationGroups =
                 getVisuallySortedCitationGroups(doc, mapFootnotesToFootnoteMarks, fcursor);
-        List<CitationGroupId> sortedCitationGroupIds = OOListUtil.map(sortedCitationGroups, group -> group.groupId);
+        List<CitationGroupId> sortedCitationGroupIds =
+                OOListUtil.map(sortedCitationGroups, group -> group.groupId);
         citationGroups.setGlobalOrder(sortedCitationGroupIds);
     }
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/frontend/RangeForOverlapCheck.java b/src/main/java/org/jabref/logic/openoffice/frontend/RangeForOverlapCheck.java
index 914195bd2436..33bd4fdfe73f 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/RangeForOverlapCheck.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/RangeForOverlapCheck.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.openoffice.frontend;
 
-import org.jabref.model.openoffice.rangesort.RangeHolder;
-
 import com.sun.star.text.XTextRange;
 
+import org.jabref.model.openoffice.rangesort.RangeHolder;
+
 /**
  * Describe a protected range for overlap checking and reporting.
  * <p>
@@ -13,10 +13,10 @@
  */
 public class RangeForOverlapCheck<T> implements RangeHolder {
 
-    public final static int REFERENCE_MARK_KIND = 0;
-    public final static int FOOTNOTE_MARK_KIND = 1;
-    public final static int CURSOR_MARK_KIND = 2;
-    public final static int BIBLIOGRAPHY_MARK_KIND = 3;
+    public static final int REFERENCE_MARK_KIND = 0;
+    public static final int FOOTNOTE_MARK_KIND = 1;
+    public static final int CURSOR_MARK_KIND = 2;
+    public static final int BIBLIOGRAPHY_MARK_KIND = 3;
 
     public final XTextRange range;
 
diff --git a/src/main/java/org/jabref/logic/openoffice/frontend/UpdateBibliography.java b/src/main/java/org/jabref/logic/openoffice/frontend/UpdateBibliography.java
index c2190e5a44a4..2875fe002f57 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/UpdateBibliography.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/UpdateBibliography.java
@@ -1,7 +1,9 @@
 package org.jabref.logic.openoffice.frontend;
 
-import java.io.IOException;
-import java.util.Optional;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.text.XTextRange;
 
 import org.jabref.logic.openoffice.style.JStyle;
 import org.jabref.logic.openoffice.style.OOFormatBibliography;
@@ -14,46 +16,35 @@
 import org.jabref.model.openoffice.uno.UnoBookmark;
 import org.jabref.model.openoffice.uno.UnoTextSection;
 
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextRange;
+import java.io.IOException;
+import java.util.Optional;
 
 public class UpdateBibliography {
 
     private static final String BIB_SECTION_NAME = "JR_bib";
     private static final String BIB_SECTION_END_NAME = "JR_bib_end";
 
-    private UpdateBibliography() {
-    }
+    private UpdateBibliography() {}
 
     public static Optional<XTextRange> getBibliographyRange(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+            throws NoDocumentException, WrappedTargetException {
         return UnoTextSection.getAnchor(doc, BIB_SECTION_NAME);
     }
 
     /**
      * Rebuilds the bibliography.
      */
-    public static void rebuildBibTextSection(XTextDocument doc,
-                                             OOFrontend frontend,
-                                             CitedKeys bibliography,
-                                             JStyle style,
-                                             boolean alwaysAddCitedOnPages)
-            throws
-            WrappedTargetException,
-            CreationException,
-            NoDocumentException, IOException {
+    public static void rebuildBibTextSection(
+            XTextDocument doc,
+            OOFrontend frontend,
+            CitedKeys bibliography,
+            JStyle style,
+            boolean alwaysAddCitedOnPages)
+            throws WrappedTargetException, CreationException, NoDocumentException, IOException {
 
         clearBibTextSectionContent2(doc);
 
-        populateBibTextSection(doc,
-                frontend,
-                bibliography,
-                style,
-                alwaysAddCitedOnPages);
+        populateBibTextSection(doc, frontend, bibliography, style, alwaysAddCitedOnPages);
     }
 
     /**
@@ -61,15 +52,14 @@ public static void rebuildBibTextSection(XTextDocument doc,
      * <p>
      * Only called from `clearBibTextSectionContent2`
      */
-    private static void createBibTextSection2(XTextDocument doc)
-            throws
-            CreationException {
+    private static void createBibTextSection2(XTextDocument doc) throws CreationException {
 
         // Always creating at the end of the document.
         // Alternatively, we could receive a cursor.
         XTextCursor textCursor = doc.getText().createTextCursor();
         textCursor.gotoEnd(false);
-        DocumentAnnotation annotation = new DocumentAnnotation(doc, BIB_SECTION_NAME, textCursor, false);
+        DocumentAnnotation annotation =
+                new DocumentAnnotation(doc, BIB_SECTION_NAME, textCursor, false);
         UnoTextSection.create(annotation);
     }
 
@@ -79,10 +69,7 @@ private static void createBibTextSection2(XTextDocument doc)
      * Only called from: `rebuildBibTextSection`
      */
     private static void clearBibTextSectionContent2(XTextDocument doc)
-            throws
-            CreationException,
-            NoDocumentException,
-            WrappedTargetException {
+            throws CreationException, NoDocumentException, WrappedTargetException {
 
         // Optional<XTextRange> sectionRange = UnoTextSection.getAnchor(doc, BIB_SECTION_NAME);
         Optional<XTextRange> sectionRange = getBibliographyRange(doc);
@@ -100,16 +87,17 @@ private static void clearBibTextSectionContent2(XTextDocument doc)
      * <p>
      * Assumes the section named BIB_SECTION_NAME exists.
      */
-    private static void populateBibTextSection(XTextDocument doc,
-                                               OOFrontend frontend,
-                                               CitedKeys bibliography,
-                                               JStyle style,
-                                               boolean alwaysAddCitedOnPages)
-            throws
-            CreationException,
-            IllegalArgumentException,
-            NoDocumentException,
-            WrappedTargetException, IOException {
+    private static void populateBibTextSection(
+            XTextDocument doc,
+            OOFrontend frontend,
+            CitedKeys bibliography,
+            JStyle style,
+            boolean alwaysAddCitedOnPages)
+            throws CreationException,
+                    IllegalArgumentException,
+                    NoDocumentException,
+                    WrappedTargetException,
+                    IOException {
 
         XTextRange sectionRange = getBibliographyRange(doc).orElseThrow(IllegalStateException::new);
 
@@ -117,10 +105,9 @@ private static void populateBibTextSection(XTextDocument doc,
 
         // emit the title of the bibliography
         OOTextIntoOO.removeDirectFormatting(cursor);
-        OOText bibliographyText = OOFormatBibliography.formatBibliography(frontend.citationGroups,
-                bibliography,
-                style,
-                alwaysAddCitedOnPages);
+        OOText bibliographyText =
+                OOFormatBibliography.formatBibliography(
+                        frontend.citationGroups, bibliography, style, alwaysAddCitedOnPages);
         OOTextIntoOO.write(doc, cursor, bibliographyText);
         cursor.collapseToEnd();
 
@@ -132,7 +119,8 @@ private static void populateBibTextSection(XTextDocument doc,
         initialParagraph.setString("");
 
         UnoBookmark.removeIfExists(doc, BIB_SECTION_END_NAME);
-        DocumentAnnotation documentAnnotation = new DocumentAnnotation(doc, BIB_SECTION_END_NAME, cursor, true);
+        DocumentAnnotation documentAnnotation =
+                new DocumentAnnotation(doc, BIB_SECTION_END_NAME, cursor, true);
         UnoBookmark.create(documentAnnotation);
 
         cursor.collapseToEnd();
diff --git a/src/main/java/org/jabref/logic/openoffice/frontend/UpdateCitationMarkers.java b/src/main/java/org/jabref/logic/openoffice/frontend/UpdateCitationMarkers.java
index 1ed8747bc3cb..2a7dd941b1f9 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/UpdateCitationMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/UpdateCitationMarkers.java
@@ -1,8 +1,11 @@
 package org.jabref.logic.openoffice.frontend;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import com.sun.star.beans.IllegalTypeException;
+import com.sun.star.beans.NotRemoveableException;
+import com.sun.star.beans.PropertyVetoException;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextDocument;
 
 import org.jabref.logic.openoffice.style.JStyle;
 import org.jabref.model.openoffice.ootext.OOText;
@@ -12,22 +15,18 @@
 import org.jabref.model.openoffice.style.CitationType;
 import org.jabref.model.openoffice.uno.CreationException;
 import org.jabref.model.openoffice.uno.NoDocumentException;
-
-import com.sun.star.beans.IllegalTypeException;
-import com.sun.star.beans.NotRemoveableException;
-import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 public class UpdateCitationMarkers {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(UpdateCitationMarkers.class);
 
-    private UpdateCitationMarkers() {
-    }
+    private UpdateCitationMarkers() {}
 
     /**
      * Visit each reference mark in referenceMarkNames, overwrite its text content.
@@ -37,10 +36,7 @@ private UpdateCitationMarkers() {
      * @param style    Bibliography style to use.
      */
     public static void applyNewCitationMarkers(XTextDocument doc, OOFrontend frontend, JStyle style)
-            throws
-            NoDocumentException,
-            CreationException,
-            WrappedTargetException {
+            throws NoDocumentException, CreationException, WrappedTargetException {
 
         CitationGroups citationGroups = frontend.citationGroups;
 
@@ -49,7 +45,8 @@ public static void applyNewCitationMarkers(XTextDocument doc, OOFrontend fronten
             Optional<OOText> marker = group.getCitationMarker();
 
             if (marker.isEmpty()) {
-                LOGGER.warn("applyNewCitationMarkers: no marker for {}",
+                LOGGER.warn(
+                        "applyNewCitationMarkers: no marker for {}",
                         group.groupId.citationGroupIdAsString());
                 continue;
             }
@@ -62,15 +59,13 @@ public static void applyNewCitationMarkers(XTextDocument doc, OOFrontend fronten
         }
     }
 
-    public static void fillCitationMarkInCursor(XTextDocument doc,
-                                                XTextCursor cursor,
-                                                OOText citationText,
-                                                boolean withText,
-                                                JStyle style)
-            throws
-            WrappedTargetException,
-            CreationException,
-            IllegalArgumentException {
+    public static void fillCitationMarkInCursor(
+            XTextDocument doc,
+            XTextCursor cursor,
+            OOText citationText,
+            boolean withText,
+            JStyle style)
+            throws WrappedTargetException, CreationException, IllegalArgumentException {
 
         Objects.requireNonNull(cursor);
         Objects.requireNonNull(citationText);
@@ -80,8 +75,8 @@ public static void fillCitationMarkInCursor(XTextDocument doc,
             OOText citationText2 = style.decorateCitationMarker(citationText);
             String ZERO_WIDTH_SPACE = "";
             if (style.spaceBeforeCitation()) {
-              // inject a ZERO_WIDTH_SPACE to hold the initial character format
-              ZERO_WIDTH_SPACE = "\u200b";
+                // inject a ZERO_WIDTH_SPACE to hold the initial character format
+                ZERO_WIDTH_SPACE = "\u200b";
             }
             citationText2 = OOText.fromString(ZERO_WIDTH_SPACE + citationText2.toString());
             OOTextIntoOO.write(doc, cursor, citationText2);
@@ -98,41 +93,39 @@ public static void fillCitationMarkInCursor(XTextDocument doc,
      * @param position         Location to insert at.
      * @param insertSpaceAfter A space inserted after the reference mark makes it easier to separate from the text coming after. But is not wanted when we recreate a reference mark.
      */
-    public static void createAndFillCitationGroup(OOFrontend frontend,
-                                                  XTextDocument doc,
-                                                  List<String> citationKeys,
-                                                  List<Optional<OOText>> pageInfos,
-                                                  CitationType citationType,
-                                                  OOText citationText,
-                                                  XTextCursor position,
-                                                  JStyle style,
-                                                  boolean insertSpaceAfter)
-            throws
-            NotRemoveableException,
-            WrappedTargetException,
-            PropertyVetoException,
-            IllegalArgumentException,
-            CreationException,
-            NoDocumentException,
-            IllegalTypeException {
+    public static void createAndFillCitationGroup(
+            OOFrontend frontend,
+            XTextDocument doc,
+            List<String> citationKeys,
+            List<Optional<OOText>> pageInfos,
+            CitationType citationType,
+            OOText citationText,
+            XTextCursor position,
+            JStyle style,
+            boolean insertSpaceAfter)
+            throws NotRemoveableException,
+                    WrappedTargetException,
+                    PropertyVetoException,
+                    IllegalArgumentException,
+                    CreationException,
+                    NoDocumentException,
+                    IllegalTypeException {
 
         Objects.requireNonNull(pageInfos);
         if (pageInfos.size() != citationKeys.size()) {
             throw new IllegalArgumentException("pageInfos.size != citationKeys.size");
         }
-        CitationGroup group = frontend.createCitationGroup(doc,
-                citationKeys,
-                pageInfos,
-                citationType,
-                position,
-                insertSpaceAfter);
+        CitationGroup group =
+                frontend.createCitationGroup(
+                        doc, citationKeys, pageInfos, citationType, position, insertSpaceAfter);
 
         final boolean withText = citationType.withText();
 
         if (withText) {
             XTextCursor fillCursor = frontend.getFillCursorForCitationGroup(doc, group);
 
-            UpdateCitationMarkers.fillCitationMarkInCursor(doc, fillCursor, citationText, withText, style);
+            UpdateCitationMarkers.fillCitationMarkInCursor(
+                    doc, fillCursor, citationText, withText, style);
 
             frontend.cleanFillCursorForCitationGroup(doc, group);
         }
diff --git a/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLCitationOOAdapter.java b/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLCitationOOAdapter.java
index 865806947f31..3ed037e062e3 100644
--- a/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLCitationOOAdapter.java
+++ b/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLCitationOOAdapter.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.openoffice.oocsltext;
 
-import java.io.IOException;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import com.sun.star.container.NoSuchElementException;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.uno.Exception;
 
 import org.jabref.logic.citationkeypattern.BracketedPattern;
 import org.jabref.logic.citationstyle.CitationStyle;
@@ -20,11 +19,12 @@
 import org.jabref.model.openoffice.ootext.OOTextIntoOO;
 import org.jabref.model.openoffice.uno.CreationException;
 
-import com.sun.star.container.NoSuchElementException;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.uno.Exception;
+import java.io.IOException;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * This class processes CSL citations in JabRef and interacts directly with LibreOffice using an XTextDocument instance.
@@ -49,16 +49,29 @@ public void readAndUpdateExistingMarks() throws WrappedTargetException, NoSuchEl
      * Inserts a citation for a group of entries.
      * Comparable to LaTeX's \cite command.
      */
-    public void insertCitation(XTextCursor cursor, CitationStyle selectedStyle, List<BibEntry> entries, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager bibEntryTypesManager)
+    public void insertCitation(
+            XTextCursor cursor,
+            CitationStyle selectedStyle,
+            List<BibEntry> entries,
+            BibDatabaseContext bibDatabaseContext,
+            BibEntryTypesManager bibEntryTypesManager)
             throws CreationException, IOException, Exception {
         String style = selectedStyle.getSource();
         boolean isAlphanumeric = isAlphanumericStyle(selectedStyle);
 
         String inTextCitation;
         if (isAlphanumeric) {
-            inTextCitation = CSLFormatUtils.generateAlphanumericCitation(entries, bibDatabaseContext);
+            inTextCitation =
+                    CSLFormatUtils.generateAlphanumericCitation(entries, bibDatabaseContext);
         } else {
-            inTextCitation = CitationStyleGenerator.generateCitation(entries, style, CSLFormatUtils.OUTPUT_FORMAT, bibDatabaseContext, bibEntryTypesManager).getText();
+            inTextCitation =
+                    CitationStyleGenerator.generateCitation(
+                                    entries,
+                                    style,
+                                    CSLFormatUtils.OUTPUT_FORMAT,
+                                    bibDatabaseContext,
+                                    bibEntryTypesManager)
+                            .getText();
         }
 
         String formattedCitation = CSLFormatUtils.transformHTML(inTextCitation);
@@ -78,7 +91,12 @@ public void insertCitation(XTextCursor cursor, CitationStyle selectedStyle, List
      *
      * @implNote Very similar to the {@link #insertCitation(XTextCursor, CitationStyle, List, BibDatabaseContext, BibEntryTypesManager)} method.insertInText method
      */
-    public void insertInTextCitation(XTextCursor cursor, CitationStyle selectedStyle, List<BibEntry> entries, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager bibEntryTypesManager)
+    public void insertInTextCitation(
+            XTextCursor cursor,
+            CitationStyle selectedStyle,
+            List<BibEntry> entries,
+            BibDatabaseContext bibDatabaseContext,
+            BibEntryTypesManager bibEntryTypesManager)
             throws IOException, CreationException, Exception {
         String style = selectedStyle.getSource();
         boolean isAlphanumeric = isAlphanumericStyle(selectedStyle);
@@ -89,25 +107,49 @@ public void insertInTextCitation(XTextCursor cursor, CitationStyle selectedStyle
             String inTextCitation;
             if (isAlphanumeric) {
                 // Generate the alphanumeric citation
-                inTextCitation = CSLFormatUtils.generateAlphanumericCitation(List.of(currentEntry), bibDatabaseContext);
+                inTextCitation =
+                        CSLFormatUtils.generateAlphanumericCitation(
+                                List.of(currentEntry), bibDatabaseContext);
                 // Get the author's name
-                String authorName = currentEntry.getResolvedFieldOrAlias(StandardField.AUTHOR, bibDatabaseContext.getDatabase())
-                                                .map(AuthorList::parse)
-                                                .map(list -> BracketedPattern.joinAuthorsOnLastName(list, 1, "", " et al."))
-                                                .orElse("");
+                String authorName =
+                        currentEntry
+                                .getResolvedFieldOrAlias(
+                                        StandardField.AUTHOR, bibDatabaseContext.getDatabase())
+                                .map(AuthorList::parse)
+                                .map(
+                                        list ->
+                                                BracketedPattern.joinAuthorsOnLastName(
+                                                        list, 1, "", " et al."))
+                                .orElse("");
                 // Combine author name with the citation
                 inTextCitation = authorName + " " + inTextCitation;
             } else {
-                inTextCitation = CitationStyleGenerator.generateCitation(List.of(currentEntry), style, CSLFormatUtils.OUTPUT_FORMAT, bibDatabaseContext, bibEntryTypesManager).getText();
+                inTextCitation =
+                        CitationStyleGenerator.generateCitation(
+                                        List.of(currentEntry),
+                                        style,
+                                        CSLFormatUtils.OUTPUT_FORMAT,
+                                        bibDatabaseContext,
+                                        bibEntryTypesManager)
+                                .getText();
             }
             String formattedCitation = CSLFormatUtils.transformHTML(inTextCitation);
             String finalText;
             if (selectedStyle.isNumericStyle()) {
-                formattedCitation = updateSingleOrMultipleCitationNumbers(formattedCitation, List.of(currentEntry));
-                String prefix = currentEntry.getResolvedFieldOrAlias(StandardField.AUTHOR, bibDatabaseContext.getDatabase())
-                                            .map(AuthorList::parse)
-                                            .map(list -> BracketedPattern.joinAuthorsOnLastName(list, 1, "", " et al.") + " ")
-                                            .orElse("");
+                formattedCitation =
+                        updateSingleOrMultipleCitationNumbers(
+                                formattedCitation, List.of(currentEntry));
+                String prefix =
+                        currentEntry
+                                .getResolvedFieldOrAlias(
+                                        StandardField.AUTHOR, bibDatabaseContext.getDatabase())
+                                .map(AuthorList::parse)
+                                .map(
+                                        list ->
+                                                BracketedPattern.joinAuthorsOnLastName(
+                                                                list, 1, "", " et al.")
+                                                        + " ")
+                                .orElse("");
                 finalText = prefix + formattedCitation;
             } else if (isAlphanumeric) {
                 finalText = formattedCitation;
@@ -132,7 +174,8 @@ public void insertEmpty(XTextCursor cursor, CitationStyle selectedStyle, List<Bi
         OOText emptyOOText = OOFormat.setLocaleNone(OOText.fromString(""));
         insertReferences(cursor, entries, emptyOOText, selectedStyle.isNumericStyle());
 
-        // Move the cursor to the end of the inserted text - although no need as we don't insert any text, but a good practice
+        // Move the cursor to the end of the inserted text - although no need as we don't insert any
+        // text, but a good practice
         cursor.collapseToEnd();
     }
 
@@ -140,40 +183,70 @@ public void insertEmpty(XTextCursor cursor, CitationStyle selectedStyle, List<Bi
      * Creates a "Bibliography" section in the document and inserts a list of references.
      * The list is generated based on the existing citations, in-text citations and empty citations in the document.
      */
-    public void insertBibliography(XTextCursor cursor, CitationStyle selectedStyle, List<BibEntry> entries, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager bibEntryTypesManager)
+    public void insertBibliography(
+            XTextCursor cursor,
+            CitationStyle selectedStyle,
+            List<BibEntry> entries,
+            BibDatabaseContext bibDatabaseContext,
+            BibEntryTypesManager bibEntryTypesManager)
             throws WrappedTargetException, CreationException, NoSuchElementException {
         markManager.setUpdateRequired(selectedStyle.isNumericStyle());
         readAndUpdateExistingMarks();
 
-        OOText title = OOFormat.paragraph(OOText.fromString(CSLFormatUtils.DEFAULT_BIBLIOGRAPHY_TITLE), CSLFormatUtils.DEFAULT_BIBLIOGRAPHY_HEADER_PARAGRAPH_FORMAT);
+        OOText title =
+                OOFormat.paragraph(
+                        OOText.fromString(CSLFormatUtils.DEFAULT_BIBLIOGRAPHY_TITLE),
+                        CSLFormatUtils.DEFAULT_BIBLIOGRAPHY_HEADER_PARAGRAPH_FORMAT);
         OOTextIntoOO.write(document, cursor, OOText.fromString(title.toString()));
-        OOText ooBreak = OOFormat.paragraph(OOText.fromString(""), CSLFormatUtils.DEFAULT_BIBLIOGRAPHY_BODY_PARAGRAPH_FORMAT);
+        OOText ooBreak =
+                OOFormat.paragraph(
+                        OOText.fromString(""),
+                        CSLFormatUtils.DEFAULT_BIBLIOGRAPHY_BODY_PARAGRAPH_FORMAT);
         OOTextIntoOO.write(document, cursor, ooBreak);
 
         String style = selectedStyle.getSource();
 
         if (selectedStyle.isNumericStyle()) {
             // Sort entries based on their order of appearance in the document
-            entries.sort(Comparator.comparingInt(entry -> markManager.getCitationNumber(entry.getCitationKey().orElse(""))));
+            entries.sort(
+                    Comparator.comparingInt(
+                            entry ->
+                                    markManager.getCitationNumber(
+                                            entry.getCitationKey().orElse(""))));
 
             for (BibEntry entry : entries) {
-                String citation = CitationStyleGenerator.generateBibliography(List.of(entry), style, CSLFormatUtils.OUTPUT_FORMAT, bibDatabaseContext, bibEntryTypesManager).getFirst();
+                String citation =
+                        CitationStyleGenerator.generateBibliography(
+                                        List.of(entry),
+                                        style,
+                                        CSLFormatUtils.OUTPUT_FORMAT,
+                                        bibDatabaseContext,
+                                        bibEntryTypesManager)
+                                .getFirst();
                 String citationKey = entry.getCitationKey().orElse("");
                 int currentNumber = markManager.getCitationNumber(citationKey);
 
-                String formattedCitation = CSLFormatUtils.updateSingleBibliographyNumber(CSLFormatUtils.transformHTML(citation), currentNumber);
+                String formattedCitation =
+                        CSLFormatUtils.updateSingleBibliographyNumber(
+                                CSLFormatUtils.transformHTML(citation), currentNumber);
                 OOText ooText = OOFormat.setLocaleNone(OOText.fromString(formattedCitation));
 
                 OOTextIntoOO.write(document, cursor, ooText);
-                    // Select the paragraph break
-                    cursor.goLeft((short) 1, true);
+                // Select the paragraph break
+                cursor.goLeft((short) 1, true);
 
-                    // Delete the selected content (paragraph break)
-                    cursor.setString("");
+                // Delete the selected content (paragraph break)
+                cursor.setString("");
             }
         } else {
             // Ordering will be according to citeproc item data provider (default)
-            List<String> citations = CitationStyleGenerator.generateBibliography(entries, style, CSLFormatUtils.OUTPUT_FORMAT, bibDatabaseContext, bibEntryTypesManager);
+            List<String> citations =
+                    CitationStyleGenerator.generateBibliography(
+                            entries,
+                            style,
+                            CSLFormatUtils.OUTPUT_FORMAT,
+                            bibDatabaseContext,
+                            bibEntryTypesManager);
 
             for (String citation : citations) {
                 String formattedCitation = CSLFormatUtils.transformHTML(citation);
@@ -187,12 +260,14 @@ public void insertBibliography(XTextCursor cursor, CitationStyle selectedStyle,
     /**
      * Inserts references and also adds a space before the citation if not already present ("smart space").
      */
-    private void insertReferences(XTextCursor cursor, List<BibEntry> entries, OOText ooText, boolean isNumericStyle)
+    private void insertReferences(
+            XTextCursor cursor, List<BibEntry> entries, OOText ooText, boolean isNumericStyle)
             throws CreationException, Exception {
         boolean preceedingSpaceExists;
         XTextCursor checkCursor = cursor.getText().createTextCursorByRange(cursor.getStart());
 
-        // Check if we're at the start of the document - if yes we set the flag and don't insert a space
+        // Check if we're at the start of the document - if yes we set the flag and don't insert a
+        // space
         if (!checkCursor.goLeft((short) 1, true)) {
             // We're at the start of the document
             preceedingSpaceExists = true;
@@ -229,9 +304,11 @@ private String updateSingleOrMultipleCitationNumbers(String citation, List<BibEn
             String prefix = matcher.group(1);
             String suffix = matcher.group(3);
 
-            int currentNumber = markManager.getCitationNumber(iterator.next().getCitationKey().orElse(""));
+            int currentNumber =
+                    markManager.getCitationNumber(iterator.next().getCitationKey().orElse(""));
 
-            matcher.appendReplacement(sb, Matcher.quoteReplacement(prefix + currentNumber + suffix));
+            matcher.appendReplacement(
+                    sb, Matcher.quoteReplacement(prefix + currentNumber + suffix));
         }
         matcher.appendTail(sb);
         return sb.toString();
@@ -252,6 +329,7 @@ public boolean isCitedEntry(BibEntry entry) {
      * Thus, we currently hardcode the check for "DIN 1505-2".
      */
     private boolean isAlphanumericStyle(CitationStyle style) {
-        return "DIN 1505-2 (alphanumeric, Deutsch) - standard superseded by ISO-690".equals(style.getTitle());
+        return "DIN 1505-2 (alphanumeric, Deutsch) - standard superseded by ISO-690"
+                .equals(style.getTitle());
     }
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtils.java b/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtils.java
index 1ac64172287f..1dcd0c903a09 100644
--- a/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtils.java
+++ b/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtils.java
@@ -1,10 +1,9 @@
 package org.jabref.logic.openoffice.oocsltext;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextDocument;
 
+import org.apache.commons.text.StringEscapeUtils;
 import org.jabref.logic.citationkeypattern.BracketedPattern;
 import org.jabref.logic.citationstyle.CitationStyleOutputFormat;
 import org.jabref.model.database.BibDatabaseContext;
@@ -15,9 +14,10 @@
 import org.jabref.model.openoffice.ootext.OOText;
 import org.jabref.model.openoffice.ootext.OOTextIntoOO;
 
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
-import org.apache.commons.text.StringEscapeUtils;
+import java.util.List;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Contains utility constants and methods for processing of CSL citations as generated by methods of <a href="https://github.com/michel-kraemer/citeproc-java">citeproc-java</a> ({@link org.jabref.logic.citationstyle.CitationStyleGenerator}).
@@ -25,7 +25,8 @@
  */
 public class CSLFormatUtils {
 
-    // TODO: These are static final fields right now, should add the functionality to let user select these and store them in preferences.
+    // TODO: These are static final fields right now, should add the functionality to let user
+    // select these and store them in preferences.
     public static final String DEFAULT_BIBLIOGRAPHY_TITLE = "References";
     public static final String DEFAULT_BIBLIOGRAPHY_HEADER_PARAGRAPH_FORMAT = "Heading 2";
 
@@ -48,7 +49,10 @@ public static String transformHTML(String html) {
         html = StringEscapeUtils.unescapeHtml4(html);
 
         // Handle margins (spaces between citation number and text)
-        html = html.replaceAll("<div class=\"csl-left-margin\">(.*?)</div><div class=\"csl-right-inline\">(.*?)</div>", "$1 $2");
+        html =
+                html.replaceAll(
+                        "<div class=\"csl-left-margin\">(.*?)</div><div class=\"csl-right-inline\">(.*?)</div>",
+                        "$1 $2");
 
         // Remove unsupported tags
         html = html.replaceAll("<div[^>]*>", "");
@@ -65,9 +69,14 @@ public static String transformHTML(String html) {
         html = html.replaceAll("<span style=\"font-style: ?italic;?\">(.*?)</span>", "<i>$1</i>");
 
         // Replace span tags with inline styles for underline
-        html = html.replaceAll("<span style=\"text-decoration: ?underline;?\">(.*?)</span>", "<u>$1</u>");
+        html =
+                html.replaceAll(
+                        "<span style=\"text-decoration: ?underline;?\">(.*?)</span>", "<u>$1</u>");
 
-        html = html.replaceAll("<span style=\"font-variant: ?small-caps;?\">(.*?)</span>", "<smallcaps>$1</smallcaps>");
+        html =
+                html.replaceAll(
+                        "<span style=\"font-variant: ?small-caps;?\">(.*?)</span>",
+                        "<smallcaps>$1</smallcaps>");
 
         // Clean up any remaining span tags
         html = html.replaceAll("</?span[^>]*>", "");
@@ -82,21 +91,27 @@ public static String transformHTML(String html) {
      * @param entries the list of entries for which the alphanumeric citation is to be generated.
      * @return the alphanumeric citation (for a single entry or a group of entries).
      */
-    public static String generateAlphanumericCitation(List<BibEntry> entries, BibDatabaseContext bibDatabaseContext) {
+    public static String generateAlphanumericCitation(
+            List<BibEntry> entries, BibDatabaseContext bibDatabaseContext) {
         StringBuilder citation = new StringBuilder("[");
         for (int i = 0; i < entries.size(); i++) {
             BibEntry entry = entries.get(i);
-            Optional<String> author = entry.getResolvedFieldOrAlias(StandardField.AUTHOR, bibDatabaseContext.getDatabase());
-            Optional<String> year = entry.getResolvedFieldOrAlias(StandardField.YEAR, bibDatabaseContext.getDatabase());
+            Optional<String> author =
+                    entry.getResolvedFieldOrAlias(
+                            StandardField.AUTHOR, bibDatabaseContext.getDatabase());
+            Optional<String> year =
+                    entry.getResolvedFieldOrAlias(
+                            StandardField.YEAR, bibDatabaseContext.getDatabase());
 
             if (author.isPresent() && year.isPresent()) {
                 AuthorList authorList = AuthorList.parse(author.get());
                 String alphaKey = BracketedPattern.authorsAlpha(authorList);
 
                 // Extract last two digits of the year
-                String shortYear = year.get().length() >= 2 ?
-                        year.get().substring(year.get().length() - 2) :
-                        year.get();
+                String shortYear =
+                        year.get().length() >= 2
+                                ? year.get().substring(year.get().length() - 2)
+                                : year.get();
 
                 citation.append(alphaKey).append(shortYear);
             } else {
diff --git a/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLReferenceMark.java b/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLReferenceMark.java
index 85df85be9876..f9729767a755 100644
--- a/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLReferenceMark.java
+++ b/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLReferenceMark.java
@@ -1,13 +1,6 @@
 package org.jabref.logic.openoffice.oocsltext;
 
-import java.util.List;
-
-import org.jabref.logic.openoffice.ReferenceMark;
-import org.jabref.model.openoffice.DocumentAnnotation;
-import org.jabref.model.openoffice.ootext.OOText;
-import org.jabref.model.openoffice.ootext.OOTextIntoOO;
-import org.jabref.model.openoffice.uno.CreationException;
-import org.jabref.model.openoffice.uno.UnoReferenceMark;
+import static org.jabref.logic.openoffice.backend.NamedRangeReferenceMark.safeInsertSpacesBetweenReferenceMarks;
 
 import com.sun.star.container.XNamed;
 import com.sun.star.lang.WrappedTargetException;
@@ -18,9 +11,17 @@
 import com.sun.star.text.XTextRange;
 import com.sun.star.uno.Exception;
 import com.sun.star.uno.UnoRuntime;
+
 import io.github.thibaultmeyer.cuid.CUID;
 
-import static org.jabref.logic.openoffice.backend.NamedRangeReferenceMark.safeInsertSpacesBetweenReferenceMarks;
+import org.jabref.logic.openoffice.ReferenceMark;
+import org.jabref.model.openoffice.DocumentAnnotation;
+import org.jabref.model.openoffice.ootext.OOText;
+import org.jabref.model.openoffice.ootext.OOTextIntoOO;
+import org.jabref.model.openoffice.uno.CreationException;
+import org.jabref.model.openoffice.uno.UnoReferenceMark;
+
+import java.util.List;
 
 /**
  * Class to handle a reference mark. See {@link CSLReferenceMarkManager} for the management of all reference marks.
@@ -38,23 +39,33 @@ public CSLReferenceMark(XNamed named, ReferenceMark referenceMark) {
         this.citationNumbers = referenceMark.getCitationNumbers();
     }
 
-    public static CSLReferenceMark of(List<String> citationKeys, List<Integer> citationNumbers, XMultiServiceFactory factory) throws Exception {
+    public static CSLReferenceMark of(
+            List<String> citationKeys, List<Integer> citationNumbers, XMultiServiceFactory factory)
+            throws Exception {
         String uniqueId = CUID.randomCUID2(8).toString();
         String name = buildReferenceName(citationKeys, citationNumbers, uniqueId);
-        XNamed named = UnoRuntime.queryInterface(XNamed.class, factory.createInstance("com.sun.star.text.ReferenceMark"));
+        XNamed named =
+                UnoRuntime.queryInterface(
+                        XNamed.class, factory.createInstance("com.sun.star.text.ReferenceMark"));
         named.setName(name);
-        ReferenceMark referenceMark = new ReferenceMark(name, citationKeys, citationNumbers, uniqueId);
+        ReferenceMark referenceMark =
+                new ReferenceMark(name, citationKeys, citationNumbers, uniqueId);
         return new CSLReferenceMark(named, referenceMark);
     }
 
-    private static String buildReferenceName(List<String> citationKeys, List<Integer> citationNumbers, String uniqueId) {
+    private static String buildReferenceName(
+            List<String> citationKeys, List<Integer> citationNumbers, String uniqueId) {
         StringBuilder nameBuilder = new StringBuilder();
         for (int i = 0; i < citationKeys.size(); i++) {
             if (i > 0) {
                 nameBuilder.append(", ");
             }
-            nameBuilder.append(ReferenceMark.PREFIXES[0]).append(citationKeys.get(i))
-                       .append(" ").append(ReferenceMark.PREFIXES[1]).append(citationNumbers.get(i));
+            nameBuilder
+                    .append(ReferenceMark.PREFIXES[0])
+                    .append(citationKeys.get(i))
+                    .append(" ")
+                    .append(ReferenceMark.PREFIXES[1])
+                    .append(citationNumbers.get(i));
         }
         nameBuilder.append(" ").append(uniqueId);
         return nameBuilder.toString();
@@ -76,7 +87,12 @@ public String getName() {
         return referenceMark.getName();
     }
 
-    public void insertReferenceIntoOO(XTextDocument doc, XTextCursor position, OOText ooText, boolean insertSpaceBefore, boolean insertSpaceAfter)
+    public void insertReferenceIntoOO(
+            XTextDocument doc,
+            XTextCursor position,
+            OOText ooText,
+            boolean insertSpaceBefore,
+            boolean insertSpaceAfter)
             throws CreationException, WrappedTargetException {
         // Ensure the cursor is at the end of its range
         position.collapseToEnd();
@@ -106,7 +122,8 @@ public void insertReferenceIntoOO(XTextDocument doc, XTextCursor position, OOTex
         cursor.gotoRange(endRange, true);
 
         // Create DocumentAnnotation and attach it
-        DocumentAnnotation documentAnnotation = new DocumentAnnotation(doc, referenceMark.getName(), cursor, true);
+        DocumentAnnotation documentAnnotation =
+                new DocumentAnnotation(doc, referenceMark.getName(), cursor, true);
         UnoReferenceMark.create(documentAnnotation);
 
         // Move cursor to the end of the inserted content
@@ -131,6 +148,11 @@ public void updateTextContent(XTextContent newTextContent) {
     }
 
     public void updateName(String newName) {
-        this.referenceMark = new ReferenceMark(newName, this.citationKeys, this.citationNumbers, this.referenceMark.getUniqueId());
+        this.referenceMark =
+                new ReferenceMark(
+                        newName,
+                        this.citationKeys,
+                        this.citationNumbers,
+                        this.referenceMark.getUniqueId());
     }
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLReferenceMarkManager.java b/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLReferenceMarkManager.java
index 408851d322d2..6a5ea3e3f650 100644
--- a/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLReferenceMarkManager.java
+++ b/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLReferenceMarkManager.java
@@ -1,16 +1,5 @@
 package org.jabref.logic.openoffice.oocsltext;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import org.jabref.logic.openoffice.ReferenceMark;
-import org.jabref.model.entry.BibEntry;
-
 import com.sun.star.container.NoSuchElementException;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNamed;
@@ -26,10 +15,22 @@
 import com.sun.star.text.XTextRangeCompare;
 import com.sun.star.uno.Exception;
 import com.sun.star.uno.UnoRuntime;
+
 import io.github.thibaultmeyer.cuid.CUID;
+
+import org.jabref.logic.openoffice.ReferenceMark;
+import org.jabref.model.entry.BibEntry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 public class CSLReferenceMarkManager {
     private static final Logger LOGGER = LoggerFactory.getLogger(CSLReferenceMarkManager.class);
 
@@ -45,20 +46,22 @@ public class CSLReferenceMarkManager {
     public CSLReferenceMarkManager(XTextDocument document) {
         this.document = document;
         this.factory = UnoRuntime.queryInterface(XMultiServiceFactory.class, document);
-        this.textRangeCompare = UnoRuntime.queryInterface(XTextRangeCompare.class, document.getText());
+        this.textRangeCompare =
+                UnoRuntime.queryInterface(XTextRangeCompare.class, document.getText());
         this.isUpdateRequired = false;
     }
 
     public CSLReferenceMark createReferenceMark(List<BibEntry> entries) throws Exception {
-        List<String> citationKeys = entries.stream()
-                                           .map(entry -> entry.getCitationKey().orElse(CUID.randomCUID2(8).toString()))
-                                           .collect(Collectors.toList());
+        List<String> citationKeys =
+                entries.stream()
+                        .map(entry -> entry.getCitationKey().orElse(CUID.randomCUID2(8).toString()))
+                        .collect(Collectors.toList());
 
-        List<Integer> citationNumbers = citationKeys.stream()
-                                                    .map(this::getCitationNumber)
-                                                    .collect(Collectors.toList());
+        List<Integer> citationNumbers =
+                citationKeys.stream().map(this::getCitationNumber).collect(Collectors.toList());
 
-        CSLReferenceMark referenceMark = CSLReferenceMark.of(citationKeys, citationNumbers, factory);
+        CSLReferenceMark referenceMark =
+                CSLReferenceMark.of(citationKeys, citationNumbers, factory);
         marksByName.put(referenceMark.getName(), referenceMark);
         marksInOrder.add(referenceMark);
         return referenceMark;
@@ -97,7 +100,10 @@ public void updateAllCitationNumbers() throws Exception {
     }
 
     private void sortMarksInOrder() {
-        marksInOrder.sort((m1, m2) -> compareTextRanges(m2.getTextContent().getAnchor(), m1.getTextContent().getAnchor()));
+        marksInOrder.sort(
+                (m1, m2) ->
+                        compareTextRanges(
+                                m2.getTextContent().getAnchor(), m1.getTextContent().getAnchor()));
     }
 
     private int compareTextRanges(XTextRange r1, XTextRange r2) {
@@ -109,7 +115,8 @@ private int compareTextRanges(XTextRange r1, XTextRange r2) {
         }
     }
 
-    private void updateMarkAndText(CSLReferenceMark mark, List<Integer> newNumbers) throws Exception {
+    private void updateMarkAndText(CSLReferenceMark mark, List<Integer> newNumbers)
+            throws Exception {
         XTextContent oldContent = mark.getTextContent();
         XTextRange range = oldContent.getAnchor();
 
@@ -125,7 +132,8 @@ private void updateMarkAndText(CSLReferenceMark mark, List<Integer> newNumbers)
             // Update the citation numbers in the text
             String updatedText = updateCitationText(currentText, newNumbers);
 
-            // Remove the old reference mark without removing the text (The only way to edit a reference mark is to remove it and add a new one)
+            // Remove the old reference mark without removing the text (The only way to edit a
+            // reference mark is to remove it and add a new one)
             text.removeTextContent(oldContent);
 
             // Update the text
@@ -133,8 +141,10 @@ private void updateMarkAndText(CSLReferenceMark mark, List<Integer> newNumbers)
 
             // Create a new reference mark with updated name
             String updatedName = updateReferenceName(mark.getName(), newNumbers);
-            XNamed newNamed = UnoRuntime.queryInterface(XNamed.class,
-                    factory.createInstance("com.sun.star.text.ReferenceMark"));
+            XNamed newNamed =
+                    UnoRuntime.queryInterface(
+                            XNamed.class,
+                            factory.createInstance("com.sun.star.text.ReferenceMark"));
             newNamed.setName(updatedName);
             XTextContent newContent = UnoRuntime.queryInterface(XTextContent.class, newNamed);
 
@@ -153,7 +163,8 @@ private String updateReferenceName(String oldName, List<Integer> newNumbers) {
         if (oldName.startsWith("JABREF_") && oldName.contains("CID") && parts.length >= 3) {
             StringBuilder newName = new StringBuilder();
             for (int i = 0; i < parts.length - 1; i += 2) {
-                // Each iteration of the loop (incrementing by 2) represents one full citation (key + number)
+                // Each iteration of the loop (incrementing by 2) represents one full citation (key
+                // + number)
                 if (i > 0) {
                     newName.append(", ");
                 }
@@ -198,11 +209,14 @@ public void readAndUpdateExistingMarks() throws WrappedTargetException, NoSuchEl
         marksInOrder.clear();
         citationKeyToNumber.clear();
 
-        XReferenceMarksSupplier supplier = UnoRuntime.queryInterface(XReferenceMarksSupplier.class, document);
+        XReferenceMarksSupplier supplier =
+                UnoRuntime.queryInterface(XReferenceMarksSupplier.class, document);
         XNameAccess marks = supplier.getReferenceMarks();
 
         for (String name : marks.getElementNames()) {
-            if (name.startsWith(ReferenceMark.PREFIXES[0]) && name.contains(ReferenceMark.PREFIXES[1]) && name.split(" ").length >= 3) {
+            if (name.startsWith(ReferenceMark.PREFIXES[0])
+                    && name.contains(ReferenceMark.PREFIXES[1])
+                    && name.split(" ").length >= 3) {
                 XNamed named = UnoRuntime.queryInterface(XNamed.class, marks.getByName(name));
 
                 ReferenceMark referenceMark = new ReferenceMark(name);
diff --git a/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLUpdateBibliography.java b/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLUpdateBibliography.java
index 107974934b40..1f077fd182bb 100644
--- a/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLUpdateBibliography.java
+++ b/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLUpdateBibliography.java
@@ -1,7 +1,10 @@
 package org.jabref.logic.openoffice.oocsltext;
 
-import java.util.List;
-import java.util.Optional;
+import com.sun.star.container.NoSuchElementException;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.text.XTextRange;
 
 import org.jabref.logic.citationstyle.CitationStyle;
 import org.jabref.model.database.BibDatabaseContext;
@@ -11,15 +14,12 @@
 import org.jabref.model.openoffice.uno.CreationException;
 import org.jabref.model.openoffice.uno.NoDocumentException;
 import org.jabref.model.openoffice.uno.UnoTextSection;
-
-import com.sun.star.container.NoSuchElementException;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextRange;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Optional;
+
 public class CSLUpdateBibliography {
 
     private static final String CSL_BIB_SECTION_NAME = "CSL_bibliography";
@@ -36,13 +36,17 @@ public Optional<XTextRange> getBibliographyRange(XTextDocument doc)
     /**
      * Rebuilds the bibliography using CSL.
      */
-    public void rebuildCSLBibliography(XTextDocument doc,
-                                       CSLCitationOOAdapter cslAdapter,
-                                       List<BibEntry> entries,
-                                       CitationStyle citationStyle,
-                                       BibDatabaseContext bibDatabaseContext,
-                                       BibEntryTypesManager bibEntryTypesManager)
-            throws WrappedTargetException, NoDocumentException, CreationException, NoSuchElementException {
+    public void rebuildCSLBibliography(
+            XTextDocument doc,
+            CSLCitationOOAdapter cslAdapter,
+            List<BibEntry> entries,
+            CitationStyle citationStyle,
+            BibDatabaseContext bibDatabaseContext,
+            BibEntryTypesManager bibEntryTypesManager)
+            throws WrappedTargetException,
+                    NoDocumentException,
+                    CreationException,
+                    NoSuchElementException {
         LOGGER.debug("Starting to rebuild CSL bibliography");
 
         // Ensure the bibliography section exists
@@ -55,16 +59,17 @@ public void rebuildCSLBibliography(XTextDocument doc,
             clearCSLBibTextSectionContent(doc);
         }
 
-        populateCSLBibTextSection(doc, cslAdapter, entries, citationStyle, bibDatabaseContext, bibEntryTypesManager);
+        populateCSLBibTextSection(
+                doc, cslAdapter, entries, citationStyle, bibDatabaseContext, bibEntryTypesManager);
         LOGGER.debug("Finished rebuilding CSL bibliography");
     }
 
-    private void createCSLBibTextSection(XTextDocument doc)
-            throws CreationException {
+    private void createCSLBibTextSection(XTextDocument doc) throws CreationException {
         LOGGER.debug("Creating new CSL bibliography section");
         XTextCursor textCursor = doc.getText().createTextCursor();
         textCursor.gotoEnd(false);
-        DocumentAnnotation annotation = new DocumentAnnotation(doc, CSL_BIB_SECTION_NAME, textCursor, false);
+        DocumentAnnotation annotation =
+                new DocumentAnnotation(doc, CSL_BIB_SECTION_NAME, textCursor, false);
         UnoTextSection.create(annotation);
         LOGGER.debug("CSL bibliography section created");
     }
@@ -82,13 +87,17 @@ private void clearCSLBibTextSectionContent(XTextDocument doc)
         }
     }
 
-    private void populateCSLBibTextSection(XTextDocument doc,
-                                           CSLCitationOOAdapter cslAdapter,
-                                           List<BibEntry> entries,
-                                           CitationStyle citationStyle,
-                                           BibDatabaseContext bibDatabaseContext,
-                                           BibEntryTypesManager bibEntryTypesManager)
-            throws WrappedTargetException, NoDocumentException, CreationException, NoSuchElementException {
+    private void populateCSLBibTextSection(
+            XTextDocument doc,
+            CSLCitationOOAdapter cslAdapter,
+            List<BibEntry> entries,
+            CitationStyle citationStyle,
+            BibDatabaseContext bibDatabaseContext,
+            BibEntryTypesManager bibEntryTypesManager)
+            throws WrappedTargetException,
+                    NoDocumentException,
+                    CreationException,
+                    NoSuchElementException {
         LOGGER.debug("Populating CSL bibliography section");
 
         Optional<XTextRange> sectionRange = getBibliographyRange(doc);
@@ -100,7 +109,8 @@ private void populateCSLBibTextSection(XTextDocument doc,
         XTextCursor cursor = doc.getText().createTextCursorByRange(sectionRange.get());
 
         // Use CSLCitationOOAdapter to insert the bibliography
-        cslAdapter.insertBibliography(cursor, citationStyle, entries, bibDatabaseContext, bibEntryTypesManager);
+        cslAdapter.insertBibliography(
+                cursor, citationStyle, entries, bibDatabaseContext, bibEntryTypesManager);
         LOGGER.debug("Bibliography inserted using CSLCitationOOAdapter");
 
         cursor.collapseToEnd();
diff --git a/src/main/java/org/jabref/logic/openoffice/style/JStyle.java b/src/main/java/org/jabref/logic/openoffice/style/JStyle.java
index d94c71ab4dfa..c14a7790db3b 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/JStyle.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/JStyle.java
@@ -1,24 +1,5 @@
 package org.jabref.logic.openoffice.style;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.regex.Pattern;
-
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.Layout;
 import org.jabref.logic.layout.LayoutFormatter;
@@ -36,10 +17,28 @@
 import org.jabref.model.openoffice.style.CitationMarkerNumericBibEntry;
 import org.jabref.model.openoffice.style.CitationMarkerNumericEntry;
 import org.jabref.model.openoffice.style.NonUniqueCitationMarker;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.regex.Pattern;
+
 /**
  * This class embodies a bibliography formatting for OpenOffice, which is composed
  * of the following elements:
@@ -142,7 +141,11 @@ public class JStyle implements Comparable<JStyle>, OOStyle {
     private String localCopy;
     private boolean isDefaultLayoutPresent;
 
-    public JStyle(Path styleFile, LayoutFormatterPreferences layoutPreferences, JournalAbbreviationRepository abbreviationRepository) throws IOException {
+    public JStyle(
+            Path styleFile,
+            LayoutFormatterPreferences layoutPreferences,
+            JournalAbbreviationRepository abbreviationRepository)
+            throws IOException {
         this.layoutPreferences = Objects.requireNonNull(layoutPreferences);
         this.abbreviationRepository = abbreviationRepository;
         this.styleFile = Objects.requireNonNull(styleFile);
@@ -152,7 +155,11 @@ public JStyle(Path styleFile, LayoutFormatterPreferences layoutPreferences, Jour
         path = styleFile.toAbsolutePath().toString();
     }
 
-    public JStyle(String resourcePath, LayoutFormatterPreferences layoutPreferences, JournalAbbreviationRepository abbreviationRepository) throws IOException {
+    public JStyle(
+            String resourcePath,
+            LayoutFormatterPreferences layoutPreferences,
+            JournalAbbreviationRepository abbreviationRepository)
+            throws IOException {
         this.layoutPreferences = Objects.requireNonNull(layoutPreferences);
         this.abbreviationRepository = abbreviationRepository;
 
@@ -179,7 +186,9 @@ private void setDefaultProperties() {
         properties.put(REFERENCE_HEADER_PARAGRAPH_FORMAT, "Heading 1");
 
         // Set default properties for the citation marker:
-        citProperties.put(AUTHOR_FIELD, FieldFactory.serializeOrFields(StandardField.AUTHOR, StandardField.EDITOR));
+        citProperties.put(
+                AUTHOR_FIELD,
+                FieldFactory.serializeOrFields(StandardField.AUTHOR, StandardField.EDITOR));
 
         citProperties.put(CITATION_GROUP_MARKUP_BEFORE, "");
         citProperties.put(CITATION_GROUP_MARKUP_AFTER, "");
@@ -285,7 +294,8 @@ private boolean isUpToDate() {
             return true;
         } else {
             try {
-                return Files.getLastModifiedTime(styleFile).toMillis() == this.styleFileModificationTime;
+                return Files.getLastModifiedTime(styleFile).toMillis()
+                        == this.styleFileModificationTime;
             } catch (IOException e) {
                 return false;
             }
@@ -388,7 +398,12 @@ private void handleStructureLine(String line) {
             try {
                 final String typeName = line.substring(0, index);
                 final String formatString = line.substring(index + 1);
-                Layout layout = new LayoutHelper(new StringReader(formatString), layoutPreferences, abbreviationRepository).getLayoutFromText();
+                Layout layout =
+                        new LayoutHelper(
+                                        new StringReader(formatString),
+                                        layoutPreferences,
+                                        abbreviationRepository)
+                                .getLayoutFromText();
                 EntryType type = EntryTypeFactory.parse(typeName);
 
                 if (!isDefaultLayoutPresent && JStyle.DEFAULT_MARK.equals(typeName)) {
@@ -683,19 +698,15 @@ protected void setDefaultBibLayout(Layout layout) {
      */
     public OOText getNumCitationMarker2(List<CitationMarkerNumericEntry> entries) {
         final int minGroupingCount = this.getMinimumGroupingCount();
-        return JStyleGetNumCitationMarker.getNumCitationMarker2(this,
-                                                                    entries,
-                                                                    minGroupingCount);
+        return JStyleGetNumCitationMarker.getNumCitationMarker2(this, entries, minGroupingCount);
     }
 
     /**
      * For some tests we need to override minGroupingCount.
      */
-    public OOText getNumCitationMarker2(List<CitationMarkerNumericEntry> entries,
-                                        int minGroupingCount) {
-        return JStyleGetNumCitationMarker.getNumCitationMarker2(this,
-                                                                    entries,
-                                                                    minGroupingCount);
+    public OOText getNumCitationMarker2(
+            List<CitationMarkerNumericEntry> entries, int minGroupingCount) {
+        return JStyleGetNumCitationMarker.getNumCitationMarker2(this, entries, minGroupingCount);
     }
 
     /**
@@ -740,13 +751,12 @@ public OOText getNormalizedCitationMarker(CitationMarkerNormEntry entry) {
      *         OOFormat.setLocaleNone() and OOFormat.setCharStyle().
      *         These are added by decorateCitationMarker()
      */
-    public OOText createCitationMarker(List<CitationMarkerEntry> citationMarkerEntries,
-                                       boolean inParenthesis,
-                                       NonUniqueCitationMarker nonUniqueCitationMarkerHandling) {
-        return JStyleGetCitationMarker.createCitationMarker(this,
-                                                                citationMarkerEntries,
-                                                                inParenthesis,
-                                                                nonUniqueCitationMarkerHandling);
+    public OOText createCitationMarker(
+            List<CitationMarkerEntry> citationMarkerEntries,
+            boolean inParenthesis,
+            NonUniqueCitationMarker nonUniqueCitationMarkerHandling) {
+        return JStyleGetCitationMarker.createCitationMarker(
+                this, citationMarkerEntries, inParenthesis, nonUniqueCitationMarkerHandling);
     }
 
     /**
@@ -931,8 +941,6 @@ public OOText getFormattedBibliographyTitle() {
         JStyle style = this;
         OOText title = style.getReferenceHeaderText();
         String parStyle = style.getReferenceHeaderParagraphFormat();
-        return parStyle == null
-                ? OOFormat.paragraph(title)
-                : OOFormat.paragraph(title, parStyle);
+        return parStyle == null ? OOFormat.paragraph(title) : OOFormat.paragraph(title, parStyle);
     }
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/JStyleGetCitationMarker.java b/src/main/java/org/jabref/logic/openoffice/style/JStyleGetCitationMarker.java
index 73d1da75e4c6..17aadbf3eaf0 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/JStyleGetCitationMarker.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/JStyleGetCitationMarker.java
@@ -1,10 +1,5 @@
 package org.jabref.logic.openoffice.style;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.logic.formatter.bibtexfields.RemoveEnclosingBracesFormatter;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.Author;
@@ -19,15 +14,19 @@
 import org.jabref.model.openoffice.style.NonUniqueCitationMarker;
 import org.jabref.model.openoffice.style.PageInfo;
 import org.jabref.model.strings.StringUtil;
-
 import org.jspecify.annotations.NonNull;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
 class JStyleGetCitationMarker {
 
-    private static final RemoveEnclosingBracesFormatter REMOVE_BRACES_FORMATTER = new RemoveEnclosingBracesFormatter();
+    private static final RemoveEnclosingBracesFormatter REMOVE_BRACES_FORMATTER =
+            new RemoveEnclosingBracesFormatter();
 
-    private JStyleGetCitationMarker() {
-    }
+    private JStyleGetCitationMarker() {}
 
     /**
      * Look up the nth author and return the "proper" last name for
@@ -52,16 +51,17 @@ private static String getAuthorLastName(AuthorList authorList, int number) {
                 stringBuilder.append(' ');
             }
             // last name if it exists
-            stringBuilder.append(author.getFamilyName().map(last -> REMOVE_BRACES_FORMATTER.format(last)).orElse(""));
+            stringBuilder.append(
+                    author.getFamilyName()
+                            .map(last -> REMOVE_BRACES_FORMATTER.format(last))
+                            .orElse(""));
         }
 
         return stringBuilder.toString();
     }
 
     private static String markupAuthorName(JStyle style, String name) {
-        return style.getAuthorNameMarkupBefore()
-                + name
-                + style.getAuthorNameMarkupAfter();
+        return style.getAuthorNameMarkupBefore() + name + style.getAuthorNameMarkupAfter();
     }
 
     /**
@@ -90,10 +90,8 @@ private static String markupAuthorName(JStyle style, String name) {
      *          - OXFORD_COMMA is only emitted if nAuthors is at least 3.
      *          - andString  is only emitted if nAuthors is at least 2.
      */
-    private static String formatAuthorList(JStyle style,
-                                           @NonNull AuthorList authorList,
-                                           int maxAuthors,
-                                           String andString) {
+    private static String formatAuthorList(
+            JStyle style, @NonNull AuthorList authorList, int maxAuthors, String andString) {
         // Apparently maxAuthorsBeforeEtAl is always 1 for in-text citations.
         // In reference lists can be for example 7,
         // (https://www.chicagomanualofstyle.org/turabian/turabian-author-date-citation-quick-guide.html)
@@ -142,11 +140,12 @@ private static String formatAuthorList(JStyle style,
         // emitAllAuthors == false means use "et al."
         boolean emitAllAuthors = (nAuthors <= maxAuthors) || (maxAuthors == -1);
 
-        int nAuthorsToEmit = emitAllAuthors
-                              ? nAuthors
-                              // If we use "et al." maxAuthorsBeforeEtAl also limits the
-                              // number of authors emitted.
-                              : Math.min(maxAuthorsBeforeEtAl, nAuthors);
+        int nAuthorsToEmit =
+                emitAllAuthors
+                        ? nAuthors
+                        // If we use "et al." maxAuthorsBeforeEtAl also limits the
+                        // number of authors emitted.
+                        : Math.min(maxAuthorsBeforeEtAl, nAuthors);
 
         if (nAuthorsToEmit >= 1) {
             stringBuilder.append(style.getAuthorsPartMarkupBefore());
@@ -214,6 +213,7 @@ private static String formatAuthorList(JStyle style,
     private static class FieldAndContent {
         Field field;
         String content;
+
         FieldAndContent(Field field, String content) {
             this.field = field;
             this.content = content;
@@ -225,11 +225,11 @@ private static class FieldAndContent {
      * field (or alias) from {@code fields} found in {@code entry}.
      * Return {@code Optional.empty()} if found nothing.
      */
-    private static Optional<FieldAndContent> getRawCitationMarkerField(@NonNull BibEntry entry,
-                                                                       @NonNull BibDatabase database,
-                                                                       @NonNull OrFields fields) {
+    private static Optional<FieldAndContent> getRawCitationMarkerField(
+            @NonNull BibEntry entry, @NonNull BibDatabase database, @NonNull OrFields fields) {
         for (Field field : fields.getFields() /* FieldFactory.parseOrFields(fields)*/) {
-            // NOT LaTeX free, because there is some latextohtml in org.jabref.logic.openoffice.style.OOPreFormatter
+            // NOT LaTeX free, because there is some latextohtml in
+            // org.jabref.logic.openoffice.style.OOPreFormatter
             Optional<String> optionalContent = entry.getResolvedFieldOrAlias(field, database);
             final boolean foundSomething = !StringUtil.isBlank(optionalContent);
             if (foundSomething) {
@@ -261,11 +261,10 @@ private static Optional<FieldAndContent> getRawCitationMarkerField(@NonNull BibE
      *
      *
      */
-    private static String getCitationMarkerField(JStyle style,
-                                                 @NonNull CitationLookupResult db,
-                                                 OrFields fields) {
+    private static String getCitationMarkerField(
+            JStyle style, @NonNull CitationLookupResult db, OrFields fields) {
         Optional<FieldAndContent> optionalFieldAndContent =
-            getRawCitationMarkerField(db.entry, db.database, fields);
+                getRawCitationMarkerField(db.entry, db.database, fields);
 
         if (optionalFieldAndContent.isEmpty()) {
             // No luck? Return an empty string:
@@ -280,7 +279,8 @@ private static String getCitationMarkerField(JStyle style,
         // braces around the result, so that AuthorList.parse does not split
         // the content.
         final OrFields fieldsToRebrace = style.getAuthorFieldNames();
-        if (fieldsToRebrace.contains(fieldAndContent.field) && StringUtil.isInCurlyBrackets(fieldAndContent.content)) {
+        if (fieldsToRebrace.contains(fieldAndContent.field)
+                && StringUtil.isInCurlyBrackets(fieldAndContent.content)) {
             result = "{" + result + "}";
         }
         return result;
@@ -313,9 +313,10 @@ private static int calculateNAuthorsToEmit(JStyle style, CitationMarkerEntry ent
             return 0;
         }
 
-        int maxAuthors = entry.getIsFirstAppearanceOfSource()
-                          ? style.getMaxAuthorsFirst()
-                          : style.getMaxAuthors();
+        int maxAuthors =
+                entry.getIsFirstAppearanceOfSource()
+                        ? style.getMaxAuthorsFirst()
+                        : style.getMaxAuthors();
 
         AuthorList authorList = getAuthorList(style, entry.getLookupResult().get());
         int nAuthors = authorList.getNumberOfAuthors();
@@ -363,19 +364,19 @@ private static int calculateNAuthorsToEmit(JStyle style, CitationMarkerEntry ent
      * @return The formatted citation.
      *
      */
-    private static OOText getAuthorYearParenthesisMarker2(JStyle style,
-                                                          AuthorYearMarkerPurpose purpose,
-                                                          List<CitationMarkerEntry> entries,
-                                                          boolean[] startsNewGroup,
-                                                          Optional<Integer> maxAuthorsOverride) {
+    private static OOText getAuthorYearParenthesisMarker2(
+            JStyle style,
+            AuthorYearMarkerPurpose purpose,
+            List<CitationMarkerEntry> entries,
+            boolean[] startsNewGroup,
+            Optional<Integer> maxAuthorsOverride) {
 
-        boolean inParenthesis = purpose == AuthorYearMarkerPurpose.IN_PARENTHESIS
-                                 || purpose == AuthorYearMarkerPurpose.NORMALIZED;
+        boolean inParenthesis =
+                purpose == AuthorYearMarkerPurpose.IN_PARENTHESIS
+                        || purpose == AuthorYearMarkerPurpose.NORMALIZED;
 
         // The String to separate authors from year, e.g. "; ".
-        String yearSep = inParenthesis
-                          ? style.getYearSeparator()
-                          : style.getYearSeparatorInText();
+        String yearSep = inParenthesis ? style.getYearSeparator() : style.getYearSeparatorInText();
 
         // The opening parenthesis.
         String startBrace = style.getBracketBefore();
@@ -390,9 +391,10 @@ private static OOText getAuthorYearParenthesisMarker2(JStyle style,
         OrFields yearFieldNames = style.getYearFieldNames();
 
         // The String to add between the two last author names, e.g. " & ".
-        String andString = inParenthesis
-                            ? style.getAuthorLastSeparator()
-                            : style.getAuthorLastSeparatorInTextWithFallBack();
+        String andString =
+                inParenthesis
+                        ? style.getAuthorLastSeparator()
+                        : style.getAuthorLastSeparatorInTextWithFallBack();
 
         String pageInfoSeparator = style.getPageInfoSeparator();
         String uniquefierSeparator = style.getUniquefierSeparator();
@@ -430,8 +432,7 @@ private static OOText getAuthorYearParenthesisMarker2(JStyle style,
 
             StringBuilder pageInfoPart = new StringBuilder("");
             if (purpose != AuthorYearMarkerPurpose.NORMALIZED) {
-                Optional<OOText> pageInfo =
-                    PageInfo.normalizePageInfo(entry.getPageInfo());
+                Optional<OOText> pageInfo = PageInfo.normalizePageInfo(entry.getPageInfo());
                 if (pageInfo.isPresent()) {
                     pageInfoPart.append(pageInfoSeparator);
                     pageInfoPart.append(OOText.toString(pageInfo.get()));
@@ -447,9 +448,10 @@ private static OOText getAuthorYearParenthesisMarker2(JStyle style,
             } else {
                 CitationLookupResult db = entry.getLookupResult().get();
 
-                int maxAuthors = purpose == AuthorYearMarkerPurpose.NORMALIZED
-                                  ? style.getMaxAuthors()
-                                  : calculateNAuthorsToEmit(style, entry);
+                int maxAuthors =
+                        purpose == AuthorYearMarkerPurpose.NORMALIZED
+                                ? style.getMaxAuthors()
+                                : calculateNAuthorsToEmit(style, entry);
 
                 if (maxAuthorsOverride.isPresent()) {
                     maxAuthors = maxAuthorsOverride.get();
@@ -481,7 +483,7 @@ private static OOText getAuthorYearParenthesisMarker2(JStyle style,
                 }
 
                 if (!inParenthesis && endingAGroup) {
-                    stringBuilder.append(endBrace);  // parenthesis after year
+                    stringBuilder.append(endBrace); // parenthesis after year
                 }
             }
         } // for j
@@ -540,28 +542,27 @@ public boolean getIsFirstAppearanceOfSource() {
      *
      * Note: now includes some markup.
      */
-    static OOText getNormalizedCitationMarker(JStyle style,
-                                              CitationMarkerNormEntry normEntry,
-                                              Optional<Integer> maxAuthorsOverride) {
+    static OOText getNormalizedCitationMarker(
+            JStyle style, CitationMarkerNormEntry normEntry, Optional<Integer> maxAuthorsOverride) {
         boolean[] startsNewGroup = {true};
         CitationMarkerEntry entry = new CitationMarkerNormEntryWrap(normEntry);
-        return getAuthorYearParenthesisMarker2(style,
-                                               AuthorYearMarkerPurpose.NORMALIZED,
-                                               Collections.singletonList(entry),
-                                               startsNewGroup,
-                                               maxAuthorsOverride);
+        return getAuthorYearParenthesisMarker2(
+                style,
+                AuthorYearMarkerPurpose.NORMALIZED,
+                Collections.singletonList(entry),
+                startsNewGroup,
+                maxAuthorsOverride);
     }
 
-    private static List<OOText>
-    getNormalizedCitationMarkers(JStyle style,
-                                 List<CitationMarkerEntry> citationMarkerEntries,
-                                 Optional<Integer> maxAuthorsOverride) {
+    private static List<OOText> getNormalizedCitationMarkers(
+            JStyle style,
+            List<CitationMarkerEntry> citationMarkerEntries,
+            Optional<Integer> maxAuthorsOverride) {
 
         List<OOText> normalizedMarkers = new ArrayList<>(citationMarkerEntries.size());
         for (CitationMarkerEntry citationMarkerEntry : citationMarkerEntries) {
-            OOText normalized = getNormalizedCitationMarker(style,
-                                                            citationMarkerEntry,
-                                                            maxAuthorsOverride);
+            OOText normalized =
+                    getNormalizedCitationMarker(style, citationMarkerEntry, maxAuthorsOverride);
             normalizedMarkers.add(normalized);
         }
         return normalizedMarkers;
@@ -596,11 +597,11 @@ static OOText getNormalizedCitationMarker(JStyle style,
      *             Note: only consecutive citations are checked.
      *
      */
-    public static OOText
-    createCitationMarker(JStyle style,
-                         List<CitationMarkerEntry> citationMarkerEntries,
-                         boolean inParenthesis,
-                         NonUniqueCitationMarker nonUniqueCitationMarkerHandling) {
+    public static OOText createCitationMarker(
+            JStyle style,
+            List<CitationMarkerEntry> citationMarkerEntries,
+            boolean inParenthesis,
+            NonUniqueCitationMarker nonUniqueCitationMarkerHandling) {
 
         final int nEntries = citationMarkerEntries.size();
 
@@ -619,9 +620,8 @@ static OOText getNormalizedCitationMarker(JStyle style,
         // We also assume, that identical entries have the same uniqueLetters.
         //
 
-        List<OOText> normalizedMarkers = getNormalizedCitationMarkers(style,
-                                                                      citationMarkerEntries,
-                                                                      Optional.empty());
+        List<OOText> normalizedMarkers =
+                getNormalizedCitationMarkers(style, citationMarkerEntries, Optional.empty());
 
         // How many authors would be emitted without grouping.
         int[] nAuthorsToEmit = new int[nEntries];
@@ -673,9 +673,9 @@ static OOText getNormalizedCitationMarker(JStyle style,
 
                     // nAuthorsToEmitRevised[i-1] may have been indirectly increased,
                     // we have to check that too.
-                    if (!isFirst1 &&
-                        !isFirst2 &&
-                        (nAuthorsToEmitRevised[i - 1] == nAuthorsToEmit[i - 1])) {
+                    if (!isFirst1
+                            && !isFirst2
+                            && (nAuthorsToEmitRevised[i - 1] == nAuthorsToEmit[i - 1])) {
                         // we can rely on normalizedMarkers
                         nAuthorsShownInhibitsJoin = false;
                     } else if (style.getMaxAuthors() == style.getMaxAuthorsFirst()) {
@@ -693,16 +693,17 @@ static OOText getNormalizedCitationMarker(JStyle style,
                             // prevShown >= need
                             // Check with extended normalizedMarkers.
                             OOText nmx1 =
-                                getNormalizedCitationMarker(style, ce1, Optional.of(prevShown));
+                                    getNormalizedCitationMarker(style, ce1, Optional.of(prevShown));
                             OOText nmx2 =
-                                getNormalizedCitationMarker(style, ce2, Optional.of(prevShown));
+                                    getNormalizedCitationMarker(style, ce2, Optional.of(prevShown));
                             boolean extendedMarkersDiffer = !nmx2.equals(nmx1);
                             nAuthorsShownInhibitsJoin = extendedMarkersDiffer;
                         }
                     }
                 }
 
-                final boolean citationKeysDiffer = !ce2.getCitationKey().equals(ce1.getCitationKey());
+                final boolean citationKeysDiffer =
+                        !ce2.getCitationKey().equals(ce1.getCitationKey());
                 final boolean normalizedMarkersDiffer = !nm2.equals(nm1);
 
                 Optional<OOText> pageInfo2 = PageInfo.normalizePageInfo(ce2.getPageInfo());
@@ -715,35 +716,36 @@ static OOText getNormalizedCitationMarker(JStyle style,
                 final boolean uniqueLetterPresenceChanged = ul2.isPresent() != ul1.isPresent();
                 final boolean uniqueLettersDiffer = !ul2.equals(ul1);
 
-                final boolean uniqueLetterDoesNotMakeUnique = citationKeysDiffer
-                                                               && !normalizedMarkersDiffer
-                                                               && !uniqueLettersDiffer;
+                final boolean uniqueLetterDoesNotMakeUnique =
+                        citationKeysDiffer && !normalizedMarkersDiffer && !uniqueLettersDiffer;
 
-                if (uniqueLetterDoesNotMakeUnique &&
-                        nonUniqueCitationMarkerHandling == NonUniqueCitationMarker.THROWS) {
-                    throw new IllegalArgumentException("different citation keys,"
-                                                       + " but same normalizedMarker and uniqueLetter");
+                if (uniqueLetterDoesNotMakeUnique
+                        && nonUniqueCitationMarkerHandling == NonUniqueCitationMarker.THROWS) {
+                    throw new IllegalArgumentException(
+                            "different citation keys,"
+                                    + " but same normalizedMarker and uniqueLetter");
                 }
 
-                final boolean pageInfoInhibitsJoin = bothPageInfosAreEmpty
-                                                      ? false
-                                                      : (citationKeysDiffer || pageInfosDiffer);
+                final boolean pageInfoInhibitsJoin =
+                        bothPageInfosAreEmpty ? false : (citationKeysDiffer || pageInfosDiffer);
 
-                startingNewGroup = normalizedMarkersDiffer
-                                    || nAuthorsShownInhibitsJoin
-                                    || pageInfoInhibitsJoin
-                                    || uniqueLetterPresenceChanged
-                                    || uniqueLetterDoesNotMakeUnique;
+                startingNewGroup =
+                        normalizedMarkersDiffer
+                                || nAuthorsShownInhibitsJoin
+                                || pageInfoInhibitsJoin
+                                || uniqueLetterPresenceChanged
+                                || uniqueLetterDoesNotMakeUnique;
 
                 if (!startingNewGroup) {
                     // inherit from first of group. Used at next i.
                     nAuthorsToEmitRevised[i] = nAuthorsToEmitRevised[i - 1];
                 }
 
-                sameAsPrev = !startingNewGroup
-                              && !uniqueLettersDiffer
-                              && !citationKeysDiffer
-                              && !pageInfosDiffer;
+                sameAsPrev =
+                        !startingNewGroup
+                                && !uniqueLettersDiffer
+                                && !citationKeysDiffer
+                                && !pageInfosDiffer;
             }
 
             if (!sameAsPrev) {
@@ -753,12 +755,13 @@ static OOText getNormalizedCitationMarker(JStyle style,
             }
         }
 
-        return getAuthorYearParenthesisMarker2(style,
-                                               (inParenthesis
-                                               ? AuthorYearMarkerPurpose.IN_PARENTHESIS
-                                               : AuthorYearMarkerPurpose.IN_TEXT),
-                                              filteredCitationMarkerEntries,
-                                              startsNewGroup,
-                                              Optional.empty());
+        return getAuthorYearParenthesisMarker2(
+                style,
+                (inParenthesis
+                        ? AuthorYearMarkerPurpose.IN_PARENTHESIS
+                        : AuthorYearMarkerPurpose.IN_TEXT),
+                filteredCitationMarkerEntries,
+                startsNewGroup,
+                Optional.empty());
     }
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/JStyleGetNumCitationMarker.java b/src/main/java/org/jabref/logic/openoffice/style/JStyleGetNumCitationMarker.java
index df500faa0aac..28f594e7934e 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/JStyleGetNumCitationMarker.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/JStyleGetNumCitationMarker.java
@@ -1,28 +1,27 @@
 package org.jabref.logic.openoffice.style;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.model.openoffice.ootext.OOText;
 import org.jabref.model.openoffice.style.CitationMarkerNumericBibEntry;
 import org.jabref.model.openoffice.style.CitationMarkerNumericEntry;
 import org.jabref.model.openoffice.style.PageInfo;
 import org.jabref.model.openoffice.util.OOListUtil;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
 class JStyleGetNumCitationMarker {
 
     // The number encoding "this entry is unresolved"
-    public final static int UNRESOLVED_ENTRY_NUMBER = 0;
+    public static final int UNRESOLVED_ENTRY_NUMBER = 0;
 
-    private JStyleGetNumCitationMarker() {
-    }
+    private JStyleGetNumCitationMarker() {}
 
     /**
      * Defines sort order for CitationMarkerNumericEntry.
      */
-    private static int compareCitationMarkerNumericEntry(CitationMarkerNumericEntry a,
-                                                         CitationMarkerNumericEntry b) {
+    private static int compareCitationMarkerNumericEntry(
+            CitationMarkerNumericEntry a, CitationMarkerNumericEntry b) {
         int na = a.getNumber().orElse(UNRESOLVED_ENTRY_NUMBER);
         int nb = b.getNumber().orElse(UNRESOLVED_ENTRY_NUMBER);
         int res = Integer.compare(na, nb);
@@ -45,8 +44,8 @@ private static int compareCitationMarkerNumericEntry(CitationMarkerNumericEntry
      *       "]" stands for BRACKET_AFTER_IN_LIST (with fallback BRACKET_AFTER)
      *       "${number}" stands for the formatted number.
      */
-    public static OOText getNumCitationMarkerForBibliography(JStyle style,
-                                                             CitationMarkerNumericBibEntry entry) {
+    public static OOText getNumCitationMarkerForBibliography(
+            JStyle style, CitationMarkerNumericBibEntry entry) {
         // prefer BRACKET_BEFORE_IN_LIST and BRACKET_AFTER_IN_LIST
         String bracketBefore = style.getBracketBeforeInListWithFallBack();
         String bracketAfter = style.getBracketAfterInListWithFallBack();
@@ -54,9 +53,10 @@ public static OOText getNumCitationMarkerForBibliography(JStyle style,
         stringBuilder.append(style.getCitationGroupMarkupBefore());
         stringBuilder.append(bracketBefore);
         final Optional<Integer> current = entry.getNumber();
-        stringBuilder.append(current.isPresent()
-                  ? String.valueOf(current.get())
-                  : (JStyle.UNDEFINED_CITATION_MARKER + entry.getCitationKey()));
+        stringBuilder.append(
+                current.isPresent()
+                        ? String.valueOf(current.get())
+                        : (JStyle.UNDEFINED_CITATION_MARKER + entry.getCitationKey()));
         stringBuilder.append(bracketAfter);
         stringBuilder.append(style.getCitationGroupMarkupAfter());
         return OOText.fromString(stringBuilder.toString());
@@ -85,10 +85,11 @@ public static OOText getNumCitationMarkerForBibliography(JStyle style,
      *     without repetition.
      *
      */
-    private static void emitBlock(List<CitationMarkerNumericEntry> block,
-                                  JStyle style,
-                                  int minGroupingCount,
-                                  StringBuilder stringBuilder) {
+    private static void emitBlock(
+            List<CitationMarkerNumericEntry> block,
+            JStyle style,
+            int minGroupingCount,
+            StringBuilder stringBuilder) {
 
         final int blockSize = block.size();
         if (blockSize == 0) {
@@ -99,9 +100,10 @@ private static void emitBlock(List<CitationMarkerNumericEntry> block,
             // Add single entry:
             CitationMarkerNumericEntry entry = block.getFirst();
             final Optional<Integer> num = entry.getNumber();
-            stringBuilder.append(num.isEmpty()
-                                 ? (JStyle.UNDEFINED_CITATION_MARKER + entry.getCitationKey())
-                                 : String.valueOf(num.get()));
+            stringBuilder.append(
+                    num.isEmpty()
+                            ? (JStyle.UNDEFINED_CITATION_MARKER + entry.getCitationKey())
+                            : String.valueOf(num.get()));
             // Emit pageInfo
             Optional<OOText> pageInfo = entry.getPageInfo();
             if (pageInfo.isPresent()) {
@@ -117,11 +119,13 @@ private static void emitBlock(List<CitationMarkerNumericEntry> block,
              */
 
             if (block.stream().anyMatch(x -> x.getPageInfo().isPresent())) {
-                throw new IllegalArgumentException("Found pageInfo in a block with more than one elements");
+                throw new IllegalArgumentException(
+                        "Found pageInfo in a block with more than one elements");
             }
 
             if (block.stream().anyMatch(x -> x.getNumber().isEmpty())) {
-                throw new IllegalArgumentException("Found unresolved entry in a block with more than one elements");
+                throw new IllegalArgumentException(
+                        "Found unresolved entry in a block with more than one elements");
             }
 
             for (int j = 1; j < blockSize; j++) {
@@ -181,9 +185,8 @@ private static void emitBlock(List<CitationMarkerNumericEntry> block,
      * @return The text for the citation.
      *
      */
-    public static OOText getNumCitationMarker2(JStyle style,
-                                               List<CitationMarkerNumericEntry> entries,
-                                               int minGroupingCount) {
+    public static OOText getNumCitationMarker2(
+            JStyle style, List<CitationMarkerNumericEntry> entries, int minGroupingCount) {
 
         final boolean joinIsDisabled = minGroupingCount <= 0;
         final int nCitations = entries.size();
@@ -231,8 +234,8 @@ public static OOText getNumCitationMarker2(JStyle style,
                 } else if (compareCitationMarkerNumericEntry(current, prev) == 0) {
                     // Same as prev, just forget it.
                 } else if ((current.getNumber().get() == (prev.getNumber().get() + 1))
-                           && (prev.getPageInfo().isEmpty())
-                           && (current.getPageInfo().isEmpty())) {
+                        && (prev.getPageInfo().isEmpty())
+                        && (current.getPageInfo().isEmpty())) {
                     // Just two consecutive numbers without pageInfo: join
                     currentBlock.add(current);
                 } else {
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOFormatBibliography.java b/src/main/java/org/jabref/logic/openoffice/style/OOFormatBibliography.java
index addc5c837281..0c827aecedbe 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOFormatBibliography.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOFormatBibliography.java
@@ -1,9 +1,5 @@
 package org.jabref.logic.openoffice.style;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.Layout;
 import org.jabref.model.database.BibDatabase;
@@ -19,38 +15,45 @@
 import org.jabref.model.openoffice.style.CitedKey;
 import org.jabref.model.openoffice.style.CitedKeys;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
 public class OOFormatBibliography {
     private static final OOPreFormatter POSTFORMATTER = new OOPreFormatter();
     private static final Field UNIQUEFIER_FIELD = new UnknownField("uniq");
 
-    private OOFormatBibliography() {
-    }
+    private OOFormatBibliography() {}
 
     /**
      * @return The formatted bibliography, including its title.
      */
-    public static OOText formatBibliography(CitationGroups citationGroups,
-                                            CitedKeys bibliography,
-                                            JStyle style,
-                                            boolean alwaysAddCitedOnPages) {
+    public static OOText formatBibliography(
+            CitationGroups citationGroups,
+            CitedKeys bibliography,
+            JStyle style,
+            boolean alwaysAddCitedOnPages) {
 
         OOText title = style.getFormattedBibliographyTitle();
-        OOText body = formatBibliographyBody(citationGroups, bibliography, style, alwaysAddCitedOnPages);
+        OOText body =
+                formatBibliographyBody(citationGroups, bibliography, style, alwaysAddCitedOnPages);
         return OOText.fromString(title.toString() + body.toString());
     }
 
     /**
      * @return Formatted body of the bibliography. Excludes the title.
      */
-    public static OOText formatBibliographyBody(CitationGroups citationGroups,
-                                                CitedKeys bibliography,
-                                                JStyle style,
-                                                boolean alwaysAddCitedOnPages) {
+    public static OOText formatBibliographyBody(
+            CitationGroups citationGroups,
+            CitedKeys bibliography,
+            JStyle style,
+            boolean alwaysAddCitedOnPages) {
 
         StringBuilder stringBuilder = new StringBuilder();
 
         for (CitedKey citedKey : bibliography.values()) {
-            OOText entryText = formatBibliographyEntry(citationGroups, citedKey, style, alwaysAddCitedOnPages);
+            OOText entryText =
+                    formatBibliographyEntry(citationGroups, citedKey, style, alwaysAddCitedOnPages);
             stringBuilder.append(entryText.toString());
         }
 
@@ -60,10 +63,11 @@ public static OOText formatBibliographyBody(CitationGroups citationGroups,
     /**
      * @return A paragraph. Includes label and "Cited on pages".
      */
-    public static OOText formatBibliographyEntry(CitationGroups citationGroups,
-                                                 CitedKey citedKey,
-                                                 JStyle style,
-                                                 boolean alwaysAddCitedOnPages) {
+    public static OOText formatBibliographyEntry(
+            CitationGroups citationGroups,
+            CitedKey citedKey,
+            JStyle style,
+            boolean alwaysAddCitedOnPages) {
         StringBuilder stringBuilder = new StringBuilder();
 
         // insert marker "[1]"
@@ -101,10 +105,11 @@ public static OOText formatBibliographyEntryBody(CitedKey citedKey, JStyle style
             Layout layout = style.getReferenceFormat(bibentry.getType());
             layout.setPostFormatter(POSTFORMATTER);
 
-            return formatFullReferenceOfBibEntry(layout,
-                                                 bibentry,
-                                                 citedKey.getLookupResult().get().database,
-                                                 citedKey.getUniqueLetter().orElse(null));
+            return formatFullReferenceOfBibEntry(
+                    layout,
+                    bibentry,
+                    citedKey.getLookupResult().get().database,
+                    citedKey.getUniqueLetter().orElse(null));
         }
     }
 
@@ -118,10 +123,8 @@ public static OOText formatBibliographyEntryBody(CitedKey citedKey, JStyle style
      *
      * @return OOText The reference part of a bibliography entry formatted as OOText
      */
-    private static OOText formatFullReferenceOfBibEntry(Layout layout,
-                                                        BibEntry entry,
-                                                        BibDatabase database,
-                                                        String uniquefier) {
+    private static OOText formatFullReferenceOfBibEntry(
+            Layout layout, BibEntry entry, BibDatabase database, String uniquefier) {
 
         // Backup the value of the uniq field, just in case the entry already has it:
         Optional<String> oldUniqVal = entry.getField(UNIQUEFIER_FIELD);
@@ -176,18 +179,20 @@ private static OOText formatCitedOnPages(CitationGroups citationGroups, CitedKey
         }
 
         // sort the citationGroups according to their indexInGlobalOrder
-        filteredList.sort((a, b) -> {
-                Integer aa = a.getIndexInGlobalOrder().orElseThrow(IllegalStateException::new);
-                Integer bb = b.getIndexInGlobalOrder().orElseThrow(IllegalStateException::new);
-                return aa.compareTo(bb);
-            });
+        filteredList.sort(
+                (a, b) -> {
+                    Integer aa = a.getIndexInGlobalOrder().orElseThrow(IllegalStateException::new);
+                    Integer bb = b.getIndexInGlobalOrder().orElseThrow(IllegalStateException::new);
+                    return aa.compareTo(bb);
+                });
 
         int index = 0;
         for (CitationGroup group : filteredList) {
             if (index > 0) {
                 stringBuilder.append(", ");
             }
-            String markName = group.getReferenceMarkNameForLinking().orElseThrow(IllegalStateException::new);
+            String markName =
+                    group.getReferenceMarkNameForLinking().orElseThrow(IllegalStateException::new);
             OOText xref = OOFormat.formatReferenceToPageNumberOfReferenceMark(markName);
             stringBuilder.append(xref.toString());
             index++;
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOPreFormatter.java b/src/main/java/org/jabref/logic/openoffice/style/OOPreFormatter.java
index caeaf8cce2a9..f4d4e930a74f 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOPreFormatter.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOPreFormatter.java
@@ -1,25 +1,29 @@
 package org.jabref.logic.openoffice.style;
 
-import java.util.Map;
-import java.util.Objects;
-
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.logic.util.strings.HTMLUnicodeConversionMaps;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Map;
+import java.util.Objects;
+
 /**
  * This formatter preprocesses JabRef fields before they are run through the layout of the bibliography style. It handles translation of LaTeX italic/bold commands into HTML tags.
  */
 public class OOPreFormatter implements LayoutFormatter {
 
-    private static final Map<String, String> CHARS = HTMLUnicodeConversionMaps.LATEX_UNICODE_CONVERSION_MAP;
+    private static final Map<String, String> CHARS =
+            HTMLUnicodeConversionMaps.LATEX_UNICODE_CONVERSION_MAP;
 
     @Override
     public String format(String field) {
         int i;
-        String finalResult = field.replaceAll("&|\\\\&", "&") // Replace & and \& with &
-                                  .replace("\\$", "&dollar;") // Replace \$ with &dollar;
-                                  .replaceAll("\\$([^$]*)\\$", "\\{$1\\}"); // Replace $...$ with {...} to simplify conversion
+        String finalResult =
+                field.replaceAll("&|\\\\&", "&") // Replace & and \& with &
+                        .replace("\\$", "&dollar;") // Replace \$ with &dollar;
+                        .replaceAll(
+                                "\\$([^$]*)\\$",
+                                "\\{$1\\}"); // Replace $...$ with {...} to simplify conversion
 
         StringBuilder sb = new StringBuilder();
         StringBuilder currentCommand = null;
@@ -45,7 +49,8 @@ public String format(String field) {
                 currentCommand = new StringBuilder();
             } else if (!incommand && ((c == '{') || (c == '}'))) {
                 // Swallow braces, necessary for replacing encoded characters
-            } else if (Character.isLetter(c) || (c == '%')
+            } else if (Character.isLetter(c)
+                    || (c == '%')
                     || StringUtil.SPECIAL_COMMAND_CHARS.contains(String.valueOf(c))) {
                 escaped = false;
 
@@ -55,7 +60,8 @@ public String format(String field) {
                     currentCommand.append(c);
                     testCharCom:
                     if ((currentCommand.length() == 1)
-                            && StringUtil.SPECIAL_COMMAND_CHARS.contains(currentCommand.toString())) {
+                            && StringUtil.SPECIAL_COMMAND_CHARS.contains(
+                                    currentCommand.toString())) {
                         // This indicates that we are in a command of the type
                         // \^o or \~{n}
                         if (i >= (finalResult.length() - 1)) {
@@ -86,7 +92,8 @@ public String format(String field) {
                         if ((i + 1) == finalResult.length()) {
                             String command = currentCommand.toString();
                             String result = OOPreFormatter.CHARS.get(command);
-                            // If found, then use translated version. If not, then keep the text of the parameter intact.
+                            // If found, then use translated version. If not, then keep the text of
+                            // the parameter intact.
                             sb.append(Objects.requireNonNullElse(result, command));
                         }
                     }
@@ -104,18 +111,27 @@ public String format(String field) {
                     if (!tag.isEmpty()) {
                         String part = StringUtil.getPart(finalResult, i, true);
                         i += part.length();
-                        sb.append('<').append(tag).append('>').append(part).append("</").append(tag).append('>');
+                        sb.append('<')
+                                .append(tag)
+                                .append('>')
+                                .append(part)
+                                .append("</")
+                                .append(tag)
+                                .append('>');
                     } else if (c == '{') {
                         String part = StringUtil.getPart(finalResult, i, true);
                         i += part.length();
                         argument = part;
                         // handle common case of general latex command
                         String result = OOPreFormatter.CHARS.get(command + argument);
-                        // If found, then use translated version. If not, then keep the text of the parameter intact.
+                        // If found, then use translated version. If not, then keep the text of the
+                        // parameter intact.
                         sb.append(Objects.requireNonNullElse(result, argument));
                     } else if (c == '}') {
-                        // This end brace terminates a command. This can be the case in constructs like {\aa}. The
-                        // correct behaviour should be to substitute the evaluated command and swallow the brace:
+                        // This end brace terminates a command. This can be the case in constructs
+                        // like {\aa}. The
+                        // correct behaviour should be to substitute the evaluated command and
+                        // swallow the brace:
                         String result = OOPreFormatter.CHARS.get(command);
                         // If the command is unknown, just print it:
                         sb.append(Objects.requireNonNullElse(result, command));
@@ -147,17 +163,18 @@ public String format(String field) {
     private String getHTMLTag(String latexCommand) {
         String result = "";
         switch (latexCommand) {
-            // Should really separate between emphasized and italic but since in later stages both are converted to italic...
-            case "textit", "it", "emph", "em" -> result = "i";  // Italic
-            case "textbf", "bf" -> result = "b";                // Bold font
-            case "textsc" -> result = "smallcaps";              // Small caps
-                                                                // Not a proper HTML tag, but used here for convenience
-            case "underline" -> result = "u";                   // Underline
-            case "sout" -> result = "s";                        // Strikeout
-                                                                // sout is the "standard" command, although it is actually based on the package ulem
-            case "texttt" -> result = "tt";                     // Monospace font
-            case "textsuperscript" -> result = "sup";           // Superscript
-            case "textsubscript" -> result = "sub";             // Subscript
+            // Should really separate between emphasized and italic but since in later stages both
+            // are converted to italic...
+            case "textit", "it", "emph", "em" -> result = "i"; // Italic
+            case "textbf", "bf" -> result = "b"; // Bold font
+            case "textsc" -> result = "smallcaps"; // Small caps
+            // Not a proper HTML tag, but used here for convenience
+            case "underline" -> result = "u"; // Underline
+            case "sout" -> result = "s"; // Strikeout
+            // sout is the "standard" command, although it is actually based on the package ulem
+            case "texttt" -> result = "tt"; // Monospace font
+            case "textsuperscript" -> result = "sup"; // Superscript
+            case "textsubscript" -> result = "sub"; // Subscript
         }
         return result;
     }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOProcess.java b/src/main/java/org/jabref/logic/openoffice/style/OOProcess.java
index 68d581df341f..e19040849f08 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcess.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcess.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.openoffice.style;
 
-import java.util.Comparator;
-import java.util.List;
-
 import org.jabref.logic.bibtex.comparator.FieldComparator;
 import org.jabref.logic.bibtex.comparator.FieldComparatorStack;
 import org.jabref.model.database.BibDatabase;
@@ -10,25 +7,33 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.openoffice.style.CitationGroups;
 
+import java.util.Comparator;
+import java.util.List;
+
 public class OOProcess {
 
-    static final Comparator<BibEntry> AUTHOR_YEAR_TITLE_COMPARATOR = makeAuthorYearTitleComparator();
-    static final Comparator<BibEntry> YEAR_AUTHOR_TITLE_COMPARATOR = makeYearAuthorTitleComparator();
+    static final Comparator<BibEntry> AUTHOR_YEAR_TITLE_COMPARATOR =
+            makeAuthorYearTitleComparator();
+    static final Comparator<BibEntry> YEAR_AUTHOR_TITLE_COMPARATOR =
+            makeYearAuthorTitleComparator();
 
-    private OOProcess() {
-    }
+    private OOProcess() {}
 
     private static Comparator<BibEntry> makeAuthorYearTitleComparator() {
-        List<Comparator<BibEntry>> ayt = List.of(new FieldComparator(StandardField.AUTHOR),
-                                                 new FieldComparator(StandardField.YEAR),
-                                                 new FieldComparator(StandardField.TITLE));
+        List<Comparator<BibEntry>> ayt =
+                List.of(
+                        new FieldComparator(StandardField.AUTHOR),
+                        new FieldComparator(StandardField.YEAR),
+                        new FieldComparator(StandardField.TITLE));
         return new FieldComparatorStack<>(ayt);
     }
 
     private static Comparator<BibEntry> makeYearAuthorTitleComparator() {
-        List<Comparator<BibEntry>> yat = List.of(new FieldComparator(StandardField.YEAR),
-                                                 new FieldComparator(StandardField.AUTHOR),
-                                                 new FieldComparator(StandardField.TITLE));
+        List<Comparator<BibEntry>> yat =
+                List.of(
+                        new FieldComparator(StandardField.YEAR),
+                        new FieldComparator(StandardField.AUTHOR),
+                        new FieldComparator(StandardField.TITLE));
         return new FieldComparatorStack<>(yat);
     }
 
@@ -53,9 +58,11 @@ public static Comparator<BibEntry> comparatorForMulticite(JStyle style) {
      *  Fill citationGroups.bibliography and cgs.citationGroupsUnordered//CitationMarker
      *  according to style.
      */
-    public static void produceCitationMarkers(CitationGroups citationGroups, List<BibDatabase> databases, JStyle style) {
+    public static void produceCitationMarkers(
+            CitationGroups citationGroups, List<BibDatabase> databases, JStyle style) {
         if (!citationGroups.hasGlobalOrder()) {
-            throw new IllegalStateException("produceCitationMarkers: globalOrder is misssing in citationGroups");
+            throw new IllegalStateException(
+                    "produceCitationMarkers: globalOrder is misssing in citationGroups");
         }
 
         citationGroups.lookupCitations(databases);
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java b/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java
index a549d162429f..f1dfa032530e 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java
@@ -1,13 +1,5 @@
 package org.jabref.logic.openoffice.style;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
 import org.jabref.model.openoffice.ootext.OOText;
 import org.jabref.model.openoffice.style.Citation;
 import org.jabref.model.openoffice.style.CitationGroup;
@@ -19,10 +11,17 @@
 import org.jabref.model.openoffice.style.NonUniqueCitationMarker;
 import org.jabref.model.openoffice.util.OOListUtil;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
 class OOProcessAuthorYearMarkers {
 
-    private OOProcessAuthorYearMarkers() {
-    }
+    private OOProcessAuthorYearMarkers() {}
 
     /**
      *  Fills {@code sortedCitedKeys//normCitMarker}
@@ -48,7 +47,8 @@ private static void createNormalizedCitationMarkers(CitedKeys sortedCitedKeys, J
      *
      *  Depends on: style, citations and their order.
      */
-    private static void createUniqueLetters(CitedKeys sortedCitedKeys, CitationGroups citationGroups) {
+    private static void createUniqueLetters(
+            CitedKeys sortedCitedKeys, CitationGroups citationGroups) {
         // The entries in the clashingKeys lists preserve
         // firstAppearance order from sortedCitedKeys.values().
         //
@@ -60,7 +60,8 @@ private static void createUniqueLetters(CitedKeys sortedCitedKeys, CitationGroup
             String normCitMarker = OOText.toString(citedKey.getNormalizedCitationMarker().get());
             String citationKey = citedKey.citationKey;
 
-            List<String> clashingKeys = normCitMarkerToClachingKeys.putIfAbsent(normCitMarker, new ArrayList<>(1));
+            List<String> clashingKeys =
+                    normCitMarkerToClachingKeys.putIfAbsent(normCitMarker, new ArrayList<>(1));
             if (clashingKeys == null) {
                 clashingKeys = normCitMarkerToClachingKeys.get(normCitMarker);
             }
@@ -135,7 +136,8 @@ static void produceCitationMarkers(CitationGroups citationGroups, JStyle style)
 
         createNormalizedCitationMarkers(citedKeys, style);
         createUniqueLetters(citedKeys, citationGroups);
-        citationGroups.createPlainBibliographySortedByComparator(OOProcess.AUTHOR_YEAR_TITLE_COMPARATOR);
+        citationGroups.createPlainBibliographySortedByComparator(
+                OOProcess.AUTHOR_YEAR_TITLE_COMPARATOR);
 
         // Mark first appearance of each citationKey
         setIsFirstAppearanceOfSourceInCitations(citationGroups);
@@ -146,9 +148,9 @@ static void produceCitationMarkers(CitationGroups citationGroups, JStyle style)
 
             List<Citation> cits = group.getCitationsInLocalOrder();
             List<CitationMarkerEntry> citationMarkerEntries = OOListUtil.map(cits, e -> e);
-            OOText citMarker = style.createCitationMarker(citationMarkerEntries,
-                                                          inParenthesis,
-                                                          strictlyUnique);
+            OOText citMarker =
+                    style.createCitationMarker(
+                            citationMarkerEntries, inParenthesis, strictlyUnique);
             group.setCitationMarker(Optional.of(citMarker));
         }
     }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOProcessCitationKeyMarkers.java b/src/main/java/org/jabref/logic/openoffice/style/OOProcessCitationKeyMarkers.java
index c7487bf30afc..59e6edde774c 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcessCitationKeyMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcessCitationKeyMarkers.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.openoffice.style;
 
-import java.util.Optional;
-
 import org.jabref.model.openoffice.ootext.OOText;
 import org.jabref.model.openoffice.style.Citation;
 import org.jabref.model.openoffice.style.CitationGroup;
 import org.jabref.model.openoffice.style.CitationGroups;
 import org.jabref.model.openoffice.util.OOListUtil;
 
+import java.util.Optional;
+
 class OOProcessCitationKeyMarkers {
 
-    private OOProcessCitationKeyMarkers() {
-    }
+    private OOProcessCitationKeyMarkers() {}
 
     /**
      *  Produce citation markers for the case when the citation
@@ -20,13 +19,18 @@ private OOProcessCitationKeyMarkers() {
     static void produceCitationMarkers(CitationGroups citationGroups, JStyle style) {
         assert style.isCitationKeyCiteMarkers();
 
-        citationGroups.createPlainBibliographySortedByComparator(OOProcess.AUTHOR_YEAR_TITLE_COMPARATOR);
+        citationGroups.createPlainBibliographySortedByComparator(
+                OOProcess.AUTHOR_YEAR_TITLE_COMPARATOR);
 
         for (CitationGroup group : citationGroups.getCitationGroupsInGlobalOrder()) {
             String citMarker =
-                style.getCitationGroupMarkupBefore()
-                + String.join(",", OOListUtil.map(group.getCitationsInLocalOrder(), Citation::getCitationKey))
-                + style.getCitationGroupMarkupAfter();
+                    style.getCitationGroupMarkupBefore()
+                            + String.join(
+                                    ",",
+                                    OOListUtil.map(
+                                            group.getCitationsInLocalOrder(),
+                                            Citation::getCitationKey))
+                            + style.getCitationGroupMarkupAfter();
             group.setCitationMarker(Optional.of(OOText.fromString(citMarker)));
         }
     }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOProcessNumericMarkers.java b/src/main/java/org/jabref/logic/openoffice/style/OOProcessNumericMarkers.java
index 0142bfd36c54..703362167066 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcessNumericMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcessNumericMarkers.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.openoffice.style;
 
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.model.openoffice.ootext.OOText;
 import org.jabref.model.openoffice.style.CitationGroup;
 import org.jabref.model.openoffice.style.CitationGroups;
 import org.jabref.model.openoffice.style.CitationMarkerNumericEntry;
 import org.jabref.model.openoffice.util.OOListUtil;
 
+import java.util.List;
+import java.util.Optional;
+
 class OOProcessNumericMarkers {
 
-    private OOProcessNumericMarkers() {
-    }
+    private OOProcessNumericMarkers() {}
 
     /**
      * Produce citation markers for the case of numbered citations
@@ -28,11 +27,13 @@ static void produceCitationMarkers(CitationGroups citationGroups, JStyle style)
         if (style.isSortByPosition()) {
             citationGroups.createNumberedBibliographySortedInOrderOfAppearance();
         } else {
-            citationGroups.createNumberedBibliographySortedByComparator(OOProcess.AUTHOR_YEAR_TITLE_COMPARATOR);
+            citationGroups.createNumberedBibliographySortedByComparator(
+                    OOProcess.AUTHOR_YEAR_TITLE_COMPARATOR);
         }
 
         for (CitationGroup group : citationGroups.getCitationGroupsInGlobalOrder()) {
-            List<CitationMarkerNumericEntry> cits = OOListUtil.map(group.getCitationsInLocalOrder(), e -> e);
+            List<CitationMarkerNumericEntry> cits =
+                    OOListUtil.map(group.getCitationsInLocalOrder(), e -> e);
             OOText citMarker = style.getNumCitationMarker2(cits);
             group.setCitationMarker(Optional.of(citMarker));
         }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java b/src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java
index 01f047127e5f..2b96e62cd3a9 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java
@@ -1,5 +1,12 @@
 package org.jabref.logic.openoffice.style;
 
+import org.jabref.logic.citationstyle.CitationStyle;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
+import org.jabref.logic.layout.LayoutFormatterPreferences;
+import org.jabref.logic.openoffice.OpenOfficePreferences;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -8,24 +15,18 @@
 import java.util.List;
 import java.util.Objects;
 
-import org.jabref.logic.citationstyle.CitationStyle;
-import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.layout.LayoutFormatterPreferences;
-import org.jabref.logic.openoffice.OpenOfficePreferences;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class StyleLoader {
 
-    public static final String DEFAULT_AUTHORYEAR_STYLE_PATH = "/resource/openoffice/default_authoryear.jstyle";
-    public static final String DEFAULT_NUMERICAL_STYLE_PATH = "/resource/openoffice/default_numerical.jstyle";
+    public static final String DEFAULT_AUTHORYEAR_STYLE_PATH =
+            "/resource/openoffice/default_authoryear.jstyle";
+    public static final String DEFAULT_NUMERICAL_STYLE_PATH =
+            "/resource/openoffice/default_numerical.jstyle";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(StyleLoader.class);
 
     // All internal styles
-    private final List<String> internalStyleFiles = Arrays.asList(DEFAULT_AUTHORYEAR_STYLE_PATH,
-            DEFAULT_NUMERICAL_STYLE_PATH);
+    private final List<String> internalStyleFiles =
+            Arrays.asList(DEFAULT_AUTHORYEAR_STYLE_PATH, DEFAULT_NUMERICAL_STYLE_PATH);
 
     private final OpenOfficePreferences openOfficePreferences;
     private final LayoutFormatterPreferences layoutFormatterPreferences;
@@ -36,9 +37,10 @@ public class StyleLoader {
     private final List<JStyle> internalStyles = new ArrayList<>();
     private final List<JStyle> externalStyles = new ArrayList<>();
 
-    public StyleLoader(OpenOfficePreferences openOfficePreferences,
-                       LayoutFormatterPreferences formatterPreferences,
-                       JournalAbbreviationRepository abbreviationRepository) {
+    public StyleLoader(
+            OpenOfficePreferences openOfficePreferences,
+            LayoutFormatterPreferences formatterPreferences,
+            JournalAbbreviationRepository abbreviationRepository) {
         this.openOfficePreferences = Objects.requireNonNull(openOfficePreferences);
         this.layoutFormatterPreferences = Objects.requireNonNull(formatterPreferences);
         this.abbreviationRepository = Objects.requireNonNull(abbreviationRepository);
@@ -61,7 +63,9 @@ public List<JStyle> getStyles() {
     public boolean addStyleIfValid(String filename) {
         Objects.requireNonNull(filename);
         try {
-            JStyle newStyle = new JStyle(Path.of(filename), layoutFormatterPreferences, abbreviationRepository);
+            JStyle newStyle =
+                    new JStyle(
+                            Path.of(filename), layoutFormatterPreferences, abbreviationRepository);
             if (externalStyles.contains(newStyle)) {
                 LOGGER.info("External style file {} already existing.", filename);
             } else if (newStyle.isValid()) {
@@ -86,7 +90,11 @@ private void loadExternalStyles() {
         List<String> lists = openOfficePreferences.getExternalStyles();
         for (String filename : lists) {
             try {
-                JStyle style = new JStyle(Path.of(filename), layoutFormatterPreferences, abbreviationRepository);
+                JStyle style =
+                        new JStyle(
+                                Path.of(filename),
+                                layoutFormatterPreferences,
+                                abbreviationRepository);
                 if (style.isValid()) { // Problem!
                     externalStyles.add(style);
                 } else {
@@ -105,7 +113,8 @@ private void loadInternalStyles() {
         internalStyles.clear();
         for (String filename : internalStyleFiles) {
             try {
-                internalStyles.add(new JStyle(filename, layoutFormatterPreferences, abbreviationRepository));
+                internalStyles.add(
+                        new JStyle(filename, layoutFormatterPreferences, abbreviationRepository));
             } catch (IOException e) {
                 LOGGER.info("Problem reading internal style file {}", filename, e);
             }
@@ -158,7 +167,7 @@ public OOStyle getUsedStyleUnified() {
             openOfficePreferences.setCurrentJStyle(internalStyles.getFirst().getPath());
             return internalStyles.getFirst();
         } else if (gotStyle instanceof CitationStyle citationStyle) {
-                return citationStyle;
+            return citationStyle;
         }
         return null;
     }
diff --git a/src/main/java/org/jabref/logic/os/OS.java b/src/main/java/org/jabref/logic/os/OS.java
index 3bba6e3ee334..119535a376b4 100644
--- a/src/main/java/org/jabref/logic/os/OS.java
+++ b/src/main/java/org/jabref/logic/os/OS.java
@@ -1,5 +1,15 @@
 package org.jabref.logic.os;
 
+import com.github.javakeyring.BackendNotSupportedException;
+import com.github.javakeyring.Keyring;
+import com.github.javakeyring.PasswordAccessException;
+
+import mslinks.ShellLink;
+import mslinks.ShellLinkException;
+
+import org.jabref.model.strings.StringUtil;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -10,28 +20,21 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jabref.model.strings.StringUtil;
-
-import com.github.javakeyring.BackendNotSupportedException;
-import com.github.javakeyring.Keyring;
-import com.github.javakeyring.PasswordAccessException;
-import mslinks.ShellLink;
-import mslinks.ShellLinkException;
-import org.slf4j.LoggerFactory;
-
 /**
  * For GUI-specific things, see {@link org.jabref.gui.desktop.os.NativeDesktop}
  */
 public class OS {
     // No LOGGER may be initialized directly
-    // Otherwise, org.jabref.Launcher.addLogToDisk will fail, because tinylog's properties are frozen
+    // Otherwise, org.jabref.Launcher.addLogToDisk will fail, because tinylog's properties are
+    // frozen
 
     public static final String NEWLINE = System.lineSeparator();
     public static final String APP_DIR_APP_NAME = "jabref";
     public static final String APP_DIR_APP_AUTHOR = "org.jabref";
 
     // https://commons.apache.org/proper/commons-lang/javadocs/api-2.6/org/apache/commons/lang/SystemUtils.html
-    private static final String OS_NAME = System.getProperty("os.name", "unknown").toLowerCase(Locale.ROOT);
+    private static final String OS_NAME =
+            System.getProperty("os.name", "unknown").toLowerCase(Locale.ROOT);
     public static final boolean LINUX = OS_NAME.startsWith("linux");
     public static final boolean WINDOWS = OS_NAME.startsWith("win");
     public static final boolean OS_X = OS_NAME.startsWith("mac");
@@ -40,7 +43,8 @@ public class OS {
 
     public static String getHostName() {
         String hostName;
-        // Following code inspired by https://commons.apache.org/proper/commons-lang/apidocs/org/apache/commons/lang3/SystemUtils.html#getHostName--
+        // Following code inspired by
+        // https://commons.apache.org/proper/commons-lang/apidocs/org/apache/commons/lang3/SystemUtils.html#getHostName--
         // See also https://stackoverflow.com/a/20793241/873282
         hostName = System.getenv("HOSTNAME");
         if (StringUtil.isBlank(hostName)) {
@@ -49,9 +53,9 @@ public static String getHostName() {
         if (StringUtil.isBlank(hostName)) {
             try {
                 hostName = InetAddress.getLocalHost().getHostName();
-            } catch (
-                    UnknownHostException e) {
-                LoggerFactory.getLogger(OS.class).info("Hostname not found. Using \"localhost\" as fallback.", e);
+            } catch (UnknownHostException e) {
+                LoggerFactory.getLogger(OS.class)
+                        .info("Hostname not found. Using \"localhost\" as fallback.", e);
                 hostName = "localhost";
             }
         }
@@ -65,12 +69,10 @@ public static boolean isKeyringAvailable() {
                 return false;
             }
             keyring.deletePassword("JabRef", "keyringTest");
-        } catch (
-                BackendNotSupportedException ex) {
+        } catch (BackendNotSupportedException ex) {
             LoggerFactory.getLogger(OS.class).warn("Credential store not supported.");
             return false;
-        } catch (
-                PasswordAccessException ex) {
+        } catch (PasswordAccessException ex) {
             LoggerFactory.getLogger(OS.class).warn("Password storage in credential store failed.");
             return false;
         } catch (Exception ex) {
@@ -85,17 +87,19 @@ public static String detectProgramPath(String programName, String directoryName)
             return programName;
         }
         if (Objects.equals(programName, "texworks")) {
-            Path texworksLinkPath = Path.of(System.getenv("APPDATA") + "\\Microsoft\\Windows\\Start Menu\\Programs\\MiKTeX\\TeXworks.lnk");
+            Path texworksLinkPath =
+                    Path.of(
+                            System.getenv("APPDATA")
+                                    + "\\Microsoft\\Windows\\Start Menu\\Programs\\MiKTeX\\TeXworks.lnk");
             if (Files.exists(texworksLinkPath)) {
                 try {
                     ShellLink link = new ShellLink(texworksLinkPath);
                     return link.resolveTarget();
-                } catch (
-                        IOException |
-                        ShellLinkException e) {
+                } catch (IOException | ShellLinkException e) {
                     // Static logger instance cannot be used. See the class comment.
                     Logger logger = Logger.getLogger(OS.class.getName());
-                    logger.log(Level.WARNING, "Had an error while reading .lnk file for TeXworks", e);
+                    logger.log(
+                            Level.WARNING, "Had an error while reading .lnk file for TeXworks", e);
                 }
             }
         }
@@ -118,10 +122,12 @@ public static String detectProgramPath(String programName, String directoryName)
         return "";
     }
 
-    private static String getProgramPath(String programName, String directoryName, String progFiles) {
+    private static String getProgramPath(
+            String programName, String directoryName, String progFiles) {
         Path programPath;
         if ((directoryName != null) && !directoryName.isEmpty()) {
-            programPath = Path.of(progFiles, directoryName, programName + DEFAULT_EXECUTABLE_EXTENSION);
+            programPath =
+                    Path.of(progFiles, directoryName, programName + DEFAULT_EXECUTABLE_EXTENSION);
         } else {
             programPath = Path.of(progFiles, programName + DEFAULT_EXECUTABLE_EXTENSION);
         }
diff --git a/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java b/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java
index 647bde6d181c..ec287678531f 100644
--- a/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java
+++ b/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.pdf;
 
+import org.jabref.model.pdf.FileAnnotation;
+
 import java.nio.file.Path;
 import java.util.List;
 
-import org.jabref.model.pdf.FileAnnotation;
-
 public interface AnnotationImporter {
 
     List<FileAnnotation> importAnnotations(final Path path);
diff --git a/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java b/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
index e4e09ac30d2e..0930ac3b00d5 100644
--- a/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
+++ b/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
@@ -1,17 +1,17 @@
 package org.jabref.logic.pdf;
 
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import org.jabref.logic.FilePreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.pdf.FileAnnotation;
 
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * Here all PDF files attached to a BibEntry are scanned for annotations using a PdfAnnotationImporter.
  */
@@ -33,8 +33,9 @@ public EntryAnnotationImporter(BibEntry entry) {
      */
     private List<LinkedFile> getFilteredFileList() {
         return entry.getFiles().stream()
-                    .filter(parsedFileField -> "pdf".equalsIgnoreCase(parsedFileField.getFileType()))
-                    .filter(parsedFileField -> !parsedFileField.isOnlineLink()).collect(Collectors.toList());
+                .filter(parsedFileField -> "pdf".equalsIgnoreCase(parsedFileField.getFileType()))
+                .filter(parsedFileField -> !parsedFileField.isOnlineLink())
+                .collect(Collectors.toList());
     }
 
     /**
@@ -43,14 +44,17 @@ private List<LinkedFile> getFilteredFileList() {
      * @param databaseContext The context is needed for the importer.
      * @return Map from each PDF to a list of file annotations
      */
-    public Map<Path, List<FileAnnotation>> importAnnotationsFromFiles(BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+    public Map<Path, List<FileAnnotation>> importAnnotationsFromFiles(
+            BibDatabaseContext databaseContext, FilePreferences filePreferences) {
         Map<Path, List<FileAnnotation>> annotations = new HashMap<>();
         AnnotationImporter importer = new PdfAnnotationImporter();
 
-        // import annotationsOfFiles if the selected files are valid which is checked in getFilteredFileList()
+        // import annotationsOfFiles if the selected files are valid which is checked in
+        // getFilteredFileList()
         for (LinkedFile linkedFile : this.getFilteredFileList()) {
-            linkedFile.findIn(databaseContext, filePreferences)
-                      .ifPresent(file -> annotations.put(file, importer.importAnnotations(file)));
+            linkedFile
+                    .findIn(databaseContext, filePreferences)
+                    .ifPresent(file -> annotations.put(file, importer.importAnnotations(file)));
         }
         return annotations;
     }
diff --git a/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java b/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
index 2a3a0cc4a862..6337870778fa 100644
--- a/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
+++ b/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
@@ -1,25 +1,25 @@
 package org.jabref.logic.pdf;
 
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 
 import org.jabref.logic.FilePreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.pdf.FileAnnotation;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+
 public class FileAnnotationCache {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FileAnnotationCache.class);
     // cache size in entries
-    private final static int CACHE_SIZE = 10;
+    private static final int CACHE_SIZE = 10;
 
     // the inner list holds the annotations per file, the outer collection maps this to a BibEntry.
     private LoadingCache<BibEntry, Map<Path, List<FileAnnotation>>> annotationCache;
@@ -28,16 +28,22 @@ public class FileAnnotationCache {
      * Creates an empty fil annotation cache. Required to allow the annotation cache to be injected into views without
      * hitting the bug https://github.com/AdamBien/afterburner.fx/issues/71 .
      */
-    public FileAnnotationCache() {
-    }
+    public FileAnnotationCache() {}
 
     public FileAnnotationCache(BibDatabaseContext context, FilePreferences filePreferences) {
-        annotationCache = CacheBuilder.newBuilder().maximumSize(CACHE_SIZE).build(new CacheLoader<BibEntry, Map<Path, List<FileAnnotation>>>() {
-            @Override
-            public Map<Path, List<FileAnnotation>> load(BibEntry entry) throws Exception {
-                return new EntryAnnotationImporter(entry).importAnnotationsFromFiles(context, filePreferences);
-            }
-        });
+        annotationCache =
+                CacheBuilder.newBuilder()
+                        .maximumSize(CACHE_SIZE)
+                        .build(
+                                new CacheLoader<BibEntry, Map<Path, List<FileAnnotation>>>() {
+                                    @Override
+                                    public Map<Path, List<FileAnnotation>> load(BibEntry entry)
+                                            throws Exception {
+                                        return new EntryAnnotationImporter(entry)
+                                                .importAnnotationsFromFiles(
+                                                        context, filePreferences);
+                                    }
+                                });
     }
 
     /**
@@ -47,12 +53,16 @@ public Map<Path, List<FileAnnotation>> load(BibEntry entry) throws Exception {
      * @return Map containing a list of annotations in a list for each file
      */
     public Map<Path, List<FileAnnotation>> getFromCache(BibEntry entry) {
-        LOGGER.debug("Loading Bibentry '%s' from cache.".formatted(entry.getCitationKey().orElse(entry.getId())));
+        LOGGER.debug(
+                "Loading Bibentry '%s' from cache."
+                        .formatted(entry.getCitationKey().orElse(entry.getId())));
         return annotationCache.getUnchecked(entry);
     }
 
     public void remove(BibEntry entry) {
-        LOGGER.debug("Deleted Bibentry '%s' from cache.".formatted(entry.getCitationKey().orElse(entry.getId())));
+        LOGGER.debug(
+                "Deleted Bibentry '%s' from cache."
+                        .formatted(entry.getCitationKey().orElse(entry.getId())));
         annotationCache.invalidate(entry);
     }
 }
diff --git a/src/main/java/org/jabref/logic/pdf/InterruptablePDFTextStripper.java b/src/main/java/org/jabref/logic/pdf/InterruptablePDFTextStripper.java
index ec136da89599..caac3f14eb22 100644
--- a/src/main/java/org/jabref/logic/pdf/InterruptablePDFTextStripper.java
+++ b/src/main/java/org/jabref/logic/pdf/InterruptablePDFTextStripper.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.pdf;
 
-import java.io.IOException;
-
 import javafx.beans.property.ReadOnlyBooleanProperty;
 
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.text.PDFTextStripper;
 
+import java.io.IOException;
+
 public class InterruptablePDFTextStripper extends PDFTextStripper {
     private final ReadOnlyBooleanProperty shutdownSignal;
 
diff --git a/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java b/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
index 0dadd01e0198..0b0e5d44b88e 100644
--- a/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
+++ b/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
@@ -1,5 +1,17 @@
 package org.jabref.logic.pdf;
 
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.cos.COSArray;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageTree;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
+import org.jabref.model.pdf.FileAnnotation;
+import org.jabref.model.pdf.FileAnnotationType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -11,19 +23,6 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import org.jabref.model.pdf.FileAnnotation;
-import org.jabref.model.pdf.FileAnnotationType;
-
-import org.apache.pdfbox.Loader;
-import org.apache.pdfbox.cos.COSArray;
-import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageTree;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class PdfAnnotationImporter implements AnnotationImporter {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PdfAnnotationImporter.class);
@@ -54,8 +53,10 @@ public List<FileAnnotation> importAnnotations(final Path path) {
                     if (FileAnnotationType.isMarkedFileAnnotationType(annotation.getSubtype())) {
                         annotationsList.add(createMarkedAnnotations(pageIndex, page, annotation));
                     } else {
-                        FileAnnotation fileAnnotation = new FileAnnotation(annotation, pageIndex + 1);
-                        if ((fileAnnotation.getContent() != null) && !fileAnnotation.getContent().isEmpty()) {
+                        FileAnnotation fileAnnotation =
+                                new FileAnnotation(annotation, pageIndex + 1);
+                        if ((fileAnnotation.getContent() != null)
+                                && !fileAnnotation.getContent().isEmpty()) {
                             annotationsList.add(fileAnnotation);
                         }
                     }
@@ -72,27 +73,43 @@ private boolean isSupportedAnnotationType(PDAnnotation annotation) {
             return false;
         }
         if ("Link".equals(annotation.getSubtype()) || "Widget".equals(annotation.getSubtype())) {
-            LOGGER.debug("{} is excluded from the supported file annotations", annotation.getSubtype());
+            LOGGER.debug(
+                    "{} is excluded from the supported file annotations", annotation.getSubtype());
             return false;
         }
         try {
-            if (!Arrays.asList(FileAnnotationType.values()).contains(FileAnnotationType.valueOf(annotation.getSubtype()))) {
+            if (!Arrays.asList(FileAnnotationType.values())
+                    .contains(FileAnnotationType.valueOf(annotation.getSubtype()))) {
                 return false;
             }
         } catch (IllegalArgumentException e) {
-            LOGGER.debug("Could not parse the FileAnnotation {} into any known FileAnnotationType. It was {}.", annotation, annotation.getSubtype());
+            LOGGER.debug(
+                    "Could not parse the FileAnnotation {} into any known FileAnnotationType. It was {}.",
+                    annotation,
+                    annotation.getSubtype());
         }
         return true;
     }
 
-    private FileAnnotation createMarkedAnnotations(int pageIndex, PDPage page, PDAnnotation annotation) {
-        FileAnnotation annotationBelongingToMarking = new FileAnnotation(
-                annotation.getCOSObject().getString(COSName.T), FileAnnotation.extractModifiedTime(annotation.getModifiedDate()),
-                pageIndex + 1, annotation.getContents(), FileAnnotationType.valueOf(annotation.getSubtype().toUpperCase(Locale.ROOT)), Optional.empty());
+    private FileAnnotation createMarkedAnnotations(
+            int pageIndex, PDPage page, PDAnnotation annotation) {
+        FileAnnotation annotationBelongingToMarking =
+                new FileAnnotation(
+                        annotation.getCOSObject().getString(COSName.T),
+                        FileAnnotation.extractModifiedTime(annotation.getModifiedDate()),
+                        pageIndex + 1,
+                        annotation.getContents(),
+                        FileAnnotationType.valueOf(
+                                annotation.getSubtype().toUpperCase(Locale.ROOT)),
+                        Optional.empty());
 
         if (annotationBelongingToMarking.getAnnotationType().isLinkedFileAnnotationType()) {
             try {
-                COSArray boundingBoxes = (COSArray) annotation.getCOSObject().getDictionaryObject(COSName.getPDFName("QuadPoints"));
+                COSArray boundingBoxes =
+                        (COSArray)
+                                annotation
+                                        .getCOSObject()
+                                        .getDictionaryObject(COSName.getPDFName("QuadPoints"));
                 annotation.setContents(new TextExtractor(page, boundingBoxes).extractMarkedText());
             } catch (IOException e) {
                 annotation.setContents("JabRef: Could not extract any marked text!");
diff --git a/src/main/java/org/jabref/logic/pdf/TextExtractor.java b/src/main/java/org/jabref/logic/pdf/TextExtractor.java
index 4cbe9e1f0242..d4f208af9c12 100644
--- a/src/main/java/org/jabref/logic/pdf/TextExtractor.java
+++ b/src/main/java/org/jabref/logic/pdf/TextExtractor.java
@@ -1,22 +1,22 @@
 package org.jabref.logic.pdf;
 
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.util.Objects;
-
-import org.jabref.architecture.AllowedToUseAwt;
-
 import org.apache.pdfbox.cos.COSArray;
 import org.apache.pdfbox.cos.COSFloat;
 import org.apache.pdfbox.cos.COSInteger;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.text.PDFTextStripperByArea;
+import org.jabref.architecture.AllowedToUseAwt;
+
+import java.awt.geom.Rectangle2D;
+import java.io.IOException;
+import java.util.Objects;
 
 /**
  * Extracts the text of marked annotations using bounding boxes.
  */
-@AllowedToUseAwt("org.apache.pdfbox.text.PDFTextStripperByArea.addRegion uses AWT's Rectangle to indicate a region")
+@AllowedToUseAwt(
+        "org.apache.pdfbox.text.PDFTextStripperByArea.addRegion uses AWT's Rectangle to indicate a region")
 public final class TextExtractor {
 
     private final COSArray boundingBoxes;
@@ -42,11 +42,15 @@ public String extractMarkedText() throws IOException {
         PDFTextStripperByArea stripperByArea = new PDFTextStripperByArea();
         String markedText = "";
 
-        // Iterates over the array of segments. Each segment consists of 8 points forming a bounding box.
+        // Iterates over the array of segments. Each segment consists of 8 points forming a bounding
+        // box.
         int totalSegments = boundingBoxes.size() / 8;
-        for (int currentSegment = 1, segmentPointer = 0; currentSegment <= totalSegments; currentSegment++, segmentPointer += 8) {
+        for (int currentSegment = 1, segmentPointer = 0;
+                currentSegment <= totalSegments;
+                currentSegment++, segmentPointer += 8) {
             try {
-                stripperByArea.addRegion("markedRegion", calculateSegmentBoundingBox(boundingBoxes, segmentPointer));
+                stripperByArea.addRegion(
+                        "markedRegion", calculateSegmentBoundingBox(boundingBoxes, segmentPointer));
                 stripperByArea.extractRegions(page);
 
                 markedText = markedText.concat(stripperByArea.getTextForRegion("markedRegion"));
diff --git a/src/main/java/org/jabref/logic/preferences/AutoCompleteFirstNameMode.java b/src/main/java/org/jabref/logic/preferences/AutoCompleteFirstNameMode.java
index 63d654ffb7c7..e4205e5f7d54 100644
--- a/src/main/java/org/jabref/logic/preferences/AutoCompleteFirstNameMode.java
+++ b/src/main/java/org/jabref/logic/preferences/AutoCompleteFirstNameMode.java
@@ -16,7 +16,8 @@ public static AutoCompleteFirstNameMode parse(String input) {
         try {
             return AutoCompleteFirstNameMode.valueOf(input);
         } catch (IllegalArgumentException ex) {
-            // Should only occur when preferences are set directly via preferences.put and not via setFirstnameMode
+            // Should only occur when preferences are set directly via preferences.put and not via
+            // setFirstnameMode
             return AutoCompleteFirstNameMode.BOTH;
         }
     }
diff --git a/src/main/java/org/jabref/logic/preferences/CliPreferences.java b/src/main/java/org/jabref/logic/preferences/CliPreferences.java
index 013c7f784287..5a7a979be4df 100644
--- a/src/main/java/org/jabref/logic/preferences/CliPreferences.java
+++ b/src/main/java/org/jabref/logic/preferences/CliPreferences.java
@@ -1,9 +1,5 @@
 package org.jabref.logic.preferences;
 
-import java.nio.file.Path;
-import java.util.Map;
-import java.util.prefs.BackingStoreException;
-
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.InternalPreferences;
 import org.jabref.logic.JabRefException;
@@ -31,9 +27,12 @@
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.BibEntryTypesManager;
-
 import org.jvnet.hk2.annotations.Contract;
 
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.prefs.BackingStoreException;
+
 @Contract
 public interface CliPreferences {
     void clear() throws BackingStoreException;
diff --git a/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java b/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
index 3423df38a8db..78cdcfe8d29d 100644
--- a/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
+++ b/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
@@ -1,31 +1,13 @@
 package org.jabref.logic.preferences;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.prefs.BackingStoreException;
-import java.util.prefs.InvalidPreferencesFormatException;
-import java.util.prefs.Preferences;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import com.airhacks.afterburner.injection.Injector;
+import com.github.javakeyring.Keyring;
+import com.github.javakeyring.PasswordAccessException;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Splitter;
+import com.tobiasdiez.easybind.EasyBind;
+
+import jakarta.inject.Singleton;
 
 import javafx.beans.InvalidationListener;
 import javafx.collections.ListChangeListener;
@@ -101,18 +83,37 @@
 import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.strings.StringUtil;
-
-import com.airhacks.afterburner.injection.Injector;
-import com.github.javakeyring.Keyring;
-import com.github.javakeyring.PasswordAccessException;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Splitter;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Singleton;
 import org.jvnet.hk2.annotations.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.prefs.BackingStoreException;
+import java.util.prefs.InvalidPreferencesFormatException;
+import java.util.prefs.Preferences;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 /**
  * The {@code JabRefPreferences} class provides the preferences and their defaults using the JDK {@code java.util.prefs}
  * class.
@@ -185,7 +186,8 @@ public class JabRefCliPreferences implements CliPreferences {
     // merge related
     public static final String MERGE_ENTRIES_DIFF_MODE = "mergeEntriesDiffMode";
     public static final String MERGE_ENTRIES_SHOULD_SHOW_DIFF = "mergeEntriesShouldShowDiff";
-    public static final String MERGE_ENTRIES_SHOULD_SHOW_UNIFIED_DIFF = "mergeEntriesShouldShowUnifiedDiff";
+    public static final String MERGE_ENTRIES_SHOULD_SHOW_UNIFIED_DIFF =
+            "mergeEntriesShouldShowUnifiedDiff";
     public static final String MERGE_ENTRIES_HIGHLIGHT_WORDS = "mergeEntriesHighlightWords";
 
     public static final String MERGE_SHOW_ONLY_CHANGED_FIELDS = "mergeShowOnlyChangedFields";
@@ -194,7 +196,8 @@ public class JabRefCliPreferences implements CliPreferences {
 
     public static final String MERGE_APPLY_TO_ALL_ENTRIES = "mergeApplyToAllEntries";
 
-    public static final String DUPLICATE_RESOLVER_DECISION_RESULT_ALL_ENTRIES = "duplicateResolverDecisionResult";
+    public static final String DUPLICATE_RESOLVER_DECISION_RESULT_ALL_ENTRIES =
+            "duplicateResolverDecisionResult";
 
     public static final String CUSTOM_EXPORT_FORMAT = "customExportFormat";
     public static final String CUSTOM_IMPORT_FORMAT = "customImportFormat";
@@ -217,7 +220,8 @@ public class JabRefCliPreferences implements CliPreferences {
     public static final String GROBID_URL = "grobidURL";
 
     public static final String DEFAULT_CITATION_KEY_PATTERN = "defaultBibtexKeyPattern";
-    public static final String UNWANTED_CITATION_KEY_CHARACTERS = "defaultUnwantedBibtexKeyCharacters";
+    public static final String UNWANTED_CITATION_KEY_CHARACTERS =
+            "defaultUnwantedBibtexKeyCharacters";
     public static final String CONFIRM_LINKED_FILE_DELETE = "confirmLinkedFileDelete";
     public static final String TRASH_INSTEAD_OF_DELETE = "trashInsteadOfDelete";
     public static final String WARN_BEFORE_OVERWRITING_KEY = "warnBeforeOverwritingKey";
@@ -232,7 +236,8 @@ public class JabRefCliPreferences implements CliPreferences {
     public static final String LOCAL_AUTO_SAVE = "localAutoSave";
     public static final String AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY = "regExpSearchExpression";
     public static final String AUTOLINK_USE_REG_EXP_SEARCH_KEY = "useRegExpSearch";
-    // bibLocAsPrimaryDir is a misleading antique variable name, we keep it for reason of compatibility
+    // bibLocAsPrimaryDir is a misleading antique variable name, we keep it for reason of
+    // compatibility
 
     public static final String STORE_RELATIVE_TO_BIB = "bibLocAsPrimaryDir";
     public static final String CUSTOM_TAB_NAME = "customTabName_";
@@ -260,6 +265,7 @@ public class JabRefCliPreferences implements CliPreferences {
      * The OpenOffice/LibreOffice connection preferences are: OO_PATH main directory for OO/LO installation, used to detect location on Win/macOS when using manual connect OO_EXECUTABLE_PATH path to soffice-file OO_JARS_PATH directory that contains juh.jar, jurt.jar, ridl.jar, unoil.jar OO_SYNC_WHEN_CITING true if the reference list is updated when adding a new citation OO_SHOW_PANEL true if the OO panel is shown on startup OO_USE_ALL_OPEN_DATABASES true if all databases should be used when citing OO_BIBLIOGRAPHY_STYLE_FILE path to the used style file OO_EXTERNAL_STYLE_FILES list with paths to external style files STYLES_*_* size and position of "Select style" dialog
      */
     public static final String OO_EXECUTABLE_PATH = "ooExecutablePath";
+
     public static final String OO_SYNC_WHEN_CITING = "syncOOWhenCiting";
     public static final String OO_USE_ALL_OPEN_BASES = "useAllOpenBases";
     public static final String OO_BIBLIOGRAPHY_STYLE_FILE = "ooBibliographyStyleFile";
@@ -280,7 +286,8 @@ public class JabRefCliPreferences implements CliPreferences {
     public static final Character STRINGLIST_DELIMITER = ';';
 
     // TODO: USed by both importer preferences and workspace preferences
-    protected static final String WARN_ABOUT_DUPLICATES_IN_INSPECTION = "warnAboutDuplicatesInInspection";
+    protected static final String WARN_ABOUT_DUPLICATES_IN_INSPECTION =
+            "warnAboutDuplicatesInInspection";
 
     // Helper string
     protected static final String USER_HOME = System.getProperty("user.home");
@@ -320,9 +327,11 @@ public class JabRefCliPreferences implements CliPreferences {
 
     // Protected terms
     private static final String PROTECTED_TERMS_ENABLED_EXTERNAL = "protectedTermsEnabledExternal";
-    private static final String PROTECTED_TERMS_DISABLED_EXTERNAL = "protectedTermsDisabledExternal";
+    private static final String PROTECTED_TERMS_DISABLED_EXTERNAL =
+            "protectedTermsDisabledExternal";
     private static final String PROTECTED_TERMS_ENABLED_INTERNAL = "protectedTermsEnabledInternal";
-    private static final String PROTECTED_TERMS_DISABLED_INTERNAL = "protectedTermsDisabledInternal";
+    private static final String PROTECTED_TERMS_DISABLED_INTERNAL =
+            "protectedTermsDisabledInternal";
 
     // Dialog states
     private static final String PREFS_EXPORT_PATH = "prefsExportPath";
@@ -364,6 +373,7 @@ public class JabRefCliPreferences implements CliPreferences {
 
     // The only instance of this class:
     private static JabRefCliPreferences singleton;
+
     /**
      * HashMap that contains all preferences which are set by default
      */
@@ -418,9 +428,11 @@ protected JabRefCliPreferences() {
         // load user preferences
         prefs = PREFS_NODE;
 
-        // Since some of the preference settings themselves use localized strings, we cannot set the language after
+        // Since some of the preference settings themselves use localized strings, we cannot set the
+        // language after
         // the initialization of the preferences in main
-        // Otherwise that language framework will be instantiated and more importantly, statically initialized preferences
+        // Otherwise that language framework will be instantiated and more importantly, statically
+        // initialized preferences
         // will never be translated.
         Localization.setLanguage(getLanguage());
 
@@ -431,11 +443,14 @@ protected JabRefCliPreferences() {
         defaults.put(SEARCH_WINDOW_HEIGHT, 176.0);
         defaults.put(SEARCH_WINDOW_WIDTH, 600.0);
         defaults.put(SEARCH_WINDOW_DIVIDER_POS, 0.5);
-        defaults.put(SEARCH_CATALOGS, convertListToString(List.of(
-                ACMPortalFetcher.FETCHER_NAME,
-                SpringerFetcher.FETCHER_NAME,
-                DBLPFetcher.FETCHER_NAME,
-                IEEE.FETCHER_NAME)));
+        defaults.put(
+                SEARCH_CATALOGS,
+                convertListToString(
+                        List.of(
+                                ACMPortalFetcher.FETCHER_NAME,
+                                SpringerFetcher.FETCHER_NAME,
+                                DBLPFetcher.FETCHER_NAME,
+                                IEEE.FETCHER_NAME)));
         defaults.put(IMPORTERS_ENABLED, Boolean.TRUE);
         defaults.put(GENERATE_KEY_ON_IMPORT, Boolean.TRUE);
 
@@ -470,9 +485,9 @@ protected JabRefCliPreferences() {
         defaults.put(PROXY_PERSIST_PASSWORD, Boolean.FALSE);
 
         // SSL
-        defaults.put(TRUSTSTORE_PATH, Directories
-                                        .getSslDirectory()
-                                        .resolve("truststore.jks").toString());
+        defaults.put(
+                TRUSTSTORE_PATH,
+                Directories.getSslDirectory().resolve("truststore.jks").toString());
 
         // system locale as default
         defaults.put(LANGUAGE, Locale.getDefault().getLanguage());
@@ -523,7 +538,9 @@ protected JabRefCliPreferences() {
         defaults.put(DEFAULT_OWNER, System.getProperty("user.name"));
         defaults.put(MEMORY_STICK_MODE, Boolean.FALSE);
 
-        defaults.put(PROTECTED_TERMS_ENABLED_INTERNAL, convertListToString(ProtectedTermsLoader.getInternalLists()));
+        defaults.put(
+                PROTECTED_TERMS_ENABLED_INTERNAL,
+                convertListToString(ProtectedTermsLoader.getInternalLists()));
         defaults.put(PROTECTED_TERMS_DISABLED_INTERNAL, "");
         defaults.put(PROTECTED_TERMS_ENABLED_EXTERNAL, "");
         defaults.put(PROTECTED_TERMS_DISABLED_EXTERNAL, "");
@@ -542,9 +559,13 @@ protected JabRefCliPreferences() {
         defaults.put(OO_USE_ALL_OPEN_BASES, Boolean.TRUE);
         defaults.put(OO_BIBLIOGRAPHY_STYLE_FILE, StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH);
         defaults.put(OO_EXTERNAL_STYLE_FILES, "");
-        defaults.put(OO_CURRENT_STYLE, CitationStyle.getDefault().getPath()); // Default CSL Style is IEEE
+        defaults.put(
+                OO_CURRENT_STYLE,
+                CitationStyle.getDefault().getPath()); // Default CSL Style is IEEE
 
-        defaults.put(FETCHER_CUSTOM_KEY_NAMES, "Springer;IEEEXplore;SAO/NASA ADS;ScienceDirect;Biodiversity Heritage");
+        defaults.put(
+                FETCHER_CUSTOM_KEY_NAMES,
+                "Springer;IEEEXplore;SAO/NASA ADS;ScienceDirect;Biodiversity Heritage");
         defaults.put(FETCHER_CUSTOM_KEY_USES, "FALSE;FALSE;FALSE;FALSE;FALSE");
         defaults.put(FETCHER_CUSTOM_KEY_PERSIST, Boolean.FALSE);
 
@@ -556,7 +577,9 @@ protected JabRefCliPreferences() {
         defaults.put(KEEP_DOWNLOAD_URL, Boolean.TRUE);
         defaults.put(DEFAULT_CITATION_KEY_PATTERN, "[auth][year]");
         defaults.put(UNWANTED_CITATION_KEY_CHARACTERS, "-`ʹ:!;?^");
-        defaults.put(RESOLVE_STRINGS_FOR_FIELDS, "author;booktitle;editor;editora;editorb;editorc;institution;issuetitle;journal;journalsubtitle;journaltitle;mainsubtitle;month;publisher;shortauthor;shorteditor;subtitle;titleaddon");
+        defaults.put(
+                RESOLVE_STRINGS_FOR_FIELDS,
+                "author;booktitle;editor;editora;editorb;editorc;institution;issuetitle;journal;journalsubtitle;journaltitle;mainsubtitle;month;publisher;shortauthor;shorteditor;subtitle;titleaddon");
         defaults.put(DO_NOT_RESOLVE_STRINGS, Boolean.FALSE);
         defaults.put(NON_WRAPPABLE_FIELDS, "pdf;ps;url;doi;file;isbn;issn");
         defaults.put(WARN_ABOUT_DUPLICATES_IN_INSPECTION, Boolean.TRUE);
@@ -583,15 +606,21 @@ protected JabRefCliPreferences() {
         defaults.put(AUTOLINK_FILES_ENABLED, Boolean.TRUE);
         defaults.put(LOCAL_AUTO_SAVE, Boolean.FALSE);
         defaults.put(ALLOW_INTEGER_EDITION_BIBTEX, Boolean.FALSE);
-        // Curly brackets ({}) are the default delimiters, not quotes (") as these cause trouble when they appear within the field value:
+        // Curly brackets ({}) are the default delimiters, not quotes (") as these cause trouble
+        // when they appear within the field value:
         // Currently, JabRef does not escape them
         defaults.put(KEY_GEN_FIRST_LETTER_A, Boolean.TRUE);
         defaults.put(KEY_GEN_ALWAYS_ADD_LETTER, Boolean.FALSE);
 
         defaults.put(ASK_AUTO_NAMING_PDFS_AGAIN, Boolean.TRUE);
-        defaults.put(CLEANUP_JOBS, convertListToString(getDefaultCleanupJobs().stream().map(Enum::name).toList()));
+        defaults.put(
+                CLEANUP_JOBS,
+                convertListToString(getDefaultCleanupJobs().stream().map(Enum::name).toList()));
         defaults.put(CLEANUP_FIELD_FORMATTERS_ENABLED, Boolean.FALSE);
-        defaults.put(CLEANUP_FIELD_FORMATTERS, FieldFormatterCleanups.getMetaDataString(FieldFormatterCleanups.DEFAULT_SAVE_ACTIONS, OS.NEWLINE));
+        defaults.put(
+                CLEANUP_FIELD_FORMATTERS,
+                FieldFormatterCleanups.getMetaDataString(
+                        FieldFormatterCleanups.DEFAULT_SAVE_ACTIONS, OS.NEWLINE));
 
         // use citation key appended with filename as default pattern
         defaults.put(IMPORT_FILENAMEPATTERN, FilePreferences.DEFAULT_FILENAME_PATTERNS[1]);
@@ -621,21 +650,40 @@ protected JabRefCliPreferences() {
         // region:AI
         defaults.put(AI_ENABLED, AiDefaultPreferences.ENABLE_CHAT);
         defaults.put(AI_PROVIDER, AiDefaultPreferences.PROVIDER.name());
-        defaults.put(AI_OPEN_AI_CHAT_MODEL, AiDefaultPreferences.CHAT_MODELS.get(AiProvider.OPEN_AI));
-        defaults.put(AI_MISTRAL_AI_CHAT_MODEL, AiDefaultPreferences.CHAT_MODELS.get(AiProvider.MISTRAL_AI));
+        defaults.put(
+                AI_OPEN_AI_CHAT_MODEL, AiDefaultPreferences.CHAT_MODELS.get(AiProvider.OPEN_AI));
+        defaults.put(
+                AI_MISTRAL_AI_CHAT_MODEL,
+                AiDefaultPreferences.CHAT_MODELS.get(AiProvider.MISTRAL_AI));
         defaults.put(AI_GEMINI_CHAT_MODEL, AiDefaultPreferences.CHAT_MODELS.get(AiProvider.GEMINI));
-        defaults.put(AI_HUGGING_FACE_CHAT_MODEL, AiDefaultPreferences.CHAT_MODELS.get(AiProvider.HUGGING_FACE));
+        defaults.put(
+                AI_HUGGING_FACE_CHAT_MODEL,
+                AiDefaultPreferences.CHAT_MODELS.get(AiProvider.HUGGING_FACE));
         defaults.put(AI_CUSTOMIZE_SETTINGS, AiDefaultPreferences.CUSTOMIZE_SETTINGS);
         defaults.put(AI_EMBEDDING_MODEL, AiDefaultPreferences.EMBEDDING_MODEL.name());
-        defaults.put(AI_OPEN_AI_API_BASE_URL, AiDefaultPreferences.PROVIDERS_API_URLS.get(AiProvider.OPEN_AI));
-        defaults.put(AI_MISTRAL_AI_API_BASE_URL, AiDefaultPreferences.PROVIDERS_API_URLS.get(AiProvider.MISTRAL_AI));
-        defaults.put(AI_GEMINI_API_BASE_URL, AiDefaultPreferences.PROVIDERS_API_URLS.get(AiProvider.GEMINI));
-        defaults.put(AI_HUGGING_FACE_API_BASE_URL, AiDefaultPreferences.PROVIDERS_API_URLS.get(AiProvider.HUGGING_FACE));
+        defaults.put(
+                AI_OPEN_AI_API_BASE_URL,
+                AiDefaultPreferences.PROVIDERS_API_URLS.get(AiProvider.OPEN_AI));
+        defaults.put(
+                AI_MISTRAL_AI_API_BASE_URL,
+                AiDefaultPreferences.PROVIDERS_API_URLS.get(AiProvider.MISTRAL_AI));
+        defaults.put(
+                AI_GEMINI_API_BASE_URL,
+                AiDefaultPreferences.PROVIDERS_API_URLS.get(AiProvider.GEMINI));
+        defaults.put(
+                AI_HUGGING_FACE_API_BASE_URL,
+                AiDefaultPreferences.PROVIDERS_API_URLS.get(AiProvider.HUGGING_FACE));
         defaults.put(AI_SYSTEM_MESSAGE, AiDefaultPreferences.SYSTEM_MESSAGE);
         defaults.put(AI_TEMPERATURE, AiDefaultPreferences.TEMPERATURE);
-        defaults.put(AI_CONTEXT_WINDOW_SIZE, AiDefaultPreferences.CONTEXT_WINDOW_SIZES.get(AiDefaultPreferences.PROVIDER).get(AiDefaultPreferences.CHAT_MODELS.get(AiDefaultPreferences.PROVIDER)));
-        defaults.put(AI_DOCUMENT_SPLITTER_CHUNK_SIZE, AiDefaultPreferences.DOCUMENT_SPLITTER_CHUNK_SIZE);
-        defaults.put(AI_DOCUMENT_SPLITTER_OVERLAP_SIZE, AiDefaultPreferences.DOCUMENT_SPLITTER_OVERLAP);
+        defaults.put(
+                AI_CONTEXT_WINDOW_SIZE,
+                AiDefaultPreferences.CONTEXT_WINDOW_SIZES
+                        .get(AiDefaultPreferences.PROVIDER)
+                        .get(AiDefaultPreferences.CHAT_MODELS.get(AiDefaultPreferences.PROVIDER)));
+        defaults.put(
+                AI_DOCUMENT_SPLITTER_CHUNK_SIZE, AiDefaultPreferences.DOCUMENT_SPLITTER_CHUNK_SIZE);
+        defaults.put(
+                AI_DOCUMENT_SPLITTER_OVERLAP_SIZE, AiDefaultPreferences.DOCUMENT_SPLITTER_OVERLAP);
         defaults.put(AI_RAG_MAX_RESULTS_COUNT, AiDefaultPreferences.RAG_MAX_RESULTS_COUNT);
         defaults.put(AI_RAG_MIN_SCORE, AiDefaultPreferences.RAG_MIN_SCORE);
         // endregion
@@ -644,7 +692,10 @@ protected JabRefCliPreferences() {
     public void setLanguageDependentDefaultValues() {
         // Entry editor tab 0:
         defaults.put(CUSTOM_TAB_NAME + "_def0", Localization.lang("General"));
-        String fieldNames = FieldFactory.getDefaultGeneralFields().stream().map(Field::getName).collect(Collectors.joining(STRINGLIST_DELIMITER.toString()));
+        String fieldNames =
+                FieldFactory.getDefaultGeneralFields().stream()
+                        .map(Field::getName)
+                        .collect(Collectors.joining(STRINGLIST_DELIMITER.toString()));
         defaults.put(CUSTOM_TAB_FIELDS + "_def0", fieldNames);
 
         // Entry editor tab 1:
@@ -664,13 +715,15 @@ public static JabRefCliPreferences getInstance() {
         return JabRefCliPreferences.singleton;
     }
 
-    //*************************************************************************************************************
+    // *************************************************************************************************************
     // Common serializer logic
-    //*************************************************************************************************************
+    // *************************************************************************************************************
 
     @VisibleForTesting
     static String convertListToString(List<String> value) {
-        return value.stream().map(val -> StringUtil.quote(val, STRINGLIST_DELIMITER.toString(), '\\')).collect(Collectors.joining(STRINGLIST_DELIMITER.toString()));
+        return value.stream()
+                .map(val -> StringUtil.quote(val, STRINGLIST_DELIMITER.toString(), '\\'))
+                .collect(Collectors.joining(STRINGLIST_DELIMITER.toString()));
     }
 
     @VisibleForTesting
@@ -682,9 +735,9 @@ static List<String> convertStringToList(String toConvert) {
         return Splitter.on(STRINGLIST_DELIMITER).splitToList(toConvert);
     }
 
-    //*************************************************************************************************************
+    // *************************************************************************************************************
     // Backingstore access logic
-    //*************************************************************************************************************
+    // *************************************************************************************************************
 
     /**
      * Check whether a key is set (differently from null).
@@ -812,7 +865,8 @@ public void clear() throws BackingStoreException {
     }
 
     private void clearTruststoreFromCustomCertificates() {
-        TrustStoreManager trustStoreManager = new TrustStoreManager(Path.of(defaults.get(TRUSTSTORE_PATH).toString()));
+        TrustStoreManager trustStoreManager =
+                new TrustStoreManager(Path.of(defaults.get(TRUSTSTORE_PATH).toString()));
         trustStoreManager.clearCustomCertificates();
     }
 
@@ -840,7 +894,10 @@ public void flush() {
             try {
                 exportPreferences(Path.of("jabref.xml"));
             } catch (JabRefException e) {
-                LOGGER.warn("Could not export preferences for memory stick mode: {}", e.getMessage(), e);
+                LOGGER.warn(
+                        "Could not export preferences for memory stick mode: {}",
+                        e.getMessage(),
+                        e);
             }
         }
         try {
@@ -867,7 +924,8 @@ public Map<String, Object> getDefaults() {
         return defaults;
     }
 
-    private void addPrefsRecursively(Preferences prefs, Map<String, Object> result) throws BackingStoreException {
+    private void addPrefsRecursively(Preferences prefs, Map<String, Object> result)
+            throws BackingStoreException {
         for (String key : prefs.keys()) {
             result.put(key, getObject(prefs, key));
         }
@@ -929,8 +987,7 @@ public void exportPreferences(Path path) throws JabRefException {
         LOGGER.debug("Exporting preferences {}", path.toAbsolutePath());
         try (OutputStream os = Files.newOutputStream(path)) {
             prefs.exportSubtree(os);
-        } catch (BackingStoreException
-                 | IOException ex) {
+        } catch (BackingStoreException | IOException ex) {
             throw new JabRefException(
                     "Could not export preferences",
                     Localization.lang("Could not export preferences"),
@@ -948,8 +1005,7 @@ public void exportPreferences(Path path) throws JabRefException {
     public void importPreferences(Path file) throws JabRefException {
         try (InputStream is = Files.newInputStream(file)) {
             Preferences.importPreferences(is);
-        } catch (InvalidPreferencesFormatException
-                 | IOException ex) {
+        } catch (InvalidPreferencesFormatException | IOException ex) {
             throw new JabRefException(
                     "Could not import preferences",
                     Localization.lang("Could not import preferences"),
@@ -957,9 +1013,9 @@ public void importPreferences(Path file) throws JabRefException {
         }
     }
 
-    //*************************************************************************************************************
+    // *************************************************************************************************************
     // ToDo: Cleanup
-    //*************************************************************************************************************
+    // *************************************************************************************************************
 
     @Override
     public LayoutFormatterPreferences getLayoutFormatterPreferences() {
@@ -975,27 +1031,38 @@ public JournalAbbreviationPreferences getJournalAbbreviationPreferences() {
             return journalAbbreviationPreferences;
         }
 
-        journalAbbreviationPreferences = new JournalAbbreviationPreferences(
-                getStringList(EXTERNAL_JOURNAL_LISTS),
-                getBoolean(USE_AMS_FJOURNAL));
-
-        journalAbbreviationPreferences.getExternalJournalLists().addListener((InvalidationListener) change ->
-                putStringList(EXTERNAL_JOURNAL_LISTS, journalAbbreviationPreferences.getExternalJournalLists()));
-        EasyBind.listen(journalAbbreviationPreferences.useFJournalFieldProperty(),
+        journalAbbreviationPreferences =
+                new JournalAbbreviationPreferences(
+                        getStringList(EXTERNAL_JOURNAL_LISTS), getBoolean(USE_AMS_FJOURNAL));
+
+        journalAbbreviationPreferences
+                .getExternalJournalLists()
+                .addListener(
+                        (InvalidationListener)
+                                change ->
+                                        putStringList(
+                                                EXTERNAL_JOURNAL_LISTS,
+                                                journalAbbreviationPreferences
+                                                        .getExternalJournalLists()));
+        EasyBind.listen(
+                journalAbbreviationPreferences.useFJournalFieldProperty(),
                 (obs, oldValue, newValue) -> putBoolean(USE_AMS_FJOURNAL, newValue));
 
         return journalAbbreviationPreferences;
     }
 
-    //*************************************************************************************************************
+    // *************************************************************************************************************
     // CustomEntryTypes
-    //*************************************************************************************************************
+    // *************************************************************************************************************
 
     @Override
     public BibEntryTypesManager getCustomEntryTypesRepository() {
         BibEntryTypesManager bibEntryTypesManager = new BibEntryTypesManager();
-        EnumSet.allOf(BibDatabaseMode.class).forEach(mode ->
-                bibEntryTypesManager.addCustomOrModifiedTypes(getBibEntryTypes(mode), mode));
+        EnumSet.allOf(BibDatabaseMode.class)
+                .forEach(
+                        mode ->
+                                bibEntryTypesManager.addCustomOrModifiedTypes(
+                                        getBibEntryTypes(mode), mode));
         return bibEntryTypesManager;
     }
 
@@ -1004,9 +1071,12 @@ private List<BibEntryType> getBibEntryTypes(BibDatabaseMode bibDatabaseMode) {
         Preferences prefsNode = getPrefsNodeForCustomizedEntryTypes(bibDatabaseMode);
         try {
             Arrays.stream(prefsNode.keys())
-                  .map(key -> prefsNode.get(key, null))
-                  .filter(Objects::nonNull)
-                  .forEach(typeString -> MetaDataParser.parseCustomEntryType(typeString).ifPresent(storedEntryTypes::add));
+                    .map(key -> prefsNode.get(key, null))
+                    .filter(Objects::nonNull)
+                    .forEach(
+                            typeString ->
+                                    MetaDataParser.parseCustomEntryType(typeString)
+                                            .ifPresent(storedEntryTypes::add));
         } catch (BackingStoreException e) {
             LOGGER.info("Parsing customized entry types failed.", e);
         }
@@ -1032,11 +1102,16 @@ private void clearBibEntryTypes(BibDatabaseMode mode) {
     @Override
     public void storeCustomEntryTypesRepository(BibEntryTypesManager entryTypesManager) {
         clearAllBibEntryTypes();
-        storeBibEntryTypes(entryTypesManager.getAllCustomizedTypes(BibDatabaseMode.BIBTEX), BibDatabaseMode.BIBTEX);
-        storeBibEntryTypes(entryTypesManager.getAllCustomizedTypes(BibDatabaseMode.BIBLATEX), BibDatabaseMode.BIBLATEX);
+        storeBibEntryTypes(
+                entryTypesManager.getAllCustomizedTypes(BibDatabaseMode.BIBTEX),
+                BibDatabaseMode.BIBTEX);
+        storeBibEntryTypes(
+                entryTypesManager.getAllCustomizedTypes(BibDatabaseMode.BIBLATEX),
+                BibDatabaseMode.BIBLATEX);
     }
 
-    private void storeBibEntryTypes(Collection<BibEntryType> bibEntryTypes, BibDatabaseMode bibDatabaseMode) {
+    private void storeBibEntryTypes(
+            Collection<BibEntryType> bibEntryTypes, BibDatabaseMode bibDatabaseMode) {
         Preferences prefsNode = getPrefsNodeForCustomizedEntryTypes(bibDatabaseMode);
 
         try {
@@ -1044,7 +1119,11 @@ private void storeBibEntryTypes(Collection<BibEntryType> bibEntryTypes, BibDatab
             clearBibEntryTypes(bibDatabaseMode);
 
             // store current custom types
-            bibEntryTypes.forEach(type -> prefsNode.put(type.getType().getName(), MetaDataSerializer.serializeCustomEntryTypes(type)));
+            bibEntryTypes.forEach(
+                    type ->
+                            prefsNode.put(
+                                    type.getType().getName(),
+                                    MetaDataSerializer.serializeCustomEntryTypes(type)));
 
             prefsNode.flush();
         } catch (BackingStoreException e) {
@@ -1058,9 +1137,9 @@ private static Preferences getPrefsNodeForCustomizedEntryTypes(BibDatabaseMode m
                 : PREFS_NODE.node(CUSTOMIZED_BIBLATEX_TYPES);
     }
 
-    //*************************************************************************************************************
+    // *************************************************************************************************************
     // Misc
-    //*************************************************************************************************************
+    // *************************************************************************************************************
 
     @Override
     public OpenOfficePreferences getOpenOfficePreferences() {
@@ -1074,36 +1153,61 @@ public OpenOfficePreferences getOpenOfficePreferences() {
 
         // Reassign currentStyle if it is not a CSL style
         if (CitationStyle.isCitationStyleFile(currentStylePath)) {
-            currentStyle = CitationStyle.createCitationStyleFromFile(currentStylePath) // Assigns CSL Style
-                         .orElse(CitationStyle.getDefault());
+            currentStyle =
+                    CitationStyle.createCitationStyleFromFile(currentStylePath) // Assigns CSL Style
+                            .orElse(CitationStyle.getDefault());
         } else {
-            // For now, must be a JStyle. In future, make separate cases for JStyles (.jstyle) and BibTeX (.bst) styles
+            // For now, must be a JStyle. In future, make separate cases for JStyles (.jstyle) and
+            // BibTeX (.bst) styles
             try {
-                currentStyle = new JStyle(currentStylePath, getLayoutFormatterPreferences(),
-                        Injector.instantiateModelOrService(JournalAbbreviationRepository.class));
+                currentStyle =
+                        new JStyle(
+                                currentStylePath,
+                                getLayoutFormatterPreferences(),
+                                Injector.instantiateModelOrService(
+                                        JournalAbbreviationRepository.class));
             } catch (IOException ex) {
                 LOGGER.warn("Could not create JStyle", ex);
             }
         }
 
-        openOfficePreferences = new OpenOfficePreferences(
-                get(OO_EXECUTABLE_PATH),
-                getBoolean(OO_USE_ALL_OPEN_BASES),
-                getBoolean(OO_SYNC_WHEN_CITING),
-                getStringList(OO_EXTERNAL_STYLE_FILES),
-                get(OO_BIBLIOGRAPHY_STYLE_FILE),
-                currentStyle,
-                getBoolean(OO_ALWAYS_ADD_CITED_ON_PAGES));
-
-        EasyBind.listen(openOfficePreferences.executablePathProperty(), (obs, oldValue, newValue) -> put(OO_EXECUTABLE_PATH, newValue));
-        EasyBind.listen(openOfficePreferences.useAllDatabasesProperty(), (obs, oldValue, newValue) -> putBoolean(OO_USE_ALL_OPEN_BASES, newValue));
-        EasyBind.listen(openOfficePreferences.alwaysAddCitedOnPagesProperty(), (obs, oldValue, newValue) -> putBoolean(OO_ALWAYS_ADD_CITED_ON_PAGES, newValue));
-        EasyBind.listen(openOfficePreferences.syncWhenCitingProperty(), (obs, oldValue, newValue) -> putBoolean(OO_SYNC_WHEN_CITING, newValue));
-
-        openOfficePreferences.getExternalStyles().addListener((InvalidationListener) change ->
-                putStringList(OO_EXTERNAL_STYLE_FILES, openOfficePreferences.getExternalStyles()));
-        EasyBind.listen(openOfficePreferences.currentJStyleProperty(), (obs, oldValue, newValue) -> put(OO_BIBLIOGRAPHY_STYLE_FILE, newValue));
-        EasyBind.listen(openOfficePreferences.currentStyleProperty(), (obs, oldValue, newValue) -> put(OO_CURRENT_STYLE, newValue.getPath()));
+        openOfficePreferences =
+                new OpenOfficePreferences(
+                        get(OO_EXECUTABLE_PATH),
+                        getBoolean(OO_USE_ALL_OPEN_BASES),
+                        getBoolean(OO_SYNC_WHEN_CITING),
+                        getStringList(OO_EXTERNAL_STYLE_FILES),
+                        get(OO_BIBLIOGRAPHY_STYLE_FILE),
+                        currentStyle,
+                        getBoolean(OO_ALWAYS_ADD_CITED_ON_PAGES));
+
+        EasyBind.listen(
+                openOfficePreferences.executablePathProperty(),
+                (obs, oldValue, newValue) -> put(OO_EXECUTABLE_PATH, newValue));
+        EasyBind.listen(
+                openOfficePreferences.useAllDatabasesProperty(),
+                (obs, oldValue, newValue) -> putBoolean(OO_USE_ALL_OPEN_BASES, newValue));
+        EasyBind.listen(
+                openOfficePreferences.alwaysAddCitedOnPagesProperty(),
+                (obs, oldValue, newValue) -> putBoolean(OO_ALWAYS_ADD_CITED_ON_PAGES, newValue));
+        EasyBind.listen(
+                openOfficePreferences.syncWhenCitingProperty(),
+                (obs, oldValue, newValue) -> putBoolean(OO_SYNC_WHEN_CITING, newValue));
+
+        openOfficePreferences
+                .getExternalStyles()
+                .addListener(
+                        (InvalidationListener)
+                                change ->
+                                        putStringList(
+                                                OO_EXTERNAL_STYLE_FILES,
+                                                openOfficePreferences.getExternalStyles()));
+        EasyBind.listen(
+                openOfficePreferences.currentJStyleProperty(),
+                (obs, oldValue, newValue) -> put(OO_BIBLIOGRAPHY_STYLE_FILE, newValue));
+        EasyBind.listen(
+                openOfficePreferences.currentStyleProperty(),
+                (obs, oldValue, newValue) -> put(OO_CURRENT_STYLE, newValue.getPath()));
 
         return openOfficePreferences;
     }
@@ -1114,14 +1218,25 @@ public LibraryPreferences getLibraryPreferences() {
             return libraryPreferences;
         }
 
-        libraryPreferences = new LibraryPreferences(
-                getBoolean(BIBLATEX_DEFAULT_MODE) ? BibDatabaseMode.BIBLATEX : BibDatabaseMode.BIBTEX,
-                getBoolean(REFORMAT_FILE_ON_SAVE_AND_EXPORT),
-                getBoolean(LOCAL_AUTO_SAVE));
-
-        EasyBind.listen(libraryPreferences.defaultBibDatabaseModeProperty(), (obs, oldValue, newValue) -> putBoolean(BIBLATEX_DEFAULT_MODE, (newValue == BibDatabaseMode.BIBLATEX)));
-        EasyBind.listen(libraryPreferences.alwaysReformatOnSaveProperty(), (obs, oldValue, newValue) -> putBoolean(REFORMAT_FILE_ON_SAVE_AND_EXPORT, newValue));
-        EasyBind.listen(libraryPreferences.autoSaveProperty(), (obs, oldValue, newValue) -> putBoolean(LOCAL_AUTO_SAVE, newValue));
+        libraryPreferences =
+                new LibraryPreferences(
+                        getBoolean(BIBLATEX_DEFAULT_MODE)
+                                ? BibDatabaseMode.BIBLATEX
+                                : BibDatabaseMode.BIBTEX,
+                        getBoolean(REFORMAT_FILE_ON_SAVE_AND_EXPORT),
+                        getBoolean(LOCAL_AUTO_SAVE));
+
+        EasyBind.listen(
+                libraryPreferences.defaultBibDatabaseModeProperty(),
+                (obs, oldValue, newValue) ->
+                        putBoolean(BIBLATEX_DEFAULT_MODE, (newValue == BibDatabaseMode.BIBLATEX)));
+        EasyBind.listen(
+                libraryPreferences.alwaysReformatOnSaveProperty(),
+                (obs, oldValue, newValue) ->
+                        putBoolean(REFORMAT_FILE_ON_SAVE_AND_EXPORT, newValue));
+        EasyBind.listen(
+                libraryPreferences.autoSaveProperty(),
+                (obs, oldValue, newValue) -> putBoolean(LOCAL_AUTO_SAVE, newValue));
 
         return libraryPreferences;
     }
@@ -1132,12 +1247,14 @@ public DOIPreferences getDOIPreferences() {
             return doiPreferences;
         }
 
-        doiPreferences = new DOIPreferences(
-                getBoolean(USE_CUSTOM_DOI_URI),
-                get(BASE_DOI_URI));
+        doiPreferences = new DOIPreferences(getBoolean(USE_CUSTOM_DOI_URI), get(BASE_DOI_URI));
 
-        EasyBind.listen(doiPreferences.useCustomProperty(), (obs, oldValue, newValue) -> putBoolean(USE_CUSTOM_DOI_URI, newValue));
-        EasyBind.listen(doiPreferences.defaultBaseURIProperty(), (obs, oldValue, newValue) -> put(BASE_DOI_URI, newValue));
+        EasyBind.listen(
+                doiPreferences.useCustomProperty(),
+                (obs, oldValue, newValue) -> putBoolean(USE_CUSTOM_DOI_URI, newValue));
+        EasyBind.listen(
+                doiPreferences.defaultBaseURIProperty(),
+                (obs, oldValue, newValue) -> put(BASE_DOI_URI, newValue));
 
         return doiPreferences;
     }
@@ -1148,21 +1265,26 @@ public OwnerPreferences getOwnerPreferences() {
             return ownerPreferences;
         }
 
-        ownerPreferences = new OwnerPreferences(
-                getBoolean(USE_OWNER),
-                get(DEFAULT_OWNER),
-                getBoolean(OVERWRITE_OWNER));
+        ownerPreferences =
+                new OwnerPreferences(
+                        getBoolean(USE_OWNER), get(DEFAULT_OWNER), getBoolean(OVERWRITE_OWNER));
 
-        EasyBind.listen(ownerPreferences.useOwnerProperty(), (obs, oldValue, newValue) -> putBoolean(USE_OWNER, newValue));
-        EasyBind.listen(ownerPreferences.defaultOwnerProperty(), (obs, oldValue, newValue) -> {
-            put(DEFAULT_OWNER, newValue);
-            // trigger re-determination of userAndHost and the dependent preferences
-            userAndHost = null;
+        EasyBind.listen(
+                ownerPreferences.useOwnerProperty(),
+                (obs, oldValue, newValue) -> putBoolean(USE_OWNER, newValue));
+        EasyBind.listen(
+                ownerPreferences.defaultOwnerProperty(),
+                (obs, oldValue, newValue) -> {
+                    put(DEFAULT_OWNER, newValue);
+                    // trigger re-determination of userAndHost and the dependent preferences
+                    userAndHost = null;
 
-            // this propagates down to filePreferences
-            getInternalPreferences().getUserAndHostProperty().setValue(newValue);
-        });
-        EasyBind.listen(ownerPreferences.overwriteOwnerProperty(), (obs, oldValue, newValue) -> putBoolean(OVERWRITE_OWNER, newValue));
+                    // this propagates down to filePreferences
+                    getInternalPreferences().getUserAndHostProperty().setValue(newValue);
+                });
+        EasyBind.listen(
+                ownerPreferences.overwriteOwnerProperty(),
+                (obs, oldValue, newValue) -> putBoolean(OVERWRITE_OWNER, newValue));
 
         return ownerPreferences;
     }
@@ -1173,22 +1295,27 @@ public TimestampPreferences getTimestampPreferences() {
             return timestampPreferences;
         }
 
-        timestampPreferences = new TimestampPreferences(
-                getBoolean(ADD_CREATION_DATE),
-                getBoolean(ADD_MODIFICATION_DATE),
-                getBoolean(UPDATE_TIMESTAMP),
-                FieldFactory.parseField(get(TIME_STAMP_FIELD)),
-                get(TIME_STAMP_FORMAT));
+        timestampPreferences =
+                new TimestampPreferences(
+                        getBoolean(ADD_CREATION_DATE),
+                        getBoolean(ADD_MODIFICATION_DATE),
+                        getBoolean(UPDATE_TIMESTAMP),
+                        FieldFactory.parseField(get(TIME_STAMP_FIELD)),
+                        get(TIME_STAMP_FORMAT));
 
-        EasyBind.listen(timestampPreferences.addCreationDateProperty(), (obs, oldValue, newValue) -> putBoolean(ADD_CREATION_DATE, newValue));
-        EasyBind.listen(timestampPreferences.addModificationDateProperty(), (obs, oldValue, newValue) -> putBoolean(ADD_MODIFICATION_DATE, newValue));
+        EasyBind.listen(
+                timestampPreferences.addCreationDateProperty(),
+                (obs, oldValue, newValue) -> putBoolean(ADD_CREATION_DATE, newValue));
+        EasyBind.listen(
+                timestampPreferences.addModificationDateProperty(),
+                (obs, oldValue, newValue) -> putBoolean(ADD_MODIFICATION_DATE, newValue));
 
         return timestampPreferences;
     }
 
-    //*************************************************************************************************************
+    // *************************************************************************************************************
     // Network preferences
-    //*************************************************************************************************************
+    // *************************************************************************************************************
 
     @Override
     public RemotePreferences getRemotePreferences() {
@@ -1196,12 +1323,15 @@ public RemotePreferences getRemotePreferences() {
             return remotePreferences;
         }
 
-        remotePreferences = new RemotePreferences(
-                getInt(REMOTE_SERVER_PORT),
-                getBoolean(USE_REMOTE_SERVER));
+        remotePreferences =
+                new RemotePreferences(getInt(REMOTE_SERVER_PORT), getBoolean(USE_REMOTE_SERVER));
 
-        EasyBind.listen(remotePreferences.portProperty(), (obs, oldValue, newValue) -> putInt(REMOTE_SERVER_PORT, newValue));
-        EasyBind.listen(remotePreferences.useRemoteServerProperty(), (obs, oldValue, newValue) -> putBoolean(USE_REMOTE_SERVER, newValue));
+        EasyBind.listen(
+                remotePreferences.portProperty(),
+                (obs, oldValue, newValue) -> putInt(REMOTE_SERVER_PORT, newValue));
+        EasyBind.listen(
+                remotePreferences.useRemoteServerProperty(),
+                (obs, oldValue, newValue) -> putBoolean(USE_REMOTE_SERVER, newValue));
 
         return remotePreferences;
     }
@@ -1212,31 +1342,46 @@ public ProxyPreferences getProxyPreferences() {
             return proxyPreferences;
         }
 
-        proxyPreferences = new ProxyPreferences(
-                getBoolean(PROXY_USE),
-                get(PROXY_HOSTNAME),
-                get(PROXY_PORT),
-                getBoolean(PROXY_USE_AUTHENTICATION),
-                get(PROXY_USERNAME),
-                getProxyPassword(),
-                getBoolean(PROXY_PERSIST_PASSWORD));
-
-        EasyBind.listen(proxyPreferences.useProxyProperty(), (obs, oldValue, newValue) -> putBoolean(PROXY_USE, newValue));
-        EasyBind.listen(proxyPreferences.hostnameProperty(), (obs, oldValue, newValue) -> put(PROXY_HOSTNAME, newValue));
-        EasyBind.listen(proxyPreferences.portProperty(), (obs, oldValue, newValue) -> put(PROXY_PORT, newValue));
-        EasyBind.listen(proxyPreferences.useAuthenticationProperty(), (obs, oldValue, newValue) -> putBoolean(PROXY_USE_AUTHENTICATION, newValue));
-        EasyBind.listen(proxyPreferences.usernameProperty(), (obs, oldValue, newValue) -> put(PROXY_USERNAME, newValue));
-        EasyBind.listen(proxyPreferences.passwordProperty(), (obs, oldValue, newValue) -> setProxyPassword(newValue));
-        EasyBind.listen(proxyPreferences.persistPasswordProperty(), (obs, oldValue, newValue) -> {
-            putBoolean(PROXY_PERSIST_PASSWORD, newValue);
-            if (!newValue) {
-                try (final Keyring keyring = Keyring.create()) {
-                    keyring.deletePassword("org.jabref", "proxy");
-                } catch (Exception ex) {
-                    LOGGER.warn("Unable to remove proxy credentials");
-                }
-            }
-        });
+        proxyPreferences =
+                new ProxyPreferences(
+                        getBoolean(PROXY_USE),
+                        get(PROXY_HOSTNAME),
+                        get(PROXY_PORT),
+                        getBoolean(PROXY_USE_AUTHENTICATION),
+                        get(PROXY_USERNAME),
+                        getProxyPassword(),
+                        getBoolean(PROXY_PERSIST_PASSWORD));
+
+        EasyBind.listen(
+                proxyPreferences.useProxyProperty(),
+                (obs, oldValue, newValue) -> putBoolean(PROXY_USE, newValue));
+        EasyBind.listen(
+                proxyPreferences.hostnameProperty(),
+                (obs, oldValue, newValue) -> put(PROXY_HOSTNAME, newValue));
+        EasyBind.listen(
+                proxyPreferences.portProperty(),
+                (obs, oldValue, newValue) -> put(PROXY_PORT, newValue));
+        EasyBind.listen(
+                proxyPreferences.useAuthenticationProperty(),
+                (obs, oldValue, newValue) -> putBoolean(PROXY_USE_AUTHENTICATION, newValue));
+        EasyBind.listen(
+                proxyPreferences.usernameProperty(),
+                (obs, oldValue, newValue) -> put(PROXY_USERNAME, newValue));
+        EasyBind.listen(
+                proxyPreferences.passwordProperty(),
+                (obs, oldValue, newValue) -> setProxyPassword(newValue));
+        EasyBind.listen(
+                proxyPreferences.persistPasswordProperty(),
+                (obs, oldValue, newValue) -> {
+                    putBoolean(PROXY_PERSIST_PASSWORD, newValue);
+                    if (!newValue) {
+                        try (final Keyring keyring = Keyring.create()) {
+                            keyring.deletePassword("org.jabref", "proxy");
+                        } catch (Exception ex) {
+                            LOGGER.warn("Unable to remove proxy credentials");
+                        }
+                    }
+                });
 
         return proxyPreferences;
     }
@@ -1245,8 +1390,8 @@ private String getProxyPassword() {
         if (getBoolean(PROXY_PERSIST_PASSWORD)) {
             try (final Keyring keyring = Keyring.create()) {
                 return new Password(
-                        keyring.getPassword("org.jabref", "proxy"),
-                        getInternalPreferences().getUserAndHost())
+                                keyring.getPassword("org.jabref", "proxy"),
+                                getInternalPreferences().getUserAndHost())
                         .decrypt();
             } catch (PasswordAccessException ex) {
                 LOGGER.warn("JabRef uses proxy password from key store but no password is stored");
@@ -1263,10 +1408,11 @@ private void setProxyPassword(String password) {
                 if (StringUtil.isBlank(password)) {
                     keyring.deletePassword("org.jabref", "proxy");
                 } else {
-                    keyring.setPassword("org.jabref", "proxy", new Password(
-                            password.trim(),
-                            getInternalPreferences().getUserAndHost())
-                            .encrypt());
+                    keyring.setPassword(
+                            "org.jabref",
+                            "proxy",
+                            new Password(password.trim(), getInternalPreferences().getUserAndHost())
+                                    .encrypt());
                 }
             } catch (Exception ex) {
                 LOGGER.warn("Unable to open key store", ex);
@@ -1280,26 +1426,24 @@ public SSLPreferences getSSLPreferences() {
             return sslPreferences;
         }
 
-        sslPreferences = new SSLPreferences(
-                get(TRUSTSTORE_PATH)
-        );
+        sslPreferences = new SSLPreferences(get(TRUSTSTORE_PATH));
 
         return sslPreferences;
     }
 
-    //*************************************************************************************************************
+    // *************************************************************************************************************
     // CitationKeyPatternPreferences
-    //*************************************************************************************************************
+    // *************************************************************************************************************
 
     private GlobalCitationKeyPatterns getGlobalCitationKeyPattern() {
-        GlobalCitationKeyPatterns citationKeyPattern = GlobalCitationKeyPatterns.fromPattern(get(DEFAULT_CITATION_KEY_PATTERN));
+        GlobalCitationKeyPatterns citationKeyPattern =
+                GlobalCitationKeyPatterns.fromPattern(get(DEFAULT_CITATION_KEY_PATTERN));
         Preferences preferences = PREFS_NODE.node(CITATION_KEY_PATTERNS_NODE);
         try {
             String[] keys = preferences.keys();
             for (String key : keys) {
                 citationKeyPattern.addCitationKeyPattern(
-                        EntryTypeFactory.parse(key),
-                        preferences.get(key, null));
+                        EntryTypeFactory.parse(key), preferences.get(key, null));
             }
         } catch (BackingStoreException ex) {
             LOGGER.info("BackingStoreException in JabRefPreferences.getKeyPattern", ex);
@@ -1328,7 +1472,8 @@ public void storeGlobalCitationKeyPattern(GlobalCitationKeyPatterns pattern) {
         for (EntryType entryType : pattern.getAllKeys()) {
             if (!pattern.isDefaultValue(entryType)) {
                 // first entry in the map is the full pattern
-                preferences.put(entryType.getName(), pattern.getValue(entryType).stringRepresentation());
+                preferences.put(
+                        entryType.getName(), pattern.getValue(entryType).stringRepresentation());
             }
         }
     }
@@ -1345,35 +1490,49 @@ public CitationKeyPatternPreferences getCitationKeyPatternPreferences() {
             return citationKeyPatternPreferences;
         }
 
-        citationKeyPatternPreferences = new CitationKeyPatternPreferences(
-                getBoolean(AVOID_OVERWRITING_KEY),
-                getBoolean(WARN_BEFORE_OVERWRITING_KEY),
-                getBoolean(GENERATE_KEYS_BEFORE_SAVING),
-                getKeySuffix(),
-                get(KEY_PATTERN_REGEX),
-                get(KEY_PATTERN_REPLACEMENT),
-                get(UNWANTED_CITATION_KEY_CHARACTERS),
-                getGlobalCitationKeyPattern(),
-                (String) defaults.get(DEFAULT_CITATION_KEY_PATTERN),
-                getBibEntryPreferences().keywordSeparatorProperty());
-
-        EasyBind.listen(citationKeyPatternPreferences.shouldAvoidOverwriteCiteKeyProperty(),
+        citationKeyPatternPreferences =
+                new CitationKeyPatternPreferences(
+                        getBoolean(AVOID_OVERWRITING_KEY),
+                        getBoolean(WARN_BEFORE_OVERWRITING_KEY),
+                        getBoolean(GENERATE_KEYS_BEFORE_SAVING),
+                        getKeySuffix(),
+                        get(KEY_PATTERN_REGEX),
+                        get(KEY_PATTERN_REPLACEMENT),
+                        get(UNWANTED_CITATION_KEY_CHARACTERS),
+                        getGlobalCitationKeyPattern(),
+                        (String) defaults.get(DEFAULT_CITATION_KEY_PATTERN),
+                        getBibEntryPreferences().keywordSeparatorProperty());
+
+        EasyBind.listen(
+                citationKeyPatternPreferences.shouldAvoidOverwriteCiteKeyProperty(),
                 (obs, oldValue, newValue) -> putBoolean(AVOID_OVERWRITING_KEY, newValue));
-        EasyBind.listen(citationKeyPatternPreferences.shouldWarnBeforeOverwriteCiteKeyProperty(),
+        EasyBind.listen(
+                citationKeyPatternPreferences.shouldWarnBeforeOverwriteCiteKeyProperty(),
                 (obs, oldValue, newValue) -> putBoolean(WARN_BEFORE_OVERWRITING_KEY, newValue));
-        EasyBind.listen(citationKeyPatternPreferences.shouldGenerateCiteKeysBeforeSavingProperty(),
+        EasyBind.listen(
+                citationKeyPatternPreferences.shouldGenerateCiteKeysBeforeSavingProperty(),
                 (obs, oldValue, newValue) -> putBoolean(GENERATE_KEYS_BEFORE_SAVING, newValue));
-        EasyBind.listen(citationKeyPatternPreferences.keySuffixProperty(), (obs, oldValue, newValue) -> {
-            putBoolean(KEY_GEN_ALWAYS_ADD_LETTER, newValue == CitationKeyPatternPreferences.KeySuffix.ALWAYS);
-            putBoolean(KEY_GEN_FIRST_LETTER_A, newValue == CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A);
-        });
-        EasyBind.listen(citationKeyPatternPreferences.keyPatternRegexProperty(),
+        EasyBind.listen(
+                citationKeyPatternPreferences.keySuffixProperty(),
+                (obs, oldValue, newValue) -> {
+                    putBoolean(
+                            KEY_GEN_ALWAYS_ADD_LETTER,
+                            newValue == CitationKeyPatternPreferences.KeySuffix.ALWAYS);
+                    putBoolean(
+                            KEY_GEN_FIRST_LETTER_A,
+                            newValue == CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A);
+                });
+        EasyBind.listen(
+                citationKeyPatternPreferences.keyPatternRegexProperty(),
                 (obs, oldValue, newValue) -> put(KEY_PATTERN_REGEX, newValue));
-        EasyBind.listen(citationKeyPatternPreferences.keyPatternReplacementProperty(),
+        EasyBind.listen(
+                citationKeyPatternPreferences.keyPatternReplacementProperty(),
                 (obs, oldValue, newValue) -> put(KEY_PATTERN_REPLACEMENT, newValue));
-        EasyBind.listen(citationKeyPatternPreferences.unwantedCharactersProperty(),
+        EasyBind.listen(
+                citationKeyPatternPreferences.unwantedCharactersProperty(),
                 (obs, oldValue, newValue) -> put(UNWANTED_CITATION_KEY_CHARACTERS, newValue));
-        EasyBind.listen(citationKeyPatternPreferences.keyPatternsProperty(),
+        EasyBind.listen(
+                citationKeyPatternPreferences.keyPatternsProperty(),
                 (obs, oldValue, newValue) -> storeGlobalCitationKeyPattern(newValue));
 
         return citationKeyPatternPreferences;
@@ -1390,9 +1549,9 @@ private CitationKeyPatternPreferences.KeySuffix getKeySuffix() {
         return keySuffix;
     }
 
-    //*************************************************************************************************************
+    // *************************************************************************************************************
     // BibEntryPreferences
-    //*************************************************************************************************************
+    // *************************************************************************************************************
 
     @Override
     public BibEntryPreferences getBibEntryPreferences() {
@@ -1400,18 +1559,19 @@ public BibEntryPreferences getBibEntryPreferences() {
             return bibEntryPreferences;
         }
 
-        bibEntryPreferences = new BibEntryPreferences(
-                get(KEYWORD_SEPARATOR).charAt(0)
-        );
+        bibEntryPreferences = new BibEntryPreferences(get(KEYWORD_SEPARATOR).charAt(0));
 
-        EasyBind.listen(bibEntryPreferences.keywordSeparatorProperty(), ((observable, oldValue, newValue) -> put(KEYWORD_SEPARATOR, String.valueOf(newValue))));
+        EasyBind.listen(
+                bibEntryPreferences.keywordSeparatorProperty(),
+                ((observable, oldValue, newValue) ->
+                        put(KEYWORD_SEPARATOR, String.valueOf(newValue))));
 
         return bibEntryPreferences;
     }
 
-    //*************************************************************************************************************
+    // *************************************************************************************************************
     // InternalPreferences
-    //*************************************************************************************************************
+    // *************************************************************************************************************
 
     protected Path getDefaultPath() {
         return Path.of("/");
@@ -1423,30 +1583,36 @@ public InternalPreferences getInternalPreferences() {
             return internalPreferences;
         }
 
-        internalPreferences = new InternalPreferences(
-                Version.parse(get(VERSION_IGNORED_UPDATE)),
-                getBoolean(VERSION_CHECK_ENABLED),
-                getPath(PREFS_EXPORT_PATH, getDefaultPath()),
-                getUserAndHost(),
-                getBoolean(MEMORY_STICK_MODE));
+        internalPreferences =
+                new InternalPreferences(
+                        Version.parse(get(VERSION_IGNORED_UPDATE)),
+                        getBoolean(VERSION_CHECK_ENABLED),
+                        getPath(PREFS_EXPORT_PATH, getDefaultPath()),
+                        getUserAndHost(),
+                        getBoolean(MEMORY_STICK_MODE));
 
-        EasyBind.listen(internalPreferences.ignoredVersionProperty(),
+        EasyBind.listen(
+                internalPreferences.ignoredVersionProperty(),
                 (obs, oldValue, newValue) -> put(VERSION_IGNORED_UPDATE, newValue.toString()));
-        EasyBind.listen(internalPreferences.versionCheckEnabledProperty(),
+        EasyBind.listen(
+                internalPreferences.versionCheckEnabledProperty(),
                 (obs, oldValue, newValue) -> putBoolean(VERSION_CHECK_ENABLED, newValue));
-        EasyBind.listen(internalPreferences.lastPreferencesExportPathProperty(),
+        EasyBind.listen(
+                internalPreferences.lastPreferencesExportPathProperty(),
                 (obs, oldValue, newValue) -> put(PREFS_EXPORT_PATH, newValue.toString()));
         // user is a static value, should only be changed for debugging
-        EasyBind.listen(internalPreferences.memoryStickModeProperty(), (obs, oldValue, newValue) -> {
-            putBoolean(MEMORY_STICK_MODE, newValue);
-            if (!newValue) {
-                try {
-                    Files.deleteIfExists(Path.of("jabref.xml"));
-                } catch (IOException e) {
-                    LOGGER.warn("Error accessing filesystem", e);
-                }
-            }
-        });
+        EasyBind.listen(
+                internalPreferences.memoryStickModeProperty(),
+                (obs, oldValue, newValue) -> {
+                    putBoolean(MEMORY_STICK_MODE, newValue);
+                    if (!newValue) {
+                        try {
+                            Files.deleteIfExists(Path.of("jabref.xml"));
+                        } catch (IOException e) {
+                            LOGGER.warn("Error accessing filesystem", e);
+                        }
+                    }
+                });
 
         return internalPreferences;
     }
@@ -1461,9 +1627,9 @@ private String getUserAndHost() {
 
     protected Language getLanguage() {
         return Stream.of(Language.values())
-                     .filter(language -> language.getId().equalsIgnoreCase(get(LANGUAGE)))
-                     .findFirst()
-                     .orElse(Language.ENGLISH);
+                .filter(language -> language.getId().equalsIgnoreCase(get(LANGUAGE)))
+                .findFirst()
+                .orElse(Language.ENGLISH);
     }
 
     @Override
@@ -1472,27 +1638,44 @@ public FieldPreferences getFieldPreferences() {
             return fieldPreferences;
         }
 
-        fieldPreferences = new FieldPreferences(
-                !getBoolean(DO_NOT_RESOLVE_STRINGS), // mind the !
-                getStringList(RESOLVE_STRINGS_FOR_FIELDS).stream()
-                                                         .map(FieldFactory::parseField)
-                                                         .collect(Collectors.toList()),
-                getStringList(NON_WRAPPABLE_FIELDS).stream()
-                                                   .map(FieldFactory::parseField)
-                                                   .collect(Collectors.toList()));
-
-        EasyBind.listen(fieldPreferences.resolveStringsProperty(), (obs, oldValue, newValue) -> putBoolean(DO_NOT_RESOLVE_STRINGS, !newValue));
-        fieldPreferences.getResolvableFields().addListener((InvalidationListener) change ->
-                put(RESOLVE_STRINGS_FOR_FIELDS, FieldFactory.serializeFieldsList(fieldPreferences.getResolvableFields())));
-        fieldPreferences.getNonWrappableFields().addListener((InvalidationListener) change ->
-                put(NON_WRAPPABLE_FIELDS, FieldFactory.serializeFieldsList(fieldPreferences.getNonWrappableFields())));
+        fieldPreferences =
+                new FieldPreferences(
+                        !getBoolean(DO_NOT_RESOLVE_STRINGS), // mind the !
+                        getStringList(RESOLVE_STRINGS_FOR_FIELDS).stream()
+                                .map(FieldFactory::parseField)
+                                .collect(Collectors.toList()),
+                        getStringList(NON_WRAPPABLE_FIELDS).stream()
+                                .map(FieldFactory::parseField)
+                                .collect(Collectors.toList()));
+
+        EasyBind.listen(
+                fieldPreferences.resolveStringsProperty(),
+                (obs, oldValue, newValue) -> putBoolean(DO_NOT_RESOLVE_STRINGS, !newValue));
+        fieldPreferences
+                .getResolvableFields()
+                .addListener(
+                        (InvalidationListener)
+                                change ->
+                                        put(
+                                                RESOLVE_STRINGS_FOR_FIELDS,
+                                                FieldFactory.serializeFieldsList(
+                                                        fieldPreferences.getResolvableFields())));
+        fieldPreferences
+                .getNonWrappableFields()
+                .addListener(
+                        (InvalidationListener)
+                                change ->
+                                        put(
+                                                NON_WRAPPABLE_FIELDS,
+                                                FieldFactory.serializeFieldsList(
+                                                        fieldPreferences.getNonWrappableFields())));
 
         return fieldPreferences;
     }
 
-    //*************************************************************************************************************
+    // *************************************************************************************************************
     // Linked files preferences
-    //*************************************************************************************************************
+    // *************************************************************************************************************
 
     protected boolean moveToTrashSupported() {
         return false;
@@ -1504,36 +1687,66 @@ public FilePreferences getFilePreferences() {
             return filePreferences;
         }
 
-        filePreferences = new FilePreferences(
-                getInternalPreferences().getUserAndHost(),
-                getPath(MAIN_FILE_DIRECTORY, getDefaultPath()).toString(),
-                getBoolean(STORE_RELATIVE_TO_BIB),
-                get(IMPORT_FILENAMEPATTERN),
-                get(IMPORT_FILEDIRPATTERN),
-                getBoolean(DOWNLOAD_LINKED_FILES),
-                getBoolean(FULLTEXT_INDEX_LINKED_FILES),
-                Path.of(get(WORKING_DIRECTORY)),
-                getBoolean(CREATE_BACKUP),
-                // We choose the data directory, because a ".bak" file should survive cache cleanups
-                getPath(BACKUP_DIRECTORY, Directories.getBackupDirectory()),
-                getBoolean(CONFIRM_LINKED_FILE_DELETE),
-                // We make use of the fallback, because we need AWT being initialized, which is not the case at the constructor JabRefPreferences()
-                getBoolean(TRASH_INSTEAD_OF_DELETE, moveToTrashSupported()),
-                getBoolean(KEEP_DOWNLOAD_URL));
-
-        EasyBind.listen(getInternalPreferences().getUserAndHostProperty(), (obs, oldValue, newValue) -> filePreferences.getUserAndHostProperty().setValue(newValue));
-        EasyBind.listen(filePreferences.mainFileDirectoryProperty(), (obs, oldValue, newValue) -> put(MAIN_FILE_DIRECTORY, newValue));
-        EasyBind.listen(filePreferences.storeFilesRelativeToBibFileProperty(), (obs, oldValue, newValue) -> putBoolean(STORE_RELATIVE_TO_BIB, newValue));
-        EasyBind.listen(filePreferences.fileNamePatternProperty(), (obs, oldValue, newValue) -> put(IMPORT_FILENAMEPATTERN, newValue));
-        EasyBind.listen(filePreferences.fileDirectoryPatternProperty(), (obs, oldValue, newValue) -> put(IMPORT_FILEDIRPATTERN, newValue));
-        EasyBind.listen(filePreferences.downloadLinkedFilesProperty(), (obs, oldValue, newValue) -> putBoolean(DOWNLOAD_LINKED_FILES, newValue));
-        EasyBind.listen(filePreferences.fulltextIndexLinkedFilesProperty(), (obs, oldValue, newValue) -> putBoolean(FULLTEXT_INDEX_LINKED_FILES, newValue));
-        EasyBind.listen(filePreferences.workingDirectoryProperty(), (obs, oldValue, newValue) -> put(WORKING_DIRECTORY, newValue.toString()));
-        EasyBind.listen(filePreferences.createBackupProperty(), (obs, oldValue, newValue) -> putBoolean(CREATE_BACKUP, newValue));
-        EasyBind.listen(filePreferences.backupDirectoryProperty(), (obs, oldValue, newValue) -> put(BACKUP_DIRECTORY, newValue.toString()));
-        EasyBind.listen(filePreferences.confirmDeleteLinkedFileProperty(), (obs, oldValue, newValue) -> putBoolean(CONFIRM_LINKED_FILE_DELETE, newValue));
-        EasyBind.listen(filePreferences.moveToTrashProperty(), (obs, oldValue, newValue) -> putBoolean(TRASH_INSTEAD_OF_DELETE, newValue));
-        EasyBind.listen(filePreferences.shouldKeepDownloadUrlProperty(), (obs, oldValue, newValue) -> putBoolean(KEEP_DOWNLOAD_URL, newValue));
+        filePreferences =
+                new FilePreferences(
+                        getInternalPreferences().getUserAndHost(),
+                        getPath(MAIN_FILE_DIRECTORY, getDefaultPath()).toString(),
+                        getBoolean(STORE_RELATIVE_TO_BIB),
+                        get(IMPORT_FILENAMEPATTERN),
+                        get(IMPORT_FILEDIRPATTERN),
+                        getBoolean(DOWNLOAD_LINKED_FILES),
+                        getBoolean(FULLTEXT_INDEX_LINKED_FILES),
+                        Path.of(get(WORKING_DIRECTORY)),
+                        getBoolean(CREATE_BACKUP),
+                        // We choose the data directory, because a ".bak" file should survive cache
+                        // cleanups
+                        getPath(BACKUP_DIRECTORY, Directories.getBackupDirectory()),
+                        getBoolean(CONFIRM_LINKED_FILE_DELETE),
+                        // We make use of the fallback, because we need AWT being initialized, which
+                        // is not the case at the constructor JabRefPreferences()
+                        getBoolean(TRASH_INSTEAD_OF_DELETE, moveToTrashSupported()),
+                        getBoolean(KEEP_DOWNLOAD_URL));
+
+        EasyBind.listen(
+                getInternalPreferences().getUserAndHostProperty(),
+                (obs, oldValue, newValue) ->
+                        filePreferences.getUserAndHostProperty().setValue(newValue));
+        EasyBind.listen(
+                filePreferences.mainFileDirectoryProperty(),
+                (obs, oldValue, newValue) -> put(MAIN_FILE_DIRECTORY, newValue));
+        EasyBind.listen(
+                filePreferences.storeFilesRelativeToBibFileProperty(),
+                (obs, oldValue, newValue) -> putBoolean(STORE_RELATIVE_TO_BIB, newValue));
+        EasyBind.listen(
+                filePreferences.fileNamePatternProperty(),
+                (obs, oldValue, newValue) -> put(IMPORT_FILENAMEPATTERN, newValue));
+        EasyBind.listen(
+                filePreferences.fileDirectoryPatternProperty(),
+                (obs, oldValue, newValue) -> put(IMPORT_FILEDIRPATTERN, newValue));
+        EasyBind.listen(
+                filePreferences.downloadLinkedFilesProperty(),
+                (obs, oldValue, newValue) -> putBoolean(DOWNLOAD_LINKED_FILES, newValue));
+        EasyBind.listen(
+                filePreferences.fulltextIndexLinkedFilesProperty(),
+                (obs, oldValue, newValue) -> putBoolean(FULLTEXT_INDEX_LINKED_FILES, newValue));
+        EasyBind.listen(
+                filePreferences.workingDirectoryProperty(),
+                (obs, oldValue, newValue) -> put(WORKING_DIRECTORY, newValue.toString()));
+        EasyBind.listen(
+                filePreferences.createBackupProperty(),
+                (obs, oldValue, newValue) -> putBoolean(CREATE_BACKUP, newValue));
+        EasyBind.listen(
+                filePreferences.backupDirectoryProperty(),
+                (obs, oldValue, newValue) -> put(BACKUP_DIRECTORY, newValue.toString()));
+        EasyBind.listen(
+                filePreferences.confirmDeleteLinkedFileProperty(),
+                (obs, oldValue, newValue) -> putBoolean(CONFIRM_LINKED_FILE_DELETE, newValue));
+        EasyBind.listen(
+                filePreferences.moveToTrashProperty(),
+                (obs, oldValue, newValue) -> putBoolean(TRASH_INSTEAD_OF_DELETE, newValue));
+        EasyBind.listen(
+                filePreferences.shouldKeepDownloadUrlProperty(),
+                (obs, oldValue, newValue) -> putBoolean(KEEP_DOWNLOAD_URL, newValue));
 
         return filePreferences;
     }
@@ -1544,20 +1757,29 @@ public AutoLinkPreferences getAutoLinkPreferences() {
             return autoLinkPreferences;
         }
 
-        autoLinkPreferences = new AutoLinkPreferences(
-                getAutoLinkKeyDependency(),
-                get(AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY),
-                getBoolean(ASK_AUTO_NAMING_PDFS_AGAIN),
-                bibEntryPreferences.keywordSeparatorProperty());
-
-        EasyBind.listen(autoLinkPreferences.citationKeyDependencyProperty(), (obs, oldValue, newValue) -> {
-            // Starts bibtex only omitted, as it is not being saved
-            putBoolean(AUTOLINK_EXACT_KEY_ONLY, newValue == AutoLinkPreferences.CitationKeyDependency.EXACT);
-            putBoolean(AUTOLINK_USE_REG_EXP_SEARCH_KEY, newValue == AutoLinkPreferences.CitationKeyDependency.REGEX);
-        });
-        EasyBind.listen(autoLinkPreferences.askAutoNamingPdfsProperty(),
+        autoLinkPreferences =
+                new AutoLinkPreferences(
+                        getAutoLinkKeyDependency(),
+                        get(AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY),
+                        getBoolean(ASK_AUTO_NAMING_PDFS_AGAIN),
+                        bibEntryPreferences.keywordSeparatorProperty());
+
+        EasyBind.listen(
+                autoLinkPreferences.citationKeyDependencyProperty(),
+                (obs, oldValue, newValue) -> {
+                    // Starts bibtex only omitted, as it is not being saved
+                    putBoolean(
+                            AUTOLINK_EXACT_KEY_ONLY,
+                            newValue == AutoLinkPreferences.CitationKeyDependency.EXACT);
+                    putBoolean(
+                            AUTOLINK_USE_REG_EXP_SEARCH_KEY,
+                            newValue == AutoLinkPreferences.CitationKeyDependency.REGEX);
+                });
+        EasyBind.listen(
+                autoLinkPreferences.askAutoNamingPdfsProperty(),
                 (obs, oldValue, newValue) -> putBoolean(ASK_AUTO_NAMING_PDFS_AGAIN, newValue));
-        EasyBind.listen(autoLinkPreferences.regularExpressionProperty(),
+        EasyBind.listen(
+                autoLinkPreferences.regularExpressionProperty(),
                 (obs, oldValue, newValue) -> put(AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY, newValue));
 
         return autoLinkPreferences;
@@ -1574,9 +1796,9 @@ private AutoLinkPreferences.CitationKeyDependency getAutoLinkKeyDependency() {
         return citationKeyDependency;
     }
 
-    //*************************************************************************************************************
+    // *************************************************************************************************************
     // Import/Export preferences
-    //*************************************************************************************************************
+    // *************************************************************************************************************
 
     @Override
     public ExportPreferences getExportPreferences() {
@@ -1584,16 +1806,29 @@ public ExportPreferences getExportPreferences() {
             return exportPreferences;
         }
 
-        exportPreferences = new ExportPreferences(
-                get(LAST_USED_EXPORT),
-                Path.of(get(EXPORT_WORKING_DIRECTORY)),
-                getExportSaveOrder(),
-                getCustomExportFormats());
-
-        EasyBind.listen(exportPreferences.lastExportExtensionProperty(), (obs, oldValue, newValue) -> put(LAST_USED_EXPORT, newValue));
-        EasyBind.listen(exportPreferences.exportWorkingDirectoryProperty(), (obs, oldValue, newValue) -> put(EXPORT_WORKING_DIRECTORY, newValue.toString()));
-        EasyBind.listen(exportPreferences.exportSaveOrderProperty(), (obs, oldValue, newValue) -> storeExportSaveOrder(newValue));
-        exportPreferences.getCustomExporters().addListener((InvalidationListener) c -> storeCustomExportFormats(exportPreferences.getCustomExporters()));
+        exportPreferences =
+                new ExportPreferences(
+                        get(LAST_USED_EXPORT),
+                        Path.of(get(EXPORT_WORKING_DIRECTORY)),
+                        getExportSaveOrder(),
+                        getCustomExportFormats());
+
+        EasyBind.listen(
+                exportPreferences.lastExportExtensionProperty(),
+                (obs, oldValue, newValue) -> put(LAST_USED_EXPORT, newValue));
+        EasyBind.listen(
+                exportPreferences.exportWorkingDirectoryProperty(),
+                (obs, oldValue, newValue) -> put(EXPORT_WORKING_DIRECTORY, newValue.toString()));
+        EasyBind.listen(
+                exportPreferences.exportSaveOrderProperty(),
+                (obs, oldValue, newValue) -> storeExportSaveOrder(newValue));
+        exportPreferences
+                .getCustomExporters()
+                .addListener(
+                        (InvalidationListener)
+                                c ->
+                                        storeCustomExportFormats(
+                                                exportPreferences.getCustomExporters()));
 
         return exportPreferences;
     }
@@ -1602,43 +1837,61 @@ protected SaveOrder getExportSaveOrder() {
         List<SaveOrder.SortCriterion> sortCriteria = new ArrayList<>();
 
         if (!"".equals(get(EXPORT_PRIMARY_SORT_FIELD))) {
-            sortCriteria.add(new SaveOrder.SortCriterion(FieldFactory.parseField(get(EXPORT_PRIMARY_SORT_FIELD)), getBoolean(EXPORT_PRIMARY_SORT_DESCENDING)));
+            sortCriteria.add(
+                    new SaveOrder.SortCriterion(
+                            FieldFactory.parseField(get(EXPORT_PRIMARY_SORT_FIELD)),
+                            getBoolean(EXPORT_PRIMARY_SORT_DESCENDING)));
         }
         if (!"".equals(get(EXPORT_SECONDARY_SORT_FIELD))) {
-            sortCriteria.add(new SaveOrder.SortCriterion(FieldFactory.parseField(get(EXPORT_SECONDARY_SORT_FIELD)), getBoolean(EXPORT_SECONDARY_SORT_DESCENDING)));
+            sortCriteria.add(
+                    new SaveOrder.SortCriterion(
+                            FieldFactory.parseField(get(EXPORT_SECONDARY_SORT_FIELD)),
+                            getBoolean(EXPORT_SECONDARY_SORT_DESCENDING)));
         }
         if (!"".equals(get(EXPORT_TERTIARY_SORT_FIELD))) {
-            sortCriteria.add(new SaveOrder.SortCriterion(FieldFactory.parseField(get(EXPORT_TERTIARY_SORT_FIELD)), getBoolean(EXPORT_TERTIARY_SORT_DESCENDING)));
+            sortCriteria.add(
+                    new SaveOrder.SortCriterion(
+                            FieldFactory.parseField(get(EXPORT_TERTIARY_SORT_FIELD)),
+                            getBoolean(EXPORT_TERTIARY_SORT_DESCENDING)));
         }
 
         return new SaveOrder(
-                SaveOrder.OrderType.fromBooleans(getBoolean(EXPORT_IN_SPECIFIED_ORDER), getBoolean(EXPORT_IN_ORIGINAL_ORDER)),
-                sortCriteria
-        );
+                SaveOrder.OrderType.fromBooleans(
+                        getBoolean(EXPORT_IN_SPECIFIED_ORDER),
+                        getBoolean(EXPORT_IN_ORIGINAL_ORDER)),
+                sortCriteria);
     }
 
     private void storeExportSaveOrder(SaveOrder saveOrder) {
-        putBoolean(EXPORT_IN_ORIGINAL_ORDER, saveOrder.getOrderType() == SaveOrder.OrderType.ORIGINAL);
-        putBoolean(EXPORT_IN_SPECIFIED_ORDER, saveOrder.getOrderType() == SaveOrder.OrderType.SPECIFIED);
+        putBoolean(
+                EXPORT_IN_ORIGINAL_ORDER, saveOrder.getOrderType() == SaveOrder.OrderType.ORIGINAL);
+        putBoolean(
+                EXPORT_IN_SPECIFIED_ORDER,
+                saveOrder.getOrderType() == SaveOrder.OrderType.SPECIFIED);
 
         long saveOrderCount = saveOrder.getSortCriteria().size();
         if (saveOrderCount >= 1) {
             put(EXPORT_PRIMARY_SORT_FIELD, saveOrder.getSortCriteria().getFirst().field.getName());
-            putBoolean(EXPORT_PRIMARY_SORT_DESCENDING, saveOrder.getSortCriteria().getFirst().descending);
+            putBoolean(
+                    EXPORT_PRIMARY_SORT_DESCENDING,
+                    saveOrder.getSortCriteria().getFirst().descending);
         } else {
             put(EXPORT_PRIMARY_SORT_FIELD, "");
             putBoolean(EXPORT_PRIMARY_SORT_DESCENDING, false);
         }
         if (saveOrderCount >= 2) {
             put(EXPORT_SECONDARY_SORT_FIELD, saveOrder.getSortCriteria().get(1).field.getName());
-            putBoolean(EXPORT_SECONDARY_SORT_DESCENDING, saveOrder.getSortCriteria().get(1).descending);
+            putBoolean(
+                    EXPORT_SECONDARY_SORT_DESCENDING,
+                    saveOrder.getSortCriteria().get(1).descending);
         } else {
             put(EXPORT_SECONDARY_SORT_FIELD, "");
             putBoolean(EXPORT_SECONDARY_SORT_DESCENDING, false);
         }
         if (saveOrderCount >= 3) {
             put(EXPORT_TERTIARY_SORT_FIELD, saveOrder.getSortCriteria().get(2).field.getName());
-            putBoolean(EXPORT_TERTIARY_SORT_DESCENDING, saveOrder.getSortCriteria().get(2).descending);
+            putBoolean(
+                    EXPORT_TERTIARY_SORT_DESCENDING, saveOrder.getSortCriteria().get(2).descending);
         } else {
             put(EXPORT_TERTIARY_SORT_FIELD, "");
             putBoolean(EXPORT_TERTIARY_SORT_DESCENDING, false);
@@ -1648,20 +1901,22 @@ private void storeExportSaveOrder(SaveOrder saveOrder) {
     @Override
     public SelfContainedSaveConfiguration getSelfContainedExportConfiguration() {
         SaveOrder exportSaveOrder = getExportSaveOrder();
-        SelfContainedSaveOrder saveOrder = switch (exportSaveOrder.getOrderType()) {
-            case TABLE -> {
-                LOGGER.warn("Table sort order requested, but JabRef is in CLI mode. Falling back to defeault save order");
-                yield SaveOrder.getDefaultSaveOrder();
-            }
-            case SPECIFIED ->
-                    SelfContainedSaveOrder.of(exportSaveOrder);
-            case ORIGINAL ->
-                    SaveOrder.getDefaultSaveOrder();
-        };
+        SelfContainedSaveOrder saveOrder =
+                switch (exportSaveOrder.getOrderType()) {
+                    case TABLE -> {
+                        LOGGER.warn(
+                                "Table sort order requested, but JabRef is in CLI mode. Falling back to defeault save order");
+                        yield SaveOrder.getDefaultSaveOrder();
+                    }
+                    case SPECIFIED -> SelfContainedSaveOrder.of(exportSaveOrder);
+                    case ORIGINAL -> SaveOrder.getDefaultSaveOrder();
+                };
 
         return new SelfContainedSaveConfiguration(
-                saveOrder, false, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, getLibraryPreferences()
-                .shouldAlwaysReformatOnSave());
+                saveOrder,
+                false,
+                BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
+                getLibraryPreferences().shouldAlwaysReformatOnSave());
     }
 
     private List<TemplateExporter> getCustomExportFormats() {
@@ -1671,12 +1926,13 @@ private List<TemplateExporter> getCustomExportFormats() {
 
         for (String toImport : getSeries(CUSTOM_EXPORT_FORMAT)) {
             List<String> formatData = convertStringToList(toImport);
-            TemplateExporter format = new TemplateExporter(
-                    formatData.getFirst(),
-                    formatData.get(EXPORTER_FILENAME_INDEX),
-                    formatData.get(EXPORTER_EXTENSION_INDEX),
-                    layoutPreferences,
-                    saveConfiguration.getSelfContainedSaveOrder());
+            TemplateExporter format =
+                    new TemplateExporter(
+                            formatData.getFirst(),
+                            formatData.get(EXPORTER_FILENAME_INDEX),
+                            formatData.get(EXPORTER_EXTENSION_INDEX),
+                            layoutPreferences,
+                            saveConfiguration.getSelfContainedSaveOrder());
             format.setCustomExport(true);
             formats.add(format);
         }
@@ -1692,7 +1948,9 @@ private void storeCustomExportFormats(List<TemplateExporter> exporters) {
                 exporterData.addFirst(exporters.get(i).getName());
                 exporterData.add(EXPORTER_FILENAME_INDEX, exporters.get(i).getLayoutFileName());
                 // Only stores the first extension associated with FileType
-                exporterData.add(EXPORTER_EXTENSION_INDEX, exporters.get(i).getFileType().getExtensions().getFirst());
+                exporterData.add(
+                        EXPORTER_EXTENSION_INDEX,
+                        exporters.get(i).getFileType().getExtensions().getFirst());
                 putStringList(CUSTOM_EXPORT_FORMAT + i, exporterData);
             }
             purgeSeries(CUSTOM_EXPORT_FORMAT, exporters.size());
@@ -1707,20 +1965,38 @@ public CleanupPreferences getCleanupPreferences() {
             return cleanupPreferences;
         }
 
-        cleanupPreferences = new CleanupPreferences(
-                EnumSet.copyOf(getStringList(CLEANUP_JOBS).stream()
-                                                          .map(CleanupPreferences.CleanupStep::valueOf)
-                                                          .collect(Collectors.toSet())),
-                new FieldFormatterCleanups(getBoolean(CLEANUP_FIELD_FORMATTERS_ENABLED),
-                        FieldFormatterCleanups.parse(StringUtil.unifyLineBreaks(get(CLEANUP_FIELD_FORMATTERS), ""))));
-
-        cleanupPreferences.getObservableActiveJobs().addListener((SetChangeListener<CleanupPreferences.CleanupStep>) c ->
-                putStringList(CLEANUP_JOBS, cleanupPreferences.getActiveJobs().stream().map(Enum::name).collect(Collectors.toList())));
-
-        EasyBind.listen(cleanupPreferences.fieldFormatterCleanupsProperty(), (fieldFormatters, oldValue, newValue) -> {
-            putBoolean(CLEANUP_FIELD_FORMATTERS_ENABLED, newValue.isEnabled());
-            put(CLEANUP_FIELD_FORMATTERS, FieldFormatterCleanups.getMetaDataString(newValue.getConfiguredActions(), OS.NEWLINE));
-        });
+        cleanupPreferences =
+                new CleanupPreferences(
+                        EnumSet.copyOf(
+                                getStringList(CLEANUP_JOBS).stream()
+                                        .map(CleanupPreferences.CleanupStep::valueOf)
+                                        .collect(Collectors.toSet())),
+                        new FieldFormatterCleanups(
+                                getBoolean(CLEANUP_FIELD_FORMATTERS_ENABLED),
+                                FieldFormatterCleanups.parse(
+                                        StringUtil.unifyLineBreaks(
+                                                get(CLEANUP_FIELD_FORMATTERS), ""))));
+
+        cleanupPreferences
+                .getObservableActiveJobs()
+                .addListener(
+                        (SetChangeListener<CleanupPreferences.CleanupStep>)
+                                c ->
+                                        putStringList(
+                                                CLEANUP_JOBS,
+                                                cleanupPreferences.getActiveJobs().stream()
+                                                        .map(Enum::name)
+                                                        .collect(Collectors.toList())));
+
+        EasyBind.listen(
+                cleanupPreferences.fieldFormatterCleanupsProperty(),
+                (fieldFormatters, oldValue, newValue) -> {
+                    putBoolean(CLEANUP_FIELD_FORMATTERS_ENABLED, newValue.isEnabled());
+                    put(
+                            CLEANUP_FIELD_FORMATTERS,
+                            FieldFormatterCleanups.getMetaDataString(
+                                    newValue.getConfiguredActions(), OS.NEWLINE));
+                });
 
         return cleanupPreferences;
     }
@@ -1731,17 +2007,20 @@ public CleanupPreferences getDefaultCleanupPreset() {
                 getDefaultCleanupJobs(),
                 new FieldFormatterCleanups(
                         (Boolean) defaults.get(CLEANUP_FIELD_FORMATTERS_ENABLED),
-                        FieldFormatterCleanups.parse((String) defaults.get(CLEANUP_FIELD_FORMATTERS))));
+                        FieldFormatterCleanups.parse(
+                                (String) defaults.get(CLEANUP_FIELD_FORMATTERS))));
     }
 
     private static EnumSet<CleanupPreferences.CleanupStep> getDefaultCleanupJobs() {
-        EnumSet<CleanupPreferences.CleanupStep> activeJobs = EnumSet.allOf(CleanupPreferences.CleanupStep.class);
-        activeJobs.removeAll(EnumSet.of(
-                CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS,
-                CleanupPreferences.CleanupStep.MOVE_PDF,
-                CleanupPreferences.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS,
-                CleanupPreferences.CleanupStep.CONVERT_TO_BIBLATEX,
-                CleanupPreferences.CleanupStep.CONVERT_TO_BIBTEX));
+        EnumSet<CleanupPreferences.CleanupStep> activeJobs =
+                EnumSet.allOf(CleanupPreferences.CleanupStep.class);
+        activeJobs.removeAll(
+                EnumSet.of(
+                        CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS,
+                        CleanupPreferences.CleanupStep.MOVE_PDF,
+                        CleanupPreferences.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS,
+                        CleanupPreferences.CleanupStep.CONVERT_TO_BIBLATEX,
+                        CleanupPreferences.CleanupStep.CONVERT_TO_BIBTEX));
         return activeJobs;
     }
 
@@ -1755,46 +2034,58 @@ public LastFilesOpenedPreferences getLastFilesOpenedPreferences() {
             return lastFilesOpenedPreferences;
         }
 
-        lastFilesOpenedPreferences = new LastFilesOpenedPreferences(
-                getStringList(LAST_EDITED).stream()
-                                          .map(Path::of)
-                                          .toList(),
-                Path.of(get(LAST_FOCUSED)),
-                getFileHistory());
-
-        lastFilesOpenedPreferences.getLastFilesOpened().addListener((ListChangeListener<Path>) change -> {
-            if (change.getList().isEmpty()) {
-                remove(LAST_EDITED);
-            } else {
-                putStringList(LAST_EDITED, lastFilesOpenedPreferences.getLastFilesOpened().stream()
-                                                                     .map(Path::toAbsolutePath)
-                                                                     .map(Path::toString)
-                                                                     .toList());
-            }
-        });
-        EasyBind.listen(lastFilesOpenedPreferences.lastFocusedFileProperty(), (obs, oldValue, newValue) -> {
-            if (newValue != null) {
-                put(LAST_FOCUSED, newValue.toAbsolutePath().toString());
-            } else {
-                remove(LAST_FOCUSED);
-            }
-        });
-        lastFilesOpenedPreferences.getFileHistory().addListener((InvalidationListener) change -> storeFileHistory(lastFilesOpenedPreferences.getFileHistory()));
+        lastFilesOpenedPreferences =
+                new LastFilesOpenedPreferences(
+                        getStringList(LAST_EDITED).stream().map(Path::of).toList(),
+                        Path.of(get(LAST_FOCUSED)),
+                        getFileHistory());
+
+        lastFilesOpenedPreferences
+                .getLastFilesOpened()
+                .addListener(
+                        (ListChangeListener<Path>)
+                                change -> {
+                                    if (change.getList().isEmpty()) {
+                                        remove(LAST_EDITED);
+                                    } else {
+                                        putStringList(
+                                                LAST_EDITED,
+                                                lastFilesOpenedPreferences
+                                                        .getLastFilesOpened()
+                                                        .stream()
+                                                        .map(Path::toAbsolutePath)
+                                                        .map(Path::toString)
+                                                        .toList());
+                                    }
+                                });
+        EasyBind.listen(
+                lastFilesOpenedPreferences.lastFocusedFileProperty(),
+                (obs, oldValue, newValue) -> {
+                    if (newValue != null) {
+                        put(LAST_FOCUSED, newValue.toAbsolutePath().toString());
+                    } else {
+                        remove(LAST_FOCUSED);
+                    }
+                });
+        lastFilesOpenedPreferences
+                .getFileHistory()
+                .addListener(
+                        (InvalidationListener)
+                                change ->
+                                        storeFileHistory(
+                                                lastFilesOpenedPreferences.getFileHistory()));
 
         return lastFilesOpenedPreferences;
     }
 
     private FileHistory getFileHistory() {
-        return FileHistory.of(getStringList(RECENT_DATABASES).stream()
-                                                             .map(Path::of)
-                                                             .toList());
+        return FileHistory.of(getStringList(RECENT_DATABASES).stream().map(Path::of).toList());
     }
 
     private void storeFileHistory(FileHistory history) {
-        putStringList(RECENT_DATABASES, history.stream()
-                                               .map(Path::toAbsolutePath)
-                                               .map(Path::toString)
-                                               .toList());
+        putStringList(
+                RECENT_DATABASES,
+                history.stream().map(Path::toAbsolutePath).map(Path::toString).toList());
     }
 
     // endregion
@@ -1809,51 +2100,90 @@ public AiPreferences getAiPreferences() {
 
         boolean aiEnabled = getBoolean(AI_ENABLED);
 
-        aiPreferences = new AiPreferences(
-                aiEnabled,
-                AiProvider.valueOf(get(AI_PROVIDER)),
-                get(AI_OPEN_AI_CHAT_MODEL),
-                get(AI_MISTRAL_AI_CHAT_MODEL),
-                get(AI_GEMINI_CHAT_MODEL),
-                get(AI_HUGGING_FACE_CHAT_MODEL),
-                getBoolean(AI_CUSTOMIZE_SETTINGS),
-                get(AI_OPEN_AI_API_BASE_URL),
-                get(AI_MISTRAL_AI_API_BASE_URL),
-                get(AI_GEMINI_API_BASE_URL),
-                get(AI_HUGGING_FACE_API_BASE_URL),
-                EmbeddingModel.valueOf(get(AI_EMBEDDING_MODEL)),
-                get(AI_SYSTEM_MESSAGE),
-                getDouble(AI_TEMPERATURE),
-                getInt(AI_CONTEXT_WINDOW_SIZE),
-                getInt(AI_DOCUMENT_SPLITTER_CHUNK_SIZE),
-                getInt(AI_DOCUMENT_SPLITTER_OVERLAP_SIZE),
-                getInt(AI_RAG_MAX_RESULTS_COUNT),
-                getDouble(AI_RAG_MIN_SCORE));
-
-        EasyBind.listen(aiPreferences.enableAiProperty(), (obs, oldValue, newValue) -> putBoolean(AI_ENABLED, newValue));
-
-        EasyBind.listen(aiPreferences.aiProviderProperty(), (obs, oldValue, newValue) -> put(AI_PROVIDER, newValue.name()));
-
-        EasyBind.listen(aiPreferences.openAiChatModelProperty(), (obs, oldValue, newValue) -> put(AI_OPEN_AI_CHAT_MODEL, newValue));
-        EasyBind.listen(aiPreferences.mistralAiChatModelProperty(), (obs, oldValue, newValue) -> put(AI_MISTRAL_AI_CHAT_MODEL, newValue));
-        EasyBind.listen(aiPreferences.geminiChatModelProperty(), (obs, oldValue, newValue) -> put(AI_GEMINI_CHAT_MODEL, newValue));
-        EasyBind.listen(aiPreferences.huggingFaceChatModelProperty(), (obs, oldValue, newValue) -> put(AI_HUGGING_FACE_CHAT_MODEL, newValue));
-
-        EasyBind.listen(aiPreferences.customizeExpertSettingsProperty(), (obs, oldValue, newValue) -> putBoolean(AI_CUSTOMIZE_SETTINGS, newValue));
-
-        EasyBind.listen(aiPreferences.openAiApiBaseUrlProperty(), (obs, oldValue, newValue) -> put(AI_OPEN_AI_API_BASE_URL, newValue));
-        EasyBind.listen(aiPreferences.mistralAiApiBaseUrlProperty(), (obs, oldValue, newValue) -> put(AI_MISTRAL_AI_API_BASE_URL, newValue));
-        EasyBind.listen(aiPreferences.geminiApiBaseUrlProperty(), (obs, oldValue, newValue) -> put(AI_GEMINI_API_BASE_URL, newValue));
-        EasyBind.listen(aiPreferences.huggingFaceApiBaseUrlProperty(), (obs, oldValue, newValue) -> put(AI_HUGGING_FACE_API_BASE_URL, newValue));
-
-        EasyBind.listen(aiPreferences.embeddingModelProperty(), (obs, oldValue, newValue) -> put(AI_EMBEDDING_MODEL, newValue.name()));
-        EasyBind.listen(aiPreferences.instructionProperty(), (obs, oldValue, newValue) -> put(AI_SYSTEM_MESSAGE, newValue));
-        EasyBind.listen(aiPreferences.temperatureProperty(), (obs, oldValue, newValue) -> putDouble(AI_TEMPERATURE, newValue.doubleValue()));
-        EasyBind.listen(aiPreferences.contextWindowSizeProperty(), (obs, oldValue, newValue) -> putInt(AI_CONTEXT_WINDOW_SIZE, newValue));
-        EasyBind.listen(aiPreferences.documentSplitterChunkSizeProperty(), (obs, oldValue, newValue) -> putInt(AI_DOCUMENT_SPLITTER_CHUNK_SIZE, newValue));
-        EasyBind.listen(aiPreferences.documentSplitterOverlapSizeProperty(), (obs, oldValue, newValue) -> putInt(AI_DOCUMENT_SPLITTER_OVERLAP_SIZE, newValue));
-        EasyBind.listen(aiPreferences.ragMaxResultsCountProperty(), (obs, oldValue, newValue) -> putInt(AI_RAG_MAX_RESULTS_COUNT, newValue));
-        EasyBind.listen(aiPreferences.ragMinScoreProperty(), (obs, oldValue, newValue) -> putDouble(AI_RAG_MIN_SCORE, newValue.doubleValue()));
+        aiPreferences =
+                new AiPreferences(
+                        aiEnabled,
+                        AiProvider.valueOf(get(AI_PROVIDER)),
+                        get(AI_OPEN_AI_CHAT_MODEL),
+                        get(AI_MISTRAL_AI_CHAT_MODEL),
+                        get(AI_GEMINI_CHAT_MODEL),
+                        get(AI_HUGGING_FACE_CHAT_MODEL),
+                        getBoolean(AI_CUSTOMIZE_SETTINGS),
+                        get(AI_OPEN_AI_API_BASE_URL),
+                        get(AI_MISTRAL_AI_API_BASE_URL),
+                        get(AI_GEMINI_API_BASE_URL),
+                        get(AI_HUGGING_FACE_API_BASE_URL),
+                        EmbeddingModel.valueOf(get(AI_EMBEDDING_MODEL)),
+                        get(AI_SYSTEM_MESSAGE),
+                        getDouble(AI_TEMPERATURE),
+                        getInt(AI_CONTEXT_WINDOW_SIZE),
+                        getInt(AI_DOCUMENT_SPLITTER_CHUNK_SIZE),
+                        getInt(AI_DOCUMENT_SPLITTER_OVERLAP_SIZE),
+                        getInt(AI_RAG_MAX_RESULTS_COUNT),
+                        getDouble(AI_RAG_MIN_SCORE));
+
+        EasyBind.listen(
+                aiPreferences.enableAiProperty(),
+                (obs, oldValue, newValue) -> putBoolean(AI_ENABLED, newValue));
+
+        EasyBind.listen(
+                aiPreferences.aiProviderProperty(),
+                (obs, oldValue, newValue) -> put(AI_PROVIDER, newValue.name()));
+
+        EasyBind.listen(
+                aiPreferences.openAiChatModelProperty(),
+                (obs, oldValue, newValue) -> put(AI_OPEN_AI_CHAT_MODEL, newValue));
+        EasyBind.listen(
+                aiPreferences.mistralAiChatModelProperty(),
+                (obs, oldValue, newValue) -> put(AI_MISTRAL_AI_CHAT_MODEL, newValue));
+        EasyBind.listen(
+                aiPreferences.geminiChatModelProperty(),
+                (obs, oldValue, newValue) -> put(AI_GEMINI_CHAT_MODEL, newValue));
+        EasyBind.listen(
+                aiPreferences.huggingFaceChatModelProperty(),
+                (obs, oldValue, newValue) -> put(AI_HUGGING_FACE_CHAT_MODEL, newValue));
+
+        EasyBind.listen(
+                aiPreferences.customizeExpertSettingsProperty(),
+                (obs, oldValue, newValue) -> putBoolean(AI_CUSTOMIZE_SETTINGS, newValue));
+
+        EasyBind.listen(
+                aiPreferences.openAiApiBaseUrlProperty(),
+                (obs, oldValue, newValue) -> put(AI_OPEN_AI_API_BASE_URL, newValue));
+        EasyBind.listen(
+                aiPreferences.mistralAiApiBaseUrlProperty(),
+                (obs, oldValue, newValue) -> put(AI_MISTRAL_AI_API_BASE_URL, newValue));
+        EasyBind.listen(
+                aiPreferences.geminiApiBaseUrlProperty(),
+                (obs, oldValue, newValue) -> put(AI_GEMINI_API_BASE_URL, newValue));
+        EasyBind.listen(
+                aiPreferences.huggingFaceApiBaseUrlProperty(),
+                (obs, oldValue, newValue) -> put(AI_HUGGING_FACE_API_BASE_URL, newValue));
+
+        EasyBind.listen(
+                aiPreferences.embeddingModelProperty(),
+                (obs, oldValue, newValue) -> put(AI_EMBEDDING_MODEL, newValue.name()));
+        EasyBind.listen(
+                aiPreferences.instructionProperty(),
+                (obs, oldValue, newValue) -> put(AI_SYSTEM_MESSAGE, newValue));
+        EasyBind.listen(
+                aiPreferences.temperatureProperty(),
+                (obs, oldValue, newValue) -> putDouble(AI_TEMPERATURE, newValue.doubleValue()));
+        EasyBind.listen(
+                aiPreferences.contextWindowSizeProperty(),
+                (obs, oldValue, newValue) -> putInt(AI_CONTEXT_WINDOW_SIZE, newValue));
+        EasyBind.listen(
+                aiPreferences.documentSplitterChunkSizeProperty(),
+                (obs, oldValue, newValue) -> putInt(AI_DOCUMENT_SPLITTER_CHUNK_SIZE, newValue));
+        EasyBind.listen(
+                aiPreferences.documentSplitterOverlapSizeProperty(),
+                (obs, oldValue, newValue) -> putInt(AI_DOCUMENT_SPLITTER_OVERLAP_SIZE, newValue));
+        EasyBind.listen(
+                aiPreferences.ragMaxResultsCountProperty(),
+                (obs, oldValue, newValue) -> putInt(AI_RAG_MAX_RESULTS_COUNT, newValue));
+        EasyBind.listen(
+                aiPreferences.ragMinScoreProperty(),
+                (obs, oldValue, newValue) -> putDouble(AI_RAG_MIN_SCORE, newValue.doubleValue()));
 
         return aiPreferences;
     }
@@ -1864,24 +2194,56 @@ public SearchPreferences getSearchPreferences() {
             return searchPreferences;
         }
 
-        searchPreferences = new SearchPreferences(
-                getBoolean(SEARCH_DISPLAY_MODE) ? SearchDisplayMode.FILTER : SearchDisplayMode.FLOAT,
-                getBoolean(SEARCH_FULLTEXT),
-                getBoolean(SEARCH_KEEP_SEARCH_STRING),
-                getBoolean(SEARCH_KEEP_GLOBAL_WINDOW_ON_TOP),
-                getDouble(SEARCH_WINDOW_HEIGHT),
-                getDouble(SEARCH_WINDOW_WIDTH),
-                getDouble(SEARCH_WINDOW_DIVIDER_POS));
-
-        searchPreferences.getObservableSearchFlags().addListener((SetChangeListener<SearchFlags>) c -> {
-            putBoolean(SEARCH_FULLTEXT, searchPreferences.getObservableSearchFlags().contains(SearchFlags.FULLTEXT));
-        });
-        EasyBind.listen(searchPreferences.searchDisplayModeProperty(), (obs, oldValue, newValue) -> putBoolean(SEARCH_DISPLAY_MODE, newValue == SearchDisplayMode.FILTER));
-        EasyBind.listen(searchPreferences.keepSearchStingProperty(), (obs, oldValue, newValue) -> putBoolean(SEARCH_KEEP_SEARCH_STRING, newValue));
-        EasyBind.listen(searchPreferences.keepWindowOnTopProperty(), (obs, oldValue, newValue) -> putBoolean(SEARCH_KEEP_GLOBAL_WINDOW_ON_TOP, searchPreferences.shouldKeepWindowOnTop()));
-        EasyBind.listen(searchPreferences.getSearchWindowHeightProperty(), (obs, oldValue, newValue) -> putDouble(SEARCH_WINDOW_HEIGHT, searchPreferences.getSearchWindowHeight()));
-        EasyBind.listen(searchPreferences.getSearchWindowWidthProperty(), (obs, oldValue, newValue) -> putDouble(SEARCH_WINDOW_WIDTH, searchPreferences.getSearchWindowWidth()));
-        EasyBind.listen(searchPreferences.getSearchWindowDividerPositionProperty(), (obs, oldValue, newValue) -> putDouble(SEARCH_WINDOW_DIVIDER_POS, searchPreferences.getSearchWindowDividerPosition()));
+        searchPreferences =
+                new SearchPreferences(
+                        getBoolean(SEARCH_DISPLAY_MODE)
+                                ? SearchDisplayMode.FILTER
+                                : SearchDisplayMode.FLOAT,
+                        getBoolean(SEARCH_FULLTEXT),
+                        getBoolean(SEARCH_KEEP_SEARCH_STRING),
+                        getBoolean(SEARCH_KEEP_GLOBAL_WINDOW_ON_TOP),
+                        getDouble(SEARCH_WINDOW_HEIGHT),
+                        getDouble(SEARCH_WINDOW_WIDTH),
+                        getDouble(SEARCH_WINDOW_DIVIDER_POS));
+
+        searchPreferences
+                .getObservableSearchFlags()
+                .addListener(
+                        (SetChangeListener<SearchFlags>)
+                                c -> {
+                                    putBoolean(
+                                            SEARCH_FULLTEXT,
+                                            searchPreferences
+                                                    .getObservableSearchFlags()
+                                                    .contains(SearchFlags.FULLTEXT));
+                                });
+        EasyBind.listen(
+                searchPreferences.searchDisplayModeProperty(),
+                (obs, oldValue, newValue) ->
+                        putBoolean(SEARCH_DISPLAY_MODE, newValue == SearchDisplayMode.FILTER));
+        EasyBind.listen(
+                searchPreferences.keepSearchStingProperty(),
+                (obs, oldValue, newValue) -> putBoolean(SEARCH_KEEP_SEARCH_STRING, newValue));
+        EasyBind.listen(
+                searchPreferences.keepWindowOnTopProperty(),
+                (obs, oldValue, newValue) ->
+                        putBoolean(
+                                SEARCH_KEEP_GLOBAL_WINDOW_ON_TOP,
+                                searchPreferences.shouldKeepWindowOnTop()));
+        EasyBind.listen(
+                searchPreferences.getSearchWindowHeightProperty(),
+                (obs, oldValue, newValue) ->
+                        putDouble(SEARCH_WINDOW_HEIGHT, searchPreferences.getSearchWindowHeight()));
+        EasyBind.listen(
+                searchPreferences.getSearchWindowWidthProperty(),
+                (obs, oldValue, newValue) ->
+                        putDouble(SEARCH_WINDOW_WIDTH, searchPreferences.getSearchWindowWidth()));
+        EasyBind.listen(
+                searchPreferences.getSearchWindowDividerPositionProperty(),
+                (obs, oldValue, newValue) ->
+                        putDouble(
+                                SEARCH_WINDOW_DIVIDER_POS,
+                                searchPreferences.getSearchWindowDividerPosition()));
 
         return searchPreferences;
     }
@@ -1892,17 +2254,27 @@ public XmpPreferences getXmpPreferences() {
             return xmpPreferences;
         }
 
-        xmpPreferences = new XmpPreferences(
-                getBoolean(USE_XMP_PRIVACY_FILTER),
-                getStringList(XMP_PRIVACY_FILTERS).stream().map(FieldFactory::parseField).collect(Collectors.toSet()),
-                getBibEntryPreferences().keywordSeparatorProperty());
+        xmpPreferences =
+                new XmpPreferences(
+                        getBoolean(USE_XMP_PRIVACY_FILTER),
+                        getStringList(XMP_PRIVACY_FILTERS).stream()
+                                .map(FieldFactory::parseField)
+                                .collect(Collectors.toSet()),
+                        getBibEntryPreferences().keywordSeparatorProperty());
 
-        EasyBind.listen(xmpPreferences.useXmpPrivacyFilterProperty(),
+        EasyBind.listen(
+                xmpPreferences.useXmpPrivacyFilterProperty(),
                 (obs, oldValue, newValue) -> putBoolean(USE_XMP_PRIVACY_FILTER, newValue));
-        xmpPreferences.getXmpPrivacyFilter().addListener((SetChangeListener<Field>) c ->
-                putStringList(XMP_PRIVACY_FILTERS, xmpPreferences.getXmpPrivacyFilter().stream()
-                                                                 .map(Field::getName)
-                                                                 .collect(Collectors.toList())));
+        xmpPreferences
+                .getXmpPrivacyFilter()
+                .addListener(
+                        (SetChangeListener<Field>)
+                                c ->
+                                        putStringList(
+                                                XMP_PRIVACY_FILTERS,
+                                                xmpPreferences.getXmpPrivacyFilter().stream()
+                                                        .map(Field::getName)
+                                                        .collect(Collectors.toList())));
 
         return xmpPreferences;
     }
@@ -1913,14 +2285,26 @@ public NameFormatterPreferences getNameFormatterPreferences() {
             return nameFormatterPreferences;
         }
 
-        nameFormatterPreferences = new NameFormatterPreferences(
-                getStringList(NAME_FORMATER_KEY),
-                getStringList(NAME_FORMATTER_VALUE));
-
-        nameFormatterPreferences.getNameFormatterKey().addListener((InvalidationListener) change ->
-                putStringList(NAME_FORMATER_KEY, nameFormatterPreferences.getNameFormatterKey()));
-        nameFormatterPreferences.getNameFormatterValue().addListener((InvalidationListener) change ->
-                putStringList(NAME_FORMATTER_VALUE, nameFormatterPreferences.getNameFormatterValue()));
+        nameFormatterPreferences =
+                new NameFormatterPreferences(
+                        getStringList(NAME_FORMATER_KEY), getStringList(NAME_FORMATTER_VALUE));
+
+        nameFormatterPreferences
+                .getNameFormatterKey()
+                .addListener(
+                        (InvalidationListener)
+                                change ->
+                                        putStringList(
+                                                NAME_FORMATER_KEY,
+                                                nameFormatterPreferences.getNameFormatterKey()));
+        nameFormatterPreferences
+                .getNameFormatterValue()
+                .addListener(
+                        (InvalidationListener)
+                                change ->
+                                        putStringList(
+                                                NAME_FORMATTER_VALUE,
+                                                nameFormatterPreferences.getNameFormatterValue()));
 
         return nameFormatterPreferences;
     }
@@ -1931,16 +2315,25 @@ public MrDlibPreferences getMrDlibPreferences() {
             return mrDlibPreferences;
         }
 
-        mrDlibPreferences = new MrDlibPreferences(
-                getBoolean(ACCEPT_RECOMMENDATIONS),
-                getBoolean(SEND_LANGUAGE_DATA),
-                getBoolean(SEND_OS_DATA),
-                getBoolean(SEND_TIMEZONE_DATA));
-
-        EasyBind.listen(mrDlibPreferences.acceptRecommendationsProperty(), (obs, oldValue, newValue) -> putBoolean(ACCEPT_RECOMMENDATIONS, newValue));
-        EasyBind.listen(mrDlibPreferences.sendLanguageProperty(), (obs, oldValue, newValue) -> putBoolean(SEND_LANGUAGE_DATA, newValue));
-        EasyBind.listen(mrDlibPreferences.sendOsProperty(), (obs, oldValue, newValue) -> putBoolean(SEND_OS_DATA, newValue));
-        EasyBind.listen(mrDlibPreferences.sendTimezoneProperty(), (obs, oldValue, newValue) -> putBoolean(SEND_TIMEZONE_DATA, newValue));
+        mrDlibPreferences =
+                new MrDlibPreferences(
+                        getBoolean(ACCEPT_RECOMMENDATIONS),
+                        getBoolean(SEND_LANGUAGE_DATA),
+                        getBoolean(SEND_OS_DATA),
+                        getBoolean(SEND_TIMEZONE_DATA));
+
+        EasyBind.listen(
+                mrDlibPreferences.acceptRecommendationsProperty(),
+                (obs, oldValue, newValue) -> putBoolean(ACCEPT_RECOMMENDATIONS, newValue));
+        EasyBind.listen(
+                mrDlibPreferences.sendLanguageProperty(),
+                (obs, oldValue, newValue) -> putBoolean(SEND_LANGUAGE_DATA, newValue));
+        EasyBind.listen(
+                mrDlibPreferences.sendOsProperty(),
+                (obs, oldValue, newValue) -> putBoolean(SEND_OS_DATA, newValue));
+        EasyBind.listen(
+                mrDlibPreferences.sendTimezoneProperty(),
+                (obs, oldValue, newValue) -> putBoolean(SEND_TIMEZONE_DATA, newValue));
 
         return mrDlibPreferences;
     }
@@ -1951,28 +2344,56 @@ public ProtectedTermsPreferences getProtectedTermsPreferences() {
             return protectedTermsPreferences;
         }
 
-        protectedTermsPreferences = new ProtectedTermsPreferences(
-                getStringList(PROTECTED_TERMS_ENABLED_INTERNAL),
-                getStringList(PROTECTED_TERMS_ENABLED_EXTERNAL),
-                getStringList(PROTECTED_TERMS_DISABLED_INTERNAL),
-                getStringList(PROTECTED_TERMS_DISABLED_EXTERNAL)
-        );
-
-        protectedTermsPreferences.getEnabledExternalTermLists().addListener((InvalidationListener) change ->
-                putStringList(PROTECTED_TERMS_ENABLED_EXTERNAL, protectedTermsPreferences.getEnabledExternalTermLists()));
-        protectedTermsPreferences.getDisabledExternalTermLists().addListener((InvalidationListener) change ->
-                putStringList(PROTECTED_TERMS_DISABLED_EXTERNAL, protectedTermsPreferences.getDisabledExternalTermLists()));
-        protectedTermsPreferences.getEnabledInternalTermLists().addListener((InvalidationListener) change ->
-                putStringList(PROTECTED_TERMS_ENABLED_INTERNAL, protectedTermsPreferences.getEnabledInternalTermLists()));
-        protectedTermsPreferences.getDisabledInternalTermLists().addListener((InvalidationListener) change ->
-                putStringList(PROTECTED_TERMS_DISABLED_INTERNAL, protectedTermsPreferences.getDisabledInternalTermLists()));
+        protectedTermsPreferences =
+                new ProtectedTermsPreferences(
+                        getStringList(PROTECTED_TERMS_ENABLED_INTERNAL),
+                        getStringList(PROTECTED_TERMS_ENABLED_EXTERNAL),
+                        getStringList(PROTECTED_TERMS_DISABLED_INTERNAL),
+                        getStringList(PROTECTED_TERMS_DISABLED_EXTERNAL));
+
+        protectedTermsPreferences
+                .getEnabledExternalTermLists()
+                .addListener(
+                        (InvalidationListener)
+                                change ->
+                                        putStringList(
+                                                PROTECTED_TERMS_ENABLED_EXTERNAL,
+                                                protectedTermsPreferences
+                                                        .getEnabledExternalTermLists()));
+        protectedTermsPreferences
+                .getDisabledExternalTermLists()
+                .addListener(
+                        (InvalidationListener)
+                                change ->
+                                        putStringList(
+                                                PROTECTED_TERMS_DISABLED_EXTERNAL,
+                                                protectedTermsPreferences
+                                                        .getDisabledExternalTermLists()));
+        protectedTermsPreferences
+                .getEnabledInternalTermLists()
+                .addListener(
+                        (InvalidationListener)
+                                change ->
+                                        putStringList(
+                                                PROTECTED_TERMS_ENABLED_INTERNAL,
+                                                protectedTermsPreferences
+                                                        .getEnabledInternalTermLists()));
+        protectedTermsPreferences
+                .getDisabledInternalTermLists()
+                .addListener(
+                        (InvalidationListener)
+                                change ->
+                                        putStringList(
+                                                PROTECTED_TERMS_DISABLED_INTERNAL,
+                                                protectedTermsPreferences
+                                                        .getDisabledInternalTermLists()));
 
         return protectedTermsPreferences;
     }
 
-    //*************************************************************************************************************
+    // *************************************************************************************************************
     // Importer preferences
-    //*************************************************************************************************************
+    // *************************************************************************************************************
 
     @Override
     public ImporterPreferences getImporterPreferences() {
@@ -1980,24 +2401,53 @@ public ImporterPreferences getImporterPreferences() {
             return importerPreferences;
         }
 
-        importerPreferences = new ImporterPreferences(
-                getBoolean(IMPORTERS_ENABLED),
-                getBoolean(GENERATE_KEY_ON_IMPORT),
-                Path.of(get(IMPORT_WORKING_DIRECTORY)),
-                getBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION),
-                getCustomImportFormats(),
-                getFetcherKeys(),
-                getBoolean(FETCHER_CUSTOM_KEY_PERSIST),
-                getStringList(SEARCH_CATALOGS));
-
-        EasyBind.listen(importerPreferences.importerEnabledProperty(), (obs, oldValue, newValue) -> putBoolean(IMPORTERS_ENABLED, newValue));
-        EasyBind.listen(importerPreferences.generateNewKeyOnImportProperty(), (obs, oldValue, newValue) -> putBoolean(GENERATE_KEY_ON_IMPORT, newValue));
-        EasyBind.listen(importerPreferences.importWorkingDirectoryProperty(), (obs, oldValue, newValue) -> put(IMPORT_WORKING_DIRECTORY, newValue.toString()));
-        EasyBind.listen(importerPreferences.warnAboutDuplicatesOnImportProperty(), (obs, oldValue, newValue) -> putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue));
-        EasyBind.listen(importerPreferences.persistCustomKeysProperty(), (obs, oldValue, newValue) -> putBoolean(FETCHER_CUSTOM_KEY_PERSIST, newValue));
-        importerPreferences.getApiKeys().addListener((InvalidationListener) c -> storeFetcherKeys(importerPreferences.getApiKeys()));
-        importerPreferences.getCustomImporters().addListener((InvalidationListener) c -> storeCustomImportFormats(importerPreferences.getCustomImporters()));
-        importerPreferences.getCatalogs().addListener((InvalidationListener) c -> putStringList(SEARCH_CATALOGS, importerPreferences.getCatalogs()));
+        importerPreferences =
+                new ImporterPreferences(
+                        getBoolean(IMPORTERS_ENABLED),
+                        getBoolean(GENERATE_KEY_ON_IMPORT),
+                        Path.of(get(IMPORT_WORKING_DIRECTORY)),
+                        getBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION),
+                        getCustomImportFormats(),
+                        getFetcherKeys(),
+                        getBoolean(FETCHER_CUSTOM_KEY_PERSIST),
+                        getStringList(SEARCH_CATALOGS));
+
+        EasyBind.listen(
+                importerPreferences.importerEnabledProperty(),
+                (obs, oldValue, newValue) -> putBoolean(IMPORTERS_ENABLED, newValue));
+        EasyBind.listen(
+                importerPreferences.generateNewKeyOnImportProperty(),
+                (obs, oldValue, newValue) -> putBoolean(GENERATE_KEY_ON_IMPORT, newValue));
+        EasyBind.listen(
+                importerPreferences.importWorkingDirectoryProperty(),
+                (obs, oldValue, newValue) -> put(IMPORT_WORKING_DIRECTORY, newValue.toString()));
+        EasyBind.listen(
+                importerPreferences.warnAboutDuplicatesOnImportProperty(),
+                (obs, oldValue, newValue) ->
+                        putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue));
+        EasyBind.listen(
+                importerPreferences.persistCustomKeysProperty(),
+                (obs, oldValue, newValue) -> putBoolean(FETCHER_CUSTOM_KEY_PERSIST, newValue));
+        importerPreferences
+                .getApiKeys()
+                .addListener(
+                        (InvalidationListener)
+                                c -> storeFetcherKeys(importerPreferences.getApiKeys()));
+        importerPreferences
+                .getCustomImporters()
+                .addListener(
+                        (InvalidationListener)
+                                c ->
+                                        storeCustomImportFormats(
+                                                importerPreferences.getCustomImporters()));
+        importerPreferences
+                .getCatalogs()
+                .addListener(
+                        (InvalidationListener)
+                                c ->
+                                        putStringList(
+                                                SEARCH_CATALOGS,
+                                                importerPreferences.getCatalogs()));
 
         return importerPreferences;
     }
@@ -2010,13 +2460,17 @@ private Set<CustomImporter> getCustomImportFormats() {
             try {
                 if (importerString.size() == 2) {
                     // New format: basePath, className
-                    importers.add(new CustomImporter(importerString.getFirst(), importerString.get(1)));
+                    importers.add(
+                            new CustomImporter(importerString.getFirst(), importerString.get(1)));
                 } else {
                     // Old format: name, cliId, className, basePath
                     importers.add(new CustomImporter(importerString.get(3), importerString.get(2)));
                 }
             } catch (Exception e) {
-                LOGGER.warn("Could not load {} from preferences. Will ignore.", importerString.getFirst(), e);
+                LOGGER.warn(
+                        "Could not load {} from preferences. Will ignore.",
+                        importerString.getFirst(),
+                        e);
             }
         }
 
@@ -2039,11 +2493,12 @@ private Set<FetcherApiKey> getFetcherKeys() {
         List<String> keys = getFetcherKeysFromKeyring(names);
 
         for (int i = 0; i < names.size(); i++) {
-            fetcherApiKeys.add(new FetcherApiKey(
-                    names.get(i),
-                    // i < uses.size() ? Boolean.parseBoolean(uses.get(i)) : false
-                    (i < uses.size()) && Boolean.parseBoolean(uses.get(i)),
-                    i < keys.size() ? keys.get(i) : ""));
+            fetcherApiKeys.add(
+                    new FetcherApiKey(
+                            names.get(i),
+                            // i < uses.size() ? Boolean.parseBoolean(uses.get(i)) : false
+                            (i < uses.size()) && Boolean.parseBoolean(uses.get(i)),
+                            i < keys.size() ? keys.get(i) : ""));
         }
 
         return fetcherApiKeys;
@@ -2055,10 +2510,12 @@ private List<String> getFetcherKeysFromKeyring(List<String> names) {
         try (final Keyring keyring = Keyring.create()) {
             for (String fetcher : names) {
                 try {
-                    keys.add(new Password(
-                            keyring.getPassword("org.jabref.customapikeys", fetcher),
-                            getInternalPreferences().getUserAndHost())
-                            .decrypt());
+                    keys.add(
+                            new Password(
+                                            keyring.getPassword(
+                                                    "org.jabref.customapikeys", fetcher),
+                                            getInternalPreferences().getUserAndHost())
+                                    .decrypt());
                 } catch (PasswordAccessException ex) {
                     LOGGER.debug("No api key stored for {} fetcher", fetcher);
                     keys.add("");
@@ -2102,10 +2559,11 @@ private void storeFetcherKeysToKeyring(List<String> names, List<String> keys) {
                         // Already removed
                     }
                 } else {
-                    keyring.setPassword("org.jabref.customapikeys", names.get(i), new Password(
-                            keys.get(i),
-                            getInternalPreferences().getUserAndHost())
-                            .encrypt());
+                    keyring.setPassword(
+                            "org.jabref.customapikeys",
+                            names.get(i),
+                            new Password(keys.get(i), getInternalPreferences().getUserAndHost())
+                                    .encrypt());
                 }
             }
         } catch (Exception ex) {
@@ -2134,14 +2592,19 @@ public GrobidPreferences getGrobidPreferences() {
             return grobidPreferences;
         }
 
-        grobidPreferences = new GrobidPreferences(
-                getBoolean(GROBID_ENABLED),
-                getBoolean(GROBID_OPT_OUT),
-                get(GROBID_URL));
+        grobidPreferences =
+                new GrobidPreferences(
+                        getBoolean(GROBID_ENABLED), getBoolean(GROBID_OPT_OUT), get(GROBID_URL));
 
-        EasyBind.listen(grobidPreferences.grobidEnabledProperty(), (obs, oldValue, newValue) -> putBoolean(GROBID_ENABLED, newValue));
-        EasyBind.listen(grobidPreferences.grobidOptOutProperty(), (obs, oldValue, newValue) -> putBoolean(GROBID_OPT_OUT, newValue));
-        EasyBind.listen(grobidPreferences.grobidURLProperty(), (obs, oldValue, newValue) -> put(GROBID_URL, newValue));
+        EasyBind.listen(
+                grobidPreferences.grobidEnabledProperty(),
+                (obs, oldValue, newValue) -> putBoolean(GROBID_ENABLED, newValue));
+        EasyBind.listen(
+                grobidPreferences.grobidOptOutProperty(),
+                (obs, oldValue, newValue) -> putBoolean(GROBID_OPT_OUT, newValue));
+        EasyBind.listen(
+                grobidPreferences.grobidURLProperty(),
+                (obs, oldValue, newValue) -> put(GROBID_URL, newValue));
 
         return grobidPreferences;
     }
diff --git a/src/main/java/org/jabref/logic/preferences/LastFilesOpenedPreferences.java b/src/main/java/org/jabref/logic/preferences/LastFilesOpenedPreferences.java
index f136c0aa64ae..181745334d2d 100644
--- a/src/main/java/org/jabref/logic/preferences/LastFilesOpenedPreferences.java
+++ b/src/main/java/org/jabref/logic/preferences/LastFilesOpenedPreferences.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.preferences;
 
-import java.nio.file.Path;
-import java.util.List;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
@@ -10,6 +7,9 @@
 
 import org.jabref.logic.util.io.FileHistory;
 
+import java.nio.file.Path;
+import java.util.List;
+
 public class LastFilesOpenedPreferences {
 
     // the last libraries that were open when jabref closes and should be reopened on startup
@@ -20,7 +20,8 @@ public class LastFilesOpenedPreferences {
     // observable list last files opened in the file menu
     private final FileHistory fileHistory;
 
-    public LastFilesOpenedPreferences(List<Path> lastFilesOpened, Path lastFocusedFile, FileHistory fileHistory) {
+    public LastFilesOpenedPreferences(
+            List<Path> lastFilesOpened, Path lastFocusedFile, FileHistory fileHistory) {
         this.lastFilesOpened = FXCollections.observableArrayList(lastFilesOpened);
         this.lastFocusedFile = new SimpleObjectProperty<>(lastFocusedFile);
         this.fileHistory = fileHistory;
diff --git a/src/main/java/org/jabref/logic/preferences/OwnerPreferences.java b/src/main/java/org/jabref/logic/preferences/OwnerPreferences.java
index d411dbddfb1e..55316a860670 100644
--- a/src/main/java/org/jabref/logic/preferences/OwnerPreferences.java
+++ b/src/main/java/org/jabref/logic/preferences/OwnerPreferences.java
@@ -10,9 +10,7 @@ public class OwnerPreferences {
     private final StringProperty defaultOwner;
     private final BooleanProperty overwriteOwner;
 
-    public OwnerPreferences(boolean useOwner,
-                            String defaultOwner,
-                            boolean overwriteOwner) {
+    public OwnerPreferences(boolean useOwner, String defaultOwner, boolean overwriteOwner) {
         this.useOwner = new SimpleBooleanProperty(useOwner);
         this.defaultOwner = new SimpleStringProperty(defaultOwner);
         this.overwriteOwner = new SimpleBooleanProperty(overwriteOwner);
diff --git a/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java b/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java
index a8d676cbc0f1..417af6615884 100644
--- a/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java
+++ b/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.preferences;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 
 import org.jabref.model.entry.field.Field;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+
 public class TimestampPreferences {
     private final BooleanProperty addCreationDate;
     private final BooleanProperty addModificationDate;
@@ -18,7 +18,12 @@ public class TimestampPreferences {
     private final Field timestampField;
     private final String timestampFormat;
 
-    public TimestampPreferences(boolean addCreationDate, boolean modifyTimestamp, boolean updateTimestamp, Field timestampField, String timestampFormat) {
+    public TimestampPreferences(
+            boolean addCreationDate,
+            boolean modifyTimestamp,
+            boolean updateTimestamp,
+            Field timestampField,
+            String timestampFormat) {
         this.addCreationDate = new SimpleBooleanProperty(addCreationDate);
         this.addModificationDate = new SimpleBooleanProperty(modifyTimestamp);
         this.updateTimestamp = updateTimestamp;
@@ -28,7 +33,8 @@ public TimestampPreferences(boolean addCreationDate, boolean modifyTimestamp, bo
 
     public String now() {
         // Milli-, Micro-, and Nanoseconds are not relevant to us, so we remove them
-        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS));
+        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(
+                LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS));
     }
 
     public boolean shouldAddCreationDate() {
diff --git a/src/main/java/org/jabref/logic/preview/PreviewLayout.java b/src/main/java/org/jabref/logic/preview/PreviewLayout.java
index 484a057f9e2b..913cf4bd4368 100644
--- a/src/main/java/org/jabref/logic/preview/PreviewLayout.java
+++ b/src/main/java/org/jabref/logic/preview/PreviewLayout.java
@@ -1,17 +1,18 @@
 package org.jabref.logic.preview;
 
-import java.util.Locale;
-
 import org.jabref.logic.bst.BstPreviewLayout;
 import org.jabref.logic.citationstyle.CitationStylePreviewLayout;
 import org.jabref.logic.layout.TextBasedPreviewLayout;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
+import java.util.Locale;
+
 /**
  * Used for displaying a rendered entry in the UI. Due to historical reasons, "rendering" is called "layout".
  */
-public sealed interface PreviewLayout permits BstPreviewLayout, CitationStylePreviewLayout, TextBasedPreviewLayout {
+public sealed interface PreviewLayout
+        permits BstPreviewLayout, CitationStylePreviewLayout, TextBasedPreviewLayout {
 
     String generatePreview(BibEntry entry, BibDatabaseContext databaseContext);
 
@@ -22,6 +23,8 @@ public sealed interface PreviewLayout permits BstPreviewLayout, CitationStylePre
     String getName();
 
     default boolean containsCaseIndependent(String searchTerm) {
-        return this.getDisplayName().toLowerCase(Locale.ROOT).contains(searchTerm.toLowerCase(Locale.ROOT));
+        return this.getDisplayName()
+                .toLowerCase(Locale.ROOT)
+                .contains(searchTerm.toLowerCase(Locale.ROOT));
     }
 }
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java
index e316dee231ed..7b7d0a418eff 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.protectedterms;
 
+import org.jabref.logic.os.OS;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -9,11 +13,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import org.jabref.logic.os.OS;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class ProtectedTermsList implements Comparable<ProtectedTermsList> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ProtectedTermsList.class);
@@ -24,7 +23,8 @@ public class ProtectedTermsList implements Comparable<ProtectedTermsList> {
     private final boolean internalList;
     private boolean enabled;
 
-    public ProtectedTermsList(String description, List<String> termList, String location, boolean internalList) {
+    public ProtectedTermsList(
+            String description, List<String> termList, String location, boolean internalList) {
         this.description = Objects.requireNonNull(description);
         this.termsList = Objects.requireNonNull(termList);
         this.location = Objects.requireNonNull(location);
@@ -86,8 +86,11 @@ public boolean addProtectedTerm(String term, boolean create) {
 
         Path p = Path.of(location);
         String s = OS.NEWLINE + term;
-        try (BufferedWriter writer = Files.newBufferedWriter(p, StandardCharsets.UTF_8,
-                create ? StandardOpenOption.CREATE : StandardOpenOption.APPEND)) {
+        try (BufferedWriter writer =
+                Files.newBufferedWriter(
+                        p,
+                        StandardCharsets.UTF_8,
+                        create ? StandardOpenOption.CREATE : StandardOpenOption.APPEND)) {
             writer.write(s);
             termsList.add(term);
         } catch (IOException ioe) {
@@ -103,7 +106,8 @@ public boolean equals(Object o) {
             return false;
         }
         ProtectedTermsList otherList = (ProtectedTermsList) o;
-        return (this.location.equals(otherList.location)) && (this.description.equals(otherList.description));
+        return (this.location.equals(otherList.location))
+                && (this.description.equals(otherList.description));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java
index 1a0efbb005aa..b425caddc0c2 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.protectedterms;
 
+import org.jabref.logic.l10n.Localization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -11,11 +15,6 @@
 import java.util.Set;
 import java.util.function.Supplier;
 
-import org.jabref.logic.l10n.Localization;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class ProtectedTermsLoader {
 
     private static final Map<String, Supplier<String>> INTERNAL_LISTS = new HashMap<>();
@@ -25,10 +24,18 @@ public class ProtectedTermsLoader {
     private final List<ProtectedTermsList> mainList = new ArrayList<>();
 
     static {
-        INTERNAL_LISTS.put("/protectedterms/months_weekdays.terms", () -> Localization.lang("Months and weekdays in English"));
-        INTERNAL_LISTS.put("/protectedterms/countries_territories.terms", () -> Localization.lang("Countries and territories in English"));
-        INTERNAL_LISTS.put("/protectedterms/electrical_engineering.terms", () -> Localization.lang("Electrical engineering terms"));
-        INTERNAL_LISTS.put("/protectedterms/computer_science.terms", () -> Localization.lang("Computer science"));
+        INTERNAL_LISTS.put(
+                "/protectedterms/months_weekdays.terms",
+                () -> Localization.lang("Months and weekdays in English"));
+        INTERNAL_LISTS.put(
+                "/protectedterms/countries_territories.terms",
+                () -> Localization.lang("Countries and territories in English"));
+        INTERNAL_LISTS.put(
+                "/protectedterms/electrical_engineering.terms",
+                () -> Localization.lang("Electrical engineering terms"));
+        INTERNAL_LISTS.put(
+                "/protectedterms/computer_science.terms",
+                () -> Localization.lang("Computer science"));
     }
 
     public ProtectedTermsLoader(ProtectedTermsPreferences preferences) {
@@ -45,7 +52,9 @@ public void update(ProtectedTermsPreferences preferences) {
         // Read internal lists
         for (String filename : preferences.getEnabledInternalTermLists()) {
             if (INTERNAL_LISTS.containsKey(filename)) {
-                mainList.add(readProtectedTermsListFromResource(filename, INTERNAL_LISTS.get(filename).get(), true));
+                mainList.add(
+                        readProtectedTermsListFromResource(
+                                filename, INTERNAL_LISTS.get(filename).get(), true));
             } else {
                 LOGGER.warn("Protected terms resource '{}' is no longer available.", filename);
             }
@@ -53,7 +62,9 @@ public void update(ProtectedTermsPreferences preferences) {
         for (String filename : preferences.getDisabledInternalTermLists()) {
             if (INTERNAL_LISTS.containsKey(filename)) {
                 if (!preferences.getEnabledInternalTermLists().contains(filename)) {
-                    mainList.add(readProtectedTermsListFromResource(filename, INTERNAL_LISTS.get(filename).get(), false));
+                    mainList.add(
+                            readProtectedTermsListFromResource(
+                                    filename, INTERNAL_LISTS.get(filename).get(), false));
                 }
             } else {
                 LOGGER.warn("Protected terms resource '{}' is no longer available.", filename);
@@ -65,8 +76,12 @@ public void update(ProtectedTermsPreferences preferences) {
             if (!preferences.getEnabledInternalTermLists().contains(filename)
                     && !preferences.getDisabledInternalTermLists().contains(filename)) {
                 // New internal list, add it
-                mainList.add(readProtectedTermsListFromResource(filename, INTERNAL_LISTS.get(filename).get(), true));
-                LOGGER.warn("New protected terms resource '{}' is available and enabled by default.", filename);
+                mainList.add(
+                        readProtectedTermsListFromResource(
+                                filename, INTERNAL_LISTS.get(filename).get(), true));
+                LOGGER.warn(
+                        "New protected terms resource '{}' is available and enabled by default.",
+                        filename);
             }
         }
 
@@ -88,7 +103,8 @@ public void update(ProtectedTermsPreferences preferences) {
     }
 
     public void reloadProtectedTermsList(ProtectedTermsList list) {
-        ProtectedTermsList newList = readProtectedTermsListFromFile(Path.of(list.getLocation()), list.isEnabled());
+        ProtectedTermsList newList =
+                readProtectedTermsListFromFile(Path.of(list.getLocation()), list.isEnabled());
         int index = mainList.indexOf(list);
         if (index >= 0) {
             mainList.set(index, newList);
@@ -116,9 +132,11 @@ public void addProtectedTermsListFromFile(Path path, boolean enabled) {
         mainList.add(readProtectedTermsListFromFile(path, enabled));
     }
 
-    public static ProtectedTermsList readProtectedTermsListFromResource(String resource, String description, boolean enabled) {
+    public static ProtectedTermsList readProtectedTermsListFromResource(
+            String resource, String description, boolean enabled) {
         ProtectedTermsParser parser = new ProtectedTermsParser();
-        parser.readTermsFromResource(Objects.requireNonNull(resource), Objects.requireNonNull(description));
+        parser.readTermsFromResource(
+                Objects.requireNonNull(resource), Objects.requireNonNull(description));
         return parser.getProtectTermsList(enabled, true);
     }
 
@@ -134,10 +152,12 @@ public boolean removeProtectedTermsList(ProtectedTermsList termList) {
         return mainList.remove(termList);
     }
 
-    public ProtectedTermsList addNewProtectedTermsList(String newDescription, String newLocation, boolean enabled) {
+    public ProtectedTermsList addNewProtectedTermsList(
+            String newDescription, String newLocation, boolean enabled) {
         Objects.requireNonNull(newDescription);
         Objects.requireNonNull(newLocation);
-        ProtectedTermsList resultingList = new ProtectedTermsList(newDescription, new ArrayList<>(), newLocation);
+        ProtectedTermsList resultingList =
+                new ProtectedTermsList(newDescription, new ArrayList<>(), newLocation);
         resultingList.setEnabled(enabled);
         resultingList.createAndWriteHeading(newDescription);
         mainList.add(resultingList);
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
index de4d7006e9ed..a680a7cd0219 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.protectedterms;
 
+import org.jabref.logic.l10n.Localization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -12,11 +16,6 @@
 import java.util.Objects;
 import java.util.stream.Stream;
 
-import org.jabref.logic.l10n.Localization;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Reads abbreviation files (property files using NAME = ABBREVIATION as a format) into a list of Abbreviations.
  */
@@ -25,14 +24,17 @@ public class ProtectedTermsParser {
     private static final Logger LOGGER = LoggerFactory.getLogger(ProtectedTermsParser.class);
 
     private final List<String> terms = new ArrayList<>();
-    private String description = Localization.lang("The text after the last line starting with # will be used");
+    private String description =
+            Localization.lang("The text after the last line starting with # will be used");
 
     private String location;
 
     public void readTermsFromResource(String resourceFileName, String descriptionString) {
         description = descriptionString;
         location = resourceFileName;
-        try (InputStream inputStream = ProtectedTermsLoader.class.getResourceAsStream(Objects.requireNonNull(resourceFileName))) {
+        try (InputStream inputStream =
+                ProtectedTermsLoader.class.getResourceAsStream(
+                        Objects.requireNonNull(resourceFileName))) {
             if (inputStream == null) {
                 LOGGER.error("Cannot find resource '{}' ({})", resourceFileName, descriptionString);
                 return;
@@ -59,7 +61,8 @@ public void readTermsFromFile(Path path) {
     }
 
     private void readTermsList(InputStream inputStream) {
-        try (Stream<String> lines = new BufferedReader(new InputStreamReader(inputStream)).lines()) {
+        try (Stream<String> lines =
+                new BufferedReader(new InputStreamReader(inputStream)).lines()) {
             this.terms.addAll(lines.map(this::setDescription).filter(Objects::nonNull).toList());
         } catch (UncheckedIOException e) {
             LOGGER.warn("Could not read terms from stream", e);
@@ -80,7 +83,8 @@ private String setDescription(String line) {
     }
 
     public ProtectedTermsList getProtectTermsList(boolean enabled, boolean internal) {
-        ProtectedTermsList termList = new ProtectedTermsList(description, terms, location, internal);
+        ProtectedTermsList termList =
+                new ProtectedTermsList(description, terms, location, internal);
         termList.setEnabled(enabled);
         return termList;
     }
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java
index 0efc19a524c4..93083cef00c5 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.protectedterms;
 
-import java.util.List;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
+import java.util.List;
+
 public class ProtectedTermsPreferences {
 
     private final ObservableList<String> enabledInternalTermLists;
@@ -12,14 +12,17 @@ public class ProtectedTermsPreferences {
     private final ObservableList<String> disabledInternalTermLists;
     private final ObservableList<String> disabledExternalTermLists;
 
-    public ProtectedTermsPreferences(List<String> enabledInternalTermLists,
-                                     List<String> enabledExternalTermLists,
-                                     List<String> disabledInternalTermLists,
-                                     List<String> disabledExternalTermLists) {
+    public ProtectedTermsPreferences(
+            List<String> enabledInternalTermLists,
+            List<String> enabledExternalTermLists,
+            List<String> disabledInternalTermLists,
+            List<String> disabledExternalTermLists) {
         this.enabledInternalTermLists = FXCollections.observableArrayList(enabledInternalTermLists);
-        this.disabledInternalTermLists = FXCollections.observableArrayList(disabledInternalTermLists);
+        this.disabledInternalTermLists =
+                FXCollections.observableArrayList(disabledInternalTermLists);
         this.enabledExternalTermLists = FXCollections.observableArrayList(enabledExternalTermLists);
-        this.disabledExternalTermLists = FXCollections.observableArrayList(disabledExternalTermLists);
+        this.disabledExternalTermLists =
+                FXCollections.observableArrayList(disabledExternalTermLists);
     }
 
     public ObservableList<String> getEnabledInternalTermLists() {
diff --git a/src/main/java/org/jabref/logic/pseudonymization/Pseudonymization.java b/src/main/java/org/jabref/logic/pseudonymization/Pseudonymization.java
index 3328c05a26de..a1b9a93425a7 100644
--- a/src/main/java/org/jabref/logic/pseudonymization/Pseudonymization.java
+++ b/src/main/java/org/jabref/logic/pseudonymization/Pseudonymization.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.pseudonymization;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
-
 import org.jspecify.annotations.NullMarked;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
 /**
  * This class is used to anonymize a library. It is required to make private libraries available for public use.
  * <p>
@@ -21,8 +20,7 @@
 @NullMarked
 public class Pseudonymization {
 
-    public record Result(BibDatabaseContext bibDatabaseContext, Map<String, String> valueMapping) {
-    }
+    public record Result(BibDatabaseContext bibDatabaseContext, Map<String, String> valueMapping) {}
 
     public Result pseudonymizeLibrary(BibDatabaseContext bibDatabaseContext) {
         // TODO: Anonymize metadata
@@ -32,11 +30,14 @@ public Result pseudonymizeLibrary(BibDatabaseContext bibDatabaseContext) {
         List<BibEntry> newEntries = pseudonymizeEntries(bibDatabaseContext, fieldToValueToIdMap);
 
         Map<String, String> valueMapping = new HashMap<>();
-        fieldToValueToIdMap.forEach((field, stringToIntMap) -> {
-            stringToIntMap.forEach((value, id) -> {
-                valueMapping.put(field.getName().toLowerCase(Locale.ROOT) + "-" + id, value);
-            });
-        });
+        fieldToValueToIdMap.forEach(
+                (field, stringToIntMap) -> {
+                    stringToIntMap.forEach(
+                            (value, id) -> {
+                                valueMapping.put(
+                                        field.getName().toLowerCase(Locale.ROOT) + "-" + id, value);
+                            });
+                });
 
         BibDatabase bibDatabase = new BibDatabase(newEntries);
         BibDatabaseContext result = new BibDatabaseContext(bibDatabase);
@@ -48,7 +49,9 @@ public Result pseudonymizeLibrary(BibDatabaseContext bibDatabaseContext) {
     /**
      * @param fieldToValueToIdMap map containing the mapping from field to value to id, will be filled by this method
      */
-    private static List<BibEntry> pseudonymizeEntries(BibDatabaseContext bibDatabaseContext, Map<Field, Map<String, Integer>> fieldToValueToIdMap) {
+    private static List<BibEntry> pseudonymizeEntries(
+            BibDatabaseContext bibDatabaseContext,
+            Map<Field, Map<String, Integer>> fieldToValueToIdMap) {
         List<BibEntry> entries = bibDatabaseContext.getEntries();
         List<BibEntry> newEntries = new ArrayList<>(entries.size());
 
@@ -56,11 +59,14 @@ private static List<BibEntry> pseudonymizeEntries(BibDatabaseContext bibDatabase
             BibEntry newEntry = new BibEntry(entry.getType());
             newEntries.add(newEntry);
             for (Field field : entry.getFields()) {
-                Map<String, Integer> valueToIdMap = fieldToValueToIdMap.computeIfAbsent(field, k -> new HashMap<>());
-                // TODO: Use {@link org.jabref.model.entry.field.FieldProperty} to distinguish cases.
+                Map<String, Integer> valueToIdMap =
+                        fieldToValueToIdMap.computeIfAbsent(field, k -> new HashMap<>());
+                // TODO: Use {@link org.jabref.model.entry.field.FieldProperty} to distinguish
+                // cases.
                 //       See {@link org.jabref.model.entry.field.StandardField} for usages.
                 String fieldContent = entry.getField(field).get();
-                Integer id = valueToIdMap.computeIfAbsent(fieldContent, k -> valueToIdMap.size() + 1);
+                Integer id =
+                        valueToIdMap.computeIfAbsent(fieldContent, k -> valueToIdMap.size() + 1);
                 newEntry.setField(field, field.getName() + "-" + id);
             }
         }
diff --git a/src/main/java/org/jabref/logic/pseudonymization/PseudonymizationResultCsvWriter.java b/src/main/java/org/jabref/logic/pseudonymization/PseudonymizationResultCsvWriter.java
index 238fa9e8f1b6..9da415ad6fbf 100644
--- a/src/main/java/org/jabref/logic/pseudonymization/PseudonymizationResultCsvWriter.java
+++ b/src/main/java/org/jabref/logic/pseudonymization/PseudonymizationResultCsvWriter.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.pseudonymization;
 
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVPrinter;
+import org.jooq.lambda.Unchecked;
+
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
@@ -8,28 +12,32 @@
 import java.util.Comparator;
 import java.util.Map;
 
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVPrinter;
-import org.jooq.lambda.Unchecked;
-
 public class PseudonymizationResultCsvWriter {
 
-    public static void writeValuesMappingAsCsv(Path path, Pseudonymization.Result result) throws IOException {
-        try (
-                OutputStreamWriter writer = new OutputStreamWriter(Files.newOutputStream(path), StandardCharsets.UTF_8);
-                CSVPrinter csvPrinter = new CSVPrinter(writer, CSVFormat.DEFAULT)
-        ) {
+    public static void writeValuesMappingAsCsv(Path path, Pseudonymization.Result result)
+            throws IOException {
+        try (OutputStreamWriter writer =
+                        new OutputStreamWriter(
+                                Files.newOutputStream(path), StandardCharsets.UTF_8);
+                CSVPrinter csvPrinter = new CSVPrinter(writer, CSVFormat.DEFAULT)) {
             csvPrinter.printRecord("pseudonymized", "original value");
             // The valueMapping is a map of pseudonymized value to original value
             // The pseudonymized value is the key, the original value is the value
             result.valueMapping().entrySet().stream()
-                  // We have date-1, date-2, ..., date-10, date-11. That should be sorted accordingly.
-                  // In case a "dumb" string ordering is used, we would get date-1, date-10, date-11, date-2, ...
-                  .sorted(Comparator.comparing((Map.Entry<String, String> entry) -> getKeyPrefix(entry.getKey())
-                  ).thenComparingInt(entry -> extractNumber(entry.getKey())))
-                  .forEach(Unchecked.consumer(entry -> {
-                      csvPrinter.printRecord(entry.getKey(), entry.getValue());
-                  }));
+                    // We have date-1, date-2, ..., date-10, date-11. That should be sorted
+                    // accordingly.
+                    // In case a "dumb" string ordering is used, we would get date-1, date-10,
+                    // date-11, date-2, ...
+                    .sorted(
+                            Comparator.comparing(
+                                            (Map.Entry<String, String> entry) ->
+                                                    getKeyPrefix(entry.getKey()))
+                                    .thenComparingInt(entry -> extractNumber(entry.getKey())))
+                    .forEach(
+                            Unchecked.consumer(
+                                    entry -> {
+                                        csvPrinter.printRecord(entry.getKey(), entry.getValue());
+                                    }));
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/push/CitationCommandString.java b/src/main/java/org/jabref/logic/push/CitationCommandString.java
index 8a645e51fbaa..1120a2739386 100644
--- a/src/main/java/org/jabref/logic/push/CitationCommandString.java
+++ b/src/main/java/org/jabref/logic/push/CitationCommandString.java
@@ -17,7 +17,11 @@ public static CitationCommandString from(String completeCiteCommand) {
         int indexKey1 = completeCiteCommand.indexOf(CITE_KEY1);
         int indexKey2 = completeCiteCommand.indexOf(CITE_KEY2);
         if (indexKey1 < 0 || indexKey2 < 0 || indexKey2 < (indexKey1 + CITE_KEY1.length())) {
-            LOGGER.info("Wrong indexes {} {} for completeCiteCommand {}. Using default delimiter and suffix.", indexKey1, indexKey2, completeCiteCommand);
+            LOGGER.info(
+                    "Wrong indexes {} {} for completeCiteCommand {}. Using default delimiter and suffix.",
+                    indexKey1,
+                    indexKey2,
+                    completeCiteCommand);
             if (completeCiteCommand.isEmpty()) {
                 completeCiteCommand = "\\cite{";
             } else if (!completeCiteCommand.endsWith("{")) {
@@ -27,8 +31,12 @@ public static CitationCommandString from(String completeCiteCommand) {
         }
 
         String prefix = completeCiteCommand.substring(0, indexKey1);
-        String delim = completeCiteCommand.substring(completeCiteCommand.lastIndexOf(CITE_KEY1) + CITE_KEY1.length(), indexKey2);
-        String suffix = completeCiteCommand.substring(completeCiteCommand.lastIndexOf(CITE_KEY2) + CITE_KEY2.length());
+        String delim =
+                completeCiteCommand.substring(
+                        completeCiteCommand.lastIndexOf(CITE_KEY1) + CITE_KEY1.length(), indexKey2);
+        String suffix =
+                completeCiteCommand.substring(
+                        completeCiteCommand.lastIndexOf(CITE_KEY2) + CITE_KEY2.length());
         return new CitationCommandString(prefix, delim, suffix);
     }
 }
diff --git a/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheck.java b/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheck.java
index 8171b819cdcb..ef69c8a4b8dd 100644
--- a/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheck.java
+++ b/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheck.java
@@ -1,5 +1,11 @@
 package org.jabref.logic.quality.consistency;
 
+import org.jabref.model.database.BibDatabaseMode;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.types.EntryType;
+
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Comparator;
@@ -11,19 +17,12 @@
 import java.util.SequencedCollection;
 import java.util.Set;
 
-import org.jabref.model.database.BibDatabaseMode;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.types.EntryType;
-
 public class BibliographyConsistencyCheck {
 
-    public record Result(Map<EntryType, EntryTypeResult> entryTypeToResultMap) {
-    }
+    public record Result(Map<EntryType, EntryTypeResult> entryTypeToResultMap) {}
 
-    public record EntryTypeResult(Collection<Field> fields, SequencedCollection<BibEntry> sortedEntries) {
-    }
+    public record EntryTypeResult(
+            Collection<Field> fields, SequencedCollection<BibEntry> sortedEntries) {}
 
     /**
      * Checks the consistency of the given entries by looking at the present and absent fields.
@@ -44,26 +43,32 @@ public Result check(List<BibEntry> entries) {
         // collects entries of the same type
         Map<EntryType, Set<BibEntry>> entryTypeToEntriesMap = new HashMap<>();
 
-        collectEntriesIntoMaps(entries, entryTypeToFieldsInAnyEntryMap, entryTypeToFieldsInAllEntriesMap, entryTypeToEntriesMap);
+        collectEntriesIntoMaps(
+                entries,
+                entryTypeToFieldsInAnyEntryMap,
+                entryTypeToFieldsInAllEntriesMap,
+                entryTypeToEntriesMap);
 
         Map<EntryType, EntryTypeResult> resultMap = new HashMap<>();
 
-        entryTypeToFieldsInAnyEntryMap.forEach((entryType, fields) -> {
-            Set<Field> commonFields = entryTypeToFieldsInAllEntriesMap.get(entryType);
-            assert commonFields != null;
-            Set<Field> uniqueFields = new HashSet<>(fields);
-            uniqueFields.removeAll(commonFields);
-
-            if (uniqueFields.isEmpty()) {
-                return;
-            }
-
-            List<BibEntry> sortedEntries = entryTypeToEntriesMap
-                    .get(entryType).stream()
-                    .filter(entry -> !entry.getFields().equals(commonFields))
-                    .sorted(getBibEntryComparator()).toList();
-            resultMap.put(entryType, new EntryTypeResult(uniqueFields, sortedEntries));
-        });
+        entryTypeToFieldsInAnyEntryMap.forEach(
+                (entryType, fields) -> {
+                    Set<Field> commonFields = entryTypeToFieldsInAllEntriesMap.get(entryType);
+                    assert commonFields != null;
+                    Set<Field> uniqueFields = new HashSet<>(fields);
+                    uniqueFields.removeAll(commonFields);
+
+                    if (uniqueFields.isEmpty()) {
+                        return;
+                    }
+
+                    List<BibEntry> sortedEntries =
+                            entryTypeToEntriesMap.get(entryType).stream()
+                                    .filter(entry -> !entry.getFields().equals(commonFields))
+                                    .sorted(getBibEntryComparator())
+                                    .toList();
+                    resultMap.put(entryType, new EntryTypeResult(uniqueFields, sortedEntries));
+                });
 
         return new Result(resultMap);
     }
@@ -90,18 +95,28 @@ private static Comparator<BibEntry> getBibEntryComparator() {
         };
     }
 
-    private static void collectEntriesIntoMaps(List<BibEntry> entries, Map<EntryType, Set<Field>> entryTypeToFieldsInAnyEntryMap, Map<EntryType, Set<Field>> entryTypeToFieldsInAllEntriesMap, Map<EntryType, Set<BibEntry>> entryTypeToEntriesMap) {
-        entries.forEach(entry -> {
-            EntryType entryType = entry.getType();
-
-            Set<Field> fieldsInAnyEntry = entryTypeToFieldsInAnyEntryMap.computeIfAbsent(entryType, k -> new HashSet<>());
-            fieldsInAnyEntry.addAll(entry.getFields());
-
-            Set<Field> fieldsInAllEntries = entryTypeToFieldsInAllEntriesMap.computeIfAbsent(entryType, k -> new HashSet<>(entry.getFields()));
-            fieldsInAllEntries.retainAll(entry.getFields());
-
-            Set<BibEntry> entriesOfType = entryTypeToEntriesMap.computeIfAbsent(entryType, k -> new HashSet<>());
-            entriesOfType.add(entry);
-        });
+    private static void collectEntriesIntoMaps(
+            List<BibEntry> entries,
+            Map<EntryType, Set<Field>> entryTypeToFieldsInAnyEntryMap,
+            Map<EntryType, Set<Field>> entryTypeToFieldsInAllEntriesMap,
+            Map<EntryType, Set<BibEntry>> entryTypeToEntriesMap) {
+        entries.forEach(
+                entry -> {
+                    EntryType entryType = entry.getType();
+
+                    Set<Field> fieldsInAnyEntry =
+                            entryTypeToFieldsInAnyEntryMap.computeIfAbsent(
+                                    entryType, k -> new HashSet<>());
+                    fieldsInAnyEntry.addAll(entry.getFields());
+
+                    Set<Field> fieldsInAllEntries =
+                            entryTypeToFieldsInAllEntriesMap.computeIfAbsent(
+                                    entryType, k -> new HashSet<>(entry.getFields()));
+                    fieldsInAllEntries.retainAll(entry.getFields());
+
+                    Set<BibEntry> entriesOfType =
+                            entryTypeToEntriesMap.computeIfAbsent(entryType, k -> new HashSet<>());
+                    entriesOfType.add(entry);
+                });
     }
 }
diff --git a/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultCsvWriter.java b/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultCsvWriter.java
index 8783695ec39c..3be02824bee0 100644
--- a/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultCsvWriter.java
+++ b/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultCsvWriter.java
@@ -1,32 +1,37 @@
 package org.jabref.logic.quality.consistency;
 
-import java.io.IOException;
-import java.io.Writer;
-import java.util.List;
-import java.util.Set;
-
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVPrinter;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.Field;
 
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVPrinter;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.List;
+import java.util.Set;
 
 /**
  * Outputs the findings as CSV.
  * <p>
  * The symbols from {@link BibliographyConsistencyCheckResultWriter} are used.
  */
-public class BibliographyConsistencyCheckResultCsvWriter extends BibliographyConsistencyCheckResultWriter {
+public class BibliographyConsistencyCheckResultCsvWriter
+        extends BibliographyConsistencyCheckResultWriter {
 
     private CSVPrinter csvPrinter;
 
-    public BibliographyConsistencyCheckResultCsvWriter(BibliographyConsistencyCheck.Result result, Writer writer) {
+    public BibliographyConsistencyCheckResultCsvWriter(
+            BibliographyConsistencyCheck.Result result, Writer writer) {
         super(result, writer);
     }
 
-    public BibliographyConsistencyCheckResultCsvWriter(BibliographyConsistencyCheck.Result result, Writer writer, BibEntryTypesManager entryTypesManager, BibDatabaseMode bibDatabaseMode) {
+    public BibliographyConsistencyCheckResultCsvWriter(
+            BibliographyConsistencyCheck.Result result,
+            Writer writer,
+            BibEntryTypesManager entryTypesManager,
+            BibDatabaseMode bibDatabaseMode) {
         super(result, writer, entryTypesManager, bibDatabaseMode);
     }
 
@@ -38,8 +43,14 @@ public void writeFindings() throws IOException {
     }
 
     @Override
-    protected void writeBibEntry(BibEntry bibEntry, String entryType, Set<Field> requiredFields, Set<Field> optionalFields) throws IOException {
-        List<String> theRecord = getFindingsAsList(bibEntry, entryType, requiredFields, optionalFields);
+    protected void writeBibEntry(
+            BibEntry bibEntry,
+            String entryType,
+            Set<Field> requiredFields,
+            Set<Field> optionalFields)
+            throws IOException {
+        List<String> theRecord =
+                getFindingsAsList(bibEntry, entryType, requiredFields, optionalFields);
         csvPrinter.printRecord(theRecord);
     }
 
diff --git a/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultTxtWriter.java b/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultTxtWriter.java
index 7eff41d74f34..17d15b0052ba 100644
--- a/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultTxtWriter.java
+++ b/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultTxtWriter.java
@@ -1,5 +1,11 @@
 package org.jabref.logic.quality.consistency;
 
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseMode;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.model.entry.field.Field;
+
 import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayList;
@@ -8,26 +14,26 @@
 import java.util.StringJoiner;
 import java.util.stream.Collectors;
 
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseMode;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.model.entry.field.Field;
-
 /**
  * Outputs the findings as plain text.
  * <p>
  * The symbols from {@link BibliographyConsistencyCheckResultWriter} are used.
  */
-public class BibliographyConsistencyCheckResultTxtWriter extends BibliographyConsistencyCheckResultWriter {
+public class BibliographyConsistencyCheckResultTxtWriter
+        extends BibliographyConsistencyCheckResultWriter {
 
     private List<Integer> columnWidths;
 
-    public BibliographyConsistencyCheckResultTxtWriter(BibliographyConsistencyCheck.Result result, Writer writer) {
+    public BibliographyConsistencyCheckResultTxtWriter(
+            BibliographyConsistencyCheck.Result result, Writer writer) {
         super(result, writer);
     }
 
-    public BibliographyConsistencyCheckResultTxtWriter(BibliographyConsistencyCheck.Result result, Writer writer, BibEntryTypesManager entryTypesManager, BibDatabaseMode bibDatabaseMode) {
+    public BibliographyConsistencyCheckResultTxtWriter(
+            BibliographyConsistencyCheck.Result result,
+            Writer writer,
+            BibEntryTypesManager entryTypesManager,
+            BibDatabaseMode bibDatabaseMode) {
         super(result, writer, entryTypesManager, bibDatabaseMode);
     }
 
@@ -44,15 +50,34 @@ public void writeFindings() throws IOException {
 
         outputRow(columnNames);
 
-        writer.write(columnWidths.stream().map(width -> "-".repeat(width)).collect(Collectors.joining(" | ", "| ", " |\n")));
+        writer.write(
+                columnWidths.stream()
+                        .map(width -> "-".repeat(width))
+                        .collect(Collectors.joining(" | ", "| ", " |\n")));
 
         super.writeFindings();
 
         writer.write("\n");
-        writer.write("%s | %s\n".formatted(REQUIRED_FIELD_AT_ENTRY_TYPE_CELL_ENTRY, Localization.lang("required field is present")));
-        writer.write("%s | %s\n".formatted(OPTIONAL_FIELD_AT_ENTRY_TYPE_CELL_ENTRY, Localization.lang("optional field is present")));
-        writer.write("%s | %s\n".formatted(UNKNOWN_FIELD_AT_ENTRY_TYPE_CELL_ENTRY, Localization.lang("unknown field is present")));
-        writer.write("%s | %s\n".formatted(UNSET_FIELD_AT_ENTRY_TYPE_CELL_ENTRY, Localization.lang("field is absent")));
+        writer.write(
+                "%s | %s\n"
+                        .formatted(
+                                REQUIRED_FIELD_AT_ENTRY_TYPE_CELL_ENTRY,
+                                Localization.lang("required field is present")));
+        writer.write(
+                "%s | %s\n"
+                        .formatted(
+                                OPTIONAL_FIELD_AT_ENTRY_TYPE_CELL_ENTRY,
+                                Localization.lang("optional field is present")));
+        writer.write(
+                "%s | %s\n"
+                        .formatted(
+                                UNKNOWN_FIELD_AT_ENTRY_TYPE_CELL_ENTRY,
+                                Localization.lang("unknown field is present")));
+        writer.write(
+                "%s | %s\n"
+                        .formatted(
+                                UNSET_FIELD_AT_ENTRY_TYPE_CELL_ENTRY,
+                                Localization.lang("field is absent")));
     }
 
     private void initializeColumnWidths() {
@@ -68,28 +93,33 @@ private void initializeColumnWidths() {
     }
 
     private Integer getColumnWidthOfEntryTypes() {
-        Integer max = result.entryTypeToResultMap().keySet()
-                            .stream()
-                            .map(entryType -> entryType.getDisplayName().length())
-                            .max(Integer::compareTo)
-                            .get();
+        Integer max =
+                result.entryTypeToResultMap().keySet().stream()
+                        .map(entryType -> entryType.getDisplayName().length())
+                        .max(Integer::compareTo)
+                        .get();
         max = Math.max(max, "entry type".length());
         return max;
     }
 
     private Integer getColumnWidthOfCitationKeys(Integer max) {
-        result.entryTypeToResultMap().values()
-              .stream()
-              .flatMap(entryTypeResult -> entryTypeResult.sortedEntries().stream())
-              .map(entry -> entry.getCitationKey().orElse("").length())
-              .max(Integer::compareTo)
-              .get();
+        result.entryTypeToResultMap().values().stream()
+                .flatMap(entryTypeResult -> entryTypeResult.sortedEntries().stream())
+                .map(entry -> entry.getCitationKey().orElse("").length())
+                .max(Integer::compareTo)
+                .get();
         return Math.max(max, "citation key".length());
     }
 
     @Override
-    protected void writeBibEntry(BibEntry bibEntry, String entryType, Set<Field> requiredFields, Set<Field> optionalFields) throws IOException {
-        List<String> theRecord = getFindingsAsList(bibEntry, entryType, requiredFields, optionalFields);
+    protected void writeBibEntry(
+            BibEntry bibEntry,
+            String entryType,
+            Set<Field> requiredFields,
+            Set<Field> optionalFields)
+            throws IOException {
+        List<String> theRecord =
+                getFindingsAsList(bibEntry, entryType, requiredFields, optionalFields);
         outputRow(theRecord);
     }
 
@@ -106,6 +136,5 @@ private void outputRow(List<String> theRecord) throws IOException {
     }
 
     @Override
-    public void close() throws IOException {
-    }
+    public void close() throws IOException {}
 }
diff --git a/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultWriter.java b/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultWriter.java
index 92fb98643c66..e7ff4bbde7f6 100644
--- a/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultWriter.java
+++ b/src/main/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultWriter.java
@@ -1,5 +1,14 @@
 package org.jabref.logic.quality.consistency;
 
+import org.jabref.model.database.BibDatabaseMode;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryType;
+import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.model.entry.field.BibField;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.types.EntryType;
+import org.jooq.lambda.Unchecked;
+
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.Writer;
@@ -12,16 +21,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.jabref.model.database.BibDatabaseMode;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.BibEntryType;
-import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.model.entry.field.BibField;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.types.EntryType;
-
-import org.jooq.lambda.Unchecked;
-
 /**
  * Outputs the findings as CSV.
  * <p>
@@ -54,84 +53,109 @@ public abstract class BibliographyConsistencyCheckResultWriter implements Closea
 
     private final List<Field> allReportedFields;
 
-    public BibliographyConsistencyCheckResultWriter(BibliographyConsistencyCheck.Result result, Writer writer) {
+    public BibliographyConsistencyCheckResultWriter(
+            BibliographyConsistencyCheck.Result result, Writer writer) {
         this(result, writer, new BibEntryTypesManager(), BibDatabaseMode.BIBTEX);
     }
 
-    public BibliographyConsistencyCheckResultWriter(BibliographyConsistencyCheck.Result result, Writer writer, BibEntryTypesManager entryTypesManager, BibDatabaseMode bibDatabaseMode) {
+    public BibliographyConsistencyCheckResultWriter(
+            BibliographyConsistencyCheck.Result result,
+            Writer writer,
+            BibEntryTypesManager entryTypesManager,
+            BibDatabaseMode bibDatabaseMode) {
         this.result = result;
         this.writer = writer;
         this.entryTypesManager = entryTypesManager;
         this.bibDatabaseMode = bibDatabaseMode;
-        this.allReportedFields = result.entryTypeToResultMap().values().stream()
-                                       .flatMap(entryTypeResult -> entryTypeResult.fields().stream())
-                                       .sorted(Comparator.comparing(Field::getName))
-                                       .distinct()
-                                       .toList();
+        this.allReportedFields =
+                result.entryTypeToResultMap().values().stream()
+                        .flatMap(entryTypeResult -> entryTypeResult.fields().stream())
+                        .sorted(Comparator.comparing(Field::getName))
+                        .distinct()
+                        .toList();
         this.columnNames = getColumnNames();
         this.columnCount = columnNames.size();
     }
 
     public void writeFindings() throws IOException {
         result.entryTypeToResultMap().entrySet().stream()
-              .sorted(Comparator.comparing(entry -> entry.getKey().getName()))
-              .forEach(Unchecked.consumer(mapEntry -> {
-                  writeMapEntry(mapEntry);
-              }));
+                .sorted(Comparator.comparing(entry -> entry.getKey().getName()))
+                .forEach(
+                        Unchecked.consumer(
+                                mapEntry -> {
+                                    writeMapEntry(mapEntry);
+                                }));
     }
 
     private List<String> getColumnNames() {
         List<String> result = new ArrayList(columnCount + 2);
         result.add("entry type");
         result.add("citation key");
-        allReportedFields.forEach(field -> {
-            result.add(field.getDisplayName());
-        });
+        allReportedFields.forEach(
+                field -> {
+                    result.add(field.getDisplayName());
+                });
         return result;
     }
 
-    protected List<String> getFindingsAsList(BibEntry bibEntry, String entryType, Set<Field> requiredFields, Set<Field> optionalFields) {
+    protected List<String> getFindingsAsList(
+            BibEntry bibEntry,
+            String entryType,
+            Set<Field> requiredFields,
+            Set<Field> optionalFields) {
         List<String> result = new ArrayList(columnCount + 2);
         result.add(entryType);
         result.add(bibEntry.getCitationKey().orElse(""));
-        allReportedFields.forEach(field -> {
-            result.add(bibEntry.getField(field).map(value -> {
-                if (requiredFields.contains(field)) {
-                    return REQUIRED_FIELD_AT_ENTRY_TYPE_CELL_ENTRY;
-                } else if (optionalFields.contains(field)) {
-                    return OPTIONAL_FIELD_AT_ENTRY_TYPE_CELL_ENTRY;
-                } else {
-                    return UNKNOWN_FIELD_AT_ENTRY_TYPE_CELL_ENTRY;
-                }
-            }).orElse(UNSET_FIELD_AT_ENTRY_TYPE_CELL_ENTRY));
-        });
+        allReportedFields.forEach(
+                field -> {
+                    result.add(
+                            bibEntry.getField(field)
+                                    .map(
+                                            value -> {
+                                                if (requiredFields.contains(field)) {
+                                                    return REQUIRED_FIELD_AT_ENTRY_TYPE_CELL_ENTRY;
+                                                } else if (optionalFields.contains(field)) {
+                                                    return OPTIONAL_FIELD_AT_ENTRY_TYPE_CELL_ENTRY;
+                                                } else {
+                                                    return UNKNOWN_FIELD_AT_ENTRY_TYPE_CELL_ENTRY;
+                                                }
+                                            })
+                                    .orElse(UNSET_FIELD_AT_ENTRY_TYPE_CELL_ENTRY));
+                });
         return result;
     }
 
-    protected void writeMapEntry(Map.Entry<EntryType, BibliographyConsistencyCheck.EntryTypeResult> mapEntry) {
+    protected void writeMapEntry(
+            Map.Entry<EntryType, BibliographyConsistencyCheck.EntryTypeResult> mapEntry) {
         String entryType = mapEntry.getKey().getDisplayName();
 
-        Optional<BibEntryType> bibEntryType = this.entryTypesManager.enrich(mapEntry.getKey(), bibDatabaseMode);
-        Set<Field> requiredFields = bibEntryType
-                .map(BibEntryType::getRequiredFields)
-                .stream()
-                .flatMap(orFieldsCollection -> orFieldsCollection.stream())
-                .flatMap(orFields -> orFields.getFields().stream())
-                .collect(Collectors.toSet());
-        Set<Field> optionalFields = bibEntryType
-                .map(BibEntryType::getOptionalFields)
-                .stream()
-                .flatMap(bibFieldSet -> bibFieldSet.stream())
-                .map(BibField::field)
-                .collect(Collectors.toSet());
+        Optional<BibEntryType> bibEntryType =
+                this.entryTypesManager.enrich(mapEntry.getKey(), bibDatabaseMode);
+        Set<Field> requiredFields =
+                bibEntryType.map(BibEntryType::getRequiredFields).stream()
+                        .flatMap(orFieldsCollection -> orFieldsCollection.stream())
+                        .flatMap(orFields -> orFields.getFields().stream())
+                        .collect(Collectors.toSet());
+        Set<Field> optionalFields =
+                bibEntryType.map(BibEntryType::getOptionalFields).stream()
+                        .flatMap(bibFieldSet -> bibFieldSet.stream())
+                        .map(BibField::field)
+                        .collect(Collectors.toSet());
 
         BibliographyConsistencyCheck.EntryTypeResult entries = mapEntry.getValue();
         SequencedCollection<BibEntry> bibEntries = entries.sortedEntries();
 
-        bibEntries.forEach(Unchecked.consumer(bibEntry -> {
-            writeBibEntry(bibEntry, entryType, requiredFields, optionalFields);
-        }));
+        bibEntries.forEach(
+                Unchecked.consumer(
+                        bibEntry -> {
+                            writeBibEntry(bibEntry, entryType, requiredFields, optionalFields);
+                        }));
     }
 
-    protected abstract void writeBibEntry(BibEntry bibEntry, String entryType, Set<Field> requiredFields, Set<Field> optionalFields) throws IOException;
+    protected abstract void writeBibEntry(
+            BibEntry bibEntry,
+            String entryType,
+            Set<Field> requiredFields,
+            Set<Field> optionalFields)
+            throws IOException;
 }
diff --git a/src/main/java/org/jabref/logic/remote/Protocol.java b/src/main/java/org/jabref/logic/remote/Protocol.java
index d8f2b147ef53..c5f24990dd69 100644
--- a/src/main/java/org/jabref/logic/remote/Protocol.java
+++ b/src/main/java/org/jabref/logic/remote/Protocol.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.remote;
 
+import javafx.util.Pair;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -8,11 +13,6 @@
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 
-import javafx.util.Pair;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * @implNote The first byte of every message identifies its type as a {@link RemoteMessage}.
  * Every message is terminated with '\0'.
@@ -42,7 +42,8 @@ public void sendMessage(RemoteMessage type) throws IOException {
     public void sendMessage(RemoteMessage type, Object argument) throws IOException {
         out.writeObject(type);
 
-        // encode the commandline arguments to handle special characters (eg. spaces and Chinese characters)
+        // encode the commandline arguments to handle special characters (eg. spaces and Chinese
+        // characters)
         // related to issue #6487
         if (type == RemoteMessage.SEND_COMMAND_LINE_ARGUMENTS) {
             String[] encodedArgs = ((String[]) argument).clone();
@@ -67,12 +68,15 @@ public Pair<RemoteMessage, Object> receiveMessage() throws IOException {
             // decode the received commandline arguments
             if (type == RemoteMessage.SEND_COMMAND_LINE_ARGUMENTS) {
                 for (int i = 0; i < ((String[]) argument).length; i++) {
-                    ((String[]) argument)[i] = URLDecoder.decode(((String[]) argument)[i], StandardCharsets.UTF_8);
+                    ((String[]) argument)[i] =
+                            URLDecoder.decode(((String[]) argument)[i], StandardCharsets.UTF_8);
                 }
             }
 
             if (endOfMessage != '\0') {
-                throw new IOException("Message didn't end on correct end of message identifier. Got " + endOfMessage);
+                throw new IOException(
+                        "Message didn't end on correct end of message identifier. Got "
+                                + endOfMessage);
             }
 
             return new Pair<>(type, argument);
@@ -92,7 +96,8 @@ public void close() {
         try {
             out.close();
         } catch (IOException e) {
-            // On the server side, the socket is automatically closed, thus we don't need to close it here.
+            // On the server side, the socket is automatically closed, thus we don't need to close
+            // it here.
             // See org.jabref.logic.remote.server.RemoteListenerServer.run
             LOGGER.debug("Output stream not closed", e);
         }
@@ -100,7 +105,8 @@ public void close() {
         try {
             socket.close();
         } catch (IOException e) {
-            // On the server side, the socket is automatically closed, thus we don't need to close it here.
+            // On the server side, the socket is automatically closed, thus we don't need to close
+            // it here.
             // See org.jabref.logic.remote.server.RemoteListenerServer.run
             LOGGER.debug("Socket not closed", e);
         }
diff --git a/src/main/java/org/jabref/logic/remote/RemotePreferences.java b/src/main/java/org/jabref/logic/remote/RemotePreferences.java
index 5d06d28261b9..6f4f61c56d05 100644
--- a/src/main/java/org/jabref/logic/remote/RemotePreferences.java
+++ b/src/main/java/org/jabref/logic/remote/RemotePreferences.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.remote;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
 /**
  * Place for handling the preferences for the remote communication
  */
diff --git a/src/main/java/org/jabref/logic/remote/RemoteUtil.java b/src/main/java/org/jabref/logic/remote/RemoteUtil.java
index 66e3a543c654..67edd521e4ce 100644
--- a/src/main/java/org/jabref/logic/remote/RemoteUtil.java
+++ b/src/main/java/org/jabref/logic/remote/RemoteUtil.java
@@ -2,8 +2,7 @@
 
 public class RemoteUtil {
 
-    private RemoteUtil() {
-    }
+    private RemoteUtil() {}
 
     public static boolean isUserPort(int portNumber) {
         return (portNumber >= 1024) && (portNumber <= 65535);
diff --git a/src/main/java/org/jabref/logic/remote/client/RemoteClient.java b/src/main/java/org/jabref/logic/remote/client/RemoteClient.java
index baa971149845..3ca511a4a6b4 100644
--- a/src/main/java/org/jabref/logic/remote/client/RemoteClient.java
+++ b/src/main/java/org/jabref/logic/remote/client/RemoteClient.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.remote.client;
 
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-
 import javafx.util.Pair;
 
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.remote.Protocol;
 import org.jabref.logic.remote.RemoteMessage;
 import org.jabref.logic.remote.RemotePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+
 public class RemoteClient {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RemoteClient.class);
@@ -32,11 +31,15 @@ public boolean ping() {
             protocol.sendMessage(RemoteMessage.PING);
             Pair<RemoteMessage, Object> response = protocol.receiveMessage();
 
-            if ((response.getKey() == RemoteMessage.PONG) && Protocol.IDENTIFIER.equals(response.getValue())) {
+            if ((response.getKey() == RemoteMessage.PONG)
+                    && Protocol.IDENTIFIER.equals(response.getValue())) {
                 return true;
             } else {
                 String port = String.valueOf(this.port);
-                String errorMessage = Localization.lang("Cannot use port %0 for remote operation; another application may be using it. Try specifying another port.", port);
+                String errorMessage =
+                        Localization.lang(
+                                "Cannot use port %0 for remote operation; another application may be using it. Try specifying another port.",
+                                port);
                 LOGGER.error(errorMessage);
                 return false;
             }
@@ -58,7 +61,11 @@ public boolean sendCommandLineArguments(String[] args) {
             Pair<RemoteMessage, Object> response = protocol.receiveMessage();
             return response.getKey() == RemoteMessage.OK;
         } catch (IOException e) {
-            LOGGER.debug("Could not send args {} to the server at port {}", String.join(", ", args), port, e);
+            LOGGER.debug(
+                    "Could not send args {} to the server at port {}",
+                    String.join(", ", args),
+                    port,
+                    e);
             return false;
         }
     }
diff --git a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java
index be574525d28c..9084a14c3e1b 100644
--- a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java
+++ b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.remote.server;
 
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketException;
-
 import javafx.util.Pair;
 
 import org.jabref.logic.remote.Protocol;
 import org.jabref.logic.remote.RemoteMessage;
 import org.jabref.logic.remote.RemotePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+
 public class RemoteListenerServer implements Runnable {
     private static final Logger LOGGER = LoggerFactory.getLogger(RemoteListenerServer.class);
 
@@ -50,7 +49,8 @@ public void run() {
         }
     }
 
-    private void handleMessage(Protocol protocol, RemoteMessage type, Object argument) throws IOException {
+    private void handleMessage(Protocol protocol, RemoteMessage type, Object argument)
+            throws IOException {
         switch (type) {
             case PING:
                 protocol.sendMessage(RemoteMessage.PONG, Protocol.IDENTIFIER);
@@ -60,7 +60,9 @@ private void handleMessage(Protocol protocol, RemoteMessage type, Object argumen
                     messageHandler.handleCommandLineArguments(strings);
                     protocol.sendMessage(RemoteMessage.OK);
                 } else {
-                    throw new IOException("Argument for 'SEND_COMMAND_LINE_ARGUMENTS' is not of type String[]. Got " + argument);
+                    throw new IOException(
+                            "Argument for 'SEND_COMMAND_LINE_ARGUMENTS' is not of type String[]. Got "
+                                    + argument);
                 }
                 break;
             default:
diff --git a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerManager.java b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerManager.java
index 65c7a37d9a6c..d50e869a71f1 100644
--- a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerManager.java
+++ b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerManager.java
@@ -1,13 +1,12 @@
 package org.jabref.logic.remote.server;
 
-import java.io.IOException;
-import java.net.BindException;
-
 import org.jabref.logic.util.HeadlessExecutorService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.BindException;
+
 /**
  * Manages the TeleServerThread through typical life cycle methods.
  * <p/>
@@ -41,7 +40,9 @@ public void open(RemoteMessageHandler messageHandler, int port) {
         try {
             remoteServerThread = new RemoteListenerServerThread(messageHandler, port);
         } catch (BindException e) {
-            LOGGER.error("There was an error opening the configured network port {}. Please ensure there isn't another application already using that port.", port);
+            LOGGER.error(
+                    "There was an error opening the configured network port {}. Please ensure there isn't another application already using that port.",
+                    port);
             remoteServerThread = null;
         } catch (IOException e) {
             LOGGER.error("Unknown error while opening the network port.", e);
diff --git a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java
index 510fee502941..535166c5e540 100644
--- a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java
+++ b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.remote.server;
 
-import java.io.IOException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+
 /**
  * This thread wrapper is required to be able to interrupt the remote listener server, e.g. when JabRef is closing down the server should shutdown as well.
  */
@@ -14,7 +14,8 @@ public class RemoteListenerServerThread extends Thread {
 
     private final RemoteListenerServer server;
 
-    public RemoteListenerServerThread(RemoteMessageHandler messageHandler, int port) throws IOException {
+    public RemoteListenerServerThread(RemoteMessageHandler messageHandler, int port)
+            throws IOException {
         this.server = new RemoteListenerServer(messageHandler, port);
         this.setName("JabRef - Remote Listener Server on port " + port);
     }
diff --git a/src/main/java/org/jabref/logic/search/DatabaseSearcher.java b/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
index 09f15d482074..426b86166c6f 100644
--- a/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
+++ b/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
@@ -1,20 +1,19 @@
 package org.jabref.logic.search;
 
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabases;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.SearchQuery;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
 public class DatabaseSearcher {
     private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseSearcher.class);
 
@@ -23,7 +22,12 @@ public class DatabaseSearcher {
     private final LuceneManager luceneManager;
 
     // get rid of task executor here or add a constuctor overload?
-    public DatabaseSearcher(SearchQuery query, BibDatabaseContext databaseContext, TaskExecutor taskExecutor, FilePreferences filePreferences) throws IOException {
+    public DatabaseSearcher(
+            SearchQuery query,
+            BibDatabaseContext databaseContext,
+            TaskExecutor taskExecutor,
+            FilePreferences filePreferences)
+            throws IOException {
         this.databaseContext = databaseContext;
         this.query = Objects.requireNonNull(query);
         this.luceneManager = new LuceneManager(databaseContext, taskExecutor, filePreferences);
@@ -40,11 +44,10 @@ public List<BibEntry> getMatches() {
             luceneManager.closeAndWait();
             return Collections.emptyList();
         }
-        List<BibEntry> matchEntries = luceneManager.search(query)
-                                                   .getMatchedEntries()
-                                                   .stream()
-                                                   .map(entryId -> databaseContext.getDatabase().getEntryById(entryId))
-                                                   .toList();
+        List<BibEntry> matchEntries =
+                luceneManager.search(query).getMatchedEntries().stream()
+                        .map(entryId -> databaseContext.getDatabase().getEntryById(entryId))
+                        .toList();
         luceneManager.closeAndWait();
         return BibDatabases.purgeEmptyEntries(matchEntries);
     }
diff --git a/src/main/java/org/jabref/logic/search/LuceneIndexer.java b/src/main/java/org/jabref/logic/search/LuceneIndexer.java
index 4cc8b48763e2..eb3257f85169 100644
--- a/src/main/java/org/jabref/logic/search/LuceneIndexer.java
+++ b/src/main/java/org/jabref/logic/search/LuceneIndexer.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.search;
 
-import java.util.Collection;
-
+import org.apache.lucene.search.SearcherManager;
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.lucene.search.SearcherManager;
+import java.util.Collection;
 
 public interface LuceneIndexer {
     void updateOnStart(BackgroundTask<?> task);
diff --git a/src/main/java/org/jabref/logic/search/LuceneManager.java b/src/main/java/org/jabref/logic/search/LuceneManager.java
index 3e9a3bf4c148..fc1cba55479a 100644
--- a/src/main/java/org/jabref/logic/search/LuceneManager.java
+++ b/src/main/java/org/jabref/logic/search/LuceneManager.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.search;
 
-import java.io.IOException;
-import java.util.List;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ChangeListener;
@@ -22,10 +19,12 @@
 import org.jabref.model.search.event.IndexClosedEvent;
 import org.jabref.model.search.event.IndexRemovedEvent;
 import org.jabref.model.search.event.IndexStartedEvent;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.List;
+
 public class LuceneManager {
     private static final Logger LOGGER = LoggerFactory.getLogger(LuceneManager.class);
 
@@ -38,7 +37,10 @@ public class LuceneManager {
     private final LuceneIndexer linkedFilesIndexer;
     private final LuceneSearcher luceneSearcher;
 
-    public LuceneManager(BibDatabaseContext databaseContext, TaskExecutor executor, FilePreferences preferences) {
+    public LuceneManager(
+            BibDatabaseContext databaseContext,
+            TaskExecutor executor,
+            FilePreferences preferences) {
         this.taskExecutor = executor;
         this.databaseContext = databaseContext;
         this.shouldIndexLinkedFiles = preferences.fulltextIndexLinkedFilesProperty();
@@ -56,7 +58,9 @@ public LuceneManager(BibDatabaseContext databaseContext, TaskExecutor executor,
         }
         linkedFilesIndexer = indexer;
 
-        this.luceneSearcher = new LuceneSearcher(databaseContext, bibFieldsIndexer, linkedFilesIndexer, preferences);
+        this.luceneSearcher =
+                new LuceneSearcher(
+                        databaseContext, bibFieldsIndexer, linkedFilesIndexer, preferences);
         updateOnStart();
     }
 
@@ -82,8 +86,9 @@ public Object call() {
                 return null;
             }
         }.willBeRecoveredAutomatically(true)
-         .onFinished(() -> this.databaseContext.getDatabase().postEvent(new IndexStartedEvent()))
-         .executeWith(taskExecutor);
+                .onFinished(
+                        () -> this.databaseContext.getDatabase().postEvent(new IndexStartedEvent()))
+                .executeWith(taskExecutor);
 
         if (shouldIndexLinkedFiles.get()) {
             new BackgroundTask<>() {
@@ -103,8 +108,12 @@ public Object call() {
                 bibFieldsIndexer.addToIndex(entries, this);
                 return null;
             }
-        }.onFinished(() -> this.databaseContext.getDatabase().postEvent(new IndexAddedOrUpdatedEvent(entries)))
-         .executeWith(taskExecutor);
+        }.onFinished(
+                        () ->
+                                this.databaseContext
+                                        .getDatabase()
+                                        .postEvent(new IndexAddedOrUpdatedEvent(entries)))
+                .executeWith(taskExecutor);
 
         if (shouldIndexLinkedFiles.get() && !isLinkedFilesIndexerBlocked.get()) {
             new BackgroundTask<>() {
@@ -124,8 +133,12 @@ public Object call() {
                 bibFieldsIndexer.removeFromIndex(entries, this);
                 return null;
             }
-        }.onFinished(() -> this.databaseContext.getDatabase().postEvent(new IndexRemovedEvent(entries)))
-         .executeWith(taskExecutor);
+        }.onFinished(
+                        () ->
+                                this.databaseContext
+                                        .getDatabase()
+                                        .postEvent(new IndexRemovedEvent(entries)))
+                .executeWith(taskExecutor);
 
         if (shouldIndexLinkedFiles.get()) {
             new BackgroundTask<>() {
@@ -138,15 +151,20 @@ public Object call() {
         }
     }
 
-    public void updateEntry(BibEntry entry, String oldValue, String newValue, boolean isLinkedFile) {
+    public void updateEntry(
+            BibEntry entry, String oldValue, String newValue, boolean isLinkedFile) {
         new BackgroundTask<>() {
             @Override
             public Object call() {
                 bibFieldsIndexer.updateEntry(entry, oldValue, newValue, this);
                 return null;
             }
-        }.onFinished(() -> this.databaseContext.getDatabase().postEvent(new IndexAddedOrUpdatedEvent(List.of(entry))))
-         .executeWith(taskExecutor);
+        }.onFinished(
+                        () ->
+                                this.databaseContext
+                                        .getDatabase()
+                                        .postEvent(new IndexAddedOrUpdatedEvent(List.of(entry))))
+                .executeWith(taskExecutor);
 
         if (isLinkedFile && shouldIndexLinkedFiles.get() && !isLinkedFilesIndexerBlocked.get()) {
             new BackgroundTask<>() {
@@ -166,8 +184,12 @@ public Object call() {
                 bibFieldsIndexer.updateEntry(entry, "", "", this);
                 return null;
             }
-        }.onFinished(() -> this.databaseContext.getDatabase().postEvent(new IndexAddedOrUpdatedEvent(List.of(entry))))
-         .executeWith(taskExecutor);
+        }.onFinished(
+                        () ->
+                                this.databaseContext
+                                        .getDatabase()
+                                        .postEvent(new IndexAddedOrUpdatedEvent(List.of(entry))))
+                .executeWith(taskExecutor);
 
         if (shouldIndexLinkedFiles.get() && !isLinkedFilesIndexerBlocked.get()) {
             new BackgroundTask<>() {
@@ -188,7 +210,7 @@ public Object call() {
                 return null;
             }
         }.onFinished(() -> this.databaseContext.getDatabase().postEvent(new IndexStartedEvent()))
-         .executeWith(taskExecutor);
+                .executeWith(taskExecutor);
 
         if (shouldIndexLinkedFiles.get()) {
             new BackgroundTask<>() {
@@ -223,7 +245,8 @@ public AutoCloseable blockLinkedFileIndexer() {
 
     public SearchResults search(SearchQuery query) {
         if (query.isValid()) {
-            query.setSearchResults(luceneSearcher.search(query.getParsedQuery(), query.getSearchFlags()));
+            query.setSearchResults(
+                    luceneSearcher.search(query.getParsedQuery(), query.getSearchFlags()));
         } else {
             query.setSearchResults(new SearchResults());
         }
diff --git a/src/main/java/org/jabref/logic/search/SearchPreferences.java b/src/main/java/org/jabref/logic/search/SearchPreferences.java
index 07a687c75ee7..a343f9e3f5bd 100644
--- a/src/main/java/org/jabref/logic/search/SearchPreferences.java
+++ b/src/main/java/org/jabref/logic/search/SearchPreferences.java
@@ -1,6 +1,6 @@
 package org.jabref.logic.search;
 
-import java.util.EnumSet;
+import com.google.common.annotations.VisibleForTesting;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
@@ -13,7 +13,7 @@
 
 import org.jabref.model.search.SearchFlags;
 
-import com.google.common.annotations.VisibleForTesting;
+import java.util.EnumSet;
 
 public class SearchPreferences {
 
@@ -25,15 +25,36 @@ public class SearchPreferences {
     private final BooleanProperty keepSearchSting;
     private final ObjectProperty<SearchDisplayMode> searchDisplayMode;
 
-    public SearchPreferences(SearchDisplayMode searchDisplayMode, boolean isFulltext, boolean keepSearchString, boolean keepWindowOnTop, double searchWindowHeight, double searchWindowWidth, double searchWindowDividerPosition) {
-        this(searchDisplayMode, EnumSet.noneOf(SearchFlags.class), keepSearchString, keepWindowOnTop, searchWindowHeight, searchWindowWidth, searchWindowDividerPosition);
+    public SearchPreferences(
+            SearchDisplayMode searchDisplayMode,
+            boolean isFulltext,
+            boolean keepSearchString,
+            boolean keepWindowOnTop,
+            double searchWindowHeight,
+            double searchWindowWidth,
+            double searchWindowDividerPosition) {
+        this(
+                searchDisplayMode,
+                EnumSet.noneOf(SearchFlags.class),
+                keepSearchString,
+                keepWindowOnTop,
+                searchWindowHeight,
+                searchWindowWidth,
+                searchWindowDividerPosition);
         if (isFulltext) {
             searchFlags.add(SearchFlags.FULLTEXT);
         }
     }
 
     @VisibleForTesting
-    public SearchPreferences(SearchDisplayMode searchDisplayMode, EnumSet<SearchFlags> searchFlags, boolean keepSearchString, boolean keepWindowOnTop, double searchWindowHeight, double searchWindowWidth, double searchWindowDividerPosition) {
+    public SearchPreferences(
+            SearchDisplayMode searchDisplayMode,
+            EnumSet<SearchFlags> searchFlags,
+            boolean keepSearchString,
+            boolean keepWindowOnTop,
+            double searchWindowHeight,
+            double searchWindowWidth,
+            double searchWindowDividerPosition) {
         this.searchDisplayMode = new SimpleObjectProperty<>(searchDisplayMode);
         this.searchFlags = FXCollections.observableSet(searchFlags);
 
diff --git a/src/main/java/org/jabref/logic/search/indexing/BibFieldsIndexer.java b/src/main/java/org/jabref/logic/search/indexing/BibFieldsIndexer.java
index 0c0d3106e727..09b9bb5f6974 100644
--- a/src/main/java/org/jabref/logic/search/indexing/BibFieldsIndexer.java
+++ b/src/main/java/org/jabref/logic/search/indexing/BibFieldsIndexer.java
@@ -1,19 +1,5 @@
 package org.jabref.logic.search.indexing;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Map;
-
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.search.LuceneIndexer;
-import org.jabref.logic.util.BackgroundTask;
-import org.jabref.logic.util.HeadlessExecutorService;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.search.SearchFieldConstants;
-
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.StringField;
 import org.apache.lucene.document.TextField;
@@ -23,9 +9,22 @@
 import org.apache.lucene.search.SearcherManager;
 import org.apache.lucene.store.ByteBuffersDirectory;
 import org.apache.lucene.store.Directory;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.search.LuceneIndexer;
+import org.jabref.logic.util.BackgroundTask;
+import org.jabref.logic.util.HeadlessExecutorService;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.search.SearchFieldConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+
 public class BibFieldsIndexer implements LuceneIndexer {
     private static final Logger LOGGER = LoggerFactory.getLogger(BibFieldsIndexer.class);
     private final BibDatabaseContext databaseContext;
@@ -36,9 +35,14 @@ public class BibFieldsIndexer implements LuceneIndexer {
 
     public BibFieldsIndexer(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
-        this.libraryName = databaseContext.getDatabasePath().map(path -> path.getFileName().toString()).orElse("unsaved");
+        this.libraryName =
+                databaseContext
+                        .getDatabasePath()
+                        .map(path -> path.getFileName().toString())
+                        .orElse("unsaved");
 
-        IndexWriterConfig config = new IndexWriterConfig(SearchFieldConstants.LATEX_AWARE_NGRAM_ANALYZER);
+        IndexWriterConfig config =
+                new IndexWriterConfig(SearchFieldConstants.LATEX_AWARE_NGRAM_ANALYZER);
 
         this.indexDirectory = new ByteBuffersDirectory();
         try {
@@ -70,30 +74,51 @@ public void addToIndex(Collection<BibEntry> entries, BackgroundTask<?> task) {
             }
             addToIndex(entry);
             task.updateProgress(i, entries.size());
-            task.updateMessage(Localization.lang("%0 of %1 entries added to the index.", i, entries.size()));
+            task.updateMessage(
+                    Localization.lang("%0 of %1 entries added to the index.", i, entries.size()));
             i++;
         }
-        LOGGER.debug("Added {} entries to index in {} ms", entries.size(), System.currentTimeMillis() - startTime);
+        LOGGER.debug(
+                "Added {} entries to index in {} ms",
+                entries.size(),
+                System.currentTimeMillis() - startTime);
     }
 
     private void addToIndex(BibEntry bibEntry) {
         try {
             Document document = new Document();
-            org.apache.lucene.document.Field.Store storeEnabled = org.apache.lucene.document.Field.Store.YES;
-            org.apache.lucene.document.Field.Store storeDisabled = org.apache.lucene.document.Field.Store.NO;
-            document.add(new StringField(SearchFieldConstants.ENTRY_ID.toString(), bibEntry.getId(), storeEnabled));
-            document.add(new TextField(SearchFieldConstants.ENTRY_TYPE.toString(), bibEntry.getType().getName(), storeDisabled));
+            org.apache.lucene.document.Field.Store storeEnabled =
+                    org.apache.lucene.document.Field.Store.YES;
+            org.apache.lucene.document.Field.Store storeDisabled =
+                    org.apache.lucene.document.Field.Store.NO;
+            document.add(
+                    new StringField(
+                            SearchFieldConstants.ENTRY_ID.toString(),
+                            bibEntry.getId(),
+                            storeEnabled));
+            document.add(
+                    new TextField(
+                            SearchFieldConstants.ENTRY_TYPE.toString(),
+                            bibEntry.getType().getName(),
+                            storeDisabled));
 
             StringBuilder allFields = new StringBuilder(bibEntry.getType().getName());
             for (Map.Entry<Field, String> mapEntry : bibEntry.getFieldMap().entrySet()) {
-                document.add(new TextField(mapEntry.getKey().getName(), mapEntry.getValue(), storeDisabled));
+                document.add(
+                        new TextField(
+                                mapEntry.getKey().getName(), mapEntry.getValue(), storeDisabled));
                 if (mapEntry.getKey().equals(StandardField.GROUPS)) {
-                    // Do not add groups to the allFields field: https://github.com/JabRef/jabref/issues/7996
+                    // Do not add groups to the allFields field:
+                    // https://github.com/JabRef/jabref/issues/7996
                     continue;
                 }
                 allFields.append('\n').append(mapEntry.getValue());
             }
-            document.add(new TextField(SearchFieldConstants.DEFAULT_FIELD.toString(), allFields.toString(), storeDisabled));
+            document.add(
+                    new TextField(
+                            SearchFieldConstants.DEFAULT_FIELD.toString(),
+                            allFields.toString(),
+                            storeDisabled));
             indexWriter.addDocument(document);
         } catch (IOException e) {
             LOGGER.warn("Could not add an entry to the index.", e);
@@ -114,14 +139,17 @@ public void removeFromIndex(Collection<BibEntry> entries, BackgroundTask<?> task
             }
             removeFromIndex(entry);
             task.updateProgress(i, entries.size());
-            task.updateMessage(Localization.lang("%0 of %1 entries removed from the index.", i, entries.size()));
+            task.updateMessage(
+                    Localization.lang(
+                            "%0 of %1 entries removed from the index.", i, entries.size()));
             i++;
         }
     }
 
     private void removeFromIndex(BibEntry entry) {
         try {
-            indexWriter.deleteDocuments((new Term(SearchFieldConstants.ENTRY_ID.toString(), entry.getId())));
+            indexWriter.deleteDocuments(
+                    (new Term(SearchFieldConstants.ENTRY_ID.toString(), entry.getId())));
             LOGGER.debug("Entry {} removed from index", entry.getId());
         } catch (IOException e) {
             LOGGER.error("Error deleting entry from index", e);
@@ -129,7 +157,8 @@ private void removeFromIndex(BibEntry entry) {
     }
 
     @Override
-    public void updateEntry(BibEntry entry, String oldValue, String newValue, BackgroundTask<?> task) {
+    public void updateEntry(
+            BibEntry entry, String oldValue, String newValue, BackgroundTask<?> task) {
         LOGGER.debug("Updating entry {} in index", entry.getId());
         removeFromIndex(entry);
         addToIndex(entry);
diff --git a/src/main/java/org/jabref/logic/search/indexing/DefaultLinkedFilesIndexer.java b/src/main/java/org/jabref/logic/search/indexing/DefaultLinkedFilesIndexer.java
index 78c9d736e724..27c47cde4804 100644
--- a/src/main/java/org/jabref/logic/search/indexing/DefaultLinkedFilesIndexer.java
+++ b/src/main/java/org/jabref/logic/search/indexing/DefaultLinkedFilesIndexer.java
@@ -1,33 +1,7 @@
 package org.jabref.logic.search.indexing;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
 import javafx.util.Pair;
 
-import org.jabref.logic.FilePreferences;
-import org.jabref.logic.importer.util.FileFieldParser;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.search.LuceneIndexer;
-import org.jabref.logic.util.BackgroundTask;
-import org.jabref.logic.util.HeadlessExecutorService;
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.search.SearchFieldConstants;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.IndexWriter;
@@ -41,9 +15,34 @@
 import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
+import org.jabref.logic.FilePreferences;
+import org.jabref.logic.importer.util.FileFieldParser;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.search.LuceneIndexer;
+import org.jabref.logic.util.BackgroundTask;
+import org.jabref.logic.util.HeadlessExecutorService;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.search.SearchFieldConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
 public class DefaultLinkedFilesIndexer implements LuceneIndexer {
     private static final Logger LOGGER = LoggerFactory.getLogger(DefaultLinkedFilesIndexer.class);
     private static final DocumentReader DOCUMENT_READER = new DocumentReader();
@@ -58,17 +57,25 @@ public class DefaultLinkedFilesIndexer implements LuceneIndexer {
     private Path indexDirectoryPath;
     private Map<String, Long> indexedFiles;
 
-    public DefaultLinkedFilesIndexer(BibDatabaseContext databaseContext, FilePreferences filePreferences) throws IOException {
+    public DefaultLinkedFilesIndexer(
+            BibDatabaseContext databaseContext, FilePreferences filePreferences)
+            throws IOException {
         this.databaseContext = databaseContext;
         this.filePreferences = filePreferences;
-        this.libraryName = databaseContext.getDatabasePath().map(path -> path.getFileName().toString()).orElseGet(() -> "untitled");
+        this.libraryName =
+                databaseContext
+                        .getDatabasePath()
+                        .map(path -> path.getFileName().toString())
+                        .orElseGet(() -> "untitled");
         this.indexedFiles = new ConcurrentHashMap<>();
 
         indexDirectoryPath = databaseContext.getFulltextIndexPath();
-        IndexWriterConfig config = new IndexWriterConfig(SearchFieldConstants.LINKED_FILES_ANALYZER);
+        IndexWriterConfig config =
+                new IndexWriterConfig(SearchFieldConstants.LINKED_FILES_ANALYZER);
         if ("unsaved".equals(indexDirectoryPath.getFileName().toString())) {
             config.setOpenMode(IndexWriterConfig.OpenMode.CREATE);
-            indexDirectoryPath = indexDirectoryPath.resolveSibling("unsaved" + NUMBER_OF_UNSAVED_LIBRARIES++);
+            indexDirectoryPath =
+                    indexDirectoryPath.resolveSibling("unsaved" + NUMBER_OF_UNSAVED_LIBRARIES++);
         }
 
         this.indexDirectory = FSDirectory.open(indexDirectoryPath);
@@ -79,17 +86,22 @@ public DefaultLinkedFilesIndexer(BibDatabaseContext databaseContext, FilePrefere
     @Override
     public void updateOnStart(BackgroundTask<?> task) {
         indexedFiles = getLinkedFilesFromIndex();
-        Map<String, Pair<Long, Path>> currentFiles = getLinkedFilesFromEntries(databaseContext.getEntries());
+        Map<String, Pair<Long, Path>> currentFiles =
+                getLinkedFilesFromEntries(databaseContext.getEntries());
 
         Set<String> filesToRemove = new HashSet<>();
         for (Map.Entry<String, Long> entry : indexedFiles.entrySet()) {
             String fileLink = entry.getKey();
             long modification = entry.getValue();
             if (!currentFiles.containsKey(fileLink)) {
-                LOGGER.debug("File {} has been removed from the library. Will be removed from the index", fileLink);
+                LOGGER.debug(
+                        "File {} has been removed from the library. Will be removed from the index",
+                        fileLink);
                 filesToRemove.add(fileLink);
             } else if (currentFiles.get(fileLink).getKey() > modification) {
-                LOGGER.debug("File {} has been modified since last indexing. Will be removed from the index.", fileLink);
+                LOGGER.debug(
+                        "File {} has been modified since last indexing. Will be removed from the index.",
+                        fileLink);
                 filesToRemove.add(fileLink);
             }
         }
@@ -99,7 +111,9 @@ public void updateOnStart(BackgroundTask<?> task) {
         for (Map.Entry<String, Pair<Long, Path>> entry : currentFiles.entrySet()) {
             String fileLink = entry.getKey();
             if (!indexedFiles.containsKey(fileLink)) {
-                LOGGER.debug("File {} has been added to the library. Will be added to the index.", fileLink);
+                LOGGER.debug(
+                        "File {} has been added to the library. Will be added to the index.",
+                        fileLink);
                 filesToAdd.put(fileLink, entry.getValue());
             }
         }
@@ -144,7 +158,10 @@ private void addToIndex(Map<String, Pair<Long, Path>> linkedFiles, BackgroundTas
             }
             addToIndex(entry.getKey(), entry.getValue().getKey(), entry.getValue().getValue());
             task.updateProgress(i, linkedFiles.size());
-            task.updateMessage(Localization.lang("Indexing %0. %1 of %2 files added to the index.", entry.getValue().getValue().getFileName(), i, linkedFiles.size()));
+            task.updateMessage(
+                    Localization.lang(
+                            "Indexing %0. %1 of %2 files added to the index.",
+                            entry.getValue().getValue().getFileName(), i, linkedFiles.size()));
             i++;
         }
         LOGGER.debug("Added {} files to index", linkedFiles.size());
@@ -167,7 +184,8 @@ public void removeFromIndex(Collection<BibEntry> entries, BackgroundTask<?> task
         removeUnlinkedFiles(entries, linkedFiles.keySet());
     }
 
-    private void removeUnlinkedFiles(Collection<BibEntry> entriesToRemove, Collection<String> linkedFiles) {
+    private void removeUnlinkedFiles(
+            Collection<BibEntry> entriesToRemove, Collection<String> linkedFiles) {
         Map<String, Set<BibEntry>> currentFiles = new HashMap<>();
         for (BibEntry entry : databaseContext.getEntries()) {
             for (LinkedFile linkedFile : entry.getFiles()) {
@@ -175,16 +193,18 @@ private void removeUnlinkedFiles(Collection<BibEntry> entriesToRemove, Collectio
             }
         }
 
-        Set<String> filesToRemove = linkedFiles.stream()
-                                               .filter(link -> {
-                                                   Set<BibEntry> entriesLinkedToFile = currentFiles.get(link);
-                                                   if (entriesLinkedToFile != null) {
-                                                       entriesLinkedToFile.removeAll(entriesToRemove);
-                                                       return entriesLinkedToFile.isEmpty();
-                                                   }
-                                                   return true;
-                                               })
-                                               .collect(Collectors.toSet());
+        Set<String> filesToRemove =
+                linkedFiles.stream()
+                        .filter(
+                                link -> {
+                                    Set<BibEntry> entriesLinkedToFile = currentFiles.get(link);
+                                    if (entriesLinkedToFile != null) {
+                                        entriesLinkedToFile.removeAll(entriesToRemove);
+                                        return entriesLinkedToFile.isEmpty();
+                                    }
+                                    return true;
+                                })
+                        .collect(Collectors.toSet());
         removeFromIndex(filesToRemove);
     }
 
@@ -192,7 +212,8 @@ private void removeFromIndex(Set<String> links) {
         for (String fileLink : links) {
             try {
                 LOGGER.debug("Removing file {} from index.", fileLink);
-                indexWriter.deleteDocuments(new Term(SearchFieldConstants.PATH.toString(), fileLink));
+                indexWriter.deleteDocuments(
+                        new Term(SearchFieldConstants.PATH.toString(), fileLink));
                 indexedFiles.remove(fileLink);
             } catch (IOException e) {
                 LOGGER.warn("Could not remove linked file {} from index.", fileLink, e);
@@ -201,13 +222,16 @@ private void removeFromIndex(Set<String> links) {
     }
 
     @Override
-    public void updateEntry(BibEntry entry, String oldValue, String newValue, BackgroundTask<?> task) {
+    public void updateEntry(
+            BibEntry entry, String oldValue, String newValue, BackgroundTask<?> task) {
         Set<LinkedFile> oldFiles = new HashSet<>(FileFieldParser.parse(oldValue));
         Set<LinkedFile> newFiles = new HashSet<>(FileFieldParser.parse(newValue));
 
         Set<LinkedFile> toRemove = new HashSet<>(oldFiles);
         toRemove.removeAll(newFiles);
-        removeUnlinkedFiles(List.of(entry), toRemove.stream().map(LinkedFile::getLink).collect(Collectors.toSet()));
+        removeUnlinkedFiles(
+                List.of(entry),
+                toRemove.stream().map(LinkedFile::getLink).collect(Collectors.toSet()));
 
         Set<LinkedFile> toAdd = new HashSet<>(newFiles);
         toAdd.removeAll(oldFiles);
@@ -236,7 +260,8 @@ private Map<String, Long> getLinkedFilesFromIndex() {
         LOGGER.debug("Getting all linked files from index.");
         Map<String, Long> linkedFiles = new HashMap<>();
         try {
-            TermQuery query = new TermQuery(new Term(SearchFieldConstants.PAGE_NUMBER.toString(), "1"));
+            TermQuery query =
+                    new TermQuery(new Term(SearchFieldConstants.PAGE_NUMBER.toString(), "1"));
             searcherManager.maybeRefresh();
             IndexSearcher searcher = searcherManager.acquire();
             StoredFields storedFields = searcher.storedFields();
@@ -246,7 +271,8 @@ private Map<String, Long> getLinkedFilesFromIndex() {
                 var pathField = doc.getField(SearchFieldConstants.PATH.toString());
                 var modifiedField = doc.getField(SearchFieldConstants.MODIFIED.toString());
                 if (pathField != null && modifiedField != null) {
-                    linkedFiles.put(pathField.stringValue(), Long.valueOf(modifiedField.stringValue()));
+                    linkedFiles.put(
+                            pathField.stringValue(), Long.valueOf(modifiedField.stringValue()));
                 }
             }
             searcherManager.release(searcher);
@@ -270,20 +296,27 @@ private Map<String, Pair<Long, Path>> getLinkedFilesFromEntries(Collection<BibEn
     }
 
     private Pair<Long, Path> getLinkedFileInfo(LinkedFile linkedFile) {
-        if (linkedFile.isOnlineLink() || !StandardFileType.PDF.getName().equals(linkedFile.getFileType())) {
-            LOGGER.debug("Linked file {} is not a local PDF file. The file will not be indexed.", linkedFile.getLink());
+        if (linkedFile.isOnlineLink()
+                || !StandardFileType.PDF.getName().equals(linkedFile.getFileType())) {
+            LOGGER.debug(
+                    "Linked file {} is not a local PDF file. The file will not be indexed.",
+                    linkedFile.getLink());
             return null;
         }
         Optional<Path> resolvedPath = linkedFile.findIn(databaseContext, filePreferences);
         if (resolvedPath.isEmpty()) {
-            LOGGER.debug("Could not resolve path of linked file {}. The file will not be indexed.", linkedFile.getLink());
+            LOGGER.debug(
+                    "Could not resolve path of linked file {}. The file will not be indexed.",
+                    linkedFile.getLink());
             return null;
         }
         try {
-            long fsModifiedTime = Files.getLastModifiedTime(resolvedPath.get()).to(TimeUnit.SECONDS);
+            long fsModifiedTime =
+                    Files.getLastModifiedTime(resolvedPath.get()).to(TimeUnit.SECONDS);
             return new Pair<>(fsModifiedTime, resolvedPath.get());
         } catch (IOException e) {
-            LOGGER.warn("Could not check the modification time of file {}.", linkedFile.getLink(), e);
+            LOGGER.warn(
+                    "Could not check the modification time of file {}.", linkedFile.getLink(), e);
             return null;
         }
     }
diff --git a/src/main/java/org/jabref/logic/search/indexing/DocumentReader.java b/src/main/java/org/jabref/logic/search/indexing/DocumentReader.java
index eca0723827a3..778adff5d10e 100644
--- a/src/main/java/org/jabref/logic/search/indexing/DocumentReader.java
+++ b/src/main/java/org/jabref/logic/search/indexing/DocumentReader.java
@@ -1,15 +1,10 @@
 package org.jabref.logic.search.indexing;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Pattern;
-
-import org.jabref.model.strings.StringUtil;
+import static org.jabref.model.search.SearchFieldConstants.ANNOTATIONS;
+import static org.jabref.model.search.SearchFieldConstants.CONTENT;
+import static org.jabref.model.search.SearchFieldConstants.MODIFIED;
+import static org.jabref.model.search.SearchFieldConstants.PAGE_NUMBER;
+import static org.jabref.model.search.SearchFieldConstants.PATH;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
@@ -20,14 +15,18 @@
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
 import org.apache.pdfbox.text.PDFTextStripper;
+import org.jabref.model.strings.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.model.search.SearchFieldConstants.ANNOTATIONS;
-import static org.jabref.model.search.SearchFieldConstants.CONTENT;
-import static org.jabref.model.search.SearchFieldConstants.MODIFIED;
-import static org.jabref.model.search.SearchFieldConstants.PAGE_NUMBER;
-import static org.jabref.model.search.SearchFieldConstants.PATH;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
 
 /**
  * Utility class for reading the data from LinkedFiles of a BibEntry for Lucene.
@@ -36,13 +35,17 @@ public final class DocumentReader {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DocumentReader.class);
     private static final Pattern HYPHEN_LINEBREAK_PATTERN = Pattern.compile("\\-\n");
-    private static final Pattern LINEBREAK_WITHOUT_PERIOD_PATTERN = Pattern.compile("([^\\\\.])\\n");
+    private static final Pattern LINEBREAK_WITHOUT_PERIOD_PATTERN =
+            Pattern.compile("([^\\\\.])\\n");
 
     public List<Document> readPdfContents(String fileLink, Path resolvedPdfPath) {
         List<Document> pages = new ArrayList<>();
         try (PDDocument pdfDocument = Loader.loadPDF(resolvedPdfPath.toFile())) {
             int numberOfPages = pdfDocument.getNumberOfPages();
-            LOGGER.debug("Reading file {} content with {} pages", resolvedPdfPath.toAbsolutePath(), numberOfPages);
+            LOGGER.debug(
+                    "Reading file {} content with {} pages",
+                    resolvedPdfPath.toAbsolutePath(),
+                    numberOfPages);
             for (int pageNumber = 1; pageNumber <= numberOfPages; pageNumber++) {
                 Document newDocument = new Document();
                 addIdentifiers(newDocument, fileLink);
@@ -90,7 +93,8 @@ private void addMetaData(Document newDocument, Path resolvedPdfPath, int pageNum
         addStringField(newDocument, PAGE_NUMBER.toString(), String.valueOf(pageNumber));
     }
 
-    private void addContentIfNotEmpty(PDDocument pdfDocument, Document newDocument, Path resolvedPath, int pageNumber) {
+    private void addContentIfNotEmpty(
+            PDDocument pdfDocument, Document newDocument, Path resolvedPath, int pageNumber) {
         PDFTextStripper pdfTextStripper = new PDFTextStripper();
         pdfTextStripper.setLineSeparator("\n");
         pdfTextStripper.setStartPage(pageNumber);
@@ -99,22 +103,29 @@ private void addContentIfNotEmpty(PDDocument pdfDocument, Document newDocument,
         try {
             String pdfContent = pdfTextStripper.getText(pdfDocument);
             if (StringUtil.isNotBlank(pdfContent)) {
-                newDocument.add(new TextField(CONTENT.toString(), mergeLines(pdfContent), Field.Store.YES));
+                newDocument.add(
+                        new TextField(CONTENT.toString(), mergeLines(pdfContent), Field.Store.YES));
             }
 
-            // Apache PDFTextStripper is 1-based. See {@link org.apache.pdfbox.text.PDFTextStripper.processPages}
+            // Apache PDFTextStripper is 1-based. See {@link
+            // org.apache.pdfbox.text.PDFTextStripper.processPages}
             PDPage page = pdfDocument.getPage(pageNumber - 1);
-            List<String> annotations = page.getAnnotations()
-                                           .stream()
-                                           .map(PDAnnotation::getContents)
-                                           .filter(Objects::nonNull)
-                                           .toList();
+            List<String> annotations =
+                    page.getAnnotations().stream()
+                            .map(PDAnnotation::getContents)
+                            .filter(Objects::nonNull)
+                            .toList();
 
             if (!annotations.isEmpty()) {
-                newDocument.add(new TextField(ANNOTATIONS.toString(), String.join("\n", annotations), Field.Store.YES));
+                newDocument.add(
+                        new TextField(
+                                ANNOTATIONS.toString(),
+                                String.join("\n", annotations),
+                                Field.Store.YES));
             }
         } catch (IOException e) {
-            LOGGER.warn("Could not read page {} of  {}", pageNumber, resolvedPath.toAbsolutePath(), e);
+            LOGGER.warn(
+                    "Could not read page {} of  {}", pageNumber, resolvedPath.toAbsolutePath(), e);
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/search/indexing/ReadOnlyLinkedFilesIndexer.java b/src/main/java/org/jabref/logic/search/indexing/ReadOnlyLinkedFilesIndexer.java
index b12d5c87899a..a3ba9dba8b93 100644
--- a/src/main/java/org/jabref/logic/search/indexing/ReadOnlyLinkedFilesIndexer.java
+++ b/src/main/java/org/jabref/logic/search/indexing/ReadOnlyLinkedFilesIndexer.java
@@ -1,20 +1,19 @@
 package org.jabref.logic.search.indexing;
 
-import java.io.IOException;
-import java.util.Collection;
-
+import org.apache.lucene.search.SearcherManager;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
 import org.jabref.logic.search.LuceneIndexer;
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.logic.util.HeadlessExecutorService;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-
-import org.apache.lucene.search.SearcherManager;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.FSDirectory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.Collection;
+
 public class ReadOnlyLinkedFilesIndexer implements LuceneIndexer {
     private static final Logger LOGGER = LoggerFactory.getLogger(ReadOnlyLinkedFilesIndexer.class);
     private Directory indexDirectory;
@@ -30,28 +29,23 @@ public ReadOnlyLinkedFilesIndexer(BibDatabaseContext databaseContext) {
     }
 
     @Override
-    public void updateOnStart(BackgroundTask<?> task) {
-    }
+    public void updateOnStart(BackgroundTask<?> task) {}
 
     @Override
-    public void addToIndex(Collection<BibEntry> entries, BackgroundTask<?> task) {
-    }
+    public void addToIndex(Collection<BibEntry> entries, BackgroundTask<?> task) {}
 
     @Override
-    public void removeFromIndex(Collection<BibEntry> entries, BackgroundTask<?> task) {
-    }
+    public void removeFromIndex(Collection<BibEntry> entries, BackgroundTask<?> task) {}
 
     @Override
-    public void updateEntry(BibEntry entry, String oldValue, String newValue, BackgroundTask<?> task) {
-    }
+    public void updateEntry(
+            BibEntry entry, String oldValue, String newValue, BackgroundTask<?> task) {}
 
     @Override
-    public void removeAllFromIndex() {
-    }
+    public void removeAllFromIndex() {}
 
     @Override
-    public void rebuildIndex(BackgroundTask<?> task) {
-    }
+    public void rebuildIndex(BackgroundTask<?> task) {}
 
     @Override
     public SearcherManager getSearcherManager() {
diff --git a/src/main/java/org/jabref/logic/search/retrieval/LuceneSearcher.java b/src/main/java/org/jabref/logic/search/retrieval/LuceneSearcher.java
index 944cfad66ce9..914f6a4233b4 100644
--- a/src/main/java/org/jabref/logic/search/retrieval/LuceneSearcher.java
+++ b/src/main/java/org/jabref/logic/search/retrieval/LuceneSearcher.java
@@ -1,24 +1,5 @@
 package org.jabref.logic.search.retrieval;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.jabref.logic.FilePreferences;
-import org.jabref.logic.search.LuceneIndexer;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.search.SearchFieldConstants;
-import org.jabref.model.search.SearchFlags;
-import org.jabref.model.search.SearchQuery;
-import org.jabref.model.search.SearchResult;
-import org.jabref.model.search.SearchResults;
-
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.MultiReader;
 import org.apache.lucene.index.StoredFields;
@@ -34,9 +15,27 @@
 import org.apache.lucene.search.highlight.Highlighter;
 import org.apache.lucene.search.highlight.QueryScorer;
 import org.apache.lucene.search.highlight.SimpleHTMLFormatter;
+import org.jabref.logic.FilePreferences;
+import org.jabref.logic.search.LuceneIndexer;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.search.SearchFieldConstants;
+import org.jabref.model.search.SearchFlags;
+import org.jabref.model.search.SearchQuery;
+import org.jabref.model.search.SearchResult;
+import org.jabref.model.search.SearchResults;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
 public final class LuceneSearcher {
     private static final Logger LOGGER = LoggerFactory.getLogger(LuceneSearcher.class);
 
@@ -45,7 +44,11 @@ public final class LuceneSearcher {
     private final SearcherManager bibFieldsSearcherManager;
     private final SearcherManager linkedFilesSearcherManager;
 
-    public LuceneSearcher(BibDatabaseContext databaseContext, LuceneIndexer bibFieldsIndexer, LuceneIndexer linkedFilesIndexer, FilePreferences filePreferences) {
+    public LuceneSearcher(
+            BibDatabaseContext databaseContext,
+            LuceneIndexer bibFieldsIndexer,
+            LuceneIndexer linkedFilesIndexer,
+            FilePreferences filePreferences) {
         this.bibFieldsSearcherManager = bibFieldsIndexer.getSearcherManager();
         this.linkedFilesSearcherManager = linkedFilesIndexer.getSearcherManager();
         this.databaseContext = databaseContext;
@@ -60,7 +63,8 @@ public boolean isEntryMatched(BibEntry entry, SearchQuery searchQuery) {
 
     private BooleanQuery buildBooleanQueryForEntry(BibEntry entry, SearchQuery searchQuery) {
         Query parsedQuery = searchQuery.getParsedQuery();
-        TermQuery entryIdQuery = new TermQuery(new Term(SearchFieldConstants.ENTRY_ID.toString(), entry.getId()));
+        TermQuery entryIdQuery =
+                new TermQuery(new Term(SearchFieldConstants.ENTRY_ID.toString(), entry.getId()));
         return new BooleanQuery.Builder()
                 .add(parsedQuery, BooleanClause.Occur.MUST)
                 .add(entryIdQuery, BooleanClause.Occur.MUST)
@@ -70,7 +74,9 @@ private BooleanQuery buildBooleanQueryForEntry(BibEntry entry, SearchQuery searc
     public SearchResults search(Query searchQuery, EnumSet<SearchFlags> searchFlags) {
         LOGGER.debug("Executing search with query: {}", searchQuery);
         try {
-            boolean shouldSearchInLinkedFiles = searchFlags.contains(SearchFlags.FULLTEXT) && filePreferences.shouldFulltextIndexLinkedFiles();
+            boolean shouldSearchInLinkedFiles =
+                    searchFlags.contains(SearchFlags.FULLTEXT)
+                            && filePreferences.shouldFulltextIndexLinkedFiles();
             return performSearch(searchQuery, shouldSearchInLinkedFiles);
         } catch (IOException | IndexSearcher.TooManyClauses e) {
             LOGGER.error("Error during search execution", e);
@@ -78,7 +84,8 @@ public SearchResults search(Query searchQuery, EnumSet<SearchFlags> searchFlags)
         return new SearchResults();
     }
 
-    private SearchResults performSearch(Query searchQuery, boolean shouldSearchInLinkedFiles) throws IOException {
+    private SearchResults performSearch(Query searchQuery, boolean shouldSearchInLinkedFiles)
+            throws IOException {
         if (shouldSearchInLinkedFiles) {
             return searchInBibFieldsAndLinkedFiles(searchQuery);
         } else {
@@ -90,7 +97,10 @@ private SearchResults searchInBibFieldsAndLinkedFiles(Query searchQuery) throws
         IndexSearcher bibFieldsIndexSearcher = acquireIndexSearcher(bibFieldsSearcherManager);
         IndexSearcher linkedFilesIndexSearcher = acquireIndexSearcher(linkedFilesSearcherManager);
         try {
-            MultiReader multiReader = new MultiReader(bibFieldsIndexSearcher.getIndexReader(), linkedFilesIndexSearcher.getIndexReader());
+            MultiReader multiReader =
+                    new MultiReader(
+                            bibFieldsIndexSearcher.getIndexReader(),
+                            linkedFilesIndexSearcher.getIndexReader());
             IndexSearcher indexSearcher = new IndexSearcher(multiReader);
             return search(indexSearcher, searchQuery, true);
         } finally {
@@ -108,14 +118,21 @@ private SearchResults searchInBibFields(Query searchQuery) throws IOException {
         }
     }
 
-    private SearchResults search(IndexSearcher indexSearcher, Query searchQuery, boolean shouldSearchInLinkedFiles) throws IOException {
+    private SearchResults search(
+            IndexSearcher indexSearcher, Query searchQuery, boolean shouldSearchInLinkedFiles)
+            throws IOException {
         TopDocs topDocs = indexSearcher.search(searchQuery, Integer.MAX_VALUE);
         StoredFields storedFields = indexSearcher.storedFields();
         LOGGER.debug("Found {} matching documents", topDocs.totalHits.value);
         return getSearchResults(topDocs, storedFields, searchQuery, shouldSearchInLinkedFiles);
     }
 
-    private SearchResults getSearchResults(TopDocs topDocs, StoredFields storedFields, Query searchQuery, boolean shouldSearchInLinkedFiles) throws IOException {
+    private SearchResults getSearchResults(
+            TopDocs topDocs,
+            StoredFields storedFields,
+            Query searchQuery,
+            boolean shouldSearchInLinkedFiles)
+            throws IOException {
         SearchResults searchResults = new SearchResults();
         long startTime = System.currentTimeMillis();
 
@@ -129,37 +146,62 @@ private SearchResults getSearchResults(TopDocs topDocs, StoredFields storedField
         return searchResults;
     }
 
-    private void getBibFieldsAndLinkedFilesResults(TopDocs topDocs, StoredFields storedFields, Query searchQuery, SearchResults searchResults) throws IOException {
+    private void getBibFieldsAndLinkedFilesResults(
+            TopDocs topDocs,
+            StoredFields storedFields,
+            Query searchQuery,
+            SearchResults searchResults)
+            throws IOException {
         Map<String, List<String>> linkedFilesMap = getLinkedFilesMap();
-        Highlighter highlighter = new Highlighter(new SimpleHTMLFormatter("<b>", "</b>"), new QueryScorer(searchQuery));
+        Highlighter highlighter =
+                new Highlighter(
+                        new SimpleHTMLFormatter("<b>", "</b>"), new QueryScorer(searchQuery));
 
         for (ScoreDoc scoreDoc : topDocs.scoreDocs) {
             Document document = storedFields.document(scoreDoc.doc);
             String fileLink = getFieldContents(document, SearchFieldConstants.PATH);
 
             if (!fileLink.isEmpty()) {
-                addLinkedFileToResults(document, fileLink, linkedFilesMap, highlighter, searchResults, scoreDoc.score);
+                addLinkedFileToResults(
+                        document,
+                        fileLink,
+                        linkedFilesMap,
+                        highlighter,
+                        searchResults,
+                        scoreDoc.score);
             } else {
                 addBibEntryToResults(document, searchResults, scoreDoc.score);
             }
         }
     }
 
-    private void getBibFieldsResults(TopDocs topDocs, StoredFields storedFields, SearchResults searchResults) throws IOException {
+    private void getBibFieldsResults(
+            TopDocs topDocs, StoredFields storedFields, SearchResults searchResults)
+            throws IOException {
         for (ScoreDoc scoreDoc : topDocs.scoreDocs) {
             Document document = storedFields.document(scoreDoc.doc);
             addBibEntryToResults(document, searchResults, scoreDoc.score);
         }
     }
 
-    private void addLinkedFileToResults(Document document, String fileLink, Map<String, List<String>> linkedFilesMap, Highlighter highlighter, SearchResults searchResults, float score) {
+    private void addLinkedFileToResults(
+            Document document,
+            String fileLink,
+            Map<String, List<String>> linkedFilesMap,
+            Highlighter highlighter,
+            SearchResults searchResults,
+            float score) {
         List<String> entriesWithFile = linkedFilesMap.get(fileLink);
         if (entriesWithFile != null && !entriesWithFile.isEmpty()) {
-            SearchResult searchResult = new SearchResult(score, fileLink,
-                    getFieldContents(document, SearchFieldConstants.CONTENT),
-                    getFieldContents(document, SearchFieldConstants.ANNOTATIONS),
-                    Integer.parseInt(getFieldContents(document, SearchFieldConstants.PAGE_NUMBER)),
-                    highlighter);
+            SearchResult searchResult =
+                    new SearchResult(
+                            score,
+                            fileLink,
+                            getFieldContents(document, SearchFieldConstants.CONTENT),
+                            getFieldContents(document, SearchFieldConstants.ANNOTATIONS),
+                            Integer.parseInt(
+                                    getFieldContents(document, SearchFieldConstants.PAGE_NUMBER)),
+                            highlighter);
             searchResults.addSearchResult(entriesWithFile, searchResult);
         }
     }
@@ -174,7 +216,9 @@ private Map<String, List<String>> getLinkedFilesMap() {
         Map<String, List<String>> linkedFilesMap = new HashMap<>();
         for (BibEntry bibEntry : databaseContext.getEntries()) {
             for (LinkedFile linkedFile : bibEntry.getFiles()) {
-                linkedFilesMap.computeIfAbsent(linkedFile.getLink(), k -> new ArrayList<>()).add(bibEntry.getId());
+                linkedFilesMap
+                        .computeIfAbsent(linkedFile.getLink(), k -> new ArrayList<>())
+                        .add(bibEntry.getId());
             }
         }
         return linkedFilesMap;
@@ -184,12 +228,14 @@ private static String getFieldContents(Document document, SearchFieldConstants f
         return Optional.ofNullable(document.get(field.toString())).orElse("");
     }
 
-    private static IndexSearcher acquireIndexSearcher(SearcherManager searcherManager) throws IOException {
+    private static IndexSearcher acquireIndexSearcher(SearcherManager searcherManager)
+            throws IOException {
         searcherManager.maybeRefreshBlocking();
         return searcherManager.acquire();
     }
 
-    private static void releaseIndexSearcher(SearcherManager searcherManager, IndexSearcher indexSearcher) throws IOException {
+    private static void releaseIndexSearcher(
+            SearcherManager searcherManager, IndexSearcher indexSearcher) throws IOException {
         searcherManager.release(indexSearcher);
     }
 }
diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnection.java b/src/main/java/org/jabref/logic/shared/DBMSConnection.java
index 2d1438f6136f..2fe23695acd7 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSConnection.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSConnection.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.shared;
 
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class DBMSConnection implements DatabaseConnection {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DBMSConnection.class);
@@ -19,7 +18,8 @@ public class DBMSConnection implements DatabaseConnection {
     private final Connection connection;
     private final DBMSConnectionProperties properties;
 
-    public DBMSConnection(DBMSConnectionProperties connectionProperties) throws SQLException, InvalidDBMSConnectionPropertiesException {
+    public DBMSConnection(DBMSConnectionProperties connectionProperties)
+            throws SQLException, InvalidDBMSConnectionPropertiesException {
         if (!connectionProperties.isValid()) {
             throw new InvalidDBMSConnectionPropertiesException();
         }
@@ -27,19 +27,29 @@ public DBMSConnection(DBMSConnectionProperties connectionProperties) throws SQLE
 
         try {
             DriverManager.setLoginTimeout(3);
-            // ensure that all SQL drivers are loaded - source: http://stackoverflow.com/a/22384826/873282
+            // ensure that all SQL drivers are loaded - source:
+            // http://stackoverflow.com/a/22384826/873282
             // we use the side effect of getAvailableDBMSTypes() - it loads all available drivers
             DBMSConnection.getAvailableDBMSTypes();
 
             if (connectionProperties.isUseExpertMode()) {
-                this.connection = DriverManager.getConnection(connectionProperties.getJdbcUrl(), connectionProperties.asProperties());
+                this.connection =
+                        DriverManager.getConnection(
+                                connectionProperties.getJdbcUrl(),
+                                connectionProperties.asProperties());
             } else {
-                this.connection = DriverManager.getConnection(connectionProperties.getUrl(), connectionProperties.asProperties());
+                this.connection =
+                        DriverManager.getConnection(
+                                connectionProperties.getUrl(), connectionProperties.asProperties());
             }
         } catch (SQLException e) {
             // Some systems like PostgreSQL retrieves 0 to every exception.
             // Therefore a stable error determination is not possible.
-            LOGGER.error("Could not connect to database: {} - Error code: {}", e.getMessage(), e.getErrorCode(), e);
+            LOGGER.error(
+                    "Could not connect to database: {} - Error code: {}",
+                    e.getMessage(),
+                    e.getErrorCode(),
+                    e);
             throw e;
         }
     }
diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java b/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
index acfe8f9250b6..ee3f25ee204d 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.shared;
 
+import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
+import org.jabref.logic.shared.security.Password;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.UnsupportedEncodingException;
 import java.security.GeneralSecurityException;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Properties;
 
-import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
-import org.jabref.logic.shared.security.Password;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Keeps all essential data for establishing a new connection to a DBMS using {@link DBMSConnection}.
  */
@@ -47,7 +46,8 @@ public DBMSConnectionProperties(SharedDatabasePreferences prefs) {
         prefs.getPort().ifPresent(thePort -> this.port = Integer.parseInt(thePort));
         prefs.getName().ifPresent(theDatabase -> this.database = theDatabase);
         prefs.getKeyStoreFile().ifPresent(theKeystore -> this.keyStore = theKeystore);
-        prefs.getServerTimezone().ifPresent(theServerTimezone -> this.serverTimezone = theServerTimezone);
+        prefs.getServerTimezone()
+                .ifPresent(theServerTimezone -> this.serverTimezone = theServerTimezone);
         prefs.getJdbcUrl().ifPresent(theJdbcUrl -> this.jdbcUrl = theJdbcUrl);
 
         this.expertMode = prefs.isUseExpertMode();
@@ -57,7 +57,11 @@ public DBMSConnectionProperties(SharedDatabasePreferences prefs) {
             this.user = prefs.getUser().get();
             if (prefs.getPassword().isPresent()) {
                 try {
-                    this.password = new Password(prefs.getPassword().get().toCharArray(), prefs.getUser().get()).decrypt();
+                    this.password =
+                            new Password(
+                                            prefs.getPassword().get().toCharArray(),
+                                            prefs.getUser().get())
+                                    .decrypt();
                 } catch (UnsupportedEncodingException | GeneralSecurityException e) {
                     LOGGER.error("Could not decrypt password", e);
                 }
@@ -70,9 +74,19 @@ public DBMSConnectionProperties(SharedDatabasePreferences prefs) {
         }
     }
 
-    DBMSConnectionProperties(DBMSType type, String host, int port, String database, String user,
-                             String password, boolean useSSL, boolean allowPublicKeyRetrieval,
-                             String serverTimezone, String keyStore, String jdbcUrl, boolean expertMode) {
+    DBMSConnectionProperties(
+            DBMSType type,
+            String host,
+            int port,
+            String database,
+            String user,
+            String password,
+            boolean useSSL,
+            boolean allowPublicKeyRetrieval,
+            String serverTimezone,
+            String keyStore,
+            String jdbcUrl,
+            boolean expertMode) {
         this.type = type;
         this.host = host;
         this.port = port;
@@ -198,7 +212,18 @@ public boolean equals(Object obj) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(type, host, port, database, user, useSSL, allowPublicKeyRetrieval, serverTimezone, keyStore, jdbcUrl, expertMode);
+        return Objects.hash(
+                type,
+                host,
+                port,
+                database,
+                user,
+                useSSL,
+                allowPublicKeyRetrieval,
+                serverTimezone,
+                keyStore,
+                jdbcUrl,
+                expertMode);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnectionPropertiesBuilder.java b/src/main/java/org/jabref/logic/shared/DBMSConnectionPropertiesBuilder.java
index 95ef884d0582..6860a44831ab 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSConnectionPropertiesBuilder.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSConnectionPropertiesBuilder.java
@@ -49,7 +49,8 @@ public DBMSConnectionPropertiesBuilder setUseSSL(boolean useSSL) {
         return this;
     }
 
-    public DBMSConnectionPropertiesBuilder setAllowPublicKeyRetrieval(boolean allowPublicKeyRetrieval) {
+    public DBMSConnectionPropertiesBuilder setAllowPublicKeyRetrieval(
+            boolean allowPublicKeyRetrieval) {
         this.allowPublicKeyRetrieval = allowPublicKeyRetrieval;
         return this;
     }
@@ -78,6 +79,18 @@ public DBMSConnectionProperties createDBMSConnectionProperties() {
         if (port == -1) {
             port = type.getDefaultPort();
         }
-        return new DBMSConnectionProperties(type, host, port, database, user, password, useSSL, allowPublicKeyRetrieval, serverTimezone, keyStore, jdbcUrl, expertMode);
+        return new DBMSConnectionProperties(
+                type,
+                host,
+                port,
+                database,
+                user,
+                password,
+                useSSL,
+                allowPublicKeyRetrieval,
+                serverTimezone,
+                keyStore,
+                jdbcUrl,
+                expertMode);
     }
 }
diff --git a/src/main/java/org/jabref/logic/shared/DBMSProcessor.java b/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
index d7ac69ee6f92..22f361ec4742 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
@@ -1,5 +1,18 @@
 package org.jabref.logic.shared;
 
+import com.google.common.collect.Lists;
+
+import org.jabref.logic.shared.exception.OfflineLockException;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.SharedBibEntryData;
+import org.jabref.model.entry.event.EntriesEventSource;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.entry.types.EntryTypeFactory;
+import org.jabref.model.metadata.MetaData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
@@ -18,19 +31,6 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import org.jabref.logic.shared.exception.OfflineLockException;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.SharedBibEntryData;
-import org.jabref.model.entry.event.EntriesEventSource;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.FieldFactory;
-import org.jabref.model.entry.types.EntryTypeFactory;
-import org.jabref.model.metadata.MetaData;
-
-import com.google.common.collect.Lists;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Processes all incoming or outgoing bib data to external SQL Database and manages its structure.
  */
@@ -62,7 +62,10 @@ public boolean checkBaseIntegrity() throws SQLException {
         if (type == DBMSType.POSTGRESQL || type == DBMSType.MYSQL) {
             String metadataVersion = metadata.get(MetaData.VERSION_DB_STRUCT);
             if (metadataVersion != null) {
-                int VERSION_DB_STRUCT = Integer.parseInt(metadata.getOrDefault(MetaData.VERSION_DB_STRUCT, "").replace(";", ""));
+                int VERSION_DB_STRUCT =
+                        Integer.parseInt(
+                                metadata.getOrDefault(MetaData.VERSION_DB_STRUCT, "")
+                                        .replace(";", ""));
                 if (VERSION_DB_STRUCT == getCURRENT_VERSION_DB_STRUCT()) {
                     databasePassesIntegrityCheck = true;
                 }
@@ -103,10 +106,13 @@ protected boolean checkTableAvailability(String... tableNames) throws SQLExcepti
 
         DatabaseMetaData databaseMetaData = connection.getMetaData();
         // ...getTables(null, ...): no restrictions
-        try (ResultSet databaseMetaDataResultSet = databaseMetaData.getTables(null, null, null, null)) {
+        try (ResultSet databaseMetaDataResultSet =
+                databaseMetaData.getTables(null, null, null, null)) {
             while (databaseMetaDataResultSet.next()) {
-                String tableName = databaseMetaDataResultSet.getString("TABLE_NAME").toUpperCase(Locale.ROOT);
-                requiredTables.remove(tableName); // Remove matching tables to check requiredTables for emptiness
+                String tableName =
+                        databaseMetaDataResultSet.getString("TABLE_NAME").toUpperCase(Locale.ROOT);
+                requiredTables.remove(
+                        tableName); // Remove matching tables to check requiredTables for emptiness
             }
             return requiredTables.isEmpty();
         }
@@ -178,24 +184,27 @@ public void insertEntries(List<BibEntry> bibEntries) {
      * @param bibEntries List of {@link BibEntry} to be inserted
      */
     protected void insertIntoEntryTable(List<BibEntry> bibEntries) {
-        StringBuilder insertIntoEntryQuery = new StringBuilder()
-                .append("INSERT INTO ")
-                .append(escape_Table("ENTRY"))
-                .append("(")
-                .append(escape("TYPE"))
-                .append(") VALUES(?)");
+        StringBuilder insertIntoEntryQuery =
+                new StringBuilder()
+                        .append("INSERT INTO ")
+                        .append(escape_Table("ENTRY"))
+                        .append("(")
+                        .append(escape("TYPE"))
+                        .append(") VALUES(?)");
         // Number of commas is bibEntries.size() - 1
         insertIntoEntryQuery.append(", (?)".repeat(Math.max(0, (bibEntries.size() - 1))));
 
-        try (PreparedStatement preparedEntryStatement = connection.prepareStatement(insertIntoEntryQuery.toString(),
-                new String[]{"SHARED_ID"})) {
+        try (PreparedStatement preparedEntryStatement =
+                connection.prepareStatement(
+                        insertIntoEntryQuery.toString(), new String[] {"SHARED_ID"})) {
             for (int i = 0; i < bibEntries.size(); i++) {
                 preparedEntryStatement.setString(i + 1, bibEntries.get(i).getType().getName());
             }
             preparedEntryStatement.executeUpdate();
 
             try (ResultSet generatedKeys = preparedEntryStatement.getGeneratedKeys()) {
-                // The following assumes that we get the generated keys in the order the entries were inserted
+                // The following assumes that we get the generated keys in the order the entries
+                // were inserted
                 // This should be the case
                 for (BibEntry bibEntry : bibEntries) {
                     generatedKeys.next();
@@ -218,17 +227,17 @@ protected void insertIntoEntryTable(List<BibEntry> bibEntries) {
      */
     private List<BibEntry> getNotYetExistingEntries(List<BibEntry> bibEntries) {
         List<Integer> remoteIds = new ArrayList<>();
-        List<Integer> localIds = bibEntries.stream()
-                                           .map(BibEntry::getSharedBibEntryData)
-                                           .map(SharedBibEntryData::getSharedID)
-                                           .filter(id -> id != -1)
-                                           .toList();
+        List<Integer> localIds =
+                bibEntries.stream()
+                        .map(BibEntry::getSharedBibEntryData)
+                        .map(SharedBibEntryData::getSharedID)
+                        .filter(id -> id != -1)
+                        .toList();
         if (localIds.isEmpty()) {
             return bibEntries;
         }
         try {
-            String selectQuery = "SELECT * FROM " +
-                    escape_Table("ENTRY");
+            String selectQuery = "SELECT * FROM " + escape_Table("ENTRY");
 
             try (ResultSet resultSet = connection.createStatement().executeQuery(selectQuery)) {
                 while (resultSet.next()) {
@@ -239,9 +248,9 @@ private List<BibEntry> getNotYetExistingEntries(List<BibEntry> bibEntries) {
         } catch (SQLException e) {
             LOGGER.error("SQL Error: ", e);
         }
-        return bibEntries.stream().filter(entry ->
-                !remoteIds.contains(entry.getSharedBibEntryData().getSharedID()))
-                         .collect(Collectors.toList());
+        return bibEntries.stream()
+                .filter(entry -> !remoteIds.contains(entry.getSharedBibEntryData().getSharedID()))
+                .collect(Collectors.toList());
     }
 
     /**
@@ -253,19 +262,22 @@ protected void insertIntoFieldTable(List<BibEntry> bibEntries) {
         try {
             // Inserting into FIELD table
             // Coerce to ArrayList in order to use List.get()
-            List<List<Field>> fields = bibEntries.stream().map(bibEntry -> new ArrayList<>(bibEntry.getFields()))
-                                                 .collect(Collectors.toList());
-
-            StringBuilder insertFieldQuery = new StringBuilder()
-                    .append("INSERT INTO ")
-                    .append(escape_Table("FIELD"))
-                    .append("(")
-                    .append(escape("ENTRY_SHARED_ID"))
-                    .append(", ")
-                    .append(escape("NAME"))
-                    .append(", ")
-                    .append(escape("VALUE"))
-                    .append(") VALUES(?, ?, ?)");
+            List<List<Field>> fields =
+                    bibEntries.stream()
+                            .map(bibEntry -> new ArrayList<>(bibEntry.getFields()))
+                            .collect(Collectors.toList());
+
+            StringBuilder insertFieldQuery =
+                    new StringBuilder()
+                            .append("INSERT INTO ")
+                            .append(escape_Table("FIELD"))
+                            .append("(")
+                            .append(escape("ENTRY_SHARED_ID"))
+                            .append(", ")
+                            .append(escape("NAME"))
+                            .append(", ")
+                            .append(escape("VALUE"))
+                            .append(") VALUES(?, ?, ?)");
             int numFields = 0;
             for (List<Field> entryFields : fields) {
                 numFields += entryFields.size();
@@ -277,14 +289,26 @@ protected void insertIntoFieldTable(List<BibEntry> bibEntries) {
 
             // Number of commas is fields.size() - 1
             insertFieldQuery.append(", (?, ?, ?)".repeat(Math.max(0, (numFields - 1))));
-            try (PreparedStatement preparedFieldStatement = connection.prepareStatement(insertFieldQuery.toString())) {
+            try (PreparedStatement preparedFieldStatement =
+                    connection.prepareStatement(insertFieldQuery.toString())) {
                 int fieldsCompleted = 0;
                 for (int entryIndex = 0; entryIndex < fields.size(); entryIndex++) {
-                    for (int entryFieldsIndex = 0; entryFieldsIndex < fields.get(entryIndex).size(); entryFieldsIndex++) {
+                    for (int entryFieldsIndex = 0;
+                            entryFieldsIndex < fields.get(entryIndex).size();
+                            entryFieldsIndex++) {
                         // columnIndex starts with 1
-                        preparedFieldStatement.setInt((3 * fieldsCompleted) + 1, bibEntries.get(entryIndex).getSharedBibEntryData().getSharedID());
-                        preparedFieldStatement.setString((3 * fieldsCompleted) + 2, fields.get(entryIndex).get(entryFieldsIndex).getName());
-                        preparedFieldStatement.setString((3 * fieldsCompleted) + 3, bibEntries.get(entryIndex).getField(fields.get(entryIndex).get(entryFieldsIndex)).get());
+                        preparedFieldStatement.setInt(
+                                (3 * fieldsCompleted) + 1,
+                                bibEntries.get(entryIndex).getSharedBibEntryData().getSharedID());
+                        preparedFieldStatement.setString(
+                                (3 * fieldsCompleted) + 2,
+                                fields.get(entryIndex).get(entryFieldsIndex).getName());
+                        preparedFieldStatement.setString(
+                                (3 * fieldsCompleted) + 3,
+                                bibEntries
+                                        .get(entryIndex)
+                                        .getField(fields.get(entryIndex).get(entryFieldsIndex))
+                                        .get());
                         fieldsCompleted += 1;
                     }
                 }
@@ -305,7 +329,8 @@ public void updateEntry(BibEntry localBibEntry) throws OfflineLockException, SQL
         connection.setAutoCommit(false); // disable auto commit due to transaction
 
         try {
-            Optional<BibEntry> sharedEntryOptional = getSharedEntry(localBibEntry.getSharedBibEntryData().getSharedID());
+            Optional<BibEntry> sharedEntryOptional =
+                    getSharedEntry(localBibEntry.getSharedBibEntryData().getSharedID());
 
             if (sharedEntryOptional.isEmpty()) {
                 return;
@@ -317,26 +342,31 @@ public void updateEntry(BibEntry localBibEntry) throws OfflineLockException, SQL
             removeSharedFieldsByDifference(localBibEntry, sharedBibEntry);
 
             // update only if local version is higher or the entries are equal
-            if ((localBibEntry.getSharedBibEntryData().getVersion() >= sharedBibEntry.getSharedBibEntryData()
-                                                                                     .getVersion()) || localBibEntry.equals(sharedBibEntry)) {
+            if ((localBibEntry.getSharedBibEntryData().getVersion()
+                            >= sharedBibEntry.getSharedBibEntryData().getVersion())
+                    || localBibEntry.equals(sharedBibEntry)) {
                 insertOrUpdateFields(localBibEntry);
 
                 // updating entry type
-                String updateEntryTypeQuery = "UPDATE " +
-                        escape_Table("ENTRY") +
-                        " SET " +
-                        escape("TYPE") +
-                        " = ?, " +
-                        escape("VERSION") +
-                        " = " +
-                        escape("VERSION") +
-                        " + 1 WHERE " +
-                        escape("SHARED_ID") +
-                        " = ?";
-
-                try (PreparedStatement preparedUpdateEntryTypeStatement = connection.prepareStatement(updateEntryTypeQuery)) {
-                    preparedUpdateEntryTypeStatement.setString(1, localBibEntry.getType().getName());
-                    preparedUpdateEntryTypeStatement.setInt(2, localBibEntry.getSharedBibEntryData().getSharedID());
+                String updateEntryTypeQuery =
+                        "UPDATE "
+                                + escape_Table("ENTRY")
+                                + " SET "
+                                + escape("TYPE")
+                                + " = ?, "
+                                + escape("VERSION")
+                                + " = "
+                                + escape("VERSION")
+                                + " + 1 WHERE "
+                                + escape("SHARED_ID")
+                                + " = ?";
+
+                try (PreparedStatement preparedUpdateEntryTypeStatement =
+                        connection.prepareStatement(updateEntryTypeQuery)) {
+                    preparedUpdateEntryTypeStatement.setString(
+                            1, localBibEntry.getType().getName());
+                    preparedUpdateEntryTypeStatement.setInt(
+                            2, localBibEntry.getSharedBibEntryData().getSharedID());
                     preparedUpdateEntryTypeStatement.executeUpdate();
                 }
 
@@ -355,22 +385,25 @@ public void updateEntry(BibEntry localBibEntry) throws OfflineLockException, SQL
     /**
      * Helping method. Removes shared fields which do not exist locally
      */
-    private void removeSharedFieldsByDifference(BibEntry localBibEntry, BibEntry sharedBibEntry) throws SQLException {
+    private void removeSharedFieldsByDifference(BibEntry localBibEntry, BibEntry sharedBibEntry)
+            throws SQLException {
         Set<Field> nullFields = new HashSet<>(sharedBibEntry.getFields());
         nullFields.removeAll(localBibEntry.getFields());
         for (Field nullField : nullFields) {
-            String deleteFieldQuery = "DELETE FROM " +
-                    escape_Table("FIELD") +
-                    " WHERE " +
-                    escape("NAME") +
-                    " = ? AND " +
-                    escape("ENTRY_SHARED_ID") +
-                    " = ?";
-
-            try (PreparedStatement preparedDeleteFieldStatement = connection
-                    .prepareStatement(deleteFieldQuery)) {
+            String deleteFieldQuery =
+                    "DELETE FROM "
+                            + escape_Table("FIELD")
+                            + " WHERE "
+                            + escape("NAME")
+                            + " = ? AND "
+                            + escape("ENTRY_SHARED_ID")
+                            + " = ?";
+
+            try (PreparedStatement preparedDeleteFieldStatement =
+                    connection.prepareStatement(deleteFieldQuery)) {
                 preparedDeleteFieldStatement.setString(1, nullField.getName());
-                preparedDeleteFieldStatement.setInt(2, localBibEntry.getSharedBibEntryData().getSharedID());
+                preparedDeleteFieldStatement.setInt(
+                        2, localBibEntry.getSharedBibEntryData().getSharedID());
                 preparedDeleteFieldStatement.executeUpdate();
             }
         }
@@ -382,59 +415,66 @@ private void removeSharedFieldsByDifference(BibEntry localBibEntry, BibEntry sha
      */
     private void insertOrUpdateFields(BibEntry localBibEntry) throws SQLException {
         for (Field field : localBibEntry.getFields()) {
-            // avoiding to use deprecated BibEntry.getField() method. null values are accepted by PreparedStatement!
+            // avoiding to use deprecated BibEntry.getField() method. null values are accepted by
+            // PreparedStatement!
             Optional<String> valueOptional = localBibEntry.getField(field);
             String value = null;
             if (valueOptional.isPresent()) {
                 value = valueOptional.get();
             }
 
-            String selectFieldQuery = "SELECT * FROM " +
-                    escape_Table("FIELD") +
-                    " WHERE " +
-                    escape("NAME") +
-                    " = ? AND " +
-                    escape("ENTRY_SHARED_ID") +
-                    " = ?";
-
-            try (PreparedStatement preparedSelectFieldStatement = connection
-                    .prepareStatement(selectFieldQuery)) {
+            String selectFieldQuery =
+                    "SELECT * FROM "
+                            + escape_Table("FIELD")
+                            + " WHERE "
+                            + escape("NAME")
+                            + " = ? AND "
+                            + escape("ENTRY_SHARED_ID")
+                            + " = ?";
+
+            try (PreparedStatement preparedSelectFieldStatement =
+                    connection.prepareStatement(selectFieldQuery)) {
                 preparedSelectFieldStatement.setString(1, field.getName());
-                preparedSelectFieldStatement.setInt(2, localBibEntry.getSharedBibEntryData().getSharedID());
+                preparedSelectFieldStatement.setInt(
+                        2, localBibEntry.getSharedBibEntryData().getSharedID());
 
                 try (ResultSet selectFieldResultSet = preparedSelectFieldStatement.executeQuery()) {
                     if (selectFieldResultSet.next()) { // check if field already exists
-                        String updateFieldQuery = "UPDATE " +
-                                escape_Table("FIELD") +
-                                " SET " +
-                                escape("VALUE") +
-                                " = ? WHERE " +
-                                escape("NAME") +
-                                " = ? AND " +
-                                escape("ENTRY_SHARED_ID") +
-                                " = ?";
-
-                        try (PreparedStatement preparedUpdateFieldStatement = connection
-                                .prepareStatement(updateFieldQuery)) {
+                        String updateFieldQuery =
+                                "UPDATE "
+                                        + escape_Table("FIELD")
+                                        + " SET "
+                                        + escape("VALUE")
+                                        + " = ? WHERE "
+                                        + escape("NAME")
+                                        + " = ? AND "
+                                        + escape("ENTRY_SHARED_ID")
+                                        + " = ?";
+
+                        try (PreparedStatement preparedUpdateFieldStatement =
+                                connection.prepareStatement(updateFieldQuery)) {
                             preparedUpdateFieldStatement.setString(1, value);
                             preparedUpdateFieldStatement.setString(2, field.getName());
-                            preparedUpdateFieldStatement.setInt(3, localBibEntry.getSharedBibEntryData().getSharedID());
+                            preparedUpdateFieldStatement.setInt(
+                                    3, localBibEntry.getSharedBibEntryData().getSharedID());
                             preparedUpdateFieldStatement.executeUpdate();
                         }
                     } else {
-                        String insertFieldQuery = "INSERT INTO " +
-                                escape_Table("FIELD") +
-                                "(" +
-                                escape("ENTRY_SHARED_ID") +
-                                ", " +
-                                escape("NAME") +
-                                ", " +
-                                escape("VALUE") +
-                                ") VALUES(?, ?, ?)";
-
-                        try (PreparedStatement preparedFieldStatement = connection
-                                .prepareStatement(insertFieldQuery)) {
-                            preparedFieldStatement.setInt(1, localBibEntry.getSharedBibEntryData().getSharedID());
+                        String insertFieldQuery =
+                                "INSERT INTO "
+                                        + escape_Table("FIELD")
+                                        + "("
+                                        + escape("ENTRY_SHARED_ID")
+                                        + ", "
+                                        + escape("NAME")
+                                        + ", "
+                                        + escape("VALUE")
+                                        + ") VALUES(?, ?, ?)";
+
+                        try (PreparedStatement preparedFieldStatement =
+                                connection.prepareStatement(insertFieldQuery)) {
+                            preparedFieldStatement.setInt(
+                                    1, localBibEntry.getSharedBibEntryData().getSharedID());
                             preparedFieldStatement.setString(2, field.getName());
                             preparedFieldStatement.setString(3, value);
                             preparedFieldStatement.executeUpdate();
@@ -455,18 +495,20 @@ public void removeEntries(List<BibEntry> bibEntries) {
         if (bibEntries.isEmpty()) {
             return;
         }
-        StringBuilder query = new StringBuilder()
-                .append("DELETE FROM ")
-                .append(escape_Table("ENTRY"))
-                .append(" WHERE ")
-                .append(escape("SHARED_ID"))
-                .append(" IN (");
+        StringBuilder query =
+                new StringBuilder()
+                        .append("DELETE FROM ")
+                        .append(escape_Table("ENTRY"))
+                        .append(" WHERE ")
+                        .append(escape("SHARED_ID"))
+                        .append(" IN (");
         query.append("?, ".repeat(bibEntries.size() - 1));
         query.append("?)");
 
         try (PreparedStatement preparedStatement = connection.prepareStatement(query.toString())) {
             for (int j = 0; j < bibEntries.size(); j++) {
-                preparedStatement.setInt(j + 1, bibEntries.get(j).getSharedBibEntryData().getSharedID());
+                preparedStatement.setInt(
+                        j + 1, bibEntries.get(j).getSharedBibEntryData().getSharedID());
             }
             preparedStatement.executeUpdate();
         } catch (SQLException e) {
@@ -515,29 +557,46 @@ public List<BibEntry> getSharedEntries(List<Integer> sharedIDs) {
 
         StringBuilder query = new StringBuilder();
         query.append("SELECT ")
-             .append(escape_Table("ENTRY")).append(".").append(escape("SHARED_ID")).append(", ")
-             .append(escape_Table("ENTRY")).append(".").append(escape("TYPE")).append(", ")
-             .append(escape_Table("ENTRY")).append(".").append(escape("VERSION")).append(", ")
-             .append("F.").append(escape("ENTRY_SHARED_ID")).append(", ")
-             .append("F.").append(escape("NAME")).append(", ")
-             .append("F.").append(escape("VALUE"))
-             .append(" FROM ")
-             .append(escape_Table("ENTRY"))
-             // Handle special case if entry does not have any fields (yet)
-             .append(" left outer join ")
-             .append(escape_Table("FIELD"))
-             .append(" F on ")
-             .append(escape_Table("ENTRY")).append(".").append(escape("SHARED_ID"))
-             .append(" = F.").append(escape("ENTRY_SHARED_ID"));
+                .append(escape_Table("ENTRY"))
+                .append(".")
+                .append(escape("SHARED_ID"))
+                .append(", ")
+                .append(escape_Table("ENTRY"))
+                .append(".")
+                .append(escape("TYPE"))
+                .append(", ")
+                .append(escape_Table("ENTRY"))
+                .append(".")
+                .append(escape("VERSION"))
+                .append(", ")
+                .append("F.")
+                .append(escape("ENTRY_SHARED_ID"))
+                .append(", ")
+                .append("F.")
+                .append(escape("NAME"))
+                .append(", ")
+                .append("F.")
+                .append(escape("VALUE"))
+                .append(" FROM ")
+                .append(escape_Table("ENTRY"))
+                // Handle special case if entry does not have any fields (yet)
+                .append(" left outer join ")
+                .append(escape_Table("FIELD"))
+                .append(" F on ")
+                .append(escape_Table("ENTRY"))
+                .append(".")
+                .append(escape("SHARED_ID"))
+                .append(" = F.")
+                .append(escape("ENTRY_SHARED_ID"));
 
         if (!sharedIDs.isEmpty()) {
             query.append(" where ")
-                 .append(escape("SHARED_ID")).append(" in (")
-                 .append("?, ".repeat(sharedIDs.size() - 1))
-                 .append("?)");
+                    .append(escape("SHARED_ID"))
+                    .append(" in (")
+                    .append("?, ".repeat(sharedIDs.size() - 1))
+                    .append("?)");
         }
-        query.append(" order by ")
-             .append(escape("SHARED_ID"));
+        query.append(" order by ").append(escape("SHARED_ID"));
 
         try (PreparedStatement preparedStatement = connection.prepareStatement(query.toString())) {
             for (int i = 0; i < sharedIDs.size(); i++) {
@@ -552,9 +611,12 @@ public List<BibEntry> getSharedEntries(List<Integer> sharedIDs) {
                     // Thus, the first change in the shared id leads to a new BibEntry
                     if (selectEntryResultSet.getInt("SHARED_ID") > lastId) {
                         bibEntry = new BibEntry();
-                        bibEntry.getSharedBibEntryData().setSharedID(selectEntryResultSet.getInt("SHARED_ID"));
-                        bibEntry.setType(EntryTypeFactory.parse(selectEntryResultSet.getString("TYPE")));
-                        bibEntry.getSharedBibEntryData().setVersion(selectEntryResultSet.getInt("VERSION"));
+                        bibEntry.getSharedBibEntryData()
+                                .setSharedID(selectEntryResultSet.getInt("SHARED_ID"));
+                        bibEntry.setType(
+                                EntryTypeFactory.parse(selectEntryResultSet.getString("TYPE")));
+                        bibEntry.getSharedBibEntryData()
+                                .setVersion(selectEntryResultSet.getInt("VERSION"));
                         sharedEntries.add(bibEntry);
                         lastId = selectEntryResultSet.getInt("SHARED_ID");
                     }
@@ -562,7 +624,10 @@ public List<BibEntry> getSharedEntries(List<Integer> sharedIDs) {
                     // In all cases, we set the field value of the newly created BibEntry object
                     String value = selectEntryResultSet.getString("VALUE");
                     if (value != null && bibEntry != null) {
-                        bibEntry.setField(FieldFactory.parseField(selectEntryResultSet.getString("NAME")), value, EntriesEventSource.SHARED);
+                        bibEntry.setField(
+                                FieldFactory.parseField(selectEntryResultSet.getString("NAME")),
+                                value,
+                                EntriesEventSource.SHARED);
                     }
                 }
             }
@@ -584,14 +649,15 @@ public List<BibEntry> getSharedEntries() {
      */
     public Map<Integer, Integer> getSharedIDVersionMapping() {
         Map<Integer, Integer> sharedIDVersionMapping = new HashMap<>();
-        String selectEntryQuery = "SELECT * FROM " +
-                escape_Table("ENTRY") +
-                " ORDER BY " +
-                escape("SHARED_ID");
+        String selectEntryQuery =
+                "SELECT * FROM " + escape_Table("ENTRY") + " ORDER BY " + escape("SHARED_ID");
 
-        try (ResultSet selectEntryResultSet = connection.createStatement().executeQuery(selectEntryQuery)) {
+        try (ResultSet selectEntryResultSet =
+                connection.createStatement().executeQuery(selectEntryQuery)) {
             while (selectEntryResultSet.next()) {
-                sharedIDVersionMapping.put(selectEntryResultSet.getInt("SHARED_ID"), selectEntryResultSet.getInt("VERSION"));
+                sharedIDVersionMapping.put(
+                        selectEntryResultSet.getInt("SHARED_ID"),
+                        selectEntryResultSet.getInt("VERSION"));
             }
         } catch (SQLException e) {
             LOGGER.error("SQL Error", e);
@@ -606,7 +672,10 @@ public Map<Integer, Integer> getSharedIDVersionMapping() {
     public Map<String, String> getSharedMetaData() {
         Map<String, String> data = new HashMap<>();
 
-        try (ResultSet resultSet = connection.createStatement().executeQuery("SELECT * FROM " + escape_Table("METADATA"))) {
+        try (ResultSet resultSet =
+                connection
+                        .createStatement()
+                        .executeQuery("SELECT * FROM " + escape_Table("METADATA"))) {
             while (resultSet.next()) {
                 data.put(resultSet.getString("KEY"), resultSet.getString("VALUE"));
             }
@@ -623,32 +692,36 @@ public Map<String, String> getSharedMetaData() {
      * @param data JabRef meta data as map
      */
     public void setSharedMetaData(Map<String, String> data) throws SQLException {
-        StringBuilder updateQuery = new StringBuilder()
-                .append("UPDATE ")
-                .append(escape_Table("METADATA"))
-                .append(" SET ")
-                .append(escape("VALUE"))
-                .append(" = ? ")
-                .append(" WHERE ")
-                .append(escape("KEY"))
-                .append(" = ?");
-
-        StringBuilder insertQuery = new StringBuilder()
-                .append("INSERT INTO ")
-                .append(escape_Table("METADATA"))
-                .append("(")
-                .append(escape("KEY"))
-                .append(", ")
-                .append(escape("VALUE"))
-                .append(") VALUES(?, ?)");
+        StringBuilder updateQuery =
+                new StringBuilder()
+                        .append("UPDATE ")
+                        .append(escape_Table("METADATA"))
+                        .append(" SET ")
+                        .append(escape("VALUE"))
+                        .append(" = ? ")
+                        .append(" WHERE ")
+                        .append(escape("KEY"))
+                        .append(" = ?");
+
+        StringBuilder insertQuery =
+                new StringBuilder()
+                        .append("INSERT INTO ")
+                        .append(escape_Table("METADATA"))
+                        .append("(")
+                        .append(escape("KEY"))
+                        .append(", ")
+                        .append(escape("VALUE"))
+                        .append(") VALUES(?, ?)");
 
         for (Map.Entry<String, String> metaEntry : data.entrySet()) {
-            try (PreparedStatement updateStatement = connection.prepareStatement(updateQuery.toString())) {
+            try (PreparedStatement updateStatement =
+                    connection.prepareStatement(updateQuery.toString())) {
                 updateStatement.setString(2, metaEntry.getKey());
                 updateStatement.setString(1, metaEntry.getValue());
                 if (updateStatement.executeUpdate() == 0) {
                     // No rows updated -> insert data
-                    try (PreparedStatement insertStatement = connection.prepareStatement(insertQuery.toString())) {
+                    try (PreparedStatement insertStatement =
+                            connection.prepareStatement(insertQuery.toString())) {
                         insertStatement.setString(1, metaEntry.getKey());
                         insertStatement.setString(2, metaEntry.getValue());
                         insertStatement.executeUpdate();
@@ -686,7 +759,8 @@ public DatabaseConnectionProperties getDBMSConnectionProperties() {
      *
      * @param dbmsSynchronizer {@link DBMSSynchronizer} which handles the notification.
      */
-    public void startNotificationListener(@SuppressWarnings("unused") DBMSSynchronizer dbmsSynchronizer) {
+    public void startNotificationListener(
+            @SuppressWarnings("unused") DBMSSynchronizer dbmsSynchronizer) {
         // nothing to do
     }
 
diff --git a/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java b/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
index d388de0b884f..711d7907f6f5 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
@@ -1,14 +1,7 @@
 package org.jabref.logic.shared;
 
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
 
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPatterns;
@@ -31,12 +24,19 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.event.MetaDataChangedEvent;
 import org.jabref.model.util.FileUpdateMonitor;
-
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * Synchronizes the shared or local databases with their opposite side. Local changes are pushed by {@link EntriesEvent}
  * using Google's Guava EventBus.
@@ -58,9 +58,12 @@ public class DBMSSynchronizer implements DatabaseSynchronizer {
     private final FileUpdateMonitor fileMonitor;
     private Optional<BibEntry> lastEntryChanged;
 
-    public DBMSSynchronizer(BibDatabaseContext bibDatabaseContext, Character keywordSeparator,
-                            FieldPreferences fieldPreferences,
-                            GlobalCitationKeyPatterns globalCiteKeyPattern, FileUpdateMonitor fileMonitor) {
+    public DBMSSynchronizer(
+            BibDatabaseContext bibDatabaseContext,
+            Character keywordSeparator,
+            FieldPreferences fieldPreferences,
+            GlobalCitationKeyPatterns globalCiteKeyPattern,
+            FileUpdateMonitor fileMonitor) {
         this.bibDatabaseContext = Objects.requireNonNull(bibDatabaseContext);
         this.bibDatabase = bibDatabaseContext.getDatabase();
         this.metaData = bibDatabaseContext.getMetaData();
@@ -77,14 +80,17 @@ public DBMSSynchronizer(BibDatabaseContext bibDatabaseContext, Character keyword
      */
     @Subscribe
     public void listen(EntriesAddedEvent event) {
-        // While synchronizing the local database (see synchronizeLocalDatabase() below), some EntriesEvents may be posted.
-        // In this case DBSynchronizer should not try to insert the bibEntry entry again (but it would not harm).
+        // While synchronizing the local database (see synchronizeLocalDatabase() below), some
+        // EntriesEvents may be posted.
+        // In this case DBSynchronizer should not try to insert the bibEntry entry again (but it
+        // would not harm).
         if (isEventSourceAccepted(event) && checkCurrentConnection()) {
             synchronizeLocalMetaData();
             pullWithLastEntry();
             synchronizeLocalDatabase();
             dbmsProcessor.insertEntries(event.getBibEntries());
-            // Reset last changed entry because it just has already been synchronized -> Why necessary?
+            // Reset last changed entry because it just has already been synchronized -> Why
+            // necessary?
             lastEntryChanged = Optional.empty();
         }
     }
@@ -95,9 +101,14 @@ public void listen(EntriesAddedEvent event) {
     @Subscribe
     public void listen(FieldChangedEvent event) {
         BibEntry bibEntry = event.getBibEntry();
-        // While synchronizing the local database (see synchronizeLocalDatabase() below), some EntriesEvents may be posted.
-        // In this case DBSynchronizer should not try to update the bibEntry entry again (but it would not harm).
-        if (isPresentLocalBibEntry(bibEntry) && isEventSourceAccepted(event) && checkCurrentConnection() && !event.isFilteredOut()) {
+        // While synchronizing the local database (see synchronizeLocalDatabase() below), some
+        // EntriesEvents may be posted.
+        // In this case DBSynchronizer should not try to update the bibEntry entry again (but it
+        // would not harm).
+        if (isPresentLocalBibEntry(bibEntry)
+                && isEventSourceAccepted(event)
+                && checkCurrentConnection()
+                && !event.isFilteredOut()) {
             synchronizeLocalMetaData();
             pullWithLastEntry();
             synchronizeSharedEntry(bibEntry);
@@ -113,8 +124,10 @@ public void listen(FieldChangedEvent event) {
      */
     @Subscribe
     public void listen(EntriesRemovedEvent event) {
-        // While synchronizing the local database (see synchronizeLocalDatabase() below), some EntriesEvents may be posted.
-        // In this case DBSynchronizer should not try to delete the bibEntry entry again (but it would not harm).
+        // While synchronizing the local database (see synchronizeLocalDatabase() below), some
+        // EntriesEvents may be posted.
+        // In this case DBSynchronizer should not try to delete the bibEntry entry again (but it
+        // would not harm).
         if (isEventSourceAccepted(event) && checkCurrentConnection()) {
             synchronizeLocalMetaData();
             pullWithLastEntry();
@@ -152,7 +165,8 @@ public void initializeDatabases() throws DatabaseNotSupportedException {
                     throw new DatabaseNotSupportedException();
                 }
 
-                // Calling dbmsProcessor.setupSharedDatabase() lets dbmsProcessor.checkBaseIntegrity() be true.
+                // Calling dbmsProcessor.setupSharedDatabase() lets
+                // dbmsProcessor.checkBaseIntegrity() be true.
                 dbmsProcessor.setupSharedDatabase();
             }
         } catch (SQLException e) {
@@ -185,26 +199,40 @@ public void synchronizeLocalDatabase() {
         for (Map.Entry<Integer, Integer> idVersionEntry : idVersionMap.entrySet()) {
             boolean remoteEntryMatchingOneLocalEntryFound = false;
             for (BibEntry localEntry : localEntries) {
-                if (idVersionEntry.getKey().equals(localEntry.getSharedBibEntryData().getSharedID())) {
+                if (idVersionEntry
+                        .getKey()
+                        .equals(localEntry.getSharedBibEntryData().getSharedID())) {
                     remoteEntryMatchingOneLocalEntryFound = true;
-                    if (idVersionEntry.getValue() > localEntry.getSharedBibEntryData().getVersion()) {
-                        Optional<BibEntry> sharedEntry = dbmsProcessor.getSharedEntry(idVersionEntry.getKey());
+                    if (idVersionEntry.getValue()
+                            > localEntry.getSharedBibEntryData().getVersion()) {
+                        Optional<BibEntry> sharedEntry =
+                                dbmsProcessor.getSharedEntry(idVersionEntry.getKey());
                         if (sharedEntry.isPresent()) {
                             // update fields
-                            localEntry.setType(sharedEntry.get().getType(), EntriesEventSource.SHARED);
-                            localEntry.getSharedBibEntryData()
-                                      .setVersion(sharedEntry.get().getSharedBibEntryData().getVersion());
-                            sharedEntry.get().getFieldMap().forEach(
-                                    // copy remote values to local entry
-                                    (field, value) -> localEntry.setField(field, value, EntriesEventSource.SHARED)
-                            );
+                            localEntry.setType(
+                                    sharedEntry.get().getType(), EntriesEventSource.SHARED);
+                            localEntry
+                                    .getSharedBibEntryData()
+                                    .setVersion(
+                                            sharedEntry.get().getSharedBibEntryData().getVersion());
+                            sharedEntry
+                                    .get()
+                                    .getFieldMap()
+                                    .forEach(
+                                            // copy remote values to local entry
+                                            (field, value) ->
+                                                    localEntry.setField(
+                                                            field,
+                                                            value,
+                                                            EntriesEventSource.SHARED));
 
                             // locally remove not existing fields
                             localEntry.getFields().stream()
-                                      .filter(field -> !sharedEntry.get().hasField(field))
-                                      .forEach(
-                                              field -> localEntry.clearField(field, EntriesEventSource.SHARED)
-                                      );
+                                    .filter(field -> !sharedEntry.get().hasField(field))
+                                    .forEach(
+                                            field ->
+                                                    localEntry.clearField(
+                                                            field, EntriesEventSource.SHARED));
                         }
                     }
                 }
@@ -216,7 +244,9 @@ public void synchronizeLocalDatabase() {
 
         if (!entriesToInsertIntoLocalDatabase.isEmpty()) {
             // in case entries should be added into the local database, insert them
-            bibDatabase.insertEntries(dbmsProcessor.partitionAndGetSharedEntries(entriesToInsertIntoLocalDatabase), EntriesEventSource.SHARED);
+            bibDatabase.insertEntries(
+                    dbmsProcessor.partitionAndGetSharedEntries(entriesToInsertIntoLocalDatabase),
+                    EntriesEventSource.SHARED);
         }
     }
 
@@ -229,8 +259,11 @@ public void synchronizeLocalDatabase() {
     private void removeNotSharedEntries(List<BibEntry> localEntries, Set<Integer> sharedIDs) {
         List<BibEntry> entriesToRemove =
                 localEntries.stream()
-                            .filter(localEntry -> !sharedIDs.contains(localEntry.getSharedBibEntryData().getSharedID()))
-                            .collect(Collectors.toList());
+                        .filter(
+                                localEntry ->
+                                        !sharedIDs.contains(
+                                                localEntry.getSharedBibEntryData().getSharedID()))
+                        .collect(Collectors.toList());
         if (!entriesToRemove.isEmpty()) {
             eventBus.post(new SharedEntriesNotPresentEvent(entriesToRemove));
             // remove all non-shared entries without triggering listeners
@@ -247,10 +280,15 @@ public void synchronizeSharedEntry(BibEntry bibEntry) {
             return;
         }
         try {
-            BibDatabaseWriter.applySaveActions(bibEntry, metaData, fieldPreferences); // perform possibly existing save actions
+            BibDatabaseWriter.applySaveActions(
+                    bibEntry, metaData, fieldPreferences); // perform possibly existing save actions
             dbmsProcessor.updateEntry(bibEntry);
         } catch (OfflineLockException exception) {
-            eventBus.post(new UpdateRefusedEvent(bibDatabaseContext, exception.getLocalBibEntry(), exception.getSharedBibEntry()));
+            eventBus.post(
+                    new UpdateRefusedEvent(
+                            bibDatabaseContext,
+                            exception.getLocalBibEntry(),
+                            exception.getSharedBibEntry()));
         } catch (SQLException e) {
             LOGGER.error("SQL Error", e);
         }
@@ -277,12 +315,14 @@ public void synchronizeLocalMetaData() {
     /**
      * Synchronizes all shared meta data.
      */
-    private void synchronizeSharedMetaData(MetaData data, GlobalCitationKeyPatterns globalCiteKeyPattern) {
+    private void synchronizeSharedMetaData(
+            MetaData data, GlobalCitationKeyPatterns globalCiteKeyPattern) {
         if (!checkCurrentConnection()) {
             return;
         }
         try {
-            dbmsProcessor.setSharedMetaData(MetaDataSerializer.getSerializedStringMap(data, globalCiteKeyPattern));
+            dbmsProcessor.setSharedMetaData(
+                    MetaDataSerializer.getSerializedStringMap(data, globalCiteKeyPattern));
         } catch (SQLException e) {
             LOGGER.error("SQL Error: ", e);
         }
@@ -298,11 +338,16 @@ public void applyMetaData() {
         for (BibEntry bibEntry : bibDatabase.getEntries()) {
             try {
                 // synchronize only if changes were present
-                if (!BibDatabaseWriter.applySaveActions(bibEntry, metaData, fieldPreferences).isEmpty()) {
+                if (!BibDatabaseWriter.applySaveActions(bibEntry, metaData, fieldPreferences)
+                        .isEmpty()) {
                     dbmsProcessor.updateEntry(bibEntry);
                 }
             } catch (OfflineLockException exception) {
-                eventBus.post(new UpdateRefusedEvent(bibDatabaseContext, exception.getLocalBibEntry(), exception.getSharedBibEntry()));
+                eventBus.post(
+                        new UpdateRefusedEvent(
+                                bibDatabaseContext,
+                                exception.getLocalBibEntry(),
+                                exception.getSharedBibEntry()));
             } catch (SQLException e) {
                 LOGGER.error("SQL Error: ", e);
             }
@@ -377,11 +422,13 @@ public boolean checkCurrentConnection() {
      */
     public boolean isEventSourceAccepted(EntriesEvent event) {
         EntriesEventSource eventSource = event.getEntriesEventSource();
-        return (eventSource == EntriesEventSource.LOCAL) || (eventSource == EntriesEventSource.UNDO);
+        return (eventSource == EntriesEventSource.LOCAL)
+                || (eventSource == EntriesEventSource.UNDO);
     }
 
     @Override
-    public void openSharedDatabase(DatabaseConnection connection) throws DatabaseNotSupportedException {
+    public void openSharedDatabase(DatabaseConnection connection)
+            throws DatabaseNotSupportedException {
         this.dbName = connection.getProperties().getDatabase();
         this.currentConnection = connection.getConnection();
         this.dbmsProcessor = DBMSProcessor.getProcessorInstance(connection);
diff --git a/src/main/java/org/jabref/logic/shared/DBMSType.java b/src/main/java/org/jabref/logic/shared/DBMSType.java
index 8a3717abaf06..5cfa8c764706 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSType.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSType.java
@@ -24,7 +24,9 @@ public enum DBMSType {
     }
 
     public static Optional<DBMSType> fromString(String typeName) {
-        return Arrays.stream(DBMSType.values()).filter(dbmsType -> dbmsType.type.equalsIgnoreCase(typeName)).findAny();
+        return Arrays.stream(DBMSType.values())
+                .filter(dbmsType -> dbmsType.type.equalsIgnoreCase(typeName))
+                .findAny();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/shared/MySQLProcessor.java b/src/main/java/org/jabref/logic/shared/MySQLProcessor.java
index 906fbaf50e8d..748b4aae5e47 100644
--- a/src/main/java/org/jabref/logic/shared/MySQLProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/MySQLProcessor.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.shared;
 
+import org.jabref.model.metadata.MetaData;
+
 import java.sql.SQLException;
 import java.util.Map;
 
-import org.jabref.model.metadata.MetaData;
-
 /**
  * Processes all incoming or outgoing bib data to MySQL Database and manages its structure.
  */
@@ -24,29 +24,36 @@ public MySQLProcessor(DatabaseConnection connection) {
      */
     @Override
     public void setUp() throws SQLException {
-        connection.createStatement().executeUpdate(
-                "CREATE TABLE IF NOT EXISTS `JABREF_ENTRY` (" +
-                        "`SHARED_ID` INT(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, " +
-                        "`TYPE` VARCHAR(255) NOT NULL, " +
-                        "`VERSION` INT(11) DEFAULT 1)");
+        connection
+                .createStatement()
+                .executeUpdate(
+                        "CREATE TABLE IF NOT EXISTS `JABREF_ENTRY` ("
+                                + "`SHARED_ID` INT(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, "
+                                + "`TYPE` VARCHAR(255) NOT NULL, "
+                                + "`VERSION` INT(11) DEFAULT 1)");
 
-        connection.createStatement().executeUpdate(
-                "CREATE TABLE IF NOT EXISTS `JABREF_FIELD` (" +
-                        "`ENTRY_SHARED_ID` INT(11) NOT NULL, " +
-                        "`NAME` VARCHAR(255) NOT NULL, " +
-                        "`VALUE` TEXT DEFAULT NULL, " +
-                        "FOREIGN KEY (`ENTRY_SHARED_ID`) REFERENCES `JABREF_ENTRY`(`SHARED_ID`) ON DELETE CASCADE)");
+        connection
+                .createStatement()
+                .executeUpdate(
+                        "CREATE TABLE IF NOT EXISTS `JABREF_FIELD` ("
+                                + "`ENTRY_SHARED_ID` INT(11) NOT NULL, "
+                                + "`NAME` VARCHAR(255) NOT NULL, "
+                                + "`VALUE` TEXT DEFAULT NULL, "
+                                + "FOREIGN KEY (`ENTRY_SHARED_ID`) REFERENCES `JABREF_ENTRY`(`SHARED_ID`) ON DELETE CASCADE)");
 
-        connection.createStatement().executeUpdate(
-                "CREATE TABLE IF NOT EXISTS `JABREF_METADATA` (" +
-                        "`KEY` varchar(255) NOT NULL," +
-                        "`VALUE` text NOT NULL)");
+        connection
+                .createStatement()
+                .executeUpdate(
+                        "CREATE TABLE IF NOT EXISTS `JABREF_METADATA` ("
+                                + "`KEY` varchar(255) NOT NULL,"
+                                + "`VALUE` text NOT NULL)");
 
         Map<String, String> metadata = getSharedMetaData();
 
         if (metadata.get(MetaData.VERSION_DB_STRUCT) != null) {
             try {
-                VERSION_DB_STRUCT_DEFAULT = Integer.valueOf(metadata.get(MetaData.VERSION_DB_STRUCT));
+                VERSION_DB_STRUCT_DEFAULT =
+                        Integer.valueOf(metadata.get(MetaData.VERSION_DB_STRUCT));
             } catch (Exception e) {
                 LOGGER.warn("[VERSION_DB_STRUCT_DEFAULT] not Integer!");
             }
@@ -56,11 +63,23 @@ public void setUp() throws SQLException {
 
         if (VERSION_DB_STRUCT_DEFAULT < CURRENT_VERSION_DB_STRUCT) {
             // We can to migrate from old table in new table
-            if (CURRENT_VERSION_DB_STRUCT == 1 && checkTableAvailability("ENTRY", "FIELD", "METADATA")) {
+            if (CURRENT_VERSION_DB_STRUCT == 1
+                    && checkTableAvailability("ENTRY", "FIELD", "METADATA")) {
                 LOGGER.info("Migrating from VersionDBStructure == 0");
-                connection.createStatement().executeUpdate("INSERT INTO " + escape_Table("ENTRY") + " SELECT * FROM `ENTRY`");
-                connection.createStatement().executeUpdate("INSERT INTO " + escape_Table("FIELD") + " SELECT * FROM `FIELD`");
-                connection.createStatement().executeUpdate("INSERT INTO " + escape_Table("METADATA") + " SELECT * FROM `METADATA`");
+                connection
+                        .createStatement()
+                        .executeUpdate(
+                                "INSERT INTO " + escape_Table("ENTRY") + " SELECT * FROM `ENTRY`");
+                connection
+                        .createStatement()
+                        .executeUpdate(
+                                "INSERT INTO " + escape_Table("FIELD") + " SELECT * FROM `FIELD`");
+                connection
+                        .createStatement()
+                        .executeUpdate(
+                                "INSERT INTO "
+                                        + escape_Table("METADATA")
+                                        + " SELECT * FROM `METADATA`");
                 metadata = getSharedMetaData();
             }
 
diff --git a/src/main/java/org/jabref/logic/shared/OracleProcessor.java b/src/main/java/org/jabref/logic/shared/OracleProcessor.java
index 3221a2118086..07219cb51331 100644
--- a/src/main/java/org/jabref/logic/shared/OracleProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/OracleProcessor.java
@@ -1,5 +1,14 @@
 package org.jabref.logic.shared;
 
+import oracle.jdbc.OracleConnection;
+import oracle.jdbc.OracleStatement;
+import oracle.jdbc.dcn.DatabaseChangeRegistration;
+
+import org.jabref.logic.shared.listener.OracleNotificationListener;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.metadata.MetaData;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -10,15 +19,6 @@
 import java.util.Properties;
 import java.util.stream.Collectors;
 
-import org.jabref.logic.shared.listener.OracleNotificationListener;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.metadata.MetaData;
-
-import oracle.jdbc.OracleConnection;
-import oracle.jdbc.OracleStatement;
-import oracle.jdbc.dcn.DatabaseChangeRegistration;
-
 /**
  * Processes all incoming or outgoing bib data to Oracle database and manages its structure.
  */
@@ -44,36 +44,46 @@ public OracleProcessor(DatabaseConnection connection) {
      */
     @Override
     public void setUp() throws SQLException {
-        connection.createStatement().executeUpdate(
-                "CREATE TABLE \"ENTRY\" (" +
-                        "\"SHARED_ID\" NUMBER NOT NULL, " +
-                        "\"TYPE\" VARCHAR2(255) NULL, " +
-                        "\"VERSION\" NUMBER DEFAULT 1, " +
-                        "CONSTRAINT \"ENTRY_PK\" PRIMARY KEY (\"SHARED_ID\"))");
+        connection
+                .createStatement()
+                .executeUpdate(
+                        "CREATE TABLE \"ENTRY\" ("
+                                + "\"SHARED_ID\" NUMBER NOT NULL, "
+                                + "\"TYPE\" VARCHAR2(255) NULL, "
+                                + "\"VERSION\" NUMBER DEFAULT 1, "
+                                + "CONSTRAINT \"ENTRY_PK\" PRIMARY KEY (\"SHARED_ID\"))");
 
         connection.createStatement().executeUpdate("CREATE SEQUENCE \"ENTRY_SEQ\"");
 
-        connection.createStatement().executeUpdate("CREATE TRIGGER \"ENTRY_T\" BEFORE INSERT ON \"ENTRY\" " +
-                "FOR EACH ROW BEGIN SELECT \"ENTRY_SEQ\".NEXTVAL INTO :NEW.shared_id FROM DUAL; END;");
-
-        connection.createStatement().executeUpdate(
-                "CREATE TABLE \"FIELD\" (" +
-                        "\"ENTRY_SHARED_ID\" NUMBER NOT NULL, " +
-                        "\"NAME\" VARCHAR2(255) NOT NULL, " +
-                        "\"VALUE\" CLOB NULL, " +
-                        "CONSTRAINT \"ENTRY_SHARED_ID_FK\" FOREIGN KEY (\"ENTRY_SHARED_ID\") " +
-                        "REFERENCES \"ENTRY\"(\"SHARED_ID\") ON DELETE CASCADE)");
-
-        connection.createStatement().executeUpdate(
-                "CREATE TABLE \"METADATA\" (" +
-                        "\"KEY\"  VARCHAR2(255) NULL," +
-                        "\"VALUE\"  CLOB NOT NULL)");
+        connection
+                .createStatement()
+                .executeUpdate(
+                        "CREATE TRIGGER \"ENTRY_T\" BEFORE INSERT ON \"ENTRY\" "
+                                + "FOR EACH ROW BEGIN SELECT \"ENTRY_SEQ\".NEXTVAL INTO :NEW.shared_id FROM DUAL; END;");
+
+        connection
+                .createStatement()
+                .executeUpdate(
+                        "CREATE TABLE \"FIELD\" ("
+                                + "\"ENTRY_SHARED_ID\" NUMBER NOT NULL, "
+                                + "\"NAME\" VARCHAR2(255) NOT NULL, "
+                                + "\"VALUE\" CLOB NULL, "
+                                + "CONSTRAINT \"ENTRY_SHARED_ID_FK\" FOREIGN KEY (\"ENTRY_SHARED_ID\") "
+                                + "REFERENCES \"ENTRY\"(\"SHARED_ID\") ON DELETE CASCADE)");
+
+        connection
+                .createStatement()
+                .executeUpdate(
+                        "CREATE TABLE \"METADATA\" ("
+                                + "\"KEY\"  VARCHAR2(255) NULL,"
+                                + "\"VALUE\"  CLOB NOT NULL)");
 
         Map<String, String> metadata = getSharedMetaData();
 
         if (metadata.get(MetaData.VERSION_DB_STRUCT) != null) {
             try {
-                VERSION_DB_STRUCT_DEFAULT = Integer.valueOf(metadata.get(MetaData.VERSION_DB_STRUCT));
+                VERSION_DB_STRUCT_DEFAULT =
+                        Integer.valueOf(metadata.get(MetaData.VERSION_DB_STRUCT));
             } catch (Exception e) {
                 LOGGER.warn("[VERSION_DB_STRUCT_DEFAULT] not Integer!");
             }
@@ -114,16 +124,19 @@ public void startNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
             properties.setProperty(OracleConnection.DCN_NOTIFY_ROWIDS, "true");
             properties.setProperty(OracleConnection.DCN_QUERY_CHANGE_NOTIFICATION, "true");
 
-            databaseChangeRegistration = oracleConnection.registerDatabaseChangeNotification(properties);
+            databaseChangeRegistration =
+                    oracleConnection.registerDatabaseChangeNotification(properties);
             databaseChangeRegistration.addListener(listener);
 
             try (Statement statement = oracleConnection.createStatement()) {
-                ((OracleStatement) statement).setDatabaseChangeRegistration(databaseChangeRegistration);
-                StringBuilder selectQuery = new StringBuilder()
-                        .append("SELECT 1 FROM ")
-                        .append(escape_Table("ENTRY"))
-                        .append(", ")
-                        .append(escape_Table("METADATA"));
+                ((OracleStatement) statement)
+                        .setDatabaseChangeRegistration(databaseChangeRegistration);
+                StringBuilder selectQuery =
+                        new StringBuilder()
+                                .append("SELECT 1 FROM ")
+                                .append(escape_Table("ENTRY"))
+                                .append(", ")
+                                .append(escape_Table("METADATA"));
                 // this execution registers all tables mentioned in selectQuery
                 statement.executeQuery(selectQuery.toString());
             }
@@ -137,21 +150,24 @@ protected void insertIntoEntryTable(List<BibEntry> entries) {
         try {
             for (BibEntry entry : entries) {
                 String insertIntoEntryQuery =
-                        "INSERT INTO " +
-                                escape_Table("ENTRY") +
-                                "(" +
-                                escape("TYPE") +
-                                ") VALUES(?)";
+                        "INSERT INTO "
+                                + escape_Table("ENTRY")
+                                + "("
+                                + escape("TYPE")
+                                + ") VALUES(?)";
 
-                try (PreparedStatement preparedEntryStatement = connection.prepareStatement(insertIntoEntryQuery,
-                        new String[]{"SHARED_ID"})) {
+                try (PreparedStatement preparedEntryStatement =
+                        connection.prepareStatement(
+                                insertIntoEntryQuery, new String[] {"SHARED_ID"})) {
 
                     preparedEntryStatement.setString(1, entry.getType().getName());
                     preparedEntryStatement.executeUpdate();
 
                     try (ResultSet generatedKeys = preparedEntryStatement.getGeneratedKeys()) {
                         if (generatedKeys.next()) {
-                            entry.getSharedBibEntryData().setSharedID(generatedKeys.getInt(1)); // set generated ID locally
+                            entry.getSharedBibEntryData()
+                                    .setSharedID(
+                                            generatedKeys.getInt(1)); // set generated ID locally
                         }
                     }
                 }
@@ -166,34 +182,48 @@ protected void insertIntoFieldTable(List<BibEntry> bibEntries) {
         try {
             // Inserting into FIELD table
             // Coerce to ArrayList in order to use List.get()
-            List<List<Field>> fields = bibEntries.stream().map(entry -> new ArrayList<>(entry.getFields()))
-                                                 .collect(Collectors.toList());
-            StringBuilder insertFieldQuery = new StringBuilder()
-                    .append("INSERT ALL");
+            List<List<Field>> fields =
+                    bibEntries.stream()
+                            .map(entry -> new ArrayList<>(entry.getFields()))
+                            .collect(Collectors.toList());
+            StringBuilder insertFieldQuery = new StringBuilder().append("INSERT ALL");
             int numFields = 0;
             for (List<Field> entryFields : fields) {
                 numFields += entryFields.size();
             }
             for (int i = 0; i < numFields; i++) {
-                insertFieldQuery.append(" INTO ")
-                                .append(escape_Table("FIELD"))
-                                .append(" (")
-                                .append(escape("ENTRY_SHARED_ID"))
-                                .append(", ")
-                                .append(escape("NAME"))
-                                .append(", ")
-                                .append(escape("VALUE"))
-                                .append(") VALUES (?, ?, ?)");
+                insertFieldQuery
+                        .append(" INTO ")
+                        .append(escape_Table("FIELD"))
+                        .append(" (")
+                        .append(escape("ENTRY_SHARED_ID"))
+                        .append(", ")
+                        .append(escape("NAME"))
+                        .append(", ")
+                        .append(escape("VALUE"))
+                        .append(") VALUES (?, ?, ?)");
             }
             insertFieldQuery.append(" SELECT * FROM DUAL");
-            try (PreparedStatement preparedFieldStatement = connection.prepareStatement(insertFieldQuery.toString())) {
+            try (PreparedStatement preparedFieldStatement =
+                    connection.prepareStatement(insertFieldQuery.toString())) {
                 int fieldsCompleted = 0;
                 for (int entryIndex = 0; entryIndex < fields.size(); entryIndex++) {
-                    for (int entryFieldsIndex = 0; entryFieldsIndex < fields.get(entryIndex).size(); entryFieldsIndex++) {
+                    for (int entryFieldsIndex = 0;
+                            entryFieldsIndex < fields.get(entryIndex).size();
+                            entryFieldsIndex++) {
                         // columnIndex starts with 1
-                        preparedFieldStatement.setInt((3 * fieldsCompleted) + 1, bibEntries.get(entryIndex).getSharedBibEntryData().getSharedID());
-                        preparedFieldStatement.setString((3 * fieldsCompleted) + 2, fields.get(entryIndex).get(entryFieldsIndex).getName());
-                        preparedFieldStatement.setString((3 * fieldsCompleted) + 3, bibEntries.get(entryIndex).getField(fields.get(entryIndex).get(entryFieldsIndex)).get());
+                        preparedFieldStatement.setInt(
+                                (3 * fieldsCompleted) + 1,
+                                bibEntries.get(entryIndex).getSharedBibEntryData().getSharedID());
+                        preparedFieldStatement.setString(
+                                (3 * fieldsCompleted) + 2,
+                                fields.get(entryIndex).get(entryFieldsIndex).getName());
+                        preparedFieldStatement.setString(
+                                (3 * fieldsCompleted) + 3,
+                                bibEntries
+                                        .get(entryIndex)
+                                        .getField(fields.get(entryIndex).get(entryFieldsIndex))
+                                        .get());
                         fieldsCompleted += 1;
                     }
                 }
diff --git a/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java b/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java
index 21b04d09c6ac..f7e1ab787673 100644
--- a/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java
@@ -1,5 +1,11 @@
 package org.jabref.logic.shared;
 
+import org.jabref.logic.shared.listener.PostgresSQLNotificationListener;
+import org.jabref.logic.util.HeadlessExecutorService;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.metadata.MetaData;
+import org.postgresql.PGConnection;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -7,13 +13,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jabref.logic.shared.listener.PostgresSQLNotificationListener;
-import org.jabref.logic.util.HeadlessExecutorService;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.metadata.MetaData;
-
-import org.postgresql.PGConnection;
-
 /**
  * Processes all incoming or outgoing bib data to PostgreSQL database and manages its structure.
  */
@@ -36,37 +35,54 @@ public PostgreSQLProcessor(DatabaseConnection connection) {
     @Override
     public void setUp() throws SQLException {
 
-        if (CURRENT_VERSION_DB_STRUCT == 1 && checkTableAvailability("ENTRY", "FIELD", "METADATA")) {
-            // checkTableAvailability does not distinguish if same table name exists in different schemas
+        if (CURRENT_VERSION_DB_STRUCT == 1
+                && checkTableAvailability("ENTRY", "FIELD", "METADATA")) {
+            // checkTableAvailability does not distinguish if same table name exists in different
+            // schemas
             // VERSION_DB_STRUCT_DEFAULT must be forced
             VERSION_DB_STRUCT_DEFAULT = 0;
         }
 
         connection.createStatement().executeUpdate("CREATE SCHEMA IF NOT EXISTS jabref");
 
-        connection.createStatement().executeUpdate(
-                "CREATE TABLE IF NOT EXISTS " + escape_Table("ENTRY") + " (" +
-                        "\"SHARED_ID\" SERIAL PRIMARY KEY, " +
-                        "\"TYPE\" VARCHAR, " +
-                        "\"VERSION\" INTEGER DEFAULT 1)");
-
-        connection.createStatement().executeUpdate(
-                "CREATE TABLE IF NOT EXISTS " + escape_Table("FIELD") + " (" +
-                        "\"ENTRY_SHARED_ID\" INTEGER REFERENCES " + escape_Table("ENTRY") + "(\"SHARED_ID\") ON DELETE CASCADE, " +
-                        "\"NAME\" VARCHAR, " +
-                        "\"VALUE\" TEXT)");
-
-        connection.createStatement().executeUpdate(
-                "CREATE TABLE IF NOT EXISTS " + escape_Table("METADATA") + " ("
-                        + "\"KEY\" VARCHAR,"
-                        + "\"VALUE\" TEXT)");
+        connection
+                .createStatement()
+                .executeUpdate(
+                        "CREATE TABLE IF NOT EXISTS "
+                                + escape_Table("ENTRY")
+                                + " ("
+                                + "\"SHARED_ID\" SERIAL PRIMARY KEY, "
+                                + "\"TYPE\" VARCHAR, "
+                                + "\"VERSION\" INTEGER DEFAULT 1)");
+
+        connection
+                .createStatement()
+                .executeUpdate(
+                        "CREATE TABLE IF NOT EXISTS "
+                                + escape_Table("FIELD")
+                                + " ("
+                                + "\"ENTRY_SHARED_ID\" INTEGER REFERENCES "
+                                + escape_Table("ENTRY")
+                                + "(\"SHARED_ID\") ON DELETE CASCADE, "
+                                + "\"NAME\" VARCHAR, "
+                                + "\"VALUE\" TEXT)");
+
+        connection
+                .createStatement()
+                .executeUpdate(
+                        "CREATE TABLE IF NOT EXISTS "
+                                + escape_Table("METADATA")
+                                + " ("
+                                + "\"KEY\" VARCHAR,"
+                                + "\"VALUE\" TEXT)");
 
         Map<String, String> metadata = getSharedMetaData();
 
         if (metadata.get(MetaData.VERSION_DB_STRUCT) != null) {
             try {
                 // replace semicolon so we can parse it
-                VERSION_DB_STRUCT_DEFAULT = Integer.parseInt(metadata.get(MetaData.VERSION_DB_STRUCT).replace(";", ""));
+                VERSION_DB_STRUCT_DEFAULT =
+                        Integer.parseInt(metadata.get(MetaData.VERSION_DB_STRUCT).replace(";", ""));
             } catch (Exception e) {
                 LOGGER.warn("[VERSION_DB_STRUCT_DEFAULT] not Integer!");
             }
@@ -78,10 +94,28 @@ public void setUp() throws SQLException {
             // We can to migrate from old table in new table
             if (VERSION_DB_STRUCT_DEFAULT == 0 && CURRENT_VERSION_DB_STRUCT == 1) {
                 LOGGER.info("Migrating from VersionDBStructure == 0");
-                connection.createStatement().executeUpdate("INSERT INTO " + escape_Table("ENTRY") + " SELECT * FROM \"ENTRY\"");
-                connection.createStatement().executeUpdate("INSERT INTO " + escape_Table("FIELD") + " SELECT * FROM \"FIELD\"");
-                connection.createStatement().executeUpdate("INSERT INTO " + escape_Table("METADATA") + " SELECT * FROM \"METADATA\"");
-                connection.createStatement().execute("SELECT setval(\'jabref.\"ENTRY_SHARED_ID_seq\"\', (select max(\"SHARED_ID\") from jabref.\"ENTRY\"))");
+                connection
+                        .createStatement()
+                        .executeUpdate(
+                                "INSERT INTO "
+                                        + escape_Table("ENTRY")
+                                        + " SELECT * FROM \"ENTRY\"");
+                connection
+                        .createStatement()
+                        .executeUpdate(
+                                "INSERT INTO "
+                                        + escape_Table("FIELD")
+                                        + " SELECT * FROM \"FIELD\"");
+                connection
+                        .createStatement()
+                        .executeUpdate(
+                                "INSERT INTO "
+                                        + escape_Table("METADATA")
+                                        + " SELECT * FROM \"METADATA\"");
+                connection
+                        .createStatement()
+                        .execute(
+                                "SELECT setval(\'jabref.\"ENTRY_SHARED_ID_seq\"\', (select max(\"SHARED_ID\") from jabref.\"ENTRY\"))");
                 metadata = getSharedMetaData();
             }
 
@@ -92,23 +126,26 @@ public void setUp() throws SQLException {
 
     @Override
     protected void insertIntoEntryTable(List<BibEntry> bibEntries) {
-        StringBuilder insertIntoEntryQuery = new StringBuilder()
-                .append("INSERT INTO ")
-                .append(escape_Table("ENTRY"))
-                .append("(")
-                .append(escape("TYPE"))
-                .append(") VALUES(?)");
+        StringBuilder insertIntoEntryQuery =
+                new StringBuilder()
+                        .append("INSERT INTO ")
+                        .append(escape_Table("ENTRY"))
+                        .append("(")
+                        .append(escape("TYPE"))
+                        .append(") VALUES(?)");
         // Number of commas is bibEntries.size() - 1
         insertIntoEntryQuery.append(", (?)".repeat(Math.max(0, bibEntries.size() - 1)));
-        try (PreparedStatement preparedEntryStatement = connection.prepareStatement(insertIntoEntryQuery.toString(),
-                Statement.RETURN_GENERATED_KEYS)) {
+        try (PreparedStatement preparedEntryStatement =
+                connection.prepareStatement(
+                        insertIntoEntryQuery.toString(), Statement.RETURN_GENERATED_KEYS)) {
             for (int i = 0; i < bibEntries.size(); i++) {
                 preparedEntryStatement.setString(i + 1, bibEntries.get(i).getType().getName());
             }
             preparedEntryStatement.executeUpdate();
 
             try (ResultSet generatedKeys = preparedEntryStatement.getGeneratedKeys()) {
-                // The following assumes that we get the generated keys in the order the entries were inserted
+                // The following assumes that we get the generated keys in the order the entries
+                // were inserted
                 // This should be the case
                 for (BibEntry bibEntry : bibEntries) {
                     generatedKeys.next();
@@ -144,7 +181,8 @@ public void startNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
         // Logger.getLogger(ThreadedHousekeeper.class.getName()).setLevel(Level.SEVERE);
         try {
             connection.createStatement().execute("LISTEN jabrefLiveUpdate");
-            // Do not use `new PostgresSQLNotificationListener(...)` as the object has to exist continuously!
+            // Do not use `new PostgresSQLNotificationListener(...)` as the object has to exist
+            // continuously!
             // Otherwise, the listener is going to be deleted by Java's garbage collector.
             PGConnection pgConnection = connection.unwrap(PGConnection.class);
             listener = new PostgresSQLNotificationListener(dbmsSynchronizer, pgConnection);
@@ -167,7 +205,9 @@ public void stopNotificationListener() {
     @Override
     public void notifyClients() {
         try {
-            connection.createStatement().execute("NOTIFY jabrefLiveUpdate, '" + PROCESSOR_ID + "';");
+            connection
+                    .createStatement()
+                    .execute("NOTIFY jabrefLiveUpdate, '" + PROCESSOR_ID + "';");
         } catch (SQLException e) {
             LOGGER.error("SQL Error during client notification", e);
         }
diff --git a/src/main/java/org/jabref/logic/shared/event/SharedEntriesNotPresentEvent.java b/src/main/java/org/jabref/logic/shared/event/SharedEntriesNotPresentEvent.java
index 6972e60e90d9..fd600616f51a 100644
--- a/src/main/java/org/jabref/logic/shared/event/SharedEntriesNotPresentEvent.java
+++ b/src/main/java/org/jabref/logic/shared/event/SharedEntriesNotPresentEvent.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.shared.event;
 
-import java.util.List;
-
 import org.jabref.model.entry.BibEntry;
 
+import java.util.List;
+
 /**
  * This event is fired when the user tries to push changes of one or more obsolete
  * {@link BibEntry} to the server.
diff --git a/src/main/java/org/jabref/logic/shared/event/UpdateRefusedEvent.java b/src/main/java/org/jabref/logic/shared/event/UpdateRefusedEvent.java
index ffced9d8af35..12e9151c0a4a 100644
--- a/src/main/java/org/jabref/logic/shared/event/UpdateRefusedEvent.java
+++ b/src/main/java/org/jabref/logic/shared/event/UpdateRefusedEvent.java
@@ -16,7 +16,10 @@ public class UpdateRefusedEvent {
      * @param bibDatabaseContext Affected {@link BibDatabaseContext}
      * @param localBibEntry      Affected {@link BibEntry}
      */
-    public UpdateRefusedEvent(BibDatabaseContext bibDatabaseContext, BibEntry localBibEntry, BibEntry sharedBibEntry) {
+    public UpdateRefusedEvent(
+            BibDatabaseContext bibDatabaseContext,
+            BibEntry localBibEntry,
+            BibEntry sharedBibEntry) {
         this.bibDatabaseContext = bibDatabaseContext;
         this.localBibEntry = localBibEntry;
         this.sharedBibEntry = sharedBibEntry;
diff --git a/src/main/java/org/jabref/logic/shared/listener/OracleNotificationListener.java b/src/main/java/org/jabref/logic/shared/listener/OracleNotificationListener.java
index 51aec6ddaaaa..a518b11e9162 100644
--- a/src/main/java/org/jabref/logic/shared/listener/OracleNotificationListener.java
+++ b/src/main/java/org/jabref/logic/shared/listener/OracleNotificationListener.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.shared.listener;
 
-import org.jabref.logic.shared.DBMSSynchronizer;
-
 import oracle.jdbc.dcn.DatabaseChangeEvent;
 import oracle.jdbc.dcn.DatabaseChangeListener;
 
+import org.jabref.logic.shared.DBMSSynchronizer;
+
 /**
  * A listener for Oracle database notifications.
  */
diff --git a/src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java b/src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java
index 96b8b7ccaf6d..2caa37d7f536 100644
--- a/src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java
+++ b/src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java
@@ -1,27 +1,28 @@
 package org.jabref.logic.shared.listener;
 
-import java.sql.SQLException;
-
 import org.jabref.logic.shared.DBMSProcessor;
 import org.jabref.logic.shared.DBMSSynchronizer;
-
 import org.postgresql.PGConnection;
 import org.postgresql.PGNotification;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.sql.SQLException;
+
 /**
  * A listener for PostgreSQL database notifications.
  */
 public class PostgresSQLNotificationListener implements Runnable {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PostgresSQLNotificationListener.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(PostgresSQLNotificationListener.class);
 
     private final DBMSSynchronizer dbmsSynchronizer;
     private final PGConnection pgConnection;
     private volatile boolean stop;
 
-    public PostgresSQLNotificationListener(DBMSSynchronizer dbmsSynchronizer, PGConnection pgConnection) {
+    public PostgresSQLNotificationListener(
+            DBMSSynchronizer dbmsSynchronizer, PGConnection pgConnection) {
         this.dbmsSynchronizer = dbmsSynchronizer;
         this.pgConnection = pgConnection;
     }
diff --git a/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java b/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
index 360c95417301..51e48adde728 100644
--- a/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
+++ b/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.shared.prefs;
 
+import org.jabref.logic.shared.DatabaseConnectionProperties;
+import org.jabref.logic.shared.security.Password;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.UnsupportedEncodingException;
 import java.security.GeneralSecurityException;
 import java.util.Optional;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
 
-import org.jabref.logic.shared.DatabaseConnectionProperties;
-import org.jabref.logic.shared.security.Password;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class SharedDatabasePreferences {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SharedDatabasePreferences.class);
@@ -27,14 +26,16 @@ public class SharedDatabasePreferences {
     private static final String SHARED_DATABASE_PASSWORD = "sharedDatabasePassword";
     private static final String SHARED_DATABASE_FOLDER = "sharedDatabaseFolder";
     private static final String SHARED_DATABASE_AUTOSAVE = "sharedDatabaseAutosave";
-    private static final String SHARED_DATABASE_REMEMBER_PASSWORD = "sharedDatabaseRememberPassword";
+    private static final String SHARED_DATABASE_REMEMBER_PASSWORD =
+            "sharedDatabaseRememberPassword";
     private static final String SHARED_DATABASE_USE_SSL = "sharedDatabaseUseSSL";
     private static final String SHARED_DATABASE_KEYSTORE_FILE = "sharedDatabaseKeyStoreFile";
     private static final String SHARED_DATABASE_SERVER_TIMEZONE = "sharedDatabaseServerTimezone";
     private static final String SHARED_DATABASE_EXPERT_MODE = "sharedDatabaseExpertMode";
     private static final String SHARED_DATABASE_JDBC_URL = "sharedDatabaseJdbcUrl";
 
-    // This {@link Preferences} is used only for things which should not appear in real JabRefPreferences due to security reasons.
+    // This {@link Preferences} is used only for things which should not appear in real
+    // JabRefPreferences due to security reasons.
     private final Preferences internalPrefs;
 
     public SharedDatabasePreferences() {
@@ -188,7 +189,9 @@ public void putAllDBMSConnectionProperties(DatabaseConnectionProperties properti
         setJdbcUrl(properties.getJdbcUrl());
 
         try {
-            setPassword(new Password(properties.getPassword().toCharArray(), properties.getUser()).encrypt());
+            setPassword(
+                    new Password(properties.getPassword().toCharArray(), properties.getUser())
+                            .encrypt());
         } catch (GeneralSecurityException | UnsupportedEncodingException e) {
             LOGGER.error("Could not store the password due to encryption problems.", e);
         }
diff --git a/src/main/java/org/jabref/logic/shared/security/Password.java b/src/main/java/org/jabref/logic/shared/security/Password.java
index 7d858e5b8f69..d6ad87b904dc 100644
--- a/src/main/java/org/jabref/logic/shared/security/Password.java
+++ b/src/main/java/org/jabref/logic/shared/security/Password.java
@@ -27,11 +27,13 @@ public class Password {
      * @param phrase Phrase which should be encrypted or decrypted
      * @param key    Key which is used to improve symmetric encryption
      */
-    public Password(char[] phrase, String key) throws NoSuchAlgorithmException, NoSuchPaddingException {
+    public Password(char[] phrase, String key)
+            throws NoSuchAlgorithmException, NoSuchPaddingException {
         this(new String(phrase), key);
     }
 
-    public Password(String phrase, String key) throws NoSuchAlgorithmException, NoSuchPaddingException {
+    public Password(String phrase, String key)
+            throws NoSuchAlgorithmException, NoSuchPaddingException {
         this.phrase = phrase.getBytes();
         this.cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
         this.secretKey = new SecretKeySpec(get128BitHash(key.getBytes()), "AES");
@@ -45,7 +47,8 @@ public Password(String phrase, String key) throws NoSuchAlgorithmException, NoSu
      */
     public String encrypt() throws GeneralSecurityException, UnsupportedEncodingException {
         cipher.init(Cipher.ENCRYPT_MODE, secretKey, ivSpec);
-        return new String(Base64.getEncoder().encode(cipher.doFinal(phrase)), StandardCharsets.UTF_8);
+        return new String(
+                Base64.getEncoder().encode(cipher.doFinal(phrase)), StandardCharsets.UTF_8);
     }
 
     /**
@@ -55,7 +58,8 @@ public String encrypt() throws GeneralSecurityException, UnsupportedEncodingExce
      */
     public String decrypt() throws GeneralSecurityException, UnsupportedEncodingException {
         cipher.init(Cipher.DECRYPT_MODE, secretKey, ivSpec);
-        return new String(cipher.doFinal(Base64.getDecoder().decode(phrase)), StandardCharsets.UTF_8);
+        return new String(
+                cipher.doFinal(Base64.getDecoder().decode(phrase)), StandardCharsets.UTF_8);
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java b/src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java
index 1e24671c21e0..d99b43a363e3 100644
--- a/src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java
+++ b/src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.texparser;
 
+import org.jabref.model.texparser.LatexParserResult;
+import org.jabref.model.texparser.LatexParserResults;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -15,12 +20,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.model.texparser.LatexParserResult;
-import org.jabref.model.texparser.LatexParserResults;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class DefaultLatexParser implements LatexParser {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DefaultLatexParser.class);
@@ -32,22 +31,27 @@ public class DefaultLatexParser implements LatexParser {
      * "[cC]ite(author|title|year|t|p)?".
      */
     private static final String[] CITE_COMMANDS = {
-            "[cC]ite(alt|alp|author|authorfull|date|num|p|t|text|title|url|year|yearpar)?",
-            "([aA]|[aA]uto|fnote|foot|footfull|full|no|[nN]ote|[pP]aren|[pP]note|[tT]ext|[sS]mart|super)cite([s*]?)",
-            "footcitetext", "(block|text)cquote"
+        "[cC]ite(alt|alp|author|authorfull|date|num|p|t|text|title|url|year|yearpar)?",
+        "([aA]|[aA]uto|fnote|foot|footfull|full|no|[nN]ote|[pP]aren|[pP]note|[tT]ext|[sS]mart|super)cite([s*]?)",
+        "footcitetext",
+        "(block|text)cquote"
     };
+
     private static final String CITE_GROUP = "key";
-    private static final Pattern CITE_PATTERN = Pattern.compile(
-            "\\\\(%s)\\*?(?:\\[(?:[^\\]]*)\\]){0,2}\\{(?<%s>[^\\}]*)\\}(?:\\{[^\\}]*\\})?".formatted(
-                    String.join("|", CITE_COMMANDS), CITE_GROUP));
+    private static final Pattern CITE_PATTERN =
+            Pattern.compile(
+                    "\\\\(%s)\\*?(?:\\[(?:[^\\]]*)\\]){0,2}\\{(?<%s>[^\\}]*)\\}(?:\\{[^\\}]*\\})?"
+                            .formatted(String.join("|", CITE_COMMANDS), CITE_GROUP));
 
     private static final String BIBLIOGRAPHY_GROUP = "bib";
-    private static final Pattern BIBLIOGRAPHY_PATTERN = Pattern.compile(
-            "\\\\(?:bibliography|addbibresource)\\{(?<%s>[^\\}]*)\\}".formatted(BIBLIOGRAPHY_GROUP));
+    private static final Pattern BIBLIOGRAPHY_PATTERN =
+            Pattern.compile(
+                    "\\\\(?:bibliography|addbibresource)\\{(?<%s>[^\\}]*)\\}"
+                            .formatted(BIBLIOGRAPHY_GROUP));
 
     private static final String INCLUDE_GROUP = "file";
-    private static final Pattern INCLUDE_PATTERN = Pattern.compile(
-            "\\\\(?:include|input)\\{(?<%s>[^\\}]*)\\}".formatted(INCLUDE_GROUP));
+    private static final Pattern INCLUDE_PATTERN =
+            Pattern.compile("\\\\(?:include|input)\\{(?<%s>[^\\}]*)\\}".formatted(INCLUDE_GROUP));
 
     @Override
     public LatexParserResult parse(String citeString) {
@@ -67,9 +71,11 @@ public Optional<LatexParserResult> parse(Path latexFile) {
         LatexParserResult latexParserResult = new LatexParserResult(latexFile);
 
         try (InputStream inputStream = Files.newInputStream(latexFile);
-             Reader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
-             LineNumberReader lineNumberReader = new LineNumberReader(reader)) {
-            for (String line = lineNumberReader.readLine(); line != null; line = lineNumberReader.readLine()) {
+                Reader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
+                LineNumberReader lineNumberReader = new LineNumberReader(reader)) {
+            for (String line = lineNumberReader.readLine();
+                    line != null;
+                    line = lineNumberReader.readLine()) {
                 // Skip comments and blank lines.
                 if (line.trim().isEmpty() || line.trim().charAt(0) == '%') {
                     continue;
@@ -101,12 +107,14 @@ public LatexParserResults parse(List<Path> latexFiles) {
     /**
      * Find cites along a specific line and store them.
      */
-    private void matchCitation(Path file, int lineNumber, String line, LatexParserResult latexParserResult) {
+    private void matchCitation(
+            Path file, int lineNumber, String line, LatexParserResult latexParserResult) {
         Matcher citeMatch = CITE_PATTERN.matcher(line);
 
         while (citeMatch.find()) {
             for (String key : citeMatch.group(CITE_GROUP).split(",")) {
-                latexParserResult.addKey(key.trim(), file, lineNumber, citeMatch.start(), citeMatch.end(), line);
+                latexParserResult.addKey(
+                        key.trim(), file, lineNumber, citeMatch.start(), citeMatch.end(), line);
             }
         }
     }
@@ -120,10 +128,13 @@ private void matchBibFile(Path file, String line, LatexParserResult latexParserR
         while (bibliographyMatch.find()) {
             for (String bibString : bibliographyMatch.group(BIBLIOGRAPHY_GROUP).split(",")) {
                 bibString = bibString.trim();
-                Path bibFile = file.getParent().resolve(
-                        bibString.endsWith(BIB_EXT)
-                                ? bibString
-                                : "%s%s".formatted(bibString, BIB_EXT)).normalize();
+                Path bibFile =
+                        file.getParent()
+                                .resolve(
+                                        bibString.endsWith(BIB_EXT)
+                                                ? bibString
+                                                : "%s%s".formatted(bibString, BIB_EXT))
+                                .normalize();
 
                 if (Files.exists(bibFile)) {
                     latexParserResult.addBibFile(bibFile);
@@ -140,9 +151,10 @@ private void matchNestedFile(Path texFile, String line, LatexParserResult latexP
 
         while (includeMatch.find()) {
             String filenamePassedToInclude = includeMatch.group(INCLUDE_GROUP);
-            String texFileName = filenamePassedToInclude.endsWith(TEX_EXT)
-                    ? filenamePassedToInclude
-                    : "%s%s".formatted(filenamePassedToInclude, TEX_EXT);
+            String texFileName =
+                    filenamePassedToInclude.endsWith(TEX_EXT)
+                            ? filenamePassedToInclude
+                            : "%s%s".formatted(filenamePassedToInclude, TEX_EXT);
             Path nestedFile = texFile.getParent().resolve(texFileName).normalize();
             if (Files.exists(nestedFile)) {
                 latexParserResult.addNestedFile(nestedFile);
diff --git a/src/main/java/org/jabref/logic/texparser/LatexParser.java b/src/main/java/org/jabref/logic/texparser/LatexParser.java
index fa3af3c494bb..3ca36d7b57dc 100644
--- a/src/main/java/org/jabref/logic/texparser/LatexParser.java
+++ b/src/main/java/org/jabref/logic/texparser/LatexParser.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.texparser;
 
+import org.jabref.model.texparser.LatexParserResult;
+import org.jabref.model.texparser.LatexParserResults;
+
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
 
-import org.jabref.model.texparser.LatexParserResult;
-import org.jabref.model.texparser.LatexParserResults;
-
 /**
  * Parses a LaTeX file
  */
diff --git a/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java b/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
index c7c8afa71190..c383f4a16f16 100644
--- a/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
+++ b/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
@@ -1,9 +1,5 @@
 package org.jabref.logic.texparser;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.OpenDatabase;
 import org.jabref.logic.importer.ParserResult;
@@ -12,10 +8,13 @@
 import org.jabref.model.texparser.LatexBibEntriesResolverResult;
 import org.jabref.model.texparser.LatexParserResults;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
 public class TexBibEntriesResolver {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TexBibEntriesResolver.class);
@@ -24,7 +23,10 @@ public class TexBibEntriesResolver {
     private final ImportFormatPreferences importFormatPreferences;
     private final FileUpdateMonitor fileMonitor;
 
-    public TexBibEntriesResolver(BibDatabase masterDatabase, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor) {
+    public TexBibEntriesResolver(
+            BibDatabase masterDatabase,
+            ImportFormatPreferences importFormatPreferences,
+            FileUpdateMonitor fileMonitor) {
         this.masterDatabase = masterDatabase;
         this.importFormatPreferences = importFormatPreferences;
         this.fileMonitor = fileMonitor;
@@ -34,42 +36,73 @@ public TexBibEntriesResolver(BibDatabase masterDatabase, ImportFormatPreferences
      * Resolve all BibTeX entries and check if they are in the given database.
      */
     public LatexBibEntriesResolverResult resolve(LatexParserResults latexParserResults) {
-        LatexBibEntriesResolverResult resolverResult = new LatexBibEntriesResolverResult(latexParserResults);
+        LatexBibEntriesResolverResult resolverResult =
+                new LatexBibEntriesResolverResult(latexParserResults);
 
         // Preload databases from BIB files.
         List<BibDatabase> bibDatabases =
-                latexParserResults.getBibFiles().stream().map(path -> {
-                    try {
-                        return OpenDatabase.loadDatabase(path, importFormatPreferences, fileMonitor).getDatabase();
-                    } catch (IOException e) {
-                        LOGGER.error("Error opening file '{}'", path, e);
-                        return ParserResult.fromError(e).getDatabase();
-                    }
-                }).toList();
+                latexParserResults.getBibFiles().stream()
+                        .map(
+                                path -> {
+                                    try {
+                                        return OpenDatabase.loadDatabase(
+                                                        path, importFormatPreferences, fileMonitor)
+                                                .getDatabase();
+                                    } catch (IOException e) {
+                                        LOGGER.error("Error opening file '{}'", path, e);
+                                        return ParserResult.fromError(e).getDatabase();
+                                    }
+                                })
+                        .toList();
 
         // Add all new entries to the newEntries set.
-        List<BibEntry> newEntries = findNewEntries(bibDatabases, latexParserResults.getCitations().keySet());
+        List<BibEntry> newEntries =
+                findNewEntries(bibDatabases, latexParserResults.getCitations().keySet());
         resolverResult.getNewEntries().addAll(newEntries);
 
         return resolverResult;
     }
 
     private List<BibEntry> findNewEntries(List<BibDatabase> bibDatabases, Set<String> citations) {
-        return bibDatabases
-                .stream()
-                .flatMap(database ->
-                        citations.stream()
-                                 .flatMap(citation -> database.getEntriesByCitationKey(citation).stream())
-                                 // Check if there is already an entry with the same key in the given database.
-                                 .filter(entry -> !entry.equals(masterDatabase.getEntryByCitationKey(entry.getCitationKey().orElse("")).orElse(new BibEntry())))
-                                 // Add cross-referencing data to the entry (fill empty fields).
-                                 .map(entry -> addCrossReferencingData(entry, database)))
+        return bibDatabases.stream()
+                .flatMap(
+                        database ->
+                                citations.stream()
+                                        .flatMap(
+                                                citation ->
+                                                        database
+                                                                .getEntriesByCitationKey(citation)
+                                                                .stream())
+                                        // Check if there is already an entry with the same key in
+                                        // the given database.
+                                        .filter(
+                                                entry ->
+                                                        !entry.equals(
+                                                                masterDatabase
+                                                                        .getEntryByCitationKey(
+                                                                                entry.getCitationKey()
+                                                                                        .orElse(""))
+                                                                        .orElse(new BibEntry())))
+                                        // Add cross-referencing data to the entry (fill empty
+                                        // fields).
+                                        .map(entry -> addCrossReferencingData(entry, database)))
                 .toList();
     }
 
     private BibEntry addCrossReferencingData(BibEntry entry, BibDatabase bibDatabase) {
-        bibDatabase.getReferencedEntry(entry).ifPresent(refEntry ->
-                refEntry.getFields().forEach(field -> entry.getFieldMap().putIfAbsent(field, refEntry.getFieldOrAlias(field).orElse(""))));
+        bibDatabase
+                .getReferencedEntry(entry)
+                .ifPresent(
+                        refEntry ->
+                                refEntry.getFields()
+                                        .forEach(
+                                                field ->
+                                                        entry.getFieldMap()
+                                                                .putIfAbsent(
+                                                                        field,
+                                                                        refEntry.getFieldOrAlias(
+                                                                                        field)
+                                                                                .orElse(""))));
 
         return entry;
     }
diff --git a/src/main/java/org/jabref/logic/util/BackgroundTask.java b/src/main/java/org/jabref/logic/util/BackgroundTask.java
index 1a9054329453..8b998fa8c3ca 100644
--- a/src/main/java/org/jabref/logic/util/BackgroundTask.java
+++ b/src/main/java/org/jabref/logic/util/BackgroundTask.java
@@ -1,10 +1,6 @@
 package org.jabref.logic.util;
 
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.function.Function;
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
@@ -15,10 +11,15 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
-import com.tobiasdiez.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
 /**
  * This class is essentially a wrapper around {@link javafx.concurrent.Task}.
  * We cannot use {@link javafx.concurrent.Task} directly since it runs certain update notifications on the JavaFX thread,
@@ -55,7 +56,8 @@ public abstract class BackgroundTask<V> {
     private Consumer<Exception> onException;
     private Runnable onFinished;
     private final BooleanProperty isCancelled = new SimpleBooleanProperty(false);
-    private final ObjectProperty<BackgroundProgress> progress = new SimpleObjectProperty<>(new BackgroundProgress(0, 0));
+    private final ObjectProperty<BackgroundProgress> progress =
+            new SimpleObjectProperty<>(new BackgroundProgress(0, 0));
     private final StringProperty message = new SimpleStringProperty("");
     private final StringProperty title = new SimpleStringProperty(this.getClass().getSimpleName());
     private final DoubleProperty workDonePercentage = new SimpleDoubleProperty(0);
@@ -63,7 +65,8 @@ public abstract class BackgroundTask<V> {
     private final BooleanProperty willBeRecoveredAutomatically = new SimpleBooleanProperty(false);
 
     public BackgroundTask() {
-        workDonePercentage.bind(EasyBind.map(progress, BackgroundTask.BackgroundProgress::getWorkDonePercentage));
+        workDonePercentage.bind(
+                EasyBind.map(progress, BackgroundTask.BackgroundProgress::getWorkDonePercentage));
     }
 
     public static <V> BackgroundTask<V> wrap(Callable<V> callable) {
@@ -267,7 +270,8 @@ public BackgroundTask<Void> thenRun(Consumer<V> nextOperation) {
             @Override
             public Void call() throws Exception {
                 V result = BackgroundTask.this.call();
-                BackgroundTask<Void> nextTask = BackgroundTask.wrap(() -> nextOperation.accept(result));
+                BackgroundTask<Void> nextTask =
+                        BackgroundTask.wrap(() -> nextOperation.accept(result));
                 EasyBind.subscribe(nextTask.progressProperty(), this::updateProgress);
                 return nextTask.call();
             }
@@ -291,9 +295,7 @@ public BackgroundTask<V> withInitialMessage(String message) {
         return this;
     }
 
-    public record BackgroundProgress(
-            double workDone,
-            double max) {
+    public record BackgroundProgress(double workDone, double max) {
 
         public double getWorkDonePercentage() {
             if (max == 0) {
diff --git a/src/main/java/org/jabref/logic/util/BuildInfo.java b/src/main/java/org/jabref/logic/util/BuildInfo.java
index 352d4531a4ac..a04c2689db89 100644
--- a/src/main/java/org/jabref/logic/util/BuildInfo.java
+++ b/src/main/java/org/jabref/logic/util/BuildInfo.java
@@ -13,9 +13,12 @@ public final class BuildInfo {
     public static final String UNKNOWN_VERSION = "UNKNOWN";
 
     public static final String OS = System.getProperty("os.name", UNKNOWN_VERSION);
-    public static final String OS_VERSION = System.getProperty("os.version", UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
-    public static final String OS_ARCH = System.getProperty("os.arch", UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
-    public static final String JAVA_VERSION = System.getProperty("java.version", UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
+    public static final String OS_VERSION =
+            System.getProperty("os.version", UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
+    public static final String OS_ARCH =
+            System.getProperty("os.arch", UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
+    public static final String JAVA_VERSION =
+            System.getProperty("java.version", UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
 
     public final Version version;
     public final String maintainers;
@@ -39,7 +42,8 @@ public BuildInfo(String path) {
 
         try (InputStream stream = BuildInfo.class.getResourceAsStream(path)) {
             if (stream != null) {
-                try (InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
+                try (InputStreamReader reader =
+                        new InputStreamReader(stream, StandardCharsets.UTF_8)) {
                     properties.load(reader);
                 }
             }
@@ -51,21 +55,35 @@ public BuildInfo(String path) {
         year = properties.getProperty("year", "");
         maintainers = properties.getProperty("maintainers", "");
         azureInstrumentationKey = BuildInfo.getValue(properties, "azureInstrumentationKey", "");
-        springerNatureAPIKey = BuildInfo.getValue(properties, "springerNatureAPIKey", "118d90a519d0fc2a01ee9715400054d4");
-        astrophysicsDataSystemAPIKey = BuildInfo.getValue(properties, "astrophysicsDataSystemAPIKey", "tAhPRKADc6cC26mZUnAoBt3MAjCvKbuCZsB4lI3c");
+        springerNatureAPIKey =
+                BuildInfo.getValue(
+                        properties, "springerNatureAPIKey", "118d90a519d0fc2a01ee9715400054d4");
+        astrophysicsDataSystemAPIKey =
+                BuildInfo.getValue(
+                        properties,
+                        "astrophysicsDataSystemAPIKey",
+                        "tAhPRKADc6cC26mZUnAoBt3MAjCvKbuCZsB4lI3c");
         ieeeAPIKey = BuildInfo.getValue(properties, "ieeeAPIKey", "5jv3wyt4tt2bwcwv7jjk7pc3");
-        scienceDirectApiKey = BuildInfo.getValue(properties, "scienceDirectApiKey", "fb82f2e692b3c72dafe5f4f1fa0ac00b");
+        scienceDirectApiKey =
+                BuildInfo.getValue(
+                        properties, "scienceDirectApiKey", "fb82f2e692b3c72dafe5f4f1fa0ac00b");
         minRequiredJavaVersion = properties.getProperty("minRequiredJavaVersion", "1.8");
         allowJava9 = "true".equals(properties.getProperty("allowJava9", "true"));
-        biodiversityHeritageApiKey = BuildInfo.getValue(properties, "biodiversityHeritageApiKey", "36b910b6-2eb3-46f2-b64c-9abc149925ba");
+        biodiversityHeritageApiKey =
+                BuildInfo.getValue(
+                        properties,
+                        "biodiversityHeritageApiKey",
+                        "36b910b6-2eb3-46f2-b64c-9abc149925ba");
         semanticScholarApiKey = BuildInfo.getValue(properties, "semanticScholarApiKey", "");
     }
 
     private static String getValue(Properties properties, String key, String defaultValue) {
-        String result = Optional.ofNullable(properties.getProperty(key))
-                                // workaround unprocessed build.properties file --> just remove the reference to some variable used in build.gradle
-                                .map(value -> value.replaceAll("\\$\\{.*\\}", ""))
-                                .orElse("");
+        String result =
+                Optional.ofNullable(properties.getProperty(key))
+                        // workaround unprocessed build.properties file --> just remove the
+                        // reference to some variable used in build.gradle
+                        .map(value -> value.replaceAll("\\$\\{.*\\}", ""))
+                        .orElse("");
         if (!result.isEmpty()) {
             return result;
         }
diff --git a/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java b/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java
index 9160fba79381..cf203c1bc88c 100644
--- a/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java
+++ b/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.util;
 
-import java.util.Optional;
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
 
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.event.BibDatabaseContextChangedEvent;
@@ -8,8 +9,7 @@
 import org.jabref.model.entry.event.FieldChangedEvent;
 import org.jabref.model.entry.field.Field;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
+import java.util.Optional;
 
 /**
  * Filters change events and only relays major changes.
@@ -38,10 +38,13 @@ public synchronized void listen(BibDatabaseContextChangedEvent event) {
             // If editing has started
             boolean isNewEdit = lastFieldChanged.isEmpty() || lastEntryChanged.isEmpty();
 
-            boolean isChangedField = lastFieldChanged.filter(f -> !f.equals(fieldChange.getField())).isPresent();
-            boolean isChangedEntry = lastEntryChanged.filter(e -> !e.equals(fieldChange.getBibEntry())).isPresent();
+            boolean isChangedField =
+                    lastFieldChanged.filter(f -> !f.equals(fieldChange.getField())).isPresent();
+            boolean isChangedEntry =
+                    lastEntryChanged.filter(e -> !e.equals(fieldChange.getBibEntry())).isPresent();
             boolean isEditChanged = !isNewEdit && (isChangedField || isChangedEntry);
-            // Only deltas of 1 when typing in manually, major change means pasting something (more than one character)
+            // Only deltas of 1 when typing in manually, major change means pasting something (more
+            // than one character)
             boolean isMajorChange = fieldChange.getMajorCharacterChange() > 1;
 
             fieldChange.setFilteredOut(!(isEditChanged || isMajorChange));
diff --git a/src/main/java/org/jabref/logic/util/CurrentThreadTaskExecutor.java b/src/main/java/org/jabref/logic/util/CurrentThreadTaskExecutor.java
index 7ac36489aabe..374d77340c15 100644
--- a/src/main/java/org/jabref/logic/util/CurrentThreadTaskExecutor.java
+++ b/src/main/java/org/jabref/logic/util/CurrentThreadTaskExecutor.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.util;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.WeakHashMap;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -7,9 +10,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Implementation of {@link TaskExecutor} that runs every task on the current thread, i.e. in a sequential order. This
  * class is not designed to be used in production but should make code involving asynchronous operations deterministic
diff --git a/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java b/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java
index ef2c74f7aec4..e2ec8ca62865 100644
--- a/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java
+++ b/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.util;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.concurrent.Callable;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * This class allows to throttle a list of tasks.
  * Use case: you have an event that occurs often, and every time you want to invoke the same task.
diff --git a/src/main/java/org/jabref/logic/util/Directories.java b/src/main/java/org/jabref/logic/util/Directories.java
index 00396975da7e..076396c8bd7b 100644
--- a/src/main/java/org/jabref/logic/util/Directories.java
+++ b/src/main/java/org/jabref/logic/util/Directories.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.util;
 
-import java.io.File;
-import java.nio.file.Path;
+import net.harawata.appdirs.AppDirsFactory;
 
 import org.jabref.logic.ai.AiService;
 import org.jabref.logic.os.OS;
 import org.jabref.model.search.SearchFieldConstants;
 
-import net.harawata.appdirs.AppDirsFactory;
+import java.io.File;
+import java.nio.file.Path;
 
 /**
  * This collects all directories based on AppDirs.
@@ -26,40 +26,39 @@ public static Path getUserDirectory() {
     }
 
     public static Path getLogDirectory() {
-        return Path.of(AppDirsFactory.getInstance()
-                                     .getUserDataDir(
-                                             OS.APP_DIR_APP_NAME,
-                                             "logs",
-                                             OS.APP_DIR_APP_AUTHOR))
-                   .resolve(new BuildInfo().version.toString());
+        return Path.of(
+                        AppDirsFactory.getInstance()
+                                .getUserDataDir(OS.APP_DIR_APP_NAME, "logs", OS.APP_DIR_APP_AUTHOR))
+                .resolve(new BuildInfo().version.toString());
     }
 
     public static Path getBackupDirectory() {
-        return Path.of(AppDirsFactory.getInstance()
-                                     .getUserDataDir(
-                                             OS.APP_DIR_APP_NAME,
-                                             "backups",
-                                             OS.APP_DIR_APP_AUTHOR));
+        return Path.of(
+                AppDirsFactory.getInstance()
+                        .getUserDataDir(OS.APP_DIR_APP_NAME, "backups", OS.APP_DIR_APP_AUTHOR));
     }
 
     public static Path getFulltextIndexBaseDirectory() {
-        return Path.of(AppDirsFactory.getInstance()
-                                     .getUserDataDir(OS.APP_DIR_APP_NAME,
-                                             "lucene" + File.separator + SearchFieldConstants.VERSION,
-                                             OS.APP_DIR_APP_AUTHOR));
+        return Path.of(
+                AppDirsFactory.getInstance()
+                        .getUserDataDir(
+                                OS.APP_DIR_APP_NAME,
+                                "lucene" + File.separator + SearchFieldConstants.VERSION,
+                                OS.APP_DIR_APP_AUTHOR));
     }
 
     public static Path getAiFilesDirectory() {
-        return Path.of(AppDirsFactory.getInstance()
-                .getUserDataDir(OS.APP_DIR_APP_NAME,
-                        "ai" + File.separator + AiService.VERSION,
-                        OS.APP_DIR_APP_AUTHOR));
+        return Path.of(
+                AppDirsFactory.getInstance()
+                        .getUserDataDir(
+                                OS.APP_DIR_APP_NAME,
+                                "ai" + File.separator + AiService.VERSION,
+                                OS.APP_DIR_APP_AUTHOR));
     }
 
     public static Path getSslDirectory() {
-        return Path.of(AppDirsFactory.getInstance()
-                                     .getUserDataDir(OS.APP_DIR_APP_NAME,
-                                             "ssl",
-                                             OS.APP_DIR_APP_AUTHOR));
+        return Path.of(
+                AppDirsFactory.getInstance()
+                        .getUserDataDir(OS.APP_DIR_APP_NAME, "ssl", OS.APP_DIR_APP_AUTHOR));
     }
 }
diff --git a/src/main/java/org/jabref/logic/util/ExternalLinkCreator.java b/src/main/java/org/jabref/logic/util/ExternalLinkCreator.java
index ab6ad32ae3dc..b55a1e018723 100644
--- a/src/main/java/org/jabref/logic/util/ExternalLinkCreator.java
+++ b/src/main/java/org/jabref/logic/util/ExternalLinkCreator.java
@@ -1,15 +1,15 @@
 package org.jabref.logic.util;
 
-import java.net.URISyntaxException;
-import java.util.Optional;
-
+import org.apache.hc.core5.net.URIBuilder;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-import org.apache.hc.core5.net.URIBuilder;
+import java.net.URISyntaxException;
+import java.util.Optional;
 
 public class ExternalLinkCreator {
-    private static final String SHORTSCIENCE_SEARCH_URL = "https://www.shortscience.org/internalsearch";
+    private static final String SHORTSCIENCE_SEARCH_URL =
+            "https://www.shortscience.org/internalsearch";
 
     /**
      * Get a URL to the search results of ShortScience for the BibEntry's title
@@ -18,17 +18,20 @@ public class ExternalLinkCreator {
      * @return The URL if it was successfully created
      */
     public static Optional<String> getShortScienceSearchURL(BibEntry entry) {
-        return entry.getField(StandardField.TITLE).map(title -> {
-            URIBuilder uriBuilder;
-            try {
-                uriBuilder = new URIBuilder(SHORTSCIENCE_SEARCH_URL);
-            } catch (URISyntaxException e) {
-                // This should never be able to happen as it would require the field to be misconfigured.
-                throw new AssertionError("ShortScience URL is invalid.", e);
-            }
-            // Direct the user to the search results for the title.
-            uriBuilder.addParameter("q", title);
-            return uriBuilder.toString();
-        });
+        return entry.getField(StandardField.TITLE)
+                .map(
+                        title -> {
+                            URIBuilder uriBuilder;
+                            try {
+                                uriBuilder = new URIBuilder(SHORTSCIENCE_SEARCH_URL);
+                            } catch (URISyntaxException e) {
+                                // This should never be able to happen as it would require the field
+                                // to be misconfigured.
+                                throw new AssertionError("ShortScience URL is invalid.", e);
+                            }
+                            // Direct the user to the search results for the title.
+                            uriBuilder.addParameter("q", title);
+                            return uriBuilder.toString();
+                        });
     }
 }
diff --git a/src/main/java/org/jabref/logic/util/FallbackExceptionHandler.java b/src/main/java/org/jabref/logic/util/FallbackExceptionHandler.java
index 9e0d31539ef7..11a4ab2849a2 100644
--- a/src/main/java/org/jabref/logic/util/FallbackExceptionHandler.java
+++ b/src/main/java/org/jabref/logic/util/FallbackExceptionHandler.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.util;
 
-import java.util.function.BiConsumer;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.function.BiConsumer;
+
 /**
  * Catch and log any unhandled exceptions.
  */
diff --git a/src/main/java/org/jabref/logic/util/FileType.java b/src/main/java/org/jabref/logic/util/FileType.java
index c054d54d7bce..869dd92b1c13 100644
--- a/src/main/java/org/jabref/logic/util/FileType.java
+++ b/src/main/java/org/jabref/logic/util/FileType.java
@@ -10,8 +10,8 @@ public interface FileType {
 
     default List<String> getExtensionsWithAsteriskAndDot() {
         return getExtensions().stream()
-                              .map(extension -> "*." + extension)
-                              .collect(Collectors.toList());
+                .map(extension -> "*." + extension)
+                .collect(Collectors.toList());
     }
 
     List<String> getExtensions();
diff --git a/src/main/java/org/jabref/logic/util/HeadlessExecutorService.java b/src/main/java/org/jabref/logic/util/HeadlessExecutorService.java
index 1070b29dfe26..ec7ffe91f9a9 100644
--- a/src/main/java/org/jabref/logic/util/HeadlessExecutorService.java
+++ b/src/main/java/org/jabref/logic/util/HeadlessExecutorService.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.util;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -14,9 +17,6 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Responsible for managing of all threads (<em>except</em> GUI threads) in JabRef.
  * <p>
@@ -33,26 +33,29 @@ public class HeadlessExecutorService implements Executor {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(HeadlessExecutorService.class);
 
-    private final ExecutorService executorService = Executors.newCachedThreadPool(r -> {
-        Thread thread = new Thread(r);
-        thread.setName("JabRef CachedThreadPool");
-        thread.setUncaughtExceptionHandler(new FallbackExceptionHandler());
-        return thread;
-    });
-
-    private final ExecutorService lowPriorityExecutorService = Executors.newCachedThreadPool(r -> {
-        Thread thread = new Thread(r);
-        thread.setName("JabRef LowPriorityCachedThreadPool");
-        thread.setUncaughtExceptionHandler(new FallbackExceptionHandler());
-        return thread;
-    });
+    private final ExecutorService executorService =
+            Executors.newCachedThreadPool(
+                    r -> {
+                        Thread thread = new Thread(r);
+                        thread.setName("JabRef CachedThreadPool");
+                        thread.setUncaughtExceptionHandler(new FallbackExceptionHandler());
+                        return thread;
+                    });
+
+    private final ExecutorService lowPriorityExecutorService =
+            Executors.newCachedThreadPool(
+                    r -> {
+                        Thread thread = new Thread(r);
+                        thread.setName("JabRef LowPriorityCachedThreadPool");
+                        thread.setUncaughtExceptionHandler(new FallbackExceptionHandler());
+                        return thread;
+                    });
 
     private final Timer timer = new Timer("timer", true);
 
     private Thread remoteThread;
 
-    private HeadlessExecutorService() {
-   }
+    private HeadlessExecutorService() {}
 
     public void execute(Runnable command) {
         Objects.requireNonNull(command);
@@ -98,7 +101,8 @@ public <T> List<Future<T>> executeAll(Collection<Callable<T>> tasks) {
         }
     }
 
-    public <T> List<Future<T>> executeAll(Collection<Callable<T>> tasks, int timeout, TimeUnit timeUnit) {
+    public <T> List<Future<T>> executeAll(
+            Collection<Callable<T>> tasks, int timeout, TimeUnit timeUnit) {
         Objects.requireNonNull(tasks);
         try {
             return executorService.invokeAll(tasks, timeout, timeUnit);
@@ -196,11 +200,15 @@ public static void gracefullyShutdown(ExecutorService executorService) {
             // This is non-blocking. See https://stackoverflow.com/a/57383461/873282.
             executorService.shutdown();
             if (!executorService.awaitTermination(60, TimeUnit.SECONDS)) {
-                LOGGER.debug("One minute passed, {} still not completed. Trying forced shutdown.", executorService.toString());
+                LOGGER.debug(
+                        "One minute passed, {} still not completed. Trying forced shutdown.",
+                        executorService.toString());
                 // those threads will be interrupted in their current task
                 executorService.shutdownNow();
                 if (executorService.awaitTermination(60, TimeUnit.SECONDS)) {
-                    LOGGER.debug("One minute passed again - forced shutdown of {} worked.", executorService.toString());
+                    LOGGER.debug(
+                            "One minute passed again - forced shutdown of {} worked.",
+                            executorService.toString());
                 } else {
                     LOGGER.error("{} did not terminate", executorService.toString());
                 }
diff --git a/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java b/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java
index db99eb45882a..cbd401f3ce21 100644
--- a/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java
+++ b/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java
@@ -68,6 +68,5 @@ public class MetadataSerializationConfiguration {
      */
     public static final String TEX_GROUP_ID = "TexGroup:";
 
-    private MetadataSerializationConfiguration() {
-    }
+    private MetadataSerializationConfiguration() {}
 }
diff --git a/src/main/java/org/jabref/logic/util/ProgressCounter.java b/src/main/java/org/jabref/logic/util/ProgressCounter.java
index abd9b21cb1b0..daf97a31ba12 100644
--- a/src/main/java/org/jabref/logic/util/ProgressCounter.java
+++ b/src/main/java/org/jabref/logic/util/ProgressCounter.java
@@ -1,8 +1,6 @@
 package org.jabref.logic.util;
 
-import java.time.Duration;
-import java.time.Instant;
-import java.util.List;
+import ai.djl.util.Progress;
 
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
@@ -14,7 +12,9 @@
 
 import org.jabref.logic.l10n.Localization;
 
-import ai.djl.util.Progress;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.List;
 
 /**
  * Convenient class for managing ETA for background tasks.
@@ -24,19 +24,24 @@
  */
 public class ProgressCounter implements Progress {
 
-    private record ProgressMessage(int maxTime, String message) { }
+    private record ProgressMessage(int maxTime, String message) {}
 
     // The list should be sorted by ProgressMessage.maxTime, smaller first.
-    private static final List<ProgressMessage> PROGRESS_MESSAGES = List.of(
-            new ProgressMessage(5, Localization.lang("Estimated time left: 5 seconds.")),
-            new ProgressMessage(15, Localization.lang("Estimated time left: 15 seconds.")),
-            new ProgressMessage(30, Localization.lang("Estimated time left: 30 seconds.")),
-            new ProgressMessage(60, Localization.lang("Estimated time left: approx. 1 minute.")),
-            new ProgressMessage(120, Localization.lang("Estimated time left: approx. 2 minutes.")),
-            new ProgressMessage(Integer.MAX_VALUE, Localization.lang("Estimated time left: more than 2 minutes."))
-    );
-
-    private static final Duration PERIODIC_UPDATE_DURATION = Duration.ofSeconds(PROGRESS_MESSAGES.getFirst().maxTime);
+    private static final List<ProgressMessage> PROGRESS_MESSAGES =
+            List.of(
+                    new ProgressMessage(5, Localization.lang("Estimated time left: 5 seconds.")),
+                    new ProgressMessage(15, Localization.lang("Estimated time left: 15 seconds.")),
+                    new ProgressMessage(30, Localization.lang("Estimated time left: 30 seconds.")),
+                    new ProgressMessage(
+                            60, Localization.lang("Estimated time left: approx. 1 minute.")),
+                    new ProgressMessage(
+                            120, Localization.lang("Estimated time left: approx. 2 minutes.")),
+                    new ProgressMessage(
+                            Integer.MAX_VALUE,
+                            Localization.lang("Estimated time left: more than 2 minutes.")));
+
+    private static final Duration PERIODIC_UPDATE_DURATION =
+            Duration.ofSeconds(PROGRESS_MESSAGES.getFirst().maxTime);
 
     private final IntegerProperty workDone = new SimpleIntegerProperty(0);
     private final IntegerProperty workMax = new SimpleIntegerProperty(0);
@@ -44,9 +49,15 @@ private record ProgressMessage(int maxTime, String message) { }
 
     // Progress counter is updated on two events:
     // 1) When workDone or workMax changes: this in normal behavior.
-    // 2) When PERIODIC_UPDATE_DURATION passes: it is used in situations where one piece of work takes too much time
-    //    (and so there are no events 1), and so the message could be "approx. 5 seconds", while it should be more.
-    private final Timeline periodicUpdate = new Timeline(new KeyFrame(new javafx.util.Duration(PERIODIC_UPDATE_DURATION.getSeconds() * 1000), e -> update()));
+    // 2) When PERIODIC_UPDATE_DURATION passes: it is used in situations where one piece of work
+    // takes too much time
+    //    (and so there are no events 1), and so the message could be "approx. 5 seconds", while it
+    // should be more.
+    private final Timeline periodicUpdate =
+            new Timeline(
+                    new KeyFrame(
+                            new javafx.util.Duration(PERIODIC_UPDATE_DURATION.getSeconds() * 1000),
+                            e -> update()));
 
     private final Instant workStartTime = Instant.now();
 
@@ -99,7 +110,9 @@ public void listenToAllProperties(Runnable runnable) {
     private void update() {
         Duration workTime = Duration.between(workStartTime, Instant.now());
         Duration oneWorkTime = workTime.dividedBy(workDone.get() == 0 ? 1 : workDone.get());
-        Duration eta = oneWorkTime.multipliedBy(workMax.get() - workDone.get() <= 0 ? 1 : workMax.get() - workDone.get());
+        Duration eta =
+                oneWorkTime.multipliedBy(
+                        workMax.get() - workDone.get() <= 0 ? 1 : workMax.get() - workDone.get());
 
         updateMessage(eta);
     }
@@ -108,7 +121,8 @@ private void update() {
     public void reset(String message, long max, String trailingMessage) {
         workMax.set((int) max);
         workDone.set(0);
-        // Ignoring message, because 1) it's not localized, 2) we supply our own message in updateMessage().
+        // Ignoring message, because 1) it's not localized, 2) we supply our own message in
+        // updateMessage().
     }
 
     @Override
@@ -129,7 +143,8 @@ public void increment(long increment) {
     @Override
     public void update(long progress, String message) {
         workDone.set((int) progress);
-        // Ignoring message, because 1) it's not localized, 2) we supply our own message in updateMessage().
+        // Ignoring message, because 1) it's not localized, 2) we supply our own message in
+        // updateMessage().
     }
 
     private void updateMessage(Duration eta) {
diff --git a/src/main/java/org/jabref/logic/util/StandardFileType.java b/src/main/java/org/jabref/logic/util/StandardFileType.java
index a18af13513d0..5a47a489404c 100644
--- a/src/main/java/org/jabref/logic/util/StandardFileType.java
+++ b/src/main/java/org/jabref/logic/util/StandardFileType.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.util;
 
+import org.jabref.model.util.OptionalUtil;
+
 import java.util.Arrays;
 import java.util.List;
 
-import org.jabref.model.util.OptionalUtil;
-
 /**
  * @implNote Enter the extensions in lowercase without a dot! The dot is added implicitly.
  */
 public enum StandardFileType implements FileType {
-
     ENDNOTE("Endnote", "ref", "enw"),
     ISI("Isi", "isi", "txt"),
     MEDLINE("Medline", "nbib", "xml"),
@@ -68,9 +67,10 @@ public String getName() {
     public static FileType fromExtensions(String... extensions) {
         var exts = Arrays.asList(extensions);
 
-        return OptionalUtil.orElse(Arrays.stream(StandardFileType.values())
-                                         .filter(field -> field.getExtensions().stream().anyMatch(exts::contains))
-                                         .findAny(),
+        return OptionalUtil.orElse(
+                Arrays.stream(StandardFileType.values())
+                        .filter(field -> field.getExtensions().stream().anyMatch(exts::contains))
+                        .findAny(),
                 new UnknownFileType(extensions));
     }
 }
diff --git a/src/main/java/org/jabref/logic/util/TestEntry.java b/src/main/java/org/jabref/logic/util/TestEntry.java
index 517cb77f3385..ce08c16ad40c 100644
--- a/src/main/java/org/jabref/logic/util/TestEntry.java
+++ b/src/main/java/org/jabref/logic/util/TestEntry.java
@@ -1,37 +1,42 @@
 package org.jabref.logic.util;
 
-import java.util.List;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 
+import java.util.List;
+
 public class TestEntry {
 
-    private TestEntry() {
-    }
+    private TestEntry() {}
 
     public static BibEntry getTestEntry() {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Smith2016")
-                .withField(StandardField.AUTHOR, "Smith, Bill and Jones, Bob and Williams, Jeff")
-                .withField(StandardField.EDITOR, "Taylor, Phil")
-                .withField(StandardField.TITLE, "Title of the test entry")
-                .withField(StandardField.NUMBER, "3")
-                .withField(StandardField.VOLUME, "34")
-                .withField(StandardField.ISSUE, "7")
-                .withField(StandardField.YEAR, "2016")
-                .withField(StandardField.PAGES, "45--67")
-                .withField(StandardField.MONTH, "July")
-                .withField(StandardField.FILE, ":testentry.pdf:PDF")
-                .withField(StandardField.JOURNAL, "BibTeX Journal")
-                .withField(StandardField.PUBLISHER, "JabRef Publishing")
-                .withField(StandardField.ADDRESS, "Trondheim")
-                .withField(StandardField.URL, "https://github.com/JabRef")
-                .withField(StandardField.DOI, "10.1001/bla.blubb")
-                .withField(StandardField.ABSTRACT,
-                        "This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger.")
-                .withField(StandardField.COMMENT, """
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("Smith2016")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Smith, Bill and Jones, Bob and Williams, Jeff")
+                        .withField(StandardField.EDITOR, "Taylor, Phil")
+                        .withField(StandardField.TITLE, "Title of the test entry")
+                        .withField(StandardField.NUMBER, "3")
+                        .withField(StandardField.VOLUME, "34")
+                        .withField(StandardField.ISSUE, "7")
+                        .withField(StandardField.YEAR, "2016")
+                        .withField(StandardField.PAGES, "45--67")
+                        .withField(StandardField.MONTH, "July")
+                        .withField(StandardField.FILE, ":testentry.pdf:PDF")
+                        .withField(StandardField.JOURNAL, "BibTeX Journal")
+                        .withField(StandardField.PUBLISHER, "JabRef Publishing")
+                        .withField(StandardField.ADDRESS, "Trondheim")
+                        .withField(StandardField.URL, "https://github.com/JabRef")
+                        .withField(StandardField.DOI, "10.1001/bla.blubb")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger.")
+                        .withField(
+                                StandardField.COMMENT,
+                                """
                         Lorem ipsum dolor sit amet, consectetur adipisici elit, sed eiusmod tempor incidunt ut labore et
                           dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat.
                           Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non
diff --git a/src/main/java/org/jabref/logic/util/UpdateField.java b/src/main/java/org/jabref/logic/util/UpdateField.java
index 93ab1b74ce72..cad62da07c5a 100644
--- a/src/main/java/org/jabref/logic/util/UpdateField.java
+++ b/src/main/java/org/jabref/logic/util/UpdateField.java
@@ -1,8 +1,5 @@
 package org.jabref.logic.util;
 
-import java.util.Collection;
-import java.util.Optional;
-
 import org.jabref.logic.preferences.OwnerPreferences;
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.FieldChange;
@@ -10,10 +7,12 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 
+import java.util.Collection;
+import java.util.Optional;
+
 public class UpdateField {
 
-    private UpdateField() {
-    }
+    private UpdateField() {}
 
     /**
      * Updating a field will result in the entry being reformatted on save
@@ -25,7 +24,8 @@ public static Optional<FieldChange> updateField(BibEntry be, Field field, String
     /**
      * Updating a non-displayable field does not result in the entry being reformatted on save
      */
-    public static Optional<FieldChange> updateNonDisplayableField(BibEntry be, Field field, String newValue) {
+    public static Optional<FieldChange> updateNonDisplayableField(
+            BibEntry be, Field field, String newValue) {
         boolean changed = be.hasChanged();
         Optional<FieldChange> fieldChange = updateField(be, field, newValue, false);
         be.setChanged(changed);
@@ -37,14 +37,15 @@ public static Optional<FieldChange> updateNonDisplayableField(BibEntry be, Field
      *
      * @param nullFieldIfValueIsTheSame If true the field value is removed when the current value is equals to newValue
      */
-    public static Optional<FieldChange> updateField(BibEntry be, Field field, String newValue,
-                                                    Boolean nullFieldIfValueIsTheSame) {
+    public static Optional<FieldChange> updateField(
+            BibEntry be, Field field, String newValue, Boolean nullFieldIfValueIsTheSame) {
         String writtenValue = null;
         String oldValue = null;
         if (be.hasField(field)) {
             oldValue = be.getField(field).get();
             if ((newValue == null) || (oldValue.equals(newValue) && nullFieldIfValueIsTheSame)) {
-                // If the new field value is null or the old and the new value are the same and flag is set
+                // If the new field value is null or the old and the new value are the same and flag
+                // is set
                 // Clear the field
                 be.clearField(field);
             } else if (!oldValue.equals(newValue)) {
@@ -69,7 +70,12 @@ public static Optional<FieldChange> updateField(BibEntry be, Field field, String
         return Optional.of(new FieldChange(be, field, oldValue, writtenValue));
     }
 
-    private static void setAutomaticFields(BibEntry entry, boolean setOwner, String owner, boolean setTimeStamp, String timeStamp) {
+    private static void setAutomaticFields(
+            BibEntry entry,
+            boolean setOwner,
+            String owner,
+            boolean setTimeStamp,
+            String timeStamp) {
         // Set owner field if this option is enabled:
         if (setOwner) {
             // Set owner field to default value
@@ -85,7 +91,10 @@ private static void setAutomaticFields(BibEntry entry, boolean setOwner, String
      * Sets empty or non-existing owner fields of bibtex entries inside a List to a specified default value. Timestamp
      * field is also set. Preferences are checked to see if these options are enabled.
      */
-    public static void setAutomaticFields(Collection<BibEntry> entries, OwnerPreferences ownerPreferences, TimestampPreferences timestampPreferences) {
+    public static void setAutomaticFields(
+            Collection<BibEntry> entries,
+            OwnerPreferences ownerPreferences,
+            TimestampPreferences timestampPreferences) {
         boolean globalSetOwner = ownerPreferences.isUseOwner();
         boolean setTimeStamp = timestampPreferences.shouldAddCreationDate();
 
@@ -99,7 +108,8 @@ public static void setAutomaticFields(Collection<BibEntry> entries, OwnerPrefere
         String timestamp = timestampPreferences.now();
 
         for (BibEntry curEntry : entries) {
-            boolean setOwner = globalSetOwner && (overwriteOwner || (!curEntry.hasField(StandardField.OWNER)));
+            boolean setOwner =
+                    globalSetOwner && (overwriteOwner || (!curEntry.hasField(StandardField.OWNER)));
             setAutomaticFields(curEntry, setOwner, defaultOwner, setTimeStamp, timestamp);
         }
     }
diff --git a/src/main/java/org/jabref/logic/util/Version.java b/src/main/java/org/jabref/logic/util/Version.java
index 5e10be4390bb..50316b66344f 100644
--- a/src/main/java/org/jabref/logic/util/Version.java
+++ b/src/main/java/org/jabref/logic/util/Version.java
@@ -1,5 +1,11 @@
 package org.jabref.logic.util;
 
+import kong.unirest.core.json.JSONArray;
+import kong.unirest.core.json.JSONObject;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -12,11 +18,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import kong.unirest.core.json.JSONArray;
-import kong.unirest.core.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Represents the Application Version with the major and minor number, the full Version String and if it's a developer version
  */
@@ -26,10 +27,13 @@ public class Version {
 
     private static final Version UNKNOWN_VERSION = new Version();
 
-    private final static Pattern VERSION_PATTERN = Pattern.compile("(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(?<stage>-alpha|-beta)?(?<num>\\d+)?(?<dev>-?dev)?.*");
-    private final static Pattern CI_SUFFIX_PATTERN = Pattern.compile("-ci\\.\\d+");
+    private static final Pattern VERSION_PATTERN =
+            Pattern.compile(
+                    "(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(?<stage>-alpha|-beta)?(?<num>\\d+)?(?<dev>-?dev)?.*");
+    private static final Pattern CI_SUFFIX_PATTERN = Pattern.compile("-ci\\.\\d+");
 
-    private static final String JABREF_GITHUB_RELEASES = "https://api.github.com/repos/JabRef/JabRef/releases";
+    private static final String JABREF_GITHUB_RELEASES =
+            "https://api.github.com/repos/JabRef/JabRef/releases";
 
     private String fullVersion = BuildInfo.UNKNOWN_VERSION;
     private int major = -1;
@@ -42,8 +46,7 @@ public class Version {
     /**
      * Dummy constructor to create a local object (and  {@link Version#UNKNOWN_VERSION})
      */
-    private Version() {
-    }
+    private Version() {}
 
     /**
      * Tinylog does not allow for altering existing loging configuraitons after the logger was initialized .
@@ -58,7 +61,9 @@ private static Logger getLogger() {
      * @return the parsed version or {@link Version#UNKNOWN_VERSION} if an error occurred
      */
     public static Version parse(String version) {
-        if ((version == null) || version.isEmpty() || version.equals(BuildInfo.UNKNOWN_VERSION)
+        if ((version == null)
+                || version.isEmpty()
+                || version.equals(BuildInfo.UNKNOWN_VERSION)
                 || "${version}".equals(version)) {
             return UNKNOWN_VERSION;
         }
@@ -82,10 +87,14 @@ public static Version parse(String version) {
                 parsedVersion.patch = patchString == null ? 0 : Integer.parseInt(patchString);
 
                 String versionStageString = matcher.group("stage");
-                parsedVersion.developmentStage = versionStageString == null ? DevelopmentStage.STABLE : DevelopmentStage.parse(versionStageString);
+                parsedVersion.developmentStage =
+                        versionStageString == null
+                                ? DevelopmentStage.STABLE
+                                : DevelopmentStage.parse(versionStageString);
 
                 String stageNumString = matcher.group("num");
-                parsedVersion.developmentNum = stageNumString == null ? 0 : Integer.parseInt(stageNumString);
+                parsedVersion.developmentNum =
+                        stageNumString == null ? 0 : Integer.parseInt(stageNumString);
 
                 parsedVersion.isDevelopmentVersion = matcher.group("dev") != null;
             } catch (NumberFormatException e) {
@@ -106,14 +115,17 @@ public static Version parse(String version) {
      * Grabs all the available releases from the GitHub repository
      */
     public static List<Version> getAllAvailableVersions() throws IOException {
-        HttpURLConnection connection = (HttpURLConnection) URI.create(JABREF_GITHUB_RELEASES).toURL().openConnection();
+        HttpURLConnection connection =
+                (HttpURLConnection) URI.create(JABREF_GITHUB_RELEASES).toURL().openConnection();
         connection.setRequestProperty("Accept-Charset", "UTF-8");
-        try (BufferedReader rd = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
+        try (BufferedReader rd =
+                new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
             JSONArray objects = new JSONArray(rd.readLine());
             List<Version> versions = new ArrayList<>(objects.length());
             for (int i = 0; i < objects.length(); i++) {
                 JSONObject jsonObject = objects.getJSONObject(i);
-                Version version = Version.parse(jsonObject.getString("tag_name").replaceFirst("v", ""));
+                Version version =
+                        Version.parse(jsonObject.getString("tag_name").replaceFirst("v", ""));
                 versions.add(version);
             }
             connection.disconnect();
@@ -154,7 +166,8 @@ public boolean isNewerThan(Version otherVersion) {
                         if (this.getDevelopmentNum() > otherVersion.getDevelopmentNum()) {
                             return true;
                         } else if (this.getDevelopmentNum() == otherVersion.getDevelopmentNum()) {
-                            // if the stage is equal check if this version is in development and the other is not
+                            // if the stage is equal check if this version is in development and the
+                            // other is not
                             return !this.isDevelopmentVersion && otherVersion.isDevelopmentVersion;
                         }
                     }
@@ -186,7 +199,8 @@ public Optional<Version> shouldBeUpdatedTo(List<Version> availableVersions) {
      * @return True if this version should be updated to the given one
      */
     public boolean shouldBeUpdatedTo(Version otherVersion) {
-        // ignoring the other version if it is not stable, except if this version itself is not stable
+        // ignoring the other version if it is not stable, except if this version itself is not
+        // stable
         if (developmentStage == Version.DevelopmentStage.STABLE
                 && otherVersion.developmentStage != Version.DevelopmentStage.STABLE) {
             return false;
@@ -227,24 +241,21 @@ public String getChangelogUrl() {
         if (isDevelopmentVersion) {
             return "https://github.com/JabRef/jabref/blob/main/CHANGELOG.md#unreleased";
         } else {
-            StringBuilder changelogLink = new StringBuilder()
-                    .append("https://github.com/JabRef/jabref/blob/v")
-                    .append(this.getMajor())
-                    .append(".")
-                    .append(this.getMinor());
+            StringBuilder changelogLink =
+                    new StringBuilder()
+                            .append("https://github.com/JabRef/jabref/blob/v")
+                            .append(this.getMajor())
+                            .append(".")
+                            .append(this.getMinor());
 
             if (this.getPatch() != 0) {
-                changelogLink
-                        .append(".")
-                        .append(this.getPatch());
+                changelogLink.append(".").append(this.getPatch());
             }
 
-            changelogLink
-                    .append(this.developmentStage.stage);
+            changelogLink.append(this.developmentStage.stage);
 
             if (this.getDevelopmentNum() != 0) {
-                changelogLink
-                        .append(this.getDevelopmentNum());
+                changelogLink.append(this.getDevelopmentNum());
             }
 
             changelogLink.append("/CHANGELOG.md");
@@ -286,6 +297,7 @@ public enum DevelopmentStage {
          * describes how stable this stage is, the higher the better
          */
         private final int stability;
+
         private final String stage;
 
         DevelopmentStage(String stage, int stability) {
diff --git a/src/main/java/org/jabref/logic/util/WebViewStore.java b/src/main/java/org/jabref/logic/util/WebViewStore.java
index 9015196ee731..1a7e0da989bd 100644
--- a/src/main/java/org/jabref/logic/util/WebViewStore.java
+++ b/src/main/java/org/jabref/logic/util/WebViewStore.java
@@ -1,20 +1,20 @@
 package org.jabref.logic.util;
 
-import java.util.ArrayDeque;
-import java.util.Queue;
-
 import javafx.application.Platform;
 import javafx.scene.web.WebView;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayDeque;
+import java.util.Queue;
+
 /**
  * A dynamic web view store. This is used primarily to prevent UI freezes while constructing web view instances.
  */
 public class WebViewStore {
     private static final Logger LOGGER = LoggerFactory.getLogger(WebViewStore.class);
-    private final static Queue<WebView> WEB_VIEWS = new ArrayDeque<>();
+    private static final Queue<WebView> WEB_VIEWS = new ArrayDeque<>();
     private static boolean isInitialized = false;
     private static Configuration config;
 
@@ -59,10 +59,11 @@ public static WebView get() {
     }
 
     private static void addWebViewLater() {
-        Platform.runLater(() -> {
-            WEB_VIEWS.add(new WebView());
-            LOGGER.debug("Cached Web views: {}", WEB_VIEWS.size());
-        });
+        Platform.runLater(
+                () -> {
+                    WEB_VIEWS.add(new WebView());
+                    LOGGER.debug("Cached Web views: {}", WEB_VIEWS.size());
+                });
     }
 
     /**
@@ -72,9 +73,7 @@ public static boolean hasMore() {
         return !WEB_VIEWS.isEmpty();
     }
 
-    public record Configuration(
-            int numberOfPreloadedInstances,
-            int minimumNumberOfInstances) {
+    public record Configuration(int numberOfPreloadedInstances, int minimumNumberOfInstances) {
 
         /**
          * @return The number of web view instances to be loaded at application startup
diff --git a/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java b/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java
index 94c2b620ec90..5386d40b4fdc 100644
--- a/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java
+++ b/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java
@@ -21,10 +21,11 @@ public enum CitationKeyDependency {
     private final BooleanProperty askAutoNamingPdfs;
     private final ReadOnlyObjectProperty<Character> keywordSeparator;
 
-    public AutoLinkPreferences(CitationKeyDependency citationKeyDependency,
-                               String regularExpression,
-                               boolean askAutoNamingPdfs,
-                               ObjectProperty<Character> keywordSeparatorProperty) {
+    public AutoLinkPreferences(
+            CitationKeyDependency citationKeyDependency,
+            String regularExpression,
+            boolean askAutoNamingPdfs,
+            ObjectProperty<Character> keywordSeparatorProperty) {
         this.citationKeyDependency = new SimpleObjectProperty<>(citationKeyDependency);
         this.regularExpression = new SimpleStringProperty(regularExpression);
         this.askAutoNamingPdfs = new SimpleBooleanProperty(askAutoNamingPdfs);
@@ -34,10 +35,11 @@ public AutoLinkPreferences(CitationKeyDependency citationKeyDependency,
     /**
      * For testing purpose
      */
-    public AutoLinkPreferences(CitationKeyDependency citationKeyDependency,
-                               String regularExpression,
-                               boolean askAutoNamingPdfs,
-                               Character keywordSeparator) {
+    public AutoLinkPreferences(
+            CitationKeyDependency citationKeyDependency,
+            String regularExpression,
+            boolean askAutoNamingPdfs,
+            Character keywordSeparator) {
         this.citationKeyDependency = new SimpleObjectProperty<>(citationKeyDependency);
         this.regularExpression = new SimpleStringProperty(regularExpression);
         this.askAutoNamingPdfs = new SimpleBooleanProperty(askAutoNamingPdfs);
diff --git a/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java b/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java
index 8df2eb600d74..2914692311fc 100644
--- a/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.util.io;
 
+import org.jabref.gui.autosaveandbackup.BackupManager;
+import org.jabref.logic.util.BackupFileType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.file.Files;
@@ -9,18 +14,11 @@
 import java.util.HexFormat;
 import java.util.Optional;
 
-import org.jabref.gui.autosaveandbackup.BackupManager;
-import org.jabref.logic.util.BackupFileType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class BackupFileUtil {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BackupFileUtil.class);
 
-    private BackupFileUtil() {
-    }
+    private BackupFileUtil() {}
 
     /**
      * Determines the path of the backup file (using the given extension)
@@ -38,10 +36,11 @@ private BackupFileUtil() {
      *     (and configured in the preferences as "make backups")
      * </p>
      */
-
-    public static Path getPathForNewBackupFileAndCreateDirectory(Path targetFile, BackupFileType fileType, Path backupDir) {
+    public static Path getPathForNewBackupFileAndCreateDirectory(
+            Path targetFile, BackupFileType fileType, Path backupDir) {
         String extension = "." + fileType.getExtensions().getFirst();
-        String timeSuffix = ZonedDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd--HH.mm.ss"));
+        String timeSuffix =
+                ZonedDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd--HH.mm.ss"));
 
         // We choose the data directory, because a ".bak" file should survive cache cleanups
         Path directory = backupDir;
@@ -49,15 +48,25 @@ public static Path getPathForNewBackupFileAndCreateDirectory(Path targetFile, Ba
             Files.createDirectories(directory);
         } catch (IOException e) {
             Path result = FileUtil.addExtension(targetFile, extension);
-            LOGGER.warn("Could not create bib writing directory {}, using {} as file", directory, result, e);
+            LOGGER.warn(
+                    "Could not create bib writing directory {}, using {} as file",
+                    directory,
+                    result,
+                    e);
             return result;
         }
-        String baseFileName = getUniqueFilePrefix(targetFile) + "--" + targetFile.getFileName() + "--" + timeSuffix;
+        String baseFileName =
+                getUniqueFilePrefix(targetFile)
+                        + "--"
+                        + targetFile.getFileName()
+                        + "--"
+                        + timeSuffix;
         Path fileName = FileUtil.addExtension(Path.of(baseFileName), extension);
         return directory.resolve(fileName);
     }
 
-    public static Optional<Path> getPathOfLatestExistingBackupFile(Path targetFile, BackupFileType fileType, Path backupDir) {
+    public static Optional<Path> getPathOfLatestExistingBackupFile(
+            Path targetFile, BackupFileType fileType, Path backupDir) {
         // The code is similar to "getPathForNewBackupFileAndCreateDirectory"
 
         String extension = "." + fileType.getExtensions().getFirst();
@@ -76,11 +85,12 @@ public static Optional<Path> getPathOfLatestExistingBackupFile(Path targetFile,
         final String prefix = getUniqueFilePrefix(targetFile) + "--" + targetFile.getFileName();
         Optional<Path> mostRecentFile;
         try {
-            mostRecentFile = Files.list(backupDir)
-                                  // just list the .sav belonging to the given targetFile
-                                  .filter(p -> p.getFileName().toString().startsWith(prefix))
-                                  .sorted()
-                                  .reduce((first, second) -> second);
+            mostRecentFile =
+                    Files.list(backupDir)
+                            // just list the .sav belonging to the given targetFile
+                            .filter(p -> p.getFileName().toString().startsWith(prefix))
+                            .sorted()
+                            .reduce((first, second) -> second);
         } catch (IOException e) {
             LOGGER.error("Could not determine most recent file", e);
             return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/util/io/CitationKeyBasedFileFinder.java b/src/main/java/org/jabref/logic/util/io/CitationKeyBasedFileFinder.java
index b6fd974e3b81..317b96c6c51d 100644
--- a/src/main/java/org/jabref/logic/util/io/CitationKeyBasedFileFinder.java
+++ b/src/main/java/org/jabref/logic/util/io/CitationKeyBasedFileFinder.java
@@ -1,5 +1,11 @@
 package org.jabref.logic.util.io;
 
+import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.strings.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.FileVisitOption;
@@ -17,13 +23,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.strings.StringUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 class CitationKeyBasedFileFinder implements FileFinder {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CitationKeyBasedFileFinder.class);
@@ -35,7 +34,8 @@ class CitationKeyBasedFileFinder implements FileFinder {
     }
 
     @Override
-    public List<Path> findAssociatedFiles(BibEntry entry, List<Path> directories, List<String> extensions) throws IOException {
+    public List<Path> findAssociatedFiles(
+            BibEntry entry, List<Path> directories, List<String> extensions) throws IOException {
         Objects.requireNonNull(directories);
         Objects.requireNonNull(entry);
 
@@ -62,7 +62,8 @@ public List<Path> findAssociatedFiles(BibEntry entry, List<Path> directories, Li
                 result.add(file);
                 continue;
             }
-            // If we get here, we did not find any exact matches. If non-exact matches are allowed, try to find one
+            // If we get here, we did not find any exact matches. If non-exact matches are allowed,
+            // try to find one
             if (!exactKeyOnly && matches(name, citeKey)) {
                 LOGGER.debug("Found non-exact match for key {} in file {}", citeKey, file);
                 result.add(file);
@@ -76,9 +77,11 @@ private boolean matches(String filename, String citeKey) {
         boolean startsWithKey = filename.startsWith(FileNameCleaner.cleanFileName(citeKey));
         if (startsWithKey) {
             // The file name starts with the key, that's already a good start
-            // However, we do not want to match "JabRefa" for "JabRef" since this is probably a file belonging to another entry published in the same time / same name
+            // However, we do not want to match "JabRefa" for "JabRef" since this is probably a file
+            // belonging to another entry published in the same time / same name
             char charAfterKey = filename.charAt(citeKey.length());
-            return !CitationKeyGenerator.APPENDIX_CHARACTERS.contains(Character.toString(charAfterKey));
+            return !CitationKeyGenerator.APPENDIX_CHARACTERS.contains(
+                    Character.toString(charAfterKey));
         }
         return false;
     }
@@ -86,16 +89,24 @@ private boolean matches(String filename, String citeKey) {
     /**
      * Returns a list of all files in the given directories which have one of the given extension.
      */
-    private Set<Path> findFilesByExtension(List<Path> directories, List<String> extensions) throws IOException {
+    private Set<Path> findFilesByExtension(List<Path> directories, List<String> extensions)
+            throws IOException {
         Objects.requireNonNull(extensions, "Extensions must not be null!");
 
-        BiPredicate<Path, BasicFileAttributes> isFileWithCorrectExtension = (path, attributes) -> !Files.isDirectory(path)
-                && extensions.contains(FileUtil.getFileExtension(path).orElse(""));
+        BiPredicate<Path, BasicFileAttributes> isFileWithCorrectExtension =
+                (path, attributes) ->
+                        !Files.isDirectory(path)
+                                && extensions.contains(FileUtil.getFileExtension(path).orElse(""));
 
         Set<Path> result = new HashSet<>();
         for (Path directory : directories) {
             if (Files.exists(directory)) {
-                try (Stream<Path> pathStream = Files.find(directory, Integer.MAX_VALUE, isFileWithCorrectExtension, FileVisitOption.FOLLOW_LINKS)) {
+                try (Stream<Path> pathStream =
+                        Files.find(
+                                directory,
+                                Integer.MAX_VALUE,
+                                isFileWithCorrectExtension,
+                                FileVisitOption.FOLLOW_LINKS)) {
                     result.addAll(pathStream.collect(Collectors.toSet()));
                 } catch (UncheckedIOException e) {
                     throw new IOException("Problem in finding files", e);
diff --git a/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java b/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java
index 1c876ea39315..0d14f577c8f0 100644
--- a/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java
+++ b/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.util.io;
 
+import org.jabref.logic.FilePreferences;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+
 import java.io.File;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -10,11 +15,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.jabref.logic.FilePreferences;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-
 /**
  * Search class for files. <br>
  * <br>
@@ -33,8 +33,9 @@ public class DatabaseFileLookup {
      */
     public DatabaseFileLookup(BibDatabaseContext databaseContext, FilePreferences filePreferences) {
         Objects.requireNonNull(databaseContext);
-        possibleFilePaths = Optional.ofNullable(databaseContext.getFileDirectories(filePreferences))
-                                    .orElse(new ArrayList<>());
+        possibleFilePaths =
+                Optional.ofNullable(databaseContext.getFileDirectories(filePreferences))
+                        .orElse(new ArrayList<>());
 
         for (BibEntry entry : databaseContext.getDatabase().getEntries()) {
             fileCache.addAll(parseFileField(entry));
@@ -63,11 +64,15 @@ private List<Path> parseFileField(BibEntry entry) {
         Objects.requireNonNull(entry);
 
         return entry.getFiles().stream()
-                    .filter(file -> !file.isOnlineLink()) // Do not query external file links (huge performance leak)
-                    .map(file -> file.findIn(possibleFilePaths))
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .collect(Collectors.toList());
+                .filter(
+                        file ->
+                                !file
+                                        .isOnlineLink()) // Do not query external file links (huge
+                                                         // performance leak)
+                .map(file -> file.findIn(possibleFilePaths))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .collect(Collectors.toList());
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/util/io/FileFinder.java b/src/main/java/org/jabref/logic/util/io/FileFinder.java
index e449b796e0cf..b91fa411d2a0 100644
--- a/src/main/java/org/jabref/logic/util/io/FileFinder.java
+++ b/src/main/java/org/jabref/logic/util/io/FileFinder.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.util.io;
 
+import org.jabref.model.entry.BibEntry;
+
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
 
-import org.jabref.model.entry.BibEntry;
-
 public interface FileFinder {
 
     /**
@@ -15,5 +15,6 @@ public interface FileFinder {
      * @param directories The root directories to search.
      * @param extensions  The extensions that are acceptable.
      */
-    List<Path> findAssociatedFiles(BibEntry entry, List<Path> directories, List<String> extensions) throws IOException;
+    List<Path> findAssociatedFiles(BibEntry entry, List<Path> directories, List<String> extensions)
+            throws IOException;
 }
diff --git a/src/main/java/org/jabref/logic/util/io/FileFinders.java b/src/main/java/org/jabref/logic/util/io/FileFinders.java
index ca27713a3fae..0b07ffebd753 100644
--- a/src/main/java/org/jabref/logic/util/io/FileFinders.java
+++ b/src/main/java/org/jabref/logic/util/io/FileFinders.java
@@ -6,12 +6,12 @@ public class FileFinders {
      */
     public static FileFinder constructFromConfiguration(AutoLinkPreferences autoLinkPreferences) {
         return switch (autoLinkPreferences.getCitationKeyDependency()) {
-            case START ->
-                    new CitationKeyBasedFileFinder(false);
-            case EXACT ->
-                    new CitationKeyBasedFileFinder(true);
+            case START -> new CitationKeyBasedFileFinder(false);
+            case EXACT -> new CitationKeyBasedFileFinder(true);
             case REGEX ->
-                    new RegExpBasedFileFinder(autoLinkPreferences.getRegularExpression(), autoLinkPreferences.getKeywordSeparator());
+                    new RegExpBasedFileFinder(
+                            autoLinkPreferences.getRegularExpression(),
+                            autoLinkPreferences.getKeywordSeparator());
         };
     }
 }
diff --git a/src/main/java/org/jabref/logic/util/io/FileHistory.java b/src/main/java/org/jabref/logic/util/io/FileHistory.java
index 7ccbcadc88d3..4a08611e1c0d 100644
--- a/src/main/java/org/jabref/logic/util/io/FileHistory.java
+++ b/src/main/java/org/jabref/logic/util/io/FileHistory.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.util.io;
 
+import javafx.collections.ModifiableObservableListBase;
+
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
-import javafx.collections.ModifiableObservableListBase;
-
 public class FileHistory extends ModifiableObservableListBase<Path> {
 
     private static final int HISTORY_SIZE = 8;
diff --git a/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java b/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java
index b2ffdf82b8a4..213e31e86891 100644
--- a/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java
+++ b/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java
@@ -9,8 +9,7 @@
  */
 public class FileNameCleaner {
 
-    private FileNameCleaner() {
-    }
+    private FileNameCleaner() {}
 
     /**
      * Replaces illegal characters in given fileName by '_'
diff --git a/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java b/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
index 2a9d165cb8d2..0c6faa08c9fc 100644
--- a/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
+++ b/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.util.io;
 
+import org.jabref.logic.l10n.Localization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -9,11 +13,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class FileNameUniqueness {
     private static final Logger LOGGER = LoggerFactory.getLogger(FileNameUniqueness.class);
 
@@ -45,9 +44,7 @@ public static String getNonOverWritingFileName(Path targetDirectory, String file
 
         int counter = 1;
         while (Files.exists(targetDirectory.resolve(newFileName))) {
-            newFileName = fileNameWithoutExtension +
-                    " (" + counter + ")" +
-                    extensionSuffix;
+            newFileName = fileNameWithoutExtension + " (" + counter + ")" + extensionSuffix;
             counter++;
         }
 
@@ -65,7 +62,8 @@ public static String getNonOverWritingFileName(Path targetDirectory, String file
      *         false when there is no "similar" file name or the content is different from that of files with "similar" name
      * @throws IOException Fail when the file is not exist or something wrong when reading the file
      */
-    public static boolean isDuplicatedFile(Path directory, Path fileName, Consumer<String> messageOnDeletion) throws IOException {
+    public static boolean isDuplicatedFile(
+            Path directory, Path fileName, Consumer<String> messageOnDeletion) throws IOException {
         Objects.requireNonNull(directory);
         Objects.requireNonNull(fileName);
 
@@ -88,16 +86,21 @@ public static boolean isDuplicatedFile(Path directory, Path fileName, Consumer<S
             if (com.google.common.io.Files.equal(originalFile.toFile(), duplicateFile.toFile())) {
                 try {
                     Files.delete(duplicateFile);
-                    messageOnDeletion.accept(Localization.lang("File '%1' is a duplicate of '%0'. Keeping '%0'", originalFileName, fileName));
+                    messageOnDeletion.accept(
+                            Localization.lang(
+                                    "File '%1' is a duplicate of '%0'. Keeping '%0'",
+                                    originalFileName, fileName));
                 } catch (IOException e) {
-                    LOGGER.error("File '{}' is a duplicate of '{}'. Could not delete '{}'.", fileName, originalFileName, fileName);
+                    LOGGER.error(
+                            "File '{}' is a duplicate of '{}'. Could not delete '{}'.",
+                            fileName,
+                            originalFileName,
+                            fileName);
                 }
                 return true;
             }
 
-            originalFileName = fileNameWithoutDuplicated +
-                    " (" + counter + ")"
-                    + extensionSuffix;
+            originalFileName = fileNameWithoutDuplicated + " (" + counter + ")" + extensionSuffix;
             counter++;
 
             if (newFilename.equals(originalFileName)) {
@@ -123,8 +126,10 @@ public static String eraseDuplicateMarks(String fileName) {
     }
 
     public static Path eraseDuplicateMarks(Path filePath) {
-        String extensionSuffix = FileUtil.getFileExtension(filePath).map(ext -> "." + ext).orElse("");
+        String extensionSuffix =
+                FileUtil.getFileExtension(filePath).map(ext -> "." + ext).orElse("");
 
-        return filePath.resolveSibling(eraseDuplicateMarks(FileUtil.getBaseName(filePath)) + extensionSuffix);
+        return filePath.resolveSibling(
+                eraseDuplicateMarks(FileUtil.getBaseName(filePath)) + extensionSuffix);
     }
 }
diff --git a/src/main/java/org/jabref/logic/util/io/FileUtil.java b/src/main/java/org/jabref/logic/util/io/FileUtil.java
index 22ad11f1246b..d980aca3980b 100644
--- a/src/main/java/org/jabref/logic/util/io/FileUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/FileUtil.java
@@ -1,5 +1,16 @@
 package org.jabref.logic.util.io;
 
+import org.jabref.logic.FilePreferences;
+import org.jabref.logic.citationkeypattern.BracketedPattern;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.entry.field.StandardField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -22,18 +33,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.jabref.logic.FilePreferences;
-import org.jabref.logic.citationkeypattern.BracketedPattern;
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.entry.field.StandardField;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * The idea of this class is to add general functionality that could possibly even in the
  * <a href="https://en.wikipedia.org/wiki/Non-blocking_I/O_(Java)">Java NIO package</a>,
@@ -41,7 +40,8 @@
  */
 public class FileUtil {
 
-    public static final boolean IS_POSIX_COMPLIANT = FileSystems.getDefault().supportedFileAttributeViews().contains("posix");
+    public static final boolean IS_POSIX_COMPLIANT =
+            FileSystems.getDefault().supportedFileAttributeViews().contains("posix");
     public static final int MAXIMUM_FILE_NAME_LENGTH = 255;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FileUtil.class);
@@ -51,19 +51,14 @@ public class FileUtil {
      */
     // @formatter:off
     private static final int[] ILLEGAL_CHARS = {
-            0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-            10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-            20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-            30, 31, 34,
-            42,
-            58, // ":"
-            60, 62, 63,
-            123, 124, 125
+        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+        25, 26, 27, 28, 29, 30, 31, 34, 42, 58, // ":"
+        60, 62, 63, 123, 124, 125
     };
+
     // @formatter:on
 
-    private FileUtil() {
-    }
+    private FileUtil() {}
 
     /**
      * Returns the extension of a file name or Optional.empty() if the file does not have one (no "." in name).
@@ -114,8 +109,14 @@ public static String getValidFileName(String fileName) {
 
         if (nameWithoutExtension.length() > MAXIMUM_FILE_NAME_LENGTH) {
             Optional<String> extension = getFileExtension(fileName);
-            String shortName = nameWithoutExtension.substring(0, MAXIMUM_FILE_NAME_LENGTH - extension.map(s -> s.length() + 1).orElse(0));
-            LOGGER.info("Truncated the too long filename '%s' (%d characters) to '%s'.".formatted(fileName, fileName.length(), shortName));
+            String shortName =
+                    nameWithoutExtension.substring(
+                            0,
+                            MAXIMUM_FILE_NAME_LENGTH
+                                    - extension.map(s -> s.length() + 1).orElse(0));
+            LOGGER.info(
+                    "Truncated the too long filename '%s' (%d characters) to '%s'."
+                            .formatted(fileName, fileName.length(), shortName));
             return extension.map(s -> shortName + "." + s).orElse(shortName);
         }
 
@@ -147,10 +148,13 @@ public static Optional<String> getUniquePathDirectory(List<String> paths, Path c
 
         List<String> uniquePathParts = uniquePathSubstrings(paths);
         return uniquePathParts.stream()
-                              .filter(part -> comparePath.toString().contains(part)
-                                              && !part.equals(fileName) && part.contains(File.separator))
-                              .findFirst()
-                              .map(part -> part.substring(0, part.lastIndexOf(File.separator)));
+                .filter(
+                        part ->
+                                comparePath.toString().contains(part)
+                                        && !part.equals(fileName)
+                                        && part.contains(File.separator))
+                .findFirst()
+                .map(part -> part.substring(0, part.lastIndexOf(File.separator)));
     }
 
     /**
@@ -161,8 +165,8 @@ public static Optional<String> getUniquePathDirectory(List<String> paths, Path c
      */
     public static Optional<String> getUniquePathFragment(List<String> paths, Path comparePath) {
         return uniquePathSubstrings(paths).stream()
-                                          .filter(part -> comparePath.toString().contains(part))
-                                          .max(Comparator.comparingInt(String::length));
+                .filter(part -> comparePath.toString().contains(part))
+                .max(Comparator.comparingInt(String::length));
     }
 
     /**
@@ -216,7 +220,8 @@ public static List<String> uniquePathSubstrings(List<String> paths) {
      * @param replaceExisting       boolean Determines whether the copy goes on even if the file exists.
      * @return boolean Whether the copy succeeded, or was stopped due to the file already existing.
      */
-    public static boolean copyFile(Path pathToSourceFile, Path pathToDestinationFile, boolean replaceExisting) {
+    public static boolean copyFile(
+            Path pathToSourceFile, Path pathToDestinationFile, boolean replaceExisting) {
         // Check if the file already exists.
         if (!Files.exists(pathToSourceFile)) {
             LOGGER.error("Path to the source file doesn't exist.");
@@ -228,7 +233,8 @@ public static boolean copyFile(Path pathToSourceFile, Path pathToDestinationFile
         }
         try {
             // This should also preserve Hard Links
-            Files.copy(pathToSourceFile, pathToDestinationFile, StandardCopyOption.REPLACE_EXISTING);
+            Files.copy(
+                    pathToSourceFile, pathToDestinationFile, StandardCopyOption.REPLACE_EXISTING);
             return true;
         } catch (IOException e) {
             LOGGER.error("Copying Files failed.", e);
@@ -265,7 +271,8 @@ public static Path relativize(Path file, List<Path> directories) {
      *
      * @param path the file path to be shortened
      */
-    public static Path relativize(Path path, BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+    public static Path relativize(
+            Path path, BibDatabaseContext databaseContext, FilePreferences filePreferences) {
         List<Path> fileDirectories = databaseContext.getFileDirectories(filePreferences);
         return relativize(path, fileDirectories);
     }
@@ -275,23 +282,38 @@ public static Path relativize(Path path, BibDatabaseContext databaseContext, Fil
      * <p>
      * ⚠ Modifies the entries in the list ⚠
      */
-    public static List<BibEntry> relativize(List<BibEntry> entries, BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+    public static List<BibEntry> relativize(
+            List<BibEntry> entries,
+            BibDatabaseContext databaseContext,
+            FilePreferences filePreferences) {
         List<Path> fileDirectories = databaseContext.getFileDirectories(filePreferences);
 
         return entries.stream()
-                      .map(entry -> {
-                          if (entry.hasField(StandardField.FILE)) {
-                              List<LinkedFile> updatedLinkedFiles = entry.getFiles().stream().map(linkedFile -> {
-                                  if (!linkedFile.isOnlineLink()) {
-                                      String newPath = FileUtil.relativize(Path.of(linkedFile.getLink()), fileDirectories).toString();
-                                      linkedFile.setLink(newPath);
-                                  }
-                                  return linkedFile;
-                              }).toList();
-                              entry.setFiles(updatedLinkedFiles);
-                          }
-                          return entry;
-                      }).toList();
+                .map(
+                        entry -> {
+                            if (entry.hasField(StandardField.FILE)) {
+                                List<LinkedFile> updatedLinkedFiles =
+                                        entry.getFiles().stream()
+                                                .map(
+                                                        linkedFile -> {
+                                                            if (!linkedFile.isOnlineLink()) {
+                                                                String newPath =
+                                                                        FileUtil.relativize(
+                                                                                        Path.of(
+                                                                                                linkedFile
+                                                                                                        .getLink()),
+                                                                                        fileDirectories)
+                                                                                .toString();
+                                                                linkedFile.setLink(newPath);
+                                                            }
+                                                            return linkedFile;
+                                                        })
+                                                .toList();
+                                entry.setFiles(updatedLinkedFiles);
+                            }
+                            return entry;
+                        })
+                .toList();
     }
 
     /**
@@ -306,9 +328,9 @@ public static List<Path> getListOfLinkedFiles(List<BibEntry> bes, List<Path> fil
         Objects.requireNonNull(fileDirs);
 
         return bes.stream()
-                  .flatMap(entry -> entry.getFiles().stream())
-                  .flatMap(file -> file.findIn(fileDirs).stream())
-                  .collect(Collectors.toList());
+                .flatMap(entry -> entry.getFiles().stream())
+                .flatMap(file -> file.findIn(fileDirs).stream())
+                .collect(Collectors.toList());
     }
 
     /**
@@ -319,7 +341,8 @@ public static List<Path> getListOfLinkedFiles(List<BibEntry> bes, List<Path> fil
      * @param fileNamePattern the filename pattern
      * @return a suggested fileName
      */
-    public static String createFileNameFromPattern(BibDatabase database, BibEntry entry, String fileNamePattern) {
+    public static String createFileNameFromPattern(
+            BibDatabase database, BibEntry entry, String fileNamePattern) {
         String targetName = BracketedPattern.expandBrackets(fileNamePattern, ';', entry, database);
 
         if (targetName.isEmpty()) {
@@ -339,8 +362,10 @@ public static String createFileNameFromPattern(BibDatabase database, BibEntry en
      * @param directoryNamePattern the dirname pattern
      * @return a suggested dirName
      */
-    public static String createDirNameFromPattern(BibDatabase database, BibEntry entry, String directoryNamePattern) {
-        String targetName = BracketedPattern.expandBrackets(directoryNamePattern, ';', entry, database);
+    public static String createDirNameFromPattern(
+            BibDatabase database, BibEntry entry, String directoryNamePattern) {
+        String targetName =
+                BracketedPattern.expandBrackets(directoryNamePattern, ';', entry, database);
 
         if (targetName.isEmpty()) {
             return targetName;
@@ -362,16 +387,22 @@ public static String createDirNameFromPattern(BibDatabase database, BibEntry ent
     public static Optional<Path> findSingleFileRecursively(String filename, Path rootDirectory) {
         try (Stream<Path> pathStream = Files.walk(rootDirectory)) {
             return pathStream
-                             .filter(Files::isRegularFile)
-                             .filter(f -> f.getFileName().toString().equals(filename))
-                             .findFirst();
+                    .filter(Files::isRegularFile)
+                    .filter(f -> f.getFileName().toString().equals(filename))
+                    .findFirst();
         } catch (UncheckedIOException | IOException ex) {
-            LOGGER.error("Error trying to locate the file {} inside the directory {}", filename, rootDirectory);
+            LOGGER.error(
+                    "Error trying to locate the file {} inside the directory {}",
+                    filename,
+                    rootDirectory);
         }
         return Optional.empty();
     }
 
-    public static Optional<Path> find(final BibDatabaseContext databaseContext, String fileName, FilePreferences filePreferences) {
+    public static Optional<Path> find(
+            final BibDatabaseContext databaseContext,
+            String fileName,
+            FilePreferences filePreferences) {
         Objects.requireNonNull(fileName, "fileName");
         return find(fileName, databaseContext.getFileDirectories(filePreferences));
     }
@@ -395,8 +426,8 @@ public static Optional<Path> find(String fileName, List<Path> directories) {
         }
 
         return directories.stream()
-                          .flatMap(directory -> find(fileName, directory).stream())
-                          .findFirst();
+                .flatMap(directory -> find(fileName, directory).stream())
+                .findFirst();
     }
 
     /**
@@ -416,8 +447,10 @@ public static Optional<Path> find(String fileName, Path directory) {
             return Optional.empty();
         }
 
-        // Explicitly check for an empty string, as File.exists returns true on that empty path, because it maps to the default jar location.
-        // If we then call toAbsoluteDir, it would always return the jar-location folder. This is not what we want here.
+        // Explicitly check for an empty string, as File.exists returns true on that empty path,
+        // because it maps to the default jar location.
+        // If we then call toAbsoluteDir, it would always return the jar-location folder. This is
+        // not what we want here.
         if (fileName.isEmpty()) {
             return Optional.of(directory);
         }
@@ -427,7 +460,8 @@ public static Optional<Path> find(String fileName, Path directory) {
             return Optional.of(resolvedFile);
         }
 
-        // get the furthest path element from root and check if our filename starts with the same name
+        // get the furthest path element from root and check if our filename starts with the same
+        // name
         // workaround for old JabRef behavior
         String furthestDirFromRoot = directory.getFileName().toString();
         if (fileName.startsWith(furthestDirFromRoot)) {
@@ -461,8 +495,7 @@ public static List<Path> findListOfFiles(String filename, List<Path> directories
      * when a path needs to be stored in the bib file or preferences.
      */
     public static String toPortableString(Path path) {
-        return path.toString()
-                   .replace('\\', '/');
+        return path.toString().replace('\\', '/');
     }
 
     /**
@@ -483,13 +516,15 @@ public static boolean isBibFile(Path file) {
      */
     public static boolean isPDFFile(Path file) {
         Optional<String> extension = FileUtil.getFileExtension(file);
-        return extension.isPresent() && StandardFileType.PDF.getExtensions().contains(extension.get());
+        return extension.isPresent()
+                && StandardFileType.PDF.getExtensions().contains(extension.get());
     }
 
     /**
      * @return Path of current panel database directory or the standard working directory in case the database was not saved yet
      */
-    public static Path getInitialDirectory(BibDatabaseContext databaseContext, Path workingDirectory) {
+    public static Path getInitialDirectory(
+            BibDatabaseContext databaseContext, Path workingDirectory) {
         return databaseContext.getDatabasePath().map(Path::getParent).orElse(workingDirectory);
     }
 
@@ -502,8 +537,10 @@ public static Path getInitialDirectory(BibDatabaseContext databaseContext, Path
      * @return Boolean whether there is an illegal name.
      */
     public static boolean detectBadFileName(String fileName) {
-        // fileName could be a path, we want to check the fileName only (and don't care about the path)
-        // Reason: Handling of "c:\temp.pdf" is difficult, because ":" is an illegal character in the file name,
+        // fileName could be a path, we want to check the fileName only (and don't care about the
+        // path)
+        // Reason: Handling of "c:\temp.pdf" is difficult, because ":" is an illegal character in
+        // the file name,
         //         but a perfectly legal one in the path at this position
         try {
             fileName = Path.of(fileName).getFileName().toString();
diff --git a/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java b/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java
index 9de0b18af246..f7fedabec89a 100644
--- a/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java
+++ b/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.util.io;
 
+import org.jabref.logic.citationkeypattern.BracketedPattern;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.strings.StringUtil;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -17,10 +21,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.jabref.logic.citationkeypattern.BracketedPattern;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.strings.StringUtil;
-
 class RegExpBasedFileFinder implements FileFinder {
 
     private static final String EXT_MARKER = "__EXTENSION__";
@@ -43,24 +43,34 @@ class RegExpBasedFileFinder implements FileFinder {
      *
      * @throws IOException throws an IOException if a PatternSyntaxException occurs
      */
-    private Pattern createFileNamePattern(String[] fileParts, String extensionRegExp, BibEntry entry) throws IOException {
+    private Pattern createFileNamePattern(
+            String[] fileParts, String extensionRegExp, BibEntry entry) throws IOException {
         // Protect the extension marker so that it isn't treated as a bracketed pattern
         String filePart = fileParts[fileParts.length - 1].replace("[extension]", EXT_MARKER);
 
-        // We need to supply a custom function to deal with the content of a bracketed expression and expandBracketContent is the default function
-        Function<String, String> expandBracket = BracketedPattern.expandBracketContent(keywordDelimiter, entry, null);
-        // but, we want to post-process the expanded content so that it can be used as a regex for finding a file name
-        Function<String, String> bracketToFileNameRegex = expandBracket.andThen(RegExpBasedFileFinder::toFileNameRegex);
-
-        String expandedBracketAsFileNameRegex = BracketedPattern.expandBrackets(filePart, bracketToFileNameRegex);
-
-        String fileNamePattern = expandedBracketAsFileNameRegex
-                .replaceAll(EXT_MARKER, extensionRegExp) // Replace the extension marker
-                .replaceAll("\\\\\\\\", "\\\\");
+        // We need to supply a custom function to deal with the content of a bracketed expression
+        // and expandBracketContent is the default function
+        Function<String, String> expandBracket =
+                BracketedPattern.expandBracketContent(keywordDelimiter, entry, null);
+        // but, we want to post-process the expanded content so that it can be used as a regex for
+        // finding a file name
+        Function<String, String> bracketToFileNameRegex =
+                expandBracket.andThen(RegExpBasedFileFinder::toFileNameRegex);
+
+        String expandedBracketAsFileNameRegex =
+                BracketedPattern.expandBrackets(filePart, bracketToFileNameRegex);
+
+        String fileNamePattern =
+                expandedBracketAsFileNameRegex
+                        .replaceAll(EXT_MARKER, extensionRegExp) // Replace the extension marker
+                        .replaceAll("\\\\\\\\", "\\\\");
         try {
             return Pattern.compile('^' + fileNamePattern + '$', Pattern.CASE_INSENSITIVE);
         } catch (PatternSyntaxException e) {
-            throw new IOException("There is a syntax error in the regular expression %s used to search for files".formatted(fileNamePattern), e);
+            throw new IOException(
+                    "There is a syntax error in the regular expression %s used to search for files"
+                            .formatted(fileNamePattern),
+                    e);
         }
     }
 
@@ -72,8 +82,13 @@ private Pattern createFileNamePattern(String[] fileParts, String extensionRegExp
      */
     private static String toFileNameRegex(String expandedContent) {
         var cleanedContent = FileNameCleaner.cleanFileName(expandedContent);
-        return expandedContent.equals(cleanedContent) ? Pattern.quote(expandedContent) :
-                "(" + Pattern.quote(expandedContent) + ")|(" + Pattern.quote(cleanedContent) + ")";
+        return expandedContent.equals(cleanedContent)
+                ? Pattern.quote(expandedContent)
+                : "("
+                        + Pattern.quote(expandedContent)
+                        + ")|("
+                        + Pattern.quote(cleanedContent)
+                        + ")";
     }
 
     /**
@@ -86,7 +101,8 @@ private static String toFileNameRegex(String expandedContent) {
      * @return A list of files paths matching the given criteria.
      */
     @Override
-    public List<Path> findAssociatedFiles(BibEntry entry, List<Path> directories, List<String> extensions) throws IOException {
+    public List<Path> findAssociatedFiles(
+            BibEntry entry, List<Path> directories, List<String> extensions) throws IOException {
         String extensionRegExp = '(' + String.join("|", extensions) + ')';
         return findFile(entry, directories, extensionRegExp);
     }
@@ -121,7 +137,8 @@ public List<Path> findAssociatedFiles(BibEntry entry, List<Path> directories, Li
      * @return Will return the first file found to match the given criteria or
      * null if none was found.
      */
-    private List<Path> findFile(BibEntry entry, List<Path> dirs, String extensionRegExp) throws IOException {
+    private List<Path> findFile(BibEntry entry, List<Path> dirs, String extensionRegExp)
+            throws IOException {
         List<Path> res = new ArrayList<>();
         for (Path directory : dirs) {
             res.addAll(findFile(entry, directory, regExp, extensionRegExp));
@@ -133,7 +150,12 @@ private List<Path> findFile(BibEntry entry, List<Path> dirs, String extensionReg
      * The actual work-horse. Will find absolute filepaths starting from the
      * given directory using the given regular expression string for search.
      */
-    private List<Path> findFile(final BibEntry entry, final Path directory, final String file, final String extensionRegExp) throws IOException {
+    private List<Path> findFile(
+            final BibEntry entry,
+            final Path directory,
+            final String file,
+            final String extensionRegExp)
+            throws IOException {
         List<Path> resultFiles = new ArrayList<>();
 
         String fileName = file;
@@ -176,23 +198,35 @@ private List<Path> findFile(final BibEntry entry, final Path directory, final St
             if ("*".equals(dirToProcess)) { // Do for all direct subdirs
                 File[] subDirs = actualDirectory.toFile().listFiles();
                 if (subDirs != null) {
-                    String restOfFileString = StringUtil.join(fileParts, "/", index + 1, fileParts.length);
+                    String restOfFileString =
+                            StringUtil.join(fileParts, "/", index + 1, fileParts.length);
                     for (File subDir : subDirs) {
                         if (subDir.isDirectory()) {
-                            resultFiles.addAll(findFile(entry, subDir.toPath(), restOfFileString, extensionRegExp));
+                            resultFiles.addAll(
+                                    findFile(
+                                            entry,
+                                            subDir.toPath(),
+                                            restOfFileString,
+                                            extensionRegExp));
                         }
                     }
                 }
             }
             // Do for all direct and indirect subdirs
             if ("**".equals(dirToProcess)) {
-                String restOfFileString = StringUtil.join(fileParts, "/", index + 1, fileParts.length);
+                String restOfFileString =
+                        StringUtil.join(fileParts, "/", index + 1, fileParts.length);
 
                 final Path rootDirectory = actualDirectory;
                 try (Stream<Path> pathStream = Files.walk(actualDirectory)) {
-                    // We only want to transverse directory (and not the current one; this is already done below)
-                    for (Path path : pathStream.filter(element -> isSubDirectory(rootDirectory, element)).collect(Collectors.toList())) {
-                        resultFiles.addAll(findFile(entry, path, restOfFileString, extensionRegExp));
+                    // We only want to transverse directory (and not the current one; this is
+                    // already done below)
+                    for (Path path :
+                            pathStream
+                                    .filter(element -> isSubDirectory(rootDirectory, element))
+                                    .collect(Collectors.toList())) {
+                        resultFiles.addAll(
+                                findFile(entry, path, restOfFileString, extensionRegExp));
                     }
                 } catch (UncheckedIOException ioe) {
                     throw ioe.getCause();
@@ -202,11 +236,14 @@ private List<Path> findFile(final BibEntry entry, final Path directory, final St
 
         // Last step: check if the given file can be found in this directory
         Pattern toMatch = createFileNamePattern(fileParts, extensionRegExp, entry);
-        BiPredicate<Path, BasicFileAttributes> matcher = (path, attributes) -> toMatch.matcher(path.getFileName().toString()).matches();
-        try (Stream<Path> pathStream = Files.find(actualDirectory, 1, matcher, FileVisitOption.FOLLOW_LINKS)) {
+        BiPredicate<Path, BasicFileAttributes> matcher =
+                (path, attributes) -> toMatch.matcher(path.getFileName().toString()).matches();
+        try (Stream<Path> pathStream =
+                Files.find(actualDirectory, 1, matcher, FileVisitOption.FOLLOW_LINKS)) {
             resultFiles.addAll(pathStream.collect(Collectors.toList()));
         } catch (UncheckedIOException uncheckedIOException) {
-            // Previously, an empty list were returned here on both IOException and UncheckedIOException
+            // Previously, an empty list were returned here on both IOException and
+            // UncheckedIOException
             throw uncheckedIOException.getCause();
         }
         return resultFiles;
diff --git a/src/main/java/org/jabref/logic/util/io/XMLUtil.java b/src/main/java/org/jabref/logic/util/io/XMLUtil.java
index b6126914de35..0b7dd5585e97 100644
--- a/src/main/java/org/jabref/logic/util/io/XMLUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/XMLUtil.java
@@ -1,5 +1,14 @@
 package org.jabref.logic.util.io;
 
+import org.jabref.architecture.AllowedToUseStandardStreams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
 import java.io.StringWriter;
 import java.util.AbstractList;
 import java.util.Collections;
@@ -14,16 +23,6 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.jabref.architecture.AllowedToUseStandardStreams;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
 /**
  * Currently used for debugging only
  */
@@ -31,8 +30,7 @@
 public class XMLUtil {
     private static final Logger LOGGER = LoggerFactory.getLogger(XMLUtil.class);
 
-    private XMLUtil() {
-    }
+    private XMLUtil() {}
 
     /**
      * Prints out the document to standard out. Used to generate files for test cases.
@@ -83,7 +81,8 @@ public static Optional<String> getNodeContent(Node item, String nodeName) {
      */
     public static Optional<String> getAttributeContent(Node item, String attributeName) {
         NamedNodeMap attributes = item.getAttributes();
-        return Optional.ofNullable(attributes.getNamedItem(attributeName)).map(Node::getTextContent);
+        return Optional.ofNullable(attributes.getNamedItem(attributeName))
+                .map(Node::getTextContent);
     }
 
     /**
@@ -115,7 +114,8 @@ public static Optional<Node> getNode(Node item, String nodeName) {
     }
 
     // Wrapper to make NodeList iterable,
-    // taken from <a href="http://stackoverflow.com/questions/19589231/can-i-iterate-through-a-nodelist-using-for-each-in-java">StackOverflow Answer</a>.
+    // taken from <a
+    // href="http://stackoverflow.com/questions/19589231/can-i-iterate-through-a-nodelist-using-for-each-in-java">StackOverflow Answer</a>.
     private static final class NodeListWrapper extends AbstractList<Node> implements RandomAccess {
 
         private final NodeList list;
diff --git a/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java b/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java
index 1a26c2a95ef0..c03b9756d0f0 100644
--- a/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java
+++ b/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java
@@ -6,9 +6,13 @@
 public class HTMLUnicodeConversionMaps {
 
     // most of the LaTeX commands can be read at http://en.wikibooks.org/wiki/LaTeX/Accents
-    // The symbols can be seen at http://www.fileformat.info/info/unicode/char/a4/index.htm. Replace "a4" with the U+ number
-    // http://detexify.kirelabs.org/classify.html and http://www.ctan.org/tex-archive/info/symbols/comprehensive/ might help to find the right LaTeX command
-    // http://llg.cubic.org/docs/ent2latex.html and http://www.w3.org/TR/xml-entity-names/byalpha.html are also useful
+    // The symbols can be seen at http://www.fileformat.info/info/unicode/char/a4/index.htm. Replace
+    // "a4" with the U+ number
+    // http://detexify.kirelabs.org/classify.html and
+    // http://www.ctan.org/tex-archive/info/symbols/comprehensive/ might help to find the right
+    // LaTeX command
+    // http://llg.cubic.org/docs/ent2latex.html and
+    // http://www.w3.org/TR/xml-entity-names/byalpha.html are also useful
     public static final Map<String, String> HTML_LATEX_CONVERSION_MAP = new HashMap<>();
     public static final Map<Integer, String> ESCAPED_ACCENTS = new HashMap<>();
     public static final Map<String, String> UNICODE_ESCAPED_ACCENTS = new HashMap<>();
@@ -18,863 +22,893 @@ public class HTMLUnicodeConversionMaps {
     public static final Map<String, String> LATEX_UNICODE_CONVERSION_MAP = new HashMap<>();
 
     /*   Portions © International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
-     */
+    Permission to copy in any form is granted for use with
+    conforming SGML systems and applications as defined in
+    ISO 8879, provided this notice is included in all copies.
+    */
 
     // as well as http://www.w3.org/Math/characters/unicode.xml
     // An array of arrays of strings in the format:
     // {"decimal number of HTML entity", "text HTML entity", "corresponding LaTeX command"}
     // Leaving a field empty is OK as it then will not be included
-    private static final String[][] CONVERSION_LIST = new String[][] {{"160", "nbsp", "{~}"}, // no-break space = non-breaking space,
-            //                                 U+00A0 ISOnum
-            {"161", "iexcl", "{\\textexclamdown}"}, // inverted exclamation mark, U+00A1 ISOnum
-            {"162", "cent", "{\\textcent}"}, // cent sign, U+00A2 ISOnum
-            {"163", "pound", "{\\pounds}"}, // pound sign, U+00A3 ISOnum
-            {"164", "curren", "{\\textcurrency}"}, // currency sign, U+00A4 ISOnum
-            {"165", "yen", "{\\textyen}"}, // yen sign = yuan sign, U+00A5 ISOnum
-            {"166", "brvbar", "{\\textbrokenbar}"}, // broken bar = broken vertical bar,
-            //                                 U+00A6 ISOnum
-            {"167", "sect", "{{\\S}}"}, // section sign, U+00A7 ISOnum
-            {"168", "uml", "{\\\"{}}"}, // diaeresis = spacing diaeresis,
-            //                                 U+00A8 ISOdia
-            {"169", "copy", "{\\copyright}"}, // copyright sign, U+00A9 ISOnum
-            {"170", "ordf", "{\\textordfeminine}"}, // feminine ordinal indicator, U+00AA ISOnum
-            {"171", "laquo", "{\\guillemotleft}"}, // left-pointing double angle quotation mark
-            //                                 = left pointing guillemet, U+00AB ISOnum
-            {"172", "not", "$\\neg$"}, // not sign, U+00AC ISOnum
-            {"173", "shy", "\\-"}, // soft hyphen = discretionary hyphen,
-            //                                 U+00AD ISOnum
-            {"174", "reg", "{\\textregistered}"}, // registered sign = registered trade mark sign,
-            //                                 U+00AE ISOnum
-            {"175", "macr", "{\\={}}"}, // macron = spacing macron = overline
-            //                                 = APL overbar, U+00AF ISOdia
-            {"176", "deg", "{$^{\\circ}$}"}, // degree sign, U+00B0 ISOnum
-            {"177", "plusmn", "$\\pm$"}, // plus-minus sign = plus-or-minus sign,
-            //                                 U+00B1 ISOnum
-            {"178", "sup2", "\\textsuperscript{2}"}, // superscript two = superscript digit two
-            //                                 = squared, U+00B2 ISOnum
-            {"179", "sup3", "\\textsuperscript{3}"}, // superscript three = superscript digit three
-            //                                 = cubed, U+00B3 ISOnum
-            {"180", "acute", "{\\'{}}"}, // acute accent = spacing acute,
-            //                                 U+00B4 ISOdia
-            {"181", "micro", "$\\mu$"}, // micro sign, U+00B5 ISOnum
-            {"", "mu", "$\\mu$"}, // micro sign, U+00B5 ISOnum
-            {"182", "para", "{{\\P}}"}, // pilcrow sign = paragraph sign,
-            //                                 U+00B6 ISOnum
-            {"183", "middot", "$\\cdot$"}, // middle dot = Georgian comma
-            //                                 = Greek middle dot, U+00B7 ISOnum
-            {"184", "cedil", "{\\c{}}"}, // cedilla = spacing cedilla, U+00B8 ISOdia
-            {"185", "sup1", "\\textsuperscript{1}"}, // superscript one = superscript digit one,
-            //                                 U+00B9 ISOnum
-            {"186", "ordm", "{\\textordmasculine}"}, // masculine ordinal indicator,
-            //                                 U+00BA ISOnum
-            {"187", "raquo", "{\\guillemotright}"}, // right-pointing double angle quotation mark
-            //                                 = right pointing guillemet, U+00BB ISOnum
-            {"188", "frac14", "$\\sfrac{1}{4}$"}, // vulgar fraction one quarter
-            //                                 = fraction one quarter, U+00BC ISOnum
-            {"189", "frac12", "$\\sfrac{1}{2}$"}, // vulgar fraction one half
-            //                                 = fraction one half, U+00BD ISOnum
-            {"190", "frac34", "$\\sfrac{3}{4}$"}, // vulgar fraction three quarters
-            //                                 = fraction three quarters, U+00BE ISOnum
-            {"191", "iquest", "{\\textquestiondown}"}, // inverted question mark
-            //                                 = turned question mark, U+00BF ISOnum
-            {"192", "Agrave", "{{\\`{A}}}"}, // latin capital letter A with grave
-            //                                 = latin capital letter A grave,
-            //                                 U+00C0 ISOlat1
-            {"193", "Aacute", "{{\\'{A}}}"}, // latin capital letter A with acute,
-            //                                 U+00C1 ISOlat1
-            {"194", "Acirc", "{{\\^{A}}}"}, // latin capital letter A with circumflex,
-            //                                 U+00C2 ISOlat1
-            {"195", "Atilde", "{{\\~{A}}}"}, // latin capital letter A with tilde,
-            //                                 U+00C3 ISOlat1
-            {"196", "Auml", "{{\\\"{A}}}"}, // latin capital letter A with diaeresis,
-            //                                 U+00C4 ISOlat1
-            {"197", "Aring", "{{\\AA}}"}, // latin capital letter A with ring above
-            //                                 = latin capital letter A ring,
-            //                                 U+00C5 ISOlat1
-            {"198", "AElig", "{{\\AE}}"}, // latin capital letter AE
-            //                                 = latin capital ligature AE,
-            //                                 U+00C6 ISOlat1
-            {"199", "Ccedil", "{{\\c{C}}}"}, // latin capital letter C with cedilla,
-            //                                 U+00C7 ISOlat1
-            {"200", "Egrave", "{{\\`{E}}}"}, // latin capital letter E with grave,
-            //                                 U+00C8 ISOlat1
-            {"201", "Eacute", "{{\\'{E}}}"}, // latin capital letter E with acute,
-            //                                 U+00C9 ISOlat1
-            {"202", "Ecirc", "{{\\^{E}}}"}, // latin capital letter E with circumflex,
-            //                                 U+00CA ISOlat1
-            {"203", "Euml", "{{\\\"{E}}}"}, // latin capital letter E with diaeresis,
-            //                                 U+00CB ISOlat1
-            {"204", "Igrave", "{{\\`{I}}}"}, // latin capital letter I with grave,
-            //                                 U+00CC ISOlat1
-            {"205", "Iacute", "{{\\'{I}}}"}, // latin capital letter I with acute,
-            //                                 U+00CD ISOlat1
-            {"206", "Icirc", "{{\\^{I}}}"}, // latin capital letter I with circumflex,
-            //                                 U+00CE ISOlat1
-            {"207", "Iuml", "{{\\\"{I}}}"}, // latin capital letter I with diaeresis,
-            //                                 U+00CF ISOlat1
-            {"208", "ETH", "{{\\DH}}"}, // latin capital letter ETH, U+00D0 ISOlat1
-            {"209", "Ntilde", "{{\\~{N}}}"}, // latin capital letter N with tilde,
-            //                                 U+00D1 ISOlat1
-            {"210", "Ograve", "{{\\`{O}}}"}, // latin capital letter O with grave,
-            //                                 U+00D2 ISOlat1
-            {"211", "Oacute", "{{\\'{O}}}"}, // latin capital letter O with acute,
-            //                                 U+00D3 ISOlat1
-            {"212", "Ocirc", "{{\\^{O}}}"}, // latin capital letter O with circumflex,
-            //                                 U+00D4 ISOlat1
-            {"213", "Otilde", "{{\\~{O}}}"}, // latin capital letter O with tilde,
-            //                                 U+00D5 ISOlat1
-            {"214", "Ouml", "{{\\\"{O}}}"}, // latin capital letter O with diaeresis,
-            //                                 U+00D6 ISOlat1
-            {"215", "times", "$\\times$"}, // multiplication sign, U+00D7 ISOnum
-            {"216", "Oslash", "{{\\O}}"}, // latin capital letter O with stroke
-            //                                 = latin capital letter O slash,
-            //                                 U+00D8 ISOlat1
-            {"217", "Ugrave", "{{\\`{U}}}"}, // latin capital letter U with grave,
-            //                                 U+00D9 ISOlat1
-            {"218", "Uacute", "{{\\'{U}}}"}, // latin capital letter U with acute,
-            //                                 U+00DA ISOlat1
-            {"219", "Ucirc", "{{\\^{U}}}"}, // latin capital letter U with circumflex,
-            //                                 U+00DB ISOlat1
-            {"220", "Uuml", "{{\\\"{U}}}"}, // latin capital letter U with diaeresis,
-            //                                 U+00DC ISOlat1
-            {"221", "Yacute", "{{\\'{Y}}}"}, // latin capital letter Y with acute,
-            //                                 U+00DD ISOlat1
-            {"222", "THORN", "{{\\TH}}"}, // latin capital letter THORN,
-            //                                 U+00DE ISOlat1
-            {"223", "szlig", "{\\ss}"}, // latin small letter sharp s = ess-zed,
-            //                                 U+00DF ISOlat1
-            {"224", "agrave", "{\\`{a}}"}, // latin small letter a with grave
-            //                                 = latin small letter a grave,
-            //                                 U+00E0 ISOlat1
-            {"225", "aacute", "{\\'{a}}"}, // latin small letter a with acute,
-            //                                 U+00E1 ISOlat1
-            {"226", "acirc", "{\\^{a}}"}, // latin small letter a with circumflex,
-            //                                 U+00E2 ISOlat1
-            {"227", "atilde", "{\\~{a}}"}, // latin small letter a with tilde,
-            //                                 U+00E3 ISOlat1
-            {"228", "auml", "{\\\"{a}}"}, // latin small letter a with diaeresis,
-            //                                 U+00E4 ISOlat1
-            {"229", "aring", "{{\\aa}}"}, // latin small letter a with ring above
-            //                                 = latin small letter a ring,
-            //                                 U+00E5 ISOlat1
-            {"230", "aelig", "{\\ae}"}, // latin small letter ae
-            //                                 = latin small ligature ae, U+00E6 ISOlat1
-            {"231", "ccedil", "{\\c{c}}"}, // latin small letter c with cedilla,
-            //                                 U+00E7 ISOlat1
-            {"232", "egrave", "{\\`{e}}"}, // latin small letter e with grave,
-            //                                 U+00E8 ISOlat1
-            {"233", "eacute", "{\\'{e}}"}, // latin small letter e with acute,
-            //                                 U+00E9 ISOlat1
-            {"234", "ecirc", "{\\^{e}}"}, // latin small letter e with circumflex,
-            //                                 U+00EA ISOlat1
-            {"235", "euml", "{\\\"{e}}"}, // latin small letter e with diaeresis,
-            //                                 U+00EB ISOlat1
-            {"236", "igrave", "{\\`{i}}"}, // latin small letter i with grave,
-            //                                 U+00EC ISOlat1
-            {"237", "iacute", "{\\'{i}}"}, // latin small letter i with acute,
-            //                                 U+00ED ISOlat1
-            {"238", "icirc", "{\\^{i}}"}, // latin small letter i with circumflex,
-            //                                 U+00EE ISOlat1
-            {"239", "iuml", "{\\\"{i}}"}, // latin small letter i with diaeresis,
-            //                                 U+00EF ISOlat1
-            {"240", "eth", "{\\dh}"}, // latin small letter eth, U+00F0 ISOlat1
-            {"241", "ntilde", "{\\~{n}}"}, // latin small letter n with tilde,
-            //                                 U+00F1 ISOlat1
-            {"242", "ograve", "{\\`{o}}"}, // latin small letter o with grave,
-            //                                 U+00F2 ISOlat1
-            {"243", "oacute", "{\\'{o}}"}, // latin small letter o with acute,
-            //                                 U+00F3 ISOlat1
-            {"244", "ocirc", "{\\^{o}}"}, // latin small letter o with circumflex,
-            //                                 U+00F4 ISOlat1
-            {"245", "otilde", "{\\~{o}}"}, // latin small letter o with tilde,
-            //                                 U+00F5 ISOlat1
-            {"246", "ouml", "{\\\"{o}}"}, // latin small letter o with diaeresis,
-            //                                 U+00F6 ISOlat1
-            {"247", "divide", "$\\div$"}, // division sign, U+00F7 ISOnum
-            {"248", "oslash", "{\\o}"}, // latin small letter o with stroke,
-            //                                 = latin small letter o slash,
-            //                                 U+00F8 ISOlat1
-            {"249", "ugrave", "{\\`{u}}"}, // latin small letter u with grave,
-            //                                 U+00F9 ISOlat1
-            {"250", "uacute", "{\\'{u}}"}, // latin small letter u with acute,
-            //                                 U+00FA ISOlat1
-            {"251", "ucirc", "{\\^{u}}"}, // latin small letter u with circumflex,
-            //                                 U+00FB ISOlat1
-            {"252", "uuml", "{\\\"{u}}"}, // latin small letter u with diaeresis,
-            //                                 U+00FC ISOlat1
-            {"253", "yacute", "{\\'{y}}"}, // latin small letter y with acute,
-            //                                 U+00FD ISOlat1
-            {"254", "thorn", "{\\th}"}, // latin small letter thorn,
-            //                                 U+00FE ISOlat1
-            {"255", "yuml", "{\\\"{y}}"}, // latin small letter y with diaeresis,
-            //                                 U+00FF ISOlat1
+    private static final String[][] CONVERSION_LIST =
+            new String[][] {
+                {"160", "nbsp", "{~}"}, // no-break space = non-breaking space,
+                //                                 U+00A0 ISOnum
+                {"161", "iexcl", "{\\textexclamdown}"}, // inverted exclamation mark, U+00A1 ISOnum
+                {"162", "cent", "{\\textcent}"}, // cent sign, U+00A2 ISOnum
+                {"163", "pound", "{\\pounds}"}, // pound sign, U+00A3 ISOnum
+                {"164", "curren", "{\\textcurrency}"}, // currency sign, U+00A4 ISOnum
+                {"165", "yen", "{\\textyen}"}, // yen sign = yuan sign, U+00A5 ISOnum
+                {"166", "brvbar", "{\\textbrokenbar}"}, // broken bar = broken vertical bar,
+                //                                 U+00A6 ISOnum
+                {"167", "sect", "{{\\S}}"}, // section sign, U+00A7 ISOnum
+                {"168", "uml", "{\\\"{}}"}, // diaeresis = spacing diaeresis,
+                //                                 U+00A8 ISOdia
+                {"169", "copy", "{\\copyright}"}, // copyright sign, U+00A9 ISOnum
+                {"170", "ordf", "{\\textordfeminine}"}, // feminine ordinal indicator, U+00AA ISOnum
+                {"171", "laquo", "{\\guillemotleft}"}, // left-pointing double angle quotation mark
+                //                                 = left pointing guillemet, U+00AB ISOnum
+                {"172", "not", "$\\neg$"}, // not sign, U+00AC ISOnum
+                {"173", "shy", "\\-"}, // soft hyphen = discretionary hyphen,
+                //                                 U+00AD ISOnum
+                {
+                    "174", "reg", "{\\textregistered}"
+                }, // registered sign = registered trade mark sign,
+                //                                 U+00AE ISOnum
+                {"175", "macr", "{\\={}}"}, // macron = spacing macron = overline
+                //                                 = APL overbar, U+00AF ISOdia
+                {"176", "deg", "{$^{\\circ}$}"}, // degree sign, U+00B0 ISOnum
+                {"177", "plusmn", "$\\pm$"}, // plus-minus sign = plus-or-minus sign,
+                //                                 U+00B1 ISOnum
+                {"178", "sup2", "\\textsuperscript{2}"}, // superscript two = superscript digit two
+                //                                 = squared, U+00B2 ISOnum
+                {
+                    "179", "sup3", "\\textsuperscript{3}"
+                }, // superscript three = superscript digit three
+                //                                 = cubed, U+00B3 ISOnum
+                {"180", "acute", "{\\'{}}"}, // acute accent = spacing acute,
+                //                                 U+00B4 ISOdia
+                {"181", "micro", "$\\mu$"}, // micro sign, U+00B5 ISOnum
+                {"", "mu", "$\\mu$"}, // micro sign, U+00B5 ISOnum
+                {"182", "para", "{{\\P}}"}, // pilcrow sign = paragraph sign,
+                //                                 U+00B6 ISOnum
+                {"183", "middot", "$\\cdot$"}, // middle dot = Georgian comma
+                //                                 = Greek middle dot, U+00B7 ISOnum
+                {"184", "cedil", "{\\c{}}"}, // cedilla = spacing cedilla, U+00B8 ISOdia
+                {"185", "sup1", "\\textsuperscript{1}"}, // superscript one = superscript digit one,
+                //                                 U+00B9 ISOnum
+                {"186", "ordm", "{\\textordmasculine}"}, // masculine ordinal indicator,
+                //                                 U+00BA ISOnum
+                {
+                    "187", "raquo", "{\\guillemotright}"
+                }, // right-pointing double angle quotation mark
+                //                                 = right pointing guillemet, U+00BB ISOnum
+                {"188", "frac14", "$\\sfrac{1}{4}$"}, // vulgar fraction one quarter
+                //                                 = fraction one quarter, U+00BC ISOnum
+                {"189", "frac12", "$\\sfrac{1}{2}$"}, // vulgar fraction one half
+                //                                 = fraction one half, U+00BD ISOnum
+                {"190", "frac34", "$\\sfrac{3}{4}$"}, // vulgar fraction three quarters
+                //                                 = fraction three quarters, U+00BE ISOnum
+                {"191", "iquest", "{\\textquestiondown}"}, // inverted question mark
+                //                                 = turned question mark, U+00BF ISOnum
+                {"192", "Agrave", "{{\\`{A}}}"}, // latin capital letter A with grave
+                //                                 = latin capital letter A grave,
+                //                                 U+00C0 ISOlat1
+                {"193", "Aacute", "{{\\'{A}}}"}, // latin capital letter A with acute,
+                //                                 U+00C1 ISOlat1
+                {"194", "Acirc", "{{\\^{A}}}"}, // latin capital letter A with circumflex,
+                //                                 U+00C2 ISOlat1
+                {"195", "Atilde", "{{\\~{A}}}"}, // latin capital letter A with tilde,
+                //                                 U+00C3 ISOlat1
+                {"196", "Auml", "{{\\\"{A}}}"}, // latin capital letter A with diaeresis,
+                //                                 U+00C4 ISOlat1
+                {"197", "Aring", "{{\\AA}}"}, // latin capital letter A with ring above
+                //                                 = latin capital letter A ring,
+                //                                 U+00C5 ISOlat1
+                {"198", "AElig", "{{\\AE}}"}, // latin capital letter AE
+                //                                 = latin capital ligature AE,
+                //                                 U+00C6 ISOlat1
+                {"199", "Ccedil", "{{\\c{C}}}"}, // latin capital letter C with cedilla,
+                //                                 U+00C7 ISOlat1
+                {"200", "Egrave", "{{\\`{E}}}"}, // latin capital letter E with grave,
+                //                                 U+00C8 ISOlat1
+                {"201", "Eacute", "{{\\'{E}}}"}, // latin capital letter E with acute,
+                //                                 U+00C9 ISOlat1
+                {"202", "Ecirc", "{{\\^{E}}}"}, // latin capital letter E with circumflex,
+                //                                 U+00CA ISOlat1
+                {"203", "Euml", "{{\\\"{E}}}"}, // latin capital letter E with diaeresis,
+                //                                 U+00CB ISOlat1
+                {"204", "Igrave", "{{\\`{I}}}"}, // latin capital letter I with grave,
+                //                                 U+00CC ISOlat1
+                {"205", "Iacute", "{{\\'{I}}}"}, // latin capital letter I with acute,
+                //                                 U+00CD ISOlat1
+                {"206", "Icirc", "{{\\^{I}}}"}, // latin capital letter I with circumflex,
+                //                                 U+00CE ISOlat1
+                {"207", "Iuml", "{{\\\"{I}}}"}, // latin capital letter I with diaeresis,
+                //                                 U+00CF ISOlat1
+                {"208", "ETH", "{{\\DH}}"}, // latin capital letter ETH, U+00D0 ISOlat1
+                {"209", "Ntilde", "{{\\~{N}}}"}, // latin capital letter N with tilde,
+                //                                 U+00D1 ISOlat1
+                {"210", "Ograve", "{{\\`{O}}}"}, // latin capital letter O with grave,
+                //                                 U+00D2 ISOlat1
+                {"211", "Oacute", "{{\\'{O}}}"}, // latin capital letter O with acute,
+                //                                 U+00D3 ISOlat1
+                {"212", "Ocirc", "{{\\^{O}}}"}, // latin capital letter O with circumflex,
+                //                                 U+00D4 ISOlat1
+                {"213", "Otilde", "{{\\~{O}}}"}, // latin capital letter O with tilde,
+                //                                 U+00D5 ISOlat1
+                {"214", "Ouml", "{{\\\"{O}}}"}, // latin capital letter O with diaeresis,
+                //                                 U+00D6 ISOlat1
+                {"215", "times", "$\\times$"}, // multiplication sign, U+00D7 ISOnum
+                {"216", "Oslash", "{{\\O}}"}, // latin capital letter O with stroke
+                //                                 = latin capital letter O slash,
+                //                                 U+00D8 ISOlat1
+                {"217", "Ugrave", "{{\\`{U}}}"}, // latin capital letter U with grave,
+                //                                 U+00D9 ISOlat1
+                {"218", "Uacute", "{{\\'{U}}}"}, // latin capital letter U with acute,
+                //                                 U+00DA ISOlat1
+                {"219", "Ucirc", "{{\\^{U}}}"}, // latin capital letter U with circumflex,
+                //                                 U+00DB ISOlat1
+                {"220", "Uuml", "{{\\\"{U}}}"}, // latin capital letter U with diaeresis,
+                //                                 U+00DC ISOlat1
+                {"221", "Yacute", "{{\\'{Y}}}"}, // latin capital letter Y with acute,
+                //                                 U+00DD ISOlat1
+                {"222", "THORN", "{{\\TH}}"}, // latin capital letter THORN,
+                //                                 U+00DE ISOlat1
+                {"223", "szlig", "{\\ss}"}, // latin small letter sharp s = ess-zed,
+                //                                 U+00DF ISOlat1
+                {"224", "agrave", "{\\`{a}}"}, // latin small letter a with grave
+                //                                 = latin small letter a grave,
+                //                                 U+00E0 ISOlat1
+                {"225", "aacute", "{\\'{a}}"}, // latin small letter a with acute,
+                //                                 U+00E1 ISOlat1
+                {"226", "acirc", "{\\^{a}}"}, // latin small letter a with circumflex,
+                //                                 U+00E2 ISOlat1
+                {"227", "atilde", "{\\~{a}}"}, // latin small letter a with tilde,
+                //                                 U+00E3 ISOlat1
+                {"228", "auml", "{\\\"{a}}"}, // latin small letter a with diaeresis,
+                //                                 U+00E4 ISOlat1
+                {"229", "aring", "{{\\aa}}"}, // latin small letter a with ring above
+                //                                 = latin small letter a ring,
+                //                                 U+00E5 ISOlat1
+                {"230", "aelig", "{\\ae}"}, // latin small letter ae
+                //                                 = latin small ligature ae, U+00E6 ISOlat1
+                {"231", "ccedil", "{\\c{c}}"}, // latin small letter c with cedilla,
+                //                                 U+00E7 ISOlat1
+                {"232", "egrave", "{\\`{e}}"}, // latin small letter e with grave,
+                //                                 U+00E8 ISOlat1
+                {"233", "eacute", "{\\'{e}}"}, // latin small letter e with acute,
+                //                                 U+00E9 ISOlat1
+                {"234", "ecirc", "{\\^{e}}"}, // latin small letter e with circumflex,
+                //                                 U+00EA ISOlat1
+                {"235", "euml", "{\\\"{e}}"}, // latin small letter e with diaeresis,
+                //                                 U+00EB ISOlat1
+                {"236", "igrave", "{\\`{i}}"}, // latin small letter i with grave,
+                //                                 U+00EC ISOlat1
+                {"237", "iacute", "{\\'{i}}"}, // latin small letter i with acute,
+                //                                 U+00ED ISOlat1
+                {"238", "icirc", "{\\^{i}}"}, // latin small letter i with circumflex,
+                //                                 U+00EE ISOlat1
+                {"239", "iuml", "{\\\"{i}}"}, // latin small letter i with diaeresis,
+                //                                 U+00EF ISOlat1
+                {"240", "eth", "{\\dh}"}, // latin small letter eth, U+00F0 ISOlat1
+                {"241", "ntilde", "{\\~{n}}"}, // latin small letter n with tilde,
+                //                                 U+00F1 ISOlat1
+                {"242", "ograve", "{\\`{o}}"}, // latin small letter o with grave,
+                //                                 U+00F2 ISOlat1
+                {"243", "oacute", "{\\'{o}}"}, // latin small letter o with acute,
+                //                                 U+00F3 ISOlat1
+                {"244", "ocirc", "{\\^{o}}"}, // latin small letter o with circumflex,
+                //                                 U+00F4 ISOlat1
+                {"245", "otilde", "{\\~{o}}"}, // latin small letter o with tilde,
+                //                                 U+00F5 ISOlat1
+                {"246", "ouml", "{\\\"{o}}"}, // latin small letter o with diaeresis,
+                //                                 U+00F6 ISOlat1
+                {"247", "divide", "$\\div$"}, // division sign, U+00F7 ISOnum
+                {"248", "oslash", "{\\o}"}, // latin small letter o with stroke,
+                //                                 = latin small letter o slash,
+                //                                 U+00F8 ISOlat1
+                {"249", "ugrave", "{\\`{u}}"}, // latin small letter u with grave,
+                //                                 U+00F9 ISOlat1
+                {"250", "uacute", "{\\'{u}}"}, // latin small letter u with acute,
+                //                                 U+00FA ISOlat1
+                {"251", "ucirc", "{\\^{u}}"}, // latin small letter u with circumflex,
+                //                                 U+00FB ISOlat1
+                {"252", "uuml", "{\\\"{u}}"}, // latin small letter u with diaeresis,
+                //                                 U+00FC ISOlat1
+                {"253", "yacute", "{\\'{y}}"}, // latin small letter y with acute,
+                //                                 U+00FD ISOlat1
+                {"254", "thorn", "{\\th}"}, // latin small letter thorn,
+                //                                 U+00FE ISOlat1
+                {"255", "yuml", "{\\\"{y}}"}, // latin small letter y with diaeresis,
+                //                                 U+00FF ISOlat1
 
-            /* Greek */
-            {"913", "Alpha", "{{$\\Alpha$}}"}, // greek capital letter alpha, U+0391
-            {"914", "Beta", "{{$\\Beta$}}"}, // greek capital letter beta, U+0392
-            {"915", "Gamma", "{{$\\Gamma$}}"}, // greek capital letter gamma,
-            //                                   U+0393 ISOgrk3
-            {"916", "Delta", "{{$\\Delta$}}"}, // greek capital letter delta,
-            //                                   U+0394 ISOgrk3
-            {"917", "Epsilon", "{{$\\Epsilon$}}"}, // greek capital letter epsilon, U+0395
-            {"918", "Zeta", "{{$\\Zeta$}}"}, // greek capital letter zeta, U+0396
-            {"919", "Eta", "{{$\\Eta$}}"}, // greek capital letter eta, U+0397
-            {"920", "Theta", "{{$\\Theta$}}"}, // greek capital letter theta,
-            //                                   U+0398 ISOgrk3
-            {"921", "Iota", "{{$\\Iota$}}"}, // greek capital letter iota, U+0399
-            {"922", "Kappa", "{{$\\Kappa$}}"}, // greek capital letter kappa, U+039A
-            {"923", "Lambda", "{{$\\Lambda$}}"}, // greek capital letter lambda,
-            //                                   U+039B ISOgrk3
-            {"924", "Mu", "{{$\\Mu$}}"}, // greek capital letter mu, U+039C
-            {"925", "Nu", "{{$\\Nu$}}"}, // greek capital letter nu, U+039D
-            {"926", "Xi", "{{$\\Xi$}}"}, // greek capital letter xi, U+039E ISOgrk3
-            {"927", "Omicron", "{{$\\Omicron$}}"}, // greek capital letter omicron, U+039F
-            {"928", "Pi", "{{$\\Pi$}}"}, // greek capital letter pi, U+03A0 ISOgrk3
-            {"929", "Rho", "{{$\\Rho$}}"}, // greek capital letter rho, U+03A1
-            /* there is no Sigmaf, and no U+03A2 character either */
-            {"931", "Sigma", "{{$\\Sigma$}}"}, // greek capital letter sigma,
-            //                                   U+03A3 ISOgrk3
-            {"932", "Tau", "{{$\\Tau$}}"}, // greek capital letter tau, U+03A4
-            {"933", "Upsilon", "{{$\\Upsilon$}}"}, // greek capital letter upsilon,
-            //                                   U+03A5 ISOgrk3
-            {"934", "Phi", "{{$\\Phi$}}"}, // greek capital letter phi,
-            //                                   U+03A6 ISOgrk3
-            {"935", "Chi", "{{$\\Chi$}}"}, // greek capital letter chi, U+03A7
-            {"936", "Psi", "{{$\\Psi$}}"}, // greek capital letter psi,
-            //                                   U+03A8 ISOgrk3
-            {"937", "Omega", "{{$\\Omega$}}"}, // greek capital letter omega,
-            //                                   U+03A9 ISOgrk3
+                /* Greek */
+                {"913", "Alpha", "{{$\\Alpha$}}"}, // greek capital letter alpha, U+0391
+                {"914", "Beta", "{{$\\Beta$}}"}, // greek capital letter beta, U+0392
+                {"915", "Gamma", "{{$\\Gamma$}}"}, // greek capital letter gamma,
+                //                                   U+0393 ISOgrk3
+                {"916", "Delta", "{{$\\Delta$}}"}, // greek capital letter delta,
+                //                                   U+0394 ISOgrk3
+                {"917", "Epsilon", "{{$\\Epsilon$}}"}, // greek capital letter epsilon, U+0395
+                {"918", "Zeta", "{{$\\Zeta$}}"}, // greek capital letter zeta, U+0396
+                {"919", "Eta", "{{$\\Eta$}}"}, // greek capital letter eta, U+0397
+                {"920", "Theta", "{{$\\Theta$}}"}, // greek capital letter theta,
+                //                                   U+0398 ISOgrk3
+                {"921", "Iota", "{{$\\Iota$}}"}, // greek capital letter iota, U+0399
+                {"922", "Kappa", "{{$\\Kappa$}}"}, // greek capital letter kappa, U+039A
+                {"923", "Lambda", "{{$\\Lambda$}}"}, // greek capital letter lambda,
+                //                                   U+039B ISOgrk3
+                {"924", "Mu", "{{$\\Mu$}}"}, // greek capital letter mu, U+039C
+                {"925", "Nu", "{{$\\Nu$}}"}, // greek capital letter nu, U+039D
+                {"926", "Xi", "{{$\\Xi$}}"}, // greek capital letter xi, U+039E ISOgrk3
+                {"927", "Omicron", "{{$\\Omicron$}}"}, // greek capital letter omicron, U+039F
+                {"928", "Pi", "{{$\\Pi$}}"}, // greek capital letter pi, U+03A0 ISOgrk3
+                {"929", "Rho", "{{$\\Rho$}}"}, // greek capital letter rho, U+03A1
+                /* there is no Sigmaf, and no U+03A2 character either */
+                {"931", "Sigma", "{{$\\Sigma$}}"}, // greek capital letter sigma,
+                //                                   U+03A3 ISOgrk3
+                {"932", "Tau", "{{$\\Tau$}}"}, // greek capital letter tau, U+03A4
+                {"933", "Upsilon", "{{$\\Upsilon$}}"}, // greek capital letter upsilon,
+                //                                   U+03A5 ISOgrk3
+                {"934", "Phi", "{{$\\Phi$}}"}, // greek capital letter phi,
+                //                                   U+03A6 ISOgrk3
+                {"935", "Chi", "{{$\\Chi$}}"}, // greek capital letter chi, U+03A7
+                {"936", "Psi", "{{$\\Psi$}}"}, // greek capital letter psi,
+                //                                   U+03A8 ISOgrk3
+                {"937", "Omega", "{{$\\Omega$}}"}, // greek capital letter omega,
+                //                                   U+03A9 ISOgrk3
 
-            {"945", "alpha", "$\\alpha$"}, // greek small letter alpha,
-            //                                   U+03B1 ISOgrk3
-            {"946", "beta", "$\\beta$"}, // greek small letter beta, U+03B2 ISOgrk3
-            {"947", "gamma", "$\\gamma$"}, // greek small letter gamma,
-            //                                   U+03B3 ISOgrk3
-            {"948", "delta", "$\\delta$"}, // greek small letter delta,
-            //                                   U+03B4 ISOgrk3
-            {"949", "epsilon", "$\\epsilon$"}, // greek small letter epsilon,
-            //                                   U+03B5 ISOgrk3
-            {"950", "zeta", "$\\zeta$"}, // greek small letter zeta, U+03B6 ISOgrk3
-            {"951", "eta", "$\\eta$"}, // greek small letter eta, U+03B7 ISOgrk3
-            {"952", "theta", "$\\theta$"}, // greek small letter theta,
-            //                                   U+03B8 ISOgrk3
-            {"953", "iota", "$\\iota$"}, // greek small letter iota, U+03B9 ISOgrk3
-            {"954", "kappa", "$\\kappa$"}, // greek small letter kappa,
-            //                                   U+03BA ISOgrk3
-            {"955", "lambda", "$\\lambda$"}, // greek small letter lambda,
-            //                                   U+03BB ISOgrk3
-            {"956", "mu", "$\\mu$"}, // greek small letter mu, U+03BC ISOgrk3
-            {"957", "nu", "$\\nu$"}, // greek small letter nu, U+03BD ISOgrk3
-            {"958", "xi", "$\\xi$"}, // greek small letter xi, U+03BE ISOgrk3
-            {"959", "omicron", "$\\omicron$"}, // greek small letter omicron, U+03BF NEW
-            {"960", "pi", "$\\pi$"}, // greek small letter pi, U+03C0 ISOgrk3
-            {"961", "rho", "$\\rho$"}, // greek small letter rho, U+03C1 ISOgrk3
-            {"962", "sigmaf", "$\\varsigma$"}, // greek small letter final sigma,
-            //                                   U+03C2 ISOgrk3
-            {"963", "sigma", "$\\sigma$"}, // greek small letter sigma,
-            //                                   U+03C3 ISOgrk3
-            {"964", "tau", "$\\tau$"}, // greek small letter tau, U+03C4 ISOgrk3
-            {"965", "upsilon", "$\\upsilon$"}, // greek small letter upsilon,
-            {"", "upsi", "$\\upsilon$"}, // alias
-            //                                   U+03C5 ISOgrk3
-            {"966", "phi", "$\\phi$"}, // greek small letter phi, U+03C6 ISOgrk3
-            {"967", "chi", "$\\chi$"}, // greek small letter chi, U+03C7 ISOgrk3
-            {"968", "psi", "$\\psi$"}, // greek small letter psi, U+03C8 ISOgrk3
-            {"969", "omega", "$\\omega$"}, // greek small letter omega,
-            //                                   U+03C9 ISOgrk3
-            {"977", "thetasym", "$\\vartheta$"}, // greek small letter theta symbol,
-            {"", "thetav", "$\\vartheta$"}, // greek small letter theta symbol,
-            {"", "vartheta", "$\\vartheta$"}, // greek small letter theta symbol,
-            //                                   U+03D1 NEW
-            {"978", "upsih", "{{$\\Upsilon$}}"}, // greek upsilon with hook symbol,
-            //                                   U+03D2 NEW
-            {"982", "piv", "$\\varphi$"}, // greek pi symbol, U+03D6 ISOgrk3
-            /* Letters with Dot Below */
-            {"7751", "", "{\\d{n}}"}, // Latin Small Letter N with Dot Below, U+1E47
-            {"7789", "", "{\\d{t}}"}, // Latin Small Letter T with Dot Below, U+1E6D
-            {"7717", "", "{\\d{h}}"}, // Latin Small Letter H with Dot Below, U+1E25
-            {"7747", "", "{\\d{m}}"}, // Latin Small Letter M with Dot Below, U+1E43
-            {"7771", "", "{\\d{r}}"}, // Latin Small Letter R with Dot Below, U+1E5B
+                {"945", "alpha", "$\\alpha$"}, // greek small letter alpha,
+                //                                   U+03B1 ISOgrk3
+                {"946", "beta", "$\\beta$"}, // greek small letter beta, U+03B2 ISOgrk3
+                {"947", "gamma", "$\\gamma$"}, // greek small letter gamma,
+                //                                   U+03B3 ISOgrk3
+                {"948", "delta", "$\\delta$"}, // greek small letter delta,
+                //                                   U+03B4 ISOgrk3
+                {"949", "epsilon", "$\\epsilon$"}, // greek small letter epsilon,
+                //                                   U+03B5 ISOgrk3
+                {"950", "zeta", "$\\zeta$"}, // greek small letter zeta, U+03B6 ISOgrk3
+                {"951", "eta", "$\\eta$"}, // greek small letter eta, U+03B7 ISOgrk3
+                {"952", "theta", "$\\theta$"}, // greek small letter theta,
+                //                                   U+03B8 ISOgrk3
+                {"953", "iota", "$\\iota$"}, // greek small letter iota, U+03B9 ISOgrk3
+                {"954", "kappa", "$\\kappa$"}, // greek small letter kappa,
+                //                                   U+03BA ISOgrk3
+                {"955", "lambda", "$\\lambda$"}, // greek small letter lambda,
+                //                                   U+03BB ISOgrk3
+                {"956", "mu", "$\\mu$"}, // greek small letter mu, U+03BC ISOgrk3
+                {"957", "nu", "$\\nu$"}, // greek small letter nu, U+03BD ISOgrk3
+                {"958", "xi", "$\\xi$"}, // greek small letter xi, U+03BE ISOgrk3
+                {"959", "omicron", "$\\omicron$"}, // greek small letter omicron, U+03BF NEW
+                {"960", "pi", "$\\pi$"}, // greek small letter pi, U+03C0 ISOgrk3
+                {"961", "rho", "$\\rho$"}, // greek small letter rho, U+03C1 ISOgrk3
+                {"962", "sigmaf", "$\\varsigma$"}, // greek small letter final sigma,
+                //                                   U+03C2 ISOgrk3
+                {"963", "sigma", "$\\sigma$"}, // greek small letter sigma,
+                //                                   U+03C3 ISOgrk3
+                {"964", "tau", "$\\tau$"}, // greek small letter tau, U+03C4 ISOgrk3
+                {"965", "upsilon", "$\\upsilon$"}, // greek small letter upsilon,
+                {"", "upsi", "$\\upsilon$"}, // alias
+                //                                   U+03C5 ISOgrk3
+                {"966", "phi", "$\\phi$"}, // greek small letter phi, U+03C6 ISOgrk3
+                {"967", "chi", "$\\chi$"}, // greek small letter chi, U+03C7 ISOgrk3
+                {"968", "psi", "$\\psi$"}, // greek small letter psi, U+03C8 ISOgrk3
+                {"969", "omega", "$\\omega$"}, // greek small letter omega,
+                //                                   U+03C9 ISOgrk3
+                {"977", "thetasym", "$\\vartheta$"}, // greek small letter theta symbol,
+                {"", "thetav", "$\\vartheta$"}, // greek small letter theta symbol,
+                {"", "vartheta", "$\\vartheta$"}, // greek small letter theta symbol,
+                //                                   U+03D1 NEW
+                {"978", "upsih", "{{$\\Upsilon$}}"}, // greek upsilon with hook symbol,
+                //                                   U+03D2 NEW
+                {"982", "piv", "$\\varphi$"}, // greek pi symbol, U+03D6 ISOgrk3
+                /* Letters with Dot Below */
+                {"7751", "", "{\\d{n}}"}, // Latin Small Letter N with Dot Below, U+1E47
+                {"7789", "", "{\\d{t}}"}, // Latin Small Letter T with Dot Below, U+1E6D
+                {"7717", "", "{\\d{h}}"}, // Latin Small Letter H with Dot Below, U+1E25
+                {"7747", "", "{\\d{m}}"}, // Latin Small Letter M with Dot Below, U+1E43
+                {"7771", "", "{\\d{r}}"}, // Latin Small Letter R with Dot Below, U+1E5B
 
-            /* General Punctuation */
-            {"8211", "ndash", "$\\textendash$"},
-            {"8212", "mdash", "$\\textemdash$"},
-            {"8226", "bull", "$\\bullet$"}, // bullet = black small circle,
-            //                                    U+2022 ISOpub
-            /* bullet is NOT the same as bullet operator, U+2219 */
-            {"8230", "hellip", "{\\ldots}"}, // horizontal ellipsis = three dot leader,
-            //                                    U+2026 ISOpub
-            {"8242", "prime", "$\\prime$"}, // prime = minutes = feet, U+2032 ISOtech
-            {"8243", "Prime", "$\\prime\\prime$"}, // double prime = seconds = inches,
-            //                                    U+2033 ISOtech
-            {"8254", "oline", "{\\={}}"}, // overline = spacing overscore,
-            //                                    U+203E NEW
-            {"8260", "frasl", "/"}, // fraction slash, U+2044 NEW
+                /* General Punctuation */
+                {"8211", "ndash", "$\\textendash$"},
+                {"8212", "mdash", "$\\textemdash$"},
+                {"8226", "bull", "$\\bullet$"}, // bullet = black small circle,
+                //                                    U+2022 ISOpub
+                /* bullet is NOT the same as bullet operator, U+2219 */
+                {"8230", "hellip", "{\\ldots}"}, // horizontal ellipsis = three dot leader,
+                //                                    U+2026 ISOpub
+                {"8242", "prime", "$\\prime$"}, // prime = minutes = feet, U+2032 ISOtech
+                {"8243", "Prime", "$\\prime\\prime$"}, // double prime = seconds = inches,
+                //                                    U+2033 ISOtech
+                {"8254", "oline", "{\\={}}"}, // overline = spacing overscore,
+                //                                    U+203E NEW
+                {"8260", "frasl", "/"}, // fraction slash, U+2044 NEW
 
-            /* Letterlike Symbols */
-            {"8472", "weierp", "$\\wp$"}, // script capital P = power set
-            //                                    = Weierstrass p, U+2118 ISOamso
-            {"8465", "image", "{{$\\Im$}}"}, // blackletter capital I = imaginary part,
-            //                                    U+2111 ISOamso
-            {"8476", "real", "{{$\\Re$}}"}, // blackletter capital R = real part symbol,
-            //                                    U+211C ISOamso
-            {"8482", "trade", "{\\texttrademark}"}, // trade mark sign, U+2122 ISOnum
-            {"8501", "alefsym", "$\\aleph$"}, // alef symbol = first transfinite cardinal,
-            //                                    U+2135 NEW
-            /*    alef symbol is NOT the same as hebrew letter alef,
-             U+05D0 although the same glyph could be used to depict both characters */
-            /* Arrows */
-            {"8592", "larr", "$\\leftarrow$"}, // leftwards arrow, U+2190 ISOnum
-            {"8593", "uarr", "$\\uparrow$"}, // upwards arrow, U+2191 ISOnum
-            {"8594", "rarr", "$\\rightarrow$"}, // rightwards arrow, U+2192 ISOnum
-            {"8595", "darr", "$\\downarrow$"}, // downwards arrow, U+2193 ISOnum
-            {"8596", "harr", "$\\leftrightarrow$"}, // left right arrow, U+2194 ISOamsa
-            {"8629", "crarr", "$\\dlsh$"}, // downwards arrow with corner leftwards
-            //                                    = carriage return, U+21B5 NEW - require mathabx
-            {"8656", "lArr", "{{$\\Leftarrow$}}"}, // leftwards double arrow, U+21D0 ISOtech
-            /*  ISO 10646 does not say that lArr is the same as the 'is implied by' arrow
-             but also does not have any other character for that function. So ? lArr can
-             be used for 'is implied by' as ISOtech suggests */
-            {"8657", "uArr", "{{$\\Uparrow$}}"}, // upwards double arrow, U+21D1 ISOamsa
-            {"8658", "rArr", "{{$\\Rightarrow$}}"}, // rightwards double arrow,
-            //                                     U+21D2 ISOtech
-            /*   ISO 10646 does not say this is the 'implies' character but does not have
-             another character with this function so ?
-             rArr can be used for 'implies' as ISOtech suggests */
-            {"8659", "dArr", "{{$\\Downarrow$}}"}, // downwards double arrow, U+21D3 ISOamsa
-            {"8660", "hArr", "{{$\\Leftrightarrow$}}"}, // left right double arrow,
-            //                                     U+21D4 ISOamsa
+                /* Letterlike Symbols */
+                {"8472", "weierp", "$\\wp$"}, // script capital P = power set
+                //                                    = Weierstrass p, U+2118 ISOamso
+                {"8465", "image", "{{$\\Im$}}"}, // blackletter capital I = imaginary part,
+                //                                    U+2111 ISOamso
+                {"8476", "real", "{{$\\Re$}}"}, // blackletter capital R = real part symbol,
+                //                                    U+211C ISOamso
+                {"8482", "trade", "{\\texttrademark}"}, // trade mark sign, U+2122 ISOnum
+                {"8501", "alefsym", "$\\aleph$"}, // alef symbol = first transfinite cardinal,
+                //                                    U+2135 NEW
+                /*    alef symbol is NOT the same as hebrew letter alef,
+                U+05D0 although the same glyph could be used to depict both characters */
+                /* Arrows */
+                {"8592", "larr", "$\\leftarrow$"}, // leftwards arrow, U+2190 ISOnum
+                {"8593", "uarr", "$\\uparrow$"}, // upwards arrow, U+2191 ISOnum
+                {"8594", "rarr", "$\\rightarrow$"}, // rightwards arrow, U+2192 ISOnum
+                {"8595", "darr", "$\\downarrow$"}, // downwards arrow, U+2193 ISOnum
+                {"8596", "harr", "$\\leftrightarrow$"}, // left right arrow, U+2194 ISOamsa
+                {"8629", "crarr", "$\\dlsh$"}, // downwards arrow with corner leftwards
+                //                                    = carriage return, U+21B5 NEW - require
+                // mathabx
+                {"8656", "lArr", "{{$\\Leftarrow$}}"}, // leftwards double arrow, U+21D0 ISOtech
+                /*  ISO 10646 does not say that lArr is the same as the 'is implied by' arrow
+                but also does not have any other character for that function. So ? lArr can
+                be used for 'is implied by' as ISOtech suggests */
+                {"8657", "uArr", "{{$\\Uparrow$}}"}, // upwards double arrow, U+21D1 ISOamsa
+                {"8658", "rArr", "{{$\\Rightarrow$}}"}, // rightwards double arrow,
+                //                                     U+21D2 ISOtech
+                /*   ISO 10646 does not say this is the 'implies' character but does not have
+                another character with this function so ?
+                rArr can be used for 'implies' as ISOtech suggests */
+                {"8659", "dArr", "{{$\\Downarrow$}}"}, // downwards double arrow, U+21D3 ISOamsa
+                {"8660", "hArr", "{{$\\Leftrightarrow$}}"}, // left right double arrow,
+                //                                     U+21D4 ISOamsa
 
-            /* Mathematical Operators */
-            {"8704", "forall", "$\\forall$"}, // for all, U+2200 ISOtech
-            {"8706", "part", "$\\partial$"}, // partial differential, U+2202 ISOtech
-            {"8707", "exist", "$\\exists$"}, // there exists, U+2203 ISOtech
-            {"8709", "empty", "$\\emptyset$"}, // empty set = null set = diameter,
-            //                                    U+2205 ISOamso
-            {"8711", "nabla", "$\\nabla$"}, // nabla = backward difference,
-            //                                    U+2207 ISOtech
-            {"8712", "isin", "$\\in$"}, // element of, U+2208 ISOtech
-            {"8713", "notin", "$\\notin$"}, // not an element of, U+2209 ISOtech
-            {"8715", "ni", "$\\ni$"}, // contains as member, U+220B ISOtech
-            /* should there be a more memorable name than 'ni'? */
-            {"8719", "prod", "$\\prod$"}, // n-ary product = product sign,
-            //                                    U+220F ISOamsb
-            /*    prod is NOT the same character as U+03A0 'greek capital letter pi' though
-             the same glyph might be used for both  */
-            {"8721", "sum", "$\\sum$"}, // n-ary sumation, U+2211 ISOamsb
-            /*    sum is NOT the same character as U+03A3 'greek capital letter sigma'
-             though the same glyph might be used for both */
-            {"8722", "minus", "$-$"}, // minus sign, U+2212 ISOtech
-            {"8727", "lowast", "$\\ast$"}, // asterisk operator, U+2217 ISOtech
-            {"8730", "radic", "$\\sqrt{}$"}, // square root = radical sign,
-            //                                    U+221A ISOtech
-            {"8733", "prop", "$\\propto$"}, // proportional to, U+221D ISOtech
-            {"8734", "infin", "$\\infty$"}, // infinity, U+221E ISOtech
-            {"8736", "ang", "$\\angle$"}, // angle, U+2220 ISOamso
-            {"8743", "and", "$\\land$"}, // logical and = wedge, U+2227 ISOtech
-            {"8744", "or", "$\\lor$"}, // logical or = vee, U+2228 ISOtech
-            {"8745", "cap", "$\\cap$"}, // intersection = cap, U+2229 ISOtech
-            {"8746", "cup", "$\\cup$"}, // union = cup, U+222A ISOtech
-            {"8747", "int", "$\\int$"}, // integral, U+222B ISOtech
-            {"8756", "there4", "$\\therefore$"}, // therefore, U+2234 ISOtech; AMSSymb
-            {"8764", "sim", "$\\sim$"}, // tilde operator = varies with = similar to,
-            //                                    U+223C ISOtech
-            /*  tilde operator is NOT the same character as the tilde, U+007E,
-             although the same glyph might be used to represent both   */
-            {"8773", "cong", "$\\cong$"}, // approximately equal to, U+2245 ISOtech
-            {"8776", "asymp", "$\\approx$"}, // almost equal to = asymptotic to,
-            //                                    U+2248 ISOamsr
-            {"8800", "ne", "$\\neq$"}, // not equal to, U+2260 ISOtech
-            {"8801", "equiv", "$\\equiv$"}, // identical to, U+2261 ISOtech
-            {"8804", "le", "$\\leq$"}, // less-than or equal to, U+2264 ISOtech
-            {"8805", "ge", "$\\geq$"}, // greater-than or equal to,
-            //                                    U+2265 ISOtech
-            {"8834", "sub", "$\\subset$"}, // subset of, U+2282 ISOtech
-            {"8835", "sup", "$\\supset$"}, // superset of, U+2283 ISOtech
-            /*    note that nsup, 'not a superset of, U+2283' is not covered by the Symbol
-             font encoding and is not included. Should it be, for symmetry?
-             It is in ISOamsn   */
-            {"8836", "nsub", "$\\not\\subset$"}, // not a subset of, U+2284 ISOamsn
-            {"8838", "sube", "$\\subseteq$"}, // subset of or equal to, U+2286 ISOtech
-            {"8839", "supe", "$\\supseteq$"}, // superset of or equal to,
-            //                                    U+2287 ISOtech
-            {"8853", "oplus", "$\\oplus$"}, // circled plus = direct sum,
-            //                                    U+2295 ISOamsb
-            {"8855", "otimes", "$\\otimes$"}, // circled times = vector product,
-            //                                    U+2297 ISOamsb
-            {"8869", "perp", "$\\perp$"}, // up tack = orthogonal to = perpendicular,
-            //                                    U+22A5 ISOtech
-            {"8901", "sdot", "$\\cdot$"}, // dot operator, U+22C5 ISOamsb
-            /* dot operator is NOT the same character as U+00B7 middle dot */
-            {"8968", "lceil", "$\\lceil$"}, // left ceiling = apl upstile,
-            //                                    U+2308 ISOamsc
-            {"8969", "rceil", "$\\rceil$"}, // right ceiling, U+2309 ISOamsc
-            {"8970", "lfloor", "$\\lfloor$"}, // left floor = apl downstile,
-            //                                    U+230A ISOamsc
-            {"8971", "rfloor", "$\\rfloor$"}, // right floor, U+230B ISOamsc
+                /* Mathematical Operators */
+                {"8704", "forall", "$\\forall$"}, // for all, U+2200 ISOtech
+                {"8706", "part", "$\\partial$"}, // partial differential, U+2202 ISOtech
+                {"8707", "exist", "$\\exists$"}, // there exists, U+2203 ISOtech
+                {"8709", "empty", "$\\emptyset$"}, // empty set = null set = diameter,
+                //                                    U+2205 ISOamso
+                {"8711", "nabla", "$\\nabla$"}, // nabla = backward difference,
+                //                                    U+2207 ISOtech
+                {"8712", "isin", "$\\in$"}, // element of, U+2208 ISOtech
+                {"8713", "notin", "$\\notin$"}, // not an element of, U+2209 ISOtech
+                {"8715", "ni", "$\\ni$"}, // contains as member, U+220B ISOtech
+                /* should there be a more memorable name than 'ni'? */
+                {"8719", "prod", "$\\prod$"}, // n-ary product = product sign,
+                //                                    U+220F ISOamsb
+                /*    prod is NOT the same character as U+03A0 'greek capital letter pi' though
+                the same glyph might be used for both  */
+                {"8721", "sum", "$\\sum$"}, // n-ary sumation, U+2211 ISOamsb
+                /*    sum is NOT the same character as U+03A3 'greek capital letter sigma'
+                though the same glyph might be used for both */
+                {"8722", "minus", "$-$"}, // minus sign, U+2212 ISOtech
+                {"8727", "lowast", "$\\ast$"}, // asterisk operator, U+2217 ISOtech
+                {"8730", "radic", "$\\sqrt{}$"}, // square root = radical sign,
+                //                                    U+221A ISOtech
+                {"8733", "prop", "$\\propto$"}, // proportional to, U+221D ISOtech
+                {"8734", "infin", "$\\infty$"}, // infinity, U+221E ISOtech
+                {"8736", "ang", "$\\angle$"}, // angle, U+2220 ISOamso
+                {"8743", "and", "$\\land$"}, // logical and = wedge, U+2227 ISOtech
+                {"8744", "or", "$\\lor$"}, // logical or = vee, U+2228 ISOtech
+                {"8745", "cap", "$\\cap$"}, // intersection = cap, U+2229 ISOtech
+                {"8746", "cup", "$\\cup$"}, // union = cup, U+222A ISOtech
+                {"8747", "int", "$\\int$"}, // integral, U+222B ISOtech
+                {"8756", "there4", "$\\therefore$"}, // therefore, U+2234 ISOtech; AMSSymb
+                {"8764", "sim", "$\\sim$"}, // tilde operator = varies with = similar to,
+                //                                    U+223C ISOtech
+                /*  tilde operator is NOT the same character as the tilde, U+007E,
+                although the same glyph might be used to represent both   */
+                {"8773", "cong", "$\\cong$"}, // approximately equal to, U+2245 ISOtech
+                {"8776", "asymp", "$\\approx$"}, // almost equal to = asymptotic to,
+                //                                    U+2248 ISOamsr
+                {"8800", "ne", "$\\neq$"}, // not equal to, U+2260 ISOtech
+                {"8801", "equiv", "$\\equiv$"}, // identical to, U+2261 ISOtech
+                {"8804", "le", "$\\leq$"}, // less-than or equal to, U+2264 ISOtech
+                {"8805", "ge", "$\\geq$"}, // greater-than or equal to,
+                //                                    U+2265 ISOtech
+                {"8834", "sub", "$\\subset$"}, // subset of, U+2282 ISOtech
+                {"8835", "sup", "$\\supset$"}, // superset of, U+2283 ISOtech
+                /*    note that nsup, 'not a superset of, U+2283' is not covered by the Symbol
+                font encoding and is not included. Should it be, for symmetry?
+                It is in ISOamsn   */
+                {"8836", "nsub", "$\\not\\subset$"}, // not a subset of, U+2284 ISOamsn
+                {"8838", "sube", "$\\subseteq$"}, // subset of or equal to, U+2286 ISOtech
+                {"8839", "supe", "$\\supseteq$"}, // superset of or equal to,
+                //                                    U+2287 ISOtech
+                {"8853", "oplus", "$\\oplus$"}, // circled plus = direct sum,
+                //                                    U+2295 ISOamsb
+                {"8855", "otimes", "$\\otimes$"}, // circled times = vector product,
+                //                                    U+2297 ISOamsb
+                {"8869", "perp", "$\\perp$"}, // up tack = orthogonal to = perpendicular,
+                //                                    U+22A5 ISOtech
+                {"8901", "sdot", "$\\cdot$"}, // dot operator, U+22C5 ISOamsb
+                /* dot operator is NOT the same character as U+00B7 middle dot */
+                {"8968", "lceil", "$\\lceil$"}, // left ceiling = apl upstile,
+                //                                    U+2308 ISOamsc
+                {"8969", "rceil", "$\\rceil$"}, // right ceiling, U+2309 ISOamsc
+                {"8970", "lfloor", "$\\lfloor$"}, // left floor = apl downstile,
+                //                                    U+230A ISOamsc
+                {"8971", "rfloor", "$\\rfloor$"}, // right floor, U+230B ISOamsc
 
-            /* Miscellaneous Technical */
-            {"9001", "lang", "$\\langle$"}, // left-pointing angle bracket = bra,
-            //                                    U+2329 ISOtech
-            /*    lang is NOT the same character as U+003C 'less than'
-             or U+2039 'single left-pointing angle quotation mark' */
-            {"9002", "rang", "$\\rangle$"}, // right-pointing angle bracket = ket,
-            //                                    U+232A ISOtech
-            /*    rang is NOT the same character as U+003E 'greater than'
-             or U+203A 'single right-pointing angle quotation mark' */
-            /* Geometric Shapes */
-            {"9674", "loz", "$\\lozenge$"}, // lozenge, U+25CA ISOpub
+                /* Miscellaneous Technical */
+                {"9001", "lang", "$\\langle$"}, // left-pointing angle bracket = bra,
+                //                                    U+2329 ISOtech
+                /*    lang is NOT the same character as U+003C 'less than'
+                or U+2039 'single left-pointing angle quotation mark' */
+                {"9002", "rang", "$\\rangle$"}, // right-pointing angle bracket = ket,
+                //                                    U+232A ISOtech
+                /*    rang is NOT the same character as U+003E 'greater than'
+                or U+203A 'single right-pointing angle quotation mark' */
+                /* Geometric Shapes */
+                {"9674", "loz", "$\\lozenge$"}, // lozenge, U+25CA ISOpub
 
-            /* Miscellaneous Symbols */
-            {"9824", "spades", "$\\spadesuit$"}, // black spade suit, U+2660 ISOpub
-            /* black here seems to mean filled as opposed to hollow */
-            {"9827", "clubs", "$\\clubsuit$"}, // black club suit = shamrock,
-            //                                    U+2663 ISOpub
-            {"9829", "hearts", "$\\heartsuit$"}, // black heart suit = valentine,
-            //                                    U+2665 ISOpub
-            {"9830", "diams", "$\\diamondsuit$"}, // black diamond suit, U+2666 ISOpub
-            {"34", "quot", "\""}, // quotation mark = APL quote,
-            //                                   U+0022 ISOnum
-            {"38", "amp", "\\&"}, // ampersand, U+0026 ISOnum
-            {"60", "lt", "$<$"}, // less-than sign, U+003C ISOnum
-            {"62", "gt", "$>$"}, // greater-than sign, U+003E ISOnum
+                /* Miscellaneous Symbols */
+                {"9824", "spades", "$\\spadesuit$"}, // black spade suit, U+2660 ISOpub
+                /* black here seems to mean filled as opposed to hollow */
+                {"9827", "clubs", "$\\clubsuit$"}, // black club suit = shamrock,
+                //                                    U+2663 ISOpub
+                {"9829", "hearts", "$\\heartsuit$"}, // black heart suit = valentine,
+                //                                    U+2665 ISOpub
+                {"9830", "diams", "$\\diamondsuit$"}, // black diamond suit, U+2666 ISOpub
+                {"34", "quot", "\""}, // quotation mark = APL quote,
+                //                                   U+0022 ISOnum
+                {"38", "amp", "\\&"}, // ampersand, U+0026 ISOnum
+                {"60", "lt", "$<$"}, // less-than sign, U+003C ISOnum
+                {"62", "gt", "$>$"}, // greater-than sign, U+003E ISOnum
 
-            /* General Punctuation */
-            {"8194", "ensp", "\\hspace{0.5em}"}, // en space, U+2002 ISOpub
-            {"8195", "emsp", "\\hspace{1em}"}, // em space, U+2003 ISOpub
-            {"8201", "thinsp", "\\hspace{0.167em}"}, // thin space, U+2009 ISOpub
-            {"8202", "", "\\hspace{0.1em}"}, // hair space, U+2010 ISOpub
-            {"8204", "zwnj", "\\/{}"}, // zero width non-joiner,
-            //                                   U+200C NEW RFC 2070
-            {"8205", "zwj", ""}, // zero width joiner, U+200D NEW RFC 2070
-            {"8206", "lrm", ""}, // left-to-right mark, U+200E NEW RFC 2070
-            {"8207", "rlm", ""}, // right-to-left mark, U+200F NEW RFC 2070
-            {"8211", "ndash", "--"}, // en dash, U+2013 ISOpub
-            {"8212", "mdash", "---"}, // em dash, U+2014 ISOpub
-            {"8216", "lsquo", "{\\textquoteleft}"}, // left single quotation mark,
-            //                                   U+2018 ISOnum
-            {"8217", "rsquo", "{\\textquoteright}"}, // right single quotation mark,
-            //                                   U+2019 ISOnum
-            {"8218", "sbquo", "{\\quotesinglbase}"}, // single low-9 quotation mark, U+201A NEW
-            {"8220", "ldquo", "{\\textquotedblleft}"}, // left double quotation mark,
-            //                                   U+201C ISOnum
-            {"8221", "rdquo", "{\\textquotedblright}"}, // right double quotation mark,
-            //                                   U+201D ISOnum
-            {"8222", "bdquo", "{\\quotedblbase}"}, // double low-9 quotation mark, U+201E NEW
-            {"8224", "dagger", "{\\dag}"}, // dagger, U+2020 ISOpub
-            {"8225", "Dagger", "{\\ddag}"}, // double dagger, U+2021 ISOpub
-            {"8240", "permil", "{\\textperthousand}"}, // per mille sign, U+2030 ISOtech
-            {"8249", "lsaquo", "{\\guilsinglleft}"}, // single left-pointing angle quotation mark,
-            //                                   U+2039 ISO proposed
-            /* lsaquo is proposed but not yet ISO standardized */
-            {"8250", "rsaquo", "{\\guilsinglright}"}, // single right-pointing angle quotation mark,
-            //                                   U+203A ISO proposed
-            /* rsaquo is proposed but not yet ISO standardized */
-            {"8364", "euro", "{\\texteuro}"}, // euro sign, U+20AC NEW
+                /* General Punctuation */
+                {"8194", "ensp", "\\hspace{0.5em}"}, // en space, U+2002 ISOpub
+                {"8195", "emsp", "\\hspace{1em}"}, // em space, U+2003 ISOpub
+                {"8201", "thinsp", "\\hspace{0.167em}"}, // thin space, U+2009 ISOpub
+                {"8202", "", "\\hspace{0.1em}"}, // hair space, U+2010 ISOpub
+                {"8204", "zwnj", "\\/{}"}, // zero width non-joiner,
+                //                                   U+200C NEW RFC 2070
+                {"8205", "zwj", ""}, // zero width joiner, U+200D NEW RFC 2070
+                {"8206", "lrm", ""}, // left-to-right mark, U+200E NEW RFC 2070
+                {"8207", "rlm", ""}, // right-to-left mark, U+200F NEW RFC 2070
+                {"8211", "ndash", "--"}, // en dash, U+2013 ISOpub
+                {"8212", "mdash", "---"}, // em dash, U+2014 ISOpub
+                {"8216", "lsquo", "{\\textquoteleft}"}, // left single quotation mark,
+                //                                   U+2018 ISOnum
+                {"8217", "rsquo", "{\\textquoteright}"}, // right single quotation mark,
+                //                                   U+2019 ISOnum
+                {"8218", "sbquo", "{\\quotesinglbase}"}, // single low-9 quotation mark, U+201A NEW
+                {"8220", "ldquo", "{\\textquotedblleft}"}, // left double quotation mark,
+                //                                   U+201C ISOnum
+                {"8221", "rdquo", "{\\textquotedblright}"}, // right double quotation mark,
+                //                                   U+201D ISOnum
+                {"8222", "bdquo", "{\\quotedblbase}"}, // double low-9 quotation mark, U+201E NEW
+                {"8224", "dagger", "{\\dag}"}, // dagger, U+2020 ISOpub
+                {"8225", "Dagger", "{\\ddag}"}, // double dagger, U+2021 ISOpub
+                {"8240", "permil", "{\\textperthousand}"}, // per mille sign, U+2030 ISOtech
+                {
+                    "8249", "lsaquo", "{\\guilsinglleft}"
+                }, // single left-pointing angle quotation mark,
+                //                                   U+2039 ISO proposed
+                /* lsaquo is proposed but not yet ISO standardized */
+                {
+                    "8250", "rsaquo", "{\\guilsinglright}"
+                }, // single right-pointing angle quotation mark,
+                //                                   U+203A ISO proposed
+                /* rsaquo is proposed but not yet ISO standardized */
+                {"8364", "euro", "{\\texteuro}"}, // euro sign, U+20AC NEW
 
-            /* Manually added */
-            {"35", "", "\\#"}, // Hash
-            {"36", "dollar", "\\$"}, // Dollar
-            {"37", "#37", "\\%"}, // Percent (&percnt; is not displayed correctly in the entry preview)
-            {"39", "apos", "'"}, // Apostrophe
-            {"40", "lpar", "("}, // Left bracket
-            {"41", "rpar", ")"}, // Right bracket
-            {"42", "", "*"}, // Asterisk
-            {"43", "plus", "+"}, // Plus
-            {"44", "comma", ","}, // Comma
-            {"45", "hyphen", "-"}, // Hyphen
-            {"46", "period", "."}, // Period
-            {"47", "slash", "/"}, // Slash (solidus)
-            {"58", "colon", ":"}, // Colon
-            {"59", "semi", ";"}, // Semi colon
-            {"61", "equals", "="}, // Equals to
-            {"91", "lsqb", "["}, // Left square bracket
-            {"92", "bsol", "{\\textbackslash}"}, // Backslash
-            {"93", "rsqb", "]"}, // Right square bracket
-            {"94", "Hat", "{\\^{}}"}, // Circumflex
-            {"95", "lowbar", "\\_"}, // Underscore
-            {"96", "grave", "{\\`{}}"}, // Grave
-            {"123", "lbrace", "\\{"}, // Left curly bracket
-            {"", "lcub", "\\{"}, // Left curly bracket
-            {"124", "vert", "|"}, // Vertical bar
-            {"", "verbar", "|"}, // Vertical bar
-            {"", "VerticalLine", "|"}, // Vertical bar
-            {"125", "rbrace", "\\}"}, // Right curly bracket
-            {"", "rcub", "\\}"}, // Right curly bracket
-            // {"138", "", "{{\\v{S}}}"}, // Line tabulation set
-            // {"141", "", ""}, // Reverse line feed
-            {"145", "", "`"}, // Apostrophe
-            {"146", "", "'"}, // Apostrophe
-            {"147", "", "``"}, // Quotation mark
-            {"148", "", "''"}, // Quotation mark
-            {"150", "", "--"}, // En dash
-            // {"154", "", "{\\v{s}}"}, // Single character introducer
-            {"256", "", "{{\\={A}}}"}, // capital A with macron
-            {"257", "", "{\\={a}}"}, // small a with macron
-            {"258", "", "{{\\u{A}}}"}, // capital A with breve
-            {"259", "", "{\\u{a}}"}, // small a with breve
-            {"260", "Aogon", "{{\\k{A}}}"}, // capital A with ogonek
-            {"261", "aogon", "{\\k{a}}"}, // small a with ogonek
-            {"262", "Cacute", "{{\\'{C}}}"}, // capital C with acute
-            {"263", "cacute", "{\\'{c}}"}, // small C with acute
-            {"264", "Ccirc", "{{\\^{C}}}"}, // capital C with circumflex
-            {"265", "ccirc", "{\\^{c}}"}, // small C with circumflex
-            {"266", "Cdot", "{{\\.{C}}}"}, // capital C with dot above
-            {"267", "cdot", "{\\.{c}}"}, // small C with dot above
-            {"268", "Ccaron", "{{\\v{C}}}"}, // capital C with caron
-            {"269", "ccaron", "{\\v{c}}"}, // small C with caron
-            {"270", "", "{{\\v{D}}}"}, // capital D with caron
-            {"271", "", "{\\v{d}}"}, // small d with caron
-            {"272", "Dstrok", "{{\\DJ}}"}, // capital D with stroke
-            {"273", "dstrok", "{{\\dj}}"}, // small d with stroke
-            {"274", "", "{{\\={E}}}"}, // capital E with macron
-            {"275", "", "{\\={e}}"}, // small e with macron
-            {"276", "", "{{\\u{E}}}"}, // capital E with breve
-            {"277", "", "{\\u{e}}"}, // small e with breve
-            {"278", "", "{{\\.{E}}}"}, // capital E with dot above
-            {"279", "", "{\\.{e}}"}, // small e with dot above
-            {"280", "Eogon", "{{\\k{E}}}"}, // capital E with ogonek
-            {"281", "eogon", "{\\k{e}}"}, // small e with ogonek
-            {"282", "", "{{\\v{E}}}"}, // capital E with caron
-            {"283", "", "{\\v{e}}"}, // small e with caron
-            {"284", "", "{{\\^{G}}}"}, // capital G with circumflex
-            {"285", "", "{\\^{g}}"}, // small g with circumflex
-            {"286", "", "{{\\u{G}}}"}, // capital G with breve
-            {"287", "", "{\\u{g}}"}, // small g with breve
-            {"288", "", "{{\\.{G}}}"}, // capital G with dot above
-            {"289", "", "{\\.{g}}"}, // small g with dot above
-            {"290", "", "{{\\c{G}}}"}, // capital G with cedilla
-            {"291", "", "{\\c{g}}"}, // small g with cedilla
-            {"292", "", "{{\\^{H}}}"}, // capital H with circumflex
-            {"293", "", "{\\^{h}}"}, // small h with circumflex
-            {"294", "", "{{\\B{H}}}"}, // capital H with stroke
-            {"295", "", "{\\B{h}}"}, // small h with stroke
-            {"296", "", "{{\\~{I}}}"}, // capital I with tilde
-            {"297", "", "{\\~{\\i}}"}, // small i with tilde
-            {"298", "Imacr", "{{\\={I}}}"}, // capital I with macron
-            {"299", "imacr", "{\\={\\i}}"}, // small i with macron
-            {"300", "", "{{\\u{I}}}"}, // capital I with breve
-            {"301", "", "{\\u{\\i}}"}, // small i with breve
-            {"302", "Iogon", "{{\\k{I}}}"}, // capital I with ogonek
-            {"303", "iogon", "{\\k{i}}"}, // small i with ogonek
-            {"304", "Idot", "{{\\.{I}}}"}, // capital I with dot above
-            {"305", "inodot", "{\\i}"}, // Small i without the dot
-            {"", "imath", "{\\i}"}, // Small i without the dot
-            {"306", "", "{{\\IJ}}"}, // Dutch di-graph IJ
-            {"307", "", "{{\\ij}}"}, // Dutch di-graph ij
-            {"308", "", "{{\\^{J}}}"}, // capital J with circumflex
-            {"309", "", "{\\^{\\j}}"}, // small j with circumflex
-            {"310", "", "{{\\c{K}}}"}, // capital K with cedilla
-            {"311", "", "{\\c{k}}"}, // small k with cedilla
-            {"312", "", "{\\textkra}"}, // Letter kra
-            {"313", "", "{{\\'{L}}}"}, // capital L with acute
-            {"314", "", "{\\'{l}}"}, // small l with acute
-            {"315", "", "{{\\c{L}}}"}, // capital L with cedilla
-            {"316", "", "{\\c{l}}"}, // small l with cedilla
-            {"317", "", "{{\\v{L}}}"}, // capital L with caron
-            {"318", "", "{\\v{l}}"}, // small l with caron
-            // {"319", "Lmidot", "{\\Lmidot}"}, // upper case L with mid dot
-            // {"320", "lmidot", "{\\lmidot}"}, // lower case l with mid dot
-            {"321", "Lstrok", "{{\\L}}"}, // upper case L with stroke
-            {"322", "lstrok", "{{\\l}}"}, // lower case l with stroke
-            {"323", "Nacute", "{{\\'{N}}}"}, // upper case N with acute
-            {"324", "nacute", "{{\\'{n}}}"}, // lower case n with acute
-            {"325", "", "{{\\c{N}}}"}, // capital N with cedilla
-            {"326", "", "{\\c{n}}"}, // small n with cedilla
-            {"327", "", "{{\\v{N}}}"}, // capital N with caron
-            {"328", "", "{\\v{n}}"}, // small n with caron
-            {"329", "", "{'n}"}, // small n preceded with apostroph
-            {"330", "", "{{\\NG}}"}, // upper case letter Eng
-            {"331", "", "{{\\ng}}"}, // lower case letter Eng
-            {"332", "Omacro", "{{\\={O}}}"}, // the capital letter O with macron
-            {"333", "omacro", "{\\={o}}"}, // the small letter o with macron
-            {"334", "", "{{\\u{O}}}"}, // the capital letter O with breve
-            {"335", "", "{\\u{o}}"}, // the small letter o with breve
-            {"336", "", "{{\\H{O}}}"}, // the capital letter O with double acute
-            {"337", "", "{\\H{o}}"}, // the small letter o with double acute
-            {"338", "OElig", "{{\\OE}}"}, // OE-ligature
-            {"339", "oelig", "{{\\oe}}"}, // oe-ligature
-            {"340", "", "{{\\'{R}}}"}, // upper case R with acute
-            {"341", "", "{{\\'{r}}}"}, // lower case r with acute
-            {"342", "", "{{\\c{R}}}"}, // upper case R with cedilla
-            {"343", "", "{{\\c{r}}}"}, // lower case r with cedilla
-            {"344", "", "{{\\v{R}}}"}, // upper case R with caron
-            {"345", "", "{{\\v{r}}}"}, // lower case r with caron
-            {"346", "", "{{\\'{S}}}"}, // upper case S with acute
-            {"347", "", "{{\\'{s}}}"}, // lower case s with acute
-            {"348", "Scirc", "{{\\^{S}}}"}, // upper case S with circumflex
-            {"349", "scirc", "{\\^{s}}"}, // lower case s with circumflex
-            {"350", "Scedil", "{{\\c{S}}}"}, // upper case S with cedilla
-            {"351", "scedil", "{\\c{s}}"}, // lower case s with cedilla
-            {"352", "Scaron", "{{\\v{S}}}"}, // latin capital letter S with caron,
-            {"353", "scaron", "{\\v{s}}"}, // latin small letter s with caron,
-            {"354", "", "{{\\c{T}}}"}, // upper case T with cedilla
-            {"355", "", "{{\\c{T}}}"}, // lower case t with cedilla
-            {"356", "", "{{\\v{T}}}"}, // latin capital letter T with caron,
-            {"357", "", "{\\v{t}}"}, // latin small letter t with caron,
-            {"358", "", "{{\\B{T}}}"}, // latin capital letter T with stroke,
-            {"359", "", "{\\B{t}}"}, // latin small letter t with stroke,
-            {"360", "", "{{\\~{U}}}"}, // capital U with tilde
-            {"361", "", "{\\~{u}}"}, // small u with tilde
-            {"362", "", "{{\\={U}}}"}, // capital U with macron
-            {"363", "", "{\\={u}}"}, // small u with macron
-            {"364", "", "{{\\u{U}}}"}, // capital U with breve
-            {"365", "", "{\\u{u}}"}, // small u with breve
-            {"366", "", "{{\\r{U}}}"}, // capital U with ring
-            {"367", "", "{\\r{u}}"}, // small u with ring
-            {"368", "", "{{\\={U}}}"}, // capital U with double acute
-            {"369", "", "{\\={u}}"}, // small u with double acute
-            {"370", "Uogon", "{{\\k{U}}}"}, // capital U with ogonek
-            {"371", "uogon", "{\\k{u}}"}, // small u with ogonek
-            {"372", "", "{{\\^{W}}}"}, // capital W with circumflex
-            {"373", "", "{\\^{w}}"}, // small w with circumflex
-            {"374", "", "{{\\^{Y}}}"}, // capital Y with circumflex
-            {"375", "", "{\\^{y}}"}, // small y with circumflex
-            {"376", "Yuml", "{{\\\"{Y}}}"}, // latin capital letter Y with diaeresis,
-            {"377", "", "{{\\'{Z}}}"}, // capital Z with acute
-            {"378", "", "{\\'{z}}"}, // small z with acute
-            {"379", "", "{{\\.{Z}}}"}, // capital Z with dot above
-            {"380", "", "{\\.{z}}"}, // small z with dot above
-            {"381", "Zcaron", "{{\\v{Z}}}"}, // capital Z with caron
-            {"382", "zcaron", "{\\v{z}}"}, // small z with caron
-            // {"383", "", ""}, // long s
-            {"384", "", "{\\B{b}}"}, // small b with stroke
-
-            {"402", "fnof", "\\textit{f}"}, // latin small f with hook = function
-
-            {"405", "", "{{\\hv}}"}, // small letter Hv
-
-            {"416", "", "{{\\OHORN}}"}, // capital O with horn
-            {"417", "", "{{\\ohorn}}"}, // small o with horn
-
-            {"431", "", "{{\\UHORN}}"}, // capital U with horn
-            {"432", "", "{{\\uhorn}}"}, // small u with horn
-
-            {"490", "Oogon", "{{\\k{O}}}"}, // capital letter O with ogonek
-            {"491", "oogon", "{\\k{o}}"}, // small letter o with ogonek
-            {"492", "", "{{\\k{\\={O}}}}"}, // capital letter O with ogonek and macron
-            {"493", "", "{\\k{\\={o}}}"}, // small letter o with ogonek and macron
-
-            {"536", "", "{{\\cb{S}}}"}, // capital letter S with comma below, require combelow
-            {"537", "", "{\\cb{s}}"}, // small letter S with comma below, require combelow
-            {"538", "", "{{\\cb{T}}}"}, // capital letter T with comma below, require combelow
-            {"539", "", "{\\cb{t}}"}, // small letter T with comma below, require combelow
-            {"710", "circ", "{\\^{}}"}, // modifier letter circumflex accent,
-            {"726", "", "+"}, // Modifier plus sign
-            {"727", "", "-"}, // Modifier minus sign
-            {"728", "breve", "{\\u{}}"}, // Breve
-            {"", "Breve", "{\\u{}}"}, // Breve
-            {"729", "dot", "{\\.{}}"}, // Dot above
-            {"730", "ring", "{\\r{}}"}, // Ring above
-            {"731", "ogon", "{\\k{}}"}, // Ogonek
-            {"732", "tilde", "\\~{}"}, // Small tilde
-            {"733", "dblac", "{{\\H{}}}"}, // Double acute
-            {"949", "epsi", "$\\epsilon$"}, // Epsilon - double check
-            {"1013", "epsiv", "$\\varepsilonup$"}, // lunate epsilon, requires txfonts
-            // {"1055", "", "{{\\cyrchar\\CYRP}}"}, // Cyrillic capital Pe
-            // {"1082", "", "{\\cyrchar\\cyrk}"}, // Cyrillic small Ka
-            // {"2013", "", ""},    // NKO letter FA -- Maybe en dash = 0x2013?
-            // {"2014", "", ""},    // NKO letter FA -- Maybe em dash = 0x2014?
-            {"8192", "", "\\hspace{0.5em}"}, // en quad
-            {"8193", "", "\\hspace{1em}"}, // em quad
-            {"8196", "", "\\hspace{0.333em}"}, // Three-Per-Em Space
-            {"8197", "", "\\hspace{0.25em}"}, // Four-Per-Em Space
-            {"8198", "", "\\hspace{0.167em}"}, // Six-Per-Em Space
-            {"8208", "hyphen", "-"}, // Hyphen
-            {"8229", "nldr", "\\.{}\\.{}"}, // Double dots - en leader
-            {"8241", "", "{\\textpertenthousand}"}, // per ten thousands sign
-            {"8244", "", "{$\\prime\\prime\\prime$}"}, // triple prime
-            {"8251", "", "{\\textreferencemark}"}, {"8253", "", "{\\textinterrobang}"},
-            {"8320", "", "$_{0}$"}, // sub-script 0
-            {"8321", "", "$_{1}$"}, // sub-script 1
-            {"8322", "", "$_{2}$"}, // sub-script 2
-            {"8323", "", "$_{3}$"}, // sub-script 3
-            {"8324", "", "$_{4}$"}, // sub-script 4
-            {"8325", "", "$_{5}$"}, // sub-script 5
-            {"8326", "", "$_{6}$"}, // sub-script 6
-            {"8327", "", "$_{7}$"}, // sub-script 7
-            {"8328", "", "$_{8}$"}, // sub-script 8
-            {"8329", "", "$_{9}$"}, // sub-script 9
-            {"8330", "", "$_{+}$"}, // sub-script +
-            {"8331", "", "$_{-}$"}, // sub-script -
-            {"8332", "", "$_{-}$"}, // sub-script =
-            {"8333", "", "$_{(}$"}, // sub-script (
-            {"8334", "", "$_{)}$"}, // sub-script )
-            {"8450", "complexes", "$\\mathbb{C}$"}, // double struck capital C -- requires e.g. amsfonts
-            {"8451", "", "{\\textcelsius}"}, // Degree Celsius
-            {"8459", "Hscr", "{{$\\mathcal{H}$}}"}, // script capital H -- possibly use \mathscr
-            {"8460", "Hfr", "{{$\\mathbb{H}$}}"}, // black letter capital H -- requires e.g. amsfonts
-            {"8466", "Lscr", "{{$\\mathcal{L}$}}"}, // script capital L -- possibly use \mathscr
-            {"8467", "ell", "{$\\ell$}"}, // script small l
-            {"8469", "naturals", "{{$\\mathbb{N}$}}"}, // double struck capital N -- requires e.g. amsfonts
-            {"8474", "Qopf", "{{$\\mathbb{Q}$}}"}, // double struck capital Q -- requires e.g. amsfonts
-            {"8477", "reals", "{{$\\mathbb{R}$}}"}, // double struck capital R -- requires e.g. amsfonts
-            {"8486", "", "${{\\Omega}}$"}, // Omega
-            {"8491", "angst", "{{\\AA}}"}, // Angstrom
-            {"8496", "Escr", "{{$\\mathcal{E}$}}"}, // script capital E
-            {"8531", "frac13", "$\\sfrac{1}{3}$"}, // Vulgar fraction one third
-            {"8532", "frac23", "$\\sfrac{2}{3}$"}, // Vulgar fraction two thirds
-            {"8533", "frac15", "$\\sfrac{1}{5}$"}, // Vulgar fraction one fifth
-            {"8534", "frac25", "$\\sfrac{2}{5}$"}, // Vulgar fraction two fifths
-            {"8535", "frac35", "$\\sfrac{3}{5}$"}, // Vulgar fraction three fifths
-            {"8536", "frac45", "$\\sfrac{4}{5}$"}, // Vulgar fraction four fifths
-            {"8537", "frac16", "$\\sfrac{1}{6}$"}, // Vulgar fraction one sixth
-            {"8538", "frac56", "$\\sfrac{5}{6}$"}, // Vulgar fraction five sixths
-            {"8539", "frac18", "$\\sfrac{1}{8}$"}, // Vulgar fraction one eighth
-            {"8540", "frac38", "$\\sfrac{3}{8}$"}, // Vulgar fraction three eighths
-            {"8541", "frac58", "$\\sfrac{5}{8}$"}, // Vulgar fraction five eighths
-            {"8542", "frac78", "$\\sfrac{7}{8}$"}, // Vulgar fraction seven eighths
-            {"8710", "", "$\\triangle$"}, // Increment - could use a more appropriate symbol
-            {"8714", "", "$\\in$"}, // Small element in
-            {"8723", "mp", "$\\mp$"}, // Minus-plus
-            {"8729", "bullet", "$\\bullet$"}, // Bullet operator
-            {"8741", "", "$\\parallel$"}, // Parallel to
-            {"8758", "ratio", ":"}, // Colon/ratio
-            {"8771", "sime", "$\\simeq$"}, // almost equal to = asymptotic to,
-            {"8776", "ap", "$\\approx$"}, // almost equal to = asymptotic to,
-            {"8810", "ll", "$\\ll$"}, // Much less than
-            {"", "Lt", "$\\ll$"}, // Much less than
-            {"8811", "gg", "$\\gg$"}, // Much greater than
-            {"", "Gt", "$\\gg$"}, // Much greater than
-            {"8818", "lsim", "$\\lesssim$"}, // Less than or equivalent to
-            {"8819", "gsim", "$\\gtrsim$"}, // Greater than or equivalent to
-            {"8862", "boxplus", "$\\boxplus$"}, // Boxed plus -- requires amssymb
-            {"8863", "boxminus", "$\\boxminus$"}, // Boxed minus -- requires amssymb
-            {"8864", "boxtimes", "$\\boxtimes$"}, // Boxed times -- requires amssymb
-            {"8882", "vltri", "$\\triangleleft$"}, // Left triangle
-            {"8883", "vrtri", "$\\triangleright$"}, // Right triangle
-            {"8896", "xwedge", "$\\bigwedge$"}, // Big wedge
-            {"8897", "xvee", "$\\bigvee$"}, // Big vee
-            {"8942", "vdots", "$\\vdots$"}, // vertical ellipsis U+22EE
-            {"8943", "cdots", "$\\cdots$"}, // midline horizontal ellipsis U+22EF
-            /* {"8944", "", "$\\ddots$"}, // up right diagonal ellipsis U+22F0 */
-            {"8945", "ddots", "$\\ddots$"}, // down right diagonal ellipsis U+22F1
-
-            {"9426", "circledc", "{\\copyright}"}, // circled small letter C
-            {"9633", "square", "$\\square$"}, // White square
-            {"9651", "xutri", "$\\bigtriangleup$"}, // White up-pointing big triangle
-            {"9653", "utri", "$\\triangle$"}, // White up-pointing small triangle -- \vartriangle probably
-            // better but requires amssymb
-            {"10877", "les", "$\\leqslant$"}, // Less than slanted equal -- requires amssymb
-            {"10878", "ges", "$\\geqslant$"}, // Less than slanted equal -- requires amssymb
-            {"64256", "", "ff"}, // ff ligature (which LaTeX solves by itself)
-            {"64257", "", "fi"}, // fi ligature (which LaTeX solves by itself)
-            {"64258", "", "fl"}, // fl ligature (which LaTeX solves by itself)
-            {"64259", "", "ffi"}, // ffi ligature (which LaTeX solves by itself)
-            {"64260", "", "ffl"}, // ffl ligature (which LaTeX solves by itself)
-            {"119978", "Oscr", "$\\mathcal{O}$"}, // script capital O -- possibly use \mathscr
-            {"119984", "Uscr", "$\\mathcal{U}$"}, // script capital U -- possibly use \mathscr
-            {"120598", "", "$\\epsilon$"}, // mathematical italic epsilon U+1D716 -- requires amsmath
-            {"120599", "", "{{\\˜{n}}}"}, // n with tide
-    };
+                /* Manually added */
+                {"35", "", "\\#"}, // Hash
+                {"36", "dollar", "\\$"}, // Dollar
+                {
+                    "37", "#37", "\\%"
+                }, // Percent (&percnt; is not displayed correctly in the entry preview)
+                {"39", "apos", "'"}, // Apostrophe
+                {"40", "lpar", "("}, // Left bracket
+                {"41", "rpar", ")"}, // Right bracket
+                {"42", "", "*"}, // Asterisk
+                {"43", "plus", "+"}, // Plus
+                {"44", "comma", ","}, // Comma
+                {"45", "hyphen", "-"}, // Hyphen
+                {"46", "period", "."}, // Period
+                {"47", "slash", "/"}, // Slash (solidus)
+                {"58", "colon", ":"}, // Colon
+                {"59", "semi", ";"}, // Semi colon
+                {"61", "equals", "="}, // Equals to
+                {"91", "lsqb", "["}, // Left square bracket
+                {"92", "bsol", "{\\textbackslash}"}, // Backslash
+                {"93", "rsqb", "]"}, // Right square bracket
+                {"94", "Hat", "{\\^{}}"}, // Circumflex
+                {"95", "lowbar", "\\_"}, // Underscore
+                {"96", "grave", "{\\`{}}"}, // Grave
+                {"123", "lbrace", "\\{"}, // Left curly bracket
+                {"", "lcub", "\\{"}, // Left curly bracket
+                {"124", "vert", "|"}, // Vertical bar
+                {"", "verbar", "|"}, // Vertical bar
+                {"", "VerticalLine", "|"}, // Vertical bar
+                {"125", "rbrace", "\\}"}, // Right curly bracket
+                {"", "rcub", "\\}"}, // Right curly bracket
+                // {"138", "", "{{\\v{S}}}"}, // Line tabulation set
+                // {"141", "", ""}, // Reverse line feed
+                {"145", "", "`"}, // Apostrophe
+                {"146", "", "'"}, // Apostrophe
+                {"147", "", "``"}, // Quotation mark
+                {"148", "", "''"}, // Quotation mark
+                {"150", "", "--"}, // En dash
+                // {"154", "", "{\\v{s}}"}, // Single character introducer
+                {"256", "", "{{\\={A}}}"}, // capital A with macron
+                {"257", "", "{\\={a}}"}, // small a with macron
+                {"258", "", "{{\\u{A}}}"}, // capital A with breve
+                {"259", "", "{\\u{a}}"}, // small a with breve
+                {"260", "Aogon", "{{\\k{A}}}"}, // capital A with ogonek
+                {"261", "aogon", "{\\k{a}}"}, // small a with ogonek
+                {"262", "Cacute", "{{\\'{C}}}"}, // capital C with acute
+                {"263", "cacute", "{\\'{c}}"}, // small C with acute
+                {"264", "Ccirc", "{{\\^{C}}}"}, // capital C with circumflex
+                {"265", "ccirc", "{\\^{c}}"}, // small C with circumflex
+                {"266", "Cdot", "{{\\.{C}}}"}, // capital C with dot above
+                {"267", "cdot", "{\\.{c}}"}, // small C with dot above
+                {"268", "Ccaron", "{{\\v{C}}}"}, // capital C with caron
+                {"269", "ccaron", "{\\v{c}}"}, // small C with caron
+                {"270", "", "{{\\v{D}}}"}, // capital D with caron
+                {"271", "", "{\\v{d}}"}, // small d with caron
+                {"272", "Dstrok", "{{\\DJ}}"}, // capital D with stroke
+                {"273", "dstrok", "{{\\dj}}"}, // small d with stroke
+                {"274", "", "{{\\={E}}}"}, // capital E with macron
+                {"275", "", "{\\={e}}"}, // small e with macron
+                {"276", "", "{{\\u{E}}}"}, // capital E with breve
+                {"277", "", "{\\u{e}}"}, // small e with breve
+                {"278", "", "{{\\.{E}}}"}, // capital E with dot above
+                {"279", "", "{\\.{e}}"}, // small e with dot above
+                {"280", "Eogon", "{{\\k{E}}}"}, // capital E with ogonek
+                {"281", "eogon", "{\\k{e}}"}, // small e with ogonek
+                {"282", "", "{{\\v{E}}}"}, // capital E with caron
+                {"283", "", "{\\v{e}}"}, // small e with caron
+                {"284", "", "{{\\^{G}}}"}, // capital G with circumflex
+                {"285", "", "{\\^{g}}"}, // small g with circumflex
+                {"286", "", "{{\\u{G}}}"}, // capital G with breve
+                {"287", "", "{\\u{g}}"}, // small g with breve
+                {"288", "", "{{\\.{G}}}"}, // capital G with dot above
+                {"289", "", "{\\.{g}}"}, // small g with dot above
+                {"290", "", "{{\\c{G}}}"}, // capital G with cedilla
+                {"291", "", "{\\c{g}}"}, // small g with cedilla
+                {"292", "", "{{\\^{H}}}"}, // capital H with circumflex
+                {"293", "", "{\\^{h}}"}, // small h with circumflex
+                {"294", "", "{{\\B{H}}}"}, // capital H with stroke
+                {"295", "", "{\\B{h}}"}, // small h with stroke
+                {"296", "", "{{\\~{I}}}"}, // capital I with tilde
+                {"297", "", "{\\~{\\i}}"}, // small i with tilde
+                {"298", "Imacr", "{{\\={I}}}"}, // capital I with macron
+                {"299", "imacr", "{\\={\\i}}"}, // small i with macron
+                {"300", "", "{{\\u{I}}}"}, // capital I with breve
+                {"301", "", "{\\u{\\i}}"}, // small i with breve
+                {"302", "Iogon", "{{\\k{I}}}"}, // capital I with ogonek
+                {"303", "iogon", "{\\k{i}}"}, // small i with ogonek
+                {"304", "Idot", "{{\\.{I}}}"}, // capital I with dot above
+                {"305", "inodot", "{\\i}"}, // Small i without the dot
+                {"", "imath", "{\\i}"}, // Small i without the dot
+                {"306", "", "{{\\IJ}}"}, // Dutch di-graph IJ
+                {"307", "", "{{\\ij}}"}, // Dutch di-graph ij
+                {"308", "", "{{\\^{J}}}"}, // capital J with circumflex
+                {"309", "", "{\\^{\\j}}"}, // small j with circumflex
+                {"310", "", "{{\\c{K}}}"}, // capital K with cedilla
+                {"311", "", "{\\c{k}}"}, // small k with cedilla
+                {"312", "", "{\\textkra}"}, // Letter kra
+                {"313", "", "{{\\'{L}}}"}, // capital L with acute
+                {"314", "", "{\\'{l}}"}, // small l with acute
+                {"315", "", "{{\\c{L}}}"}, // capital L with cedilla
+                {"316", "", "{\\c{l}}"}, // small l with cedilla
+                {"317", "", "{{\\v{L}}}"}, // capital L with caron
+                {"318", "", "{\\v{l}}"}, // small l with caron
+                // {"319", "Lmidot", "{\\Lmidot}"}, // upper case L with mid dot
+                // {"320", "lmidot", "{\\lmidot}"}, // lower case l with mid dot
+                {"321", "Lstrok", "{{\\L}}"}, // upper case L with stroke
+                {"322", "lstrok", "{{\\l}}"}, // lower case l with stroke
+                {"323", "Nacute", "{{\\'{N}}}"}, // upper case N with acute
+                {"324", "nacute", "{{\\'{n}}}"}, // lower case n with acute
+                {"325", "", "{{\\c{N}}}"}, // capital N with cedilla
+                {"326", "", "{\\c{n}}"}, // small n with cedilla
+                {"327", "", "{{\\v{N}}}"}, // capital N with caron
+                {"328", "", "{\\v{n}}"}, // small n with caron
+                {"329", "", "{'n}"}, // small n preceded with apostroph
+                {"330", "", "{{\\NG}}"}, // upper case letter Eng
+                {"331", "", "{{\\ng}}"}, // lower case letter Eng
+                {"332", "Omacro", "{{\\={O}}}"}, // the capital letter O with macron
+                {"333", "omacro", "{\\={o}}"}, // the small letter o with macron
+                {"334", "", "{{\\u{O}}}"}, // the capital letter O with breve
+                {"335", "", "{\\u{o}}"}, // the small letter o with breve
+                {"336", "", "{{\\H{O}}}"}, // the capital letter O with double acute
+                {"337", "", "{\\H{o}}"}, // the small letter o with double acute
+                {"338", "OElig", "{{\\OE}}"}, // OE-ligature
+                {"339", "oelig", "{{\\oe}}"}, // oe-ligature
+                {"340", "", "{{\\'{R}}}"}, // upper case R with acute
+                {"341", "", "{{\\'{r}}}"}, // lower case r with acute
+                {"342", "", "{{\\c{R}}}"}, // upper case R with cedilla
+                {"343", "", "{{\\c{r}}}"}, // lower case r with cedilla
+                {"344", "", "{{\\v{R}}}"}, // upper case R with caron
+                {"345", "", "{{\\v{r}}}"}, // lower case r with caron
+                {"346", "", "{{\\'{S}}}"}, // upper case S with acute
+                {"347", "", "{{\\'{s}}}"}, // lower case s with acute
+                {"348", "Scirc", "{{\\^{S}}}"}, // upper case S with circumflex
+                {"349", "scirc", "{\\^{s}}"}, // lower case s with circumflex
+                {"350", "Scedil", "{{\\c{S}}}"}, // upper case S with cedilla
+                {"351", "scedil", "{\\c{s}}"}, // lower case s with cedilla
+                {"352", "Scaron", "{{\\v{S}}}"}, // latin capital letter S with caron,
+                {"353", "scaron", "{\\v{s}}"}, // latin small letter s with caron,
+                {"354", "", "{{\\c{T}}}"}, // upper case T with cedilla
+                {"355", "", "{{\\c{T}}}"}, // lower case t with cedilla
+                {"356", "", "{{\\v{T}}}"}, // latin capital letter T with caron,
+                {"357", "", "{\\v{t}}"}, // latin small letter t with caron,
+                {"358", "", "{{\\B{T}}}"}, // latin capital letter T with stroke,
+                {"359", "", "{\\B{t}}"}, // latin small letter t with stroke,
+                {"360", "", "{{\\~{U}}}"}, // capital U with tilde
+                {"361", "", "{\\~{u}}"}, // small u with tilde
+                {"362", "", "{{\\={U}}}"}, // capital U with macron
+                {"363", "", "{\\={u}}"}, // small u with macron
+                {"364", "", "{{\\u{U}}}"}, // capital U with breve
+                {"365", "", "{\\u{u}}"}, // small u with breve
+                {"366", "", "{{\\r{U}}}"}, // capital U with ring
+                {"367", "", "{\\r{u}}"}, // small u with ring
+                {"368", "", "{{\\={U}}}"}, // capital U with double acute
+                {"369", "", "{\\={u}}"}, // small u with double acute
+                {"370", "Uogon", "{{\\k{U}}}"}, // capital U with ogonek
+                {"371", "uogon", "{\\k{u}}"}, // small u with ogonek
+                {"372", "", "{{\\^{W}}}"}, // capital W with circumflex
+                {"373", "", "{\\^{w}}"}, // small w with circumflex
+                {"374", "", "{{\\^{Y}}}"}, // capital Y with circumflex
+                {"375", "", "{\\^{y}}"}, // small y with circumflex
+                {"376", "Yuml", "{{\\\"{Y}}}"}, // latin capital letter Y with diaeresis,
+                {"377", "", "{{\\'{Z}}}"}, // capital Z with acute
+                {"378", "", "{\\'{z}}"}, // small z with acute
+                {"379", "", "{{\\.{Z}}}"}, // capital Z with dot above
+                {"380", "", "{\\.{z}}"}, // small z with dot above
+                {"381", "Zcaron", "{{\\v{Z}}}"}, // capital Z with caron
+                {"382", "zcaron", "{\\v{z}}"}, // small z with caron
+                // {"383", "", ""}, // long s
+                {"384", "", "{\\B{b}}"}, // small b with stroke
+                {"402", "fnof", "\\textit{f}"}, // latin small f with hook = function
+                {"405", "", "{{\\hv}}"}, // small letter Hv
+                {"416", "", "{{\\OHORN}}"}, // capital O with horn
+                {"417", "", "{{\\ohorn}}"}, // small o with horn
+                {"431", "", "{{\\UHORN}}"}, // capital U with horn
+                {"432", "", "{{\\uhorn}}"}, // small u with horn
+                {"490", "Oogon", "{{\\k{O}}}"}, // capital letter O with ogonek
+                {"491", "oogon", "{\\k{o}}"}, // small letter o with ogonek
+                {"492", "", "{{\\k{\\={O}}}}"}, // capital letter O with ogonek and macron
+                {"493", "", "{\\k{\\={o}}}"}, // small letter o with ogonek and macron
+                {"536", "", "{{\\cb{S}}}"}, // capital letter S with comma below, require combelow
+                {"537", "", "{\\cb{s}}"}, // small letter S with comma below, require combelow
+                {"538", "", "{{\\cb{T}}}"}, // capital letter T with comma below, require combelow
+                {"539", "", "{\\cb{t}}"}, // small letter T with comma below, require combelow
+                {"710", "circ", "{\\^{}}"}, // modifier letter circumflex accent,
+                {"726", "", "+"}, // Modifier plus sign
+                {"727", "", "-"}, // Modifier minus sign
+                {"728", "breve", "{\\u{}}"}, // Breve
+                {"", "Breve", "{\\u{}}"}, // Breve
+                {"729", "dot", "{\\.{}}"}, // Dot above
+                {"730", "ring", "{\\r{}}"}, // Ring above
+                {"731", "ogon", "{\\k{}}"}, // Ogonek
+                {"732", "tilde", "\\~{}"}, // Small tilde
+                {"733", "dblac", "{{\\H{}}}"}, // Double acute
+                {"949", "epsi", "$\\epsilon$"}, // Epsilon - double check
+                {"1013", "epsiv", "$\\varepsilonup$"}, // lunate epsilon, requires txfonts
+                // {"1055", "", "{{\\cyrchar\\CYRP}}"}, // Cyrillic capital Pe
+                // {"1082", "", "{\\cyrchar\\cyrk}"}, // Cyrillic small Ka
+                // {"2013", "", ""},    // NKO letter FA -- Maybe en dash = 0x2013?
+                // {"2014", "", ""},    // NKO letter FA -- Maybe em dash = 0x2014?
+                {"8192", "", "\\hspace{0.5em}"}, // en quad
+                {"8193", "", "\\hspace{1em}"}, // em quad
+                {"8196", "", "\\hspace{0.333em}"}, // Three-Per-Em Space
+                {"8197", "", "\\hspace{0.25em}"}, // Four-Per-Em Space
+                {"8198", "", "\\hspace{0.167em}"}, // Six-Per-Em Space
+                {"8208", "hyphen", "-"}, // Hyphen
+                {"8229", "nldr", "\\.{}\\.{}"}, // Double dots - en leader
+                {"8241", "", "{\\textpertenthousand}"}, // per ten thousands sign
+                {"8244", "", "{$\\prime\\prime\\prime$}"}, // triple prime
+                {"8251", "", "{\\textreferencemark}"},
+                {"8253", "", "{\\textinterrobang}"},
+                {"8320", "", "$_{0}$"}, // sub-script 0
+                {"8321", "", "$_{1}$"}, // sub-script 1
+                {"8322", "", "$_{2}$"}, // sub-script 2
+                {"8323", "", "$_{3}$"}, // sub-script 3
+                {"8324", "", "$_{4}$"}, // sub-script 4
+                {"8325", "", "$_{5}$"}, // sub-script 5
+                {"8326", "", "$_{6}$"}, // sub-script 6
+                {"8327", "", "$_{7}$"}, // sub-script 7
+                {"8328", "", "$_{8}$"}, // sub-script 8
+                {"8329", "", "$_{9}$"}, // sub-script 9
+                {"8330", "", "$_{+}$"}, // sub-script +
+                {"8331", "", "$_{-}$"}, // sub-script -
+                {"8332", "", "$_{-}$"}, // sub-script =
+                {"8333", "", "$_{(}$"}, // sub-script (
+                {"8334", "", "$_{)}$"}, // sub-script )
+                {
+                    "8450", "complexes", "$\\mathbb{C}$"
+                }, // double struck capital C -- requires e.g. amsfonts
+                {"8451", "", "{\\textcelsius}"}, // Degree Celsius
+                {"8459", "Hscr", "{{$\\mathcal{H}$}}"}, // script capital H -- possibly use \mathscr
+                {
+                    "8460", "Hfr", "{{$\\mathbb{H}$}}"
+                }, // black letter capital H -- requires e.g. amsfonts
+                {"8466", "Lscr", "{{$\\mathcal{L}$}}"}, // script capital L -- possibly use \mathscr
+                {"8467", "ell", "{$\\ell$}"}, // script small l
+                {
+                    "8469", "naturals", "{{$\\mathbb{N}$}}"
+                }, // double struck capital N -- requires e.g. amsfonts
+                {
+                    "8474", "Qopf", "{{$\\mathbb{Q}$}}"
+                }, // double struck capital Q -- requires e.g. amsfonts
+                {
+                    "8477", "reals", "{{$\\mathbb{R}$}}"
+                }, // double struck capital R -- requires e.g. amsfonts
+                {"8486", "", "${{\\Omega}}$"}, // Omega
+                {"8491", "angst", "{{\\AA}}"}, // Angstrom
+                {"8496", "Escr", "{{$\\mathcal{E}$}}"}, // script capital E
+                {"8531", "frac13", "$\\sfrac{1}{3}$"}, // Vulgar fraction one third
+                {"8532", "frac23", "$\\sfrac{2}{3}$"}, // Vulgar fraction two thirds
+                {"8533", "frac15", "$\\sfrac{1}{5}$"}, // Vulgar fraction one fifth
+                {"8534", "frac25", "$\\sfrac{2}{5}$"}, // Vulgar fraction two fifths
+                {"8535", "frac35", "$\\sfrac{3}{5}$"}, // Vulgar fraction three fifths
+                {"8536", "frac45", "$\\sfrac{4}{5}$"}, // Vulgar fraction four fifths
+                {"8537", "frac16", "$\\sfrac{1}{6}$"}, // Vulgar fraction one sixth
+                {"8538", "frac56", "$\\sfrac{5}{6}$"}, // Vulgar fraction five sixths
+                {"8539", "frac18", "$\\sfrac{1}{8}$"}, // Vulgar fraction one eighth
+                {"8540", "frac38", "$\\sfrac{3}{8}$"}, // Vulgar fraction three eighths
+                {"8541", "frac58", "$\\sfrac{5}{8}$"}, // Vulgar fraction five eighths
+                {"8542", "frac78", "$\\sfrac{7}{8}$"}, // Vulgar fraction seven eighths
+                {"8710", "", "$\\triangle$"}, // Increment - could use a more appropriate symbol
+                {"8714", "", "$\\in$"}, // Small element in
+                {"8723", "mp", "$\\mp$"}, // Minus-plus
+                {"8729", "bullet", "$\\bullet$"}, // Bullet operator
+                {"8741", "", "$\\parallel$"}, // Parallel to
+                {"8758", "ratio", ":"}, // Colon/ratio
+                {"8771", "sime", "$\\simeq$"}, // almost equal to = asymptotic to,
+                {"8776", "ap", "$\\approx$"}, // almost equal to = asymptotic to,
+                {"8810", "ll", "$\\ll$"}, // Much less than
+                {"", "Lt", "$\\ll$"}, // Much less than
+                {"8811", "gg", "$\\gg$"}, // Much greater than
+                {"", "Gt", "$\\gg$"}, // Much greater than
+                {"8818", "lsim", "$\\lesssim$"}, // Less than or equivalent to
+                {"8819", "gsim", "$\\gtrsim$"}, // Greater than or equivalent to
+                {"8862", "boxplus", "$\\boxplus$"}, // Boxed plus -- requires amssymb
+                {"8863", "boxminus", "$\\boxminus$"}, // Boxed minus -- requires amssymb
+                {"8864", "boxtimes", "$\\boxtimes$"}, // Boxed times -- requires amssymb
+                {"8882", "vltri", "$\\triangleleft$"}, // Left triangle
+                {"8883", "vrtri", "$\\triangleright$"}, // Right triangle
+                {"8896", "xwedge", "$\\bigwedge$"}, // Big wedge
+                {"8897", "xvee", "$\\bigvee$"}, // Big vee
+                {"8942", "vdots", "$\\vdots$"}, // vertical ellipsis U+22EE
+                {"8943", "cdots", "$\\cdots$"}, // midline horizontal ellipsis U+22EF
+                /* {"8944", "", "$\\ddots$"}, // up right diagonal ellipsis U+22F0 */
+                {"8945", "ddots", "$\\ddots$"}, // down right diagonal ellipsis U+22F1
+                {"9426", "circledc", "{\\copyright}"}, // circled small letter C
+                {"9633", "square", "$\\square$"}, // White square
+                {"9651", "xutri", "$\\bigtriangleup$"}, // White up-pointing big triangle
+                {
+                    "9653", "utri", "$\\triangle$"
+                }, // White up-pointing small triangle -- \vartriangle probably
+                // better but requires amssymb
+                {"10877", "les", "$\\leqslant$"}, // Less than slanted equal -- requires amssymb
+                {"10878", "ges", "$\\geqslant$"}, // Less than slanted equal -- requires amssymb
+                {"64256", "", "ff"}, // ff ligature (which LaTeX solves by itself)
+                {"64257", "", "fi"}, // fi ligature (which LaTeX solves by itself)
+                {"64258", "", "fl"}, // fl ligature (which LaTeX solves by itself)
+                {"64259", "", "ffi"}, // ffi ligature (which LaTeX solves by itself)
+                {"64260", "", "ffl"}, // ffl ligature (which LaTeX solves by itself)
+                {"119978", "Oscr", "$\\mathcal{O}$"}, // script capital O -- possibly use \mathscr
+                {"119984", "Uscr", "$\\mathcal{U}$"}, // script capital U -- possibly use \mathscr
+                {
+                    "120598", "", "$\\epsilon$"
+                }, // mathematical italic epsilon U+1D716 -- requires amsmath
+                {"120599", "", "{{\\˜{n}}}"}, // n with tide
+            };
 
     // List of combining accents
-    private static final String[][] ACCENT_LIST = new String[][] {{"768", "`"}, // Grave
-            {"769", "'"}, // Acute
-            {"770", "^"}, // Circumflex
-            {"771", "~"}, // Tilde
-            {"772", "="}, // Macron
-            {"773", "="}, // Overline - not completely correct
-            {"774", "u"}, // Breve
-            {"775", "."}, // Dot above
-            {"776", "\""}, // Diaeresis
-            {"777", "h"}, // Hook above
-            {"778", "r"}, // Ring
-            {"779", "H"}, // Double acute
-            {"780", "v"}, // Caron
-            {"781", "|"}, // Vertical line above
-            {"782", "U"}, // Double vertical line above
-            {"783", "G"}, // Double grave
-            {"784", "textdotbreve"}, // Candrabindu
-            {"785", "t"}, // Inverted breve
-            //        {"786", ""},    // Turned comma above
-            //        {"787", ""},    // Comma above
-            {"788", "textrevcommaabove"}, // Reversed comma above
-            {"789", "textcommaabover"}, // Comma above right
-            {"790", "textsubgrave"}, // Grave accent below -requires tipa
-            {"791", "textsubacute"}, // Acute accent below - requires tipa
-            {"792", "textadvancing"}, // Left tack below - requires tipa
-            {"793", "textretracting"}, // Right tack below - requires tipa
-            {"794", "textlangleabove"}, // Left angle above
-            {"795", "textrighthorn"}, // Horn
-            {"796", "textsublhalfring"}, // Left half ring below - requires tipa
-            {"797", "textraising"}, // Up tack below - requires tipa
-            {"798", "textlowering"}, // Down tack below - requires tipa
-            {"799", "textsubplus"}, // Plus sign below - requires tipa
-            {"800", "textsubbar"}, // Minus sign below
-            {"801", "textpalhookbelow"}, // Palatalized hook below
-            {"802", "M"}, // Retroflex hook below - textrethookbelow?
-            {"803", "d"}, // Dot below
-            {"804", "textsubumlaut"}, // Diaeresis below - requires tipa
-            {"805", "textsubring"}, // Ring below - requires tipa
-            {"806", "cb"}, // Comma below - requires combelow
-            {"807", "c"}, // Cedilla
-            {"808", "k"}, // Ogonek
-            {"809", "textsyllabic"}, // Vertical line below - requires tipa
-            {"810", "textsubbridge"}, // Bridge below - requires tipa
-            {"811", "textsubw"}, // Inverted double arch below - requires tipa
-            {"812", "textsubwedge"}, // Caron below
-            {"813", "textsubcircum"}, // Circumflex accent below - requires tipa
-            {"814", "textsubbreve"}, // Breve below
-            {"815", "textsubarch"}, // Inverted breve below - requires tipa
-            {"816", "textsubtilde"}, // Tilde below - requires tipa
-            {"817", "b"}, // Macron below - not completely correct
-            {"818", "b"}, // Underline
-            {"819", "subdoublebar"}, // Double low line -- requires extraipa
-            {"820", "textsuperimposetilde"}, // Tilde overlay - requires tipa
-            {"821", "B"}, // Short stroke overlay - textsstrokethru?
-            {"822", "textlstrokethru"}, // Long stroke overlay
-            {"823", "textsstrikethru"}, // Short solidus overlay
-            {"824", "textlstrikethru"}, // Long solidus overlay
-            {"825", "textsubrhalfring"}, // Right half ring below - requires tipa
-            {"826", "textinvsubbridge"}, // inverted bridge below - requires tipa
-            {"827", "textsubsquare"}, // Square below - requires tipa
-            {"828", "textseagull"}, // Seagull below - requires tipa
-            {"829", "textovercross"}, // X above - requires tipa
-            //        {"830", ""},    // Vertical tilde
-            //        {"831", ""},    // Double overline
-            //        {"832", ""},    // Grave tone mark
-            //        {"833", ""},    // Acute tone mark
-            //        {"834", ""},    // Greek perispomeni
-            //        {"835", ""},    // Greek koronis
-            //        {"836", ""},    // Greek dialytika tonos
-            //        {"837", ""},    // Greek ypogegrammeni
-            {"838", "overbridge"}, // Bridge above - requires extraipa
-            {"839", "subdoublebar"}, // Equals sign below - requires extraipa
-            {"840", "subdoublevert"}, // Double vertical line below - requires extraipa
-            {"841", "subcorner"}, // Left angle below - requires extraipa
-            {"842", "crtilde"}, // Not tilde above - requires extraipa
-            {"843", "dottedtilde"}, // Homothetic above - requires extraipa
-            {"844", "doubletilde"}, // Almost equal to above - requires extraipa
-            {"845", "spreadlips"}, // Left right arrow below - requires extraipa
-            {"846", "whistle"}, // Upwards arrow below - requires extraipa
-            {"861", "textdoublebreve"}, // Double breve
-            {"862", "textdoublemacron"}, // Double macron
-            {"863", "textdoublemacronbelow"}, // Double macron below
-            {"864", "textdoubletilde"}, // Double tilde
-            {"865", "texttoptiebar"}, // Double inverted breve
-            {"866", "sliding"}, // Double rightwards arrow below - requires extraipa
-    };
+    private static final String[][] ACCENT_LIST =
+            new String[][] {
+                {"768", "`"}, // Grave
+                {"769", "'"}, // Acute
+                {"770", "^"}, // Circumflex
+                {"771", "~"}, // Tilde
+                {"772", "="}, // Macron
+                {"773", "="}, // Overline - not completely correct
+                {"774", "u"}, // Breve
+                {"775", "."}, // Dot above
+                {"776", "\""}, // Diaeresis
+                {"777", "h"}, // Hook above
+                {"778", "r"}, // Ring
+                {"779", "H"}, // Double acute
+                {"780", "v"}, // Caron
+                {"781", "|"}, // Vertical line above
+                {"782", "U"}, // Double vertical line above
+                {"783", "G"}, // Double grave
+                {"784", "textdotbreve"}, // Candrabindu
+                {"785", "t"}, // Inverted breve
+                //        {"786", ""},    // Turned comma above
+                //        {"787", ""},    // Comma above
+                {"788", "textrevcommaabove"}, // Reversed comma above
+                {"789", "textcommaabover"}, // Comma above right
+                {"790", "textsubgrave"}, // Grave accent below -requires tipa
+                {"791", "textsubacute"}, // Acute accent below - requires tipa
+                {"792", "textadvancing"}, // Left tack below - requires tipa
+                {"793", "textretracting"}, // Right tack below - requires tipa
+                {"794", "textlangleabove"}, // Left angle above
+                {"795", "textrighthorn"}, // Horn
+                {"796", "textsublhalfring"}, // Left half ring below - requires tipa
+                {"797", "textraising"}, // Up tack below - requires tipa
+                {"798", "textlowering"}, // Down tack below - requires tipa
+                {"799", "textsubplus"}, // Plus sign below - requires tipa
+                {"800", "textsubbar"}, // Minus sign below
+                {"801", "textpalhookbelow"}, // Palatalized hook below
+                {"802", "M"}, // Retroflex hook below - textrethookbelow?
+                {"803", "d"}, // Dot below
+                {"804", "textsubumlaut"}, // Diaeresis below - requires tipa
+                {"805", "textsubring"}, // Ring below - requires tipa
+                {"806", "cb"}, // Comma below - requires combelow
+                {"807", "c"}, // Cedilla
+                {"808", "k"}, // Ogonek
+                {"809", "textsyllabic"}, // Vertical line below - requires tipa
+                {"810", "textsubbridge"}, // Bridge below - requires tipa
+                {"811", "textsubw"}, // Inverted double arch below - requires tipa
+                {"812", "textsubwedge"}, // Caron below
+                {"813", "textsubcircum"}, // Circumflex accent below - requires tipa
+                {"814", "textsubbreve"}, // Breve below
+                {"815", "textsubarch"}, // Inverted breve below - requires tipa
+                {"816", "textsubtilde"}, // Tilde below - requires tipa
+                {"817", "b"}, // Macron below - not completely correct
+                {"818", "b"}, // Underline
+                {"819", "subdoublebar"}, // Double low line -- requires extraipa
+                {"820", "textsuperimposetilde"}, // Tilde overlay - requires tipa
+                {"821", "B"}, // Short stroke overlay - textsstrokethru?
+                {"822", "textlstrokethru"}, // Long stroke overlay
+                {"823", "textsstrikethru"}, // Short solidus overlay
+                {"824", "textlstrikethru"}, // Long solidus overlay
+                {"825", "textsubrhalfring"}, // Right half ring below - requires tipa
+                {"826", "textinvsubbridge"}, // inverted bridge below - requires tipa
+                {"827", "textsubsquare"}, // Square below - requires tipa
+                {"828", "textseagull"}, // Seagull below - requires tipa
+                {"829", "textovercross"}, // X above - requires tipa
+                //        {"830", ""},    // Vertical tilde
+                //        {"831", ""},    // Double overline
+                //        {"832", ""},    // Grave tone mark
+                //        {"833", ""},    // Acute tone mark
+                //        {"834", ""},    // Greek perispomeni
+                //        {"835", ""},    // Greek koronis
+                //        {"836", ""},    // Greek dialytika tonos
+                //        {"837", ""},    // Greek ypogegrammeni
+                {"838", "overbridge"}, // Bridge above - requires extraipa
+                {"839", "subdoublebar"}, // Equals sign below - requires extraipa
+                {"840", "subdoublevert"}, // Double vertical line below - requires extraipa
+                {"841", "subcorner"}, // Left angle below - requires extraipa
+                {"842", "crtilde"}, // Not tilde above - requires extraipa
+                {"843", "dottedtilde"}, // Homothetic above - requires extraipa
+                {"844", "doubletilde"}, // Almost equal to above - requires extraipa
+                {"845", "spreadlips"}, // Left right arrow below - requires extraipa
+                {"846", "whistle"}, // Upwards arrow below - requires extraipa
+                {"861", "textdoublebreve"}, // Double breve
+                {"862", "textdoublemacron"}, // Double macron
+                {"863", "textdoublemacronbelow"}, // Double macron below
+                {"864", "textdoubletilde"}, // Double tilde
+                {"865", "texttoptiebar"}, // Double inverted breve
+                {"866", "sliding"}, // Double rightwards arrow below - requires extraipa
+            };
 
     static {
         for (String[] aConversionList : CONVERSION_LIST) {
             if (!aConversionList[2].isEmpty()) {
                 String strippedLaTeX = cleanLaTeX(aConversionList[2]);
                 if (!aConversionList[1].isEmpty()) {
-                    HTML_LATEX_CONVERSION_MAP.put("&" + aConversionList[1] + ";", aConversionList[2]);
+                    HTML_LATEX_CONVERSION_MAP.put(
+                            "&" + aConversionList[1] + ";", aConversionList[2]);
                     if (!strippedLaTeX.isEmpty()) {
-                        LATEX_HTML_CONVERSION_MAP.put(strippedLaTeX, "&" + aConversionList[1] + ";");
+                        LATEX_HTML_CONVERSION_MAP.put(
+                                strippedLaTeX, "&" + aConversionList[1] + ";");
                     }
                 } else if (!aConversionList[0].isEmpty() && !strippedLaTeX.isEmpty()) {
                     LATEX_HTML_CONVERSION_MAP.put(strippedLaTeX, "&#" + aConversionList[0] + ";");
                 }
                 if (!aConversionList[0].isEmpty()) {
-                    NUMERICAL_LATEX_CONVERSION_MAP.put(Integer.decode(aConversionList[0]), aConversionList[2]);
+                    NUMERICAL_LATEX_CONVERSION_MAP.put(
+                            Integer.decode(aConversionList[0]), aConversionList[2]);
                     if (Integer.decode(aConversionList[0]) > 128) {
-                        String unicodeSymbol = String.valueOf(Character.toChars(Integer.decode(aConversionList[0])));
+                        String unicodeSymbol =
+                                String.valueOf(
+                                        Character.toChars(Integer.decode(aConversionList[0])));
                         UNICODE_LATEX_CONVERSION_MAP.put(unicodeSymbol, aConversionList[2]);
                         if (!strippedLaTeX.isEmpty()) {
                             LATEX_UNICODE_CONVERSION_MAP.put(strippedLaTeX, unicodeSymbol);
@@ -885,7 +919,8 @@ public class HTMLUnicodeConversionMaps {
         }
         for (String[] anAccentList : ACCENT_LIST) {
             ESCAPED_ACCENTS.put(Integer.decode(anAccentList[0]), anAccentList[1]);
-            UNICODE_ESCAPED_ACCENTS.put(anAccentList[1],
+            UNICODE_ESCAPED_ACCENTS.put(
+                    anAccentList[1],
                     String.valueOf(Character.toChars(Integer.decode(anAccentList[0]))));
         }
         // Manually added values which are killed by cleanLaTeX
@@ -893,7 +928,8 @@ public class HTMLUnicodeConversionMaps {
         LATEX_UNICODE_CONVERSION_MAP.put("$", "$");
 
         // Manual corrections
-        LATEX_HTML_CONVERSION_MAP.put("AA", "&Aring;"); // Overwritten by &angst; which is less supported
+        LATEX_HTML_CONVERSION_MAP.put(
+                "AA", "&Aring;"); // Overwritten by &angst; which is less supported
         LATEX_UNICODE_CONVERSION_MAP.put("AA", "Å"); // Overwritten by Ångstrom symbol
 
         // Manual additions
@@ -905,8 +941,7 @@ public class HTMLUnicodeConversionMaps {
         LATEX_UNICODE_CONVERSION_MAP.put("textquotesingle", "'"); // apostrophe, U+00027
     }
 
-    private HTMLUnicodeConversionMaps() {
-    }
+    private HTMLUnicodeConversionMaps() {}
 
     private static String cleanLaTeX(String escapedString) {
         // Get rid of \{}$ from the LaTeX-string
diff --git a/src/main/java/org/jabref/logic/util/strings/StringManipulator.java b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
index bdde7c1fd496..7488b2aca1c8 100644
--- a/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
+++ b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
@@ -32,20 +32,29 @@ enum Direction {
      *
      * @return              The resulting text and caret position.
      */
-    private static ResultingStringState setWordCase(String text, int caretPosition, LetterCase targetCase) {
+    private static ResultingStringState setWordCase(
+            String text, int caretPosition, LetterCase targetCase) {
         int nextWordBoundary = getNextWordBoundary(caretPosition, text, Direction.NEXT);
 
         // Preserve whitespaces
         int wordStartPosition = caretPosition;
-        while (wordStartPosition < nextWordBoundary && Character.isWhitespace(text.charAt(wordStartPosition))) {
+        while (wordStartPosition < nextWordBoundary
+                && Character.isWhitespace(text.charAt(wordStartPosition))) {
             wordStartPosition++;
         }
 
-        String result = switch (targetCase) {
-            case UPPER -> (new UpperCaseFormatter()).format(text.substring(wordStartPosition, nextWordBoundary));
-            case LOWER -> (new LowerCaseFormatter()).format(text.substring(wordStartPosition, nextWordBoundary));
-            case CAPITALIZED -> (new CapitalizeFormatter()).format(text.substring(wordStartPosition, nextWordBoundary));
-        };
+        String result =
+                switch (targetCase) {
+                    case UPPER ->
+                            (new UpperCaseFormatter())
+                                    .format(text.substring(wordStartPosition, nextWordBoundary));
+                    case LOWER ->
+                            (new LowerCaseFormatter())
+                                    .format(text.substring(wordStartPosition, nextWordBoundary));
+                    case CAPITALIZED ->
+                            (new CapitalizeFormatter())
+                                    .format(text.substring(wordStartPosition, nextWordBoundary));
+                };
 
         return new ResultingStringState(
                 nextWordBoundary,
@@ -61,18 +70,21 @@ private static ResultingStringState setWordCase(String text, int caretPosition,
      *
      * @return              The resulting text and caret position.
      */
-    static ResultingStringState deleteUntilWordBoundary(int caretPosition, String text, Direction direction) {
+    static ResultingStringState deleteUntilWordBoundary(
+            int caretPosition, String text, Direction direction) {
         // Define cutout range
         int nextWordBoundary = getNextWordBoundary(caretPosition, text, direction);
 
         // Construct new string without cutout
         return switch (direction) {
-            case NEXT -> new ResultingStringState(
-                    caretPosition,
-                    text.substring(0, caretPosition) + text.substring(nextWordBoundary));
-            case PREVIOUS -> new ResultingStringState(
-                    nextWordBoundary,
-                    text.substring(0, nextWordBoundary) + text.substring(caretPosition));
+            case NEXT ->
+                    new ResultingStringState(
+                            caretPosition,
+                            text.substring(0, caretPosition) + text.substring(nextWordBoundary));
+            case PREVIOUS ->
+                    new ResultingStringState(
+                            nextWordBoundary,
+                            text.substring(0, nextWordBoundary) + text.substring(caretPosition));
         };
     }
 
diff --git a/src/main/java/org/jabref/logic/util/strings/StringSimilarity.java b/src/main/java/org/jabref/logic/util/strings/StringSimilarity.java
index 2b83e2b9a8dc..e4b0c06f656a 100644
--- a/src/main/java/org/jabref/logic/util/strings/StringSimilarity.java
+++ b/src/main/java/org/jabref/logic/util/strings/StringSimilarity.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.util.strings;
 
-import java.util.Locale;
-
 import info.debatty.java.stringsimilarity.Levenshtein;
 
+import java.util.Locale;
+
 public class StringSimilarity {
     private final Levenshtein METRIC_DISTANCE = new Levenshtein();
     // edit distance threshold for entry title comparison
@@ -22,6 +22,7 @@ public boolean isSimilar(String a, String b) {
 
     public double editDistanceIgnoreCase(String a, String b) {
         // TODO: Locale is dependent on the language of the strings. English is a good denominator.
-        return METRIC_DISTANCE.distance(a.toLowerCase(Locale.ENGLISH), b.toLowerCase(Locale.ENGLISH));
+        return METRIC_DISTANCE.distance(
+                a.toLowerCase(Locale.ENGLISH), b.toLowerCase(Locale.ENGLISH));
     }
 }
diff --git a/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java b/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java
index 9c6ce27e82f7..dc53d1c09480 100644
--- a/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java
+++ b/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java
@@ -1,8 +1,9 @@
 package org.jabref.logic.xmp;
 
-import java.util.Map;
-import java.util.Optional;
-
+import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.cos.COSDictionary;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.pdmodel.PDDocumentInformation;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
@@ -10,10 +11,8 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryTypeFactory;
 
-import org.apache.pdfbox.cos.COSBase;
-import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.PDDocumentInformation;
+import java.util.Map;
+import java.util.Optional;
 
 public class DocumentInformationExtractor {
 
diff --git a/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java b/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
index 8e0cfcf20d96..b550f5e007f4 100644
--- a/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
+++ b/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
@@ -1,14 +1,8 @@
 package org.jabref.logic.xmp;
 
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Optional;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.xmpbox.schema.DublinCoreSchema;
+import org.apache.xmpbox.type.BadFieldValueException;
 import org.jabref.logic.bibtex.TypedBibEntry;
 import org.jabref.logic.formatter.casechanger.UnprotectTermsFormatter;
 import org.jabref.model.database.BibDatabase;
@@ -24,13 +18,18 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.strings.StringUtil;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.xmpbox.schema.DublinCoreSchema;
-import org.apache.xmpbox.type.BadFieldValueException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
 /**
  * This class is used for <em>both</em> conversion from Dublin Core to BibTeX and conversion form BibTeX to Dublin Core
  */
@@ -53,7 +52,8 @@ public class DublinCoreExtractor {
      * @param dcSchema      Metadata in DublinCore format.
      * @param resolvedEntry The BibEntry object, which is filled during metadata extraction.
      */
-    public DublinCoreExtractor(DublinCoreSchema dcSchema, XmpPreferences xmpPreferences, BibEntry resolvedEntry) {
+    public DublinCoreExtractor(
+            DublinCoreSchema dcSchema, XmpPreferences xmpPreferences, BibEntry resolvedEntry) {
         this.dcSchema = dcSchema;
         this.xmpPreferences = xmpPreferences;
         this.bibEntry = resolvedEntry;
@@ -75,7 +75,7 @@ private void extractEditor() {
     private void extractAuthor() {
         List<String> creators = dcSchema.getCreators();
         if ((creators != null) && !creators.isEmpty()) {
-           bibEntry.setField(StandardField.AUTHOR, String.join(" and ", creators));
+            bibEntry.setField(StandardField.AUTHOR, String.join(" and ", creators));
         }
     }
 
@@ -87,11 +87,24 @@ private void extractDate() {
         if ((dates != null) && !dates.isEmpty()) {
             String date = dates.getFirst().trim();
             Date.parse(date)
-                    .ifPresent(dateValue -> {
-                        dateValue.getDay().ifPresent(day -> bibEntry.setField(StandardField.DAY, Integer.toString(day)));
-                        dateValue.getMonth().ifPresent(bibEntry::setMonth);
-                        dateValue.getYear().ifPresent(year -> bibEntry.setField(StandardField.YEAR, Integer.toString(year)));
-                    });
+                    .ifPresent(
+                            dateValue -> {
+                                dateValue
+                                        .getDay()
+                                        .ifPresent(
+                                                day ->
+                                                        bibEntry.setField(
+                                                                StandardField.DAY,
+                                                                Integer.toString(day)));
+                                dateValue.getMonth().ifPresent(bibEntry::setMonth);
+                                dateValue
+                                        .getYear()
+                                        .ifPresent(
+                                                year ->
+                                                        bibEntry.setField(
+                                                                StandardField.YEAR,
+                                                                Integer.toString(year)));
+                            });
         }
     }
 
@@ -138,31 +151,31 @@ private void extractPublisher() {
      */
     private void extractBibTexFields() {
         Predicate<String> isBibTeXElement = s -> s.startsWith("bibtex/");
-        Consumer<String> splitBibTeXElement = s -> {
-            // the default pattern is bibtex/key/value, but some fields contains url etc.
-            // so the value property contains additional slashes, which makes the usage of
-            // String#split complicated.
-            String temp = s.substring("bibtex/".length());
-            int i = temp.indexOf('/');
-            if (i != -1) {
-                Field key = FieldFactory.parseField(temp.substring(0, i));
-                String value = temp.substring(i + 1);
-                bibEntry.setField(key, value);
-
-                // only for month field - override value
-                // workaround, because the date value of the xmp component of pdf box is corrupted
-                // see also DublinCoreExtractor#extractYearAndMonth
-                if (StandardField.MONTH == key) {
-                    Optional<Month> parsedMonth = Month.parse(value);
-                    parsedMonth.ifPresent(bibEntry::setMonth);
-                }
-            }
-        };
+        Consumer<String> splitBibTeXElement =
+                s -> {
+                    // the default pattern is bibtex/key/value, but some fields contains url etc.
+                    // so the value property contains additional slashes, which makes the usage of
+                    // String#split complicated.
+                    String temp = s.substring("bibtex/".length());
+                    int i = temp.indexOf('/');
+                    if (i != -1) {
+                        Field key = FieldFactory.parseField(temp.substring(0, i));
+                        String value = temp.substring(i + 1);
+                        bibEntry.setField(key, value);
+
+                        // only for month field - override value
+                        // workaround, because the date value of the xmp component of pdf box is
+                        // corrupted
+                        // see also DublinCoreExtractor#extractYearAndMonth
+                        if (StandardField.MONTH == key) {
+                            Optional<Month> parsedMonth = Month.parse(value);
+                            parsedMonth.ifPresent(bibEntry::setMonth);
+                        }
+                    }
+                };
         List<String> relationships = dcSchema.getRelations();
         if (relationships != null) {
-            relationships.stream()
-                         .filter(isBibTeXElement)
-                         .forEach(splitBibTeXElement);
+            relationships.stream().filter(isBibTeXElement).forEach(splitBibTeXElement);
         }
     }
 
@@ -174,7 +187,7 @@ private void extractRights() {
         try {
             rights = dcSchema.getRights();
         } catch (BadFieldValueException e) {
-           LOGGER.warn("Could not extract rights", e);
+            LOGGER.warn("Could not extract rights", e);
         }
         if (!StringUtil.isNullOrEmpty(rights)) {
             bibEntry.setField(new UnknownField(DC_RIGHTS), rights);
@@ -286,7 +299,8 @@ public Optional<BibEntry> extractBibtexEntry() {
         this.extractCoverage();
         this.extractLanguages();
 
-        // we pass a new BibEntry in the constructor which is never empty as it already consists of "@misc"
+        // we pass a new BibEntry in the constructor which is never empty as it already consists of
+        // "@misc"
         if (bibEntry.getFieldMap().isEmpty()) {
             return Optional.empty();
         }
@@ -318,7 +332,9 @@ private void fillCreator(String creators) {
      */
     private void fillDate() {
         bibEntry.getFieldOrAlias(StandardField.DATE)
-                .ifPresent(publicationDate -> dcSchema.addUnqualifiedSequenceValue("date", publicationDate));
+                .ifPresent(
+                        publicationDate ->
+                                dcSchema.addUnqualifiedSequenceValue("date", publicationDate));
     }
 
     /**
@@ -370,8 +386,7 @@ private void fillCoverage(String coverage) {
      * BibTeX: language; DC: dc:language
      */
     private void fillLanguages(String languages) {
-        Arrays.stream(languages.split(","))
-                .forEach(dcSchema::addLanguage);
+        Arrays.stream(languages.split(",")).forEach(dcSchema::addLanguage);
     }
 
     /**
@@ -393,7 +408,8 @@ private void fillSource(String source) {
      * The value of the given field is fetched from the class variable {@link DublinCoreExtractor#bibEntry}.
      */
     private void fillCustomField(Field field) {
-        // We write the plain content of the field, because this is a custom DC field content with the semantics that
+        // We write the plain content of the field, because this is a custom DC field content with
+        // the semantics that
         // BibTeX data is stored. Thus, we do not need to get rid of BibTeX, but can keep it.
         String value = bibEntry.getField(field).get();
         dcSchema.addRelation("bibtex/" + field.getName() + '/' + value);
@@ -433,24 +449,15 @@ public void fillDublinCoreSchema() {
             String value = unprotectTermsFormatter.format(bibEntry.getField(field).get());
             if (field instanceof StandardField standardField) {
                 switch (standardField) {
-                    case EDITOR ->
-                            this.fillContributor(value);
-                    case AUTHOR ->
-                            this.fillCreator(value);
-                    case YEAR ->
-                            this.fillDate();
-                    case ABSTRACT ->
-                            this.fillDescription(value);
-                    case DOI ->
-                            this.fillIdentifier(value);
-                    case PUBLISHER ->
-                            this.fillPublisher(value);
-                    case KEYWORDS ->
-                            this.fillKeywords(value);
-                    case TITLE ->
-                            this.fillTitle(value);
-                    case LANGUAGE ->
-                            this.fillLanguages(value);
+                    case EDITOR -> this.fillContributor(value);
+                    case AUTHOR -> this.fillCreator(value);
+                    case YEAR -> this.fillDate();
+                    case ABSTRACT -> this.fillDescription(value);
+                    case DOI -> this.fillIdentifier(value);
+                    case PUBLISHER -> this.fillPublisher(value);
+                    case KEYWORDS -> this.fillKeywords(value);
+                    case TITLE -> this.fillTitle(value);
+                    case LANGUAGE -> this.fillLanguages(value);
                     case FILE -> {
                         // we do not write the "file" field, because the file is the PDF itself
                     }
@@ -460,8 +467,7 @@ public void fillDublinCoreSchema() {
                             this.fillCustomField(field);
                         }
                     }
-                    default ->
-                            this.fillCustomField(field);
+                    default -> this.fillCustomField(field);
                 }
             } else {
                 if (DC_COVERAGE.equals(field.getName())) {
diff --git a/src/main/java/org/jabref/logic/xmp/XmpPreferences.java b/src/main/java/org/jabref/logic/xmp/XmpPreferences.java
index 136bb06e2f16..1c4d0f07344a 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpPreferences.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpPreferences.java
@@ -1,7 +1,5 @@
 package org.jabref.logic.xmp;
 
-import java.util.Set;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -10,13 +8,18 @@
 
 import org.jabref.model.entry.field.Field;
 
+import java.util.Set;
+
 public class XmpPreferences {
 
     private final BooleanProperty useXmpPrivacyFilter;
     private final ObservableSet<Field> xmpPrivacyFilter;
     private final ObjectProperty<Character> keywordSeparator;
 
-    public XmpPreferences(boolean useXmpPrivacyFilter, Set<Field> xmpPrivacyFilter, ObjectProperty<Character> keywordSeparator) {
+    public XmpPreferences(
+            boolean useXmpPrivacyFilter,
+            Set<Field> xmpPrivacyFilter,
+            ObjectProperty<Character> keywordSeparator) {
         this.useXmpPrivacyFilter = new SimpleBooleanProperty(useXmpPrivacyFilter);
         this.xmpPrivacyFilter = FXCollections.observableSet(xmpPrivacyFilter);
         this.keywordSeparator = keywordSeparator;
diff --git a/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java b/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java
index a3c6e37a934d..f616c4414872 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java
@@ -1,17 +1,5 @@
 package org.jabref.logic.xmp;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.schema.DublinCoreSchemaCustom;
-
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
@@ -19,9 +7,20 @@
 import org.apache.pdfbox.pdmodel.common.PDMetadata;
 import org.apache.xmpbox.XMPMetadata;
 import org.apache.xmpbox.schema.DublinCoreSchema;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.schema.DublinCoreSchemaCustom;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+
 public class XmpUtilReader {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(XmpUtilReader.class);
@@ -31,7 +30,10 @@ public class XmpUtilReader {
 
     public XmpUtilReader() {
         // See: https://pdfbox.apache.org/2.0/getting-started.html
-        System.setProperty("sun.java2d.cmm", "sun.java2d.cmm.kcms.KcmsServiceProvider"); // To get higher rendering speed on java 8 oder 9 for images
+        System.setProperty(
+                "sun.java2d.cmm",
+                "sun.java2d.cmm.kcms.KcmsServiceProvider"); // To get higher rendering speed on java
+                                                            // 8 oder 9 for images
     }
 
     /**
@@ -57,8 +59,7 @@ public List<XMPMetadata> readRawXmp(Path path) throws IOException {
      * @throws IOException Throws an IOException if the file cannot be read, so the user than remove a lock or cancel
      *                     the operation.
      */
-    public List<BibEntry> readXmp(Path path, XmpPreferences xmpPreferences)
-            throws IOException {
+    public List<BibEntry> readXmp(Path path, XmpPreferences xmpPreferences) throws IOException {
 
         List<BibEntry> result = new LinkedList<>();
 
@@ -68,9 +69,12 @@ public List<BibEntry> readXmp(Path path, XmpPreferences xmpPreferences)
             if (!xmpMetaList.isEmpty()) {
                 // Only support Dublin Core since JabRef 4.2
                 for (XMPMetadata xmpMeta : xmpMetaList) {
-                    DublinCoreSchema dcSchema = DublinCoreSchemaCustom.copyDublinCoreSchema(xmpMeta.getDublinCoreSchema());
+                    DublinCoreSchema dcSchema =
+                            DublinCoreSchemaCustom.copyDublinCoreSchema(
+                                    xmpMeta.getDublinCoreSchema());
                     if (dcSchema != null) {
-                        DublinCoreExtractor dcExtractor = new DublinCoreExtractor(dcSchema, xmpPreferences, new BibEntry());
+                        DublinCoreExtractor dcExtractor =
+                                new DublinCoreExtractor(dcSchema, xmpPreferences, new BibEntry());
                         Optional<BibEntry> entry = dcExtractor.extractBibtexEntry();
                         entry.ifPresent(result::add);
                     }
@@ -79,7 +83,8 @@ public List<BibEntry> readXmp(Path path, XmpPreferences xmpPreferences)
             if (result.isEmpty()) {
                 // If we did not find any XMP metadata, search for non XMP metadata
                 PDDocumentInformation documentInformation = document.getDocumentInformation();
-                DocumentInformationExtractor diExtractor = new DocumentInformationExtractor(documentInformation);
+                DocumentInformationExtractor diExtractor =
+                        new DocumentInformationExtractor(documentInformation);
                 Optional<BibEntry> entry = diExtractor.extractBibtexEntry();
                 entry.ifPresent(result::add);
             }
@@ -112,14 +117,17 @@ private List<XMPMetadata> getXmpMetadata(PDDocument document) {
         int startDescriptionSection = xmp.indexOf(START_TAG);
         int endDescriptionSection = xmp.lastIndexOf(END_TAG) + END_TAG.length();
 
-        if ((startDescriptionSection < 0) || (startDescriptionSection > endDescriptionSection) || (endDescriptionSection == (END_TAG.length() - 1))) {
+        if ((startDescriptionSection < 0)
+                || (startDescriptionSection > endDescriptionSection)
+                || (endDescriptionSection == (END_TAG.length() - 1))) {
             return metaList;
         }
 
         // XML header for the xmpDomParser
         String start = xmp.substring(0, startDescriptionSection);
         // descriptionArray - mid part of the textual metadata
-        String[] descriptionsArray = xmp.substring(startDescriptionSection, endDescriptionSection).split(END_TAG);
+        String[] descriptionsArray =
+                xmp.substring(startDescriptionSection, endDescriptionSection).split(END_TAG);
         // XML footer for the xmpDomParser
         String end = xmp.substring(endDescriptionSection);
 
@@ -127,7 +135,9 @@ private List<XMPMetadata> getXmpMetadata(PDDocument document) {
             // END_TAG is appended, because of the split operation above
             String xmpMetaString = start + s + END_TAG + end;
             try {
-                metaList.add(XmpUtilShared.parseXmpMetadata(new ByteArrayInputStream(xmpMetaString.getBytes())));
+                metaList.add(
+                        XmpUtilShared.parseXmpMetadata(
+                                new ByteArrayInputStream(xmpMetaString.getBytes())));
             } catch (IOException ex) {
                 LOGGER.debug("Problem parsing XMP schema. Continuing with other schemas.", ex);
             }
diff --git a/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java b/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java
index 4957a11cfab4..b78aa59c6a77 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.xmp;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Path;
-import java.util.List;
-
-import org.jabref.model.entry.BibEntry;
-
 import org.apache.xmpbox.XMPMetadata;
 import org.apache.xmpbox.xml.DomXmpParser;
+import org.jabref.model.entry.BibEntry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.util.List;
+
 /**
  * XMPUtilShared provides support for reading (@link XMPUtilReader) and writing (@link XMPUtilWriter) BibTex data as XMP metadata
  * in PDF-documents.
@@ -20,8 +19,7 @@ public class XmpUtilShared {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(XmpUtilShared.class);
 
-    private XmpUtilShared() {
-    }
+    private XmpUtilShared() {}
 
     protected static XMPMetadata parseXmpMetadata(InputStream is) throws IOException {
         XMPMetadata meta;
@@ -30,7 +28,8 @@ protected static XMPMetadata parseXmpMetadata(InputStream is) throws IOException
             meta = parser.parse(is);
             return meta;
         } catch (Exception e) {
-            // bad style to catch Exception but as this is called in a loop we do not want to break here when any schema encounters an error
+            // bad style to catch Exception but as this is called in a loop we do not want to break
+            // here when any schema encounters an error
             throw new IOException(e);
         }
     }
diff --git a/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java b/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
index cf329b15fb71..afe0383656f1 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
@@ -1,5 +1,24 @@
 package org.jabref.logic.xmp;
 
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
+import org.apache.pdfbox.pdmodel.PDDocumentInformation;
+import org.apache.pdfbox.pdmodel.common.PDMetadata;
+import org.apache.xmpbox.XMPMetadata;
+import org.apache.xmpbox.schema.DublinCoreSchema;
+import org.apache.xmpbox.xml.XmpSerializer;
+import org.jabref.logic.exporter.EmbeddedBibFilePdfExporter;
+import org.jabref.logic.formatter.casechanger.UnprotectTermsFormatter;
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.schema.DublinCoreSchemaCustom;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -14,26 +33,6 @@
 
 import javax.xml.transform.TransformerException;
 
-import org.jabref.logic.exporter.EmbeddedBibFilePdfExporter;
-import org.jabref.logic.formatter.casechanger.UnprotectTermsFormatter;
-import org.jabref.logic.util.io.FileUtil;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.schema.DublinCoreSchemaCustom;
-
-import org.apache.pdfbox.Loader;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
-import org.apache.pdfbox.pdmodel.PDDocumentInformation;
-import org.apache.pdfbox.pdmodel.common.PDMetadata;
-import org.apache.xmpbox.XMPMetadata;
-import org.apache.xmpbox.schema.DublinCoreSchema;
-import org.apache.xmpbox.xml.XmpSerializer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Writes given BibEntries into the XMP part of a PDF file.
  * <p>
@@ -72,9 +71,7 @@ public XmpUtilWriter(XmpPreferences xmpPreferences) {
      * @throws TransformerException If the entry was malformed or unsupported.
      * @throws IOException          If the file could not be written to or could not be found.
      */
-    public void writeXmp(Path file,
-                         BibEntry entry,
-                         BibDatabase database)
+    public void writeXmp(Path file, BibEntry entry, BibDatabase database)
             throws IOException, TransformerException {
         writeXmp(file, List.of(entry), database);
     }
@@ -88,9 +85,7 @@ public void writeXmp(Path file,
      * @param database An optional database which the given bibtex entries belong to, which will be used to
      *                 resolve strings. If the database is null the strings will not be resolved.
      */
-    private void writeToDCSchema(DublinCoreSchema dcSchema,
-                                 BibEntry entry,
-                                 BibDatabase database) {
+    private void writeToDCSchema(DublinCoreSchema dcSchema, BibEntry entry, BibDatabase database) {
         BibEntry resolvedEntry = getDefaultOrDatabaseEntry(entry, database);
         writeToDCSchema(dcSchema, resolvedEntry);
     }
@@ -101,8 +96,7 @@ private void writeToDCSchema(DublinCoreSchema dcSchema,
      * @param dcSchema Dublin core schema, which is filled with the bib entry.
      * @param entry    The entry, which is added to the dublin core metadata.
      */
-    private void writeToDCSchema(DublinCoreSchema dcSchema,
-                                 BibEntry entry) {
+    private void writeToDCSchema(DublinCoreSchema dcSchema, BibEntry entry) {
         DublinCoreExtractor dcExtractor = new DublinCoreExtractor(dcSchema, xmpPreferences, entry);
         dcExtractor.fillDublinCoreSchema();
     }
@@ -117,9 +111,7 @@ private void writeToDCSchema(DublinCoreSchema dcSchema,
      * @param database An optional database which the given BibTeX entries belong to, which will be used to
      *                 resolve strings. If the database is null the strings will not be resolved.
      */
-    private void writeDublinCore(PDDocument document,
-                                 List<BibEntry> entries,
-                                 BibDatabase database)
+    private void writeDublinCore(PDDocument document, List<BibEntry> entries, BibDatabase database)
             throws IOException, TransformerException {
 
         List<BibEntry> resolvedEntries;
@@ -150,7 +142,9 @@ private void writeDublinCore(PDDocument document,
         meta.removeSchema(meta.getDublinCoreSchema());
 
         for (BibEntry entry : resolvedEntries) {
-            DublinCoreSchema dcSchema = DublinCoreSchemaCustom.copyDublinCoreSchema(meta.createAndAddDublinCoreSchema());
+            DublinCoreSchema dcSchema =
+                    DublinCoreSchemaCustom.copyDublinCoreSchema(
+                            meta.createAndAddDublinCoreSchema());
             writeToDCSchema(dcSchema, entry, null);
         }
 
@@ -207,8 +201,8 @@ public String generateXmpStringWithoutXmpDeclaration(List<BibEntry> entries) {
         Predicate<String> isBeginOrEndTag = s -> s.contains(XMP_BEGIN_END_TAG);
 
         return Arrays.stream(xmpContent.split(System.lineSeparator()))
-                     .filter(isBeginOrEndTag.negate())
-                     .collect(Collectors.joining(System.lineSeparator()));
+                .filter(isBeginOrEndTag.negate())
+                .collect(Collectors.joining(System.lineSeparator()));
     }
 
     /**
@@ -225,9 +219,8 @@ public String generateXmpStringWithoutXmpDeclaration(List<BibEntry> entries) {
      * @param database An optional database which the given bibtex entries belong to, which will be used to
      *                 resolve strings. If the database is null the strings will not be resolved.
      */
-    private void writeDocumentInformation(PDDocument document,
-                                          BibEntry entry,
-                                          BibDatabase database) {
+    private void writeDocumentInformation(
+            PDDocument document, BibEntry entry, BibDatabase database) {
         PDDocumentInformation di = document.getDocumentInformation();
         BibEntry resolvedEntry = getDefaultOrDatabaseEntry(entry, database);
 
@@ -236,19 +229,13 @@ private void writeDocumentInformation(PDDocument document,
             if (useXmpPrivacyFilter && xmpPreferences.getXmpPrivacyFilter().contains(field)) {
                 // erase field instead of adding it
                 switch (field) {
-                    case StandardField.AUTHOR ->
-                            di.setAuthor(null);
-                    case StandardField.TITLE ->
-                            di.setTitle(null);
-                    case StandardField.KEYWORDS ->
-                            di.setKeywords(null);
-                    case StandardField.ABSTRACT ->
-                            di.setSubject(null);
+                    case StandardField.AUTHOR -> di.setAuthor(null);
+                    case StandardField.TITLE -> di.setTitle(null);
+                    case StandardField.KEYWORDS -> di.setKeywords(null);
+                    case StandardField.ABSTRACT -> di.setSubject(null);
                     // do not write file field
-                    case StandardField.FILE -> {
-                    }
-                    case null, default ->
-                            di.setCustomMetadataValue("bibtex/" + field, null);
+                    case StandardField.FILE -> {}
+                    case null, default -> di.setCustomMetadataValue("bibtex/" + field, null);
                 }
                 continue;
             }
@@ -257,20 +244,18 @@ private void writeDocumentInformation(PDDocument document,
             String value = unprotectTermsFormatter.format(resolvedEntry.getField(field).orElse(""));
 
             switch (field) {
-                case StandardField.AUTHOR ->
-                        di.setAuthor(value);
-                case StandardField.TITLE ->
-                        di.setTitle(value);
-                case StandardField.KEYWORDS ->
-                        di.setKeywords(value);
-                case StandardField.ABSTRACT ->
-                        di.setSubject(value);
+                case StandardField.AUTHOR -> di.setAuthor(value);
+                case StandardField.TITLE -> di.setTitle(value);
+                case StandardField.KEYWORDS -> di.setKeywords(value);
+                case StandardField.ABSTRACT -> di.setSubject(value);
                 // do not write file field
-                case StandardField.FILE -> {
-                }
+                case StandardField.FILE -> {}
                 case null, default ->
-                        resolvedEntry.getField(field).ifPresent(val -> di.setCustomMetadataValue("bibtex/" + field, val));
-                // We hit the case of an PDF-unsupported field --> write it directly
+                        resolvedEntry
+                                .getField(field)
+                                .ifPresent(
+                                        val -> di.setCustomMetadataValue("bibtex/" + field, val));
+                    // We hit the case of an PDF-unsupported field --> write it directly
             }
         }
         di.setCustomMetadataValue("bibtex/entrytype", resolvedEntry.getType().getDisplayName());
@@ -295,9 +280,7 @@ private void writeDocumentInformation(PDDocument document,
      * @throws TransformerException If the entry was malformed or unsupported.
      * @throws IOException          If the file could not be written to or could not be found.
      */
-    public void writeXmp(Path path,
-                         List<BibEntry> bibtexEntries,
-                         BibDatabase database)
+    public void writeXmp(Path path, List<BibEntry> bibtexEntries, BibDatabase database)
             throws IOException, TransformerException {
         List<BibEntry> resolvedEntries;
         if (database == null) {
@@ -327,7 +310,8 @@ public void writeXmp(Path path,
                 FileUtil.copyFile(newFile, path, true);
             } catch (IOException e) {
                 LOGGER.debug("Could not write XMP metadata", e);
-                throw new TransformerException("Could not write XMP metadata: " + e.getLocalizedMessage(), e);
+                throw new TransformerException(
+                        "Could not write XMP metadata: " + e.getLocalizedMessage(), e);
             }
         }
         Files.delete(newFile);
diff --git a/src/main/java/org/jabref/migrations/ConvertLegacyExplicitGroups.java b/src/main/java/org/jabref/migrations/ConvertLegacyExplicitGroups.java
index 63f1ab809c43..f4e383c67dfe 100644
--- a/src/main/java/org/jabref/migrations/ConvertLegacyExplicitGroups.java
+++ b/src/main/java/org/jabref/migrations/ConvertLegacyExplicitGroups.java
@@ -1,14 +1,14 @@
 package org.jabref.migrations;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.groups.ExplicitGroup;
 import org.jabref.model.groups.GroupTreeNode;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * Converts legacy explicit groups, where the group contained a list of assigned entries, to the new format,
  * where the entry stores a list of groups it belongs to.
@@ -22,9 +22,11 @@ public void performMigration(ParserResult parserResult) {
             return;
         }
 
-        for (ExplicitGroup group : getExplicitGroupsWithLegacyKeys(parserResult.getMetaData().getGroups().get())) {
+        for (ExplicitGroup group :
+                getExplicitGroupsWithLegacyKeys(parserResult.getMetaData().getGroups().get())) {
             for (String entryKey : group.getLegacyEntryKeys()) {
-                for (BibEntry entry : parserResult.getDatabase().getEntriesByCitationKey(entryKey)) {
+                for (BibEntry entry :
+                        parserResult.getDatabase().getEntriesByCitationKey(entryKey)) {
                     group.add(entry);
                 }
             }
@@ -43,7 +45,8 @@ private List<ExplicitGroup> getExplicitGroupsWithLegacyKeys(GroupTreeNode node)
             }
         }
 
-        node.getChildren().forEach(child -> findings.addAll(getExplicitGroupsWithLegacyKeys(child)));
+        node.getChildren()
+                .forEach(child -> findings.addAll(getExplicitGroupsWithLegacyKeys(child)));
 
         return findings;
     }
diff --git a/src/main/java/org/jabref/migrations/ConvertMarkingToGroups.java b/src/main/java/org/jabref/migrations/ConvertMarkingToGroups.java
index 5326ae73fcaf..f47a8095d75e 100644
--- a/src/main/java/org/jabref/migrations/ConvertMarkingToGroups.java
+++ b/src/main/java/org/jabref/migrations/ConvertMarkingToGroups.java
@@ -1,12 +1,7 @@
 package org.jabref.migrations;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.MultimapBuilder;
 
 import javafx.collections.ObservableList;
 
@@ -19,8 +14,13 @@
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.groups.GroupTreeNode;
 
-import com.google.common.collect.Multimap;
-import com.google.common.collect.MultimapBuilder;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Converts legacy explicit groups, where the group contained a list of assigned entries, to the new format,
@@ -37,20 +37,28 @@ public void performMigration(ParserResult parserResult) {
         ObservableList<BibEntry> entries = parserResult.getDatabase().getEntries();
         Multimap<String, BibEntry> markings = getMarkingWithEntries(entries);
         if (!markings.isEmpty()) {
-            GroupTreeNode markingRoot = GroupTreeNode.fromGroup(
-                    new ExplicitGroup(Localization.lang("Markings"), GroupHierarchyType.INCLUDING, ','));
+            GroupTreeNode markingRoot =
+                    GroupTreeNode.fromGroup(
+                            new ExplicitGroup(
+                                    Localization.lang("Markings"),
+                                    GroupHierarchyType.INCLUDING,
+                                    ','));
 
             for (Map.Entry<String, Collection<BibEntry>> marking : markings.asMap().entrySet()) {
                 String markingName = marking.getKey();
                 Collection<BibEntry> markingMatchedEntries = marking.getValue();
 
-                GroupTreeNode markingGroup = markingRoot.addSubgroup(
-                        new ExplicitGroup(markingName, GroupHierarchyType.INCLUDING, ','));
+                GroupTreeNode markingGroup =
+                        markingRoot.addSubgroup(
+                                new ExplicitGroup(markingName, GroupHierarchyType.INCLUDING, ','));
                 markingGroup.addEntriesToGroup(markingMatchedEntries);
             }
 
             if (parserResult.getMetaData().getGroups().isEmpty()) {
-                parserResult.getMetaData().setGroups(GroupTreeNode.fromGroup(DefaultGroupsFactory.getAllEntriesGroup()));
+                parserResult
+                        .getMetaData()
+                        .setGroups(
+                                GroupTreeNode.fromGroup(DefaultGroupsFactory.getAllEntriesGroup()));
             }
             GroupTreeNode root = parserResult.getMetaData().getGroups().get();
             root.addChild(markingRoot, 0);
diff --git a/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java b/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java
index ae749e69e7c0..790a0ac32fca 100644
--- a/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java
+++ b/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java
@@ -1,11 +1,5 @@
 package org.jabref.migrations;
 
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import org.jabref.logic.preferences.JabRefCliPreferences;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntryType;
@@ -14,6 +8,12 @@
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.types.EntryTypeFactory;
 
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 class CustomEntryTypePreferenceMigration {
 
     // non-default preferences
@@ -22,12 +22,12 @@ class CustomEntryTypePreferenceMigration {
     private static final String CUSTOM_TYPE_OPT = "customTypeOpt_";
     private static final String CUSTOM_TYPE_PRIOPT = "customTypePriOpt_";
 
-    private CustomEntryTypePreferenceMigration() {
-    }
+    private CustomEntryTypePreferenceMigration() {}
 
-    static void upgradeStoredBibEntryTypes(BibDatabaseMode defaultBibDatabaseMode,
-                                           JabRefCliPreferences preferences,
-                                           BibEntryTypesManager entryTypesManager) {
+    static void upgradeStoredBibEntryTypes(
+            BibDatabaseMode defaultBibDatabaseMode,
+            JabRefCliPreferences preferences,
+            BibEntryTypesManager entryTypesManager) {
         List<BibEntryType> storedOldTypes = new ArrayList<>();
 
         int number = 0;
@@ -46,7 +46,8 @@ static void upgradeStoredBibEntryTypes(BibDatabaseMode defaultBibDatabaseMode,
      * <p>
      * (old implementation which has been copied)
      */
-    private static Optional<BibEntryType> getBibEntryType(int number, JabRefCliPreferences preferences) {
+    private static Optional<BibEntryType> getBibEntryType(
+            int number, JabRefCliPreferences preferences) {
         String nr = String.valueOf(number);
         String name = preferences.get(CUSTOM_TYPE_NAME + nr);
         if (name == null) {
@@ -56,20 +57,34 @@ private static Optional<BibEntryType> getBibEntryType(int number, JabRefCliPrefe
         List<String> opt = preferences.getStringList(CUSTOM_TYPE_OPT + nr);
         List<String> priOpt = preferences.getStringList(CUSTOM_TYPE_PRIOPT + nr);
 
-        BibEntryTypeBuilder entryTypeBuilder = new BibEntryTypeBuilder()
-                .withType(EntryTypeFactory.parse(name))
-                .withRequiredFields(req.stream().map(FieldFactory::parseOrFields).collect(Collectors.toCollection(LinkedHashSet::new)));
+        BibEntryTypeBuilder entryTypeBuilder =
+                new BibEntryTypeBuilder()
+                        .withType(EntryTypeFactory.parse(name))
+                        .withRequiredFields(
+                                req.stream()
+                                        .map(FieldFactory::parseOrFields)
+                                        .collect(Collectors.toCollection(LinkedHashSet::new)));
         if (priOpt.isEmpty()) {
-            entryTypeBuilder = entryTypeBuilder
-                    .withImportantFields(opt.stream().map(FieldFactory::parseField).collect(Collectors.toCollection(LinkedHashSet::new)));
+            entryTypeBuilder =
+                    entryTypeBuilder.withImportantFields(
+                            opt.stream()
+                                    .map(FieldFactory::parseField)
+                                    .collect(Collectors.toCollection(LinkedHashSet::new)));
             return Optional.of(entryTypeBuilder.build());
         } else {
             List<String> secondary = new ArrayList<>(opt);
             secondary.removeAll(priOpt);
 
-            entryTypeBuilder = entryTypeBuilder
-                    .withImportantFields(priOpt.stream().map(FieldFactory::parseField).collect(Collectors.toCollection(LinkedHashSet::new)))
-                    .withDetailFields(secondary.stream().map(FieldFactory::parseField).collect(Collectors.toCollection(LinkedHashSet::new)));
+            entryTypeBuilder =
+                    entryTypeBuilder
+                            .withImportantFields(
+                                    priOpt.stream()
+                                            .map(FieldFactory::parseField)
+                                            .collect(Collectors.toCollection(LinkedHashSet::new)))
+                            .withDetailFields(
+                                    secondary.stream()
+                                            .map(FieldFactory::parseField)
+                                            .collect(Collectors.toCollection(LinkedHashSet::new)));
             return Optional.of(entryTypeBuilder.build());
         }
     }
diff --git a/src/main/java/org/jabref/migrations/MergeReviewIntoCommentMigration.java b/src/main/java/org/jabref/migrations/MergeReviewIntoCommentMigration.java
index 7b08a38e52ec..fbd24fd24b92 100644
--- a/src/main/java/org/jabref/migrations/MergeReviewIntoCommentMigration.java
+++ b/src/main/java/org/jabref/migrations/MergeReviewIntoCommentMigration.java
@@ -1,23 +1,23 @@
 package org.jabref.migrations;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 public class MergeReviewIntoCommentMigration {
-    private static final Logger LOGGER = LoggerFactory.getLogger(MergeReviewIntoCommentMigration.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(MergeReviewIntoCommentMigration.class);
 
     public static boolean needsMigration(ParserResult parserResult) {
         return parserResult.getDatabase().getEntries().stream()
-                           .anyMatch(bibEntry -> bibEntry.getField(StandardField.REVIEW).isPresent());
+                .anyMatch(bibEntry -> bibEntry.getField(StandardField.REVIEW).isPresent());
     }
 
     public void performMigration(ParserResult parserResult) {
@@ -31,18 +31,18 @@ public void performMigration(ParserResult parserResult) {
         }
 
         entries.stream()
-               .filter(MergeReviewIntoCommentMigration::hasReviewField)
-               .filter(entry -> !MergeReviewIntoCommentMigration.hasCommentField(entry))
-               .forEach(entry -> migrate(entry, parserResult));
+                .filter(MergeReviewIntoCommentMigration::hasReviewField)
+                .filter(entry -> !MergeReviewIntoCommentMigration.hasCommentField(entry))
+                .forEach(entry -> migrate(entry, parserResult));
     }
 
     public static List<BibEntry> collectConflicts(ParserResult parserResult) {
         List<BibEntry> entries = Objects.requireNonNull(parserResult).getDatabase().getEntries();
 
         return entries.stream()
-                      .filter(MergeReviewIntoCommentMigration::hasReviewField)
-                      .filter(MergeReviewIntoCommentMigration::hasCommentField)
-                      .collect(Collectors.toList());
+                .filter(MergeReviewIntoCommentMigration::hasReviewField)
+                .filter(MergeReviewIntoCommentMigration::hasCommentField)
+                .collect(Collectors.toList());
     }
 
     public void performConflictingMigration(ParserResult parserResult) {
@@ -59,15 +59,23 @@ private static boolean hasReviewField(BibEntry entry) {
 
     private String mergeCommentFieldIfPresent(BibEntry entry, String review) {
         if (entry.getField(StandardField.COMMENT).isPresent()) {
-            LOGGER.info("Both Comment and Review fields are present in {}. Merging them into the comment field.", entry.getCitationKey().orElse(entry.getAuthorTitleYear(150)));
-            return "%s\n%s:\n%s".formatted(entry.getField(StandardField.COMMENT).get().trim(), Localization.lang("Review"), review.trim());
+            LOGGER.info(
+                    "Both Comment and Review fields are present in {}. Merging them into the comment field.",
+                    entry.getCitationKey().orElse(entry.getAuthorTitleYear(150)));
+            return "%s\n%s:\n%s"
+                    .formatted(
+                            entry.getField(StandardField.COMMENT).get().trim(),
+                            Localization.lang("Review"),
+                            review.trim());
         }
         return review;
     }
 
     private void migrate(BibEntry entry, ParserResult parserResult) {
         if (hasReviewField(entry)) {
-            updateFields(entry, mergeCommentFieldIfPresent(entry, entry.getField(StandardField.REVIEW).get()));
+            updateFields(
+                    entry,
+                    mergeCommentFieldIfPresent(entry, entry.getField(StandardField.REVIEW).get()));
             parserResult.setChangedOnMigration(true);
         }
     }
diff --git a/src/main/java/org/jabref/migrations/PreferencesMigrations.java b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
index b0299ea3f720..a92bea140ff5 100644
--- a/src/main/java/org/jabref/migrations/PreferencesMigrations.java
+++ b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
@@ -1,18 +1,6 @@
 package org.jabref.migrations;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.UnaryOperator;
-import java.util.prefs.BackingStoreException;
-import java.util.prefs.Preferences;
-import java.util.stream.Collectors;
+import com.github.javakeyring.Keyring;
 
 import javafx.scene.control.TableColumn;
 
@@ -32,22 +20,34 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.strings.StringUtil;
-
-import com.github.javakeyring.Keyring;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.UnaryOperator;
+import java.util.prefs.BackingStoreException;
+import java.util.prefs.Preferences;
+import java.util.stream.Collectors;
+
 public class PreferencesMigrations {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesMigrations.class);
 
-    private PreferencesMigrations() {
-    }
+    private PreferencesMigrations() {}
 
     /**
      * Perform checks and changes for users with a preference set from an older JabRef version.
      */
-    public static void runMigrations(JabRefGuiPreferences preferences, BibEntryTypesManager entryTypesManager) {
+    public static void runMigrations(
+            JabRefGuiPreferences preferences, BibEntryTypesManager entryTypesManager) {
         Preferences mainPrefsNode = Preferences.userRoot().node("/org/jabref");
 
         upgradePrefsToOrgJabRef(mainPrefsNode);
@@ -59,9 +59,12 @@ public static void runMigrations(JabRefGuiPreferences preferences, BibEntryTypes
         upgradeKeyBindingsToJavaFX(preferences);
         addCrossRefRelatedFieldsForAutoComplete(preferences);
         upgradePreviewStyle(preferences);
-        // changeColumnVariableNamesFor51 needs to be run before upgradeColumnPre50Preferences to ensure
-        // backward compatibility, as it copies the old values to new variable names and keeps th old sored with the old
-        // variable names. However, the variables from 5.0 need to be copied to the new variable name too.
+        // changeColumnVariableNamesFor51 needs to be run before upgradeColumnPre50Preferences to
+        // ensure
+        // backward compatibility, as it copies the old values to new variable names and keeps th
+        // old sored with the old
+        // variable names. However, the variables from 5.0 need to be copied to the new variable
+        // name too.
         changeColumnVariableNamesFor51(preferences);
         upgradeColumnPreferences(preferences);
         restoreVariablesForBackwardCompatibility(preferences);
@@ -90,7 +93,8 @@ private static void upgradePrefsToOrgJabRef(Preferences mainPrefsNode) {
         }
     }
 
-    private static void copyPrefsRecursively(Preferences from, Preferences to) throws BackingStoreException {
+    private static void copyPrefsRecursively(Preferences from, Preferences to)
+            throws BackingStoreException {
         for (String key : from.keys()) {
             String newValue = from.get(key, "");
             if (newValue.contains("net.sf")) {
@@ -152,18 +156,30 @@ private static void upgradeSortOrder(JabRefCliPreferences prefs) {
         if (prefs.get(JabRefCliPreferences.EXPORT_IN_SPECIFIED_ORDER, null) == null) {
             if (prefs.getBoolean("exportInStandardOrder", false)) {
                 prefs.putBoolean(JabRefCliPreferences.EXPORT_IN_SPECIFIED_ORDER, true);
-                prefs.put(JabRefCliPreferences.EXPORT_PRIMARY_SORT_FIELD, StandardField.AUTHOR.getName());
-                prefs.put(JabRefCliPreferences.EXPORT_SECONDARY_SORT_FIELD, StandardField.EDITOR.getName());
-                prefs.put(JabRefCliPreferences.EXPORT_TERTIARY_SORT_FIELD, StandardField.YEAR.getName());
+                prefs.put(
+                        JabRefCliPreferences.EXPORT_PRIMARY_SORT_FIELD,
+                        StandardField.AUTHOR.getName());
+                prefs.put(
+                        JabRefCliPreferences.EXPORT_SECONDARY_SORT_FIELD,
+                        StandardField.EDITOR.getName());
+                prefs.put(
+                        JabRefCliPreferences.EXPORT_TERTIARY_SORT_FIELD,
+                        StandardField.YEAR.getName());
                 prefs.putBoolean(JabRefCliPreferences.EXPORT_PRIMARY_SORT_DESCENDING, false);
                 prefs.putBoolean(JabRefCliPreferences.EXPORT_SECONDARY_SORT_DESCENDING, false);
                 prefs.putBoolean(JabRefCliPreferences.EXPORT_TERTIARY_SORT_DESCENDING, false);
             } else if (prefs.getBoolean("exportInTitleOrder", false)) {
                 // exportInTitleOrder => title, author, editor
                 prefs.putBoolean(JabRefCliPreferences.EXPORT_IN_SPECIFIED_ORDER, true);
-                prefs.put(JabRefCliPreferences.EXPORT_PRIMARY_SORT_FIELD, StandardField.TITLE.getName());
-                prefs.put(JabRefCliPreferences.EXPORT_SECONDARY_SORT_FIELD, StandardField.AUTHOR.getName());
-                prefs.put(JabRefCliPreferences.EXPORT_TERTIARY_SORT_FIELD, StandardField.EDITOR.getName());
+                prefs.put(
+                        JabRefCliPreferences.EXPORT_PRIMARY_SORT_FIELD,
+                        StandardField.TITLE.getName());
+                prefs.put(
+                        JabRefCliPreferences.EXPORT_SECONDARY_SORT_FIELD,
+                        StandardField.AUTHOR.getName());
+                prefs.put(
+                        JabRefCliPreferences.EXPORT_TERTIARY_SORT_FIELD,
+                        StandardField.EDITOR.getName());
                 prefs.putBoolean(JabRefCliPreferences.EXPORT_PRIMARY_SORT_DESCENDING, false);
                 prefs.putBoolean(JabRefCliPreferences.EXPORT_SECONDARY_SORT_DESCENDING, false);
                 prefs.putBoolean(JabRefCliPreferences.EXPORT_TERTIARY_SORT_DESCENDING, false);
@@ -174,10 +190,13 @@ private static void upgradeSortOrder(JabRefCliPreferences prefs) {
     /**
      * Migrate all customized entry types from versions <=3.7
      */
-    private static void upgradeStoredBibEntryTypes(JabRefCliPreferences prefs, Preferences mainPrefsNode, BibEntryTypesManager entryTypesManager) {
+    private static void upgradeStoredBibEntryTypes(
+            JabRefCliPreferences prefs,
+            Preferences mainPrefsNode,
+            BibEntryTypesManager entryTypesManager) {
         try {
-            if (mainPrefsNode.nodeExists(JabRefCliPreferences.CUSTOMIZED_BIBTEX_TYPES) ||
-                    mainPrefsNode.nodeExists(JabRefCliPreferences.CUSTOMIZED_BIBLATEX_TYPES)) {
+            if (mainPrefsNode.nodeExists(JabRefCliPreferences.CUSTOMIZED_BIBTEX_TYPES)
+                    || mainPrefsNode.nodeExists(JabRefCliPreferences.CUSTOMIZED_BIBLATEX_TYPES)) {
                 // skip further processing as prefs already have been migrated
             } else {
                 LOGGER.info("Migrating old custom entry types.");
@@ -196,12 +215,15 @@ private static void upgradeStoredBibEntryTypes(JabRefCliPreferences prefs, Prefe
      * <p>
      * Introduced in <a href="https://github.com/JabRef/jabref/pull/1704">#1704</a>
      */
-    private static void upgradeLabelPatternToCitationKeyPattern(JabRefCliPreferences prefs, Preferences mainPrefsNode) {
+    private static void upgradeLabelPatternToCitationKeyPattern(
+            JabRefCliPreferences prefs, Preferences mainPrefsNode) {
         final String V3_6_DEFAULT_BIBTEX_KEYPATTERN = "defaultBibtexKeyPattern";
         final String V3_6_BIBTEX_KEYPATTERN_NODE = "bibtexkeypatterns";
         final String V3_3_DEFAULT_LABELPATTERN = "defaultLabelPattern";
-        final String V3_3_LOGIC_LABELPATTERN = "logic/labelpattern"; // version 3.3 - 3.5, mind the case
-        final String V3_0_LOGIC_LABELPATTERN = "logic/labelPattern"; // node used for version 3.0 - 3.2
+        final String V3_3_LOGIC_LABELPATTERN =
+                "logic/labelpattern"; // version 3.3 - 3.5, mind the case
+        final String V3_0_LOGIC_LABELPATTERN =
+                "logic/labelPattern"; // node used for version 3.0 - 3.2
         final String LEGACY_LABELPATTERN = "labelPattern"; // version <3.0
 
         try {
@@ -211,7 +233,9 @@ private static void upgradeLabelPatternToCitationKeyPattern(JabRefCliPreferences
                 String oldDefault = mainPrefsNode.get(V3_3_DEFAULT_LABELPATTERN, null);
                 if (oldDefault != null) {
                     prefs.put(V3_6_DEFAULT_BIBTEX_KEYPATTERN, oldDefault);
-                    LOGGER.info("Upgraded old default key generator pattern '{}' to new version.", oldDefault);
+                    LOGGER.info(
+                            "Upgraded old default key generator pattern '{}' to new version.",
+                            oldDefault);
                 }
             }
             // Pref node already exists do not migrate from previous version
@@ -235,59 +259,77 @@ private static void upgradeLabelPatternToCitationKeyPattern(JabRefCliPreferences
     /**
      * Migrate Import File Name and Directory name Patterns from versions <=4.0 to new BracketedPatterns
      */
-    private static void migrateFileImportPattern(String oldStylePattern, String newStylePattern,
-                                                 JabRefCliPreferences prefs, Preferences mainPrefsNode) {
-        String preferenceFileNamePattern = mainPrefsNode.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN, null);
-
-        if ((preferenceFileNamePattern != null) &&
-                oldStylePattern.equals(preferenceFileNamePattern)) {
+    private static void migrateFileImportPattern(
+            String oldStylePattern,
+            String newStylePattern,
+            JabRefCliPreferences prefs,
+            Preferences mainPrefsNode) {
+        String preferenceFileNamePattern =
+                mainPrefsNode.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN, null);
+
+        if ((preferenceFileNamePattern != null)
+                && oldStylePattern.equals(preferenceFileNamePattern)) {
             // Upgrade the old-style File Name pattern to new one:
             mainPrefsNode.put(JabRefCliPreferences.IMPORT_FILENAMEPATTERN, newStylePattern);
-            LOGGER.info("migrated old style {} value \"{}\" to new value \"{}\" in the preference file", JabRefCliPreferences.IMPORT_FILENAMEPATTERN, oldStylePattern, newStylePattern);
+            LOGGER.info(
+                    "migrated old style {} value \"{}\" to new value \"{}\" in the preference file",
+                    JabRefCliPreferences.IMPORT_FILENAMEPATTERN,
+                    oldStylePattern,
+                    newStylePattern);
 
             if (prefs.hasKey(JabRefCliPreferences.IMPORT_FILENAMEPATTERN)) {
                 // Update also the key in the current application settings, if necessary:
                 String fileNamePattern = prefs.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN);
                 if (oldStylePattern.equals(fileNamePattern)) {
                     prefs.put(JabRefCliPreferences.IMPORT_FILENAMEPATTERN, newStylePattern);
-                    LOGGER.info("migrated old style {} value \"{}\" to new value \"{}\" in the running application", JabRefCliPreferences.IMPORT_FILENAMEPATTERN, oldStylePattern, newStylePattern);
+                    LOGGER.info(
+                            "migrated old style {} value \"{}\" to new value \"{}\" in the running application",
+                            JabRefCliPreferences.IMPORT_FILENAMEPATTERN,
+                            oldStylePattern,
+                            newStylePattern);
                 }
             }
         }
     }
 
-    static void upgradeImportFileAndDirePatterns(JabRefCliPreferences prefs, Preferences mainPrefsNode) {
+    static void upgradeImportFileAndDirePatterns(
+            JabRefCliPreferences prefs, Preferences mainPrefsNode) {
         // Migrate Import patterns
         // Check for prefs node for Version <= 4.0
         if (mainPrefsNode.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN, null) != null) {
-            String[] oldStylePatterns = new String[]{
-                    "\\bibtexkey",
-                    "\\bibtexkey\\begin{title} - \\format[RemoveBrackets]{\\title}\\end{title}"};
-            String[] newStylePatterns = new String[]{"[citationkey]",
-                    "[citationkey] - [title]"};
+            String[] oldStylePatterns =
+                    new String[] {
+                        "\\bibtexkey",
+                        "\\bibtexkey\\begin{title} - \\format[RemoveBrackets]{\\title}\\end{title}"
+                    };
+            String[] newStylePatterns = new String[] {"[citationkey]", "[citationkey] - [title]"};
 
-            String[] oldDisplayStylePattern = new String[]{"bibtexkey", "bibtexkey - title"};
+            String[] oldDisplayStylePattern = new String[] {"bibtexkey", "bibtexkey - title"};
 
             for (int i = 0; i < oldStylePatterns.length; i++) {
-                migrateFileImportPattern(oldStylePatterns[i], newStylePatterns[i], prefs, mainPrefsNode);
+                migrateFileImportPattern(
+                        oldStylePatterns[i], newStylePatterns[i], prefs, mainPrefsNode);
             }
             for (int i = 0; i < oldDisplayStylePattern.length; i++) {
-                migrateFileImportPattern(oldDisplayStylePattern[i], newStylePatterns[i], prefs, mainPrefsNode);
+                migrateFileImportPattern(
+                        oldDisplayStylePattern[i], newStylePatterns[i], prefs, mainPrefsNode);
             }
         }
-        // Directory preferences are not yet migrated, since it is not quote clear how to parse and reinterpret
+        // Directory preferences are not yet migrated, since it is not quote clear how to parse and
+        // reinterpret
         // the user defined old-style patterns, and the default pattern is "".
     }
 
     private static void upgradeKeyBindingsToJavaFX(JabRefCliPreferences prefs) {
-        UnaryOperator<String> replaceKeys = str -> {
-            String result = str.replace("ctrl ", "ctrl+");
-            result = result.replace("shift ", "shift+");
-            result = result.replace("alt ", "alt+");
-            result = result.replace("meta ", "meta+");
+        UnaryOperator<String> replaceKeys =
+                str -> {
+                    String result = str.replace("ctrl ", "ctrl+");
+                    result = result.replace("shift ", "shift+");
+                    result = result.replace("alt ", "alt+");
+                    result = result.replace("meta ", "meta+");
 
-            return result;
-        };
+                    return result;
+                };
 
         List<String> keys = new ArrayList<>(prefs.getStringList(JabRefGuiPreferences.BINDINGS));
         keys.replaceAll(replaceKeys);
@@ -296,21 +338,26 @@ private static void upgradeKeyBindingsToJavaFX(JabRefCliPreferences prefs) {
 
     private static void addCrossRefRelatedFieldsForAutoComplete(JabRefCliPreferences prefs) {
         // LinkedHashSet because we want to retain the order and add new fields to the end
-        Set<String> keys = new LinkedHashSet<>(prefs.getStringList(JabRefGuiPreferences.AUTOCOMPLETER_COMPLETE_FIELDS));
+        Set<String> keys =
+                new LinkedHashSet<>(
+                        prefs.getStringList(JabRefGuiPreferences.AUTOCOMPLETER_COMPLETE_FIELDS));
         keys.add("crossref");
         keys.add("related");
         keys.add("entryset");
-        prefs.putStringList(JabRefGuiPreferences.AUTOCOMPLETER_COMPLETE_FIELDS, new ArrayList<>(keys));
+        prefs.putStringList(
+                JabRefGuiPreferences.AUTOCOMPLETER_COMPLETE_FIELDS, new ArrayList<>(keys));
     }
 
-    private static void migrateTypedKeyPrefs(JabRefCliPreferences prefs, Preferences oldPatternPrefs)
-            throws BackingStoreException {
+    private static void migrateTypedKeyPrefs(
+            JabRefCliPreferences prefs, Preferences oldPatternPrefs) throws BackingStoreException {
         LOGGER.info("Found old Bibtex Key patterns which will be migrated to new version.");
 
-        GlobalCitationKeyPatterns keyPattern = GlobalCitationKeyPatterns.fromPattern(
-                prefs.get(JabRefCliPreferences.DEFAULT_CITATION_KEY_PATTERN));
+        GlobalCitationKeyPatterns keyPattern =
+                GlobalCitationKeyPatterns.fromPattern(
+                        prefs.get(JabRefCliPreferences.DEFAULT_CITATION_KEY_PATTERN));
         for (String key : oldPatternPrefs.keys()) {
-            keyPattern.addCitationKeyPattern(EntryTypeFactory.parse(key), oldPatternPrefs.get(key, null));
+            keyPattern.addCitationKeyPattern(
+                    EntryTypeFactory.parse(key), oldPatternPrefs.get(key, null));
         }
 
         prefs.storeGlobalCitationKeyPattern(keyPattern);
@@ -326,11 +373,23 @@ private static void migrateTypedKeyPrefs(JabRefCliPreferences prefs, Preferences
      */
     protected static void upgradePreviewStyle(JabRefGuiPreferences prefs) {
         String currentPreviewStyle = prefs.get(JabRefGuiPreferences.PREVIEW_STYLE);
-        String migratedStyle = currentPreviewStyle.replace("\\begin{review}<BR><BR><b>Review: </b> \\format[HTMLChars]{\\review} \\end{review}", "\\begin{comment}<BR><BR><b>Comment: </b> \\format[Markdown,HTMLChars]{\\comment} \\end{comment}")
-                                                  .replace("\\format[HTMLChars]{\\comment}", "\\format[Markdown,HTMLChars]{\\comment}")
-                                                  .replace("\\format[Markdown,HTMLChars]{\\comment}", "\\format[Markdown,HTMLChars(keepCurlyBraces)]{\\comment}")
-                                                  .replace("<b><i>\\bibtextype</i><a name=\"\\bibtexkey\">\\begin{bibtexkey} (\\bibtexkey)</a>", "<b><i>\\bibtextype</i><a name=\"\\citationkey\">\\begin{citationkey} (\\citationkey)</a>")
-                                                  .replace("\\end{bibtexkey}</b><br>__NEWLINE__", "\\end{citationkey}</b><br>__NEWLINE__");
+        String migratedStyle =
+                currentPreviewStyle
+                        .replace(
+                                "\\begin{review}<BR><BR><b>Review: </b> \\format[HTMLChars]{\\review} \\end{review}",
+                                "\\begin{comment}<BR><BR><b>Comment: </b> \\format[Markdown,HTMLChars]{\\comment} \\end{comment}")
+                        .replace(
+                                "\\format[HTMLChars]{\\comment}",
+                                "\\format[Markdown,HTMLChars]{\\comment}")
+                        .replace(
+                                "\\format[Markdown,HTMLChars]{\\comment}",
+                                "\\format[Markdown,HTMLChars(keepCurlyBraces)]{\\comment}")
+                        .replace(
+                                "<b><i>\\bibtextype</i><a name=\"\\bibtexkey\">\\begin{bibtexkey} (\\bibtexkey)</a>",
+                                "<b><i>\\bibtextype</i><a name=\"\\citationkey\">\\begin{citationkey} (\\citationkey)</a>")
+                        .replace(
+                                "\\end{bibtexkey}</b><br>__NEWLINE__",
+                                "\\end{citationkey}</b><br>__NEWLINE__");
         prefs.put(JabRefGuiPreferences.PREVIEW_STYLE, migratedStyle);
     }
 
@@ -349,20 +408,25 @@ protected static void upgradePreviewStyle(JabRefGuiPreferences prefs) {
      */
     static void upgradeColumnPreferences(JabRefCliPreferences preferences) {
         List<String> columnNames = preferences.getStringList(JabRefGuiPreferences.COLUMN_NAMES);
-        List<Double> columnWidths = preferences.getStringList(JabRefGuiPreferences.COLUMN_WIDTHS)
-                                               .stream()
-                                               .map(string -> {
-                                                   try {
-                                                       return Double.parseDouble(string);
-                                                   } catch (NumberFormatException e) {
-                                                       return ColumnPreferences.DEFAULT_COLUMN_WIDTH;
-                                                   }
-                                               }).toList();
+        List<Double> columnWidths =
+                preferences.getStringList(JabRefGuiPreferences.COLUMN_WIDTHS).stream()
+                        .map(
+                                string -> {
+                                    try {
+                                        return Double.parseDouble(string);
+                                    } catch (NumberFormatException e) {
+                                        return ColumnPreferences.DEFAULT_COLUMN_WIDTH;
+                                    }
+                                })
+                        .toList();
 
         // "field:"
-        String normalFieldTypeString = MainTableColumnModel.Type.NORMALFIELD.getName() + MainTableColumnModel.COLUMNS_QUALIFIER_DELIMITER;
+        String normalFieldTypeString =
+                MainTableColumnModel.Type.NORMALFIELD.getName()
+                        + MainTableColumnModel.COLUMNS_QUALIFIER_DELIMITER;
 
-        if (!columnNames.isEmpty() && columnNames.stream().noneMatch(name -> name.contains(normalFieldTypeString))) {
+        if (!columnNames.isEmpty()
+                && columnNames.stream().noneMatch(name -> name.contains(normalFieldTypeString))) {
             List<MainTableColumnModel> columns = new ArrayList<>();
             columns.add(new MainTableColumnModel(MainTableColumnModel.Type.GROUPS));
             columns.add(new MainTableColumnModel(MainTableColumnModel.Type.FILES));
@@ -372,9 +436,10 @@ static void upgradeColumnPreferences(JabRefCliPreferences preferences) {
                 String name = columnNames.get(i);
                 double columnWidth = ColumnPreferences.DEFAULT_COLUMN_WIDTH;
 
-                MainTableColumnModel.Type type = SpecialField.fromName(name)
-                                                             .map(field -> MainTableColumnModel.Type.SPECIALFIELD)
-                                                             .orElse(MainTableColumnModel.Type.NORMALFIELD);
+                MainTableColumnModel.Type type =
+                        SpecialField.fromName(name)
+                                .map(field -> MainTableColumnModel.Type.SPECIALFIELD)
+                                .orElse(MainTableColumnModel.Type.NORMALFIELD);
 
                 if (i < columnWidths.size()) {
                     columnWidth = columnWidths.get(i);
@@ -383,24 +448,27 @@ static void upgradeColumnPreferences(JabRefCliPreferences preferences) {
                 columns.add(new MainTableColumnModel(type, name, columnWidth));
             }
 
-            preferences.putStringList(JabRefGuiPreferences.COLUMN_NAMES,
+            preferences.putStringList(
+                    JabRefGuiPreferences.COLUMN_NAMES,
                     columns.stream()
-                           .map(MainTableColumnModel::getName)
-                           .collect(Collectors.toList()));
+                            .map(MainTableColumnModel::getName)
+                            .collect(Collectors.toList()));
 
-            preferences.putStringList(JabRefGuiPreferences.COLUMN_WIDTHS,
+            preferences.putStringList(
+                    JabRefGuiPreferences.COLUMN_WIDTHS,
                     columns.stream()
-                           .map(MainTableColumnModel::getWidth)
-                           .map(Double::intValue)
-                           .map(Object::toString)
-                           .collect(Collectors.toList()));
+                            .map(MainTableColumnModel::getWidth)
+                            .map(Double::intValue)
+                            .map(Object::toString)
+                            .collect(Collectors.toList()));
 
             // ASCENDING by default
-            preferences.putStringList(JabRefGuiPreferences.COLUMN_SORT_TYPES,
+            preferences.putStringList(
+                    JabRefGuiPreferences.COLUMN_SORT_TYPES,
                     columns.stream()
-                           .map(MainTableColumnModel::getSortType)
-                           .map(TableColumn.SortType::toString)
-                           .collect(Collectors.toList()));
+                            .map(MainTableColumnModel::getSortType)
+                            .map(TableColumn.SortType::toString)
+                            .collect(Collectors.toList()));
         }
     }
 
@@ -419,10 +487,14 @@ static void changeColumnVariableNamesFor51(JabRefCliPreferences preferences) {
         List<String> oldColumnNames = preferences.getStringList(V5_0_COLUMN_NAMES);
         List<String> columnNames = preferences.getStringList(V5_1_COLUMN_NAMES);
         if (!oldColumnNames.isEmpty() && columnNames.isEmpty()) {
-            preferences.putStringList(V5_1_COLUMN_NAMES, preferences.getStringList(V5_0_COLUMN_NAMES));
-            preferences.putStringList(V5_1_COLUMN_WIDTHS, preferences.getStringList(V5_0_COLUMN_WIDTHS));
-            preferences.putStringList(V5_1_COLUMN_SORT_TYPES, preferences.getStringList(V5_0_COLUMN_SORT_TYPES));
-            preferences.putStringList(V5_1_COLUMN_SORT_ORDER, preferences.getStringList(V5_0_COLUMN_SORT_ORDER));
+            preferences.putStringList(
+                    V5_1_COLUMN_NAMES, preferences.getStringList(V5_0_COLUMN_NAMES));
+            preferences.putStringList(
+                    V5_1_COLUMN_WIDTHS, preferences.getStringList(V5_0_COLUMN_WIDTHS));
+            preferences.putStringList(
+                    V5_1_COLUMN_SORT_TYPES, preferences.getStringList(V5_0_COLUMN_SORT_TYPES));
+            preferences.putStringList(
+                    V5_1_COLUMN_SORT_ORDER, preferences.getStringList(V5_0_COLUMN_SORT_ORDER));
         }
     }
 
@@ -435,15 +507,21 @@ static void changeColumnVariableNamesFor51(JabRefCliPreferences preferences) {
     static void restoreVariablesForBackwardCompatibility(JabRefCliPreferences preferences) {
         // 5.0 preference name "columnNames". The new one is {@link JabRefPreferences#COLUMN_NAMES}
         List<String> oldColumnNames = preferences.getStringList("columnNames");
-        List<String> fieldColumnNames = oldColumnNames.stream()
-                                                      .filter(columnName -> columnName.startsWith("field:") || columnName.startsWith("special:"))
-                                                      .map(columnName -> {
-                                                          if (columnName.startsWith("field:")) {
-                                                              return columnName.substring(6);
-                                                          } else { // special
-                                                              return columnName.substring(8);
-                                                          }
-                                                      }).collect(Collectors.toList());
+        List<String> fieldColumnNames =
+                oldColumnNames.stream()
+                        .filter(
+                                columnName ->
+                                        columnName.startsWith("field:")
+                                                || columnName.startsWith("special:"))
+                        .map(
+                                columnName -> {
+                                    if (columnName.startsWith("field:")) {
+                                        return columnName.substring(6);
+                                    } else { // special
+                                        return columnName.substring(8);
+                                    }
+                                })
+                        .collect(Collectors.toList());
 
         if (!fieldColumnNames.isEmpty()) {
             preferences.putStringList("columnNames", fieldColumnNames);
@@ -502,27 +580,37 @@ private static void upgradeCleanups(JabRefCliPreferences prefs) {
         final String V6_0_CLEANUP_FIELD_FORMATTERS_ENABLED = "CleanUpFormattersEnabled";
 
         List<String> activeJobs = new ArrayList<>();
-        for (CleanupPreferences.CleanupStep action : EnumSet.allOf(CleanupPreferences.CleanupStep.class)) {
+        for (CleanupPreferences.CleanupStep action :
+                EnumSet.allOf(CleanupPreferences.CleanupStep.class)) {
             Optional<String> job = prefs.getAsOptional(V5_8_CLEANUP + action.name());
             if (job.isPresent() && Boolean.parseBoolean(job.get())) {
                 activeJobs.add(action.name());
-                // prefs.deleteKey(V5_8_CLEANUP + action.name()); // for backward compatibility in comments
+                // prefs.deleteKey(V5_8_CLEANUP + action.name()); // for backward compatibility in
+                // comments
             }
         }
         if (!activeJobs.isEmpty()) {
             prefs.put(V6_0_CLEANUP_JOBS, String.join(";", activeJobs));
         }
 
-        List<String> formatterCleanups = List.of(StringUtil.unifyLineBreaks(prefs.get(V5_8_CLEANUP_FIELD_FORMATTERS), "\n")
-                                                           .split("\n"));
+        List<String> formatterCleanups =
+                List.of(
+                        StringUtil.unifyLineBreaks(prefs.get(V5_8_CLEANUP_FIELD_FORMATTERS), "\n")
+                                .split("\n"));
         if (formatterCleanups.size() >= 2
                 && (formatterCleanups.getFirst().equals(FieldFormatterCleanups.ENABLED)
-                || formatterCleanups.getFirst().equals(FieldFormatterCleanups.DISABLED))) {
-            prefs.putBoolean(V6_0_CLEANUP_FIELD_FORMATTERS_ENABLED, formatterCleanups.getFirst().equals(FieldFormatterCleanups.ENABLED)
-                    ? Boolean.TRUE
-                    : Boolean.FALSE);
-
-            prefs.put(V6_0_CLEANUP_FIELD_FORMATTERS, String.join(OS.NEWLINE, formatterCleanups.subList(1, formatterCleanups.size() - 1)));
+                        || formatterCleanups.getFirst().equals(FieldFormatterCleanups.DISABLED))) {
+            prefs.putBoolean(
+                    V6_0_CLEANUP_FIELD_FORMATTERS_ENABLED,
+                    formatterCleanups.getFirst().equals(FieldFormatterCleanups.ENABLED)
+                            ? Boolean.TRUE
+                            : Boolean.FALSE);
+
+            prefs.put(
+                    V6_0_CLEANUP_FIELD_FORMATTERS,
+                    String.join(
+                            OS.NEWLINE,
+                            formatterCleanups.subList(1, formatterCleanups.size() - 1)));
         }
     }
 
@@ -536,10 +624,13 @@ static void moveApiKeysToKeyring(JabRefCliPreferences preferences) {
         if (!keys.isEmpty() && names.size() == keys.size()) {
             try (final Keyring keyring = Keyring.create()) {
                 for (int i = 0; i < names.size(); i++) {
-                    keyring.setPassword("org.jabref.customapikeys", names.get(i), new Password(
-                            keys.get(i),
-                            preferences.getInternalPreferences().getUserAndHost())
-                            .encrypt());
+                    keyring.setPassword(
+                            "org.jabref.customapikeys",
+                            names.get(i),
+                            new Password(
+                                            keys.get(i),
+                                            preferences.getInternalPreferences().getUserAndHost())
+                                    .encrypt());
                 }
                 preferences.deleteKey(V5_9_FETCHER_CUSTOM_KEYS);
             } catch (Exception ex) {
diff --git a/src/main/java/org/jabref/migrations/SearchToLuceneMigration.java b/src/main/java/org/jabref/migrations/SearchToLuceneMigration.java
index 4a0d2db62977..8b5988b177cf 100644
--- a/src/main/java/org/jabref/migrations/SearchToLuceneMigration.java
+++ b/src/main/java/org/jabref/migrations/SearchToLuceneMigration.java
@@ -1,19 +1,20 @@
 package org.jabref.migrations;
 
-import org.jabref.model.search.ThrowingErrorListener;
-import org.jabref.search.SearchLexer;
-import org.jabref.search.SearchParser;
-
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.BailErrorStrategy;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.EscapeQuerySyntaxImpl;
+import org.jabref.model.search.ThrowingErrorListener;
+import org.jabref.search.SearchLexer;
+import org.jabref.search.SearchParser;
 
 public class SearchToLuceneMigration {
-    public static String migrateToLuceneSyntax(String searchExpression, boolean isRegularExpression) {
+    public static String migrateToLuceneSyntax(
+            String searchExpression, boolean isRegularExpression) {
         SearchParser.StartContext context = getStartContext(searchExpression);
-        SearchToLuceneVisitor searchToLuceneVisitor = new SearchToLuceneVisitor(isRegularExpression);
+        SearchToLuceneVisitor searchToLuceneVisitor =
+                new SearchToLuceneVisitor(isRegularExpression);
         QueryNode luceneQueryNode = searchToLuceneVisitor.visit(context);
         return luceneQueryNode.toQueryString(new EscapeQuerySyntaxImpl()).toString();
     }
@@ -25,7 +26,8 @@ private static SearchParser.StartContext getStartContext(String searchExpression
         SearchParser parser = new SearchParser(new CommonTokenStream(lexer));
         parser.removeErrorListeners(); // no infos on file system
         parser.addErrorListener(ThrowingErrorListener.INSTANCE);
-        parser.setErrorHandler(new BailErrorStrategy()); // ParseCancellationException on parse errors
+        parser.setErrorHandler(
+                new BailErrorStrategy()); // ParseCancellationException on parse errors
         return parser.start();
     }
 }
diff --git a/src/main/java/org/jabref/migrations/SearchToLuceneVisitor.java b/src/main/java/org/jabref/migrations/SearchToLuceneVisitor.java
index aabdf5701850..0f6f3c42421c 100644
--- a/src/main/java/org/jabref/migrations/SearchToLuceneVisitor.java
+++ b/src/main/java/org/jabref/migrations/SearchToLuceneVisitor.java
@@ -1,14 +1,5 @@
 package org.jabref.migrations;
 
-import java.util.List;
-import java.util.Optional;
-
-import org.jabref.model.entry.field.InternalField;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.search.SearchFieldConstants;
-import org.jabref.search.SearchBaseVisitor;
-import org.jabref.search.SearchParser;
-
 import org.apache.lucene.queryparser.flexible.core.nodes.AndQueryNode;
 import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode;
 import org.apache.lucene.queryparser.flexible.core.nodes.GroupQueryNode;
@@ -16,9 +7,17 @@
 import org.apache.lucene.queryparser.flexible.core.nodes.OrQueryNode;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.nodes.RegexpQueryNode;
+import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.search.SearchFieldConstants;
+import org.jabref.search.SearchBaseVisitor;
+import org.jabref.search.SearchParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Optional;
+
 /**
  * Converts to a Lucene index with the assumption that the ngram analyzer is used.
  *
@@ -38,23 +37,45 @@ public SearchToLuceneVisitor(boolean isRegularExpression) {
     public QueryNode visitStart(SearchParser.StartContext ctx) {
         QueryNode result = visit(ctx.expression());
 
-        // If user searches for a single negation, Lucene also (!) interprets it as filter on the entities matched by the other terms
+        // If user searches for a single negation, Lucene also (!) interprets it as filter on the
+        // entities matched by the other terms
         // We need to add a "filter" to match all entities
         // See https://github.com/LoayGhreeb/lucene-mwe/issues/1 for more details
         if (result instanceof ModifierQueryNode modifierQueryNode) {
             if (modifierQueryNode.getModifier() == ModifierQueryNode.Modifier.MOD_NOT) {
-                return new AndQueryNode(List.of(new FieldQueryNode(SearchFieldConstants.DEFAULT_FIELD.toString(), "*", 0, 0), modifierQueryNode));
+                return new AndQueryNode(
+                        List.of(
+                                new FieldQueryNode(
+                                        SearchFieldConstants.DEFAULT_FIELD.toString(), "*", 0, 0),
+                                modifierQueryNode));
             }
         }
 
         // User might search for NOT this AND NOT that - we also need to convert properly
         if (result instanceof AndQueryNode andQueryNode) {
-            if (andQueryNode.getChildren().stream().allMatch(child -> child instanceof ModifierQueryNode modifierQueryNode && modifierQueryNode.getModifier() == ModifierQueryNode.Modifier.MOD_NOT)) {
-                List<QueryNode> children = andQueryNode.getChildren().stream()
-                                                       // prepend "any:* AND" to each child
-                                                       .map(child -> new AndQueryNode(List.of(new FieldQueryNode(SearchFieldConstants.DEFAULT_FIELD.toString(), "*", 0, 0), child)))
-                                                       .map(child -> (QueryNode) child)
-                                                       .toList();
+            if (andQueryNode.getChildren().stream()
+                    .allMatch(
+                            child ->
+                                    child instanceof ModifierQueryNode modifierQueryNode
+                                            && modifierQueryNode.getModifier()
+                                                    == ModifierQueryNode.Modifier.MOD_NOT)) {
+                List<QueryNode> children =
+                        andQueryNode.getChildren().stream()
+                                // prepend "any:* AND" to each child
+                                .map(
+                                        child ->
+                                                new AndQueryNode(
+                                                        List.of(
+                                                                new FieldQueryNode(
+                                                                        SearchFieldConstants
+                                                                                .DEFAULT_FIELD
+                                                                                .toString(),
+                                                                        "*",
+                                                                        0,
+                                                                        0),
+                                                                child)))
+                                .map(child -> (QueryNode) child)
+                                .toList();
                 return new AndQueryNode(children);
             }
         }
@@ -98,20 +119,24 @@ public QueryNode visitComparison(SearchParser.ComparisonContext context) {
             String field = fieldDescriptor.get().getText();
 
             // Direct comparison does not work
-            // context.CONTAINS() and others are null if absent (thus, we cannot check for getText())
-            if (context.CONTAINS() != null ||
-                    context.MATCHES() != null ||
-                    context.EQUAL() != null ||
-                    context.EEQUAL() != null) { // exact match
+            // context.CONTAINS() and others are null if absent (thus, we cannot check for
+            // getText())
+            if (context.CONTAINS() != null
+                    || context.MATCHES() != null
+                    || context.EQUAL() != null
+                    || context.EEQUAL() != null) { // exact match
                 if (LOGGER.isDebugEnabled() && context.EEQUAL() != null) {
-                    LOGGER.warn("Exact match is currently not supported by Lucene, using contains instead. Term: {}", context.getText());
+                    LOGGER.warn(
+                            "Exact match is currently not supported by Lucene, using contains instead. Term: {}",
+                            context.getText());
                 }
                 return getFieldQueryNode(field, right, startIndex, stopIndex, false);
             }
 
             assert (context.NEQUAL() != null);
 
-            // Treating of "wrong" query field != "". This did not work in v5.x, but should work in v6.x
+            // Treating of "wrong" query field != "". This did not work in v5.x, but should work in
+            // v6.x
             boolean forceRegex;
             if (right.isEmpty()) {
                 forceRegex = true;
@@ -120,9 +145,16 @@ public QueryNode visitComparison(SearchParser.ComparisonContext context) {
                 forceRegex = false;
             }
 
-            return new ModifierQueryNode(getFieldQueryNode(field, right, startIndex, stopIndex, forceRegex), ModifierQueryNode.Modifier.MOD_NOT);
+            return new ModifierQueryNode(
+                    getFieldQueryNode(field, right, startIndex, stopIndex, forceRegex),
+                    ModifierQueryNode.Modifier.MOD_NOT);
         } else {
-            return getFieldQueryNode(SearchFieldConstants.DEFAULT_FIELD.toString(), right, startIndex, stopIndex, false);
+            return getFieldQueryNode(
+                    SearchFieldConstants.DEFAULT_FIELD.toString(),
+                    right,
+                    startIndex,
+                    stopIndex,
+                    false);
         }
     }
 
@@ -131,13 +163,15 @@ public QueryNode visitComparison(SearchParser.ComparisonContext context) {
      * In Lucene, this is represented by a RegexpQueryNode or a FieldQueryNode.
      * They are created in this class accordingly.
      */
-    private QueryNode getFieldQueryNode(String field, String term, int startIndex, int stopIndex, boolean forceRegex) {
-        field = switch (field) {
-            case "anyfield" -> SearchFieldConstants.DEFAULT_FIELD.toString();
-            case "anykeyword" -> StandardField.KEYWORDS.getName();
-            case "key" -> InternalField.KEY_FIELD.getName();
-            default -> field;
-        };
+    private QueryNode getFieldQueryNode(
+            String field, String term, int startIndex, int stopIndex, boolean forceRegex) {
+        field =
+                switch (field) {
+                    case "anyfield" -> SearchFieldConstants.DEFAULT_FIELD.toString();
+                    case "anykeyword" -> StandardField.KEYWORDS.getName();
+                    case "key" -> InternalField.KEY_FIELD.getName();
+                    default -> field;
+                };
 
         if (isRegularExpression || forceRegex) {
             // Lucene does a sanity check on the positions, thus we provide other fake positions
diff --git a/src/main/java/org/jabref/migrations/SpecialFieldsToSeparateFields.java b/src/main/java/org/jabref/migrations/SpecialFieldsToSeparateFields.java
index 06f18823e227..ec56659610a5 100644
--- a/src/main/java/org/jabref/migrations/SpecialFieldsToSeparateFields.java
+++ b/src/main/java/org/jabref/migrations/SpecialFieldsToSeparateFields.java
@@ -1,12 +1,5 @@
 package org.jabref.migrations;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Keyword;
@@ -14,6 +7,13 @@
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.SpecialFieldValue;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 public class SpecialFieldsToSeparateFields implements PostOpenMigration {
     private final KeywordList possibleKeywordsToMigrate;
     private final Character keywordDelimiter;
@@ -21,11 +21,13 @@ public class SpecialFieldsToSeparateFields implements PostOpenMigration {
 
     public SpecialFieldsToSeparateFields(Character keywordDelimiter) {
         List<SpecialFieldValue> specialFieldValues = Arrays.asList(SpecialFieldValue.values());
-        possibleKeywordsToMigrate = new KeywordList(specialFieldValues.stream()
-                                                                      .map(SpecialFieldValue::getKeyword)
-                                                                      .filter(Optional::isPresent)
-                                                                      .map(Optional::get)
-                                                                      .collect(Collectors.toList()));
+        possibleKeywordsToMigrate =
+                new KeywordList(
+                        specialFieldValues.stream()
+                                .map(SpecialFieldValue::getKeyword)
+                                .filter(Optional::isPresent)
+                                .map(Optional::get)
+                                .collect(Collectors.toList()));
         this.keywordDelimiter = keywordDelimiter;
     }
 
@@ -36,7 +38,8 @@ public void performMigration(ParserResult parserResult) {
 
     private void migrateEntry(BibEntry entry) {
         for (Keyword keyword : possibleKeywordsToMigrate) {
-            if (entry.getKeywords(keywordDelimiter).contains(keyword) && migrationTable.containsKey(keyword.get())) {
+            if (entry.getKeywords(keywordDelimiter).contains(keyword)
+                    && migrationTable.containsKey(keyword.get())) {
                 entry.setField(migrationTable.get(keyword.get()), keyword.get());
             }
         }
diff --git a/src/main/java/org/jabref/model/ChainNode.java b/src/main/java/org/jabref/model/ChainNode.java
index 7b0a36252542..9fce9b8c9f37 100644
--- a/src/main/java/org/jabref/model/ChainNode.java
+++ b/src/main/java/org/jabref/model/ChainNode.java
@@ -21,13 +21,16 @@
  *
  * @param <T> the type of the class
  */
-@SuppressWarnings("unchecked") // We use some explicit casts of the form "(T) this". The constructor ensures that this cast is valid.
+@SuppressWarnings(
+        "unchecked") // We use some explicit casts of the form "(T) this". The constructor ensures
+                     // that this cast is valid.
 public abstract class ChainNode<T extends ChainNode<T>> {
 
     /**
      * This node's parent, or null if this node has no parent
      */
     private T parent;
+
     /**
      * This node's child, or null if this node has no child
      */
@@ -44,7 +47,8 @@ public ChainNode(Class<T> derivingClass) {
         child = null;
 
         if (!derivingClass.isInstance(this)) {
-            throw new UnsupportedOperationException("The class extending ChainNode<T> has to derive from T");
+            throw new UnsupportedOperationException(
+                    "The class extending ChainNode<T> has to derive from T");
         }
     }
 
@@ -89,7 +93,8 @@ public Optional<T> getChild() {
     public T setChild(T child) {
         Objects.requireNonNull(child);
         if (child.getParent().isPresent()) {
-            throw new UnsupportedOperationException("Cannot add a node which already has a parent, use moveTo instead");
+            throw new UnsupportedOperationException(
+                    "Cannot add a node which already has a parent, use moveTo instead");
         }
 
         child.setParent((T) this);
@@ -109,9 +114,11 @@ public T setChild(T child) {
     public void moveTo(T target) {
         Objects.requireNonNull(target);
 
-        // Check that the target node is not an ancestor of this node, because this would create loops in the tree
+        // Check that the target node is not an ancestor of this node, because this would create
+        // loops in the tree
         if (this.isAncestorOf(target)) {
-            throw new UnsupportedOperationException("the target cannot be a descendant of this node");
+            throw new UnsupportedOperationException(
+                    "the target cannot be a descendant of this node");
         }
 
         // Remove from previous parent
diff --git a/src/main/java/org/jabref/model/FieldChange.java b/src/main/java/org/jabref/model/FieldChange.java
index 02d4fd593e44..b54e5425c2da 100644
--- a/src/main/java/org/jabref/model/FieldChange.java
+++ b/src/main/java/org/jabref/model/FieldChange.java
@@ -1,10 +1,10 @@
 package org.jabref.model;
 
-import java.util.Objects;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
+import java.util.Objects;
+
 /**
  * This class is used in the instance of a field being modified, removed or added.
  */
@@ -81,7 +81,14 @@ public boolean equals(Object obj) {
 
     @Override
     public String toString() {
-        return "FieldChange [entry=" + entry.getCitationKey().orElse("") + ", field=" + field + ", oldValue="
-                + oldValue + ", newValue=" + newValue + "]";
+        return "FieldChange [entry="
+                + entry.getCitationKey().orElse("")
+                + ", field="
+                + field
+                + ", oldValue="
+                + oldValue
+                + ", newValue="
+                + newValue
+                + "]";
     }
 }
diff --git a/src/main/java/org/jabref/model/TreeNode.java b/src/main/java/org/jabref/model/TreeNode.java
index b34e2011a0f1..467c3fab2b3c 100644
--- a/src/main/java/org/jabref/model/TreeNode.java
+++ b/src/main/java/org/jabref/model/TreeNode.java
@@ -1,5 +1,8 @@
 package org.jabref.model;
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -9,9 +12,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-
 /**
  * Represents a node in a tree.
  * <p>
@@ -30,7 +30,8 @@
  *
  * @param <T> the type of the class
  */
-// We use some explicit casts of the form "(T) this". The constructor ensures that this cast is valid.
+// We use some explicit casts of the form "(T) this". The constructor ensures that this cast is
+// valid.
 @SuppressWarnings("unchecked")
 public abstract class TreeNode<T extends TreeNode<T>> {
 
@@ -38,16 +39,19 @@ public abstract class TreeNode<T extends TreeNode<T>> {
      * Array of children, may be empty if this node has no children (but never null)
      */
     private final ObservableList<T> children;
+
     /**
      * This node's parent, or null if this node has no parent
      */
     private T parent;
+
     /**
      * The function which is invoked when something changed in the subtree.
      */
-    private Consumer<T> onDescendantChanged = t -> {
-        /* Do nothing */
-    };
+    private Consumer<T> onDescendantChanged =
+            t -> {
+                /* Do nothing */
+            };
 
     /**
      * Constructs a tree node without parent and no children.
@@ -60,7 +64,8 @@ public TreeNode(Class<T> derivingClass) {
         children = FXCollections.observableArrayList();
 
         if (!derivingClass.isInstance(this)) {
-            throw new UnsupportedOperationException("The class extending TreeNode<T> has to derive from T");
+            throw new UnsupportedOperationException(
+                    "The class extending TreeNode<T> has to derive from T");
         }
     }
 
@@ -115,8 +120,11 @@ public Optional<T> getDescendant(List<Integer> indexedPath) {
      * @return the child index of this node in its parent
      */
     public int getPositionInParent() {
-        return getParent().orElseThrow(() -> new UnsupportedOperationException("Roots have no position in parent"))
-                          .getIndexOfChild((T) this).get();
+        return getParent()
+                .orElseThrow(
+                        () -> new UnsupportedOperationException("Roots have no position in parent"))
+                .getIndexOfChild((T) this)
+                .get();
     }
 
     /**
@@ -469,7 +477,8 @@ public T addChild(T child) {
     public T addChild(T child, int index) {
         Objects.requireNonNull(child);
         if (child.getParent().isPresent()) {
-            throw new UnsupportedOperationException("Cannot add a node which already has a parent, use moveTo instead");
+            throw new UnsupportedOperationException(
+                    "Cannot add a node which already has a parent, use moveTo instead");
         }
 
         child.setParent((T) this);
@@ -549,9 +558,11 @@ public void sortChildren(Comparator<? super T> comparator, boolean recursive) {
     public void moveTo(T target, int targetIndex) {
         Objects.requireNonNull(target);
 
-        // Check that the target node is not an ancestor of this node, because this would create loops in the tree
+        // Check that the target node is not an ancestor of this node, because this would create
+        // loops in the tree
         if (this.isAncestorOf(target)) {
-            throw new UnsupportedOperationException("the target cannot be a descendant of this node");
+            throw new UnsupportedOperationException(
+                    "the target cannot be a descendant of this node");
         }
 
         // Remove from previous parent
@@ -629,6 +640,7 @@ public List<T> findChildrenSatisfying(Predicate<T> matcher) {
     }
 
     public Stream<T> iterateOverTree() {
-        return Stream.concat(Stream.of((T) this), getChildren().stream().flatMap(TreeNode::iterateOverTree));
+        return Stream.concat(
+                Stream.of((T) this), getChildren().stream().flatMap(TreeNode::iterateOverTree));
     }
 }
diff --git a/src/main/java/org/jabref/model/ai/AiProvider.java b/src/main/java/org/jabref/model/ai/AiProvider.java
index ae33acb97cdd..717d922124f2 100644
--- a/src/main/java/org/jabref/model/ai/AiProvider.java
+++ b/src/main/java/org/jabref/model/ai/AiProvider.java
@@ -22,4 +22,3 @@ public String toString() {
         return label;
     }
 }
-
diff --git a/src/main/java/org/jabref/model/ai/EmbeddingModel.java b/src/main/java/org/jabref/model/ai/EmbeddingModel.java
index 262aea878473..55d9c5437575 100644
--- a/src/main/java/org/jabref/model/ai/EmbeddingModel.java
+++ b/src/main/java/org/jabref/model/ai/EmbeddingModel.java
@@ -8,18 +8,23 @@
  */
 public enum EmbeddingModel {
     ZEROHELL_TINYDPR_ACC_0_315_BS_307("zerohell/tinydpr-acc_0.315-bs_307", 45821255L),
-    OMARELSAYEED_SEARCH_MODEL_PRECHATS_AUGMENTED("omarelsayeed/Search_Model_PRECHATS_AUGMENTED", 47407976L),
+    OMARELSAYEED_SEARCH_MODEL_PRECHATS_AUGMENTED(
+            "omarelsayeed/Search_Model_PRECHATS_AUGMENTED", 47407976L),
     DDOBOKKI_ELECTRA_SMALL_NLI_STS("ddobokki/electra-small-nli-sts", 55621715L),
     DAEKEUN_ML_KOELECTRA_SMALL_V3_KORSTS("daekeun-ml/koelectra-small-v3-korsts", 57381425L),
     JINAAI_JINA_EMBEDDING_T_EN_V1("jinaai/jina-embedding-t-en-v1", 58379473L),
     CRAIG_PARAPHRASE_MINILM_L6_V2("Craig/paraphrase-MiniLM-L6-v2", 91599429L),
-    FLAX_SENTENCE_EMBEDDINGS_MULTI_QA_V1_MINILM_L6_CLS_DOT("flax-sentence-embeddings/multi-qa_v1-MiniLM-L6-cls_dot", 91634951L),
-    FLAX_SENTENCE_EMBEDDINGS_ALL_DATASETS_V4_MINILM_L6("flax-sentence-embeddings/all_datasets_v4_MiniLM-L6", 91649161L),
+    FLAX_SENTENCE_EMBEDDINGS_MULTI_QA_V1_MINILM_L6_CLS_DOT(
+            "flax-sentence-embeddings/multi-qa_v1-MiniLM-L6-cls_dot", 91634951L),
+    FLAX_SENTENCE_EMBEDDINGS_ALL_DATASETS_V4_MINILM_L6(
+            "flax-sentence-embeddings/all_datasets_v4_MiniLM-L6", 91649161L),
     OBRIZUM_ALL_MINILM_L6_V2("obrizum/all-MiniLM-L6-v2", 91652211L),
     TAVAKOLIH_ALL_MINILM_L6_V2_PUBMED_FULL("tavakolih/all-MiniLM-L6-v2-pubmed-full", 91838102L),
     TEKRAJ_AVODAMED_SYNONYM_GENERATOR1("tekraj/avodamed-synonym-generator1", 91838145L),
-    RIOLITE_PRODUCTS_MATCHING_AUMET_FINE_TUNE_2023_08_22("RIOLITE/products_matching_aumet_fine_tune_2023-08-22", 91839291L),
-    JAIMEVERA1107_ALL_MINILM_L6_V2_SIMILARITY_ES("jaimevera1107/all-MiniLM-L6-v2-similarity-es", 91842465L),
+    RIOLITE_PRODUCTS_MATCHING_AUMET_FINE_TUNE_2023_08_22(
+            "RIOLITE/products_matching_aumet_fine_tune_2023-08-22", 91839291L),
+    JAIMEVERA1107_ALL_MINILM_L6_V2_SIMILARITY_ES(
+            "jaimevera1107/all-MiniLM-L6-v2-similarity-es", 91842465L),
     NATEGRO_PARAMETER_MINI_LDS("nategro/parameter-mini-lds", 91843514L),
     VALURANK_MINILM_L6_KEYWORD_EXTRACTION("valurank/MiniLM-L6-Keyword-Extraction", 91900285L),
     COINTEGRATED_RUBERT_TINY("cointegrated/rubert-tiny", 96055211L),
@@ -31,118 +36,165 @@ public enum EmbeddingModel {
     INKOZIEV_SBERT_PQ("inkoziev/sbert_pq", 120308714L),
     INKOZIEV_SBERT_SYNONYMY("inkoziev/sbert_synonymy", 120311223L),
     THENLPER_GTE_SMALL_ZH("thenlper/gte-small-zh", 121472573L),
-    FLAX_SENTENCE_EMBEDDINGS_ALL_DATASETS_V3_MINILM_L12("flax-sentence-embeddings/all_datasets_v3_MiniLM-L12", 134243017L),
+    FLAX_SENTENCE_EMBEDDINGS_ALL_DATASETS_V3_MINILM_L12(
+            "flax-sentence-embeddings/all_datasets_v3_MiniLM-L12", 134243017L),
     YUNYU_SENTENCE_TRANSFORMERS_E5_SMALL_V2("yunyu/sentence-transformers-e5-small-v2", 134456313L),
     WITH_MADRID_WITH_E5_SMALL_V2("with-madrid/with-e5-small-v2", 134460325L),
     THENLPER_GTE_SMALL("thenlper/gte-small", 134511905L),
-    SENTENCE_TRANSFORMERS_PARAPHRASE_ALBERT_BASE_V2("sentence-transformers/paraphrase-albert-base-v2", 142338665L),
+    SENTENCE_TRANSFORMERS_PARAPHRASE_ALBERT_BASE_V2(
+            "sentence-transformers/paraphrase-albert-base-v2", 142338665L),
     TAYLORAI_BGE_MICRO("TaylorAI/bge-micro", 157041724L),
     TAYLORAI_BGE_MICRO_V2("TaylorAI/bge-micro-v2", 157042922L),
     SENTENCE_TRANSFORMERS_ALL_MINILM_L6_V1("sentence-transformers/all-MiniLM-L6-v1", 182496433L),
-    SENTENCE_TRANSFORMERS_PARAPHRASE_ALBERT_SMALL_V2("sentence-transformers/paraphrase-albert-small-v2", 189084665L),
+    SENTENCE_TRANSFORMERS_PARAPHRASE_ALBERT_SMALL_V2(
+            "sentence-transformers/paraphrase-albert-small-v2", 189084665L),
     INFGRAD_STELLA_BASE_ZH_V2("infgrad/stella-base-zh-v2", 205986861L),
-    SENTENCE_TRANSFORMERS_PARAPHRASE_MINILM_L3_V2("sentence-transformers/paraphrase-MiniLM-L3-v2", 209503582L),
+    SENTENCE_TRANSFORMERS_PARAPHRASE_MINILM_L3_V2(
+            "sentence-transformers/paraphrase-MiniLM-L3-v2", 209503582L),
     INFGRAD_STELLA_BASE_EN_V2("infgrad/stella-base-en-v2", 220059382L),
     COINTEGRATED_RUBERT_TINY2("cointegrated/rubert-tiny2", 238866335L),
-    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_BASE_TAS_B("sentence-transformers/msmarco-distilbert-base-tas-b", 266190339L),
-    SAKIL_SENTENCE_SIMILARITY_SEMANTIC_SEARCH("Sakil/sentence_similarity_semantic_search", 266463591L),
+    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_BASE_TAS_B(
+            "sentence-transformers/msmarco-distilbert-base-tas-b", 266190339L),
+    SAKIL_SENTENCE_SIMILARITY_SEMANTIC_SEARCH(
+            "Sakil/sentence_similarity_semantic_search", 266463591L),
     INTFLOAT_E5_SMALL_UNSUPERVISED("intfloat/e5-small-unsupervised", 267690846L),
     SENTENCE_TRANSFORMERS_ALL_MINILM_L12_V1("sentence-transformers/all-MiniLM-L12-v1", 267711998L),
     METARANK_CE_ESCI_MINILM_L12_V2("metarank/ce-esci-MiniLM-L12-v2", 268183428L),
-    SENTENCE_TRANSFORMERS_PARAPHRASE_MINILM_L6_V2("sentence-transformers/paraphrase-MiniLM-L6-v2", 273472933L),
-    SENTENCE_TRANSFORMERS_MULTI_QA_MINILM_L6_DOT_V1("sentence-transformers/multi-qa-MiniLM-L6-dot-v1", 273512223L),
-    SENTENCE_TRANSFORMERS_MULTI_QA_MINILM_L6_COS_V1("sentence-transformers/multi-qa-MiniLM-L6-cos-v1", 273514267L),
-    SEYEDALI_MULTILINGUAL_TEXT_SEMANTIC_SEARCH_SIAMESE_BERT_V1("SeyedAli/Multilingual-Text-Semantic-Search-Siamese-BERT-V1", 273514358L),
+    SENTENCE_TRANSFORMERS_PARAPHRASE_MINILM_L6_V2(
+            "sentence-transformers/paraphrase-MiniLM-L6-v2", 273472933L),
+    SENTENCE_TRANSFORMERS_MULTI_QA_MINILM_L6_DOT_V1(
+            "sentence-transformers/multi-qa-MiniLM-L6-dot-v1", 273512223L),
+    SENTENCE_TRANSFORMERS_MULTI_QA_MINILM_L6_COS_V1(
+            "sentence-transformers/multi-qa-MiniLM-L6-cos-v1", 273514267L),
+    SEYEDALI_MULTILINGUAL_TEXT_SEMANTIC_SEARCH_SIAMESE_BERT_V1(
+            "SeyedAli/Multilingual-Text-Semantic-Search-Siamese-BERT-V1", 273514358L),
     HUM_WORKS_LODESTONE_BASE_4096_V1("Hum-Works/lodestone-base-4096-v1", 276079125L),
     TAYLORAI_GTE_TINY("TaylorAI/gte-tiny", 295507495L),
-    FLAX_SENTENCE_EMBEDDINGS_ST_CODESEARCH_DISTILROBERTA_BASE("flax-sentence-embeddings/st-codesearch-distilroberta-base", 331141227L),
-    EMBEDDING_DATA_DISTILROBERTA_BASE_SENTENCE_TRANSFORMER("embedding-data/distilroberta-base-sentence-transformer", 331882136L),
-    SENTENCE_TRANSFORMERS_MSMARCO_MINILM_L_6_V3("sentence-transformers/msmarco-MiniLM-L-6-v3", 364329689L),
-    SENTENCE_TRANSFORMERS_MSMARCO_MINILM_L6_COS_V5("sentence-transformers/msmarco-MiniLM-L6-cos-v5", 364331688L),
+    FLAX_SENTENCE_EMBEDDINGS_ST_CODESEARCH_DISTILROBERTA_BASE(
+            "flax-sentence-embeddings/st-codesearch-distilroberta-base", 331141227L),
+    EMBEDDING_DATA_DISTILROBERTA_BASE_SENTENCE_TRANSFORMER(
+            "embedding-data/distilroberta-base-sentence-transformer", 331882136L),
+    SENTENCE_TRANSFORMERS_MSMARCO_MINILM_L_6_V3(
+            "sentence-transformers/msmarco-MiniLM-L-6-v3", 364329689L),
+    SENTENCE_TRANSFORMERS_MSMARCO_MINILM_L6_COS_V5(
+            "sentence-transformers/msmarco-MiniLM-L6-cos-v5", 364331688L),
     INTFLOAT_E5_SMALL("intfloat/e5-small", 400847215L),
     BAAI_BGE_SMALL_EN_V1_5("BAAI/bge-small-en-v1.5", 401109346L),
     SENTENCE_TRANSFORMERS_ALL_MINILM_L12_V2("sentence-transformers/all-MiniLM-L12-v2", 401240896L),
-    SENTENCE_TRANSFORMERS_PARAPHRASE_MINILM_L12_V2("sentence-transformers/paraphrase-MiniLM-L12-v2", 401412737L),
+    SENTENCE_TRANSFORMERS_PARAPHRASE_MINILM_L12_V2(
+            "sentence-transformers/paraphrase-MiniLM-L12-v2", 401412737L),
     UER_SBERT_BASE_CHINESE_NLI("uer/sbert-base-chinese-nli", 409269989L),
     GANYMEDENIL_TEXT2VEC_BASE_CHINESE("GanymedeNil/text2vec-base-chinese", 409692389L),
-    RYANLAI_SHIBING624_TEXT2VEC_BASE_CHINESE_FINE_TUNE_INSURANCE_DATA("ryanlai/shibing624_text2vec-base-chinese-fine-tune-insurance_data", 409693794L),
+    RYANLAI_SHIBING624_TEXT2VEC_BASE_CHINESE_FINE_TUNE_INSURANCE_DATA(
+            "ryanlai/shibing624_text2vec-base-chinese-fine-tune-insurance_data", 409693794L),
     DMETASOUL_SBERT_CHINESE_GENERAL_V2("DMetaSoul/sbert-chinese-general-v2", 409704852L),
     THENLPER_GTE_BASE_ZH("thenlper/gte-base-zh", 409713201L),
     BAAI_BGE_BASE_ZH_V1_5("BAAI/bge-base-zh-v1.5", 409719134L),
     DMETASOUL_SBERT_CHINESE_GENERAL_V1("DMetaSoul/sbert-chinese-general-v1", 410456811L),
-    KORNWTP_CONGEN_PARAPHRASE_MULTILINGUAL_MPNET_BASE_V2("kornwtp/ConGen-paraphrase-multilingual-mpnet-base-v2", 423346343L),
+    KORNWTP_CONGEN_PARAPHRASE_MULTILINGUAL_MPNET_BASE_V2(
+            "kornwtp/ConGen-paraphrase-multilingual-mpnet-base-v2", 423346343L),
     KAMALKRAJ_BIOSIMCSE_BIOLINKBERT_BASE("kamalkraj/BioSimCSE-BioLinkBERT-BASE", 433910574L),
-    ADITEYABARAL_SENTENCETRANSFORMER_BERT_BASE_CASED("aditeyabaral/sentencetransformer-bert-base-cased", 433978649L),
+    ADITEYABARAL_SENTENCETRANSFORMER_BERT_BASE_CASED(
+            "aditeyabaral/sentencetransformer-bert-base-cased", 433978649L),
     PRITAMDEKA_S_BIOBERT_SNLI_MULTINLI_STSB("pritamdeka/S-BioBert-snli-multinli-stsb", 433980263L),
-    PRITAMDEKA_BIOBERT_MNLI_SNLI_SCINLI_SCITAIL_MEDNLI_STSB("pritamdeka/BioBERT-mnli-snli-scinli-scitail-mednli-stsb", 434214702L),
-    RICARDO_FILHO_BERT_BASE_PORTUGUESE_CASED_NLI_ASSIN_2("ricardo-filho/bert-base-portuguese-cased-nli-assin-2", 436429150L),
+    PRITAMDEKA_BIOBERT_MNLI_SNLI_SCINLI_SCITAIL_MEDNLI_STSB(
+            "pritamdeka/BioBERT-mnli-snli-scinli-scitail-mednli-stsb", 434214702L),
+    RICARDO_FILHO_BERT_BASE_PORTUGUESE_CASED_NLI_ASSIN_2(
+            "ricardo-filho/bert-base-portuguese-cased-nli-assin-2", 436429150L),
     ALFANEO_JURISBERT_BASE_PORTUGUESE_STS("alfaneo/jurisbert-base-portuguese-sts", 436521076L),
     ANATEL_BERT_AUGMENTED_PT_ANATEL("anatel/bert-augmented-pt-anatel", 436668456L),
     JEGORMEISTER_BERT_BASE_DUTCH_CASED_SNLI("jegormeister/bert-base-dutch-cased-snli", 437355818L),
-    TEXTGAIN_ALLNLI_GRONLP_BERT_BASE_DUTCH_CASED("textgain/allnli-GroNLP-bert-base-dutch-cased", 437582891L),
+    TEXTGAIN_ALLNLI_GRONLP_BERT_BASE_DUTCH_CASED(
+            "textgain/allnli-GroNLP-bert-base-dutch-cased", 437582891L),
     CASKCSG_COTMAE_BASE_MSMARCO_RETRIEVER("caskcsg/cotmae_base_msmarco_retriever", 438251940L),
-    PRITAMDEKA_S_PUBMEDBERT_MS_MARCO_SCIFACT("pritamdeka/S-PubMedBert-MS-MARCO-SCIFACT", 438704594L),
+    PRITAMDEKA_S_PUBMEDBERT_MS_MARCO_SCIFACT(
+            "pritamdeka/S-PubMedBert-MS-MARCO-SCIFACT", 438704594L),
     PRITAMDEKA_S_PUBMEDBERT_MS_MARCO("pritamdeka/S-PubMedBert-MS-MARCO", 438704806L),
-    PRITAMDEKA_S_BLUEBERT_SNLI_MULTINLI_STSB("pritamdeka/S-Bluebert-snli-multinli-stsb", 438716287L),
+    PRITAMDEKA_S_BLUEBERT_SNLI_MULTINLI_STSB(
+            "pritamdeka/S-Bluebert-snli-multinli-stsb", 438716287L),
     WHALELOOPS_PHRASE_BERT("whaleloops/phrase-bert", 438716681L),
     MENADSA_S_PUBMEDBERT("menadsa/S-PubMedBERT", 438937759L),
     NEUML_PUBMEDBERT_BASE_EMBEDDINGS("NeuML/pubmedbert-base-embeddings", 438938814L),
     JOSELUHF11_SYMPTOM_ENCODER_V10("joseluhf11/symptom_encoder_v10", 438945770L),
-    INOKUFU_BERT_BASE_UNCASED_XNLI_STS_FINETUNED_EDUCATION("inokufu/bert-base-uncased-xnli-sts-finetuned-education", 438946856L),
-    TOOLBENCH_TOOLBENCH_IR_BERT_BASED_UNCASED("ToolBench/ToolBench_IR_bert_based_uncased", 438948860L),
+    INOKUFU_BERT_BASE_UNCASED_XNLI_STS_FINETUNED_EDUCATION(
+            "inokufu/bert-base-uncased-xnli-sts-finetuned-education", 438946856L),
+    TOOLBENCH_TOOLBENCH_IR_BERT_BASED_UNCASED(
+            "ToolBench/ToolBench_IR_bert_based_uncased", 438948860L),
     SAP_AI_RESEARCH_MICSE("sap-ai-research/miCSE", 438951368L),
-    PRITAMDEKA_PUBMEDBERT_MNLI_SNLI_SCINLI_SCITAIL_MEDNLI_STSB("pritamdeka/PubMedBERT-mnli-snli-scinli-scitail-mednli-stsb", 438952446L),
+    PRITAMDEKA_PUBMEDBERT_MNLI_SNLI_SCINLI_SCITAIL_MEDNLI_STSB(
+            "pritamdeka/PubMedBERT-mnli-snli-scinli-scitail-mednli-stsb", 438952446L),
     DEAN_AI_LEGAL_HEBERT_FT("dean-ai/legal_heBERT_ft", 439070928L),
     ESPEJELOMAR_SENTECE_EMBEDDINGS_BETO("espejelomar/sentece-embeddings-BETO", 440451936L),
     RECOBO_CHEMICAL_BERT_UNCASED_TSDAE("recobo/chemical-bert-uncased-tsdae", 440455185L),
     RECOBO_CHEMICAL_BERT_UNCASED_SIMCSE("recobo/chemical-bert-uncased-simcse", 440455189L),
     EFEDERICI_SENTENCE_BERT_BASE("efederici/sentence-bert-base", 440758981L),
-    NICKPROCK_SENTENCE_BERT_BASE_ITALIAN_UNCASED("nickprock/sentence-bert-base-italian-uncased", 440763826L),
-    PM_AI_BI_ENCODER_MSMARCO_BERT_BASE_GERMAN("PM-AI/bi-encoder_msmarco_bert-base_german", 440766137L),
-    SONOISA_SENTENCE_BERT_BASE_JA_EN_MEAN_TOKENS("sonoisa/sentence-bert-base-ja-en-mean-tokens", 442802550L),
-    EMRECAN_BERT_BASE_TURKISH_CASED_MEAN_NLI_STSB_TR("emrecan/bert-base-turkish-cased-mean-nli-stsb-tr", 443305457L),
-    BESPIN_GLOBAL_KLUE_SENTENCE_ROBERTA_BASE_KORNLU("bespin-global/klue-sentence-roberta-base-kornlu", 443317038L),
+    NICKPROCK_SENTENCE_BERT_BASE_ITALIAN_UNCASED(
+            "nickprock/sentence-bert-base-italian-uncased", 440763826L),
+    PM_AI_BI_ENCODER_MSMARCO_BERT_BASE_GERMAN(
+            "PM-AI/bi-encoder_msmarco_bert-base_german", 440766137L),
+    SONOISA_SENTENCE_BERT_BASE_JA_EN_MEAN_TOKENS(
+            "sonoisa/sentence-bert-base-ja-en-mean-tokens", 442802550L),
+    EMRECAN_BERT_BASE_TURKISH_CASED_MEAN_NLI_STSB_TR(
+            "emrecan/bert-base-turkish-cased-mean-nli-stsb-tr", 443305457L),
+    BESPIN_GLOBAL_KLUE_SENTENCE_ROBERTA_BASE_KORNLU(
+            "bespin-global/klue-sentence-roberta-base-kornlu", 443317038L),
     COLORFULSCOOP_SBERT_BASE_JA("colorfulscoop/sbert-base-ja", 443364095L),
     KDHYUN08_TAACO_STS("KDHyun08/TAACO_STS", 443555816L),
-    NYTK_SENTENCE_TRANSFORMERS_EXPERIMENTAL_HUBERT_HUNGARIAN("NYTK/sentence-transformers-experimental-hubert-hungarian", 443593876L),
+    NYTK_SENTENCE_TRANSFORMERS_EXPERIMENTAL_HUBERT_HUNGARIAN(
+            "NYTK/sentence-transformers-experimental-hubert-hungarian", 443593876L),
     DANGVANTUAN_SENTENCE_CAMEMBERT_BASE("dangvantuan/sentence-camembert-base", 444801167L),
     CL_NAGOYA_SUP_SIMCSE_JA_BASE("cl-nagoya/sup-simcse-ja-base", 445137598L),
-    ANTOINELOUIS_CROSSENCODER_CAMEMBERT_BASE_MMARCOFR("antoinelouis/crossencoder-camembert-base-mmarcoFR", 445755626L),
+    ANTOINELOUIS_CROSSENCODER_CAMEMBERT_BASE_MMARCOFR(
+            "antoinelouis/crossencoder-camembert-base-mmarcoFR", 445755626L),
     EFEDERICI_CROSS_ENCODER_UMBERTO_STSB("efederici/cross-encoder-umberto-stsb", 445782000L),
     PKSHATECH_SIMCSE_JA_BERT_BASE_CLCMLP("pkshatech/simcse-ja-bert-base-clcmlp", 447508201L),
-    DIMITRIZ_ST_GREEK_MEDIA_BERT_BASE_UNCASED("dimitriz/st-greek-media-bert-base-uncased", 453380207L),
+    DIMITRIZ_ST_GREEK_MEDIA_BERT_BASE_UNCASED(
+            "dimitriz/st-greek-media-bert-base-uncased", 453380207L),
     SENTENCE_TRANSFORMERS_ALL_MINILM_L6_V2("sentence-transformers/all-MiniLM-L6-v2", 454845228L),
     BONGSOO_KPF_SBERT_V1_1("bongsoo/kpf-sbert-v1.1", 457312561L),
     SNUNLP_KR_SBERT_V40K_KLUENLI_AUGSTS("snunlp/KR-SBERT-V40K-klueNLI-augSTS", 468422009L),
-    JEGORMEISTER_ROBBERT_V2_DUTCH_BASE_MQA_FINETUNED("jegormeister/robbert-v2-dutch-base-mqa-finetuned", 469888693L),
+    JEGORMEISTER_ROBBERT_V2_DUTCH_BASE_MQA_FINETUNED(
+            "jegormeister/robbert-v2-dutch-base-mqa-finetuned", 469888693L),
     M3HRDADFI_BERT_ZWNJ_WNLI_MEAN_TOKENS("m3hrdadfi/bert-zwnj-wnli-mean-tokens", 474471928L),
     M3HRDADFI_ROBERTA_ZWNJ_WNLI_MEAN_TOKENS("m3hrdadfi/roberta-zwnj-wnli-mean-tokens", 477438912L),
-    ANTOINELOUIS_CROSSENCODER_MMINILMV2_L12_MMARCOFR("antoinelouis/crossencoder-mMiniLMv2-L12-mmarcoFR", 492751134L),
+    ANTOINELOUIS_CROSSENCODER_MMINILMV2_L12_MMARCOFR(
+            "antoinelouis/crossencoder-mMiniLMv2-L12-mmarcoFR", 492751134L),
     JMBRITO_PTBR_SIMILARITY_E5_SMALL("jmbrito/ptbr-similarity-e5-small", 492840150L),
     EF_ZULLA_E5_MULTI_SML_TORCH("ef-zulla/e5-multi-sml-torch", 492995658L),
     EFEDERICI_MULTILINGUAL_E5_SMALL_4096("efederici/multilingual-e5-small-4096", 494892908L),
-    TURKUNLP_SBERT_UNCASED_FINNISH_PARAPHRASE("TurkuNLP/sbert-uncased-finnish-paraphrase", 498561990L),
+    TURKUNLP_SBERT_UNCASED_FINNISH_PARAPHRASE(
+            "TurkuNLP/sbert-uncased-finnish-paraphrase", 498561990L),
     TURKUNLP_SBERT_CASED_FINNISH_PARAPHRASE("TurkuNLP/sbert-cased-finnish-paraphrase", 498571084L),
     FIRQAAA_INDO_SENTENCE_BERT_BASE("firqaaa/indo-sentence-bert-base", 498781876L),
-    DATAIKUNLP_PARAPHRASE_MULTILINGUAL_MINILM_L12_V2("DataikuNLP/paraphrase-multilingual-MiniLM-L12-v2", 499614329L),
+    DATAIKUNLP_PARAPHRASE_MULTILINGUAL_MINILM_L12_V2(
+            "DataikuNLP/paraphrase-multilingual-MiniLM-L12-v2", 499614329L),
     VOICELAB_SBERT_BASE_CASED_PL("Voicelab/sbert-base-cased-pl", 500326139L),
     KBLAB_SENTENCE_BERT_SWEDISH_CASED("KBLab/sentence-bert-swedish-cased", 500457410L),
-    PRITAMDEKA_S_BIOMED_ROBERTA_SNLI_MULTINLI_STSB("pritamdeka/S-Biomed-Roberta-snli-multinli-stsb", 501284135L),
+    PRITAMDEKA_S_BIOMED_ROBERTA_SNLI_MULTINLI_STSB(
+            "pritamdeka/S-Biomed-Roberta-snli-multinli-stsb", 501284135L),
     MCHOCHLOV_CODEBERT_BASE_CD_FT("mchochlov/codebert-base-cd-ft", 501284494L),
     ANNAWEGMANN_STYLE_EMBEDDING("AnnaWegmann/Style-Embedding", 501287433L),
     IPIPAN_SILVER_RETRIEVER_BASE_V1("ipipan/silver-retriever-base-v1", 501614604L),
     TIMKOORNSTRA_SAURON("TimKoornstra/SAURON", 502033555L),
-    SANGMINI_MSMARCO_COTMAE_MINILM_L12_EN_KO_JA("sangmini/msmarco-cotmae-MiniLM-L12_en-ko-ja", 504910521L),
-    IMVLADIKON_SENTENCE_TRANSFORMERS_ALEPHBERT("imvladikon/sentence-transformers-alephbert", 505898928L),
+    SANGMINI_MSMARCO_COTMAE_MINILM_L12_EN_KO_JA(
+            "sangmini/msmarco-cotmae-MiniLM-L12_en-ko-ja", 504910521L),
+    IMVLADIKON_SENTENCE_TRANSFORMERS_ALEPHBERT(
+            "imvladikon/sentence-transformers-alephbert", 505898928L),
     JINAAI_JINA_EMBEDDINGS_V2_SMALL_EN("jinaai/jina-embeddings-v2-small-en", 523027867L),
-    SENTENCE_TRANSFORMERS_MULTI_QA_DISTILBERT_DOT_V1("sentence-transformers/multi-qa-distilbert-dot-v1", 531692650L),
-    SENTENCE_TRANSFORMERS_MULTI_QA_DISTILBERT_COS_V1("sentence-transformers/multi-qa-distilbert-cos-v1", 531693680L),
+    SENTENCE_TRANSFORMERS_MULTI_QA_DISTILBERT_DOT_V1(
+            "sentence-transformers/multi-qa-distilbert-dot-v1", 531692650L),
+    SENTENCE_TRANSFORMERS_MULTI_QA_DISTILBERT_COS_V1(
+            "sentence-transformers/multi-qa-distilbert-cos-v1", 531693680L),
     BARISAYDIN_TEXT2VEC_BASE_MULTILINGUAL("barisaydin/text2vec-base-multilingual", 534361171L),
     INTFLOAT_E5_SMALL_V2("intfloat/e5-small-v2", 534806175L),
-    SENTENCE_TRANSFORMERS_MSMARCO_MINILM_L_12_V3("sentence-transformers/msmarco-MiniLM-L-12-v3", 534860036L),
-    SENTENCE_TRANSFORMERS_MSMARCO_MINILM_L12_COS_V5("sentence-transformers/msmarco-MiniLM-L12-cos-v5", 534862040L),
-    SADAKMED_DISTILUSE_BASE_MULTILINGUAL_CASED_V2("sadakmed/distiluse-base-multilingual-cased-v2", 539972541L),
-    SADAKMED_DISTILUSE_BASE_MULTILINGUAL_CASED_V1("sadakmed/distiluse-base-multilingual-cased-v1", 539972776L),
+    SENTENCE_TRANSFORMERS_MSMARCO_MINILM_L_12_V3(
+            "sentence-transformers/msmarco-MiniLM-L-12-v3", 534860036L),
+    SENTENCE_TRANSFORMERS_MSMARCO_MINILM_L12_COS_V5(
+            "sentence-transformers/msmarco-MiniLM-L12-cos-v5", 534862040L),
+    SADAKMED_DISTILUSE_BASE_MULTILINGUAL_CASED_V2(
+            "sadakmed/distiluse-base-multilingual-cased-v2", 539972541L),
+    SADAKMED_DISTILUSE_BASE_MULTILINGUAL_CASED_V1(
+            "sadakmed/distiluse-base-multilingual-cased-v1", 539972776L),
     DIGIO_TWITTER4SSE("digio/Twitter4SSE", 541602231L),
     HGTHINKER_VIETNAMESE_SBERT("HgThinker/vietnamese-sbert", 542099329L),
     KEEPITREAL_VIETNAMESE_SBERT("keepitreal/vietnamese-sbert", 542107840L),
@@ -151,64 +203,97 @@ public enum EmbeddingModel {
     INFGRAD_STELLA_LARGE_ZH_V2("infgrad/stella-large-zh-v2", 652825863L),
     AMU_TAO_8K("amu/tao-8k", 667548999L),
     MRP_SIMCSE_MODEL_M_BERT_THAI_CASED("mrp/simcse-model-m-bert-thai-cased", 714456826L),
-    EZLEE_E_COMMERCE_BERT_BASE_MULTILINGUAL_CASED("EZlee/e-commerce-bert-base-multilingual-cased", 715407892L),
+    EZLEE_E_COMMERCE_BERT_BASE_MULTILINGUAL_CASED(
+            "EZlee/e-commerce-bert-base-multilingual-cased", 715407892L),
     NBAILAB_NB_SBERT_BASE("NbAiLab/nb-sbert-base", 715413471L),
-    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_BASE_V2("sentence-transformers/msmarco-distilbert-base-v2", 797224782L),
-    SENTENCE_TRANSFORMERS_QUORA_DISTILBERT_BASE("sentence-transformers/quora-distilbert-base", 797224802L),
-    SENTENCE_TRANSFORMERS_DISTILBERT_BASE_NLI_STSB_MEAN_TOKENS("sentence-transformers/distilbert-base-nli-stsb-mean-tokens", 797225157L),
-    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_BASE_V4("sentence-transformers/msmarco-distilbert-base-v4", 797225173L),
-    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_BASE_V3("sentence-transformers/msmarco-distilbert-base-v3", 797225186L),
-    SENTENCE_TRANSFORMERS_NQ_DISTILBERT_BASE_V1("sentence-transformers/nq-distilbert-base-v1", 797225211L),
-    SENTENCE_TRANSFORMERS_STSB_DISTILBERT_BASE("sentence-transformers/stsb-distilbert-base", 797225223L),
-    SENTENCE_TRANSFORMERS_NLI_DISTILBERT_BASE("sentence-transformers/nli-distilbert-base", 797225321L),
-    SENTENCE_TRANSFORMERS_DISTILBERT_BASE_NLI_MEAN_TOKENS("sentence-transformers/distilbert-base-nli-mean-tokens", 797225416L),
-    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_COS_V5("sentence-transformers/msmarco-distilbert-cos-v5", 797227197L),
-    SENTENCE_TRANSFORMERS_DISTILBERT_BASE_NLI_STSB_QUORA_RANKING("sentence-transformers/distilbert-base-nli-stsb-quora-ranking", 797227940L),
-    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_DOT_V5("sentence-transformers/msmarco-distilbert-dot-v5", 797243272L),
-    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_BASE_DOT_PROD_V3("sentence-transformers/msmarco-distilbert-base-dot-prod-v3", 801943600L),
+    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_BASE_V2(
+            "sentence-transformers/msmarco-distilbert-base-v2", 797224782L),
+    SENTENCE_TRANSFORMERS_QUORA_DISTILBERT_BASE(
+            "sentence-transformers/quora-distilbert-base", 797224802L),
+    SENTENCE_TRANSFORMERS_DISTILBERT_BASE_NLI_STSB_MEAN_TOKENS(
+            "sentence-transformers/distilbert-base-nli-stsb-mean-tokens", 797225157L),
+    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_BASE_V4(
+            "sentence-transformers/msmarco-distilbert-base-v4", 797225173L),
+    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_BASE_V3(
+            "sentence-transformers/msmarco-distilbert-base-v3", 797225186L),
+    SENTENCE_TRANSFORMERS_NQ_DISTILBERT_BASE_V1(
+            "sentence-transformers/nq-distilbert-base-v1", 797225211L),
+    SENTENCE_TRANSFORMERS_STSB_DISTILBERT_BASE(
+            "sentence-transformers/stsb-distilbert-base", 797225223L),
+    SENTENCE_TRANSFORMERS_NLI_DISTILBERT_BASE(
+            "sentence-transformers/nli-distilbert-base", 797225321L),
+    SENTENCE_TRANSFORMERS_DISTILBERT_BASE_NLI_MEAN_TOKENS(
+            "sentence-transformers/distilbert-base-nli-mean-tokens", 797225416L),
+    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_COS_V5(
+            "sentence-transformers/msmarco-distilbert-cos-v5", 797227197L),
+    SENTENCE_TRANSFORMERS_DISTILBERT_BASE_NLI_STSB_QUORA_RANKING(
+            "sentence-transformers/distilbert-base-nli-stsb-quora-ranking", 797227940L),
+    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_DOT_V5(
+            "sentence-transformers/msmarco-distilbert-dot-v5", 797243272L),
+    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_BASE_DOT_PROD_V3(
+            "sentence-transformers/msmarco-distilbert-base-dot-prod-v3", 801943600L),
     SONOISA_CLIP_VIT_B_32_JAPANESE_V1("sonoisa/clip-vit-b-32-japanese-v1", 803727976L),
-    SENTENCE_TRANSFORMERS_PARAPHRASE_TINYBERT_L6_V2("sentence-transformers/paraphrase-TinyBERT-L6-v2", 804365804L),
+    SENTENCE_TRANSFORMERS_PARAPHRASE_TINYBERT_L6_V2(
+            "sentence-transformers/paraphrase-TinyBERT-L6-v2", 804365804L),
     KMARIUNAS_UNCASED_BERT_TRIPLET_40("kmariunas/uncased-bert-triplet-40", 876434296L),
-    SENTENCE_TRANSFORMERS_FACEBOOK_DPR_CTX_ENCODER_SINGLE_NQ_BASE("sentence-transformers/facebook-dpr-ctx_encoder-single-nq-base", 876666203L),
+    SENTENCE_TRANSFORMERS_FACEBOOK_DPR_CTX_ENCODER_SINGLE_NQ_BASE(
+            "sentence-transformers/facebook-dpr-ctx_encoder-single-nq-base", 876666203L),
     SENTENCE_TRANSFORMERS_NLI_BERT_BASE("sentence-transformers/nli-bert-base", 876667005L),
     INTFLOAT_E5_BASE_UNSUPERVISED("intfloat/e5-base-unsupervised", 876669021L),
-    SENTENCE_TRANSFORMERS_MSMARCO_BERT_CO_CONDENSOR("sentence-transformers/msmarco-bert-co-condensor", 876675904L),
+    SENTENCE_TRANSFORMERS_MSMARCO_BERT_CO_CONDENSOR(
+            "sentence-transformers/msmarco-bert-co-condensor", 876675904L),
     DENNLINGER_BERT_WIKI_PARAGRAPHS("dennlinger/bert-wiki-paragraphs", 876684158L),
     SENTENCE_TRANSFORMERS_ALL_MPNET_BASE_V1("sentence-transformers/all-mpnet-base-v1", 876722807L),
     INTFLOAT_E5_BASE("intfloat/e5-base", 876731424L),
     SENTENCE_TRANSFORMERS_ALL_MPNET_BASE_V2("sentence-transformers/all-mpnet-base-v2", 876747501L),
     BIU_NLP_ABSTRACT_SIM_SENTENCE_PUBMED("biu-nlp/abstract-sim-sentence-pubmed", 876931102L),
     HIIAMSID_SENTENCE_SIMILARITY_SPANISH_ES("hiiamsid/sentence_similarity_spanish_es", 879645858L),
-    SONOISA_SENTENCE_BERT_BASE_JA_MEAN_TOKENS("sonoisa/sentence-bert-base-ja-mean-tokens", 885270964L),
-    SONOISA_SENTENCE_BERT_BASE_JA_MEAN_TOKENS_V2("sonoisa/sentence-bert-base-ja-mean-tokens-v2", 885310545L),
+    SONOISA_SENTENCE_BERT_BASE_JA_MEAN_TOKENS(
+            "sonoisa/sentence-bert-base-ja-mean-tokens", 885270964L),
+    SONOISA_SENTENCE_BERT_BASE_JA_MEAN_TOKENS_V2(
+            "sonoisa/sentence-bert-base-ja-mean-tokens-v2", 885310545L),
     JHGAN_KO_SBERT_STS("jhgan/ko-sbert-sts", 886044722L),
     JHGAN_KO_SBERT_MULTITASK("jhgan/ko-sbert-multitask", 886045069L),
     JHGAN_KO_SBERT_NLI("jhgan/ko-sbert-nli", 886045384L),
     JHGAN_KO_SROBERTA_STS("jhgan/ko-sroberta-sts", 886050344L),
     JHGAN_KO_SROBERTA_MULTITASK("jhgan/ko-sroberta-multitask", 886051209L),
-    NICKPROCK_SENTENCE_BERT_BASE_ITALIAN_XXL_UNCASED("nickprock/sentence-bert-base-italian-xxl-uncased", 886645281L),
-    ANTOINELOUIS_BIENCODER_CAMEMBERT_BASE_MMARCOFR("antoinelouis/biencoder-camembert-base-mmarcoFR", 888314464L),
-    NETHERLANDSFORENSICINSTITUTE_ROBBERT_2022_DUTCH_SENTENCE_TRANSFORMERS("NetherlandsForensicInstitute/robbert-2022-dutch-sentence-transformers", 954183237L),
-    L3CUBE_PUNE_MARATHI_SENTENCE_SIMILARITY_SBERT("l3cube-pune/marathi-sentence-similarity-sbert", 959874042L),
+    NICKPROCK_SENTENCE_BERT_BASE_ITALIAN_XXL_UNCASED(
+            "nickprock/sentence-bert-base-italian-xxl-uncased", 886645281L),
+    ANTOINELOUIS_BIENCODER_CAMEMBERT_BASE_MMARCOFR(
+            "antoinelouis/biencoder-camembert-base-mmarcoFR", 888314464L),
+    NETHERLANDSFORENSICINSTITUTE_ROBBERT_2022_DUTCH_SENTENCE_TRANSFORMERS(
+            "NetherlandsForensicInstitute/robbert-2022-dutch-sentence-transformers", 954183237L),
+    L3CUBE_PUNE_MARATHI_SENTENCE_SIMILARITY_SBERT(
+            "l3cube-pune/marathi-sentence-similarity-sbert", 959874042L),
     L3CUBE_PUNE_TAMIL_SENTENCE_BERT_NLI("l3cube-pune/tamil-sentence-bert-nli", 959875603L),
-    L3CUBE_PUNE_MALAYALAM_SENTENCE_SIMILARITY_SBERT("l3cube-pune/malayalam-sentence-similarity-sbert", 959875683L),
+    L3CUBE_PUNE_MALAYALAM_SENTENCE_SIMILARITY_SBERT(
+            "l3cube-pune/malayalam-sentence-similarity-sbert", 959875683L),
     L3CUBE_PUNE_INDIC_SENTENCE_BERT_NLI("l3cube-pune/indic-sentence-bert-nli", 959875927L),
-    ANTOINELOUIS_BIENCODER_MMINILMV2_L12_MMARCOFR("antoinelouis/biencoder-mMiniLMv2-L12-mmarcoFR", 963385617L),
-    SENTENCE_TRANSFORMERS_ALL_DISTILROBERTA_V1("sentence-transformers/all-distilroberta-v1", 988159693L),
+    ANTOINELOUIS_BIENCODER_MMINILMV2_L12_MMARCOFR(
+            "antoinelouis/biencoder-mMiniLMv2-L12-mmarcoFR", 963385617L),
+    SENTENCE_TRANSFORMERS_ALL_DISTILROBERTA_V1(
+            "sentence-transformers/all-distilroberta-v1", 988159693L),
     SDADAS_ST_POLISH_PARAPHRASE_FROM_MPNET("sdadas/st-polish-paraphrase-from-mpnet", 1001952602L),
     D0RJ_E5_BASE_EN_RU("d0rj/e5-base-en-ru", 1064431460L),
-    BKAI_FOUNDATION_MODELS_VIETNAMESE_BI_ENCODER("bkai-foundation-models/vietnamese-bi-encoder", 1082117217L),
-    VOVANPHUC_SUP_SIMCSE_VIETNAMESE_PHOBERT_BASE("VoVanPhuc/sup-SimCSE-VietNamese-phobert-base", 1086863154L),
+    BKAI_FOUNDATION_MODELS_VIETNAMESE_BI_ENCODER(
+            "bkai-foundation-models/vietnamese-bi-encoder", 1082117217L),
+    VOVANPHUC_SUP_SIMCSE_VIETNAMESE_PHOBERT_BASE(
+            "VoVanPhuc/sup-SimCSE-VietNamese-phobert-base", 1086863154L),
     SETU4993_LEALLA_SMALL("setu4993/LEALLA-small", 1123385164L),
-    AIDA_UPM_MSTSB_PARAPHRASE_MULTILINGUAL_MPNET_BASE_V2("AIDA-UPM/mstsb-paraphrase-multilingual-mpnet-base-v2", 1126421474L),
+    AIDA_UPM_MSTSB_PARAPHRASE_MULTILINGUAL_MPNET_BASE_V2(
+            "AIDA-UPM/mstsb-paraphrase-multilingual-mpnet-base-v2", 1126421474L),
     LIGHTETERNAL_STSB_XLM_R_GREEK_TRANSFER("lighteternal/stsb-xlm-r-greek-transfer", 1126421894L),
-    SYMANTO_SN_XLM_ROBERTA_BASE_SNLI_MNLI_ANLI_XNLI("symanto/sn-xlm-roberta-base-snli-mnli-anli-xnli", 1126437775L),
+    SYMANTO_SN_XLM_ROBERTA_BASE_SNLI_MNLI_ANLI_XNLI(
+            "symanto/sn-xlm-roberta-base-snli-mnli-anli-xnli", 1126437775L),
     KAISERRR_PMC_VIT_L_14_MULTILINGUAL("kaiserrr/pmc-vit-l-14-multilingual", 1134398395L),
     UARITM_MULTILINGUAL_EN_RU_UK("uaritm/multilingual_en_ru_uk", 1134401492L),
-    EMBAAS_SENTENCE_TRANSFORMERS_MULTILINGUAL_E5_BASE("embaas/sentence-transformers-multilingual-e5-base", 1134404203L),
+    EMBAAS_SENTENCE_TRANSFORMERS_MULTILINGUAL_E5_BASE(
+            "embaas/sentence-transformers-multilingual-e5-base", 1134404203L),
     UARITM_MULTILINGUAL_EN_UK_PL_RU("uaritm/multilingual_en_uk_pl_ru", 1134405835L),
-    MEEDAN_PARAPHRASE_FILIPINO_MPNET_BASE_V2("meedan/paraphrase-filipino-mpnet-base-v2", 1134417514L),
-    LLUKAS22_PARAPHRASE_MULTILINGUAL_MPNET_BASE_V2_EMBEDDING_ALL("LLukas22/paraphrase-multilingual-mpnet-base-v2-embedding-all", 1134852016L),
+    MEEDAN_PARAPHRASE_FILIPINO_MPNET_BASE_V2(
+            "meedan/paraphrase-filipino-mpnet-base-v2", 1134417514L),
+    LLUKAS22_PARAPHRASE_MULTILINGUAL_MPNET_BASE_V2_EMBEDDING_ALL(
+            "LLukas22/paraphrase-multilingual-mpnet-base-v2-embedding-all", 1134852016L),
     EFEDERICI_E5_BASE_MULTILINGUAL_4096("efederici/e5-base-multilingual-4096", 1141989720L),
     SDADAS_MMLW_RETRIEVAL_E5_LARGE("sdadas/mmlw-retrieval-e5-large", 1142073524L),
     SHIBING624_TEXT2VEC_BASE_CHINESE("shibing624/text2vec-base-chinese", 1225878310L),
@@ -218,68 +303,113 @@ public enum EmbeddingModel {
     RESEARCH2NLP_ELECTRICAL_STELLA("Research2NLP/electrical_stella", 1304912784L),
     BAAI_BGE_BASE_EN_V1_5("BAAI/bge-base-en-v1.5", 1312805365L),
     INTFLOAT_E5_BASE_V2("intfloat/e5-base-v2", 1313722035L),
-    SENTENCE_TRANSFORMERS_FACEBOOK_DPR_CTX_ENCODER_MULTISET_BASE("sentence-transformers/facebook-dpr-ctx_encoder-multiset-base", 1314862396L),
-    SENTENCE_TRANSFORMERS_FACEBOOK_DPR_QUESTION_ENCODER_MULTISET_BASE("sentence-transformers/facebook-dpr-question_encoder-multiset-base", 1314862432L),
-    SENTENCE_TRANSFORMERS_FACEBOOK_DPR_QUESTION_ENCODER_SINGLE_NQ_BASE("sentence-transformers/facebook-dpr-question_encoder-single-nq-base", 1314862439L),
+    SENTENCE_TRANSFORMERS_FACEBOOK_DPR_CTX_ENCODER_MULTISET_BASE(
+            "sentence-transformers/facebook-dpr-ctx_encoder-multiset-base", 1314862396L),
+    SENTENCE_TRANSFORMERS_FACEBOOK_DPR_QUESTION_ENCODER_MULTISET_BASE(
+            "sentence-transformers/facebook-dpr-question_encoder-multiset-base", 1314862432L),
+    SENTENCE_TRANSFORMERS_FACEBOOK_DPR_QUESTION_ENCODER_SINGLE_NQ_BASE(
+            "sentence-transformers/facebook-dpr-question_encoder-single-nq-base", 1314862439L),
     SENTENCE_TRANSFORMERS_STSB_BERT_BASE("sentence-transformers/stsb-bert-base", 1314863267L),
-    SENTENCE_TRANSFORMERS_BERT_BASE_WIKIPEDIA_SECTIONS_MEAN_TOKENS("sentence-transformers/bert-base-wikipedia-sections-mean-tokens", 1314863421L),
-    SENTENCE_TRANSFORMERS_MSMARCO_BERT_BASE_DOT_V5("sentence-transformers/msmarco-bert-base-dot-v5", 1314884613L),
+    SENTENCE_TRANSFORMERS_BERT_BASE_WIKIPEDIA_SECTIONS_MEAN_TOKENS(
+            "sentence-transformers/bert-base-wikipedia-sections-mean-tokens", 1314863421L),
+    SENTENCE_TRANSFORMERS_MSMARCO_BERT_BASE_DOT_V5(
+            "sentence-transformers/msmarco-bert-base-dot-v5", 1314884613L),
     BIU_NLP_ABSTRACT_SIM_QUERY_PUBMED("biu-nlp/abstract-sim-query-pubmed", 1314929735L),
-    SENTENCE_TRANSFORMERS_NLI_DISTILROBERTA_BASE_V2("sentence-transformers/nli-distilroberta-base-v2", 1316717228L),
-    SENTENCE_TRANSFORMERS_PARAPHRASE_DISTILROBERTA_BASE_V2("sentence-transformers/paraphrase-distilroberta-base-v2", 1316717279L),
-    SENTENCE_TRANSFORMERS_MSMARCO_DISTILROBERTA_BASE_V2("sentence-transformers/msmarco-distilroberta-base-v2", 1316717517L),
-    SENTENCE_TRANSFORMERS_STSB_DISTILROBERTA_BASE_V2("sentence-transformers/stsb-distilroberta-base-v2", 1316717592L),
+    SENTENCE_TRANSFORMERS_NLI_DISTILROBERTA_BASE_V2(
+            "sentence-transformers/nli-distilroberta-base-v2", 1316717228L),
+    SENTENCE_TRANSFORMERS_PARAPHRASE_DISTILROBERTA_BASE_V2(
+            "sentence-transformers/paraphrase-distilroberta-base-v2", 1316717279L),
+    SENTENCE_TRANSFORMERS_MSMARCO_DISTILROBERTA_BASE_V2(
+            "sentence-transformers/msmarco-distilroberta-base-v2", 1316717517L),
+    SENTENCE_TRANSFORMERS_STSB_DISTILROBERTA_BASE_V2(
+            "sentence-transformers/stsb-distilroberta-base-v2", 1316717592L),
     SENTENCE_TRANSFORMERS_ALLENAI_SPECTER("sentence-transformers/allenai-specter", 1320322654L),
-    STJIRIS_BERT_LARGE_PORTUGUESE_CASED_LEGAL_TSDAE_GPL_NLI_STS_METAKD_V1("stjiris/bert-large-portuguese-cased-legal-tsdae-gpl-nli-sts-MetaKD-v1", 1338612674L),
-    RUFIMELO_BERT_LARGE_PORTUGUESE_CASED_STS("rufimelo/bert-large-portuguese-cased-sts", 1338615398L),
-    STJIRIS_BERT_LARGE_PORTUGUESE_CASED_LEGAL_TSDAE_GPL_NLI_STS_V1("stjiris/bert-large-portuguese-cased-legal-tsdae-gpl-nli-sts-v1", 1338619481L),
-    EMBAAS_SENTENCE_TRANSFORMERS_E5_LARGE_V2("embaas/sentence-transformers-e5-large-v2", 1341647009L),
+    STJIRIS_BERT_LARGE_PORTUGUESE_CASED_LEGAL_TSDAE_GPL_NLI_STS_METAKD_V1(
+            "stjiris/bert-large-portuguese-cased-legal-tsdae-gpl-nli-sts-MetaKD-v1", 1338612674L),
+    RUFIMELO_BERT_LARGE_PORTUGUESE_CASED_STS(
+            "rufimelo/bert-large-portuguese-cased-sts", 1338615398L),
+    STJIRIS_BERT_LARGE_PORTUGUESE_CASED_LEGAL_TSDAE_GPL_NLI_STS_V1(
+            "stjiris/bert-large-portuguese-cased-legal-tsdae-gpl-nli-sts-v1", 1338619481L),
+    EMBAAS_SENTENCE_TRANSFORMERS_E5_LARGE_V2(
+            "embaas/sentence-transformers-e5-large-v2", 1341647009L),
     NAUFALIHSAN_INDONESIAN_SBERT_LARGE("naufalihsan/indonesian-sbert-large", 1341648109L),
     DRSEBASTIANK_MEDBEDDING("DrSebastianK/medbedding", 1341655716L),
     THENLPER_GTE_LARGE("thenlper/gte-large", 1341688021L),
     CONSCIOUSAI_CAI_LUNARIS_TEXT_EMBEDDINGS("consciousAI/cai-lunaris-text-embeddings", 1341719299L),
     DENAYA_INDOSBERT_LARGE("denaya/indoSBERT-large", 1342706773L),
-    DEUTSCHE_TELEKOM_GBERT_LARGE_PARAPHRASE_COSINE("deutsche-telekom/gbert-large-paraphrase-cosine", 1344052884L),
-    DEUTSCHE_TELEKOM_GBERT_LARGE_PARAPHRASE_EUCLIDEAN("deutsche-telekom/gbert-large-paraphrase-euclidean", 1344053075L),
-    JHLEE3421_FAQ_SEMANTIC_KLUE_ROBERTA_LARGE("jhlee3421/faq-semantic-klue-roberta-large", 1347759387L),
+    DEUTSCHE_TELEKOM_GBERT_LARGE_PARAPHRASE_COSINE(
+            "deutsche-telekom/gbert-large-paraphrase-cosine", 1344052884L),
+    DEUTSCHE_TELEKOM_GBERT_LARGE_PARAPHRASE_EUCLIDEAN(
+            "deutsche-telekom/gbert-large-paraphrase-euclidean", 1344053075L),
+    JHLEE3421_FAQ_SEMANTIC_KLUE_ROBERTA_LARGE(
+            "jhlee3421/faq-semantic-klue-roberta-large", 1347759387L),
     YS7YOO_SENTENCE_ROBERTA_LARGE_KOR_STS("ys7yoo/sentence-roberta-large-kor-sts", 1347770951L),
-    DANGVANTUAN_CROSSENCODER_CAMEMBERT_LARGE("dangvantuan/CrossEncoder-camembert-large", 1350050334L),
+    DANGVANTUAN_CROSSENCODER_CAMEMBERT_LARGE(
+            "dangvantuan/CrossEncoder-camembert-large", 1350050334L),
     CL_NAGOYA_SUP_SIMCSE_JA_LARGE("cl-nagoya/sup-simcse-ja-large", 1350138460L),
     CL_NAGOYA_UNSUP_SIMCSE_JA_LARGE("cl-nagoya/unsup-simcse-ja-large", 1350138870L),
     VOICELAB_SBERT_LARGE_CASED_PL("Voicelab/sbert-large-cased-pl", 1422987879L),
-    FLAX_SENTENCE_EMBEDDINGS_ALL_DATASETS_V3_ROBERTA_LARGE("flax-sentence-embeddings/all_datasets_v3_roberta-large", 1424216178L),
-    COINTEGRATED_RUBERT_BASE_CASED_DP_PARAPHRASE_DETECTION("cointegrated/rubert-base-cased-dp-paraphrase-detection", 1424603089L),
-    ABBASGOLESTANI_AG_NLI_DETS_SENTENCE_SIMILARITY_V1("abbasgolestani/ag-nli-DeTS-sentence-similarity-v1", 1424949708L),
-    S_NLP_RUBERT_BASE_CASED_CONVERSATIONAL_PARAPHRASE_V1("s-nlp/rubert-base-cased-conversational-paraphrase-v1", 1427358048L),
-    SENTENCE_TRANSFORMERS_PARAPHRASE_MULTILINGUAL_MINILM_L12_V2("sentence-transformers/paraphrase-multilingual-MiniLM-L12-v2", 1441155294L),
+    FLAX_SENTENCE_EMBEDDINGS_ALL_DATASETS_V3_ROBERTA_LARGE(
+            "flax-sentence-embeddings/all_datasets_v3_roberta-large", 1424216178L),
+    COINTEGRATED_RUBERT_BASE_CASED_DP_PARAPHRASE_DETECTION(
+            "cointegrated/rubert-base-cased-dp-paraphrase-detection", 1424603089L),
+    ABBASGOLESTANI_AG_NLI_DETS_SENTENCE_SIMILARITY_V1(
+            "abbasgolestani/ag-nli-DeTS-sentence-similarity-v1", 1424949708L),
+    S_NLP_RUBERT_BASE_CASED_CONVERSATIONAL_PARAPHRASE_V1(
+            "s-nlp/rubert-base-cased-conversational-paraphrase-v1", 1427358048L),
+    SENTENCE_TRANSFORMERS_PARAPHRASE_MULTILINGUAL_MINILM_L12_V2(
+            "sentence-transformers/paraphrase-multilingual-MiniLM-L12-v2", 1441155294L),
     INTFLOAT_MULTILINGUAL_E5_SMALL("intfloat/multilingual-e5-small", 1456397601L),
     SHIBING624_TEXT2VEC_BASE_MULTILINGUAL("shibing624/text2vec-base-multilingual", 1475447734L),
-    SENTENCE_TRANSFORMERS_ROBERTA_BASE_NLI_MEAN_TOKENS("sentence-transformers/roberta-base-nli-mean-tokens", 1498736923L),
-    SENTENCE_TRANSFORMERS_MSMARCO_ROBERTA_BASE_V3("sentence-transformers/msmarco-roberta-base-v3", 1498737534L),
+    SENTENCE_TRANSFORMERS_ROBERTA_BASE_NLI_MEAN_TOKENS(
+            "sentence-transformers/roberta-base-nli-mean-tokens", 1498736923L),
+    SENTENCE_TRANSFORMERS_MSMARCO_ROBERTA_BASE_V3(
+            "sentence-transformers/msmarco-roberta-base-v3", 1498737534L),
     SENTENCE_TRANSFORMERS_STSB_ROBERTA_BASE("sentence-transformers/stsb-roberta-base", 1498737700L),
-    SDADAS_ST_POLISH_PARAPHRASE_FROM_DISTILROBERTA("sdadas/st-polish-paraphrase-from-distilroberta", 1499991122L),
-    SENTENCE_TRANSFORMERS_MSMARCO_ROBERTA_BASE_ANCE_FIRSTP("sentence-transformers/msmarco-roberta-base-ance-firstp", 1503475571L),
-    SENTENCE_TRANSFORMERS_QUORA_DISTILBERT_MULTILINGUAL("sentence-transformers/quora-distilbert-multilingual", 1619939023L),
-    SENTENCE_TRANSFORMERS_DISTILBERT_MULTILINGUAL_NLI_STSB_QUORA_RANKING("sentence-transformers/distilbert-multilingual-nli-stsb-quora-ranking", 1619939159L),
-    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_MULTILINGUAL_EN_DE_V2_TMP_LNG_ALIGNED("sentence-transformers/msmarco-distilbert-multilingual-en-de-v2-tmp-lng-aligned", 1619939584L),
-    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_MULTILINGUAL_EN_DE_V2_TMP_TRAINED_SCRATCH("sentence-transformers/msmarco-distilbert-multilingual-en-de-v2-tmp-trained-scratch", 1619939629L),
-    SENTENCE_TRANSFORMERS_CLIP_VIT_B_32_MULTILINGUAL_V1("sentence-transformers/clip-ViT-B-32-multilingual-v1", 1623088124L),
-    SENTENCE_TRANSFORMERS_DISTILUSE_BASE_MULTILINGUAL_CASED_V1("sentence-transformers/distiluse-base-multilingual-cased-v1", 1623089363L),
+    SDADAS_ST_POLISH_PARAPHRASE_FROM_DISTILROBERTA(
+            "sdadas/st-polish-paraphrase-from-distilroberta", 1499991122L),
+    SENTENCE_TRANSFORMERS_MSMARCO_ROBERTA_BASE_ANCE_FIRSTP(
+            "sentence-transformers/msmarco-roberta-base-ance-firstp", 1503475571L),
+    SENTENCE_TRANSFORMERS_QUORA_DISTILBERT_MULTILINGUAL(
+            "sentence-transformers/quora-distilbert-multilingual", 1619939023L),
+    SENTENCE_TRANSFORMERS_DISTILBERT_MULTILINGUAL_NLI_STSB_QUORA_RANKING(
+            "sentence-transformers/distilbert-multilingual-nli-stsb-quora-ranking", 1619939159L),
+    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_MULTILINGUAL_EN_DE_V2_TMP_LNG_ALIGNED(
+            "sentence-transformers/msmarco-distilbert-multilingual-en-de-v2-tmp-lng-aligned",
+            1619939584L),
+    SENTENCE_TRANSFORMERS_MSMARCO_DISTILBERT_MULTILINGUAL_EN_DE_V2_TMP_TRAINED_SCRATCH(
+            "sentence-transformers/msmarco-distilbert-multilingual-en-de-v2-tmp-trained-scratch",
+            1619939629L),
+    SENTENCE_TRANSFORMERS_CLIP_VIT_B_32_MULTILINGUAL_V1(
+            "sentence-transformers/clip-ViT-B-32-multilingual-v1", 1623088124L),
+    SENTENCE_TRANSFORMERS_DISTILUSE_BASE_MULTILINGUAL_CASED_V1(
+            "sentence-transformers/distiluse-base-multilingual-cased-v1", 1623089363L),
     COINTEGRATED_LABSE_EN_RU("cointegrated/LaBSE-en-ru", 1722020835L),
     SETU4993_LEALLA_BASE("setu4993/LEALLA-base", 1732164984L),
-    SENTENCE_TRANSFORMERS_BERT_BASE_NLI_CLS_TOKEN("sentence-transformers/bert-base-nli-cls-token", 1752798722L),
-    SENTENCE_TRANSFORMERS_BERT_BASE_NLI_MAX_TOKENS("sentence-transformers/bert-base-nli-max-tokens", 1752799127L),
-    SENTENCE_TRANSFORMERS_BERT_BASE_NLI_STSB_MEAN_TOKENS("sentence-transformers/bert-base-nli-stsb-mean-tokens", 1752799151L),
+    SENTENCE_TRANSFORMERS_BERT_BASE_NLI_CLS_TOKEN(
+            "sentence-transformers/bert-base-nli-cls-token", 1752798722L),
+    SENTENCE_TRANSFORMERS_BERT_BASE_NLI_MAX_TOKENS(
+            "sentence-transformers/bert-base-nli-max-tokens", 1752799127L),
+    SENTENCE_TRANSFORMERS_BERT_BASE_NLI_STSB_MEAN_TOKENS(
+            "sentence-transformers/bert-base-nli-stsb-mean-tokens", 1752799151L),
     HIIAMSID_SENTENCE_SIMILARITY_HINDI("hiiamsid/sentence_similarity_hindi", 1898639316L),
-    L3CUBE_PUNE_HINDI_SENTENCE_SIMILARITY_SBERT("l3cube-pune/hindi-sentence-similarity-sbert", 1910125113L),
-    SENTENCE_TRANSFORMERS_ROBERTA_BASE_NLI_STSB_MEAN_TOKENS("sentence-transformers/roberta-base-nli-stsb-mean-tokens", 1997326693L),
-    SENTENCE_TRANSFORMERS_NLI_ROBERTA_BASE_V2("sentence-transformers/nli-roberta-base-v2", 1997327069L),
-    SENTENCE_TRANSFORMERS_MSMARCO_ROBERTA_BASE_V2("sentence-transformers/msmarco-roberta-base-v2", 1997327352L),
-    SENTENCE_TRANSFORMERS_STSB_ROBERTA_BASE_V2("sentence-transformers/stsb-roberta-base-v2", 1997327433L),
-    SENTENCE_TRANSFORMERS_BERT_BASE_NLI_MEAN_TOKENS("sentence-transformers/bert-base-nli-mean-tokens", 2190792186L),
+    L3CUBE_PUNE_HINDI_SENTENCE_SIMILARITY_SBERT(
+            "l3cube-pune/hindi-sentence-similarity-sbert", 1910125113L),
+    SENTENCE_TRANSFORMERS_ROBERTA_BASE_NLI_STSB_MEAN_TOKENS(
+            "sentence-transformers/roberta-base-nli-stsb-mean-tokens", 1997326693L),
+    SENTENCE_TRANSFORMERS_NLI_ROBERTA_BASE_V2(
+            "sentence-transformers/nli-roberta-base-v2", 1997327069L),
+    SENTENCE_TRANSFORMERS_MSMARCO_ROBERTA_BASE_V2(
+            "sentence-transformers/msmarco-roberta-base-v2", 1997327352L),
+    SENTENCE_TRANSFORMERS_STSB_ROBERTA_BASE_V2(
+            "sentence-transformers/stsb-roberta-base-v2", 1997327433L),
+    SENTENCE_TRANSFORMERS_BERT_BASE_NLI_MEAN_TOKENS(
+            "sentence-transformers/bert-base-nli-mean-tokens", 2190792186L),
     CLIPS_MFAQ("clips/mfaq", 2238871436L),
-    EMBAAS_SENTENCE_TRANSFORMERS_MULTILINGUAL_E5_LARGE("embaas/sentence-transformers-multilingual-e5-large", 2261845613L),
-    SMART_TRIBUNE_SENTENCE_TRANSFORMERS_MULTILINGUAL_E5_LARGE("smart-tribune/sentence-transformers-multilingual-e5-large", 2261845912L),
+    EMBAAS_SENTENCE_TRANSFORMERS_MULTILINGUAL_E5_LARGE(
+            "embaas/sentence-transformers-multilingual-e5-large", 2261845613L),
+    SMART_TRIBUNE_SENTENCE_TRANSFORMERS_MULTILINGUAL_E5_LARGE(
+            "smart-tribune/sentence-transformers-multilingual-e5-large", 2261845912L),
     PIERLUIGIC_XL_LEXEME("pierluigic/xl-lexeme", 2261859900L),
     SETU4993_LEALLA_LARGE("setu4993/LEALLA-large", 2378725205L),
     GANYMEDENIL_TEXT2VEC_LARGE_CHINESE("GanymedeNil/text2vec-large-chinese", 2604914264L),
@@ -289,31 +419,47 @@ public enum EmbeddingModel {
     INTFLOAT_E5_LARGE_V2("intfloat/e5-large-v2", 2682330013L),
     AARI1995_GERMAN_SEMANTIC_STS_V2("aari1995/German_Semantic_STS_V2", 2687049043L),
     LAJAVANESS_CROSSENCODER_CAMEMBERT_LARGE("Lajavaness/CrossEncoder-camembert-large", 2696718911L),
-    SENTENCE_TRANSFORMERS_ROBERTA_LARGE_NLI_MEAN_TOKENS("sentence-transformers/roberta-large-nli-mean-tokens", 2845695742L),
-    SENTENCE_TRANSFORMERS_ALL_ROBERTA_LARGE_V1("sentence-transformers/all-roberta-large-v1", 2845707102L),
+    SENTENCE_TRANSFORMERS_ROBERTA_LARGE_NLI_MEAN_TOKENS(
+            "sentence-transformers/roberta-large-nli-mean-tokens", 2845695742L),
+    SENTENCE_TRANSFORMERS_ALL_ROBERTA_LARGE_V1(
+            "sentence-transformers/all-roberta-large-v1", 2845707102L),
     D0RJ_E5_LARGE_EN_RU("d0rj/e5-large-en-ru", 2930802136L),
-    SENTENCE_TRANSFORMERS_PARAPHRASE_MULTILINGUAL_MPNET_BASE_V2("sentence-transformers/paraphrase-multilingual-mpnet-base-v2", 3351053454L),
-    SENTENCE_TRANSFORMERS_PARAPHRASE_XLM_R_MULTILINGUAL_V1("sentence-transformers/paraphrase-xlm-r-multilingual-v1", 3351068034L),
-    SENTENCE_TRANSFORMERS_STSB_XLM_R_MULTILINGUAL("sentence-transformers/stsb-xlm-r-multilingual", 3351068164L),
-    SENTENCE_TRANSFORMERS_XLM_R_DISTILROBERTA_BASE_PARAPHRASE_V1("sentence-transformers/xlm-r-distilroberta-base-paraphrase-v1", 3351068526L),
-    SENTENCE_TRANSFORMERS_XLM_R_100LANGS_BERT_BASE_NLI_STSB_MEAN_TOKENS("sentence-transformers/xlm-r-100langs-bert-base-nli-stsb-mean-tokens", 3351068568L),
-    SENTENCE_TRANSFORMERS_XLM_R_BERT_BASE_NLI_STSB_MEAN_TOKENS("sentence-transformers/xlm-r-bert-base-nli-stsb-mean-tokens", 3351068726L),
+    SENTENCE_TRANSFORMERS_PARAPHRASE_MULTILINGUAL_MPNET_BASE_V2(
+            "sentence-transformers/paraphrase-multilingual-mpnet-base-v2", 3351053454L),
+    SENTENCE_TRANSFORMERS_PARAPHRASE_XLM_R_MULTILINGUAL_V1(
+            "sentence-transformers/paraphrase-xlm-r-multilingual-v1", 3351068034L),
+    SENTENCE_TRANSFORMERS_STSB_XLM_R_MULTILINGUAL(
+            "sentence-transformers/stsb-xlm-r-multilingual", 3351068164L),
+    SENTENCE_TRANSFORMERS_XLM_R_DISTILROBERTA_BASE_PARAPHRASE_V1(
+            "sentence-transformers/xlm-r-distilroberta-base-paraphrase-v1", 3351068526L),
+    SENTENCE_TRANSFORMERS_XLM_R_100LANGS_BERT_BASE_NLI_STSB_MEAN_TOKENS(
+            "sentence-transformers/xlm-r-100langs-bert-base-nli-stsb-mean-tokens", 3351068568L),
+    SENTENCE_TRANSFORMERS_XLM_R_BERT_BASE_NLI_STSB_MEAN_TOKENS(
+            "sentence-transformers/xlm-r-bert-base-nli-stsb-mean-tokens", 3351068726L),
     INTFLOAT_MULTILINGUAL_E5_BASE("intfloat/multilingual-e5-base", 3378991076L),
     WOODY72_MULTILINGUAL_E5_BASE("woody72/multilingual-e5-base", 3378991184L),
     SETU4993_SMALLER_LABSE("setu4993/smaller-LaBSE", 3512900311L),
     BAAI_BGE_LARGE_EN_V1_5("BAAI/bge-large-en-v1.5", 4019210262L),
-    SENTENCE_TRANSFORMERS_BERT_LARGE_NLI_CLS_TOKEN("sentence-transformers/bert-large-nli-cls-token", 4023121298L),
+    SENTENCE_TRANSFORMERS_BERT_LARGE_NLI_CLS_TOKEN(
+            "sentence-transformers/bert-large-nli-cls-token", 4023121298L),
     SENTENCE_TRANSFORMERS_STSB_BERT_LARGE("sentence-transformers/stsb-bert-large", 4023121756L),
-    SENTENCE_TRANSFORMERS_NLI_BERT_LARGE_MAX_POOLING("sentence-transformers/nli-bert-large-max-pooling", 4023122032L),
-    SENTENCE_TRANSFORMERS_BERT_LARGE_NLI_STSB_MEAN_TOKENS("sentence-transformers/bert-large-nli-stsb-mean-tokens", 4023122049L),
+    SENTENCE_TRANSFORMERS_NLI_BERT_LARGE_MAX_POOLING(
+            "sentence-transformers/nli-bert-large-max-pooling", 4023122032L),
+    SENTENCE_TRANSFORMERS_BERT_LARGE_NLI_STSB_MEAN_TOKENS(
+            "sentence-transformers/bert-large-nli-stsb-mean-tokens", 4023122049L),
     DANGVANTUAN_SENTENCE_CAMEMBERT_LARGE("dangvantuan/sentence-camembert-large", 4041517356L),
     SENTENCE_TRANSFORMERS_NLI_ROBERTA_LARGE("sentence-transformers/nli-roberta-large", 4267149116L),
-    SENTENCE_TRANSFORMERS_BERT_LARGE_NLI_MEAN_TOKENS("sentence-transformers/bert-large-nli-mean-tokens", 5363703243L),
-    SENTENCE_TRANSFORMERS_BERT_LARGE_NLI_MAX_TOKENS("sentence-transformers/bert-large-nli-max-tokens", 5363703258L),
+    SENTENCE_TRANSFORMERS_BERT_LARGE_NLI_MEAN_TOKENS(
+            "sentence-transformers/bert-large-nli-mean-tokens", 5363703243L),
+    SENTENCE_TRANSFORMERS_BERT_LARGE_NLI_MAX_TOKENS(
+            "sentence-transformers/bert-large-nli-max-tokens", 5363703258L),
     SENTENCE_TRANSFORMERS_LABSE("sentence-transformers/LaBSE", 5668685854L),
-    SENTENCE_TRANSFORMERS_USE_CMLM_MULTILINGUAL("sentence-transformers/use-cmlm-multilingual", 5675108503L),
-    SENTENCE_TRANSFORMERS_ROBERTA_LARGE_NLI_STSB_MEAN_TOKENS("sentence-transformers/roberta-large-nli-stsb-mean-tokens", 5689102286L),
-    SENTENCE_TRANSFORMERS_STSB_ROBERTA_LARGE("sentence-transformers/stsb-roberta-large", 5689102977L),
+    SENTENCE_TRANSFORMERS_USE_CMLM_MULTILINGUAL(
+            "sentence-transformers/use-cmlm-multilingual", 5675108503L),
+    SENTENCE_TRANSFORMERS_ROBERTA_LARGE_NLI_STSB_MEAN_TOKENS(
+            "sentence-transformers/roberta-large-nli-stsb-mean-tokens", 5689102286L),
+    SENTENCE_TRANSFORMERS_STSB_ROBERTA_LARGE(
+            "sentence-transformers/stsb-roberta-large", 5689102977L),
     INTFLOAT_MULTILINGUAL_E5_LARGE("intfloat/multilingual-e5-large", 6759678687L),
     SETU4993_LABSE("setu4993/LaBSE", 7554057205L),
     BLAXZTER_LABSE_SENTENCE_EMBEDDINGS("Blaxzter/LaBSE-sentence-embeddings", 7554061681L);
diff --git a/src/main/java/org/jabref/model/database/BibDatabase.java b/src/main/java/org/jabref/model/database/BibDatabase.java
index a5d1d4618510..d90e491428f2 100644
--- a/src/main/java/org/jabref/model/database/BibDatabase.java
+++ b/src/main/java/org/jabref/model/database/BibDatabase.java
@@ -1,23 +1,7 @@
 package org.jabref.model.database;
 
-import java.math.BigInteger;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -35,12 +19,28 @@
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
-
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.math.BigInteger;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 /**
  * A bibliography database. This is the "bib" file (or the library stored in a shared SQL database)
  */
@@ -52,7 +52,9 @@ public class BibDatabase {
     /**
      * State attributes
      */
-    private final ObservableList<BibEntry> entries = FXCollections.synchronizedObservableList(FXCollections.observableArrayList(BibEntry::getObservables));
+    private final ObservableList<BibEntry> entries =
+            FXCollections.synchronizedObservableList(
+                    FXCollections.observableArrayList(BibEntry::getObservables));
 
     // BibEntryId to BibEntry
     private final Map<String, BibEntry> entriesId = new HashMap<>();
@@ -145,15 +147,18 @@ public Set<Field> getAllVisibleFields() {
         for (BibEntry e : getEntries()) {
             allFields.addAll(e.getFields());
         }
-        return allFields.stream().filter(field -> !FieldFactory.isInternalField(field))
-                        .collect(Collectors.toSet());
+        return allFields.stream()
+                .filter(field -> !FieldFactory.isInternalField(field))
+                .collect(Collectors.toSet());
     }
 
     /**
      * Returns the entry with the given citation key.
      */
     public synchronized Optional<BibEntry> getEntryByCitationKey(String key) {
-        return entries.stream().filter(entry -> Objects.equals(entry.getCitationKey().orElse(null), key)).findFirst();
+        return entries.stream()
+                .filter(entry -> Objects.equals(entry.getCitationKey().orElse(null), key))
+                .findFirst();
     }
 
     /**
@@ -166,11 +171,13 @@ public synchronized List<BibEntry> getEntriesByCitationKey(String key) {
         List<BibEntry> result = new ArrayList<>();
 
         for (BibEntry entry : entries) {
-            entry.getCitationKey().ifPresent(entryKey -> {
-                if (key.equals(entryKey)) {
-                    result.add(entry);
-                }
-            });
+            entry.getCitationKey()
+                    .ifPresent(
+                            entryKey -> {
+                                if (key.equals(entryKey)) {
+                                    result.add(entry);
+                                }
+                            });
         }
         return result;
     }
@@ -197,7 +204,8 @@ public synchronized void insertEntries(List<BibEntry> entries) {
         insertEntries(entries, EntriesEventSource.LOCAL);
     }
 
-    public synchronized void insertEntries(List<BibEntry> newEntries, EntriesEventSource eventSource) {
+    public synchronized void insertEntries(
+            List<BibEntry> newEntries, EntriesEventSource eventSource) {
         Objects.requireNonNull(newEntries);
         for (BibEntry entry : newEntries) {
             entry.registerListener(this);
@@ -236,7 +244,8 @@ public synchronized void removeEntries(List<BibEntry> toBeDeleted) {
      * @param toBeDeleted Entry to delete
      * @param eventSource Source the event is sent from
      */
-    public synchronized void removeEntries(List<BibEntry> toBeDeleted, EntriesEventSource eventSource) {
+    public synchronized void removeEntries(
+            List<BibEntry> toBeDeleted, EntriesEventSource eventSource) {
         Objects.requireNonNull(toBeDeleted);
 
         List<String> ids = new ArrayList<>();
@@ -331,7 +340,9 @@ public BibtexString getString(String id) {
      * Returns the string with the given name/label
      */
     public Optional<BibtexString> getStringByName(String name) {
-        return getStringValues().stream().filter(string -> string.getName().equals(name)).findFirst();
+        return getStringValues().stream()
+                .filter(string -> string.getName().equals(name))
+                .findFirst();
     }
 
     /**
@@ -404,7 +415,8 @@ public List<BibtexString> getUsedStrings(Collection<BibEntry> entries) {
      * @param inPlace          If inPlace is true then the given BibtexEntries will be modified, if false then copies of the BibtexEntries are made before resolving the strings.
      * @return a list of bibtexentries, with all strings resolved. It is dependent on the value of inPlace whether copies are made or the given BibtexEntries are modified.
      */
-    public List<BibEntry> resolveForStrings(Collection<BibEntry> entriesToResolve, boolean inPlace) {
+    public List<BibEntry> resolveForStrings(
+            Collection<BibEntry> entriesToResolve, boolean inPlace) {
         Objects.requireNonNull(entriesToResolve, "entries must not be null.");
 
         List<BibEntry> results = new ArrayList<>(entriesToResolve.size());
@@ -614,9 +626,9 @@ public String generateSharedDatabaseID() {
      */
     public long getNumberOfCitationKeyOccurrences(String key) {
         return entries.stream()
-                      .flatMap(entry -> entry.getCitationKey().stream())
-                      .filter(key::equals)
-                      .count();
+                .flatMap(entry -> entry.getCitationKey().stream())
+                .filter(key::equals)
+                .count();
     }
 
     /**
@@ -652,7 +664,8 @@ public String getNewLineSeparator() {
      * @implNote IDs are zero-padded strings, so there is no need to convert them to integers for comparison.
      */
     public int indexOf(BibEntry bibEntry) {
-        int index = Collections.binarySearch(entries, bibEntry, Comparator.comparing(BibEntry::getId));
+        int index =
+                Collections.binarySearch(entries, bibEntry, Comparator.comparing(BibEntry::getId));
         return index >= 0 ? index : -1;
     }
 
@@ -678,6 +691,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(entries, bibtexStrings, preamble, epilog, sharedDatabaseID, newLineSeparator);
+        return Objects.hash(
+                entries, bibtexStrings, preamble, epilog, sharedDatabaseID, newLineSeparator);
     }
 }
diff --git a/src/main/java/org/jabref/model/database/BibDatabaseContext.java b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
index 9d34e8398e88..7de41e5aa69c 100644
--- a/src/main/java/org/jabref/model/database/BibDatabaseContext.java
+++ b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
@@ -1,14 +1,5 @@
 package org.jabref.model.database;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.UUID;
-
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.crawler.Crawler;
@@ -21,11 +12,19 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.study.Study;
-
 import org.jspecify.annotations.NonNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+
 /**
  * Represents everything related to a BIB file.
  *
@@ -77,7 +76,8 @@ public BibDatabaseContext(BibDatabase database, MetaData metaData, Path path) {
         this(database, metaData, path, DatabaseLocation.LOCAL);
     }
 
-    public BibDatabaseContext(BibDatabase database, MetaData metaData, Path path, DatabaseLocation location) {
+    public BibDatabaseContext(
+            BibDatabase database, MetaData metaData, Path path, DatabaseLocation location) {
         this(database, metaData);
         Objects.requireNonNull(location);
         this.path = path;
@@ -133,9 +133,16 @@ public boolean isBiblatexMode() {
      */
     public boolean isStudy() {
         return this.getDatabasePath()
-                   .map(path -> path.getFileName().toString().equals(Crawler.FILENAME_STUDY_RESULT_BIB) &&
-                           Files.exists(path.resolveSibling(StudyRepository.STUDY_DEFINITION_FILE_NAME)))
-                   .orElse(false);
+                .map(
+                        path ->
+                                path.getFileName()
+                                                .toString()
+                                                .equals(Crawler.FILENAME_STUDY_RESULT_BIB)
+                                        && Files.exists(
+                                                path.resolveSibling(
+                                                        StudyRepository
+                                                                .STUDY_DEFINITION_FILE_NAME)))
+                .orElse(false);
     }
 
     /**
@@ -162,31 +169,42 @@ public List<Path> getFileDirectories(FilePreferences preferences) {
         // Paths are a) ordered and b) should be contained only once in the result
         LinkedHashSet<Path> fileDirs = new LinkedHashSet<>(3);
 
-        Optional<Path> userFileDirectory = metaData.getUserFileDirectory(preferences.getUserAndHost()).map(dir -> getFileDirectoryPath(dir));
+        Optional<Path> userFileDirectory =
+                metaData.getUserFileDirectory(preferences.getUserAndHost())
+                        .map(dir -> getFileDirectoryPath(dir));
         userFileDirectory.ifPresent(fileDirs::add);
 
-        Optional<Path> generalFileDirectory = metaData.getDefaultFileDirectory().map(dir -> getFileDirectoryPath(dir));
+        Optional<Path> generalFileDirectory =
+                metaData.getDefaultFileDirectory().map(dir -> getFileDirectoryPath(dir));
         generalFileDirectory.ifPresent(fileDirs::add);
 
-        // fileDirs.isEmpty() is true after these two if there are no directories set in the BIB file itself:
+        // fileDirs.isEmpty() is true after these two if there are no directories set in the BIB
+        // file itself:
         //   1) no user-specific file directory set (in the metadata of the bib file) and
         //   2) no general file directory is set (in the metadata of the bib file)
 
         // BIB file directory or main file directory (according to (global) preferences)
         if (preferences.shouldStoreFilesRelativeToBibFile()) {
-            getDatabasePath().ifPresent(dbPath -> {
-                Path parentPath = dbPath.getParent();
-                if (parentPath == null) {
-                    parentPath = Path.of(System.getProperty("user.dir"));
-                    LOGGER.warn("Parent path of database file {} is null. Falling back to {}.", dbPath, parentPath);
-                }
-                Objects.requireNonNull(parentPath, "BibTeX database parent path is null");
-                fileDirs.add(parentPath.toAbsolutePath());
-            });
+            getDatabasePath()
+                    .ifPresent(
+                            dbPath -> {
+                                Path parentPath = dbPath.getParent();
+                                if (parentPath == null) {
+                                    parentPath = Path.of(System.getProperty("user.dir"));
+                                    LOGGER.warn(
+                                            "Parent path of database file {} is null. Falling back to {}.",
+                                            dbPath,
+                                            parentPath);
+                                }
+                                Objects.requireNonNull(
+                                        parentPath, "BibTeX database parent path is null");
+                                fileDirs.add(parentPath.toAbsolutePath());
+                            });
         } else {
-            preferences.getMainFileDirectory()
-                       .filter(path -> !fileDirs.contains(path))
-                       .ifPresent(fileDirs::add);
+            preferences
+                    .getMainFileDirectory()
+                    .filter(path -> !fileDirs.contains(path))
+                    .ifPresent(fileDirs::add);
         }
 
         return new ArrayList<>(fileDirs);
@@ -198,9 +216,7 @@ public List<Path> getFileDirectories(FilePreferences preferences) {
      * @return the path - or an empty optional, if none of the directories exists
      */
     public Optional<Path> getFirstExistingFileDir(FilePreferences preferences) {
-        return getFileDirectories(preferences).stream()
-                                              .filter(Files::exists)
-                                              .findFirst();
+        return getFileDirectories(preferences).stream().filter(Files::exists).findFirst();
     }
 
     /**
@@ -212,9 +228,12 @@ private Path getFileDirectoryPath(String directory) {
             return path;
         }
 
-        // If this path is relative, we try to interpret it as relative to the file path of this BIB file:
+        // If this path is relative, we try to interpret it as relative to the file path of this BIB
+        // file:
         return getDatabasePath()
-                .map(databaseFile -> databaseFile.getParent().resolve(path).normalize().toAbsolutePath())
+                .map(
+                        databaseFile ->
+                                databaseFile.getParent().resolve(path).normalize().toAbsolutePath())
                 .orElse(path);
     }
 
@@ -262,8 +281,12 @@ public Path getFulltextIndexPath() {
 
         if (getDatabasePath().isPresent()) {
             Path databasePath = getDatabasePath().get();
-            // Eventually, this leads to filenames as "40daf3b0--fuu.bib--2022-09-04--01.36.25.bib" --> "--" is used as separator between "groups"
-            String fileName = BackupFileUtil.getUniqueFilePrefix(databasePath) + "--" + databasePath.getFileName();
+            // Eventually, this leads to filenames as "40daf3b0--fuu.bib--2022-09-04--01.36.25.bib"
+            // --> "--" is used as separator between "groups"
+            String fileName =
+                    BackupFileUtil.getUniqueFilePrefix(databasePath)
+                            + "--"
+                            + databasePath.getFileName();
             indexPath = appData.resolve(fileName);
             LOGGER.debug("Index path for {} is {}", getDatabasePath().get(), indexPath);
             return indexPath;
@@ -276,14 +299,20 @@ public Path getFulltextIndexPath() {
 
     @Override
     public String toString() {
-        return "BibDatabaseContext{" +
-                "metaData=" + metaData +
-                ", mode=" + getMode() +
-                ", databasePath=" + getDatabasePath() +
-                ", biblatexMode=" + isBiblatexMode() +
-                ", uid= " + getUid() +
-                ", fulltextIndexPath=" + getFulltextIndexPath() +
-                '}';
+        return "BibDatabaseContext{"
+                + "metaData="
+                + metaData
+                + ", mode="
+                + getMode()
+                + ", databasePath="
+                + getDatabasePath()
+                + ", biblatexMode="
+                + isBiblatexMode()
+                + ", uid= "
+                + getUid()
+                + ", fulltextIndexPath="
+                + getFulltextIndexPath()
+                + '}';
     }
 
     @Override
@@ -294,7 +323,10 @@ public boolean equals(Object o) {
         if (!(o instanceof BibDatabaseContext that)) {
             return false;
         }
-        return Objects.equals(database, that.database) && Objects.equals(metaData, that.metaData) && Objects.equals(path, that.path) && location == that.location;
+        return Objects.equals(database, that.database)
+                && Objects.equals(metaData, that.metaData)
+                && Objects.equals(path, that.path)
+                && location == that.location;
     }
 
     /**
diff --git a/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java b/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java
index 3fa1f5745a56..e35ae5c6f91d 100644
--- a/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java
+++ b/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java
@@ -1,15 +1,14 @@
 package org.jabref.model.database;
 
-import java.util.stream.Stream;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.EntryTypeFactory;
 
+import java.util.stream.Stream;
+
 public class BibDatabaseModeDetection {
 
-    private BibDatabaseModeDetection() {
-    }
+    private BibDatabaseModeDetection() {}
 
     /**
      * Tries to infer the database type by examining a BibDatabase database.
diff --git a/src/main/java/org/jabref/model/database/BibDatabases.java b/src/main/java/org/jabref/model/database/BibDatabases.java
index 6ca031786371..86afe1f072c4 100644
--- a/src/main/java/org/jabref/model/database/BibDatabases.java
+++ b/src/main/java/org/jabref/model/database/BibDatabases.java
@@ -1,15 +1,14 @@
 package org.jabref.model.database;
 
+import org.jabref.model.entry.BibEntry;
+
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.jabref.model.entry.BibEntry;
-
 public class BibDatabases {
 
-    private BibDatabases() {
-    }
+    private BibDatabases() {}
 
     /**
      * Receives a Collection of BibEntry instances, iterates through them, and
@@ -18,7 +17,7 @@ private BibDatabases() {
      */
     public static List<BibEntry> purgeEmptyEntries(Collection<BibEntry> entries) {
         return entries.stream()
-                      .filter(entry -> !entry.getFields().isEmpty())
-                      .collect(Collectors.toList());
+                .filter(entry -> !entry.getFields().isEmpty())
+                .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/model/database/KeyChangeListener.java b/src/main/java/org/jabref/model/database/KeyChangeListener.java
index 6dc601971f1b..e0790c0c60d9 100644
--- a/src/main/java/org/jabref/model/database/KeyChangeListener.java
+++ b/src/main/java/org/jabref/model/database/KeyChangeListener.java
@@ -1,9 +1,6 @@
 package org.jabref.model.database;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import com.google.common.eventbus.Subscribe;
 
 import org.jabref.model.database.event.EntriesRemovedEvent;
 import org.jabref.model.entry.BibEntry;
@@ -12,7 +9,10 @@
 import org.jabref.model.entry.field.FieldProperty;
 import org.jabref.model.entry.field.InternalField;
 
-import com.google.common.eventbus.Subscribe;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
 
 public class KeyChangeListener {
 
@@ -42,20 +42,29 @@ public void listen(EntriesRemovedEvent event) {
 
     private void updateEntryLinks(String newKey, String oldKey) {
         for (BibEntry entry : database.getEntries()) {
-            entry.getFields(field -> field.getProperties().contains(FieldProperty.SINGLE_ENTRY_LINK))
-                 .forEach(field -> {
-                     String fieldContent = entry.getField(field).orElseThrow();
-                     replaceSingleKeyInField(newKey, oldKey, entry, field, fieldContent);
-                 });
-            entry.getFields(field -> field.getProperties().contains(FieldProperty.MULTIPLE_ENTRY_LINK))
-                 .forEach(field -> {
-                     String fieldContent = entry.getField(field).orElseThrow();
-                     replaceKeyInMultiplesKeyField(newKey, oldKey, entry, field, fieldContent);
-                 });
+            entry.getFields(
+                            field ->
+                                    field.getProperties().contains(FieldProperty.SINGLE_ENTRY_LINK))
+                    .forEach(
+                            field -> {
+                                String fieldContent = entry.getField(field).orElseThrow();
+                                replaceSingleKeyInField(newKey, oldKey, entry, field, fieldContent);
+                            });
+            entry.getFields(
+                            field ->
+                                    field.getProperties()
+                                            .contains(FieldProperty.MULTIPLE_ENTRY_LINK))
+                    .forEach(
+                            field -> {
+                                String fieldContent = entry.getField(field).orElseThrow();
+                                replaceKeyInMultiplesKeyField(
+                                        newKey, oldKey, entry, field, fieldContent);
+                            });
         }
     }
 
-    private void replaceKeyInMultiplesKeyField(String newKey, String oldKey, BibEntry entry, Field field, String fieldContent) {
+    private void replaceKeyInMultiplesKeyField(
+            String newKey, String oldKey, BibEntry entry, Field field, String fieldContent) {
         List<String> keys = new ArrayList<>(Arrays.asList(fieldContent.split(",")));
         int index = keys.indexOf(oldKey);
         if (index != -1) {
@@ -68,7 +77,8 @@ private void replaceKeyInMultiplesKeyField(String newKey, String oldKey, BibEntr
         }
     }
 
-    private void replaceSingleKeyInField(String newKey, String oldKey, BibEntry entry, Field field, String fieldContent) {
+    private void replaceSingleKeyInField(
+            String newKey, String oldKey, BibEntry entry, Field field, String fieldContent) {
         if (fieldContent.equals(oldKey)) {
             if (newKey == null) {
                 entry.clearField(field);
diff --git a/src/main/java/org/jabref/model/database/event/ChangePropagation.java b/src/main/java/org/jabref/model/database/event/ChangePropagation.java
index c562e5cde9d7..e80c62edae9d 100644
--- a/src/main/java/org/jabref/model/database/event/ChangePropagation.java
+++ b/src/main/java/org/jabref/model/database/event/ChangePropagation.java
@@ -1,5 +1,6 @@
 package org.jabref.model.database.event;
 
 public enum ChangePropagation {
-    POST_EVENT, DO_NOT_POST_EVENT
+    POST_EVENT,
+    DO_NOT_POST_EVENT
 }
diff --git a/src/main/java/org/jabref/model/database/event/EntriesAddedEvent.java b/src/main/java/org/jabref/model/database/event/EntriesAddedEvent.java
index 35e51ee5ed19..5d284c596bc3 100644
--- a/src/main/java/org/jabref/model/database/event/EntriesAddedEvent.java
+++ b/src/main/java/org/jabref/model/database/event/EntriesAddedEvent.java
@@ -1,12 +1,12 @@
 package org.jabref.model.database.event;
 
-import java.util.List;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.event.EntriesEvent;
 import org.jabref.model.entry.event.EntriesEventSource;
 
+import java.util.List;
+
 /**
  * {@link EntriesAddedEvent} is fired when at least {@link BibEntry} is being added to the {@link BibDatabase}.
  */
@@ -20,8 +20,8 @@ public class EntriesAddedEvent extends EntriesEvent {
      * @param bibEntries the entries which are being added
      * @param firstEntry the first entry being added
      */
-
-    public EntriesAddedEvent(List<BibEntry> bibEntries, BibEntry firstEntry, EntriesEventSource location) {
+    public EntriesAddedEvent(
+            List<BibEntry> bibEntries, BibEntry firstEntry, EntriesEventSource location) {
         super(bibEntries, location);
         this.firstEntry = firstEntry;
     }
diff --git a/src/main/java/org/jabref/model/database/event/EntriesRemovedEvent.java b/src/main/java/org/jabref/model/database/event/EntriesRemovedEvent.java
index e252132f82a1..1d1fa983707d 100644
--- a/src/main/java/org/jabref/model/database/event/EntriesRemovedEvent.java
+++ b/src/main/java/org/jabref/model/database/event/EntriesRemovedEvent.java
@@ -1,16 +1,15 @@
 package org.jabref.model.database.event;
 
-import java.util.List;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.event.EntriesEvent;
 import org.jabref.model.entry.event.EntriesEventSource;
 
+import java.util.List;
+
 /**
  * <code>EntriesRemovedEvent</code> is fired when at least one <code>BibEntry</code> is being removed
  * from the database.
  */
-
 public class EntriesRemovedEvent extends EntriesEvent {
 
     /**
diff --git a/src/main/java/org/jabref/model/entry/Author.java b/src/main/java/org/jabref/model/entry/Author.java
index 5892ca0b4570..7d6ef5123caf 100644
--- a/src/main/java/org/jabref/model/entry/Author.java
+++ b/src/main/java/org/jabref/model/entry/Author.java
@@ -1,13 +1,13 @@
 package org.jabref.model.entry;
 
-import java.util.Objects;
-import java.util.Optional;
-
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.logic.formatter.bibtexfields.RemoveWordEnclosingAndOuterEnclosingBracesFormatter;
 import org.jabref.model.strings.LatexToUnicodeAdapter;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * This is an immutable class that keeps information regarding single author. It is just a container for the information, with very simple methods to access it.
  * <p>
@@ -23,7 +23,8 @@ public class Author {
      */
     public static final Author OTHERS = new Author("", "", null, "others", null);
 
-    public static final RemoveWordEnclosingAndOuterEnclosingBracesFormatter FORMATTER = new RemoveWordEnclosingAndOuterEnclosingBracesFormatter();
+    public static final RemoveWordEnclosingAndOuterEnclosingBracesFormatter FORMATTER =
+            new RemoveWordEnclosingAndOuterEnclosingBracesFormatter();
 
     private final String givenName;
     private final String givenNameAbbreviated;
@@ -43,8 +44,18 @@ public class Author {
      * @param familyName      the last name of the author (may consist of several tokens, like "Vall{\'e}e Poussin" in "Charles Louis Xavier Joseph de la Vall{\'e}e Poussin")
      * @param nameSuffix        the junior part of the author's name (may consist of several tokens, like "Jr. III" in "Smith, Jr. III, John")
      */
-    public Author(String givenName, String givenNameAbbreviated, String namePrefix, String familyName, String nameSuffix) {
-        boolean keepBracesAtLastPart = StringUtil.isBlank(givenName) && StringUtil.isBlank(givenNameAbbreviated) && StringUtil.isBlank(namePrefix) && !StringUtil.isBlank(familyName) && StringUtil.isBlank(nameSuffix);
+    public Author(
+            String givenName,
+            String givenNameAbbreviated,
+            String namePrefix,
+            String familyName,
+            String nameSuffix) {
+        boolean keepBracesAtLastPart =
+                StringUtil.isBlank(givenName)
+                        && StringUtil.isBlank(givenNameAbbreviated)
+                        && StringUtil.isBlank(namePrefix)
+                        && !StringUtil.isBlank(familyName)
+                        && StringUtil.isBlank(nameSuffix);
 
         if (!StringUtil.isBlank(givenName)) {
             this.givenName = addDotIfAbbreviation(FORMATTER.format(givenName));
@@ -84,8 +95,9 @@ public static String addDotIfAbbreviation(String name) {
             return name;
         }
         // If only one character (uppercase letter), add a dot and return immediately:
-        if ((name.length() == 1) && Character.isLetter(name.charAt(0)) &&
-                Character.isUpperCase(name.charAt(0))) {
+        if ((name.length() == 1)
+                && Character.isLetter(name.charAt(0))
+                && Character.isUpperCase(name.charAt(0))) {
             return name + ".";
         }
 
@@ -105,15 +117,18 @@ public static String addDotIfAbbreviation(String name) {
                 }
             }
 
-            boolean currentIsUppercaseLetter = Character.isLetter(currentChar) && Character.isUpperCase(currentChar);
+            boolean currentIsUppercaseLetter =
+                    Character.isLetter(currentChar) && Character.isUpperCase(currentChar);
             if (!currentIsUppercaseLetter) {
                 // No uppercase letter, hence nothing to do
                 continue;
             }
 
-            boolean lastIsLowercaseLetter = Character.isLetter(lastChar) && Character.isLowerCase(lastChar);
+            boolean lastIsLowercaseLetter =
+                    Character.isLetter(lastChar) && Character.isLowerCase(lastChar);
             if (lastIsLowercaseLetter) {
-                // previous character was lowercase (probably an acronym like JabRef) -> don't change anything
+                // previous character was lowercase (probably an acronym like JabRef) -> don't
+                // change anything
                 continue;
             }
 
@@ -140,12 +155,16 @@ public static String addDotIfAbbreviation(String name) {
             char furtherChar = Character.MIN_VALUE;
             for (int j = i + 1; j < name.length(); j++) {
                 furtherChar = name.charAt(j);
-                if (Character.isWhitespace(furtherChar) || (furtherChar == '-') || (furtherChar == '~') || (furtherChar == '.')) {
+                if (Character.isWhitespace(furtherChar)
+                        || (furtherChar == '-')
+                        || (furtherChar == '~')
+                        || (furtherChar == '.')) {
                     // end of word
                     break;
                 }
 
-                boolean furtherIsUppercaseLetter = Character.isLetter(furtherChar) && Character.isUpperCase(furtherChar);
+                boolean furtherIsUppercaseLetter =
+                        Character.isLetter(furtherChar) && Character.isUpperCase(furtherChar);
                 if (!furtherIsUppercaseLetter) {
                     nextWordIsUppercase = false;
                     break;
@@ -317,7 +336,8 @@ public String getNameForAlphabetization() {
     public Author latexFree() {
         if (latexFreeAuthor == null) {
             String first = getGivenName().map(LatexToUnicodeAdapter::format).orElse(null);
-            String givenNameAbbreviated = getGivenNameAbbreviated().map(LatexToUnicodeAdapter::format).orElse(null);
+            String givenNameAbbreviated =
+                    getGivenNameAbbreviated().map(LatexToUnicodeAdapter::format).orElse(null);
             String von = getNamePrefix().map(LatexToUnicodeAdapter::format).orElse(null);
             String last = getFamilyName().map(LatexToUnicodeAdapter::format).orElse(null);
             String jr = getNameSuffix().map(LatexToUnicodeAdapter::format).orElse(null);
diff --git a/src/main/java/org/jabref/model/entry/AuthorList.java b/src/main/java/org/jabref/model/entry/AuthorList.java
index 092d04de61cf..1d3308645367 100644
--- a/src/main/java/org/jabref/model/entry/AuthorList.java
+++ b/src/main/java/org/jabref/model/entry/AuthorList.java
@@ -1,5 +1,9 @@
 package org.jabref.model.entry;
 
+import org.jabref.architecture.AllowedToUseLogic;
+import org.jabref.logic.importer.AuthorListParser;
+import org.jspecify.annotations.NonNull;
+
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -10,11 +14,6 @@
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
-import org.jabref.architecture.AllowedToUseLogic;
-import org.jabref.logic.importer.AuthorListParser;
-
-import org.jspecify.annotations.NonNull;
-
 /**
  * This is an immutable class representing information of either <CODE>author</CODE> or <CODE>editor</CODE> field in bibtex record.
  * <p>
@@ -120,7 +119,8 @@
 @AllowedToUseLogic("because it needs access to AuthorList parser")
 public class AuthorList implements Iterable<Author> {
 
-    private static final Map<String, AuthorList> AUTHOR_CACHE = Collections.synchronizedMap(new WeakHashMap<>());
+    private static final Map<String, AuthorList> AUTHOR_CACHE =
+            Collections.synchronizedMap(new WeakHashMap<>());
     private final List<Author> authors;
     private AuthorList latexFreeAuthors;
 
@@ -148,7 +148,8 @@ public static AuthorList of(Author... authors) {
         return Collectors.collectingAndThen(Collectors.toUnmodifiableList(), AuthorList::new);
     }
 
-    private static String andCoordinatedConjunction(List<Author> authors, Function<Author, String> style, boolean oxfordComma) {
+    private static String andCoordinatedConjunction(
+            List<Author> authors, Function<Author, String> style, boolean oxfordComma) {
         var formattedAuthors = authors.stream().map(style).collect(Collectors.toUnmodifiableList());
         return andCoordinatedConjunction(formattedAuthors, oxfordComma);
     }
@@ -160,7 +161,10 @@ private static String andCoordinatedConjunction(List<String> authors, boolean ox
             case 0 -> "";
             case 1 -> authors.getFirst();
             case 2 -> authors.getFirst() + " and " + authors.get(1);
-            default -> String.join(", ", authors.subList(0, lastIndex)) + lastDelimiter + authors.get(lastIndex);
+            default ->
+                    String.join(", ", authors.subList(0, lastIndex))
+                            + lastDelimiter
+                            + authors.get(lastIndex);
         };
     }
 
@@ -173,10 +177,12 @@ private static String andCoordinatedConjunction(List<String> authors, boolean ox
      * @return An AuthorList object representing the given authors.
      */
     public static AuthorList parse(@NonNull final String authors) {
-        return AUTHOR_CACHE.computeIfAbsent(authors, string -> {
-            AuthorListParser parser = new AuthorListParser();
-            return parser.parse(string);
-        });
+        return AUTHOR_CACHE.computeIfAbsent(
+                authors,
+                string -> {
+                    AuthorListParser parser = new AuthorListParser();
+                    return parser.parse(string);
+                });
     }
 
     /**
@@ -184,7 +190,8 @@ public static AuthorList parse(@NonNull final String authors) {
      *
      * @see AuthorList#getAsFirstLastNames
      */
-    public static String fixAuthorFirstNameFirstCommas(String authors, boolean abbreviate, boolean oxfordComma) {
+    public static String fixAuthorFirstNameFirstCommas(
+            String authors, boolean abbreviate, boolean oxfordComma) {
         return AuthorList.parse(authors).getAsFirstLastNames(abbreviate, oxfordComma);
     }
 
@@ -202,7 +209,8 @@ public static String fixAuthorFirstNameFirst(String authors) {
      *
      * @see AuthorList#getAsLastFirstNames
      */
-    public static String fixAuthorLastNameFirstCommas(String authors, boolean abbreviate, boolean oxfordComma) {
+    public static String fixAuthorLastNameFirstCommas(
+            String authors, boolean abbreviate, boolean oxfordComma) {
         return AuthorList.parse(authors).getAsLastFirstNames(abbreviate, oxfordComma);
     }
 
@@ -293,9 +301,11 @@ public List<Author> getAuthors() {
      */
     public AuthorList latexFree() {
         if (latexFreeAuthors == null) {
-            latexFreeAuthors = new AuthorList(authors.stream()
-                                                     .map(Author::latexFree)
-                                                     .collect(Collectors.toUnmodifiableList()));
+            latexFreeAuthors =
+                    new AuthorList(
+                            authors.stream()
+                                    .map(Author::latexFree)
+                                    .collect(Collectors.toUnmodifiableList()));
             latexFreeAuthors.latexFreeAuthors = latexFreeAuthors;
         }
         return latexFreeAuthors;
@@ -318,7 +328,10 @@ public String getAsNatbib() {
         return switch (authors.size()) {
             case 0 -> "";
             case 1 -> authors.getFirst().getNamePrefixAndFamilyName();
-            case 2 -> authors.getFirst().getNamePrefixAndFamilyName() + " and " + authors.get(1).getNamePrefixAndFamilyName();
+            case 2 ->
+                    authors.getFirst().getNamePrefixAndFamilyName()
+                            + " and "
+                            + authors.get(1).getNamePrefixAndFamilyName();
             default -> authors.getFirst().getNamePrefixAndFamilyName() + " et al.";
         };
     }
@@ -339,7 +352,8 @@ public String getAsNatbib() {
      * Oxford comma.</a>
      */
     public String getAsLastNames(boolean oxfordComma) {
-        return andCoordinatedConjunction(getAuthors(), Author::getNamePrefixAndFamilyName, oxfordComma);
+        return andCoordinatedConjunction(
+                getAuthors(), Author::getNamePrefixAndFamilyName, oxfordComma);
     }
 
     /**
@@ -361,7 +375,8 @@ public String getAsLastNames(boolean oxfordComma) {
      * Oxford comma.</a>
      */
     public String getAsLastFirstNames(boolean abbreviate, boolean oxfordComma) {
-        return andCoordinatedConjunction(getAuthors(), auth -> auth.getFamilyGiven(abbreviate), oxfordComma);
+        return andCoordinatedConjunction(
+                getAuthors(), auth -> auth.getFamilyGiven(abbreviate), oxfordComma);
     }
 
     @Override
@@ -384,8 +399,8 @@ public String toString() {
      */
     public String getAsLastFirstNamesWithAnd(boolean abbreviate) {
         return getAuthors().stream()
-                           .map(author -> author.getFamilyGiven(abbreviate))
-                           .collect(Collectors.joining(" and "));
+                .map(author -> author.getFamilyGiven(abbreviate))
+                .collect(Collectors.joining(" and "));
     }
 
     /**
@@ -397,13 +412,15 @@ public String getAsLastFirstFirstLastNamesWithAnd(boolean abbreviate) {
         return switch (authors.size()) {
             case 0 -> "";
             case 1 -> authors.getFirst().getFamilyGiven(abbreviate);
-            default -> authors.stream()
-                              .skip(1)
-                              .map(author -> author.getGivenFamily(abbreviate))
-                              .collect(Collectors.joining(
-                                      " and ",
-                                      authors.getFirst().getFamilyGiven(abbreviate) + " and ",
-                                      ""));
+            default ->
+                    authors.stream()
+                            .skip(1)
+                            .map(author -> author.getGivenFamily(abbreviate))
+                            .collect(
+                                    Collectors.joining(
+                                            " and ",
+                                            authors.getFirst().getFamilyGiven(abbreviate) + " and ",
+                                            ""));
         };
     }
 
@@ -426,7 +443,8 @@ public String getAsLastFirstFirstLastNamesWithAnd(boolean abbreviate) {
      * Oxford comma.</a>
      */
     public String getAsFirstLastNames(boolean abbreviate, boolean oxfordComma) {
-        return andCoordinatedConjunction(getAuthors(), author -> author.getGivenFamily(abbreviate), oxfordComma);
+        return andCoordinatedConjunction(
+                getAuthors(), author -> author.getGivenFamily(abbreviate), oxfordComma);
     }
 
     /**
@@ -467,8 +485,8 @@ public int hashCode() {
      */
     public String getAsFirstLastNamesWithAnd() {
         return getAuthors().stream()
-                           .map(author -> author.getGivenFamily(false))
-                           .collect(Collectors.joining(" and "));
+                .map(author -> author.getGivenFamily(false))
+                .collect(Collectors.joining(" and "));
     }
 
     /**
@@ -482,8 +500,8 @@ public String getAsFirstLastNamesWithAnd() {
      */
     public String getForAlphabetization() {
         return getAuthors().stream()
-                           .map(Author::getNameForAlphabetization)
-                           .collect(Collectors.joining(" and "));
+                .map(Author::getNameForAlphabetization)
+                .collect(Collectors.joining(" and "));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index f0d2d43689ec..c87295258b71 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -1,23 +1,9 @@
 package org.jabref.model.entry;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.SequencedSet;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.BiFunction;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.eventbus.EventBus;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.optional.OptionalBinding;
 
 import javafx.beans.Observable;
 import javafx.beans.property.ObjectProperty;
@@ -45,14 +31,28 @@
 import org.jabref.model.strings.LatexToUnicodeAdapter;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.MultiKeyMap;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.eventbus.EventBus;
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.optional.OptionalBinding;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.SequencedSet;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.BiFunction;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
 /**
  * Represents a Bib(La)TeX entry, which can be BibTeX or BibLaTeX.
  * <p>
@@ -112,7 +112,8 @@ public class BibEntry implements Cloneable {
     /**
      * Cache that stores the field as keyword lists (format &lt;Field, Separator, Keyword list>)
      */
-    private final MultiKeyMap<StandardField, Character, KeywordList> fieldsAsKeywords = new MultiKeyMap<>(StandardField.class);
+    private final MultiKeyMap<StandardField, Character, KeywordList> fieldsAsKeywords =
+            new MultiKeyMap<>(StandardField.class);
 
     private final EventBus eventBus = new EventBus();
 
@@ -120,7 +121,8 @@ public class BibEntry implements Cloneable {
 
     private final ObjectProperty<EntryType> type = new SimpleObjectProperty<>(DEFAULT_TYPE);
 
-    private ObservableMap<Field, String> fields = FXCollections.observableMap(new ConcurrentHashMap<>());
+    private ObservableMap<Field, String> fields =
+            FXCollections.observableMap(new ConcurrentHashMap<>());
 
     /**
      * The part before the start of the entry
@@ -187,24 +189,30 @@ public Optional<String> getResolvedFieldOrAlias(OrFields fields, BibDatabase dat
      * @param sourceEntry type of the cross-referenced BibEntry
      * @return the mapped field or null if there is no valid mapping available
      */
-    private Optional<Field> getSourceField(Field targetField, EntryType targetEntry, EntryType sourceEntry) {
+    private Optional<Field> getSourceField(
+            Field targetField, EntryType targetEntry, EntryType sourceEntry) {
         //// 1. Sort out forbidden fields
-        if ((targetField == StandardField.IDS) ||
-                (targetField == StandardField.CROSSREF) ||
-                (targetField == StandardField.XREF) ||
-                (targetField == StandardField.ENTRYSET) ||
-                (targetField == StandardField.RELATED) ||
-                (targetField == StandardField.SORTKEY)) {
+        if ((targetField == StandardField.IDS)
+                || (targetField == StandardField.CROSSREF)
+                || (targetField == StandardField.XREF)
+                || (targetField == StandardField.ENTRYSET)
+                || (targetField == StandardField.RELATED)
+                || (targetField == StandardField.SORTKEY)) {
             return Optional.empty();
         }
 
         //// 2. Handle special field mappings
-        if (((sourceEntry == StandardEntryType.MvBook) && (targetEntry == StandardEntryType.InBook)) ||
-                ((sourceEntry == StandardEntryType.MvBook) && (targetEntry == StandardEntryType.BookInBook)) ||
-                ((sourceEntry == StandardEntryType.MvBook) && (targetEntry == StandardEntryType.SuppBook)) ||
-                ((sourceEntry == StandardEntryType.Book) && (targetEntry == StandardEntryType.InBook)) ||
-                ((sourceEntry == StandardEntryType.Book) && (targetEntry == StandardEntryType.BookInBook)) ||
-                ((sourceEntry == StandardEntryType.Book) && (targetEntry == StandardEntryType.SuppBook))) {
+        if (((sourceEntry == StandardEntryType.MvBook) && (targetEntry == StandardEntryType.InBook))
+                || ((sourceEntry == StandardEntryType.MvBook)
+                        && (targetEntry == StandardEntryType.BookInBook))
+                || ((sourceEntry == StandardEntryType.MvBook)
+                        && (targetEntry == StandardEntryType.SuppBook))
+                || ((sourceEntry == StandardEntryType.Book)
+                        && (targetEntry == StandardEntryType.InBook))
+                || ((sourceEntry == StandardEntryType.Book)
+                        && (targetEntry == StandardEntryType.BookInBook))
+                || ((sourceEntry == StandardEntryType.Book)
+                        && (targetEntry == StandardEntryType.SuppBook))) {
             if (targetField == StandardField.AUTHOR) {
                 return Optional.of(StandardField.AUTHOR);
             }
@@ -213,17 +221,27 @@ private Optional<Field> getSourceField(Field targetField, EntryType targetEntry,
             }
         }
 
-        if (((sourceEntry == StandardEntryType.MvBook) && (targetEntry == StandardEntryType.Book)) ||
-                ((sourceEntry == StandardEntryType.MvBook) && (targetEntry == StandardEntryType.InBook)) ||
-                ((sourceEntry == StandardEntryType.MvBook) && (targetEntry == StandardEntryType.BookInBook)) ||
-                ((sourceEntry == StandardEntryType.MvBook) && (targetEntry == StandardEntryType.SuppBook)) ||
-                ((sourceEntry == StandardEntryType.MvCollection) && (targetEntry == StandardEntryType.Collection)) ||
-                ((sourceEntry == StandardEntryType.MvCollection) && (targetEntry == StandardEntryType.InCollection)) ||
-                ((sourceEntry == StandardEntryType.MvCollection) && (targetEntry == StandardEntryType.SuppCollection)) ||
-                ((sourceEntry == StandardEntryType.MvProceedings) && (targetEntry == StandardEntryType.Proceedings)) ||
-                ((sourceEntry == StandardEntryType.MvProceedings) && (targetEntry == StandardEntryType.InProceedings)) ||
-                ((sourceEntry == StandardEntryType.MvReference) && (targetEntry == StandardEntryType.Reference)) ||
-                ((sourceEntry == StandardEntryType.MvReference) && (targetEntry == StandardEntryType.InReference))) {
+        if (((sourceEntry == StandardEntryType.MvBook) && (targetEntry == StandardEntryType.Book))
+                || ((sourceEntry == StandardEntryType.MvBook)
+                        && (targetEntry == StandardEntryType.InBook))
+                || ((sourceEntry == StandardEntryType.MvBook)
+                        && (targetEntry == StandardEntryType.BookInBook))
+                || ((sourceEntry == StandardEntryType.MvBook)
+                        && (targetEntry == StandardEntryType.SuppBook))
+                || ((sourceEntry == StandardEntryType.MvCollection)
+                        && (targetEntry == StandardEntryType.Collection))
+                || ((sourceEntry == StandardEntryType.MvCollection)
+                        && (targetEntry == StandardEntryType.InCollection))
+                || ((sourceEntry == StandardEntryType.MvCollection)
+                        && (targetEntry == StandardEntryType.SuppCollection))
+                || ((sourceEntry == StandardEntryType.MvProceedings)
+                        && (targetEntry == StandardEntryType.Proceedings))
+                || ((sourceEntry == StandardEntryType.MvProceedings)
+                        && (targetEntry == StandardEntryType.InProceedings))
+                || ((sourceEntry == StandardEntryType.MvReference)
+                        && (targetEntry == StandardEntryType.Reference))
+                || ((sourceEntry == StandardEntryType.MvReference)
+                        && (targetEntry == StandardEntryType.InReference))) {
             if (targetField == StandardField.MAINTITLE) {
                 return Optional.of(StandardField.TITLE);
             }
@@ -235,9 +253,9 @@ private Optional<Field> getSourceField(Field targetField, EntryType targetEntry,
             }
 
             // those fields are no more available for the same-name inheritance strategy
-            if ((targetField == StandardField.TITLE) ||
-                    (targetField == StandardField.SUBTITLE) ||
-                    (targetField == StandardField.TITLEADDON)) {
+            if ((targetField == StandardField.TITLE)
+                    || (targetField == StandardField.SUBTITLE)
+                    || (targetField == StandardField.TITLEADDON)) {
                 return Optional.empty();
             }
 
@@ -247,13 +265,19 @@ private Optional<Field> getSourceField(Field targetField, EntryType targetEntry,
             }
         }
 
-        if (((sourceEntry == StandardEntryType.Book) && (targetEntry == StandardEntryType.InBook)) ||
-                ((sourceEntry == StandardEntryType.Book) && (targetEntry == StandardEntryType.BookInBook)) ||
-                ((sourceEntry == StandardEntryType.Book) && (targetEntry == StandardEntryType.SuppBook)) ||
-                ((sourceEntry == StandardEntryType.Collection) && (targetEntry == StandardEntryType.InCollection)) ||
-                ((sourceEntry == StandardEntryType.Collection) && (targetEntry == StandardEntryType.SuppCollection)) ||
-                ((sourceEntry == StandardEntryType.Reference) && (targetEntry == StandardEntryType.InReference)) ||
-                ((sourceEntry == StandardEntryType.Proceedings) && (targetEntry == StandardEntryType.InProceedings))) {
+        if (((sourceEntry == StandardEntryType.Book) && (targetEntry == StandardEntryType.InBook))
+                || ((sourceEntry == StandardEntryType.Book)
+                        && (targetEntry == StandardEntryType.BookInBook))
+                || ((sourceEntry == StandardEntryType.Book)
+                        && (targetEntry == StandardEntryType.SuppBook))
+                || ((sourceEntry == StandardEntryType.Collection)
+                        && (targetEntry == StandardEntryType.InCollection))
+                || ((sourceEntry == StandardEntryType.Collection)
+                        && (targetEntry == StandardEntryType.SuppCollection))
+                || ((sourceEntry == StandardEntryType.Reference)
+                        && (targetEntry == StandardEntryType.InReference))
+                || ((sourceEntry == StandardEntryType.Proceedings)
+                        && (targetEntry == StandardEntryType.InProceedings))) {
             if (targetField == StandardField.BOOKTITLE) {
                 return Optional.of(StandardField.TITLE);
             }
@@ -265,9 +289,9 @@ private Optional<Field> getSourceField(Field targetField, EntryType targetEntry,
             }
 
             // those fields are no more available for the same-name inheritance strategy
-            if ((targetField == StandardField.TITLE) ||
-                    (targetField == StandardField.SUBTITLE) ||
-                    (targetField == StandardField.TITLEADDON)) {
+            if ((targetField == StandardField.TITLE)
+                    || (targetField == StandardField.SUBTITLE)
+                    || (targetField == StandardField.TITLEADDON)) {
                 return Optional.empty();
             }
 
@@ -277,8 +301,10 @@ private Optional<Field> getSourceField(Field targetField, EntryType targetEntry,
             }
         }
 
-        if (((sourceEntry == IEEETranEntryType.Periodical) && (targetEntry == StandardEntryType.Article)) ||
-                ((sourceEntry == IEEETranEntryType.Periodical) && (targetEntry == StandardEntryType.SuppPeriodical))) {
+        if (((sourceEntry == IEEETranEntryType.Periodical)
+                        && (targetEntry == StandardEntryType.Article))
+                || ((sourceEntry == IEEETranEntryType.Periodical)
+                        && (targetEntry == StandardEntryType.SuppPeriodical))) {
             if (targetField == StandardField.JOURNALTITLE) {
                 return Optional.of(StandardField.TITLE);
             }
@@ -287,8 +313,7 @@ private Optional<Field> getSourceField(Field targetField, EntryType targetEntry,
             }
 
             // those fields are no more available for the same-name inheritance strategy
-            if ((targetField == StandardField.TITLE) ||
-                    (targetField == StandardField.SUBTITLE)) {
+            if ((targetField == StandardField.TITLE) || (targetField == StandardField.SUBTITLE)) {
                 return Optional.empty();
             }
 
@@ -324,7 +349,10 @@ public Optional<String> getResolvedFieldOrAliasLatexFree(Field field, BibDatabas
         return genericGetResolvedFieldOrAlias(field, database, BibEntry::getFieldOrAliasLatexFree);
     }
 
-    private Optional<String> genericGetResolvedFieldOrAlias(Field field, BibDatabase database, BiFunction<BibEntry, Field, Optional<String>> getFieldOrAlias) {
+    private Optional<String> genericGetResolvedFieldOrAlias(
+            Field field,
+            BibDatabase database,
+            BiFunction<BibEntry, Field, Optional<String>> getFieldOrAlias) {
         if ((InternalField.TYPE_HEADER == field) || (InternalField.OBSOLETE_TYPE_HEADER == field)) {
             return Optional.of(type.get().getDisplayName());
         }
@@ -349,9 +377,9 @@ private Optional<String> genericGetResolvedFieldOrAlias(Field field, BibDatabase
             }
         }
 
-        return (database == null) || result.isEmpty() ?
-                result :
-                Optional.of(database.resolveForStrings(result.get()));
+        return (database == null) || result.isEmpty()
+                ? result
+                : Optional.of(database.resolveForStrings(result.get()));
     }
 
     /**
@@ -446,7 +474,9 @@ public Optional<FieldChange> setType(EntryType newType, EntriesEventSource event
         changed = true;
         this.type.setValue(newType);
 
-        FieldChange change = new FieldChange(this, InternalField.TYPE_HEADER, oldType.getName(), newType.getName());
+        FieldChange change =
+                new FieldChange(
+                        this, InternalField.TYPE_HEADER, oldType.getName(), newType.getName());
         eventBus.post(new FieldChangedEvent(change, eventSource));
         return Optional.of(change);
     }
@@ -462,7 +492,9 @@ public SequencedSet<Field> getFields() {
      * Returns an unmodifiable sequence containing the names of all fields that are a) set for this particular entry and b) matching the given predicate
      */
     public SequencedSet<Field> getFields(Predicate<Field> selector) {
-        return getFields().stream().filter(selector).collect(Collectors.toCollection(LinkedHashSet::new));
+        return getFields().stream()
+                .filter(selector)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     /**
@@ -508,7 +540,8 @@ public boolean hasField(Field field) {
      * @param getFieldValue the method to get the value of a given field in a given entry
      * @return determined field value
      */
-    private Optional<String> genericGetFieldOrAlias(Field field, BiFunction<BibEntry, Field, Optional<String>> getFieldValue) {
+    private Optional<String> genericGetFieldOrAlias(
+            Field field, BiFunction<BibEntry, Field, Optional<String>> getFieldValue) {
         Optional<String> fieldValue = getFieldValue.apply(this, field);
 
         if (fieldValue.isPresent() && !fieldValue.get().isEmpty()) {
@@ -524,15 +557,18 @@ private Optional<String> genericGetFieldOrAlias(Field field, BiFunction<BibEntry
 
         // Finally, handle dates
         if (StandardField.DATE == field) {
-            Optional<Date> date = Date.parse(
-                    getFieldValue.apply(this, StandardField.YEAR),
-                    getFieldValue.apply(this, StandardField.MONTH),
-                    getFieldValue.apply(this, StandardField.DAY));
+            Optional<Date> date =
+                    Date.parse(
+                            getFieldValue.apply(this, StandardField.YEAR),
+                            getFieldValue.apply(this, StandardField.MONTH),
+                            getFieldValue.apply(this, StandardField.DAY));
 
             return date.map(Date::getNormalized);
         }
 
-        if ((StandardField.YEAR == field) || (StandardField.MONTH == field) || (StandardField.DAY == field)) {
+        if ((StandardField.YEAR == field)
+                || (StandardField.MONTH == field)
+                || (StandardField.DAY == field)) {
             Optional<String> date = getFieldValue.apply(this, StandardField.DATE);
             if (date.isEmpty()) {
                 return Optional.empty();
@@ -615,9 +651,11 @@ public void setField(Map<Field, String> fields) {
      * @param value       The value to set
      * @param eventSource Source the event is sent from
      */
-    public Optional<FieldChange> setField(Field field, String value, EntriesEventSource eventSource) {
+    public Optional<FieldChange> setField(
+            Field field, String value, EntriesEventSource eventSource) {
         Objects.requireNonNull(field, "field name must not be null");
-        Objects.requireNonNull(value, "field value for field " + field.getName() + " must not be null");
+        Objects.requireNonNull(
+                value, "field value for field " + field.getName() + " must not be null");
         Objects.requireNonNull(eventSource, "field eventSource must not be null");
 
         if (value.isEmpty()) {
@@ -697,7 +735,8 @@ public Optional<FieldChange> clearField(Field field, EntriesEventSource eventSou
      * @return true if all fields are set or could be resolved, false otherwise.
      */
     public boolean allFieldsPresent(Collection<OrFields> fields, BibDatabase database) {
-        return fields.stream().allMatch(field -> this.getResolvedFieldOrAlias(field, database).isPresent());
+        return fields.stream()
+                .allMatch(field -> this.getResolvedFieldOrAlias(field, database).isPresent());
     }
 
     /**
@@ -745,8 +784,12 @@ public String getAuthorTitleYear() {
      * Author1, Author2: Title (Year)
      */
     public String getAuthorTitleYear(int maxCharacters) {
-        String[] s = new String[]{getField(StandardField.AUTHOR).orElse("N/A"), getField(StandardField.TITLE).orElse("N/A"),
-                getField(StandardField.YEAR).orElse("N/A")};
+        String[] s =
+                new String[] {
+                    getField(StandardField.AUTHOR).orElse("N/A"),
+                    getField(StandardField.TITLE).orElse("N/A"),
+                    getField(StandardField.YEAR).orElse("N/A")
+                };
 
         String text = s[0] + ": \"" + s[1] + "\" (" + s[2] + ')';
         if ((maxCharacters <= 0) || (text.length() <= maxCharacters)) {
@@ -871,16 +914,22 @@ public KeywordList getKeywords(Character delimiter) {
     }
 
     public KeywordList getResolvedKeywords(Character delimiter, BibDatabase database) {
-        Optional<String> keywordsContent = getResolvedFieldOrAlias(StandardField.KEYWORDS, database);
-        return keywordsContent.map(content -> KeywordList.parse(content, delimiter)).orElse(new KeywordList());
+        Optional<String> keywordsContent =
+                getResolvedFieldOrAlias(StandardField.KEYWORDS, database);
+        return keywordsContent
+                .map(content -> KeywordList.parse(content, delimiter))
+                .orElse(new KeywordList());
     }
 
-    public Optional<FieldChange> removeKeywords(KeywordList keywordsToRemove, Character keywordDelimiter) {
+    public Optional<FieldChange> removeKeywords(
+            KeywordList keywordsToRemove, Character keywordDelimiter) {
         KeywordList keywordList = getKeywords(keywordDelimiter);
 
         // We need to fix "file has changed on disk" for duplicate keywords
-        // The input of the set may contain duplicate keywords (which are present as single keyword in the set)
-        // Even if no "keywordsToRemove" is contained, the method "putKeywords" will return a change, because the duplicate keywords will have been removed
+        // The input of the set may contain duplicate keywords (which are present as single keyword
+        // in the set)
+        // Even if no "keywordsToRemove" is contained, the method "putKeywords" will return a
+        // change, because the duplicate keywords will have been removed
         int oldSize = keywordList.size();
         keywordList.removeAll(keywordsToRemove);
         // claim 1: The size of a set is the same, if no element is removed
@@ -893,9 +942,8 @@ public Optional<FieldChange> removeKeywords(KeywordList keywordsToRemove, Charac
         }
     }
 
-    public Optional<FieldChange> replaceKeywords(KeywordList keywordsToReplace,
-                                                 Keyword newValue,
-                                                 Character keywordDelimiter) {
+    public Optional<FieldChange> replaceKeywords(
+            KeywordList keywordsToReplace, Keyword newValue, Character keywordDelimiter) {
         KeywordList keywordList = getKeywords(keywordDelimiter);
         keywordList.replaceAll(keywordsToReplace, newValue);
 
@@ -1009,8 +1057,9 @@ public BibEntry withUserComments(String commentsBeforeEntry) {
     }
 
     public List<ParsedEntryLink> getEntryLinkList(Field field, BibDatabase database) {
-        return getField(field).map(fieldValue -> EntryLinkList.parse(fieldValue, database))
-                              .orElse(Collections.emptyList());
+        return getField(field)
+                .map(fieldValue -> EntryLinkList.parse(fieldValue, database))
+                .orElse(Collections.emptyList());
     }
 
     public Optional<FieldChange> setEntryLinkList(Field field, List<ParsedEntryLink> list) {
@@ -1035,15 +1084,17 @@ public Set<String> getFieldAsWords(Field field) {
 
     public KeywordList getFieldAsKeywords(Field field, Character keywordSeparator) {
         if (field instanceof StandardField standardField) {
-            Optional<KeywordList> storedList = fieldsAsKeywords.get(standardField, keywordSeparator);
+            Optional<KeywordList> storedList =
+                    fieldsAsKeywords.get(standardField, keywordSeparator);
             if (storedList.isPresent()) {
                 return storedList.get();
             }
         }
 
-        KeywordList keywords = getField(field)
-                .map(content -> KeywordList.parse(content, keywordSeparator))
-                .orElse(new KeywordList());
+        KeywordList keywords =
+                getField(field)
+                        .map(content -> KeywordList.parse(content, keywordSeparator))
+                        .orElse(new KeywordList());
 
         if (field instanceof StandardField standardField) {
             fieldsAsKeywords.put(standardField, keywordSeparator, keywords);
@@ -1157,7 +1208,8 @@ public void replaceDownloadedFile(String linkToDownloadedFile, LinkedFile downlo
         int i = 0;
         while ((i < linkedFiles.size()) && (oldFileIndex == -1)) {
             LinkedFile file = linkedFiles.get(i);
-            // The file type changes as part of download process (see prepareDownloadTask), thus we only compare by link
+            // The file type changes as part of download process (see prepareDownloadTask), thus we
+            // only compare by link
             if (file.getLink().equalsIgnoreCase(linkToDownloadedFile)) {
                 oldFileIndex = i;
             }
@@ -1196,15 +1248,19 @@ public void mergeWith(BibEntry other, Set<Field> otherPrioritizedFields) {
         thisFields.addAll(this.getFields());
         otherFields.addAll(other.getFields());
 
-        // At the moment, "Field" interface does not provide explicit equality, so using their names instead.
-        Set<String> thisFieldsNames = thisFields.stream().map(Field::getName).collect(Collectors.toSet());
-        Set<String> otherPrioritizedFieldsNames = otherPrioritizedFields.stream().map(Field::getName).collect(Collectors.toSet());
+        // At the moment, "Field" interface does not provide explicit equality, so using their names
+        // instead.
+        Set<String> thisFieldsNames =
+                thisFields.stream().map(Field::getName).collect(Collectors.toSet());
+        Set<String> otherPrioritizedFieldsNames =
+                otherPrioritizedFields.stream().map(Field::getName).collect(Collectors.toSet());
 
         for (Field otherField : otherFields) {
             Optional<String> otherFieldValue = other.getField(otherField);
-            if (!thisFieldsNames.contains(otherField.getName()) ||
-                    otherPrioritizedFieldsNames.contains(otherField.getName())) {
-                // As iterator only goes through non-null fields from OTHER, otherFieldValue can never be empty
+            if (!thisFieldsNames.contains(otherField.getName())
+                    || otherPrioritizedFieldsNames.contains(otherField.getName())) {
+                // As iterator only goes through non-null fields from OTHER, otherFieldValue can
+                // never be empty
                 otherFieldValue.ifPresent(s -> this.setField(otherField, s));
             }
         }
diff --git a/src/main/java/org/jabref/model/entry/BibEntryType.java b/src/main/java/org/jabref/model/entry/BibEntryType.java
index 6751c68153ad..fe62ff635992 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryType.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryType.java
@@ -1,14 +1,5 @@
 package org.jabref.model.entry;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Objects;
-import java.util.SequencedSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import org.jabref.gui.importer.BibEntryTypePrefsAndFileViewModel;
 import org.jabref.logic.exporter.MetaDataSerializer;
 import org.jabref.model.database.BibDatabaseMode;
@@ -19,6 +10,15 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryType;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Objects;
+import java.util.SequencedSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 public class BibEntryType implements Comparable<BibEntryType> {
 
     private final EntryType type;
@@ -34,7 +34,8 @@ public class BibEntryType implements Comparable<BibEntryType> {
      * @param allFields         A BibFields list of all fields, including the required fields
      * @param requiredFields    A OrFields list of just the required fields
      */
-    public BibEntryType(EntryType type, Collection<BibField> allFields, Collection<OrFields> requiredFields) {
+    public BibEntryType(
+            EntryType type, Collection<BibField> allFields, Collection<OrFields> requiredFields) {
         this.type = Objects.requireNonNull(type);
         this.allFields = new LinkedHashSet<>(allFields);
         this.requiredFields = new LinkedHashSet<>(requiredFields);
@@ -46,13 +47,12 @@ public EntryType getType() {
 
     public SequencedSet<BibField> getOptionalFields() {
         return getAllBibFields().stream()
-                             .filter(field -> !isRequired(field.field()))
-                             .collect(Collectors.toCollection(LinkedHashSet::new));
+                .filter(field -> !isRequired(field.field()))
+                .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     public boolean isRequired(Field field) {
-        return getRequiredFields().stream()
-                                  .anyMatch(fields -> fields.contains(field));
+        return getRequiredFields().stream().anyMatch(fields -> fields.contains(field));
     }
 
     /**
@@ -74,42 +74,48 @@ public SequencedSet<BibField> getAllBibFields() {
     }
 
     public Set<Field> getAllFields() {
-        return allFields.stream().map(BibField::field).collect(Collectors.toCollection(LinkedHashSet::new));
+        return allFields.stream()
+                .map(BibField::field)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     public SequencedSet<Field> getImportantOptionalFields() {
         return getOptionalFields().stream()
-                                  .filter(field -> field.priority() == FieldPriority.IMPORTANT)
-                                  .map(BibField::field)
-                                  .collect(Collectors.toCollection(LinkedHashSet::new));
+                .filter(field -> field.priority() == FieldPriority.IMPORTANT)
+                .map(BibField::field)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     public SequencedSet<Field> getDetailOptionalFields() {
         return getOptionalFields().stream()
-                                  .filter(field -> field.priority() == FieldPriority.DETAIL)
-                                  .map(BibField::field)
-                                  .collect(Collectors.toCollection(LinkedHashSet::new));
+                .filter(field -> field.priority() == FieldPriority.DETAIL)
+                .map(BibField::field)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     public Set<Field> getDeprecatedFields(BibDatabaseMode mode) {
         if (mode == BibDatabaseMode.BIBTEX) {
             return Set.of();
         }
-        Set<Field> deprecatedFields = new HashSet<>(EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.keySet());
+        Set<Field> deprecatedFields =
+                new HashSet<>(EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.keySet());
 
-        // Only the optional fields which are mapped to another BibLaTeX name should be shown as "deprecated"
+        // Only the optional fields which are mapped to another BibLaTeX name should be shown as
+        // "deprecated"
         deprecatedFields.retainAll(getOptionalFieldsAndAliases());
 
         // BibLaTeX aims for that field "date" is used
         // Thus, year + month is deprecated
-        // However, year is used in the wild very often, so we do not mark that as default as deprecated
+        // However, year is used in the wild very often, so we do not mark that as default as
+        // deprecated
         deprecatedFields.add(StandardField.MONTH);
 
         return deprecatedFields;
     }
 
     public SequencedSet<Field> getDetailOptionalNotDeprecatedFields(BibDatabaseMode mode) {
-        SequencedSet<Field> optionalFieldsNotPrimaryOrDeprecated = new LinkedHashSet<>(getDetailOptionalFields());
+        SequencedSet<Field> optionalFieldsNotPrimaryOrDeprecated =
+                new LinkedHashSet<>(getDetailOptionalFields());
         optionalFieldsNotPrimaryOrDeprecated.removeAll(getDeprecatedFields(mode));
         return optionalFieldsNotPrimaryOrDeprecated;
     }
@@ -118,7 +124,8 @@ public SequencedSet<Field> getDetailOptionalNotDeprecatedFields(BibDatabaseMode
      * Get list of all optional fields of this entry and all fields being source for a BibTeX to BibLaTeX conversion.
      */
     private SequencedSet<Field> getOptionalFieldsAndAliases() {
-        SequencedSet<Field> optionalFieldsAndAliases = new LinkedHashSet<>(getOptionalFields().size());
+        SequencedSet<Field> optionalFieldsAndAliases =
+                new LinkedHashSet<>(getOptionalFields().size());
         for (BibField field : getOptionalFields()) {
             optionalFieldsAndAliases.add(field.field());
             if (EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.containsKey(field.field())) {
@@ -137,9 +144,9 @@ public boolean equals(Object o) {
             return false;
         }
         BibEntryType that = (BibEntryType) o;
-        return type.equals(that.type) &&
-               Objects.equals(requiredFields, that.requiredFields) &&
-               Objects.equals(allFields, that.allFields);
+        return type.equals(that.type)
+                && Objects.equals(requiredFields, that.requiredFields)
+                && Objects.equals(allFields, that.allFields);
     }
 
     @Override
@@ -157,11 +164,14 @@ public int hashCode() {
      */
     @Override
     public String toString() {
-        return "BibEntryType{" +
-                "type=" + type +
-                ", allFields=" + allFields +
-                ", requiredFields=" + requiredFields +
-                '}';
+        return "BibEntryType{"
+                + "type="
+                + type
+                + ", allFields="
+                + allFields
+                + ", requiredFields="
+                + requiredFields
+                + '}';
     }
 
     /**
diff --git a/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java b/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java
index d873748938bf..66a69ee654ac 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java
@@ -1,5 +1,16 @@
 package org.jabref.model.entry;
 
+import com.google.common.collect.Streams;
+
+import org.jabref.model.entry.field.BibField;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldPriority;
+import org.jabref.model.entry.field.OrFields;
+import org.jabref.model.entry.types.EntryType;
+import org.jabref.model.entry.types.StandardEntryType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -11,17 +22,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.jabref.model.entry.field.BibField;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.FieldPriority;
-import org.jabref.model.entry.field.OrFields;
-import org.jabref.model.entry.types.EntryType;
-import org.jabref.model.entry.types.StandardEntryType;
-
-import com.google.common.collect.Streams;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class BibEntryTypeBuilder {
     private static final Logger LOGGER = LoggerFactory.getLogger(BibEntryTypeBuilder.class);
     private final SequencedSet<OrFields> requiredFields = new LinkedHashSet<>();
@@ -38,28 +38,39 @@ public BibEntryTypeBuilder withType(EntryType type) {
     public BibEntryTypeBuilder withImportantFields(SequencedSet<Field> newFields) {
         List<Field> containedFields = containedInSeenFields(newFields);
         if (!containedFields.isEmpty()) {
-            LOGGER.warn("Fields {} already added to type {}.", containedFields, type.getDisplayName());
+            LOGGER.warn(
+                    "Fields {} already added to type {}.", containedFields, type.getDisplayName());
             hasWarnings = true;
         }
         this.seenFields.addAll(newFields);
-        this.optionalFields = Streams.concat(optionalFields.stream(), newFields.stream().map(field -> new BibField(field, FieldPriority.IMPORTANT)))
-                                     .collect(Collectors.toCollection(LinkedHashSet::new));
+        this.optionalFields =
+                Streams.concat(
+                                optionalFields.stream(),
+                                newFields.stream()
+                                        .map(field -> new BibField(field, FieldPriority.IMPORTANT)))
+                        .collect(Collectors.toCollection(LinkedHashSet::new));
         return this;
     }
 
     public BibEntryTypeBuilder withImportantFields(Field... newFields) {
-        return withImportantFields(Arrays.stream(newFields).collect(Collectors.toCollection(LinkedHashSet::new)));
+        return withImportantFields(
+                Arrays.stream(newFields).collect(Collectors.toCollection(LinkedHashSet::new)));
     }
 
     public BibEntryTypeBuilder withDetailFields(SequencedCollection<Field> newFields) {
         List<Field> containedFields = containedInSeenFields(newFields);
         if (!containedFields.isEmpty()) {
-            LOGGER.warn("Fields {} already added to type {}.", containedFields, type.getDisplayName());
+            LOGGER.warn(
+                    "Fields {} already added to type {}.", containedFields, type.getDisplayName());
             hasWarnings = true;
         }
         this.seenFields.addAll(newFields);
-        this.optionalFields = Streams.concat(optionalFields.stream(), newFields.stream().map(field -> new BibField(field, FieldPriority.DETAIL)))
-                                     .collect(Collectors.toCollection(LinkedHashSet::new));
+        this.optionalFields =
+                Streams.concat(
+                                optionalFields.stream(),
+                                newFields.stream()
+                                        .map(field -> new BibField(field, FieldPriority.DETAIL)))
+                        .collect(Collectors.toCollection(LinkedHashSet::new));
         return this;
     }
 
@@ -72,10 +83,15 @@ public BibEntryTypeBuilder withRequiredFields(SequencedSet<OrFields> requiredFie
     }
 
     public BibEntryTypeBuilder addRequiredFields(SequencedSet<OrFields> requiredFields) {
-        Set<Field> fieldsToAdd = requiredFields.stream().map(OrFields::getFields).flatMap(Set::stream).collect(Collectors.toSet());
+        Set<Field> fieldsToAdd =
+                requiredFields.stream()
+                        .map(OrFields::getFields)
+                        .flatMap(Set::stream)
+                        .collect(Collectors.toSet());
         List<Field> containedFields = containedInSeenFields(fieldsToAdd);
         if (!containedFields.isEmpty()) {
-            LOGGER.warn("Fields {} already added to type {}.", containedFields, type.getDisplayName());
+            LOGGER.warn(
+                    "Fields {} already added to type {}.", containedFields, type.getDisplayName());
             hasWarnings = true;
         }
         this.seenFields.addAll(fieldsToAdd);
@@ -88,7 +104,10 @@ public BibEntryTypeBuilder addRequiredFields(OrFields... requiredFields) {
     }
 
     public BibEntryTypeBuilder addRequiredFields(Field... requiredFields) {
-        return addRequiredFields(Arrays.stream(requiredFields).map(OrFields::new).collect(Collectors.toCollection(LinkedHashSet::new)));
+        return addRequiredFields(
+                Arrays.stream(requiredFields)
+                        .map(OrFields::new)
+                        .collect(Collectors.toCollection(LinkedHashSet::new)));
     }
 
     public BibEntryTypeBuilder withRequiredFields(Field... requiredFields) {
@@ -96,20 +115,28 @@ public BibEntryTypeBuilder withRequiredFields(Field... requiredFields) {
     }
 
     public BibEntryTypeBuilder withRequiredFields(OrFields first, Field... requiredFields) {
-        return addRequiredFields(Stream.concat(Stream.of(first), Arrays.stream(requiredFields).map(OrFields::new)).collect(Collectors.toCollection(LinkedHashSet::new)));
+        return addRequiredFields(
+                Stream.concat(Stream.of(first), Arrays.stream(requiredFields).map(OrFields::new))
+                        .collect(Collectors.toCollection(LinkedHashSet::new)));
     }
 
-    public BibEntryTypeBuilder withRequiredFields(SequencedSet<OrFields> first, Field... requiredFields) {
-        return addRequiredFields(Stream.concat(first.stream(), Arrays.stream(requiredFields).map(OrFields::new)).collect(Collectors.toCollection(LinkedHashSet::new)));
+    public BibEntryTypeBuilder withRequiredFields(
+            SequencedSet<OrFields> first, Field... requiredFields) {
+        return addRequiredFields(
+                Stream.concat(first.stream(), Arrays.stream(requiredFields).map(OrFields::new))
+                        .collect(Collectors.toCollection(LinkedHashSet::new)));
     }
 
     public BibEntryType build() {
         // Treat required fields as important ones
-        Stream<BibField> requiredAsImportant = requiredFields.stream()
-                .map(OrFields::getFields)
-                .flatMap(Set::stream)
-                .map(field -> new BibField(field, FieldPriority.IMPORTANT));
-        SequencedSet<BibField> allFields = Stream.concat(optionalFields.stream(), requiredAsImportant).collect(Collectors.toCollection(LinkedHashSet::new));
+        Stream<BibField> requiredAsImportant =
+                requiredFields.stream()
+                        .map(OrFields::getFields)
+                        .flatMap(Set::stream)
+                        .map(field -> new BibField(field, FieldPriority.IMPORTANT));
+        SequencedSet<BibField> allFields =
+                Stream.concat(optionalFields.stream(), requiredAsImportant)
+                        .collect(Collectors.toCollection(LinkedHashSet::new));
         return new BibEntryType(type, allFields, requiredFields);
     }
 
diff --git a/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java b/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java
index 9209e35be874..2dd5c6590131 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java
@@ -1,15 +1,6 @@
 package org.jabref.model.entry;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import com.google.common.annotations.VisibleForTesting;
 
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.field.BibField;
@@ -22,25 +13,40 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.entry.types.IEEETranEntryTypeDefinitions;
-
-import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 public class BibEntryTypesManager {
     private static final Logger LOGGER = LoggerFactory.getLogger(BibEntryTypesManager.class);
 
-    private final InternalEntryTypes BIBTEX_ENTRYTYPES = new InternalEntryTypes(
-            Stream.concat(BibtexEntryTypeDefinitions.ALL.stream(), IEEETranEntryTypeDefinitions.ALL.stream())
-                  .collect(Collectors.toList()));
+    private final InternalEntryTypes BIBTEX_ENTRYTYPES =
+            new InternalEntryTypes(
+                    Stream.concat(
+                                    BibtexEntryTypeDefinitions.ALL.stream(),
+                                    IEEETranEntryTypeDefinitions.ALL.stream())
+                            .collect(Collectors.toList()));
 
-    private final InternalEntryTypes BIBLATEX_ENTRYTYPES = new InternalEntryTypes(
-            Stream.concat(BiblatexEntryTypeDefinitions.ALL.stream(),
-                          Stream.concat(BiblatexSoftwareEntryTypeDefinitions.ALL.stream(), BiblatexAPAEntryTypeDefinitions.ALL.stream()))
-                  .collect(Collectors.toList()));
+    private final InternalEntryTypes BIBLATEX_ENTRYTYPES =
+            new InternalEntryTypes(
+                    Stream.concat(
+                                    BiblatexEntryTypeDefinitions.ALL.stream(),
+                                    Stream.concat(
+                                            BiblatexSoftwareEntryTypeDefinitions.ALL.stream(),
+                                            BiblatexAPAEntryTypeDefinitions.ALL.stream()))
+                            .collect(Collectors.toList()));
 
-    public BibEntryTypesManager() {
-    }
+    public BibEntryTypesManager() {}
 
     @VisibleForTesting
     InternalEntryTypes getEntryTypes(BibDatabaseMode mode) {
@@ -101,7 +107,8 @@ public boolean isDifferentCustomOrModifiedType(BibEntryType type, BibDatabaseMod
     /**
      * Sets the given custom entry types for BibTeX and biblatex mode
      */
-    public void addCustomOrModifiedTypes(List<BibEntryType> customizedEntryTypes, BibDatabaseMode mode) {
+    public void addCustomOrModifiedTypes(
+            List<BibEntryType> customizedEntryTypes, BibDatabaseMode mode) {
         InternalEntryTypes entryTypes = getEntryTypes(mode);
         customizedEntryTypes.forEach(entryTypes::addCustomOrModifiedType);
     }
@@ -117,7 +124,8 @@ public void addCustomOrModifiedType(BibEntryType entryType, BibDatabaseMode mode
     public void update(BibEntryType entryType, BibDatabaseMode mode) {
         InternalEntryTypes entryTypes = getEntryTypes(mode);
         if (entryTypes.standardTypes.contains(entryType)) {
-            // The method to check containment does a deep equals. Thus, different fields lead to a non-containment property
+            // The method to check containment does a deep equals. Thus, different fields lead to a
+            // non-containment property
             entryTypes.removeCustomOrModifiedEntryType(entryType);
             return;
         }
@@ -126,9 +134,10 @@ public void update(BibEntryType entryType, BibDatabaseMode mode) {
         }
 
         // Workaround for UI not supporting OrFields
-        Optional<BibEntryType> standardTypeOpt = entryTypes.standardTypes.stream()
-                                                                      .filter(InternalEntryTypes.typeEquals(entryType.getType()))
-                                                                      .findFirst();
+        Optional<BibEntryType> standardTypeOpt =
+                entryTypes.standardTypes.stream()
+                        .filter(InternalEntryTypes.typeEquals(entryType.getType()))
+                        .findFirst();
         if (standardTypeOpt.isEmpty()) {
             LOGGER.debug("Standard type not found for {}", entryType.getType());
             entryTypes.addCustomOrModifiedType(entryType);
@@ -136,23 +145,27 @@ public void update(BibEntryType entryType, BibDatabaseMode mode) {
         }
 
         BibEntryType standardType = standardTypeOpt.get();
-        Set<Field> standardRequiredFields = standardType.getRequiredFields().stream()
-                                                        .map(OrFields::getFields)
-                                                        .flatMap(Set::stream)
-                                                        .collect(Collectors.toSet());
+        Set<Field> standardRequiredFields =
+                standardType.getRequiredFields().stream()
+                        .map(OrFields::getFields)
+                        .flatMap(Set::stream)
+                        .collect(Collectors.toSet());
         Set<BibField> standardOptionalFields = standardType.getOptionalFields();
 
-        Set<Field> entryTypeRequiredFields = entryType.getRequiredFields().stream()
-                                                                  .map(OrFields::getFields)
-                                                                  .flatMap(Set::stream)
-                                                      .collect(Collectors.toSet());
+        Set<Field> entryTypeRequiredFields =
+                entryType.getRequiredFields().stream()
+                        .map(OrFields::getFields)
+                        .flatMap(Set::stream)
+                        .collect(Collectors.toSet());
         Set<BibField> entryTypeOptionalFields = entryType.getOptionalFields();
 
-        if (standardRequiredFields.equals(entryTypeRequiredFields) && standardOptionalFields.equals(entryTypeOptionalFields)) {
+        if (standardRequiredFields.equals(entryTypeRequiredFields)
+                && standardOptionalFields.equals(entryTypeOptionalFields)) {
             entryTypes.removeCustomOrModifiedEntryType(entryType);
             return;
         }
-        LOGGER.debug("Different standard type fields for {} and standard {}", entryType, standardType);
+        LOGGER.debug(
+                "Different standard type fields for {} and standard {}", entryType, standardType);
         entryTypes.addCustomOrModifiedType(entryType);
     }
 
@@ -177,7 +190,8 @@ public boolean isCustomType(EntryType type, BibDatabaseMode mode) {
      * There might be also types not known to the entry types manager, which are neither standard nor customized.
      */
     public boolean isCustomType(BibEntryType type, BibDatabaseMode mode) {
-        return !getEntryTypes(mode).isStandardType(type) && getEntryTypes(mode).isCustomOrModifiedType(type);
+        return !getEntryTypes(mode).isStandardType(type)
+                && getEntryTypes(mode).isCustomOrModifiedType(type);
     }
 
     /**
@@ -194,10 +208,11 @@ public Optional<BibEntryType> enrich(EntryType type, BibDatabaseMode mode) {
      */
     @VisibleForTesting
     static class InternalEntryTypes {
-        @VisibleForTesting
-        final Set<BibEntryType> standardTypes;
+        @VisibleForTesting final Set<BibEntryType> standardTypes;
 
-        // TreeSet needs to be used here, because then, org.jabref.model.entry.BibEntryType.compareTo is used - instead of org.jabref.model.entry.BibEntryType.equals
+        // TreeSet needs to be used here, because then,
+        // org.jabref.model.entry.BibEntryType.compareTo is used - instead of
+        // org.jabref.model.entry.BibEntryType.equals
         private final SortedSet<BibEntryType> customOrModifiedType = new TreeSet<>();
 
         private InternalEntryTypes(List<BibEntryType> standardTypes) {
@@ -207,9 +222,16 @@ private InternalEntryTypes(List<BibEntryType> standardTypes) {
         private List<BibEntryType> getAllCustomTypes() {
             Collection<BibEntryType> customizedTypes = getAllTypes();
             return customizedTypes.stream()
-                                  .filter(bibEntryType -> standardTypes.stream()
-                                                                       .noneMatch(item -> item.getType().equals(bibEntryType.getType())))
-                                  .toList();
+                    .filter(
+                            bibEntryType ->
+                                    standardTypes.stream()
+                                            .noneMatch(
+                                                    item ->
+                                                            item.getType()
+                                                                    .equals(
+                                                                            bibEntryType
+                                                                                    .getType())))
+                    .toList();
         }
 
         /**
@@ -217,16 +239,13 @@ private List<BibEntryType> getAllCustomTypes() {
          * or an empty optional if it does not exist.
          */
         private Optional<BibEntryType> enrich(EntryType type) {
-            Optional<BibEntryType> enrichedType = customOrModifiedType.stream()
-                                                                      .filter(typeEquals(type))
-                                                                      .findFirst();
+            Optional<BibEntryType> enrichedType =
+                    customOrModifiedType.stream().filter(typeEquals(type)).findFirst();
             if (enrichedType.isPresent()) {
                 LOGGER.debug("Using customized entry type for {}", type.getName());
                 return enrichedType;
             } else {
-                return standardTypes.stream()
-                                    .filter(typeEquals(type))
-                                    .findFirst();
+                return standardTypes.stream().filter(typeEquals(type)).findFirst();
             }
         }
 
@@ -274,12 +293,15 @@ private boolean isCustomOrModifiedType(BibEntryType entryType) {
                 return true;
             }
             // In case of a standard type, we need to check if the fields are different.
-            // The TreeSet uses compareTo and not equals, thus we need to get the stored type to do a deep comparison
+            // The TreeSet uses compareTo and not equals, thus we need to get the stored type to do
+            // a deep comparison
             return !EntryTypeFactory.nameAndFieldsAreEqual(standardType.get(), entryType);
         }
 
         private Optional<BibEntryType> getStandardType(BibEntryType entryType) {
-            return standardTypes.stream().filter(item -> item.getType().equals(entryType.getType())).findAny();
+            return standardTypes.stream()
+                    .filter(item -> item.getType().equals(entryType.getType()))
+                    .findAny();
         }
 
         private boolean isStandardType(BibEntryType entryType) {
diff --git a/src/main/java/org/jabref/model/entry/BibtexString.java b/src/main/java/org/jabref/model/entry/BibtexString.java
index e467e212db62..ca46b6f4a9dc 100644
--- a/src/main/java/org/jabref/model/entry/BibtexString.java
+++ b/src/main/java/org/jabref/model/entry/BibtexString.java
@@ -60,7 +60,9 @@ public static Type get(String key) {
             // Second character is not upper case
             // aStallman -> AUTHOR
             // asdf -> OTHER
-            if (!(String.valueOf(key.charAt(1))).toUpperCase(Locale.ROOT).equals(String.valueOf(key.charAt(1)))) {
+            if (!(String.valueOf(key.charAt(1)))
+                    .toUpperCase(Locale.ROOT)
+                    .equals(String.valueOf(key.charAt(1)))) {
                 return OTHER;
             }
             for (Type t : Type.values()) {
@@ -170,7 +172,7 @@ public String getUserComments() {
     public Object clone() {
         BibtexString clone;
         if (parsedSerialization == null) {
-             clone = new BibtexString(name, content);
+            clone = new BibtexString(name, content);
         } else {
             clone = new BibtexString(name, content, parsedSerialization);
         }
@@ -192,11 +194,11 @@ public boolean equals(Object o) {
             return false;
         }
         BibtexString that = (BibtexString) o;
-        return Objects.equals(hasChanged, that.hasChanged) &&
-                Objects.equals(name, that.name) &&
-                Objects.equals(content, that.content) &&
-                Objects.equals(type, that.type) &&
-                Objects.equals(parsedSerialization, that.parsedSerialization);
+        return Objects.equals(hasChanged, that.hasChanged)
+                && Objects.equals(name, that.name)
+                && Objects.equals(content, that.content)
+                && Objects.equals(type, that.type)
+                && Objects.equals(parsedSerialization, that.parsedSerialization);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java b/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java
index 1a15918ac9a2..11c2c6c9797f 100644
--- a/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java
+++ b/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java
@@ -1,5 +1,8 @@
 package org.jabref.model.entry;
 
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.InternalField;
+
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -8,13 +11,9 @@
 import java.util.StringJoiner;
 import java.util.TreeSet;
 
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.InternalField;
-
 public class CanonicalBibEntry {
 
-    private CanonicalBibEntry() {
-    }
+    private CanonicalBibEntry() {}
 
     /**
      * This returns a canonical BibTeX serialization.
@@ -38,7 +37,8 @@ public static String getCanonicalRepresentation(BibEntry entry) {
         String citeKey = entry.getCitationKey().orElse("");
         sb.append("@%s{%s,".formatted(entry.getType().getName(), citeKey)).append('\n');
 
-        // we have to introduce a new Map as fields are stored case-sensitive in JabRef (see https://github.com/koppor/jabref/issues/45).
+        // we have to introduce a new Map as fields are stored case-sensitive in JabRef (see
+        // https://github.com/koppor/jabref/issues/45).
         Map<String, String> mapFieldToValue = new HashMap<>();
 
         // determine sorted fields -- all fields lower case
@@ -61,7 +61,11 @@ public static String getCanonicalRepresentation(BibEntry entry) {
             sj.add(line);
         }
 
-        sj.add("  _jabref_shared = {sharedId: %d, version: %d}".formatted(entry.getSharedBibEntryData().getSharedID(), entry.getSharedBibEntryData().getVersion()));
+        sj.add(
+                "  _jabref_shared = {sharedId: %d, version: %d}"
+                        .formatted(
+                                entry.getSharedBibEntryData().getSharedID(),
+                                entry.getSharedBibEntryData().getVersion()));
 
         sb.append(sj);
 
diff --git a/src/main/java/org/jabref/model/entry/Date.java b/src/main/java/org/jabref/model/entry/Date.java
index 3509b8cc304e..726afeb6e898 100644
--- a/src/main/java/org/jabref/model/entry/Date.java
+++ b/src/main/java/org/jabref/model/entry/Date.java
@@ -1,5 +1,8 @@
 package org.jabref.model.entry;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.time.LocalDate;
 import java.time.Year;
 import java.time.YearMonth;
@@ -14,59 +17,61 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class Date {
 
     public static final String DATE_REGEX;
-    private static final DateTimeFormatter NORMALIZED_DATE_FORMATTER = DateTimeFormatter.ofPattern("uuuu[-MM][-dd]");
+    private static final DateTimeFormatter NORMALIZED_DATE_FORMATTER =
+            DateTimeFormatter.ofPattern("uuuu[-MM][-dd]");
     private static final DateTimeFormatter SIMPLE_DATE_FORMATS;
     private static final Logger LOGGER = LoggerFactory.getLogger(Date.class);
 
     static {
-        List<String> formatStrings = Arrays.asList(
-                "uuuu-MM-dd'T'HH:mm[:ss][xxx][xx][X]",  // covers 2018-10-03T07:24:14+03:00
-                "uuuu-MM-dd'T'HH:m[:ss][xxx][xx][X]",   // covers 2018-10-03T17:2
-                "uuuu-MM-dd'T'H:mm[:ss][xxx][xx][X]",   // covers 2018-10-03T7:24
-                "uuuu-MM-dd'T'H:m[:ss][xxx][xx][X]",    // covers 2018-10-03T7:7
-                "uuuu-MM-dd'T'HH[:ss][xxx][xx][X]",     // covers 2018-10-03T07
-                "uuuu-MM-dd'T'H[:ss][xxx][xx][X]",      // covers 2018-10-03T7
-                "uuuu-M-d",                             // covers 2009-1-15
-                "uuuu-M",                               // covers 2009-11
-                "uuuu/M",                               // covers 2020/10
-                "d-M-uuuu",                             // covers 15-1-2012
-                "M-uuuu",                               // covers 1-2012
-                "M/uuuu",                               // covers 9/2015 and 09/2015
-                "M/uu",                                 // covers 9/15
-                "MMMM d, uuuu",                         // covers September 1, 2015
-                "MMMM, uuuu",                           // covers September, 2015
-                "MMMM  uuuu",                           // covers September 2015
-                "d.M.uuuu",                             // covers 15.1.2015
-                "uuuu.M.d",                             // covers 2015.1.15
-                "uuuu",                                 // covers 2015
-                "MMM, uuuu",                            // covers Jan, 2020
-                "MMM. uuuu",                            // covers Oct. 2020
-                "MMM uuuu",                             // covers Jan 2020
-                "uuuu.MM.d",                            // covers 2015.10.15
-                "d MMMM u/d MMMM u",                    // covers 20 January 2015/20 February 2015
-                "d MMMM u",                             // covers 20 January 2015
-                "d MMMM u / d MMMM u",
-                "u'-'",                                 // covers 2015-
-                "u'?'",                                 // covers 2023?
-                "u G",                                  // covers 1 BC and 1 AD
-                "uuuu G",                               // covers 0030 BC and 0005 AD
-                "u G/u G",                              // covers 30 BC/5 AD
-                "uuuu G/uuuu G",                        // covers 0030 BC/0005 AD
-                "uuuu-MM G/uuuu-MM G"                   // covers 0030-01 BC/0005-02 AD
-                );
-
-        SIMPLE_DATE_FORMATS = formatStrings.stream()
-                                           .map(DateTimeFormatter::ofPattern)
-                                           .reduce(new DateTimeFormatterBuilder(),
-                                                   DateTimeFormatterBuilder::appendOptional,
-                                                   (builder, formatterBuilder) -> builder.append(formatterBuilder.toFormatter()))
-                                           .toFormatter(Locale.US);
+        List<String> formatStrings =
+                Arrays.asList(
+                        "uuuu-MM-dd'T'HH:mm[:ss][xxx][xx][X]", // covers 2018-10-03T07:24:14+03:00
+                        "uuuu-MM-dd'T'HH:m[:ss][xxx][xx][X]", // covers 2018-10-03T17:2
+                        "uuuu-MM-dd'T'H:mm[:ss][xxx][xx][X]", // covers 2018-10-03T7:24
+                        "uuuu-MM-dd'T'H:m[:ss][xxx][xx][X]", // covers 2018-10-03T7:7
+                        "uuuu-MM-dd'T'HH[:ss][xxx][xx][X]", // covers 2018-10-03T07
+                        "uuuu-MM-dd'T'H[:ss][xxx][xx][X]", // covers 2018-10-03T7
+                        "uuuu-M-d", // covers 2009-1-15
+                        "uuuu-M", // covers 2009-11
+                        "uuuu/M", // covers 2020/10
+                        "d-M-uuuu", // covers 15-1-2012
+                        "M-uuuu", // covers 1-2012
+                        "M/uuuu", // covers 9/2015 and 09/2015
+                        "M/uu", // covers 9/15
+                        "MMMM d, uuuu", // covers September 1, 2015
+                        "MMMM, uuuu", // covers September, 2015
+                        "MMMM  uuuu", // covers September 2015
+                        "d.M.uuuu", // covers 15.1.2015
+                        "uuuu.M.d", // covers 2015.1.15
+                        "uuuu", // covers 2015
+                        "MMM, uuuu", // covers Jan, 2020
+                        "MMM. uuuu", // covers Oct. 2020
+                        "MMM uuuu", // covers Jan 2020
+                        "uuuu.MM.d", // covers 2015.10.15
+                        "d MMMM u/d MMMM u", // covers 20 January 2015/20 February 2015
+                        "d MMMM u", // covers 20 January 2015
+                        "d MMMM u / d MMMM u",
+                        "u'-'", // covers 2015-
+                        "u'?'", // covers 2023?
+                        "u G", // covers 1 BC and 1 AD
+                        "uuuu G", // covers 0030 BC and 0005 AD
+                        "u G/u G", // covers 30 BC/5 AD
+                        "uuuu G/uuuu G", // covers 0030 BC/0005 AD
+                        "uuuu-MM G/uuuu-MM G" // covers 0030-01 BC/0005-02 AD
+                        );
+
+        SIMPLE_DATE_FORMATS =
+                formatStrings.stream()
+                        .map(DateTimeFormatter::ofPattern)
+                        .reduce(
+                                new DateTimeFormatterBuilder(),
+                                DateTimeFormatterBuilder::appendOptional,
+                                (builder, formatterBuilder) ->
+                                        builder.append(formatterBuilder.toFormatter()))
+                        .toFormatter(Locale.US);
 
         /*
          * There is also {@link org.jabref.model.entry.Date#parse(java.lang.String)}.
@@ -75,10 +80,14 @@ public class Date {
          * ii) two dates separated by '/'
          * Additionally, parse method requires the reviewed String to hold only a date.
          */
-        DATE_REGEX = "\\d{4}-\\d{1,2}-\\d{1,2}" + // covers YYYY-MM-DD, YYYY-M-DD, YYYY-MM-D, YYYY-M-D
-                "|\\d{4}\\.\\d{1,2}\\.\\d{1,2}|" + // covers YYYY.MM.DD, YYYY.M.DD, YYYY.MM.D, YYYY.M.D
-                "(January|February|March|April|May|June|July|August|September|" +
-                "October|November|December) \\d{1,2}, \\d{4}"; // covers Month DD, YYYY & Month D, YYYY
+        DATE_REGEX =
+                "\\d{4}-\\d{1,2}-\\d{1,2}"
+                        + // covers YYYY-MM-DD, YYYY-M-DD, YYYY-MM-D, YYYY-M-D
+                        "|\\d{4}\\.\\d{1,2}\\.\\d{1,2}|"
+                        + // covers YYYY.MM.DD, YYYY.M.DD, YYYY.MM.D, YYYY.M.D
+                        "(January|February|March|April|May|June|July|August|September|"
+                        + "October|November|December) \\d{1,2}, \\d{4}"; // covers Month DD, YYYY &
+                                                                         // Month D, YYYY
     }
 
     private final TemporalAccessor date;
@@ -127,17 +136,21 @@ public static Optional<Date> parse(String dateString) {
 
         // if dateString has range format, treat as date range
         if (dateString.matches(
-               "\\d{4}/\\d{4}|" + // uuuu/uuuu
-               "\\d{4}-\\d{2}/\\d{4}-\\d{2}|" + // uuuu-mm/uuuu-mm
-               "\\d{4}-\\d{2}-\\d{2}/\\d{4}-\\d{2}-\\d{2}|" + // uuuu-mm-dd/uuuu-mm-dd
-               "(?i)(January|February|March|April|May|June|July|August|September|October|November|December)" +
-               "( |\\-)(\\d{1,4})/(January|February|March|April|May|June|July|August|September|October|November" +
-               "|December)( |\\-)(\\d{1,4})(?i-)|" + // January 2015/January 2015
-               "(?i)(\\d{1,2})( )(January|February|March|April|May|June|July|August|September|October|November|December)" +
-               "( |\\-)(\\d{1,4})/(\\d{1,2})( )" +
-               "(January|February|March|April|May|June|July|August|September|October|November|December)" +
-               "( |\\-)(\\d{1,4})(?i-)" // 20 January 2015/20 January 2015
-        )) {
+                "\\d{4}/\\d{4}|"
+                        + // uuuu/uuuu
+                        "\\d{4}-\\d{2}/\\d{4}-\\d{2}|"
+                        + // uuuu-mm/uuuu-mm
+                        "\\d{4}-\\d{2}-\\d{2}/\\d{4}-\\d{2}-\\d{2}|"
+                        + // uuuu-mm-dd/uuuu-mm-dd
+                        "(?i)(January|February|March|April|May|June|July|August|September|October|November|December)"
+                        + "( |\\-)(\\d{1,4})/(January|February|March|April|May|June|July|August|September|October|November"
+                        + "|December)( |\\-)(\\d{1,4})(?i-)|"
+                        + // January 2015/January 2015
+                        "(?i)(\\d{1,2})( )(January|February|March|April|May|June|July|August|September|October|November|December)"
+                        + "( |\\-)(\\d{1,4})/(\\d{1,2})( )"
+                        + "(January|February|March|April|May|June|July|August|September|October|November|December)"
+                        + "( |\\-)(\\d{1,4})(?i-)" // 20 January 2015/20 January 2015
+                )) {
             try {
                 String[] strDates = dateString.split("/");
                 TemporalAccessor parsedDate = SIMPLE_DATE_FORMATS.parse(strDates[0].strip());
@@ -148,17 +161,21 @@ public static Optional<Date> parse(String dateString) {
                 return Optional.empty();
             }
         } else if (dateString.matches(
-              "\\d{4} / \\d{4}|" + // uuuu / uuuu
-              "\\d{4}-\\d{2} / \\d{4}-\\d{2}|" + // uuuu-mm / uuuu-mm
-              "\\d{4}-\\d{2}-\\d{2} / \\d{4}-\\d{2}-\\d{2}|" + // uuuu-mm-dd / uuuu-mm-dd
-              "(?i)(January|February|March|April|May|June|July|August|September|October|November|December)" +
-              "( |\\-)(\\d{1,4}) / (January|February|March|April|May|June|July|August|September|October|November" +
-              "|December)( |\\-)(\\d{1,4})(?i-)|" + // January 2015/January 2015
-              "(?i)(\\d{1,2})( )(January|February|March|April|May|June|July|August|September|October|November|December)" +
-              "( |\\-)(\\d{1,4}) / (\\d{1,2})( )" +
-              "(January|February|March|April|May|June|July|August|September|October|November|December)" +
-              "( |\\-)(\\d{1,4})(?i-)" // 20 January 2015/20 January 2015
-        )) {
+                "\\d{4} / \\d{4}|"
+                        + // uuuu / uuuu
+                        "\\d{4}-\\d{2} / \\d{4}-\\d{2}|"
+                        + // uuuu-mm / uuuu-mm
+                        "\\d{4}-\\d{2}-\\d{2} / \\d{4}-\\d{2}-\\d{2}|"
+                        + // uuuu-mm-dd / uuuu-mm-dd
+                        "(?i)(January|February|March|April|May|June|July|August|September|October|November|December)"
+                        + "( |\\-)(\\d{1,4}) / (January|February|March|April|May|June|July|August|September|October|November"
+                        + "|December)( |\\-)(\\d{1,4})(?i-)|"
+                        + // January 2015/January 2015
+                        "(?i)(\\d{1,2})( )(January|February|March|April|May|June|July|August|September|October|November|December)"
+                        + "( |\\-)(\\d{1,4}) / (\\d{1,2})( )"
+                        + "(January|February|March|April|May|June|July|August|September|October|November|December)"
+                        + "( |\\-)(\\d{1,4})(?i-)" // 20 January 2015/20 January 2015
+                )) {
             try {
                 String[] strDates = dateString.split(" / ");
                 TemporalAccessor parsedDate = SIMPLE_DATE_FORMATS.parse(strDates[0].strip());
@@ -169,13 +186,19 @@ public static Optional<Date> parse(String dateString) {
                 return Optional.empty();
             }
         } else if (dateString.matches(
-                "\\d{1,4} BC/\\d{1,4} AD|" + // 30 BC/5 AD and 0030 BC/0005 AD
-                "\\d{1,4} BC/\\d{1,4} BC|" + // 30 BC/10 BC and 0030 BC/0010 BC
-                "\\d{1,4} AD/\\d{1,4} AD|" + // 5 AD/10 AD and 0005 AD/0010 AD
-                "\\d{1,4}-\\d{1,2} BC/\\d{1,4}-\\d{1,2} AD|" + // 5 AD/10 AD and 0005 AD/0010 AD
-                "\\d{1,4}-\\d{1,2} BC/\\d{1,4}-\\d{1,2} BC|" + // 5 AD/10 AD and 0005 AD/0010 AD
-                "\\d{1,4}-\\d{1,2} AD/\\d{1,4}-\\d{1,2} AD" // 5 AD/10 AD and 0005 AD/0010 AD
-        )) {
+                "\\d{1,4} BC/\\d{1,4} AD|"
+                        + // 30 BC/5 AD and 0030 BC/0005 AD
+                        "\\d{1,4} BC/\\d{1,4} BC|"
+                        + // 30 BC/10 BC and 0030 BC/0010 BC
+                        "\\d{1,4} AD/\\d{1,4} AD|"
+                        + // 5 AD/10 AD and 0005 AD/0010 AD
+                        "\\d{1,4}-\\d{1,2} BC/\\d{1,4}-\\d{1,2} AD|"
+                        + // 5 AD/10 AD and 0005 AD/0010 AD
+                        "\\d{1,4}-\\d{1,2} BC/\\d{1,4}-\\d{1,2} BC|"
+                        + // 5 AD/10 AD and 0005 AD/0010 AD
+                        "\\d{1,4}-\\d{1,2} AD/\\d{1,4}-\\d{1,2} AD" // 5 AD/10 AD and 0005 AD/0010
+                                                                    // AD
+                )) {
             try {
                 String[] strDates = dateString.split("/");
                 TemporalAccessor parsedDate = parseDateWithEraIndicator(strDates[0]);
@@ -186,13 +209,19 @@ public static Optional<Date> parse(String dateString) {
                 return Optional.empty();
             }
         } else if (dateString.matches(
-                "\\d{1,4} BC / \\d{1,4} AD|" + // 30 BC / 5 AD and 0030 BC / 0005 AD
-                "\\d{1,4} BC / \\d{1,4} BC|" + // 30 BC / 10 BC and 0030 BC / 0010 BC
-                "\\d{1,4} AD / \\d{1,4} AD|" + // 5 AD / 10 AD and 0005 AD / 0010 AD
-                "\\d{1,4}-\\d{1,2} BC / \\d{1,4}-\\d{1,2} AD|" + // 5 AD/10 AD and 0005 AD/0010 AD
-                "\\d{1,4}-\\d{1,2} BC / \\d{1,4}-\\d{1,2} BC|" + // 5 AD/10 AD and 0005 AD/0010 AD
-                "\\d{1,4}-\\d{1,2} AD / \\d{1,4}-\\d{1,2} AD" // 5 AD/10 AD and 0005 AD/0010 AD
-        )) {
+                "\\d{1,4} BC / \\d{1,4} AD|"
+                        + // 30 BC / 5 AD and 0030 BC / 0005 AD
+                        "\\d{1,4} BC / \\d{1,4} BC|"
+                        + // 30 BC / 10 BC and 0030 BC / 0010 BC
+                        "\\d{1,4} AD / \\d{1,4} AD|"
+                        + // 5 AD / 10 AD and 0005 AD / 0010 AD
+                        "\\d{1,4}-\\d{1,2} BC / \\d{1,4}-\\d{1,2} AD|"
+                        + // 5 AD/10 AD and 0005 AD/0010 AD
+                        "\\d{1,4}-\\d{1,2} BC / \\d{1,4}-\\d{1,2} BC|"
+                        + // 5 AD/10 AD and 0005 AD/0010 AD
+                        "\\d{1,4}-\\d{1,2} AD / \\d{1,4}-\\d{1,2} AD" // 5 AD/10 AD and 0005 AD/0010
+                                                                      // AD
+                )) {
             try {
                 String[] strDates = dateString.split(" / ");
                 TemporalAccessor parsedDate = parseDateWithEraIndicator(strDates[0]);
@@ -218,11 +247,14 @@ public static Optional<Date> parse(String dateString) {
 
         // handle the new date formats with era indicators
         if (dateString.matches(
-                "\\d{1,4} BC|" + // covers 1 BC
-                "\\d{1,4} AD|" + // covers 1 BC
-                "\\d{1,4}-\\d{1,2} BC|" +  // covers 0030-01 BC
-                "\\d{1,4}-\\d{1,2} AD" // covers 0005-01 AD
-        )) {
+                "\\d{1,4} BC|"
+                        + // covers 1 BC
+                        "\\d{1,4} AD|"
+                        + // covers 1 BC
+                        "\\d{1,4}-\\d{1,2} BC|"
+                        + // covers 0030-01 BC
+                        "\\d{1,4}-\\d{1,2} AD" // covers 0005-01 AD
+                )) {
             try {
                 // Parse the date with era indicator
                 TemporalAccessor date = parseDateWithEraIndicator(dateString);
@@ -242,9 +274,8 @@ public static Optional<Date> parse(String dateString) {
         }
     }
 
-    public static Optional<Date> parse(Optional<String> yearValue,
-                                       Optional<String> monthValue,
-                                       Optional<String> dayValue) {
+    public static Optional<Date> parse(
+            Optional<String> yearValue, Optional<String> monthValue, Optional<String> dayValue) {
         Optional<Year> year = yearValue.flatMap(Date::convertToInt).map(Year::of);
         Optional<Month> month = monthValue.flatMap(Month::parse);
         Optional<Integer> day = dayValue.flatMap(Date::convertToInt);
@@ -335,13 +366,16 @@ public boolean equals(Object o) {
         }
         Date date1 = (Date) o;
 
-        return Objects.equals(getYear(), date1.getYear()) &&
-                Objects.equals(getMonth(), date1.getMonth()) &&
-                Objects.equals(getDay(), date1.getDay()) &&
-                Objects.equals(get(ChronoField.HOUR_OF_DAY), date1.get(ChronoField.HOUR_OF_DAY)) &&
-                Objects.equals(get(ChronoField.MINUTE_OF_HOUR), date1.get(ChronoField.MINUTE_OF_HOUR)) &&
-                Objects.equals(get(ChronoField.SECOND_OF_DAY), date1.get(ChronoField.SECOND_OF_DAY)) &&
-                Objects.equals(get(ChronoField.OFFSET_SECONDS), date1.get(ChronoField.OFFSET_SECONDS));
+        return Objects.equals(getYear(), date1.getYear())
+                && Objects.equals(getMonth(), date1.getMonth())
+                && Objects.equals(getDay(), date1.getDay())
+                && Objects.equals(get(ChronoField.HOUR_OF_DAY), date1.get(ChronoField.HOUR_OF_DAY))
+                && Objects.equals(
+                        get(ChronoField.MINUTE_OF_HOUR), date1.get(ChronoField.MINUTE_OF_HOUR))
+                && Objects.equals(
+                        get(ChronoField.SECOND_OF_DAY), date1.get(ChronoField.SECOND_OF_DAY))
+                && Objects.equals(
+                        get(ChronoField.OFFSET_SECONDS), date1.get(ChronoField.OFFSET_SECONDS));
     }
 
     @Override
@@ -351,16 +385,21 @@ public String toString() {
             formattedDate = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(date);
         } else if (date.isSupported(ChronoField.HOUR_OF_DAY)) {
             formattedDate = DateTimeFormatter.ISO_DATE_TIME.format(date);
-        } else if (date.isSupported(ChronoField.MONTH_OF_YEAR) && date.isSupported(ChronoField.DAY_OF_MONTH)) {
+        } else if (date.isSupported(ChronoField.MONTH_OF_YEAR)
+                && date.isSupported(ChronoField.DAY_OF_MONTH)) {
             formattedDate = DateTimeFormatter.ISO_DATE.format(date);
         }
-        return "Date{" +
-               "date=" + formattedDate +
-               '}';
+        return "Date{" + "date=" + formattedDate + '}';
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getYear(), getMonth(), getDay(), get(ChronoField.HOUR_OF_DAY), get(ChronoField.MINUTE_OF_HOUR), get(ChronoField.OFFSET_SECONDS));
+        return Objects.hash(
+                getYear(),
+                getMonth(),
+                getDay(),
+                get(ChronoField.HOUR_OF_DAY),
+                get(ChronoField.MINUTE_OF_HOUR),
+                get(ChronoField.OFFSET_SECONDS));
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/EntryConverter.java b/src/main/java/org/jabref/model/entry/EntryConverter.java
index 162afb219d1d..71c559d89d65 100644
--- a/src/main/java/org/jabref/model/entry/EntryConverter.java
+++ b/src/main/java/org/jabref/model/entry/EntryConverter.java
@@ -1,12 +1,12 @@
 package org.jabref.model.entry;
 
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.StandardField;
-
 /**
  * Converts Entry models from BibTeX to biblatex and back.
  */
@@ -21,18 +21,25 @@ public class EntryConverter {
 
     static {
         EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX = new HashMap<>();
-        EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.put(StandardField.ADDRESS, StandardField.LOCATION);
-        EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.put(StandardField.ANNOTE, StandardField.ANNOTATION);
-        EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.put(StandardField.ARCHIVEPREFIX, StandardField.EPRINTTYPE);
-        EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.put(StandardField.JOURNAL, StandardField.JOURNALTITLE);
-        EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.put(StandardField.KEY, StandardField.SORTKEY);
-        EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.put(StandardField.PRIMARYCLASS, StandardField.EPRINTCLASS);
-        EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.put(StandardField.SCHOOL, StandardField.INSTITUTION);
+        EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.put(
+                StandardField.ADDRESS, StandardField.LOCATION);
+        EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.put(
+                StandardField.ANNOTE, StandardField.ANNOTATION);
+        EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.put(
+                StandardField.ARCHIVEPREFIX, StandardField.EPRINTTYPE);
+        EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.put(
+                StandardField.JOURNAL, StandardField.JOURNALTITLE);
+        EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.put(
+                StandardField.KEY, StandardField.SORTKEY);
+        EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.put(
+                StandardField.PRIMARYCLASS, StandardField.EPRINTCLASS);
+        EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.put(
+                StandardField.SCHOOL, StandardField.INSTITUTION);
 
         // inverse map
-        EntryConverter.FIELD_ALIASES_BIBLATEX_TO_BIBTEX = EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX
-                .entrySet().stream()
-                .collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
+        EntryConverter.FIELD_ALIASES_BIBLATEX_TO_BIBTEX =
+                EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.entrySet().stream()
+                        .collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
 
         // all aliases
         FIELD_ALIASES = new HashMap<>();
@@ -40,6 +47,5 @@ public class EntryConverter {
         FIELD_ALIASES.putAll(EntryConverter.FIELD_ALIASES_BIBLATEX_TO_BIBTEX);
     }
 
-    private EntryConverter() {
-    }
+    private EntryConverter() {}
 }
diff --git a/src/main/java/org/jabref/model/entry/EntryLinkList.java b/src/main/java/org/jabref/model/entry/EntryLinkList.java
index d7f5bb527539..9c803dce026a 100644
--- a/src/main/java/org/jabref/model/entry/EntryLinkList.java
+++ b/src/main/java/org/jabref/model/entry/EntryLinkList.java
@@ -1,18 +1,17 @@
 package org.jabref.model.entry;
 
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.strings.StringUtil;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.strings.StringUtil;
-
 public class EntryLinkList {
 
     public static final String SEPARATOR = ",";
 
-    private EntryLinkList() {
-    }
+    private EntryLinkList() {}
 
     public static List<ParsedEntryLink> parse(String fieldValue, BibDatabase database) {
         List<ParsedEntryLink> result = new ArrayList<>();
diff --git a/src/main/java/org/jabref/model/entry/IdGenerator.java b/src/main/java/org/jabref/model/entry/IdGenerator.java
index 4875daf8ac4f..0a029321f472 100644
--- a/src/main/java/org/jabref/model/entry/IdGenerator.java
+++ b/src/main/java/org/jabref/model/entry/IdGenerator.java
@@ -19,8 +19,7 @@ public class IdGenerator {
 
     private static int idCounter;
 
-    private IdGenerator() {
-    }
+    private IdGenerator() {}
 
     public static synchronized String next() {
         String result = ID_FORMAT.format(idCounter);
diff --git a/src/main/java/org/jabref/model/entry/Keyword.java b/src/main/java/org/jabref/model/entry/Keyword.java
index d3df45becca2..c9b9a427c1fb 100644
--- a/src/main/java/org/jabref/model/entry/Keyword.java
+++ b/src/main/java/org/jabref/model/entry/Keyword.java
@@ -1,12 +1,12 @@
 package org.jabref.model.entry;
 
+import org.jabref.model.ChainNode;
+
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.jabref.model.ChainNode;
-
 /**
  * Represents a keyword in a chain of keywords.
  * For example, "JabRef" in "Bibliographic manager > Awesome ones > JabRef"
@@ -47,7 +47,8 @@ public boolean equals(Object o) {
         }
         Keyword other = (Keyword) o;
         return Objects.equals(this.keyword, other.keyword)
-                // && Objects.equals(this.getParent(), other.getParent()) : we can't check the parents because then we would run in circles
+                // && Objects.equals(this.getParent(), other.getParent()) : we can't check the
+                // parents because then we would run in circles
                 && Objects.equals(this.getChild(), other.getChild());
     }
 
@@ -79,9 +80,15 @@ private void addAtEnd(String keyword) {
      * E.g., calling {@link #getSubchainAsString(Character)} on the node "B" in "A > B > C" returns "B > C".
      */
     private String getSubchainAsString(Character hierarchicalDelimiter) {
-        return keyword +
-                getChild().map(child -> " " + hierarchicalDelimiter + " " + child.getSubchainAsString(hierarchicalDelimiter))
-                          .orElse("");
+        return keyword
+                + getChild()
+                        .map(
+                                child ->
+                                        " "
+                                                + hierarchicalDelimiter
+                                                + " "
+                                                + child.getSubchainAsString(hierarchicalDelimiter))
+                        .orElse("");
     }
 
     /**
@@ -97,8 +104,13 @@ public String get() {
      */
     public String getPathFromRootAsString(Character hierarchicalDelimiter) {
         return getParent()
-                .map(parent -> parent.getPathFromRootAsString(hierarchicalDelimiter) + " " + hierarchicalDelimiter + " ")
-                .orElse("")
+                        .map(
+                                parent ->
+                                        parent.getPathFromRootAsString(hierarchicalDelimiter)
+                                                + " "
+                                                + hierarchicalDelimiter
+                                                + " ")
+                        .orElse("")
                 + keyword;
     }
 
@@ -107,10 +119,9 @@ public String getPathFromRootAsString(Character hierarchicalDelimiter) {
      * E.g, for "A > B > C" we get {"A", "B", "C"}.
      */
     public Set<Keyword> flatten() {
-        return Stream
-                .concat(Stream.of(this),
-                        getChild().stream()
-                                  .flatMap(child -> child.flatten().stream()))
+        return Stream.concat(
+                        Stream.of(this),
+                        getChild().stream().flatMap(child -> child.flatten().stream()))
                 .collect(Collectors.toSet());
     }
 
@@ -120,7 +131,7 @@ public Set<Keyword> flatten() {
      */
     public Set<String> getAllSubchainsAsString(Character hierarchicalDelimiter) {
         return flatten().stream()
-                        .map(subchain -> subchain.getPathFromRootAsString(hierarchicalDelimiter))
-                        .collect(Collectors.toSet());
+                .map(subchain -> subchain.getPathFromRootAsString(hierarchicalDelimiter))
+                .collect(Collectors.toSet());
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/KeywordList.java b/src/main/java/org/jabref/model/entry/KeywordList.java
index 76adb9add8d3..42524d65272b 100644
--- a/src/main/java/org/jabref/model/entry/KeywordList.java
+++ b/src/main/java/org/jabref/model/entry/KeywordList.java
@@ -1,5 +1,7 @@
 package org.jabref.model.entry;
 
+import org.jabref.model.strings.StringUtil;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -12,8 +14,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.jabref.model.strings.StringUtil;
-
 /**
  * Represents a list of keyword chains.
  * For example, "Type > A, Type > B, Something else".
@@ -43,7 +43,8 @@ public KeywordList(Keyword... keywordChains) {
         this(Arrays.asList(keywordChains));
     }
 
-    public static KeywordList parse(String keywordString, Character delimiter, Character hierarchicalDelimiter) {
+    public static KeywordList parse(
+            String keywordString, Character delimiter, Character hierarchicalDelimiter) {
         if (StringUtil.isBlank(keywordString)) {
             return new KeywordList();
         }
@@ -74,13 +75,17 @@ public static KeywordList parse(String keywordString, Character delimiter) {
     }
 
     public static String serialize(List<Keyword> keywords, Character delimiter) {
-        return keywords.stream().map(Keyword::get).collect(Collectors.joining(delimiter.toString()));
+        return keywords.stream()
+                .map(Keyword::get)
+                .collect(Collectors.joining(delimiter.toString()));
     }
 
-    public static KeywordList merge(String keywordStringA, String keywordStringB, Character delimiter) {
+    public static KeywordList merge(
+            String keywordStringA, String keywordStringB, Character delimiter) {
         KeywordList keywordListA = parse(keywordStringA, delimiter);
         KeywordList keywordListB = parse(keywordStringB, delimiter);
-        List<Keyword> distinctKeywords = Stream.concat(keywordListA.stream(), keywordListB.stream()).distinct().toList();
+        List<Keyword> distinctKeywords =
+                Stream.concat(keywordListA.stream(), keywordListB.stream()).distinct().toList();
         return new KeywordList(distinctKeywords);
     }
 
@@ -124,7 +129,9 @@ public boolean add(Keyword keyword) {
      * Keywords are separated by the given delimiter and an additional space, i.e. "one, two".
      */
     public String getAsString(Character delimiter) {
-        return keywordChains.stream().map(Keyword::toString).collect(Collectors.joining(delimiter + " "));
+        return keywordChains.stream()
+                .map(Keyword::toString)
+                .collect(Collectors.joining(delimiter + " "));
     }
 
     public void add(String keywordsString) {
diff --git a/src/main/java/org/jabref/model/entry/LinkedFile.java b/src/main/java/org/jabref/model/entry/LinkedFile.java
index 4a3654dd746f..ead5f9e469be 100644
--- a/src/main/java/org/jabref/model/entry/LinkedFile.java
+++ b/src/main/java/org/jabref/model/entry/LinkedFile.java
@@ -1,18 +1,5 @@
 package org.jabref.model.entry;
 
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Pattern;
-
 import javafx.beans.Observable;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
@@ -23,10 +10,22 @@
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
-
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Pattern;
+
 /**
  * Represents the link to an external file (e.g. associated PDF file).
  * This class is {@link Serializable} which is needed for drag and drop in gui
@@ -35,7 +34,8 @@
 @NullMarked
 public class LinkedFile implements Serializable {
 
-    private static final String REGEX_URL = "^((?:https?\\:\\/\\/|www\\.)(?:[-a-z0-9]+\\.)*[-a-z0-9]+.*)";
+    private static final String REGEX_URL =
+            "^((?:https?\\:\\/\\/|www\\.)(?:[-a-z0-9]+\\.)*[-a-z0-9]+.*)";
     private static final Pattern URL_PATTERN = Pattern.compile(REGEX_URL);
 
     private static final LinkedFile NULL_OBJECT = new LinkedFile("", Path.of(""), "");
@@ -47,11 +47,18 @@ public class LinkedFile implements Serializable {
     private transient StringProperty sourceURL = new SimpleStringProperty();
 
     public LinkedFile(String description, Path link, String fileType) {
-        this(Objects.requireNonNull(description), Objects.requireNonNull(link).toString(), Objects.requireNonNull(fileType));
+        this(
+                Objects.requireNonNull(description),
+                Objects.requireNonNull(link).toString(),
+                Objects.requireNonNull(fileType));
     }
 
     public LinkedFile(String description, Path link, String fileType, String sourceUrl) {
-        this(Objects.requireNonNull(description), Objects.requireNonNull(link).toString(), Objects.requireNonNull(fileType), Objects.requireNonNull(sourceUrl));
+        this(
+                Objects.requireNonNull(description),
+                Objects.requireNonNull(link).toString(),
+                Objects.requireNonNull(fileType),
+                Objects.requireNonNull(sourceUrl));
     }
 
     public LinkedFile(String description, String link, FileType fileType) {
@@ -77,11 +84,18 @@ public LinkedFile(URL link, String fileType) {
     }
 
     public LinkedFile(String description, URL link, String fileType) {
-        this(description, Objects.requireNonNull(link).toString(), Objects.requireNonNull(fileType));
+        this(
+                description,
+                Objects.requireNonNull(link).toString(),
+                Objects.requireNonNull(fileType));
     }
 
     public LinkedFile(String description, URL link, String fileType, String sourceUrl) {
-        this(description, Objects.requireNonNull(link).toString(), Objects.requireNonNull(fileType), Objects.requireNonNull(sourceUrl));
+        this(
+                description,
+                Objects.requireNonNull(link).toString(),
+                Objects.requireNonNull(fileType),
+                Objects.requireNonNull(sourceUrl));
     }
 
     /**
@@ -204,12 +218,20 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "ParsedFileField{" +
-                "description='" + description.get() + '\'' +
-                ", link='" + link.get() + '\'' +
-                ", fileType='" + fileType.get() + '\'' +
-                (StringUtil.isNullOrEmpty(sourceURL.get()) ? "" : (", sourceUrl='" + sourceURL.get() + '\'')) +
-                '}';
+        return "ParsedFileField{"
+                + "description='"
+                + description.get()
+                + '\''
+                + ", link='"
+                + link.get()
+                + '\''
+                + ", fileType='"
+                + fileType.get()
+                + '\''
+                + (StringUtil.isNullOrEmpty(sourceURL.get())
+                        ? ""
+                        : (", sourceUrl='" + sourceURL.get() + '\''))
+                + '}';
     }
 
     public boolean isEmpty() {
@@ -220,7 +242,8 @@ public boolean isOnlineLink() {
         return isOnlineLink(link.get());
     }
 
-    public Optional<Path> findIn(BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+    public Optional<Path> findIn(
+            BibDatabaseContext databaseContext, FilePreferences filePreferences) {
         List<Path> dirs = databaseContext.getFileDirectories(filePreferences);
         return findIn(dirs);
     }
diff --git a/src/main/java/org/jabref/model/entry/Month.java b/src/main/java/org/jabref/model/entry/Month.java
index 26bec5fd86a1..7aed00b1fc68 100644
--- a/src/main/java/org/jabref/model/entry/Month.java
+++ b/src/main/java/org/jabref/model/entry/Month.java
@@ -1,15 +1,14 @@
 package org.jabref.model.entry;
 
-import java.util.Optional;
-
 import org.jabref.logic.bibtex.FieldWriter;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Optional;
+
 /**
  * Represents a Month of the Year.
  */
 public enum Month {
-
     JANUARY("January", "jan", 1),
     FEBRUARY("February", "feb", 2),
     MARCH("March", "mar", 3),
@@ -176,7 +175,10 @@ public String getShortName() {
      * @return Month in JabRef format
      */
     public String getJabRefFormat() {
-        return (FieldWriter.BIBTEX_STRING_START_END_SYMBOL + "%s" + FieldWriter.BIBTEX_STRING_START_END_SYMBOL).formatted(shortName);
+        return (FieldWriter.BIBTEX_STRING_START_END_SYMBOL
+                        + "%s"
+                        + FieldWriter.BIBTEX_STRING_START_END_SYMBOL)
+                .formatted(shortName);
     }
 
     /**
diff --git a/src/main/java/org/jabref/model/entry/ParsedEntryLink.java b/src/main/java/org/jabref/model/entry/ParsedEntryLink.java
index dd989692d952..4e73668ee39d 100644
--- a/src/main/java/org/jabref/model/entry/ParsedEntryLink.java
+++ b/src/main/java/org/jabref/model/entry/ParsedEntryLink.java
@@ -1,10 +1,10 @@
 package org.jabref.model.entry;
 
+import org.jabref.model.database.BibDatabase;
+
 import java.util.Objects;
 import java.util.Optional;
 
-import org.jabref.model.database.BibDatabase;
-
 public class ParsedEntryLink {
 
     private String key;
diff --git a/src/main/java/org/jabref/model/entry/SharedBibEntryData.java b/src/main/java/org/jabref/model/entry/SharedBibEntryData.java
index 69c3c6bf9765..6dbbb5c93632 100644
--- a/src/main/java/org/jabref/model/entry/SharedBibEntryData.java
+++ b/src/main/java/org/jabref/model/entry/SharedBibEntryData.java
@@ -41,9 +41,9 @@ public void setVersion(int version) {
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
-                          .add("sharedID", sharedID)
-                          .add("version", version)
-                          .toString();
+                .add("sharedID", sharedID)
+                .add("version", version)
+                .toString();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/event/EntriesEvent.java b/src/main/java/org/jabref/model/entry/event/EntriesEvent.java
index e44aa89ca9fb..187e7b46b712 100644
--- a/src/main/java/org/jabref/model/entry/event/EntriesEvent.java
+++ b/src/main/java/org/jabref/model/entry/event/EntriesEvent.java
@@ -1,11 +1,11 @@
 package org.jabref.model.entry.event;
 
-import java.util.List;
-import java.util.Objects;
-
 import org.jabref.model.database.event.BibDatabaseContextChangedEvent;
 import org.jabref.model.entry.BibEntry;
 
+import java.util.List;
+import java.util.Objects;
+
 /**
  * This abstract class pretends a minimal set of attributes and methods which an entries event should have.
  */
diff --git a/src/main/java/org/jabref/model/entry/event/EntryChangedEvent.java b/src/main/java/org/jabref/model/entry/event/EntryChangedEvent.java
index a16819b9ab2a..0f1f449aeb72 100644
--- a/src/main/java/org/jabref/model/entry/event/EntryChangedEvent.java
+++ b/src/main/java/org/jabref/model/entry/event/EntryChangedEvent.java
@@ -1,13 +1,12 @@
 package org.jabref.model.entry.event;
 
-import java.util.Collections;
-
 import org.jabref.model.entry.BibEntry;
 
+import java.util.Collections;
+
 /**
  * <code>EntryChangedEvent</code> is fired when a <code>BibEntry</code> has been changed.
  */
-
 public class EntryChangedEvent extends EntriesEvent {
 
     /**
@@ -26,7 +25,8 @@ public EntryChangedEvent(BibEntry bibEntry, EntriesEventSource location) {
     }
 
     public BibEntry getBibEntry() {
-        // An entryChangedEvent should only have one BibEntry, but its parent class stores a List<BibEntry>
+        // An entryChangedEvent should only have one BibEntry, but its parent class stores a
+        // List<BibEntry>
         return getBibEntries().getFirst();
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java b/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java
index c7d6255a813b..3dc3c08cd85b 100644
--- a/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java
+++ b/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java
@@ -21,8 +21,12 @@ public class FieldChangedEvent extends EntryChangedEvent {
      * @param newValue new field value
      * @param location Location affected by this event
      */
-    public FieldChangedEvent(BibEntry bibEntry, Field field, String newValue, String oldValue,
-                             EntriesEventSource location) {
+    public FieldChangedEvent(
+            BibEntry bibEntry,
+            Field field,
+            String newValue,
+            String oldValue,
+            EntriesEventSource location) {
         super(bibEntry, location);
         this.field = field;
         this.newValue = newValue;
diff --git a/src/main/java/org/jabref/model/entry/field/AMSField.java b/src/main/java/org/jabref/model/entry/field/AMSField.java
index 989fde529944..80859dcf0df9 100644
--- a/src/main/java/org/jabref/model/entry/field/AMSField.java
+++ b/src/main/java/org/jabref/model/entry/field/AMSField.java
@@ -5,7 +5,6 @@
 import java.util.Optional;
 
 public enum AMSField implements Field {
-
     FJOURNAL("fjournal");
 
     private final String name;
@@ -38,8 +37,8 @@ public enum AMSField implements Field {
 
     public static <T> Optional<AMSField> fromName(T type, String name) {
         return Arrays.stream(AMSField.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+                .filter(field -> field.getName().equalsIgnoreCase(name))
+                .findAny();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/field/BibField.java b/src/main/java/org/jabref/model/entry/field/BibField.java
index 1453e6fc32d7..7b8b14f94094 100644
--- a/src/main/java/org/jabref/model/entry/field/BibField.java
+++ b/src/main/java/org/jabref/model/entry/field/BibField.java
@@ -23,10 +23,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "BibField{" +
-                "field=" + field.getDisplayName() +
-                ", priority=" + priority +
-                '}';
+        return "BibField{" + "field=" + field.getDisplayName() + ", priority=" + priority + '}';
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/field/BiblatexApaField.java b/src/main/java/org/jabref/model/entry/field/BiblatexApaField.java
index e93ab4249748..4809cf97e42e 100644
--- a/src/main/java/org/jabref/model/entry/field/BiblatexApaField.java
+++ b/src/main/java/org/jabref/model/entry/field/BiblatexApaField.java
@@ -1,13 +1,12 @@
 package org.jabref.model.entry.field;
 
+import org.jabref.model.entry.types.BiblatexApaEntryType;
+
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.Optional;
 
-import org.jabref.model.entry.types.BiblatexApaEntryType;
-
 public enum BiblatexApaField implements Field {
-
     AMENDMENT("amendment"),
     ARTICLE("article"),
     CITATION("citation"),
@@ -48,12 +47,13 @@ public enum BiblatexApaField implements Field {
     public static <T> Optional<BiblatexApaField> fromName(T type, String name) {
         if (!(type instanceof BiblatexApaEntryType)) {
             // Also returns nothing if no type is given.
-            // Reason: The field should also be recognized in the presence of a BiblatexApa entry type.
+            // Reason: The field should also be recognized in the presence of a BiblatexApa entry
+            // type.
             return Optional.empty();
         }
         return Arrays.stream(BiblatexApaField.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+                .filter(field -> field.getName().equalsIgnoreCase(name))
+                .findAny();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/field/BiblatexSoftwareField.java b/src/main/java/org/jabref/model/entry/field/BiblatexSoftwareField.java
index 4a9ddeda6888..80fc8efa5802 100644
--- a/src/main/java/org/jabref/model/entry/field/BiblatexSoftwareField.java
+++ b/src/main/java/org/jabref/model/entry/field/BiblatexSoftwareField.java
@@ -1,13 +1,12 @@
 package org.jabref.model.entry.field;
 
+import org.jabref.model.entry.types.BiblatexSoftwareEntryType;
+
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.Optional;
 
-import org.jabref.model.entry.types.BiblatexSoftwareEntryType;
-
 public enum BiblatexSoftwareField implements Field {
-
     HALID("hal_id"),
     HALVERSION("hal_version"),
     INTRODUCEDIN("introducedin"),
@@ -33,7 +32,8 @@ public enum BiblatexSoftwareField implements Field {
         this.properties = EnumSet.noneOf(FieldProperty.class);
     }
 
-    BiblatexSoftwareField(String name, String displayName, FieldProperty first, FieldProperty... rest) {
+    BiblatexSoftwareField(
+            String name, String displayName, FieldProperty first, FieldProperty... rest) {
         this.name = name;
         this.displayName = displayName;
         this.properties = EnumSet.of(first, rest);
@@ -50,8 +50,8 @@ public static <T> Optional<BiblatexSoftwareField> fromName(T type, String name)
             return Optional.empty();
         }
         return Arrays.stream(BiblatexSoftwareField.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+                .filter(field -> field.getName().equalsIgnoreCase(name))
+                .findAny();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/field/Field.java b/src/main/java/org/jabref/model/entry/field/Field.java
index 225b969586a5..1cc8d4621ab6 100644
--- a/src/main/java/org/jabref/model/entry/field/Field.java
+++ b/src/main/java/org/jabref/model/entry/field/Field.java
@@ -1,10 +1,10 @@
 package org.jabref.model.entry.field;
 
+import org.jabref.model.strings.StringUtil;
+
 import java.util.EnumSet;
 import java.util.Optional;
 
-import org.jabref.model.strings.StringUtil;
-
 public interface Field {
 
     /**
diff --git a/src/main/java/org/jabref/model/entry/field/FieldFactory.java b/src/main/java/org/jabref/model/entry/field/FieldFactory.java
index ff660ad4ab66..22b0728608c3 100644
--- a/src/main/java/org/jabref/model/entry/field/FieldFactory.java
+++ b/src/main/java/org/jabref/model/entry/field/FieldFactory.java
@@ -1,5 +1,10 @@
 package org.jabref.model.entry.field;
 
+import org.jabref.logic.preferences.JabRefCliPreferences;
+import org.jabref.model.entry.types.EntryType;
+import org.jabref.model.strings.StringUtil;
+import org.jabref.model.util.OptionalUtil;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -15,11 +20,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import org.jabref.logic.preferences.JabRefCliPreferences;
-import org.jabref.model.entry.types.EntryType;
-import org.jabref.model.strings.StringUtil;
-import org.jabref.model.util.OptionalUtil;
-
 public class FieldFactory {
 
     /**
@@ -27,6 +27,7 @@ public class FieldFactory {
      * (e.g. "author/editor" to use editor where author is not set):
      */
     private static final String FIELD_OR_SEPARATOR = "/";
+
     private static final String DELIMITER = ";";
 
     public static String serializeOrFields(Field... fields) {
@@ -35,36 +36,51 @@ public static String serializeOrFields(Field... fields) {
 
     public static String serializeOrFields(OrFields fields) {
         return fields.getFields().stream()
-                     .map(field -> {
-                         if (field instanceof UnknownField unknownField) {
-                             // In case a user has put a user-defined field, the casing of that field is kept
-                             return unknownField.getDisplayName();
-                         } else {
-                             // In all fields known to JabRef, the name is used - JabRef knows better than the user how to case the field
-                             return field.getName();
-                         }
-                     })
-                     .collect(Collectors.joining(FIELD_OR_SEPARATOR));
+                .map(
+                        field -> {
+                            if (field instanceof UnknownField unknownField) {
+                                // In case a user has put a user-defined field, the casing of that
+                                // field is kept
+                                return unknownField.getDisplayName();
+                            } else {
+                                // In all fields known to JabRef, the name is used - JabRef knows
+                                // better than the user how to case the field
+                                return field.getName();
+                            }
+                        })
+                .collect(Collectors.joining(FIELD_OR_SEPARATOR));
     }
 
     public static String serializeOrFieldsList(Set<OrFields> fields) {
-        return fields.stream().map(FieldFactory::serializeOrFields).collect(Collectors.joining(DELIMITER));
+        return fields.stream()
+                .map(FieldFactory::serializeOrFields)
+                .collect(Collectors.joining(DELIMITER));
     }
 
     /**
      * Checks whether the given field contains LaTeX code or something else
      */
     public static boolean isLatexField(Field field) {
-        return Collections.disjoint(field.getProperties(), Set.of(FieldProperty.VERBATIM, FieldProperty.MARKDOWN));
+        return Collections.disjoint(
+                field.getProperties(), Set.of(FieldProperty.VERBATIM, FieldProperty.MARKDOWN));
     }
 
     /**
      * Returns a collection of StandardFields where the content should not be interpreted as "plain" text, but something else (such as links to other fields, numbers, ...)
      */
     public static Collection<Field> getNotTextFields() {
-        Set<Field> result = Arrays.stream(StandardField.values())
-              .filter(field -> !Collections.disjoint(field.getProperties(), Set.of(FieldProperty.VERBATIM, FieldProperty.NUMERIC, FieldProperty.DATE, FieldProperty.MULTIPLE_ENTRY_LINK)))
-                .collect(Collectors.toSet());
+        Set<Field> result =
+                Arrays.stream(StandardField.values())
+                        .filter(
+                                field ->
+                                        !Collections.disjoint(
+                                                field.getProperties(),
+                                                Set.of(
+                                                        FieldProperty.VERBATIM,
+                                                        FieldProperty.NUMERIC,
+                                                        FieldProperty.DATE,
+                                                        FieldProperty.MULTIPLE_ENTRY_LINK)))
+                        .collect(Collectors.toSet());
 
         // These fields are not marked as verbatim, because they could include LaTeX code
         result.add(StandardField.MONTH);
@@ -73,39 +89,43 @@ public static Collection<Field> getNotTextFields() {
     }
 
     public static OrFields parseOrFields(String fieldNames) {
-        Set<Field> fields = Arrays.stream(fieldNames.split(FieldFactory.FIELD_OR_SEPARATOR))
-                                  .filter(StringUtil::isNotBlank)
-                                  .map(FieldFactory::parseField)
-                                  .collect(Collectors.toCollection(LinkedHashSet::new));
+        Set<Field> fields =
+                Arrays.stream(fieldNames.split(FieldFactory.FIELD_OR_SEPARATOR))
+                        .filter(StringUtil::isNotBlank)
+                        .map(FieldFactory::parseField)
+                        .collect(Collectors.toCollection(LinkedHashSet::new));
         return new OrFields(fields);
     }
 
     public static SequencedSet<OrFields> parseOrFieldsList(String fieldNames) {
         return Arrays.stream(fieldNames.split(FieldFactory.DELIMITER))
-                     .filter(StringUtil::isNotBlank)
-                     .map(FieldFactory::parseOrFields)
-                     .collect(Collectors.toCollection(LinkedHashSet::new));
+                .filter(StringUtil::isNotBlank)
+                .map(FieldFactory::parseOrFields)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     public static SequencedSet<Field> parseFieldList(String fieldNames) {
         return Arrays.stream(fieldNames.split(FieldFactory.DELIMITER))
-                     .filter(StringUtil::isNotBlank)
-                     .map(FieldFactory::parseField)
-                     .collect(Collectors.toCollection(LinkedHashSet::new));
+                .filter(StringUtil::isNotBlank)
+                .map(FieldFactory::parseField)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     public static String serializeFieldsList(Collection<Field> fields) {
         return fields.stream()
-                     .map(field -> {
-                         if (field instanceof UnknownField unknownField) {
-                             // In case a user has put a user-defined field, the casing of that field is kept
-                             return unknownField.getDisplayName();
-                         } else {
-                             // In all fields known to JabRef, the name is used - JabRef knows better than the user how to case the field
-                             return field.getName();
-                         }
-                     })
-                     .collect(Collectors.joining(DELIMITER));
+                .map(
+                        field -> {
+                            if (field instanceof UnknownField unknownField) {
+                                // In case a user has put a user-defined field, the casing of that
+                                // field is kept
+                                return unknownField.getDisplayName();
+                            } else {
+                                // In all fields known to JabRef, the name is used - JabRef knows
+                                // better than the user how to case the field
+                                return field.getName();
+                            }
+                        })
+                .collect(Collectors.joining(DELIMITER));
     }
 
     /**
@@ -113,25 +133,26 @@ public static String serializeFieldsList(Collection<Field> fields) {
      * This somehow acts as filter, BibLaTeX "APA" entry type has field "article", but we want to have StandardField (if not explicitly requested otherwise)
      */
     public static <T extends EntryType> Field parseField(T type, String fieldName) {
-        // Check if the field name starts with "comment-" which indicates it's a UserSpecificCommentField
+        // Check if the field name starts with "comment-" which indicates it's a
+        // UserSpecificCommentField
         if (fieldName.startsWith("comment-")) {
             String username = fieldName.substring("comment-".length());
             return new UserSpecificCommentField(username);
         }
         return OptionalUtil.<Field>orElse(
-              OptionalUtil.<Field>orElse(
-               OptionalUtil.<Field>orElse(
-                OptionalUtil.<Field>orElse(
-                 OptionalUtil.<Field>orElse(
-                   OptionalUtil.<Field>orElse(
-              InternalField.fromName(fieldName),
-              StandardField.fromName(fieldName)),
-              SpecialField.fromName(fieldName)),
-              IEEEField.fromName(fieldName)),
-              BiblatexSoftwareField.fromName(type, fieldName)),
-              BiblatexApaField.fromName(type, fieldName)),
-              AMSField.fromName(type, fieldName))
-              .orElse(UnknownField.fromDisplayName(fieldName));
+                        OptionalUtil.<Field>orElse(
+                                OptionalUtil.<Field>orElse(
+                                        OptionalUtil.<Field>orElse(
+                                                OptionalUtil.<Field>orElse(
+                                                        OptionalUtil.<Field>orElse(
+                                                                InternalField.fromName(fieldName),
+                                                                StandardField.fromName(fieldName)),
+                                                        SpecialField.fromName(fieldName)),
+                                                IEEEField.fromName(fieldName)),
+                                        BiblatexSoftwareField.fromName(type, fieldName)),
+                                BiblatexApaField.fromName(type, fieldName)),
+                        AMSField.fromName(type, fieldName))
+                .orElse(UnknownField.fromDisplayName(fieldName));
     }
 
     public static Field parseField(String fieldName) {
@@ -143,7 +164,8 @@ public static boolean isInternalField(Field field) {
     }
 
     public static Set<Field> getJournalNameFields() {
-        return getFieldsFiltered(field -> field.getProperties().contains(FieldProperty.JOURNAL_NAME));
+        return getFieldsFiltered(
+                field -> field.getProperties().contains(FieldProperty.JOURNAL_NAME));
     }
 
     /**
@@ -178,7 +200,8 @@ public static Set<Field> getAllFieldsWithOutInternal() {
     public static SequencedSet<Field> getStandardFieldsWithCitationKey() {
         EnumSet<StandardField> allFields = EnumSet.allOf(StandardField.class);
 
-        LinkedHashSet<Field> standardFieldsWithBibtexKey = new LinkedHashSet<>(allFields.size() + 1);
+        LinkedHashSet<Field> standardFieldsWithBibtexKey =
+                new LinkedHashSet<>(allFields.size() + 1);
         standardFieldsWithBibtexKey.add(InternalField.KEY_FIELD);
         standardFieldsWithBibtexKey.addAll(allFields);
 
@@ -190,13 +213,12 @@ public static Set<Field> getBookNameFields() {
     }
 
     public static Set<Field> getPersonNameFields() {
-        return getFieldsFiltered(field -> field.getProperties().contains(FieldProperty.PERSON_NAMES));
+        return getFieldsFiltered(
+                field -> field.getProperties().contains(FieldProperty.PERSON_NAMES));
     }
 
     private static Set<Field> getFieldsFiltered(Predicate<Field> selector) {
-        return getAllFields().stream()
-                             .filter(selector)
-                             .collect(Collectors.toSet());
+        return getAllFields().stream().filter(selector).collect(Collectors.toSet());
     }
 
     private static Set<Field> getAllFields() {
@@ -217,14 +239,27 @@ private static Set<Field> getAllFields() {
      * separate preferences object
      */
     public static List<Field> getDefaultGeneralFields() {
-        List<Field> defaultGeneralFields = new ArrayList<>(Arrays.asList(StandardField.DOI, StandardField.CROSSREF, StandardField.KEYWORDS, StandardField.EPRINT, StandardField.URL, StandardField.FILE, StandardField.GROUPS, StandardField.OWNER, StandardField.TIMESTAMP));
+        List<Field> defaultGeneralFields =
+                new ArrayList<>(
+                        Arrays.asList(
+                                StandardField.DOI,
+                                StandardField.CROSSREF,
+                                StandardField.KEYWORDS,
+                                StandardField.EPRINT,
+                                StandardField.URL,
+                                StandardField.FILE,
+                                StandardField.GROUPS,
+                                StandardField.OWNER,
+                                StandardField.TIMESTAMP));
         defaultGeneralFields.addAll(EnumSet.allOf(SpecialField.class));
         return defaultGeneralFields;
     }
 
-    // TODO: This should ideally be user configurable! (https://github.com/JabRef/jabref/issues/9840)
+    // TODO: This should ideally be user configurable!
+    // (https://github.com/JabRef/jabref/issues/9840)
     // TODO: Move somewhere more appropriate in the future
     public static boolean isMultiLineField(final Field field, List<Field> nonWrappableFields) {
-        return field.getProperties().contains(FieldProperty.MULTILINE_TEXT) || nonWrappableFields.contains(field);
+        return field.getProperties().contains(FieldProperty.MULTILINE_TEXT)
+                || nonWrappableFields.contains(field);
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/field/IEEEField.java b/src/main/java/org/jabref/model/entry/field/IEEEField.java
index 12af456b0b30..884f044a4744 100644
--- a/src/main/java/org/jabref/model/entry/field/IEEEField.java
+++ b/src/main/java/org/jabref/model/entry/field/IEEEField.java
@@ -31,8 +31,8 @@ public enum IEEEField implements Field {
 
     public static Optional<IEEEField> fromName(String name) {
         return Arrays.stream(IEEEField.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+                .filter(field -> field.getName().equalsIgnoreCase(name))
+                .findAny();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/field/InternalField.java b/src/main/java/org/jabref/model/entry/field/InternalField.java
index 427f86483c5f..ebf3cc3cdb89 100644
--- a/src/main/java/org/jabref/model/entry/field/InternalField.java
+++ b/src/main/java/org/jabref/model/entry/field/InternalField.java
@@ -70,8 +70,8 @@ public static Optional<InternalField> fromName(String name) {
         }
 
         return Arrays.stream(InternalField.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+                .filter(field -> field.getName().equalsIgnoreCase(name))
+                .findAny();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/field/OrFields.java b/src/main/java/org/jabref/model/entry/field/OrFields.java
index a8de739eb7dc..3fb9d7e713c1 100644
--- a/src/main/java/org/jabref/model/entry/field/OrFields.java
+++ b/src/main/java/org/jabref/model/entry/field/OrFields.java
@@ -86,8 +86,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "OrFields{" +
-                "fields=" + fields +
-                '}';
+        return "OrFields{" + "fields=" + fields + '}';
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/field/SpecialField.java b/src/main/java/org/jabref/model/entry/field/SpecialField.java
index 2c1b5f3f37a7..db235c7e7f41 100644
--- a/src/main/java/org/jabref/model/entry/field/SpecialField.java
+++ b/src/main/java/org/jabref/model/entry/field/SpecialField.java
@@ -1,5 +1,7 @@
 package org.jabref.model.entry.field;
 
+import org.jabref.model.entry.KeywordList;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
@@ -7,43 +9,34 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.jabref.model.entry.KeywordList;
-
 public enum SpecialField implements Field {
+    PRINTED("printed", SpecialFieldValue.PRINTED),
 
-    PRINTED("printed",
-            SpecialFieldValue.PRINTED
-    ),
-
-    PRIORITY("priority",
+    PRIORITY(
+            "priority",
             SpecialFieldValue.CLEAR_PRIORITY,
             SpecialFieldValue.PRIORITY_HIGH,
             SpecialFieldValue.PRIORITY_MEDIUM,
-            SpecialFieldValue.PRIORITY_LOW
-    ),
+            SpecialFieldValue.PRIORITY_LOW),
 
-    QUALITY("qualityassured",
-            SpecialFieldValue.QUALITY_ASSURED
-    ),
+    QUALITY("qualityassured", SpecialFieldValue.QUALITY_ASSURED),
 
-    RANKING("ranking",
+    RANKING(
+            "ranking",
             SpecialFieldValue.CLEAR_RANK,
             SpecialFieldValue.RANK_1,
             SpecialFieldValue.RANK_2,
             SpecialFieldValue.RANK_3,
             SpecialFieldValue.RANK_4,
-            SpecialFieldValue.RANK_5
-    ),
+            SpecialFieldValue.RANK_5),
 
-    READ_STATUS("readstatus",
+    READ_STATUS(
+            "readstatus",
             SpecialFieldValue.CLEAR_READ_STATUS,
             SpecialFieldValue.READ,
-            SpecialFieldValue.SKIMMED
-    ),
+            SpecialFieldValue.SKIMMED),
 
-    RELEVANCE("relevance",
-            SpecialFieldValue.RELEVANT
-    );
+    RELEVANCE("relevance", SpecialFieldValue.RELEVANT);
 
     private final List<SpecialFieldValue> values;
     private final KeywordList keywords;
@@ -72,8 +65,8 @@ public KeywordList getKeyWords() {
 
     public static Optional<SpecialField> fromName(String name) {
         return Arrays.stream(SpecialField.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+                .filter(field -> field.getName().equalsIgnoreCase(name))
+                .findAny();
     }
 
     public boolean isSingleValueField() {
diff --git a/src/main/java/org/jabref/model/entry/field/SpecialFieldValue.java b/src/main/java/org/jabref/model/entry/field/SpecialFieldValue.java
index 6c3337b41f69..5abdd2ae7dfb 100644
--- a/src/main/java/org/jabref/model/entry/field/SpecialFieldValue.java
+++ b/src/main/java/org/jabref/model/entry/field/SpecialFieldValue.java
@@ -1,11 +1,10 @@
 package org.jabref.model.entry.field;
 
-import java.util.Optional;
-
 import org.jabref.model.entry.Keyword;
 
-public enum SpecialFieldValue {
+import java.util.Optional;
 
+public enum SpecialFieldValue {
     PRINTED("printed"),
 
     CLEAR_PRIORITY(null),
diff --git a/src/main/java/org/jabref/model/entry/field/StandardField.java b/src/main/java/org/jabref/model/entry/field/StandardField.java
index 842883ff6826..83d9d23abb38 100644
--- a/src/main/java/org/jabref/model/entry/field/StandardField.java
+++ b/src/main/java/org/jabref/model/entry/field/StandardField.java
@@ -1,5 +1,7 @@
 package org.jabref.model.entry.field;
 
+import org.jabref.gui.fieldeditors.FieldNameLabel;
+
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Locale;
@@ -7,8 +9,6 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.jabref.gui.fieldeditors.FieldNameLabel;
-
 /**
  * Standard BibTeX and BibLaTeX fields, as well as "normal" JabRef specific fields.
  * <p>
@@ -32,7 +32,8 @@ public enum StandardField implements Field {
     BOOKTITLEADDON("booktitleaddon"),
     CHAPTER("chapter"),
     COMMENTATOR("commentator", FieldProperty.PERSON_NAMES),
-    // Comments of users are handled at {@link org.jabref.model.entry.field.UserSpecificCommentField}
+    // Comments of users are handled at {@link
+    // org.jabref.model.entry.field.UserSpecificCommentField}
     COMMENT("comment", FieldProperty.MULTILINE_TEXT, FieldProperty.MARKDOWN),
     CROSSREF("crossref", FieldProperty.SINGLE_ENTRY_LINK),
     CITES("cites", FieldProperty.MULTIPLE_ENTRY_LINK),
@@ -141,7 +142,8 @@ public enum StandardField implements Field {
     CREATIONDATE("creationdate", FieldProperty.DATE),
     MODIFICATIONDATE("modificationdate", FieldProperty.DATE);
 
-    public static final Set<Field> AUTOMATIC_FIELDS = Set.of(OWNER, TIMESTAMP, CREATIONDATE, MODIFICATIONDATE);
+    public static final Set<Field> AUTOMATIC_FIELDS =
+            Set.of(OWNER, TIMESTAMP, CREATIONDATE, MODIFICATIONDATE);
 
     private static final Map<String, StandardField> NAME_TO_STANDARD_FIELD = new HashMap<>();
 
diff --git a/src/main/java/org/jabref/model/entry/field/UnknownField.java b/src/main/java/org/jabref/model/entry/field/UnknownField.java
index 5e4ff7bc39db..974af50ec90a 100644
--- a/src/main/java/org/jabref/model/entry/field/UnknownField.java
+++ b/src/main/java/org/jabref/model/entry/field/UnknownField.java
@@ -1,11 +1,11 @@
 package org.jabref.model.entry.field;
 
+import org.jabref.model.strings.StringUtil;
+
 import java.util.EnumSet;
 import java.util.Locale;
 import java.util.Objects;
 
-import org.jabref.model.strings.StringUtil;
-
 public class UnknownField implements Field {
     private String name;
     private final EnumSet<FieldProperty> properties;
@@ -25,7 +25,8 @@ public UnknownField(String name, FieldProperty first, FieldProperty... rest) {
         this(name, StringUtil.capitalizeFirst(name), first, rest);
     }
 
-    public UnknownField(String name, String displayName, FieldProperty first, FieldProperty... rest) {
+    public UnknownField(
+            String name, String displayName, FieldProperty first, FieldProperty... rest) {
         this.name = name;
         this.displayName = displayName;
         this.properties = EnumSet.of(first, rest);
@@ -78,8 +79,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "UnknownField{" +
-               "name='" + name + '\'' +
-               '}';
+        return "UnknownField{" + "name='" + name + '\'' + '}';
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java b/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java
index 89e437e2e2f5..b2b07b2febe8 100644
--- a/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java
+++ b/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java
@@ -4,7 +4,8 @@
 import java.util.Objects;
 
 public class UserSpecificCommentField implements Field {
-    private static final EnumSet<FieldProperty> PROPERTIES = EnumSet.of(FieldProperty.MULTILINE_TEXT, FieldProperty.MARKDOWN);
+    private static final EnumSet<FieldProperty> PROPERTIES =
+            EnumSet.of(FieldProperty.MULTILINE_TEXT, FieldProperty.MARKDOWN);
     private final String name;
 
     public UserSpecificCommentField(String username) {
@@ -44,8 +45,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "UnknownCommentField{" +
-                "name='" + name + '\'' +
-                '}';
+        return "UnknownCommentField{" + "name='" + name + '\'' + '}';
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java b/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
index 01a9e74270f2..9d5eaa1755d7 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
@@ -1,5 +1,9 @@
 package org.jabref.model.entry.identifier;
 
+import org.jabref.model.strings.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Objects;
@@ -7,11 +11,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.model.strings.StringUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Identifier for the arXiv. See https://arxiv.org/help/arxiv_identifier
  */
@@ -39,13 +38,21 @@ public class ArXivIdentifier extends EprintIdentifier {
 
     public static Optional<ArXivIdentifier> parse(String value) {
         String identifier = value.replace(" ", "");
-        Pattern identifierPattern = Pattern.compile("(" + ARXIV_PREFIX + ")?\\s?:?\\s?(?<id>\\d{4}\\.\\d{4,5})(v(?<version>\\d+))?\\s?(\\[(?<classification>\\S+)\\])?");
+        Pattern identifierPattern =
+                Pattern.compile(
+                        "("
+                                + ARXIV_PREFIX
+                                + ")?\\s?:?\\s?(?<id>\\d{4}\\.\\d{4,5})(v(?<version>\\d+))?\\s?(\\[(?<classification>\\S+)\\])?");
         Matcher identifierMatcher = identifierPattern.matcher(identifier);
         if (identifierMatcher.matches()) {
             return getArXivIdentifier(identifierMatcher);
         }
 
-        Pattern oldIdentifierPattern = Pattern.compile("(" + ARXIV_PREFIX + ")?\\s?:?\\s?(?<id>(?<classification>[a-z\\-]+(\\.[A-Z]{2})?)/\\d{7})(v(?<version>\\d+))?");
+        Pattern oldIdentifierPattern =
+                Pattern.compile(
+                        "("
+                                + ARXIV_PREFIX
+                                + ")?\\s?:?\\s?(?<id>(?<classification>[a-z\\-]+(\\.[A-Z]{2})?)/\\d{7})(v(?<version>\\d+))?");
         Matcher oldIdentifierMatcher = oldIdentifierPattern.matcher(identifier);
         if (oldIdentifierMatcher.matches()) {
             return getArXivIdentifier(oldIdentifierMatcher);
@@ -93,10 +100,14 @@ public Optional<DOI> inferDOI() {
 
     @Override
     public String toString() {
-        return "ArXivIdentifier{" +
-                "identifier='" + identifier + '\'' +
-                ", classification='" + classification + '\'' +
-                '}';
+        return "ArXivIdentifier{"
+                + "identifier='"
+                + identifier
+                + '\''
+                + ", classification='"
+                + classification
+                + '\''
+                + '}';
     }
 
     @Override
@@ -109,8 +120,8 @@ public boolean equals(Object o) {
         }
 
         ArXivIdentifier that = (ArXivIdentifier) o;
-        return Objects.equals(identifier, that.identifier) &&
-                Objects.equals(classification, that.classification);
+        return Objects.equals(identifier, that.identifier)
+                && Objects.equals(classification, that.classification);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/identifier/DOI.java b/src/main/java/org/jabref/model/entry/identifier/DOI.java
index a8c0f7533c0b..1f04c8d5a851 100644
--- a/src/main/java/org/jabref/model/entry/identifier/DOI.java
+++ b/src/main/java/org/jabref/model/entry/identifier/DOI.java
@@ -1,5 +1,12 @@
 package org.jabref.model.entry.identifier;
 
+import org.jabref.architecture.AllowedToUseLogic;
+import org.jabref.logic.layout.format.LatexToUnicodeFormatter;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URLDecoder;
@@ -10,18 +17,11 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.architecture.AllowedToUseLogic;
-import org.jabref.logic.layout.format.LatexToUnicodeFormatter;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.StandardField;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Class for working with <a href="https://en.wikipedia.org/wiki/Digital_object_identifier">Digital object identifiers (DOIs)</a> and <a href="http://shortdoi.org">Short DOIs</a>
  */
-@AllowedToUseLogic("because we want to have this class 'smart' an be able to parse obscure DOIs, too. For this, we need the LatexToUnicodeformatter.")
+@AllowedToUseLogic(
+        "because we want to have this class 'smart' an be able to parse obscure DOIs, too. For this, we need the LatexToUnicodeformatter.")
 public class DOI implements Identifier {
 
     public static final URI AGENCY_RESOLVER = URI.create("https://doi.org/doiRA");
@@ -31,78 +31,110 @@ public class DOI implements Identifier {
 
     // Regex
     // (see http://www.doi.org/doi_handbook/2_Numbering.html)
-    private static final String DOI_EXP = ""
-            + "(?:urn:)?"                       // optional urn
-            + "(?:doi:)?"                       // optional doi
-            + "("                               // begin group \1
-            + "10"                              // directory indicator
-            + "(?:\\.[0-9]+)+"                  // registrant codes
-            + "[/:%]"                           // divider
-            + "(?:.+)"                          // suffix alphanumeric string
-            + ")";                              // end group \1
-    private static final String FIND_DOI_EXP = ""
-            + "(?:urn:)?"                       // optional urn
-            + "(?:doi:)?"                       // optional doi
-            + "("                               // begin group \1
-            + "10"                              // directory indicator
-            + "(?:\\.[0-9]+)+"                  // registrant codes
-            + "[/:]"                            // divider
-            + "(?:[^\\s,]+[^,;(\\.\\s)])"       // suffix alphanumeric without " "/"," and not ending on "."/","/";"
-            + ")";                              // end group \1
+    private static final String DOI_EXP =
+            ""
+                    + "(?:urn:)?" // optional urn
+                    + "(?:doi:)?" // optional doi
+                    + "(" // begin group \1
+                    + "10" // directory indicator
+                    + "(?:\\.[0-9]+)+" // registrant codes
+                    + "[/:%]" // divider
+                    + "(?:.+)" // suffix alphanumeric string
+                    + ")"; // end group \1
+    private static final String FIND_DOI_EXP =
+            ""
+                    + "(?:urn:)?" // optional urn
+                    + "(?:doi:)?" // optional doi
+                    + "(" // begin group \1
+                    + "10" // directory indicator
+                    + "(?:\\.[0-9]+)+" // registrant codes
+                    + "[/:]" // divider
+                    + "(?:[^\\s,]+[^,;(\\.\\s)])" // suffix alphanumeric without " "/"," and not
+                                                  // ending on "."/","/";"
+                    + ")"; // end group \1
 
     // Regex (Short DOI)
-    private static final String SHORT_DOI_SHORTCUT = ""
-            + "^\\s*(?:https?://)?(?:www\\.)?(?:doi\\.org/)([a-z0-9]{4,10})\\s*$"; // eg https://doi.org/bfrhmx
-    private static final String IN_TEXT_SHORT_DOI_SHORTCUT = ""
-            + "(?:https?://)?(?:www\\.)?(?:doi\\.org/)([a-z0-9]{4,10})"; // eg https://doi.org/bfrhmx somewhere in the text
-    private static final String SHORT_DOI_EXP_PREFIX = ""
-            + "^(?:" // can begin with...
-            + "\\s*(?:https?://)?(?:www\\.)?"   // optional url parts "http(s)://"+"www."
-            + "[a-zA-Z\\.]*doi[a-zA-Z\\.]*"     //  eg "dx.doi." or "doi.acm." or "doi." if with url, must include "doi", otherwise too ambiguous
-            + "\\.[a-zA-Z]{2,10}/)?";           // ".org" or ".de" or ".academy"
-    private static final String SHORT_DOI_EXP = ""
-            + "(?:"                             // begin "any one of these"
-            + "(?:[\\s/]?(?:(?:urn:)|(?:doi:)|(?:urn:doi:)))" // "doi:10/12ab" or " urn:10/12ab" or "/urn:doi:/10/12ab" ...
-            + "|(?:\\s?/?)"                     // or "/10/12ab" or " /10/12ab" or "10/12ab" or " 10/12ab"
-            + ")"                               // end "any one of these"
-            + "("                               // begin group \1
-            + "10"                              // directory indicator
-            + "[/%:]"                           // divider
-            + "[a-zA-Z0-9]{3,}"                 // at least 3 characters
-            + ")"                               // end group  \1
-            + "\\s*$";                          // must be the end
-    private static final String FIND_SHORT_DOI_EXP = ""
-            + "(?:"                             // begin "any one of these" (but not none of those!)
-            + "(?:(?:www\\.)?doi\\.org/)"       // either doi.org
-            + "|"                               // or any of the following with doi.org or not...
-            + "(?:(?:doi.org/)?(?:(?:urn:)|(?:doi:)|(?:urn:doi:)))" // "doi:10/12ab" or " urn:10/12ab" or "/urn:doi:/10/12ab" or "doi.org/doi:10/12ab"...
-            + ")"                               // end "any one of these"
-            + "("                               // begin group \1
-            + "10"                              // directory indicator
-            + "[/%:]"                           // divider
-            + "[a-zA-Z0-9]{3,}"                 // at least 3 characters
-            + ")";                              // end group  \1
+    private static final String SHORT_DOI_SHORTCUT =
+            ""
+                    + "^\\s*(?:https?://)?(?:www\\.)?(?:doi\\.org/)([a-z0-9]{4,10})\\s*$"; // eg
+                                                                                           // https://doi.org/bfrhmx
+    private static final String IN_TEXT_SHORT_DOI_SHORTCUT =
+            ""
+                    + "(?:https?://)?(?:www\\.)?(?:doi\\.org/)([a-z0-9]{4,10})"; // eg
+                                                                                 // https://doi.org/bfrhmx somewhere in the text
+    private static final String SHORT_DOI_EXP_PREFIX =
+            ""
+                    + "^(?:" // can begin with...
+                    + "\\s*(?:https?://)?(?:www\\.)?" // optional url parts "http(s)://"+"www."
+                    + "[a-zA-Z\\.]*doi[a-zA-Z\\.]*" //  eg "dx.doi." or "doi.acm." or "doi." if with
+                                                    // url, must include "doi", otherwise too
+                                                    // ambiguous
+                    + "\\.[a-zA-Z]{2,10}/)?"; // ".org" or ".de" or ".academy"
+    private static final String SHORT_DOI_EXP =
+            ""
+                    + "(?:" // begin "any one of these"
+                    + "(?:[\\s/]?(?:(?:urn:)|(?:doi:)|(?:urn:doi:)))" // "doi:10/12ab" or "
+                                                                      // urn:10/12ab" or
+                                                                      // "/urn:doi:/10/12ab" ...
+                    + "|(?:\\s?/?)" // or "/10/12ab" or " /10/12ab" or "10/12ab" or " 10/12ab"
+                    + ")" // end "any one of these"
+                    + "(" // begin group \1
+                    + "10" // directory indicator
+                    + "[/%:]" // divider
+                    + "[a-zA-Z0-9]{3,}" // at least 3 characters
+                    + ")" // end group  \1
+                    + "\\s*$"; // must be the end
+    private static final String FIND_SHORT_DOI_EXP =
+            ""
+                    + "(?:" // begin "any one of these" (but not none of those!)
+                    + "(?:(?:www\\.)?doi\\.org/)" // either doi.org
+                    + "|" // or any of the following with doi.org or not...
+                    + "(?:(?:doi.org/)?(?:(?:urn:)|(?:doi:)|(?:urn:doi:)))" // "doi:10/12ab" or "
+                                                                            // urn:10/12ab" or
+                                                                            // "/urn:doi:/10/12ab"
+                                                                            // or
+                                                                            // "doi.org/doi:10/12ab"...
+                    + ")" // end "any one of these"
+                    + "(" // begin group \1
+                    + "10" // directory indicator
+                    + "[/%:]" // divider
+                    + "[a-zA-Z0-9]{3,}" // at least 3 characters
+                    + ")"; // end group  \1
 
     private static final String HTTP_EXP = "https?://[^\\s]+?" + DOI_EXP;
     private static final String SHORT_DOI_HTTP_EXP = "https?://[^\\s]+?" + SHORT_DOI_EXP;
     // Pattern
-    private static final Pattern EXACT_DOI_PATT = Pattern.compile("^(?:https?://[^\\s]+?)?" + DOI_EXP + "$", Pattern.CASE_INSENSITIVE);
-    private static final Pattern FIND_DOI_PATT = Pattern.compile("(?:https?://[^\\s]+?)?" + FIND_DOI_EXP, Pattern.CASE_INSENSITIVE);
+    private static final Pattern EXACT_DOI_PATT =
+            Pattern.compile("^(?:https?://[^\\s]+?)?" + DOI_EXP + "$", Pattern.CASE_INSENSITIVE);
+    private static final Pattern FIND_DOI_PATT =
+            Pattern.compile("(?:https?://[^\\s]+?)?" + FIND_DOI_EXP, Pattern.CASE_INSENSITIVE);
     // Pattern (short DOI)
-    private static final Pattern EXACT_SHORT_DOI_SHORTCUT = Pattern.compile(SHORT_DOI_SHORTCUT, Pattern.CASE_INSENSITIVE); // eg doi.org/bfrhmx (no "10/")
-    private static final Pattern FIND_SHORT_DOI_SHORTCUT = Pattern.compile(IN_TEXT_SHORT_DOI_SHORTCUT, Pattern.CASE_INSENSITIVE); // eg doi.org/bfrhmx (no "10/")
-    private static final Pattern EXACT_SHORT_DOI_PATT = Pattern.compile(SHORT_DOI_EXP_PREFIX + SHORT_DOI_EXP, Pattern.CASE_INSENSITIVE);
-    private static final Pattern FIND_SHORT_DOI_PATT = Pattern.compile("(?:https?://[^\\s]+?)?" + FIND_SHORT_DOI_EXP, Pattern.CASE_INSENSITIVE);
+    private static final Pattern EXACT_SHORT_DOI_SHORTCUT =
+            Pattern.compile(
+                    SHORT_DOI_SHORTCUT, Pattern.CASE_INSENSITIVE); // eg doi.org/bfrhmx (no "10/")
+    private static final Pattern FIND_SHORT_DOI_SHORTCUT =
+            Pattern.compile(
+                    IN_TEXT_SHORT_DOI_SHORTCUT,
+                    Pattern.CASE_INSENSITIVE); // eg doi.org/bfrhmx (no "10/")
+    private static final Pattern EXACT_SHORT_DOI_PATT =
+            Pattern.compile(SHORT_DOI_EXP_PREFIX + SHORT_DOI_EXP, Pattern.CASE_INSENSITIVE);
+    private static final Pattern FIND_SHORT_DOI_PATT =
+            Pattern.compile(
+                    "(?:https?://[^\\s]+?)?" + FIND_SHORT_DOI_EXP, Pattern.CASE_INSENSITIVE);
 
     // See https://www.baeldung.com/java-regex-s-splus for explanation of \\s+
-    // See https://stackoverflow.com/questions/3203190/regex-any-ascii-character for the regexp that includes ASCII characters only
-    // Another reference for regexp for ASCII characters: https://howtodoinjava.com/java/regex/java-clean-ascii-text-non-printable-chars/
-    private static final String CHARS_TO_REMOVE = "[\\s+" // remove white space characters, i.e, \t, \n, \x0B, \f, \r . + is a greedy quantifier
-            + "\\\\" // remove backslashes
-            + "{}" // remove curly brackets
-            + "\\[\\]`|" // remove square brackets, backticks, and pipes
-            + "[^\\x00-\\x7F]" // strips off all non-ASCII characters
-            + "]";
+    // See https://stackoverflow.com/questions/3203190/regex-any-ascii-character for the regexp that
+    // includes ASCII characters only
+    // Another reference for regexp for ASCII characters:
+    // https://howtodoinjava.com/java/regex/java-clean-ascii-text-non-printable-chars/
+    private static final String CHARS_TO_REMOVE =
+            "[\\s+" // remove white space characters, i.e, \t, \n, \x0B, \f, \r . + is a greedy
+                    // quantifier
+                    + "\\\\" // remove backslashes
+                    + "{}" // remove curly brackets
+                    + "\\[\\]`|" // remove square brackets, backticks, and pipes
+                    + "[^\\x00-\\x7F]" // strips off all non-ASCII characters
+                    + "]";
 
     // DOI
     private final String doi;
@@ -146,7 +178,8 @@ public DOI(String doi) {
                     this.doi = "10/" + shortcutDoiMatcher.group(1);
                     isShortDoi = true;
                 } else {
-                    throw new IllegalArgumentException(trimmedDoi + " is not a valid DOI/Short DOI.");
+                    throw new IllegalArgumentException(
+                            trimmedDoi + " is not a valid DOI/Short DOI.");
                 }
             }
         }
@@ -165,7 +198,8 @@ public static Optional<DOI> parse(String doi) {
             LatexToUnicodeFormatter formatter = new LatexToUnicodeFormatter();
             String cleanedDOI = doi;
             cleanedDOI = URLDecoder.decode(cleanedDOI, StandardCharsets.UTF_8);
-            // needs to be handled before LatexToUnicode, because otherwise `^` will be treated as conversion superscript
+            // needs to be handled before LatexToUnicode, because otherwise `^` will be treated as
+            // conversion superscript
             cleanedDOI = cleanedDOI.replaceAll("\\^", "");
             cleanedDOI = formatter.format(cleanedDOI);
             cleanedDOI = cleanedDOI.replaceAll(CHARS_TO_REMOVE, "");
@@ -223,9 +257,7 @@ public static Optional<DOI> findInText(String text) {
 
     @Override
     public String toString() {
-        return "DOI{" +
-                "doi='" + doi + '\'' +
-                '}';
+        return "DOI{" + "doi='" + doi + '\'' + '}';
     }
 
     /**
@@ -253,7 +285,8 @@ public boolean isShortDoi() {
      */
     @Override
     public Optional<URI> getExternalURI() {
-        // TODO: We need dependency injection here. It should never happen that this method is called.
+        // TODO: We need dependency injection here. It should never happen that this method is
+        // called.
         //       Always, the user preferences should be honored --> #getExternalURIWithCustomBase
         return getExternalURIFromBase(RESOLVER);
     }
diff --git a/src/main/java/org/jabref/model/entry/identifier/ISBN.java b/src/main/java/org/jabref/model/entry/identifier/ISBN.java
index 962f3459de76..6b32d7adb90e 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ISBN.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ISBN.java
@@ -1,5 +1,8 @@
 package org.jabref.model.entry.identifier;
 
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Locale;
@@ -8,9 +11,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.StandardField;
-
 public class ISBN implements Identifier {
 
     private static final Pattern ISBN_PATTERN = Pattern.compile("^(\\d{9}[\\dxX]|\\d{13})$");
@@ -54,7 +54,8 @@ public boolean isIsbn13() {
         return isbn13check();
     }
 
-    // Check that the control digit is correct, see e.g. https://en.wikipedia.org/wiki/International_Standard_Book_Number#Check_digits
+    // Check that the control digit is correct, see e.g.
+    // https://en.wikipedia.org/wiki/International_Standard_Book_Number#Check_digits
     private boolean isbn10check() {
         if (isbnString.length() != 10) {
             return false;
@@ -72,7 +73,8 @@ private boolean isbn10check() {
         return (sum % 11) == 0;
     }
 
-    // Check that the control digit is correct, see e.g. https://en.wikipedia.org/wiki/International_Standard_Book_Number#Check_digits
+    // Check that the control digit is correct, see e.g.
+    // https://en.wikipedia.org/wiki/International_Standard_Book_Number#Check_digits
     private boolean isbn13check() {
         if (isbnString.length() != 13) {
             return false;
diff --git a/src/main/java/org/jabref/model/entry/identifier/ISSN.java b/src/main/java/org/jabref/model/entry/identifier/ISSN.java
index 7050a74687ce..716f39947c67 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ISSN.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ISSN.java
@@ -1,14 +1,14 @@
 package org.jabref.model.entry.identifier;
 
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+
 import java.net.URI;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.StandardField;
-
 public class ISSN implements Identifier {
 
     private static final Pattern ISSN_PATTERN = Pattern.compile("^\\d{4}-\\d{3}[\\dxX]$");
@@ -39,7 +39,8 @@ public String getCleanedISSN() {
     }
 
     public boolean isValidChecksum() {
-        // Check that the control digit is correct, see e.g. https://en.wikipedia.org/wiki/International_Standard_Serial_Number
+        // Check that the control digit is correct, see e.g.
+        // https://en.wikipedia.org/wiki/International_Standard_Serial_Number
         int sum = 0;
         for (int pos = 0; pos <= 7; pos++) {
             char c = issnString.charAt(pos);
diff --git a/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java b/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java
index 165596e2020b..b8d9da5884b9 100644
--- a/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java
+++ b/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java
@@ -1,5 +1,10 @@
 package org.jabref.model.entry.identifier;
 
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Objects;
@@ -7,12 +12,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.StandardField;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class IacrEprint implements Identifier {
     public static final URI RESOLVER = URI.create("https://ia.cr");
     private static final Logger LOGGER = LoggerFactory.getLogger(IacrEprint.class);
@@ -30,14 +29,14 @@ public class IacrEprint implements Identifier {
             matcher.find();
             this.iacrEprint = matcher.group(0);
         } else {
-            throw new IllegalArgumentException(trimmedId + " is not a valid IacrEprint identifier.");
+            throw new IllegalArgumentException(
+                    trimmedId + " is not a valid IacrEprint identifier.");
         }
     }
 
     private static boolean matchesExcepted(String identifier) {
         return identifier.matches(
-                "(https\\:\\/\\/)?(ia\\.cr\\/|eprint\\.iacr\\.org\\/)?" + IACR_EPRINT_EXP
-        );
+                "(https\\:\\/\\/)?(ia\\.cr\\/|eprint\\.iacr\\.org\\/)?" + IACR_EPRINT_EXP);
     }
 
     public static Optional<IacrEprint> parse(String identifier) {
diff --git a/src/main/java/org/jabref/model/entry/identifier/Identifier.java b/src/main/java/org/jabref/model/entry/identifier/Identifier.java
index 3a921bfdf6ca..710b98451a16 100644
--- a/src/main/java/org/jabref/model/entry/identifier/Identifier.java
+++ b/src/main/java/org/jabref/model/entry/identifier/Identifier.java
@@ -1,10 +1,10 @@
 package org.jabref.model.entry.identifier;
 
+import org.jabref.model.entry.field.Field;
+
 import java.net.URI;
 import java.util.Optional;
 
-import org.jabref.model.entry.field.Field;
-
 public interface Identifier {
 
     /**
diff --git a/src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java b/src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java
index df7fa8eb941e..b64f095f8c9d 100644
--- a/src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java
+++ b/src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java
@@ -1,14 +1,14 @@
 package org.jabref.model.entry.identifier;
 
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.strings.StringUtil;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Objects;
 import java.util.Optional;
 
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.strings.StringUtil;
-
 /**
  * Article identifier for MathSciNet (also sometimes called "MRNumber")
  */
@@ -21,7 +21,8 @@ public MathSciNetId(String identifier) {
     }
 
     public static Optional<MathSciNetId> parse(String mrNumberRaw) {
-        // Take everything before whitespace or open bracket, so something like `619693 (82j:58046)` gets parsed correctly
+        // Take everything before whitespace or open bracket, so something like `619693 (82j:58046)`
+        // gets parsed correctly
         String identifier = StringUtil.tokenizeToList(mrNumberRaw, " (").getFirst().trim();
         return Optional.of(new MathSciNetId(identifier));
     }
diff --git a/src/main/java/org/jabref/model/entry/types/BiblatexAPAEntryTypeDefinitions.java b/src/main/java/org/jabref/model/entry/types/BiblatexAPAEntryTypeDefinitions.java
index f5c0b89b0be4..0a7e7630cf82 100644
--- a/src/main/java/org/jabref/model/entry/types/BiblatexAPAEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/BiblatexAPAEntryTypeDefinitions.java
@@ -1,43 +1,83 @@
 package org.jabref.model.entry.types;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypeBuilder;
 import org.jabref.model.entry.field.BiblatexApaField;
 import org.jabref.model.entry.field.StandardField;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class BiblatexAPAEntryTypeDefinitions {
 
-    private static final BibEntryType JURISDICTION = new BibEntryTypeBuilder()
-            .withType(BiblatexApaEntryType.Jurisdiction)
-            .withImportantFields(StandardField.ORGANIZATION, BiblatexApaField.CITATION_CITEORG, BiblatexApaField.CITATION_CITEDATE, BiblatexApaField.CITATION_CITEDATE, StandardField.ORIGDATE)
-            .withRequiredFields(StandardField.TITLE, BiblatexApaField.CITATION, BiblatexApaField.CITATION_CITEINFO, StandardField.URL, StandardField.DATE)
-            .build();
-
-    private static final BibEntryType LEGISLATION = new BibEntryTypeBuilder()
-            .withType(BiblatexApaEntryType.Legislation)
-            .withImportantFields(StandardField.TITLEADDON, StandardField.ORIGDATE)
-            .withRequiredFields(StandardField.TITLE, StandardField.LOCATION, StandardField.URL, StandardField.DATE)
-            .build();
-
-    private static final BibEntryType LEGADMINMATERIAL = new BibEntryTypeBuilder()
-            .withType(BiblatexApaEntryType.Legadminmaterial)
-            .withImportantFields(StandardField.NUMBER, StandardField.SHORTTITLE, StandardField.NOTE, StandardField.KEYWORDS)
-            .withRequiredFields(StandardField.TITLE, BiblatexApaField.CITATION, StandardField.URL, StandardField.DATE)
-            .build();
-
-    private static final BibEntryType CONSTITUTION = new BibEntryTypeBuilder()
-            .withType(BiblatexApaEntryType.Constitution)
-            .withImportantFields(BiblatexApaField.ARTICLE, BiblatexApaField.AMENDMENT, StandardField.EVENTDATE, StandardField.KEYWORDS, StandardField.PART, BiblatexApaField.SECTION)
-            .withRequiredFields(BiblatexApaField.SOURCE, StandardField.TYPE)
-            .build();
-
-    private static final BibEntryType LEGAL = new BibEntryTypeBuilder()
-        .withType(BiblatexApaEntryType.Legal)
-        .withRequiredFields(StandardField.TITLE, StandardField.DATE, StandardField.URI, StandardField.KEYWORDS, StandardField.PART, BiblatexApaField.SECTION)
-        .build();
-
-    public static final List<BibEntryType> ALL = Arrays.asList(JURISDICTION, LEGISLATION, LEGADMINMATERIAL, CONSTITUTION, LEGAL);
+    private static final BibEntryType JURISDICTION =
+            new BibEntryTypeBuilder()
+                    .withType(BiblatexApaEntryType.Jurisdiction)
+                    .withImportantFields(
+                            StandardField.ORGANIZATION,
+                            BiblatexApaField.CITATION_CITEORG,
+                            BiblatexApaField.CITATION_CITEDATE,
+                            BiblatexApaField.CITATION_CITEDATE,
+                            StandardField.ORIGDATE)
+                    .withRequiredFields(
+                            StandardField.TITLE,
+                            BiblatexApaField.CITATION,
+                            BiblatexApaField.CITATION_CITEINFO,
+                            StandardField.URL,
+                            StandardField.DATE)
+                    .build();
+
+    private static final BibEntryType LEGISLATION =
+            new BibEntryTypeBuilder()
+                    .withType(BiblatexApaEntryType.Legislation)
+                    .withImportantFields(StandardField.TITLEADDON, StandardField.ORIGDATE)
+                    .withRequiredFields(
+                            StandardField.TITLE,
+                            StandardField.LOCATION,
+                            StandardField.URL,
+                            StandardField.DATE)
+                    .build();
+
+    private static final BibEntryType LEGADMINMATERIAL =
+            new BibEntryTypeBuilder()
+                    .withType(BiblatexApaEntryType.Legadminmaterial)
+                    .withImportantFields(
+                            StandardField.NUMBER,
+                            StandardField.SHORTTITLE,
+                            StandardField.NOTE,
+                            StandardField.KEYWORDS)
+                    .withRequiredFields(
+                            StandardField.TITLE,
+                            BiblatexApaField.CITATION,
+                            StandardField.URL,
+                            StandardField.DATE)
+                    .build();
+
+    private static final BibEntryType CONSTITUTION =
+            new BibEntryTypeBuilder()
+                    .withType(BiblatexApaEntryType.Constitution)
+                    .withImportantFields(
+                            BiblatexApaField.ARTICLE,
+                            BiblatexApaField.AMENDMENT,
+                            StandardField.EVENTDATE,
+                            StandardField.KEYWORDS,
+                            StandardField.PART,
+                            BiblatexApaField.SECTION)
+                    .withRequiredFields(BiblatexApaField.SOURCE, StandardField.TYPE)
+                    .build();
+
+    private static final BibEntryType LEGAL =
+            new BibEntryTypeBuilder()
+                    .withType(BiblatexApaEntryType.Legal)
+                    .withRequiredFields(
+                            StandardField.TITLE,
+                            StandardField.DATE,
+                            StandardField.URI,
+                            StandardField.KEYWORDS,
+                            StandardField.PART,
+                            BiblatexApaField.SECTION)
+                    .build();
+
+    public static final List<BibEntryType> ALL =
+            Arrays.asList(JURISDICTION, LEGISLATION, LEGADMINMATERIAL, CONSTITUTION, LEGAL);
 }
diff --git a/src/main/java/org/jabref/model/entry/types/BiblatexApaEntryType.java b/src/main/java/org/jabref/model/entry/types/BiblatexApaEntryType.java
index 6a1d8d3abe2f..11993cde2ba2 100644
--- a/src/main/java/org/jabref/model/entry/types/BiblatexApaEntryType.java
+++ b/src/main/java/org/jabref/model/entry/types/BiblatexApaEntryType.java
@@ -5,7 +5,6 @@
 import java.util.Optional;
 
 public enum BiblatexApaEntryType implements EntryType {
-
     Legislation("Legislation"),
     Legadminmaterial("Legadminmaterial"),
     Jurisdiction("Jurisdiction"),
@@ -30,7 +29,7 @@ public String getDisplayName() {
 
     public static Optional<BiblatexApaEntryType> fromName(String name) {
         return Arrays.stream(BiblatexApaEntryType.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+                .filter(field -> field.getName().equalsIgnoreCase(name))
+                .findAny();
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitions.java b/src/main/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitions.java
index 40c79b8b31d7..1c4509c22829 100644
--- a/src/main/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitions.java
@@ -1,13 +1,13 @@
 package org.jabref.model.entry.types;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypeBuilder;
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.StandardField;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * This class defines entry types for biblatex support.
  * It is based on the <a href="https://texdoc.org/serve/biblatex.pdf/0">biblatex documentation</a>
@@ -16,401 +16,975 @@
  */
 public class BiblatexEntryTypeDefinitions {
 
-    private static final BibEntryType ARTICLE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Article)
-            .withRequiredFields(
-                    StandardField.AUTHOR, StandardField.TITLE, StandardField.JOURNALTITLE, StandardField.DATE)
-            .withImportantFields(
-                    StandardField.SUBTITLE, StandardField.EDITOR, StandardField.SERIES, StandardField.VOLUME, StandardField.NUMBER,
-                    StandardField.EID, StandardField.ISSUE, StandardField.PAGES, StandardField.NOTE, StandardField.ISSN, StandardField.DOI,
-                    StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(
-                    StandardField.TRANSLATOR, StandardField.ANNOTATOR, StandardField.COMMENTATOR,
-                    StandardField.TITLEADDON, StandardField.EDITORA, StandardField.EDITORB, StandardField.EDITORC,
-                    StandardField.JOURNALSUBTITLE, StandardField.ISSUETITLE, StandardField.ISSUESUBTITLE, StandardField.LANGUAGE,
-                    StandardField.ORIGLANGUAGE, StandardField.VERSION,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType BOOK = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Book)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.DATE)
-            .withImportantFields(StandardField.EDITOR,
-                    StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.MAINTITLE, StandardField.MAINSUBTITLE,
-                    StandardField.MAINTITLEADDON, StandardField.VOLUME, StandardField.EDITION, StandardField.PUBLISHER, StandardField.ISBN,
-                    StandardField.CHAPTER, StandardField.PAGES, StandardField.PAGETOTAL, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.EDITORA, StandardField.EDITORB, StandardField.EDITORC,
-                    StandardField.TRANSLATOR, StandardField.ANNOTATOR, StandardField.COMMENTATOR, StandardField.INTRODUCTION,
-                    StandardField.FOREWORD, StandardField.AFTERWORD,
-                    StandardField.LANGUAGE,
-                    StandardField.ORIGLANGUAGE, StandardField.PART, StandardField.VOLUMES,
-                    StandardField.SERIES, StandardField.NUMBER, StandardField.NOTE, StandardField.LOCATION,
-                    StandardField.ADDENDUM,
-                    StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType MVBOOK = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.MvBook)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.DATE)
-            .withImportantFields(StandardField.EDITOR, StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.EDITION,
-                    StandardField.PUBLISHER, StandardField.ISBN, StandardField.PAGETOTAL, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.EDITORA, StandardField.EDITORB, StandardField.EDITORC,
-                    StandardField.TRANSLATOR, StandardField.ANNOTATOR, StandardField.COMMENTATOR, StandardField.INTRODUCTION,
-                    StandardField.FOREWORD, StandardField.AFTERWORD,
-                    StandardField.LANGUAGE, StandardField.ORIGLANGUAGE, StandardField.VOLUMES, StandardField.SERIES,
-                    StandardField.NUMBER, StandardField.NOTE, StandardField.LOCATION,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType INBOOK = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.InBook)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.BOOKTITLE, StandardField.DATE)
-            .withImportantFields(
-                    StandardField.BOOKAUTHOR, StandardField.EDITOR, StandardField.SUBTITLE, StandardField.TITLEADDON,
-                    StandardField.MAINTITLE, StandardField.MAINSUBTITLE, StandardField.MAINTITLEADDON, StandardField.BOOKSUBTITLE,
-                    StandardField.BOOKTITLEADDON, StandardField.VOLUME, StandardField.EDITION, StandardField.PUBLISHER,
-                    StandardField.ISBN, StandardField.CHAPTER, StandardField.PAGES, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.EDITORA, StandardField.EDITORB,
-                    StandardField.EDITORC, StandardField.TRANSLATOR, StandardField.ANNOTATOR, StandardField.COMMENTATOR,
-                    StandardField.INTRODUCTION, StandardField.FOREWORD, StandardField.AFTERWORD,
-                    StandardField.LANGUAGE, StandardField.ORIGLANGUAGE,
-                    StandardField.PART, StandardField.VOLUMES, StandardField.SERIES,
-                    StandardField.NUMBER, StandardField.NOTE, StandardField.LOCATION,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType BOOKINBOOK = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.BookInBook)
-            .withRequiredFields(INBOOK.getRequiredFields())
-            .withImportantFields(INBOOK.getImportantOptionalFields())
-            .withDetailFields(INBOOK.getDetailOptionalFields())
-            .build();
-
-    private static final BibEntryType SUPPBOOK = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.SuppBook)
-            .withImportantFields(INBOOK.getImportantOptionalFields())
-            .withDetailFields(INBOOK.getDetailOptionalFields())
-            .withRequiredFields(INBOOK.getRequiredFields())
-            .build();
-
-    private static final BibEntryType BOOKLET = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Booklet)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.DATE)
-            .withImportantFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.HOWPUBLISHED,
-                    StandardField.CHAPTER, StandardField.PAGES, StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS,
-                    StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.LANGUAGE,
-                    StandardField.TYPE, StandardField.NOTE, StandardField.LOCATION,
-                    StandardField.PAGETOTAL, StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType COLLECTION = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Collection)
-            .withRequiredFields(StandardField.EDITOR, StandardField.TITLE, StandardField.DATE)
-            .withImportantFields(
-                    StandardField.TRANSLATOR, StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.MAINTITLE,
-                    StandardField.MAINSUBTITLE, StandardField.MAINTITLEADDON, StandardField.VOLUME, StandardField.EDITION,
-                    StandardField.PUBLISHER, StandardField.ISBN, StandardField.CHAPTER, StandardField.PAGES, StandardField.DOI,
-                    StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.EDITORA, StandardField.EDITORB, StandardField.EDITORC,
-                    StandardField.ANNOTATOR, StandardField.COMMENTATOR, StandardField.INTRODUCTION, StandardField.FOREWORD,
-                    StandardField.AFTERWORD,
-                    StandardField.LANGUAGE, StandardField.ORIGLANGUAGE,
-                    StandardField.PART, StandardField.VOLUMES, StandardField.SERIES,
-                    StandardField.NUMBER, StandardField.NOTE, StandardField.LOCATION,
-                    StandardField.PAGETOTAL, StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType MVCOLLECTION = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.MvCollection)
-            .withRequiredFields(StandardField.EDITOR, StandardField.TITLE, StandardField.DATE)
-            .withImportantFields(StandardField.TRANSLATOR, StandardField.SUBTITLE, StandardField.TITLEADDON,
-                    StandardField.EDITION, StandardField.PUBLISHER, StandardField.ISBN, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.EDITORA, StandardField.EDITORB, StandardField.EDITORC,
-                    StandardField.ANNOTATOR, StandardField.COMMENTATOR, StandardField.INTRODUCTION, StandardField.FOREWORD,
-                    StandardField.AFTERWORD, StandardField.LANGUAGE,
-                    StandardField.ORIGLANGUAGE, StandardField.VOLUMES, StandardField.SERIES, StandardField.NUMBER,
-                    StandardField.NOTE, StandardField.LOCATION, StandardField.PAGETOTAL,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType INCOLLECTION = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.InCollection)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.BOOKTITLE, StandardField.DATE)
-            .withImportantFields(StandardField.TRANSLATOR, StandardField.SUBTITLE, StandardField.TITLEADDON,
-                    StandardField.MAINTITLE, StandardField.MAINSUBTITLE, StandardField.MAINTITLEADDON, StandardField.BOOKSUBTITLE,
-                    StandardField.BOOKTITLEADDON, StandardField.VOLUME, StandardField.EDITION, StandardField.PUBLISHER,
-                    StandardField.ISBN, StandardField.CHAPTER, StandardField.PAGES, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.EDITOR, StandardField.EDITORA, StandardField.EDITORB, StandardField.EDITORC,
-                    StandardField.ANNOTATOR, StandardField.COMMENTATOR, StandardField.INTRODUCTION,
-                    StandardField.FOREWORD, StandardField.AFTERWORD,
-                    StandardField.LANGUAGE, StandardField.ORIGLANGUAGE,
-                    StandardField.PART, StandardField.VOLUMES, StandardField.SERIES, StandardField.NUMBER,
-                    StandardField.NOTE, StandardField.LOCATION,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType SUPPCOLLECTION = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.SuppCollection)
-            .withRequiredFields(INCOLLECTION.getRequiredFields())
-            .withImportantFields(INCOLLECTION.getImportantOptionalFields())
-            .withDetailFields(INCOLLECTION.getDetailOptionalFields())
-            .build();
-
-    private static final BibEntryType MANUAL = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Manual)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.DATE)
-            .withImportantFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.EDITION, StandardField.PUBLISHER,
-                    StandardField.ISBN, StandardField.CHAPTER, StandardField.PAGES, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.LANGUAGE,
-                    StandardField.TYPE, StandardField.SERIES, StandardField.NUMBER, StandardField.VERSION, StandardField.NOTE,
-                    StandardField.ORGANIZATION, StandardField.LOCATION,
-                    StandardField.PAGETOTAL, StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType MISC = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Misc)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.DATE)
-            .withImportantFields(
-                    StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.HOWPUBLISHED, StandardField.LOCATION, StandardField.DOI,
-                    StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.LANGUAGE,
-                    StandardField.TYPE, StandardField.VERSION, StandardField.NOTE, StandardField.ORGANIZATION,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType ONLINE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Online)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.DATE, StandardField.URL)
-            .withImportantFields(
-                    StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.URLDATE)
-            .withDetailFields(StandardField.LANGUAGE, StandardField.VERSION,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType PATENT = new BibEntryTypeBuilder()
-            .withType(IEEETranEntryType.Patent)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.NUMBER, StandardField.DATE)
-            .withImportantFields(StandardField.HOLDER,
-                    StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS,
-                    StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.TYPE,
-                    StandardField.VERSION, StandardField.LOCATION, StandardField.NOTE, StandardField.ADDENDUM,
-                    StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType PERIODICAL = new BibEntryTypeBuilder()
-            .withType(IEEETranEntryType.Periodical)
-            .withRequiredFields(StandardField.EDITOR, StandardField.TITLE, StandardField.DATE)
-            .withImportantFields(
-                    StandardField.SUBTITLE, StandardField.ISSUETITLE, StandardField.ISSUESUBTITLE, StandardField.ISSN, StandardField.DOI,
-                    StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.EDITORA, StandardField.EDITORB, StandardField.EDITORC,
-                    StandardField.LANGUAGE, StandardField.SERIES,
-                    StandardField.VOLUME, StandardField.NUMBER, StandardField.ISSUE, StandardField.NOTE,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType SUPPPERIODICAL = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.SuppPeriodical)
-            .withRequiredFields(ARTICLE.getRequiredFields())
-            .withImportantFields(ARTICLE.getImportantOptionalFields())
-            .withDetailFields(ARTICLE.getDetailOptionalFields())
-            .build();
-
-    private static final BibEntryType PROCEEDINGS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Proceedings)
-            .withRequiredFields(StandardField.TITLE, StandardField.DATE)
-            .withImportantFields(
-                    StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.MAINTITLE, StandardField.MAINSUBTITLE,
-                    StandardField.MAINTITLEADDON, StandardField.EVENTTITLE, StandardField.VOLUME, StandardField.PUBLISHER, StandardField.ISBN,
-                    StandardField.CHAPTER, StandardField.PAGES, StandardField.PAGETOTAL, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.EDITOR, StandardField.EVENTTITLEADDON,
-                    StandardField.EVENTDATE, StandardField.VENUE, StandardField.LANGUAGE, StandardField.PART,
-                    StandardField.VOLUMES, StandardField.SERIES, StandardField.NUMBER, StandardField.NOTE, StandardField.ORGANIZATION,
-                    StandardField.LOCATION,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType MVPROCEEDINGS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.MvProceedings)
-            .withRequiredFields(StandardField.TITLE, StandardField.DATE)
-            .withImportantFields(
-                    StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.MAINTITLE, StandardField.MAINSUBTITLE,
-                    StandardField.MAINTITLEADDON, StandardField.EVENTTITLE, StandardField.VOLUME, StandardField.PUBLISHER, StandardField.ISBN,
-                    StandardField.CHAPTER, StandardField.PAGES, StandardField.PAGETOTAL, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.EDITOR,
-                    StandardField.EVENTTITLEADDON, StandardField.EVENTDATE, StandardField.VENUE, StandardField.LANGUAGE,
-                    StandardField.VOLUMES, StandardField.SERIES, StandardField.NUMBER, StandardField.NOTE, StandardField.ORGANIZATION,
-                    StandardField.LOCATION,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType INPROCEEDINGS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.InProceedings)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.BOOKTITLE, StandardField.DATE)
-            .withImportantFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.MAINTITLE,
-                    StandardField.MAINSUBTITLE, StandardField.MAINTITLEADDON, StandardField.BOOKSUBTITLE,
-                    StandardField.BOOKTITLEADDON, StandardField.EVENTTITLE, StandardField.VOLUME, StandardField.PUBLISHER,
-                    StandardField.ISBN, StandardField.CHAPTER, StandardField.PAGES, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.EDITOR,
-                    StandardField.EVENTTITLEADDON, StandardField.EVENTDATE, StandardField.VENUE,
-                    StandardField.LANGUAGE, StandardField.PART, StandardField.VOLUMES, StandardField.SERIES,
-                    StandardField.NUMBER, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.LOCATION,
-                    StandardField.ADDENDUM,
-                    StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType REFERENCE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Reference)
-            .withRequiredFields(COLLECTION.getRequiredFields())
-            .withImportantFields(COLLECTION.getImportantOptionalFields())
-            .withDetailFields(COLLECTION.getDetailOptionalFields())
-            .build();
-
-    private static final BibEntryType MVREFERENCE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.MvReference)
-            .withRequiredFields(MVCOLLECTION.getRequiredFields())
-            .withImportantFields(MVCOLLECTION.getImportantOptionalFields())
-            .withDetailFields(MVCOLLECTION.getDetailOptionalFields())
-            .build();
-
-    private static final BibEntryType INREFERENCE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.InReference)
-            .withRequiredFields(INCOLLECTION.getRequiredFields())
-            .withImportantFields(INCOLLECTION.getImportantOptionalFields())
-            .withDetailFields(INCOLLECTION.getDetailOptionalFields())
-            .build();
-
-    private static final BibEntryType REPORT = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Report)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.TYPE, StandardField.INSTITUTION, StandardField.DATE)
-            .withImportantFields(
-                    StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.NUMBER, StandardField.ISRN,
-                    StandardField.CHAPTER, StandardField.PAGES, StandardField.PAGETOTAL, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.LANGUAGE,
-                    StandardField.VERSION, StandardField.NOTE, StandardField.LOCATION,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType SET = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Set)
-            .withRequiredFields(StandardField.ENTRYSET, StandardField.CROSSREF)
-            .build();
-
-    private static final BibEntryType THESIS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Thesis)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.TYPE, StandardField.INSTITUTION, StandardField.DATE)
-            .withImportantFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.CHAPTER,
-                    StandardField.PAGES, StandardField.PAGETOTAL, StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS,
-                    StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.LANGUAGE, StandardField.NOTE,
-                    StandardField.LOCATION, StandardField.ISBN,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType UNPUBLISHED = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Unpublished)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.DATE)
-            .withImportantFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.HOWPUBLISHED,
-                    StandardField.PUBSTATE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.LANGUAGE,
-                    StandardField.NOTE, StandardField.LOCATION, StandardField.ADDENDUM, StandardField.EVENTTITLE,
-                    StandardField.EVENTDATE, StandardField.VENUE)
-            .build();
-
-    private static final BibEntryType CONFERENCE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Conference)
-            .withRequiredFields(INPROCEEDINGS.getRequiredFields())
-            .withImportantFields(INPROCEEDINGS.getImportantOptionalFields())
-            .withDetailFields(INPROCEEDINGS.getDetailOptionalFields())
-            .build();
-
-    private static final BibEntryType ELECTRONIC = new BibEntryTypeBuilder()
-            .withType(IEEETranEntryType.Electronic)
-            .withRequiredFields(ONLINE.getRequiredFields())
-            .withImportantFields(ONLINE.getImportantOptionalFields())
-            .withDetailFields(ONLINE.getDetailOptionalFields())
-            .build();
-
-    private static final BibEntryType MASTERSTHESIS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.MastersThesis)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.INSTITUTION, StandardField.DATE)
-            .withImportantFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.TYPE,
-                    StandardField.CHAPTER, StandardField.PAGES, StandardField.PAGETOTAL, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.LANGUAGE, StandardField.NOTE,
-                    StandardField.LOCATION, StandardField.ISBN,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType PHDTHESIS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.PhdThesis)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.INSTITUTION, StandardField.DATE)
-            .withImportantFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.TYPE,
-                    StandardField.CHAPTER, StandardField.PAGES, StandardField.PAGETOTAL, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.LANGUAGE, StandardField.NOTE,
-                    StandardField.LOCATION, StandardField.ISBN,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType TECHREPORT = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.TechReport)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.INSTITUTION, StandardField.DATE)
-            .withImportantFields(
-                    StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.TYPE, StandardField.NUMBER, StandardField.ISRN,
-                    StandardField.CHAPTER, StandardField.PAGES, StandardField.PAGETOTAL, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.LANGUAGE,
-                    StandardField.VERSION, StandardField.NOTE, StandardField.LOCATION,
-                    StandardField.ADDENDUM,
-                    StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType WWW = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.WWW)
-            .withRequiredFields(ONLINE.getRequiredFields())
-            .withImportantFields(ONLINE.getImportantOptionalFields())
-            .withDetailFields(ONLINE.getDetailOptionalFields())
-            .build();
-
-    private static final BibEntryType SOFTWARE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Software)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.DATE)
-            .withImportantFields(
-                    StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.HOWPUBLISHED, StandardField.LOCATION, StandardField.DOI,
-                    StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.LANGUAGE,
-                    StandardField.TYPE, StandardField.VERSION, StandardField.NOTE, StandardField.ORGANIZATION,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    private static final BibEntryType DATASET = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Dataset)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.DATE)
-            .withImportantFields(
-                    StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.HOWPUBLISHED, StandardField.LOCATION, StandardField.DOI,
-                    StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withDetailFields(StandardField.LANGUAGE, StandardField.EDITION,
-                    StandardField.TYPE, StandardField.VERSION, StandardField.NOTE, StandardField.ORGANIZATION,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE)
-            .build();
-
-    public static final List<BibEntryType> ALL = Arrays.asList(ARTICLE, BOOK, MVBOOK, INBOOK, BOOKINBOOK, SUPPBOOK,
-            BOOKLET, COLLECTION, MVCOLLECTION, INCOLLECTION, SUPPCOLLECTION, MANUAL, MISC, ONLINE, PATENT, PERIODICAL,
-            SUPPPERIODICAL, PROCEEDINGS, MVPROCEEDINGS, INPROCEEDINGS, REFERENCE, MVREFERENCE, INREFERENCE, REPORT, SET,
-            THESIS, UNPUBLISHED, CONFERENCE, ELECTRONIC, MASTERSTHESIS, PHDTHESIS, TECHREPORT, WWW, SOFTWARE, DATASET);
-
-    public static final List<BibEntryType> RECOMMENDED = Arrays.asList(ARTICLE, BOOK, INPROCEEDINGS, REPORT, MISC);
+    private static final BibEntryType ARTICLE =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Article)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.JOURNALTITLE,
+                            StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.EDITOR,
+                            StandardField.SERIES,
+                            StandardField.VOLUME,
+                            StandardField.NUMBER,
+                            StandardField.EID,
+                            StandardField.ISSUE,
+                            StandardField.PAGES,
+                            StandardField.NOTE,
+                            StandardField.ISSN,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.TRANSLATOR,
+                            StandardField.ANNOTATOR,
+                            StandardField.COMMENTATOR,
+                            StandardField.TITLEADDON,
+                            StandardField.EDITORA,
+                            StandardField.EDITORB,
+                            StandardField.EDITORC,
+                            StandardField.JOURNALSUBTITLE,
+                            StandardField.ISSUETITLE,
+                            StandardField.ISSUESUBTITLE,
+                            StandardField.LANGUAGE,
+                            StandardField.ORIGLANGUAGE,
+                            StandardField.VERSION,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType BOOK =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Book)
+                    .withRequiredFields(
+                            StandardField.AUTHOR, StandardField.TITLE, StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.EDITOR,
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.MAINTITLE,
+                            StandardField.MAINSUBTITLE,
+                            StandardField.MAINTITLEADDON,
+                            StandardField.VOLUME,
+                            StandardField.EDITION,
+                            StandardField.PUBLISHER,
+                            StandardField.ISBN,
+                            StandardField.CHAPTER,
+                            StandardField.PAGES,
+                            StandardField.PAGETOTAL,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.EDITORA,
+                            StandardField.EDITORB,
+                            StandardField.EDITORC,
+                            StandardField.TRANSLATOR,
+                            StandardField.ANNOTATOR,
+                            StandardField.COMMENTATOR,
+                            StandardField.INTRODUCTION,
+                            StandardField.FOREWORD,
+                            StandardField.AFTERWORD,
+                            StandardField.LANGUAGE,
+                            StandardField.ORIGLANGUAGE,
+                            StandardField.PART,
+                            StandardField.VOLUMES,
+                            StandardField.SERIES,
+                            StandardField.NUMBER,
+                            StandardField.NOTE,
+                            StandardField.LOCATION,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType MVBOOK =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.MvBook)
+                    .withRequiredFields(
+                            StandardField.AUTHOR, StandardField.TITLE, StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.EDITOR,
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.EDITION,
+                            StandardField.PUBLISHER,
+                            StandardField.ISBN,
+                            StandardField.PAGETOTAL,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.EDITORA,
+                            StandardField.EDITORB,
+                            StandardField.EDITORC,
+                            StandardField.TRANSLATOR,
+                            StandardField.ANNOTATOR,
+                            StandardField.COMMENTATOR,
+                            StandardField.INTRODUCTION,
+                            StandardField.FOREWORD,
+                            StandardField.AFTERWORD,
+                            StandardField.LANGUAGE,
+                            StandardField.ORIGLANGUAGE,
+                            StandardField.VOLUMES,
+                            StandardField.SERIES,
+                            StandardField.NUMBER,
+                            StandardField.NOTE,
+                            StandardField.LOCATION,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType INBOOK =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.InBook)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.BOOKTITLE,
+                            StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.BOOKAUTHOR,
+                            StandardField.EDITOR,
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.MAINTITLE,
+                            StandardField.MAINSUBTITLE,
+                            StandardField.MAINTITLEADDON,
+                            StandardField.BOOKSUBTITLE,
+                            StandardField.BOOKTITLEADDON,
+                            StandardField.VOLUME,
+                            StandardField.EDITION,
+                            StandardField.PUBLISHER,
+                            StandardField.ISBN,
+                            StandardField.CHAPTER,
+                            StandardField.PAGES,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.EDITORA,
+                            StandardField.EDITORB,
+                            StandardField.EDITORC,
+                            StandardField.TRANSLATOR,
+                            StandardField.ANNOTATOR,
+                            StandardField.COMMENTATOR,
+                            StandardField.INTRODUCTION,
+                            StandardField.FOREWORD,
+                            StandardField.AFTERWORD,
+                            StandardField.LANGUAGE,
+                            StandardField.ORIGLANGUAGE,
+                            StandardField.PART,
+                            StandardField.VOLUMES,
+                            StandardField.SERIES,
+                            StandardField.NUMBER,
+                            StandardField.NOTE,
+                            StandardField.LOCATION,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType BOOKINBOOK =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.BookInBook)
+                    .withRequiredFields(INBOOK.getRequiredFields())
+                    .withImportantFields(INBOOK.getImportantOptionalFields())
+                    .withDetailFields(INBOOK.getDetailOptionalFields())
+                    .build();
+
+    private static final BibEntryType SUPPBOOK =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.SuppBook)
+                    .withImportantFields(INBOOK.getImportantOptionalFields())
+                    .withDetailFields(INBOOK.getDetailOptionalFields())
+                    .withRequiredFields(INBOOK.getRequiredFields())
+                    .build();
+
+    private static final BibEntryType BOOKLET =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Booklet)
+                    .withRequiredFields(
+                            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+                            StandardField.TITLE,
+                            StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.HOWPUBLISHED,
+                            StandardField.CHAPTER,
+                            StandardField.PAGES,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.LANGUAGE,
+                            StandardField.TYPE,
+                            StandardField.NOTE,
+                            StandardField.LOCATION,
+                            StandardField.PAGETOTAL,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType COLLECTION =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Collection)
+                    .withRequiredFields(
+                            StandardField.EDITOR, StandardField.TITLE, StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.TRANSLATOR,
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.MAINTITLE,
+                            StandardField.MAINSUBTITLE,
+                            StandardField.MAINTITLEADDON,
+                            StandardField.VOLUME,
+                            StandardField.EDITION,
+                            StandardField.PUBLISHER,
+                            StandardField.ISBN,
+                            StandardField.CHAPTER,
+                            StandardField.PAGES,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.EDITORA,
+                            StandardField.EDITORB,
+                            StandardField.EDITORC,
+                            StandardField.ANNOTATOR,
+                            StandardField.COMMENTATOR,
+                            StandardField.INTRODUCTION,
+                            StandardField.FOREWORD,
+                            StandardField.AFTERWORD,
+                            StandardField.LANGUAGE,
+                            StandardField.ORIGLANGUAGE,
+                            StandardField.PART,
+                            StandardField.VOLUMES,
+                            StandardField.SERIES,
+                            StandardField.NUMBER,
+                            StandardField.NOTE,
+                            StandardField.LOCATION,
+                            StandardField.PAGETOTAL,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType MVCOLLECTION =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.MvCollection)
+                    .withRequiredFields(
+                            StandardField.EDITOR, StandardField.TITLE, StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.TRANSLATOR,
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.EDITION,
+                            StandardField.PUBLISHER,
+                            StandardField.ISBN,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.EDITORA,
+                            StandardField.EDITORB,
+                            StandardField.EDITORC,
+                            StandardField.ANNOTATOR,
+                            StandardField.COMMENTATOR,
+                            StandardField.INTRODUCTION,
+                            StandardField.FOREWORD,
+                            StandardField.AFTERWORD,
+                            StandardField.LANGUAGE,
+                            StandardField.ORIGLANGUAGE,
+                            StandardField.VOLUMES,
+                            StandardField.SERIES,
+                            StandardField.NUMBER,
+                            StandardField.NOTE,
+                            StandardField.LOCATION,
+                            StandardField.PAGETOTAL,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType INCOLLECTION =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.InCollection)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.BOOKTITLE,
+                            StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.TRANSLATOR,
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.MAINTITLE,
+                            StandardField.MAINSUBTITLE,
+                            StandardField.MAINTITLEADDON,
+                            StandardField.BOOKSUBTITLE,
+                            StandardField.BOOKTITLEADDON,
+                            StandardField.VOLUME,
+                            StandardField.EDITION,
+                            StandardField.PUBLISHER,
+                            StandardField.ISBN,
+                            StandardField.CHAPTER,
+                            StandardField.PAGES,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.EDITOR,
+                            StandardField.EDITORA,
+                            StandardField.EDITORB,
+                            StandardField.EDITORC,
+                            StandardField.ANNOTATOR,
+                            StandardField.COMMENTATOR,
+                            StandardField.INTRODUCTION,
+                            StandardField.FOREWORD,
+                            StandardField.AFTERWORD,
+                            StandardField.LANGUAGE,
+                            StandardField.ORIGLANGUAGE,
+                            StandardField.PART,
+                            StandardField.VOLUMES,
+                            StandardField.SERIES,
+                            StandardField.NUMBER,
+                            StandardField.NOTE,
+                            StandardField.LOCATION,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType SUPPCOLLECTION =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.SuppCollection)
+                    .withRequiredFields(INCOLLECTION.getRequiredFields())
+                    .withImportantFields(INCOLLECTION.getImportantOptionalFields())
+                    .withDetailFields(INCOLLECTION.getDetailOptionalFields())
+                    .build();
+
+    private static final BibEntryType MANUAL =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Manual)
+                    .withRequiredFields(
+                            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+                            StandardField.TITLE,
+                            StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.EDITION,
+                            StandardField.PUBLISHER,
+                            StandardField.ISBN,
+                            StandardField.CHAPTER,
+                            StandardField.PAGES,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.LANGUAGE,
+                            StandardField.TYPE,
+                            StandardField.SERIES,
+                            StandardField.NUMBER,
+                            StandardField.VERSION,
+                            StandardField.NOTE,
+                            StandardField.ORGANIZATION,
+                            StandardField.LOCATION,
+                            StandardField.PAGETOTAL,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType MISC =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Misc)
+                    .withRequiredFields(
+                            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+                            StandardField.TITLE,
+                            StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.HOWPUBLISHED,
+                            StandardField.LOCATION,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.LANGUAGE,
+                            StandardField.TYPE,
+                            StandardField.VERSION,
+                            StandardField.NOTE,
+                            StandardField.ORGANIZATION,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType ONLINE =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Online)
+                    .withRequiredFields(
+                            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+                            StandardField.TITLE,
+                            StandardField.DATE,
+                            StandardField.URL)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.NOTE,
+                            StandardField.ORGANIZATION,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.LANGUAGE,
+                            StandardField.VERSION,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType PATENT =
+            new BibEntryTypeBuilder()
+                    .withType(IEEETranEntryType.Patent)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.NUMBER,
+                            StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.HOLDER,
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.TYPE,
+                            StandardField.VERSION,
+                            StandardField.LOCATION,
+                            StandardField.NOTE,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType PERIODICAL =
+            new BibEntryTypeBuilder()
+                    .withType(IEEETranEntryType.Periodical)
+                    .withRequiredFields(
+                            StandardField.EDITOR, StandardField.TITLE, StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.ISSUETITLE,
+                            StandardField.ISSUESUBTITLE,
+                            StandardField.ISSN,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.EDITORA,
+                            StandardField.EDITORB,
+                            StandardField.EDITORC,
+                            StandardField.LANGUAGE,
+                            StandardField.SERIES,
+                            StandardField.VOLUME,
+                            StandardField.NUMBER,
+                            StandardField.ISSUE,
+                            StandardField.NOTE,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType SUPPPERIODICAL =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.SuppPeriodical)
+                    .withRequiredFields(ARTICLE.getRequiredFields())
+                    .withImportantFields(ARTICLE.getImportantOptionalFields())
+                    .withDetailFields(ARTICLE.getDetailOptionalFields())
+                    .build();
+
+    private static final BibEntryType PROCEEDINGS =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Proceedings)
+                    .withRequiredFields(StandardField.TITLE, StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.MAINTITLE,
+                            StandardField.MAINSUBTITLE,
+                            StandardField.MAINTITLEADDON,
+                            StandardField.EVENTTITLE,
+                            StandardField.VOLUME,
+                            StandardField.PUBLISHER,
+                            StandardField.ISBN,
+                            StandardField.CHAPTER,
+                            StandardField.PAGES,
+                            StandardField.PAGETOTAL,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.EDITOR,
+                            StandardField.EVENTTITLEADDON,
+                            StandardField.EVENTDATE,
+                            StandardField.VENUE,
+                            StandardField.LANGUAGE,
+                            StandardField.PART,
+                            StandardField.VOLUMES,
+                            StandardField.SERIES,
+                            StandardField.NUMBER,
+                            StandardField.NOTE,
+                            StandardField.ORGANIZATION,
+                            StandardField.LOCATION,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType MVPROCEEDINGS =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.MvProceedings)
+                    .withRequiredFields(StandardField.TITLE, StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.MAINTITLE,
+                            StandardField.MAINSUBTITLE,
+                            StandardField.MAINTITLEADDON,
+                            StandardField.EVENTTITLE,
+                            StandardField.VOLUME,
+                            StandardField.PUBLISHER,
+                            StandardField.ISBN,
+                            StandardField.CHAPTER,
+                            StandardField.PAGES,
+                            StandardField.PAGETOTAL,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.EDITOR,
+                            StandardField.EVENTTITLEADDON,
+                            StandardField.EVENTDATE,
+                            StandardField.VENUE,
+                            StandardField.LANGUAGE,
+                            StandardField.VOLUMES,
+                            StandardField.SERIES,
+                            StandardField.NUMBER,
+                            StandardField.NOTE,
+                            StandardField.ORGANIZATION,
+                            StandardField.LOCATION,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType INPROCEEDINGS =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.InProceedings)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.BOOKTITLE,
+                            StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.MAINTITLE,
+                            StandardField.MAINSUBTITLE,
+                            StandardField.MAINTITLEADDON,
+                            StandardField.BOOKSUBTITLE,
+                            StandardField.BOOKTITLEADDON,
+                            StandardField.EVENTTITLE,
+                            StandardField.VOLUME,
+                            StandardField.PUBLISHER,
+                            StandardField.ISBN,
+                            StandardField.CHAPTER,
+                            StandardField.PAGES,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.EDITOR,
+                            StandardField.EVENTTITLEADDON,
+                            StandardField.EVENTDATE,
+                            StandardField.VENUE,
+                            StandardField.LANGUAGE,
+                            StandardField.PART,
+                            StandardField.VOLUMES,
+                            StandardField.SERIES,
+                            StandardField.NUMBER,
+                            StandardField.NOTE,
+                            StandardField.ORGANIZATION,
+                            StandardField.LOCATION,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType REFERENCE =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Reference)
+                    .withRequiredFields(COLLECTION.getRequiredFields())
+                    .withImportantFields(COLLECTION.getImportantOptionalFields())
+                    .withDetailFields(COLLECTION.getDetailOptionalFields())
+                    .build();
+
+    private static final BibEntryType MVREFERENCE =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.MvReference)
+                    .withRequiredFields(MVCOLLECTION.getRequiredFields())
+                    .withImportantFields(MVCOLLECTION.getImportantOptionalFields())
+                    .withDetailFields(MVCOLLECTION.getDetailOptionalFields())
+                    .build();
+
+    private static final BibEntryType INREFERENCE =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.InReference)
+                    .withRequiredFields(INCOLLECTION.getRequiredFields())
+                    .withImportantFields(INCOLLECTION.getImportantOptionalFields())
+                    .withDetailFields(INCOLLECTION.getDetailOptionalFields())
+                    .build();
+
+    private static final BibEntryType REPORT =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Report)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.TYPE,
+                            StandardField.INSTITUTION,
+                            StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.NUMBER,
+                            StandardField.ISRN,
+                            StandardField.CHAPTER,
+                            StandardField.PAGES,
+                            StandardField.PAGETOTAL,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.LANGUAGE,
+                            StandardField.VERSION,
+                            StandardField.NOTE,
+                            StandardField.LOCATION,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType SET =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Set)
+                    .withRequiredFields(StandardField.ENTRYSET, StandardField.CROSSREF)
+                    .build();
+
+    private static final BibEntryType THESIS =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Thesis)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.TYPE,
+                            StandardField.INSTITUTION,
+                            StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.CHAPTER,
+                            StandardField.PAGES,
+                            StandardField.PAGETOTAL,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.LANGUAGE,
+                            StandardField.NOTE,
+                            StandardField.LOCATION,
+                            StandardField.ISBN,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType UNPUBLISHED =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Unpublished)
+                    .withRequiredFields(
+                            StandardField.AUTHOR, StandardField.TITLE, StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.HOWPUBLISHED,
+                            StandardField.PUBSTATE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.LANGUAGE,
+                            StandardField.NOTE,
+                            StandardField.LOCATION,
+                            StandardField.ADDENDUM,
+                            StandardField.EVENTTITLE,
+                            StandardField.EVENTDATE,
+                            StandardField.VENUE)
+                    .build();
+
+    private static final BibEntryType CONFERENCE =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Conference)
+                    .withRequiredFields(INPROCEEDINGS.getRequiredFields())
+                    .withImportantFields(INPROCEEDINGS.getImportantOptionalFields())
+                    .withDetailFields(INPROCEEDINGS.getDetailOptionalFields())
+                    .build();
+
+    private static final BibEntryType ELECTRONIC =
+            new BibEntryTypeBuilder()
+                    .withType(IEEETranEntryType.Electronic)
+                    .withRequiredFields(ONLINE.getRequiredFields())
+                    .withImportantFields(ONLINE.getImportantOptionalFields())
+                    .withDetailFields(ONLINE.getDetailOptionalFields())
+                    .build();
+
+    private static final BibEntryType MASTERSTHESIS =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.MastersThesis)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.INSTITUTION,
+                            StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.TYPE,
+                            StandardField.CHAPTER,
+                            StandardField.PAGES,
+                            StandardField.PAGETOTAL,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.LANGUAGE,
+                            StandardField.NOTE,
+                            StandardField.LOCATION,
+                            StandardField.ISBN,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType PHDTHESIS =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.PhdThesis)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.INSTITUTION,
+                            StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.TYPE,
+                            StandardField.CHAPTER,
+                            StandardField.PAGES,
+                            StandardField.PAGETOTAL,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.LANGUAGE,
+                            StandardField.NOTE,
+                            StandardField.LOCATION,
+                            StandardField.ISBN,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType TECHREPORT =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.TechReport)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.INSTITUTION,
+                            StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.TYPE,
+                            StandardField.NUMBER,
+                            StandardField.ISRN,
+                            StandardField.CHAPTER,
+                            StandardField.PAGES,
+                            StandardField.PAGETOTAL,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.LANGUAGE,
+                            StandardField.VERSION,
+                            StandardField.NOTE,
+                            StandardField.LOCATION,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType WWW =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.WWW)
+                    .withRequiredFields(ONLINE.getRequiredFields())
+                    .withImportantFields(ONLINE.getImportantOptionalFields())
+                    .withDetailFields(ONLINE.getDetailOptionalFields())
+                    .build();
+
+    private static final BibEntryType SOFTWARE =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Software)
+                    .withRequiredFields(
+                            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+                            StandardField.TITLE,
+                            StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.HOWPUBLISHED,
+                            StandardField.LOCATION,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.LANGUAGE,
+                            StandardField.TYPE,
+                            StandardField.VERSION,
+                            StandardField.NOTE,
+                            StandardField.ORGANIZATION,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    private static final BibEntryType DATASET =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Dataset)
+                    .withRequiredFields(
+                            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+                            StandardField.TITLE,
+                            StandardField.DATE)
+                    .withImportantFields(
+                            StandardField.SUBTITLE,
+                            StandardField.TITLEADDON,
+                            StandardField.HOWPUBLISHED,
+                            StandardField.LOCATION,
+                            StandardField.DOI,
+                            StandardField.EPRINT,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            StandardField.URL,
+                            StandardField.URLDATE)
+                    .withDetailFields(
+                            StandardField.LANGUAGE,
+                            StandardField.EDITION,
+                            StandardField.TYPE,
+                            StandardField.VERSION,
+                            StandardField.NOTE,
+                            StandardField.ORGANIZATION,
+                            StandardField.ADDENDUM,
+                            StandardField.PUBSTATE)
+                    .build();
+
+    public static final List<BibEntryType> ALL =
+            Arrays.asList(
+                    ARTICLE,
+                    BOOK,
+                    MVBOOK,
+                    INBOOK,
+                    BOOKINBOOK,
+                    SUPPBOOK,
+                    BOOKLET,
+                    COLLECTION,
+                    MVCOLLECTION,
+                    INCOLLECTION,
+                    SUPPCOLLECTION,
+                    MANUAL,
+                    MISC,
+                    ONLINE,
+                    PATENT,
+                    PERIODICAL,
+                    SUPPPERIODICAL,
+                    PROCEEDINGS,
+                    MVPROCEEDINGS,
+                    INPROCEEDINGS,
+                    REFERENCE,
+                    MVREFERENCE,
+                    INREFERENCE,
+                    REPORT,
+                    SET,
+                    THESIS,
+                    UNPUBLISHED,
+                    CONFERENCE,
+                    ELECTRONIC,
+                    MASTERSTHESIS,
+                    PHDTHESIS,
+                    TECHREPORT,
+                    WWW,
+                    SOFTWARE,
+                    DATASET);
+
+    public static final List<BibEntryType> RECOMMENDED =
+            Arrays.asList(ARTICLE, BOOK, INPROCEEDINGS, REPORT, MISC);
 }
diff --git a/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryType.java b/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryType.java
index 041c48e592a5..15a52f6244fb 100644
--- a/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryType.java
+++ b/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryType.java
@@ -5,7 +5,6 @@
 import java.util.Optional;
 
 public enum BiblatexSoftwareEntryType implements EntryType {
-
     Dataset("Dataset"),
     SoftwareVersion("SoftwareVersion"),
     SoftwareModule("SoftwareModule"),
@@ -19,8 +18,8 @@ public enum BiblatexSoftwareEntryType implements EntryType {
 
     public static Optional<BiblatexSoftwareEntryType> fromName(String name) {
         return Arrays.stream(BiblatexSoftwareEntryType.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+                .filter(field -> field.getName().equalsIgnoreCase(name))
+                .findAny();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitions.java b/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitions.java
index ff5e3e6599f5..a96246e06700 100644
--- a/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitions.java
@@ -1,50 +1,140 @@
 package org.jabref.model.entry.types;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypeBuilder;
 import org.jabref.model.entry.field.BiblatexSoftwareField;
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.StandardField;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class BiblatexSoftwareEntryTypeDefinitions {
-    private static final BibEntryType SOFTWARE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Software)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.URL, StandardField.VERSION, StandardField.YEAR)
-            .withImportantFields(StandardField.DATE, StandardField.DOI, StandardField.EPRINTTYPE, StandardField.EPRINTCLASS, StandardField.EPRINT,
-                    StandardField.FILE, BiblatexSoftwareField.HALID, BiblatexSoftwareField.HALVERSION, StandardField.INSTITUTION, BiblatexSoftwareField.INTRODUCEDIN,
-                    BiblatexSoftwareField.LICENSE, StandardField.MONTH, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.PUBLISHER, StandardField.RELATED,
-                    BiblatexSoftwareField.RELATEDSTRING, BiblatexSoftwareField.REPOSITORY, BiblatexSoftwareField.SWHID, StandardField.URLDATE)
-            .build();
+    private static final BibEntryType SOFTWARE =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Software)
+                    .withRequiredFields(
+                            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+                            StandardField.TITLE,
+                            StandardField.URL,
+                            StandardField.VERSION,
+                            StandardField.YEAR)
+                    .withImportantFields(
+                            StandardField.DATE,
+                            StandardField.DOI,
+                            StandardField.EPRINTTYPE,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINT,
+                            StandardField.FILE,
+                            BiblatexSoftwareField.HALID,
+                            BiblatexSoftwareField.HALVERSION,
+                            StandardField.INSTITUTION,
+                            BiblatexSoftwareField.INTRODUCEDIN,
+                            BiblatexSoftwareField.LICENSE,
+                            StandardField.MONTH,
+                            StandardField.NOTE,
+                            StandardField.ORGANIZATION,
+                            StandardField.PUBLISHER,
+                            StandardField.RELATED,
+                            BiblatexSoftwareField.RELATEDSTRING,
+                            BiblatexSoftwareField.REPOSITORY,
+                            BiblatexSoftwareField.SWHID,
+                            StandardField.URLDATE)
+                    .build();
 
-    private static final BibEntryType SOFTWAREVERSION = new BibEntryTypeBuilder()
-            .withType(BiblatexSoftwareEntryType.SoftwareVersion)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.URL, StandardField.YEAR, StandardField.VERSION)
-            .withImportantFields(StandardField.DATE, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, BiblatexSoftwareField.HALID, BiblatexSoftwareField.HALVERSION,
-                    StandardField.INSTITUTION, BiblatexSoftwareField.INTRODUCEDIN, BiblatexSoftwareField.LICENSE, StandardField.MONTH, StandardField.NOTE, StandardField.ORGANIZATION,
-                    StandardField.PUBLISHER, StandardField.RELATED, BiblatexSoftwareField.RELATEDTYPE, BiblatexSoftwareField.RELATEDSTRING,
-                    BiblatexSoftwareField.REPOSITORY, BiblatexSoftwareField.SWHID, StandardField.SUBTITLE, StandardField.URLDATE)
-            .build();
+    private static final BibEntryType SOFTWAREVERSION =
+            new BibEntryTypeBuilder()
+                    .withType(BiblatexSoftwareEntryType.SoftwareVersion)
+                    .withRequiredFields(
+                            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+                            StandardField.TITLE,
+                            StandardField.URL,
+                            StandardField.YEAR,
+                            StandardField.VERSION)
+                    .withImportantFields(
+                            StandardField.DATE,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINTTYPE,
+                            BiblatexSoftwareField.HALID,
+                            BiblatexSoftwareField.HALVERSION,
+                            StandardField.INSTITUTION,
+                            BiblatexSoftwareField.INTRODUCEDIN,
+                            BiblatexSoftwareField.LICENSE,
+                            StandardField.MONTH,
+                            StandardField.NOTE,
+                            StandardField.ORGANIZATION,
+                            StandardField.PUBLISHER,
+                            StandardField.RELATED,
+                            BiblatexSoftwareField.RELATEDTYPE,
+                            BiblatexSoftwareField.RELATEDSTRING,
+                            BiblatexSoftwareField.REPOSITORY,
+                            BiblatexSoftwareField.SWHID,
+                            StandardField.SUBTITLE,
+                            StandardField.URLDATE)
+                    .build();
 
-    private static final BibEntryType SOFTWAREMODULE = new BibEntryTypeBuilder()
-            .withType(BiblatexSoftwareEntryType.SoftwareModule)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.SUBTITLE, StandardField.URL, StandardField.YEAR)
-            .withImportantFields(StandardField.DATE, StandardField.DOI, StandardField.EPRINTTYPE, StandardField.EPRINTCLASS, StandardField.EPRINT,
-                    StandardField.EDITOR, StandardField.FILE, BiblatexSoftwareField.HALID, BiblatexSoftwareField.HALVERSION, StandardField.INSTITUTION, BiblatexSoftwareField.INTRODUCEDIN,
-                    BiblatexSoftwareField.LICENSE, StandardField.MONTH, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.PUBLISHER, StandardField.RELATED,
-                    BiblatexSoftwareField.RELATEDSTRING, BiblatexSoftwareField.REPOSITORY, BiblatexSoftwareField.SWHID, StandardField.URLDATE, StandardField.VERSION)
-            .build();
+    private static final BibEntryType SOFTWAREMODULE =
+            new BibEntryTypeBuilder()
+                    .withType(BiblatexSoftwareEntryType.SoftwareModule)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.SUBTITLE,
+                            StandardField.URL,
+                            StandardField.YEAR)
+                    .withImportantFields(
+                            StandardField.DATE,
+                            StandardField.DOI,
+                            StandardField.EPRINTTYPE,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINT,
+                            StandardField.EDITOR,
+                            StandardField.FILE,
+                            BiblatexSoftwareField.HALID,
+                            BiblatexSoftwareField.HALVERSION,
+                            StandardField.INSTITUTION,
+                            BiblatexSoftwareField.INTRODUCEDIN,
+                            BiblatexSoftwareField.LICENSE,
+                            StandardField.MONTH,
+                            StandardField.NOTE,
+                            StandardField.ORGANIZATION,
+                            StandardField.PUBLISHER,
+                            StandardField.RELATED,
+                            BiblatexSoftwareField.RELATEDSTRING,
+                            BiblatexSoftwareField.REPOSITORY,
+                            BiblatexSoftwareField.SWHID,
+                            StandardField.URLDATE,
+                            StandardField.VERSION)
+                    .build();
 
-    private static final BibEntryType CODEFRAGMENT = new BibEntryTypeBuilder()
-            .withType(BiblatexSoftwareEntryType.CodeFragment)
-            .withRequiredFields(StandardField.URL)
-            .withImportantFields(StandardField.DATE, StandardField.DOI, StandardField.EPRINTTYPE, StandardField.EPRINTCLASS, StandardField.EPRINT,
-                    StandardField.EDITOR, StandardField.FILE, BiblatexSoftwareField.HALID, BiblatexSoftwareField.HALVERSION, StandardField.INSTITUTION, BiblatexSoftwareField.INTRODUCEDIN,
-                    BiblatexSoftwareField.LICENSE, StandardField.MONTH, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.PUBLISHER, StandardField.RELATED,
-                    BiblatexSoftwareField.RELATEDSTRING, BiblatexSoftwareField.REPOSITORY, BiblatexSoftwareField.SWHID, StandardField.URLDATE, StandardField.VERSION)
-            .build();
+    private static final BibEntryType CODEFRAGMENT =
+            new BibEntryTypeBuilder()
+                    .withType(BiblatexSoftwareEntryType.CodeFragment)
+                    .withRequiredFields(StandardField.URL)
+                    .withImportantFields(
+                            StandardField.DATE,
+                            StandardField.DOI,
+                            StandardField.EPRINTTYPE,
+                            StandardField.EPRINTCLASS,
+                            StandardField.EPRINT,
+                            StandardField.EDITOR,
+                            StandardField.FILE,
+                            BiblatexSoftwareField.HALID,
+                            BiblatexSoftwareField.HALVERSION,
+                            StandardField.INSTITUTION,
+                            BiblatexSoftwareField.INTRODUCEDIN,
+                            BiblatexSoftwareField.LICENSE,
+                            StandardField.MONTH,
+                            StandardField.NOTE,
+                            StandardField.ORGANIZATION,
+                            StandardField.PUBLISHER,
+                            StandardField.RELATED,
+                            BiblatexSoftwareField.RELATEDSTRING,
+                            BiblatexSoftwareField.REPOSITORY,
+                            BiblatexSoftwareField.SWHID,
+                            StandardField.URLDATE,
+                            StandardField.VERSION)
+                    .build();
 
-    public static final List<BibEntryType> ALL = Arrays.asList(SOFTWAREVERSION, SOFTWARE, SOFTWAREMODULE, CODEFRAGMENT);
+    public static final List<BibEntryType> ALL =
+            Arrays.asList(SOFTWAREVERSION, SOFTWARE, SOFTWAREMODULE, CODEFRAGMENT);
 }
diff --git a/src/main/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitions.java b/src/main/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitions.java
index 885235958f89..dedd506d6bc6 100644
--- a/src/main/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitions.java
@@ -1,13 +1,13 @@
 package org.jabref.model.entry.types;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypeBuilder;
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.StandardField;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * This class represents all supported BibTeX entry types.
  * It is based on the information of <a href="https://tug.org/texmf-docs/bibtex/btxdoc.pdf">BibTeXing</a>, a manual
@@ -22,11 +22,22 @@ public class BibtexEntryTypeDefinitions {
      * Required fields: author, title, journal, year.
      * Optional fields: volume, number, pages, month, note.
      */
-    private static final BibEntryType ARTICLE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Article)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.JOURNAL, StandardField.YEAR)
-            .withImportantFields(StandardField.VOLUME, StandardField.NUMBER, StandardField.PAGES, StandardField.MONTH, StandardField.ISSN, StandardField.NOTE)
-            .build();
+    private static final BibEntryType ARTICLE =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Article)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.JOURNAL,
+                            StandardField.YEAR)
+                    .withImportantFields(
+                            StandardField.VOLUME,
+                            StandardField.NUMBER,
+                            StandardField.PAGES,
+                            StandardField.MONTH,
+                            StandardField.ISSN,
+                            StandardField.NOTE)
+                    .build();
 
     /**
      * A book with an explicit publisher.
@@ -34,11 +45,24 @@ public class BibtexEntryTypeDefinitions {
      * Required fields: author or editor, title, publisher, year.
      * Optional fields: volume or number, series, address, edition, month, note.
      */
-    private static final BibEntryType BOOK = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Book)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.PUBLISHER, StandardField.YEAR)
-            .withImportantFields(StandardField.VOLUME, StandardField.NUMBER, StandardField.SERIES, StandardField.ADDRESS, StandardField.EDITION, StandardField.MONTH, StandardField.ISBN, StandardField.NOTE)
-            .build();
+    private static final BibEntryType BOOK =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Book)
+                    .withRequiredFields(
+                            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+                            StandardField.TITLE,
+                            StandardField.PUBLISHER,
+                            StandardField.YEAR)
+                    .withImportantFields(
+                            StandardField.VOLUME,
+                            StandardField.NUMBER,
+                            StandardField.SERIES,
+                            StandardField.ADDRESS,
+                            StandardField.EDITION,
+                            StandardField.MONTH,
+                            StandardField.ISBN,
+                            StandardField.NOTE)
+                    .build();
 
     /**
      * A work that is printed and bound, but without a named publisher or sponsoring institution.
@@ -46,11 +70,18 @@ public class BibtexEntryTypeDefinitions {
      * Required field: title.
      * Optional fields: author, howpublished, address, month, year, note.
      */
-    private static final BibEntryType BOOKLET = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Booklet)
-            .withRequiredFields(StandardField.TITLE)
-            .withImportantFields(StandardField.AUTHOR, StandardField.HOWPUBLISHED, StandardField.ADDRESS, StandardField.MONTH, StandardField.YEAR, StandardField.NOTE)
-            .build();
+    private static final BibEntryType BOOKLET =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Booklet)
+                    .withRequiredFields(StandardField.TITLE)
+                    .withImportantFields(
+                            StandardField.AUTHOR,
+                            StandardField.HOWPUBLISHED,
+                            StandardField.ADDRESS,
+                            StandardField.MONTH,
+                            StandardField.YEAR,
+                            StandardField.NOTE)
+                    .build();
 
     /**
      * An article in a conference proceedings.
@@ -58,11 +89,26 @@ public class BibtexEntryTypeDefinitions {
      * Required fields: author, title, booktitle, year.
      * Optional fields: editor, volume or number, series, pages, address, month, organization, publisher, note.
      */
-    private static final BibEntryType CONFERENCE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Conference)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.BOOKTITLE, StandardField.YEAR)
-            .withImportantFields(StandardField.EDITOR, StandardField.VOLUME, StandardField.NUMBER, StandardField.SERIES, StandardField.PAGES, StandardField.ADDRESS, StandardField.MONTH, StandardField.ORGANIZATION, StandardField.PUBLISHER, StandardField.NOTE)
-            .build();
+    private static final BibEntryType CONFERENCE =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Conference)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.BOOKTITLE,
+                            StandardField.YEAR)
+                    .withImportantFields(
+                            StandardField.EDITOR,
+                            StandardField.VOLUME,
+                            StandardField.NUMBER,
+                            StandardField.SERIES,
+                            StandardField.PAGES,
+                            StandardField.ADDRESS,
+                            StandardField.MONTH,
+                            StandardField.ORGANIZATION,
+                            StandardField.PUBLISHER,
+                            StandardField.NOTE)
+                    .build();
 
     /**
      * A part of a book, which may be a chapter (or section or whatever) and/or a range of pages.
@@ -70,24 +116,53 @@ public class BibtexEntryTypeDefinitions {
      * Required fields: author or editor, title, chapter and/or pages, publisher, year.
      * Optional fields: volume or number, series, type, address, edition, month, note.
      */
-    private static final BibEntryType INBOOK = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.InBook)
-            .addRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR))
-            .addRequiredFields(StandardField.TITLE, StandardField.PUBLISHER, StandardField.YEAR)
-            .addRequiredFields(new OrFields(StandardField.CHAPTER, StandardField.PAGES))
-            .withImportantFields(StandardField.VOLUME, StandardField.NUMBER, StandardField.SERIES, StandardField.TYPE, StandardField.ADDRESS, StandardField.EDITION, StandardField.MONTH, StandardField.ISBN, StandardField.NOTE)
-            .build();
+    private static final BibEntryType INBOOK =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.InBook)
+                    .addRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR))
+                    .addRequiredFields(
+                            StandardField.TITLE, StandardField.PUBLISHER, StandardField.YEAR)
+                    .addRequiredFields(new OrFields(StandardField.CHAPTER, StandardField.PAGES))
+                    .withImportantFields(
+                            StandardField.VOLUME,
+                            StandardField.NUMBER,
+                            StandardField.SERIES,
+                            StandardField.TYPE,
+                            StandardField.ADDRESS,
+                            StandardField.EDITION,
+                            StandardField.MONTH,
+                            StandardField.ISBN,
+                            StandardField.NOTE)
+                    .build();
 
     /**
      * A part of a book having its own title.
      * Required fields: author, title, booktitle, publisher, year.
      * Optional fields: editor, volume or number, series, type, chapter, pages, address, edition, month, note.
      */
-    private static final BibEntryType INCOLLECTION = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.InCollection)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.BOOKTITLE, StandardField.PUBLISHER, StandardField.YEAR)
-            .withImportantFields(StandardField.EDITOR, StandardField.VOLUME, StandardField.NUMBER, StandardField.SERIES, StandardField.TYPE, StandardField.CHAPTER, StandardField.PAGES, StandardField.ADDRESS, StandardField.EDITION, StandardField.MONTH, StandardField.ISBN, StandardField.NOTE)
-            .build();
+    private static final BibEntryType INCOLLECTION =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.InCollection)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.BOOKTITLE,
+                            StandardField.PUBLISHER,
+                            StandardField.YEAR)
+                    .withImportantFields(
+                            StandardField.EDITOR,
+                            StandardField.VOLUME,
+                            StandardField.NUMBER,
+                            StandardField.SERIES,
+                            StandardField.TYPE,
+                            StandardField.CHAPTER,
+                            StandardField.PAGES,
+                            StandardField.ADDRESS,
+                            StandardField.EDITION,
+                            StandardField.MONTH,
+                            StandardField.ISBN,
+                            StandardField.NOTE)
+                    .build();
 
     /**
      * An article in a conference proceedings.
@@ -95,19 +170,46 @@ public class BibtexEntryTypeDefinitions {
      * Required fields: author, title, booktitle, year.
      * Optional fields: editor, volume or number, series, pages, address, month, organization, publisher, note.
      */
-    private static final BibEntryType INPROCEEDINGS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.InProceedings)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.BOOKTITLE, StandardField.YEAR)
-            .withImportantFields(StandardField.EDITOR, StandardField.VOLUME, StandardField.NUMBER, StandardField.SERIES, StandardField.PAGES, StandardField.ADDRESS, StandardField.MONTH, StandardField.ORGANIZATION, StandardField.PUBLISHER, StandardField.NOTE)
-            .build();
+    private static final BibEntryType INPROCEEDINGS =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.InProceedings)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.BOOKTITLE,
+                            StandardField.YEAR)
+                    .withImportantFields(
+                            StandardField.EDITOR,
+                            StandardField.VOLUME,
+                            StandardField.NUMBER,
+                            StandardField.SERIES,
+                            StandardField.PAGES,
+                            StandardField.ADDRESS,
+                            StandardField.MONTH,
+                            StandardField.ORGANIZATION,
+                            StandardField.PUBLISHER,
+                            StandardField.NOTE)
+                    .build();
 
     /**
      * Technical documentation.
      * Required field: title.
      * Optional fields: author, organization, address, edition, month, year, note.
      */
-    private static final BibEntryType MANUAL = new BibEntryTypeBuilder().withRequiredFields(StandardField.TITLE).withImportantFields(StandardField.AUTHOR, StandardField.ORGANIZATION, StandardField.ADDRESS, StandardField.EDITION, StandardField.MONTH, StandardField.YEAR, StandardField.ISBN, StandardField.NOTE).withType(StandardEntryType.Manual)
-                                                                        .build();
+    private static final BibEntryType MANUAL =
+            new BibEntryTypeBuilder()
+                    .withRequiredFields(StandardField.TITLE)
+                    .withImportantFields(
+                            StandardField.AUTHOR,
+                            StandardField.ORGANIZATION,
+                            StandardField.ADDRESS,
+                            StandardField.EDITION,
+                            StandardField.MONTH,
+                            StandardField.YEAR,
+                            StandardField.ISBN,
+                            StandardField.NOTE)
+                    .withType(StandardEntryType.Manual)
+                    .build();
 
     /**
      * A Master's thesis.
@@ -115,11 +217,20 @@ public class BibtexEntryTypeDefinitions {
      * Required fields: author, title, school, year.
      * Optional fields: type, address, month, note.
      */
-    private static final BibEntryType MASTERSTHESIS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.MastersThesis)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.SCHOOL, StandardField.YEAR)
-            .withImportantFields(StandardField.TYPE, StandardField.ADDRESS, StandardField.MONTH, StandardField.NOTE)
-            .build();
+    private static final BibEntryType MASTERSTHESIS =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.MastersThesis)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.SCHOOL,
+                            StandardField.YEAR)
+                    .withImportantFields(
+                            StandardField.TYPE,
+                            StandardField.ADDRESS,
+                            StandardField.MONTH,
+                            StandardField.NOTE)
+                    .build();
 
     /**
      * Use this type when nothing else fits.
@@ -127,10 +238,17 @@ public class BibtexEntryTypeDefinitions {
      * Required fields: none.
      * Optional fields: author, title, howpublished, month, year, note.
      */
-    private static final BibEntryType MISC = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Misc)
-            .withImportantFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.HOWPUBLISHED, StandardField.MONTH, StandardField.YEAR, StandardField.NOTE)
-            .build();
+    private static final BibEntryType MISC =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Misc)
+                    .withImportantFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.HOWPUBLISHED,
+                            StandardField.MONTH,
+                            StandardField.YEAR,
+                            StandardField.NOTE)
+                    .build();
 
     /**
      * A PhD thesis.
@@ -138,11 +256,20 @@ public class BibtexEntryTypeDefinitions {
      * Required fields: author, title, school, year.
      * Optional fields: type, address, month, note.
      */
-    private static final BibEntryType PHDTHESIS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.PhdThesis)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.SCHOOL, StandardField.YEAR)
-            .withImportantFields(StandardField.TYPE, StandardField.ADDRESS, StandardField.MONTH, StandardField.NOTE)
-            .build();
+    private static final BibEntryType PHDTHESIS =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.PhdThesis)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.SCHOOL,
+                            StandardField.YEAR)
+                    .withImportantFields(
+                            StandardField.TYPE,
+                            StandardField.ADDRESS,
+                            StandardField.MONTH,
+                            StandardField.NOTE)
+                    .build();
 
     /**
      * The proceedings of a conference.
@@ -150,11 +277,22 @@ public class BibtexEntryTypeDefinitions {
      * Required fields: title, year.
      * Optional fields: editor, volume or number, series, address, month, organization, publisher, note.
      */
-    private static final BibEntryType PROCEEDINGS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Proceedings)
-            .withRequiredFields(StandardField.TITLE, StandardField.YEAR)
-            .withImportantFields(StandardField.EDITOR, StandardField.VOLUME, StandardField.NUMBER, StandardField.SERIES, StandardField.ADDRESS, StandardField.PUBLISHER, StandardField.MONTH, StandardField.ORGANIZATION, StandardField.ISBN, StandardField.NOTE)
-            .build();
+    private static final BibEntryType PROCEEDINGS =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Proceedings)
+                    .withRequiredFields(StandardField.TITLE, StandardField.YEAR)
+                    .withImportantFields(
+                            StandardField.EDITOR,
+                            StandardField.VOLUME,
+                            StandardField.NUMBER,
+                            StandardField.SERIES,
+                            StandardField.ADDRESS,
+                            StandardField.PUBLISHER,
+                            StandardField.MONTH,
+                            StandardField.ORGANIZATION,
+                            StandardField.ISBN,
+                            StandardField.NOTE)
+                    .build();
 
     /**
      * A report published by a school or other institution, usually numbered within a series.
@@ -162,11 +300,21 @@ public class BibtexEntryTypeDefinitions {
      * Required fields: author, title, institution, year.
      * Optional fields: type, number, address, month, note.
      */
-    private static final BibEntryType TECHREPORT = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.TechReport)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.INSTITUTION, StandardField.YEAR)
-            .withImportantFields(StandardField.TYPE, StandardField.NUMBER, StandardField.ADDRESS, StandardField.MONTH, StandardField.NOTE)
-            .build();
+    private static final BibEntryType TECHREPORT =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.TechReport)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.INSTITUTION,
+                            StandardField.YEAR)
+                    .withImportantFields(
+                            StandardField.TYPE,
+                            StandardField.NUMBER,
+                            StandardField.ADDRESS,
+                            StandardField.MONTH,
+                            StandardField.NOTE)
+                    .build();
 
     /**
      * A document having an author and title, but not formally published.
@@ -174,17 +322,33 @@ public class BibtexEntryTypeDefinitions {
      * Required fields: author, title, note.
      * Optional fields: month, year.
      */
-    private static final BibEntryType UNPUBLISHED = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Unpublished)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.NOTE)
-            .withImportantFields(StandardField.MONTH, StandardField.YEAR)
-            .build();
+    private static final BibEntryType UNPUBLISHED =
+            new BibEntryTypeBuilder()
+                    .withType(StandardEntryType.Unpublished)
+                    .withRequiredFields(
+                            StandardField.AUTHOR, StandardField.TITLE, StandardField.NOTE)
+                    .withImportantFields(StandardField.MONTH, StandardField.YEAR)
+                    .build();
 
-    public static final List<BibEntryType> ALL = Arrays.asList(ARTICLE, INBOOK, BOOK, BOOKLET, INCOLLECTION, CONFERENCE,
-            INPROCEEDINGS, PROCEEDINGS, MANUAL, MASTERSTHESIS, PHDTHESIS, TECHREPORT, UNPUBLISHED, MISC);
+    public static final List<BibEntryType> ALL =
+            Arrays.asList(
+                    ARTICLE,
+                    INBOOK,
+                    BOOK,
+                    BOOKLET,
+                    INCOLLECTION,
+                    CONFERENCE,
+                    INPROCEEDINGS,
+                    PROCEEDINGS,
+                    MANUAL,
+                    MASTERSTHESIS,
+                    PHDTHESIS,
+                    TECHREPORT,
+                    UNPUBLISHED,
+                    MISC);
 
-    public static final List<BibEntryType> RECOMMENDED = Arrays.asList(ARTICLE, BOOK, INPROCEEDINGS, TECHREPORT, MISC);
+    public static final List<BibEntryType> RECOMMENDED =
+            Arrays.asList(ARTICLE, BOOK, INPROCEEDINGS, TECHREPORT, MISC);
 
-    private BibtexEntryTypeDefinitions() {
-    }
+    private BibtexEntryTypeDefinitions() {}
 }
diff --git a/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java b/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java
index 0f30ca5e6bf5..1790794a0dea 100644
--- a/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java
+++ b/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java
@@ -1,17 +1,16 @@
 package org.jabref.model.entry.types;
 
+import org.jabref.model.entry.BibEntryType;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 
-import org.jabref.model.entry.BibEntryType;
-
 public class EntryTypeFactory {
 
-    private EntryTypeFactory() {
-    }
+    private EntryTypeFactory() {}
 
     /**
      * Checks whether two EntryTypeFactory are equal
@@ -28,7 +27,8 @@ public static boolean nameAndFieldsAreEqual(BibEntryType type1, BibEntryType typ
             return Objects.equals(type1.getType(), type2.getType())
                     && Objects.equals(type1.getRequiredFields(), type2.getRequiredFields())
                     && Objects.equals(type1.getOptionalFields(), type2.getOptionalFields())
-                    && Objects.equals(type1.getDetailOptionalFields(), type2.getDetailOptionalFields());
+                    && Objects.equals(
+                            type1.getDetailOptionalFields(), type2.getDetailOptionalFields());
         }
     }
 
@@ -37,20 +37,26 @@ public static boolean isExclusiveBiblatex(EntryType type) {
     }
 
     private static boolean isBibtex(EntryType type) {
-        return BibtexEntryTypeDefinitions.ALL.stream().anyMatch(bibEntryType -> bibEntryType.getType().equals(type));
+        return BibtexEntryTypeDefinitions.ALL.stream()
+                .anyMatch(bibEntryType -> bibEntryType.getType().equals(type));
     }
 
     private static boolean isBiblatex(EntryType type) {
-        return BiblatexEntryTypeDefinitions.ALL.stream().anyMatch(bibEntryType -> bibEntryType.getType().equals(type));
+        return BiblatexEntryTypeDefinitions.ALL.stream()
+                .anyMatch(bibEntryType -> bibEntryType.getType().equals(type));
     }
 
     public static EntryType parse(String typeName) {
-        List<EntryType> types = new ArrayList<>(Arrays.<EntryType>asList(StandardEntryType.values()));
+        List<EntryType> types =
+                new ArrayList<>(Arrays.<EntryType>asList(StandardEntryType.values()));
         types.addAll(Arrays.<EntryType>asList(IEEETranEntryType.values()));
         types.addAll(Arrays.<EntryType>asList(BiblatexSoftwareEntryType.values()));
         types.addAll(Arrays.<EntryType>asList(BiblatexApaEntryType.values()));
         types.addAll(Arrays.<EntryType>asList(SystematicLiteratureReviewStudyEntryType.values()));
 
-        return types.stream().filter(type -> type.getName().equals(typeName.toLowerCase(Locale.ENGLISH))).findFirst().orElse(new UnknownEntryType(typeName));
+        return types.stream()
+                .filter(type -> type.getName().equals(typeName.toLowerCase(Locale.ENGLISH)))
+                .findFirst()
+                .orElse(new UnknownEntryType(typeName));
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/types/IEEETranEntryType.java b/src/main/java/org/jabref/model/entry/types/IEEETranEntryType.java
index 4c3305ded225..0eb59d2e4c65 100644
--- a/src/main/java/org/jabref/model/entry/types/IEEETranEntryType.java
+++ b/src/main/java/org/jabref/model/entry/types/IEEETranEntryType.java
@@ -19,8 +19,8 @@ public enum IEEETranEntryType implements EntryType {
 
     public static Optional<IEEETranEntryType> fromName(String name) {
         return Arrays.stream(IEEETranEntryType.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+                .filter(field -> field.getName().equalsIgnoreCase(name))
+                .findAny();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/types/IEEETranEntryTypeDefinitions.java b/src/main/java/org/jabref/model/entry/types/IEEETranEntryTypeDefinitions.java
index 790dea24746a..87f388335051 100644
--- a/src/main/java/org/jabref/model/entry/types/IEEETranEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/IEEETranEntryTypeDefinitions.java
@@ -1,14 +1,14 @@
 package org.jabref.model.entry.types;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypeBuilder;
 import org.jabref.model.entry.field.IEEEField;
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.StandardField;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * This class represents all supported IEEETran entry types.
  * <p>
@@ -23,22 +23,42 @@ public class IEEETranEntryTypeDefinitions {
      * Required fields:
      * Optional fields: author, month, year, title, language, howpublished, organization, address, note, url
      */
-    private static final BibEntryType ELECTRONIC = new BibEntryTypeBuilder()
-            .withType(IEEETranEntryType.Electronic)
-            .withImportantFields(StandardField.AUTHOR, StandardField.MONTH, StandardField.YEAR, StandardField.TITLE, StandardField.LANGUAGE,
-                    StandardField.HOWPUBLISHED, StandardField.ORGANIZATION, StandardField.ADDRESS, StandardField.NOTE, StandardField.URL)
-            .build();
+    private static final BibEntryType ELECTRONIC =
+            new BibEntryTypeBuilder()
+                    .withType(IEEETranEntryType.Electronic)
+                    .withImportantFields(
+                            StandardField.AUTHOR,
+                            StandardField.MONTH,
+                            StandardField.YEAR,
+                            StandardField.TITLE,
+                            StandardField.LANGUAGE,
+                            StandardField.HOWPUBLISHED,
+                            StandardField.ORGANIZATION,
+                            StandardField.ADDRESS,
+                            StandardField.NOTE,
+                            StandardField.URL)
+                    .build();
 
     /**
      * Special entry type that can be used to externally control some aspects of the bibliography style.
      */
-    private static final BibEntryType IEEETRANBSTCTL = new BibEntryTypeBuilder()
-            .withType(IEEETranEntryType.IEEEtranBSTCTL)
-            .withImportantFields(IEEEField.CTLUSE_ARTICLE_NUMBER, IEEEField.CTLUSE_PAPER, IEEEField.CTLUSE_FORCED_ETAL,
-                    IEEEField.CTLUSE_URL, IEEEField.CTLMAX_NAMES_FORCED_ETAL, IEEEField.CTLNAMES_SHOW_ETAL,
-                    IEEEField.CTLUSE_ALT_SPACING, IEEEField.CTLALT_STRETCH_FACTOR, IEEEField.CTLDASH_REPEATED_NAMES,
-                    IEEEField.CTLNAME_FORMAT_STRING, IEEEField.CTLNAME_LATEX_CMD, IEEEField.CTLNAME_URL_PREFIX)
-            .build();
+    private static final BibEntryType IEEETRANBSTCTL =
+            new BibEntryTypeBuilder()
+                    .withType(IEEETranEntryType.IEEEtranBSTCTL)
+                    .withImportantFields(
+                            IEEEField.CTLUSE_ARTICLE_NUMBER,
+                            IEEEField.CTLUSE_PAPER,
+                            IEEEField.CTLUSE_FORCED_ETAL,
+                            IEEEField.CTLUSE_URL,
+                            IEEEField.CTLMAX_NAMES_FORCED_ETAL,
+                            IEEEField.CTLNAMES_SHOW_ETAL,
+                            IEEEField.CTLUSE_ALT_SPACING,
+                            IEEEField.CTLALT_STRETCH_FACTOR,
+                            IEEEField.CTLDASH_REPEATED_NAMES,
+                            IEEEField.CTLNAME_FORMAT_STRING,
+                            IEEEField.CTLNAME_LATEX_CMD,
+                            IEEEField.CTLNAME_URL_PREFIX)
+                    .build();
 
     /**
      * The periodical entry type is used for journals and magazines.
@@ -46,11 +66,21 @@ public class IEEETranEntryTypeDefinitions {
      * Required fields: title, year
      * Optional fields: editor, language, series, volume, number, organization, month, note, url
      */
-    private static final BibEntryType PERIODICAL = new BibEntryTypeBuilder()
-            .withType(IEEETranEntryType.Periodical)
-            .withRequiredFields(StandardField.TITLE, StandardField.YEAR)
-            .withImportantFields(StandardField.EDITOR, StandardField.LANGUAGE, StandardField.SERIES, StandardField.VOLUME, StandardField.NUMBER, StandardField.ORGANIZATION, StandardField.MONTH, StandardField.NOTE, StandardField.URL)
-            .build();
+    private static final BibEntryType PERIODICAL =
+            new BibEntryTypeBuilder()
+                    .withType(IEEETranEntryType.Periodical)
+                    .withRequiredFields(StandardField.TITLE, StandardField.YEAR)
+                    .withImportantFields(
+                            StandardField.EDITOR,
+                            StandardField.LANGUAGE,
+                            StandardField.SERIES,
+                            StandardField.VOLUME,
+                            StandardField.NUMBER,
+                            StandardField.ORGANIZATION,
+                            StandardField.MONTH,
+                            StandardField.NOTE,
+                            StandardField.URL)
+                    .build();
 
     /**
      * Entry type for patents.
@@ -58,13 +88,27 @@ public class IEEETranEntryTypeDefinitions {
      * Required fields: nationality, number, year or yearfiled
      * Optional fields: author, title, language, assignee, address, type, number, day, dayfiled, month, monthfiled, note, url
      */
-    private static final BibEntryType PATENT = new BibEntryTypeBuilder()
-            .withType(IEEETranEntryType.Patent)
-            .withRequiredFields(new OrFields(StandardField.YEAR, StandardField.YEARFILED), StandardField.NATIONALITY, StandardField.NUMBER)
-            .withImportantFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.LANGUAGE, StandardField.ASSIGNEE, StandardField.ADDRESS,
-                    StandardField.TYPE, StandardField.DAY, StandardField.DAYFILED, StandardField.MONTH,
-                    StandardField.MONTHFILED, StandardField.NOTE, StandardField.URL)
-            .build();
+    private static final BibEntryType PATENT =
+            new BibEntryTypeBuilder()
+                    .withType(IEEETranEntryType.Patent)
+                    .withRequiredFields(
+                            new OrFields(StandardField.YEAR, StandardField.YEARFILED),
+                            StandardField.NATIONALITY,
+                            StandardField.NUMBER)
+                    .withImportantFields(
+                            StandardField.AUTHOR,
+                            StandardField.TITLE,
+                            StandardField.LANGUAGE,
+                            StandardField.ASSIGNEE,
+                            StandardField.ADDRESS,
+                            StandardField.TYPE,
+                            StandardField.DAY,
+                            StandardField.DAYFILED,
+                            StandardField.MONTH,
+                            StandardField.MONTHFILED,
+                            StandardField.NOTE,
+                            StandardField.URL)
+                    .build();
 
     /**
      * The standard entry type is used for proposed or formally published standards.
@@ -72,16 +116,28 @@ public class IEEETranEntryTypeDefinitions {
      * Required fields: title, organization or institution
      * Optional fields: author, language, howpublished, type, number, revision, address, month, year, note, url
      */
-    private static final BibEntryType STANDARD = new BibEntryTypeBuilder()
-            .withType(IEEETranEntryType.Standard)
-            .withRequiredFields(new OrFields(StandardField.ORGANIZATION, StandardField.INSTITUTION), StandardField.TITLE)
-            .withImportantFields(StandardField.AUTHOR, StandardField.LANGUAGE, StandardField.HOWPUBLISHED, StandardField.TYPE,
-                    StandardField.NUMBER, StandardField.REVISION, StandardField.ADDRESS, StandardField.MONTH, StandardField.YEAR,
-                    StandardField.NOTE, StandardField.URL)
-            .build();
+    private static final BibEntryType STANDARD =
+            new BibEntryTypeBuilder()
+                    .withType(IEEETranEntryType.Standard)
+                    .withRequiredFields(
+                            new OrFields(StandardField.ORGANIZATION, StandardField.INSTITUTION),
+                            StandardField.TITLE)
+                    .withImportantFields(
+                            StandardField.AUTHOR,
+                            StandardField.LANGUAGE,
+                            StandardField.HOWPUBLISHED,
+                            StandardField.TYPE,
+                            StandardField.NUMBER,
+                            StandardField.REVISION,
+                            StandardField.ADDRESS,
+                            StandardField.MONTH,
+                            StandardField.YEAR,
+                            StandardField.NOTE,
+                            StandardField.URL)
+                    .build();
 
-    public static final List<BibEntryType> ALL = Arrays.asList(ELECTRONIC, IEEETRANBSTCTL, PERIODICAL, PATENT, STANDARD);
+    public static final List<BibEntryType> ALL =
+            Arrays.asList(ELECTRONIC, IEEETRANBSTCTL, PERIODICAL, PATENT, STANDARD);
 
-    private IEEETranEntryTypeDefinitions() {
-    }
+    private IEEETranEntryTypeDefinitions() {}
 }
diff --git a/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryType.java b/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryType.java
index 1d9bd4be1127..0fa684347e52 100644
--- a/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryType.java
+++ b/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryType.java
@@ -17,8 +17,8 @@ public enum SystematicLiteratureReviewStudyEntryType implements EntryType {
 
     public static Optional<SystematicLiteratureReviewStudyEntryType> fromName(String name) {
         return Arrays.stream(SystematicLiteratureReviewStudyEntryType.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+                .filter(field -> field.getName().equalsIgnoreCase(name))
+                .findAny();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryTypeDefinitions.java b/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryTypeDefinitions.java
index 5d1bf665bfef..b69c2d83c593 100644
--- a/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryTypeDefinitions.java
@@ -1,13 +1,13 @@
 package org.jabref.model.entry.types;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypeBuilder;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * This class represents all supported entry types used in a study definition file
  */
@@ -21,10 +21,15 @@ public class SystematicLiteratureReviewStudyEntryTypeDefinitions {
      * <li>Optional fields:</li>
      * </ul>
      */
-    private static final BibEntryType STUDY_ENTRY = new BibEntryTypeBuilder()
-            .withType(SystematicLiteratureReviewStudyEntryType.STUDY_ENTRY)
-            .withRequiredFields(StandardField.AUTHOR, new UnknownField("lastsearchdate"), new UnknownField("name"), new UnknownField("researchquestions"))
-            .build();
+    private static final BibEntryType STUDY_ENTRY =
+            new BibEntryTypeBuilder()
+                    .withType(SystematicLiteratureReviewStudyEntryType.STUDY_ENTRY)
+                    .withRequiredFields(
+                            StandardField.AUTHOR,
+                            new UnknownField("lastsearchdate"),
+                            new UnknownField("name"),
+                            new UnknownField("researchquestions"))
+                    .build();
 
     /**
      * Entry type for the queries within the study definition file
@@ -34,10 +39,11 @@ public class SystematicLiteratureReviewStudyEntryTypeDefinitions {
      * <li>Optional fields:</li>
      * </ul>
      */
-    private static final BibEntryType SEARCH_QUERY_ENTRY = new BibEntryTypeBuilder()
-            .withType(SystematicLiteratureReviewStudyEntryType.SEARCH_QUERY_ENTRY)
-            .withRequiredFields(new UnknownField("query"))
-            .build();
+    private static final BibEntryType SEARCH_QUERY_ENTRY =
+            new BibEntryTypeBuilder()
+                    .withType(SystematicLiteratureReviewStudyEntryType.SEARCH_QUERY_ENTRY)
+                    .withRequiredFields(new UnknownField("query"))
+                    .build();
 
     /**
      * Entry type for the targeted libraries within a study definition file
@@ -47,14 +53,15 @@ public class SystematicLiteratureReviewStudyEntryTypeDefinitions {
      * <li>Optional fields: comment</li>
      * </ul>
      */
-    private static final BibEntryType LIBRARY_ENTRY = new BibEntryTypeBuilder()
-            .withType(SystematicLiteratureReviewStudyEntryType.STUDY_ENTRY)
-            .withRequiredFields(new UnknownField("name"), new UnknownField("enabled"))
-            .withImportantFields(StandardField.COMMENT)
-            .build();
+    private static final BibEntryType LIBRARY_ENTRY =
+            new BibEntryTypeBuilder()
+                    .withType(SystematicLiteratureReviewStudyEntryType.STUDY_ENTRY)
+                    .withRequiredFields(new UnknownField("name"), new UnknownField("enabled"))
+                    .withImportantFields(StandardField.COMMENT)
+                    .build();
 
-    public static final List<BibEntryType> ALL = Arrays.asList(STUDY_ENTRY, SEARCH_QUERY_ENTRY, LIBRARY_ENTRY);
+    public static final List<BibEntryType> ALL =
+            Arrays.asList(STUDY_ENTRY, SEARCH_QUERY_ENTRY, LIBRARY_ENTRY);
 
-    private SystematicLiteratureReviewStudyEntryTypeDefinitions() {
-    }
+    private SystematicLiteratureReviewStudyEntryTypeDefinitions() {}
 }
diff --git a/src/main/java/org/jabref/model/entry/types/UnknownEntryType.java b/src/main/java/org/jabref/model/entry/types/UnknownEntryType.java
index 6b9d8682d1cc..ff2863e790c7 100644
--- a/src/main/java/org/jabref/model/entry/types/UnknownEntryType.java
+++ b/src/main/java/org/jabref/model/entry/types/UnknownEntryType.java
@@ -1,10 +1,10 @@
 package org.jabref.model.entry.types;
 
+import org.jabref.model.strings.StringUtil;
+
 import java.util.Locale;
 import java.util.Objects;
 
-import org.jabref.model.strings.StringUtil;
-
 public class UnknownEntryType implements EntryType {
     private final String name;
 
@@ -14,9 +14,7 @@ public UnknownEntryType(String name) {
 
     @Override
     public String toString() {
-        return "UnknownEntryType{" +
-                "name='" + name + '\'' +
-                '}';
+        return "UnknownEntryType{" + "name='" + name + '\'' + '}';
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/groups/AbstractGroup.java b/src/main/java/org/jabref/model/groups/AbstractGroup.java
index 5f0aa7cbcfec..6cd08f50e1bf 100644
--- a/src/main/java/org/jabref/model/groups/AbstractGroup.java
+++ b/src/main/java/org/jabref/model/groups/AbstractGroup.java
@@ -1,9 +1,5 @@
 package org.jabref.model.groups;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.paint.Color;
@@ -12,6 +8,10 @@
 import org.jabref.model.search.SearchMatcher;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * Base class for all groups.
  */
@@ -21,10 +21,12 @@ public abstract class AbstractGroup implements SearchMatcher {
      * The group's name.
      */
     protected final StringProperty name = new SimpleStringProperty();
+
     /**
      * The hierarchical context of the group.
      */
     protected final GroupHierarchyType context;
+
     protected Optional<Color> color = Optional.empty();
     protected boolean isExpanded = true;
     protected Optional<String> description = Optional.empty();
@@ -37,14 +39,21 @@ protected AbstractGroup(String name, GroupHierarchyType context) {
 
     @Override
     public String toString() {
-        return "AbstractGroup{" +
-                "name='" + name.getValue() + '\'' +
-                ", context=" + context +
-                ", color=" + color +
-                ", isExpanded=" + isExpanded +
-                ", description=" + description +
-                ", iconName=" + iconName +
-                '}';
+        return "AbstractGroup{"
+                + "name='"
+                + name.getValue()
+                + '\''
+                + ", context="
+                + context
+                + ", color="
+                + color
+                + ", isExpanded="
+                + isExpanded
+                + ", description="
+                + description
+                + ", iconName="
+                + iconName
+                + '}';
     }
 
     @Override
@@ -56,7 +65,8 @@ public boolean equals(Object other) {
             return false;
         }
         AbstractGroup that = (AbstractGroup) other;
-        return Objects.equals(this.name.getValue(), that.name.getValue()) && Objects.equals(this.description, that.description)
+        return Objects.equals(this.name.getValue(), that.name.getValue())
+                && Objects.equals(this.description, that.description)
                 && Objects.equals(this.context, that.context);
     }
 
diff --git a/src/main/java/org/jabref/model/groups/AllEntriesGroup.java b/src/main/java/org/jabref/model/groups/AllEntriesGroup.java
index 1e3ef85fa538..c6e14a00cb3f 100644
--- a/src/main/java/org/jabref/model/groups/AllEntriesGroup.java
+++ b/src/main/java/org/jabref/model/groups/AllEntriesGroup.java
@@ -1,9 +1,9 @@
 package org.jabref.model.groups;
 
-import java.util.Objects;
-
 import org.jabref.model.entry.BibEntry;
 
+import java.util.Objects;
+
 /**
  * This group contains all entries. Always. At any time!
  */
diff --git a/src/main/java/org/jabref/model/groups/AutomaticGroup.java b/src/main/java/org/jabref/model/groups/AutomaticGroup.java
index 026ce74f76f9..61e5c74eef91 100644
--- a/src/main/java/org/jabref/model/groups/AutomaticGroup.java
+++ b/src/main/java/org/jabref/model/groups/AutomaticGroup.java
@@ -1,12 +1,12 @@
 package org.jabref.model.groups;
 
-import java.util.Set;
-
 import javafx.collections.ObservableList;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.TreeCollector;
 
+import java.util.Set;
+
 public abstract class AutomaticGroup extends AbstractGroup {
     public AutomaticGroup(String name, GroupHierarchyType context) {
         super(name, context);
@@ -25,9 +25,10 @@ public boolean isDynamic() {
     public abstract Set<GroupTreeNode> createSubgroups(BibEntry entry);
 
     public ObservableList<GroupTreeNode> createSubgroups(ObservableList<BibEntry> entries) {
-        // TODO: Propagate changes to entry list (however: there is no flatMap and collect as TransformationList)
+        // TODO: Propagate changes to entry list (however: there is no flatMap and collect as
+        // TransformationList)
         return entries.stream()
-                      .flatMap(entry -> createSubgroups(entry).stream())
-                      .collect(TreeCollector.mergeIntoTree(GroupTreeNode::isSameGroupAs));
+                .flatMap(entry -> createSubgroups(entry).stream())
+                .collect(TreeCollector.mergeIntoTree(GroupTreeNode::isSameGroupAs));
     }
 }
diff --git a/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java b/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
index 06dfcd983c11..c436ffce3dd3 100644
--- a/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
@@ -1,22 +1,27 @@
 package org.jabref.model.groups;
 
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Keyword;
 import org.jabref.model.entry.KeywordList;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.strings.StringUtil;
 
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 public class AutomaticKeywordGroup extends AutomaticGroup {
 
     private final Character keywordDelimiter;
     private final Character keywordHierarchicalDelimiter;
     private final Field field;
 
-    public AutomaticKeywordGroup(String name, GroupHierarchyType context, Field field, Character keywordDelimiter, Character keywordHierarchicalDelimiter) {
+    public AutomaticKeywordGroup(
+            String name,
+            GroupHierarchyType context,
+            Field field,
+            Character keywordDelimiter,
+            Character keywordHierarchicalDelimiter) {
         super(name, context);
         this.field = field;
         this.keywordDelimiter = keywordDelimiter;
@@ -37,7 +42,12 @@ public Field getField() {
 
     @Override
     public AbstractGroup deepCopy() {
-        return new AutomaticKeywordGroup(this.name.getValue(), this.context, field, this.keywordDelimiter, keywordHierarchicalDelimiter);
+        return new AutomaticKeywordGroup(
+                this.name.getValue(),
+                this.context,
+                field,
+                this.keywordDelimiter,
+                keywordHierarchicalDelimiter);
     }
 
     @Override
@@ -49,8 +59,8 @@ public boolean equals(Object o) {
             return false;
         }
         AutomaticKeywordGroup that = (AutomaticKeywordGroup) o;
-        return Objects.equals(keywordDelimiter, that.keywordDelimiter) &&
-                Objects.equals(field, that.field);
+        return Objects.equals(keywordDelimiter, that.keywordDelimiter)
+                && Objects.equals(field, that.field);
     }
 
     @Override
@@ -62,24 +72,23 @@ public int hashCode() {
     public Set<GroupTreeNode> createSubgroups(BibEntry entry) {
         KeywordList keywordList = entry.getFieldAsKeywords(field, keywordDelimiter);
         return keywordList.stream()
-                          .filter(keyword -> StringUtil.isNotBlank(keyword.get()))
-                          .map(this::createGroup)
-                          .collect(Collectors.toSet());
+                .filter(keyword -> StringUtil.isNotBlank(keyword.get()))
+                .map(this::createGroup)
+                .collect(Collectors.toSet());
     }
 
     private GroupTreeNode createGroup(Keyword keywordChain) {
-        WordKeywordGroup rootGroup = new WordKeywordGroup(
-                keywordChain.get(),
-                GroupHierarchyType.INCLUDING,
-                field,
-                keywordChain.getPathFromRootAsString(keywordHierarchicalDelimiter),
-                true,
-                keywordDelimiter,
-                true);
+        WordKeywordGroup rootGroup =
+                new WordKeywordGroup(
+                        keywordChain.get(),
+                        GroupHierarchyType.INCLUDING,
+                        field,
+                        keywordChain.getPathFromRootAsString(keywordHierarchicalDelimiter),
+                        true,
+                        keywordDelimiter,
+                        true);
         GroupTreeNode root = new GroupTreeNode(rootGroup);
-        keywordChain.getChild()
-                    .map(this::createGroup)
-                    .ifPresent(root::addChild);
+        keywordChain.getChild().map(this::createGroup).ifPresent(root::addChild);
         return root;
     }
 }
diff --git a/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java b/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java
index bd31c03a674c..caeb08ef1946 100644
--- a/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java
+++ b/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java
@@ -1,12 +1,12 @@
 package org.jabref.model.groups;
 
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
-
 public class AutomaticPersonsGroup extends AutomaticGroup {
 
     private final Field field;
@@ -40,11 +40,13 @@ public AbstractGroup deepCopy() {
 
     @Override
     public Set<GroupTreeNode> createSubgroups(BibEntry entry) {
-        return LastNameGroup.getAsLastNamesLatexFree(field, entry)
-                            .stream()
-                            .map(lastName -> new LastNameGroup(lastName, GroupHierarchyType.INDEPENDENT, field, lastName))
-                            .map(GroupTreeNode::new)
-                            .collect(Collectors.toSet());
+        return LastNameGroup.getAsLastNamesLatexFree(field, entry).stream()
+                .map(
+                        lastName ->
+                                new LastNameGroup(
+                                        lastName, GroupHierarchyType.INDEPENDENT, field, lastName))
+                .map(GroupTreeNode::new)
+                .collect(Collectors.toSet());
     }
 
     public Field getField() {
diff --git a/src/main/java/org/jabref/model/groups/ExplicitGroup.java b/src/main/java/org/jabref/model/groups/ExplicitGroup.java
index d0857d5aa295..5b06e6f1bb03 100644
--- a/src/main/java/org/jabref/model/groups/ExplicitGroup.java
+++ b/src/main/java/org/jabref/model/groups/ExplicitGroup.java
@@ -1,12 +1,12 @@
 package org.jabref.model.groups;
 
+import org.jabref.model.entry.field.StandardField;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
-import org.jabref.model.entry.field.StandardField;
-
 /**
  * This group contains entries, which were manually assigned to it.
  * Assignments are stored in the {@link StandardField#GROUPS} field.
@@ -31,7 +31,8 @@ public void addLegacyEntryKey(String key) {
 
     @Override
     public AbstractGroup deepCopy() {
-        ExplicitGroup copy = new ExplicitGroup(getName(), getHierarchicalContext(), keywordSeparator);
+        ExplicitGroup copy =
+                new ExplicitGroup(getName(), getHierarchicalContext(), keywordSeparator);
         copy.legacyEntryKeys.addAll(legacyEntryKeys);
         return copy;
     }
@@ -63,7 +64,14 @@ public List<String> getLegacyEntryKeys() {
 
     @Override
     public int hashCode() {
-        return Objects.hash(name.getValue(), context, legacyEntryKeys, iconName, color, description, isExpanded);
+        return Objects.hash(
+                name.getValue(),
+                context,
+                legacyEntryKeys,
+                iconName,
+                color,
+                description,
+                isExpanded);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/groups/GroupEntryChanger.java b/src/main/java/org/jabref/model/groups/GroupEntryChanger.java
index 8bd75be26dba..7076c195d860 100644
--- a/src/main/java/org/jabref/model/groups/GroupEntryChanger.java
+++ b/src/main/java/org/jabref/model/groups/GroupEntryChanger.java
@@ -1,12 +1,12 @@
 package org.jabref.model.groups;
 
+import org.jabref.model.FieldChange;
+import org.jabref.model.entry.BibEntry;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.jabref.model.FieldChange;
-import org.jabref.model.entry.BibEntry;
-
 /**
  * Some groups can change entries so that they match (or no longer match) the group.
  * This functionality is encoded in this interface.
diff --git a/src/main/java/org/jabref/model/groups/GroupTreeNode.java b/src/main/java/org/jabref/model/groups/GroupTreeNode.java
index 6e5b3284a685..401e1b9448d7 100644
--- a/src/main/java/org/jabref/model/groups/GroupTreeNode.java
+++ b/src/main/java/org/jabref/model/groups/GroupTreeNode.java
@@ -1,13 +1,5 @@
 package org.jabref.model.groups;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 
@@ -19,6 +11,14 @@
 import org.jabref.model.search.matchers.MatcherSet;
 import org.jabref.model.search.matchers.MatcherSets;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 /**
  * A node in the groups tree that holds exactly one AbstractGroup.
  */
@@ -73,17 +73,24 @@ public void setGroup(AbstractGroup newGroup) {
      * @param shouldRemovePreviousAssignments specifies whether previous matched entries should be removed from the old group
      * @param entriesInDatabase               list of entries in the database
      */
-    public List<FieldChange> setGroup(AbstractGroup newGroup, boolean shouldKeepPreviousAssignments,
-                                      boolean shouldRemovePreviousAssignments, List<BibEntry> entriesInDatabase) {
+    public List<FieldChange> setGroup(
+            AbstractGroup newGroup,
+            boolean shouldKeepPreviousAssignments,
+            boolean shouldRemovePreviousAssignments,
+            List<BibEntry> entriesInDatabase) {
         AbstractGroup oldGroup = getGroup();
         groupProperty.set(Objects.requireNonNull(newGroup));
 
         List<FieldChange> changes = new ArrayList<>();
-        boolean shouldRemoveFromOldGroup = shouldRemovePreviousAssignments && (oldGroup instanceof GroupEntryChanger);
-        boolean shouldAddToNewGroup = shouldKeepPreviousAssignments && (newGroup instanceof GroupEntryChanger);
+        boolean shouldRemoveFromOldGroup =
+                shouldRemovePreviousAssignments && (oldGroup instanceof GroupEntryChanger);
+        boolean shouldAddToNewGroup =
+                shouldKeepPreviousAssignments && (newGroup instanceof GroupEntryChanger);
         if (shouldAddToNewGroup || shouldRemoveFromOldGroup) {
-            List<BibEntry> entriesMatchedByOldGroup = entriesInDatabase.stream().filter(oldGroup::isMatch)
-                                                                       .collect(Collectors.toList());
+            List<BibEntry> entriesMatchedByOldGroup =
+                    entriesInDatabase.stream()
+                            .filter(oldGroup::isMatch)
+                            .collect(Collectors.toList());
             if (shouldRemoveFromOldGroup) {
                 GroupEntryChanger entryChanger = (GroupEntryChanger) oldGroup;
                 changes.addAll(entryChanger.remove(entriesMatchedByOldGroup));
@@ -109,15 +116,20 @@ private SearchMatcher getSearchMatcher(GroupHierarchyType originalContext) {
         if (context == GroupHierarchyType.INDEPENDENT) {
             return getGroup();
         }
-        MatcherSet searchRule = MatcherSets.build(
-                context == GroupHierarchyType.REFINING ? MatcherSets.MatcherType.AND : MatcherSets.MatcherType.OR);
+        MatcherSet searchRule =
+                MatcherSets.build(
+                        context == GroupHierarchyType.REFINING
+                                ? MatcherSets.MatcherType.AND
+                                : MatcherSets.MatcherType.OR);
         searchRule.addRule(getGroup());
-        if ((context == GroupHierarchyType.INCLUDING) && (originalContext != GroupHierarchyType.REFINING)) {
+        if ((context == GroupHierarchyType.INCLUDING)
+                && (originalContext != GroupHierarchyType.REFINING)) {
             for (GroupTreeNode child : getChildren()) {
                 searchRule.addRule(child.getSearchMatcher(originalContext));
             }
-        } else if ((context == GroupHierarchyType.REFINING) && !isRoot() && (originalContext
-                != GroupHierarchyType.INCLUDING)) {
+        } else if ((context == GroupHierarchyType.REFINING)
+                && !isRoot()
+                && (originalContext != GroupHierarchyType.INCLUDING)) {
             // noinspection OptionalGetWithoutIsPresent
             searchRule.addRule(getParent().get().getSearchMatcher(originalContext));
         }
@@ -133,8 +145,8 @@ public boolean equals(Object o) {
             return false;
         }
         GroupTreeNode that = (GroupTreeNode) o;
-        return Objects.equals(getGroup(), that.getGroup()) &&
-                Objects.equals(getChildren(), that.getChildren());
+        return Objects.equals(getGroup(), that.getGroup())
+                && Objects.equals(getChildren(), that.getChildren());
     }
 
     @Override
@@ -239,9 +251,7 @@ public GroupTreeNode copyNode() {
      */
     public List<BibEntry> findMatches(List<BibEntry> entries) {
         SearchMatcher matcher = getSearchMatcher();
-        return entries.stream()
-                      .filter(matcher::isMatch)
-                      .collect(Collectors.toList());
+        return entries.stream().filter(matcher::isMatch).collect(Collectors.toList());
     }
 
     /**
@@ -268,16 +278,14 @@ public boolean matches(BibEntry entry) {
      */
     public String getPath() {
         return getPathFromRoot().stream()
-                                .skip(1) // Skip root
-                                .map(GroupTreeNode::getName)
-                                .collect(Collectors.joining(PATH_DELIMITER));
+                .skip(1) // Skip root
+                .map(GroupTreeNode::getName)
+                .collect(Collectors.joining(PATH_DELIMITER));
     }
 
     @Override
     public String toString() {
-        return "GroupTreeNode{" +
-                "group=" + getGroup() +
-                '}';
+        return "GroupTreeNode{" + "group=" + getGroup() + '}';
     }
 
     /**
@@ -288,10 +296,10 @@ public String toString() {
     public Optional<GroupTreeNode> getChildByPath(String pathToSource) {
         GroupTreeNode present = this;
         for (String groupName : pathToSource.split(PATH_DELIMITER)) {
-            Optional<GroupTreeNode> childWithName = present
-                    .getChildren().stream()
-                    .filter(group -> Objects.equals(group.getName(), groupName))
-                    .findFirst();
+            Optional<GroupTreeNode> childWithName =
+                    present.getChildren().stream()
+                            .filter(group -> Objects.equals(group.getName(), groupName))
+                            .findFirst();
             if (childWithName.isPresent()) {
                 present = childWithName.get();
             } else {
diff --git a/src/main/java/org/jabref/model/groups/KeywordGroup.java b/src/main/java/org/jabref/model/groups/KeywordGroup.java
index 22511e2e0497..150466e96001 100644
--- a/src/main/java/org/jabref/model/groups/KeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/KeywordGroup.java
@@ -1,9 +1,9 @@
 package org.jabref.model.groups;
 
-import java.util.Objects;
-
 import org.jabref.model.entry.field.Field;
 
+import java.util.Objects;
+
 /**
  * Matches entries based on a search phrase relative to the content in a specified field.
  */
@@ -12,7 +12,12 @@ public abstract class KeywordGroup extends AbstractGroup {
     protected final String searchExpression;
     protected final boolean caseSensitive;
 
-    public KeywordGroup(String name, GroupHierarchyType context, Field searchField, String searchExpression, boolean caseSensitive) {
+    public KeywordGroup(
+            String name,
+            GroupHierarchyType context,
+            Field searchField,
+            String searchExpression,
+            boolean caseSensitive) {
         super(name, context);
         this.caseSensitive = caseSensitive;
         this.searchField = searchField;
@@ -48,11 +53,14 @@ public boolean equals(Object o) {
             return false;
         }
         KeywordGroup that = (KeywordGroup) o;
-        return isCaseSensitive() == that.isCaseSensitive() && Objects.equals(getSearchField(), that.getSearchField()) && Objects.equals(getSearchExpression(), that.getSearchExpression());
+        return isCaseSensitive() == that.isCaseSensitive()
+                && Objects.equals(getSearchField(), that.getSearchField())
+                && Objects.equals(getSearchExpression(), that.getSearchExpression());
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), getSearchField(), getSearchExpression(), isCaseSensitive());
+        return Objects.hash(
+                super.hashCode(), getSearchField(), getSearchExpression(), isCaseSensitive());
     }
 }
diff --git a/src/main/java/org/jabref/model/groups/LastNameGroup.java b/src/main/java/org/jabref/model/groups/LastNameGroup.java
index 7ee022af1b6f..edb28a81707d 100644
--- a/src/main/java/org/jabref/model/groups/LastNameGroup.java
+++ b/src/main/java/org/jabref/model/groups/LastNameGroup.java
@@ -1,42 +1,45 @@
 package org.jabref.model.groups;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.strings.LatexToUnicodeAdapter;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 /**
  * Matches based on a latex free last name in a specified field. The field is parsed as an author list and the last names are resolved of latex.
  */
 public class LastNameGroup extends KeywordGroup {
-    public LastNameGroup(String groupName, GroupHierarchyType context, Field searchField, String lastName) {
+    public LastNameGroup(
+            String groupName, GroupHierarchyType context, Field searchField, String lastName) {
         super(groupName, context, searchField, LatexToUnicodeAdapter.format(lastName), true);
     }
 
     static List<String> getAsLastNamesLatexFree(Field field, BibEntry bibEntry) {
         return bibEntry.getField(field).stream()
-                       .map(AuthorList::parse)
-                       .map(AuthorList::latexFree)
-                       .map(AuthorList::getAuthors)
-                       .flatMap(Collection::stream)
-                       .map(Author::getFamilyName)
-                       .flatMap(Optional::stream)
-                       .collect(Collectors.toList());
+                .map(AuthorList::parse)
+                .map(AuthorList::latexFree)
+                .map(AuthorList::getAuthors)
+                .flatMap(Collection::stream)
+                .map(Author::getFamilyName)
+                .flatMap(Optional::stream)
+                .collect(Collectors.toList());
     }
 
     @Override
     public boolean contains(BibEntry entry) {
-        return getAsLastNamesLatexFree(getSearchField(), entry).stream().anyMatch(name -> name.equals(getSearchExpression()));
+        return getAsLastNamesLatexFree(getSearchField(), entry).stream()
+                .anyMatch(name -> name.equals(getSearchExpression()));
     }
 
     @Override
     public AbstractGroup deepCopy() {
-        return new LastNameGroup(getName(), getHierarchicalContext(), getSearchField(), getSearchExpression());
+        return new LastNameGroup(
+                getName(), getHierarchicalContext(), getSearchField(), getSearchExpression());
     }
 }
diff --git a/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java b/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java
index dae573d0b1cb..efedc9e0278a 100644
--- a/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java
@@ -1,27 +1,32 @@
 package org.jabref.model.groups;
 
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+
 import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
 
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
-
 /**
  * Matches entries if the content of a given field is matched by a regular expression.
  */
 public class RegexKeywordGroup extends KeywordGroup {
     private final Pattern pattern;
 
-    public RegexKeywordGroup(String name, GroupHierarchyType context, Field searchField,
-                             String searchExpression, boolean caseSensitive) {
+    public RegexKeywordGroup(
+            String name,
+            GroupHierarchyType context,
+            Field searchField,
+            String searchExpression,
+            boolean caseSensitive) {
         super(name, context, searchField, searchExpression, caseSensitive);
         this.pattern = compilePattern(searchExpression, caseSensitive);
     }
 
     private static Pattern compilePattern(String searchExpression, boolean caseSensitive) {
-        return caseSensitive ? Pattern.compile("\\b" + searchExpression + "\\b") : Pattern.compile(
-                "\\b" + searchExpression + "\\b", Pattern.CASE_INSENSITIVE);
+        return caseSensitive
+                ? Pattern.compile("\\b" + searchExpression + "\\b")
+                : Pattern.compile("\\b" + searchExpression + "\\b", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
@@ -47,16 +52,13 @@ public boolean equals(Object o) {
 
     @Override
     public AbstractGroup deepCopy() {
-        return new RegexKeywordGroup(getName(), getHierarchicalContext(), searchField, searchExpression,
-                caseSensitive);
+        return new RegexKeywordGroup(
+                getName(), getHierarchicalContext(), searchField, searchExpression, caseSensitive);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getName(),
-                getHierarchicalContext(),
-                searchField,
-                searchExpression,
-                caseSensitive);
+        return Objects.hash(
+                getName(), getHierarchicalContext(), searchField, searchExpression, caseSensitive);
     }
 }
diff --git a/src/main/java/org/jabref/model/groups/SearchGroup.java b/src/main/java/org/jabref/model/groups/SearchGroup.java
index 4ba85e8974ab..e957659c4f1d 100644
--- a/src/main/java/org/jabref/model/groups/SearchGroup.java
+++ b/src/main/java/org/jabref/model/groups/SearchGroup.java
@@ -1,19 +1,19 @@
 package org.jabref.model.groups;
 
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
+import io.github.adr.linked.ADR;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.search.SearchQuery;
-
-import io.github.adr.linked.ADR;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
 /**
  * This group matches entries by a complex search pattern, which might include conditions about the values of
  * multiple fields.
@@ -26,7 +26,11 @@ public class SearchGroup extends AbstractGroup {
 
     private SearchQuery query;
 
-    public SearchGroup(String name, GroupHierarchyType context, String searchExpression, EnumSet<SearchFlags> searchFlags) {
+    public SearchGroup(
+            String name,
+            GroupHierarchyType context,
+            String searchExpression,
+            EnumSet<SearchFlags> searchFlags) {
         super(name, context);
         this.query = new SearchQuery(searchExpression, searchFlags);
     }
@@ -74,9 +78,9 @@ public boolean equals(Object o) {
             return false;
         }
         return Objects.equals(getName(), other.getName())
-               && Objects.equals(getHierarchicalContext(), other.getHierarchicalContext())
-               && Objects.equals(getSearchExpression(), other.getSearchExpression())
-               && Objects.equals(getSearchFlags(), other.getSearchFlags());
+                && Objects.equals(getHierarchicalContext(), other.getHierarchicalContext())
+                && Objects.equals(getSearchExpression(), other.getSearchExpression())
+                && Objects.equals(getSearchFlags(), other.getSearchFlags());
     }
 
     @Override
@@ -87,18 +91,37 @@ public boolean contains(BibEntry entry) {
     @Override
     public AbstractGroup deepCopy() {
         try {
-            return new SearchGroup(getName(), getHierarchicalContext(), getSearchExpression(), getSearchFlags());
+            return new SearchGroup(
+                    getName(), getHierarchicalContext(), getSearchExpression(), getSearchFlags());
         } catch (Throwable t) {
             // this should never happen, because the constructor obviously
             // succeeded in creating _this_ instance!
-            LOGGER.error("Internal error in SearchGroup.deepCopy(). Please report this on https://github.com/JabRef/jabref/issues", t);
+            LOGGER.error(
+                    "Internal error in SearchGroup.deepCopy(). Please report this on https://github.com/JabRef/jabref/issues",
+                    t);
             return null;
         }
     }
 
     @Override
     public String toString() {
-        return "SearchGroup [query=" + query + ", name=" + name + ", searchFlags=" + getSearchFlags() + ",  context=" + context + ", color=" + color + ", isExpanded=" + isExpanded + ", description=" + description + ", iconName=" + iconName + "]";
+        return "SearchGroup [query="
+                + query
+                + ", name="
+                + name
+                + ", searchFlags="
+                + getSearchFlags()
+                + ",  context="
+                + context
+                + ", color="
+                + color
+                + ", isExpanded="
+                + isExpanded
+                + ", description="
+                + description
+                + ", iconName="
+                + iconName
+                + "]";
     }
 
     @Override
@@ -108,6 +131,7 @@ public boolean isDynamic() {
 
     @Override
     public int hashCode() {
-        return Objects.hash(getName(), getHierarchicalContext(), getSearchExpression(), getSearchFlags());
+        return Objects.hash(
+                getName(), getHierarchicalContext(), getSearchExpression(), getSearchFlags());
     }
 }
diff --git a/src/main/java/org/jabref/model/groups/TexGroup.java b/src/main/java/org/jabref/model/groups/TexGroup.java
index 8d22c0a1d7fc..6a07245dd1ec 100644
--- a/src/main/java/org/jabref/model/groups/TexGroup.java
+++ b/src/main/java/org/jabref/model/groups/TexGroup.java
@@ -1,13 +1,5 @@
 package org.jabref.model.groups;
 
-import java.io.IOException;
-import java.net.InetAddress;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.logic.auxparser.AuxParser;
 import org.jabref.logic.auxparser.AuxParserResult;
@@ -17,10 +9,17 @@
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateListener;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.InetAddress;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
 @AllowedToUseLogic("because it needs access to aux parser")
 public class TexGroup extends AbstractGroup implements FileUpdateListener {
 
@@ -33,7 +32,14 @@ public class TexGroup extends AbstractGroup implements FileUpdateListener {
     private final MetaData metaData;
     private final String user;
 
-    TexGroup(String name, GroupHierarchyType context, Path filePath, AuxParser auxParser, FileUpdateMonitor fileMonitor, MetaData metaData, String user) {
+    TexGroup(
+            String name,
+            GroupHierarchyType context,
+            Path filePath,
+            AuxParser auxParser,
+            FileUpdateMonitor fileMonitor,
+            MetaData metaData,
+            String user) {
         super(name, context);
         this.metaData = metaData;
         this.user = user;
@@ -42,19 +48,47 @@ public class TexGroup extends AbstractGroup implements FileUpdateListener {
         this.fileMonitor = fileMonitor;
     }
 
-    TexGroup(String name, GroupHierarchyType context, Path filePath, AuxParser auxParser, FileUpdateMonitor fileMonitor, MetaData metaData) throws IOException {
-        this(name, context, filePath, auxParser, fileMonitor, metaData, System.getProperty("user.name") + '-' + InetAddress.getLocalHost().getHostName());
-    }
-
-    public static TexGroup create(String name, GroupHierarchyType context, Path filePath, AuxParser auxParser, FileUpdateMonitor fileMonitor, MetaData metaData) throws IOException {
+    TexGroup(
+            String name,
+            GroupHierarchyType context,
+            Path filePath,
+            AuxParser auxParser,
+            FileUpdateMonitor fileMonitor,
+            MetaData metaData)
+            throws IOException {
+        this(
+                name,
+                context,
+                filePath,
+                auxParser,
+                fileMonitor,
+                metaData,
+                System.getProperty("user.name") + '-' + InetAddress.getLocalHost().getHostName());
+    }
+
+    public static TexGroup create(
+            String name,
+            GroupHierarchyType context,
+            Path filePath,
+            AuxParser auxParser,
+            FileUpdateMonitor fileMonitor,
+            MetaData metaData)
+            throws IOException {
         TexGroup group = new TexGroup(name, context, filePath, auxParser, fileMonitor, metaData);
         fileMonitor.addListenerForFile(group.getFilePathResolved(), group);
         return group;
     }
 
     // without FileUpdateMonitor
-    public static TexGroup create(String name, GroupHierarchyType context, Path filePath, AuxParser auxParser, MetaData metaData) throws IOException {
-        return new TexGroup(name, context, filePath, auxParser, new DummyFileUpdateMonitor(), metaData);
+    public static TexGroup create(
+            String name,
+            GroupHierarchyType context,
+            Path filePath,
+            AuxParser auxParser,
+            MetaData metaData)
+            throws IOException {
+        return new TexGroup(
+                name, context, filePath, auxParser, new DummyFileUpdateMonitor(), metaData);
     }
 
     public Path getFilePathResolved() {
@@ -79,7 +113,8 @@ public boolean isDynamic() {
     @Override
     public AbstractGroup deepCopy() {
         try {
-            return new TexGroup(name.getValue(), context, filePath, auxParser, fileMonitor, metaData);
+            return new TexGroup(
+                    name.getValue(), context, filePath, auxParser, fileMonitor, metaData);
         } catch (IOException ex) {
             // This should never happen because we were able to monitor the file just fine until now
             LOGGER.error("Problem creating copy of group", ex);
@@ -104,12 +139,17 @@ public boolean equals(Object o) {
 
     @Override
     public String toString() {
-        return "TexGroup{" +
-                "filePath=" + filePath +
-                ", keysUsedInAux=" + keysUsedInAux +
-                ", auxParser=" + auxParser +
-                ", fileMonitor=" + fileMonitor +
-                "} " + super.toString();
+        return "TexGroup{"
+                + "filePath="
+                + filePath
+                + ", keysUsedInAux="
+                + keysUsedInAux
+                + ", auxParser="
+                + auxParser
+                + ", fileMonitor="
+                + fileMonitor
+                + "} "
+                + super.toString();
     }
 
     @Override
@@ -139,8 +179,6 @@ private Path expandPath(Path path) {
     }
 
     private List<Path> getFileDirectoriesAsPaths() {
-        return metaData.getLatexFileDirectory(user)
-                       .map(List::of)
-                       .orElse(Collections.emptyList());
+        return metaData.getLatexFileDirectory(user).map(List::of).orElse(Collections.emptyList());
     }
 }
diff --git a/src/main/java/org/jabref/model/groups/WordKeywordGroup.java b/src/main/java/org/jabref/model/groups/WordKeywordGroup.java
index c1a3b83988cb..e02a02aea6fd 100644
--- a/src/main/java/org/jabref/model/groups/WordKeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/WordKeywordGroup.java
@@ -1,13 +1,5 @@
 package org.jabref.model.groups;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.KeywordList;
@@ -18,6 +10,14 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.ListUtil;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * Matches entries if a given field contains a specified word.
  */
@@ -27,9 +27,14 @@ public class WordKeywordGroup extends KeywordGroup implements GroupEntryChanger
     private final SearchStrategy searchStrategy;
     private final boolean onlySplitWordsAtSeparator;
 
-    public WordKeywordGroup(String name, GroupHierarchyType context, Field searchField,
-                            String searchExpression, boolean caseSensitive, Character keywordSeparator,
-                            boolean onlySplitWordsAtSeparator) {
+    public WordKeywordGroup(
+            String name,
+            GroupHierarchyType context,
+            Field searchField,
+            String searchExpression,
+            boolean caseSensitive,
+            Character keywordSeparator,
+            boolean onlySplitWordsAtSeparator) {
         super(name, context, searchField, searchExpression, caseSensitive);
 
         this.keywordSeparator = keywordSeparator;
@@ -46,7 +51,8 @@ public WordKeywordGroup(String name, GroupHierarchyType context, Field searchFie
         }
     }
 
-    private static boolean containsCaseInsensitive(Set<String> searchIn, Collection<String> searchFor) {
+    private static boolean containsCaseInsensitive(
+            Set<String> searchIn, Collection<String> searchFor) {
         for (String searchWord : searchFor) {
             if (!containsCaseInsensitive(searchIn, searchWord)) {
                 return false;
@@ -121,13 +127,20 @@ public boolean contains(BibEntry entry) {
 
     @Override
     public AbstractGroup deepCopy() {
-        return new WordKeywordGroup(getName(), getHierarchicalContext(), searchField, searchExpression,
-                caseSensitive, keywordSeparator, onlySplitWordsAtSeparator);
+        return new WordKeywordGroup(
+                getName(),
+                getHierarchicalContext(),
+                searchField,
+                searchExpression,
+                caseSensitive,
+                keywordSeparator,
+                onlySplitWordsAtSeparator);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getName(),
+        return Objects.hash(
+                getName(),
                 getHierarchicalContext(),
                 searchField,
                 searchExpression,
@@ -163,16 +176,15 @@ class TypeSearchStrategy implements SearchStrategy {
         Set<EntryType> searchWords;
 
         TypeSearchStrategy() {
-            searchWords = KeywordList.parse(searchExpression, keywordSeparator)
-                                     .stream()
-                                     .map(word -> EntryTypeFactory.parse(word.get()))
-                                     .collect(Collectors.toSet());
+            searchWords =
+                    KeywordList.parse(searchExpression, keywordSeparator).stream()
+                            .map(word -> EntryTypeFactory.parse(word.get()))
+                            .collect(Collectors.toSet());
         }
 
         @Override
         public boolean contains(BibEntry entry) {
-            return searchWords.stream()
-                              .anyMatch(word -> entry.getType().equals(word));
+            return searchWords.stream().anyMatch(word -> entry.getType().equals(word));
         }
     }
 
diff --git a/src/main/java/org/jabref/model/metadata/ContentSelector.java b/src/main/java/org/jabref/model/metadata/ContentSelector.java
index d2c633f63968..0a9039eb13ed 100644
--- a/src/main/java/org/jabref/model/metadata/ContentSelector.java
+++ b/src/main/java/org/jabref/model/metadata/ContentSelector.java
@@ -1,12 +1,12 @@
 package org.jabref.model.metadata;
 
+import org.jabref.model.entry.field.Field;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
-import org.jabref.model.entry.field.Field;
-
 public class ContentSelector {
 
     private final Field field;
@@ -31,8 +31,7 @@ public boolean equals(Object o) {
         }
 
         ContentSelector that = (ContentSelector) o;
-        return Objects.equals(field, that.field) &&
-                Objects.equals(values, that.values);
+        return Objects.equals(field, that.field) && Objects.equals(values, that.values);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/metadata/ContentSelectors.java b/src/main/java/org/jabref/model/metadata/ContentSelectors.java
index fd28221fc977..109bcc7dc502 100644
--- a/src/main/java/org/jabref/model/metadata/ContentSelectors.java
+++ b/src/main/java/org/jabref/model/metadata/ContentSelectors.java
@@ -1,5 +1,9 @@
 package org.jabref.model.metadata;
 
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldProperty;
+import org.jabref.model.entry.field.StandardField;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -11,33 +15,40 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.FieldProperty;
-import org.jabref.model.entry.field.StandardField;
-
 public class ContentSelectors {
 
-    public static final List<Field> DEFAULT_FIELD_NAMES = List.of(StandardField.AUTHOR, StandardField.JOURNAL, StandardField.KEYWORDS, StandardField.PUBLISHER);
+    public static final List<Field> DEFAULT_FIELD_NAMES =
+            List.of(
+                    StandardField.AUTHOR,
+                    StandardField.JOURNAL,
+                    StandardField.KEYWORDS,
+                    StandardField.PUBLISHER);
 
     private final SortedSet<ContentSelector> contentSelectors;
 
     public ContentSelectors() {
-        contentSelectors = new TreeSet<>(new Comparator<ContentSelector>() {
-            @Override
-            public int compare(ContentSelector o1, ContentSelector o2) {
-                // First, check the field name
-                int result = o1.getField().getName().compareTo(o2.getField().getName());
-                if (result != 0) {
-                    return result;
-                }
-
-                // If the field names are equal, compare the properties
-                // We did not find any other way to compare enum sets, so we convert them to lists and compare them using the toString method
-                List<FieldProperty> properties1 = o1.getField().getProperties().stream().sorted().toList();
-                List<FieldProperty> properties2 = o2.getField().getProperties().stream().sorted().toList();
-                return properties1.toString().compareTo(properties2.toString());
-            }
-        });
+        contentSelectors =
+                new TreeSet<>(
+                        new Comparator<ContentSelector>() {
+                            @Override
+                            public int compare(ContentSelector o1, ContentSelector o2) {
+                                // First, check the field name
+                                int result =
+                                        o1.getField().getName().compareTo(o2.getField().getName());
+                                if (result != 0) {
+                                    return result;
+                                }
+
+                                // If the field names are equal, compare the properties
+                                // We did not find any other way to compare enum sets, so we convert
+                                // them to lists and compare them using the toString method
+                                List<FieldProperty> properties1 =
+                                        o1.getField().getProperties().stream().sorted().toList();
+                                List<FieldProperty> properties2 =
+                                        o2.getField().getProperties().stream().sorted().toList();
+                                return properties1.toString().compareTo(properties2.toString());
+                            }
+                        });
     }
 
     public void addContentSelector(ContentSelector contentSelector) {
@@ -113,10 +124,12 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "ContentSelectors{" +
-                "contentSelectors=" + contentSelectors +
-                ", fieldsWithSelectors=" + getFieldsWithSelectors() +
-                '}';
+        return "ContentSelectors{"
+                + "contentSelectors="
+                + contentSelectors
+                + ", fieldsWithSelectors="
+                + getFieldsWithSelectors()
+                + '}';
     }
 
     /**
@@ -137,11 +150,14 @@ public static boolean isDefaultMap(Map<Field, List<String>> fieldKeywordsMap) {
         return true;
     }
 
-    public static Map<Field, List<String>> getFieldKeywordsMap(SortedSet<ContentSelector> contentSelectors) {
+    public static Map<Field, List<String>> getFieldKeywordsMap(
+            SortedSet<ContentSelector> contentSelectors) {
         final Map<Field, List<String>> fieldKeywordsMap = new HashMap<>();
         contentSelectors.forEach(
-                existingContentSelector -> fieldKeywordsMap.put(existingContentSelector.getField(), new ArrayList<>(existingContentSelector.getValues()))
-        );
+                existingContentSelector ->
+                        fieldKeywordsMap.put(
+                                existingContentSelector.getField(),
+                                new ArrayList<>(existingContentSelector.getValues())));
         return fieldKeywordsMap;
     }
 }
diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index 8f7c4a1dcd22..c23d01b5e030 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -1,14 +1,8 @@
 package org.jabref.model.metadata;
 
-import java.nio.charset.Charset;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.SortedSet;
+import com.google.common.eventbus.EventBus;
+import com.tobiasdiez.easybind.optional.OptionalBinding;
+import com.tobiasdiez.easybind.optional.OptionalWrapper;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -27,19 +21,26 @@
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.groups.event.GroupUpdatedEvent;
 import org.jabref.model.metadata.event.MetaDataChangedEvent;
-
-import com.google.common.eventbus.EventBus;
-import com.tobiasdiez.easybind.optional.OptionalBinding;
-import com.tobiasdiez.easybind.optional.OptionalWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.SortedSet;
+
 @AllowedToUseLogic("because it needs access to citation pattern and cleanups")
 public class MetaData {
 
     public static final String META_FLAG = "jabref-meta: ";
     public static final String ENTRYTYPE_FLAG = "jabref-entrytype: ";
-    public static final String SAVE_ORDER_CONFIG = "saveOrderConfig"; // ToDo: Rename in next major version to saveOrder, adapt testbibs
+    public static final String SAVE_ORDER_CONFIG =
+            "saveOrderConfig"; // ToDo: Rename in next major version to saveOrder, adapt testbibs
     public static final String SAVE_ACTIONS = "saveActions";
     public static final String PREFIX_KEYPATTERN = "keypattern_";
     public static final String KEYPATTERNDEFAULT = "keypatterndefault";
@@ -66,7 +67,8 @@ public class MetaData {
     private final Map<String, Path> laTexFileDirectory = new HashMap<>(); // <User, FilePath>
 
     private final ObjectProperty<GroupTreeNode> groupsRoot = new SimpleObjectProperty<>(null);
-    private final OptionalBinding<GroupTreeNode> groupsRootBinding = new OptionalWrapper<>(groupsRoot);
+    private final OptionalBinding<GroupTreeNode> groupsRootBinding =
+            new OptionalWrapper<>(groupsRoot);
     private Optional<Version> groupSearchSyntaxVersion = Optional.empty();
 
     private Charset encoding;
@@ -113,7 +115,8 @@ public void setGroups(GroupTreeNode root) {
         Objects.requireNonNull(root);
         groupsRoot.setValue(root);
         root.subscribeToDescendantChanged(groupTreeNode -> groupsRootBinding.invalidate());
-        root.subscribeToDescendantChanged(groupTreeNode -> eventBus.post(new GroupUpdatedEvent(this)));
+        root.subscribeToDescendantChanged(
+                groupTreeNode -> eventBus.post(new GroupUpdatedEvent(this)));
         eventBus.post(new GroupUpdatedEvent(this));
         postChange();
     }
@@ -130,9 +133,11 @@ public Optional<Version> getGroupSearchSyntaxVersion() {
     /**
      * @return the stored label patterns
      */
-    public AbstractCitationKeyPatterns getCiteKeyPatterns(GlobalCitationKeyPatterns globalPatterns) {
+    public AbstractCitationKeyPatterns getCiteKeyPatterns(
+            GlobalCitationKeyPatterns globalPatterns) {
         Objects.requireNonNull(globalPatterns);
-        AbstractCitationKeyPatterns bibtexKeyPatterns = new DatabaseCitationKeyPatterns(globalPatterns);
+        AbstractCitationKeyPatterns bibtexKeyPatterns =
+                new DatabaseCitationKeyPatterns(globalPatterns);
 
         // Add stored key patterns
         citeKeyPatterns.forEach(bibtexKeyPatterns::addCitationKeyPattern);
@@ -154,7 +159,9 @@ public void setCiteKeyPattern(AbstractCitationKeyPatterns bibtexKeyPatterns) {
         setCiteKeyPattern(defaultValue, nonDefaultPatterns);
     }
 
-    public void setCiteKeyPattern(CitationKeyPattern defaultValue, Map<EntryType, CitationKeyPattern> nonDefaultPatterns) {
+    public void setCiteKeyPattern(
+            CitationKeyPattern defaultValue,
+            Map<EntryType, CitationKeyPattern> nonDefaultPatterns) {
         // Remove all patterns from metadata
         citeKeyPatterns.clear();
 
@@ -405,12 +412,53 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(isProtected, groupsRoot.getValue(), encoding, encodingExplicitlySupplied, saveOrder, citeKeyPatterns, userFileDirectory,
-                laTexFileDirectory, defaultCiteKeyPattern, saveActions, mode, defaultFileDirectory, contentSelectors, versionDBStructure);
+        return Objects.hash(
+                isProtected,
+                groupsRoot.getValue(),
+                encoding,
+                encodingExplicitlySupplied,
+                saveOrder,
+                citeKeyPatterns,
+                userFileDirectory,
+                laTexFileDirectory,
+                defaultCiteKeyPattern,
+                saveActions,
+                mode,
+                defaultFileDirectory,
+                contentSelectors,
+                versionDBStructure);
     }
 
     @Override
     public String toString() {
-        return "MetaData [citeKeyPatterns=" + citeKeyPatterns + ", userFileDirectory=" + userFileDirectory + ", laTexFileDirectory=" + laTexFileDirectory + ", groupsRoot=" + groupsRoot + ", encoding=" + encoding + ", saveOrderConfig=" + saveOrder + ", defaultCiteKeyPattern=" + defaultCiteKeyPattern + ", saveActions=" + saveActions + ", mode=" + mode + ", isProtected=" + isProtected + ", defaultFileDirectory=" + defaultFileDirectory + ", contentSelectors=" + contentSelectors + ", encodingExplicitlySupplied=" + encodingExplicitlySupplied + ", VersionDBStructure=" + versionDBStructure + "]";
+        return "MetaData [citeKeyPatterns="
+                + citeKeyPatterns
+                + ", userFileDirectory="
+                + userFileDirectory
+                + ", laTexFileDirectory="
+                + laTexFileDirectory
+                + ", groupsRoot="
+                + groupsRoot
+                + ", encoding="
+                + encoding
+                + ", saveOrderConfig="
+                + saveOrder
+                + ", defaultCiteKeyPattern="
+                + defaultCiteKeyPattern
+                + ", saveActions="
+                + saveActions
+                + ", mode="
+                + mode
+                + ", isProtected="
+                + isProtected
+                + ", defaultFileDirectory="
+                + defaultFileDirectory
+                + ", contentSelectors="
+                + contentSelectors
+                + ", encodingExplicitlySupplied="
+                + encodingExplicitlySupplied
+                + ", VersionDBStructure="
+                + versionDBStructure
+                + "]";
     }
 }
diff --git a/src/main/java/org/jabref/model/metadata/SaveOrder.java b/src/main/java/org/jabref/model/metadata/SaveOrder.java
index 94e9b671bb1c..bd5aa38ccc0a 100644
--- a/src/main/java/org/jabref/model/metadata/SaveOrder.java
+++ b/src/main/java/org/jabref/model/metadata/SaveOrder.java
@@ -1,15 +1,14 @@
 package org.jabref.model.metadata;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * Stores the save order config for a library
  * <p>
@@ -45,7 +44,9 @@ private SaveOrder(List<String> data) {
             orderType = OrderType.valueOf(data.getFirst().toUpperCase());
         } catch (IllegalArgumentException ex) {
             if (data.size() > 1 && data.size() % 2 == 1) {
-                LOGGER.warn("Could not parse sort order: {} - trying to parse the sort criteria", data.getFirst());
+                LOGGER.warn(
+                        "Could not parse sort order: {} - trying to parse the sort criteria",
+                        data.getFirst());
                 orderType = OrderType.SPECIFIED;
             } else {
                 LOGGER.warn("Could not parse sort order: {}", data.getFirst());
@@ -58,7 +59,9 @@ private SaveOrder(List<String> data) {
 
         List<SortCriterion> sortCriteria = new ArrayList<>(data.size() / 2);
         for (int index = 1; index < data.size(); index = index + 2) {
-            sortCriteria.add(new SortCriterion(FieldFactory.parseField(data.get(index)), data.get(index + 1)));
+            sortCriteria.add(
+                    new SortCriterion(
+                            FieldFactory.parseField(data.get(index)), data.get(index + 1)));
         }
         this.sortCriteria = sortCriteria;
     }
@@ -85,8 +88,8 @@ public boolean equals(Object o) {
             return true;
         }
         if (o instanceof SaveOrder that) {
-            return Objects.equals(sortCriteria, that.sortCriteria) &&
-                    Objects.equals(orderType, that.orderType);
+            return Objects.equals(sortCriteria, that.sortCriteria)
+                    && Objects.equals(orderType, that.orderType);
         }
         return false;
     }
@@ -98,9 +101,12 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "SaveOrderConfig{" + "orderType=" + orderType.toString() +
-                ", sortCriteria=" + sortCriteria +
-                '}';
+        return "SaveOrderConfig{"
+                + "orderType="
+                + orderType.toString()
+                + ", sortCriteria="
+                + sortCriteria
+                + '}';
     }
 
     /**
@@ -147,9 +153,7 @@ public SortCriterion(Field field, boolean descending) {
 
         @Override
         public String toString() {
-            return "SortCriterion{" + "field='" + field + '\'' +
-                    ", descending=" + descending +
-                    '}';
+            return "SortCriterion{" + "field='" + field + '\'' + ", descending=" + descending + '}';
         }
 
         @Override
@@ -161,8 +165,7 @@ public boolean equals(Object o) {
                 return false;
             }
             SortCriterion that = (SortCriterion) o;
-            return Objects.equals(descending, that.descending) &&
-                    Objects.equals(field, that.field);
+            return Objects.equals(descending, that.descending) && Objects.equals(field, that.field);
         }
 
         @Override
@@ -187,7 +190,8 @@ public String toString() {
             return name;
         }
 
-        public static SaveOrder.OrderType fromBooleans(boolean saveInSpecifiedOrder, boolean saveInOriginalOrder) {
+        public static SaveOrder.OrderType fromBooleans(
+                boolean saveInSpecifiedOrder, boolean saveInOriginalOrder) {
             SaveOrder.OrderType orderType = SaveOrder.OrderType.TABLE;
             if (saveInSpecifiedOrder) {
                 orderType = SaveOrder.OrderType.SPECIFIED;
diff --git a/src/main/java/org/jabref/model/metadata/SelfContainedSaveOrder.java b/src/main/java/org/jabref/model/metadata/SelfContainedSaveOrder.java
index 4b5cafc6b9c4..8583a987d2cc 100644
--- a/src/main/java/org/jabref/model/metadata/SelfContainedSaveOrder.java
+++ b/src/main/java/org/jabref/model/metadata/SelfContainedSaveOrder.java
@@ -1,10 +1,10 @@
 package org.jabref.model.metadata;
 
-import java.util.List;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 /**
  * With this class, the user of an instance can directly sort things. Without looking up anything in the preferences or in the UI.
  *
@@ -31,8 +31,10 @@ public static SelfContainedSaveOrder of(SaveOrder saveOrder) {
         if (saveOrder instanceof SelfContainedSaveOrder order) {
             return order;
         }
-        if ((saveOrder.getOrderType() == OrderType.TABLE) && (!saveOrder.getSortCriteria().isEmpty())) {
-            // We map from TABLE to SPECIFIED to have the users of this class just to `switch` between
+        if ((saveOrder.getOrderType() == OrderType.TABLE)
+                && (!saveOrder.getSortCriteria().isEmpty())) {
+            // We map from TABLE to SPECIFIED to have the users of this class just to `switch`
+            // between
             //   ORIGINAL and SPECIFIED
             return new SelfContainedSaveOrder(OrderType.SPECIFIED, saveOrder.getSortCriteria());
         }
diff --git a/src/main/java/org/jabref/model/openoffice/DocumentAnnotation.java b/src/main/java/org/jabref/model/openoffice/DocumentAnnotation.java
index 2d7037f71991..f485aeb7ac1b 100644
--- a/src/main/java/org/jabref/model/openoffice/DocumentAnnotation.java
+++ b/src/main/java/org/jabref/model/openoffice/DocumentAnnotation.java
@@ -11,5 +11,5 @@
  * @param range  Cursor marking the location or range for the thing to be inserted.
  * @param absorb ReferenceMark, Bookmark and TextSection can incorporate a text range. If absorb is true, the text in the range becomes part of the thing. If absorb is false, the thing is inserted at the end of the range.
  */
-public record DocumentAnnotation(XTextDocument doc, String name, XTextRange range, boolean absorb) {
-}
+public record DocumentAnnotation(
+        XTextDocument doc, String name, XTextRange range, boolean absorb) {}
diff --git a/src/main/java/org/jabref/model/openoffice/backend/NamedRange.java b/src/main/java/org/jabref/model/openoffice/backend/NamedRange.java
index 57fba4dc272d..0454fbd2d29c 100644
--- a/src/main/java/org/jabref/model/openoffice/backend/NamedRange.java
+++ b/src/main/java/org/jabref/model/openoffice/backend/NamedRange.java
@@ -1,15 +1,15 @@
 package org.jabref.model.openoffice.backend;
 
-import java.util.Optional;
-
-import org.jabref.model.openoffice.uno.CreationException;
-import org.jabref.model.openoffice.uno.NoDocumentException;
-
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.text.XTextCursor;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextRange;
 
+import org.jabref.model.openoffice.uno.CreationException;
+import org.jabref.model.openoffice.uno.NoDocumentException;
+
+import java.util.Optional;
+
 /**
  * NamedRange (with NamedRangeManager) attempts to provide a common interface for working with reference mark based and bookmark based text ranges to be used as locations to fill with citation markers. LibreOffice supports name-based lookup and listing names for both (hence the name).
  * <p>
@@ -23,17 +23,13 @@ public interface NamedRange {
      * @return Optional.empty if the mark is missing from the document.
      */
     Optional<XTextRange> getMarkRange(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException;
+            throws NoDocumentException, WrappedTargetException;
 
     /**
      * Cursor for the reference marks as is, not prepared for filling, but does not need cleanFillCursor either.
      */
     Optional<XTextCursor> getRawCursor(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException;
+            throws NoDocumentException, WrappedTargetException;
 
     /**
      * Get a cursor for filling in text.
@@ -41,24 +37,15 @@ Optional<XTextCursor> getRawCursor(XTextDocument doc)
      * Must be followed by cleanFillCursor()
      */
     XTextCursor getFillCursor(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException,
-            CreationException;
+            throws NoDocumentException, WrappedTargetException, CreationException;
 
     /**
      * Remove brackets, but if the result would become empty, leave them; if the result would be a single character, leave the left bracket.
      */
-    void cleanFillCursor(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException;
+    void cleanFillCursor(XTextDocument doc) throws NoDocumentException, WrappedTargetException;
 
     /**
      * Note: create is in NamedRangeManager
      */
-    void removeFromDocument(XTextDocument doc)
-            throws
-            WrappedTargetException,
-            NoDocumentException;
+    void removeFromDocument(XTextDocument doc) throws WrappedTargetException, NoDocumentException;
 }
diff --git a/src/main/java/org/jabref/model/openoffice/backend/NamedRangeManager.java b/src/main/java/org/jabref/model/openoffice/backend/NamedRangeManager.java
index 25a82b4ad193..09180bb791b8 100644
--- a/src/main/java/org/jabref/model/openoffice/backend/NamedRangeManager.java
+++ b/src/main/java/org/jabref/model/openoffice/backend/NamedRangeManager.java
@@ -1,31 +1,27 @@
 package org.jabref.model.openoffice.backend;
 
-import java.util.List;
-import java.util.Optional;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextCursor;
+import com.sun.star.text.XTextDocument;
 
 import org.jabref.model.openoffice.uno.CreationException;
 import org.jabref.model.openoffice.uno.NoDocumentException;
 
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
+import java.util.List;
+import java.util.Optional;
 
 public interface NamedRangeManager {
 
-    NamedRange createNamedRange(XTextDocument doc,
-                                String markName,
-                                XTextCursor position,
-                                boolean insertSpaceAfter,
-                                boolean withoutBrackets)
-            throws
-            CreationException;
+    NamedRange createNamedRange(
+            XTextDocument doc,
+            String markName,
+            XTextCursor position,
+            boolean insertSpaceAfter,
+            boolean withoutBrackets)
+            throws CreationException;
 
-    List<String> getUsedNames(XTextDocument doc)
-            throws
-            NoDocumentException;
+    List<String> getUsedNames(XTextDocument doc) throws NoDocumentException;
 
     Optional<NamedRange> getNamedRangeFromDocument(XTextDocument doc, String markName)
-            throws
-            NoDocumentException,
-            WrappedTargetException;
+            throws NoDocumentException, WrappedTargetException;
 }
diff --git a/src/main/java/org/jabref/model/openoffice/ootext/OOFormat.java b/src/main/java/org/jabref/model/openoffice/ootext/OOFormat.java
index 444f06a8727d..c9d5eedaafae 100644
--- a/src/main/java/org/jabref/model/openoffice/ootext/OOFormat.java
+++ b/src/main/java/org/jabref/model/openoffice/ootext/OOFormat.java
@@ -9,8 +9,7 @@
  */
 public class OOFormat {
 
-    private OOFormat() {
-    }
+    private OOFormat() {}
 
     /**
      * Mark {@code ootext} as using a character locale known to OO.
@@ -24,7 +23,8 @@ private OOFormat() {
      *               The territory part is not only optional, the allowed "codes are vendor and browser-specific", so probably best to avoid them if possible.
      */
     public static OOText setLocale(OOText ootext, String locale) {
-        return OOText.fromString("<span lang=\"%s\">".formatted(locale) + ootext.toString() + "</span>");
+        return OOText.fromString(
+                "<span lang=\"%s\">".formatted(locale) + ootext.toString() + "</span>");
     }
 
     /**
@@ -42,9 +42,10 @@ public static OOText setLocaleNone(OOText ootext) {
      * @param charStyle Name of a character style known to OO. May be empty for "Standard", which in turn means do not override any properties.
      */
     public static OOText setCharStyle(OOText ootext, String charStyle) {
-        return OOText.fromString("<span oo:CharStyleName=\"%s\">".formatted(charStyle)
-                + ootext.toString()
-                + "</span>");
+        return OOText.fromString(
+                "<span oo:CharStyleName=\"%s\">".formatted(charStyle)
+                        + ootext.toString()
+                        + "</span>");
     }
 
     /**
@@ -69,7 +70,9 @@ public static OOText paragraph(OOText ootext) {
      * Format an OO cross-reference showing the target's page number as label to a reference mark.
      */
     public static OOText formatReferenceToPageNumberOfReferenceMark(String referenceMarkName) {
-        String string = "<oo:referenceToPageNumberOfReferenceMark target=\"%s\">".formatted(referenceMarkName);
+        String string =
+                "<oo:referenceToPageNumberOfReferenceMark target=\"%s\">"
+                        .formatted(referenceMarkName);
         return OOText.fromString(string);
     }
 }
diff --git a/src/main/java/org/jabref/model/openoffice/ootext/OOTextIntoOO.java b/src/main/java/org/jabref/model/openoffice/ootext/OOTextIntoOO.java
index 3e1a58b92cd1..c2c8dfca9d1f 100644
--- a/src/main/java/org/jabref/model/openoffice/ootext/OOTextIntoOO.java
+++ b/src/main/java/org/jabref/model/openoffice/ootext/OOTextIntoOO.java
@@ -1,25 +1,5 @@
 package org.jabref.model.openoffice.ootext;
 
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.jabref.architecture.AllowedToUseAwt;
-import org.jabref.model.openoffice.uno.CreationException;
-import org.jabref.model.openoffice.uno.UnoCast;
-import org.jabref.model.openoffice.uno.UnoCrossRef;
-import org.jabref.model.openoffice.util.OOPair;
-import org.jabref.model.strings.StringUtil;
-
 import com.sun.star.awt.FontSlant;
 import com.sun.star.awt.FontStrikeout;
 import com.sun.star.awt.FontUnderline;
@@ -43,9 +23,29 @@
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextCursor;
 import com.sun.star.text.XTextDocument;
+
+import org.jabref.architecture.AllowedToUseAwt;
+import org.jabref.model.openoffice.uno.CreationException;
+import org.jabref.model.openoffice.uno.UnoCast;
+import org.jabref.model.openoffice.uno.UnoCrossRef;
+import org.jabref.model.openoffice.util.OOPair;
+import org.jabref.model.strings.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * Interpret OOText into an OpenOffice or LibreOffice writer document.
  */
@@ -87,17 +87,25 @@ public class OOTextIntoOO {
     private static final String ATTRIBUTE_VALUE_REGEXP = "\"([^\"]*)\"";
 
     private static final Pattern HTML_TAG =
-            Pattern.compile("<(/" + TAG_NAME_REGEXP + ")>"
-                    + "|"
-                    + "<(" + TAG_NAME_REGEXP + ")"
-                    + "((?:\\s+(" + ATTRIBUTE_NAME_REGEXP + ")=" + ATTRIBUTE_VALUE_REGEXP + ")*)"
-                    + ">");
+            Pattern.compile(
+                    "<(/"
+                            + TAG_NAME_REGEXP
+                            + ")>"
+                            + "|"
+                            + "<("
+                            + TAG_NAME_REGEXP
+                            + ")"
+                            + "((?:\\s+("
+                            + ATTRIBUTE_NAME_REGEXP
+                            + ")="
+                            + ATTRIBUTE_VALUE_REGEXP
+                            + ")*)"
+                            + ">");
 
     private static final Pattern ATTRIBUTE_PATTERN =
             Pattern.compile("\\s+(" + ATTRIBUTE_NAME_REGEXP + ")=" + ATTRIBUTE_VALUE_REGEXP);
 
-    private OOTextIntoOO() {
-    }
+    private OOTextIntoOO() {}
 
     /**
      * Insert a text with formatting indicated by HTML-like tags, into a text at the position given by a cursor.
@@ -130,9 +138,7 @@ private OOTextIntoOO() {
      * @param ootext   The marked-up text to insert.
      */
     public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
-            throws
-            WrappedTargetException,
-            CreationException {
+            throws WrappedTargetException, CreationException {
 
         Objects.requireNonNull(doc);
         Objects.requireNonNull(ootext);
@@ -218,12 +224,15 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
                                 } else {
                                     if (setParagraphStyle(cursor, value)) {
                                         // Presumably tested already:
-                                        LOGGER.debug("oo:ParaStyleName=\"%s\" failed".formatted(value));
+                                        LOGGER.debug(
+                                                "oo:ParaStyleName=\"%s\" failed".formatted(value));
                                     }
                                 }
                                 break;
                             default:
-                                LOGGER.warn("Unexpected attribute '%s' for <%s>".formatted(key, tagName));
+                                LOGGER.warn(
+                                        "Unexpected attribute '%s' for <%s>"
+                                                .formatted(key, tagName));
                                 break;
                         }
                     }
@@ -233,8 +242,13 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
                         String key = pair.a;
                         String value = pair.b;
                         switch (key) {
-                            case "target" -> UnoCrossRef.insertReferenceToPageNumberOfReferenceMark(doc, value, cursor);
-                            default -> LOGGER.warn("Unexpected attribute '%s' for <%s>".formatted(key, tagName));
+                            case "target" ->
+                                    UnoCrossRef.insertReferenceToPageNumberOfReferenceMark(
+                                            doc, value, cursor);
+                            default ->
+                                    LOGGER.warn(
+                                            "Unexpected attribute '%s' for <%s>"
+                                                    .formatted(key, tagName));
                         }
                     }
                     break;
@@ -262,10 +276,14 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
                                     settings.addAll(setCharCaseMap(CaseMap.SMALLCAPS));
                                     break;
                                 }
-                                LOGGER.warn("Unexpected value %s for attribute '%s' for <%s>".formatted(
-                                        value, key, tagName));
+                                LOGGER.warn(
+                                        "Unexpected value %s for attribute '%s' for <%s>"
+                                                .formatted(value, key, tagName));
                             }
-                            default -> LOGGER.warn("Unexpected attribute '%s' for <%s>".formatted(key, tagName));
+                            default ->
+                                    LOGGER.warn(
+                                            "Unexpected attribute '%s' for <%s>"
+                                                    .formatted(key, tagName));
                         }
                     }
                     formatStack.pushLayer(settings);
@@ -284,10 +302,9 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
                     formatStack.popLayer();
                     String expected = expectEnd.pop();
                     if (!tagName.equals(expected)) {
-                        LOGGER.warn("expected '<%s>', found '<%s>' after '%s'".formatted(
-                                expected,
-                                tagName,
-                                currentSubstring));
+                        LOGGER.warn(
+                                "expected '<%s>', found '<%s>' after '%s'"
+                                        .formatted(expected, tagName, currentSubstring));
                     }
                     break;
                 default:
@@ -309,7 +326,9 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
             for (String s : expectEnd) {
                 rest.insert(0, "<%s>".formatted(s));
             }
-            LOGGER.warn("OOTextIntoOO.write: expectEnd stack is not empty at the end: %s%n".formatted(rest));
+            LOGGER.warn(
+                    "OOTextIntoOO.write: expectEnd stack is not empty at the end: %s%n"
+                            .formatted(rest));
         }
     }
 
@@ -328,9 +347,7 @@ public static void removeDirectFormatting(XTextCursor cursor) {
             // Special handling
             propertySet.setPropertyValue(CHAR_STYLE_NAME, "Standard");
             xPropertyState.setPropertyToDefault("CharCaseMap");
-        } catch (UnknownPropertyException |
-                PropertyVetoException |
-                WrappedTargetException ex) {
+        } catch (UnknownPropertyException | PropertyVetoException | WrappedTargetException ex) {
             LOGGER.warn("exception caught", ex);
         }
 
@@ -344,15 +361,17 @@ public static void removeDirectFormatting(XTextCursor cursor) {
          */
 
         // Only report those we do not yet know about
-        final Set<String> knownToFail = Set.of("ListAutoFormat",
-                "ListId",
-                "NumberingIsNumber",
-                "NumberingLevel",
-                "NumberingRules",
-                "NumberingStartValue",
-                "ParaChapterNumberingLevel",
-                "ParaIsNumberingRestart",
-                "ParaStyleName");
+        final Set<String> knownToFail =
+                Set.of(
+                        "ListAutoFormat",
+                        "ListId",
+                        "NumberingIsNumber",
+                        "NumberingLevel",
+                        "NumberingRules",
+                        "NumberingStartValue",
+                        "ParaChapterNumberingLevel",
+                        "ParaIsNumberingRestart",
+                        "ParaStyleName");
 
         // query again, just in case it matters
         propertySet = UnoCast.cast(XPropertySet.class, cursor).get();
@@ -391,36 +410,40 @@ static class MyPropertyStack {
          * (at the end, under "Interdependencies between Properties")
          *
          */
-        static final Set<String> CONTROLLED_PROPERTIES = Set.of(
+        static final Set<String> CONTROLLED_PROPERTIES =
+                Set.of(
 
-                /* Used for SuperScript, SubScript.
-                 *
-                 * These three are interdependent: changing one may change others.
-                 */
-                "CharEscapement", "CharEscapementHeight", "CharAutoEscapement",
+                        /* Used for SuperScript, SubScript.
+                         *
+                         * These three are interdependent: changing one may change others.
+                         */
+                        "CharEscapement",
+                        "CharEscapementHeight",
+                        "CharAutoEscapement",
 
-                /* used for Bold */
-                "CharWeight",
+                        /* used for Bold */
+                        "CharWeight",
 
-                /* Used for Italic */
-                "CharPosture",
+                        /* Used for Italic */
+                        "CharPosture",
 
-                /* Used for strikeout. These two are interdependent. */
-                "CharStrikeout", "CharCrossedOut",
+                        /* Used for strikeout. These two are interdependent. */
+                        "CharStrikeout",
+                        "CharCrossedOut",
 
-                /* Used for underline. These three are interdependent, but apparently
-                 * we can leave out the last two.
-                 */
-                "CharUnderline", // "CharUnderlineColor", "CharUnderlineHasColor",
+                        /* Used for underline. These three are interdependent, but apparently
+                         * we can leave out the last two.
+                         */
+                        "CharUnderline", // "CharUnderlineColor", "CharUnderlineHasColor",
 
-                /* Used for lang="zxx", to silence spellchecker. */
-                "CharLocale",
+                        /* Used for lang="zxx", to silence spellchecker. */
+                        "CharLocale",
 
-                /* Used for CitationCharacterFormat.  */
-                "CharStyleName",
+                        /* Used for CitationCharacterFormat.  */
+                        "CharStyleName",
 
-                /* Used for <smallcaps> and <span style="font-variant: small-caps"> */
-                "CharCaseMap");
+                        /* Used for <smallcaps> and <span style="font-variant: small-caps"> */
+                        "CharCaseMap");
 
         /**
          * The number of properties actually controlled.
@@ -467,7 +490,8 @@ static class MyPropertyStack {
                 goodNames[entry.getValue()] = entry.getKey();
             }
 
-            // XMultiPropertySet.setPropertyValues() requires alphabetically sorted property names. We adjust here:
+            // XMultiPropertySet.setPropertyValues() requires alphabetically sorted property names.
+            // We adjust here:
             Arrays.sort(goodNames);
             for (int i = 0; i < goodSize; i++) {
                 this.goodNameToIndex.put(goodNames[i], i);
@@ -600,13 +624,13 @@ private static List<OOPair<String, String>> parseAttributes(String attributes) {
      * We rely on property values being either DIRECT_VALUE or DEFAULT_VALUE (not AMBIGUOUS_VALUE). If the cursor covers a homogeneous region, or is collapsed, then this is true.
      */
     private static boolean isPropertyDefault(XTextCursor cursor, String propertyName)
-            throws
-            UnknownPropertyException {
+            throws UnknownPropertyException {
         XPropertyState xPropertyState = UnoCast.cast(XPropertyState.class, cursor).get();
         PropertyState state = xPropertyState.getPropertyState(propertyName);
         if (state == PropertyState.AMBIGUOUS_VALUE) {
-            throw new java.lang.IllegalArgumentException("PropertyState.AMBIGUOUS_VALUE"
-                    + " (expected properties for a homogeneous cursor)");
+            throw new java.lang.IllegalArgumentException(
+                    "PropertyState.AMBIGUOUS_VALUE"
+                            + " (expected properties for a homogeneous cursor)");
         }
         return state == PropertyState.DEFAULT_VALUE;
     }
@@ -685,18 +709,17 @@ private static List<OOPair<String, Object>> setCharLocale(String value) {
      * @param relative If true, calculate the new values relative to the current values. This allows
      *                 subscript-in-superscript.
      */
-    private static List<OOPair<String, Object>> setCharEscapement(Optional<Short> value,
-                                                                  Optional<Byte> height,
-                                                                  boolean relative,
-                                                                  MyPropertyStack formatStack) {
+    private static List<OOPair<String, Object>> setCharEscapement(
+            Optional<Short> value,
+            Optional<Byte> height,
+            boolean relative,
+            MyPropertyStack formatStack) {
         List<OOPair<String, Object>> settings = new ArrayList<>();
-        Optional<Short> oldValue = formatStack
-                .getPropertyValue(CHAR_ESCAPEMENT)
-                .map(e -> (short) e);
+        Optional<Short> oldValue =
+                formatStack.getPropertyValue(CHAR_ESCAPEMENT).map(e -> (short) e);
 
-        Optional<Byte> oldHeight = formatStack
-                .getPropertyValue(CHAR_ESCAPEMENT_HEIGHT)
-                .map(e -> (byte) e);
+        Optional<Byte> oldHeight =
+                formatStack.getPropertyValue(CHAR_ESCAPEMENT_HEIGHT).map(e -> (byte) e);
 
         if (relative && (value.isPresent() || height.isPresent())) {
             double oldHeightFloat = oldHeight.orElse(CHAR_ESCAPEMENT_HEIGHT_DEFAULT) * 0.01;
@@ -723,17 +746,13 @@ private static List<OOPair<String, Object>> setCharEscapement(Optional<Short> va
     }
 
     private static List<OOPair<String, Object>> setSubScript(MyPropertyStack formatStack) {
-        return setCharEscapement(Optional.of(SUBSCRIPT_VALUE),
-                Optional.of(SUBSCRIPT_HEIGHT),
-                true,
-                formatStack);
+        return setCharEscapement(
+                Optional.of(SUBSCRIPT_VALUE), Optional.of(SUBSCRIPT_HEIGHT), true, formatStack);
     }
 
     private static List<OOPair<String, Object>> setSuperScript(MyPropertyStack formatStack) {
-        return setCharEscapement(Optional.of(SUPERSCRIPT_VALUE),
-                Optional.of(SUPERSCRIPT_HEIGHT),
-                true,
-                formatStack);
+        return setCharEscapement(
+                Optional.of(SUPERSCRIPT_VALUE), Optional.of(SUPERSCRIPT_HEIGHT), true, formatStack);
     }
 
     /**
@@ -763,7 +782,8 @@ private static void insertParagraphBreak(XText text, XTextCursor cursor) {
             // Assuming it means wrong code for ControlCharacter.
             // https://api.libreoffice.org/docs/idl/ref/  does not tell.
             // If my assumption is correct, we never get here.
-            throw new java.lang.IllegalArgumentException("Caught unexpected com.sun.star.lang.IllegalArgumentException", ex);
+            throw new java.lang.IllegalArgumentException(
+                    "Caught unexpected com.sun.star.lang.IllegalArgumentException", ex);
         }
     }
 }
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/FunctionalTextViewCursor.java b/src/main/java/org/jabref/model/openoffice/rangesort/FunctionalTextViewCursor.java
index d17d4a8ce590..ef363be9ff06 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/FunctionalTextViewCursor.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/FunctionalTextViewCursor.java
@@ -1,18 +1,18 @@
 package org.jabref.model.openoffice.rangesort;
 
-import java.util.Arrays;
-import java.util.Objects;
-
-import org.jabref.model.openoffice.uno.UnoCursor;
-import org.jabref.model.openoffice.uno.UnoSelection;
-import org.jabref.model.openoffice.util.OOResult;
-
 import com.sun.star.lang.XServiceInfo;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextRange;
 import com.sun.star.text.XTextViewCursor;
 import com.sun.star.uno.RuntimeException;
 
+import org.jabref.model.openoffice.uno.UnoCursor;
+import org.jabref.model.openoffice.uno.UnoSelection;
+import org.jabref.model.openoffice.util.OOResult;
+
+import java.util.Arrays;
+import java.util.Objects;
+
 /*
  * A problem with XTextViewCursor: if it is not in text, then we get a crippled version that does
  * not support viewCursor.getStart() or viewCursor.gotoRange(range,false), and will throw an
@@ -53,9 +53,8 @@ public class FunctionalTextViewCursor {
     /* The view cursor, potentially moved from its original location. */
     private final XTextViewCursor viewCursor;
 
-    private FunctionalTextViewCursor(XTextRange initialPosition,
-                                     XServiceInfo initialSelection,
-                                     XTextViewCursor viewCursor) {
+    private FunctionalTextViewCursor(
+            XTextRange initialPosition, XServiceInfo initialSelection, XTextViewCursor viewCursor) {
         this.initialPosition = initialPosition;
         this.initialSelection = initialSelection;
         this.viewCursor = viewCursor;
@@ -79,7 +78,9 @@ public static OOResult<FunctionalTextViewCursor, String> get(XTextDocument doc)
             try {
                 initialPosition = UnoCursor.createTextCursorByRange(viewCursor);
                 viewCursor.getStart();
-                return OOResult.ok(new FunctionalTextViewCursor(initialPosition, initialSelection, viewCursor));
+                return OOResult.ok(
+                        new FunctionalTextViewCursor(
+                                initialPosition, initialSelection, viewCursor));
             } catch (RuntimeException ex) {
                 // bad cursor
                 viewCursor = null;
@@ -88,10 +89,11 @@ public static OOResult<FunctionalTextViewCursor, String> get(XTextDocument doc)
         }
 
         if (initialSelection == null) {
-            String errorMessage = "Selection is not available: cannot provide a functional view cursor";
+            String errorMessage =
+                    "Selection is not available: cannot provide a functional view cursor";
             return OOResult.error(errorMessage);
         } else if (Arrays.stream(initialSelection.getSupportedServiceNames())
-                         .noneMatch("com.sun.star.text.TextRanges"::equals)) {
+                .noneMatch("com.sun.star.text.TextRanges"::equals)) {
             // initialSelection does not support TextRanges.
             // We need to change it (and the viewCursor with it).
             XTextRange newSelection = doc.getText().getStart();
@@ -113,16 +115,16 @@ public static OOResult<FunctionalTextViewCursor, String> get(XTextDocument doc)
             return OOResult.error(errorMessage);
         }
 
-        return OOResult.ok(new FunctionalTextViewCursor(initialPosition, initialSelection, viewCursor));
+        return OOResult.ok(
+                new FunctionalTextViewCursor(initialPosition, initialSelection, viewCursor));
     }
 
     public XTextViewCursor getViewCursor() {
         return viewCursor;
     }
 
-    private static void restore(XTextDocument doc,
-                                XTextRange initialPosition,
-                                XServiceInfo initialSelection) {
+    private static void restore(
+            XTextDocument doc, XTextRange initialPosition, XServiceInfo initialSelection) {
 
         if (initialPosition != null) {
             XTextViewCursor viewCursor = UnoCursor.getViewCursor(doc).orElse(null);
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapBetween.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapBetween.java
index 8108befdbd3f..97d7f71ec9d5 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapBetween.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapBetween.java
@@ -1,21 +1,20 @@
 package org.jabref.model.openoffice.rangesort;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.sun.star.text.XText;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.text.XTextRange;
+import com.sun.star.text.XTextRangeCompare;
 
 import org.jabref.model.openoffice.uno.UnoCast;
 import org.jabref.model.openoffice.uno.UnoTextRange;
 import org.jabref.model.openoffice.util.OOTuple3;
 
-import com.sun.star.text.XText;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextRange;
-import com.sun.star.text.XTextRangeCompare;
+import java.util.ArrayList;
+import java.util.List;
 
 public class RangeOverlapBetween {
 
-    private RangeOverlapBetween() {
-    }
+    private RangeOverlapBetween() {}
 
     /**
      * Check for any overlap between two sets of XTextRange values.
@@ -24,11 +23,8 @@ private RangeOverlapBetween() {
      * <p>
      * Returns on first problem found.
      */
-    public static <V extends RangeHolder>
-    List<RangeOverlap<V>> findFirst(XTextDocument doc,
-                                    List<V> fewHolders,
-                                    List<V> manyHolders,
-                                    boolean includeTouching) {
+    public static <V extends RangeHolder> List<RangeOverlap<V>> findFirst(
+            XTextDocument doc, List<V> fewHolders, List<V> manyHolders, boolean includeTouching) {
 
         List<RangeOverlap<V>> result = new ArrayList<>();
 
@@ -44,9 +40,9 @@ List<RangeOverlap<V>> findFirst(XTextDocument doc,
 
         for (V aHolder : fewHolders) {
             XText aText = aHolder.getRange().getText();
-            fewTuples.add(new OOTuple3<>(aText,
-                    UnoCast.cast(XTextRangeCompare.class, aText).get(),
-                    aHolder));
+            fewTuples.add(
+                    new OOTuple3<>(
+                            aText, UnoCast.cast(XTextRangeCompare.class, aText).get(), aHolder));
         }
 
         /*
@@ -66,11 +62,13 @@ List<RangeOverlap<V>> findFirst(XTextDocument doc,
                 if (aText != bText) {
                     continue;
                 }
-                int abEndToStart = UnoTextRange.compareStartsUnsafe(cmp, aRange.getEnd(), bRangeStart);
+                int abEndToStart =
+                        UnoTextRange.compareStartsUnsafe(cmp, aRange.getEnd(), bRangeStart);
                 if (abEndToStart < 0 || (!includeTouching && (abEndToStart == 0))) {
                     continue;
                 }
-                int baEndToStart = UnoTextRange.compareStartsUnsafe(cmp, bRangeEnd, aRange.getStart());
+                int baEndToStart =
+                        UnoTextRange.compareStartsUnsafe(cmp, bRangeEnd, aRange.getStart());
                 if (baEndToStart < 0 || (!includeTouching && (baEndToStart == 0))) {
                     continue;
                 }
@@ -78,12 +76,14 @@ List<RangeOverlap<V>> findFirst(XTextDocument doc,
                 boolean equal = UnoTextRange.compareStartsThenEndsUnsafe(cmp, aRange, bRange) == 0;
                 boolean touching = abEndToStart == 0 || baEndToStart == 0;
 
-                // In case of two equal collapsed ranges there is an ambiguity : TOUCH or EQUAL_RANGE ?
+                // In case of two equal collapsed ranges there is an ambiguity : TOUCH or
+                // EQUAL_RANGE ?
                 //
                 // We return EQUAL_RANGE
-                RangeOverlapKind kind = equal ? RangeOverlapKind.EQUAL_RANGE
-                        : (touching ? RangeOverlapKind.TOUCH
-                        : RangeOverlapKind.OVERLAP);
+                RangeOverlapKind kind =
+                        equal
+                                ? RangeOverlapKind.EQUAL_RANGE
+                                : (touching ? RangeOverlapKind.TOUCH : RangeOverlapKind.OVERLAP);
 
                 List<V> valuesForOverlappingRanges = new ArrayList<>();
                 valuesForOverlappingRanges.add(aHolder);
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapKind.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapKind.java
index 1098a85a87ff..0f4b17ffb171 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapKind.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapKind.java
@@ -17,4 +17,3 @@ public enum RangeOverlapKind {
      */
     EQUAL_RANGE
 }
-
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapWithin.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapWithin.java
index 25ddd9401761..facf739b818d 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapWithin.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapWithin.java
@@ -1,19 +1,18 @@
 package org.jabref.model.openoffice.rangesort;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.text.XTextRange;
+import com.sun.star.text.XTextRangeCompare;
 
 import org.jabref.model.openoffice.uno.UnoCast;
 import org.jabref.model.openoffice.uno.UnoTextRange;
 
-import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextRange;
-import com.sun.star.text.XTextRangeCompare;
+import java.util.ArrayList;
+import java.util.List;
 
 public class RangeOverlapWithin {
 
-    private RangeOverlapWithin() {
-    }
+    private RangeOverlapWithin() {}
 
     /**
      * Report identical, overlapping or touching ranges between elements of rangeHolders.
@@ -26,11 +25,8 @@ private RangeOverlapWithin() {
      * @param reportAtMost    Limit the number of records returned to atMost. Zero {@code reportAtMost} means no limit.
      * @param includeTouching Should the result contain ranges sharing only a boundary?
      */
-    public static <V extends RangeHolder>
-    List<RangeOverlap<V>> findOverlappingRanges(XTextDocument doc,
-                                                List<V> rangeHolders,
-                                                boolean includeTouching,
-                                                int reportAtMost) {
+    public static <V extends RangeHolder> List<RangeOverlap<V>> findOverlappingRanges(
+            XTextDocument doc, List<V> rangeHolders, boolean includeTouching, int reportAtMost) {
 
         RangeSort.RangePartitions<V> partitions = RangeSort.partitionAndSortRanges(rangeHolders);
 
@@ -45,10 +41,8 @@ List<RangeOverlap<V>> findOverlappingRanges(XTextDocument doc,
      * @param atMost          Limit the number of records returned to atMost. Zero {@code atMost} means no limit.
      * @param includeTouching Should the result contain ranges sharing only a boundary?
      */
-    public static <V extends RangeHolder>
-    List<RangeOverlap<V>> findOverlappingRanges(RangeSort.RangePartitions<V> input,
-                                                int atMost,
-                                                boolean includeTouching) {
+    public static <V extends RangeHolder> List<RangeOverlap<V>> findOverlappingRanges(
+            RangeSort.RangePartitions<V> input, int atMost, boolean includeTouching) {
         assert atMost >= 0;
 
         List<RangeOverlap<V>> result = new ArrayList<>();
@@ -57,8 +51,9 @@ List<RangeOverlap<V>> findOverlappingRanges(RangeSort.RangePartitions<V> input,
             if (partition.isEmpty()) {
                 continue;
             }
-            XTextRangeCompare cmp = UnoCast.cast(XTextRangeCompare.class,
-                    partition.getFirst().getRange().getText()).get();
+            XTextRangeCompare cmp =
+                    UnoCast.cast(XTextRangeCompare.class, partition.getFirst().getRange().getText())
+                            .get();
 
             for (int i = 0; i < (partition.size() - 1); i++) {
                 V aHolder = partition.get(i);
@@ -73,11 +68,10 @@ List<RangeOverlap<V>> findOverlappingRanges(RangeSort.RangePartitions<V> input,
                     aValues.add(aHolder);
                     // aValues.add(bHolder);
                     // collect those equal
-                    while (i < (partition.size() - 1) &&
-                            UnoTextRange.compareStartsThenEndsUnsafe(
-                                    cmp,
-                                    aRange,
-                                    partition.get(i + 1).getRange()) == 0) {
+                    while (i < (partition.size() - 1)
+                            && UnoTextRange.compareStartsThenEndsUnsafe(
+                                            cmp, aRange, partition.get(i + 1).getRange())
+                                    == 0) {
                         bHolder = partition.get(i + 1);
                         aValues.add(bHolder);
                         i++;
@@ -91,16 +85,19 @@ List<RangeOverlap<V>> findOverlappingRanges(RangeSort.RangePartitions<V> input,
 
                 // Not equal, and (a <= b) since sorted.
                 // Check if a.end >= b.start
-                cmpResult = UnoTextRange.compareStartsUnsafe(cmp, aRange.getEnd(), bRange.getStart());
+                cmpResult =
+                        UnoTextRange.compareStartsUnsafe(cmp, aRange.getEnd(), bRange.getStart());
                 if (cmpResult > 0 || (includeTouching && (cmpResult == 0))) {
                     // found overlap or touch
                     List<V> valuesForOverlappingRanges = new ArrayList<>();
                     valuesForOverlappingRanges.add(aHolder);
                     valuesForOverlappingRanges.add(bHolder);
-                    result.add(new RangeOverlap<>(cmpResult == 0
-                            ? RangeOverlapKind.TOUCH
-                            : RangeOverlapKind.OVERLAP,
-                            valuesForOverlappingRanges));
+                    result.add(
+                            new RangeOverlap<>(
+                                    cmpResult == 0
+                                            ? RangeOverlapKind.TOUCH
+                                            : RangeOverlapKind.OVERLAP,
+                                    valuesForOverlappingRanges));
                 }
                 if (atMost > 0 && result.size() >= atMost) {
                     return result;
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSort.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSort.java
index 074dd0bae133..bc1951b8e1c7 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSort.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSort.java
@@ -1,24 +1,23 @@
 package org.jabref.model.openoffice.rangesort;
 
+import com.sun.star.text.XText;
+import com.sun.star.text.XTextRangeCompare;
+
+import org.jabref.model.openoffice.uno.UnoCast;
+import org.jabref.model.openoffice.uno.UnoTextRange;
+
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.jabref.model.openoffice.uno.UnoCast;
-import org.jabref.model.openoffice.uno.UnoTextRange;
-
-import com.sun.star.text.XText;
-import com.sun.star.text.XTextRangeCompare;
-
 /**
  * RangeSort provides sorting based on XTextRangeCompare, which only provides comparison between XTextRange values within the same XText.
  */
 public class RangeSort {
 
-    private RangeSort() {
-    }
+    private RangeSort() {}
 
     /**
      * Compare two RangeHolders (using RangeHolder.getRange()) within an XText.
@@ -30,8 +29,9 @@ private static class HolderComparatorWithinPartition implements Comparator<Range
         private final XTextRangeCompare cmp;
 
         HolderComparatorWithinPartition(XText text) {
-            cmp = UnoCast.cast(XTextRangeCompare.class, text)
-                          .orElseThrow(java.lang.IllegalArgumentException::new);
+            cmp =
+                    UnoCast.cast(XTextRangeCompare.class, text)
+                            .orElseThrow(java.lang.IllegalArgumentException::new);
         }
 
         /**
@@ -68,7 +68,8 @@ public RangePartitions() {
 
         public void add(V holder) {
             XText partitionKey = holder.getRange().getText();
-            List<V> partition = partitions.computeIfAbsent(partitionKey, unused -> new ArrayList<>());
+            List<V> partition =
+                    partitions.computeIfAbsent(partitionKey, unused -> new ArrayList<>());
             partition.add(holder);
         }
 
@@ -91,7 +92,8 @@ public static <V extends RangeHolder> RangePartitions<V> partitionRanges(List<V>
     /**
      * Note: RangeHolder.getRange() is called many times.
      */
-    public static <V extends RangeHolder> RangePartitions<V> partitionAndSortRanges(List<V> holders) {
+    public static <V extends RangeHolder> RangePartitions<V> partitionAndSortRanges(
+            List<V> holders) {
         RangePartitions<V> result = partitionRanges(holders);
         for (List<V> partition : result.getPartitions()) {
             sortWithinPartition(partition);
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortVisual.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortVisual.java
index 88af7b426b14..4e780c9cbf14 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortVisual.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortVisual.java
@@ -1,17 +1,17 @@
 package org.jabref.model.openoffice.rangesort;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jabref.model.openoffice.uno.UnoScreenRefresh;
-
 import com.sun.star.awt.Point;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextRange;
 import com.sun.star.text.XTextViewCursor;
+
+import org.jabref.model.openoffice.uno.UnoScreenRefresh;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Sort XTextRange values visually (top-down,left-to-right).
  * <p>
@@ -23,8 +23,7 @@ public class RangeSortVisual {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RangeSortVisual.class);
 
-    private RangeSortVisual() {
-    }
+    private RangeSortVisual() {}
 
     /**
      * Sort the input {@code inputs} visually.
@@ -33,12 +32,12 @@ private RangeSortVisual() {
      *
      * @return The input, sorted by the elements XTextRange and getIndexInPosition.
      */
-    public static <T> List<RangeSortable<T>> visualSort(List<RangeSortable<T>> inputs,
-                                                        XTextDocument doc,
-                                                        FunctionalTextViewCursor fcursor) {
+    public static <T> List<RangeSortable<T>> visualSort(
+            List<RangeSortable<T>> inputs, XTextDocument doc, FunctionalTextViewCursor fcursor) {
 
         if (UnoScreenRefresh.hasControllersLocked(doc)) {
-            final String msg = "visualSort: with ControllersLocked, viewCursor.gotoRange is probably useless";
+            final String msg =
+                    "visualSort: with ControllersLocked, viewCursor.gotoRange is probably useless";
             LOGGER.warn(msg);
             throw new IllegalStateException(msg);
         }
@@ -58,9 +57,8 @@ public static <T> List<RangeSortable<T>> visualSort(List<RangeSortable<T>> input
         ArrayList<ComparableMark<RangeSortable<T>>> comparableMarks = new ArrayList<>(inputSize);
         for (int i = 0; i < inputSize; i++) {
             RangeSortable<T> input = inputs.get(i);
-            comparableMarks.add(new ComparableMark<>(positions.get(i),
-                    input.getIndexInPosition(),
-                    input));
+            comparableMarks.add(
+                    new ComparableMark<>(positions.get(i), input.getIndexInPosition(), input));
         }
         comparableMarks.sort(RangeSortVisual::compareTopToBottomLeftToRight);
 
@@ -111,6 +109,5 @@ private static <T> int compareTopToBottomLeftToRight(ComparableMark<T> a, Compar
      * <p>
      * Used for sorting reference marks by their visual positions.
      */
-    private record ComparableMark<T>(Point position, int indexInPosition, T content) {
-    }
+    private record ComparableMark<T>(Point position, int indexInPosition, T content) {}
 }
diff --git a/src/main/java/org/jabref/model/openoffice/style/Citation.java b/src/main/java/org/jabref/model/openoffice/style/Citation.java
index 54bfb937572b..4d1a309209c2 100644
--- a/src/main/java/org/jabref/model/openoffice/style/Citation.java
+++ b/src/main/java/org/jabref/model/openoffice/style/Citation.java
@@ -1,14 +1,15 @@
 package org.jabref.model.openoffice.style;
 
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.openoffice.ootext.OOText;
 import org.jabref.model.openoffice.util.OOPair;
 
-public class Citation implements ComparableCitation, CitationMarkerEntry, CitationMarkerNumericEntry {
+import java.util.List;
+import java.util.Optional;
+
+public class Citation
+        implements ComparableCitation, CitationMarkerEntry, CitationMarkerNumericEntry {
 
     /**
      * key in database
@@ -70,17 +71,16 @@ public Optional<BibEntry> getBibEntry() {
     }
 
     public static Optional<CitationLookupResult> lookup(BibDatabase database, String key) {
-        return database
-                .getEntryByCitationKey(key)
+        return database.getEntryByCitationKey(key)
                 .map(bibEntry -> new CitationLookupResult(bibEntry, database));
     }
 
     public static Optional<CitationLookupResult> lookup(List<BibDatabase> databases, String key) {
         return databases.stream()
-                         .map(database -> Citation.lookup(database, key))
-                         .filter(Optional::isPresent)
-                         .map(Optional::get)
-                         .findFirst();
+                .map(database -> Citation.lookup(database, key))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .findFirst();
     }
 
     public void lookupInDatabases(List<BibDatabase> databases) {
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationGroup.java b/src/main/java/org/jabref/model/openoffice/style/CitationGroup.java
index 4fbb62d94a5c..d7540682ca51 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationGroup.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationGroup.java
@@ -1,14 +1,14 @@
 package org.jabref.model.openoffice.style;
 
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.openoffice.ootext.OOText;
+import org.jabref.model.openoffice.util.OOListUtil;
+
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.openoffice.ootext.OOText;
-import org.jabref.model.openoffice.util.OOListUtil;
-
 /**
  * A CitationGroup describes a group of citations.
  */
@@ -55,11 +55,12 @@ public class CitationGroup {
      */
     private Optional<OOText> citationMarker;
 
-    public CitationGroup(OODataModel dataModel,
-                         CitationGroupId groupId,
-                         CitationType citationType,
-                         List<Citation> citationsInStorageOrder,
-                         Optional<String> referenceMarkNameForLinking) {
+    public CitationGroup(
+            OODataModel dataModel,
+            CitationGroupId groupId,
+            CitationType citationType,
+            List<Citation> citationsInStorageOrder,
+            Optional<String> referenceMarkNameForLinking) {
         this.dataModel = dataModel;
         this.groupId = groupId;
         this.citationType = citationType;
@@ -92,8 +93,9 @@ void imposeLocalOrder(Comparator<BibEntry> entryComparator) {
             lastCitation.setPageInfo(Optional.empty());
         }
 
-        this.localOrder = OOListUtil.order(citationsInStorageOrder,
-                new CompareCitation(entryComparator, true));
+        this.localOrder =
+                OOListUtil.order(
+                        citationsInStorageOrder, new CompareCitation(entryComparator, true));
 
         if (dataModel == OODataModel.JabRef52) {
             getCitationsInLocalOrder().get(last).setPageInfo(lastPageInfo);
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationGroups.java b/src/main/java/org/jabref/model/openoffice/style/CitationGroups.java
index 7ffe943dad63..7c71183453f2 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationGroups.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationGroups.java
@@ -1,5 +1,12 @@
 package org.jabref.model.openoffice.style;
 
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.openoffice.util.OOListUtil;
+import org.jabref.model.openoffice.util.OOPair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
@@ -9,14 +16,6 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.openoffice.util.OOListUtil;
-import org.jabref.model.openoffice.util.OOPair;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * CitationGroups : the set of citation groups in the document.
  * <p>
@@ -55,9 +54,8 @@ public int numberOfCitationGroups() {
     /**
      * For each citation in {@code where} call {@code fun.accept(new Pair(citation, value));}
      */
-    public <T> void distributeToCitations(List<CitationPath> where,
-                                          Consumer<OOPair<Citation, T>> fun,
-                                          T value) {
+    public <T> void distributeToCitations(
+            List<CitationPath> where, Consumer<OOPair<Citation, T>> fun, T value) {
 
         for (CitationPath p : where) {
             CitationGroup group = citationGroupsUnordered.get(p.group);
@@ -123,7 +121,8 @@ public List<CitationGroup> getCitationGroupsInGlobalOrder() {
     public void setGlobalOrder(List<CitationGroupId> globalOrder) {
         Objects.requireNonNull(globalOrder);
         if (globalOrder.size() != numberOfCitationGroups()) {
-            throw new IllegalStateException("setGlobalOrder: globalOrder.size() != numberOfCitationGroups()");
+            throw new IllegalStateException(
+                    "setGlobalOrder: globalOrder.size() != numberOfCitationGroups()");
         }
         this.globalOrder = Optional.of(globalOrder);
 
@@ -212,8 +211,9 @@ public List<String> getUnresolvedKeys() {
 
     public void createNumberedBibliographySortedInOrderOfAppearance() {
         if (bibliography.isPresent()) {
-            throw new IllegalStateException("createNumberedBibliographySortedInOrderOfAppearance:"
-                    + " already have a bibliography");
+            throw new IllegalStateException(
+                    "createNumberedBibliographySortedInOrderOfAppearance:"
+                            + " already have a bibliography");
         }
         CitedKeys citedKeys = getCitedKeysSortedInOrderOfAppearance();
         citedKeys.numberCitedKeysInCurrentOrder();
@@ -226,7 +226,8 @@ public void createNumberedBibliographySortedInOrderOfAppearance() {
      */
     public void createPlainBibliographySortedByComparator(Comparator<BibEntry> entryComparator) {
         if (bibliography.isPresent()) {
-            throw new IllegalStateException("createPlainBibliographySortedByComparator: already have a bibliography");
+            throw new IllegalStateException(
+                    "createPlainBibliographySortedByComparator: already have a bibliography");
         }
         CitedKeys citedKeys = getCitedKeysUnordered();
         citedKeys.sortByComparator(entryComparator);
@@ -238,7 +239,8 @@ public void createPlainBibliographySortedByComparator(Comparator<BibEntry> entry
      */
     public void createNumberedBibliographySortedByComparator(Comparator<BibEntry> entryComparator) {
         if (bibliography.isPresent()) {
-            throw new IllegalStateException("createNumberedBibliographySortedByComparator: already have a bibliography");
+            throw new IllegalStateException(
+                    "createNumberedBibliographySortedByComparator: already have a bibliography");
         }
         CitedKeys citedKeys = getCitedKeysUnordered();
         citedKeys.sortByComparator(entryComparator);
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationLookupResult.java b/src/main/java/org/jabref/model/openoffice/style/CitationLookupResult.java
index c82177a7e691..8c7dc270644e 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationLookupResult.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationLookupResult.java
@@ -1,10 +1,10 @@
 package org.jabref.model.openoffice.style;
 
-import java.util.Objects;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 
+import java.util.Objects;
+
 public class CitationLookupResult {
 
     public final BibEntry entry;
@@ -35,7 +35,8 @@ public boolean equals(Object otherObject) {
             return false;
         }
         CitationLookupResult that = (CitationLookupResult) otherObject;
-        return Objects.equals(this.entry, that.entry) && Objects.equals(this.database, that.database);
+        return Objects.equals(this.entry, that.entry)
+                && Objects.equals(this.database, that.database);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationMarkerEntry.java b/src/main/java/org/jabref/model/openoffice/style/CitationMarkerEntry.java
index 18bbe5588b3a..bf4f81221c9e 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationMarkerEntry.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationMarkerEntry.java
@@ -1,9 +1,9 @@
 package org.jabref.model.openoffice.style;
 
-import java.util.Optional;
-
 import org.jabref.model.openoffice.ootext.OOText;
 
+import java.util.Optional;
+
 /**
  * This is what we need for createCitationMarker to produce author-year citation markers.
  */
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNumericEntry.java b/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNumericEntry.java
index 9c0c6081489a..79667ece57e7 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNumericEntry.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNumericEntry.java
@@ -1,9 +1,9 @@
 package org.jabref.model.openoffice.style;
 
-import java.util.Optional;
-
 import org.jabref.model.openoffice.ootext.OOText;
 
+import java.util.Optional;
+
 /**
  * This is what we need for numeric citation markers.
  */
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationType.java b/src/main/java/org/jabref/model/openoffice/style/CitationType.java
index 55c1d7c50ed2..f4a6af61b35d 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationType.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationType.java
@@ -4,7 +4,6 @@
  * Presentation types of citation groups.
  */
 public enum CitationType {
-
     AUTHORYEAR_PAR,
     AUTHORYEAR_INTEXT,
     INVISIBLE_CIT;
@@ -20,5 +19,3 @@ public boolean withText() {
         return this != INVISIBLE_CIT;
     }
 }
-
-
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitedKey.java b/src/main/java/org/jabref/model/openoffice/style/CitedKey.java
index 8920e5a39332..af8b09dd1473 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitedKey.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitedKey.java
@@ -1,22 +1,20 @@
 package org.jabref.model.openoffice.style;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.openoffice.ootext.OOText;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * Cited keys are collected from the citations in citation groups.
  * <p>
  * They contain backreferences to the corresponding citations in {@code where}. This allows the extra information generated using CitedKeys to be distributed back to the in-text citations.
  */
-public class CitedKey implements
-        ComparableCitedKey,
-        CitationMarkerNormEntry,
-        CitationMarkerNumericBibEntry {
+public class CitedKey
+        implements ComparableCitedKey, CitationMarkerNormEntry, CitationMarkerNumericBibEntry {
 
     public final String citationKey;
     private final List<CitationPath> where;
@@ -24,7 +22,7 @@ public class CitedKey implements
     private Optional<CitationLookupResult> db;
     private Optional<Integer> number; // For Numbered citation styles.
     private Optional<String> uniqueLetter; // For AuthorYear citation styles.
-    private Optional<OOText> normCitMarker;  // For AuthorYear citation styles.
+    private Optional<OOText> normCitMarker; // For AuthorYear citation styles.
 
     CitedKey(String citationKey, CitationPath path, Citation citation) {
         this.citationKey = citationKey;
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitedKeys.java b/src/main/java/org/jabref/model/openoffice/style/CitedKeys.java
index a5afedede801..f88f9708d37b 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitedKeys.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitedKeys.java
@@ -1,14 +1,14 @@
 package org.jabref.model.openoffice.style;
 
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Optional;
 
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.BibEntry;
-
 public class CitedKeys {
 
     /**
diff --git a/src/main/java/org/jabref/model/openoffice/style/ComparableCitation.java b/src/main/java/org/jabref/model/openoffice/style/ComparableCitation.java
index 42a7e5869ba1..5496732eaa3e 100644
--- a/src/main/java/org/jabref/model/openoffice/style/ComparableCitation.java
+++ b/src/main/java/org/jabref/model/openoffice/style/ComparableCitation.java
@@ -1,9 +1,9 @@
 package org.jabref.model.openoffice.style;
 
-import java.util.Optional;
-
 import org.jabref.model.openoffice.ootext.OOText;
 
+import java.util.Optional;
+
 /**
  * When sorting citations (in a group), we also consider pageInfo. Otherwise we sort citations as cited keys.
  */
diff --git a/src/main/java/org/jabref/model/openoffice/style/ComparableCitedKey.java b/src/main/java/org/jabref/model/openoffice/style/ComparableCitedKey.java
index 23b3ffaba78a..1335cc2e2f58 100644
--- a/src/main/java/org/jabref/model/openoffice/style/ComparableCitedKey.java
+++ b/src/main/java/org/jabref/model/openoffice/style/ComparableCitedKey.java
@@ -1,9 +1,9 @@
 package org.jabref.model.openoffice.style;
 
-import java.util.Optional;
-
 import org.jabref.model.entry.BibEntry;
 
+import java.util.Optional;
+
 /**
  * This is what we need to sort bibliography entries.
  */
@@ -13,4 +13,3 @@ public interface ComparableCitedKey {
 
     Optional<BibEntry> getBibEntry();
 }
-
diff --git a/src/main/java/org/jabref/model/openoffice/style/CompareCitation.java b/src/main/java/org/jabref/model/openoffice/style/CompareCitation.java
index 1d27674ba1d0..6e80e7c0bd1a 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CompareCitation.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CompareCitation.java
@@ -1,9 +1,9 @@
 package org.jabref.model.openoffice.style;
 
-import java.util.Comparator;
-
 import org.jabref.model.entry.BibEntry;
 
+import java.util.Comparator;
+
 /*
  * Given a Comparator<BibEntry> provide a Comparator<ComparableCitation> that can handle unresolved
  * citation keys and takes pageInfo into account.
@@ -26,5 +26,3 @@ public int compare(ComparableCitation a, ComparableCitation b) {
         return res;
     }
 }
-
-
diff --git a/src/main/java/org/jabref/model/openoffice/style/CompareCitedKey.java b/src/main/java/org/jabref/model/openoffice/style/CompareCitedKey.java
index e8a99e6980b0..f66a7068c784 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CompareCitedKey.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CompareCitedKey.java
@@ -1,10 +1,10 @@
 package org.jabref.model.openoffice.style;
 
+import org.jabref.model.entry.BibEntry;
+
 import java.util.Comparator;
 import java.util.Optional;
 
-import org.jabref.model.entry.BibEntry;
-
 /*
  * Given a Comparator<BibEntry> provide a Comparator<ComparableCitedKey> that also handles
  * unresolved citation keys.
diff --git a/src/main/java/org/jabref/model/openoffice/style/NonUniqueCitationMarker.java b/src/main/java/org/jabref/model/openoffice/style/NonUniqueCitationMarker.java
index e633f7a9c706..2a5770eee332 100644
--- a/src/main/java/org/jabref/model/openoffice/style/NonUniqueCitationMarker.java
+++ b/src/main/java/org/jabref/model/openoffice/style/NonUniqueCitationMarker.java
@@ -15,4 +15,3 @@ public enum NonUniqueCitationMarker {
      */
     THROWS
 }
-
diff --git a/src/main/java/org/jabref/model/openoffice/style/OODataModel.java b/src/main/java/org/jabref/model/openoffice/style/OODataModel.java
index 470edc1694da..bcdd97cc72bd 100644
--- a/src/main/java/org/jabref/model/openoffice/style/OODataModel.java
+++ b/src/main/java/org/jabref/model/openoffice/style/OODataModel.java
@@ -1,11 +1,11 @@
 package org.jabref.model.openoffice.style;
 
+import org.jabref.model.openoffice.ootext.OOText;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import org.jabref.model.openoffice.ootext.OOText;
-
 /**
  * What is the data stored?
  */
diff --git a/src/main/java/org/jabref/model/openoffice/style/PageInfo.java b/src/main/java/org/jabref/model/openoffice/style/PageInfo.java
index 7fd56293d73b..bb3a72551d45 100644
--- a/src/main/java/org/jabref/model/openoffice/style/PageInfo.java
+++ b/src/main/java/org/jabref/model/openoffice/style/PageInfo.java
@@ -1,19 +1,20 @@
 package org.jabref.model.openoffice.style;
 
-import java.util.Optional;
-
 import org.jabref.model.openoffice.ootext.OOText;
 
+import java.util.Optional;
+
 public class PageInfo {
 
-    private PageInfo() {
-    }
+    private PageInfo() {}
 
     /*
      * pageInfo normalization
      */
     public static Optional<OOText> normalizePageInfo(Optional<OOText> optionalText) {
-        if (optionalText == null || optionalText.isEmpty() || "".equals(OOText.toString(optionalText.get()))) {
+        if (optionalText == null
+                || optionalText.isEmpty()
+                || "".equals(OOText.toString(optionalText.get()))) {
             return Optional.empty();
         }
         String str = OOText.toString(optionalText.get());
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoBookmark.java b/src/main/java/org/jabref/model/openoffice/uno/UnoBookmark.java
index 0f87ddcd21b4..b32693204fb3 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoBookmark.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoBookmark.java
@@ -1,9 +1,5 @@
 package org.jabref.model.openoffice.uno;
 
-import java.util.Optional;
-
-import org.jabref.model.openoffice.DocumentAnnotation;
-
 import com.sun.star.container.NoSuchElementException;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNamed;
@@ -14,17 +10,18 @@
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextRange;
 
+import org.jabref.model.openoffice.DocumentAnnotation;
+
+import java.util.Optional;
+
 public class UnoBookmark {
 
-    private UnoBookmark() {
-    }
+    private UnoBookmark() {}
 
     /**
      * Provides access to bookmarks by name.
      */
-    public static XNameAccess getNameAccess(XTextDocument doc)
-            throws
-            NoDocumentException {
+    public static XNameAccess getNameAccess(XTextDocument doc) throws NoDocumentException {
 
         XBookmarksSupplier supplier = UnoCast.cast(XBookmarksSupplier.class, doc).get();
         try {
@@ -41,9 +38,7 @@ public static XNameAccess getNameAccess(XTextDocument doc)
      * @return The XTextRange for the bookmark, or Optional.empty().
      */
     public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
+            throws WrappedTargetException, NoDocumentException {
 
         XNameAccess nameAccess = getNameAccess(doc);
         return UnoNameAccess.getTextContentByName(nameAccess, name).map(XTextContent::getAnchor);
@@ -57,9 +52,7 @@ public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
      * @return The XNamed interface of the bookmark.
      * result.getName() should be checked by the caller, because its name may differ from the one requested.
      */
-    public static XNamed create(DocumentAnnotation documentAnnotation)
-            throws
-            CreationException {
+    public static XNamed create(DocumentAnnotation documentAnnotation) throws CreationException {
         return UnoNamed.insertNamedTextContent("com.sun.star.text.Bookmark", documentAnnotation);
     }
 
@@ -67,9 +60,7 @@ public static XNamed create(DocumentAnnotation documentAnnotation)
      * Remove the named bookmark if it exists.
      */
     public static void removeIfExists(XTextDocument doc, String name)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+            throws NoDocumentException, WrappedTargetException {
 
         XNameAccess marks = UnoBookmark.getNameAccess(doc);
 
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoCast.java b/src/main/java/org/jabref/model/openoffice/uno/UnoCast.java
index 3234e4d130a9..9b9ed25b9b01 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoCast.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoCast.java
@@ -1,13 +1,12 @@
 package org.jabref.model.openoffice.uno;
 
-import java.util.Optional;
-
 import com.sun.star.uno.UnoRuntime;
 
+import java.util.Optional;
+
 public class UnoCast {
 
-    private UnoCast() {
-    }
+    private UnoCast() {}
 
     /**
      * cast : short for Optional.ofNullable(UnoRuntime.queryInterface(...))
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoCrossRef.java b/src/main/java/org/jabref/model/openoffice/uno/UnoCrossRef.java
index 7ac294d22909..094e8770d643 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoCrossRef.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoCrossRef.java
@@ -15,8 +15,7 @@
 
 public class UnoCrossRef {
 
-    private UnoCrossRef() {
-    }
+    private UnoCrossRef() {}
 
     /**
      * Update TextFields, etc. We use it to refresh cross-references in the document.
@@ -32,12 +31,9 @@ public static void refresh(XTextDocument doc) {
      * <p>
      * May need a documentConnection.refresh() after, to update the text shown.
      */
-    public static void insertReferenceToPageNumberOfReferenceMark(XTextDocument doc,
-                                                                  String referenceMarkName,
-                                                                  XTextRange cursor)
-            throws
-            CreationException,
-            WrappedTargetException {
+    public static void insertReferenceToPageNumberOfReferenceMark(
+            XTextDocument doc, String referenceMarkName, XTextRange cursor)
+            throws CreationException, WrappedTargetException {
 
         // based on: https://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Reference_Marks
         XMultiServiceFactory msf = UnoCast.cast(XMultiServiceFactory.class, doc).get();
@@ -55,30 +51,35 @@ public static void insertReferenceToPageNumberOfReferenceMark(XTextDocument doc,
             // Set the SourceName of the GetReference text field to the referenceMarkName
             xFieldProps.setPropertyValue("SourceName", referenceMarkName);
         } catch (UnknownPropertyException ex) {
-            throw new java.lang.IllegalStateException("The created GetReference does not have property 'SourceName'");
+            throw new java.lang.IllegalStateException(
+                    "The created GetReference does not have property 'SourceName'");
         } catch (PropertyVetoException ex) {
-            throw new java.lang.IllegalStateException("Caught PropertyVetoException on 'SourceName'");
+            throw new java.lang.IllegalStateException(
+                    "Caught PropertyVetoException on 'SourceName'");
         }
 
         try {
             // specify that the source is a reference mark (could also be a footnote,
             // bookmark or sequence field)
-            xFieldProps.setPropertyValue("ReferenceFieldSource", ReferenceFieldSource.REFERENCE_MARK);
+            xFieldProps.setPropertyValue(
+                    "ReferenceFieldSource", ReferenceFieldSource.REFERENCE_MARK);
         } catch (UnknownPropertyException ex) {
-            throw new java.lang.IllegalStateException("The created GetReference does not have property"
-                    + " 'ReferenceFieldSource'");
+            throw new java.lang.IllegalStateException(
+                    "The created GetReference does not have property" + " 'ReferenceFieldSource'");
         } catch (PropertyVetoException ex) {
-            throw new java.lang.IllegalStateException("Caught PropertyVetoException on 'ReferenceFieldSource'");
+            throw new java.lang.IllegalStateException(
+                    "Caught PropertyVetoException on 'ReferenceFieldSource'");
         }
 
         try {
             // We want the reference displayed as page number
             xFieldProps.setPropertyValue("ReferenceFieldPart", ReferenceFieldPart.PAGE);
         } catch (UnknownPropertyException ex) {
-            throw new java.lang.IllegalStateException("The created GetReference does not have property"
-                    + " 'ReferenceFieldPart'");
+            throw new java.lang.IllegalStateException(
+                    "The created GetReference does not have property" + " 'ReferenceFieldPart'");
         } catch (PropertyVetoException ex) {
-            throw new java.lang.IllegalStateException("Caught PropertyVetoException on 'ReferenceFieldPart'");
+            throw new java.lang.IllegalStateException(
+                    "Caught PropertyVetoException on 'ReferenceFieldPart'");
         }
 
         // Get the XTextContent interface of the GetReference text field
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoCursor.java b/src/main/java/org/jabref/model/openoffice/uno/UnoCursor.java
index 2bca7a1ff19c..28728905c30f 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoCursor.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoCursor.java
@@ -1,7 +1,5 @@
 package org.jabref.model.openoffice.uno;
 
-import java.util.Optional;
-
 import com.sun.star.text.XTextContent;
 import com.sun.star.text.XTextCursor;
 import com.sun.star.text.XTextDocument;
@@ -9,18 +7,19 @@
 import com.sun.star.text.XTextViewCursor;
 import com.sun.star.text.XTextViewCursorSupplier;
 
+import java.util.Optional;
+
 public class UnoCursor {
 
-    private UnoCursor() {
-    }
+    private UnoCursor() {}
 
     /**
      * Get the cursor positioned by the user.
      */
     public static Optional<XTextViewCursor> getViewCursor(XTextDocument doc) {
         return UnoTextDocument.getCurrentController(doc)
-                               .flatMap(e -> UnoCast.cast(XTextViewCursorSupplier.class, e))
-                               .map(XTextViewCursorSupplier::getViewCursor);
+                .flatMap(e -> UnoCast.cast(XTextViewCursorSupplier.class, e))
+                .map(XTextViewCursorSupplier::getViewCursor);
     }
 
     /**
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoNameAccess.java b/src/main/java/org/jabref/model/openoffice/uno/UnoNameAccess.java
index 1250d56d9239..cef377094df4 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoNameAccess.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoNameAccess.java
@@ -1,23 +1,21 @@
 package org.jabref.model.openoffice.uno;
 
-import java.util.Optional;
-
 import com.sun.star.container.NoSuchElementException;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.text.XTextContent;
 
+import java.util.Optional;
+
 public class UnoNameAccess {
 
-    private UnoNameAccess() {
-    }
+    private UnoNameAccess() {}
 
     /**
      * @return null if name not found, or if the result does not support the XTextContent interface.
      */
     public static Optional<XTextContent> getTextContentByName(XNameAccess nameAccess, String name)
-            throws
-            WrappedTargetException {
+            throws WrappedTargetException {
         try {
             return UnoCast.cast(XTextContent.class, nameAccess.getByName(name));
         } catch (NoSuchElementException ex) {
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoNamed.java b/src/main/java/org/jabref/model/openoffice/uno/UnoNamed.java
index 702f55181711..409e5b9fce30 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoNamed.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoNamed.java
@@ -1,16 +1,15 @@
 package org.jabref.model.openoffice.uno;
 
-import org.jabref.model.openoffice.DocumentAnnotation;
-
 import com.sun.star.container.XNamed;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextContent;
 import com.sun.star.uno.Exception;
 
+import org.jabref.model.openoffice.DocumentAnnotation;
+
 public class UnoNamed {
 
-    private UnoNamed() {
-    }
+    private UnoNamed() {}
 
     /**
      * Insert a new instance of a service at the provided cursor position.
@@ -21,10 +20,10 @@ private UnoNamed() {
      * @return The XNamed interface, in case we need to check the actual name.
      */
     static XNamed insertNamedTextContent(String service, DocumentAnnotation documentAnnotation)
-            throws
-            CreationException {
+            throws CreationException {
 
-        XMultiServiceFactory msf = UnoCast.cast(XMultiServiceFactory.class, documentAnnotation.doc()).get();
+        XMultiServiceFactory msf =
+                UnoCast.cast(XMultiServiceFactory.class, documentAnnotation.doc()).get();
 
         Object xObject;
         try {
@@ -33,14 +32,24 @@ static XNamed insertNamedTextContent(String service, DocumentAnnotation document
             throw new CreationException(e.getMessage());
         }
 
-        XNamed xNamed = UnoCast.cast(XNamed.class, xObject)
-                                .orElseThrow(() -> new IllegalArgumentException("Service is not an XNamed"));
+        XNamed xNamed =
+                UnoCast.cast(XNamed.class, xObject)
+                        .orElseThrow(
+                                () -> new IllegalArgumentException("Service is not an XNamed"));
         xNamed.setName(documentAnnotation.name());
 
         // get XTextContent interface
-        XTextContent xTextContent = UnoCast.cast(XTextContent.class, xObject)
-                                            .orElseThrow(() -> new IllegalArgumentException("Service is not an XTextContent"));
-        documentAnnotation.range().getText().insertTextContent(documentAnnotation.range(), xTextContent, documentAnnotation.absorb());
+        XTextContent xTextContent =
+                UnoCast.cast(XTextContent.class, xObject)
+                        .orElseThrow(
+                                () ->
+                                        new IllegalArgumentException(
+                                                "Service is not an XTextContent"));
+        documentAnnotation
+                .range()
+                .getText()
+                .insertTextContent(
+                        documentAnnotation.range(), xTextContent, documentAnnotation.absorb());
         return xNamed;
     }
 }
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoProperties.java b/src/main/java/org/jabref/model/openoffice/uno/UnoProperties.java
index bca3d90ab6c3..5f3a0072556f 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoProperties.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoProperties.java
@@ -1,12 +1,5 @@
 package org.jabref.model.openoffice.uno;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import com.sun.star.beans.Property;
 import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XPropertyContainer;
@@ -14,13 +7,19 @@
 import com.sun.star.beans.XPropertySetInfo;
 import com.sun.star.lang.WrappedTargetException;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 /**
  * Utilities for properties.
  */
 public class UnoProperties {
 
-    private UnoProperties() {
-    }
+    private UnoProperties() {}
 
     public static Optional<XPropertySet> asPropertySet(XPropertyContainer propertyContainer) {
         return UnoCast.cast(XPropertySet.class, propertyContainer);
@@ -28,18 +27,17 @@ public static Optional<XPropertySet> asPropertySet(XPropertyContainer propertyCo
 
     public static Optional<XPropertySetInfo> getPropertySetInfo(XPropertySet propertySet) {
         return Optional.ofNullable(propertySet)
-                        .flatMap(e -> Optional.ofNullable(e.getPropertySetInfo()));
+                .flatMap(e -> Optional.ofNullable(e.getPropertySetInfo()));
     }
 
-    public static Optional<XPropertySetInfo> getPropertySetInfo(XPropertyContainer propertyContainer) {
+    public static Optional<XPropertySetInfo> getPropertySetInfo(
+            XPropertyContainer propertyContainer) {
         return Optional.ofNullable(propertyContainer).flatMap(UnoProperties::getPropertySetInfo);
     }
 
     public static List<String> getPropertyNames(Property[] properties) {
         Objects.requireNonNull(properties);
-        return Arrays.stream(properties)
-                      .map(p -> p.Name)
-                      .collect(Collectors.toList());
+        return Arrays.stream(properties).map(p -> p.Name).collect(Collectors.toList());
     }
 
     public static List<String> getPropertyNames(XPropertySetInfo propertySetInfo) {
@@ -57,8 +55,7 @@ public static List<String> getPropertyNames(XPropertyContainer propertyContainer
     }
 
     public static Optional<Object> getValueAsObject(XPropertySet propertySet, String property)
-            throws
-            WrappedTargetException {
+            throws WrappedTargetException {
         Objects.requireNonNull(propertySet);
         Objects.requireNonNull(property);
         try {
@@ -68,9 +65,8 @@ public static Optional<Object> getValueAsObject(XPropertySet propertySet, String
         }
     }
 
-    public static Optional<Object> getValueAsObject(XPropertyContainer propertyContainer, String property)
-            throws
-            WrappedTargetException {
+    public static Optional<Object> getValueAsObject(
+            XPropertyContainer propertyContainer, String property) throws WrappedTargetException {
         Optional<XPropertySet> propertySet = asPropertySet(propertyContainer);
         if (propertySet.isEmpty()) {
             return Optional.empty();
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoRedlines.java b/src/main/java/org/jabref/model/openoffice/uno/UnoRedlines.java
index 3793ce7a0794..2ba5dac65b51 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoRedlines.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoRedlines.java
@@ -1,7 +1,5 @@
 package org.jabref.model.openoffice.uno;
 
-import java.util.Optional;
-
 import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.NoSuchElementException;
@@ -11,14 +9,14 @@
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.text.XTextDocument;
 
+import java.util.Optional;
+
 /**
  * Change tracking and Redlines
  */
 public class UnoRedlines {
 
-    public static boolean getRecordChanges(XTextDocument doc)
-            throws
-            WrappedTargetException {
+    public static boolean getRecordChanges(XTextDocument doc) throws WrappedTargetException {
 
         // https://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Settings
         // "Properties of com.sun.star.text.TextDocument"
@@ -28,7 +26,8 @@ public static boolean getRecordChanges(XTextDocument doc)
         try {
             return (boolean) propertySet.getPropertyValue("RecordChanges");
         } catch (UnknownPropertyException ex) {
-            throw new java.lang.IllegalStateException("Caught UnknownPropertyException on 'RecordChanges'");
+            throw new java.lang.IllegalStateException(
+                    "Caught UnknownPropertyException on 'RecordChanges'");
         }
     }
 
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoReferenceMark.java b/src/main/java/org/jabref/model/openoffice/uno/UnoReferenceMark.java
index 0b9f2adc6c01..bedc9698ea96 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoReferenceMark.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoReferenceMark.java
@@ -1,12 +1,5 @@
 package org.jabref.model.openoffice.uno;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
-import org.jabref.model.openoffice.DocumentAnnotation;
-
 import com.sun.star.container.NoSuchElementException;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNamed;
@@ -17,19 +10,23 @@
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextRange;
 
+import org.jabref.model.openoffice.DocumentAnnotation;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
 public class UnoReferenceMark {
 
-    private UnoReferenceMark() {
-    }
+    private UnoReferenceMark() {}
 
     /**
      * @throws NoDocumentException If cannot get reference marks
      *                             <p>
      *                             Note: also used by `isDocumentConnectionMissing` to test if we have a working connection.
      */
-    public static XNameAccess getNameAccess(XTextDocument doc)
-            throws
-            NoDocumentException {
+    public static XNameAccess getNameAccess(XTextDocument doc) throws NoDocumentException {
 
         XReferenceMarksSupplier supplier = UnoCast.cast(XReferenceMarksSupplier.class, doc).get();
 
@@ -45,8 +42,7 @@ public static XNameAccess getNameAccess(XTextDocument doc)
      * <p>
      * Empty list for nothing.
      */
-    public static List<String> getListOfNames(XTextDocument doc)
-            throws NoDocumentException {
+    public static List<String> getListOfNames(XTextDocument doc) throws NoDocumentException {
 
         XNameAccess nameAccess = UnoReferenceMark.getNameAccess(doc);
         String[] names = nameAccess.getElementNames();
@@ -62,9 +58,7 @@ public static List<String> getListOfNames(XTextDocument doc)
      * Removes both the text and the mark itself.
      */
     public static void removeIfExists(XTextDocument doc, String name)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
+            throws WrappedTargetException, NoDocumentException {
 
         XNameAccess xReferenceMarks = UnoReferenceMark.getNameAccess(doc);
 
@@ -85,9 +79,7 @@ public static void removeIfExists(XTextDocument doc, String name)
      * @return reference mark as XTextContent, Optional.empty if not found.
      */
     public static Optional<XTextContent> getAsTextContent(XTextDocument doc, String name)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+            throws NoDocumentException, WrappedTargetException {
 
         XNameAccess nameAccess = UnoReferenceMark.getNameAccess(doc);
         return UnoNameAccess.getTextContentByName(nameAccess, name);
@@ -97,11 +89,8 @@ public static Optional<XTextContent> getAsTextContent(XTextDocument doc, String
      * XTextRange for the named reference mark, Optional.empty if not found.
      */
     public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
-        return UnoReferenceMark.getAsTextContent(doc, name)
-                                .map(XTextContent::getAnchor);
+            throws NoDocumentException, WrappedTargetException {
+        return UnoReferenceMark.getAsTextContent(doc, name).map(XTextContent::getAnchor);
     }
 
     /**
@@ -112,9 +101,8 @@ public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
      * Note: LibreOffice 6.4.6.2 will create multiple reference marks with the same name without error or renaming. Its GUI does not allow this, but we can create them programmatically. In the GUI, clicking on any of those identical names will move the cursor to the same mark.
      *
      */
-    public static XNamed create(DocumentAnnotation documentAnnotation)
-            throws
-            CreationException {
-        return UnoNamed.insertNamedTextContent("com.sun.star.text.ReferenceMark", documentAnnotation);
+    public static XNamed create(DocumentAnnotation documentAnnotation) throws CreationException {
+        return UnoNamed.insertNamedTextContent(
+                "com.sun.star.text.ReferenceMark", documentAnnotation);
     }
 }
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoScreenRefresh.java b/src/main/java/org/jabref/model/openoffice/uno/UnoScreenRefresh.java
index 6de0afe5ad6f..63d29f0aeef3 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoScreenRefresh.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoScreenRefresh.java
@@ -7,8 +7,7 @@
  */
 public class UnoScreenRefresh {
 
-    private UnoScreenRefresh() {
-    }
+    private UnoScreenRefresh() {}
 
     /**
      * Disable screen refresh.
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoSelection.java b/src/main/java/org/jabref/model/openoffice/uno/UnoSelection.java
index a6e581cfce17..9407ecbb20fe 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoSelection.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoSelection.java
@@ -1,15 +1,16 @@
 package org.jabref.model.openoffice.uno;
 
-import java.util.Objects;
-import java.util.Optional;
-
 import com.sun.star.frame.XController;
 import com.sun.star.lang.XServiceInfo;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.view.XSelectionSupplier;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * Selection in the document.
  */
@@ -17,8 +18,7 @@ public class UnoSelection {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(UnoSelection.class);
 
-    private UnoSelection() {
-    }
+    private UnoSelection() {}
 
     private static Optional<XSelectionSupplier> getSelectionSupplier(XTextDocument doc) {
         if (doc == null) {
@@ -27,12 +27,15 @@ private static Optional<XSelectionSupplier> getSelectionSupplier(XTextDocument d
         }
         Optional<XController> controller = UnoTextDocument.getCurrentController(doc);
         if (controller.isEmpty()) {
-            LOGGER.warn("UnoSelection.getSelectionSupplier: getCurrentController(doc) returned empty");
+            LOGGER.warn(
+                    "UnoSelection.getSelectionSupplier: getCurrentController(doc) returned empty");
             return Optional.empty();
         }
-        Optional<XSelectionSupplier> supplier = UnoCast.cast(XSelectionSupplier.class, controller.get());
+        Optional<XSelectionSupplier> supplier =
+                UnoCast.cast(XSelectionSupplier.class, controller.get());
         if (supplier.isEmpty()) {
-            LOGGER.warn("UnoSelection.getSelectionSupplier: cast to XSelectionSupplier returned empty");
+            LOGGER.warn(
+                    "UnoSelection.getSelectionSupplier: cast to XSelectionSupplier returned empty");
             return Optional.empty();
         }
         return supplier;
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoStyle.java b/src/main/java/org/jabref/model/openoffice/uno/UnoStyle.java
index aaf2c2da1422..d1b2785f2dff 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoStyle.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoStyle.java
@@ -1,7 +1,5 @@
 package org.jabref.model.openoffice.uno;
 
-import java.util.Optional;
-
 import com.sun.star.container.NoSuchElementException;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNameContainer;
@@ -10,6 +8,8 @@
 import com.sun.star.style.XStyleFamiliesSupplier;
 import com.sun.star.text.XTextDocument;
 
+import java.util.Optional;
+
 /**
  * Styles in the document.
  */
@@ -18,12 +18,10 @@ public class UnoStyle {
     public static final String CHARACTER_STYLES = "CharacterStyles";
     public static final String PARAGRAPH_STYLES = "ParagraphStyles";
 
-    private UnoStyle() {
-    }
+    private UnoStyle() {}
 
-    private static Optional<XStyle> getStyleFromFamily(XTextDocument doc, String familyName, String styleName)
-            throws
-            WrappedTargetException {
+    private static Optional<XStyle> getStyleFromFamily(
+            XTextDocument doc, String familyName, String styleName) throws WrappedTargetException {
 
         XStyleFamiliesSupplier fss = UnoCast.cast(XStyleFamiliesSupplier.class, doc).get();
         XNameAccess families = UnoCast.cast(XNameAccess.class, fss.getStyleFamilies()).get();
@@ -44,34 +42,27 @@ private static Optional<XStyle> getStyleFromFamily(XTextDocument doc, String fam
     }
 
     public static Optional<XStyle> getParagraphStyle(XTextDocument doc, String styleName)
-            throws
-            WrappedTargetException {
+            throws WrappedTargetException {
         return getStyleFromFamily(doc, PARAGRAPH_STYLES, styleName);
     }
 
     public static Optional<XStyle> getCharacterStyle(XTextDocument doc, String styleName)
-            throws
-            WrappedTargetException {
+            throws WrappedTargetException {
         return getStyleFromFamily(doc, CHARACTER_STYLES, styleName);
     }
 
-    public static Optional<String> getInternalNameOfStyle(XTextDocument doc, String familyName,
-                                                          String name)
-            throws
-            WrappedTargetException {
-        return getStyleFromFamily(doc, familyName, name)
-                .map(XStyle::getName);
+    public static Optional<String> getInternalNameOfStyle(
+            XTextDocument doc, String familyName, String name) throws WrappedTargetException {
+        return getStyleFromFamily(doc, familyName, name).map(XStyle::getName);
     }
 
     public static Optional<String> getInternalNameOfParagraphStyle(XTextDocument doc, String name)
-            throws
-            WrappedTargetException {
+            throws WrappedTargetException {
         return getInternalNameOfStyle(doc, PARAGRAPH_STYLES, name);
     }
 
     public static Optional<String> getInternalNameOfCharacterStyle(XTextDocument doc, String name)
-            throws
-            WrappedTargetException {
+            throws WrappedTargetException {
         return getInternalNameOfStyle(doc, CHARACTER_STYLES, name);
     }
 }
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoTextDocument.java b/src/main/java/org/jabref/model/openoffice/uno/UnoTextDocument.java
index 200f7be55df5..9a02ec6c9c73 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoTextDocument.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoTextDocument.java
@@ -1,7 +1,5 @@
 package org.jabref.model.openoffice.uno;
 
-import java.util.Optional;
-
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.document.XDocumentProperties;
 import com.sun.star.document.XDocumentPropertiesSupplier;
@@ -10,15 +8,17 @@
 import com.sun.star.lang.DisposedException;
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.text.XTextDocument;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Optional;
+
 public class UnoTextDocument {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(UnoTextDocument.class);
 
-    private UnoTextDocument() {
-    }
+    private UnoTextDocument() {}
 
     /**
      * @return True if we cannot reach the current document.
@@ -65,7 +65,8 @@ public static Optional<String> getFrameTitle(XTextDocument doc) {
         }
 
         try {
-            Optional<Object> frameTitleObj = UnoProperties.getValueAsObject(propertySet.get(), "Title");
+            Optional<Object> frameTitleObj =
+                    UnoProperties.getValueAsObject(propertySet.get(), "Title");
             if (frameTitleObj.isEmpty()) {
                 return Optional.empty();
             }
@@ -79,8 +80,7 @@ public static Optional<String> getFrameTitle(XTextDocument doc) {
 
     static Optional<XDocumentProperties> getDocumentProperties(XTextDocument doc) {
         return Optional.ofNullable(doc)
-                        .flatMap(e -> UnoCast.cast(XDocumentPropertiesSupplier.class, e))
-                        .map(XDocumentPropertiesSupplier::getDocumentProperties);
+                .flatMap(e -> UnoCast.cast(XDocumentPropertiesSupplier.class, e))
+                .map(XDocumentPropertiesSupplier::getDocumentProperties);
     }
 }
-
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoTextRange.java b/src/main/java/org/jabref/model/openoffice/uno/UnoTextRange.java
index 883ab8de1fc8..aecd8d3dd141 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoTextRange.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoTextRange.java
@@ -1,16 +1,15 @@
 package org.jabref.model.openoffice.uno;
 
-import java.util.Optional;
-
 import com.sun.star.text.XFootnote;
 import com.sun.star.text.XTextContent;
 import com.sun.star.text.XTextRange;
 import com.sun.star.text.XTextRangeCompare;
 
+import java.util.Optional;
+
 public class UnoTextRange {
 
-    private UnoTextRange() {
-    }
+    private UnoTextRange() {}
 
     /**
      * If original is in a footnote, return a range containing the corresponding footnote marker.
@@ -63,7 +62,8 @@ public static int compareEnds(XTextRange a, XTextRange b) {
     /*
      * Assumes a and b belong to the same XText as compare.
      */
-    public static int compareStartsThenEndsUnsafe(XTextRangeCompare compare, XTextRange a, XTextRange b) {
+    public static int compareStartsThenEndsUnsafe(
+            XTextRangeCompare compare, XTextRange a, XTextRange b) {
         int res = compare.compareRegionStarts(a, b);
         if (res != 0) {
             return -1 * res;
@@ -73,7 +73,8 @@ public static int compareStartsThenEndsUnsafe(XTextRangeCompare compare, XTextRa
 
     public static int compareStartsThenEnds(XTextRange a, XTextRange b) {
         if (!comparables(a, b)) {
-            throw new java.lang.IllegalArgumentException("compareStartsThenEnds: got incomparable regions");
+            throw new java.lang.IllegalArgumentException(
+                    "compareStartsThenEnds: got incomparable regions");
         }
         final XTextRangeCompare compare = UnoCast.cast(XTextRangeCompare.class, a.getText()).get();
         return compareStartsThenEndsUnsafe(compare, a, b);
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoTextSection.java b/src/main/java/org/jabref/model/openoffice/uno/UnoTextSection.java
index 9e0c3fddf2d6..d826eafe3ad0 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoTextSection.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoTextSection.java
@@ -1,9 +1,5 @@
 package org.jabref.model.openoffice.uno;
 
-import java.util.Optional;
-
-import org.jabref.model.openoffice.DocumentAnnotation;
-
 import com.sun.star.container.NoSuchElementException;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNamed;
@@ -16,14 +12,16 @@
 import com.sun.star.text.XTextSectionsSupplier;
 import com.sun.star.uno.Any;
 
+import org.jabref.model.openoffice.DocumentAnnotation;
+
+import java.util.Optional;
+
 public class UnoTextSection {
 
     /**
      * @return An XNameAccess to find sections by name.
      */
-    public static XNameAccess getNameAccess(XTextDocument doc)
-            throws
-            NoDocumentException {
+    public static XNameAccess getNameAccess(XTextDocument doc) throws NoDocumentException {
 
         XTextSectionsSupplier supplier = UnoCast.cast(XTextSectionsSupplier.class, doc).get();
         try {
@@ -37,12 +35,11 @@ public static XNameAccess getNameAccess(XTextDocument doc)
      * Get an XTextSection by name.
      */
     public static Optional<XTextSection> getByName(XTextDocument doc, String name)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
+            throws WrappedTargetException, NoDocumentException {
         XNameAccess nameAccess = getNameAccess(doc);
         try {
-            return Optional.ofNullable((XTextSection) ((Any) nameAccess.getByName(name)).getObject());
+            return Optional.ofNullable(
+                    (XTextSection) ((Any) nameAccess.getByName(name)).getObject());
         } catch (NoSuchElementException ex) {
             return Optional.empty();
         }
@@ -55,9 +52,7 @@ public static Optional<XTextSection> getByName(XTextDocument doc, String name)
      * @return The XTextRange for the section, or Optional.empty().
      */
     public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
+            throws WrappedTargetException, NoDocumentException {
 
         XNameAccess nameAccess = getNameAccess(doc);
         return UnoNameAccess.getTextContentByName(nameAccess, name).map(XTextContent::getAnchor);
@@ -67,11 +62,8 @@ public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
      * Create a text section with the provided name and insert it at the provided cursor.
      * If an XTextSection by that name already exists, LibreOffice (6.4.6.2) creates a section with a name different from what we requested, in "Section {number}" format
      */
-    public static XNamed create(DocumentAnnotation documentAnnotation)
-            throws
-            CreationException {
+    public static XNamed create(DocumentAnnotation documentAnnotation) throws CreationException {
 
         return UnoNamed.insertNamedTextContent("com.sun.star.text.TextSection", documentAnnotation);
     }
 }
-
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoUndo.java b/src/main/java/org/jabref/model/openoffice/uno/UnoUndo.java
index 9de5e1491304..4a8744199c21 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoUndo.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoUndo.java
@@ -1,24 +1,23 @@
 package org.jabref.model.openoffice.uno;
 
-import java.util.Optional;
-
 import com.sun.star.document.XUndoManager;
 import com.sun.star.document.XUndoManagerSupplier;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.util.InvalidStateException;
 
+import java.util.Optional;
+
 /**
  * Undo : group document changes into larger Undo actions.
  */
 public class UnoUndo {
 
-    private UnoUndo() {
-    }
+    private UnoUndo() {}
 
     public static Optional<XUndoManager> getXUndoManager(XTextDocument doc) {
         // https://www.openoffice.org/api/docs/common/ref/com/sun/star/document/XUndoManager.html
         return UnoCast.cast(XUndoManagerSupplier.class, doc)
-                       .map(XUndoManagerSupplier::getUndoManager);
+                .map(XUndoManagerSupplier::getUndoManager);
     }
 
     /**
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoUserDefinedProperty.java b/src/main/java/org/jabref/model/openoffice/uno/UnoUserDefinedProperty.java
index 1a3645d12ed3..6bb83aaef444 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoUserDefinedProperty.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoUserDefinedProperty.java
@@ -1,10 +1,5 @@
 package org.jabref.model.openoffice.uno;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-
 import com.sun.star.beans.IllegalTypeException;
 import com.sun.star.beans.NotRemoveableException;
 import com.sun.star.beans.PropertyAttribute;
@@ -19,9 +14,15 @@
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.Any;
 import com.sun.star.uno.Type;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * Document level user-defined properties.
  * <p>
@@ -31,17 +32,17 @@ public class UnoUserDefinedProperty {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(UnoUserDefinedProperty.class);
 
-    private UnoUserDefinedProperty() {
-    }
+    private UnoUserDefinedProperty() {}
 
     public static Optional<XPropertyContainer> getPropertyContainer(XTextDocument doc) {
-        return UnoTextDocument.getDocumentProperties(doc).map(XDocumentProperties::getUserDefinedProperties);
+        return UnoTextDocument.getDocumentProperties(doc)
+                .map(XDocumentProperties::getUserDefinedProperties);
     }
 
     public static List<String> getListOfNames(XTextDocument doc) {
         return UnoUserDefinedProperty.getPropertyContainer(doc)
-                                      .map(UnoProperties::getPropertyNames)
-                                      .orElse(new ArrayList<>());
+                .map(UnoProperties::getPropertyNames)
+                .orElse(new ArrayList<>());
     }
 
     /**
@@ -50,12 +51,13 @@ public static List<String> getListOfNames(XTextDocument doc) {
      * These properties are used to store extra data about individual citation. In particular, the `pageInfo` part.
      */
     public static Optional<String> getStringValue(XTextDocument doc, String property)
-            throws
-            WrappedTargetException {
-        Optional<XPropertySet> propertySet = UnoUserDefinedProperty.getPropertyContainer(doc)
-                                                                    .flatMap(UnoProperties::asPropertySet);
+            throws WrappedTargetException {
+        Optional<XPropertySet> propertySet =
+                UnoUserDefinedProperty.getPropertyContainer(doc)
+                        .flatMap(UnoProperties::asPropertySet);
         if (propertySet.isEmpty()) {
-            throw new java.lang.IllegalArgumentException("getting UserDefinedProperties as XPropertySet failed");
+            throw new java.lang.IllegalArgumentException(
+                    "getting UserDefinedProperties as XPropertySet failed");
         }
         try {
             String value = propertySet.get().getPropertyValue(property).toString();
@@ -70,10 +72,7 @@ public static Optional<String> getStringValue(XTextDocument doc, String property
      * @param value    The value to be stored.
      */
     public static void setStringProperty(XTextDocument doc, String property, String value)
-            throws
-            IllegalTypeException,
-            PropertyVetoException,
-            WrappedTargetException {
+            throws IllegalTypeException, PropertyVetoException, WrappedTargetException {
 
         Objects.requireNonNull(property);
         Objects.requireNonNull(value);
@@ -81,7 +80,8 @@ public static void setStringProperty(XTextDocument doc, String property, String
         Optional<XPropertyContainer> container = UnoUserDefinedProperty.getPropertyContainer(doc);
 
         if (container.isEmpty()) {
-            throw new java.lang.IllegalArgumentException("UnoUserDefinedProperty.getPropertyContainer failed");
+            throw new java.lang.IllegalArgumentException(
+                    "UnoUserDefinedProperty.getPropertyContainer failed");
         }
 
         Optional<XPropertySet> propertySet = container.flatMap(UnoProperties::asPropertySet);
@@ -101,9 +101,13 @@ public static void setStringProperty(XTextDocument doc, String property, String
         }
 
         try {
-            container.get().addProperty(property, PropertyAttribute.REMOVEABLE, new Any(Type.STRING, value));
+            container
+                    .get()
+                    .addProperty(
+                            property, PropertyAttribute.REMOVEABLE, new Any(Type.STRING, value));
         } catch (PropertyExistException ex) {
-            throw new java.lang.IllegalStateException("Caught PropertyExistException for property assumed not to exist");
+            throw new java.lang.IllegalStateException(
+                    "Caught PropertyExistException for property assumed not to exist");
         }
     }
 
@@ -112,23 +116,23 @@ public static void setStringProperty(XTextDocument doc, String property, String
      *                 <p>
      *                 Logs warning if does not exist.
      */
-    public static void remove(XTextDocument doc, String property)
-            throws
-            NotRemoveableException {
+    public static void remove(XTextDocument doc, String property) throws NotRemoveableException {
 
         Objects.requireNonNull(property);
 
         Optional<XPropertyContainer> container = UnoUserDefinedProperty.getPropertyContainer(doc);
 
         if (container.isEmpty()) {
-            throw new java.lang.IllegalArgumentException("getUserDefinedPropertiesAsXPropertyContainer failed");
+            throw new java.lang.IllegalArgumentException(
+                    "getUserDefinedPropertiesAsXPropertyContainer failed");
         }
 
         try {
             container.get().removeProperty(property);
         } catch (UnknownPropertyException ex) {
-            LOGGER.warn("UnoUserDefinedProperty.remove(%s) This property was not there to remove".formatted(
-                    property));
+            LOGGER.warn(
+                    "UnoUserDefinedProperty.remove(%s) This property was not there to remove"
+                            .formatted(property));
         }
     }
 
@@ -138,15 +142,15 @@ public static void remove(XTextDocument doc, String property)
      *                 Keep silent if property did not exist.
      */
     public static void removeIfExists(XTextDocument doc, String property)
-            throws
-            NotRemoveableException {
+            throws NotRemoveableException {
 
         Objects.requireNonNull(property);
 
         Optional<XPropertyContainer> container = UnoUserDefinedProperty.getPropertyContainer(doc);
 
         if (container.isEmpty()) {
-            throw new java.lang.IllegalArgumentException("getUserDefinedPropertiesAsXPropertyContainer failed");
+            throw new java.lang.IllegalArgumentException(
+                    "getUserDefinedPropertiesAsXPropertyContainer failed");
         }
 
         try {
diff --git a/src/main/java/org/jabref/model/openoffice/util/OOPair.java b/src/main/java/org/jabref/model/openoffice/util/OOPair.java
index 006c33e942ea..d153e4e5086c 100644
--- a/src/main/java/org/jabref/model/openoffice/util/OOPair.java
+++ b/src/main/java/org/jabref/model/openoffice/util/OOPair.java
@@ -9,4 +9,3 @@ public OOPair(A a, B b) {
         this.b = b;
     }
 }
-
diff --git a/src/main/java/org/jabref/model/openoffice/util/OOResult.java b/src/main/java/org/jabref/model/openoffice/util/OOResult.java
index afbdeaf617e6..da07f5263c86 100644
--- a/src/main/java/org/jabref/model/openoffice/util/OOResult.java
+++ b/src/main/java/org/jabref/model/openoffice/util/OOResult.java
@@ -109,4 +109,3 @@ public OOVoidResult<E> asVoidResult() {
         }
     }
 }
-
diff --git a/src/main/java/org/jabref/model/openoffice/util/OOTuple3.java b/src/main/java/org/jabref/model/openoffice/util/OOTuple3.java
index cff3079efa12..df3e48c1aff2 100644
--- a/src/main/java/org/jabref/model/openoffice/util/OOTuple3.java
+++ b/src/main/java/org/jabref/model/openoffice/util/OOTuple3.java
@@ -19,4 +19,3 @@ public OOTuple3(A a, B b, C c) {
         this.c = c;
     }
 }
-
diff --git a/src/main/java/org/jabref/model/openoffice/util/OOVoidResult.java b/src/main/java/org/jabref/model/openoffice/util/OOVoidResult.java
index 5de68f8697cc..b5400857cc2e 100644
--- a/src/main/java/org/jabref/model/openoffice/util/OOVoidResult.java
+++ b/src/main/java/org/jabref/model/openoffice/util/OOVoidResult.java
@@ -49,4 +49,3 @@ public <F> OOVoidResult<F> mapError(Function<E, F> fun) {
         }
     }
 }
-
diff --git a/src/main/java/org/jabref/model/pdf/FileAnnotation.java b/src/main/java/org/jabref/model/pdf/FileAnnotation.java
index c5e393ee61e8..fa54c17af737 100644
--- a/src/main/java/org/jabref/model/pdf/FileAnnotation.java
+++ b/src/main/java/org/jabref/model/pdf/FileAnnotation.java
@@ -1,20 +1,20 @@
 package org.jabref.model.pdf;
 
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.Objects;
 import java.util.Optional;
 
-import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class FileAnnotation {
     private static final Logger LOGGER = LoggerFactory.getLogger(FileAnnotation.class);
 
-    private final static int ABBREVIATED_ANNOTATION_NAME_LENGTH = 45;
+    private static final int ABBREVIATED_ANNOTATION_NAME_LENGTH = 45;
     private static final String DATE_TIME_STRING = "^D:\\d{14}$";
     private static final String DATE_TIME_STRING_WITH_TIME_ZONE = "^D:\\d{14}.+";
     private static final String ANNOTATION_DATE_FORMAT = "yyyyMMddHHmmss";
@@ -35,8 +35,13 @@ public class FileAnnotation {
      * @param content        the actual content of the annotation
      * @param annotationType the type of the annotation
      */
-    public FileAnnotation(final String author, final LocalDateTime timeModified, final int pageNumber,
-                          final String content, final FileAnnotationType annotationType, final Optional<FileAnnotation> linkedFileAnnotation) {
+    public FileAnnotation(
+            final String author,
+            final LocalDateTime timeModified,
+            final int pageNumber,
+            final String content,
+            final FileAnnotationType annotationType,
+            final Optional<FileAnnotation> linkedFileAnnotation) {
         this.author = author;
         this.timeModified = timeModified;
         this.page = pageNumber;
@@ -52,9 +57,13 @@ public FileAnnotation(final String author, final LocalDateTime timeModified, fin
      * @param pageNumber The page of the pdf where the annotation occurs
      */
     public FileAnnotation(final PDAnnotation annotation, final int pageNumber) {
-        this(annotation.getCOSObject().getString(COSName.T),
+        this(
+                annotation.getCOSObject().getString(COSName.T),
                 extractModifiedTime(annotation.getModifiedDate()),
-                pageNumber, annotation.getContents(), FileAnnotationType.parse(annotation), Optional.empty());
+                pageNumber,
+                annotation.getContents(),
+                FileAnnotationType.parse(annotation),
+                Optional.empty());
     }
 
     /**
@@ -65,9 +74,17 @@ public FileAnnotation(final PDAnnotation annotation, final int pageNumber) {
      * @param pageNumber           The page of the pdf where the annotation occurs
      * @param linkedFileAnnotation The corresponding note of a marked text area.
      */
-    public FileAnnotation(final PDAnnotation annotation, final int pageNumber, FileAnnotation linkedFileAnnotation) {
-        this(annotation.getCOSObject().getString(COSName.T), extractModifiedTime(annotation.getModifiedDate()),
-                pageNumber, annotation.getContents(), FileAnnotationType.parse(annotation), Optional.of(linkedFileAnnotation));
+    public FileAnnotation(
+            final PDAnnotation annotation,
+            final int pageNumber,
+            FileAnnotation linkedFileAnnotation) {
+        this(
+                annotation.getCOSObject().getString(COSName.T),
+                extractModifiedTime(annotation.getModifiedDate()),
+                pageNumber,
+                annotation.getContents(),
+                FileAnnotationType.parse(annotation),
+                Optional.of(linkedFileAnnotation));
     }
 
     /**
@@ -88,9 +105,12 @@ public static LocalDateTime extractModifiedTime(String dateTimeString) {
         }
 
         try {
-            return LocalDateTime.parse(dateTimeString, DateTimeFormatter.ofPattern(ANNOTATION_DATE_FORMAT));
+            return LocalDateTime.parse(
+                    dateTimeString, DateTimeFormatter.ofPattern(ANNOTATION_DATE_FORMAT));
         } catch (DateTimeParseException e) {
-            LOGGER.info("Expected a parseable date string! However, this text could not be parsed: '%s'".formatted(dateTimeString));
+            LOGGER.info(
+                    "Expected a parseable date string! However, this text could not be parsed: '%s'"
+                            .formatted(dateTimeString));
             return LocalDateTime.now();
         }
     }
@@ -116,7 +136,8 @@ private String parseContent(final String content) {
      */
     private String abbreviateAnnotationName(final String annotationName) {
         if (annotationName.length() > ABBREVIATED_ANNOTATION_NAME_LENGTH) {
-            return annotationName.subSequence(0, ABBREVIATED_ANNOTATION_NAME_LENGTH).toString() + "...";
+            return annotationName.subSequence(0, ABBREVIATED_ANNOTATION_NAME_LENGTH).toString()
+                    + "...";
         }
         return annotationName;
     }
@@ -146,7 +167,8 @@ public boolean equals(Object other) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(annotationType, author, content, page, linkedFileAnnotation, timeModified);
+        return Objects.hash(
+                annotationType, author, content, page, linkedFileAnnotation, timeModified);
     }
 
     public String getAuthor() {
diff --git a/src/main/java/org/jabref/model/pdf/FileAnnotationType.java b/src/main/java/org/jabref/model/pdf/FileAnnotationType.java
index dfd101026ad8..16724f97cbbd 100644
--- a/src/main/java/org/jabref/model/pdf/FileAnnotationType.java
+++ b/src/main/java/org/jabref/model/pdf/FileAnnotationType.java
@@ -1,16 +1,15 @@
 package org.jabref.model.pdf;
 
-import java.util.Locale;
-
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Locale;
+
 /**
  * Our representation of the type of the FileAnnotation. This is needed as some FileAnnotationTypes require special
  * handling (e.g., Highlight or Underline), because of the linked FileAnnotations.
  */
-
 public enum FileAnnotationType {
     TEXT("Text", false),
     HIGHLIGHT("Highlight", true),
@@ -47,7 +46,9 @@ public static FileAnnotationType parse(PDAnnotation annotation) {
         try {
             return FileAnnotationType.valueOf(annotation.getSubtype().toUpperCase(Locale.ROOT));
         } catch (IllegalArgumentException e) {
-            LOGGER.info("FileAnnotationType %s is not supported and was converted into 'Unknown'!".formatted(annotation.getSubtype()));
+            LOGGER.info(
+                    "FileAnnotationType %s is not supported and was converted into 'Unknown'!"
+                            .formatted(annotation.getSubtype()));
             return UNKNOWN;
         }
     }
@@ -60,7 +61,8 @@ public static FileAnnotationType parse(PDAnnotation annotation) {
      */
     public static boolean isMarkedFileAnnotationType(String annotationType) {
         try {
-            return FileAnnotationType.valueOf(annotationType.toUpperCase(Locale.ROOT)).linkedFileAnnotationType;
+            return FileAnnotationType.valueOf(annotationType.toUpperCase(Locale.ROOT))
+                    .linkedFileAnnotationType;
         } catch (IllegalArgumentException e) {
             return false;
         }
diff --git a/src/main/java/org/jabref/model/schema/DublinCoreSchemaCustom.java b/src/main/java/org/jabref/model/schema/DublinCoreSchemaCustom.java
index a67dcc6dd5f1..7cc896c13855 100644
--- a/src/main/java/org/jabref/model/schema/DublinCoreSchemaCustom.java
+++ b/src/main/java/org/jabref/model/schema/DublinCoreSchemaCustom.java
@@ -1,8 +1,5 @@
 package org.jabref.model.schema;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.xmpbox.XMPMetadata;
 import org.apache.xmpbox.schema.DublinCoreSchema;
@@ -13,6 +10,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  *  A DublinCoreSchema extension Class.
  *  In case anyone intends to alter standard behaviour.
@@ -32,10 +32,15 @@ public static DublinCoreSchema copyDublinCoreSchema(DublinCoreSchema dcSchema) {
         }
 
         try {
-            DublinCoreSchemaCustom dublinCoreSchemaCustom = new DublinCoreSchemaCustom(dcSchema.getMetadata());
-            FieldUtils.writeField(dublinCoreSchemaCustom, "container", dcSchema.getContainer(), true);
-            FieldUtils.writeField(dublinCoreSchemaCustom, "attributes",
-                    FieldUtils.readField(dcSchema, "attributes", true), true);
+            DublinCoreSchemaCustom dublinCoreSchemaCustom =
+                    new DublinCoreSchemaCustom(dcSchema.getMetadata());
+            FieldUtils.writeField(
+                    dublinCoreSchemaCustom, "container", dcSchema.getContainer(), true);
+            FieldUtils.writeField(
+                    dublinCoreSchemaCustom,
+                    "attributes",
+                    FieldUtils.readField(dcSchema, "attributes", true),
+                    true);
             return dublinCoreSchemaCustom;
         } catch (Exception e) {
             LOGGER.error("Error making custom DC Schema. Using the default", e);
@@ -52,9 +57,7 @@ public List<String> getUnqualifiedSequenceValueList(String seqName) {
         AbstractField abstractProperty = getAbstractProperty(seqName);
         if (abstractProperty instanceof ArrayProperty property) {
             if ("date".equals(seqName)) {
-                return property.getContainer()
-                        .getAllProperties()
-                        .stream()
+                return property.getContainer().getAllProperties().stream()
                         .map(field -> (String) ((DateType) field).getRawValue())
                         .collect(Collectors.toList());
             }
diff --git a/src/main/java/org/jabref/model/search/Analyzer/LatexToUnicodeFoldingFilter.java b/src/main/java/org/jabref/model/search/Analyzer/LatexToUnicodeFoldingFilter.java
index 5cd7fd640420..5d13258dfa4d 100644
--- a/src/main/java/org/jabref/model/search/Analyzer/LatexToUnicodeFoldingFilter.java
+++ b/src/main/java/org/jabref/model/search/Analyzer/LatexToUnicodeFoldingFilter.java
@@ -1,19 +1,18 @@
 package org.jabref.model.search.Analyzer;
 
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.jabref.architecture.AllowedToUseLogic;
-import org.jabref.logic.cleanup.Formatter;
-import org.jabref.logic.layout.format.LatexToUnicodeFormatter;
-
 import org.apache.lucene.analysis.TokenFilter;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
+import org.jabref.architecture.AllowedToUseLogic;
+import org.jabref.logic.cleanup.Formatter;
+import org.jabref.logic.layout.format.LatexToUnicodeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.Arrays;
+
 /**
  * @implNote Implementation based on {@link org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter}
  */
@@ -32,8 +31,7 @@ public LatexToUnicodeFoldingFilter(TokenStream input) {
         super(input);
     }
 
-    private record FoldingResult(char[] output, int length) {
-    }
+    private record FoldingResult(char[] output, int length) {}
 
     @Override
     public boolean incrementToken() throws IOException {
diff --git a/src/main/java/org/jabref/model/search/SearchFieldConstants.java b/src/main/java/org/jabref/model/search/SearchFieldConstants.java
index 12aa58576da2..df2359b2febf 100644
--- a/src/main/java/org/jabref/model/search/SearchFieldConstants.java
+++ b/src/main/java/org/jabref/model/search/SearchFieldConstants.java
@@ -1,12 +1,11 @@
 package org.jabref.model.search;
 
-import java.util.List;
-
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.en.EnglishAnalyzer;
 import org.jabref.model.search.Analyzer.LatexAwareAnalyzer;
 import org.jabref.model.search.Analyzer.LatexAwareNGramAnalyzer;
 
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.en.EnglishAnalyzer;
+import java.util.List;
 
 public enum SearchFieldConstants {
     /**
@@ -28,8 +27,10 @@ public enum SearchFieldConstants {
 
     public static final Analyzer LINKED_FILES_ANALYZER = new EnglishAnalyzer();
     public static final Analyzer LATEX_AWARE_ANALYZER = new LatexAwareAnalyzer();
-    public static final Analyzer LATEX_AWARE_NGRAM_ANALYZER = new LatexAwareNGramAnalyzer(1, Integer.MAX_VALUE);
-    public static final List<String> PDF_FIELDS = List.of(CONTENT.toString(), ANNOTATIONS.toString());
+    public static final Analyzer LATEX_AWARE_NGRAM_ANALYZER =
+            new LatexAwareNGramAnalyzer(1, Integer.MAX_VALUE);
+    public static final List<String> PDF_FIELDS =
+            List.of(CONTENT.toString(), ANNOTATIONS.toString());
     private final String field;
 
     SearchFieldConstants(String field) {
diff --git a/src/main/java/org/jabref/model/search/SearchFlags.java b/src/main/java/org/jabref/model/search/SearchFlags.java
index 20dcf22234ef..696f2f3dfa45 100644
--- a/src/main/java/org/jabref/model/search/SearchFlags.java
+++ b/src/main/java/org/jabref/model/search/SearchFlags.java
@@ -1,5 +1,7 @@
 package org.jabref.model.search;
 
 public enum SearchFlags {
-    REGULAR_EXPRESSION, FULLTEXT, CASE_SENSITIVE
+    REGULAR_EXPRESSION,
+    FULLTEXT,
+    CASE_SENSITIVE
 }
diff --git a/src/main/java/org/jabref/model/search/SearchQuery.java b/src/main/java/org/jabref/model/search/SearchQuery.java
index b76fc036fcee..f94be38e886d 100644
--- a/src/main/java/org/jabref/model/search/SearchQuery.java
+++ b/src/main/java/org/jabref/model/search/SearchQuery.java
@@ -1,5 +1,12 @@
 package org.jabref.model.search;
 
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper;
+import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.highlight.QueryTermExtractor;
+import org.apache.lucene.search.highlight.WeightedTerm;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.EnumSet;
@@ -12,13 +19,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper;
-import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.highlight.QueryTermExtractor;
-import org.apache.lucene.search.highlight.WeightedTerm;
-
 public class SearchQuery {
     /**
      * The mode of escaping special characters in regular expressions
@@ -46,7 +46,8 @@ String format(String regex) {
         /**
          * Regex pattern for escaping special characters in javascript regular expressions
          */
-        private static final Pattern JAVASCRIPT_ESCAPED_CHARS_PATTERN = Pattern.compile("[.*+?^${}()|\\[\\]\\\\/]");
+        private static final Pattern JAVASCRIPT_ESCAPED_CHARS_PATTERN =
+                Pattern.compile("[.*+?^${}()|\\[\\]\\\\/]");
 
         /**
          * Attempt to escape all regex special characters.
@@ -73,10 +74,11 @@ public SearchQuery(String query, EnumSet<SearchFlags> searchFlags) {
 
         if (searchFlags.contains(SearchFlags.FULLTEXT)) {
             boosts.put(SearchFieldConstants.DEFAULT_FIELD.toString(), 4F);
-            SearchFieldConstants.PDF_FIELDS.forEach(field -> {
-                boosts.put(field, 1F);
-                fieldAnalyzers.put(field, SearchFieldConstants.LINKED_FILES_ANALYZER);
-            });
+            SearchFieldConstants.PDF_FIELDS.forEach(
+                    field -> {
+                        boosts.put(field, 1F);
+                        fieldAnalyzers.put(field, SearchFieldConstants.LINKED_FILES_ANALYZER);
+                    });
         } else {
             boosts.put(SearchFieldConstants.DEFAULT_FIELD.toString(), 1F);
         }
@@ -84,8 +86,11 @@ public SearchQuery(String query, EnumSet<SearchFlags> searchFlags) {
         String[] fieldsToSearchArray = new String[boosts.size()];
         boosts.keySet().toArray(fieldsToSearchArray);
 
-        PerFieldAnalyzerWrapper analyzerWrapper = new PerFieldAnalyzerWrapper(SearchFieldConstants.LATEX_AWARE_ANALYZER, fieldAnalyzers);
-        MultiFieldQueryParser queryParser = new MultiFieldQueryParser(fieldsToSearchArray, analyzerWrapper, boosts);
+        PerFieldAnalyzerWrapper analyzerWrapper =
+                new PerFieldAnalyzerWrapper(
+                        SearchFieldConstants.LATEX_AWARE_ANALYZER, fieldAnalyzers);
+        MultiFieldQueryParser queryParser =
+                new MultiFieldQueryParser(fieldsToSearchArray, analyzerWrapper, boosts);
         queryParser.setAllowLeadingWildcard(true);
 
         try {
@@ -122,8 +127,7 @@ public boolean equals(Object o) {
         if (!(o instanceof SearchQuery that)) {
             return false;
         }
-        return Objects.equals(query, that.query)
-                && Objects.equals(searchFlags, that.searchFlags);
+        return Objects.equals(query, that.query) && Objects.equals(searchFlags, that.searchFlags);
     }
 
     @Override
@@ -154,16 +158,18 @@ public List<String> getSearchWords() {
             return List.of();
         }
         return Arrays.stream(QueryTermExtractor.getTerms(parsedQuery))
-                     .map(WeightedTerm::getTerm)
-                     .toList();
+                .map(WeightedTerm::getTerm)
+                .toList();
     }
 
-    // Returns a regular expression pattern in the form (w1)|(w2)| ... wi are escaped if no regular expression search is enabled
+    // Returns a regular expression pattern in the form (w1)|(w2)| ... wi are escaped if no regular
+    // expression search is enabled
     public Optional<Pattern> getPatternForWords() {
         return joinWordsToPattern(EscapeMode.JAVA);
     }
 
-    // Returns a regular expression pattern in the form (w1)|(w2)| ... wi are escaped for javascript if no regular expression search is enabled
+    // Returns a regular expression pattern in the form (w1)|(w2)| ... wi are escaped for javascript
+    // if no regular expression search is enabled
     public Optional<Pattern> getJavaScriptPatternForWords() {
         return joinWordsToPattern(EscapeMode.JAVASCRIPT);
     }
diff --git a/src/main/java/org/jabref/model/search/SearchResult.java b/src/main/java/org/jabref/model/search/SearchResult.java
index a26a443d21a8..07f87acba478 100644
--- a/src/main/java/org/jabref/model/search/SearchResult.java
+++ b/src/main/java/org/jabref/model/search/SearchResult.java
@@ -1,14 +1,14 @@
 package org.jabref.model.search;
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.search.highlight.Highlighter;
 import org.apache.lucene.search.highlight.InvalidTokenOffsetsException;
 import org.apache.lucene.search.highlight.TextFragment;
 
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
 public final class SearchResult {
 
     private final float searchScore;
@@ -21,13 +21,14 @@ public final class SearchResult {
     private List<String> contentResultStringsHtml;
     private List<String> annotationsResultStringsHtml;
 
-    private SearchResult(float searchScore,
-                         boolean hasFulltextResults,
-                         String path,
-                         String pageContent,
-                         String annotation,
-                         int pageNumber,
-                         Highlighter highlighter) {
+    private SearchResult(
+            float searchScore,
+            boolean hasFulltextResults,
+            String path,
+            String pageContent,
+            String annotation,
+            int pageNumber,
+            Highlighter highlighter) {
         this.searchScore = searchScore;
         this.hasFulltextResults = hasFulltextResults;
         this.path = path;
@@ -41,20 +42,29 @@ public SearchResult(float searchScore) {
         this(searchScore, false, "", "", "", -1, null);
     }
 
-    public SearchResult(float searchScore, String path, String pageContent, String annotation, int pageNumber, Highlighter highlighter) {
+    public SearchResult(
+            float searchScore,
+            String path,
+            String pageContent,
+            String annotation,
+            int pageNumber,
+            Highlighter highlighter) {
         this(searchScore, true, path, pageContent, annotation, pageNumber, highlighter);
     }
 
     public List<String> getContentResultStringsHtml() {
         if (contentResultStringsHtml == null) {
-            return contentResultStringsHtml = getHighlighterFragments(highlighter, SearchFieldConstants.CONTENT, pageContent);
+            return contentResultStringsHtml =
+                    getHighlighterFragments(highlighter, SearchFieldConstants.CONTENT, pageContent);
         }
         return contentResultStringsHtml;
     }
 
     public List<String> getAnnotationsResultStringsHtml() {
         if (annotationsResultStringsHtml == null) {
-            annotationsResultStringsHtml = getHighlighterFragments(highlighter, SearchFieldConstants.ANNOTATIONS, annotation);
+            annotationsResultStringsHtml =
+                    getHighlighterFragments(
+                            highlighter, SearchFieldConstants.ANNOTATIONS, annotation);
         }
         return annotationsResultStringsHtml;
     }
@@ -75,9 +85,12 @@ public int getPageNumber() {
         return pageNumber;
     }
 
-    private static List<String> getHighlighterFragments(Highlighter highlighter, SearchFieldConstants field, String content) {
-        try (TokenStream contentStream = SearchFieldConstants.LINKED_FILES_ANALYZER.tokenStream(field.toString(), content)) {
-            TextFragment[] frags = highlighter.getBestTextFragments(contentStream, content, true, 10);
+    private static List<String> getHighlighterFragments(
+            Highlighter highlighter, SearchFieldConstants field, String content) {
+        try (TokenStream contentStream =
+                SearchFieldConstants.LINKED_FILES_ANALYZER.tokenStream(field.toString(), content)) {
+            TextFragment[] frags =
+                    highlighter.getBestTextFragments(contentStream, content, true, 10);
             return Arrays.stream(frags).map(TextFragment::toString).toList();
         } catch (IOException | InvalidTokenOffsetsException e) {
             return List.of();
diff --git a/src/main/java/org/jabref/model/search/SearchResults.java b/src/main/java/org/jabref/model/search/SearchResults.java
index 3c0acb85ed75..8abc10a3d95f 100644
--- a/src/main/java/org/jabref/model/search/SearchResults.java
+++ b/src/main/java/org/jabref/model/search/SearchResults.java
@@ -1,5 +1,7 @@
 package org.jabref.model.search;
 
+import org.jabref.model.entry.BibEntry;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -7,8 +9,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jabref.model.entry.BibEntry;
-
 public class SearchResults {
 
     private final Map<String, List<SearchResult>> searchResults = new HashMap<>();
@@ -27,19 +27,17 @@ public void addSearchResult(Collection<String> entries, SearchResult result) {
 
     public float getSearchScoreForEntry(BibEntry entry) {
         if (searchResults.containsKey(entry.getId())) {
-            return searchResults.get(entry.getId())
-                                .stream()
-                                .map(SearchResult::getSearchScore)
-                                .reduce(0f, Float::max);
+            return searchResults.get(entry.getId()).stream()
+                    .map(SearchResult::getSearchScore)
+                    .reduce(0f, Float::max);
         }
         return 0f;
     }
 
     public boolean hasFulltextResults(BibEntry entry) {
         if (searchResults.containsKey(entry.getId())) {
-            return searchResults.get(entry.getId())
-                                .stream()
-                                .anyMatch(SearchResult::hasFulltextResults);
+            return searchResults.get(entry.getId()).stream()
+                    .anyMatch(SearchResult::hasFulltextResults);
         }
         return false;
     }
diff --git a/src/main/java/org/jabref/model/search/ThrowingErrorListener.java b/src/main/java/org/jabref/model/search/ThrowingErrorListener.java
index d51c2b244741..2d18f1ebb217 100644
--- a/src/main/java/org/jabref/model/search/ThrowingErrorListener.java
+++ b/src/main/java/org/jabref/model/search/ThrowingErrorListener.java
@@ -10,8 +10,13 @@ public class ThrowingErrorListener extends BaseErrorListener {
     public static final ThrowingErrorListener INSTANCE = new ThrowingErrorListener();
 
     @Override
-    public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol,
-                            int line, int charPositionInLine, String msg, RecognitionException e)
+    public void syntaxError(
+            Recognizer<?, ?> recognizer,
+            Object offendingSymbol,
+            int line,
+            int charPositionInLine,
+            String msg,
+            RecognitionException e)
             throws ParseCancellationException {
         throw new ParseCancellationException("line " + line + ":" + charPositionInLine + " " + msg);
     }
diff --git a/src/main/java/org/jabref/model/search/event/IndexAddedOrUpdatedEvent.java b/src/main/java/org/jabref/model/search/event/IndexAddedOrUpdatedEvent.java
index ed6f432ce259..763bc7b61919 100644
--- a/src/main/java/org/jabref/model/search/event/IndexAddedOrUpdatedEvent.java
+++ b/src/main/java/org/jabref/model/search/event/IndexAddedOrUpdatedEvent.java
@@ -1,8 +1,7 @@
 package org.jabref.model.search.event;
 
-import java.util.List;
-
 import org.jabref.model.entry.BibEntry;
 
-public record IndexAddedOrUpdatedEvent(List<BibEntry> entries) {
-}
+import java.util.List;
+
+public record IndexAddedOrUpdatedEvent(List<BibEntry> entries) {}
diff --git a/src/main/java/org/jabref/model/search/event/IndexClosedEvent.java b/src/main/java/org/jabref/model/search/event/IndexClosedEvent.java
index a79475c80ddf..c0d1c35c8d2a 100644
--- a/src/main/java/org/jabref/model/search/event/IndexClosedEvent.java
+++ b/src/main/java/org/jabref/model/search/event/IndexClosedEvent.java
@@ -1,4 +1,3 @@
 package org.jabref.model.search.event;
 
-public record IndexClosedEvent() {
-}
+public record IndexClosedEvent() {}
diff --git a/src/main/java/org/jabref/model/search/event/IndexRemovedEvent.java b/src/main/java/org/jabref/model/search/event/IndexRemovedEvent.java
index a89cad1e2bdb..7ee279d3b4dd 100644
--- a/src/main/java/org/jabref/model/search/event/IndexRemovedEvent.java
+++ b/src/main/java/org/jabref/model/search/event/IndexRemovedEvent.java
@@ -1,8 +1,7 @@
 package org.jabref.model.search.event;
 
-import java.util.List;
-
 import org.jabref.model.entry.BibEntry;
 
-public record IndexRemovedEvent(List<BibEntry> entries) {
-}
+import java.util.List;
+
+public record IndexRemovedEvent(List<BibEntry> entries) {}
diff --git a/src/main/java/org/jabref/model/search/event/IndexStartedEvent.java b/src/main/java/org/jabref/model/search/event/IndexStartedEvent.java
index 8bb268ab73c6..33273d74bd70 100644
--- a/src/main/java/org/jabref/model/search/event/IndexStartedEvent.java
+++ b/src/main/java/org/jabref/model/search/event/IndexStartedEvent.java
@@ -1,4 +1,3 @@
 package org.jabref.model.search.event;
 
-public record IndexStartedEvent() {
-}
+public record IndexStartedEvent() {}
diff --git a/src/main/java/org/jabref/model/search/matchers/AndMatcher.java b/src/main/java/org/jabref/model/search/matchers/AndMatcher.java
index 81839607ad0f..667323cc7530 100644
--- a/src/main/java/org/jabref/model/search/matchers/AndMatcher.java
+++ b/src/main/java/org/jabref/model/search/matchers/AndMatcher.java
@@ -9,7 +9,6 @@ public class AndMatcher extends MatcherSet {
 
     @Override
     public boolean isMatch(BibEntry entry) {
-        return matchers.stream()
-                       .allMatch(rule -> rule.isMatch(entry));
+        return matchers.stream().allMatch(rule -> rule.isMatch(entry));
     }
 }
diff --git a/src/main/java/org/jabref/model/search/matchers/MatcherSet.java b/src/main/java/org/jabref/model/search/matchers/MatcherSet.java
index 2b54636294ac..6ac619f92b43 100644
--- a/src/main/java/org/jabref/model/search/matchers/MatcherSet.java
+++ b/src/main/java/org/jabref/model/search/matchers/MatcherSet.java
@@ -1,11 +1,11 @@
 package org.jabref.model.search.matchers;
 
+import org.jabref.model.search.SearchMatcher;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import org.jabref.model.search.SearchMatcher;
-
 public abstract class MatcherSet implements SearchMatcher {
 
     protected final List<SearchMatcher> matchers = new ArrayList<>();
diff --git a/src/main/java/org/jabref/model/search/matchers/NotMatcher.java b/src/main/java/org/jabref/model/search/matchers/NotMatcher.java
index 09be8c7f86e7..c7ea7a5488d5 100644
--- a/src/main/java/org/jabref/model/search/matchers/NotMatcher.java
+++ b/src/main/java/org/jabref/model/search/matchers/NotMatcher.java
@@ -1,10 +1,10 @@
 package org.jabref.model.search.matchers;
 
-import java.util.Objects;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.SearchMatcher;
 
+import java.util.Objects;
+
 /**
  * Inverts the search result.
  * <p>
diff --git a/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java b/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java
index 01c4c304ef29..e99768b55c62 100644
--- a/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java
+++ b/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java
@@ -1,13 +1,14 @@
 package org.jabref.model.strings;
 
+import com.github.tomtung.latex2unicode.LaTeX2Unicode;
+
+import fastparse.Parsed;
+
 import java.text.Normalizer;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
 
-import com.github.tomtung.latex2unicode.LaTeX2Unicode;
-import fastparse.Parsed;
-
 /**
  * Adapter class for the latex2unicode lib. This is an alternative to our LatexToUnicode class
  */
diff --git a/src/main/java/org/jabref/model/strings/StringUtil.java b/src/main/java/org/jabref/model/strings/StringUtil.java
index 2237526cd3e0..559b64311906 100644
--- a/src/main/java/org/jabref/model/strings/StringUtil.java
+++ b/src/main/java/org/jabref/model/strings/StringUtil.java
@@ -1,5 +1,11 @@
 package org.jabref.model.strings;
 
+import com.google.common.base.CharMatcher;
+
+import org.apache.commons.lang3.StringUtils;
+import org.jabref.architecture.AllowedToUseApacheCommonsLang3;
+import org.jabref.logic.bibtex.FieldWriter;
+
 import java.text.Normalizer;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -11,12 +17,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.architecture.AllowedToUseApacheCommonsLang3;
-import org.jabref.logic.bibtex.FieldWriter;
-
-import com.google.common.base.CharMatcher;
-import org.apache.commons.lang3.StringUtils;
-
 @AllowedToUseApacheCommonsLang3("There is no equivalent in Google's Guava")
 public class StringUtil {
 
@@ -155,7 +155,8 @@ public static String getCorrectFileName(String orgName, String defaultExtension)
             return "";
         }
 
-        if (orgName.toLowerCase(Locale.ROOT).endsWith("." + defaultExtension.toLowerCase(Locale.ROOT))) {
+        if (orgName.toLowerCase(Locale.ROOT)
+                .endsWith("." + defaultExtension.toLowerCase(Locale.ROOT))) {
             return orgName;
         }
 
@@ -179,8 +180,10 @@ public static String getCorrectFileName(String orgName, String defaultExtension)
     public static String wrap(String in, int wrapAmount, String newline) {
         String[] lines = in.split("\n");
         StringBuilder result = new StringBuilder();
-        // remove all whitespace at the end of the string, this especially includes \r created when the field content has \r\n as line separator
-        addWrappedLine(result, CharMatcher.whitespace().trimTrailingFrom(lines[0]), wrapAmount, newline);
+        // remove all whitespace at the end of the string, this especially includes \r created when
+        // the field content has \r\n as line separator
+        addWrappedLine(
+                result, CharMatcher.whitespace().trimTrailingFrom(lines[0]), wrapAmount, newline);
         for (int i = 1; i < lines.length; i++) {
             if (lines[i].trim().isEmpty()) {
                 result.append(newline);
@@ -190,7 +193,8 @@ public static String wrap(String in, int wrapAmount, String newline) {
                 result.append('\t');
                 result.append(newline);
                 result.append('\t');
-                // remove all whitespace at the end of the string, this especially includes \r created when the field content has \r\n as line separator
+                // remove all whitespace at the end of the string, this especially includes \r
+                // created when the field content has \r\n as line separator
                 String line = CharMatcher.whitespace().trimTrailingFrom(lines[i]);
                 addWrappedLine(result, line, wrapAmount, newline);
             }
@@ -206,7 +210,8 @@ public static String wrap(String in, int wrapAmount, String newline) {
      * @param wrapAmount    the number of characters belonging to a line of text
      * @param newlineString a string containing the newline character(s)
      */
-    private static void addWrappedLine(StringBuilder result, String line, int wrapAmount, String newlineString) {
+    private static void addWrappedLine(
+            StringBuilder result, String line, int wrapAmount, String newlineString) {
         // Set our pointer to the beginning of the new line in the StringBuffer:
         int length = result.length();
         // Add the line, unmodified:
@@ -312,7 +317,10 @@ public static String putBracesAroundCapitals(String s) {
             }
 
             // See if we should start bracing:
-            if ((inBrace == 0) && !isBracing && !inString && Character.isLetter((char) c)
+            if ((inBrace == 0)
+                    && !isBracing
+                    && !inString
+                    && Character.isLetter((char) c)
                     && Character.isUpperCase((char) c)) {
                 buf.append('{');
                 isBracing = true;
@@ -453,7 +461,13 @@ public static int intValueOf(String str) {
         boolean sign = false;
         char ch;
 
-        if ((str == null) || ((end = str.length()) == 0) || ((((ch = str.charAt(0)) < '0') || (ch > '9')) && (!(sign = ch == '-') || (++idx == end) || ((ch = str.charAt(idx)) < '0') || (ch > '9')))) {
+        if ((str == null)
+                || ((end = str.length()) == 0)
+                || ((((ch = str.charAt(0)) < '0') || (ch > '9'))
+                        && (!(sign = ch == '-')
+                                || (++idx == end)
+                                || ((ch = str.charAt(idx)) < '0')
+                                || (ch > '9')))) {
             throw new NumberFormatException(str);
         }
 
@@ -483,7 +497,13 @@ public static Optional<Integer> intValueOfOptional(String str) {
         boolean sign = false;
         char ch;
 
-        if ((str == null) || ((end = str.length()) == 0) || ((((ch = str.charAt(0)) < '0') || (ch > '9')) && (!(sign = ch == '-') || (++idx == end) || ((ch = str.charAt(idx)) < '0') || (ch > '9')))) {
+        if ((str == null)
+                || ((end = str.length()) == 0)
+                || ((((ch = str.charAt(0)) < '0') || (ch > '9'))
+                        && (!(sign = ch == '-')
+                                || (++idx == end)
+                                || ((ch = str.charAt(idx)) < '0')
+                                || (ch > '9')))) {
             return Optional.empty();
         }
 
@@ -520,8 +540,14 @@ public static String stripNonValidXMLCharacters(String in) {
         char current; // Used to reference the current character.
 
         for (int i = 0; i < in.length(); i++) {
-            current = in.charAt(i); // NOTE: No IndexOutOfBoundsException caught here; it should not happen.
-            if ((current == 0x9) || (current == 0xA) || (current == 0xD) || ((current >= 0x20) && (current <= 0xD7FF))
+            current =
+                    in.charAt(
+                            i); // NOTE: No IndexOutOfBoundsException caught here; it should not
+                                // happen.
+            if ((current == 0x9)
+                    || (current == 0xA)
+                    || (current == 0xD)
+                    || ((current >= 0x20) && (current <= 0xD7FF))
                     || ((current >= 0xE000) && (current <= 0xFFFD))) {
                 out.append(current);
             }
@@ -672,7 +698,8 @@ public static String unquote(String toUnquote, char quoteChar) {
         return result.toString();
     }
 
-    @AllowedToUseApacheCommonsLang3("No Guava equivalent existing - see https://stackoverflow.com/q/3322152/873282 for a list of other implementations")
+    @AllowedToUseApacheCommonsLang3(
+            "No Guava equivalent existing - see https://stackoverflow.com/q/3322152/873282 for a list of other implementations")
     public static String stripAccents(String searchQuery) {
         return StringUtils.stripAccents(searchQuery);
     }
@@ -704,12 +731,16 @@ public static List<String> getStringAsWords(String text) {
      * Returns a list of sentences contained in the given text.
      */
     public static List<String> getStringAsSentences(String text) {
-        // A sentence ends with a .?!;, but not in the case of "Mr.", "Ms.", "Mrs.", "Dr.", "st.", "jr.", "co.", "inc.", and "ltd."
-        Pattern splitTextPattern = Pattern.compile("(?<=[\\.!;\\?])(?<![Mm](([Rr]|[Rr][Ss])|[Ss])\\.|[Dd][Rr]\\.|[Ss][Tt]\\.|[Jj][Rr]\\.|[Cc][Oo]\\.|[Ii][Nn][Cc]\\.|[Ll][Tt][Dd]\\.)\\s+");
+        // A sentence ends with a .?!;, but not in the case of "Mr.", "Ms.", "Mrs.", "Dr.", "st.",
+        // "jr.", "co.", "inc.", and "ltd."
+        Pattern splitTextPattern =
+                Pattern.compile(
+                        "(?<=[\\.!;\\?])(?<![Mm](([Rr]|[Rr][Ss])|[Ss])\\.|[Dd][Rr]\\.|[Ss][Tt]\\.|[Jj][Rr]\\.|[Cc][Oo]\\.|[Ii][Nn][Cc]\\.|[Ll][Tt][Dd]\\.)\\s+");
         return Arrays.asList(splitTextPattern.split(text));
     }
 
-    @AllowedToUseApacheCommonsLang3("No direct Guava equivalent existing - see https://stackoverflow.com/q/16560635/873282")
+    @AllowedToUseApacheCommonsLang3(
+            "No direct Guava equivalent existing - see https://stackoverflow.com/q/16560635/873282")
     public static boolean containsIgnoreCase(String text, String searchString) {
         return StringUtils.containsIgnoreCase(text, searchString);
     }
@@ -746,7 +777,8 @@ public static boolean containsWhitespace(String s) {
         return s.chars().anyMatch(Character::isWhitespace);
     }
 
-    @AllowedToUseApacheCommonsLang3("No Guava equivalent existing - see https://stackoverflow.com/a/23825984")
+    @AllowedToUseApacheCommonsLang3(
+            "No Guava equivalent existing - see https://stackoverflow.com/a/23825984")
     public static String removeStringAtTheEnd(String string, String stringToBeRemoved) {
         return StringUtils.removeEndIgnoreCase(string, stringToBeRemoved);
     }
diff --git a/src/main/java/org/jabref/model/study/Study.java b/src/main/java/org/jabref/model/study/Study.java
index 5f0b1648f7f6..5ad1d4f111bc 100644
--- a/src/main/java/org/jabref/model/study/Study.java
+++ b/src/main/java/org/jabref/model/study/Study.java
@@ -1,14 +1,14 @@
 package org.jabref.model.study;
 
-import java.util.List;
-import java.util.Objects;
-
-import org.jabref.logic.crawler.StudyYamlParser;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+import org.jabref.logic.crawler.StudyYamlParser;
+
+import java.util.List;
+import java.util.Objects;
+
 /**
  * This class represents a scientific study.
  *
@@ -31,7 +31,12 @@ public class Study {
 
     private List<StudyDatabase> databases;
 
-    public Study(List<String> authors, String title, List<String> researchQuestions, List<StudyQuery> queryEntries, List<StudyDatabase> databases) {
+    public Study(
+            List<String> authors,
+            String title,
+            List<String> researchQuestions,
+            List<StudyQuery> queryEntries,
+            List<StudyDatabase> databases) {
         this.authors = authors;
         this.title = title;
         this.researchQuestions = researchQuestions;
@@ -42,8 +47,7 @@ public Study(List<String> authors, String title, List<String> researchQuestions,
     /**
      * Used for Jackson deserialization
      */
-    private Study() {
-    }
+    private Study() {}
 
     public List<String> getAuthors() {
         return authors;
@@ -87,13 +91,19 @@ public void setResearchQuestions(List<String> researchQuestions) {
 
     @Override
     public String toString() {
-        return "Study{" +
-                "authors=" + authors +
-                ", studyName='" + title + '\'' +
-                ", researchQuestions=" + researchQuestions +
-                ", queries=" + queries +
-                ", libraries=" + databases +
-                '}';
+        return "Study{"
+                + "authors="
+                + authors
+                + ", studyName='"
+                + title
+                + '\''
+                + ", researchQuestions="
+                + researchQuestions
+                + ", queries="
+                + queries
+                + ", libraries="
+                + databases
+                + '}';
     }
 
     @Override
@@ -107,11 +117,11 @@ public boolean equals(Object other) {
 
         Study otherStudy = (Study) other;
 
-        return Objects.equals(authors, otherStudy.authors) &&
-                Objects.equals(title, otherStudy.title) &&
-                Objects.equals(researchQuestions, otherStudy.researchQuestions) &&
-                Objects.equals(queries, otherStudy.queries) &&
-                Objects.equals(databases, otherStudy.databases);
+        return Objects.equals(authors, otherStudy.authors)
+                && Objects.equals(title, otherStudy.title)
+                && Objects.equals(researchQuestions, otherStudy.researchQuestions)
+                && Objects.equals(queries, otherStudy.queries)
+                && Objects.equals(databases, otherStudy.databases);
     }
 
     @Override
@@ -119,4 +129,3 @@ public int hashCode() {
         return Objects.hashCode(this);
     }
 }
-
diff --git a/src/main/java/org/jabref/model/study/StudyDatabase.java b/src/main/java/org/jabref/model/study/StudyDatabase.java
index dc035d558b1a..860fb336b92f 100644
--- a/src/main/java/org/jabref/model/study/StudyDatabase.java
+++ b/src/main/java/org/jabref/model/study/StudyDatabase.java
@@ -62,9 +62,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "LibraryEntry{" +
-                "name='" + name + '\'' +
-                ", enabled=" + enabled +
-                '}';
+        return "LibraryEntry{" + "name='" + name + '\'' + ", enabled=" + enabled + '}';
     }
 }
diff --git a/src/main/java/org/jabref/model/study/StudyQuery.java b/src/main/java/org/jabref/model/study/StudyQuery.java
index 940d842eb668..571a2594c968 100644
--- a/src/main/java/org/jabref/model/study/StudyQuery.java
+++ b/src/main/java/org/jabref/model/study/StudyQuery.java
@@ -10,8 +10,7 @@ public StudyQuery(String query) {
     /**
      * Used for Jackson deserialization
      */
-    public StudyQuery() {
-    }
+    public StudyQuery() {}
 
     public String getQuery() {
         return query;
@@ -42,8 +41,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "QueryEntry{" +
-                "query='" + query + '\'' +
-                '}';
+        return "QueryEntry{" + "query='" + query + '\'' + '}';
     }
 }
diff --git a/src/main/java/org/jabref/model/texparser/Citation.java b/src/main/java/org/jabref/model/texparser/Citation.java
index 87911525e5ac..6df6f3a4dd4d 100644
--- a/src/main/java/org/jabref/model/texparser/Citation.java
+++ b/src/main/java/org/jabref/model/texparser/Citation.java
@@ -32,25 +32,25 @@ public String getContext() {
         int center = (colStart + colEnd) / 2;
         int lineLength = lineText.length();
 
-        int start = Math.max(0, center + CONTEXT_WIDTH / 2 < lineLength
-                ? center - CONTEXT_WIDTH / 2
-                : lineLength - CONTEXT_WIDTH);
+        int start =
+                Math.max(
+                        0,
+                        center + CONTEXT_WIDTH / 2 < lineLength
+                                ? center - CONTEXT_WIDTH / 2
+                                : lineLength - CONTEXT_WIDTH);
         int end = Math.min(lineLength, start + CONTEXT_WIDTH);
 
         // Add three dots when the string does not contain all the line.
-        return "%s%s%s".formatted(
-                start > 0 ? "..." : "",
-                lineText.substring(start, end).trim(),
-                end < lineLength ? "..." : "");
+        return "%s%s%s"
+                .formatted(
+                        start > 0 ? "..." : "",
+                        lineText.substring(start, end).trim(),
+                        end < lineLength ? "..." : "");
     }
 
     @Override
     public String toString() {
-        return "Citation{path=%s, line=%s, colStart=%s, colEnd=%s, lineText='%s'}".formatted(
-                this.path,
-                this.line,
-                this.colStart,
-                this.colEnd,
-                this.lineText);
+        return "Citation{path=%s, line=%s, colStart=%s, colEnd=%s, lineText='%s'}"
+                .formatted(this.path, this.line, this.colStart, this.colEnd, this.lineText);
     }
 }
diff --git a/src/main/java/org/jabref/model/texparser/LatexBibEntriesResolverResult.java b/src/main/java/org/jabref/model/texparser/LatexBibEntriesResolverResult.java
index eb0100eb9ad3..961a13ca1c2d 100644
--- a/src/main/java/org/jabref/model/texparser/LatexBibEntriesResolverResult.java
+++ b/src/main/java/org/jabref/model/texparser/LatexBibEntriesResolverResult.java
@@ -1,12 +1,12 @@
 package org.jabref.model.texparser;
 
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
+import com.google.common.collect.Multimap;
 
 import org.jabref.model.entry.BibEntry;
 
-import com.google.common.collect.Multimap;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
 
 public class LatexBibEntriesResolverResult {
 
@@ -32,9 +32,8 @@ public Multimap<String, Citation> getCitations() {
 
     @Override
     public String toString() {
-        return "TexBibEntriesResolverResult{latexParserResults=%s, newEntries=%s}".formatted(
-                this.latexParserResults,
-                this.newEntries);
+        return "TexBibEntriesResolverResult{latexParserResults=%s, newEntries=%s}"
+                .formatted(this.latexParserResults, this.newEntries);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/texparser/LatexParserResult.java b/src/main/java/org/jabref/model/texparser/LatexParserResult.java
index 2a48973ddb85..c608169cf676 100644
--- a/src/main/java/org/jabref/model/texparser/LatexParserResult.java
+++ b/src/main/java/org/jabref/model/texparser/LatexParserResult.java
@@ -1,14 +1,14 @@
 package org.jabref.model.texparser;
 
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-
 public class LatexParserResult {
 
     private final Path path;
@@ -63,11 +63,8 @@ public void addBibFile(Path bibFile) {
 
     @Override
     public String toString() {
-        return "TexParserResult{path=%s, citations=%s, nestedFiles=%s, bibFiles=%s}".formatted(
-                this.path,
-                this.citations,
-                this.nestedFiles,
-                this.bibFiles);
+        return "TexParserResult{path=%s, citations=%s, nestedFiles=%s, bibFiles=%s}"
+                .formatted(this.path, this.citations, this.nestedFiles, this.bibFiles);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/texparser/LatexParserResults.java b/src/main/java/org/jabref/model/texparser/LatexParserResults.java
index d09df07408a6..b07207d04383 100644
--- a/src/main/java/org/jabref/model/texparser/LatexParserResults.java
+++ b/src/main/java/org/jabref/model/texparser/LatexParserResults.java
@@ -1,5 +1,9 @@
 package org.jabref.model.texparser;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -9,10 +13,6 @@
 import java.util.Objects;
 import java.util.Set;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-
 public class LatexParserResults {
     private final Map<Path, LatexParserResult> parsedTexFiles;
 
diff --git a/src/main/java/org/jabref/model/util/DirectoryMonitorManager.java b/src/main/java/org/jabref/model/util/DirectoryMonitorManager.java
index ba3c6546a8fd..040a720109cb 100644
--- a/src/main/java/org/jabref/model/util/DirectoryMonitorManager.java
+++ b/src/main/java/org/jabref/model/util/DirectoryMonitorManager.java
@@ -1,11 +1,11 @@
 package org.jabref.model.util;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.commons.io.monitor.FileAlterationListener;
 import org.apache.commons.io.monitor.FileAlterationObserver;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class DirectoryMonitorManager {
 
     private final DirectoryMonitor directoryMonitor;
diff --git a/src/main/java/org/jabref/model/util/ListUtil.java b/src/main/java/org/jabref/model/util/ListUtil.java
index 207fab5c3d1e..200c5a0d31df 100644
--- a/src/main/java/org/jabref/model/util/ListUtil.java
+++ b/src/main/java/org/jabref/model/util/ListUtil.java
@@ -1,13 +1,13 @@
 package org.jabref.model.util;
 
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.LinkedFile;
+
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.LinkedFile;
-
 /**
  * Provides a few helper methods for lists.
  */
@@ -42,8 +42,7 @@ public static <T> boolean allMatch(Iterable<T> list, Predicate<T> predicate) {
      * The result is a stream of distinct {@link LinkedFile}s.
      */
     public static Stream<LinkedFile> getLinkedFiles(Iterable<BibEntry> entries) {
-        return StreamSupport
-                .stream(entries.spliterator(), false)
+        return StreamSupport.stream(entries.spliterator(), false)
                 .map(BibEntry::getFiles)
                 .flatMap(List::stream)
                 .distinct();
diff --git a/src/main/java/org/jabref/model/util/OptionalUtil.java b/src/main/java/org/jabref/model/util/OptionalUtil.java
index d3610010af6b..83ee6f4b1d92 100644
--- a/src/main/java/org/jabref/model/util/OptionalUtil.java
+++ b/src/main/java/org/jabref/model/util/OptionalUtil.java
@@ -12,7 +12,8 @@
 
 public class OptionalUtil {
 
-    public static <T, U> boolean equals(Optional<T> left, Optional<U> right, BiPredicate<T, U> equality) {
+    public static <T, U> boolean equals(
+            Optional<T> left, Optional<U> right, BiPredicate<T, U> equality) {
         if (left.isEmpty()) {
             return right.isEmpty();
         } else {
@@ -43,11 +44,13 @@ public static <T> List<T> toList(Optional<T>... values) {
         return Stream.of(values).flatMap(Optional::stream).toList();
     }
 
-    public static <T, R> Stream<R> flatMapFromStream(Optional<T> value, Function<? super T, ? extends Stream<? extends R>> mapper) {
+    public static <T, R> Stream<R> flatMapFromStream(
+            Optional<T> value, Function<? super T, ? extends Stream<? extends R>> mapper) {
         return value.stream().flatMap(mapper);
     }
 
-    public static <T, R> Stream<R> flatMap(Optional<T> value, Function<? super T, ? extends Collection<? extends R>> mapper) {
+    public static <T, R> Stream<R> flatMap(
+            Optional<T> value, Function<? super T, ? extends Collection<? extends R>> mapper) {
         return value.stream().flatMap(element -> mapper.apply(element).stream());
     }
 
@@ -59,7 +62,8 @@ public static <T> Boolean isPresentAndTrue(Optional<Boolean> value) {
         return value.isPresent() && value.get();
     }
 
-    public static <T, S, R> Optional<R> combine(Optional<T> valueOne, Optional<S> valueTwo, BiFunction<T, S, R> combine) {
+    public static <T, S, R> Optional<R> combine(
+            Optional<T> valueOne, Optional<S> valueTwo, BiFunction<T, S, R> combine) {
         if (valueOne.isPresent() && valueTwo.isPresent()) {
             return Optional.ofNullable(combine.apply(valueOne.get(), valueTwo.get()));
         } else {
@@ -67,7 +71,8 @@ public static <T, S, R> Optional<R> combine(Optional<T> valueOne, Optional<S> va
         }
     }
 
-    public static <T> Optional<T> orElse(Optional<? extends T> valueOne, Optional<? extends T> valueTwo) {
+    public static <T> Optional<T> orElse(
+            Optional<? extends T> valueOne, Optional<? extends T> valueTwo) {
         if (valueOne.isPresent()) {
             return valueOne.map(f -> f);
         } else {
diff --git a/src/main/java/org/jabref/model/util/TreeCollector.java b/src/main/java/org/jabref/model/util/TreeCollector.java
index 8b1045d89eb2..fb4141670fa1 100644
--- a/src/main/java/org/jabref/model/util/TreeCollector.java
+++ b/src/main/java/org/jabref/model/util/TreeCollector.java
@@ -1,5 +1,10 @@
 package org.jabref.model.util;
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import org.jabref.model.TreeNode;
+
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
@@ -12,11 +17,6 @@
 import java.util.function.Supplier;
 import java.util.stream.Collector;
 
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-
-import org.jabref.model.TreeNode;
-
 /**
  * Merges a list of nodes into a tree.
  * Nodes with a common parent are added as direct children.
@@ -33,17 +33,19 @@ public class TreeCollector<T> implements Collector<T, ObservableList<T>, Observa
      * @param addChild    a function that adds the second argument as a child to the first-specified node
      * @param equivalence a function that tells us whether two nodes are equivalent
      */
-    private TreeCollector(Function<T, List<T>> getChildren, BiConsumer<T, T> addChild, BiPredicate<T, T> equivalence) {
+    private TreeCollector(
+            Function<T, List<T>> getChildren,
+            BiConsumer<T, T> addChild,
+            BiPredicate<T, T> equivalence) {
         this.getChildren = getChildren;
         this.addChild = addChild;
         this.equivalence = equivalence;
     }
 
-    public static <T extends TreeNode<T>> TreeCollector<T> mergeIntoTree(BiPredicate<T, T> equivalence) {
+    public static <T extends TreeNode<T>> TreeCollector<T> mergeIntoTree(
+            BiPredicate<T, T> equivalence) {
         return new TreeCollector<>(
-                TreeNode::getChildren,
-                (parent, child) -> child.moveTo(parent),
-                equivalence);
+                TreeNode::getChildren, (parent, child) -> child.moveTo(parent), equivalence);
     }
 
     @Override
@@ -55,10 +57,10 @@ public Supplier<ObservableList<T>> supplier() {
     public BiConsumer<ObservableList<T>, T> accumulator() {
         return (alreadyProcessed, newItem) -> {
             // Check if the node is already in the tree
-            Optional<T> sameItemInTree = alreadyProcessed
-                    .stream()
-                    .filter(item -> equivalence.test(item, newItem))
-                    .findFirst();
+            Optional<T> sameItemInTree =
+                    alreadyProcessed.stream()
+                            .filter(item -> equivalence.test(item, newItem))
+                            .findFirst();
             if (sameItemInTree.isPresent()) {
                 for (T child : new ArrayList<>(getChildren.apply(newItem))) {
                     merge(sameItemInTree.get(), child);
@@ -70,12 +72,13 @@ public BiConsumer<ObservableList<T>, T> accumulator() {
     }
 
     private void merge(T target, T node) {
-        Optional<T> sameItemInTree = getChildren
-                .apply(target).stream()
-                .filter(item -> equivalence.test(item, node))
-                .findFirst();
+        Optional<T> sameItemInTree =
+                getChildren.apply(target).stream()
+                        .filter(item -> equivalence.test(item, node))
+                        .findFirst();
         if (sameItemInTree.isPresent()) {
-            // We need to copy the list because the #addChild method might remove the child from its own parent
+            // We need to copy the list because the #addChild method might remove the child from its
+            // own parent
             for (T child : new ArrayList<>(getChildren.apply(node))) {
                 merge(sameItemInTree.get(), child);
             }
diff --git a/src/test/java/org/jabref/IconsPropertiesTest.java b/src/test/java/org/jabref/IconsPropertiesTest.java
index 013857bc7296..b1b142f16448 100644
--- a/src/test/java/org/jabref/IconsPropertiesTest.java
+++ b/src/test/java/org/jabref/IconsPropertiesTest.java
@@ -1,5 +1,11 @@
 package org.jabref;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
 import java.io.IOException;
 import java.io.Reader;
 import java.nio.file.Files;
@@ -11,12 +17,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 class IconsPropertiesTest {
 
     @Test
@@ -30,14 +30,23 @@ void existenceOfIconImagesReferencedFromIconsProperties() throws IOException {
         try (Reader reader = Files.newBufferedReader(Path.of(iconsPropertiesPath))) {
             properties.load(reader);
         }
-        assertFalse(properties.entrySet().isEmpty(), "There must be loaded properties after loading " + iconsPropertiesPath);
+        assertFalse(
+                properties.entrySet().isEmpty(),
+                "There must be loaded properties after loading " + iconsPropertiesPath);
 
         // check that each key references an existing file
         for (Map.Entry<Object, Object> entry : properties.entrySet()) {
             String name = entry.getKey().toString();
             String value = entry.getValue().toString();
 
-            assertTrue(Files.exists(Path.of(folder, value)), "Referenced image (" + name + " --> " + value + " does not exist in folder " + folder);
+            assertTrue(
+                    Files.exists(Path.of(folder, value)),
+                    "Referenced image ("
+                            + name
+                            + " --> "
+                            + value
+                            + " does not exist in folder "
+                            + folder);
         }
 
         // check that each image in the folder is referenced by a key
@@ -47,9 +56,13 @@ void existenceOfIconImagesReferencedFromIconsProperties() throws IOException {
         }
 
         try (Stream<Path> pathStream = Files.list(Path.of(folder))) {
-            List<String> fileNamesInFolder = pathStream.map(p -> p.getFileName().toString()).collect(Collectors.toList());
+            List<String> fileNamesInFolder =
+                    pathStream.map(p -> p.getFileName().toString()).collect(Collectors.toList());
             fileNamesInFolder.removeAll(imagesReferencedFromProperties);
-            assertEquals("[red.png]", fileNamesInFolder.toString(), "Images are in the folder that are unused");
+            assertEquals(
+                    "[red.png]",
+                    fileNamesInFolder.toString(),
+                    "Images are in the folder that are unused");
         }
     }
 }
diff --git a/src/test/java/org/jabref/architecture/ArchitectureTest.java b/src/test/java/org/jabref/architecture/ArchitectureTest.java
index 567c8e048532..5e9ff88bffcf 100644
--- a/src/test/java/org/jabref/architecture/ArchitectureTest.java
+++ b/src/test/java/org/jabref/architecture/ArchitectureTest.java
@@ -1,59 +1,99 @@
 package org.jabref.architecture;
 
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
+
 import com.tngtech.archunit.core.domain.JavaClasses;
 import com.tngtech.archunit.core.importer.ImportOption;
 import com.tngtech.archunit.junit.AnalyzeClasses;
 import com.tngtech.archunit.junit.ArchTest;
 
-import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
-import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
-
 /**
  * This class checks JabRef's test classes for architecture quality
  */
 @AnalyzeClasses(packages = "org.jabref", importOptions = ImportOption.OnlyIncludeTests.class)
 public class ArchitectureTest {
 
-    private static final String CLASS_ORG_JABREF_GUI_PREFERENCES = "org.jabref.logic.preferences.GuiPreferences";
+    private static final String CLASS_ORG_JABREF_GUI_PREFERENCES =
+            "org.jabref.logic.preferences.GuiPreferences";
 
     @ArchTest
     public void testsAreIndependentOfGuiPreferences(JavaClasses classes) {
-        noClasses().that().doNotHaveSimpleName("EntryEditorTest")
-                   .and().doNotHaveSimpleName("LinkedFileViewModelTest")
-                   .and().doNotHaveSimpleName("JabRefPreferencesTest")
-                   .and().doNotHaveSimpleName("PreferencesMigrationsTest")
-                   .and().doNotHaveSimpleName("SaveDatabaseActionTest")
-                   .and().doNotHaveSimpleName("UpdateTimestampListenerTest")
-                   .and().doNotHaveSimpleName("DatabaseSearcherWithBibFilesTest")
-                   .and().doNotHaveFullyQualifiedName("org.jabref.benchmarks.Benchmarks")
-                   .and().doNotHaveFullyQualifiedName("org.jabref.testutils.interactive.styletester.StyleTesterMain")
-                   .should().dependOnClassesThat().haveFullyQualifiedName(CLASS_ORG_JABREF_GUI_PREFERENCES)
-                   .check(classes);
+        noClasses()
+                .that()
+                .doNotHaveSimpleName("EntryEditorTest")
+                .and()
+                .doNotHaveSimpleName("LinkedFileViewModelTest")
+                .and()
+                .doNotHaveSimpleName("JabRefPreferencesTest")
+                .and()
+                .doNotHaveSimpleName("PreferencesMigrationsTest")
+                .and()
+                .doNotHaveSimpleName("SaveDatabaseActionTest")
+                .and()
+                .doNotHaveSimpleName("UpdateTimestampListenerTest")
+                .and()
+                .doNotHaveSimpleName("DatabaseSearcherWithBibFilesTest")
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.benchmarks.Benchmarks")
+                .and()
+                .doNotHaveFullyQualifiedName(
+                        "org.jabref.testutils.interactive.styletester.StyleTesterMain")
+                .should()
+                .dependOnClassesThat()
+                .haveFullyQualifiedName(CLASS_ORG_JABREF_GUI_PREFERENCES)
+                .check(classes);
     }
 
     @ArchTest
     public void testNaming(JavaClasses classes) {
-        classes().that().areTopLevelClasses()
-                 .and().doNotHaveFullyQualifiedName("org.jabref.benchmarks.Benchmarks")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.http.server.TestBibFile")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.gui.autocompleter.AutoCompleterUtil")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.gui.search.TextFlowEqualityHelper")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.logic.util.CurrentThreadTaskExecutor")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.logic.bibtex.BibEntryAssert")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.logic.importer.fileformat.ImporterTestEngine")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.logic.l10n.JavaLocalizationEntryParser")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.logic.l10n.LocalizationEntry")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.logic.l10n.LocalizationParser")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.logic.openoffice.style.OOBibStyleTestHelper")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.logic.shared.TestManager")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.model.search.rules.MockSearchMatcher")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.model.TreeNodeTestData")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.performance.BibtexEntryGenerator")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.support.DisabledOnCIServer")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.support.CIServerCondition")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.testutils.interactive.styletester.StyleTesterMain")
-                 .and().doNotHaveFullyQualifiedName("org.jabref.testutils.interactive.styletester.StyleTesterView")
-                 .should().haveSimpleNameEndingWith("Test")
-                 .check(classes);
+        classes()
+                .that()
+                .areTopLevelClasses()
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.benchmarks.Benchmarks")
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.http.server.TestBibFile")
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.gui.autocompleter.AutoCompleterUtil")
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.gui.search.TextFlowEqualityHelper")
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.logic.util.CurrentThreadTaskExecutor")
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.logic.bibtex.BibEntryAssert")
+                .and()
+                .doNotHaveFullyQualifiedName(
+                        "org.jabref.logic.importer.fileformat.ImporterTestEngine")
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.logic.l10n.JavaLocalizationEntryParser")
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.logic.l10n.LocalizationEntry")
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.logic.l10n.LocalizationParser")
+                .and()
+                .doNotHaveFullyQualifiedName(
+                        "org.jabref.logic.openoffice.style.OOBibStyleTestHelper")
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.logic.shared.TestManager")
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.model.search.rules.MockSearchMatcher")
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.model.TreeNodeTestData")
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.performance.BibtexEntryGenerator")
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.support.DisabledOnCIServer")
+                .and()
+                .doNotHaveFullyQualifiedName("org.jabref.support.CIServerCondition")
+                .and()
+                .doNotHaveFullyQualifiedName(
+                        "org.jabref.testutils.interactive.styletester.StyleTesterMain")
+                .and()
+                .doNotHaveFullyQualifiedName(
+                        "org.jabref.testutils.interactive.styletester.StyleTesterView")
+                .should()
+                .haveSimpleNameEndingWith("Test")
+                .check(classes);
     }
 }
diff --git a/src/test/java/org/jabref/architecture/MainArchitectureTest.java b/src/test/java/org/jabref/architecture/MainArchitectureTest.java
index 88370b12beb3..62b6a21d1714 100644
--- a/src/test/java/org/jabref/architecture/MainArchitectureTest.java
+++ b/src/test/java/org/jabref/architecture/MainArchitectureTest.java
@@ -1,8 +1,7 @@
 package org.jabref.architecture;
 
-import java.nio.file.Paths;
-
-import org.jabref.logic.importer.fileformat.ImporterTestEngine;
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
+import static com.tngtech.archunit.library.Architectures.layeredArchitecture;
 
 import com.tngtech.archunit.core.domain.JavaClasses;
 import com.tngtech.archunit.core.importer.ImportOption;
@@ -10,8 +9,9 @@
 import com.tngtech.archunit.junit.ArchTest;
 import com.tngtech.archunit.library.GeneralCodingRules;
 
-import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
-import static com.tngtech.archunit.library.Architectures.layeredArchitecture;
+import org.jabref.logic.importer.fileformat.ImporterTestEngine;
+
+import java.nio.file.Paths;
 
 /**
  * This class checks JabRef's shipped classes for architecture quality.
@@ -30,60 +30,76 @@ class MainArchitectureTest {
 
     @ArchTest
     public void doNotUseApacheCommonsLang3(JavaClasses classes) {
-        noClasses().that().areNotAnnotatedWith(AllowedToUseApacheCommonsLang3.class)
-                   .should().accessClassesThat().resideInAPackage("org.apache.commons.lang3")
-                   .check(classes);
+        noClasses()
+                .that()
+                .areNotAnnotatedWith(AllowedToUseApacheCommonsLang3.class)
+                .should()
+                .accessClassesThat()
+                .resideInAPackage("org.apache.commons.lang3")
+                .check(classes);
     }
 
     @ArchTest
     public void doNotUseSwing(JavaClasses classes) {
         // This checks for all Swing packages, but not the UndoManager
-        noClasses().that().areNotAnnotatedWith(AllowedToUseSwing.class)
-                   .should().accessClassesThat()
-                   .resideInAnyPackage("javax.swing",
-                           "javax.swing.border..",
-                           "javax.swing.colorchooser..",
-                           "javax.swing.event..",
-                           "javax.swing.filechooser..",
-                           "javax.swing.plaf..",
-                           "javax.swing.table..",
-                           "javax.swing.text..",
-                           "javax.swing.tree..")
-                   .check(classes);
+        noClasses()
+                .that()
+                .areNotAnnotatedWith(AllowedToUseSwing.class)
+                .should()
+                .accessClassesThat()
+                .resideInAnyPackage(
+                        "javax.swing",
+                        "javax.swing.border..",
+                        "javax.swing.colorchooser..",
+                        "javax.swing.event..",
+                        "javax.swing.filechooser..",
+                        "javax.swing.plaf..",
+                        "javax.swing.table..",
+                        "javax.swing.text..",
+                        "javax.swing.tree..")
+                .check(classes);
     }
 
     @ArchTest
     public void doNotUseAssertJ(JavaClasses classes) {
-        noClasses().should().accessClassesThat().resideInAPackage("org.assertj..")
-                   .check(classes);
+        noClasses().should().accessClassesThat().resideInAPackage("org.assertj..").check(classes);
     }
 
     @ArchTest
     public void doNotUseJavaAWT(JavaClasses classes) {
-        noClasses().that().areNotAnnotatedWith(AllowedToUseAwt.class)
-                   .should().accessClassesThat().resideInAPackage(PACKAGE_JAVA_AWT)
-                   .check(classes);
+        noClasses()
+                .that()
+                .areNotAnnotatedWith(AllowedToUseAwt.class)
+                .should()
+                .accessClassesThat()
+                .resideInAPackage(PACKAGE_JAVA_AWT)
+                .check(classes);
     }
 
     @ArchTest
     public void doNotUsePaths(JavaClasses classes) {
-        noClasses().should()
-                   .accessClassesThat()
-                   .belongToAnyOf(Paths.class)
-                   .because("Path.of(...) should be used instead")
-                   .check(classes);
+        noClasses()
+                .should()
+                .accessClassesThat()
+                .belongToAnyOf(Paths.class)
+                .because("Path.of(...) should be used instead")
+                .check(classes);
     }
 
     @ArchTest
     public void useStreamsOfResources(JavaClasses classes) {
         // Reason: https://github.com/oracle/graal/issues/7682#issuecomment-1786704111
-        noClasses().that().haveNameNotMatching(".*Test")
-                   .and().areNotAnnotatedWith(AllowedToUseClassGetResource.class)
-                   .and().areNotAssignableFrom(ImporterTestEngine.class)
-                   .should()
-                   .callMethod(Class.class, "getResource", String.class)
-                   .because("getResourceAsStream(...) should be used instead")
-                   .check(classes);
+        noClasses()
+                .that()
+                .haveNameNotMatching(".*Test")
+                .and()
+                .areNotAnnotatedWith(AllowedToUseClassGetResource.class)
+                .and()
+                .areNotAssignableFrom(ImporterTestEngine.class)
+                .should()
+                .callMethod(Class.class, "getResource", String.class)
+                .because("getResourceAsStream(...) should be used instead")
+                .check(classes);
     }
 
     @ArchTest
@@ -93,61 +109,95 @@ public void respectLayeredArchitecture(JavaClasses classes) {
         String Migrations = "Migrations";
         String CLI = "Cli";
         String GUI = "Gui";
-        layeredArchitecture().consideringOnlyDependenciesInLayers()
-                             .layer(GUI).definedBy(PACKAGE_ORG_JABREF_GUI)
-                             .layer(Logic).definedBy(PACKAGE_ORG_JABREF_LOGIC)
-                             .layer(Model).definedBy(PACKAGE_ORG_JABREF_MODEL)
-                             .layer(CLI).definedBy(PACKAGE_ORG_JABREF_CLI)
-                             .layer(Migrations).definedBy("org.jabref.migrations..") // TODO: Move to logic
-
-                             .whereLayer(GUI).mayOnlyBeAccessedByLayers(CLI, Migrations)
-                             .whereLayer(Logic).mayOnlyBeAccessedByLayers(GUI, CLI, Model, Migrations)
-                             .whereLayer(Model).mayOnlyBeAccessedByLayers(GUI, Logic, Migrations, CLI)
-
-                             // Needs to be fixed
-                             .whereLayer(CLI).mayOnlyBeAccessedByLayers(GUI)
-                             // .whereLayer(CLI).mayNotBeAccessedByAnyLayer()
-
-                             .whereLayer(Migrations).mayOnlyBeAccessedByLayers(GUI, Logic)
-                             .check(classes);
+        layeredArchitecture()
+                .consideringOnlyDependenciesInLayers()
+                .layer(GUI)
+                .definedBy(PACKAGE_ORG_JABREF_GUI)
+                .layer(Logic)
+                .definedBy(PACKAGE_ORG_JABREF_LOGIC)
+                .layer(Model)
+                .definedBy(PACKAGE_ORG_JABREF_MODEL)
+                .layer(CLI)
+                .definedBy(PACKAGE_ORG_JABREF_CLI)
+                .layer(Migrations)
+                .definedBy("org.jabref.migrations..") // TODO: Move to logic
+                .whereLayer(GUI)
+                .mayOnlyBeAccessedByLayers(CLI, Migrations)
+                .whereLayer(Logic)
+                .mayOnlyBeAccessedByLayers(GUI, CLI, Model, Migrations)
+                .whereLayer(Model)
+                .mayOnlyBeAccessedByLayers(GUI, Logic, Migrations, CLI)
+
+                // Needs to be fixed
+                .whereLayer(CLI)
+                .mayOnlyBeAccessedByLayers(GUI)
+                // .whereLayer(CLI).mayNotBeAccessedByAnyLayer()
+
+                .whereLayer(Migrations)
+                .mayOnlyBeAccessedByLayers(GUI, Logic)
+                .check(classes);
     }
 
     @ArchTest
     public void doNotUseLogicInModel(JavaClasses classes) {
-        noClasses().that().resideInAPackage(PACKAGE_ORG_JABREF_MODEL)
-                   .and().areNotAnnotatedWith(AllowedToUseLogic.class)
-                   .should().dependOnClassesThat().resideInAPackage(PACKAGE_ORG_JABREF_LOGIC)
-                   .check(classes);
+        noClasses()
+                .that()
+                .resideInAPackage(PACKAGE_ORG_JABREF_MODEL)
+                .and()
+                .areNotAnnotatedWith(AllowedToUseLogic.class)
+                .should()
+                .dependOnClassesThat()
+                .resideInAPackage(PACKAGE_ORG_JABREF_LOGIC)
+                .check(classes);
     }
 
     @ArchTest
     public void restrictUsagesInModel(JavaClasses classes) {
-        // Until we switch to Lucene, we need to access Globals.stateManager().getActiveDatabase() from the search classes,
+        // Until we switch to Lucene, we need to access Globals.stateManager().getActiveDatabase()
+        // from the search classes,
         // because the PDFSearch needs to access the index of the corresponding database
-        noClasses().that().areNotAssignableFrom("org.jabref.model.search.rules.ContainBasedSearchRule")
-                   .and().areNotAssignableFrom("org.jabref.model.search.rules.RegexBasedSearchRule")
-                   .and().areNotAssignableFrom("org.jabref.model.search.rules.GrammarBasedSearchRule")
-                   .and().resideInAPackage(PACKAGE_ORG_JABREF_MODEL)
-                   .should().dependOnClassesThat().resideInAPackage(PACKAGE_JAVAX_SWING)
-                   .check(classes);
+        noClasses()
+                .that()
+                .areNotAssignableFrom("org.jabref.model.search.rules.ContainBasedSearchRule")
+                .and()
+                .areNotAssignableFrom("org.jabref.model.search.rules.RegexBasedSearchRule")
+                .and()
+                .areNotAssignableFrom("org.jabref.model.search.rules.GrammarBasedSearchRule")
+                .and()
+                .resideInAPackage(PACKAGE_ORG_JABREF_MODEL)
+                .should()
+                .dependOnClassesThat()
+                .resideInAPackage(PACKAGE_JAVAX_SWING)
+                .check(classes);
     }
 
     @ArchTest
     public void restrictUsagesInLogic(JavaClasses classes) {
-        noClasses().that().resideInAPackage(PACKAGE_ORG_JABREF_LOGIC)
-                   .and().areNotAnnotatedWith(AllowedToUseSwing.class)
-                   .and().areNotAssignableFrom("org.jabref.logic.search.DatabaseSearcherWithBibFilesTest")
-                   .should().dependOnClassesThat().resideInAPackage(PACKAGE_JAVAX_SWING)
-                   .check(classes);
+        noClasses()
+                .that()
+                .resideInAPackage(PACKAGE_ORG_JABREF_LOGIC)
+                .and()
+                .areNotAnnotatedWith(AllowedToUseSwing.class)
+                .and()
+                .areNotAssignableFrom("org.jabref.logic.search.DatabaseSearcherWithBibFilesTest")
+                .should()
+                .dependOnClassesThat()
+                .resideInAPackage(PACKAGE_JAVAX_SWING)
+                .check(classes);
     }
 
     @ArchTest
     public void restrictStandardStreams(JavaClasses classes) {
-        noClasses().that().resideOutsideOfPackages(PACKAGE_ORG_JABREF_CLI)
-                   .and().resideOutsideOfPackages("org.jabref.gui.openoffice..") // Uses LibreOffice SDK
-                   .and().areNotAnnotatedWith(AllowedToUseStandardStreams.class)
-                   .should(GeneralCodingRules.ACCESS_STANDARD_STREAMS)
-                   .because("logging framework should be used instead or the class be marked explicitly as @AllowedToUseStandardStreams")
-                   .check(classes);
+        noClasses()
+                .that()
+                .resideOutsideOfPackages(PACKAGE_ORG_JABREF_CLI)
+                .and()
+                .resideOutsideOfPackages("org.jabref.gui.openoffice..") // Uses LibreOffice SDK
+                .and()
+                .areNotAnnotatedWith(AllowedToUseStandardStreams.class)
+                .should(GeneralCodingRules.ACCESS_STANDARD_STREAMS)
+                .because(
+                        "logging framework should be used instead or the class be marked explicitly as @AllowedToUseStandardStreams")
+                .check(classes);
     }
 }
diff --git a/src/test/java/org/jabref/cli/ArgumentProcessorTest.java b/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
index 9f662dfe8da0..7cca0aba96ff 100644
--- a/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
+++ b/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
@@ -1,10 +1,8 @@
 package org.jabref.cli;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Objects;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -26,56 +24,71 @@
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Objects;
 
 class ArgumentProcessorTest {
 
-    private final GuiPreferences preferences = mock(GuiPreferences.class, Answers.RETURNS_DEEP_STUBS);
+    private final GuiPreferences preferences =
+            mock(GuiPreferences.class, Answers.RETURNS_DEEP_STUBS);
     private final BibEntryTypesManager entryTypesManager = mock(BibEntryTypesManager.class);
-    private final ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-    private final ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+    private final ImporterPreferences importerPreferences =
+            mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+    private final ImportFormatPreferences importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
 
     @BeforeEach()
     void setup() {
-        when(importerPreferences.getCustomImporters()).thenReturn(FXCollections.emptyObservableSet());
+        when(importerPreferences.getCustomImporters())
+                .thenReturn(FXCollections.emptyObservableSet());
 
         when(preferences.getImporterPreferences()).thenReturn(importerPreferences);
         when(preferences.getImportFormatPreferences()).thenReturn(importFormatPreferences);
-        when(preferences.getSearchPreferences()).thenReturn(new SearchPreferences(
-                SearchDisplayMode.FILTER,
-                EnumSet.noneOf(SearchFlags.class),
-                false,
-                false,
-                0,
-                0,
-                0));
+        when(preferences.getSearchPreferences())
+                .thenReturn(
+                        new SearchPreferences(
+                                SearchDisplayMode.FILTER,
+                                EnumSet.noneOf(SearchFlags.class),
+                                false,
+                                false,
+                                0,
+                                0,
+                                0));
     }
 
     @Test
     void auxImport(@TempDir Path tempDir) throws Exception {
-        String auxFile = Path.of(AuxCommandLineTest.class.getResource("paper.aux").toURI()).toAbsolutePath().toString();
-        String originBib = Path.of(AuxCommandLineTest.class.getResource("origin.bib").toURI()).toAbsolutePath().toString();
+        String auxFile =
+                Path.of(AuxCommandLineTest.class.getResource("paper.aux").toURI())
+                        .toAbsolutePath()
+                        .toString();
+        String originBib =
+                Path.of(AuxCommandLineTest.class.getResource("origin.bib").toURI())
+                        .toAbsolutePath()
+                        .toString();
 
         Path outputBib = tempDir.resolve("output.bisb").toAbsolutePath();
         String outputBibFile = outputBib.toAbsolutePath().toString();
 
-        List<String> args = List.of("--nogui", "--debug", "--aux", auxFile + "," + outputBibFile, originBib);
-
-        ArgumentProcessor processor = new ArgumentProcessor(
-                args.toArray(String[]::new),
-                Mode.INITIAL_START,
-                preferences,
-                preferences,
-                mock(FileUpdateMonitor.class),
-                entryTypesManager);
+        List<String> args =
+                List.of("--nogui", "--debug", "--aux", auxFile + "," + outputBibFile, originBib);
+
+        ArgumentProcessor processor =
+                new ArgumentProcessor(
+                        args.toArray(String[]::new),
+                        Mode.INITIAL_START,
+                        preferences,
+                        preferences,
+                        mock(FileUpdateMonitor.class),
+                        entryTypesManager);
         processor.processArguments();
 
         assertTrue(Files.exists(outputBib));
@@ -83,29 +96,44 @@ void auxImport(@TempDir Path tempDir) throws Exception {
 
     @Test
     void exportMatches(@TempDir Path tempDir) throws Exception {
-        Path originBib = Path.of(Objects.requireNonNull(ArgumentProcessorTest.class.getResource("origin.bib")).toURI());
+        Path originBib =
+                Path.of(
+                        Objects.requireNonNull(
+                                        ArgumentProcessorTest.class.getResource("origin.bib"))
+                                .toURI());
         String originBibFile = originBib.toAbsolutePath().toString();
 
-        Path expectedBib = Path.of(
-                Objects.requireNonNull(ArgumentProcessorTest.class.getResource("ArgumentProcessorTestExportMatches.bib"))
-                       .toURI()
-        );
+        Path expectedBib =
+                Path.of(
+                        Objects.requireNonNull(
+                                        ArgumentProcessorTest.class.getResource(
+                                                "ArgumentProcessorTestExportMatches.bib"))
+                                .toURI());
 
-        BibtexImporter bibtexImporter = new BibtexImporter(importFormatPreferences, new DummyFileUpdateMonitor());
-        List<BibEntry> expectedEntries = bibtexImporter.importDatabase(expectedBib).getDatabase().getEntries();
+        BibtexImporter bibtexImporter =
+                new BibtexImporter(importFormatPreferences, new DummyFileUpdateMonitor());
+        List<BibEntry> expectedEntries =
+                bibtexImporter.importDatabase(expectedBib).getDatabase().getEntries();
 
         Path outputBib = tempDir.resolve("output.bib").toAbsolutePath();
         String outputBibFile = outputBib.toAbsolutePath().toString();
 
-        List<String> args = List.of("-n", "--debug", "--exportMatches", "author:Einstein," + outputBibFile, originBibFile);
-
-        ArgumentProcessor processor = new ArgumentProcessor(
-                args.toArray(String[]::new),
-                Mode.INITIAL_START,
-                preferences,
-                preferences,
-                mock(FileUpdateMonitor.class),
-                entryTypesManager);
+        List<String> args =
+                List.of(
+                        "-n",
+                        "--debug",
+                        "--exportMatches",
+                        "author:Einstein," + outputBibFile,
+                        originBibFile);
+
+        ArgumentProcessor processor =
+                new ArgumentProcessor(
+                        args.toArray(String[]::new),
+                        Mode.INITIAL_START,
+                        preferences,
+                        preferences,
+                        mock(FileUpdateMonitor.class),
+                        entryTypesManager);
         processor.processArguments();
 
         assertTrue(Files.exists(outputBib));
@@ -114,31 +142,51 @@ void exportMatches(@TempDir Path tempDir) throws Exception {
 
     @Test
     void convertBibtexToTablerefsabsbib(@TempDir Path tempDir) throws Exception {
-        Path originBib = Path.of(Objects.requireNonNull(ArgumentProcessorTest.class.getResource("origin.bib")).toURI());
+        Path originBib =
+                Path.of(
+                        Objects.requireNonNull(
+                                        ArgumentProcessorTest.class.getResource("origin.bib"))
+                                .toURI());
         String originBibFile = originBib.toAbsolutePath().toString();
 
         Path outputHtml = tempDir.resolve("output.html").toAbsolutePath();
         String outputHtmlFile = outputHtml.toAbsolutePath().toString();
 
-        when(importerPreferences.getCustomImporters()) .thenReturn(FXCollections.emptyObservableSet());
+        when(importerPreferences.getCustomImporters())
+                .thenReturn(FXCollections.emptyObservableSet());
 
         SaveOrder saveOrder = new SaveOrder(SaveOrder.OrderType.TABLE, List.of());
-        ExportPreferences exportPreferences = new ExportPreferences(".html", tempDir, saveOrder, List.of());
+        ExportPreferences exportPreferences =
+                new ExportPreferences(".html", tempDir, saveOrder, List.of());
         when(preferences.getExportPreferences()).thenReturn(exportPreferences);
 
-        SelfContainedSaveOrder selfContainedSaveOrder = new SelfContainedSaveOrder(SaveOrder.OrderType.ORIGINAL, List.of());
-        SelfContainedSaveConfiguration selfContainedSaveConfiguration = new SelfContainedSaveConfiguration(selfContainedSaveOrder, false, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, false);
-        when(preferences.getSelfContainedExportConfiguration()).thenReturn(selfContainedSaveConfiguration);
-
-        List<String> args = List.of("-n", "-i", originBibFile + ",bibtex", "-o", outputHtmlFile + ",tablerefsabsbib");
-
-        ArgumentProcessor processor = new ArgumentProcessor(
-                args.toArray(String[]::new),
-                Mode.INITIAL_START,
-                preferences,
-                preferences,
-                mock(FileUpdateMonitor.class),
-                entryTypesManager);
+        SelfContainedSaveOrder selfContainedSaveOrder =
+                new SelfContainedSaveOrder(SaveOrder.OrderType.ORIGINAL, List.of());
+        SelfContainedSaveConfiguration selfContainedSaveConfiguration =
+                new SelfContainedSaveConfiguration(
+                        selfContainedSaveOrder,
+                        false,
+                        BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
+                        false);
+        when(preferences.getSelfContainedExportConfiguration())
+                .thenReturn(selfContainedSaveConfiguration);
+
+        List<String> args =
+                List.of(
+                        "-n",
+                        "-i",
+                        originBibFile + ",bibtex",
+                        "-o",
+                        outputHtmlFile + ",tablerefsabsbib");
+
+        ArgumentProcessor processor =
+                new ArgumentProcessor(
+                        args.toArray(String[]::new),
+                        Mode.INITIAL_START,
+                        preferences,
+                        preferences,
+                        mock(FileUpdateMonitor.class),
+                        entryTypesManager);
         processor.processArguments();
 
         assertTrue(Files.exists(outputHtml));
diff --git a/src/test/java/org/jabref/cli/AuxCommandLineTest.java b/src/test/java/org/jabref/cli/AuxCommandLineTest.java
index 69d8734fc9da..f79bcad53b7f 100644
--- a/src/test/java/org/jabref/cli/AuxCommandLineTest.java
+++ b/src/test/java/org/jabref/cli/AuxCommandLineTest.java
@@ -1,25 +1,24 @@
 package org.jabref.cli;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.model.database.BibDatabase;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.Mockito.mock;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
 
 class AuxCommandLineTest {
 
@@ -35,10 +34,12 @@ void test() throws URISyntaxException, IOException {
         InputStream originalStream = AuxCommandLineTest.class.getResourceAsStream("origin.bib");
 
         File auxFile = Path.of(AuxCommandLineTest.class.getResource("paper.aux").toURI()).toFile();
-        try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
+        try (InputStreamReader originalReader =
+                new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
             ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
-            AuxCommandLine auxCommandLine = new AuxCommandLine(auxFile.getAbsolutePath(), result.getDatabase());
+            AuxCommandLine auxCommandLine =
+                    new AuxCommandLine(auxFile.getAbsolutePath(), result.getDatabase());
             BibDatabase newDB = auxCommandLine.perform();
             assertNotNull(newDB);
             assertEquals(2, newDB.getEntries().size());
diff --git a/src/test/java/org/jabref/cli/JabRefCLITest.java b/src/test/java/org/jabref/cli/JabRefCLITest.java
index ee868aaaa856..174c30151fde 100644
--- a/src/test/java/org/jabref/cli/JabRefCLITest.java
+++ b/src/test/java/org/jabref/cli/JabRefCLITest.java
@@ -1,16 +1,15 @@
 package org.jabref.cli;
 
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import javafx.util.Pair;
 
 import org.jabref.logic.os.OS;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Collections;
+import java.util.List;
 
 class JabRefCLITest {
 
@@ -18,137 +17,156 @@ class JabRefCLITest {
 
     @Test
     void emptyCLILeftOversLongOptions() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"--nogui", "--import=some/file", "--output=some/export/file"});
+        JabRefCLI cli =
+                new JabRefCLI(
+                        new String[] {
+                            "--nogui", "--import=some/file", "--output=some/export/file"
+                        });
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
     }
 
     @Test
     void guiIsDisabledLongOptions() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"--nogui", "--import=some/file", "--output=some/export/file"});
+        JabRefCLI cli =
+                new JabRefCLI(
+                        new String[] {
+                            "--nogui", "--import=some/file", "--output=some/export/file"
+                        });
 
         assertTrue(cli.isDisableGui());
     }
 
     @Test
     void successfulParsingOfFileImportCLILongOptions() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"--nogui", "--import=some/file", "--output=some/export/file"});
+        JabRefCLI cli =
+                new JabRefCLI(
+                        new String[] {
+                            "--nogui", "--import=some/file", "--output=some/export/file"
+                        });
 
         assertEquals("some/file", cli.getFileImport());
     }
 
     @Test
     void successfulParsingOfFileExportCLILongOptions() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"--nogui", "--import=some/file", "--output=some/export/file"});
+        JabRefCLI cli =
+                new JabRefCLI(
+                        new String[] {
+                            "--nogui", "--import=some/file", "--output=some/export/file"
+                        });
 
         assertEquals("some/export/file", cli.getFileExport());
     }
 
     @Test
     void emptyCLILeftOversShortOptions() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"-n", "-i=some/file", "-o=some/export/file"});
+        JabRefCLI cli = new JabRefCLI(new String[] {"-n", "-i=some/file", "-o=some/export/file"});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
     }
 
     @Test
     void guiIsDisabledShortOptions() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"-n", "-i=some/file", "-o=some/export/file"});
+        JabRefCLI cli = new JabRefCLI(new String[] {"-n", "-i=some/file", "-o=some/export/file"});
 
         assertTrue(cli.isDisableGui());
     }
 
     @Test
     void successfulParsingOfFileImportShortOptions() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"-n", "-i=some/file", "-o=some/export/file"});
+        JabRefCLI cli = new JabRefCLI(new String[] {"-n", "-i=some/file", "-o=some/export/file"});
 
         assertEquals("some/file", cli.getFileImport());
     }
 
     @Test
     void successfulParsingOfFileExportShortOptions() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"-n", "-i=some/file", "-o=some/export/file"});
+        JabRefCLI cli = new JabRefCLI(new String[] {"-n", "-i=some/file", "-o=some/export/file"});
 
         assertEquals("some/export/file", cli.getFileExport());
     }
 
     @Test
     void emptyPreferencesLeftOver() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"-n", "-x=some/file"});
+        JabRefCLI cli = new JabRefCLI(new String[] {"-n", "-x=some/file"});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
     }
 
     @Test
     void successfulExportOfPreferences() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"-n", "-x=some/file"});
+        JabRefCLI cli = new JabRefCLI(new String[] {"-n", "-x=some/file"});
 
         assertEquals("some/file", cli.getPreferencesExport());
     }
 
     @Test
     void guiDisabledForPreferencesExport() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"-n", "-x=some/file"});
+        JabRefCLI cli = new JabRefCLI(new String[] {"-n", "-x=some/file"});
 
         assertTrue(cli.isDisableGui());
     }
 
     @Test
     void emptyLeftOversCLIShortImportingBibtex() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"-ib", bibtex});
+        JabRefCLI cli = new JabRefCLI(new String[] {"-ib", bibtex});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
     }
 
     @Test
     void recognizesImportBibtexShort() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"-ib", bibtex});
+        JabRefCLI cli = new JabRefCLI(new String[] {"-ib", bibtex});
 
         assertTrue(cli.isBibtexImport());
     }
 
     @Test
     void successfulParsingOfBibtexImportShort() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"-ib", bibtex});
+        JabRefCLI cli = new JabRefCLI(new String[] {"-ib", bibtex});
 
         assertEquals(bibtex, cli.getBibtexImport());
     }
 
     @Test
     void emptyLeftOversCLILongImportingBibtex() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"-importBibtex", bibtex});
+        JabRefCLI cli = new JabRefCLI(new String[] {"-importBibtex", bibtex});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
     }
 
     @Test
     void recognizesImportBibtexLong() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"-importBibtex", bibtex});
+        JabRefCLI cli = new JabRefCLI(new String[] {"-importBibtex", bibtex});
 
         assertTrue(cli.isBibtexImport());
     }
 
     @Test
     void successfulParsingOfBibtexImportLong() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"-importBibtex", bibtex});
+        JabRefCLI cli = new JabRefCLI(new String[] {"-importBibtex", bibtex});
 
         assertEquals(bibtex, cli.getBibtexImport());
     }
 
     @Test
     void alignStringTable() {
-        List<Pair<String, String>> given = List.of(
-                new Pair<>("Apple", "Slice"),
-                new Pair<>("Bread", "Loaf"),
-                new Pair<>("Paper", "Sheet"),
-                new Pair<>("Country", "County"));
-
-        String expected = """
+        List<Pair<String, String>> given =
+                List.of(
+                        new Pair<>("Apple", "Slice"),
+                        new Pair<>("Bread", "Loaf"),
+                        new Pair<>("Paper", "Sheet"),
+                        new Pair<>("Country", "County"));
+
+        String expected =
+                """
                 Apple   : Slice
                 Bread   : Loaf
                 Paper   : Sheet
                 Country : County
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
         assertEquals(expected, JabRefCLI.alignStringTable(given));
     }
diff --git a/src/test/java/org/jabref/gui/ClipBoardManagerTest.java b/src/test/java/org/jabref/gui/ClipBoardManagerTest.java
index 88ddfd846f7d..b577053a65eb 100644
--- a/src/test/java/org/jabref/gui/ClipBoardManagerTest.java
+++ b/src/test/java/org/jabref/gui/ClipBoardManagerTest.java
@@ -1,10 +1,10 @@
 package org.jabref.gui;
 
-import java.awt.Toolkit;
-import java.awt.datatransfer.StringSelection;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -19,15 +19,15 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import com.airhacks.afterburner.injection.Injector;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.awt.Toolkit;
+import java.awt.datatransfer.StringSelection;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 @AllowedToUseAwt("Requires AWT for clipboard access")
 class ClipBoardManagerTest {
@@ -51,7 +51,8 @@ void setUp() {
         Clipboard clipboard = mock(Clipboard.class);
         // create primary clipboard and set a temporary value
         StringSelection selection = new StringSelection("test");
-        java.awt.datatransfer.Clipboard clipboardPrimary = Toolkit.getDefaultToolkit().getSystemClipboard();
+        java.awt.datatransfer.Clipboard clipboardPrimary =
+                Toolkit.getDefaultToolkit().getSystemClipboard();
         clipboardPrimary.setContents(selection, selection);
 
         // create mock entry manager and set up behaviour for mock
@@ -61,7 +62,8 @@ void setUp() {
         clipBoardManager = new ClipBoardManager(clipboard, clipboardPrimary);
     }
 
-    @DisplayName("Check that the ClipBoardManager can set a bibentry as its content from the clipboard")
+    @DisplayName(
+            "Check that the ClipBoardManager can set a bibentry as its content from the clipboard")
     @Test
     void copyStringBibEntry() throws IOException {
         // Arrange
@@ -90,11 +92,15 @@ void copyStringBibEntry() throws IOException {
     }
 
     @Test
-    @DisplayName("Check that the ClipBoardManager can handle a bibentry with string constants correctly from the clipboard")
+    @DisplayName(
+            "Check that the ClipBoardManager can handle a bibentry with string constants correctly from the clipboard")
     void copyStringBibEntryWithStringConstants() throws IOException {
         // Arrange
-        String expected = "@String{grl = \"Geophys. Res. Lett.\"}@Article{,\n" + " author = {Claudepierre, S. G.},\n" +
-                " journal = {grl},\n" + "}";
+        String expected =
+                "@String{grl = \"Geophys. Res. Lett.\"}@Article{,\n"
+                        + " author = {Claudepierre, S. G.},\n"
+                        + " journal = {grl},\n"
+                        + "}";
         // create BibEntry
         BibEntry bibEntry = new BibEntry();
         // construct an entry
@@ -112,7 +118,8 @@ void copyStringBibEntryWithStringConstants() throws IOException {
         BibtexString bibtexString = mock(BibtexString.class);
 
         // define return value for getParsedSerialization()
-        when(bibtexString.getParsedSerialization()).thenReturn("@String{grl = \"Geophys. Res. Lett.\"}");
+        when(bibtexString.getParsedSerialization())
+                .thenReturn("@String{grl = \"Geophys. Res. Lett.\"}");
         // add the constant
         constants.add(bibtexString);
 
diff --git a/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java b/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
index ff593360016d..fe790d0e4933 100644
--- a/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
+++ b/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
@@ -1,6 +1,8 @@
 package org.jabref.gui;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.preferences.TimestampPreferences;
@@ -8,13 +10,10 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Optional;
 
 class UpdateTimestampListenerTest {
 
@@ -49,13 +48,19 @@ void updateTimestampEnabled() {
 
         bibEntry.setField(StandardField.MODIFICATIONDATE, baseDate);
 
-        assertEquals(Optional.of(baseDate), bibEntry.getField(StandardField.MODIFICATIONDATE), "Initial timestamp not set correctly");
+        assertEquals(
+                Optional.of(baseDate),
+                bibEntry.getField(StandardField.MODIFICATIONDATE),
+                "Initial timestamp not set correctly");
 
         database.registerListener(new UpdateTimestampListener(preferencesMock));
 
         bibEntry.setField(new UnknownField("test"), "some value");
 
-        assertEquals(Optional.of(newDate), bibEntry.getField(StandardField.MODIFICATIONDATE), "Timestamp not set correctly after entry changed");
+        assertEquals(
+                Optional.of(newDate),
+                bibEntry.getField(StandardField.MODIFICATIONDATE),
+                "Timestamp not set correctly after entry changed");
     }
 
     @Test
@@ -67,12 +72,18 @@ void updateTimestampDisabled() {
 
         bibEntry.setField(StandardField.MODIFICATIONDATE, baseDate);
 
-        assertEquals(Optional.of(baseDate), bibEntry.getField(StandardField.MODIFICATIONDATE), "Initial timestamp not set correctly");
+        assertEquals(
+                Optional.of(baseDate),
+                bibEntry.getField(StandardField.MODIFICATIONDATE),
+                "Initial timestamp not set correctly");
 
         database.registerListener(new UpdateTimestampListener(preferencesMock));
 
         bibEntry.setField(new UnknownField("test"), "some value");
 
-        assertEquals(Optional.of(baseDate), bibEntry.getField(StandardField.MODIFICATIONDATE), "New timestamp set after entry changed even though updates were disabled");
+        assertEquals(
+                Optional.of(baseDate),
+                bibEntry.getField(StandardField.MODIFICATIONDATE),
+                "New timestamp set after entry changed even though updates were disabled");
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/AppendPersonNamesStrategyTest.java b/src/test/java/org/jabref/gui/autocompleter/AppendPersonNamesStrategyTest.java
index 4e1c526eff9a..4dc62f3feb48 100644
--- a/src/test/java/org/jabref/gui/autocompleter/AppendPersonNamesStrategyTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/AppendPersonNamesStrategyTest.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.autocompleter;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class AppendPersonNamesStrategyTest {
 
     @Test
@@ -16,8 +16,8 @@ void withoutParam() {
 
     @ParameterizedTest(name = "separationBySpace={0}, expectedResult={1}")
     @CsvSource({
-            "TRUE, ' '",
-            "FALSE, ' and '",
+        "TRUE, ' '",
+        "FALSE, ' and '",
     })
     void withParam(boolean separationBySpace, String expectedResult) {
         AppendPersonNamesStrategy strategy = new AppendPersonNamesStrategy(separationBySpace);
diff --git a/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java
index 7b641e987ddb..d38507297ecb 100644
--- a/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java
@@ -1,18 +1,17 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
+import static org.jabref.gui.autocompleter.AutoCompleterUtil.getRequest;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.jabref.gui.autocompleter.AutoCompleterUtil.getRequest;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 
 class BibEntrySuggestionProviderTest {
 
@@ -76,7 +75,9 @@ void completeNullThrowsException() {
         entry.setCitationKey("testKey");
         database.insertEntry(entry);
 
-        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest(null)));
+        assertThrows(
+                NullPointerException.class,
+                () -> autoCompleter.provideSuggestions(getRequest(null)));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java
index 004fa2e57ca2..df3cfc0f088d 100644
--- a/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java
@@ -1,18 +1,17 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
+import static org.jabref.gui.autocompleter.AutoCompleterUtil.getRequest;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.jabref.gui.autocompleter.AutoCompleterUtil.getRequest;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 
 class ContentSelectorSuggestionProviderTest {
 
@@ -21,7 +20,8 @@ class ContentSelectorSuggestionProviderTest {
     @Test
     void completeWithoutAddingAnythingReturnsNothing() {
         SuggestionProvider<String> suggestionProvider = new EmptySuggestionProvider();
-        autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.emptyList());
+        autoCompleter =
+                new ContentSelectorSuggestionProvider(suggestionProvider, Collections.emptyList());
 
         Collection<String> expected = Collections.emptyList();
         Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
@@ -32,7 +32,9 @@ void completeWithoutAddingAnythingReturnsNothing() {
     @Test
     void completeKeywordReturnsKeyword() {
         SuggestionProvider<String> suggestionProvider = new EmptySuggestionProvider();
-        autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.singletonList("test"));
+        autoCompleter =
+                new ContentSelectorSuggestionProvider(
+                        suggestionProvider, Collections.singletonList("test"));
 
         Collection<String> expected = Collections.singletonList("test");
         Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
@@ -43,7 +45,9 @@ void completeKeywordReturnsKeyword() {
     @Test
     void completeBeginningOfKeywordReturnsKeyword() {
         SuggestionProvider<String> suggestionProvider = new EmptySuggestionProvider();
-        autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.singletonList("test"));
+        autoCompleter =
+                new ContentSelectorSuggestionProvider(
+                        suggestionProvider, Collections.singletonList("test"));
 
         Collection<String> expected = Collections.singletonList("test");
         Collection<String> result = autoCompleter.provideSuggestions(getRequest("te"));
@@ -58,8 +62,10 @@ void completeKeywordReturnsKeywordFromDatabase() {
         bibEntry.addKeyword("test", ',');
         database.insertEntry(bibEntry);
 
-        SuggestionProvider<String> suggestionProvider = new WordSuggestionProvider(StandardField.KEYWORDS, database);
-        autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.emptyList());
+        SuggestionProvider<String> suggestionProvider =
+                new WordSuggestionProvider(StandardField.KEYWORDS, database);
+        autoCompleter =
+                new ContentSelectorSuggestionProvider(suggestionProvider, Collections.emptyList());
 
         Collection<String> expected = Collections.singletonList("test");
         Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
@@ -70,7 +76,9 @@ void completeKeywordReturnsKeywordFromDatabase() {
     @Test
     void completeUppercaseBeginningOfNameReturnsName() {
         SuggestionProvider<String> suggestionProvider = new EmptySuggestionProvider();
-        autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.singletonList("test"));
+        autoCompleter =
+                new ContentSelectorSuggestionProvider(
+                        suggestionProvider, Collections.singletonList("test"));
 
         Collection<String> expected = Collections.singletonList("test");
         Collection<String> result = autoCompleter.provideSuggestions(getRequest("TE"));
@@ -80,13 +88,17 @@ void completeUppercaseBeginningOfNameReturnsName() {
 
     @Test
     void completeNullThrowsException() {
-        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest(null)));
+        assertThrows(
+                NullPointerException.class,
+                () -> autoCompleter.provideSuggestions(getRequest(null)));
     }
 
     @Test
     void completeEmptyStringReturnsNothing() {
         SuggestionProvider<String> suggestionProvider = new EmptySuggestionProvider();
-        autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.singletonList("test"));
+        autoCompleter =
+                new ContentSelectorSuggestionProvider(
+                        suggestionProvider, Collections.singletonList("test"));
 
         Collection<String> expected = Collections.emptyList();
         Collection<String> result = autoCompleter.provideSuggestions(getRequest(""));
@@ -101,8 +113,11 @@ void completeReturnsMultipleResults() {
         bibEntry.addKeyword("testa", ',');
         database.insertEntry(bibEntry);
 
-        SuggestionProvider<String> suggestionProvider = new WordSuggestionProvider(StandardField.KEYWORDS, database);
-        autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.singletonList("testb"));
+        SuggestionProvider<String> suggestionProvider =
+                new WordSuggestionProvider(StandardField.KEYWORDS, database);
+        autoCompleter =
+                new ContentSelectorSuggestionProvider(
+                        suggestionProvider, Collections.singletonList("testb"));
 
         Collection<String> expected = Arrays.asList("testa", "testb");
         Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
@@ -118,8 +133,11 @@ void completeReturnsKeywordsInAlphabeticalOrder() {
         bibEntry.addKeyword("testc", ',');
         database.insertEntry(bibEntry);
 
-        SuggestionProvider<String> suggestionProvider = new WordSuggestionProvider(StandardField.KEYWORDS, database);
-        autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Arrays.asList("testb", "testa"));
+        SuggestionProvider<String> suggestionProvider =
+                new WordSuggestionProvider(StandardField.KEYWORDS, database);
+        autoCompleter =
+                new ContentSelectorSuggestionProvider(
+                        suggestionProvider, Arrays.asList("testb", "testa"));
 
         Collection<String> expected = Arrays.asList("testa", "testb", "testc", "testd");
         Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
diff --git a/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java b/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java
index 767eff823747..f5e3100f23b3 100644
--- a/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java
@@ -1,19 +1,18 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
+import static org.jabref.gui.autocompleter.AutoCompleterUtil.getRequest;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.jabref.gui.autocompleter.AutoCompleterUtil.getRequest;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 
 class DefaultAutoCompleterTest {
 
@@ -92,7 +91,9 @@ void completeNullThrowsException() {
         entry.setField(StandardField.TITLE, "testKey");
         database.insertEntry(entry);
 
-        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest(null)));
+        assertThrows(
+                NullPointerException.class,
+                () -> autoCompleter.provideSuggestions(getRequest(null)));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java
index e4baeeb3405d..0a1df80f680b 100644
--- a/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
+import static org.jabref.gui.autocompleter.AutoCompleterUtil.getRequest;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -12,15 +12,14 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.jabref.gui.autocompleter.AutoCompleterUtil.getRequest;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
 
 class FieldValueSuggestionProviderTest {
 
@@ -35,7 +34,9 @@ void setUp() {
 
     @Test
     void initAutoCompleterWithNullFieldThrowsException() {
-        assertThrows(NullPointerException.class, () -> new FieldValueSuggestionProvider(null, new BibDatabase()));
+        assertThrows(
+                NullPointerException.class,
+                () -> new FieldValueSuggestionProvider(null, new BibDatabase()));
     }
 
     @Test
@@ -66,11 +67,16 @@ void completeAfterAddingEntryWithoutFieldReturnsNothing() {
     @Test
     void completeOnIgnoredFieldReturnsNothing() {
         AutoCompletePreferences autoCompletePreferences = mock(AutoCompletePreferences.class);
-        JournalAbbreviationRepository journalAbbreviationRepository = mock(JournalAbbreviationRepository.class);
-        when(autoCompletePreferences.getCompleteFields()).thenReturn(FXCollections.observableSet(Set.of(StandardField.AUTHOR)));
-        SuggestionProviders suggestionProviders = new SuggestionProviders(database, journalAbbreviationRepository, autoCompletePreferences);
+        JournalAbbreviationRepository journalAbbreviationRepository =
+                mock(JournalAbbreviationRepository.class);
+        when(autoCompletePreferences.getCompleteFields())
+                .thenReturn(FXCollections.observableSet(Set.of(StandardField.AUTHOR)));
+        SuggestionProviders suggestionProviders =
+                new SuggestionProviders(
+                        database, journalAbbreviationRepository, autoCompletePreferences);
 
-        SuggestionProvider<String> autoCompleter = (SuggestionProvider<String>) suggestionProviders.getForField(StandardField.TITLE);
+        SuggestionProvider<String> autoCompleter =
+                (SuggestionProvider<String>) suggestionProviders.getForField(StandardField.TITLE);
 
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "testValue");
@@ -116,7 +122,9 @@ void completeNullThrowsException() {
         entry.setField(StandardField.TITLE, "testKey");
         database.insertEntry(entry);
 
-        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest(null)));
+        assertThrows(
+                NullPointerException.class,
+                () -> autoCompleter.provideSuggestions(getRequest(null)));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/autocompleter/PersonNameStringConverterTest.java b/src/test/java/org/jabref/gui/autocompleter/PersonNameStringConverterTest.java
index c38a604dfab5..4c5f3fe9f1d0 100644
--- a/src/test/java/org/jabref/gui/autocompleter/PersonNameStringConverterTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/PersonNameStringConverterTest.java
@@ -1,15 +1,14 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.preferences.AutoCompleteFirstNameMode;
 import org.jabref.model.entry.Author;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
 
 class PersonNameStringConverterTest {
 
@@ -22,52 +21,55 @@ void setUp() {
         author = new Author("Joseph M.", "J. M.", "", "Reagle", "Jr.");
     }
 
-    @ParameterizedTest(name = "autoCompFF={0}, autoCompLF={1}, autoCompleteFirstNameMode={2}, expectedResult={3}")
+    @ParameterizedTest(
+            name =
+                    "autoCompFF={0}, autoCompLF={1}, autoCompleteFirstNameMode={2}, expectedResult={3}")
     @CsvSource({
-            "TRUE, TRUE, ONLY_FULL, 'Reagle, Jr., Joseph M.'",
-            "TRUE, FALSE, ONLY_FULL, 'Joseph M. Reagle, Jr.'",
-            "FALSE, TRUE, ONLY_FULL, 'Reagle, Jr., Joseph M.'",
-            "FALSE, FALSE, ONLY_FULL, 'Reagle'",
-
-            "TRUE, TRUE, ONLY_ABBREVIATED, 'Reagle, Jr., J. M.'",
-            "TRUE, FALSE, ONLY_ABBREVIATED, 'J. M. Reagle, Jr.'",
-            "FALSE, TRUE, ONLY_ABBREVIATED, 'Reagle, Jr., J. M.'",
-            "FALSE, FALSE, ONLY_ABBREVIATED, 'Reagle'",
-
-            "TRUE, TRUE, BOTH, 'Reagle, Jr., J. M.'",
-            "TRUE, FALSE, BOTH, 'J. M. Reagle, Jr.'",
-            "FALSE, TRUE, BOTH, 'Reagle, Jr., J. M.'",
-            "FALSE, FALSE, BOTH, 'Reagle'"
+        "TRUE, TRUE, ONLY_FULL, 'Reagle, Jr., Joseph M.'",
+        "TRUE, FALSE, ONLY_FULL, 'Joseph M. Reagle, Jr.'",
+        "FALSE, TRUE, ONLY_FULL, 'Reagle, Jr., Joseph M.'",
+        "FALSE, FALSE, ONLY_FULL, 'Reagle'",
+        "TRUE, TRUE, ONLY_ABBREVIATED, 'Reagle, Jr., J. M.'",
+        "TRUE, FALSE, ONLY_ABBREVIATED, 'J. M. Reagle, Jr.'",
+        "FALSE, TRUE, ONLY_ABBREVIATED, 'Reagle, Jr., J. M.'",
+        "FALSE, FALSE, ONLY_ABBREVIATED, 'Reagle'",
+        "TRUE, TRUE, BOTH, 'Reagle, Jr., J. M.'",
+        "TRUE, FALSE, BOTH, 'J. M. Reagle, Jr.'",
+        "FALSE, TRUE, BOTH, 'Reagle, Jr., J. M.'",
+        "FALSE, FALSE, BOTH, 'Reagle'"
     })
-    void toStringWithoutAutoCompletePreferences(boolean autoCompFF, boolean autoCompLF, AutoCompleteFirstNameMode autoCompleteFirstNameMode, String expectedResult) {
-        PersonNameStringConverter converter = new PersonNameStringConverter(autoCompFF, autoCompLF, autoCompleteFirstNameMode);
+    void toStringWithoutAutoCompletePreferences(
+            boolean autoCompFF,
+            boolean autoCompLF,
+            AutoCompleteFirstNameMode autoCompleteFirstNameMode,
+            String expectedResult) {
+        PersonNameStringConverter converter =
+                new PersonNameStringConverter(autoCompFF, autoCompLF, autoCompleteFirstNameMode);
         String formattedStr = converter.toString(author);
         assertEquals(expectedResult, formattedStr);
     }
 
-    @ParameterizedTest(name = "shouldAutoComplete={0}, firstNameMode={1}, nameFormat={2}, expectedResult={3}")
+    @ParameterizedTest(
+            name = "shouldAutoComplete={0}, firstNameMode={1}, nameFormat={2}, expectedResult={3}")
     @CsvSource({
-            "TRUE, ONLY_FULL, LAST_FIRST, 'Reagle, Jr., Joseph M.'",
-            "TRUE, ONLY_ABBREVIATED, LAST_FIRST, 'Reagle, Jr., J. M.'",
-            "TRUE, BOTH, LAST_FIRST, 'Reagle, Jr., J. M.'",
-
-            "TRUE, ONLY_FULL, FIRST_LAST, 'Joseph M. Reagle, Jr.'",
-            "TRUE, ONLY_ABBREVIATED, FIRST_LAST, 'J. M. Reagle, Jr.'",
-            "TRUE, BOTH, FIRST_LAST, 'J. M. Reagle, Jr.'",
-
-            "TRUE, ONLY_FULL, BOTH, 'Reagle, Jr., Joseph M.'",
-            "TRUE, ONLY_ABBREVIATED, BOTH, 'Reagle, Jr., J. M.'",
-            "TRUE, BOTH, BOTH, 'Reagle, Jr., J. M.'"
+        "TRUE, ONLY_FULL, LAST_FIRST, 'Reagle, Jr., Joseph M.'",
+        "TRUE, ONLY_ABBREVIATED, LAST_FIRST, 'Reagle, Jr., J. M.'",
+        "TRUE, BOTH, LAST_FIRST, 'Reagle, Jr., J. M.'",
+        "TRUE, ONLY_FULL, FIRST_LAST, 'Joseph M. Reagle, Jr.'",
+        "TRUE, ONLY_ABBREVIATED, FIRST_LAST, 'J. M. Reagle, Jr.'",
+        "TRUE, BOTH, FIRST_LAST, 'J. M. Reagle, Jr.'",
+        "TRUE, ONLY_FULL, BOTH, 'Reagle, Jr., Joseph M.'",
+        "TRUE, ONLY_ABBREVIATED, BOTH, 'Reagle, Jr., J. M.'",
+        "TRUE, BOTH, BOTH, 'Reagle, Jr., J. M.'"
     })
-    void toStringWithAutoCompletePreferences(boolean shouldAutoComplete,
-                                                 AutoCompleteFirstNameMode firstNameMode,
-                                                 AutoCompletePreferences.NameFormat nameFormat,
-                                                 String expectedResult) {
-        AutoCompletePreferences preferences = new AutoCompletePreferences(
-                shouldAutoComplete,
-                firstNameMode,
-                nameFormat,
-                Collections.emptySet());
+    void toStringWithAutoCompletePreferences(
+            boolean shouldAutoComplete,
+            AutoCompleteFirstNameMode firstNameMode,
+            AutoCompletePreferences.NameFormat nameFormat,
+            String expectedResult) {
+        AutoCompletePreferences preferences =
+                new AutoCompletePreferences(
+                        shouldAutoComplete, firstNameMode, nameFormat, Collections.emptySet());
         PersonNameStringConverter converter = new PersonNameStringConverter(preferences);
         String formattedStr = converter.toString(author);
         assertEquals(expectedResult, formattedStr);
diff --git a/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
index 980868f73067..d44f4751cda6 100644
--- a/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
@@ -1,21 +1,20 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
+import static org.jabref.gui.autocompleter.AutoCompleterUtil.getRequest;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.jabref.gui.autocompleter.AutoCompleterUtil.getRequest;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 
 class PersonNameSuggestionProviderTest {
 
@@ -35,7 +34,9 @@ void setUp() throws Exception {
 
     @Test
     void initAutoCompleterWithNullFieldThrowsException() {
-        assertThrows(NullPointerException.class, () -> new PersonNameSuggestionProvider((Field) null, new BibDatabase()));
+        assertThrows(
+                NullPointerException.class,
+                () -> new PersonNameSuggestionProvider((Field) null, new BibDatabase()));
     }
 
     @Test
@@ -89,7 +90,9 @@ void completeLowercaseBeginningOfNameReturnsName() {
 
     @Test
     void completeNullThrowsException() {
-        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest(null)));
+        assertThrows(
+                NullPointerException.class,
+                () -> autoCompleter.provideSuggestions(getRequest(null)));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java b/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java
index c26a645cfcb3..fa2d0af5c56d 100644
--- a/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Set;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.preferences.AutoCompleteFirstNameMode;
@@ -10,15 +10,14 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.util.Set;
+import java.util.stream.Stream;
 
 class SuggestionProvidersTest {
 
@@ -27,14 +26,24 @@ class SuggestionProvidersTest {
     @BeforeEach
     void initializeSuggestionProviders() {
         BibDatabase database = new BibDatabase();
-        JournalAbbreviationRepository abbreviationRepository = mock(JournalAbbreviationRepository.class);
-        Set<Field> completeFields = Set.of(StandardField.AUTHOR, StandardField.XREF, StandardField.XDATA, StandardField.JOURNAL, StandardField.PUBLISHER, SpecialField.PRINTED);
-        AutoCompletePreferences autoCompletePreferences = new AutoCompletePreferences(
-                true,
-                AutoCompleteFirstNameMode.BOTH,
-                AutoCompletePreferences.NameFormat.BOTH,
-                completeFields);
-        this.suggestionProviders = new SuggestionProviders(database, abbreviationRepository, autoCompletePreferences);
+        JournalAbbreviationRepository abbreviationRepository =
+                mock(JournalAbbreviationRepository.class);
+        Set<Field> completeFields =
+                Set.of(
+                        StandardField.AUTHOR,
+                        StandardField.XREF,
+                        StandardField.XDATA,
+                        StandardField.JOURNAL,
+                        StandardField.PUBLISHER,
+                        SpecialField.PRINTED);
+        AutoCompletePreferences autoCompletePreferences =
+                new AutoCompletePreferences(
+                        true,
+                        AutoCompleteFirstNameMode.BOTH,
+                        AutoCompletePreferences.NameFormat.BOTH,
+                        completeFields);
+        this.suggestionProviders =
+                new SuggestionProviders(database, abbreviationRepository, autoCompletePreferences);
     }
 
     private static Stream<Arguments> getTestPairs() {
@@ -52,8 +61,7 @@ private static Stream<Arguments> getTestPairs() {
                 Arguments.of(JournalsSuggestionProvider.class, StandardField.PUBLISHER),
 
                 // TODO: Auto completion should be aware of possible values of special fields
-                Arguments.of(WordSuggestionProvider.class, SpecialField.PRINTED)
-        );
+                Arguments.of(WordSuggestionProvider.class, SpecialField.PRINTED));
     }
 
     @ParameterizedTest
@@ -65,6 +73,7 @@ void appropriateCompleterReturned(Class<SuggestionProvider<BibEntry>> expected,
     @Test
     void emptySuggestionProviderReturnedForEmptySuggestionProviderList() {
         SuggestionProviders empty = new SuggestionProviders();
-        assertEquals(EmptySuggestionProvider.class, empty.getForField(StandardField.AUTHOR).getClass());
+        assertEquals(
+                EmptySuggestionProvider.class, empty.getForField(StandardField.AUTHOR).getClass());
     }
 }
diff --git a/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerDiscardedTest.java b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerDiscardedTest.java
index 7619e0c9ae29..120e208b9cc7 100644
--- a/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerDiscardedTest.java
+++ b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerDiscardedTest.java
@@ -1,10 +1,8 @@
 package org.jabref.gui.autosaveandbackup;
 
-import java.io.IOException;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.gui.LibraryTab;
 import org.jabref.logic.exporter.AtomicFileWriter;
@@ -19,15 +17,16 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.SaveOrder;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
+import java.io.IOException;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 /**
  * Test for "discarded" flag
@@ -53,35 +52,50 @@ void setup(@TempDir Path tempDir) throws Exception {
         bibDatabaseContext.setDatabasePath(testBib);
 
         bibEntryTypesManager = new BibEntryTypesManager();
-        saveConfiguration = new SelfContainedSaveConfiguration(SaveOrder.getDefaultSaveOrder(), false, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, false);
+        saveConfiguration =
+                new SelfContainedSaveConfiguration(
+                        SaveOrder.getDefaultSaveOrder(),
+                        false,
+                        BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
+                        false);
         preferences = mock(CliPreferences.class, Answers.RETURNS_DEEP_STUBS);
 
         saveDatabase();
 
-        backupManager = new BackupManager(mock(LibraryTab.class), bibDatabaseContext, bibEntryTypesManager, preferences);
+        backupManager =
+                new BackupManager(
+                        mock(LibraryTab.class),
+                        bibDatabaseContext,
+                        bibEntryTypesManager,
+                        preferences);
 
         makeBackup();
     }
 
     private void saveDatabase() throws IOException {
         try (Writer writer = new AtomicFileWriter(testBib, StandardCharsets.UTF_8, false)) {
-            BibWriter bibWriter = new BibWriter(writer, bibDatabaseContext.getDatabase().getNewLineSeparator());
+            BibWriter bibWriter =
+                    new BibWriter(writer, bibDatabaseContext.getDatabase().getNewLineSeparator());
             new BibtexDatabaseWriter(
-                    bibWriter,
-                    saveConfiguration,
-                    preferences.getFieldPreferences(),
-                    preferences.getCitationKeyPatternPreferences(),
-                    bibEntryTypesManager)
+                            bibWriter,
+                            saveConfiguration,
+                            preferences.getFieldPreferences(),
+                            preferences.getCitationKeyPatternPreferences(),
+                            bibEntryTypesManager)
                     .saveDatabase(bibDatabaseContext);
         }
     }
 
     private void databaseModification() {
-        bibDatabaseContext.getDatabase().insertEntry(new BibEntry().withField(StandardField.NOTE, "test"));
+        bibDatabaseContext
+                .getDatabase()
+                .insertEntry(new BibEntry().withField(StandardField.NOTE, "test"));
     }
 
     private void makeBackup() {
-        backupManager.determineBackupPathForNewBackup(backupDir).ifPresent(path -> backupManager.performBackup(path));
+        backupManager
+                .determineBackupPathForNewBackup(backupDir)
+                .ifPresent(path -> backupManager.performBackup(path));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
index a45d7cbb9c19..3caf92acd88c 100644
--- a/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
+++ b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
@@ -1,12 +1,11 @@
 package org.jabref.gui.autosaveandbackup;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.nio.file.attribute.FileTime;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.gui.LibraryTab;
 import org.jabref.logic.FilePreferences;
@@ -20,18 +19,18 @@
 import org.jabref.model.groups.event.GroupUpdatedEvent;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.event.MetaDataChangedEvent;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.FileTime;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 class BackupManagerTest {
 
@@ -48,7 +47,8 @@ void backupFileNameIsCorrectlyGeneratedInAppDataDirectory() {
         backupDir = Directories.getBackupDirectory();
         Path bakPath = BackupManager.getBackupPathForNewBackup(bibPath, backupDir);
 
-        // Pattern is "27182d3c--test.bib--", but the hashing is implemented differently on Linux than on Windows
+        // Pattern is "27182d3c--test.bib--", but the hashing is implemented differently on Linux
+        // than on Windows
         assertNotEquals("", bakPath);
     }
 
@@ -62,7 +62,11 @@ void backupFileIsEqualForNonExistingBackup() throws Exception {
     void backupFileIsEqual() throws Exception {
         // Prepare test: Create backup file on "right" path
         Path source = Path.of(BackupManagerTest.class.getResource("no-changes.bib.bak").toURI());
-        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(Path.of(BackupManagerTest.class.getResource("no-changes.bib").toURI()), BackupFileType.BACKUP, backupDir);
+        Path target =
+                BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(
+                        Path.of(BackupManagerTest.class.getResource("no-changes.bib").toURI()),
+                        BackupFileType.BACKUP,
+                        backupDir);
         Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
 
         Path originalFile = Path.of(BackupManagerTest.class.getResource("no-changes.bib").toURI());
@@ -73,7 +77,11 @@ void backupFileIsEqual() throws Exception {
     void backupFileDiffers() throws Exception {
         // Prepare test: Create backup file on "right" path
         Path source = Path.of(BackupManagerTest.class.getResource("changes.bib.bak").toURI());
-        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(Path.of(BackupManagerTest.class.getResource("changes.bib").toURI()), BackupFileType.BACKUP, backupDir);
+        Path target =
+                BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(
+                        Path.of(BackupManagerTest.class.getResource("changes.bib").toURI()),
+                        BackupFileType.BACKUP,
+                        backupDir);
         Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
 
         Path originalFile = Path.of(BackupManagerTest.class.getResource("changes.bib").toURI());
@@ -83,19 +91,27 @@ void backupFileDiffers() throws Exception {
     @Test
     void correctBackupFileDeterminedForMultipleBakFiles() throws Exception {
         Path noChangesBib = Path.of(BackupManagerTest.class.getResource("no-changes.bib").toURI());
-        Path noChangesBibBak = Path.of(BackupManagerTest.class.getResource("no-changes.bib.bak").toURI());
+        Path noChangesBibBak =
+                Path.of(BackupManagerTest.class.getResource("no-changes.bib.bak").toURI());
 
         // Prepare test: Create backup files on "right" path
         // most recent file does not have any changes
-        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(noChangesBib, BackupFileType.BACKUP, backupDir);
+        Path target =
+                BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(
+                        noChangesBib, BackupFileType.BACKUP, backupDir);
         Files.copy(noChangesBibBak, target, StandardCopyOption.REPLACE_EXISTING);
 
         // create "older" .bak files containing changes
         for (int i = 0; i < 10; i++) {
-            Path changesBibBak = Path.of(BackupManagerTest.class.getResource("changes.bib").toURI());
+            Path changesBibBak =
+                    Path.of(BackupManagerTest.class.getResource("changes.bib").toURI());
             Path directory = backupDir;
             String timeSuffix = "2020-02-03--00.00.0" + Integer.toString(i);
-            String fileName = BackupFileUtil.getUniqueFilePrefix(noChangesBib) + "--no-changes.bib--" + timeSuffix + ".bak";
+            String fileName =
+                    BackupFileUtil.getUniqueFilePrefix(noChangesBib)
+                            + "--no-changes.bib--"
+                            + timeSuffix
+                            + ".bak";
             target = directory.resolve(fileName);
             Files.copy(changesBibBak, target, StandardCopyOption.REPLACE_EXISTING);
         }
@@ -107,9 +123,12 @@ void correctBackupFileDeterminedForMultipleBakFiles() throws Exception {
     @Test
     void bakFileWithNewerTimeStampLeadsToDiff() throws Exception {
         Path changesBib = Path.of(BackupManagerTest.class.getResource("changes.bib").toURI());
-        Path changesBibBak = Path.of(BackupManagerTest.class.getResource("changes.bib.bak").toURI());
+        Path changesBibBak =
+                Path.of(BackupManagerTest.class.getResource("changes.bib.bak").toURI());
 
-        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(changesBib, BackupFileType.BACKUP, backupDir);
+        Path target =
+                BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(
+                        changesBib, BackupFileType.BACKUP, backupDir);
         Files.copy(changesBibBak, target, StandardCopyOption.REPLACE_EXISTING);
 
         assertTrue(BackupManager.backupFileDiffers(changesBib, backupDir));
@@ -118,9 +137,12 @@ void bakFileWithNewerTimeStampLeadsToDiff() throws Exception {
     @Test
     void bakFileWithOlderTimeStampDoesNotLeadToDiff() throws Exception {
         Path changesBib = Path.of(BackupManagerTest.class.getResource("changes.bib").toURI());
-        Path changesBibBak = Path.of(BackupManagerTest.class.getResource("changes.bib.bak").toURI());
+        Path changesBibBak =
+                Path.of(BackupManagerTest.class.getResource("changes.bib.bak").toURI());
 
-        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(changesBib, BackupFileType.BACKUP, backupDir);
+        Path target =
+                BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(
+                        changesBib, BackupFileType.BACKUP, backupDir);
         Files.copy(changesBibBak, target, StandardCopyOption.REPLACE_EXISTING);
 
         // Make .bak file very old
@@ -143,14 +165,18 @@ void shouldNotCreateABackup(@TempDir Path customDir) throws Exception {
         when(filePreferences.getBackupDirectory()).thenReturn(backupDir);
         when(filePreferences.shouldCreateBackup()).thenReturn(false);
 
-        BackupManager manager = BackupManager.start(
-                mock(LibraryTab.class),
-                database,
-                mock(BibEntryTypesManager.class, Answers.RETURNS_DEEP_STUBS),
-                preferences);
+        BackupManager manager =
+                BackupManager.start(
+                        mock(LibraryTab.class),
+                        database,
+                        mock(BibEntryTypesManager.class, Answers.RETURNS_DEEP_STUBS),
+                        preferences);
         manager.listen(new MetaDataChangedEvent(new MetaData()));
 
-        BackupManager.shutdown(database, filePreferences.getBackupDirectory(), filePreferences.shouldCreateBackup());
+        BackupManager.shutdown(
+                database,
+                filePreferences.getBackupDirectory(),
+                filePreferences.shouldCreateBackup());
 
         List<Path> files = Files.list(backupDir).toList();
         assertEquals(Collections.emptyList(), files);
@@ -170,11 +196,12 @@ void shouldCreateABackup(@TempDir Path customDir) throws Exception {
         when(filePreferences.getBackupDirectory()).thenReturn(backupDir);
         when(filePreferences.shouldCreateBackup()).thenReturn(true);
 
-        BackupManager manager = BackupManager.start(
-                mock(LibraryTab.class),
-                database,
-                mock(BibEntryTypesManager.class, Answers.RETURNS_DEEP_STUBS),
-                preferences);
+        BackupManager manager =
+                BackupManager.start(
+                        mock(LibraryTab.class),
+                        database,
+                        mock(BibEntryTypesManager.class, Answers.RETURNS_DEEP_STUBS),
+                        preferences);
         manager.listen(new MetaDataChangedEvent(new MetaData()));
 
         Optional<Path> fullBackupPath = manager.determineBackupPathForNewBackup(backupDir);
diff --git a/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderPanelViewModelTest.java b/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderPanelViewModelTest.java
index 0bc69329a334..9c4fd7c311e7 100644
--- a/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderPanelViewModelTest.java
+++ b/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderPanelViewModelTest.java
@@ -1,27 +1,31 @@
 package org.jabref.gui.commonfxcontrols;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.SaveOrder;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
 
 class SaveOrderPanelViewModelTest {
 
-    SortCriterionViewModel sortCriterionKey = new SortCriterionViewModel(new SaveOrder.SortCriterion(StandardField.KEY, false));
-    SortCriterionViewModel sortCriterionAuthor = new SortCriterionViewModel(new SaveOrder.SortCriterion(StandardField.AUTHOR, false));
-    SortCriterionViewModel sortCriterionTitle = new SortCriterionViewModel(new SaveOrder.SortCriterion(StandardField.TITLE, true));
+    SortCriterionViewModel sortCriterionKey =
+            new SortCriterionViewModel(new SaveOrder.SortCriterion(StandardField.KEY, false));
+    SortCriterionViewModel sortCriterionAuthor =
+            new SortCriterionViewModel(new SaveOrder.SortCriterion(StandardField.AUTHOR, false));
+    SortCriterionViewModel sortCriterionTitle =
+            new SortCriterionViewModel(new SaveOrder.SortCriterion(StandardField.TITLE, true));
 
     SaveOrderConfigPanelViewModel viewModel;
 
     @BeforeEach
     void setUp() {
         viewModel = new SaveOrderConfigPanelViewModel();
-        viewModel.sortCriteriaProperty().addAll(List.of(sortCriterionKey, sortCriterionAuthor, sortCriterionTitle));
+        viewModel
+                .sortCriteriaProperty()
+                .addAll(List.of(sortCriterionKey, sortCriterionAuthor, sortCriterionTitle));
     }
 
     @Test
@@ -32,36 +36,51 @@ void addCriterion() {
 
     @Test
     void removeCriterion() {
-        SortCriterionViewModel unknownCriterion = new SortCriterionViewModel(new SaveOrder.SortCriterion(StandardField.ABSTRACT, false));
+        SortCriterionViewModel unknownCriterion =
+                new SortCriterionViewModel(
+                        new SaveOrder.SortCriterion(StandardField.ABSTRACT, false));
         viewModel.removeCriterion(unknownCriterion);
         assertEquals(3, viewModel.sortCriteriaProperty().size());
 
         viewModel.removeCriterion(sortCriterionAuthor);
         assertEquals(2, viewModel.sortCriteriaProperty().size());
-        assertEquals(List.of(sortCriterionKey, sortCriterionTitle), viewModel.sortCriteriaProperty());
+        assertEquals(
+                List.of(sortCriterionKey, sortCriterionTitle), viewModel.sortCriteriaProperty());
     }
 
     @Test
     void moveCriterionUp() {
         viewModel.moveCriterionUp(sortCriterionTitle);
-        assertEquals(List.of(sortCriterionKey, sortCriterionTitle, sortCriterionAuthor), viewModel.sortCriteriaProperty());
+        assertEquals(
+                List.of(sortCriterionKey, sortCriterionTitle, sortCriterionAuthor),
+                viewModel.sortCriteriaProperty());
 
         viewModel.moveCriterionUp(sortCriterionTitle);
-        assertEquals(List.of(sortCriterionTitle, sortCriterionKey, sortCriterionAuthor), viewModel.sortCriteriaProperty());
+        assertEquals(
+                List.of(sortCriterionTitle, sortCriterionKey, sortCriterionAuthor),
+                viewModel.sortCriteriaProperty());
 
         viewModel.moveCriterionUp(sortCriterionTitle);
-        assertEquals(List.of(sortCriterionTitle, sortCriterionKey, sortCriterionAuthor), viewModel.sortCriteriaProperty());
+        assertEquals(
+                List.of(sortCriterionTitle, sortCriterionKey, sortCriterionAuthor),
+                viewModel.sortCriteriaProperty());
     }
 
     @Test
     void moveCriterionDown() {
         viewModel.moveCriterionDown(sortCriterionKey);
-        assertEquals(List.of(sortCriterionAuthor, sortCriterionKey, sortCriterionTitle), viewModel.sortCriteriaProperty());
+        assertEquals(
+                List.of(sortCriterionAuthor, sortCriterionKey, sortCriterionTitle),
+                viewModel.sortCriteriaProperty());
 
         viewModel.moveCriterionDown(sortCriterionKey);
-        assertEquals(List.of(sortCriterionAuthor, sortCriterionTitle, sortCriterionKey), viewModel.sortCriteriaProperty());
+        assertEquals(
+                List.of(sortCriterionAuthor, sortCriterionTitle, sortCriterionKey),
+                viewModel.sortCriteriaProperty());
 
         viewModel.moveCriterionDown(sortCriterionKey);
-        assertEquals(List.of(sortCriterionAuthor, sortCriterionTitle, sortCriterionKey), viewModel.sortCriteriaProperty());
+        assertEquals(
+                List.of(sortCriterionAuthor, sortCriterionTitle, sortCriterionKey),
+                viewModel.sortCriteriaProperty());
     }
 }
diff --git a/src/test/java/org/jabref/gui/documentviewer/PdfDocumentViewModelTest.java b/src/test/java/org/jabref/gui/documentviewer/PdfDocumentViewModelTest.java
index 91fcd8492d08..ae69a77b307c 100644
--- a/src/test/java/org/jabref/gui/documentviewer/PdfDocumentViewModelTest.java
+++ b/src/test/java/org/jabref/gui/documentviewer/PdfDocumentViewModelTest.java
@@ -1,28 +1,28 @@
 package org.jabref.gui.documentviewer;
 
-import java.io.IOException;
-import java.nio.file.Path;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.IOException;
+import java.nio.file.Path;
 
 class PdfDocumentViewModelTest {
 
-  @Test
-  void getPagesTest(@TempDir Path tempDir) throws IOException {
-    try (PDDocument mockPDF = new PDDocument()) {
-      Path pdfFile = tempDir.resolve("mockPDF.pdf");
+    @Test
+    void getPagesTest(@TempDir Path tempDir) throws IOException {
+        try (PDDocument mockPDF = new PDDocument()) {
+            Path pdfFile = tempDir.resolve("mockPDF.pdf");
 
-      mockPDF.addPage(new PDPage());
-      mockPDF.save(pdfFile.toAbsolutePath().toString());
+            mockPDF.addPage(new PDPage());
+            mockPDF.save(pdfFile.toAbsolutePath().toString());
 
-      PdfDocumentViewModel PDFviewModel = new PdfDocumentViewModel(mockPDF);
+            PdfDocumentViewModel PDFviewModel = new PdfDocumentViewModel(mockPDF);
 
-      assertEquals(1, PDFviewModel.getPages().size());
+            assertEquals(1, PDFviewModel.getPages().size());
+        }
     }
-  }
 }
diff --git a/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java b/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
index 9a5b97436609..2f13b6ae3e35 100644
--- a/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
+++ b/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
@@ -1,8 +1,11 @@
 package org.jabref.gui.edit;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -22,23 +25,20 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 
 class CopyMoreActionTest {
 
     private final DialogService dialogService = spy(DialogService.class);
     private final ClipBoardManager clipBoardManager = mock(ClipBoardManager.class);
     private final GuiPreferences preferences = mock(GuiPreferences.class);
-    private final JournalAbbreviationRepository abbreviationRepository = mock(JournalAbbreviationRepository.class);
+    private final JournalAbbreviationRepository abbreviationRepository =
+            mock(JournalAbbreviationRepository.class);
     private final StateManager stateManager = mock(StateManager.class);
     private final List<String> titles = new ArrayList<>();
     private final List<String> keys = new ArrayList<>();
@@ -50,27 +50,41 @@ class CopyMoreActionTest {
     @BeforeEach
     void setUp() {
         String title = "A tale from the trenches";
-        entry = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.AUTHOR, "Souti Chattopadhyay and Nicholas Nelson and Audrey Au and Natalia Morales and Christopher Sanchez and Rahul Pandita and Anita Sarma")
-                .withField(StandardField.TITLE, title)
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.DOI, "10.1145/3377811.3380330")
-                .withField(StandardField.SUBTITLE, "cognitive biases and software development")
-                .withCitationKey("abc");
+        entry =
+                new BibEntry(StandardEntryType.Misc)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Souti Chattopadhyay and Nicholas Nelson and Audrey Au and Natalia Morales and Christopher Sanchez and Rahul Pandita and Anita Sarma")
+                        .withField(StandardField.TITLE, title)
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.DOI, "10.1145/3377811.3380330")
+                        .withField(
+                                StandardField.SUBTITLE, "cognitive biases and software development")
+                        .withCitationKey("abc");
         titles.add(title);
         keys.add("abc");
         dois.add("10.1145/3377811.3380330");
 
-        ExternalApplicationsPreferences externalApplicationsPreferences = mock(ExternalApplicationsPreferences.class);
-        when(externalApplicationsPreferences.getCiteCommand()).thenReturn(new CitationCommandString("\\cite{", ",", "}"));
-        when(preferences.getExternalApplicationsPreferences()).thenReturn(externalApplicationsPreferences);
+        ExternalApplicationsPreferences externalApplicationsPreferences =
+                mock(ExternalApplicationsPreferences.class);
+        when(externalApplicationsPreferences.getCiteCommand())
+                .thenReturn(new CitationCommandString("\\cite{", ",", "}"));
+        when(preferences.getExternalApplicationsPreferences())
+                .thenReturn(externalApplicationsPreferences);
     }
 
     @Test
     void executeOnFail() {
         when(stateManager.getActiveDatabase()).thenReturn(Optional.empty());
         when(stateManager.getSelectedEntries()).thenReturn(FXCollections.emptyObservableList());
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository);
+        copyMoreAction =
+                new CopyMoreAction(
+                        StandardActions.COPY_TITLE,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferences,
+                        abbreviationRepository);
         copyMoreAction.execute();
 
         verify(clipBoardManager, times(0)).setContent(any(String.class));
@@ -81,149 +95,248 @@ void executeOnFail() {
     void executeCopyTitleWithNoTitle() {
         BibEntry entryWithNoTitle = (BibEntry) entry.clone();
         entryWithNoTitle.clearField(StandardField.TITLE);
-        ObservableList<BibEntry> entriesWithNoTitles = FXCollections.observableArrayList(entryWithNoTitle);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(entriesWithNoTitles));
+        ObservableList<BibEntry> entriesWithNoTitles =
+                FXCollections.observableArrayList(entryWithNoTitle);
+        BibDatabaseContext databaseContext =
+                new BibDatabaseContext(new BibDatabase(entriesWithNoTitles));
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithNoTitles);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository);
+        copyMoreAction =
+                new CopyMoreAction(
+                        StandardActions.COPY_TITLE,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferences,
+                        abbreviationRepository);
         copyMoreAction.execute();
 
         verify(clipBoardManager, times(0)).setContent(any(String.class));
-        verify(dialogService, times(1)).notify(Localization.lang("None of the selected entries have titles."));
+        verify(dialogService, times(1))
+                .notify(Localization.lang("None of the selected entries have titles."));
     }
 
     @Test
     void executeCopyTitleOnPartialSuccess() {
         BibEntry entryWithNoTitle = (BibEntry) entry.clone();
         entryWithNoTitle.clearField(StandardField.TITLE);
-        ObservableList<BibEntry> mixedEntries = FXCollections.observableArrayList(entryWithNoTitle, entry);
+        ObservableList<BibEntry> mixedEntries =
+                FXCollections.observableArrayList(entryWithNoTitle, entry);
         BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(mixedEntries));
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(mixedEntries);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository);
+        copyMoreAction =
+                new CopyMoreAction(
+                        StandardActions.COPY_TITLE,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferences,
+                        abbreviationRepository);
         copyMoreAction.execute();
 
         String copiedTitles = String.join("\n", titles);
         verify(clipBoardManager, times(1)).setContent(copiedTitles);
-        verify(dialogService, times(1)).notify(Localization.lang("Warning: %0 out of %1 entries have undefined title.",
-                Integer.toString(mixedEntries.size() - titles.size()), Integer.toString(mixedEntries.size())));
+        verify(dialogService, times(1))
+                .notify(
+                        Localization.lang(
+                                "Warning: %0 out of %1 entries have undefined title.",
+                                Integer.toString(mixedEntries.size() - titles.size()),
+                                Integer.toString(mixedEntries.size())));
     }
 
     @Test
     void executeCopyTitleOnSuccess() {
         ObservableList<BibEntry> entriesWithTitles = FXCollections.observableArrayList(entry);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(entriesWithTitles));
+        BibDatabaseContext databaseContext =
+                new BibDatabaseContext(new BibDatabase(entriesWithTitles));
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithTitles);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository);
+        copyMoreAction =
+                new CopyMoreAction(
+                        StandardActions.COPY_TITLE,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferences,
+                        abbreviationRepository);
         copyMoreAction.execute();
 
         String copiedTitles = String.join("\n", titles);
         verify(clipBoardManager, times(1)).setContent(copiedTitles);
-        verify(dialogService, times(1)).notify(Localization.lang("Copied '%0' to clipboard.",
-                JabRefDialogService.shortenDialogMessage(copiedTitles)));
+        verify(dialogService, times(1))
+                .notify(
+                        Localization.lang(
+                                "Copied '%0' to clipboard.",
+                                JabRefDialogService.shortenDialogMessage(copiedTitles)));
     }
 
     @Test
     void executeCopyKeyWithNoKey() {
         BibEntry entryWithNoKey = (BibEntry) entry.clone();
         entryWithNoKey.clearCiteKey();
-        ObservableList<BibEntry> entriesWithNoKeys = FXCollections.observableArrayList(entryWithNoKey);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(entriesWithNoKeys));
+        ObservableList<BibEntry> entriesWithNoKeys =
+                FXCollections.observableArrayList(entryWithNoKey);
+        BibDatabaseContext databaseContext =
+                new BibDatabaseContext(new BibDatabase(entriesWithNoKeys));
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithNoKeys);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository);
+        copyMoreAction =
+                new CopyMoreAction(
+                        StandardActions.COPY_KEY,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferences,
+                        abbreviationRepository);
         copyMoreAction.execute();
 
         verify(clipBoardManager, times(0)).setContent(any(String.class));
-        verify(dialogService, times(1)).notify(Localization.lang("None of the selected entries have citation keys."));
+        verify(dialogService, times(1))
+                .notify(Localization.lang("None of the selected entries have citation keys."));
     }
 
     @Test
     void executeCopyKeyOnPartialSuccess() {
         BibEntry entryWithNoKey = (BibEntry) entry.clone();
         entryWithNoKey.clearCiteKey();
-        ObservableList<BibEntry> mixedEntries = FXCollections.observableArrayList(entryWithNoKey, entry);
+        ObservableList<BibEntry> mixedEntries =
+                FXCollections.observableArrayList(entryWithNoKey, entry);
         BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(mixedEntries));
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(mixedEntries);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository);
+        copyMoreAction =
+                new CopyMoreAction(
+                        StandardActions.COPY_KEY,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferences,
+                        abbreviationRepository);
         copyMoreAction.execute();
 
         String copiedKeys = String.join("\n", keys);
         verify(clipBoardManager, times(1)).setContent(copiedKeys);
-        verify(dialogService, times(1)).notify(Localization.lang("Warning: %0 out of %1 entries have undefined citation key.",
-                Integer.toString(mixedEntries.size() - titles.size()), Integer.toString(mixedEntries.size())));
+        verify(dialogService, times(1))
+                .notify(
+                        Localization.lang(
+                                "Warning: %0 out of %1 entries have undefined citation key.",
+                                Integer.toString(mixedEntries.size() - titles.size()),
+                                Integer.toString(mixedEntries.size())));
     }
 
     @Test
     void executeCopyKeyOnSuccess() {
         ObservableList<BibEntry> entriesWithKeys = FXCollections.observableArrayList(entry);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(entriesWithKeys));
+        BibDatabaseContext databaseContext =
+                new BibDatabaseContext(new BibDatabase(entriesWithKeys));
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithKeys);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository);
+        copyMoreAction =
+                new CopyMoreAction(
+                        StandardActions.COPY_KEY,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferences,
+                        abbreviationRepository);
         copyMoreAction.execute();
 
         String copiedKeys = String.join("\n", keys);
         verify(clipBoardManager, times(1)).setContent(copiedKeys);
-        verify(dialogService, times(1)).notify(Localization.lang("Copied '%0' to clipboard.",
-                JabRefDialogService.shortenDialogMessage(copiedKeys)));
+        verify(dialogService, times(1))
+                .notify(
+                        Localization.lang(
+                                "Copied '%0' to clipboard.",
+                                JabRefDialogService.shortenDialogMessage(copiedKeys)));
     }
 
     @Test
     void executeCopyDoiWithNoDoi() {
         BibEntry entryWithNoDoi = (BibEntry) entry.clone();
         entryWithNoDoi.clearField(StandardField.DOI);
-        ObservableList<BibEntry> entriesWithNoDois = FXCollections.observableArrayList(entryWithNoDoi);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(entriesWithNoDois));
+        ObservableList<BibEntry> entriesWithNoDois =
+                FXCollections.observableArrayList(entryWithNoDoi);
+        BibDatabaseContext databaseContext =
+                new BibDatabaseContext(new BibDatabase(entriesWithNoDois));
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithNoDois);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_DOI, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository);
+        copyMoreAction =
+                new CopyMoreAction(
+                        StandardActions.COPY_DOI,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferences,
+                        abbreviationRepository);
         copyMoreAction.execute();
 
         verify(clipBoardManager, times(0)).setContent(any(String.class));
-        verify(dialogService, times(1)).notify(Localization.lang("None of the selected entries have DOIs."));
+        verify(dialogService, times(1))
+                .notify(Localization.lang("None of the selected entries have DOIs."));
     }
 
     @Test
     void executeCopyDoiOnPartialSuccess() {
         BibEntry entryWithNoDoi = (BibEntry) entry.clone();
         entryWithNoDoi.clearField(StandardField.DOI);
-        ObservableList<BibEntry> mixedEntries = FXCollections.observableArrayList(entryWithNoDoi, entry);
+        ObservableList<BibEntry> mixedEntries =
+                FXCollections.observableArrayList(entryWithNoDoi, entry);
         BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(mixedEntries));
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(mixedEntries);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_DOI, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository);
+        copyMoreAction =
+                new CopyMoreAction(
+                        StandardActions.COPY_DOI,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferences,
+                        abbreviationRepository);
         copyMoreAction.execute();
 
         String copiedDois = String.join("\n", dois);
         verify(clipBoardManager, times(1)).setContent(copiedDois);
-        verify(dialogService, times(1)).notify(Localization.lang("Warning: %0 out of %1 entries have undefined DOIs.",
-                Integer.toString(mixedEntries.size() - titles.size()), Integer.toString(mixedEntries.size())));
+        verify(dialogService, times(1))
+                .notify(
+                        Localization.lang(
+                                "Warning: %0 out of %1 entries have undefined DOIs.",
+                                Integer.toString(mixedEntries.size() - titles.size()),
+                                Integer.toString(mixedEntries.size())));
     }
 
     @Test
     void executeCopyDoiOnSuccess() {
         ObservableList<BibEntry> entriesWithDois = FXCollections.observableArrayList(entry);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(entriesWithDois));
+        BibDatabaseContext databaseContext =
+                new BibDatabaseContext(new BibDatabase(entriesWithDois));
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithDois);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_DOI, dialogService, stateManager, clipBoardManager, preferences, abbreviationRepository);
+        copyMoreAction =
+                new CopyMoreAction(
+                        StandardActions.COPY_DOI,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferences,
+                        abbreviationRepository);
         copyMoreAction.execute();
 
         String copiedDois = String.join("\n", dois);
         verify(clipBoardManager, times(1)).setContent(copiedDois);
-        verify(dialogService, times(1)).notify(Localization.lang("Copied '%0' to clipboard.",
-                JabRefDialogService.shortenDialogMessage(copiedDois)));
+        verify(dialogService, times(1))
+                .notify(
+                        Localization.lang(
+                                "Copied '%0' to clipboard.",
+                                JabRefDialogService.shortenDialogMessage(copiedDois)));
     }
 }
diff --git a/src/test/java/org/jabref/gui/edit/CopyOrMoveFieldContentTabViewModelTest.java b/src/test/java/org/jabref/gui/edit/CopyOrMoveFieldContentTabViewModelTest.java
index e8182ba5cd1b..4a7a478f3134 100644
--- a/src/test/java/org/jabref/gui/edit/CopyOrMoveFieldContentTabViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/CopyOrMoveFieldContentTabViewModelTest.java
@@ -1,19 +1,18 @@
 package org.jabref.gui.edit;
 
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.gui.StateManager;
 import org.jabref.gui.edit.automaticfiededitor.copyormovecontent.CopyOrMoveFieldContentTabViewModel;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.util.List;
+import java.util.Optional;
 
 class CopyOrMoveFieldContentTabViewModelTest {
     CopyOrMoveFieldContentTabViewModel copyOrMoveFieldContentTabViewModel;
@@ -26,28 +25,38 @@ class CopyOrMoveFieldContentTabViewModelTest {
 
     @BeforeEach
     void setup() {
-        entryA = new BibEntry(BibEntry.DEFAULT_TYPE)
-                .withField(StandardField.YEAR, "2015")
-                .withField(StandardField.DATE, "2014");
+        entryA =
+                new BibEntry(BibEntry.DEFAULT_TYPE)
+                        .withField(StandardField.YEAR, "2015")
+                        .withField(StandardField.DATE, "2014");
 
-        entryB = new BibEntry(BibEntry.DEFAULT_TYPE)
-                .withField(StandardField.DATE, "1998");
+        entryB = new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.DATE, "1998");
         bibDatabase = new BibDatabase();
         copyOrMoveFieldContentTabViewModel = newTwoFieldsViewModel(entryA, entryB);
     }
 
     @Test
     void copyValueDoesNotCopyBlankValues() {
-        CopyOrMoveFieldContentTabViewModel copyOrMoveFieldContentTabViewModel = newTwoFieldsViewModel(entryA, entryB);
+        CopyOrMoveFieldContentTabViewModel copyOrMoveFieldContentTabViewModel =
+                newTwoFieldsViewModel(entryA, entryB);
 
         copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.YEAR);
         copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.DATE);
         copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(true);
         copyOrMoveFieldContentTabViewModel.copyValue();
 
-        assertEquals(Optional.of("2015"), entryA.getField(StandardField.DATE), "YEAR field is not copied correctly to the DATE field");
-        assertEquals(Optional.of("2015"), entryA.getField(StandardField.YEAR), "YEAR field should not have changed");
-        assertEquals(Optional.of("1998"), entryB.getField(StandardField.DATE), "DATE field should not have changed because the YEAR field is blank e.g it doesn't exist");
+        assertEquals(
+                Optional.of("2015"),
+                entryA.getField(StandardField.DATE),
+                "YEAR field is not copied correctly to the DATE field");
+        assertEquals(
+                Optional.of("2015"),
+                entryA.getField(StandardField.YEAR),
+                "YEAR field should not have changed");
+        assertEquals(
+                Optional.of("1998"),
+                entryB.getField(StandardField.DATE),
+                "DATE field should not have changed because the YEAR field is blank e.g it doesn't exist");
     }
 
     @Test
@@ -70,9 +79,10 @@ void swapValuesShouldSwapFieldValuesIfBothValuesAreNotBlank() {
 
         copyOrMoveFieldContentTabViewModel.swapValues();
 
-        assertEquals(List.of(Optional.of("2014"), Optional.of("2015")),
-                     List.of(entryA.getField(StandardField.YEAR), entryA.getField(StandardField.DATE)),
-                     "YEAR and DATE values didn't swap");
+        assertEquals(
+                List.of(Optional.of("2014"), Optional.of("2015")),
+                List.of(entryA.getField(StandardField.YEAR), entryA.getField(StandardField.DATE)),
+                "YEAR and DATE values didn't swap");
     }
 
     @Test
@@ -100,6 +110,7 @@ void moveValueShouldMoveValueIfOverwriteIsEnabled() {
     }
 
     private CopyOrMoveFieldContentTabViewModel newTwoFieldsViewModel(BibEntry... selectedEntries) {
-        return new CopyOrMoveFieldContentTabViewModel(List.of(selectedEntries), bibDatabase, stateManager);
+        return new CopyOrMoveFieldContentTabViewModel(
+                List.of(selectedEntries), bibDatabase, stateManager);
     }
 }
diff --git a/src/test/java/org/jabref/gui/edit/EditFieldContentTabViewModelTest.java b/src/test/java/org/jabref/gui/edit/EditFieldContentTabViewModelTest.java
index 931edb84a054..770df6a8e4b9 100644
--- a/src/test/java/org/jabref/gui/edit/EditFieldContentTabViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/EditFieldContentTabViewModelTest.java
@@ -1,20 +1,19 @@
 package org.jabref.gui.edit;
 
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.gui.StateManager;
 import org.jabref.gui.edit.automaticfiededitor.editfieldcontent.EditFieldContentViewModel;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.mockito.Mockito.mock;
+import java.util.List;
+import java.util.Optional;
 
 class EditFieldContentTabViewModelTest {
     EditFieldContentViewModel editFieldContentViewModel;
@@ -27,16 +26,19 @@ class EditFieldContentTabViewModelTest {
 
     @BeforeEach
     void setup() {
-        entryA = new BibEntry(BibEntry.DEFAULT_TYPE)
-                .withField(StandardField.YEAR, "2015")
-                .withField(StandardField.DATE, "2014");
+        entryA =
+                new BibEntry(BibEntry.DEFAULT_TYPE)
+                        .withField(StandardField.YEAR, "2015")
+                        .withField(StandardField.DATE, "2014");
 
-        entryB = new BibEntry(BibEntry.DEFAULT_TYPE)
-                .withField(StandardField.DATE, "1998")
-                .withField(StandardField.YEAR, "");
+        entryB =
+                new BibEntry(BibEntry.DEFAULT_TYPE)
+                        .withField(StandardField.DATE, "1998")
+                        .withField(StandardField.YEAR, "");
 
         bibDatabase = new BibDatabase();
-        editFieldContentViewModel = new EditFieldContentViewModel(bibDatabase, List.of(entryA, entryB), stateManager);
+        editFieldContentViewModel =
+                new EditFieldContentViewModel(bibDatabase, List.of(entryA, entryB), stateManager);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java b/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java
index e95b267dc2b3..b2e74fbeede8 100644
--- a/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java
@@ -1,7 +1,9 @@
 package org.jabref.gui.edit;
 
-import java.util.Arrays;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -10,14 +12,11 @@
 import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Arrays;
+import java.util.List;
 
 class ManageKeywordsViewModelTest {
 
@@ -26,28 +25,40 @@ class ManageKeywordsViewModelTest {
 
     @BeforeEach
     void setUp() {
-        BibEntry entryOne = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Prakhar Srivastava and Nishant Singh")
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.DOI, "10.1109/PARC49193.2020.236624")
-                .withField(StandardField.ISBN, "978-1-7281-6575-2")
-                .withField(StandardField.JOURNALTITLE, "2020 International Conference on Power Electronics & IoT Applications in Renewable Energy and its Control (PARC)")
-                .withField(StandardField.PAGES, "351--354")
-                .withField(StandardField.PUBLISHER, "IEEE")
-                .withField(StandardField.TITLE, "Automatized Medical Chatbot (Medibot)")
-                .withField(StandardField.KEYWORDS, "Human-machine interaction, Chatbot, Medical Chatbot, Natural Language Processing, Machine Learning, Bot");
-
-        BibEntry entryTwo = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Mladjan Jovanovic and Marcos Baez and Fabio Casati")
-                .withField(StandardField.DATE, "November 2020")
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.DOI, "10.1109/MIC.2020.3037151")
-                .withField(StandardField.ISSN, "1941-0131")
-                .withField(StandardField.JOURNALTITLE, "IEEE Internet Computing")
-                .withField(StandardField.PAGES, "1--1")
-                .withField(StandardField.PUBLISHER, "IEEE")
-                .withField(StandardField.TITLE, "Chatbots as conversational healthcare services")
-                .withField(StandardField.KEYWORDS, "Chatbot, Medical services, Internet, Data collection, Medical diagnostic imaging, Automation, Vocabulary");
+        BibEntry entryOne =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Prakhar Srivastava and Nishant Singh")
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.DOI, "10.1109/PARC49193.2020.236624")
+                        .withField(StandardField.ISBN, "978-1-7281-6575-2")
+                        .withField(
+                                StandardField.JOURNALTITLE,
+                                "2020 International Conference on Power Electronics & IoT Applications in Renewable Energy and its Control (PARC)")
+                        .withField(StandardField.PAGES, "351--354")
+                        .withField(StandardField.PUBLISHER, "IEEE")
+                        .withField(StandardField.TITLE, "Automatized Medical Chatbot (Medibot)")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Human-machine interaction, Chatbot, Medical Chatbot, Natural Language Processing, Machine Learning, Bot");
+
+        BibEntry entryTwo =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Mladjan Jovanovic and Marcos Baez and Fabio Casati")
+                        .withField(StandardField.DATE, "November 2020")
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.DOI, "10.1109/MIC.2020.3037151")
+                        .withField(StandardField.ISSN, "1941-0131")
+                        .withField(StandardField.JOURNALTITLE, "IEEE Internet Computing")
+                        .withField(StandardField.PAGES, "1--1")
+                        .withField(StandardField.PUBLISHER, "IEEE")
+                        .withField(
+                                StandardField.TITLE,
+                                "Chatbots as conversational healthcare services")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Chatbot, Medical services, Internet, Data collection, Medical diagnostic imaging, Automation, Vocabulary");
 
         List<BibEntry> entries = List.of(entryOne, entryTwo);
 
@@ -59,9 +70,21 @@ void setUp() {
     @Test
     void keywordsFilledInCorrectly() {
         ObservableList<String> addedKeywords = keywordsViewModel.getKeywords();
-        List<String> expectedKeywordsList = Arrays.asList("Human-machine interaction", "Chatbot", "Medical Chatbot",
-                "Natural Language Processing", "Machine Learning", "Bot", "Chatbot", "Medical services", "Internet",
-                "Data collection", "Medical diagnostic imaging", "Automation", "Vocabulary");
+        List<String> expectedKeywordsList =
+                Arrays.asList(
+                        "Human-machine interaction",
+                        "Chatbot",
+                        "Medical Chatbot",
+                        "Natural Language Processing",
+                        "Machine Learning",
+                        "Bot",
+                        "Chatbot",
+                        "Medical services",
+                        "Internet",
+                        "Data collection",
+                        "Medical diagnostic imaging",
+                        "Automation",
+                        "Vocabulary");
 
         assertEquals(FXCollections.observableList(expectedKeywordsList), addedKeywords);
     }
@@ -69,14 +92,32 @@ void keywordsFilledInCorrectly() {
     @Test
     void removedKeywordNotIncludedInKeywordsList() {
         ObservableList<String> modifiedKeywords = keywordsViewModel.getKeywords();
-        List<String> originalKeywordsList = Arrays.asList("Human-machine interaction", "Chatbot", "Medical Chatbot",
-                "Natural Language Processing", "Machine Learning", "Bot", "Chatbot", "Medical services", "Internet",
-                "Data collection", "Medical diagnostic imaging", "Automation", "Vocabulary");
-
-        assertEquals(FXCollections.observableList(originalKeywordsList), modifiedKeywords, "compared lists are not identical");
+        List<String> originalKeywordsList =
+                Arrays.asList(
+                        "Human-machine interaction",
+                        "Chatbot",
+                        "Medical Chatbot",
+                        "Natural Language Processing",
+                        "Machine Learning",
+                        "Bot",
+                        "Chatbot",
+                        "Medical services",
+                        "Internet",
+                        "Data collection",
+                        "Medical diagnostic imaging",
+                        "Automation",
+                        "Vocabulary");
+
+        assertEquals(
+                FXCollections.observableList(originalKeywordsList),
+                modifiedKeywords,
+                "compared lists are not identical");
 
         keywordsViewModel.removeKeyword("Human-machine interaction");
 
-        assertNotEquals(FXCollections.observableList(originalKeywordsList), modifiedKeywords, "compared lists are identical");
+        assertNotEquals(
+                FXCollections.observableList(originalKeywordsList),
+                modifiedKeywords,
+                "compared lists are identical");
     }
 }
diff --git a/src/test/java/org/jabref/gui/edit/RenameFieldViewModelTest.java b/src/test/java/org/jabref/gui/edit/RenameFieldViewModelTest.java
index 7d3c4c3cd188..d1d59c2d2d51 100644
--- a/src/test/java/org/jabref/gui/edit/RenameFieldViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/RenameFieldViewModelTest.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.edit;
 
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.gui.StateManager;
 import org.jabref.gui.edit.automaticfiededitor.renamefield.RenameFieldViewModel;
@@ -11,12 +11,11 @@
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.util.List;
+import java.util.Optional;
 
 class RenameFieldViewModelTest {
     RenameFieldViewModel renameFieldViewModel;
@@ -29,18 +28,21 @@ class RenameFieldViewModelTest {
 
     @BeforeEach
     void setup() {
-        entryA = new BibEntry(BibEntry.DEFAULT_TYPE)
-                .withField(StandardField.YEAR, "2015")
-                .withField(StandardField.DATE, "2014")
-                .withField(StandardField.AUTHOR, "Doe");
-
-        entryB = new BibEntry(BibEntry.DEFAULT_TYPE)
-                .withField(StandardField.DATE, "1998")
-                .withField(StandardField.YEAR, "")
-                .withField(StandardField.AUTHOR, "Eddie");
+        entryA =
+                new BibEntry(BibEntry.DEFAULT_TYPE)
+                        .withField(StandardField.YEAR, "2015")
+                        .withField(StandardField.DATE, "2014")
+                        .withField(StandardField.AUTHOR, "Doe");
+
+        entryB =
+                new BibEntry(BibEntry.DEFAULT_TYPE)
+                        .withField(StandardField.DATE, "1998")
+                        .withField(StandardField.YEAR, "")
+                        .withField(StandardField.AUTHOR, "Eddie");
 
         bibDatabase = new BibDatabase();
-        renameFieldViewModel = new RenameFieldViewModel(List.of(entryA, entryB), bibDatabase, stateManager);
+        renameFieldViewModel =
+                new RenameFieldViewModel(List.of(entryA, entryB), bibDatabase, stateManager);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java b/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java
index 3a4c6e9c7f17..b7cd0749392e 100644
--- a/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java
@@ -1,7 +1,8 @@
 package org.jabref.gui.edit;
 
-import java.util.ArrayList;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -11,14 +12,12 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.ArrayList;
+import java.util.List;
 
 class ReplaceStringViewModelTest {
 
@@ -27,20 +26,31 @@ class ReplaceStringViewModelTest {
 
     @BeforeEach
     void setUp() {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Shatakshi Sharma and Bhim Singh and Sukumar Mishra")
-                .withField(StandardField.DATE, "April 2020")
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.DOI, "10.1109/TII.2019.2935531")
-                .withField(StandardField.FILE, ":https\\://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8801912:PDF")
-                .withField(StandardField.ISSUE, "4")
-                .withField(StandardField.ISSN, "1941-0050")
-                .withField(StandardField.JOURNALTITLE, "IEEE Transactions on Industrial Informatics")
-                .withField(StandardField.PAGES, "2346--2356")
-                .withField(StandardField.PUBLISHER, "IEEE")
-                .withField(StandardField.TITLE, "Economic Operation and Quality Control in PV-BES-DG-Based Autonomous System")
-                .withField(StandardField.VOLUME, "16")
-                .withField(StandardField.KEYWORDS, "Batteries, Generators, Economics, Power quality, State of charge, Harmonic analysis, Control systems, Battery, diesel generator (DG), distributed generation, power quality, photovoltaic (PV), voltage source converter (VSC)");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Shatakshi Sharma and Bhim Singh and Sukumar Mishra")
+                        .withField(StandardField.DATE, "April 2020")
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.DOI, "10.1109/TII.2019.2935531")
+                        .withField(
+                                StandardField.FILE,
+                                ":https\\://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8801912:PDF")
+                        .withField(StandardField.ISSUE, "4")
+                        .withField(StandardField.ISSN, "1941-0050")
+                        .withField(
+                                StandardField.JOURNALTITLE,
+                                "IEEE Transactions on Industrial Informatics")
+                        .withField(StandardField.PAGES, "2346--2356")
+                        .withField(StandardField.PUBLISHER, "IEEE")
+                        .withField(
+                                StandardField.TITLE,
+                                "Economic Operation and Quality Control in PV-BES-DG-Based Autonomous System")
+                        .withField(StandardField.VOLUME, "16")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Batteries, Generators, Economics, Power quality, State of charge, Harmonic analysis, Control systems, Battery, diesel generator (DG), distributed generation, power quality, photovoltaic (PV), voltage source converter (VSC)");
 
         List<BibEntry> entries = new ArrayList<>();
         entries.add(entry);
@@ -49,26 +59,45 @@ void setUp() {
         viewModel = new ReplaceStringViewModel(libraryTab);
     }
 
-    @ParameterizedTest(name = "findString={0}, replaceString={1}, fieldString={2}, selectOnly={3}, allFieldReplace={4}, expectedResult={5}")
+    @ParameterizedTest(
+            name =
+                    "findString={0}, replaceString={1}, fieldString={2}, selectOnly={3}, allFieldReplace={4}, expectedResult={5}")
     @CsvSource({
-            "randomText, replaceText, author, TRUE, FALSE, 0", // does not replace when findString does not exist in the selected field
-            "Informatics, replaceText, randomField, TRUE, FALSE, 0", // does not replace if the BibEntry does not have selected field
-
-            "Informatics, replaceText, journaltitle, TRUE, FALSE, 1", // replace "Informatics" in the JOURNALTITLE field to "replaceText" in the BibEntry
-            "Informatics, replaceText, journaltitle, TRUE, TRUE, 1", // replace "Informatics" in the JOURNALTITLE field to "replaceText" in the BibEntry
-            "Informatics, replaceText, journaltitle, FALSE, FALSE, 1", // replace "Informatics" in the JOURNALTITLE field to "replaceText" in the BibEntry
-            "Informatics, replaceText, journaltitle, FALSE, TRUE, 1", // replace "Informatics" in the JOURNALTITLE field to "replaceText" in the BibEntry
-
-            "2020, 2021, date, TRUE, FALSE, 1", // only replace "2020" in the DATE field to "2021" in the BibEntry
-            "2020, 2021, date, FALSE, TRUE, 2", // replace all the "2020"s in the entries
-            "2020, 2021, date, FALSE, FALSE, 1", // only replace "2020" in the DATE field to "2021" in the BibEntry
-            "2020, 2021, date, TRUE, TRUE, 2", // replace all the "2020"s in the entries
-
-            "System, replaceText, title, FALSE, TRUE, 1", // replace "System" in all entries is case-sensitive
-            "and, '', author, TRUE, FALSE, 2", // replace two "and"s with empty string in the same AUTHOR field
-            "' ', ',', date, TRUE, FALSE, 1" // replace space with comma in DATE field
+        "randomText, replaceText, author, TRUE, FALSE, 0", // does not replace when findString does
+                                                           // not exist in the selected field
+        "Informatics, replaceText, randomField, TRUE, FALSE, 0", // does not replace if the BibEntry
+                                                                 // does not have selected field
+        "Informatics, replaceText, journaltitle, TRUE, FALSE, 1", // replace "Informatics" in the
+                                                                  // JOURNALTITLE field to
+                                                                  // "replaceText" in the BibEntry
+        "Informatics, replaceText, journaltitle, TRUE, TRUE, 1", // replace "Informatics" in the
+                                                                 // JOURNALTITLE field to
+                                                                 // "replaceText" in the BibEntry
+        "Informatics, replaceText, journaltitle, FALSE, FALSE, 1", // replace "Informatics" in the
+                                                                   // JOURNALTITLE field to
+                                                                   // "replaceText" in the BibEntry
+        "Informatics, replaceText, journaltitle, FALSE, TRUE, 1", // replace "Informatics" in the
+                                                                  // JOURNALTITLE field to
+                                                                  // "replaceText" in the BibEntry
+        "2020, 2021, date, TRUE, FALSE, 1", // only replace "2020" in the DATE field to "2021" in
+                                            // the BibEntry
+        "2020, 2021, date, FALSE, TRUE, 2", // replace all the "2020"s in the entries
+        "2020, 2021, date, FALSE, FALSE, 1", // only replace "2020" in the DATE field to "2021" in
+                                             // the BibEntry
+        "2020, 2021, date, TRUE, TRUE, 2", // replace all the "2020"s in the entries
+        "System, replaceText, title, FALSE, TRUE, 1", // replace "System" in all entries is
+                                                      // case-sensitive
+        "and, '', author, TRUE, FALSE, 2", // replace two "and"s with empty string in the same
+                                           // AUTHOR field
+        "' ', ',', date, TRUE, FALSE, 1" // replace space with comma in DATE field
     })
-    void replace(String findString, String replaceString, String fieldString, boolean selectOnly, boolean allFieldReplace, int expectedResult) {
+    void replace(
+            String findString,
+            String replaceString,
+            String fieldString,
+            boolean selectOnly,
+            boolean allFieldReplace,
+            int expectedResult) {
         viewModel.findStringProperty().bind(new SimpleStringProperty(findString));
         viewModel.replaceStringProperty().bind(new SimpleStringProperty(replaceString));
         viewModel.fieldStringProperty().bind(new SimpleStringProperty(fieldString));
diff --git a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
index 0ca82db33cee..a074edc58ee8 100644
--- a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.Optional;
-import java.util.SequencedSet;
-import java.util.Set;
-
-import javax.swing.undo.UndoManager;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProviders;
@@ -27,7 +27,6 @@
 import org.jabref.model.entry.field.UserSpecificCommentField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.GUITest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -37,11 +36,11 @@
 import org.mockito.MockitoAnnotations;
 import org.testfx.framework.junit5.ApplicationExtension;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Optional;
+import java.util.SequencedSet;
+import java.util.Set;
+
+import javax.swing.undo.UndoManager;
 
 @GUITest
 @ExtendWith(ApplicationExtension.class)
@@ -51,29 +50,18 @@ class CommentsTabTest {
 
     private CommentsTab commentsTab;
 
-    @Mock
-    private BibEntryTypesManager entryTypesManager;
-    @Mock
-    private BibDatabaseContext databaseContext;
-    @Mock
-    private SuggestionProviders suggestionProviders;
-    @Mock
-    private UndoManager undoManager;
-    @Mock
-    private DialogService dialogService;
-    @Mock
-    private GuiPreferences preferences;
-    @Mock
-    private ThemeManager themeManager;
-    @Mock
-    private TaskExecutor taskExecutor;
-    @Mock
-    private JournalAbbreviationRepository journalAbbreviationRepository;
-    @Mock
-    private OwnerPreferences ownerPreferences;
-
-    @Mock
-    private EntryEditorPreferences entryEditorPreferences;
+    @Mock private BibEntryTypesManager entryTypesManager;
+    @Mock private BibDatabaseContext databaseContext;
+    @Mock private SuggestionProviders suggestionProviders;
+    @Mock private UndoManager undoManager;
+    @Mock private DialogService dialogService;
+    @Mock private GuiPreferences preferences;
+    @Mock private ThemeManager themeManager;
+    @Mock private TaskExecutor taskExecutor;
+    @Mock private JournalAbbreviationRepository journalAbbreviationRepository;
+    @Mock private OwnerPreferences ownerPreferences;
+
+    @Mock private EntryEditorPreferences entryEditorPreferences;
 
     @BeforeEach
     void setUp() {
@@ -87,20 +75,20 @@ void setUp() {
         BibEntryType entryTypeMock = mock(BibEntryType.class);
         when(entryTypesManager.enrich(any(), any())).thenReturn(Optional.of(entryTypeMock));
 
-        commentsTab = new CommentsTab(
-                preferences,
-                databaseContext,
-                suggestionProviders,
-                undoManager,
-                mock(UndoAction.class),
-                mock(RedoAction.class),
-                dialogService,
-                themeManager,
-                taskExecutor,
-                journalAbbreviationRepository,
-                mock(LuceneManager.class),
-                OptionalObjectProperty.empty()
-        );
+        commentsTab =
+                new CommentsTab(
+                        preferences,
+                        databaseContext,
+                        suggestionProviders,
+                        undoManager,
+                        mock(UndoAction.class),
+                        mock(RedoAction.class),
+                        dialogService,
+                        themeManager,
+                        taskExecutor,
+                        journalAbbreviationRepository,
+                        mock(LuceneManager.class),
+                        OptionalObjectProperty.empty());
     }
 
     @Test
@@ -108,8 +96,9 @@ void emptyCommentShownIfGloballyEnabled() {
         final UserSpecificCommentField ownerComment = new UserSpecificCommentField(ownerName);
         when(entryEditorPreferences.shouldShowUserCommentsFields()).thenReturn(true);
 
-        BibEntry entry = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.COMMENT, "Standard comment text");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.COMMENT, "Standard comment text");
 
         SequencedSet<Field> fields = commentsTab.determineFieldsToShow(entry);
 
@@ -120,8 +109,9 @@ void emptyCommentShownIfGloballyEnabled() {
     void emptyCommentFieldNotShownIfGloballyDisabled() {
         when(entryEditorPreferences.shouldShowUserCommentsFields()).thenReturn(false);
 
-        BibEntry entry = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.COMMENT, "Standard comment text");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.COMMENT, "Standard comment text");
 
         SequencedSet<Field> fields = commentsTab.determineFieldsToShow(entry);
 
@@ -132,11 +122,13 @@ void emptyCommentFieldNotShownIfGloballyDisabled() {
     @ValueSource(booleans = {true, false})
     void commentFieldShownIfContainsText(boolean shouldShowUserCommentsFields) {
         final UserSpecificCommentField ownerComment = new UserSpecificCommentField(ownerName);
-        when(entryEditorPreferences.shouldShowUserCommentsFields()).thenReturn(shouldShowUserCommentsFields);
+        when(entryEditorPreferences.shouldShowUserCommentsFields())
+                .thenReturn(shouldShowUserCommentsFields);
 
-        BibEntry entry = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.COMMENT, "Standard comment text")
-                .withField(ownerComment, "User-specific comment text");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.COMMENT, "Standard comment text")
+                        .withField(ownerComment, "User-specific comment text");
 
         SequencedSet<Field> fields = commentsTab.determineFieldsToShow(entry);
 
@@ -146,12 +138,14 @@ void commentFieldShownIfContainsText(boolean shouldShowUserCommentsFields) {
     @Test
     void determineFieldsToShowWorksForMultipleUsers() {
         final UserSpecificCommentField ownerComment = new UserSpecificCommentField(ownerName);
-        final UserSpecificCommentField otherUsersComment = new UserSpecificCommentField("other-user-id");
+        final UserSpecificCommentField otherUsersComment =
+                new UserSpecificCommentField("other-user-id");
 
-        BibEntry entry = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.COMMENT, "Standard comment text")
-                .withField(ownerComment, "User-specific comment text")
-                .withField(otherUsersComment, "other-user-id comment text");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.COMMENT, "Standard comment text")
+                        .withField(ownerComment, "User-specific comment text")
+                        .withField(otherUsersComment, "other-user-id comment text");
 
         SequencedSet<Field> fields = commentsTab.determineFieldsToShow(entry);
 
@@ -162,6 +156,9 @@ void determineFieldsToShowWorksForMultipleUsers() {
     void differentiateCaseInUserName() {
         UserSpecificCommentField field1 = new UserSpecificCommentField("USER");
         UserSpecificCommentField field2 = new UserSpecificCommentField("user");
-        assertNotEquals(field1, field2, "Two UserSpecificCommentField instances with usernames that differ only by case should be considered different");
+        assertNotEquals(
+                field1,
+                field2,
+                "Two UserSpecificCommentField instances with usernames that differ only by case should be considered different");
     }
 }
diff --git a/src/test/java/org/jabref/gui/entryeditor/SciteTabTest.java b/src/test/java/org/jabref/gui/entryeditor/SciteTabTest.java
index af60f0554ffe..87125ac52bff 100644
--- a/src/test/java/org/jabref/gui/entryeditor/SciteTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/SciteTabTest.java
@@ -1,12 +1,16 @@
 package org.jabref.gui.entryeditor;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.testutils.category.GUITest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -15,28 +19,21 @@
 import org.mockito.MockitoAnnotations;
 import org.testfx.framework.junit5.ApplicationExtension;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 @GUITest
 @ExtendWith(ApplicationExtension.class)
 public class SciteTabTest {
 
     public static final String SAMPLE_DOI = "10.1109/ICECS.2010.5724443";
 
-    @Mock
-    private GuiPreferences preferences;
-    @Mock
-    private TaskExecutor taskExecutor;
-    @Mock
-    private DialogService dialogService;
+    @Mock private GuiPreferences preferences;
+    @Mock private TaskExecutor taskExecutor;
+    @Mock private DialogService dialogService;
 
     @BeforeEach
     void setUp() {
         MockitoAnnotations.openMocks(this);
-        EntryEditorPreferences entryEditorPreferences = mock(EntryEditorPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        EntryEditorPreferences entryEditorPreferences =
+                mock(EntryEditorPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(entryEditorPreferences.shouldShowSciteTab()).thenReturn(true);
         when(preferences.getEntryEditorPreferences()).thenReturn(entryEditorPreferences);
     }
@@ -62,8 +59,7 @@ void bindNullEntry() {
     @Test
     void bindEntry() {
         var tab = new SciteTab(preferences, taskExecutor, dialogService);
-        var entry = new BibEntry()
-                .withField(StandardField.DOI, SAMPLE_DOI);
+        var entry = new BibEntry().withField(StandardField.DOI, SAMPLE_DOI);
 
         tab.bindToEntry(entry);
     }
diff --git a/src/test/java/org/jabref/gui/entryeditor/SciteTabViewModelTest.java b/src/test/java/org/jabref/gui/entryeditor/SciteTabViewModelTest.java
index 4c2b48df0875..ed0a61042511 100644
--- a/src/test/java/org/jabref/gui/entryeditor/SciteTabViewModelTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/SciteTabViewModelTest.java
@@ -1,34 +1,33 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import kong.unirest.core.json.JSONObject;
 
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.identifier.DOI;
-
-import kong.unirest.core.json.JSONObject;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Optional;
 
 class SciteTabViewModelTest {
 
-    @Mock
-    private GuiPreferences preferences;
-    @Mock
-    private TaskExecutor taskExecutor;
+    @Mock private GuiPreferences preferences;
+    @Mock private TaskExecutor taskExecutor;
 
     @BeforeEach
     void setUp() {
         MockitoAnnotations.openMocks(this);
-        EntryEditorPreferences entryEditorPreferences = mock(EntryEditorPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        EntryEditorPreferences entryEditorPreferences =
+                mock(EntryEditorPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(entryEditorPreferences.shouldShowSciteTab()).thenReturn(true);
         when(preferences.getEntryEditorPreferences()).thenReturn(entryEditorPreferences);
     }
diff --git a/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java b/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
index f11b938805a6..c74d8c16ec39 100644
--- a/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.Collections;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 import javafx.scene.Scene;
@@ -9,6 +10,7 @@
 import javafx.scene.control.TabPane;
 import javafx.stage.Stage;
 
+import org.fxmisc.richtext.CodeArea;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.keyboard.KeyBindingRepository;
@@ -23,8 +25,6 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.testutils.category.GUITest;
-
-import org.fxmisc.richtext.CodeArea;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Answers;
@@ -32,8 +32,7 @@
 import org.testfx.framework.junit5.ApplicationExtension;
 import org.testfx.framework.junit5.Start;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Collections;
 
 @GUITest
 @ExtendWith(ApplicationExtension.class)
@@ -50,28 +49,33 @@ public void onStart(Stage stage) {
         area = new CodeArea();
         area.appendText("some example\n text to go here\n across a couple of \n lines....");
         StateManager stateManager = mock(StateManager.class);
-        when(stateManager.activeSearchQuery(SearchType.NORMAL_SEARCH)).thenReturn(OptionalObjectProperty.empty());
-        KeyBindingRepository keyBindingRepository = new KeyBindingRepository(Collections.emptyList(), Collections.emptyList());
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(stateManager.activeSearchQuery(SearchType.NORMAL_SEARCH))
+                .thenReturn(OptionalObjectProperty.empty());
+        KeyBindingRepository keyBindingRepository =
+                new KeyBindingRepository(Collections.emptyList(), Collections.emptyList());
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         FieldPreferences fieldPreferences = mock(FieldPreferences.class);
-        when(fieldPreferences.getNonWrappableFields()).thenReturn(FXCollections.emptyObservableList());
+        when(fieldPreferences.getNonWrappableFields())
+                .thenReturn(FXCollections.emptyObservableList());
 
-        sourceTab = new SourceTab(
-                new BibDatabaseContext(),
-                new CountingUndoManager(),
-                fieldPreferences,
-                importFormatPreferences,
-                new DummyFileUpdateMonitor(),
-                mock(DialogService.class),
-                mock(BibEntryTypesManager.class),
-                keyBindingRepository,
-                OptionalObjectProperty.empty());
-        pane = new TabPane(
-                new Tab("main area", area),
-                new Tab("other tab", new Label("some text")),
-                sourceTab
-        );
+        sourceTab =
+                new SourceTab(
+                        new BibDatabaseContext(),
+                        new CountingUndoManager(),
+                        fieldPreferences,
+                        importFormatPreferences,
+                        new DummyFileUpdateMonitor(),
+                        mock(DialogService.class),
+                        mock(BibEntryTypesManager.class),
+                        keyBindingRepository,
+                        OptionalObjectProperty.empty());
+        pane =
+                new TabPane(
+                        new Tab("main area", area),
+                        new Tab("other tab", new Label("some text")),
+                        sourceTab);
         scene = new Scene(pane);
         this.stage = stage;
 
diff --git a/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsRepositoryTest.java b/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsRepositoryTest.java
index 41106d57a6b8..2e2c4b6c2024 100644
--- a/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsRepositoryTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsRepositoryTest.java
@@ -1,17 +1,16 @@
 package org.jabref.gui.entryeditor.citationrelationtab;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.gui.entryeditor.citationrelationtab.semanticscholar.SemanticScholarFetcher;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.List;
 
 class BibEntryRelationsRepositoryTest {
 
@@ -32,19 +31,23 @@ private BibEntry createCitingBibEntry(Integer i) {
     }
 
     private BibEntry createCitingBibEntry(BibEntry citedEntry) {
-        return createCitingBibEntry(Integer.valueOf(citedEntry.getCitationKey().get().substring(5)));
+        return createCitingBibEntry(
+                Integer.valueOf(citedEntry.getCitationKey().get().substring(5)));
     }
 
     @Test
     void getCitations() throws Exception {
         SemanticScholarFetcher semanticScholarFetcher = mock(SemanticScholarFetcher.class);
-        when(semanticScholarFetcher.searchCitedBy(any(BibEntry.class))).thenAnswer(invocation -> {
-            BibEntry entry = invocation.getArgument(0);
-            return getCitedBy(entry);
-        });
+        when(semanticScholarFetcher.searchCitedBy(any(BibEntry.class)))
+                .thenAnswer(
+                        invocation -> {
+                            BibEntry entry = invocation.getArgument(0);
+                            return getCitedBy(entry);
+                        });
         BibEntryRelationsCache bibEntryRelationsCache = new BibEntryRelationsCache();
 
-        BibEntryRelationsRepository bibEntryRelationsRepository = new BibEntryRelationsRepository(semanticScholarFetcher, bibEntryRelationsCache);
+        BibEntryRelationsRepository bibEntryRelationsRepository =
+                new BibEntryRelationsRepository(semanticScholarFetcher, bibEntryRelationsCache);
 
         for (int i = 0; i < 150; i++) {
             BibEntry entry = createBibEntry(i);
diff --git a/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModelTest.java b/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModelTest.java
index 9df5f2d2aaab..21d1713d32c0 100644
--- a/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModelTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModelTest.java
@@ -1,9 +1,9 @@
 package org.jabref.gui.entryeditor.citationrelationtab;
 
-import java.util.List;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -28,27 +28,24 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.List;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
 
 class CitationsRelationsTabViewModelTest {
     private ImportHandler importHandler;
     private BibDatabaseContext bibDatabaseContext;
     private BibEntry testEntry;
 
-    @Mock
-    private GuiPreferences preferences;
-    @Mock
-    private DuplicateCheck duplicateCheck;
+    @Mock private GuiPreferences preferences;
+    @Mock private DuplicateCheck duplicateCheck;
     private BibEntry existingEntry;
     private BibEntry firstEntryToImport;
     private BibEntry secondEntryToImport;
@@ -58,81 +55,110 @@ class CitationsRelationsTabViewModelTest {
     void setUp() {
         MockitoAnnotations.openMocks(this);
 
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(preferences.getImportFormatPreferences()).thenReturn(importFormatPreferences);
 
-        ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImporterPreferences importerPreferences =
+                mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importerPreferences.isGenerateNewKeyOnImport()).thenReturn(false);
         when(preferences.getImporterPreferences()).thenReturn(importerPreferences);
 
         FieldPreferences fieldPreferences = mock(FieldPreferences.class);
-        when(fieldPreferences.getNonWrappableFields()).thenReturn(FXCollections.observableArrayList());
+        when(fieldPreferences.getNonWrappableFields())
+                .thenReturn(FXCollections.observableArrayList());
         when(preferences.getFieldPreferences()).thenReturn(fieldPreferences);
 
         when(preferences.getFilePreferences()).thenReturn(mock(FilePreferences.class));
-        when(preferences.getOwnerPreferences()).thenReturn(mock(OwnerPreferences.class, Answers.RETURNS_DEEP_STUBS));
-        when(preferences.getTimestampPreferences()).thenReturn(mock(TimestampPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        when(preferences.getOwnerPreferences())
+                .thenReturn(mock(OwnerPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        when(preferences.getTimestampPreferences())
+                .thenReturn(mock(TimestampPreferences.class, Answers.RETURNS_DEEP_STUBS));
 
-        CitationKeyPatternPreferences citationKeyPatternPreferences = mock(CitationKeyPatternPreferences.class);
+        CitationKeyPatternPreferences citationKeyPatternPreferences =
+                mock(CitationKeyPatternPreferences.class);
         GlobalCitationKeyPatterns patterns = GlobalCitationKeyPatterns.fromPattern("[auth][year]");
         when(citationKeyPatternPreferences.getKeyPatterns()).thenReturn(patterns);
-        when(preferences.getCitationKeyPatternPreferences()).thenReturn(citationKeyPatternPreferences);
+        when(preferences.getCitationKeyPatternPreferences())
+                .thenReturn(citationKeyPatternPreferences);
 
         bibDatabaseContext = new BibDatabaseContext(new BibDatabase());
         when(duplicateCheck.isDuplicate(any(), any(), any())).thenReturn(false);
 
-        viewModel = new CitationsRelationsTabViewModel(
-                bibDatabaseContext,
-                preferences,
-                mock(UndoManager.class),
-                mock(StateManager.class, Answers.RETURNS_DEEP_STUBS),
-                mock(DialogService.class),
-                new DummyFileUpdateMonitor(),
-                new CurrentThreadTaskExecutor());
-
-        existingEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Test2023")
-                .withField(StandardField.AUTHOR, "Test Author");
+        viewModel =
+                new CitationsRelationsTabViewModel(
+                        bibDatabaseContext,
+                        preferences,
+                        mock(UndoManager.class),
+                        mock(StateManager.class, Answers.RETURNS_DEEP_STUBS),
+                        mock(DialogService.class),
+                        new DummyFileUpdateMonitor(),
+                        new CurrentThreadTaskExecutor());
+
+        existingEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("Test2023")
+                        .withField(StandardField.AUTHOR, "Test Author");
 
         bibDatabaseContext.getDatabase().insertEntry(existingEntry);
 
-        firstEntryToImport = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "First Author")
-                                                                    .withField(StandardField.YEAR, "2022")
-                                                                    .withCitationKey("FirstAuthorCitationKey2022");
-
-        secondEntryToImport = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Second Author")
-                                                                     .withField(StandardField.YEAR, "2021")
-                                                                     .withCitationKey("SecondAuthorCitationKey20221");
+        firstEntryToImport =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "First Author")
+                        .withField(StandardField.YEAR, "2022")
+                        .withCitationKey("FirstAuthorCitationKey2022");
+
+        secondEntryToImport =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Second Author")
+                        .withField(StandardField.YEAR, "2021")
+                        .withCitationKey("SecondAuthorCitationKey20221");
     }
 
     @Test
     void existingEntryCitesOtherPaperWithCitationKeys() {
-        var citationItems = List.of(new CitationRelationItem(firstEntryToImport, false),
-                new CitationRelationItem(secondEntryToImport, false));
+        var citationItems =
+                List.of(
+                        new CitationRelationItem(firstEntryToImport, false),
+                        new CitationRelationItem(secondEntryToImport, false));
 
         viewModel.importEntries(citationItems, CitationFetcher.SearchType.CITES, existingEntry);
-        assertEquals(Optional.of("FirstAuthorCitationKey2022,SecondAuthorCitationKey20221"), existingEntry.getField(StandardField.CITES));
-        assertEquals(List.of(existingEntry, firstEntryToImport, secondEntryToImport), bibDatabaseContext.getEntries());
+        assertEquals(
+                Optional.of("FirstAuthorCitationKey2022,SecondAuthorCitationKey20221"),
+                existingEntry.getField(StandardField.CITES));
+        assertEquals(
+                List.of(existingEntry, firstEntryToImport, secondEntryToImport),
+                bibDatabaseContext.getEntries());
     }
 
     @Test
     void importedEntriesWithExistingCitationKeysCiteExistingEntry() {
-        var citationItems = List.of(new CitationRelationItem(firstEntryToImport, false),
-                new CitationRelationItem(secondEntryToImport, false));
+        var citationItems =
+                List.of(
+                        new CitationRelationItem(firstEntryToImport, false),
+                        new CitationRelationItem(secondEntryToImport, false));
 
         viewModel.importEntries(citationItems, CitationFetcher.SearchType.CITED_BY, existingEntry);
         assertEquals(Optional.of("Test2023"), firstEntryToImport.getField(StandardField.CITES));
-        assertEquals(List.of(existingEntry, firstEntryToImport, secondEntryToImport), bibDatabaseContext.getEntries());
+        assertEquals(
+                List.of(existingEntry, firstEntryToImport, secondEntryToImport),
+                bibDatabaseContext.getEntries());
     }
 
     @Test
     void existingEntryCitesOtherPaperWithCitationKeysAndExistingCiteField() {
         existingEntry.setField(StandardField.CITES, "Asdf1222");
-        var citationItems = List.of(new CitationRelationItem(firstEntryToImport, false),
-                new CitationRelationItem(secondEntryToImport, false));
+        var citationItems =
+                List.of(
+                        new CitationRelationItem(firstEntryToImport, false),
+                        new CitationRelationItem(secondEntryToImport, false));
 
         viewModel.importEntries(citationItems, CitationFetcher.SearchType.CITES, existingEntry);
-        assertEquals(Optional.of("Asdf1222,FirstAuthorCitationKey2022,SecondAuthorCitationKey20221"), existingEntry.getField(StandardField.CITES));
-        assertEquals(List.of(existingEntry, firstEntryToImport, secondEntryToImport), bibDatabaseContext.getEntries());
+        assertEquals(
+                Optional.of("Asdf1222,FirstAuthorCitationKey2022,SecondAuthorCitationKey20221"),
+                existingEntry.getField(StandardField.CITES));
+        assertEquals(
+                List.of(existingEntry, firstEntryToImport, secondEntryToImport),
+                bibDatabaseContext.getEntries());
     }
 }
diff --git a/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java b/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java
index 95d38b96872c..0696e4212162 100644
--- a/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java
@@ -1,15 +1,14 @@
 package org.jabref.gui.entryeditor.fileannotationtab;
 
-import java.time.LocalDateTime;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.pdf.FileAnnotation;
 import org.jabref.model.pdf.FileAnnotationType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.time.LocalDateTime;
+import java.util.Optional;
 
 class FileAnnotationViewModelTest {
 
@@ -19,15 +18,39 @@ class FileAnnotationViewModelTest {
     @BeforeEach
     void setup() {
         String content = "This is content";
-        String marking = ("This is paragraph 1.%n" +
-                "This is paragr-%naph 2, and it crosses%nseveral lines,%nnow you can see next paragraph:%n"
-                + "This is paragraph%n3.").formatted();
-
-        FileAnnotation linkedFileAnnotation = new FileAnnotation("John", LocalDateTime.now(), 3, content, FileAnnotationType.FREETEXT, Optional.empty());
-        FileAnnotation annotation = new FileAnnotation("Jaroslav Kucha ˇr", LocalDateTime.parse("2017-07-20T10:11:30"), 1, marking, FileAnnotationType.HIGHLIGHT, Optional.of(linkedFileAnnotation));
-        FileAnnotation annotationWithoutFileAnnotation = new FileAnnotation("Jaroslav Kucha ˇr", LocalDateTime.parse("2017-07-20T10:11:30"), 1, marking, FileAnnotationType.HIGHLIGHT, Optional.empty());
+        String marking =
+                ("This is paragraph 1.%n"
+                                + "This is paragr-%naph 2, and it crosses%nseveral lines,%nnow you can see next paragraph:%n"
+                                + "This is paragraph%n3.")
+                        .formatted();
+
+        FileAnnotation linkedFileAnnotation =
+                new FileAnnotation(
+                        "John",
+                        LocalDateTime.now(),
+                        3,
+                        content,
+                        FileAnnotationType.FREETEXT,
+                        Optional.empty());
+        FileAnnotation annotation =
+                new FileAnnotation(
+                        "Jaroslav Kucha ˇr",
+                        LocalDateTime.parse("2017-07-20T10:11:30"),
+                        1,
+                        marking,
+                        FileAnnotationType.HIGHLIGHT,
+                        Optional.of(linkedFileAnnotation));
+        FileAnnotation annotationWithoutFileAnnotation =
+                new FileAnnotation(
+                        "Jaroslav Kucha ˇr",
+                        LocalDateTime.parse("2017-07-20T10:11:30"),
+                        1,
+                        marking,
+                        FileAnnotationType.HIGHLIGHT,
+                        Optional.empty());
         annotationViewModel = new FileAnnotationViewModel(annotation);
-        annotationViewModelWithoutFileAnnotation = new FileAnnotationViewModel(annotationWithoutFileAnnotation);
+        annotationViewModelWithoutFileAnnotation =
+                new FileAnnotationViewModel(annotationWithoutFileAnnotation);
     }
 
     @Test
@@ -52,18 +75,22 @@ void retrieveCorrectContent() {
 
     @Test
     void retrieveCorrectContentWithoutLinkedFileAnnotation() {
-        String expectedMarking = ("This is paragraph 1.%n" +
-                "This is paragraph 2, and it crosses several lines, now you can see next paragraph:%n"
-                + "This is paragraph 3.").formatted();
+        String expectedMarking =
+                ("This is paragraph 1.%n"
+                                + "This is paragraph 2, and it crosses several lines, now you can see next paragraph:%n"
+                                + "This is paragraph 3.")
+                        .formatted();
 
         assertEquals(expectedMarking, annotationViewModelWithoutFileAnnotation.getContent());
     }
 
     @Test
     void removeOnlyLineBreaksNotPrecededByPeriodOrColon() {
-        String expectedMarking = ("This is paragraph 1.%n" +
-                "This is paragraph 2, and it crosses several lines, now you can see next paragraph:%n"
-                + "This is paragraph 3.").formatted();
+        String expectedMarking =
+                ("This is paragraph 1.%n"
+                                + "This is paragraph 2, and it crosses several lines, now you can see next paragraph:%n"
+                                + "This is paragraph 3.")
+                        .formatted();
 
         assertEquals(expectedMarking, annotationViewModel.getMarking());
     }
diff --git a/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java b/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
index 45ac2845fe3e..322fa25ab8cd 100644
--- a/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
@@ -1,9 +1,13 @@
 package org.jabref.gui.exporter;
 
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyCollection;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -27,19 +31,14 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.SaveOrder;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyCollection;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 
 class ExportToClipboardActionTest {
 
@@ -47,7 +46,8 @@ class ExportToClipboardActionTest {
     private final DialogService dialogService = spy(DialogService.class);
     private final ClipBoardManager clipBoardManager = mock(ClipBoardManager.class);
     private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
-    private final CliPreferences preferences = mock(CliPreferences.class, Answers.RETURNS_DEEP_STUBS);
+    private final CliPreferences preferences =
+            mock(CliPreferences.class, Answers.RETURNS_DEEP_STUBS);
     private final StateManager stateManager = mock(StateManager.class);
 
     private TaskExecutor taskExecutor;
@@ -55,21 +55,30 @@ class ExportToClipboardActionTest {
 
     @BeforeEach
     void setUp() {
-        BibEntry entry = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.AUTHOR, "Souti Chattopadhyay and Nicholas Nelson and Audrey Au and Natalia Morales and Christopher Sanchez and Rahul Pandita and Anita Sarma")
-                .withField(StandardField.TITLE, "A tale from the trenches")
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.DOI, "10.1145/3377811.3380330")
-                .withField(StandardField.SUBTITLE, "cognitive biases and software development");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Misc)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Souti Chattopadhyay and Nicholas Nelson and Audrey Au and Natalia Morales and Christopher Sanchez and Rahul Pandita and Anita Sarma")
+                        .withField(StandardField.TITLE, "A tale from the trenches")
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.DOI, "10.1145/3377811.3380330")
+                        .withField(
+                                StandardField.SUBTITLE,
+                                "cognitive biases and software development");
 
         selectedEntries = FXCollections.observableArrayList(entry);
         when(stateManager.getSelectedEntries()).thenReturn(selectedEntries);
 
         taskExecutor = new CurrentThreadTaskExecutor();
-        when(preferences.getExportPreferences().getCustomExporters()).thenReturn(FXCollections.observableList(List.of()));
-        when(preferences.getSelfContainedExportConfiguration()).thenReturn(mock(SelfContainedSaveConfiguration.class));
+        when(preferences.getExportPreferences().getCustomExporters())
+                .thenReturn(FXCollections.observableList(List.of()));
+        when(preferences.getSelfContainedExportConfiguration())
+                .thenReturn(mock(SelfContainedSaveConfiguration.class));
         when(preferences.getXmpPreferences()).thenReturn(mock(XmpPreferences.class));
-        exportToClipboardAction = new ExportToClipboardAction(dialogService, stateManager, clipBoardManager, taskExecutor, preferences);
+        exportToClipboardAction =
+                new ExportToClipboardAction(
+                        dialogService, stateManager, clipBoardManager, taskExecutor, preferences);
     }
 
     @Test
@@ -77,40 +86,57 @@ void executeIfNoSelectedEntries() {
         when(stateManager.getSelectedEntries()).thenReturn(FXCollections.emptyObservableList());
 
         exportToClipboardAction.execute();
-        verify(dialogService, times(1)).notify(Localization.lang("This operation requires one or more entries to be selected."));
+        verify(dialogService, times(1))
+                .notify(
+                        Localization.lang(
+                                "This operation requires one or more entries to be selected."));
     }
 
     @Test
     void executeOnSuccess() {
-        Exporter selectedExporter = new Exporter("html", "HTML", StandardFileType.HTML) {
-            @Override
-            public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries) {
-            }
-        };
-
-        LibraryPreferences libraryPreferences = mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        Exporter selectedExporter =
+                new Exporter("html", "HTML", StandardFileType.HTML) {
+                    @Override
+                    public void export(
+                            BibDatabaseContext databaseContext,
+                            Path file,
+                            List<BibEntry> entries) {}
+                };
+
+        LibraryPreferences libraryPreferences =
+                mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
         FilePreferences filePreferences = mock(FilePreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
         when(preferences.getLibraryPreferences()).thenReturn(libraryPreferences);
         when(preferences.getExportPreferences().getLastExportExtension()).thenReturn("HTML");
-        when(preferences.getSelfContainedExportConfiguration().getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
+        when(preferences.getSelfContainedExportConfiguration().getSaveOrder())
+                .thenReturn(SaveOrder.getDefaultSaveOrder());
         when(stateManager.getSelectedEntries()).thenReturn(selectedEntries);
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         // noinspection ConstantConditions since databaseContext is mocked
-        when(databaseContext.getFileDirectories(preferences.getFilePreferences())).thenReturn(new ArrayList<>(List.of(Path.of("path"))));
+        when(databaseContext.getFileDirectories(preferences.getFilePreferences()))
+                .thenReturn(new ArrayList<>(List.of(Path.of("path"))));
         when(databaseContext.getMetaData()).thenReturn(new MetaData());
         when(dialogService.showChoiceDialogAndWait(
-                eq(Localization.lang("Export")),
-                eq(Localization.lang("Select export format")),
-                eq(Localization.lang("Export")),
-                any(Exporter.class),
-                anyCollection())
-        ).thenReturn(Optional.of(selectedExporter));
+                        eq(Localization.lang("Export")),
+                        eq(Localization.lang("Select export format")),
+                        eq(Localization.lang("Export")),
+                        any(Exporter.class),
+                        anyCollection()))
+                .thenReturn(Optional.of(selectedExporter));
 
         exportToClipboardAction.execute();
-        verify(dialogService, times(1)).showChoiceDialogAndWait(
-                eq(Localization.lang("Export")), eq(Localization.lang("Select export format")),
-                eq(Localization.lang("Export")), any(Exporter.class), anyCollection());
-        verify(dialogService, times(1)).notify(Localization.lang("Entries exported to clipboard") + ": " + selectedEntries.size());
+        verify(dialogService, times(1))
+                .showChoiceDialogAndWait(
+                        eq(Localization.lang("Export")),
+                        eq(Localization.lang("Select export format")),
+                        eq(Localization.lang("Export")),
+                        any(Exporter.class),
+                        anyCollection());
+        verify(dialogService, times(1))
+                .notify(
+                        Localization.lang("Entries exported to clipboard")
+                                + ": "
+                                + selectedEntries.size());
     }
 }
diff --git a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
index bbc91aa2501b..152abfe6dd75 100644
--- a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
@@ -1,12 +1,14 @@
 package org.jabref.gui.exporter;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
@@ -32,23 +34,21 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.SaveOrder;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 class SaveDatabaseActionTest {
 
-    private static final String TEST_BIBTEX_LIBRARY_LOCATION = "C:\\Users\\John_Doe\\Jabref\\literature.bib";
+    private static final String TEST_BIBTEX_LIBRARY_LOCATION =
+            "C:\\Users\\John_Doe\\Jabref\\literature.bib";
     private Path file = Path.of(TEST_BIBTEX_LIBRARY_LOCATION);
     private final DialogService dialogService = mock(DialogService.class);
     private final FilePreferences filePreferences = mock(FilePreferences.class);
@@ -60,15 +60,23 @@ class SaveDatabaseActionTest {
     @BeforeEach
     void setUp() {
         when(libraryTab.getBibDatabaseContext()).thenReturn(dbContext);
-        when(filePreferences.getWorkingDirectory()).thenReturn(Path.of(TEST_BIBTEX_LIBRARY_LOCATION));
+        when(filePreferences.getWorkingDirectory())
+                .thenReturn(Path.of(TEST_BIBTEX_LIBRARY_LOCATION));
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
         when(preferences.getExportPreferences()).thenReturn(mock(ExportPreferences.class));
-        saveDatabaseAction = spy(new SaveDatabaseAction(libraryTab, dialogService, preferences, mock(BibEntryTypesManager.class)));
+        saveDatabaseAction =
+                spy(
+                        new SaveDatabaseAction(
+                                libraryTab,
+                                dialogService,
+                                preferences,
+                                mock(BibEntryTypesManager.class)));
     }
 
     @Test
     void saveAsShouldSetWorkingDirectory() {
-        when(dialogService.showFileSaveDialog(any(FileDialogConfiguration.class))).thenReturn(Optional.of(file));
+        when(dialogService.showFileSaveDialog(any(FileDialogConfiguration.class)))
+                .thenReturn(Optional.of(file));
         doReturn(true).when(saveDatabaseAction).saveAs(any());
 
         saveDatabaseAction.saveAs();
@@ -78,7 +86,8 @@ void saveAsShouldSetWorkingDirectory() {
 
     @Test
     void saveAsShouldNotSetWorkingDirectoryIfNotSelected() {
-        when(dialogService.showFileSaveDialog(any(FileDialogConfiguration.class))).thenReturn(Optional.empty());
+        when(dialogService.showFileSaveDialog(any(FileDialogConfiguration.class)))
+                .thenReturn(Optional.empty());
         doReturn(false).when(saveDatabaseAction).saveAs(any());
 
         saveDatabaseAction.saveAs();
@@ -99,10 +108,12 @@ void saveShouldShowSaveAsIfDatabaseNotSelected() {
 
         saveDatabaseAction.save();
 
-        verify(saveDatabaseAction, times(1)).saveAs(file, SaveDatabaseAction.SaveDatabaseMode.NORMAL);
+        verify(saveDatabaseAction, times(1))
+                .saveAs(file, SaveDatabaseAction.SaveDatabaseMode.NORMAL);
     }
 
-    private SaveDatabaseAction createSaveDatabaseActionForBibDatabase(BibDatabase database) throws IOException {
+    private SaveDatabaseAction createSaveDatabaseActionForBibDatabase(BibDatabase database)
+            throws IOException {
         file = Files.createTempFile("JabRef", ".bib");
         file.toFile().deleteOnExit();
 
@@ -112,10 +123,13 @@ private SaveDatabaseAction createSaveDatabaseActionForBibDatabase(BibDatabase da
         dbContext = mock(BibDatabaseContext.class);
         libraryTab = mock(LibraryTab.class);
         MetaData metaData = mock(MetaData.class);
-        when(saveConfiguration.withSaveType(any(BibDatabaseWriter.SaveType.class))).thenReturn(saveConfiguration);
+        when(saveConfiguration.withSaveType(any(BibDatabaseWriter.SaveType.class)))
+                .thenReturn(saveConfiguration);
         when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
-        GlobalCitationKeyPatterns emptyGlobalCitationKeyPatterns = GlobalCitationKeyPatterns.fromPattern("");
-        when(metaData.getCiteKeyPatterns(any(GlobalCitationKeyPatterns.class))).thenReturn(emptyGlobalCitationKeyPatterns);
+        GlobalCitationKeyPatterns emptyGlobalCitationKeyPatterns =
+                GlobalCitationKeyPatterns.fromPattern("");
+        when(metaData.getCiteKeyPatterns(any(GlobalCitationKeyPatterns.class)))
+                .thenReturn(emptyGlobalCitationKeyPatterns);
         when(dbContext.getDatabasePath()).thenReturn(Optional.of(file));
         when(dbContext.getLocation()).thenReturn(DatabaseLocation.LOCAL);
         when(dbContext.getDatabase()).thenReturn(database);
@@ -125,14 +139,19 @@ private SaveDatabaseAction createSaveDatabaseActionForBibDatabase(BibDatabase da
         when(preferences.getLibraryPreferences()).thenReturn(libraryPreferences);
         when(libraryPreferences.autoSaveProperty()).thenReturn(new SimpleBooleanProperty(false));
         when(preferences.getFieldPreferences()).thenReturn(fieldPreferences);
-        when(preferences.getCitationKeyPatternPreferences()).thenReturn(mock(CitationKeyPatternPreferences.class));
-        when(preferences.getCitationKeyPatternPreferences().getKeyPatterns()).thenReturn(emptyGlobalCitationKeyPatterns);
-        when(preferences.getFieldPreferences().getNonWrappableFields()).thenReturn(FXCollections.emptyObservableList());
+        when(preferences.getCitationKeyPatternPreferences())
+                .thenReturn(mock(CitationKeyPatternPreferences.class));
+        when(preferences.getCitationKeyPatternPreferences().getKeyPatterns())
+                .thenReturn(emptyGlobalCitationKeyPatterns);
+        when(preferences.getFieldPreferences().getNonWrappableFields())
+                .thenReturn(FXCollections.emptyObservableList());
         when(preferences.getLibraryPreferences()).thenReturn(mock(LibraryPreferences.class));
         when(libraryTab.getBibDatabaseContext()).thenReturn(dbContext);
         when(libraryTab.getUndoManager()).thenReturn(mock(CountingUndoManager.class));
         when(libraryTab.getBibDatabaseContext()).thenReturn(dbContext);
-        saveDatabaseAction = new SaveDatabaseAction(libraryTab, dialogService, preferences, mock(BibEntryTypesManager.class));
+        saveDatabaseAction =
+                new SaveDatabaseAction(
+                        libraryTab, dialogService, preferences, mock(BibEntryTypesManager.class));
         return saveDatabaseAction;
     }
 
@@ -147,9 +166,11 @@ void saveKeepsChangedFlag() throws Exception {
         saveDatabaseAction = createSaveDatabaseActionForBibDatabase(database);
         saveDatabaseAction.save();
 
-        assertEquals(database
-                        .getEntries().stream()
-                        .map(BibEntry::hasChanged).filter(changed -> false).collect(Collectors.toList()),
+        assertEquals(
+                database.getEntries().stream()
+                        .map(BibEntry::hasChanged)
+                        .filter(changed -> false)
+                        .collect(Collectors.toList()),
                 Collections.emptyList());
     }
 
diff --git a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
index 937b42d601ae..eae492501f42 100644
--- a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
@@ -1,10 +1,9 @@
 package org.jabref.gui.externalfiles;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.TreeSet;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -16,25 +15,24 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.TreeSet;
 
 class AutoSetFileLinksUtilTest {
 
-    private final ExternalApplicationsPreferences externalApplicationsPreferences = mock(ExternalApplicationsPreferences.class);
+    private final ExternalApplicationsPreferences externalApplicationsPreferences =
+            mock(ExternalApplicationsPreferences.class);
     private final FilePreferences filePreferences = mock(FilePreferences.class);
-    private final AutoLinkPreferences autoLinkPrefs = new AutoLinkPreferences(
-            AutoLinkPreferences.CitationKeyDependency.START,
-            "",
-            false,
-            ';');
+    private final AutoLinkPreferences autoLinkPrefs =
+            new AutoLinkPreferences(
+                    AutoLinkPreferences.CitationKeyDependency.START, "", false, ';');
     private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
     private final BibEntry entry = new BibEntry(StandardEntryType.Article);
     private Path path = null;
@@ -45,14 +43,23 @@ void setUp(@TempDir Path folder) throws Exception {
         Files.createFile(path);
         entry.setCitationKey("CiteKey");
         when(externalApplicationsPreferences.getExternalFileTypes())
-                .thenReturn(FXCollections.observableSet(new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes())));
+                .thenReturn(
+                        FXCollections.observableSet(
+                                new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes())));
     }
 
     @Test
     void findAssociatedNotLinkedFilesSuccess() throws Exception {
-        when(databaseContext.getFileDirectories(any())).thenReturn(Collections.singletonList(path.getParent()));
-        List<LinkedFile> expected = Collections.singletonList(new LinkedFile("", Path.of("CiteKey.pdf"), "PDF"));
-        AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(databaseContext, externalApplicationsPreferences, filePreferences, autoLinkPrefs);
+        when(databaseContext.getFileDirectories(any()))
+                .thenReturn(Collections.singletonList(path.getParent()));
+        List<LinkedFile> expected =
+                Collections.singletonList(new LinkedFile("", Path.of("CiteKey.pdf"), "PDF"));
+        AutoSetFileLinksUtil util =
+                new AutoSetFileLinksUtil(
+                        databaseContext,
+                        externalApplicationsPreferences,
+                        filePreferences,
+                        autoLinkPrefs);
         List<LinkedFile> actual = util.findAssociatedNotLinkedFiles(entry);
         assertEquals(expected, actual);
     }
@@ -60,7 +67,12 @@ void findAssociatedNotLinkedFilesSuccess() throws Exception {
     @Test
     void findAssociatedNotLinkedFilesForEmptySearchDir() throws Exception {
         when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
-        AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(databaseContext, externalApplicationsPreferences, filePreferences, autoLinkPrefs);
+        AutoSetFileLinksUtil util =
+                new AutoSetFileLinksUtil(
+                        databaseContext,
+                        externalApplicationsPreferences,
+                        filePreferences,
+                        autoLinkPrefs);
         List<LinkedFile> actual = util.findAssociatedNotLinkedFiles(entry);
         assertEquals(Collections.emptyList(), actual);
     }
diff --git a/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java b/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java
index 9faa54d6e9f0..86408e42aecf 100755
--- a/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java
@@ -1,5 +1,15 @@
 package org.jabref.gui.externalfiles;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.FileTime;
@@ -10,16 +20,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 class FileFilterUtilsTest {
 
     private final FileFilterUtils fileFilterUtils = new FileFilterUtils();
@@ -118,41 +118,37 @@ void setUp(@TempDir Path tempDir) throws Exception {
 
         @Test
         void sortByDateAscendingPositiveTest() {
-            List<String> sortedPaths = fileFilterUtils
-                .sortByDateAscending(files)
-                .stream()
-                .map(Path::toString)
-                .collect(Collectors.toList());
+            List<String> sortedPaths =
+                    fileFilterUtils.sortByDateAscending(files).stream()
+                            .map(Path::toString)
+                            .collect(Collectors.toList());
             assertEquals(sortedPaths, expectedSortByDateAscending);
         }
 
         @Test
         void sortByDateAscendingNegativeTest() {
-            List<String> sortedPaths = fileFilterUtils
-                .sortByDateAscending(files)
-                .stream()
-                .map(Path::toString)
-                .collect(Collectors.toList());
+            List<String> sortedPaths =
+                    fileFilterUtils.sortByDateAscending(files).stream()
+                            .map(Path::toString)
+                            .collect(Collectors.toList());
             assertNotEquals(sortedPaths, wrongOrder);
         }
 
         @Test
         void sortByDateDescendingPositiveTest() {
-            List<String> sortedPaths = fileFilterUtils
-                .sortByDateDescending(files)
-                .stream()
-                .map(Path::toString)
-                .collect(Collectors.toList());
+            List<String> sortedPaths =
+                    fileFilterUtils.sortByDateDescending(files).stream()
+                            .map(Path::toString)
+                            .collect(Collectors.toList());
             assertEquals(sortedPaths, expectedSortByDateDescending);
         }
 
         @Test
         void sortByDateDescendingNegativeTest() {
-            List<String> sortedPaths = fileFilterUtils
-                .sortByDateDescending(files)
-                .stream()
-                .map(Path::toString)
-                .collect(Collectors.toList());
+            List<String> sortedPaths =
+                    fileFilterUtils.sortByDateDescending(files).stream()
+                            .map(Path::toString)
+                            .collect(Collectors.toList());
             assertNotEquals(sortedPaths, wrongOrder);
         }
     }
diff --git a/src/test/java/org/jabref/gui/externalfiles/GitIgnoreFileFilterTest.java b/src/test/java/org/jabref/gui/externalfiles/GitIgnoreFileFilterTest.java
index c574719bddee..c7c5275d1871 100644
--- a/src/test/java/org/jabref/gui/externalfiles/GitIgnoreFileFilterTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/GitIgnoreFileFilterTest.java
@@ -1,19 +1,21 @@
 package org.jabref.gui.externalfiles;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 class GitIgnoreFileFilterTest {
 
     @Test
     void checkSimpleGitIgnore(@TempDir Path dir) throws Exception {
-        Files.writeString(dir.resolve(".gitignore"), """
+        Files.writeString(
+                dir.resolve(".gitignore"),
+                """
                 *.png
                 """);
         GitIgnoreFileFilter gitIgnoreFileFilter = new GitIgnoreFileFilter(dir);
@@ -22,7 +24,9 @@ void checkSimpleGitIgnore(@TempDir Path dir) throws Exception {
 
     @Test
     void checkSimpleGitIgnoreWithAllowing(@TempDir Path dir) throws Exception {
-        Files.writeString(dir.resolve(".gitignore"), """
+        Files.writeString(
+                dir.resolve(".gitignore"),
+                """
                 !*.png
                 """);
         GitIgnoreFileFilter gitIgnoreFileFilter = new GitIgnoreFileFilter(dir);
@@ -31,7 +35,9 @@ void checkSimpleGitIgnoreWithAllowing(@TempDir Path dir) throws Exception {
 
     @Test
     void checkSimpleGitIgnoreWithOverwritingDefs(@TempDir Path dir) throws Exception {
-        Files.writeString(dir.resolve(".gitignore"), """
+        Files.writeString(
+                dir.resolve(".gitignore"),
+                """
                 !*.png
                 *.png
                 """);
@@ -41,7 +47,9 @@ void checkSimpleGitIgnoreWithOverwritingDefs(@TempDir Path dir) throws Exception
 
     @Test
     void checkDirectoryGitIgnore(@TempDir Path dir) throws Exception {
-        Files.writeString(dir.resolve(".gitignore"), """
+        Files.writeString(
+                dir.resolve(".gitignore"),
+                """
                 **/*.png
                 """);
         GitIgnoreFileFilter gitIgnoreFileFilter = new GitIgnoreFileFilter(dir);
diff --git a/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java b/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java
index 8dadc909ff18..3dbfa1a8958b 100644
--- a/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java
@@ -1,8 +1,11 @@
 package org.jabref.gui.externalfiles;
 
-import java.util.List;
-
-import javax.swing.undo.UndoManager;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -22,7 +25,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
@@ -30,35 +32,31 @@
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.List;
 
-class ImportHandlerTest {
+import javax.swing.undo.UndoManager;
 
+class ImportHandlerTest {
 
     private ImportHandler importHandler;
     private BibDatabaseContext bibDatabaseContext;
     private BibEntry testEntry;
 
-    @Mock
-    private GuiPreferences preferences;
-    @Mock
-    private DuplicateCheck duplicateCheck;
+    @Mock private GuiPreferences preferences;
+    @Mock private DuplicateCheck duplicateCheck;
 
     @BeforeEach
     void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(preferences.getImportFormatPreferences()).thenReturn(importFormatPreferences);
         when(preferences.getFilePreferences()).thenReturn(mock(FilePreferences.class));
 
         FieldPreferences fieldPreferences = mock(FieldPreferences.class);
-        when(fieldPreferences.getNonWrappableFields()).thenReturn(FXCollections.observableArrayList());
+        when(fieldPreferences.getNonWrappableFields())
+                .thenReturn(FXCollections.observableArrayList());
         when(preferences.getFieldPreferences()).thenReturn(fieldPreferences);
 
         bibDatabaseContext = mock(BibDatabaseContext.class);
@@ -66,47 +64,53 @@ void setUp() {
         when(bibDatabaseContext.getMode()).thenReturn(BibDatabaseMode.BIBTEX);
         when(bibDatabaseContext.getDatabase()).thenReturn(bibDatabase);
         when(duplicateCheck.isDuplicate(any(), any(), any())).thenReturn(false);
-        importHandler = new ImportHandler(
-                bibDatabaseContext,
-                preferences,
-                new DummyFileUpdateMonitor(),
-                mock(UndoManager.class),
-                mock(StateManager.class),
-                mock(DialogService.class),
-                new CurrentThreadTaskExecutor()
-                );
-
-        testEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Test2023")
-                .withField(StandardField.AUTHOR, "Test Author");
+        importHandler =
+                new ImportHandler(
+                        bibDatabaseContext,
+                        preferences,
+                        new DummyFileUpdateMonitor(),
+                        mock(UndoManager.class),
+                        mock(StateManager.class),
+                        mock(DialogService.class),
+                        new CurrentThreadTaskExecutor());
+
+        testEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("Test2023")
+                        .withField(StandardField.AUTHOR, "Test Author");
     }
 
     @Test
     void handleBibTeXData() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
 
         GuiPreferences preferences = mock(GuiPreferences.class);
         when(preferences.getImportFormatPreferences()).thenReturn(importFormatPreferences);
         when(preferences.getFilePreferences()).thenReturn(mock(FilePreferences.class));
 
-        ImportHandler importHandler = new ImportHandler(
-                mock(BibDatabaseContext.class),
-                preferences,
-                new DummyFileUpdateMonitor(),
-                mock(UndoManager.class),
-                mock(StateManager.class),
-                mock(DialogService.class),
-                new CurrentThreadTaskExecutor());
-
-        List<BibEntry> bibEntries = importHandler.handleBibTeXData("""
+        ImportHandler importHandler =
+                new ImportHandler(
+                        mock(BibDatabaseContext.class),
+                        preferences,
+                        new DummyFileUpdateMonitor(),
+                        mock(UndoManager.class),
+                        mock(StateManager.class),
+                        mock(DialogService.class),
+                        new CurrentThreadTaskExecutor());
+
+        List<BibEntry> bibEntries =
+                importHandler.handleBibTeXData(
+                        """
                 @InProceedings{Wen2013,
                   library          = {Tagungen\\2013\\KWTK45\\},
                 }
                 """);
 
-        BibEntry expected = new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey("Wen2013")
-                .withField(StandardField.LIBRARY, "Tagungen\\2013\\KWTK45\\");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey("Wen2013")
+                        .withField(StandardField.LIBRARY, "Tagungen\\2013\\KWTK45\\");
 
         assertEquals(List.of(expected), bibEntries.stream().toList());
     }
@@ -127,28 +131,45 @@ void findDuplicateTest() {
     @Test
     void handleDuplicatesKeepRightTest() {
         // Arrange
-        BibEntry duplicateEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Duplicate2023")
-                .withField(StandardField.AUTHOR, "Duplicate Author");
+        BibEntry duplicateEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("Duplicate2023")
+                        .withField(StandardField.AUTHOR, "Duplicate Author");
 
         BibDatabase bibDatabase = bibDatabaseContext.getDatabase();
-        bibDatabase.insertEntry(duplicateEntry); // Simulate that the duplicate entry is already in the database
-
-        DuplicateDecisionResult decisionResult = new DuplicateDecisionResult(DuplicateResolverDialog.DuplicateResolverResult.KEEP_RIGHT, null);
-        importHandler = Mockito.spy(new ImportHandler(
-                bibDatabaseContext,
-                preferences,
-                new DummyFileUpdateMonitor(),
-                mock(UndoManager.class),
-                mock(StateManager.class),
-                mock(DialogService.class),
-                new CurrentThreadTaskExecutor()
-        ));
+        bibDatabase.insertEntry(
+                duplicateEntry); // Simulate that the duplicate entry is already in the database
+
+        DuplicateDecisionResult decisionResult =
+                new DuplicateDecisionResult(
+                        DuplicateResolverDialog.DuplicateResolverResult.KEEP_RIGHT, null);
+        importHandler =
+                Mockito.spy(
+                        new ImportHandler(
+                                bibDatabaseContext,
+                                preferences,
+                                new DummyFileUpdateMonitor(),
+                                mock(UndoManager.class),
+                                mock(StateManager.class),
+                                mock(DialogService.class),
+                                new CurrentThreadTaskExecutor()));
         // Mock the behavior of getDuplicateDecision to return KEEP_RIGHT
-        Mockito.doReturn(decisionResult).when(importHandler).getDuplicateDecision(testEntry, duplicateEntry, DuplicateResolverDialog.DuplicateResolverResult.BREAK);
+        Mockito.doReturn(decisionResult)
+                .when(importHandler)
+                .getDuplicateDecision(
+                        testEntry,
+                        duplicateEntry,
+                        DuplicateResolverDialog.DuplicateResolverResult.BREAK);
 
         // Act
-        BibEntry result = importHandler.handleDuplicates(bibDatabaseContext, testEntry, duplicateEntry, DuplicateResolverDialog.DuplicateResolverResult.BREAK).get();
+        BibEntry result =
+                importHandler
+                        .handleDuplicates(
+                                bibDatabaseContext,
+                                testEntry,
+                                duplicateEntry,
+                                DuplicateResolverDialog.DuplicateResolverResult.BREAK)
+                        .get();
 
         // Assert that the duplicate entry was removed from the database
         assertFalse(bibDatabase.getEntries().contains(duplicateEntry));
@@ -159,68 +180,112 @@ void handleDuplicatesKeepRightTest() {
     @Test
     void handleDuplicatesKeepBothTest() {
         // Arrange
-        BibEntry duplicateEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Duplicate2023")
-                .withField(StandardField.AUTHOR, "Duplicate Author");
+        BibEntry duplicateEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("Duplicate2023")
+                        .withField(StandardField.AUTHOR, "Duplicate Author");
 
         BibDatabase bibDatabase = bibDatabaseContext.getDatabase();
-        bibDatabase.insertEntry(duplicateEntry); // Simulate that the duplicate entry is already in the database
-
-        DuplicateDecisionResult decisionResult = new DuplicateDecisionResult(DuplicateResolverDialog.DuplicateResolverResult.KEEP_BOTH, null);
-        importHandler = Mockito.spy(new ImportHandler(
-                bibDatabaseContext,
-                preferences,
-                new DummyFileUpdateMonitor(),
-                mock(UndoManager.class),
-                mock(StateManager.class),
-                mock(DialogService.class),
-                new CurrentThreadTaskExecutor()
-        ));
+        bibDatabase.insertEntry(
+                duplicateEntry); // Simulate that the duplicate entry is already in the database
+
+        DuplicateDecisionResult decisionResult =
+                new DuplicateDecisionResult(
+                        DuplicateResolverDialog.DuplicateResolverResult.KEEP_BOTH, null);
+        importHandler =
+                Mockito.spy(
+                        new ImportHandler(
+                                bibDatabaseContext,
+                                preferences,
+                                new DummyFileUpdateMonitor(),
+                                mock(UndoManager.class),
+                                mock(StateManager.class),
+                                mock(DialogService.class),
+                                new CurrentThreadTaskExecutor()));
         // Mock the behavior of getDuplicateDecision to return KEEP_BOTH
-        Mockito.doReturn(decisionResult).when(importHandler).getDuplicateDecision(testEntry, duplicateEntry, DuplicateResolverDialog.DuplicateResolverResult.BREAK);
+        Mockito.doReturn(decisionResult)
+                .when(importHandler)
+                .getDuplicateDecision(
+                        testEntry,
+                        duplicateEntry,
+                        DuplicateResolverDialog.DuplicateResolverResult.BREAK);
 
         // Act
-        BibEntry result = importHandler.handleDuplicates(bibDatabaseContext, testEntry, duplicateEntry, DuplicateResolverDialog.DuplicateResolverResult.BREAK).get();
+        BibEntry result =
+                importHandler
+                        .handleDuplicates(
+                                bibDatabaseContext,
+                                testEntry,
+                                duplicateEntry,
+                                DuplicateResolverDialog.DuplicateResolverResult.BREAK)
+                        .get();
 
         // Assert
-        assertTrue(bibDatabase.getEntries().contains(duplicateEntry)); // Assert that the duplicate entry is still in the database
+        assertTrue(
+                bibDatabase
+                        .getEntries()
+                        .contains(
+                                duplicateEntry)); // Assert that the duplicate entry is still in the
+                                                  // database
         assertEquals(testEntry, result); // Assert that the original entry is returned
     }
 
     @Test
     void handleDuplicatesKeepMergeTest() {
         // Arrange
-        BibEntry duplicateEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Duplicate2023")
-                .withField(StandardField.AUTHOR, "Duplicate Author");
+        BibEntry duplicateEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("Duplicate2023")
+                        .withField(StandardField.AUTHOR, "Duplicate Author");
 
-        BibEntry mergedEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Merged2023")
-                .withField(StandardField.AUTHOR, "Merged Author");
+        BibEntry mergedEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("Merged2023")
+                        .withField(StandardField.AUTHOR, "Merged Author");
 
         BibDatabase bibDatabase = bibDatabaseContext.getDatabase();
-        bibDatabase.insertEntry(duplicateEntry); // Simulate that the duplicate entry is already in the database
-
-        DuplicateDecisionResult decisionResult = new DuplicateDecisionResult(DuplicateResolverDialog.DuplicateResolverResult.KEEP_MERGE, mergedEntry);
-        importHandler = Mockito.spy(new ImportHandler(
-                bibDatabaseContext,
-                preferences,
-                new DummyFileUpdateMonitor(),
-                mock(UndoManager.class),
-                mock(StateManager.class),
-                mock(DialogService.class),
-                new CurrentThreadTaskExecutor()
-        ));
+        bibDatabase.insertEntry(
+                duplicateEntry); // Simulate that the duplicate entry is already in the database
+
+        DuplicateDecisionResult decisionResult =
+                new DuplicateDecisionResult(
+                        DuplicateResolverDialog.DuplicateResolverResult.KEEP_MERGE, mergedEntry);
+        importHandler =
+                Mockito.spy(
+                        new ImportHandler(
+                                bibDatabaseContext,
+                                preferences,
+                                new DummyFileUpdateMonitor(),
+                                mock(UndoManager.class),
+                                mock(StateManager.class),
+                                mock(DialogService.class),
+                                new CurrentThreadTaskExecutor()));
         // Mock the behavior of getDuplicateDecision to return KEEP_MERGE
-        Mockito.doReturn(decisionResult).when(importHandler).getDuplicateDecision(testEntry, duplicateEntry, DuplicateResolverDialog.DuplicateResolverResult.BREAK);
+        Mockito.doReturn(decisionResult)
+                .when(importHandler)
+                .getDuplicateDecision(
+                        testEntry,
+                        duplicateEntry,
+                        DuplicateResolverDialog.DuplicateResolverResult.BREAK);
 
         // Act
         // create and return a default BibEntry or do other computations
-        BibEntry result = importHandler.handleDuplicates(bibDatabaseContext, testEntry, duplicateEntry, DuplicateResolverDialog.DuplicateResolverResult.BREAK)
-                                       .orElseGet(BibEntry::new);
+        BibEntry result =
+                importHandler
+                        .handleDuplicates(
+                                bibDatabaseContext,
+                                testEntry,
+                                duplicateEntry,
+                                DuplicateResolverDialog.DuplicateResolverResult.BREAK)
+                        .orElseGet(BibEntry::new);
 
         // Assert
-        assertFalse(bibDatabase.getEntries().contains(duplicateEntry)); // Assert that the duplicate entry was removed from the database
+        assertFalse(
+                bibDatabase
+                        .getEntries()
+                        .contains(
+                                duplicateEntry)); // Assert that the duplicate entry was removed
+                                                  // from the database
         assertEquals(mergedEntry, result); // Assert that the merged entry is returned
     }
 }
diff --git a/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java b/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java
index 7a76317ddbd5..5f9fc860a3bc 100644
--- a/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java
@@ -1,9 +1,11 @@
 package org.jabref.gui.externalfiles;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import static java.nio.file.DirectoryStream.Filter;
 
 import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.gui.util.FileNodeViewModel;
@@ -12,21 +14,21 @@
 import org.jabref.logic.externalfiles.ExternalFileSorter;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static java.nio.file.DirectoryStream.Filter;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Stream;
 
 class UnlinkedFilesCrawlerTest {
 
     @Test
     void minimalGitIgnore(@TempDir Path testRoot) throws Exception {
-        Files.writeString(testRoot.resolve(".gitignore"), """
+        Files.writeString(
+                testRoot.resolve(".gitignore"),
+                """
                 *.png
                 """);
         Path subDir = testRoot.resolve("subdir");
@@ -36,9 +38,17 @@ void minimalGitIgnore(@TempDir Path testRoot) throws Exception {
         UnlinkedPDFFileFilter unlinkedPDFFileFilter = mock(UnlinkedPDFFileFilter.class);
         when(unlinkedPDFFileFilter.accept(any(Path.class))).thenReturn(true);
 
-        UnlinkedFilesCrawler unlinkedFilesCrawler = new UnlinkedFilesCrawler(testRoot, unlinkedPDFFileFilter, DateRange.ALL_TIME, ExternalFileSorter.DEFAULT, mock(BibDatabaseContext.class), mock(FilePreferences.class));
+        UnlinkedFilesCrawler unlinkedFilesCrawler =
+                new UnlinkedFilesCrawler(
+                        testRoot,
+                        unlinkedPDFFileFilter,
+                        DateRange.ALL_TIME,
+                        ExternalFileSorter.DEFAULT,
+                        mock(BibDatabaseContext.class),
+                        mock(FilePreferences.class));
 
-        FileNodeViewModel fileNodeViewModel = unlinkedFilesCrawler.searchDirectory(testRoot, unlinkedPDFFileFilter);
+        FileNodeViewModel fileNodeViewModel =
+                unlinkedFilesCrawler.searchDirectory(testRoot, unlinkedPDFFileFilter);
 
         assertEquals(new FileNodeViewModel(testRoot), fileNodeViewModel);
     }
@@ -54,13 +64,26 @@ void excludingTheCurrentLibraryTest(@TempDir Path testRoot) throws IOException {
         BibDatabaseContext databaseContext = new BibDatabaseContext();
         databaseContext.setDatabasePath(databasePath);
 
-        ExternalApplicationsPreferences externalApplicationsPreferences = mock(ExternalApplicationsPreferences.class);
-        Filter<Path> fileExtensionFilter = new FileExtensionViewModel(StandardFileType.ANY_FILE, externalApplicationsPreferences).dirFilter();
+        ExternalApplicationsPreferences externalApplicationsPreferences =
+                mock(ExternalApplicationsPreferences.class);
+        Filter<Path> fileExtensionFilter =
+                new FileExtensionViewModel(
+                                StandardFileType.ANY_FILE, externalApplicationsPreferences)
+                        .dirFilter();
         FilePreferences filePreferences = mock(FilePreferences.class);
-        UnlinkedPDFFileFilter unlinkedPdfFileFilter = new UnlinkedPDFFileFilter(fileExtensionFilter, databaseContext, filePreferences);
+        UnlinkedPDFFileFilter unlinkedPdfFileFilter =
+                new UnlinkedPDFFileFilter(fileExtensionFilter, databaseContext, filePreferences);
 
-        UnlinkedFilesCrawler unlinkedFilesCrawler = new UnlinkedFilesCrawler(testRoot, unlinkedPdfFileFilter, DateRange.ALL_TIME, ExternalFileSorter.DEFAULT, databaseContext, filePreferences);
-        FileNodeViewModel fileNodeViewModel = unlinkedFilesCrawler.searchDirectory(testRoot, unlinkedPdfFileFilter);
+        UnlinkedFilesCrawler unlinkedFilesCrawler =
+                new UnlinkedFilesCrawler(
+                        testRoot,
+                        unlinkedPdfFileFilter,
+                        DateRange.ALL_TIME,
+                        ExternalFileSorter.DEFAULT,
+                        databaseContext,
+                        filePreferences);
+        FileNodeViewModel fileNodeViewModel =
+                unlinkedFilesCrawler.searchDirectory(testRoot, unlinkedPdfFileFilter);
 
         // checking to see if the database file has been filtered
         try (Stream<Path> filesInitially = Files.list(testRoot)) {
diff --git a/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypesTest.java b/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypesTest.java
index 0a5ad1a54871..471936edb7e9 100644
--- a/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypesTest.java
+++ b/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypesTest.java
@@ -1,96 +1,120 @@
 package org.jabref.gui.externalfiletype;
 
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Optional;
-import java.util.Set;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.model.entry.LinkedFile;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.Set;
 
 class ExternalFileTypesTest {
-    private static final Set<ExternalFileType> TEST_LIST = Set.of(
-            StandardExternalFileType.MARKDOWN,
-            StandardExternalFileType.PDF,
-            StandardExternalFileType.URL,
-            StandardExternalFileType.JPG,
-            StandardExternalFileType.TXT);
-
-    private static final String TEST_STRINGLIST = "PostScript:REMOVED;" +
-            "Word:REMOVED;" +
-            "Word 2007+:REMOVED;" +
-            "OpenDocument text:REMOVED;" +
-            "Excel:REMOVED;" +
-            "Excel 2007+:REMOVED;" +
-            "OpenDocument spreadsheet:REMOVED;" +
-            "PowerPoint:REMOVED;" +
-            "PowerPoint 2007+:REMOVED;" +
-            "OpenDocument presentation:REMOVED;" +
-            "Rich Text Format:REMOVED;" +
-            "PNG image:REMOVED;" +
-            "GIF image:REMOVED;" +
-            "Djvu:REMOVED;" +
-            "LaTeX:REMOVED;" +
-            "CHM:REMOVED;" +
-            "TIFF image:REMOVED;" +
-            "MHT:REMOVED;" +
-            "ePUB:REMOVED";
-
-    private final ExternalApplicationsPreferences externalApplicationsPreferences = mock(ExternalApplicationsPreferences.class);
+    private static final Set<ExternalFileType> TEST_LIST =
+            Set.of(
+                    StandardExternalFileType.MARKDOWN,
+                    StandardExternalFileType.PDF,
+                    StandardExternalFileType.URL,
+                    StandardExternalFileType.JPG,
+                    StandardExternalFileType.TXT);
+
+    private static final String TEST_STRINGLIST =
+            "PostScript:REMOVED;"
+                    + "Word:REMOVED;"
+                    + "Word 2007+:REMOVED;"
+                    + "OpenDocument text:REMOVED;"
+                    + "Excel:REMOVED;"
+                    + "Excel 2007+:REMOVED;"
+                    + "OpenDocument spreadsheet:REMOVED;"
+                    + "PowerPoint:REMOVED;"
+                    + "PowerPoint 2007+:REMOVED;"
+                    + "OpenDocument presentation:REMOVED;"
+                    + "Rich Text Format:REMOVED;"
+                    + "PNG image:REMOVED;"
+                    + "GIF image:REMOVED;"
+                    + "Djvu:REMOVED;"
+                    + "LaTeX:REMOVED;"
+                    + "CHM:REMOVED;"
+                    + "TIFF image:REMOVED;"
+                    + "MHT:REMOVED;"
+                    + "ePUB:REMOVED";
+
+    private final ExternalApplicationsPreferences externalApplicationsPreferences =
+            mock(ExternalApplicationsPreferences.class);
 
     @BeforeEach
     void setUp() {
-        when(externalApplicationsPreferences.getExternalFileTypes()).thenReturn(FXCollections.observableSet(TEST_LIST));
+        when(externalApplicationsPreferences.getExternalFileTypes())
+                .thenReturn(FXCollections.observableSet(TEST_LIST));
     }
 
     @Test
     void getExternalFileTypeByName() {
-        assertEquals(Optional.of(StandardExternalFileType.PDF), ExternalFileTypes.getExternalFileTypeByName("PDF", externalApplicationsPreferences));
+        assertEquals(
+                Optional.of(StandardExternalFileType.PDF),
+                ExternalFileTypes.getExternalFileTypeByName(
+                        "PDF", externalApplicationsPreferences));
     }
 
     @Test
     void getExternalFileTypeByExt() {
-        assertEquals(Optional.of(StandardExternalFileType.URL), ExternalFileTypes.getExternalFileTypeByExt("html", externalApplicationsPreferences));
+        assertEquals(
+                Optional.of(StandardExternalFileType.URL),
+                ExternalFileTypes.getExternalFileTypeByExt(
+                        "html", externalApplicationsPreferences));
     }
 
     @Test
     void isExternalFileTypeByExt() {
-        assertTrue(ExternalFileTypes.isExternalFileTypeByExt("html", externalApplicationsPreferences));
-        assertFalse(ExternalFileTypes.isExternalFileTypeByExt("tst", externalApplicationsPreferences));
+        assertTrue(
+                ExternalFileTypes.isExternalFileTypeByExt("html", externalApplicationsPreferences));
+        assertFalse(
+                ExternalFileTypes.isExternalFileTypeByExt("tst", externalApplicationsPreferences));
     }
 
     @Test
     void getExternalFileTypeForName() {
-        assertEquals(Optional.of(StandardExternalFileType.JPG), ExternalFileTypes.getExternalFileTypeForName("testfile.jpg", externalApplicationsPreferences));
+        assertEquals(
+                Optional.of(StandardExternalFileType.JPG),
+                ExternalFileTypes.getExternalFileTypeForName(
+                        "testfile.jpg", externalApplicationsPreferences));
     }
 
     @Test
     void getExternalFileTypeByMimeType() {
-        assertEquals(Optional.of(StandardExternalFileType.TXT), ExternalFileTypes.getExternalFileTypeByMimeType("text/plain", externalApplicationsPreferences));
+        assertEquals(
+                Optional.of(StandardExternalFileType.TXT),
+                ExternalFileTypes.getExternalFileTypeByMimeType(
+                        "text/plain", externalApplicationsPreferences));
     }
 
     @Test
     void getExternalFileTypeByFile() {
         Path testfile = Path.of("testfile.txt");
-        assertEquals(Optional.of(StandardExternalFileType.TXT), ExternalFileTypes.getExternalFileTypeByFile(testfile, externalApplicationsPreferences));
+        assertEquals(
+                Optional.of(StandardExternalFileType.TXT),
+                ExternalFileTypes.getExternalFileTypeByFile(
+                        testfile, externalApplicationsPreferences));
     }
 
     @Test
     void getExternalFileTypeByLinkedFile() {
-        LinkedFile testfile = new LinkedFile("A testfile", "https://testserver.com/testfile.pdf", "PDF");
-        assertEquals(Optional.of(StandardExternalFileType.PDF), ExternalFileTypes.getExternalFileTypeByLinkedFile(testfile, false, externalApplicationsPreferences));
+        LinkedFile testfile =
+                new LinkedFile("A testfile", "https://testserver.com/testfile.pdf", "PDF");
+        assertEquals(
+                Optional.of(StandardExternalFileType.PDF),
+                ExternalFileTypes.getExternalFileTypeByLinkedFile(
+                        testfile, false, externalApplicationsPreferences));
     }
 
     @Test
@@ -109,14 +133,17 @@ void fromString() {
 
     @Test
     void externalFileTypetoStringArray() {
-        ExternalFileType type = new CustomExternalFileType(
-                "testEntry",
-                "tst",
-                "text/plain",
-                "emacs",
-                "close",
-                IconTheme.JabRefIcons.CLOSE);
-
-        assertEquals("[testEntry, tst, text/plain, emacs, CLOSE]", Arrays.toString(type.toStringArray()));
+        ExternalFileType type =
+                new CustomExternalFileType(
+                        "testEntry",
+                        "tst",
+                        "text/plain",
+                        "emacs",
+                        "close",
+                        IconTheme.JabRefIcons.CLOSE);
+
+        assertEquals(
+                "[testEntry, tst, text/plain, emacs, CLOSE]",
+                Arrays.toString(type.toStringArray()));
     }
 }
diff --git a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
index 04295b6cb4c6..ad43c7589482 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
@@ -1,17 +1,17 @@
 package org.jabref.gui.fieldeditors;
 
-import java.io.IOException;
-import java.net.CookieHandler;
-import java.net.CookieManager;
-import java.net.CookiePolicy;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
-import java.util.TreeSet;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 import javafx.scene.control.ButtonType;
@@ -32,7 +32,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.testutils.category.GUITest;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -43,20 +42,21 @@
 import org.junit.jupiter.params.provider.ValueSource;
 import org.testfx.framework.junit5.ApplicationExtension;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.net.CookieHandler;
+import java.net.CookieManager;
+import java.net.CookiePolicy;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.TreeSet;
 
-// Need to run on JavaFX thread since {@link org.jabref.gui.linkedfile.DeleteFileAction.execute} creates a DialogPane
+// Need to run on JavaFX thread since {@link org.jabref.gui.linkedfile.DeleteFileAction.execute}
+// creates a DialogPane
 @ExtendWith(ApplicationExtension.class)
 @GUITest
 class LinkedFileViewModelTest {
@@ -67,23 +67,27 @@ class LinkedFileViewModelTest {
     private BibDatabaseContext databaseContext;
     private TaskExecutor taskExecutor;
     private DialogService dialogService;
-    private final ExternalApplicationsPreferences externalApplicationsPreferences = mock(ExternalApplicationsPreferences.class);
+    private final ExternalApplicationsPreferences externalApplicationsPreferences =
+            mock(ExternalApplicationsPreferences.class);
     private final FilePreferences filePreferences = mock(FilePreferences.class);
     private final GuiPreferences preferences = mock(GuiPreferences.class);
     private CookieManager cookieManager;
 
     @BeforeEach
     void setUp(@TempDir Path tempFolder) throws Exception {
-        entry = new BibEntry()
-                .withCitationKey("asdf");
+        entry = new BibEntry().withCitationKey("asdf");
 
         databaseContext = new BibDatabaseContext();
         taskExecutor = mock(TaskExecutor.class);
         dialogService = mock(DialogService.class);
 
-        when(externalApplicationsPreferences.getExternalFileTypes()).thenReturn(FXCollections.observableSet(new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes())));
+        when(externalApplicationsPreferences.getExternalFileTypes())
+                .thenReturn(
+                        FXCollections.observableSet(
+                                new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes())));
         when(filePreferences.confirmDeleteLinkedFile()).thenReturn(true);
-        when(preferences.getExternalApplicationsPreferences()).thenReturn(externalApplicationsPreferences);
+        when(preferences.getExternalApplicationsPreferences())
+                .thenReturn(externalApplicationsPreferences);
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
         when(preferences.getXmpPreferences()).thenReturn(mock(XmpPreferences.class));
         tempFile = tempFolder.resolve("temporaryFile");
@@ -106,11 +110,21 @@ void tearDown() {
 
     @Test
     void deleteWhenFilePathNotPresentReturnsTrue() {
-        // Making this a spy, so we can inject an empty optional without digging into the implementation
+        // Making this a spy, so we can inject an empty optional without digging into the
+        // implementation
         linkedFile = spy(new LinkedFile("", Path.of("nonexistent file"), ""));
-        doReturn(Optional.empty()).when(linkedFile).findIn(any(BibDatabaseContext.class), any(FilePreferences.class));
-
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
+        doReturn(Optional.empty())
+                .when(linkedFile)
+                .findIn(any(BibDatabaseContext.class), any(FilePreferences.class));
+
+        LinkedFileViewModel viewModel =
+                new LinkedFileViewModel(
+                        linkedFile,
+                        entry,
+                        databaseContext,
+                        taskExecutor,
+                        dialogService,
+                        preferences);
         boolean removed = viewModel.delete();
 
         assertTrue(removed);
@@ -124,13 +138,24 @@ void deleteWhenRemoveChosenReturnsTrueButDoesNotDeletesFile() {
         linkedFile = new LinkedFile("", tempFile, "");
         // Mock the dialog created at {@link org.jabref.gui.linkedfile.DeleteFileAction.execute}
         when(dialogService.showCustomDialogAndWait(
-                anyString(),
-                any(DialogPane.class),
-                any(ButtonType.class),
-                any(ButtonType.class),
-                any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(2))); // first vararg - remove button
-
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
+                        anyString(),
+                        any(DialogPane.class),
+                        any(ButtonType.class),
+                        any(ButtonType.class),
+                        any(ButtonType.class)))
+                .thenAnswer(
+                        invocation ->
+                                Optional.of(
+                                        invocation.getArgument(2))); // first vararg - remove button
+
+        LinkedFileViewModel viewModel =
+                new LinkedFileViewModel(
+                        linkedFile,
+                        entry,
+                        databaseContext,
+                        taskExecutor,
+                        dialogService,
+                        preferences);
         boolean removed = viewModel.delete();
 
         assertTrue(removed);
@@ -141,13 +166,25 @@ void deleteWhenRemoveChosenReturnsTrueButDoesNotDeletesFile() {
     void deleteWhenDeleteChosenReturnsTrueAndDeletesFile() {
         linkedFile = new LinkedFile("", tempFile, "");
         when(dialogService.showCustomDialogAndWait(
-                anyString(),
-                any(DialogPane.class),
-                any(ButtonType.class),
-                any(ButtonType.class),
-                any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(3))); // second vararg - delete button
-
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
+                        anyString(),
+                        any(DialogPane.class),
+                        any(ButtonType.class),
+                        any(ButtonType.class),
+                        any(ButtonType.class)))
+                .thenAnswer(
+                        invocation ->
+                                Optional.of(
+                                        invocation.getArgument(
+                                                3))); // second vararg - delete button
+
+        LinkedFileViewModel viewModel =
+                new LinkedFileViewModel(
+                        linkedFile,
+                        entry,
+                        databaseContext,
+                        taskExecutor,
+                        dialogService,
+                        preferences);
         boolean removed = viewModel.delete();
 
         assertTrue(removed);
@@ -158,13 +195,25 @@ void deleteWhenDeleteChosenReturnsTrueAndDeletesFile() {
     void deleteMissingFileReturnsTrue() {
         linkedFile = new LinkedFile("", Path.of("!!nonexistent file!!"), "");
         when(dialogService.showCustomDialogAndWait(
-                anyString(),
-                any(DialogPane.class),
-                any(ButtonType.class),
-                any(ButtonType.class),
-                any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(3))); // second vararg - delete button
-
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
+                        anyString(),
+                        any(DialogPane.class),
+                        any(ButtonType.class),
+                        any(ButtonType.class),
+                        any(ButtonType.class)))
+                .thenAnswer(
+                        invocation ->
+                                Optional.of(
+                                        invocation.getArgument(
+                                                3))); // second vararg - delete button
+
+        LinkedFileViewModel viewModel =
+                new LinkedFileViewModel(
+                        linkedFile,
+                        entry,
+                        databaseContext,
+                        taskExecutor,
+                        dialogService,
+                        preferences);
         boolean removed = viewModel.delete();
 
         assertTrue(removed);
@@ -174,13 +223,24 @@ void deleteMissingFileReturnsTrue() {
     void deleteWhenDialogCancelledReturnsFalseAndDoesNotRemoveFile() {
         linkedFile = new LinkedFile("desc", tempFile, "pdf");
         when(dialogService.showCustomDialogAndWait(
-                anyString(),
-                any(DialogPane.class),
-                any(ButtonType.class),
-                any(ButtonType.class),
-                any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(4))); // third vararg - cancel button
-
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
+                        anyString(),
+                        any(DialogPane.class),
+                        any(ButtonType.class),
+                        any(ButtonType.class),
+                        any(ButtonType.class)))
+                .thenAnswer(
+                        invocation ->
+                                Optional.of(
+                                        invocation.getArgument(4))); // third vararg - cancel button
+
+        LinkedFileViewModel viewModel =
+                new LinkedFileViewModel(
+                        linkedFile,
+                        entry,
+                        databaseContext,
+                        taskExecutor,
+                        dialogService,
+                        preferences);
         boolean removed = viewModel.delete();
 
         assertFalse(removed);
@@ -189,10 +249,11 @@ void deleteWhenDialogCancelledReturnsFalseAndDoesNotRemoveFile() {
 
     @ParameterizedTest
     @CsvSource({
-            "true, Download 'https://www.google.com/' was a HTML file. Keeping URL.",
-            "false, Download 'https://www.google.com/' was a HTML file. Removed."
+        "true, Download 'https://www.google.com/' was a HTML file. Keeping URL.",
+        "false, Download 'https://www.google.com/' was a HTML file. Removed."
     })
-    void downloadHtmlFileCausesWarningDisplay(Boolean keepHtmlLink, String warningText) throws MalformedURLException {
+    void downloadHtmlFileCausesWarningDisplay(Boolean keepHtmlLink, String warningText)
+            throws MalformedURLException {
         when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
         when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
@@ -202,7 +263,14 @@ void downloadHtmlFileCausesWarningDisplay(Boolean keepHtmlLink, String warningTe
         String fileType = StandardExternalFileType.URL.getName();
         linkedFile = new LinkedFile(url, fileType);
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, new CurrentThreadTaskExecutor(), dialogService, preferences);
+        LinkedFileViewModel viewModel =
+                new LinkedFileViewModel(
+                        linkedFile,
+                        entry,
+                        databaseContext,
+                        new CurrentThreadTaskExecutor(),
+                        dialogService,
+                        preferences);
 
         viewModel.download(keepHtmlLink);
 
@@ -215,9 +283,17 @@ void isNotSamePath() {
         databaseContext = mock(BibDatabaseContext.class);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
-        when(databaseContext.getFirstExistingFileDir(filePreferences)).thenReturn(Optional.of(Path.of("/home")));
-
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
+        when(databaseContext.getFirstExistingFileDir(filePreferences))
+                .thenReturn(Optional.of(Path.of("/home")));
+
+        LinkedFileViewModel viewModel =
+                new LinkedFileViewModel(
+                        linkedFile,
+                        entry,
+                        databaseContext,
+                        taskExecutor,
+                        dialogService,
+                        preferences);
         assertFalse(viewModel.isGeneratedPathSameAsOriginal());
     }
 
@@ -227,9 +303,17 @@ void isSamePath() {
         databaseContext = mock(BibDatabaseContext.class);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
-        when(databaseContext.getFirstExistingFileDir(filePreferences)).thenReturn(Optional.of(tempFile.getParent()));
-
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
+        when(databaseContext.getFirstExistingFileDir(filePreferences))
+                .thenReturn(Optional.of(tempFile.getParent()));
+
+        LinkedFileViewModel viewModel =
+                new LinkedFileViewModel(
+                        linkedFile,
+                        entry,
+                        databaseContext,
+                        taskExecutor,
+                        dialogService,
+                        preferences);
         assertTrue(viewModel.isGeneratedPathSameAsOriginal());
     }
 
@@ -240,9 +324,17 @@ void isNotSamePathWithPattern() {
         databaseContext = mock(BibDatabaseContext.class);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
         when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
-        when(databaseContext.getFirstExistingFileDir(filePreferences)).thenReturn(Optional.of(tempFile.getParent()));
-
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
+        when(databaseContext.getFirstExistingFileDir(filePreferences))
+                .thenReturn(Optional.of(tempFile.getParent()));
+
+        LinkedFileViewModel viewModel =
+                new LinkedFileViewModel(
+                        linkedFile,
+                        entry,
+                        databaseContext,
+                        taskExecutor,
+                        dialogService,
+                        preferences);
         assertFalse(viewModel.isGeneratedPathSameAsOriginal());
     }
 
@@ -253,28 +345,41 @@ void isSamePathWithPattern() throws IOException {
         databaseContext = mock(BibDatabaseContext.class);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
         when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
-        when(databaseContext.getFirstExistingFileDir(filePreferences)).thenReturn(Optional.of(tempFile.getParent()));
+        when(databaseContext.getFirstExistingFileDir(filePreferences))
+                .thenReturn(Optional.of(tempFile.getParent()));
 
-        LinkedFileHandler fileHandler = new LinkedFileHandler(linkedFile, entry, databaseContext, filePreferences);
+        LinkedFileHandler fileHandler =
+                new LinkedFileHandler(linkedFile, entry, databaseContext, filePreferences);
         fileHandler.moveToDefaultDirectory();
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
+        LinkedFileViewModel viewModel =
+                new LinkedFileViewModel(
+                        linkedFile,
+                        entry,
+                        databaseContext,
+                        taskExecutor,
+                        dialogService,
+                        preferences);
         assertTrue(viewModel.isGeneratedPathSameAsOriginal());
     }
 
     // Tests if added parameters to mimeType gets parsed to correct format.
     @Test
     void mimeTypeStringWithParameterIsReturnedAsWithoutParameter() {
-        Optional<ExternalFileType> test = ExternalFileTypes.getExternalFileTypeByMimeType("text/html; charset=UTF-8", externalApplicationsPreferences);
+        Optional<ExternalFileType> test =
+                ExternalFileTypes.getExternalFileTypeByMimeType(
+                        "text/html; charset=UTF-8", externalApplicationsPreferences);
         String actual = test.get().toString();
         assertEquals("URL", actual);
     }
 
-    // We cannot use "@FetcherTest" annotation, because a @FetcherTest does not fire up a GUI environment (which is needed for this test)
+    // We cannot use "@FetcherTest" annotation, because a @FetcherTest does not fire up a GUI
+    // environment (which is needed for this test)
     // @FetcherTest
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    void downloadPdfFileWhenLinkedFilePointsToPdfUrl(boolean keepHtml) throws MalformedURLException {
+    void downloadPdfFileWhenLinkedFilePointsToPdfUrl(boolean keepHtml)
+            throws MalformedURLException {
         linkedFile = new LinkedFile(URI.create("http://arxiv.org/pdf/1207.0408v1").toURL(), "pdf");
         // Needed Mockito stubbing methods to run test
         when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
@@ -283,7 +388,14 @@ void downloadPdfFileWhenLinkedFilePointsToPdfUrl(boolean keepHtml) throws Malfor
 
         databaseContext.setDatabasePath(tempFile);
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, new CurrentThreadTaskExecutor(), dialogService, preferences);
+        LinkedFileViewModel viewModel =
+                new LinkedFileViewModel(
+                        linkedFile,
+                        entry,
+                        databaseContext,
+                        new CurrentThreadTaskExecutor(),
+                        dialogService,
+                        preferences);
 
         // TODO: Rewrite using WireMock
         viewModel.download(keepHtml);
diff --git a/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java
index 8d72caa9a581..10252c6d6219 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java
@@ -1,10 +1,9 @@
 package org.jabref.gui.fieldeditors;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.EmptySuggestionProvider;
@@ -16,21 +15,23 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
 
 @FetcherTest("Downloads a PDF file")
 class LinkedFilesEditorViewModelTest {
     private LinkedFilesEditorViewModel viewModel;
-    private final GuiPreferences preferences = mock(GuiPreferences.class, Answers.RETURNS_DEEP_STUBS);
-    private final FilePreferences filePreferences = mock(FilePreferences.class, Answers.RETURNS_DEEP_STUBS);
+    private final GuiPreferences preferences =
+            mock(GuiPreferences.class, Answers.RETURNS_DEEP_STUBS);
+    private final FilePreferences filePreferences =
+            mock(FilePreferences.class, Answers.RETURNS_DEEP_STUBS);
     private final BibDatabaseContext bibDatabaseContext = mock(BibDatabaseContext.class);
     private final UndoManager undoManager = mock(UndoManager.class);
 
@@ -41,12 +42,22 @@ void urlFieldShouldDownloadFile(@TempDir Path tempDir) {
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
         when(bibDatabaseContext.getFirstExistingFileDir(any())).thenReturn(Optional.of(tempDir));
 
-        viewModel = new LinkedFilesEditorViewModel(StandardField.FILE, new EmptySuggestionProvider(), mock(DialogService.class), bibDatabaseContext,
-                           new CurrentThreadTaskExecutor(), mock(FieldCheckers.class), preferences, undoManager);
+        viewModel =
+                new LinkedFilesEditorViewModel(
+                        StandardField.FILE,
+                        new EmptySuggestionProvider(),
+                        mock(DialogService.class),
+                        bibDatabaseContext,
+                        new CurrentThreadTaskExecutor(),
+                        mock(FieldCheckers.class),
+                        preferences,
+                        undoManager);
 
-        BibEntry entry = new BibEntry().withCitationKey("test")
-            .withField(StandardField.URL, "https://ceur-ws.org/Vol-847/paper6.pdf");
-                viewModel.entry = entry;
+        BibEntry entry =
+                new BibEntry()
+                        .withCitationKey("test")
+                        .withField(StandardField.URL, "https://ceur-ws.org/Vol-847/paper6.pdf");
+        viewModel.entry = entry;
         viewModel.fetchFulltext();
 
         assertTrue(Files.exists(tempDir.resolve("test.pdf")));
diff --git a/src/test/java/org/jabref/gui/groups/GroupColorPickerTest.java b/src/test/java/org/jabref/gui/groups/GroupColorPickerTest.java
index 12c43a4801e9..d00f1ab75651 100644
--- a/src/test/java/org/jabref/gui/groups/GroupColorPickerTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupColorPickerTest.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.groups;
 
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import javafx.scene.paint.Color;
 
@@ -9,41 +8,35 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
+import java.util.stream.Stream;
 
 class GroupColorPickerTest {
 
     static Stream<Arguments> generateColor() {
         return Stream.of(
-                Arguments.of(
-                        Color.hsb(180, 1.0, 1.0),
-                        List.of(Color.hsb(0, 1.0, 1.0))
-                ),
+                Arguments.of(Color.hsb(180, 1.0, 1.0), List.of(Color.hsb(0, 1.0, 1.0))),
                 Arguments.of(
                         Color.hsb(270, 1.0, 1.0),
-                        List.of(
-                                Color.hsb(0, 1.0, 1.0),
-                                Color.hsb(180, 1.0, 1.0))
-                ),
+                        List.of(Color.hsb(0, 1.0, 1.0), Color.hsb(180, 1.0, 1.0))),
                 Arguments.of(
                         Color.hsb(270, 1.0, 1.0),
                         List.of(
                                 Color.hsb(0, 1.0, 1.0),
                                 Color.hsb(90, 1.0, 1.0),
-                                Color.hsb(180, 1.0, 1.0))
-                )
-        );
+                                Color.hsb(180, 1.0, 1.0))));
     }
 
     private static String colorToHsb(Color color) {
-        return "h:%,.4f s:%,.4f b:%,.4f".formatted(color.getHue(), color.getSaturation(), color.getBrightness());
+        return "h:%,.4f s:%,.4f b:%,.4f"
+                .formatted(color.getHue(), color.getSaturation(), color.getBrightness());
     }
 
     @ParameterizedTest
     @MethodSource
     void generateColor(Color expected, List<Color> subgroupColors) {
         Color result = GroupColorPicker.generateColor(subgroupColors);
-        assertEquals(expected, result,
-                "%s != %s".formatted(colorToHsb(expected), colorToHsb(result)));
+        assertEquals(
+                expected, result, "%s != %s".formatted(colorToHsb(expected), colorToHsb(result)));
     }
 }
diff --git a/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
index a1d1126d1618..e45ebdc78468 100644
--- a/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
@@ -1,8 +1,11 @@
 package org.jabref.gui.groups;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
@@ -14,17 +17,13 @@
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
 
 class GroupDialogViewModelTest {
 
@@ -53,7 +52,15 @@ void setUp(@TempDir Path temporaryFolder) {
 
         bibDatabaseContext.setMetaData(metaData);
 
-        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferences, group, null, new DummyFileUpdateMonitor(), stateManager);
+        viewModel =
+                new GroupDialogViewModel(
+                        dialogService,
+                        bibDatabaseContext,
+                        preferences,
+                        group,
+                        null,
+                        new DummyFileUpdateMonitor(),
+                        stateManager);
     }
 
     @Test
@@ -61,7 +68,8 @@ void validateExistingAbsolutePath() throws Exception {
         var anAuxFile = temporaryFolder.resolve("auxfile.aux").toAbsolutePath();
 
         Files.createFile(anAuxFile);
-        when(metaData.getLatexFileDirectory(any(String.class))).thenReturn(Optional.of(temporaryFolder));
+        when(metaData.getLatexFileDirectory(any(String.class)))
+                .thenReturn(Optional.of(temporaryFolder));
 
         viewModel.texGroupFilePathProperty().setValue(anAuxFile.toString());
         assertTrue(viewModel.texGroupFilePathValidatonStatus().isValid());
@@ -80,7 +88,8 @@ void validateExistingRelativePath() throws Exception {
 
         // The file needs to exist
         Files.createFile(temporaryFolder.resolve(anAuxFile));
-        when(metaData.getLatexFileDirectory(any(String.class))).thenReturn(Optional.of(temporaryFolder));
+        when(metaData.getLatexFileDirectory(any(String.class)))
+                .thenReturn(Optional.of(temporaryFolder));
 
         viewModel.texGroupFilePathProperty().setValue(anAuxFile.toString());
         assertTrue(viewModel.texGroupFilePathValidatonStatus().isValid());
@@ -90,7 +99,15 @@ void validateExistingRelativePath() throws Exception {
     void hierarchicalContextFromGroup() throws Exception {
         GroupHierarchyType groupHierarchyType = GroupHierarchyType.INCLUDING;
         when(group.getHierarchicalContext()).thenReturn(groupHierarchyType);
-        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferences, group, null, new DummyFileUpdateMonitor(), stateManager);
+        viewModel =
+                new GroupDialogViewModel(
+                        dialogService,
+                        bibDatabaseContext,
+                        preferences,
+                        group,
+                        null,
+                        new DummyFileUpdateMonitor(),
+                        stateManager);
 
         assertEquals(groupHierarchyType, viewModel.groupHierarchySelectedProperty().getValue());
     }
@@ -98,9 +115,19 @@ void hierarchicalContextFromGroup() throws Exception {
     @Test
     void defaultHierarchicalContext() throws Exception {
         GroupHierarchyType defaultHierarchicalContext = GroupHierarchyType.REFINING;
-        when(preferences.getGroupsPreferences().getDefaultHierarchicalContext()).thenReturn(defaultHierarchicalContext);
-        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferences, null, null, new DummyFileUpdateMonitor(), stateManager);
-
-        assertEquals(defaultHierarchicalContext, viewModel.groupHierarchySelectedProperty().getValue());
+        when(preferences.getGroupsPreferences().getDefaultHierarchicalContext())
+                .thenReturn(defaultHierarchicalContext);
+        viewModel =
+                new GroupDialogViewModel(
+                        dialogService,
+                        bibDatabaseContext,
+                        preferences,
+                        null,
+                        null,
+                        new DummyFileUpdateMonitor(),
+                        stateManager);
+
+        assertEquals(
+                defaultHierarchicalContext, viewModel.groupHierarchySelectedProperty().getValue());
     }
 }
diff --git a/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
index cbc5c852b5d9..5c583feb0aeb 100644
--- a/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
@@ -1,7 +1,9 @@
 package org.jabref.gui.groups;
 
-import java.util.Arrays;
-import java.util.EnumSet;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -21,14 +23,11 @@
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.groups.WordKeywordGroup;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Arrays;
+import java.util.EnumSet;
 
 class GroupNodeViewModelTest {
 
@@ -45,21 +44,38 @@ void setUp() {
         databaseContext = new BibDatabaseContext();
         taskExecutor = new CurrentThreadTaskExecutor();
         preferences = mock(GuiPreferences.class);
-        when(preferences.getGroupsPreferences()).thenReturn(new GroupsPreferences(
-                EnumSet.noneOf(GroupViewMode.class),
-                true,
-                true,
-                GroupHierarchyType.INDEPENDENT
-        ));
-
-        viewModel = getViewModelForGroup(
-                new WordKeywordGroup("Test group", GroupHierarchyType.INDEPENDENT, StandardField.TITLE, "search", true, ',', false));
+        when(preferences.getGroupsPreferences())
+                .thenReturn(
+                        new GroupsPreferences(
+                                EnumSet.noneOf(GroupViewMode.class),
+                                true,
+                                true,
+                                GroupHierarchyType.INDEPENDENT));
+
+        viewModel =
+                getViewModelForGroup(
+                        new WordKeywordGroup(
+                                "Test group",
+                                GroupHierarchyType.INDEPENDENT,
+                                StandardField.TITLE,
+                                "search",
+                                true,
+                                ',',
+                                false));
     }
 
     @Test
     void getDisplayNameConvertsLatexToUnicode() {
-        GroupNodeViewModel viewModel = getViewModelForGroup(
-                new WordKeywordGroup("\\beta", GroupHierarchyType.INDEPENDENT, StandardField.TITLE, "search", true, ',', false));
+        GroupNodeViewModel viewModel =
+                getViewModelForGroup(
+                        new WordKeywordGroup(
+                                "\\beta",
+                                GroupHierarchyType.INDEPENDENT,
+                                StandardField.TITLE,
+                                "search",
+                                true,
+                                ',',
+                                false));
         assertEquals("β", viewModel.getDisplayName());
     }
 
@@ -80,16 +96,78 @@ void treeOfAutomaticKeywordGroupIsCombined() {
         BibEntry entryThree = new BibEntry().withField(StandardField.KEYWORDS, "A > B > B2");
         databaseContext.getDatabase().insertEntries(entryOne, entryTwo, entryThree);
 
-        AutomaticKeywordGroup group = new AutomaticKeywordGroup("Keywords", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, ',', '>');
+        AutomaticKeywordGroup group =
+                new AutomaticKeywordGroup(
+                        "Keywords",
+                        GroupHierarchyType.INDEPENDENT,
+                        StandardField.KEYWORDS,
+                        ',',
+                        '>');
         GroupNodeViewModel groupViewModel = getViewModelForGroup(group);
 
-        WordKeywordGroup expectedGroupA = new WordKeywordGroup("A", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true);
-        WordKeywordGroup expectedGroupB = new WordKeywordGroup("B", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > B", true, ',', true);
-        WordKeywordGroup expectedGroupB1 = new WordKeywordGroup("B1", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > B > B1", true, ',', true);
-        WordKeywordGroup expectedGroupB2 = new WordKeywordGroup("B2", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > B > B2", true, ',', true);
-        WordKeywordGroup expectedGroupC = new WordKeywordGroup("C", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > C", true, ',', true);
-        WordKeywordGroup expectedGroupD = new WordKeywordGroup("D", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > D", true, ',', true);
-        WordKeywordGroup expectedGroupE = new WordKeywordGroup("E", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "E", true, ',', true);
+        WordKeywordGroup expectedGroupA =
+                new WordKeywordGroup(
+                        "A",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A",
+                        true,
+                        ',',
+                        true);
+        WordKeywordGroup expectedGroupB =
+                new WordKeywordGroup(
+                        "B",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A > B",
+                        true,
+                        ',',
+                        true);
+        WordKeywordGroup expectedGroupB1 =
+                new WordKeywordGroup(
+                        "B1",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A > B > B1",
+                        true,
+                        ',',
+                        true);
+        WordKeywordGroup expectedGroupB2 =
+                new WordKeywordGroup(
+                        "B2",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A > B > B2",
+                        true,
+                        ',',
+                        true);
+        WordKeywordGroup expectedGroupC =
+                new WordKeywordGroup(
+                        "C",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A > C",
+                        true,
+                        ',',
+                        true);
+        WordKeywordGroup expectedGroupD =
+                new WordKeywordGroup(
+                        "D",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A > D",
+                        true,
+                        ',',
+                        true);
+        WordKeywordGroup expectedGroupE =
+                new WordKeywordGroup(
+                        "E",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "E",
+                        true,
+                        ',',
+                        true);
         GroupNodeViewModel expectedA = getViewModelForGroup(expectedGroupA);
         GroupTreeNode expectedB = expectedA.addSubgroup(expectedGroupB);
         expectedB.addSubgroup(expectedGroupB1);
@@ -97,69 +175,222 @@ void treeOfAutomaticKeywordGroupIsCombined() {
         expectedA.addSubgroup(expectedGroupC);
         expectedA.addSubgroup(expectedGroupD);
         GroupNodeViewModel expectedE = getViewModelForGroup(expectedGroupE);
-        ObservableList<GroupNodeViewModel> expected = FXCollections.observableArrayList(expectedA, expectedE);
+        ObservableList<GroupNodeViewModel> expected =
+                FXCollections.observableArrayList(expectedA, expectedE);
 
         assertEquals(expected, groupViewModel.getChildren());
     }
 
     @Test
     void draggedOnTopOfGroupAddsBeforeIt() {
-        GroupNodeViewModel rootViewModel = getViewModelForGroup(new WordKeywordGroup("root", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true));
-        WordKeywordGroup groupA = new WordKeywordGroup("A", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true);
-        WordKeywordGroup groupB = new WordKeywordGroup("B", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > B", true, ',', true);
-        WordKeywordGroup groupC = new WordKeywordGroup("C", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > B > B1", true, ',', true);
-        GroupNodeViewModel groupAViewModel = getViewModelForGroup(rootViewModel.addSubgroup(groupA));
-        GroupNodeViewModel groupBViewModel = getViewModelForGroup(rootViewModel.addSubgroup(groupB));
-        GroupNodeViewModel groupCViewModel = getViewModelForGroup(rootViewModel.addSubgroup(groupC));
+        GroupNodeViewModel rootViewModel =
+                getViewModelForGroup(
+                        new WordKeywordGroup(
+                                "root",
+                                GroupHierarchyType.INCLUDING,
+                                StandardField.KEYWORDS,
+                                "A",
+                                true,
+                                ',',
+                                true));
+        WordKeywordGroup groupA =
+                new WordKeywordGroup(
+                        "A",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A",
+                        true,
+                        ',',
+                        true);
+        WordKeywordGroup groupB =
+                new WordKeywordGroup(
+                        "B",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A > B",
+                        true,
+                        ',',
+                        true);
+        WordKeywordGroup groupC =
+                new WordKeywordGroup(
+                        "C",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A > B > B1",
+                        true,
+                        ',',
+                        true);
+        GroupNodeViewModel groupAViewModel =
+                getViewModelForGroup(rootViewModel.addSubgroup(groupA));
+        GroupNodeViewModel groupBViewModel =
+                getViewModelForGroup(rootViewModel.addSubgroup(groupB));
+        GroupNodeViewModel groupCViewModel =
+                getViewModelForGroup(rootViewModel.addSubgroup(groupC));
 
         groupCViewModel.draggedOn(groupBViewModel, DroppingMouseLocation.TOP);
 
-        assertEquals(Arrays.asList(groupAViewModel, groupCViewModel, groupBViewModel), rootViewModel.getChildren());
+        assertEquals(
+                Arrays.asList(groupAViewModel, groupCViewModel, groupBViewModel),
+                rootViewModel.getChildren());
     }
 
     @Test
     void draggedOnBottomOfGroupAddsAfterIt() {
-        GroupNodeViewModel rootViewModel = getViewModelForGroup(new WordKeywordGroup("root", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true));
-        WordKeywordGroup groupA = new WordKeywordGroup("A", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true);
-        WordKeywordGroup groupB = new WordKeywordGroup("B", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > B", true, ',', true);
-        WordKeywordGroup groupC = new WordKeywordGroup("C", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > B > B1", true, ',', true);
-        GroupNodeViewModel groupAViewModel = getViewModelForGroup(rootViewModel.addSubgroup(groupA));
-        GroupNodeViewModel groupBViewModel = getViewModelForGroup(rootViewModel.addSubgroup(groupB));
-        GroupNodeViewModel groupCViewModel = getViewModelForGroup(rootViewModel.addSubgroup(groupC));
+        GroupNodeViewModel rootViewModel =
+                getViewModelForGroup(
+                        new WordKeywordGroup(
+                                "root",
+                                GroupHierarchyType.INCLUDING,
+                                StandardField.KEYWORDS,
+                                "A",
+                                true,
+                                ',',
+                                true));
+        WordKeywordGroup groupA =
+                new WordKeywordGroup(
+                        "A",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A",
+                        true,
+                        ',',
+                        true);
+        WordKeywordGroup groupB =
+                new WordKeywordGroup(
+                        "B",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A > B",
+                        true,
+                        ',',
+                        true);
+        WordKeywordGroup groupC =
+                new WordKeywordGroup(
+                        "C",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A > B > B1",
+                        true,
+                        ',',
+                        true);
+        GroupNodeViewModel groupAViewModel =
+                getViewModelForGroup(rootViewModel.addSubgroup(groupA));
+        GroupNodeViewModel groupBViewModel =
+                getViewModelForGroup(rootViewModel.addSubgroup(groupB));
+        GroupNodeViewModel groupCViewModel =
+                getViewModelForGroup(rootViewModel.addSubgroup(groupC));
 
         groupCViewModel.draggedOn(groupAViewModel, DroppingMouseLocation.BOTTOM);
 
-        assertEquals(Arrays.asList(groupAViewModel, groupCViewModel, groupBViewModel), rootViewModel.getChildren());
+        assertEquals(
+                Arrays.asList(groupAViewModel, groupCViewModel, groupBViewModel),
+                rootViewModel.getChildren());
     }
 
     @Test
     void draggedOnBottomOfGroupAddsAfterItWhenSourceGroupWasBefore() {
-        GroupNodeViewModel rootViewModel = getViewModelForGroup(new WordKeywordGroup("root", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true));
-        WordKeywordGroup groupA = new WordKeywordGroup("A", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true);
-        WordKeywordGroup groupB = new WordKeywordGroup("B", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > B", true, ',', true);
-        WordKeywordGroup groupC = new WordKeywordGroup("C", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > B > B1", true, ',', true);
-        GroupNodeViewModel groupAViewModel = getViewModelForGroup(rootViewModel.addSubgroup(groupA));
-        GroupNodeViewModel groupBViewModel = getViewModelForGroup(rootViewModel.addSubgroup(groupB));
-        GroupNodeViewModel groupCViewModel = getViewModelForGroup(rootViewModel.addSubgroup(groupC));
+        GroupNodeViewModel rootViewModel =
+                getViewModelForGroup(
+                        new WordKeywordGroup(
+                                "root",
+                                GroupHierarchyType.INCLUDING,
+                                StandardField.KEYWORDS,
+                                "A",
+                                true,
+                                ',',
+                                true));
+        WordKeywordGroup groupA =
+                new WordKeywordGroup(
+                        "A",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A",
+                        true,
+                        ',',
+                        true);
+        WordKeywordGroup groupB =
+                new WordKeywordGroup(
+                        "B",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A > B",
+                        true,
+                        ',',
+                        true);
+        WordKeywordGroup groupC =
+                new WordKeywordGroup(
+                        "C",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A > B > B1",
+                        true,
+                        ',',
+                        true);
+        GroupNodeViewModel groupAViewModel =
+                getViewModelForGroup(rootViewModel.addSubgroup(groupA));
+        GroupNodeViewModel groupBViewModel =
+                getViewModelForGroup(rootViewModel.addSubgroup(groupB));
+        GroupNodeViewModel groupCViewModel =
+                getViewModelForGroup(rootViewModel.addSubgroup(groupC));
 
         groupAViewModel.draggedOn(groupBViewModel, DroppingMouseLocation.BOTTOM);
 
-        assertEquals(Arrays.asList(groupBViewModel, groupAViewModel, groupCViewModel), rootViewModel.getChildren());
+        assertEquals(
+                Arrays.asList(groupBViewModel, groupAViewModel, groupCViewModel),
+                rootViewModel.getChildren());
     }
 
     @Test
     void draggedOnTopOfGroupAddsBeforeItWhenSourceGroupWasBefore() {
-        GroupNodeViewModel rootViewModel = getViewModelForGroup(new WordKeywordGroup("root", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true));
-        WordKeywordGroup groupA = new WordKeywordGroup("A", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true);
-        WordKeywordGroup groupB = new WordKeywordGroup("B", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > B", true, ',', true);
-        WordKeywordGroup groupC = new WordKeywordGroup("C", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > B > B1", true, ',', true);
-        GroupNodeViewModel groupAViewModel = getViewModelForGroup(rootViewModel.addSubgroup(groupA));
-        GroupNodeViewModel groupBViewModel = getViewModelForGroup(rootViewModel.addSubgroup(groupB));
-        GroupNodeViewModel groupCViewModel = getViewModelForGroup(rootViewModel.addSubgroup(groupC));
+        GroupNodeViewModel rootViewModel =
+                getViewModelForGroup(
+                        new WordKeywordGroup(
+                                "root",
+                                GroupHierarchyType.INCLUDING,
+                                StandardField.KEYWORDS,
+                                "A",
+                                true,
+                                ',',
+                                true));
+        WordKeywordGroup groupA =
+                new WordKeywordGroup(
+                        "A",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A",
+                        true,
+                        ',',
+                        true);
+        WordKeywordGroup groupB =
+                new WordKeywordGroup(
+                        "B",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A > B",
+                        true,
+                        ',',
+                        true);
+        WordKeywordGroup groupC =
+                new WordKeywordGroup(
+                        "C",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "A > B > B1",
+                        true,
+                        ',',
+                        true);
+        GroupNodeViewModel groupAViewModel =
+                getViewModelForGroup(rootViewModel.addSubgroup(groupA));
+        GroupNodeViewModel groupBViewModel =
+                getViewModelForGroup(rootViewModel.addSubgroup(groupB));
+        GroupNodeViewModel groupCViewModel =
+                getViewModelForGroup(rootViewModel.addSubgroup(groupC));
 
         groupAViewModel.draggedOn(groupCViewModel, DroppingMouseLocation.TOP);
 
-        assertEquals(Arrays.asList(groupBViewModel, groupAViewModel, groupCViewModel), rootViewModel.getChildren());
+        assertEquals(
+                Arrays.asList(groupBViewModel, groupAViewModel, groupCViewModel),
+                rootViewModel.getChildren());
     }
 
     @Test
@@ -169,18 +400,39 @@ void entriesAreAddedCorrectly() {
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupNodeViewModel model = new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group, new CustomLocalDragboard(), preferences);
+        GroupNodeViewModel model =
+                new GroupNodeViewModel(
+                        databaseContext,
+                        stateManager,
+                        taskExecutor,
+                        group,
+                        new CustomLocalDragboard(),
+                        preferences);
         model.addEntriesToGroup(databaseContext.getEntries());
 
-        assertEquals(databaseContext.getEntries(), model.getGroupNode().getEntriesInGroup(databaseContext.getEntries()));
+        assertEquals(
+                databaseContext.getEntries(),
+                model.getGroupNode().getEntriesInGroup(databaseContext.getEntries()));
         assertEquals(groupName, entry.getField(StandardField.GROUPS).get());
     }
 
     private GroupNodeViewModel getViewModelForGroup(AbstractGroup group) {
-        return new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group, new CustomLocalDragboard(), preferences);
+        return new GroupNodeViewModel(
+                databaseContext,
+                stateManager,
+                taskExecutor,
+                group,
+                new CustomLocalDragboard(),
+                preferences);
     }
 
     private GroupNodeViewModel getViewModelForGroup(GroupTreeNode group) {
-        return new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group, new CustomLocalDragboard(), preferences);
+        return new GroupNodeViewModel(
+                databaseContext,
+                stateManager,
+                taskExecutor,
+                group,
+                new CustomLocalDragboard(),
+                preferences);
     }
 }
diff --git a/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
index e7bcacebfce7..62fef4f3352d 100644
--- a/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
@@ -1,7 +1,10 @@
 package org.jabref.gui.groups;
 
-import java.util.EnumSet;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
@@ -18,16 +21,12 @@
 import org.jabref.model.groups.ExplicitGroup;
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.groups.WordKeywordGroup;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.EnumSet;
+import java.util.Optional;
 
 class GroupTreeViewModelTest {
 
@@ -47,23 +46,42 @@ void setUp() {
         preferences = mock(GuiPreferences.class);
         dialogService = mock(DialogService.class, Answers.RETURNS_DEEP_STUBS);
 
-        when(preferences.getGroupsPreferences()).thenReturn(new GroupsPreferences(
-                EnumSet.noneOf(GroupViewMode.class),
-                true,
-                true,
-                GroupHierarchyType.INDEPENDENT));
-        groupTree = new GroupTreeViewModel(stateManager, mock(DialogService.class), mock(ChatHistoryService.class), preferences, taskExecutor, new CustomLocalDragboard());
+        when(preferences.getGroupsPreferences())
+                .thenReturn(
+                        new GroupsPreferences(
+                                EnumSet.noneOf(GroupViewMode.class),
+                                true,
+                                true,
+                                GroupHierarchyType.INDEPENDENT));
+        groupTree =
+                new GroupTreeViewModel(
+                        stateManager,
+                        mock(DialogService.class),
+                        mock(ChatHistoryService.class),
+                        preferences,
+                        taskExecutor,
+                        new CustomLocalDragboard());
     }
 
     @Test
     void rootGroupIsAllEntriesByDefault() {
         AllEntriesGroup allEntriesGroup = new AllEntriesGroup("All entries");
-        assertEquals(new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, allEntriesGroup, new CustomLocalDragboard(), preferences), groupTree.rootGroupProperty().getValue());
+        assertEquals(
+                new GroupNodeViewModel(
+                        databaseContext,
+                        stateManager,
+                        taskExecutor,
+                        allEntriesGroup,
+                        new CustomLocalDragboard(),
+                        preferences),
+                groupTree.rootGroupProperty().getValue());
     }
 
     @Test
     void rootGroupIsSelectedByDefault() {
-        assertEquals(groupTree.rootGroupProperty().get().getGroupNode(), stateManager.getSelectedGroups(databaseContext).getFirst());
+        assertEquals(
+                groupTree.rootGroupProperty().get().getGroupNode(),
+                stateManager.getSelectedGroups(databaseContext).getFirst());
     }
 
     @Test
@@ -72,7 +90,14 @@ void explicitGroupsAreRemovedFromEntriesOnDelete() {
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupNodeViewModel model = new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group, new CustomLocalDragboard(), preferences);
+        GroupNodeViewModel model =
+                new GroupNodeViewModel(
+                        databaseContext,
+                        stateManager,
+                        taskExecutor,
+                        group,
+                        new CustomLocalDragboard(),
+                        preferences);
         model.addEntriesToGroup(databaseContext.getEntries());
         groupTree.removeGroupsAndSubGroupsFromEntries(model);
 
@@ -82,11 +107,26 @@ void explicitGroupsAreRemovedFromEntriesOnDelete() {
     @Test
     void keywordGroupsAreNotRemovedFromEntriesOnDelete() {
         String groupName = "A";
-        WordKeywordGroup group = new WordKeywordGroup(groupName, GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, groupName, true, ',', true);
+        WordKeywordGroup group =
+                new WordKeywordGroup(
+                        groupName,
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        groupName,
+                        true,
+                        ',',
+                        true);
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupNodeViewModel model = new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group, new CustomLocalDragboard(), preferences);
+        GroupNodeViewModel model =
+                new GroupNodeViewModel(
+                        databaseContext,
+                        stateManager,
+                        taskExecutor,
+                        group,
+                        new CustomLocalDragboard(),
+                        preferences);
         model.addEntriesToGroup(databaseContext.getEntries());
         groupTree.removeGroupsAndSubGroupsFromEntries(model);
 
@@ -96,47 +136,124 @@ void keywordGroupsAreNotRemovedFromEntriesOnDelete() {
     @Test
     void shouldNotShowDialogWhenGroupNameChanges() {
         AbstractGroup oldGroup = new ExplicitGroup("group", GroupHierarchyType.INDEPENDENT, ',');
-        AbstractGroup newGroup = new ExplicitGroup("newGroupName", GroupHierarchyType.INDEPENDENT, ',');
+        AbstractGroup newGroup =
+                new ExplicitGroup("newGroupName", GroupHierarchyType.INDEPENDENT, ',');
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupTreeViewModel model = new GroupTreeViewModel(stateManager, dialogService, mock(ChatHistoryService.class), preferences, taskExecutor, new CustomLocalDragboard());
+        GroupTreeViewModel model =
+                new GroupTreeViewModel(
+                        stateManager,
+                        dialogService,
+                        mock(ChatHistoryService.class),
+                        preferences,
+                        taskExecutor,
+                        new CustomLocalDragboard());
         assertTrue(model.onlyMinorChanges(oldGroup, newGroup));
     }
 
     @Test
     void shouldNotShowDialogWhenGroupsAreEqual() {
-        AbstractGroup oldGroup = new WordKeywordGroup("group", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "keywordTest", true, ',', true);
-        AbstractGroup newGroup = new WordKeywordGroup("group", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "keywordTest", true, ',', true);
+        AbstractGroup oldGroup =
+                new WordKeywordGroup(
+                        "group",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "keywordTest",
+                        true,
+                        ',',
+                        true);
+        AbstractGroup newGroup =
+                new WordKeywordGroup(
+                        "group",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "keywordTest",
+                        true,
+                        ',',
+                        true);
 
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupTreeViewModel model = new GroupTreeViewModel(stateManager, dialogService, mock(ChatHistoryService.class), preferences, taskExecutor, new CustomLocalDragboard());
+        GroupTreeViewModel model =
+                new GroupTreeViewModel(
+                        stateManager,
+                        dialogService,
+                        mock(ChatHistoryService.class),
+                        preferences,
+                        taskExecutor,
+                        new CustomLocalDragboard());
         assertTrue(model.onlyMinorChanges(oldGroup, newGroup));
     }
 
     @Test
     void shouldShowDialogWhenKeywordDiffers() {
-        AbstractGroup oldGroup = new WordKeywordGroup("group", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "keywordTest", true, ',', true);
-        AbstractGroup newGroup = new WordKeywordGroup("group", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "keywordChanged", true, ',', true);
+        AbstractGroup oldGroup =
+                new WordKeywordGroup(
+                        "group",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "keywordTest",
+                        true,
+                        ',',
+                        true);
+        AbstractGroup newGroup =
+                new WordKeywordGroup(
+                        "group",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "keywordChanged",
+                        true,
+                        ',',
+                        true);
 
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupTreeViewModel model = new GroupTreeViewModel(stateManager, dialogService, mock(ChatHistoryService.class), preferences, taskExecutor, new CustomLocalDragboard());
+        GroupTreeViewModel model =
+                new GroupTreeViewModel(
+                        stateManager,
+                        dialogService,
+                        mock(ChatHistoryService.class),
+                        preferences,
+                        taskExecutor,
+                        new CustomLocalDragboard());
         assertFalse(model.onlyMinorChanges(oldGroup, newGroup));
     }
 
     @Test
     void shouldShowDialogWhenCaseSensitivyDiffers() {
-        AbstractGroup oldGroup = new WordKeywordGroup("group", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "keywordTest", false, ',', true);
-        AbstractGroup newGroup = new WordKeywordGroup("group", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "keywordChanged", true, ',', true);
+        AbstractGroup oldGroup =
+                new WordKeywordGroup(
+                        "group",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "keywordTest",
+                        false,
+                        ',',
+                        true);
+        AbstractGroup newGroup =
+                new WordKeywordGroup(
+                        "group",
+                        GroupHierarchyType.INCLUDING,
+                        StandardField.KEYWORDS,
+                        "keywordChanged",
+                        true,
+                        ',',
+                        true);
 
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupTreeViewModel model = new GroupTreeViewModel(stateManager, dialogService, mock(ChatHistoryService.class), preferences, taskExecutor, new CustomLocalDragboard());
+        GroupTreeViewModel model =
+                new GroupTreeViewModel(
+                        stateManager,
+                        dialogService,
+                        mock(ChatHistoryService.class),
+                        preferences,
+                        taskExecutor,
+                        new CustomLocalDragboard());
         assertFalse(model.onlyMinorChanges(oldGroup, newGroup));
     }
 }
diff --git a/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java b/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java
index b6fe4ab52523..2ab1117713a1 100644
--- a/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java
+++ b/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java
@@ -1,6 +1,10 @@
 package org.jabref.gui.importer;
 
-import java.util.List;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
@@ -11,15 +15,10 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import java.util.List;
 
 class NewEntryActionTest {
 
@@ -33,13 +32,16 @@ class NewEntryActionTest {
     @BeforeEach
     void setUp() {
         when(stateManager.activeDatabaseProperty()).thenReturn(OptionalObjectProperty.empty());
-        newEntryAction = new NewEntryAction(() -> libraryTab, dialogService, preferences, stateManager);
+        newEntryAction =
+                new NewEntryAction(() -> libraryTab, dialogService, preferences, stateManager);
     }
 
     @Test
     void executeOnSuccessWithFixedType() {
         EntryType type = StandardEntryType.Article;
-        newEntryAction = new NewEntryAction(() -> libraryTab, type, dialogService, preferences, stateManager);
+        newEntryAction =
+                new NewEntryAction(
+                        () -> libraryTab, type, dialogService, preferences, stateManager);
         when(tabContainer.getLibraryTabs()).thenReturn(List.of(libraryTab));
 
         newEntryAction.execute();
diff --git a/src/test/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModelTest.java b/src/test/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModelTest.java
index dd8dec306161..c0187501b993 100644
--- a/src/test/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModelTest.java
+++ b/src/test/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModelTest.java
@@ -1,17 +1,16 @@
 package org.jabref.gui.importer.fetcher;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.preferences.GuiPreferences;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-
 class WebSearchPaneViewModelTest {
 
     private GuiPreferences preferences;
@@ -40,8 +39,8 @@ void falseQueryValidationStatus() {
         assertFalse(viewModel.queryValidationStatus().validProperty().getValue());
     }
 
-     @Test
-     void correctQueryValidationStatus() {
+    @Test
+    void correctQueryValidationStatus() {
         viewModel.queryProperty().setValue("Miami AND Beach OR Houston AND Texas");
         assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
     }
diff --git a/src/test/java/org/jabref/gui/keyboard/KeyBindingRepositoryTest.java b/src/test/java/org/jabref/gui/keyboard/KeyBindingRepositoryTest.java
index 25033372740e..bca4eea11f4d 100644
--- a/src/test/java/org/jabref/gui/keyboard/KeyBindingRepositoryTest.java
+++ b/src/test/java/org/jabref/gui/keyboard/KeyBindingRepositoryTest.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.keyboard;
 
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
+import java.util.stream.Stream;
 
 class KeyBindingRepositoryTest {
     private static Stream<Arguments> provideTestData() {
@@ -15,14 +15,14 @@ private static Stream<Arguments> provideTestData() {
                 // Correctly mapped
                 Arguments.of(
                         List.of(KeyBinding.ABBREVIATE, KeyBinding.NEW_TECHREPORT, KeyBinding.PASTE),
-                        List.of("ctrl+1", "alt+2", "shift+3")
-                ),
+                        List.of("ctrl+1", "alt+2", "shift+3")),
 
                 // Defaults on faulty data
                 Arguments.of(
                         List.of(KeyBinding.ABBREVIATE, KeyBinding.NEW_TECHREPORT, KeyBinding.PASTE),
-                        List.of(KeyBinding.ABBREVIATE.getDefaultKeyBinding(), KeyBinding.NEW_TECHREPORT.getDefaultKeyBinding())
-                ));
+                        List.of(
+                                KeyBinding.ABBREVIATE.getDefaultKeyBinding(),
+                                KeyBinding.NEW_TECHREPORT.getDefaultKeyBinding())));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/gui/keyboard/KeyBindingsTabModelTest.java b/src/test/java/org/jabref/gui/keyboard/KeyBindingsTabModelTest.java
index 6a96bc4ac432..8ce1db88fbc0 100644
--- a/src/test/java/org/jabref/gui/keyboard/KeyBindingsTabModelTest.java
+++ b/src/test/java/org/jabref/gui/keyboard/KeyBindingsTabModelTest.java
@@ -1,6 +1,14 @@
 package org.jabref.gui.keyboard;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCombination;
@@ -11,18 +19,10 @@
 import org.jabref.gui.preferences.keybindings.KeyBindingViewModel;
 import org.jabref.gui.preferences.keybindings.KeyBindingsTabViewModel;
 import org.jabref.logic.os.OS;
-
-import com.airhacks.afterburner.injection.Injector;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Optional;
 
 /**
  * Test class for the keybindings dialog view model
@@ -38,43 +38,67 @@ void setUp() {
         GuiPreferences preferences = mock(GuiPreferences.class);
         when(preferences.getKeyBindingRepository()).thenReturn(keyBindingRepository);
         Injector.setModelOrService(KeyBindingRepository.class, keyBindingRepository);
-        model = new KeyBindingsTabViewModel(keyBindingRepository, mock(DialogService.class), preferences);
+        model =
+                new KeyBindingsTabViewModel(
+                        keyBindingRepository, mock(DialogService.class), preferences);
     }
 
     @Test
     void invalidKeyBindingIsNotSaved() {
         setKeyBindingViewModel(KeyBinding.COPY);
-        KeyEvent shortcutKeyEvent = new KeyEvent(KeyEvent.KEY_RELEASED, "Q", "Q", KeyCode.Q, false, false, false, false);
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.COPY, shortcutKeyEvent));
+        KeyEvent shortcutKeyEvent =
+                new KeyEvent(
+                        KeyEvent.KEY_RELEASED, "Q", "Q", KeyCode.Q, false, false, false, false);
+        assertFalse(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.COPY, shortcutKeyEvent));
         model.setNewBindingForCurrent(shortcutKeyEvent);
-        KeyCombination combination = KeyCombination.keyCombination(keyBindingRepository.get(KeyBinding.COPY).get());
-        assertFalse(KeyBindingRepository.checkKeyCombinationEquality(combination, shortcutKeyEvent));
+        KeyCombination combination =
+                KeyCombination.keyCombination(keyBindingRepository.get(KeyBinding.COPY).get());
+        assertFalse(
+                KeyBindingRepository.checkKeyCombinationEquality(combination, shortcutKeyEvent));
         model.storeSettings();
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.COPY, shortcutKeyEvent));
+        assertFalse(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.COPY, shortcutKeyEvent));
     }
 
     @Test
     void specialKeysValidKeyBindingIsSaved() {
         setKeyBindingViewModel(KeyBinding.IMPORT_INTO_NEW_DATABASE);
-        KeyEvent shortcutKeyEvent = new KeyEvent(KeyEvent.KEY_RELEASED, "F1", "F1", KeyCode.F1, false, false, false, false);
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.IMPORT_INTO_NEW_DATABASE, shortcutKeyEvent));
+        KeyEvent shortcutKeyEvent =
+                new KeyEvent(
+                        KeyEvent.KEY_RELEASED, "F1", "F1", KeyCode.F1, false, false, false, false);
+        assertFalse(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.IMPORT_INTO_NEW_DATABASE, shortcutKeyEvent));
         model.setNewBindingForCurrent(shortcutKeyEvent);
 
-        KeyCombination combination = KeyCombination.keyCombination(model.getKeyBindingRepository().get(KeyBinding.IMPORT_INTO_NEW_DATABASE).get());
+        KeyCombination combination =
+                KeyCombination.keyCombination(
+                        model.getKeyBindingRepository()
+                                .get(KeyBinding.IMPORT_INTO_NEW_DATABASE)
+                                .get());
 
         assertTrue(KeyBindingRepository.checkKeyCombinationEquality(combination, shortcutKeyEvent));
 
         model.storeSettings();
 
-        assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.IMPORT_INTO_NEW_DATABASE, shortcutKeyEvent));
+        assertTrue(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.IMPORT_INTO_NEW_DATABASE, shortcutKeyEvent));
     }
 
     @Test
     void keyBindingCategory() {
-        KeyBindingViewModel bindViewModel = new KeyBindingViewModel(keyBindingRepository, KeyBindingCategory.FILE);
+        KeyBindingViewModel bindViewModel =
+                new KeyBindingViewModel(keyBindingRepository, KeyBindingCategory.FILE);
         model.selectedKeyBindingProperty().set(Optional.of(bindViewModel));
-        KeyEvent shortcutKeyEvent = new KeyEvent(KeyEvent.KEY_PRESSED, "M", "M", KeyCode.M, true, true, true, false);
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLEANUP, shortcutKeyEvent));
+        KeyEvent shortcutKeyEvent =
+                new KeyEvent(KeyEvent.KEY_PRESSED, "M", "M", KeyCode.M, true, true, true, false);
+        assertFalse(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.CLEANUP, shortcutKeyEvent));
         model.setNewBindingForCurrent(shortcutKeyEvent);
         assertNull(model.selectedKeyBindingProperty().get().get().getKeyBinding());
     }
@@ -82,15 +106,23 @@ void keyBindingCategory() {
     @Test
     void randomNewKeyKeyBindingInRepository() {
         setKeyBindingViewModel(KeyBinding.CLEANUP);
-        KeyEvent shortcutKeyEvent = new KeyEvent(KeyEvent.KEY_PRESSED, "K", "K", KeyCode.K, true, true, true, false);
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLEANUP, shortcutKeyEvent));
+        KeyEvent shortcutKeyEvent =
+                new KeyEvent(KeyEvent.KEY_PRESSED, "K", "K", KeyCode.K, true, true, true, false);
+        assertFalse(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.CLEANUP, shortcutKeyEvent));
         model.setNewBindingForCurrent(shortcutKeyEvent);
 
-        KeyCombination combination = KeyCombination.keyCombination(model.getKeyBindingRepository().get(KeyBinding.CLEANUP).get());
+        KeyCombination combination =
+                KeyCombination.keyCombination(
+                        model.getKeyBindingRepository().get(KeyBinding.CLEANUP).get());
 
         assertTrue(KeyBindingRepository.checkKeyCombinationEquality(combination, shortcutKeyEvent));
 
-        assertFalse(KeyBindingRepository.checkKeyCombinationEquality(KeyCombination.valueOf(KeyBinding.CLEANUP.getDefaultKeyBinding()), shortcutKeyEvent));
+        assertFalse(
+                KeyBindingRepository.checkKeyCombinationEquality(
+                        KeyCombination.valueOf(KeyBinding.CLEANUP.getDefaultKeyBinding()),
+                        shortcutKeyEvent));
     }
 
     @Test
@@ -98,26 +130,37 @@ void saveNewKeyBindingsToPreferences() {
         assumeFalse(OS.OS_X);
 
         setKeyBindingViewModel(KeyBinding.ABBREVIATE);
-        KeyEvent shortcutKeyEvent = new KeyEvent(KeyEvent.KEY_PRESSED, "J", "J", KeyCode.J, true, true, true, false);
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        KeyEvent shortcutKeyEvent =
+                new KeyEvent(KeyEvent.KEY_PRESSED, "J", "J", KeyCode.J, true, true, true, false);
+        assertFalse(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.ABBREVIATE, shortcutKeyEvent));
         model.setNewBindingForCurrent(shortcutKeyEvent);
 
         model.storeSettings();
 
-        assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        assertTrue(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.ABBREVIATE, shortcutKeyEvent));
     }
 
     @Test
     void saveNewSpecialKeysKeyBindingsToPreferences() {
         setKeyBindingViewModel(KeyBinding.ABBREVIATE);
-        KeyEvent shortcutKeyEvent = new KeyEvent(KeyEvent.KEY_PRESSED, "F1", "F1", KeyCode.F1, true, false, false, false);
+        KeyEvent shortcutKeyEvent =
+                new KeyEvent(
+                        KeyEvent.KEY_PRESSED, "F1", "F1", KeyCode.F1, true, false, false, false);
 
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        assertFalse(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.ABBREVIATE, shortcutKeyEvent));
         model.setNewBindingForCurrent(shortcutKeyEvent);
 
         model.storeSettings();
 
-        assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        assertTrue(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.ABBREVIATE, shortcutKeyEvent));
     }
 
     @Test
@@ -125,32 +168,43 @@ void setAllKeyBindingsToDefault() {
         assumeFalse(OS.OS_X);
 
         setKeyBindingViewModel(KeyBinding.ABBREVIATE);
-        KeyEvent shortcutKeyEvent = new KeyEvent(KeyEvent.KEY_PRESSED, "C", "C", KeyCode.C, true, true, true, false);
+        KeyEvent shortcutKeyEvent =
+                new KeyEvent(KeyEvent.KEY_PRESSED, "C", "C", KeyCode.C, true, true, true, false);
 
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        assertFalse(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.ABBREVIATE, shortcutKeyEvent));
 
         model.setNewBindingForCurrent(shortcutKeyEvent);
         model.storeSettings();
 
-        assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        assertTrue(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.ABBREVIATE, shortcutKeyEvent));
 
         keyBindingRepository.resetToDefault();
         model.storeSettings();
 
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        assertFalse(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.ABBREVIATE, shortcutKeyEvent));
     }
 
     @Test
     void closeEntryEditorCloseEntryKeybinding() {
         setKeyBindingViewModel(KeyBinding.CLOSE);
-        KeyEvent closeEditorEvent = new KeyEvent(KeyEvent.KEY_PRESSED, "", "", KeyCode.ESCAPE, false, false, false, false);
+        KeyEvent closeEditorEvent =
+                new KeyEvent(
+                        KeyEvent.KEY_PRESSED, "", "", KeyCode.ESCAPE, false, false, false, false);
 
         assertEquals(KeyBinding.CLOSE.getDefaultKeyBinding(), KeyCode.ESCAPE.getName());
 
         KeyCombination combi = KeyCombination.valueOf(KeyBinding.CLOSE.getDefaultKeyBinding());
 
         assertTrue(combi.match(closeEditorEvent));
-        assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE, closeEditorEvent));
+        assertTrue(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.CLOSE, closeEditorEvent));
     }
 
     @Test
@@ -158,23 +212,32 @@ void setSingleKeyBindingToDefault() {
         assumeFalse(OS.OS_X);
 
         KeyBindingViewModel viewModel = setKeyBindingViewModel(KeyBinding.ABBREVIATE);
-        KeyEvent shortcutKeyEvent = new KeyEvent(KeyEvent.KEY_PRESSED, "C", "C", KeyCode.C, true, true, true, false);
+        KeyEvent shortcutKeyEvent =
+                new KeyEvent(KeyEvent.KEY_PRESSED, "C", "C", KeyCode.C, true, true, true, false);
 
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        assertFalse(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.ABBREVIATE, shortcutKeyEvent));
 
         model.setNewBindingForCurrent(shortcutKeyEvent);
         model.storeSettings();
 
-        assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        assertTrue(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.ABBREVIATE, shortcutKeyEvent));
 
         viewModel.resetToDefault();
         model.storeSettings();
 
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        assertFalse(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.ABBREVIATE, shortcutKeyEvent));
     }
 
     private KeyBindingViewModel setKeyBindingViewModel(KeyBinding binding) {
-        KeyBindingViewModel viewModel = new KeyBindingViewModel(keyBindingRepository, binding, binding.getDefaultKeyBinding());
+        KeyBindingViewModel viewModel =
+                new KeyBindingViewModel(
+                        keyBindingRepository, binding, binding.getDefaultKeyBinding());
         model.selectedKeyBindingProperty().set(Optional.of(viewModel));
         return viewModel;
     }
diff --git a/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java b/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java
index bbff19660a83..81e679aae20e 100644
--- a/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java
+++ b/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.libraryproperties.constants;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import javafx.beans.property.StringProperty;
 
@@ -9,16 +10,15 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibtexString;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.util.List;
 
 class ConstantsPropertiesViewModelTest {
 
     private DialogService service = mock(DialogService.class);
-    private ExternalApplicationsPreferences externalApplicationsPreferences = mock(ExternalApplicationsPreferences.class);
+    private ExternalApplicationsPreferences externalApplicationsPreferences =
+            mock(ExternalApplicationsPreferences.class);
 
     /**
      * Check that the list of strings is sorted according to their keys
@@ -26,19 +26,22 @@ class ConstantsPropertiesViewModelTest {
     @Test
     void stringsListPropertySorting() {
         BibtexString string1 = new BibtexString("TSE", "Transactions on Software Engineering");
-        BibtexString string2 = new BibtexString("ICSE", "International Conference on Software Engineering");
+        BibtexString string2 =
+                new BibtexString("ICSE", "International Conference on Software Engineering");
         BibDatabase db = new BibDatabase();
         db.setStrings(List.of(string1, string2));
         BibDatabaseContext context = new BibDatabaseContext(db);
         List<String> expected = List.of(string2.getName(), string1.getName()); // ICSE before TSE
 
-        ConstantsPropertiesViewModel model = new ConstantsPropertiesViewModel(context, service, externalApplicationsPreferences);
+        ConstantsPropertiesViewModel model =
+                new ConstantsPropertiesViewModel(context, service, externalApplicationsPreferences);
         model.setValues();
 
-        List<String> actual = model.stringsListProperty().stream()
-                .map(ConstantsItemModel::labelProperty)
-                .map(StringProperty::getValue)
-                .toList();
+        List<String> actual =
+                model.stringsListProperty().stream()
+                        .map(ConstantsItemModel::labelProperty)
+                        .map(StringProperty::getValue)
+                        .toList();
 
         assertEquals(expected, actual);
     }
@@ -52,17 +55,20 @@ void stringsListPropertyResorting() {
         BibDatabaseContext context = new BibDatabaseContext(db);
         List<String> expected = List.of("ICSE", "TSE");
 
-        ConstantsPropertiesViewModel model = new ConstantsPropertiesViewModel(context, service, externalApplicationsPreferences);
+        ConstantsPropertiesViewModel model =
+                new ConstantsPropertiesViewModel(context, service, externalApplicationsPreferences);
         var stringsList = model.stringsListProperty();
         stringsList.add(new ConstantsItemModel("TSE", "Transactions on Software Engineering"));
-        stringsList.add(new ConstantsItemModel("ICSE", "International Conference on Software Engineering"));
+        stringsList.add(
+                new ConstantsItemModel("ICSE", "International Conference on Software Engineering"));
 
         model.resortStrings();
 
-        List<String> actual = model.stringsListProperty().stream()
-                .map(ConstantsItemModel::labelProperty)
-                .map(StringProperty::getValue)
-                .toList();
+        List<String> actual =
+                model.stringsListProperty().stream()
+                        .map(ConstantsItemModel::labelProperty)
+                        .map(StringProperty::getValue)
+                        .toList();
 
         assertEquals(expected, actual);
     }
@@ -72,7 +78,8 @@ void storeSettingsWithStringConstantTest() {
         BibDatabase db = new BibDatabase();
         BibDatabaseContext context = new BibDatabaseContext(db);
 
-        ConstantsPropertiesViewModel model = new ConstantsPropertiesViewModel(context, service, externalApplicationsPreferences);
+        ConstantsPropertiesViewModel model =
+                new ConstantsPropertiesViewModel(context, service, externalApplicationsPreferences);
 
         var stringsList = model.stringsListProperty();
         stringsList.add(new ConstantsItemModel("KTH", "Royal Institute of Technology"));
diff --git a/src/test/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModelTest.java b/src/test/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModelTest.java
index cd17e1c38b45..95014ac62fd2 100644
--- a/src/test/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModelTest.java
+++ b/src/test/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModelTest.java
@@ -1,8 +1,9 @@
 package org.jabref.gui.libraryproperties.contentselectors;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
@@ -16,19 +17,21 @@
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
 
 class ContentSelectorViewModelTest {
     private final DialogService dialogService = mock(DialogService.class);
-    private final List<StandardField> DEFAULT_FIELDS = Arrays.asList(
-            StandardField.AUTHOR, StandardField.JOURNAL, StandardField.KEYWORDS, StandardField.PUBLISHER);
+    private final List<StandardField> DEFAULT_FIELDS =
+            Arrays.asList(
+                    StandardField.AUTHOR,
+                    StandardField.JOURNAL,
+                    StandardField.KEYWORDS,
+                    StandardField.PUBLISHER);
     private ContentSelectorViewModel viewModel;
     private BibDatabaseContext databaseContext;
 
@@ -41,7 +44,8 @@ void setUp() {
 
     @Test
     void initHasDefaultFieldNames() {
-        ListProperty<Field> expected = new SimpleListProperty<>(FXCollections.observableArrayList(DEFAULT_FIELDS));
+        ListProperty<Field> expected =
+                new SimpleListProperty<>(FXCollections.observableArrayList(DEFAULT_FIELDS));
         ListProperty<Field> result = viewModel.getFieldNamesBackingList();
 
         assertEquals(expected, result);
@@ -51,8 +55,8 @@ void initHasDefaultFieldNames() {
     void addsNewKeyword() {
         addKeyword(StandardField.KEYWORDS, "test");
 
-        ListProperty<String> expected = new SimpleListProperty<>(
-                FXCollections.observableArrayList("test"));
+        ListProperty<String> expected =
+                new SimpleListProperty<>(FXCollections.observableArrayList("test"));
         ListProperty<String> result = viewModel.getKeywordsBackingList();
 
         assertEquals(expected, result);
@@ -63,8 +67,8 @@ void addsKeywordOnlyIfUnique() {
         addKeyword(StandardField.KEYWORDS, "test");
         addKeyword(StandardField.KEYWORDS, "test");
 
-        ListProperty<String> expected = new SimpleListProperty<>(
-                FXCollections.observableArrayList("test"));
+        ListProperty<String> expected =
+                new SimpleListProperty<>(FXCollections.observableArrayList("test"));
         ListProperty<String> result = viewModel.getKeywordsBackingList();
 
         assertEquals(expected, result);
@@ -75,7 +79,8 @@ void removesKeyword() {
         addKeyword(StandardField.KEYWORDS, "test");
         removeKeyword(StandardField.KEYWORDS, "test");
 
-        ListProperty<String> expected = new SimpleListProperty<>(FXCollections.observableArrayList());
+        ListProperty<String> expected =
+                new SimpleListProperty<>(FXCollections.observableArrayList());
         ListProperty<String> result = viewModel.getKeywordsBackingList();
 
         assertEquals(expected, result);
@@ -87,7 +92,8 @@ void addsNewField() {
         addField(testField);
 
         ListProperty<Field> fields = viewModel.getFieldNamesBackingList();
-        boolean fieldsContainTestValue = fields.stream().anyMatch(field -> "Test".equals(field.getDisplayName()));
+        boolean fieldsContainTestValue =
+                fields.stream().anyMatch(field -> "Test".equals(field.getDisplayName()));
 
         assertTrue(fieldsContainTestValue);
     }
@@ -98,7 +104,8 @@ void removesField() {
         addField(testField);
         removeField(testField);
 
-        ListProperty<Field> expected = new SimpleListProperty<>(FXCollections.observableArrayList(DEFAULT_FIELDS));
+        ListProperty<Field> expected =
+                new SimpleListProperty<>(FXCollections.observableArrayList(DEFAULT_FIELDS));
         ListProperty<Field> result = viewModel.getFieldNamesBackingList();
 
         assertEquals(expected, result);
@@ -109,8 +116,8 @@ void displaysKeywordsInAlphabeticalOrder() {
         addKeyword(StandardField.KEYWORDS, "test1");
         addKeyword(StandardField.KEYWORDS, "test2");
 
-        ListProperty<String> expected = new SimpleListProperty<>(
-                FXCollections.observableArrayList("test1", "test2"));
+        ListProperty<String> expected =
+                new SimpleListProperty<>(FXCollections.observableArrayList("test1", "test2"));
         ListProperty<String> result = viewModel.getKeywordsBackingList();
 
         assertEquals(expected, result);
@@ -124,8 +131,8 @@ void savingPersistsDataInDatabase() {
         addKeyword(testField, "test2");
         viewModel.storeSettings();
 
-        List<String> result = databaseContext.getMetaData()
-                                             .getContentSelectorValuesForField(testField);
+        List<String> result =
+                databaseContext.getMetaData().getContentSelectorValuesForField(testField);
         List<String> expected = Arrays.asList("test1", "test2");
 
         assertEquals(expected, result);
@@ -133,15 +140,17 @@ void savingPersistsDataInDatabase() {
 
     private void addKeyword(Field field, String keyword) {
         when(dialogService.showInputDialogAndWait(
-                Localization.lang("Add new keyword"), Localization.lang("Keyword:")))
+                        Localization.lang("Add new keyword"), Localization.lang("Keyword:")))
                 .thenReturn(Optional.of(keyword));
 
         viewModel.showInputKeywordDialog(field);
     }
 
     private void removeKeyword(Field field, String keyword) {
-        when(dialogService.showConfirmationDialogAndWait(Localization.lang("Remove keyword"),
-                Localization.lang("Are you sure you want to remove keyword: \"%0\"?", keyword)))
+        when(dialogService.showConfirmationDialogAndWait(
+                        Localization.lang("Remove keyword"),
+                        Localization.lang(
+                                "Are you sure you want to remove keyword: \"%0\"?", keyword)))
                 .thenReturn(true);
 
         viewModel.showRemoveKeywordConfirmationDialog(field, keyword);
@@ -149,19 +158,22 @@ private void removeKeyword(Field field, String keyword) {
 
     private void addField(Field field) {
         when(dialogService.showEditableChoiceDialogAndWait(
-                Localization.lang("Add new field name"),
-                Localization.lang("Field name"),
-                Localization.lang("Add"),
-                FXCollections.observableArrayList(FieldFactory.getStandardFieldsWithCitationKey()),
-                FieldsUtil.FIELD_STRING_CONVERTER))
+                        Localization.lang("Add new field name"),
+                        Localization.lang("Field name"),
+                        Localization.lang("Add"),
+                        FXCollections.observableArrayList(
+                                FieldFactory.getStandardFieldsWithCitationKey()),
+                        FieldsUtil.FIELD_STRING_CONVERTER))
                 .thenReturn(Optional.of(field));
         viewModel.showInputFieldNameDialog();
     }
 
     private void removeField(Field field) {
         when(dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Remove field name"),
-                Localization.lang("Are you sure you want to remove field name: \"%0\"?", field.getDisplayName())))
+                        Localization.lang("Remove field name"),
+                        Localization.lang(
+                                "Are you sure you want to remove field name: \"%0\"?",
+                                field.getDisplayName())))
                 .thenReturn(true);
 
         viewModel.showRemoveFieldNameConfirmationDialog(field);
diff --git a/src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java b/src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java
index b7ab54475eed..97e3dcbd8c8a 100644
--- a/src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java
+++ b/src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java
@@ -1,14 +1,18 @@
 package org.jabref.gui.linkedfile;
 
-import java.net.CookieHandler;
-import java.net.CookieManager;
-import java.net.CookiePolicy;
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
-import java.util.TreeSet;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.head;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
 
 import javafx.collections.FXCollections;
 
@@ -22,8 +26,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-
-import com.github.tomakehurst.wiremock.WireMockServer;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,27 +33,26 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.head;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.net.CookieHandler;
+import java.net.CookieManager;
+import java.net.CookiePolicy;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.TreeSet;
 
 class DownloadLinkedFileActionTest {
 
-    @TempDir
-    private Path tempFolder;
+    @TempDir private Path tempFolder;
 
     private BibEntry entry;
 
     private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
     private final DialogService dialogService = mock(DialogService.class);
-    private final ExternalApplicationsPreferences externalApplicationsPreferences = mock(ExternalApplicationsPreferences.class);
+    private final ExternalApplicationsPreferences externalApplicationsPreferences =
+            mock(ExternalApplicationsPreferences.class);
     private final FilePreferences filePreferences = mock(FilePreferences.class);
     private final GuiPreferences preferences = mock(GuiPreferences.class);
 
@@ -59,11 +60,14 @@ class DownloadLinkedFileActionTest {
 
     @BeforeEach
     void setUp(@TempDir Path tempFolder) throws Exception {
-        entry = new BibEntry()
-                .withCitationKey("asdf");
-
-        when(externalApplicationsPreferences.getExternalFileTypes()).thenReturn(FXCollections.observableSet(new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes())));
-        when(preferences.getExternalApplicationsPreferences()).thenReturn(externalApplicationsPreferences);
+        entry = new BibEntry().withCitationKey("asdf");
+
+        when(externalApplicationsPreferences.getExternalFileTypes())
+                .thenReturn(
+                        FXCollections.observableSet(
+                                new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes())));
+        when(preferences.getExternalApplicationsPreferences())
+                .thenReturn(externalApplicationsPreferences);
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
         when(preferences.getXmpPreferences()).thenReturn(mock(XmpPreferences.class));
         Path tempFile = tempFolder.resolve("temporaryFile");
@@ -99,18 +103,21 @@ void replacesLinkedFiles(@TempDir Path tempFolder) throws Exception {
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
         when(filePreferences.shouldKeepDownloadUrl()).thenReturn(true);
 
-        DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(
-                databaseContext,
-                entry,
-                linkedFile,
-                linkedFile.getLink(),
-                dialogService,
-                preferences.getExternalApplicationsPreferences(),
-                preferences.getFilePreferences(),
-                new CurrentThreadTaskExecutor());
+        DownloadLinkedFileAction downloadLinkedFileAction =
+                new DownloadLinkedFileAction(
+                        databaseContext,
+                        entry,
+                        linkedFile,
+                        linkedFile.getLink(),
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences(),
+                        preferences.getFilePreferences(),
+                        new CurrentThreadTaskExecutor());
         downloadLinkedFileAction.execute();
 
-        assertEquals(List.of(new LinkedFile("", tempFolder.resolve("asdf.pdf"), "PDF", url)), entry.getFiles());
+        assertEquals(
+                List.of(new LinkedFile("", tempFolder.resolve("asdf.pdf"), "PDF", url)),
+                entry.getFiles());
     }
 
     @ParameterizedTest
@@ -124,18 +131,21 @@ void doesntReplaceSourceURL(boolean keepHtml) throws Exception {
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
         when(filePreferences.shouldKeepDownloadUrl()).thenReturn(true);
 
-        DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(
-                databaseContext,
-                entry,
-                linkedFile,
-                linkedFile.getLink(),
-                dialogService,
-                preferences.getExternalApplicationsPreferences(),
-                preferences.getFilePreferences(),
-                new CurrentThreadTaskExecutor());
+        DownloadLinkedFileAction downloadLinkedFileAction =
+                new DownloadLinkedFileAction(
+                        databaseContext,
+                        entry,
+                        linkedFile,
+                        linkedFile.getLink(),
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences(),
+                        preferences.getFilePreferences(),
+                        new CurrentThreadTaskExecutor());
         downloadLinkedFileAction.execute();
 
-        assertEquals(List.of(new LinkedFile("", tempFolder.resolve("asdf.pdf"), "PDF", url)), entry.getFiles());
+        assertEquals(
+                List.of(new LinkedFile("", tempFolder.resolve("asdf.pdf"), "PDF", url)),
+                entry.getFiles());
 
         linkedFile = entry.getFiles().getFirst();
 
@@ -144,36 +154,44 @@ void doesntReplaceSourceURL(boolean keepHtml) throws Exception {
         // Verify that re-downloading the file after the first download doesn't modify the entry
         Files.delete(downloadedFile);
 
-        DownloadLinkedFileAction downloadLinkedFileAction2 = new DownloadLinkedFileAction(
-                databaseContext,
-                entry,
-                linkedFile,
-                linkedFile.getSourceUrl(),
-                dialogService,
-                preferences.getExternalApplicationsPreferences(),
-                preferences.getFilePreferences(),
-                new CurrentThreadTaskExecutor(),
-                Path.of(linkedFile.getLink()).getFileName().toString(),
-                keepHtml);
+        DownloadLinkedFileAction downloadLinkedFileAction2 =
+                new DownloadLinkedFileAction(
+                        databaseContext,
+                        entry,
+                        linkedFile,
+                        linkedFile.getSourceUrl(),
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences(),
+                        preferences.getFilePreferences(),
+                        new CurrentThreadTaskExecutor(),
+                        Path.of(linkedFile.getLink()).getFileName().toString(),
+                        keepHtml);
         downloadLinkedFileAction2.execute();
 
-        assertEquals(List.of(new LinkedFile("", tempFolder.resolve("asdf.pdf"), "PDF", url)), entry.getFiles());
+        assertEquals(
+                List.of(new LinkedFile("", tempFolder.resolve("asdf.pdf"), "PDF", url)),
+                entry.getFiles());
     }
 
     @Test
     void keepsHtmlFileLink(@TempDir Path tempFolder) throws Exception {
-        stubFor(get(urlEqualTo("/html"))
-                .willReturn(aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "text/html; charset=utf-8")
-                        .withBody("<html><body><h1>Hi</h1></body></html>")));
-
-        stubFor(head(urlEqualTo("/html"))
-                .willReturn(aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "text/html; charset=utf-8")));
-
-        LinkedFile linkedFile = new LinkedFile(URI.create("http://localhost:2331/html").toURL(), "");
+        stubFor(
+                get(urlEqualTo("/html"))
+                        .willReturn(
+                                aResponse()
+                                        .withStatus(200)
+                                        .withHeader("Content-Type", "text/html; charset=utf-8")
+                                        .withBody("<html><body><h1>Hi</h1></body></html>")));
+
+        stubFor(
+                head(urlEqualTo("/html"))
+                        .willReturn(
+                                aResponse()
+                                        .withStatus(200)
+                                        .withHeader("Content-Type", "text/html; charset=utf-8")));
+
+        LinkedFile linkedFile =
+                new LinkedFile(URI.create("http://localhost:2331/html").toURL(), "");
         when(databaseContext.getFirstExistingFileDir(any())).thenReturn(Optional.of(tempFolder));
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
@@ -182,15 +200,16 @@ void keepsHtmlFileLink(@TempDir Path tempFolder) throws Exception {
 
         BibEntry expected = (BibEntry) entry.clone();
 
-        DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(
-                databaseContext,
-                entry,
-                linkedFile,
-                linkedFile.getLink(),
-                dialogService,
-                preferences.getExternalApplicationsPreferences(),
-                preferences.getFilePreferences(),
-                new CurrentThreadTaskExecutor());
+        DownloadLinkedFileAction downloadLinkedFileAction =
+                new DownloadLinkedFileAction(
+                        databaseContext,
+                        entry,
+                        linkedFile,
+                        linkedFile.getLink(),
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences(),
+                        preferences.getFilePreferences(),
+                        new CurrentThreadTaskExecutor());
         downloadLinkedFileAction.execute();
 
         assertEquals(expected, entry);
@@ -198,35 +217,41 @@ void keepsHtmlFileLink(@TempDir Path tempFolder) throws Exception {
 
     @Test
     void removesHtmlFileLink(@TempDir Path tempFolder) throws Exception {
-        stubFor(get(urlEqualTo("/html"))
-                .willReturn(aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "text/html; charset=utf-8")
-                        .withBody("<html><body><h1>Hi</h1></body></html>")));
-
-        stubFor(head(urlEqualTo("/html"))
-                .willReturn(aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "text/html; charset=utf-8")));
-
-        LinkedFile linkedFile = new LinkedFile(URI.create("http://localhost:2331/html").toURL(), "");
+        stubFor(
+                get(urlEqualTo("/html"))
+                        .willReturn(
+                                aResponse()
+                                        .withStatus(200)
+                                        .withHeader("Content-Type", "text/html; charset=utf-8")
+                                        .withBody("<html><body><h1>Hi</h1></body></html>")));
+
+        stubFor(
+                head(urlEqualTo("/html"))
+                        .willReturn(
+                                aResponse()
+                                        .withStatus(200)
+                                        .withHeader("Content-Type", "text/html; charset=utf-8")));
+
+        LinkedFile linkedFile =
+                new LinkedFile(URI.create("http://localhost:2331/html").toURL(), "");
         when(databaseContext.getFirstExistingFileDir(any())).thenReturn(Optional.of(tempFolder));
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
 
         entry.setFiles(List.of(linkedFile));
 
-        DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(
-                databaseContext,
-                entry,
-                linkedFile,
-                linkedFile.getLink(),
-                dialogService,
-                preferences.getExternalApplicationsPreferences(),
-                preferences.getFilePreferences(),
-                new CurrentThreadTaskExecutor(),
-                "",
-                false);
+        DownloadLinkedFileAction downloadLinkedFileAction =
+                new DownloadLinkedFileAction(
+                        databaseContext,
+                        entry,
+                        linkedFile,
+                        linkedFile.getLink(),
+                        dialogService,
+                        preferences.getExternalApplicationsPreferences(),
+                        preferences.getFilePreferences(),
+                        new CurrentThreadTaskExecutor(),
+                        "",
+                        false);
         downloadLinkedFileAction.execute();
 
         assertEquals(new BibEntry().withCitationKey("asdf"), entry);
diff --git a/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java b/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java
index 5384c8818bd5..da0b68200a59 100644
--- a/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java
+++ b/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java
@@ -1,14 +1,14 @@
 package org.jabref.gui.maintable;
 
-import org.jabref.logic.preferences.CliPreferences;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import com.airhacks.afterburner.injection.Injector;
+
+import org.jabref.logic.preferences.CliPreferences;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-
 class MainTableColumnModelTest {
 
     private static String testName = "field:author";
@@ -16,7 +16,8 @@ class MainTableColumnModelTest {
     private static String testQualifier = "author";
 
     private static String testTypeOnlyName = "linked_id";
-    private static MainTableColumnModel.Type testTypeOnlyType = MainTableColumnModel.Type.LINKED_IDENTIFIER;
+    private static MainTableColumnModel.Type testTypeOnlyType =
+            MainTableColumnModel.Type.LINKED_IDENTIFIER;
 
     @BeforeAll
     static void setup() {
diff --git a/src/test/java/org/jabref/gui/maintable/MainTableDataModelTest.java b/src/test/java/org/jabref/gui/maintable/MainTableDataModelTest.java
index 0236756acb0b..e043281e48d3 100644
--- a/src/test/java/org/jabref/gui/maintable/MainTableDataModelTest.java
+++ b/src/test/java/org/jabref/gui/maintable/MainTableDataModelTest.java
@@ -1,6 +1,9 @@
 package org.jabref.gui.maintable;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.tobiasdiez.easybind.EasyBind;
 
 import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
@@ -16,39 +19,52 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
-import com.tobiasdiez.easybind.EasyBind;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.List;
 
 class MainTableDataModelTest {
 
     @Test
     void additionToObservableMapTriggersUpdate() {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
-        ObservableList<BibEntry> entries = FXCollections.synchronizedObservableList(FXCollections.observableArrayList(BibEntry::getObservables));
+        ObservableList<BibEntry> entries =
+                FXCollections.synchronizedObservableList(
+                        FXCollections.observableArrayList(BibEntry::getObservables));
         ObservableList<BibEntry> allEntries = FXCollections.unmodifiableObservableList(entries);
-        NameDisplayPreferences nameDisplayPreferences = new NameDisplayPreferences(NameDisplayPreferences.DisplayStyle.AS_IS, NameDisplayPreferences.AbbreviationStyle.FULL);
-        SimpleObjectProperty<MainTableFieldValueFormatter> fieldValueFormatter = new SimpleObjectProperty<>(new MainTableFieldValueFormatter(nameDisplayPreferences, bibDatabaseContext));
-        ObservableList<BibEntryTableViewModel> entriesViewModel = EasyBind.mapBacked(allEntries, entry ->
-                new BibEntryTableViewModel(entry, bibDatabaseContext, fieldValueFormatter));
+        NameDisplayPreferences nameDisplayPreferences =
+                new NameDisplayPreferences(
+                        NameDisplayPreferences.DisplayStyle.AS_IS,
+                        NameDisplayPreferences.AbbreviationStyle.FULL);
+        SimpleObjectProperty<MainTableFieldValueFormatter> fieldValueFormatter =
+                new SimpleObjectProperty<>(
+                        new MainTableFieldValueFormatter(
+                                nameDisplayPreferences, bibDatabaseContext));
+        ObservableList<BibEntryTableViewModel> entriesViewModel =
+                EasyBind.mapBacked(
+                        allEntries,
+                        entry ->
+                                new BibEntryTableViewModel(
+                                        entry, bibDatabaseContext, fieldValueFormatter));
         FilteredList<BibEntryTableViewModel> entriesFiltered = new FilteredList<>(entriesViewModel);
         IntegerProperty resultSize = new SimpleIntegerProperty();
         resultSize.bind(Bindings.size(entriesFiltered));
-        SortedList<BibEntryTableViewModel> entriesFilteredAndSorted = new SortedList<>(entriesFiltered);
+        SortedList<BibEntryTableViewModel> entriesFilteredAndSorted =
+                new SortedList<>(entriesFiltered);
         EntryComparator entryComparator = new EntryComparator(false, false, StandardField.AUTHOR);
-        entriesFilteredAndSorted.setComparator((o1, o2) -> entryComparator.compare(o1.getEntry(), o2.getEntry()));
+        entriesFilteredAndSorted.setComparator(
+                (o1, o2) -> entryComparator.compare(o1.getEntry(), o2.getEntry()));
 
         final boolean[] changed = {false};
 
-        entriesFilteredAndSorted.addListener((InvalidationListener) observable -> changed[0] = true);
+        entriesFilteredAndSorted.addListener(
+                (InvalidationListener) observable -> changed[0] = true);
 
         BibEntry bibEntryAuthorT = new BibEntry().withField(StandardField.AUTHOR, "T");
         entries.add(bibEntryAuthorT);
 
-        List<BibEntry> result = entriesFilteredAndSorted.stream().map(BibEntryTableViewModel::getEntry).toList();
+        List<BibEntry> result =
+                entriesFilteredAndSorted.stream().map(BibEntryTableViewModel::getEntry).toList();
         assertEquals(List.of(bibEntryAuthorT), result);
 
         BibEntry bibEntryNothingToZ = new BibEntry();
diff --git a/src/test/java/org/jabref/gui/menus/FileHistoryMenuTest.java b/src/test/java/org/jabref/gui/menus/FileHistoryMenuTest.java
index a50815f835e1..92c96db7d3fd 100644
--- a/src/test/java/org/jabref/gui/menus/FileHistoryMenuTest.java
+++ b/src/test/java/org/jabref/gui/menus/FileHistoryMenuTest.java
@@ -1,30 +1,27 @@
 package org.jabref.gui.menus;
 
-import java.nio.file.Path;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.MockitoAnnotations.openMocks;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.frame.FileHistoryMenu;
 import org.jabref.logic.util.io.FileHistory;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.testfx.framework.junit5.ApplicationExtension;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.MockitoAnnotations.openMocks;
+import java.nio.file.Path;
 
 @ExtendWith(ApplicationExtension.class)
 class FileHistoryMenuTest {
     private static final String BIBTEX_LIBRARY_PATH = "src/test/resources/org/jabref/";
 
     private FileHistoryMenu fileHistoryMenu;
-    @Mock
-    private FileHistory fileHistory;
-    @Mock
-    private DialogService dialogService;
+    @Mock private FileHistory fileHistory;
+    @Mock private DialogService dialogService;
 
     @BeforeEach
     void setUp() {
diff --git a/src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java b/src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java
index 8284c4c289db..c5944f99ea11 100644
--- a/src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java
@@ -1,19 +1,18 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import javafx.scene.text.Text;
 
 import org.jabref.testutils.category.GUITest;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.testfx.framework.junit5.ApplicationExtension;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @GUITest
 @ExtendWith(ApplicationExtension.class)
@@ -24,19 +23,29 @@ public static void assertEquals(List<Text> expected, List<Text> actual) {
         Assertions.assertEquals(expected.toString(), actual.toString());
 
         // Moreover, make sure that style classes are correct
-        List<String> expectedStyles = expected.stream().map(text -> text.getStyleClass().toString()).collect(Collectors.toList());
-        List<String> actualStyles = actual.stream().map(text -> text.getStyleClass().toString()).collect(Collectors.toList());
+        List<String> expectedStyles =
+                expected.stream()
+                        .map(text -> text.getStyleClass().toString())
+                        .collect(Collectors.toList());
+        List<String> actualStyles =
+                actual.stream()
+                        .map(text -> text.getStyleClass().toString())
+                        .collect(Collectors.toList());
         Assertions.assertEquals(expectedStyles, actualStyles);
     }
 
     @Test
     void generateDiffHighlightingBothNullThrowsNPE() {
-        assertThrows(NullPointerException.class, () -> DiffHighlighting.generateDiffHighlighting(null, null, ""));
+        assertThrows(
+                NullPointerException.class,
+                () -> DiffHighlighting.generateDiffHighlighting(null, null, ""));
     }
 
     @Test
     void nullSeparatorThrowsNPE() {
-        assertThrows(NullPointerException.class, () -> DiffHighlighting.generateDiffHighlighting("", "", null));
+        assertThrows(
+                NullPointerException.class,
+                () -> DiffHighlighting.generateDiffHighlighting("", "", null));
     }
 
     @Test
@@ -45,8 +54,7 @@ void generateDiffHighlightingNoDiff() {
                 Arrays.asList(
                         DiffHighlighting.forUnchanged("f"),
                         DiffHighlighting.forUnchanged("o"),
-                        DiffHighlighting.forUnchanged("o")
-                ),
+                        DiffHighlighting.forUnchanged("o")),
                 DiffHighlighting.generateDiffHighlighting("foo", "foo", ""));
     }
 
@@ -54,9 +62,7 @@ void generateDiffHighlightingNoDiff() {
     void generateDiffHighlightingSingleWordAddTextWordDiff() {
         assertEquals(
                 Arrays.asList(
-                        DiffHighlighting.forRemoved("foo "),
-                        DiffHighlighting.forAdded("foobar")
-                ),
+                        DiffHighlighting.forRemoved("foo "), DiffHighlighting.forAdded("foobar")),
                 DiffHighlighting.generateDiffHighlighting("foo", "foobar", " "));
     }
 
@@ -67,8 +73,7 @@ void generateDiffHighlightingSingleWordAddTextCharacterDiff() {
                         DiffHighlighting.forUnchanged("f"),
                         DiffHighlighting.forUnchanged("o"),
                         DiffHighlighting.forUnchanged("o"),
-                        DiffHighlighting.forAdded("bar")
-                ),
+                        DiffHighlighting.forAdded("bar")),
                 DiffHighlighting.generateDiffHighlighting("foo", "foobar", ""));
     }
 
@@ -76,9 +81,7 @@ void generateDiffHighlightingSingleWordAddTextCharacterDiff() {
     void generateDiffHighlightingSingleWordDeleteTextWordDiff() {
         assertEquals(
                 Arrays.asList(
-                        DiffHighlighting.forRemoved("foobar "),
-                        DiffHighlighting.forAdded("foo")
-                ),
+                        DiffHighlighting.forRemoved("foobar "), DiffHighlighting.forAdded("foo")),
                 DiffHighlighting.generateDiffHighlighting("foobar", "foo", " "));
     }
 
@@ -91,8 +94,7 @@ void generateDiffHighlightingSingleWordDeleteTextCharacterDiff() {
                         DiffHighlighting.forUnchanged("o"),
                         DiffHighlighting.forRemoved("b"),
                         DiffHighlighting.forRemoved("a"),
-                        DiffHighlighting.forRemoved("r")
-                ),
+                        DiffHighlighting.forRemoved("r")),
                 DiffHighlighting.generateDiffHighlighting("foobar", "foo", ""));
     }
 }
diff --git a/src/test/java/org/jabref/gui/mergeentries/FieldRowViewModelTest.java b/src/test/java/org/jabref/gui/mergeentries/FieldRowViewModelTest.java
index 712897b3db4b..fb3aeef418d8 100644
--- a/src/test/java/org/jabref/gui/mergeentries/FieldRowViewModelTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/FieldRowViewModelTest.java
@@ -1,6 +1,11 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.gui.mergeentries.newmergedialog.FieldRowViewModel;
 import org.jabref.gui.mergeentries.newmergedialog.fieldsmerger.FieldMergerFactory;
@@ -10,18 +15,12 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.jbibtex.ParseException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Optional;
 
 public class FieldRowViewModelTest {
 
@@ -38,38 +37,55 @@ public class FieldRowViewModelTest {
 
     @BeforeEach
     void setup() throws ParseException {
-        leftEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("LajnDiezScheinEtAl2012")
-                .withField(StandardField.AUTHOR, "Lajn, A and Diez, T and Schein, F and Frenzel, H and von Wenckstern, H and Grundmann, M")
-                .withField(StandardField.TITLE, "Light and temperature stability of fully transparent ZnO-based inverter circuits")
-                .withField(StandardField.NUMBER, "4")
-                .withField(StandardField.PAGES, "515--517")
-                .withField(StandardField.VOLUME, "32")
-                .withField(StandardField.GROUPS, "Skimmed")
-                .withField(StandardField.JOURNAL, "Electron Device Letters, IEEE")
-                .withField(StandardField.PUBLISHER, "IEEE")
-                .withField(StandardField.YEAR, "2012");
-
-        rightEntry = new BibEntry(StandardEntryType.Book)
-                .withCitationKey("KolbLenhardWirtz2012")
-                .withField(StandardField.AUTHOR, "Stefan Kolb and Guido Wirtz")
-                .withField(StandardField.BOOKTITLE, "Proceedings of the 5\\textsuperscript{th} {IEEE} International Conference on Service-Oriented Computing and Applications {(SOCA'12)}, Taipei, Taiwan")
-                .withField(StandardField.TITLE, "{Bridging the Heterogeneity of Orchestrations - A Petri Net-based Integration of BPEL and Windows Workflow}")
-                .withField(StandardField.ORGANIZATION, "IEEE")
-                .withField(StandardField.PAGES, "1--8")
-                .withField(StandardField.ADDRESS, "Oxford, United Kingdom")
-                .withField(StandardField.GROUPS, "By rating, Skimmed")
-                .withMonth(Month.DECEMBER)
-                .withField(StandardField.KEYWORDS, "a, b, c")
-                .withField(StandardField.YEAR, "2012");
-
-        extraEntry = new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey("BoopalGarridoGustafsson2013")
-                .withField(StandardField.AUTHOR, "Padma Prasad Boopal and Mario Garrido and Oscar Gustafsson")
-                .withField(StandardField.BOOKTITLE, "2013 {IEEE} International Symposium on Circuits and Systems (ISCAS2013), Beijing, China, May 19-23, 2013")
-                .withField(StandardField.TITLE, "A reconfigurable {FFT} architecture for variable-length and multi-streaming {OFDM} standards")
-                .withField(StandardField.KEYWORDS, "b, c, a")
-                .withField(StandardField.YEAR, "2013");
+        leftEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("LajnDiezScheinEtAl2012")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Lajn, A and Diez, T and Schein, F and Frenzel, H and von Wenckstern, H and Grundmann, M")
+                        .withField(
+                                StandardField.TITLE,
+                                "Light and temperature stability of fully transparent ZnO-based inverter circuits")
+                        .withField(StandardField.NUMBER, "4")
+                        .withField(StandardField.PAGES, "515--517")
+                        .withField(StandardField.VOLUME, "32")
+                        .withField(StandardField.GROUPS, "Skimmed")
+                        .withField(StandardField.JOURNAL, "Electron Device Letters, IEEE")
+                        .withField(StandardField.PUBLISHER, "IEEE")
+                        .withField(StandardField.YEAR, "2012");
+
+        rightEntry =
+                new BibEntry(StandardEntryType.Book)
+                        .withCitationKey("KolbLenhardWirtz2012")
+                        .withField(StandardField.AUTHOR, "Stefan Kolb and Guido Wirtz")
+                        .withField(
+                                StandardField.BOOKTITLE,
+                                "Proceedings of the 5\\textsuperscript{th} {IEEE} International Conference on Service-Oriented Computing and Applications {(SOCA'12)}, Taipei, Taiwan")
+                        .withField(
+                                StandardField.TITLE,
+                                "{Bridging the Heterogeneity of Orchestrations - A Petri Net-based Integration of BPEL and Windows Workflow}")
+                        .withField(StandardField.ORGANIZATION, "IEEE")
+                        .withField(StandardField.PAGES, "1--8")
+                        .withField(StandardField.ADDRESS, "Oxford, United Kingdom")
+                        .withField(StandardField.GROUPS, "By rating, Skimmed")
+                        .withMonth(Month.DECEMBER)
+                        .withField(StandardField.KEYWORDS, "a, b, c")
+                        .withField(StandardField.YEAR, "2012");
+
+        extraEntry =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey("BoopalGarridoGustafsson2013")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Padma Prasad Boopal and Mario Garrido and Oscar Gustafsson")
+                        .withField(
+                                StandardField.BOOKTITLE,
+                                "2013 {IEEE} International Symposium on Circuits and Systems (ISCAS2013), Beijing, China, May 19-23, 2013")
+                        .withField(
+                                StandardField.TITLE,
+                                "A reconfigurable {FFT} architecture for variable-length and multi-streaming {OFDM} standards")
+                        .withField(StandardField.KEYWORDS, "b, c, a")
+                        .withField(StandardField.YEAR, "2013");
 
         mergedEntry = new BibEntry();
         fieldMergerFactory = new FieldMergerFactory(bibEntryPreferences);
@@ -114,9 +130,16 @@ void hasEqualLeftAndRightValuesShouldReturnTrueIfLeftAndRightAreEqual() {
     }
 
     @Test
-    @Disabled("This test is kept as a reminder to implement a different comparison logic based on the given field.")
+    @Disabled(
+            "This test is kept as a reminder to implement a different comparison logic based on the given field.")
     void hasEqualLeftAndRightValuesShouldReturnTrueIfKeywordsAreEqual() {
-        FieldRowViewModel keywordsField = new FieldRowViewModel(StandardField.KEYWORDS, rightEntry, extraEntry, mergedEntry, fieldMergerFactory);
+        FieldRowViewModel keywordsField =
+                new FieldRowViewModel(
+                        StandardField.KEYWORDS,
+                        rightEntry,
+                        extraEntry,
+                        mergedEntry,
+                        fieldMergerFactory);
         assertTrue(keywordsField.hasEqualLeftAndRightValues());
     }
 
@@ -125,7 +148,8 @@ void selectLeftValueShouldBeCorrect() {
         var monthFieldViewModel = createViewModelForField(StandardField.MONTH);
         monthFieldViewModel.selectLeftValue();
         assertEquals(FieldRowViewModel.Selection.LEFT, monthFieldViewModel.getSelection());
-        assertEquals(Optional.of(""), Optional.ofNullable(monthFieldViewModel.getMergedFieldValue()));
+        assertEquals(
+                Optional.of(""), Optional.ofNullable(monthFieldViewModel.getMergedFieldValue()));
 
         monthFieldViewModel.selectRightValue();
         monthFieldViewModel.selectLeftValue();
@@ -138,12 +162,16 @@ void selectRightValueShouldBeCorrect() {
         var monthFieldViewModel = createViewModelForField(StandardField.MONTH);
         monthFieldViewModel.selectRightValue();
         assertEquals(FieldRowViewModel.Selection.RIGHT, monthFieldViewModel.getSelection());
-        assertEquals(rightEntry.getField(StandardField.MONTH), Optional.of(monthFieldViewModel.getMergedFieldValue()));
+        assertEquals(
+                rightEntry.getField(StandardField.MONTH),
+                Optional.of(monthFieldViewModel.getMergedFieldValue()));
 
         monthFieldViewModel.selectLeftValue();
         monthFieldViewModel.selectRightValue();
         assertEquals(FieldRowViewModel.Selection.RIGHT, monthFieldViewModel.getSelection());
-        assertEquals(rightEntry.getField(StandardField.MONTH), Optional.of(monthFieldViewModel.getMergedFieldValue()));
+        assertEquals(
+                rightEntry.getField(StandardField.MONTH),
+                Optional.of(monthFieldViewModel.getMergedFieldValue()));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/mergeentries/GroupMergerTest.java b/src/test/java/org/jabref/gui/mergeentries/GroupMergerTest.java
index 025ecc61b94c..07900b9404ce 100644
--- a/src/test/java/org/jabref/gui/mergeentries/GroupMergerTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/GroupMergerTest.java
@@ -1,15 +1,14 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.gui.mergeentries.newmergedialog.fieldsmerger.GroupMerger;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class GroupMergerTest {
 
@@ -29,13 +28,12 @@ private static Stream<Arguments> mergeShouldMergeGroupsCorrectly() {
                 Arguments.of("a, b", "c", "a, b, c"),
                 Arguments.of("a, b, c", "c", "a, b, c"),
                 Arguments.of("a, b", "c, d", "a, b, c, d"),
-                Arguments.of("a, b, c", "b, z", "a, b, c, z")
-        );
+                Arguments.of("a, b, c", "b, z", "a, b, c, z"));
     }
 
     @ParameterizedTest
     @MethodSource
     void mergeShouldMergeGroupsCorrectly(String groupsA, String groupsB, String expected) {
-     assertEquals(expected, groupMerger.merge(groupsA, groupsB));
+        assertEquals(expected, groupMerger.merge(groupsA, groupsB));
     }
 }
diff --git a/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeCellViewModelTest.java b/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeCellViewModelTest.java
index beb2daec6183..816ddc47155d 100644
--- a/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeCellViewModelTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeCellViewModelTest.java
@@ -1,15 +1,14 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.gui.mergeentries.newmergedialog.cell.ThreeWayMergeCellViewModel;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class ThreeWayMergeCellViewModelTest {
 
@@ -25,8 +24,7 @@ private static Stream<Arguments> oddEvenLogic() {
                 Arguments.of(true, false, true, false),
                 Arguments.of(false, false, true, false),
                 Arguments.of(true, true, false, true),
-                Arguments.of(false, true, false, true)
-        );
+                Arguments.of(false, true, false, true));
     }
 
     private static Stream<Arguments> isEvenShouldReturnTrueIfRowIndexIsEven() {
@@ -36,8 +34,7 @@ private static Stream<Arguments> isEvenShouldReturnTrueIfRowIndexIsEven() {
                 Arguments.of(1, false),
                 Arguments.of(2, true),
                 Arguments.of(9999, false),
-                Arguments.of(Integer.MAX_VALUE, false)
-        );
+                Arguments.of(Integer.MAX_VALUE, false));
     }
 
     private static Stream<Arguments> isOddShouldReturnTrueIfRowIndexIsOdd() {
@@ -48,8 +45,7 @@ private static Stream<Arguments> isOddShouldReturnTrueIfRowIndexIsOdd() {
                 Arguments.of(7777, true),
                 Arguments.of(9999, true),
                 Arguments.of(Integer.MAX_VALUE, true),
-                Arguments.of(0, false)
-        );
+                Arguments.of(0, false));
     }
 
     private static Stream<Arguments> getTextAndSetTextShouldBeConsistent() {
@@ -59,13 +55,13 @@ private static Stream<Arguments> getTextAndSetTextShouldBeConsistent() {
                 Arguments.of("World"),
                 Arguments.of("" + null),
                 Arguments.of("Hello, World"),
-                Arguments.of("عربي")
-        );
+                Arguments.of("عربي"));
     }
 
     @ParameterizedTest
     @MethodSource
-    void oddEvenLogic(boolean setIsOdd, boolean setIsEven, boolean expectedIsOdd, boolean expectedIsEven) {
+    void oddEvenLogic(
+            boolean setIsOdd, boolean setIsEven, boolean expectedIsOdd, boolean expectedIsEven) {
         viewModel.setOdd(setIsOdd);
         viewModel.setEven(setIsEven);
         assertEquals(expectedIsOdd, viewModel.isOdd());
diff --git a/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeViewModelTest.java b/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeViewModelTest.java
index 9fdb230312ce..1f990f364c98 100644
--- a/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeViewModelTest.java
@@ -1,7 +1,9 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.HashSet;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.google.common.collect.Comparators;
 
 import org.jabref.gui.mergeentries.newmergedialog.ThreeWayMergeViewModel;
 import org.jabref.model.entry.BibEntry;
@@ -11,13 +13,11 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import com.google.common.collect.Comparators;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.HashSet;
+import java.util.List;
 
 class ThreeWayMergeViewModelTest {
 
@@ -28,17 +28,27 @@ class ThreeWayMergeViewModelTest {
 
     @BeforeEach
     void setup() {
-        leftEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Erik G. Larsson and Oscar Gustafsson")
-                .withField(StandardField.TITLE, "The Impact of Dynamic Voltage and Frequency Scaling on Multicore {DSP} Algorithm Design [Exploratory {DSP]}")
-                .withField(StandardField.NUMBER, "1")
-                .withField(new UnknownField("custom"), "1.2.3");
+        leftEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Erik G. Larsson and Oscar Gustafsson")
+                        .withField(
+                                StandardField.TITLE,
+                                "The Impact of Dynamic Voltage and Frequency Scaling on Multicore {DSP} Algorithm Design [Exploratory {DSP]}")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(new UnknownField("custom"), "1.2.3");
 
-        rightEntry = new BibEntry(StandardEntryType.InProceedings)
-                .withField(StandardField.AUTHOR, "Henrik Ohlsson and Oscar Gustafsson and Lars Wanhammar")
-                .withField(StandardField.TITLE, "Arithmetic transformations for increased maximal sample rate of bit-parallel bireciprocal lattice wave digital filters")
-                .withField(StandardField.BOOKTITLE, "Proceedings of the 2001 International Symposium on Circuits and Systems, {ISCAS} 2001, Sydney, Australia, May 6-9, 2001")
-                .withField(StandardField.NUMBER, "2");
+        rightEntry =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Henrik Ohlsson and Oscar Gustafsson and Lars Wanhammar")
+                        .withField(
+                                StandardField.TITLE,
+                                "Arithmetic transformations for increased maximal sample rate of bit-parallel bireciprocal lattice wave digital filters")
+                        .withField(
+                                StandardField.BOOKTITLE,
+                                "Proceedings of the 2001 International Symposium on Circuits and Systems, {ISCAS} 2001, Sydney, Australia, May 6-9, 2001")
+                        .withField(StandardField.NUMBER, "2");
         viewModel = new ThreeWayMergeViewModel(leftEntry, rightEntry, "left", "right");
         visibleFields = viewModel.getVisibleFields();
     }
@@ -61,8 +71,12 @@ void getVisibleFieldsShouldHaveEntryTypeFieldAtTheHeadOfTheList() {
 
     @Test
     void getVisibleFieldsShouldContainAllNonInternalFieldsInRightAndLeftEntry() {
-        assertTrue(visibleFields.containsAll(leftEntry.getFields().stream().filter(this::isNotInternalField).toList()));
-        assertTrue(visibleFields.containsAll(rightEntry.getFields().stream().filter(this::isNotInternalField).toList()));
+        assertTrue(
+                visibleFields.containsAll(
+                        leftEntry.getFields().stream().filter(this::isNotInternalField).toList()));
+        assertTrue(
+                visibleFields.containsAll(
+                        rightEntry.getFields().stream().filter(this::isNotInternalField).toList()));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FileMergerTest.java b/src/test/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FileMergerTest.java
index fd3051031fd7..04c1f3337c26 100644
--- a/src/test/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FileMergerTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FileMergerTest.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.mergeentries.newmergedialog.fieldsmerger;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class FileMergerTest {
     FileMerger fileMerger = new FileMerger();
 
@@ -20,7 +20,9 @@ class FileMergerTest {
      * @param fileB File String b
      */
     @ParameterizedTest
-    @CsvSource(textBlock = """
+    @CsvSource(
+            textBlock =
+                    """
                 ,,,
                 FileA,FileA,
                 FileA,FileA,''
diff --git a/src/test/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModelTest.java b/src/test/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModelTest.java
index 39453fcc1cfe..c5380373f1d5 100644
--- a/src/test/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModelTest.java
+++ b/src/test/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModelTest.java
@@ -1,7 +1,8 @@
 package org.jabref.gui.preferences.customentrytypes;
 
-import java.util.List;
-import java.util.TreeSet;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -15,15 +16,13 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.BiblatexEntryTypeDefinitions;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.List;
+import java.util.TreeSet;
 
 class CustomEntryTypesTabViewModelTest {
 
@@ -37,16 +36,23 @@ class CustomEntryTypesTabViewModelTest {
     void setup() {
         preferences = mock(CliPreferences.class);
         fieldPreferences = mock(FieldPreferences.class);
-        when(fieldPreferences.getNonWrappableFields()).thenReturn(FXCollections.observableArrayList());
+        when(fieldPreferences.getNonWrappableFields())
+                .thenReturn(FXCollections.observableArrayList());
         when(preferences.getFieldPreferences()).thenReturn(fieldPreferences);
         entryTypesManager = new BibEntryTypesManager();
-        online = BiblatexEntryTypeDefinitions.ALL.stream().filter(type -> type.getType().equals(StandardEntryType.Online)).findAny().get();
+        online =
+                BiblatexEntryTypeDefinitions.ALL.stream()
+                        .filter(type -> type.getType().equals(StandardEntryType.Online))
+                        .findAny()
+                        .get();
     }
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
     void storeSettingsKeepsStandardTypes(BibDatabaseMode mode) {
-        CustomEntryTypesTabViewModel model = new CustomEntryTypesTabViewModel(mode, entryTypesManager, mock(DialogService.class), preferences);
+        CustomEntryTypesTabViewModel model =
+                new CustomEntryTypesTabViewModel(
+                        mode, entryTypesManager, mock(DialogService.class), preferences);
         model.setValues();
         model.storeSettings();
         assertEquals(new TreeSet<>(), entryTypesManager.getAllCustomizedTypes(mode));
@@ -54,37 +60,76 @@ void storeSettingsKeepsStandardTypes(BibDatabaseMode mode) {
 
     @Test
     void storeSettingsKeepsTypeWhenOrFieldsDiffersOnly() {
-        CustomEntryTypesTabViewModel model = new CustomEntryTypesTabViewModel(BibDatabaseMode.BIBLATEX, entryTypesManager, mock(DialogService.class), preferences);
+        CustomEntryTypesTabViewModel model =
+                new CustomEntryTypesTabViewModel(
+                        BibDatabaseMode.BIBLATEX,
+                        entryTypesManager,
+                        mock(DialogService.class),
+                        preferences);
         model.setValues();
 
         // This is similar ot the standard online type, but has no OR fields
-        BibEntryType onlineWithoutOrFields = new BibEntryTypeBuilder()
-                .withType(StandardEntryType.Online)
-                .withRequiredFields(StandardField.AUTHOR, StandardField.EDITOR, StandardField.TITLE, StandardField.DATE, StandardField.URL)
-                .withImportantFields(
-                        StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.URLDATE)
-                .withDetailFields(StandardField.LANGUAGE, StandardField.VERSION,
-                        StandardField.ADDENDUM, StandardField.PUBSTATE)
-                .build();
-        model.entryTypes().setAll(List.of(new CustomEntryTypeViewModel(onlineWithoutOrFields, x -> false)));
+        BibEntryType onlineWithoutOrFields =
+                new BibEntryTypeBuilder()
+                        .withType(StandardEntryType.Online)
+                        .withRequiredFields(
+                                StandardField.AUTHOR,
+                                StandardField.EDITOR,
+                                StandardField.TITLE,
+                                StandardField.DATE,
+                                StandardField.URL)
+                        .withImportantFields(
+                                StandardField.SUBTITLE,
+                                StandardField.TITLEADDON,
+                                StandardField.NOTE,
+                                StandardField.ORGANIZATION,
+                                StandardField.URLDATE)
+                        .withDetailFields(
+                                StandardField.LANGUAGE,
+                                StandardField.VERSION,
+                                StandardField.ADDENDUM,
+                                StandardField.PUBSTATE)
+                        .build();
+        model.entryTypes()
+                .setAll(List.of(new CustomEntryTypeViewModel(onlineWithoutOrFields, x -> false)));
 
         model.storeSettings();
 
-        assertEquals(new TreeSet<>(), entryTypesManager.getAllCustomizedTypes(BibDatabaseMode.BIBLATEX));
+        assertEquals(
+                new TreeSet<>(), entryTypesManager.getAllCustomizedTypes(BibDatabaseMode.BIBLATEX));
     }
 
     @Test
     void storeSettingsUpdatesType() {
-        CustomEntryTypesTabViewModel model = new CustomEntryTypesTabViewModel(BibDatabaseMode.BIBLATEX, entryTypesManager, mock(DialogService.class), preferences);
+        CustomEntryTypesTabViewModel model =
+                new CustomEntryTypesTabViewModel(
+                        BibDatabaseMode.BIBLATEX,
+                        entryTypesManager,
+                        mock(DialogService.class),
+                        preferences);
         model.setValues();
 
         // No important optional fields anymore (they are required now)
-        BibEntryType modified = new BibEntryTypeBuilder()
-                .withType(StandardEntryType.Online)
-                .withRequiredFields(StandardField.AUTHOR, StandardField.EDITOR, StandardField.TITLE, StandardField.DATE, StandardField.URL, StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.URLDATE)
-                .withDetailFields(StandardField.LANGUAGE, StandardField.VERSION,
-                        StandardField.ADDENDUM, StandardField.PUBSTATE)
-                .build();
+        BibEntryType modified =
+                new BibEntryTypeBuilder()
+                        .withType(StandardEntryType.Online)
+                        .withRequiredFields(
+                                StandardField.AUTHOR,
+                                StandardField.EDITOR,
+                                StandardField.TITLE,
+                                StandardField.DATE,
+                                StandardField.URL,
+                                StandardField.SUBTITLE,
+                                StandardField.TITLEADDON,
+                                StandardField.NOTE,
+                                StandardField.ORGANIZATION,
+                                StandardField.URLDATE)
+                        .withDetailFields(
+                                StandardField.LANGUAGE,
+                                StandardField.VERSION,
+                                StandardField.ADDENDUM,
+                                StandardField.PUBSTATE)
+                        .build();
         model.entryTypes().setAll(List.of(new CustomEntryTypeViewModel(modified, x -> false)));
 
         model.storeSettings();
diff --git a/src/test/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModelTest.java b/src/test/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModelTest.java
index 7d6a3a05b6d1..d73ce18f32e7 100644
--- a/src/test/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModelTest.java
+++ b/src/test/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModelTest.java
@@ -1,37 +1,41 @@
 package org.jabref.gui.preferences.externalfiletypes;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.frame.ExternalApplicationsPreferences;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Spy;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-
 public class ExternalFileTypesTabViewModelTest {
 
-    private ExternalApplicationsPreferences externalApplicationsPreferences = mock(ExternalApplicationsPreferences.class);
+    private ExternalApplicationsPreferences externalApplicationsPreferences =
+            mock(ExternalApplicationsPreferences.class);
     private DialogService dialogService = mock(DialogService.class);
-    private ExternalFileTypeItemViewModel externalFileTypeItemViewModel = new ExternalFileTypeItemViewModel();
+    private ExternalFileTypeItemViewModel externalFileTypeItemViewModel =
+            new ExternalFileTypeItemViewModel();
 
     @Spy
-    private ExternalFileTypesTabViewModel externalFileTypesTabViewModel = spy(new ExternalFileTypesTabViewModel(externalApplicationsPreferences, dialogService));
+    private ExternalFileTypesTabViewModel externalFileTypesTabViewModel =
+            spy(new ExternalFileTypesTabViewModel(externalApplicationsPreferences, dialogService));
 
     @BeforeEach
     void setUp() {
         externalFileTypeItemViewModel.nameProperty().set("Excel 2007");
         externalFileTypeItemViewModel.extensionProperty().set("xlsx");
-        externalFileTypeItemViewModel.mimetypeProperty().set("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        externalFileTypeItemViewModel
+                .mimetypeProperty()
+                .set("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         externalFileTypeItemViewModel.applicationProperty().set("oocalc");
     }
 
@@ -41,41 +45,61 @@ public void setupViewModelWithoutName() {
 
     public void viewModelClone(ExternalFileTypeItemViewModel updatedModel) {
         updatedModel.nameProperty().set(externalFileTypeItemViewModel.getName());
-        updatedModel.extensionProperty().set(externalFileTypeItemViewModel.extensionProperty().get());
+        updatedModel
+                .extensionProperty()
+                .set(externalFileTypeItemViewModel.extensionProperty().get());
         updatedModel.mimetypeProperty().set(externalFileTypeItemViewModel.mimetypeProperty().get());
-        updatedModel.applicationProperty().set(externalFileTypeItemViewModel.applicationProperty().get());
+        updatedModel
+                .applicationProperty()
+                .set(externalFileTypeItemViewModel.applicationProperty().get());
     }
 
     public boolean viewModelIsSameValue(ExternalFileTypeItemViewModel item) {
         return !(!item.getName().equals(externalFileTypeItemViewModel.getName())
-                || !item.extensionProperty().get().equals(externalFileTypeItemViewModel.extensionProperty().get())
-                || !item.mimetypeProperty().get().equals(externalFileTypeItemViewModel.mimetypeProperty().get())
-                || !item.applicationProperty().get().equals(externalFileTypeItemViewModel.applicationProperty().get()));
+                || !item.extensionProperty()
+                        .get()
+                        .equals(externalFileTypeItemViewModel.extensionProperty().get())
+                || !item.mimetypeProperty()
+                        .get()
+                        .equals(externalFileTypeItemViewModel.mimetypeProperty().get())
+                || !item.applicationProperty()
+                        .get()
+                        .equals(externalFileTypeItemViewModel.applicationProperty().get()));
     }
 
     @Test
-    void whenExternalFileTypeItemViewModelWithNonEmptyStringValueThenisValidExternalFileTypeReturnTrue() {
-        assertTrue(externalFileTypesTabViewModel.isValidExternalFileType(externalFileTypeItemViewModel));
+    void
+            whenExternalFileTypeItemViewModelWithNonEmptyStringValueThenisValidExternalFileTypeReturnTrue() {
+        assertTrue(
+                externalFileTypesTabViewModel.isValidExternalFileType(
+                        externalFileTypeItemViewModel));
     }
 
     @Test
     void whenExternalFileTypeItemViewModelWithEmptyNameThenisValidExternalFileTypeReturnFalse() {
         this.setupViewModelWithoutName();
-        assertFalse(externalFileTypesTabViewModel.isValidExternalFileType(externalFileTypeItemViewModel));
+        assertFalse(
+                externalFileTypesTabViewModel.isValidExternalFileType(
+                        externalFileTypeItemViewModel));
     }
 
     @Test
     void WhenExternalFileTypeItemViewModelIsValidThenAddNewTypeIsSuccessful() {
-        ArgumentCaptor<ExternalFileTypeItemViewModel> itemCaptor = ArgumentCaptor.forClass(ExternalFileTypeItemViewModel.class);
-        doAnswer(mocked -> {
-            ExternalFileTypeItemViewModel capturedItem = itemCaptor.getValue();
-            this.viewModelClone(capturedItem);
-            return null;
-        }).when(externalFileTypesTabViewModel).showEditDialog(itemCaptor.capture(), any());
+        ArgumentCaptor<ExternalFileTypeItemViewModel> itemCaptor =
+                ArgumentCaptor.forClass(ExternalFileTypeItemViewModel.class);
+        doAnswer(
+                        mocked -> {
+                            ExternalFileTypeItemViewModel capturedItem = itemCaptor.getValue();
+                            this.viewModelClone(capturedItem);
+                            return null;
+                        })
+                .when(externalFileTypesTabViewModel)
+                .showEditDialog(itemCaptor.capture(), any());
 
         externalFileTypesTabViewModel.addNewType();
 
-        ObservableList<ExternalFileTypeItemViewModel> actualFileTypes = externalFileTypesTabViewModel.getFileTypes();
+        ObservableList<ExternalFileTypeItemViewModel> actualFileTypes =
+                externalFileTypesTabViewModel.getFileTypes();
         assertEquals(1, actualFileTypes.size());
         assertTrue(viewModelIsSameValue(actualFileTypes.getFirst()));
     }
@@ -83,16 +107,21 @@ void WhenExternalFileTypeItemViewModelIsValidThenAddNewTypeIsSuccessful() {
     @Test
     void WhenExternalFileTypeItemViewModelMissNameThenAddNewTypeIsFailed() {
         setupViewModelWithoutName();
-        ArgumentCaptor<ExternalFileTypeItemViewModel> itemCaptor = ArgumentCaptor.forClass(ExternalFileTypeItemViewModel.class);
-        doAnswer(mocked -> {
-            ExternalFileTypeItemViewModel capturedItem = itemCaptor.getValue();
-            viewModelClone(capturedItem);
-            return null;
-        }).when(externalFileTypesTabViewModel).showEditDialog(itemCaptor.capture(), any());
+        ArgumentCaptor<ExternalFileTypeItemViewModel> itemCaptor =
+                ArgumentCaptor.forClass(ExternalFileTypeItemViewModel.class);
+        doAnswer(
+                        mocked -> {
+                            ExternalFileTypeItemViewModel capturedItem = itemCaptor.getValue();
+                            viewModelClone(capturedItem);
+                            return null;
+                        })
+                .when(externalFileTypesTabViewModel)
+                .showEditDialog(itemCaptor.capture(), any());
 
         externalFileTypesTabViewModel.addNewType();
 
-        ObservableList<ExternalFileTypeItemViewModel> emptyFileTypes = externalFileTypesTabViewModel.getFileTypes();
+        ObservableList<ExternalFileTypeItemViewModel> emptyFileTypes =
+                externalFileTypesTabViewModel.getFileTypes();
         assertEquals(0, emptyFileTypes.size());
     }
 }
diff --git a/src/test/java/org/jabref/gui/preferences/journals/AbbreviationViewModelTest.java b/src/test/java/org/jabref/gui/preferences/journals/AbbreviationViewModelTest.java
index 87f9ea5aeab3..8016682bacf3 100644
--- a/src/test/java/org/jabref/gui/preferences/journals/AbbreviationViewModelTest.java
+++ b/src/test/java/org/jabref/gui/preferences/journals/AbbreviationViewModelTest.java
@@ -1,15 +1,14 @@
 package org.jabref.gui.preferences.journals;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.logic.journals.Abbreviation;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.stream.Stream;
 
 class AbbreviationViewModelTest {
 
@@ -21,24 +20,33 @@ void containsCaseIndependentContains(String searchTerm, AbbreviationViewModel ab
 
     private static Stream<Arguments> provideContainsCaseIndependentContains() {
         return Stream.of(
-                Arguments.of("name", new AbbreviationViewModel(new Abbreviation("Long Name", "abbr", "unique"))),
-                Arguments.of("bBr", new AbbreviationViewModel(new Abbreviation("Long Name", "abbr", "unique"))),
-                Arguments.of("Uniq", new AbbreviationViewModel(new Abbreviation("Long Name", "abbr", "unique"))),
-                Arguments.of("", new AbbreviationViewModel(new Abbreviation("Long Name", "abbr", "unique"))),
-                Arguments.of("", new AbbreviationViewModel(new Abbreviation("", "", "")))
-        );
+                Arguments.of(
+                        "name",
+                        new AbbreviationViewModel(new Abbreviation("Long Name", "abbr", "unique"))),
+                Arguments.of(
+                        "bBr",
+                        new AbbreviationViewModel(new Abbreviation("Long Name", "abbr", "unique"))),
+                Arguments.of(
+                        "Uniq",
+                        new AbbreviationViewModel(new Abbreviation("Long Name", "abbr", "unique"))),
+                Arguments.of(
+                        "",
+                        new AbbreviationViewModel(new Abbreviation("Long Name", "abbr", "unique"))),
+                Arguments.of("", new AbbreviationViewModel(new Abbreviation("", "", ""))));
     }
 
     @ParameterizedTest
     @MethodSource("provideContainsCaseIndependentDoesNotContain")
-    void containsCaseIndependentDoesNotContain(String searchTerm, AbbreviationViewModel abbreviation) {
+    void containsCaseIndependentDoesNotContain(
+            String searchTerm, AbbreviationViewModel abbreviation) {
         assertFalse(abbreviation.containsCaseIndependent(searchTerm));
     }
 
     private static Stream<Arguments> provideContainsCaseIndependentDoesNotContain() {
         return Stream.of(
-                Arguments.of("Something else", new AbbreviationViewModel(new Abbreviation("Long Name", "abbr", "unique"))),
-                Arguments.of("Something", new AbbreviationViewModel(new Abbreviation("", "", "")))
-        );
+                Arguments.of(
+                        "Something else",
+                        new AbbreviationViewModel(new Abbreviation("Long Name", "abbr", "unique"))),
+                Arguments.of("Something", new AbbreviationViewModel(new Abbreviation("", "", ""))));
     }
 }
diff --git a/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java b/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java
index 52702a869575..c9ab9155d29a 100644
--- a/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java
+++ b/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java
@@ -1,14 +1,14 @@
 package org.jabref.gui.preferences.journals;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -20,48 +20,53 @@
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.util.CurrentThreadTaskExecutor;
 import org.jabref.logic.util.TaskExecutor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 class JournalAbbreviationsViewModelTabTest {
 
-    private final static TestAbbreviation ABBREVIATION_0 = new TestAbbreviation("Full0", "Abb0");
-    private final static TestAbbreviation ABBREVIATION_0_OTHER_SHORT_UNIQUE = new TestAbbreviation("Full0", "Abb0", "A0");
+    private static final TestAbbreviation ABBREVIATION_0 = new TestAbbreviation("Full0", "Abb0");
+    private static final TestAbbreviation ABBREVIATION_0_OTHER_SHORT_UNIQUE =
+            new TestAbbreviation("Full0", "Abb0", "A0");
 
-    private final static TestAbbreviation ABBREVIATION_1 = new TestAbbreviation("Full1", "Abb1");
-    private final static TestAbbreviation ABBREVIATION_1_SHOW = new TestAbbreviation("Full1", "Abb1", true);
-    private final static TestAbbreviation ABBREVIATION_1_OTHER_SHORT_UNIQUE = new TestAbbreviation("Full1", "Abb1", "A1");
+    private static final TestAbbreviation ABBREVIATION_1 = new TestAbbreviation("Full1", "Abb1");
+    private static final TestAbbreviation ABBREVIATION_1_SHOW =
+            new TestAbbreviation("Full1", "Abb1", true);
+    private static final TestAbbreviation ABBREVIATION_1_OTHER_SHORT_UNIQUE =
+            new TestAbbreviation("Full1", "Abb1", "A1");
 
-    private final static TestAbbreviation ABBREVIATION_2 = new TestAbbreviation("Full2", "Abb2");
-    private final static TestAbbreviation ABBREVIATION_2_OTHER_SHORT_UNIQUE = new TestAbbreviation("Full2", "Abb2", "A2");
+    private static final TestAbbreviation ABBREVIATION_2 = new TestAbbreviation("Full2", "Abb2");
+    private static final TestAbbreviation ABBREVIATION_2_OTHER_SHORT_UNIQUE =
+            new TestAbbreviation("Full2", "Abb2", "A2");
 
-    private final static TestAbbreviation ABBREVIATION_3 = new TestAbbreviation("Full3", "Abb3");
-    private final static TestAbbreviation ABBREVIATION_3_OTHER_SHORT_UNIQUE = new TestAbbreviation("Full3", "Abb3", "A3");
+    private static final TestAbbreviation ABBREVIATION_3 = new TestAbbreviation("Full3", "Abb3");
+    private static final TestAbbreviation ABBREVIATION_3_OTHER_SHORT_UNIQUE =
+            new TestAbbreviation("Full3", "Abb3", "A3");
 
-    private final static TestAbbreviation ABBREVIATION_4 = new TestAbbreviation("Full4", "Abb4");
+    private static final TestAbbreviation ABBREVIATION_4 = new TestAbbreviation("Full4", "Abb4");
 
-    private final static TestAbbreviation ABBREVIATION_5 = new TestAbbreviation("Full5", "Abb5");
+    private static final TestAbbreviation ABBREVIATION_5 = new TestAbbreviation("Full5", "Abb5");
 
-    private final static TestAbbreviation ABBREVIATION_6 = new TestAbbreviation("Full6", "Abb6");
+    private static final TestAbbreviation ABBREVIATION_6 = new TestAbbreviation("Full6", "Abb6");
 
     private JournalAbbreviationsTabViewModel viewModel;
     private Path emptyTestFile;
     private Path tempFolder;
-    private final JournalAbbreviationRepository repository = JournalAbbreviationLoader.loadBuiltInRepository();
+    private final JournalAbbreviationRepository repository =
+            JournalAbbreviationLoader.loadBuiltInRepository();
     private DialogService dialogService;
 
     static class TestAbbreviation extends Abbreviation {
@@ -72,12 +77,14 @@ public TestAbbreviation(String name, String abbreviation) {
             this(name, abbreviation, false);
         }
 
-        public TestAbbreviation(String name, String abbreviation, boolean showShortestUniqueAbbreviation) {
+        public TestAbbreviation(
+                String name, String abbreviation, boolean showShortestUniqueAbbreviation) {
             super(name, abbreviation);
             this.showShortestUniqueAbbreviation = showShortestUniqueAbbreviation;
         }
 
-        public TestAbbreviation(String name, String abbreviation, String shortestUniqueAbbreviation) {
+        public TestAbbreviation(
+                String name, String abbreviation, String shortestUniqueAbbreviation) {
             super(name, abbreviation, shortestUniqueAbbreviation);
             this.showShortestUniqueAbbreviation = true;
         }
@@ -85,16 +92,20 @@ public TestAbbreviation(String name, String abbreviation, String shortestUniqueA
         @Override
         public String toString() {
             if (showShortestUniqueAbbreviation) {
-                return this.getName() + "," + this.getAbbreviation() + "," + this.getShortestUniqueAbbreviation();
+                return this.getName()
+                        + ","
+                        + this.getAbbreviation()
+                        + ","
+                        + this.getShortestUniqueAbbreviation();
             }
             return this.getName() + "," + this.getAbbreviation();
         }
     }
 
     private static String csvListOfAbbreviations(List<TestAbbreviation> testAbbreviations) {
-       return testAbbreviations.stream()
-               .map(TestAbbreviation::toString)
-               .collect(Collectors.joining("\n"));
+        return testAbbreviations.stream()
+                .map(TestAbbreviation::toString)
+                .collect(Collectors.joining("\n"));
     }
 
     private static String csvListOfAbbreviations(TestAbbreviation... testAbbreviations) {
@@ -111,8 +122,7 @@ private record TestData(
             List<CsvFileNameAndContent> csvFiles,
             TestAbbreviation abbreviationToCheck,
             List<String> finalContentsOfFile2,
-            List<String> finalContentsOfFile3
-    ) {
+            List<String> finalContentsOfFile3) {
         /**
          * Note that we have a **different** ordering at the constructor, because Java generics have "type erasure"
          */
@@ -120,9 +130,9 @@ public TestData(
                 List<CsvFileNameAndContent> csvFiles,
                 List<TestAbbreviation> finalContentsOfFile2,
                 List<TestAbbreviation> finalContentsOfFile3,
-                TestAbbreviation abbreviationToCheck
-        ) {
-            this(csvFiles,
+                TestAbbreviation abbreviationToCheck) {
+            this(
+                    csvFiles,
                     abbreviationToCheck,
                     finalContentsOfFile2.stream().map(TestAbbreviation::toString).toList(),
                     finalContentsOfFile3.stream().map(TestAbbreviation::toString).toList());
@@ -130,7 +140,8 @@ public TestData(
     }
 
     public static Stream<TestData> provideTestFiles() {
-        // filenameing: testfileXY, where X is the number of test (count starts at 1), and Y is the number of the file in the test (count starts at 0)
+        // filenameing: testfileXY, where X is the number of test (count starts at 1), and Y is the
+        // number of the file in the test (count starts at 0)
         // testfile_3 has 5 entries after de-duplication
         return Stream.of(
                 // No shortest unique abbreviations in files
@@ -138,51 +149,125 @@ public static Stream<TestData> provideTestFiles() {
                 new TestData(
                         List.of(
                                 new CsvFileNameAndContent("testFile10.csv", ABBREVIATION_1),
-                                new CsvFileNameAndContent("testFile11.csv", ABBREVIATION_0, ABBREVIATION_1, ABBREVIATION_2),
-                                new CsvFileNameAndContent("testFile12.csv", ABBREVIATION_0, ABBREVIATION_1, ABBREVIATION_2, ABBREVIATION_3),
-                                new CsvFileNameAndContent("testFile13.csv", ABBREVIATION_0, ABBREVIATION_1, ABBREVIATION_1, ABBREVIATION_2, ABBREVIATION_3, ABBREVIATION_4)),
+                                new CsvFileNameAndContent(
+                                        "testFile11.csv",
+                                        ABBREVIATION_0,
+                                        ABBREVIATION_1,
+                                        ABBREVIATION_2),
+                                new CsvFileNameAndContent(
+                                        "testFile12.csv",
+                                        ABBREVIATION_0,
+                                        ABBREVIATION_1,
+                                        ABBREVIATION_2,
+                                        ABBREVIATION_3),
+                                new CsvFileNameAndContent(
+                                        "testFile13.csv",
+                                        ABBREVIATION_0,
+                                        ABBREVIATION_1,
+                                        ABBREVIATION_1,
+                                        ABBREVIATION_2,
+                                        ABBREVIATION_3,
+                                        ABBREVIATION_4)),
                         List.of(ABBREVIATION_0, ABBREVIATION_1, ABBREVIATION_2, ABBREVIATION_5),
-                        List.of(ABBREVIATION_0, ABBREVIATION_1, ABBREVIATION_2, ABBREVIATION_3, ABBREVIATION_6),
+                        List.of(
+                                ABBREVIATION_0,
+                                ABBREVIATION_1,
+                                ABBREVIATION_2,
+                                ABBREVIATION_3,
+                                ABBREVIATION_6),
                         ABBREVIATION_1_SHOW),
 
                 // Shortest unique abbreviations
                 new TestData(
                         List.of(
-                                new CsvFileNameAndContent("testFile20.csv", ABBREVIATION_1_OTHER_SHORT_UNIQUE),
-                                new CsvFileNameAndContent("testFile21.csv", ABBREVIATION_0_OTHER_SHORT_UNIQUE, ABBREVIATION_1_OTHER_SHORT_UNIQUE, ABBREVIATION_2_OTHER_SHORT_UNIQUE),
-                                new CsvFileNameAndContent("testFile22.csv", ABBREVIATION_0_OTHER_SHORT_UNIQUE, ABBREVIATION_1_OTHER_SHORT_UNIQUE, ABBREVIATION_2_OTHER_SHORT_UNIQUE, ABBREVIATION_3_OTHER_SHORT_UNIQUE),
-                                // contains duplicate entry ABBREVIATION_1_OTHER_SHORT_UNIQUE, therefore 6 entries
-                                new CsvFileNameAndContent("testFile23.csv", ABBREVIATION_0_OTHER_SHORT_UNIQUE, ABBREVIATION_1_OTHER_SHORT_UNIQUE, ABBREVIATION_1_OTHER_SHORT_UNIQUE, ABBREVIATION_2_OTHER_SHORT_UNIQUE, ABBREVIATION_3, ABBREVIATION_4)),
-                        List.of(ABBREVIATION_0_OTHER_SHORT_UNIQUE, ABBREVIATION_1_OTHER_SHORT_UNIQUE, ABBREVIATION_2_OTHER_SHORT_UNIQUE, ABBREVIATION_5),
+                                new CsvFileNameAndContent(
+                                        "testFile20.csv", ABBREVIATION_1_OTHER_SHORT_UNIQUE),
+                                new CsvFileNameAndContent(
+                                        "testFile21.csv",
+                                        ABBREVIATION_0_OTHER_SHORT_UNIQUE,
+                                        ABBREVIATION_1_OTHER_SHORT_UNIQUE,
+                                        ABBREVIATION_2_OTHER_SHORT_UNIQUE),
+                                new CsvFileNameAndContent(
+                                        "testFile22.csv",
+                                        ABBREVIATION_0_OTHER_SHORT_UNIQUE,
+                                        ABBREVIATION_1_OTHER_SHORT_UNIQUE,
+                                        ABBREVIATION_2_OTHER_SHORT_UNIQUE,
+                                        ABBREVIATION_3_OTHER_SHORT_UNIQUE),
+                                // contains duplicate entry ABBREVIATION_1_OTHER_SHORT_UNIQUE,
+                                // therefore 6 entries
+                                new CsvFileNameAndContent(
+                                        "testFile23.csv",
+                                        ABBREVIATION_0_OTHER_SHORT_UNIQUE,
+                                        ABBREVIATION_1_OTHER_SHORT_UNIQUE,
+                                        ABBREVIATION_1_OTHER_SHORT_UNIQUE,
+                                        ABBREVIATION_2_OTHER_SHORT_UNIQUE,
+                                        ABBREVIATION_3,
+                                        ABBREVIATION_4)),
+                        List.of(
+                                ABBREVIATION_0_OTHER_SHORT_UNIQUE,
+                                ABBREVIATION_1_OTHER_SHORT_UNIQUE,
+                                ABBREVIATION_2_OTHER_SHORT_UNIQUE,
+                                ABBREVIATION_5),
                         // without duplicates
-                        List.of(ABBREVIATION_0_OTHER_SHORT_UNIQUE, ABBREVIATION_1_OTHER_SHORT_UNIQUE, ABBREVIATION_2_OTHER_SHORT_UNIQUE, ABBREVIATION_3, ABBREVIATION_6),
+                        List.of(
+                                ABBREVIATION_0_OTHER_SHORT_UNIQUE,
+                                ABBREVIATION_1_OTHER_SHORT_UNIQUE,
+                                ABBREVIATION_2_OTHER_SHORT_UNIQUE,
+                                ABBREVIATION_3,
+                                ABBREVIATION_6),
                         ABBREVIATION_1_OTHER_SHORT_UNIQUE),
 
                 // Mixed abbreviations (some have shortest unique, some have not)
                 new TestData(
                         List.of(
                                 new CsvFileNameAndContent("testFile30.csv", ABBREVIATION_1),
-                                new CsvFileNameAndContent("testFile31.csv", ABBREVIATION_0_OTHER_SHORT_UNIQUE, ABBREVIATION_1, ABBREVIATION_2_OTHER_SHORT_UNIQUE),
-                                new CsvFileNameAndContent("testFile32.csv", ABBREVIATION_0, ABBREVIATION_1_OTHER_SHORT_UNIQUE, ABBREVIATION_2_OTHER_SHORT_UNIQUE, ABBREVIATION_3),
+                                new CsvFileNameAndContent(
+                                        "testFile31.csv",
+                                        ABBREVIATION_0_OTHER_SHORT_UNIQUE,
+                                        ABBREVIATION_1,
+                                        ABBREVIATION_2_OTHER_SHORT_UNIQUE),
+                                new CsvFileNameAndContent(
+                                        "testFile32.csv",
+                                        ABBREVIATION_0,
+                                        ABBREVIATION_1_OTHER_SHORT_UNIQUE,
+                                        ABBREVIATION_2_OTHER_SHORT_UNIQUE,
+                                        ABBREVIATION_3),
                                 // contains ABBREVIATION_1 in two variants, therefore 5 in total
-                                new CsvFileNameAndContent("testFile33.csv", ABBREVIATION_0, ABBREVIATION_1_OTHER_SHORT_UNIQUE, ABBREVIATION_1, ABBREVIATION_2_OTHER_SHORT_UNIQUE, ABBREVIATION_4)),
+                                new CsvFileNameAndContent(
+                                        "testFile33.csv",
+                                        ABBREVIATION_0,
+                                        ABBREVIATION_1_OTHER_SHORT_UNIQUE,
+                                        ABBREVIATION_1,
+                                        ABBREVIATION_2_OTHER_SHORT_UNIQUE,
+                                        ABBREVIATION_4)),
                         // Entries of testFile2 plus ABBREVIATION_5_SHOW minus ABBREVIATION_3
-                        List.of(ABBREVIATION_0, ABBREVIATION_1_OTHER_SHORT_UNIQUE, ABBREVIATION_2_OTHER_SHORT_UNIQUE, ABBREVIATION_5),
+                        List.of(
+                                ABBREVIATION_0,
+                                ABBREVIATION_1_OTHER_SHORT_UNIQUE,
+                                ABBREVIATION_2_OTHER_SHORT_UNIQUE,
+                                ABBREVIATION_5),
                         // Entries of testFile3 plus ABBREVIATION_6_SHOW minus ABBREVIATION_4
-                        List.of(ABBREVIATION_0, ABBREVIATION_1_OTHER_SHORT_UNIQUE, ABBREVIATION_1, ABBREVIATION_2_OTHER_SHORT_UNIQUE, ABBREVIATION_6),
-                        ABBREVIATION_1_OTHER_SHORT_UNIQUE)
-        );
+                        List.of(
+                                ABBREVIATION_0,
+                                ABBREVIATION_1_OTHER_SHORT_UNIQUE,
+                                ABBREVIATION_1,
+                                ABBREVIATION_2_OTHER_SHORT_UNIQUE,
+                                ABBREVIATION_6),
+                        ABBREVIATION_1_OTHER_SHORT_UNIQUE));
     }
 
     @BeforeEach
     void setUpViewModel(@TempDir Path tempFolder) throws Exception {
-        JournalAbbreviationPreferences abbreviationPreferences = mock(JournalAbbreviationPreferences.class);
+        JournalAbbreviationPreferences abbreviationPreferences =
+                mock(JournalAbbreviationPreferences.class);
 
         dialogService = mock(DialogService.class);
         this.tempFolder = tempFolder;
 
         TaskExecutor taskExecutor = new CurrentThreadTaskExecutor();
-        viewModel = new JournalAbbreviationsTabViewModel(abbreviationPreferences, dialogService, taskExecutor, repository);
+        viewModel =
+                new JournalAbbreviationsTabViewModel(
+                        abbreviationPreferences, dialogService, taskExecutor, repository);
 
         emptyTestFile = createTestFile(new CsvFileNameAndContent("emptyTestFile.csv", ""));
     }
@@ -222,7 +307,8 @@ void addFileIncreasesCounterOfOpenFilesAndHasNoAbbreviations() {
     @ParameterizedTest
     @MethodSource("provideTestFiles")
     void addDuplicatedFileResultsInErrorDialog(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.getFirst())));
+        when(dialogService.showFileSaveDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.getFirst())));
         viewModel.addNewFile();
         viewModel.addNewFile();
         verify(dialogService).showErrorDialogAndWait(anyString(), anyString());
@@ -231,7 +317,8 @@ void addDuplicatedFileResultsInErrorDialog(TestData testData) throws IOException
     @ParameterizedTest
     @MethodSource("provideTestFiles")
     void openDuplicatedFileResultsInAnException(TestData testData) throws IOException {
-        when(dialogService.showFileOpenDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.getFirst())));
+        when(dialogService.showFileOpenDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.getFirst())));
         viewModel.openFile();
         viewModel.openFile();
         verify(dialogService).showErrorDialogAndWait(anyString(), anyString());
@@ -239,13 +326,15 @@ void openDuplicatedFileResultsInAnException(TestData testData) throws IOExceptio
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void selectLastJournalFileSwitchesFilesAndTheirAbbreviations(TestData testData) throws IOException {
+    void selectLastJournalFileSwitchesFilesAndTheirAbbreviations(TestData testData)
+            throws IOException {
         when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(emptyTestFile));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         assertEquals(0, viewModel.abbreviationsCountProperty().get());
 
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.getFirst())));
+        when(dialogService.showFileSaveDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.getFirst())));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         assertEquals(1, viewModel.abbreviationsCountProperty().get());
@@ -253,21 +342,28 @@ void selectLastJournalFileSwitchesFilesAndTheirAbbreviations(TestData testData)
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void openValidFileContainsTheSpecificEntryAndEnoughAbbreviations(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(2))));
+    void openValidFileContainsTheSpecificEntryAndEnoughAbbreviations(TestData testData)
+            throws IOException {
+        when(dialogService.showFileSaveDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(2))));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
 
         assertEquals(1, viewModel.journalFilesProperty().size());
         assertEquals(4, viewModel.abbreviationsProperty().size());
 
-        assertTrue(viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(testData.abbreviationToCheck)));
+        assertTrue(
+                viewModel
+                        .abbreviationsProperty()
+                        .contains(new AbbreviationViewModel(testData.abbreviationToCheck)));
     }
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void removeLastListSetsCurrentFileAndCurrentAbbreviationToNull(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.getFirst())));
+    void removeLastListSetsCurrentFileAndCurrentAbbreviationToNull(TestData testData)
+            throws IOException {
+        when(dialogService.showFileSaveDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.getFirst())));
         viewModel.addNewFile();
         viewModel.removeCurrentFile();
 
@@ -281,9 +377,11 @@ void removeLastListSetsCurrentFileAndCurrentAbbreviationToNull(TestData testData
     @MethodSource("provideTestFiles")
     void mixedFileUsage(TestData testData) throws IOException {
         // simulate open file button twice
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
+        when(dialogService.showFileSaveDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
         viewModel.addNewFile();
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(2))));
+        when(dialogService.showFileSaveDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(2))));
         viewModel.addNewFile();
         viewModel.currentFileProperty().set(viewModel.journalFilesProperty().get(1));
 
@@ -294,7 +392,10 @@ void mixedFileUsage(TestData testData) throws IOException {
         assertEquals(4, viewModel.abbreviationsProperty().size());
 
         // check "arbitrary" abbreviation
-        assertTrue(viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(testData.abbreviationToCheck)));
+        assertTrue(
+                viewModel
+                        .abbreviationsProperty()
+                        .contains(new AbbreviationViewModel(testData.abbreviationToCheck)));
 
         // simulate add new file button
         when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(emptyTestFile));
@@ -308,7 +409,8 @@ void mixedFileUsage(TestData testData) throws IOException {
         assertEquals(0, viewModel.abbreviationsProperty().size());
 
         // simulate opening of testFile_3
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(3))));
+        when(dialogService.showFileSaveDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(3))));
         viewModel.addNewFile();
         viewModel.currentFileProperty().set(viewModel.journalFilesProperty().get(3));
 
@@ -319,7 +421,10 @@ void mixedFileUsage(TestData testData) throws IOException {
         assertEquals(5, viewModel.abbreviationsProperty().size());
 
         // check "arbitrary" abbreviation
-        assertTrue(viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(testData.abbreviationToCheck)));
+        assertTrue(
+                viewModel
+                        .abbreviationsProperty()
+                        .contains(new AbbreviationViewModel(testData.abbreviationToCheck)));
     }
 
     @Test
@@ -327,11 +432,13 @@ void builtInListsIncludeAllBuiltInAbbreviations() {
         viewModel.addBuiltInList();
         assertEquals(1, viewModel.journalFilesProperty().getSize());
         viewModel.currentFileProperty().set(viewModel.journalFilesProperty().getFirst());
-        ObservableList<Abbreviation> expected = FXCollections.observableArrayList(repository.getAllLoaded());
-        ObservableList<Abbreviation> actualAbbreviations = FXCollections
-                .observableArrayList(viewModel.abbreviationsProperty().stream()
-                                              .map(AbbreviationViewModel::getAbbreviationObject)
-                                              .collect(Collectors.toList()));
+        ObservableList<Abbreviation> expected =
+                FXCollections.observableArrayList(repository.getAllLoaded());
+        ObservableList<Abbreviation> actualAbbreviations =
+                FXCollections.observableArrayList(
+                        viewModel.abbreviationsProperty().stream()
+                                .map(AbbreviationViewModel::getAbbreviationObject)
+                                .collect(Collectors.toList()));
 
         assertEquals(expected, actualAbbreviations);
     }
@@ -340,7 +447,8 @@ void builtInListsIncludeAllBuiltInAbbreviations() {
     @MethodSource("provideTestFiles")
     void currentFilePropertyChangeActiveFile(TestData testData) throws IOException {
         for (CsvFileNameAndContent testFile : testData.csvFiles) {
-            when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testFile)));
+            when(dialogService.showFileSaveDialog(any()))
+                    .thenReturn(Optional.of(createTestFile(testFile)));
             viewModel.addNewFile();
         }
         viewModel.selectLastJournalFile();
@@ -370,23 +478,30 @@ void currentFilePropertyChangeActiveFile(TestData testData) throws IOException {
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void addAbbreviationIncludesAbbreviationsInAbbreviationList(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(2))));
+    void addAbbreviationIncludesAbbreviationsInAbbreviationList(TestData testData)
+            throws IOException {
+        when(dialogService.showFileSaveDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(2))));
         viewModel.addNewFile();
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(3))));
+        when(dialogService.showFileSaveDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(3))));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         Abbreviation testAbbreviation = new Abbreviation("YetAnotherEntry", "YAE");
         viewModel.addAbbreviation(testAbbreviation);
 
         assertEquals(6, viewModel.abbreviationsProperty().size());
-        assertTrue(viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(testAbbreviation)));
+        assertTrue(
+                viewModel
+                        .abbreviationsProperty()
+                        .contains(new AbbreviationViewModel(testAbbreviation)));
     }
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
     void addDuplicatedAbbreviationResultsInException(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
+        when(dialogService.showFileSaveDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         viewModel.addAbbreviation(new Abbreviation("YetAnotherEntry", "YAE"));
@@ -403,15 +518,21 @@ void editSameAbbreviationWithNoChangeDoesNotResultInException() {
         viewModel.addAbbreviation(testAbbreviation);
         viewModel.editAbbreviation(testAbbreviation);
 
-        assertTrue(viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(testAbbreviation)));
+        assertTrue(
+                viewModel
+                        .abbreviationsProperty()
+                        .contains(new AbbreviationViewModel(testAbbreviation)));
     }
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void editAbbreviationIncludesNewAbbreviationInAbbreviationsList(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(2))));
+    void editAbbreviationIncludesNewAbbreviationInAbbreviationsList(TestData testData)
+            throws IOException {
+        when(dialogService.showFileSaveDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(2))));
         viewModel.addNewFile();
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(3))));
+        when(dialogService.showFileSaveDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(3))));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         selectLastAbbreviation();
@@ -419,7 +540,10 @@ void editAbbreviationIncludesNewAbbreviationInAbbreviationsList(TestData testDat
         viewModel.addAbbreviation(testAbbreviation);
 
         assertEquals(6, viewModel.abbreviationsProperty().size());
-        assertTrue(viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(testAbbreviation)));
+        assertTrue(
+                viewModel
+                        .abbreviationsProperty()
+                        .contains(new AbbreviationViewModel(testAbbreviation)));
 
         when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(emptyTestFile));
         viewModel.addNewFile();
@@ -427,13 +551,17 @@ void editAbbreviationIncludesNewAbbreviationInAbbreviationsList(TestData testDat
         // addAbbreviation(testAbbreviation);
 
         assertEquals(0, viewModel.abbreviationsProperty().size());
-        assertFalse(viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(testAbbreviation)));
+        assertFalse(
+                viewModel
+                        .abbreviationsProperty()
+                        .contains(new AbbreviationViewModel(testAbbreviation)));
     }
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
     void editAbbreviationToExistingOneResultsInException(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
+        when(dialogService.showFileSaveDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         selectLastAbbreviation();
@@ -449,7 +577,8 @@ void editAbbreviationToExistingOneResultsInException(TestData testData) throws I
     @ParameterizedTest
     @MethodSource("provideTestFiles")
     void editAbbreviationToEmptyNameResultsInException(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
+        when(dialogService.showFileSaveDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         selectLastAbbreviation();
@@ -462,8 +591,10 @@ void editAbbreviationToEmptyNameResultsInException(TestData testData) throws IOE
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void editAbbreviationToEmptyAbbreviationResultsInException(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
+    void editAbbreviationToEmptyAbbreviationResultsInException(TestData testData)
+            throws IOException {
+        when(dialogService.showFileSaveDialog(any()))
+                .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         selectLastAbbreviation();
@@ -476,7 +607,8 @@ void editAbbreviationToEmptyAbbreviationResultsInException(TestData testData) th
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void saveAbbreviationsToFilesCreatesNewFilesWithWrittenAbbreviations(TestData testData) throws Exception {
+    void saveAbbreviationsToFilesCreatesNewFilesWithWrittenAbbreviations(TestData testData)
+            throws Exception {
         Path testFile2 = createTestFile(testData.csvFiles.get(2));
         when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(testFile2));
         viewModel.addNewFile();
@@ -484,7 +616,10 @@ void saveAbbreviationsToFilesCreatesNewFilesWithWrittenAbbreviations(TestData te
         selectLastAbbreviation();
         viewModel.editAbbreviation(ABBREVIATION_5);
         assertEquals(4, viewModel.abbreviationsProperty().size());
-        assertTrue(viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(ABBREVIATION_5)));
+        assertTrue(
+                viewModel
+                        .abbreviationsProperty()
+                        .contains(new AbbreviationViewModel(ABBREVIATION_5)));
 
         Path testFile3 = createTestFile(testData.csvFiles.get(3));
         when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(testFile3));
@@ -492,14 +627,25 @@ void saveAbbreviationsToFilesCreatesNewFilesWithWrittenAbbreviations(TestData te
         assertEquals(5, viewModel.abbreviationsProperty().size());
 
         viewModel.selectLastJournalFile();
-        assertTrue(viewModel.currentFileProperty().get().getAbsolutePath().get().getFileName().toString().endsWith("3.csv"));
+        assertTrue(
+                viewModel
+                        .currentFileProperty()
+                        .get()
+                        .getAbsolutePath()
+                        .get()
+                        .getFileName()
+                        .toString()
+                        .endsWith("3.csv"));
         selectLastAbbreviation();
         viewModel.deleteAbbreviation();
         viewModel.addAbbreviation(ABBREVIATION_6);
 
         // deletion and addition of an entry leads to same size
         assertEquals(5, viewModel.abbreviationsProperty().size());
-        assertTrue(viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(ABBREVIATION_6)));
+        assertTrue(
+                viewModel
+                        .abbreviationsProperty()
+                        .contains(new AbbreviationViewModel(ABBREVIATION_6)));
 
         // overwrite all files
         viewModel.saveJournalAbbreviationFiles();
@@ -515,13 +661,18 @@ void saveAbbreviationsToFilesCreatesNewFilesWithWrittenAbbreviations(TestData te
      * Select the last abbreviation in the list of abbreviations
      */
     private void selectLastAbbreviation() {
-        viewModel.currentAbbreviationProperty()
-                 .set(viewModel.abbreviationsProperty().get(viewModel.abbreviationsCountProperty().get() - 1));
+        viewModel
+                .currentAbbreviationProperty()
+                .set(
+                        viewModel
+                                .abbreviationsProperty()
+                                .get(viewModel.abbreviationsCountProperty().get() - 1));
     }
 
     private void addFourTestFileToViewModelAndPreferences(TestData testData) throws IOException {
         for (CsvFileNameAndContent csvFile : testData.csvFiles) {
-            when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(csvFile)));
+            when(dialogService.showFileSaveDialog(any()))
+                    .thenReturn(Optional.of(createTestFile(csvFile)));
             viewModel.addNewFile();
         }
         viewModel.storeSettings();
diff --git a/src/test/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModelTest.java b/src/test/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModelTest.java
index 4e30b8726fc1..3456dfb5f591 100644
--- a/src/test/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModelTest.java
+++ b/src/test/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModelTest.java
@@ -1,6 +1,11 @@
 package org.jabref.gui.preferences.keybindings;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.airhacks.afterburner.injection.Injector;
 
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
@@ -10,14 +15,9 @@
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.logic.preferences.CliPreferences;
-
-import com.airhacks.afterburner.injection.Injector;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Optional;
 
 class KeyBindingViewModelTest {
 
@@ -29,25 +29,36 @@ void resetToDefault() {
         when(preferences.getKeyBindingRepository()).thenReturn(keyBindingRepository);
         Injector.setModelOrService(CliPreferences.class, preferences);
 
-        KeyBindingsTabViewModel keyBindingsTabViewModel = new KeyBindingsTabViewModel(keyBindingRepository, mock(DialogService.class), preferences);
+        KeyBindingsTabViewModel keyBindingsTabViewModel =
+                new KeyBindingsTabViewModel(
+                        keyBindingRepository, mock(DialogService.class), preferences);
         KeyBinding binding = KeyBinding.ABBREVIATE;
 
-        KeyBindingViewModel viewModel = new KeyBindingViewModel(keyBindingRepository, binding, binding.getDefaultKeyBinding());
+        KeyBindingViewModel viewModel =
+                new KeyBindingViewModel(
+                        keyBindingRepository, binding, binding.getDefaultKeyBinding());
         keyBindingsTabViewModel.selectedKeyBindingProperty().set(Optional.of(viewModel));
 
-        KeyEvent shortcutKeyEvent = new KeyEvent(KeyEvent.KEY_PRESSED, "F1", "F1", KeyCode.F1, true, false, false,
-                false);
+        KeyEvent shortcutKeyEvent =
+                new KeyEvent(
+                        KeyEvent.KEY_PRESSED, "F1", "F1", KeyCode.F1, true, false, false, false);
 
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        assertFalse(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.ABBREVIATE, shortcutKeyEvent));
 
         keyBindingsTabViewModel.setNewBindingForCurrent(shortcutKeyEvent);
         keyBindingsTabViewModel.storeSettings();
 
-        assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        assertTrue(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.ABBREVIATE, shortcutKeyEvent));
 
         // Reset to default
         viewModel.resetToDefault();
 
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        assertFalse(
+                keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.ABBREVIATE, shortcutKeyEvent));
     }
 }
diff --git a/src/test/java/org/jabref/gui/preview/ClipboardContentGeneratorTest.java b/src/test/java/org/jabref/gui/preview/ClipboardContentGeneratorTest.java
index fefbe501147d..70cf75dcc91d 100644
--- a/src/test/java/org/jabref/gui/preview/ClipboardContentGeneratorTest.java
+++ b/src/test/java/org/jabref/gui/preview/ClipboardContentGeneratorTest.java
@@ -1,45 +1,66 @@
 package org.jabref.gui.preview;
 
-import java.util.Arrays;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import javafx.scene.input.ClipboardContent;
 
 import org.jabref.logic.os.OS;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Arrays;
+import java.util.List;
 
 class ClipboardContentGeneratorTest {
 
     @Test
     void processPreviewText() throws Exception {
-        String expected = "Article (Smith2016)" + OS.NEWLINE +
-                "Smith, B.; Jones, B. &amp; Williams, J." + OS.NEWLINE +
-                "Taylor, P. (Ed.)" + OS.NEWLINE +
-                "Title of the test entry " + OS.NEWLINE +
-                "BibTeX Journal, JabRef Publishing, 2016, 34, 45-67 " + OS.NEWLINE +
-                "" + OS.NEWLINE +
-                "Abstract:  This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. " + OS.NEWLINE +
-                "<br>" + OS.NEWLINE +
-                "Article (Smith2016)" + OS.NEWLINE +
-                "Smith, B.; Jones, B. &amp; Williams, J." + OS.NEWLINE +
-                "Taylor, P. (Ed.)" + OS.NEWLINE +
-                "Title of the test entry " + OS.NEWLINE +
-                "BibTeX Journal, JabRef Publishing, 2016, 34, 45-67 " + OS.NEWLINE +
-                "" + OS.NEWLINE +
-                "Abstract:  This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. ";
-
-        String citation = "Article (Smith2016)" + OS.NEWLINE +
-                "Smith, B.; Jones, B. &amp; Williams, J." + OS.NEWLINE +
-                "Taylor, P. (Ed.)" + OS.NEWLINE +
-                "Title of the test entry " + OS.NEWLINE +
-                "BibTeX Journal, JabRef Publishing, 2016, 34, 45-67 " + OS.NEWLINE +
-                OS.NEWLINE +
-                "Abstract:  This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. ";
-
-        ClipboardContent clipboardContent = ClipboardContentGenerator.processPreview(List.of(citation, citation));
+        String expected =
+                "Article (Smith2016)"
+                        + OS.NEWLINE
+                        + "Smith, B.; Jones, B. &amp; Williams, J."
+                        + OS.NEWLINE
+                        + "Taylor, P. (Ed.)"
+                        + OS.NEWLINE
+                        + "Title of the test entry "
+                        + OS.NEWLINE
+                        + "BibTeX Journal, JabRef Publishing, 2016, 34, 45-67 "
+                        + OS.NEWLINE
+                        + ""
+                        + OS.NEWLINE
+                        + "Abstract:  This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. "
+                        + OS.NEWLINE
+                        + "<br>"
+                        + OS.NEWLINE
+                        + "Article (Smith2016)"
+                        + OS.NEWLINE
+                        + "Smith, B.; Jones, B. &amp; Williams, J."
+                        + OS.NEWLINE
+                        + "Taylor, P. (Ed.)"
+                        + OS.NEWLINE
+                        + "Title of the test entry "
+                        + OS.NEWLINE
+                        + "BibTeX Journal, JabRef Publishing, 2016, 34, 45-67 "
+                        + OS.NEWLINE
+                        + ""
+                        + OS.NEWLINE
+                        + "Abstract:  This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. ";
+
+        String citation =
+                "Article (Smith2016)"
+                        + OS.NEWLINE
+                        + "Smith, B.; Jones, B. &amp; Williams, J."
+                        + OS.NEWLINE
+                        + "Taylor, P. (Ed.)"
+                        + OS.NEWLINE
+                        + "Title of the test entry "
+                        + OS.NEWLINE
+                        + "BibTeX Journal, JabRef Publishing, 2016, 34, 45-67 "
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "Abstract:  This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. ";
+
+        ClipboardContent clipboardContent =
+                ClipboardContentGenerator.processPreview(List.of(citation, citation));
         String actual = clipboardContent.getString();
 
         assertEquals(expected, actual);
@@ -47,63 +68,101 @@ void processPreviewText() throws Exception {
 
     @Test
     void processPreviewHtml() throws Exception {
-        String expected = "<font face=\"sans-serif\"><b><i>Article</i><a name=\"Smith2016\"> (Smith2016)</a></b><br>" + OS.NEWLINE +
-                " Smith, B.; Jones, B. &amp; Williams, J.<BR>" + OS.NEWLINE +
-                " Taylor, P. <i>(Ed.)</i><BR>" + OS.NEWLINE +
-                " Title of the test entry <BR>" + OS.NEWLINE +
-                OS.NEWLINE +
-                " <em>BibTeX Journal, </em>" + OS.NEWLINE +
-                OS.NEWLINE +
-                OS.NEWLINE +
-                OS.NEWLINE +
-                " <em>JabRef Publishing, </em>" + OS.NEWLINE +
-                "<b>2016</b><i>, 34</i>, 45-67 " + OS.NEWLINE +
-                "<BR><BR><b>Abstract: </b> This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. " + OS.NEWLINE +
-                "</dd>" + OS.NEWLINE +
-                "<p></p></font>" + OS.NEWLINE +
-                "<br>" + OS.NEWLINE +
-                "<font face=\"sans-serif\"><b><i>Article</i><a name=\"Smith2016\"> (Smith2016)</a></b><br>" + OS.NEWLINE +
-                " Smith, B.; Jones, B. &amp; Williams, J.<BR>" + OS.NEWLINE +
-                " Taylor, P. <i>(Ed.)</i><BR>" + OS.NEWLINE +
-                " Title of the test entry <BR>" + OS.NEWLINE +
-                OS.NEWLINE +
-                " <em>BibTeX Journal, </em>" + OS.NEWLINE +
-                OS.NEWLINE +
-                OS.NEWLINE +
-                OS.NEWLINE +
-                " <em>JabRef Publishing, </em>" + OS.NEWLINE +
-                "<b>2016</b><i>, 34</i>, 45-67 " + OS.NEWLINE +
-                "<BR><BR><b>Abstract: </b> This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. " + OS.NEWLINE +
-                "</dd>" + OS.NEWLINE +
-                "<p></p></font>";
-
-        String citation = "<font face=\"sans-serif\"><b><i>Article</i><a name=\"Smith2016\"> (Smith2016)</a></b><br>" + OS.NEWLINE +
-                " Smith, B.; Jones, B. &amp; Williams, J.<BR>" + OS.NEWLINE +
-                " Taylor, P. <i>(Ed.)</i><BR>" + OS.NEWLINE +
-                " Title of the test entry <BR>" + OS.NEWLINE +
-                OS.NEWLINE +
-                " <em>BibTeX Journal, </em>" + OS.NEWLINE +
-                OS.NEWLINE +
-                OS.NEWLINE +
-                OS.NEWLINE +
-                " <em>JabRef Publishing, </em>" + OS.NEWLINE +
-                "<b>2016</b><i>, 34</i>, 45-67 " + OS.NEWLINE +
-                "<BR><BR><b>Abstract: </b> This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. " + OS.NEWLINE +
-                "</dd>" + OS.NEWLINE +
-                "<p></p></font>";
-
-        ClipboardContent clipboardContent = ClipboardContentGenerator.processPreview(Arrays.asList(citation, citation));
+        String expected =
+                "<font face=\"sans-serif\"><b><i>Article</i><a name=\"Smith2016\"> (Smith2016)</a></b><br>"
+                        + OS.NEWLINE
+                        + " Smith, B.; Jones, B. &amp; Williams, J.<BR>"
+                        + OS.NEWLINE
+                        + " Taylor, P. <i>(Ed.)</i><BR>"
+                        + OS.NEWLINE
+                        + " Title of the test entry <BR>"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + " <em>BibTeX Journal, </em>"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + " <em>JabRef Publishing, </em>"
+                        + OS.NEWLINE
+                        + "<b>2016</b><i>, 34</i>, 45-67 "
+                        + OS.NEWLINE
+                        + "<BR><BR><b>Abstract: </b> This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. "
+                        + OS.NEWLINE
+                        + "</dd>"
+                        + OS.NEWLINE
+                        + "<p></p></font>"
+                        + OS.NEWLINE
+                        + "<br>"
+                        + OS.NEWLINE
+                        + "<font face=\"sans-serif\"><b><i>Article</i><a name=\"Smith2016\"> (Smith2016)</a></b><br>"
+                        + OS.NEWLINE
+                        + " Smith, B.; Jones, B. &amp; Williams, J.<BR>"
+                        + OS.NEWLINE
+                        + " Taylor, P. <i>(Ed.)</i><BR>"
+                        + OS.NEWLINE
+                        + " Title of the test entry <BR>"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + " <em>BibTeX Journal, </em>"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + " <em>JabRef Publishing, </em>"
+                        + OS.NEWLINE
+                        + "<b>2016</b><i>, 34</i>, 45-67 "
+                        + OS.NEWLINE
+                        + "<BR><BR><b>Abstract: </b> This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. "
+                        + OS.NEWLINE
+                        + "</dd>"
+                        + OS.NEWLINE
+                        + "<p></p></font>";
+
+        String citation =
+                "<font face=\"sans-serif\"><b><i>Article</i><a name=\"Smith2016\"> (Smith2016)</a></b><br>"
+                        + OS.NEWLINE
+                        + " Smith, B.; Jones, B. &amp; Williams, J.<BR>"
+                        + OS.NEWLINE
+                        + " Taylor, P. <i>(Ed.)</i><BR>"
+                        + OS.NEWLINE
+                        + " Title of the test entry <BR>"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + " <em>BibTeX Journal, </em>"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + " <em>JabRef Publishing, </em>"
+                        + OS.NEWLINE
+                        + "<b>2016</b><i>, 34</i>, 45-67 "
+                        + OS.NEWLINE
+                        + "<BR><BR><b>Abstract: </b> This entry describes a test scenario which may be useful in JabRef. By providing a test entry it is possible to see how certain things will look in this graphical BIB-file mananger. "
+                        + OS.NEWLINE
+                        + "</dd>"
+                        + OS.NEWLINE
+                        + "<p></p></font>";
+
+        ClipboardContent clipboardContent =
+                ClipboardContentGenerator.processPreview(Arrays.asList(citation, citation));
         String actual = clipboardContent.getString();
         assertEquals(expected, actual);
     }
 
     @Test
     void processText() throws Exception {
-        String expected = "[1]B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, Jul. 2016." + OS.NEWLINE +
-                "[1]B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, Jul. 2016." + OS.NEWLINE;
-
-        String citation = "[1]B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, Jul. 2016." + OS.NEWLINE;
-        ClipboardContent textTransferable = ClipboardContentGenerator.processText(Arrays.asList(citation, citation));
+        String expected =
+                "[1]B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, Jul. 2016."
+                        + OS.NEWLINE
+                        + "[1]B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, Jul. 2016."
+                        + OS.NEWLINE;
+
+        String citation =
+                "[1]B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, Jul. 2016."
+                        + OS.NEWLINE;
+        ClipboardContent textTransferable =
+                ClipboardContentGenerator.processText(Arrays.asList(citation, citation));
 
         String actual = textTransferable.getString();
         assertEquals(expected, actual);
@@ -111,29 +170,50 @@ void processText() throws Exception {
 
     @Test
     void processHtmlAsHtml() throws Exception {
-        String expected = "<!DOCTYPE html>" + OS.NEWLINE +
-                "<html>" + OS.NEWLINE +
-                "   <head>" + OS.NEWLINE +
-                "      <meta charset=\"utf-8\">" + OS.NEWLINE +
-                "   </head>" + OS.NEWLINE +
-                "   <body>" + OS.NEWLINE +
-                OS.NEWLINE +
-                "  <div class=\"csl-entry\">" + OS.NEWLINE +
-                "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <i>BibTeX Journal</i>, vol. 34, no. 3, pp. 45–67, Jul. 2016.</div>" + OS.NEWLINE +
-                "  </div>" + OS.NEWLINE +
-                OS.NEWLINE +
-                "<br>" + OS.NEWLINE +
-                "  <div class=\"csl-entry\">" + OS.NEWLINE +
-                "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <i>BibTeX Journal</i>, vol. 34, no. 3, pp. 45–67, Jul. 2016.</div>" + OS.NEWLINE +
-                "  </div>" + OS.NEWLINE +
-                OS.NEWLINE +
-                "   </body>" + OS.NEWLINE +
-                "</html>" + OS.NEWLINE;
-
-        String citation = "  <div class=\"csl-entry\">" + OS.NEWLINE +
-                "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <i>BibTeX Journal</i>, vol. 34, no. 3, pp. 45–67, Jul. 2016.</div>" + OS.NEWLINE +
-                "  </div>" + OS.NEWLINE;
-        ClipboardContent htmlTransferable = ClipboardContentGenerator.processHtml(Arrays.asList(citation, citation));
+        String expected =
+                "<!DOCTYPE html>"
+                        + OS.NEWLINE
+                        + "<html>"
+                        + OS.NEWLINE
+                        + "   <head>"
+                        + OS.NEWLINE
+                        + "      <meta charset=\"utf-8\">"
+                        + OS.NEWLINE
+                        + "   </head>"
+                        + OS.NEWLINE
+                        + "   <body>"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "  <div class=\"csl-entry\">"
+                        + OS.NEWLINE
+                        + "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <i>BibTeX Journal</i>, vol. 34, no. 3, pp. 45–67, Jul. 2016.</div>"
+                        + OS.NEWLINE
+                        + "  </div>"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "<br>"
+                        + OS.NEWLINE
+                        + "  <div class=\"csl-entry\">"
+                        + OS.NEWLINE
+                        + "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <i>BibTeX Journal</i>, vol. 34, no. 3, pp. 45–67, Jul. 2016.</div>"
+                        + OS.NEWLINE
+                        + "  </div>"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "   </body>"
+                        + OS.NEWLINE
+                        + "</html>"
+                        + OS.NEWLINE;
+
+        String citation =
+                "  <div class=\"csl-entry\">"
+                        + OS.NEWLINE
+                        + "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <i>BibTeX Journal</i>, vol. 34, no. 3, pp. 45–67, Jul. 2016.</div>"
+                        + OS.NEWLINE
+                        + "  </div>"
+                        + OS.NEWLINE;
+        ClipboardContent htmlTransferable =
+                ClipboardContentGenerator.processHtml(Arrays.asList(citation, citation));
 
         Object actual = htmlTransferable.getHtml();
         assertEquals(expected, actual);
diff --git a/src/test/java/org/jabref/gui/push/PushToEmacsTest.java b/src/test/java/org/jabref/gui/push/PushToEmacsTest.java
index ecce833f03b9..985fd3e7f8ff 100644
--- a/src/test/java/org/jabref/gui/push/PushToEmacsTest.java
+++ b/src/test/java/org/jabref/gui/push/PushToEmacsTest.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.push;
 
-import java.util.Map;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.beans.property.SimpleMapProperty;
 import javafx.collections.FXCollections;
@@ -10,14 +11,12 @@
 import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.logic.os.OS;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Map;
 
 @Disabled("Needs running emacs daemon. Start emacs with --daemon")
 class PushToEmacsTest {
@@ -28,20 +27,28 @@ void setup() {
         DialogService dialogService = mock(DialogService.class, Answers.RETURNS_DEEP_STUBS);
         GuiPreferences preferences = mock(GuiPreferences.class);
 
-        PushToApplicationPreferences pushToApplicationPreferences = mock(PushToApplicationPreferences.class);
+        PushToApplicationPreferences pushToApplicationPreferences =
+                mock(PushToApplicationPreferences.class);
 
-        String emacsClient = OS.WINDOWS ? "\"C:\\tools\\emacs\\bin\\emacsclientw.exe\"" : "emacsclient";
+        String emacsClient =
+                OS.WINDOWS ? "\"C:\\tools\\emacs\\bin\\emacsclientw.exe\"" : "emacsclient";
         Map<String, String> emacsConfig = Map.of("Emacs", emacsClient);
-        ObservableMap<String, String> emacsConfigObservableMap = FXCollections.observableMap(emacsConfig);
-        when(pushToApplicationPreferences.getCommandPaths()).thenReturn(new SimpleMapProperty<>(emacsConfigObservableMap));
+        ObservableMap<String, String> emacsConfigObservableMap =
+                FXCollections.observableMap(emacsConfig);
+        when(pushToApplicationPreferences.getCommandPaths())
+                .thenReturn(new SimpleMapProperty<>(emacsConfigObservableMap));
 
         when(pushToApplicationPreferences.getEmacsArguments()).thenReturn("-n -e");
 
-        when(preferences.getPushToApplicationPreferences()).thenReturn(pushToApplicationPreferences);
+        when(preferences.getPushToApplicationPreferences())
+                .thenReturn(pushToApplicationPreferences);
 
-        ExternalApplicationsPreferences externalApplicationsPreferences = mock(ExternalApplicationsPreferences.class);
-        when(externalApplicationsPreferences.getCiteCommand().toString()).thenReturn("\\cite{key1,key2}");
-        when(preferences.getExternalApplicationsPreferences()).thenReturn(externalApplicationsPreferences);
+        ExternalApplicationsPreferences externalApplicationsPreferences =
+                mock(ExternalApplicationsPreferences.class);
+        when(externalApplicationsPreferences.getCiteCommand().toString())
+                .thenReturn("\\cite{key1,key2}");
+        when(preferences.getExternalApplicationsPreferences())
+                .thenReturn(externalApplicationsPreferences);
 
         pushToEmacs = new PushToEmacs(dialogService, preferences);
     }
diff --git a/src/test/java/org/jabref/gui/push/PushToTeXworksTest.java b/src/test/java/org/jabref/gui/push/PushToTeXworksTest.java
index 956ab88e400a..313bc27a1a32 100644
--- a/src/test/java/org/jabref/gui/push/PushToTeXworksTest.java
+++ b/src/test/java/org/jabref/gui/push/PushToTeXworksTest.java
@@ -1,6 +1,10 @@
 package org.jabref.gui.push;
 
-import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import javafx.beans.property.SimpleMapProperty;
 import javafx.collections.FXCollections;
@@ -10,16 +14,11 @@
 import org.jabref.gui.frame.ExternalApplicationsPreferences;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.logic.push.CitationCommandString;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import java.util.Map;
 
 class PushToTeXworksTest {
 
@@ -32,21 +31,27 @@ class PushToTeXworksTest {
     void setup() {
         DialogService dialogService = mock(DialogService.class, Answers.RETURNS_DEEP_STUBS);
         GuiPreferences preferences = mock(GuiPreferences.class);
-        PushToApplicationPreferences pushToApplicationPreferences = mock(PushToApplicationPreferences.class);
+        PushToApplicationPreferences pushToApplicationPreferences =
+                mock(PushToApplicationPreferences.class);
 
         // Mock the command path
         Map<String, String> commandPaths = Map.of(DISPLAY_NAME, TEXWORKS_CLIENT_PATH);
-        ObservableMap<String, String> observableCommandPaths = FXCollections.observableMap(commandPaths);
-        when(pushToApplicationPreferences.getCommandPaths()).thenReturn(new SimpleMapProperty<>(observableCommandPaths));
-        when(preferences.getPushToApplicationPreferences()).thenReturn(pushToApplicationPreferences);
+        ObservableMap<String, String> observableCommandPaths =
+                FXCollections.observableMap(commandPaths);
+        when(pushToApplicationPreferences.getCommandPaths())
+                .thenReturn(new SimpleMapProperty<>(observableCommandPaths));
+        when(preferences.getPushToApplicationPreferences())
+                .thenReturn(pushToApplicationPreferences);
 
         // Mock the return value for getCiteCommand()
-        ExternalApplicationsPreferences externalApplicationsPreferences = mock(ExternalApplicationsPreferences.class);
+        ExternalApplicationsPreferences externalApplicationsPreferences =
+                mock(ExternalApplicationsPreferences.class);
         CitationCommandString mockCiteCommand = mock(CitationCommandString.class);
         when(mockCiteCommand.prefix()).thenReturn("");
         when(mockCiteCommand.suffix()).thenReturn("");
         when(externalApplicationsPreferences.getCiteCommand()).thenReturn(mockCiteCommand);
-        when(preferences.getExternalApplicationsPreferences()).thenReturn(externalApplicationsPreferences);
+        when(preferences.getExternalApplicationsPreferences())
+                .thenReturn(externalApplicationsPreferences);
 
         // Create a new instance of PushToTeXworks
         pushToTeXworks = new PushToTeXworks(dialogService, preferences);
@@ -68,7 +73,10 @@ void displayName() {
     @Test
     void getCommandLine() {
         String keyString = "TestKey";
-        String[] expectedCommand = new String[] {null, "--insert-text", keyString}; // commandPath is only set in pushEntries
+        String[] expectedCommand =
+                new String[] {
+                    null, "--insert-text", keyString
+                }; // commandPath is only set in pushEntries
 
         String[] actualCommand = pushToTeXworks.getCommandLine(keyString);
 
@@ -96,6 +104,7 @@ void pushEntries() {
      */
     @Test
     void getTooltip() {
-        assertEquals("Push entries to external application (TeXworks)", pushToTeXworks.getTooltip());
+        assertEquals(
+                "Push entries to external application (TeXworks)", pushToTeXworks.getTooltip());
     }
 }
diff --git a/src/test/java/org/jabref/gui/search/GetLastSearchHistoryTest.java b/src/test/java/org/jabref/gui/search/GetLastSearchHistoryTest.java
index 4dd28d92f397..b642c06f6e2c 100644
--- a/src/test/java/org/jabref/gui/search/GetLastSearchHistoryTest.java
+++ b/src/test/java/org/jabref/gui/search/GetLastSearchHistoryTest.java
@@ -1,18 +1,17 @@
 package org.jabref.gui.search;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import javafx.stage.Stage;
 
 import org.jabref.gui.StateManager;
 import org.jabref.testutils.category.GUITest;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.testfx.framework.junit5.ApplicationExtension;
 import org.testfx.framework.junit5.Start;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
 
 @GUITest
 @ExtendWith(ApplicationExtension.class)
diff --git a/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java b/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
index fb9f582e5919..65f14aa5d796 100644
--- a/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
+++ b/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
@@ -1,7 +1,10 @@
 package org.jabref.gui.search;
 
-import java.util.EnumSet;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 import javafx.scene.Scene;
@@ -20,7 +23,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.search.SearchFlags;
 import org.jabref.testutils.category.GUITest;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Answers;
@@ -28,11 +30,8 @@
 import org.testfx.framework.junit5.ApplicationExtension;
 import org.testfx.framework.junit5.Start;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.EnumSet;
+import java.util.List;
 
 @GUITest
 @ExtendWith(ApplicationExtension.class)
@@ -45,7 +44,8 @@ public class GlobalSearchBarTest {
     public void onStart(Stage stage) {
         SearchPreferences searchPreferences = mock(SearchPreferences.class);
         when(searchPreferences.getSearchFlags()).thenReturn(EnumSet.noneOf(SearchFlags.class));
-        when(searchPreferences.getObservableSearchFlags()).thenReturn(FXCollections.observableSet());
+        when(searchPreferences.getObservableSearchFlags())
+                .thenReturn(FXCollections.observableSet());
         GuiPreferences preferences = mock(GuiPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(preferences.getSearchPreferences()).thenReturn(searchPreferences);
 
@@ -58,14 +58,14 @@ public void onStart(Stage stage) {
         stateManager.setActiveDatabase(new BibDatabaseContext());
 
         // Instantiate GlobalSearchBar class, so the change listener is registered
-        GlobalSearchBar searchBar = new GlobalSearchBar(
-                mock(LibraryTabContainer.class),
-                stateManager,
-                preferences,
-                mock(CountingUndoManager.class),
-                mock(DialogService.class),
-                SearchType.NORMAL_SEARCH
-        );
+        GlobalSearchBar searchBar =
+                new GlobalSearchBar(
+                        mock(LibraryTabContainer.class),
+                        stateManager,
+                        preferences,
+                        mock(CountingUndoManager.class),
+                        mock(DialogService.class),
+                        SearchType.NORMAL_SEARCH);
 
         hBox = new HBox(searchBar);
 
diff --git a/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java b/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java
index 15246db46816..14f10a9db600 100644
--- a/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java
+++ b/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java
@@ -1,12 +1,12 @@
 package org.jabref.gui.search;
 
-import java.util.List;
-
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
 
 import org.junit.jupiter.api.Assertions;
 
+import java.util.List;
+
 public class TextFlowEqualityHelper {
 
     public static void assertEquals(List<Text> expectedTexts, TextFlow description) {
@@ -27,7 +27,8 @@ public static void assertEquals(List<Text> expectedTexts, TextFlow description)
         }
     }
 
-    public static boolean checkIfTextsEqualsExpectedTexts(List<Text> texts, List<Text> expectedTexts) {
+    public static boolean checkIfTextsEqualsExpectedTexts(
+            List<Text> texts, List<Text> expectedTexts) {
         if (expectedTexts.size() != texts.size()) {
             return false;
         }
diff --git a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
index 00612d16ba95..c1b6e94309c4 100644
--- a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
+++ b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
@@ -1,10 +1,9 @@
 package org.jabref.gui.sidepane;
 
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.HashSet;
-
-import javax.swing.undo.UndoManager;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -22,16 +21,16 @@
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.testfx.framework.junit5.ApplicationExtension;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+
+import javax.swing.undo.UndoManager;
 
 @ExtendWith(ApplicationExtension.class)
 class SidePaneViewModelTest {
@@ -39,7 +38,8 @@ class SidePaneViewModelTest {
     LibraryTabContainer tabContainer = mock(LibraryTabContainer.class);
     GuiPreferences preferences = mock(GuiPreferences.class);
     ChatHistoryService chatHistoryService = mock(ChatHistoryService.class);
-    JournalAbbreviationRepository abbreviationRepository = mock(JournalAbbreviationRepository.class);
+    JournalAbbreviationRepository abbreviationRepository =
+            mock(JournalAbbreviationRepository.class);
     StateManager stateManager = mock(StateManager.class);
     TaskExecutor taskExecutor = mock(TaskExecutor.class);
     DialogService dialogService = mock(DialogService.class);
@@ -48,7 +48,8 @@ class SidePaneViewModelTest {
     ClipBoardManager clipBoardManager = mock(ClipBoardManager.class);
     UndoManager undoManager = mock(UndoManager.class);
 
-    SidePanePreferences sidePanePreferences = new SidePanePreferences(new HashSet<>(), new HashMap<>(), 0);
+    SidePanePreferences sidePanePreferences =
+            new SidePanePreferences(new HashSet<>(), new HashMap<>(), 0);
     ObservableList<SidePaneType> sidePaneComponents = FXCollections.observableArrayList();
     SidePaneViewModel sidePaneViewModel;
 
@@ -64,18 +65,19 @@ void setUp() {
         sidePanePreferences.getPreferredPositions().put(SidePaneType.WEB_SEARCH, 1);
         sidePanePreferences.getPreferredPositions().put(SidePaneType.OPEN_OFFICE, 2);
 
-        sidePaneViewModel = new SidePaneViewModel(
-                tabContainer,
-                preferences,
-                chatHistoryService,
-                abbreviationRepository,
-                stateManager,
-                taskExecutor,
-                dialogService,
-                fileUpdateMonitor,
-                entryTypesManager,
-                clipBoardManager,
-                undoManager);
+        sidePaneViewModel =
+                new SidePaneViewModel(
+                        tabContainer,
+                        preferences,
+                        chatHistoryService,
+                        abbreviationRepository,
+                        stateManager,
+                        taskExecutor,
+                        dialogService,
+                        fileUpdateMonitor,
+                        entryTypesManager,
+                        clipBoardManager,
+                        undoManager);
     }
 
     @Test
@@ -115,6 +117,8 @@ void sortByPreferredPositions() {
 
         sidePaneComponents.sort(new SidePaneViewModel.PreferredIndexSort(sidePanePreferences));
 
-        assertTrue(sidePaneComponents.getFirst() == SidePaneType.OPEN_OFFICE && sidePaneComponents.get(2) == SidePaneType.GROUPS);
+        assertTrue(
+                sidePaneComponents.getFirst() == SidePaneType.OPEN_OFFICE
+                        && sidePaneComponents.get(2) == SidePaneType.GROUPS);
     }
 }
diff --git a/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java b/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
index 537616b8b991..f1bae003a0a6 100644
--- a/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
+++ b/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.slr;
 
-import java.nio.file.Path;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.WorkspacePreferences;
@@ -9,14 +9,13 @@
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.model.study.Study;
 import org.jabref.model.study.StudyDatabase;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.nio.file.Path;
+import java.util.List;
 
 class ManageStudyDefinitionViewModelTest {
     private ImportFormatPreferences importFormatPreferences;
@@ -35,72 +34,73 @@ void setUp() {
 
     @Test
     void emptyStudyConstructorFillsDatabasesCorrectly() {
-        ManageStudyDefinitionViewModel manageStudyDefinitionViewModel = new ManageStudyDefinitionViewModel(importFormatPreferences, importerPreferences, workspacePreferences, dialogService);
-        assertEquals(List.of(
-                new StudyCatalogItem("ACM Portal", true),
-                new StudyCatalogItem("ArXiv", false),
-                new StudyCatalogItem("Bibliotheksverbund Bayern (Experimental)", false),
-                new StudyCatalogItem("Biodiversity Heritage", false),
-                new StudyCatalogItem("CiteSeerX", false),
-                new StudyCatalogItem("Crossref", false),
-                new StudyCatalogItem("DBLP", true),
-                new StudyCatalogItem("DOAB", false),
-                new StudyCatalogItem("DOAJ", false),
-                new StudyCatalogItem("GVK", false),
-                new StudyCatalogItem("IEEEXplore", true),
-                new StudyCatalogItem("INSPIRE", false),
-                new StudyCatalogItem("ISIDORE", false),
-                new StudyCatalogItem("LOBID", false),
-                new StudyCatalogItem("MathSciNet", false),
-                new StudyCatalogItem("Medline/PubMed", false),
-                new StudyCatalogItem("ResearchGate", false),
-                new StudyCatalogItem("SAO/NASA ADS", false),
-                new StudyCatalogItem("ScholarArchive", false),
-                new StudyCatalogItem("SemanticScholar", false),
-                new StudyCatalogItem("Springer", true),
-                new StudyCatalogItem("zbMATH", false)
-        ), manageStudyDefinitionViewModel.getCatalogs());
+        ManageStudyDefinitionViewModel manageStudyDefinitionViewModel =
+                new ManageStudyDefinitionViewModel(
+                        importFormatPreferences,
+                        importerPreferences,
+                        workspacePreferences,
+                        dialogService);
+        assertEquals(
+                List.of(
+                        new StudyCatalogItem("ACM Portal", true),
+                        new StudyCatalogItem("ArXiv", false),
+                        new StudyCatalogItem("Bibliotheksverbund Bayern (Experimental)", false),
+                        new StudyCatalogItem("Biodiversity Heritage", false),
+                        new StudyCatalogItem("CiteSeerX", false),
+                        new StudyCatalogItem("Crossref", false),
+                        new StudyCatalogItem("DBLP", true),
+                        new StudyCatalogItem("DOAB", false),
+                        new StudyCatalogItem("DOAJ", false),
+                        new StudyCatalogItem("GVK", false),
+                        new StudyCatalogItem("IEEEXplore", true),
+                        new StudyCatalogItem("INSPIRE", false),
+                        new StudyCatalogItem("ISIDORE", false),
+                        new StudyCatalogItem("LOBID", false),
+                        new StudyCatalogItem("MathSciNet", false),
+                        new StudyCatalogItem("Medline/PubMed", false),
+                        new StudyCatalogItem("ResearchGate", false),
+                        new StudyCatalogItem("SAO/NASA ADS", false),
+                        new StudyCatalogItem("ScholarArchive", false),
+                        new StudyCatalogItem("SemanticScholar", false),
+                        new StudyCatalogItem("Springer", true),
+                        new StudyCatalogItem("zbMATH", false)),
+                manageStudyDefinitionViewModel.getCatalogs());
     }
 
     @Test
     void studyConstructorFillsDatabasesCorrectly(@TempDir Path tempDir) {
-        ManageStudyDefinitionViewModel manageStudyDefinitionViewModel = getManageStudyDefinitionViewModel(tempDir);
-        assertEquals(List.of(
-                new StudyCatalogItem("ACM Portal", true),
-                new StudyCatalogItem("ArXiv", false),
-                new StudyCatalogItem("Bibliotheksverbund Bayern (Experimental)", false),
-                new StudyCatalogItem("Biodiversity Heritage", false),
-                new StudyCatalogItem("CiteSeerX", false),
-                new StudyCatalogItem("Crossref", false),
-                new StudyCatalogItem("DBLP", false),
-                new StudyCatalogItem("DOAB", false),
-                new StudyCatalogItem("DOAJ", false),
-                new StudyCatalogItem("GVK", false),
-                new StudyCatalogItem("IEEEXplore", false),
-                new StudyCatalogItem("INSPIRE", false),
-                new StudyCatalogItem("ISIDORE", false),
-                new StudyCatalogItem("LOBID", false),
-                new StudyCatalogItem("MathSciNet", false),
-                new StudyCatalogItem("Medline/PubMed", false),
-                new StudyCatalogItem("ResearchGate", false),
-                new StudyCatalogItem("SAO/NASA ADS", false),
-                new StudyCatalogItem("ScholarArchive", false),
-                new StudyCatalogItem("SemanticScholar", false),
-                new StudyCatalogItem("Springer", false),
-                new StudyCatalogItem("zbMATH", false)
-        ), manageStudyDefinitionViewModel.getCatalogs());
+        ManageStudyDefinitionViewModel manageStudyDefinitionViewModel =
+                getManageStudyDefinitionViewModel(tempDir);
+        assertEquals(
+                List.of(
+                        new StudyCatalogItem("ACM Portal", true),
+                        new StudyCatalogItem("ArXiv", false),
+                        new StudyCatalogItem("Bibliotheksverbund Bayern (Experimental)", false),
+                        new StudyCatalogItem("Biodiversity Heritage", false),
+                        new StudyCatalogItem("CiteSeerX", false),
+                        new StudyCatalogItem("Crossref", false),
+                        new StudyCatalogItem("DBLP", false),
+                        new StudyCatalogItem("DOAB", false),
+                        new StudyCatalogItem("DOAJ", false),
+                        new StudyCatalogItem("GVK", false),
+                        new StudyCatalogItem("IEEEXplore", false),
+                        new StudyCatalogItem("INSPIRE", false),
+                        new StudyCatalogItem("ISIDORE", false),
+                        new StudyCatalogItem("LOBID", false),
+                        new StudyCatalogItem("MathSciNet", false),
+                        new StudyCatalogItem("Medline/PubMed", false),
+                        new StudyCatalogItem("ResearchGate", false),
+                        new StudyCatalogItem("SAO/NASA ADS", false),
+                        new StudyCatalogItem("ScholarArchive", false),
+                        new StudyCatalogItem("SemanticScholar", false),
+                        new StudyCatalogItem("Springer", false),
+                        new StudyCatalogItem("zbMATH", false)),
+                manageStudyDefinitionViewModel.getCatalogs());
     }
 
     private ManageStudyDefinitionViewModel getManageStudyDefinitionViewModel(Path tempDir) {
-        List<StudyDatabase> databases = List.of(
-                new StudyDatabase("ACM Portal", true));
-        Study study = new Study(
-                List.of("Name"),
-                "title",
-                List.of("Q1"),
-                List.of(),
-                databases
-        );
+        List<StudyDatabase> databases = List.of(new StudyDatabase("ACM Portal", true));
+        Study study = new Study(List.of("Name"), "title", List.of("Q1"), List.of(), databases);
         return new ManageStudyDefinitionViewModel(
                 study,
                 tempDir,
diff --git a/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java b/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
index 1395ac401cd2..ead2af4e9c0b 100644
--- a/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
+++ b/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
@@ -1,11 +1,10 @@
 package org.jabref.gui.theme;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
@@ -17,7 +16,6 @@
 import org.jabref.gui.util.DefaultFileUpdateMonitor;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.support.DisabledOnCIServer;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -26,17 +24,20 @@
 import org.mockito.Answers;
 import org.testfx.framework.junit5.ApplicationExtension;
 
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 
 @ExtendWith(ApplicationExtension.class)
 class ThemeManagerTest {
 
-    private static final String TEST_CSS_DATA = "data:text/css;charset=utf-8;base64,LyogQmlibGF0ZXggU291cmNlIENvZGUgKi8KLmNvZGUtYXJlYSAudGV4dCB7CiAgICAtZngtZm9udC1mYW1pbHk6IG1vbm9zcGFjZTsKfQ==";
-    private static final String TEST_CSS_CONTENT = """
+    private static final String TEST_CSS_DATA =
+            "data:text/css;charset=utf-8;base64,LyogQmlibGF0ZXggU291cmNlIENvZGUgKi8KLmNvZGUtYXJlYSAudGV4dCB7CiAgICAtZngtZm9udC1mYW1pbHk6IG1vbm9zcGFjZTsKfQ==";
+    private static final String TEST_CSS_CONTENT =
+            """
             /* Biblatex Source Code */
             .code-area .text {
                 -fx-font-family: monospace;
@@ -53,39 +54,51 @@ void setUp(@TempDir Path tempFolder) {
     void themeManagerUsesProvidedTheme() throws IOException {
         Path testCss = tempFolder.resolve("test.css");
         Files.writeString(testCss, TEST_CSS_CONTENT, StandardOpenOption.CREATE);
-        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        WorkspacePreferences workspacePreferences =
+                mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
-        ThemeManager themeManager = new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
+        ThemeManager themeManager =
+                new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
 
         assertEquals(Theme.Type.CUSTOM, themeManager.getActiveTheme().getType());
         assertEquals(testCss.toString(), themeManager.getActiveTheme().getName());
-        Optional<String> cssLocationBeforeDeletion = themeManager.getActiveTheme()
-                                                                 .getAdditionalStylesheet()
-                                                                 .map(StyleSheet::getWebEngineStylesheet);
-        assertTrue(cssLocationBeforeDeletion.isPresent(), "expected custom theme location to be available");
+        Optional<String> cssLocationBeforeDeletion =
+                themeManager
+                        .getActiveTheme()
+                        .getAdditionalStylesheet()
+                        .map(StyleSheet::getWebEngineStylesheet);
+        assertTrue(
+                cssLocationBeforeDeletion.isPresent(),
+                "expected custom theme location to be available");
         assertEquals(TEST_CSS_DATA, cssLocationBeforeDeletion.get());
     }
 
     @Test
     void customThemeAvailableEvenWhenDeleted() throws IOException {
         /* Create a temporary custom theme that is just a small snippet of CSS. There is no CSS
-         validation (at the moment) but by making a valid CSS block we don't preclude adding validation later */
+        validation (at the moment) but by making a valid CSS block we don't preclude adding validation later */
         Path testCss = tempFolder.resolve("test.css");
         Files.writeString(testCss, TEST_CSS_CONTENT, StandardOpenOption.CREATE);
-        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        WorkspacePreferences workspacePreferences =
+                mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
         // ActiveTheme should provide the additionalStylesheet that was created before
-        ThemeManager themeManagerCreatedBeforeFileDeleted = new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
+        ThemeManager themeManagerCreatedBeforeFileDeleted =
+                new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
 
         Files.delete(testCss);
 
         // ActiveTheme should keep the additionalStylesheet in memory and provide it
-        Optional<String> cssLocationAfterDeletion = themeManagerCreatedBeforeFileDeleted.getActiveTheme()
-                                                                                        .getAdditionalStylesheet()
-                                                                                        .map(StyleSheet::getWebEngineStylesheet);
-        assertTrue(cssLocationAfterDeletion.isPresent(), "expected custom theme location to be available");
+        Optional<String> cssLocationAfterDeletion =
+                themeManagerCreatedBeforeFileDeleted
+                        .getActiveTheme()
+                        .getAdditionalStylesheet()
+                        .map(StyleSheet::getWebEngineStylesheet);
+        assertTrue(
+                cssLocationAfterDeletion.isPresent(),
+                "expected custom theme location to be available");
         assertEquals(TEST_CSS_DATA, cssLocationAfterDeletion.get());
     }
 
@@ -105,18 +118,24 @@ void customThemeBecomesAvailableAfterFileIsCreated() throws IOException {
         when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
         // ActiveTheme should provide no additionalStylesheet when no file exists
-        ThemeManager themeManagerCreatedBeforeFileExists = new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
-        assertEquals(Optional.empty(), themeManagerCreatedBeforeFileExists.getActiveTheme()
-                                                                          .getAdditionalStylesheet(),
+        ThemeManager themeManagerCreatedBeforeFileExists =
+                new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
+        assertEquals(
+                Optional.empty(),
+                themeManagerCreatedBeforeFileExists.getActiveTheme().getAdditionalStylesheet(),
                 "didn't expect additional stylesheet to be available because it didn't exist when theme was created");
 
         Files.writeString(testCss, TEST_CSS_CONTENT, StandardOpenOption.CREATE);
 
         // ActiveTheme should provide an additionalStylesheet after the file was created
-        Optional<String> cssLocationAfterFileCreated = themeManagerCreatedBeforeFileExists.getActiveTheme()
-                                                                                          .getAdditionalStylesheet()
-                                                                                          .map(StyleSheet::getWebEngineStylesheet);
-        assertTrue(cssLocationAfterFileCreated.isPresent(), "expected custom theme location to be available");
+        Optional<String> cssLocationAfterFileCreated =
+                themeManagerCreatedBeforeFileExists
+                        .getActiveTheme()
+                        .getAdditionalStylesheet()
+                        .map(StyleSheet::getWebEngineStylesheet);
+        assertTrue(
+                cssLocationAfterFileCreated.isPresent(),
+                "expected custom theme location to be available");
         assertEquals(TEST_CSS_DATA, cssLocationAfterFileCreated.get());
     }
 
@@ -132,29 +151,52 @@ void largeCustomThemeNotHeldInMemory() throws IOException {
             Files.writeString(largeCssTestFile, testString, StandardOpenOption.APPEND);
         }
         Files.writeString(largeCssTestFile, " */", StandardOpenOption.APPEND);
-        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        WorkspacePreferences workspacePreferences =
+                mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(workspacePreferences.getTheme()).thenReturn(new Theme(largeCssTestFile.toString()));
 
         // ActiveTheme should provide the large additionalStylesheet that was created before
-        ThemeManager themeManager = new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
-        Optional<String> cssLocationBeforeRemoved = themeManager.getActiveTheme()
-                                                                .getAdditionalStylesheet()
-                                                                .map(StyleSheet::getWebEngineStylesheet);
-        assertTrue(cssLocationBeforeRemoved.isPresent(), "expected custom theme location to be available");
-        assertTrue(cssLocationBeforeRemoved.get().startsWith("file:"), "expected large custom theme to be a file");
+        ThemeManager themeManager =
+                new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
+        Optional<String> cssLocationBeforeRemoved =
+                themeManager
+                        .getActiveTheme()
+                        .getAdditionalStylesheet()
+                        .map(StyleSheet::getWebEngineStylesheet);
+        assertTrue(
+                cssLocationBeforeRemoved.isPresent(),
+                "expected custom theme location to be available");
+        assertTrue(
+                cssLocationBeforeRemoved.get().startsWith("file:"),
+                "expected large custom theme to be a file");
 
         Files.move(largeCssTestFile, largeCssTestFile.resolveSibling("renamed.css"));
 
-        // getAdditionalStylesheet() should no longer offer the deleted stylesheet as it is not been held in memory
-        assertEquals("", themeManager.getActiveTheme().getAdditionalStylesheet().get().getWebEngineStylesheet(),
+        // getAdditionalStylesheet() should no longer offer the deleted stylesheet as it is not been
+        // held in memory
+        assertEquals(
+                "",
+                themeManager
+                        .getActiveTheme()
+                        .getAdditionalStylesheet()
+                        .get()
+                        .getWebEngineStylesheet(),
                 "didn't expect additional stylesheet after css was deleted");
 
         Files.move(largeCssTestFile.resolveSibling("renamed.css"), largeCssTestFile);
 
         // Check that it is available once more, if the file is restored
-        Optional<String> cssLocationAfterFileIsRestored = themeManager.getActiveTheme().getAdditionalStylesheet().map(StyleSheet::getWebEngineStylesheet);
-        assertTrue(cssLocationAfterFileIsRestored.isPresent(), "expected custom theme location to be available");
-        assertTrue(cssLocationAfterFileIsRestored.get().startsWith("file:"), "expected large custom theme to be a file");
+        Optional<String> cssLocationAfterFileIsRestored =
+                themeManager
+                        .getActiveTheme()
+                        .getAdditionalStylesheet()
+                        .map(StyleSheet::getWebEngineStylesheet);
+        assertTrue(
+                cssLocationAfterFileIsRestored.isPresent(),
+                "expected custom theme location to be available");
+        assertTrue(
+                cssLocationAfterFileIsRestored.get().startsWith("file:"),
+                "expected large custom theme to be a file");
     }
 
     @Test
@@ -166,10 +208,12 @@ void installThemeOnScene() throws IOException {
 
         Path testCss = tempFolder.resolve("reload.css");
         Files.writeString(testCss, TEST_CSS_CONTENT, StandardOpenOption.CREATE);
-        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        WorkspacePreferences workspacePreferences =
+                mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
-        ThemeManager themeManager = new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
+        ThemeManager themeManager =
+                new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
 
         themeManager.installCss(scene);
 
@@ -181,23 +225,27 @@ void installThemeOnScene() throws IOException {
     void installThemeOnWebEngine() throws IOException {
         Path testCss = tempFolder.resolve("reload.css");
         Files.writeString(testCss, TEST_CSS_CONTENT, StandardOpenOption.CREATE);
-        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        WorkspacePreferences workspacePreferences =
+                mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
-        ThemeManager themeManager = new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
+        ThemeManager themeManager =
+                new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
 
         CompletableFuture<String> webEngineStyleSheetLocation = new CompletableFuture<>();
 
-        Platform.runLater(() -> {
-            WebEngine webEngine = new WebEngine();
-            themeManager.installCss(webEngine);
+        Platform.runLater(
+                () -> {
+                    WebEngine webEngine = new WebEngine();
+                    themeManager.installCss(webEngine);
 
-            webEngineStyleSheetLocation.complete(webEngine.getUserStyleSheetLocation());
-        });
+                    webEngineStyleSheetLocation.complete(webEngine.getUserStyleSheetLocation());
+                });
 
-        assertDoesNotThrow(() -> {
-            assertEquals(TEST_CSS_DATA, webEngineStyleSheetLocation.get());
-        });
+        assertDoesNotThrow(
+                () -> {
+                    assertEquals(TEST_CSS_DATA, webEngineStyleSheetLocation.get());
+                });
     }
 
     /**
@@ -208,7 +256,8 @@ void installThemeOnWebEngine() throws IOException {
     void liveReloadCssDataUrl() throws IOException, InterruptedException {
         Path testCss = tempFolder.resolve("reload.css");
         Files.writeString(testCss, TEST_CSS_CONTENT, StandardOpenOption.CREATE);
-        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        WorkspacePreferences workspacePreferences =
+                mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
         final ThemeManager themeManager;
@@ -228,11 +277,14 @@ void liveReloadCssDataUrl() throws IOException, InterruptedException {
 
         themeManager.installCss(scene);
 
-        Files.writeString(testCss, """
+        Files.writeString(
+                testCss,
+                """
                 /* And now for something slightly different */
                 .code-area .text {
                     -fx-font-family: serif;
-                }""", StandardOpenOption.CREATE);
+                }""",
+                StandardOpenOption.CREATE);
 
         // Wait for the stylesheet to be reloaded
         Thread.sleep(500);
@@ -240,7 +292,11 @@ void liveReloadCssDataUrl() throws IOException, InterruptedException {
         fileUpdateMonitor.shutdown();
         thread.join();
 
-        Optional<String> testCssLocation2 = themeManager.getActiveTheme().getAdditionalStylesheet().map(StyleSheet::getWebEngineStylesheet);
+        Optional<String> testCssLocation2 =
+                themeManager
+                        .getActiveTheme()
+                        .getAdditionalStylesheet()
+                        .map(StyleSheet::getWebEngineStylesheet);
         assertTrue(testCssLocation2.isPresent(), "expected custom theme location to be available");
         assertEquals(
                 "data:text/css;charset=utf-8;base64,LyogQW5kIG5vdyBmb3Igc29tZXRoaW5nIHNsaWdodGx5IGRpZmZlcmVudCAqLwouY29kZS1hcmVhIC50ZXh0IHsKICAgIC1meC1mb250LWZhbWlseTogc2VyaWY7Cn0=",
diff --git a/src/test/java/org/jabref/gui/theme/ThemeTest.java b/src/test/java/org/jabref/gui/theme/ThemeTest.java
index c9a6489bd726..f5ebfe7179a1 100644
--- a/src/test/java/org/jabref/gui/theme/ThemeTest.java
+++ b/src/test/java/org/jabref/gui/theme/ThemeTest.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.theme;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Optional;
 
 class ThemeTest {
     @Test
@@ -13,7 +13,9 @@ void lightThemeUsedWhenPathIsBlank() {
         Theme theme = new Theme("");
 
         assertEquals(Theme.Type.DEFAULT, theme.getType());
-        assertEquals(Optional.empty(), theme.getAdditionalStylesheet(),
+        assertEquals(
+                Optional.empty(),
+                theme.getAdditionalStylesheet(),
                 "didn't expect additional stylesheet to be available");
     }
 
@@ -22,7 +24,9 @@ void lightThemeUsedWhenPathIsBaseCss() {
         Theme theme = new Theme("Base.css");
 
         assertEquals(Theme.Type.DEFAULT, theme.getType());
-        assertEquals(Optional.empty(), theme.getAdditionalStylesheet(),
+        assertEquals(
+                Optional.empty(),
+                theme.getAdditionalStylesheet(),
                 "didn't expect additional stylesheet to be available");
     }
 
@@ -32,7 +36,9 @@ void darkThemeUsedWhenPathIsDarkCss() {
 
         assertEquals(Theme.Type.EMBEDDED, theme.getType());
         assertTrue(theme.getAdditionalStylesheet().isPresent());
-        assertEquals("Dark.css", theme.getAdditionalStylesheet().get().getWatchPath().getFileName().toString(),
+        assertEquals(
+                "Dark.css",
+                theme.getAdditionalStylesheet().get().getWatchPath().getFileName().toString(),
                 "expected dark theme stylesheet to be available");
     }
 
@@ -41,7 +47,9 @@ void customThemeIgnoredIfDirectory() {
         Theme theme = new Theme(".");
 
         assertEquals(Theme.Type.DEFAULT, theme.getType());
-        assertEquals(Optional.empty(), theme.getAdditionalStylesheet(),
+        assertEquals(
+                Optional.empty(),
+                theme.getAdditionalStylesheet(),
                 "didn't expect additional stylesheet to be available when location is a directory");
     }
 
@@ -50,7 +58,9 @@ void customThemeIgnoredIfInvalidPath() {
         Theme theme = new Theme("\0\0\0");
 
         assertEquals(Theme.Type.DEFAULT, theme.getType());
-        assertEquals(Optional.empty(), theme.getAdditionalStylesheet(),
+        assertEquals(
+                Optional.empty(),
+                theme.getAdditionalStylesheet(),
                 "didn't expect additional stylesheet when CSS location is just some null terminators!");
     }
 
@@ -60,6 +70,8 @@ void customThemeIfFileNotFound() {
 
         assertEquals(Theme.Type.CUSTOM, theme.getType());
         assertTrue(theme.getAdditionalStylesheet().isPresent());
-        assertEquals("Idonotexist.css", theme.getAdditionalStylesheet().get().getWatchPath().getFileName().toString());
+        assertEquals(
+                "Idonotexist.css",
+                theme.getAdditionalStylesheet().get().getWatchPath().getFileName().toString());
     }
 }
diff --git a/src/test/java/org/jabref/gui/util/ColorUtilTest.java b/src/test/java/org/jabref/gui/util/ColorUtilTest.java
index 4b7b18c0e964..8a5ad36ad44e 100644
--- a/src/test/java/org/jabref/gui/util/ColorUtilTest.java
+++ b/src/test/java/org/jabref/gui/util/ColorUtilTest.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.util;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import javafx.scene.paint.Color;
 
@@ -9,7 +9,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class ColorUtilTest {
 
@@ -39,8 +39,7 @@ private static Stream<Arguments> provideToRGBACodeTest() {
                 Arguments.of(C2, "rgba(255,255,255,%f)".formatted(1.0)),
                 Arguments.of(C3, "rgba(0,0,0,%f)".formatted(0.0)),
                 Arguments.of(C4, "rgba(255,255,255,%f)".formatted(1.0)),
-                Arguments.of(C5, "rgba(153,204,127,%f)".formatted(0.3))
-        );
+                Arguments.of(C5, "rgba(153,204,127,%f)".formatted(0.3)));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/util/ControlHelperTest.java b/src/test/java/org/jabref/gui/util/ControlHelperTest.java
index 291893af7d11..661681b8e26c 100644
--- a/src/test/java/org/jabref/gui/util/ControlHelperTest.java
+++ b/src/test/java/org/jabref/gui/util/ControlHelperTest.java
@@ -1,59 +1,78 @@
 package org.jabref.gui.util;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.NullAndEmptySource;
 import org.junit.jupiter.params.provider.NullSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 class ControlHelperTest {
 
     private final String TEXT = "abcdef";
     private final int MAX_CHARACTERS = 5;
     private final int DEFAULT_MAX_CHARACTERS = -1;
     private final String ELLIPSIS_STRING = "***";
-    private final ControlHelper.EllipsisPosition ELLIPSIS_POSITION = ControlHelper.EllipsisPosition.ENDING;
+    private final ControlHelper.EllipsisPosition ELLIPSIS_POSITION =
+            ControlHelper.EllipsisPosition.ENDING;
 
     @ParameterizedTest
     @NullAndEmptySource
     void truncateWithTextNullAndEmptyReturnsSource(String text) {
-        String truncatedText = ControlHelper.truncateString(text, MAX_CHARACTERS, ELLIPSIS_STRING, ELLIPSIS_POSITION);
+        String truncatedText =
+                ControlHelper.truncateString(
+                        text, MAX_CHARACTERS, ELLIPSIS_STRING, ELLIPSIS_POSITION);
         assertEquals(text, truncatedText);
     }
 
     @Test
     void truncateWithDefaultMaxCharactersReturnsText() {
-        String truncatedText = ControlHelper.truncateString(TEXT, DEFAULT_MAX_CHARACTERS, ELLIPSIS_STRING, ELLIPSIS_POSITION);
+        String truncatedText =
+                ControlHelper.truncateString(
+                        TEXT, DEFAULT_MAX_CHARACTERS, ELLIPSIS_STRING, ELLIPSIS_POSITION);
         assertEquals(TEXT, truncatedText);
     }
 
     @Test
     void truncateWithEllipsisPositionBeginningReturnsTruncatedText() {
-        String truncatedText = ControlHelper.truncateString(TEXT, MAX_CHARACTERS, ELLIPSIS_STRING, ControlHelper.EllipsisPosition.BEGINNING);
+        String truncatedText =
+                ControlHelper.truncateString(
+                        TEXT,
+                        MAX_CHARACTERS,
+                        ELLIPSIS_STRING,
+                        ControlHelper.EllipsisPosition.BEGINNING);
         assertEquals("***ef", truncatedText);
     }
 
     @Test
     void truncateWithEllipsisPositionCenterReturnsTruncatedText() {
-        String truncatedText = ControlHelper.truncateString(TEXT, MAX_CHARACTERS, ELLIPSIS_STRING, ControlHelper.EllipsisPosition.CENTER);
+        String truncatedText =
+                ControlHelper.truncateString(
+                        TEXT,
+                        MAX_CHARACTERS,
+                        ELLIPSIS_STRING,
+                        ControlHelper.EllipsisPosition.CENTER);
         assertEquals("a***f", truncatedText);
     }
 
     @Test
     void truncateWithDefaultMaxCharactersAndNullEllipsisAndPositionEndingReturnsTruncatedText() {
         String text = "a".repeat(75) + "b".repeat(25);
-        String truncatedText = ControlHelper.truncateString(text, DEFAULT_MAX_CHARACTERS, null, ControlHelper.EllipsisPosition.ENDING);
+        String truncatedText =
+                ControlHelper.truncateString(
+                        text, DEFAULT_MAX_CHARACTERS, null, ControlHelper.EllipsisPosition.ENDING);
         assertEquals("a".repeat(75), truncatedText);
     }
 
     @ParameterizedTest
     @NullSource
-    void truncateWithNullEllipsisPositionThrowsNullPointerException(ControlHelper.EllipsisPosition ellipsisPosition) {
+    void truncateWithNullEllipsisPositionThrowsNullPointerException(
+            ControlHelper.EllipsisPosition ellipsisPosition) {
         assertThrows(
-            NullPointerException.class,
-            () -> ControlHelper.truncateString(TEXT, MAX_CHARACTERS, ELLIPSIS_STRING, ellipsisPosition)
-        );
+                NullPointerException.class,
+                () ->
+                        ControlHelper.truncateString(
+                                TEXT, MAX_CHARACTERS, ELLIPSIS_STRING, ellipsisPosition));
     }
 }
diff --git a/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java b/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java
index 5e89f07bc93d..e30dec02cdec 100644
--- a/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java
+++ b/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java
@@ -1,19 +1,18 @@
 package org.jabref.gui.util;
 
-import java.nio.file.Path;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import javafx.stage.FileChooser;
 
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.FileType;
 import org.jabref.logic.util.StandardFileType;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 class FileDialogConfigurationTest {
 
@@ -21,32 +20,33 @@ class FileDialogConfigurationTest {
     void withValidDirectoryString(@TempDir Path folder) {
         String tempFolder = folder.toAbsolutePath().toString();
 
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(tempFolder).build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder().withInitialDirectory(tempFolder).build();
 
-        assertEquals(Optional.of(Path.of(tempFolder)), fileDialogConfiguration.getInitialDirectory());
+        assertEquals(
+                Optional.of(Path.of(tempFolder)), fileDialogConfiguration.getInitialDirectory());
     }
 
     @Test
     void withValidDirectoryPath(@TempDir Path tempFolder) {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(tempFolder).build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder().withInitialDirectory(tempFolder).build();
 
         assertEquals(Optional.of(tempFolder), fileDialogConfiguration.getInitialDirectory());
     }
 
     @Test
     void withNullStringDirectory() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory((String) null).build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder().withInitialDirectory((String) null).build();
 
         assertEquals(Optional.empty(), fileDialogConfiguration.getInitialDirectory());
     }
 
     @Test
     void withNullPathDirectory() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory((Path) null).build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder().withInitialDirectory((Path) null).build();
 
         assertEquals(Optional.empty(), fileDialogConfiguration.getInitialDirectory());
     }
@@ -54,24 +54,34 @@ void withNullPathDirectory() {
     @Test
     void withNonExistingDirectoryAndParentNull() {
         String tempFolder = "workingDirectory";
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(tempFolder).build();
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder().withInitialDirectory(tempFolder).build();
 
         assertEquals(Optional.empty(), fileDialogConfiguration.getInitialDirectory());
     }
 
     @Test
     void singleExtension() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withDefaultExtension(StandardFileType.BIBTEX_DB).build();
-
-        FileChooser.ExtensionFilter filter = toFilter("%1s %2s".formatted("BibTex", Localization.lang("Library")), StandardFileType.BIBTEX_DB);
-
-        assertEquals(filter.getExtensions(), fileDialogConfiguration.getDefaultExtension().getExtensions());
+        FileDialogConfiguration fileDialogConfiguration =
+                new FileDialogConfiguration.Builder()
+                        .withDefaultExtension(StandardFileType.BIBTEX_DB)
+                        .build();
+
+        FileChooser.ExtensionFilter filter =
+                toFilter(
+                        "%1s %2s".formatted("BibTex", Localization.lang("Library")),
+                        StandardFileType.BIBTEX_DB);
+
+        assertEquals(
+                filter.getExtensions(),
+                fileDialogConfiguration.getDefaultExtension().getExtensions());
     }
 
     private FileChooser.ExtensionFilter toFilter(String description, FileType extension) {
-        return new FileChooser.ExtensionFilter(description,
-                extension.getExtensions().stream().map(ending -> "*." + ending).collect(Collectors.toList()));
+        return new FileChooser.ExtensionFilter(
+                description,
+                extension.getExtensions().stream()
+                        .map(ending -> "*." + ending)
+                        .collect(Collectors.toList()));
     }
 }
diff --git a/src/test/java/org/jabref/gui/util/OpenConsoleActionTest.java b/src/test/java/org/jabref/gui/util/OpenConsoleActionTest.java
index 55889e14816e..bf35ab5260fa 100644
--- a/src/test/java/org/jabref/gui/util/OpenConsoleActionTest.java
+++ b/src/test/java/org/jabref/gui/util/OpenConsoleActionTest.java
@@ -1,20 +1,19 @@
 package org.jabref.gui.util;
 
-import java.util.Optional;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import org.jabref.gui.StateManager;
 import org.jabref.gui.frame.OpenConsoleAction;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.model.database.BibDatabaseContext;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import java.util.Optional;
 
 class OpenConsoleActionTest {
 
@@ -39,7 +38,8 @@ void newActionGetsCurrentDatabase() {
 
     @Test
     void newActionGetsSuppliedDatabase() {
-        OpenConsoleAction action = new OpenConsoleAction(() -> other, stateManager, preferences, null);
+        OpenConsoleAction action =
+                new OpenConsoleAction(() -> other, stateManager, preferences, null);
         action.execute();
         verify(stateManager, never()).getActiveDatabase();
         verify(other, times(1)).getDatabasePath();
@@ -47,7 +47,8 @@ void newActionGetsSuppliedDatabase() {
 
     @Test
     void actionDefaultsToCurrentDatabase() {
-        OpenConsoleAction action = new OpenConsoleAction(() -> null, stateManager, preferences, null);
+        OpenConsoleAction action =
+                new OpenConsoleAction(() -> null, stateManager, preferences, null);
         action.execute();
         verify(stateManager, times(1)).getActiveDatabase();
         verify(current, times(1)).getDatabasePath();
diff --git a/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java b/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java
index 5cc4e46daace..62cc3bf9af9f 100644
--- a/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java
+++ b/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.util;
 
-import java.util.Collections;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -10,11 +8,12 @@
 
 import org.jabref.model.TreeNode;
 import org.jabref.model.TreeNodeTestData;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 class RecursiveTreeItemTest {
 
@@ -36,23 +35,35 @@ void setUp() throws Exception {
 
     @Test
     void addsAllChildrenNodes() throws Exception {
-        assertEquals(root.getChildren(), rootTreeItem.getChildren().stream().map(TreeItem::getValue).collect(Collectors.toList()));
+        assertEquals(
+                root.getChildren(),
+                rootTreeItem.getChildren().stream()
+                        .map(TreeItem::getValue)
+                        .collect(Collectors.toList()));
     }
 
     @Test
     void addsAllChildrenOfChildNode() throws Exception {
         assertEquals(
                 root.getChildAt(1).get().getChildren(),
-                rootTreeItem.getChildren().get(1).getChildren().stream().map(TreeItem::getValue).collect(Collectors.toList()));
+                rootTreeItem.getChildren().get(1).getChildren().stream()
+                        .map(TreeItem::getValue)
+                        .collect(Collectors.toList()));
     }
 
     @Test
     void respectsFilter() throws Exception {
         filterPredicate.setValue(item -> item.getName().contains("test"));
 
-        assertEquals(Collections.singletonList(node.getParent().get()), rootTreeItem.getChildren().stream().map(TreeItem::getValue).collect(Collectors.toList()));
+        assertEquals(
+                Collections.singletonList(node.getParent().get()),
+                rootTreeItem.getChildren().stream()
+                        .map(TreeItem::getValue)
+                        .collect(Collectors.toList()));
         assertEquals(
                 Collections.singletonList(node),
-                rootTreeItem.getChildren().getFirst().getChildren().stream().map(TreeItem::getValue).collect(Collectors.toList()));
+                rootTreeItem.getChildren().getFirst().getChildren().stream()
+                        .map(TreeItem::getValue)
+                        .collect(Collectors.toList()));
     }
 }
diff --git a/src/test/java/org/jabref/gui/util/TooltipTextUtilTest.java b/src/test/java/org/jabref/gui/util/TooltipTextUtilTest.java
index da5b07630014..437e683b9691 100644
--- a/src/test/java/org/jabref/gui/util/TooltipTextUtilTest.java
+++ b/src/test/java/org/jabref/gui/util/TooltipTextUtilTest.java
@@ -1,16 +1,15 @@
 package org.jabref.gui.util;
 
-import java.util.ArrayList;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import javafx.scene.text.Text;
 
 import org.jabref.gui.search.TextFlowEqualityHelper;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.ArrayList;
+import java.util.List;
 
 class TooltipTextUtilTest {
 
@@ -133,44 +132,74 @@ void transformTextToHtmlStringWithLinebreaks() {
     @Test
     void formatToTextsNoReplacements() {
         List<Text> expectedTextList = new ArrayList<>();
-        expectedTextList.add(TooltipTextUtil.createText("This search contains entries in which any field contains the regular expression "));
-        String test = "This search contains entries in which any field contains the regular expression ";
+        expectedTextList.add(
+                TooltipTextUtil.createText(
+                        "This search contains entries in which any field contains the regular expression "));
+        String test =
+                "This search contains entries in which any field contains the regular expression ";
         List<Text> textList = TooltipTextUtil.formatToTexts(test);
 
-        assertTrue(TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(expectedTextList, textList));
+        assertTrue(
+                TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(expectedTextList, textList));
     }
 
     @Test
     void formatToTextsEnd() {
         List<Text> expectedTextList = new ArrayList<>();
-        expectedTextList.add(TooltipTextUtil.createText("This search contains entries in which any field contains the regular expression "));
-        expectedTextList.add(TooltipTextUtil.createText("replacing text", TooltipTextUtil.TextType.BOLD));
-        String test = "This search contains entries in which any field contains the regular expression <b>%0</b>";
-        List<Text> textList = TooltipTextUtil.formatToTexts(test, new TooltipTextUtil.TextReplacement("<b>%0</b>", "replacing text", TooltipTextUtil.TextType.BOLD));
+        expectedTextList.add(
+                TooltipTextUtil.createText(
+                        "This search contains entries in which any field contains the regular expression "));
+        expectedTextList.add(
+                TooltipTextUtil.createText("replacing text", TooltipTextUtil.TextType.BOLD));
+        String test =
+                "This search contains entries in which any field contains the regular expression <b>%0</b>";
+        List<Text> textList =
+                TooltipTextUtil.formatToTexts(
+                        test,
+                        new TooltipTextUtil.TextReplacement(
+                                "<b>%0</b>", "replacing text", TooltipTextUtil.TextType.BOLD));
 
-        assertTrue(TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(expectedTextList, textList));
+        assertTrue(
+                TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(expectedTextList, textList));
     }
 
     @Test
     void formatToTextsBegin() {
         List<Text> expectedTextList = new ArrayList<>();
-        expectedTextList.add(TooltipTextUtil.createText("replacing text", TooltipTextUtil.TextType.BOLD));
-        expectedTextList.add(TooltipTextUtil.createText(" This search contains entries in which any field contains the regular expression"));
-        String test = "<b>%0</b> This search contains entries in which any field contains the regular expression";
-        List<Text> textList = TooltipTextUtil.formatToTexts(test, new TooltipTextUtil.TextReplacement("<b>%0</b>", "replacing text", TooltipTextUtil.TextType.BOLD));
+        expectedTextList.add(
+                TooltipTextUtil.createText("replacing text", TooltipTextUtil.TextType.BOLD));
+        expectedTextList.add(
+                TooltipTextUtil.createText(
+                        " This search contains entries in which any field contains the regular expression"));
+        String test =
+                "<b>%0</b> This search contains entries in which any field contains the regular expression";
+        List<Text> textList =
+                TooltipTextUtil.formatToTexts(
+                        test,
+                        new TooltipTextUtil.TextReplacement(
+                                "<b>%0</b>", "replacing text", TooltipTextUtil.TextType.BOLD));
 
-        assertTrue(TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(expectedTextList, textList));
+        assertTrue(
+                TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(expectedTextList, textList));
     }
 
     @Test
     void formatToTextsMiddle() {
         List<Text> expectedTextList = new ArrayList<>();
         expectedTextList.add(TooltipTextUtil.createText("This search contains entries "));
-        expectedTextList.add(TooltipTextUtil.createText("replacing text", TooltipTextUtil.TextType.BOLD));
-        expectedTextList.add(TooltipTextUtil.createText(" in which any field contains the regular expression"));
-        String test = "This search contains entries <b>%0</b> in which any field contains the regular expression";
-        List<Text> textList = TooltipTextUtil.formatToTexts(test, new TooltipTextUtil.TextReplacement("<b>%0</b>", "replacing text", TooltipTextUtil.TextType.BOLD));
-
-        assertTrue(TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(expectedTextList, textList));
+        expectedTextList.add(
+                TooltipTextUtil.createText("replacing text", TooltipTextUtil.TextType.BOLD));
+        expectedTextList.add(
+                TooltipTextUtil.createText(" in which any field contains the regular expression"));
+        String test =
+                "This search contains entries <b>%0</b> in which any field contains the regular expression";
+        List<Text> textList =
+                TooltipTextUtil.formatToTexts(
+                        test,
+                        new TooltipTextUtil.TextReplacement(
+                                "<b>%0</b>", "replacing text", TooltipTextUtil.TextType.BOLD));
+
+        assertTrue(
+                TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(expectedTextList, textList));
     }
 }
diff --git a/src/test/java/org/jabref/gui/util/comparator/NumericFieldComparatorTest.java b/src/test/java/org/jabref/gui/util/comparator/NumericFieldComparatorTest.java
index 9fb3048f302a..39a4a66d78e2 100644
--- a/src/test/java/org/jabref/gui/util/comparator/NumericFieldComparatorTest.java
+++ b/src/test/java/org/jabref/gui/util/comparator/NumericFieldComparatorTest.java
@@ -1,9 +1,9 @@
 package org.jabref.gui.util.comparator;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 class NumericFieldComparatorTest {
 
     private final NumericFieldComparator comparator = new NumericFieldComparator();
diff --git a/src/test/java/org/jabref/gui/util/comparator/RankingFieldComparatorTest.java b/src/test/java/org/jabref/gui/util/comparator/RankingFieldComparatorTest.java
index b6fcbc268fac..722fc35b7365 100644
--- a/src/test/java/org/jabref/gui/util/comparator/RankingFieldComparatorTest.java
+++ b/src/test/java/org/jabref/gui/util/comparator/RankingFieldComparatorTest.java
@@ -1,14 +1,13 @@
 package org.jabref.gui.util.comparator;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
 import org.jabref.model.entry.field.SpecialFieldValue;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 class RankingFieldComparatorTest {
 
@@ -16,9 +15,12 @@ class RankingFieldComparatorTest {
     private final SpecialFieldValue value1 = SpecialFieldValue.RANK_1;
     private final SpecialFieldValue value2 = SpecialFieldValue.RANK_2;
     private final SpecialFieldValue value3 = SpecialFieldValue.RANK_3;
-    private final Optional<SpecialFieldValueViewModel> rank1 = Optional.of(new SpecialFieldValueViewModel(value1));
-    private final Optional<SpecialFieldValueViewModel> rank2 = Optional.of(new SpecialFieldValueViewModel(value2));
-    private final Optional<SpecialFieldValueViewModel> rank3 = Optional.of(new SpecialFieldValueViewModel(value3));
+    private final Optional<SpecialFieldValueViewModel> rank1 =
+            Optional.of(new SpecialFieldValueViewModel(value1));
+    private final Optional<SpecialFieldValueViewModel> rank2 =
+            Optional.of(new SpecialFieldValueViewModel(value2));
+    private final Optional<SpecialFieldValueViewModel> rank3 =
+            Optional.of(new SpecialFieldValueViewModel(value3));
 
     @BeforeEach
     void setUp() {
diff --git a/src/test/java/org/jabref/gui/util/comparator/SpecialFieldComparatorTest.java b/src/test/java/org/jabref/gui/util/comparator/SpecialFieldComparatorTest.java
index 1a7e23497ce4..b77d021c769f 100644
--- a/src/test/java/org/jabref/gui/util/comparator/SpecialFieldComparatorTest.java
+++ b/src/test/java/org/jabref/gui/util/comparator/SpecialFieldComparatorTest.java
@@ -1,14 +1,13 @@
 package org.jabref.gui.util.comparator;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
 import org.jabref.model.entry.field.SpecialFieldValue;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 class SpecialFieldComparatorTest {
 
@@ -16,9 +15,12 @@ class SpecialFieldComparatorTest {
     private final SpecialFieldValue value1 = SpecialFieldValue.PRIORITY_HIGH;
     private final SpecialFieldValue value2 = SpecialFieldValue.PRIORITY_LOW;
     private final SpecialFieldValue value3 = SpecialFieldValue.READ;
-    private final Optional<SpecialFieldValueViewModel> prio1 = Optional.of(new SpecialFieldValueViewModel(value1));
-    private final Optional<SpecialFieldValueViewModel> prio3 = Optional.of(new SpecialFieldValueViewModel(value2));
-    private final Optional<SpecialFieldValueViewModel> read = Optional.of(new SpecialFieldValueViewModel(value3));
+    private final Optional<SpecialFieldValueViewModel> prio1 =
+            Optional.of(new SpecialFieldValueViewModel(value1));
+    private final Optional<SpecialFieldValueViewModel> prio3 =
+            Optional.of(new SpecialFieldValueViewModel(value2));
+    private final Optional<SpecialFieldValueViewModel> read =
+            Optional.of(new SpecialFieldValueViewModel(value3));
 
     @BeforeEach
     void setUp() {
diff --git a/src/test/java/org/jabref/http/server/LibrariesResourceTest.java b/src/test/java/org/jabref/http/server/LibrariesResourceTest.java
index 1ec937d6dafd..b690cea9304a 100644
--- a/src/test/java/org/jabref/http/server/LibrariesResourceTest.java
+++ b/src/test/java/org/jabref/http/server/LibrariesResourceTest.java
@@ -1,13 +1,14 @@
 package org.jabref.http.server;
 
-import java.util.EnumSet;
-import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import jakarta.ws.rs.core.Application;
+
 import org.glassfish.jersey.server.ResourceConfig;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.EnumSet;
+import java.util.stream.Collectors;
 
 class LibrariesResourceTest extends ServerTest {
 
@@ -20,15 +21,22 @@ protected Application configure() {
 
     @Test
     void defaultOneTestLibrary() throws Exception {
-        assertEquals("[\"" + TestBibFile.GENERAL_SERVER_TEST.id + "\"]", target("/libraries").request().get(String.class));
+        assertEquals(
+                "[\"" + TestBibFile.GENERAL_SERVER_TEST.id + "\"]",
+                target("/libraries").request().get(String.class));
     }
 
     @Test
     void twoTestLibraries() {
-        EnumSet<TestBibFile> availableLibraries = EnumSet.of(TestBibFile.GENERAL_SERVER_TEST, TestBibFile.JABREF_AUTHORS);
+        EnumSet<TestBibFile> availableLibraries =
+                EnumSet.of(TestBibFile.GENERAL_SERVER_TEST, TestBibFile.JABREF_AUTHORS);
         setAvailableLibraries(availableLibraries);
-        // We cannot use a string constant as the path changes from OS to OS. Therefore, we need to dynamically create the expected result.
-        String expected = availableLibraries.stream().map(file -> file.id).collect(Collectors.joining("\",\"", "[\"", "\"]"));
+        // We cannot use a string constant as the path changes from OS to OS. Therefore, we need to
+        // dynamically create the expected result.
+        String expected =
+                availableLibraries.stream()
+                        .map(file -> file.id)
+                        .collect(Collectors.joining("\",\"", "[\"", "\"]"));
         assertEquals(expected, target("/libraries").request().get(String.class));
     }
 }
diff --git a/src/test/java/org/jabref/http/server/LibraryResourceTest.java b/src/test/java/org/jabref/http/server/LibraryResourceTest.java
index f4d43c12b777..94e51a68b204 100644
--- a/src/test/java/org/jabref/http/server/LibraryResourceTest.java
+++ b/src/test/java/org/jabref/http/server/LibraryResourceTest.java
@@ -1,18 +1,19 @@
 package org.jabref.http.server;
 
-import org.jabref.http.JabrefMediaType;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import jakarta.ws.rs.core.Application;
+
 import org.glassfish.jersey.server.ResourceConfig;
+import org.jabref.http.JabrefMediaType;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class LibraryResourceTest extends ServerTest {
 
     @Override
     protected Application configure() {
-        ResourceConfig resourceConfig = new ResourceConfig(LibraryResource.class, LibrariesResource.class);
+        ResourceConfig resourceConfig =
+                new ResourceConfig(LibraryResource.class, LibrariesResource.class);
         addPreferencesToResourceConfig(resourceConfig);
         addGsonToResourceConfig(resourceConfig);
         return resourceConfig.getApplication();
@@ -20,7 +21,8 @@ protected Application configure() {
 
     @Test
     void getJson() {
-        assertEquals("""
+        assertEquals(
+                """
                 @Misc{Author2023test,
                   author = {Demo Author},
                   title  = {Demo Title},
@@ -28,12 +30,19 @@ void getJson() {
                 }
 
                 @Comment{jabref-meta: databaseType:bibtex;}
-                """, target("/libraries/" + TestBibFile.GENERAL_SERVER_TEST.id).request(JabrefMediaType.BIBTEX).get(String.class));
+                """,
+                target("/libraries/" + TestBibFile.GENERAL_SERVER_TEST.id)
+                        .request(JabrefMediaType.BIBTEX)
+                        .get(String.class));
     }
 
     @Test
     void getClsItemJson() {
-        assertEquals("""
-                [{"id":"Author2023test","type":"article","author":[{"family":"Author","given":"Demo"}],"event-date":{"date-parts":[[2023]]},"issued":{"date-parts":[[2023]]},"title":"Demo Title"}]""", target("/libraries/" + TestBibFile.GENERAL_SERVER_TEST.id).request(JabrefMediaType.JSON_CSL_ITEM).get(String.class));
+        assertEquals(
+                """
+                [{"id":"Author2023test","type":"article","author":[{"family":"Author","given":"Demo"}],"event-date":{"date-parts":[[2023]]},"issued":{"date-parts":[[2023]]},"title":"Demo Title"}]""",
+                target("/libraries/" + TestBibFile.GENERAL_SERVER_TEST.id)
+                        .request(JabrefMediaType.JSON_CSL_ITEM)
+                        .get(String.class));
     }
 }
diff --git a/src/test/java/org/jabref/http/server/ServerTest.java b/src/test/java/org/jabref/http/server/ServerTest.java
index 713c30264b6d..58fae195bd6c 100644
--- a/src/test/java/org/jabref/http/server/ServerTest.java
+++ b/src/test/java/org/jabref/http/server/ServerTest.java
@@ -1,27 +1,27 @@
 package org.jabref.http.server;
 
-import java.util.EnumSet;
-import java.util.List;
-import java.util.stream.Collectors;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.google.gson.Gson;
 
 import javafx.collections.FXCollections;
 
+import org.glassfish.hk2.utilities.binding.AbstractBinder;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.JerseyTest;
 import org.jabref.http.dto.GsonFactory;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.preferences.LastFilesOpenedPreferences;
 import org.jabref.model.entry.BibEntryPreferences;
-
-import com.google.gson.Gson;
-import org.glassfish.hk2.utilities.binding.AbstractBinder;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.test.JerseyTest;
 import org.junit.jupiter.api.BeforeAll;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Abstract test class to
@@ -46,29 +46,32 @@ static void installLoggingBridge() {
     }
 
     protected void addGsonToResourceConfig(ResourceConfig resourceConfig) {
-        resourceConfig.register(new AbstractBinder() {
-            @Override
-            protected void configure() {
-                bind(new GsonFactory().provide()).to(Gson.class).ranked(2);
-            }
-        });
+        resourceConfig.register(
+                new AbstractBinder() {
+                    @Override
+                    protected void configure() {
+                        bind(new GsonFactory().provide()).to(Gson.class).ranked(2);
+                    }
+                });
     }
 
     protected void addPreferencesToResourceConfig(ResourceConfig resourceConfig) {
-        resourceConfig.register(new AbstractBinder() {
-            @Override
-            protected void configure() {
-                bind(preferences).to(CliPreferences.class).ranked(2);
-            }
-        });
+        resourceConfig.register(
+                new AbstractBinder() {
+                    @Override
+                    protected void configure() {
+                        bind(preferences).to(CliPreferences.class).ranked(2);
+                    }
+                });
     }
 
     protected void setAvailableLibraries(EnumSet<TestBibFile> files) {
-        when(lastFilesOpenedPreferences.getLastFilesOpened()).thenReturn(
-                FXCollections.observableArrayList(
-                        files.stream()
-                             .map(file -> file.path)
-                             .collect(Collectors.toList())));
+        when(lastFilesOpenedPreferences.getLastFilesOpened())
+                .thenReturn(
+                        FXCollections.observableArrayList(
+                                files.stream()
+                                        .map(file -> file.path)
+                                        .collect(Collectors.toList())));
     }
 
     private static void initializePreferencesService() {
@@ -85,14 +88,19 @@ private static void initializePreferencesService() {
         when(preferences.getFieldPreferences()).thenReturn(fieldWriterPreferences);
         when(fieldWriterPreferences.shouldResolveStrings()).thenReturn(false);
 
-        // defaults are in {@link org.jabref.logic.preferences.JabRefPreferences.NON_WRAPPABLE_FIELDS}
-        FieldPreferences fieldContentFormatterPreferences = new FieldPreferences(false, List.of(), List.of());
+        // defaults are in {@link
+        // org.jabref.logic.preferences.JabRefPreferences.NON_WRAPPABLE_FIELDS}
+        FieldPreferences fieldContentFormatterPreferences =
+                new FieldPreferences(false, List.of(), List.of());
         // used twice, once for reading and once for writing
-        when(importFormatPreferences.fieldPreferences()).thenReturn(fieldContentFormatterPreferences);
+        when(importFormatPreferences.fieldPreferences())
+                .thenReturn(fieldContentFormatterPreferences);
 
         lastFilesOpenedPreferences = mock(LastFilesOpenedPreferences.class);
         when(preferences.getLastFilesOpenedPreferences()).thenReturn(lastFilesOpenedPreferences);
 
-        when(lastFilesOpenedPreferences.getLastFilesOpened()).thenReturn(FXCollections.observableArrayList(TestBibFile.GENERAL_SERVER_TEST.path));
+        when(lastFilesOpenedPreferences.getLastFilesOpened())
+                .thenReturn(
+                        FXCollections.observableArrayList(TestBibFile.GENERAL_SERVER_TEST.path));
     }
 }
diff --git a/src/test/java/org/jabref/http/server/TestBibFile.java b/src/test/java/org/jabref/http/server/TestBibFile.java
index 4897defde32a..64a9830d05e5 100644
--- a/src/test/java/org/jabref/http/server/TestBibFile.java
+++ b/src/test/java/org/jabref/http/server/TestBibFile.java
@@ -1,9 +1,9 @@
 package org.jabref.http.server;
 
-import java.nio.file.Path;
-
 import org.jabref.logic.util.io.BackupFileUtil;
 
+import java.nio.file.Path;
+
 public enum TestBibFile {
     GENERAL_SERVER_TEST("src/test/resources/org/jabref/http/server/general-server-test.bib"),
     JABREF_AUTHORS("src/test/resources/testbib/jabref-authors.bib");
diff --git a/src/test/java/org/jabref/logic/TypedBibEntryTest.java b/src/test/java/org/jabref/logic/TypedBibEntryTest.java
index 403ffe3ab49e..8da0d2ef2e71 100644
--- a/src/test/java/org/jabref/logic/TypedBibEntryTest.java
+++ b/src/test/java/org/jabref/logic/TypedBibEntryTest.java
@@ -1,5 +1,9 @@
 package org.jabref.logic;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.jabref.logic.bibtex.TypedBibEntry;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -7,14 +11,9 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.entry.types.UnknownEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 class TypedBibEntryTest {
     private BibEntryTypesManager entryTypesManager;
 
diff --git a/src/test/java/org/jabref/logic/ai/chatting/chathistory/ChatHistoryStorageTest.java b/src/test/java/org/jabref/logic/ai/chatting/chathistory/ChatHistoryStorageTest.java
index 49528b4abb89..e48a112b9fae 100644
--- a/src/test/java/org/jabref/logic/ai/chatting/chathistory/ChatHistoryStorageTest.java
+++ b/src/test/java/org/jabref/logic/ai/chatting/chathistory/ChatHistoryStorageTest.java
@@ -1,17 +1,18 @@
 package org.jabref.logic.ai.chatting.chathistory;
 
-import java.nio.file.Path;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import dev.langchain4j.data.message.AiMessage;
 import dev.langchain4j.data.message.ChatMessage;
 import dev.langchain4j.data.message.UserMessage;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.nio.file.Path;
+import java.util.List;
 
 abstract class ChatHistoryStorageTest {
     @TempDir Path tempDir;
@@ -39,22 +40,17 @@ void tearDown() {
 
     @Test
     void entryChatHistory() {
-        List<ChatMessage> messages = List.of(
-                new UserMessage("hi!"),
-                new AiMessage("hello!")
-        );
+        List<ChatMessage> messages = List.of(new UserMessage("hi!"), new AiMessage("hello!"));
 
         storage.storeMessagesForEntry(tempDir.resolve("test.bib"), "citationKey", messages);
         reopen();
-        assertEquals(messages, storage.loadMessagesForEntry(tempDir.resolve("test.bib"), "citationKey"));
+        assertEquals(
+                messages, storage.loadMessagesForEntry(tempDir.resolve("test.bib"), "citationKey"));
     }
 
     @Test
     void groupChatHistory() {
-        List<ChatMessage> messages = List.of(
-                new UserMessage("hi!"),
-                new AiMessage("hello!")
-        );
+        List<ChatMessage> messages = List.of(new UserMessage("hi!"), new AiMessage("hello!"));
 
         storage.storeMessagesForGroup(tempDir.resolve("test.bib"), "group", messages);
         reopen();
diff --git a/src/test/java/org/jabref/logic/ai/chatting/chathistory/MVStoreChatHistoryStorageTest.java b/src/test/java/org/jabref/logic/ai/chatting/chathistory/MVStoreChatHistoryStorageTest.java
index fc8a6be2ccdb..7e1b4ade71f3 100644
--- a/src/test/java/org/jabref/logic/ai/chatting/chathistory/MVStoreChatHistoryStorageTest.java
+++ b/src/test/java/org/jabref/logic/ai/chatting/chathistory/MVStoreChatHistoryStorageTest.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.ai.chatting.chathistory;
 
-import java.nio.file.Path;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.ai.chatting.chathistory.storages.MVStoreChatHistoryStorage;
 import org.jabref.logic.util.NotificationService;
 
-import static org.mockito.Mockito.mock;
+import java.nio.file.Path;
 
 class MVStoreChatHistoryStorageTest extends ChatHistoryStorageTest {
     @Override
diff --git a/src/test/java/org/jabref/logic/ai/ingestion/FullyIngestedDocumentsTrackerTest.java b/src/test/java/org/jabref/logic/ai/ingestion/FullyIngestedDocumentsTrackerTest.java
index 09dddc716648..3bb7e613b1c4 100644
--- a/src/test/java/org/jabref/logic/ai/ingestion/FullyIngestedDocumentsTrackerTest.java
+++ b/src/test/java/org/jabref/logic/ai/ingestion/FullyIngestedDocumentsTrackerTest.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.ai.ingestion;
 
-import java.nio.file.Path;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.nio.file.Path;
+import java.util.Optional;
 
 abstract class FullyIngestedDocumentsTrackerTest {
     @TempDir Path tempDir;
@@ -47,6 +47,7 @@ void unmarkDocumentAsFullyIngested() {
         reopen();
         tracker.unmarkDocumentAsFullyIngested("link");
         reopen();
-        assertEquals(Optional.empty(), tracker.getIngestedDocumentModificationTimeInSeconds("link"));
+        assertEquals(
+                Optional.empty(), tracker.getIngestedDocumentModificationTimeInSeconds("link"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/ai/ingestion/MVStoreFullyIngestedDocumentsTrackerTest.java b/src/test/java/org/jabref/logic/ai/ingestion/MVStoreFullyIngestedDocumentsTrackerTest.java
index 1626557c274d..29dec56c0712 100644
--- a/src/test/java/org/jabref/logic/ai/ingestion/MVStoreFullyIngestedDocumentsTrackerTest.java
+++ b/src/test/java/org/jabref/logic/ai/ingestion/MVStoreFullyIngestedDocumentsTrackerTest.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.ai.ingestion;
 
-import java.nio.file.Path;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.ai.ingestion.storages.MVStoreFullyIngestedDocumentsTracker;
 import org.jabref.logic.util.NotificationService;
 
-import static org.mockito.Mockito.mock;
+import java.nio.file.Path;
 
 class MVStoreFullyIngestedDocumentsTrackerTest extends FullyIngestedDocumentsTrackerTest {
     @Override
diff --git a/src/test/java/org/jabref/logic/ai/summarization/MVStoreSummariesStorageTest.java b/src/test/java/org/jabref/logic/ai/summarization/MVStoreSummariesStorageTest.java
index 0beedc7e8bf7..58df7788dcdb 100644
--- a/src/test/java/org/jabref/logic/ai/summarization/MVStoreSummariesStorageTest.java
+++ b/src/test/java/org/jabref/logic/ai/summarization/MVStoreSummariesStorageTest.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.ai.summarization;
 
-import java.nio.file.Path;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.ai.summarization.storages.MVStoreSummariesStorage;
 import org.jabref.logic.util.NotificationService;
 
-import static org.mockito.Mockito.mock;
+import java.nio.file.Path;
 
 class MVStoreSummariesStorageTest extends SummariesStorageTest {
     @Override
diff --git a/src/test/java/org/jabref/logic/ai/summarization/SummariesStorageTest.java b/src/test/java/org/jabref/logic/ai/summarization/SummariesStorageTest.java
index 45f1d9bdb051..2c1d55f95ec9 100644
--- a/src/test/java/org/jabref/logic/ai/summarization/SummariesStorageTest.java
+++ b/src/test/java/org/jabref/logic/ai/summarization/SummariesStorageTest.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.ai.summarization;
 
-import java.nio.file.Path;
-import java.time.LocalDateTime;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.ai.AiProvider;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.nio.file.Path;
+import java.time.LocalDateTime;
+import java.util.Optional;
 
 abstract class SummariesStorageTest {
     @TempDir Path tempDir;
@@ -41,14 +40,22 @@ void tearDown() {
 
     @Test
     void set() {
-        summariesStorage.set(bibPath, "citationKey", new Summary(LocalDateTime.now(), AiProvider.OPEN_AI, "model", "contents"));
+        summariesStorage.set(
+                bibPath,
+                "citationKey",
+                new Summary(LocalDateTime.now(), AiProvider.OPEN_AI, "model", "contents"));
         reopen();
-        assertEquals(Optional.of("contents"), summariesStorage.get(bibPath, "citationKey").map(Summary::content));
+        assertEquals(
+                Optional.of("contents"),
+                summariesStorage.get(bibPath, "citationKey").map(Summary::content));
     }
 
     @Test
     void clear() {
-        summariesStorage.set(bibPath, "citationKey", new Summary(LocalDateTime.now(), AiProvider.OPEN_AI, "model", "contents"));
+        summariesStorage.set(
+                bibPath,
+                "citationKey",
+                new Summary(LocalDateTime.now(), AiProvider.OPEN_AI, "model", "contents"));
         reopen();
         summariesStorage.clear(bibPath, "citationKey");
         reopen();
diff --git a/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java b/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
index 572f15438f27..afd9adaf7824 100644
--- a/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
+++ b/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
@@ -1,29 +1,28 @@
 package org.jabref.logic.auxparser;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
 
 class AuxParserTest {
     private ImportFormatPreferences importFormatPreferences;
@@ -42,7 +41,8 @@ void tearDown() {
     void normal() throws URISyntaxException, IOException {
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
         Path auxFile = Path.of(AuxParserTest.class.getResource("paper.aux").toURI());
-        try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
+        try (InputStreamReader originalReader =
+                new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
             ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
@@ -57,7 +57,8 @@ void normal() throws URISyntaxException, IOException {
             assertTrue(newEntries.get(1).hasChanged());
             assertEquals(2, auxResult.getResolvedKeysCount());
             assertEquals(2, auxResult.getFoundKeysInAux());
-            assertEquals(auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
+            assertEquals(
+                    auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
                     auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount());
             assertEquals(0, auxResult.getCrossRefEntriesCount());
         }
@@ -69,7 +70,8 @@ void twoArgMacro() throws URISyntaxException, IOException {
 
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
         Path auxFile = Path.of(AuxParserTest.class.getResource("papertwoargmacro.aux").toURI());
-        try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
+        try (InputStreamReader originalReader =
+                new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
             ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
@@ -84,7 +86,8 @@ void twoArgMacro() throws URISyntaxException, IOException {
             assertTrue(newEntries.get(1).hasChanged());
             assertEquals(2, auxResult.getResolvedKeysCount());
             assertEquals(2, auxResult.getFoundKeysInAux());
-            assertEquals(auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
+            assertEquals(
+                    auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
                     auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount());
             assertEquals(0, auxResult.getCrossRefEntriesCount());
         }
@@ -94,7 +97,8 @@ void twoArgMacro() throws URISyntaxException, IOException {
     void notAllFound() throws URISyntaxException, IOException {
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
         Path auxFile = Path.of(AuxParserTest.class.getResource("badpaper.aux").toURI());
-        try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
+        try (InputStreamReader originalReader =
+                new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
             ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
@@ -106,7 +110,8 @@ void notAllFound() throws URISyntaxException, IOException {
             assertEquals(2, newDB.getEntries().size());
             assertEquals(2, auxResult.getResolvedKeysCount());
             assertEquals(3, auxResult.getFoundKeysInAux());
-            assertEquals(auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
+            assertEquals(
+                    auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
                     auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount());
             assertEquals(0, auxResult.getCrossRefEntriesCount());
         }
@@ -116,7 +121,8 @@ void notAllFound() throws URISyntaxException, IOException {
     void duplicateBibDatabaseConfiguration() throws URISyntaxException, IOException {
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("config.bib");
         Path auxFile = Path.of(AuxParserTest.class.getResource("paper.aux").toURI());
-        try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
+        try (InputStreamReader originalReader =
+                new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
             ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
@@ -132,7 +138,8 @@ void duplicateBibDatabaseConfiguration() throws URISyntaxException, IOException
     void nestedAux() throws URISyntaxException, IOException {
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
         Path auxFile = Path.of(AuxParserTest.class.getResource("nested.aux").toURI());
-        try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
+        try (InputStreamReader originalReader =
+                new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
             ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
@@ -144,7 +151,8 @@ void nestedAux() throws URISyntaxException, IOException {
             assertEquals(2, newDB.getEntries().size());
             assertEquals(2, auxResult.getResolvedKeysCount());
             assertEquals(2, auxResult.getFoundKeysInAux());
-            assertEquals(auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
+            assertEquals(
+                    auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
                     auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount());
             assertEquals(0, auxResult.getCrossRefEntriesCount());
         }
@@ -154,7 +162,8 @@ void nestedAux() throws URISyntaxException, IOException {
     void crossRef() throws URISyntaxException, IOException {
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
         Path auxFile = Path.of(AuxParserTest.class.getResource("crossref.aux").toURI());
-        try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
+        try (InputStreamReader originalReader =
+                new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
             ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
@@ -166,7 +175,8 @@ void crossRef() throws URISyntaxException, IOException {
             assertEquals(4, newDB.getEntries().size());
             assertEquals(3, auxResult.getResolvedKeysCount());
             assertEquals(4, auxResult.getFoundKeysInAux());
-            assertEquals(auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
+            assertEquals(
+                    auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
                     auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount());
             assertEquals(1, auxResult.getCrossRefEntriesCount());
         }
@@ -183,7 +193,8 @@ void fileNotFound() {
         assertEquals(0, newDB.getEntries().size());
         assertEquals(0, auxResult.getResolvedKeysCount());
         assertEquals(0, auxResult.getFoundKeysInAux());
-        assertEquals(auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
+        assertEquals(
+                auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
                 auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount());
         assertEquals(0, auxResult.getCrossRefEntriesCount());
     }
diff --git a/src/test/java/org/jabref/logic/auxparser/DefaultAuxParserTest.java b/src/test/java/org/jabref/logic/auxparser/DefaultAuxParserTest.java
index 735262acf78f..f6207d070ac6 100644
--- a/src/test/java/org/jabref/logic/auxparser/DefaultAuxParserTest.java
+++ b/src/test/java/org/jabref/logic/auxparser/DefaultAuxParserTest.java
@@ -3,5 +3,4 @@
 /**
  * Please see {@link AuxParserTest} for the test cases
  */
-class DefaultAuxParserTest {
-}
+class DefaultAuxParserTest {}
diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java b/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
index 55b9ed985607..be99f95a3f01 100644
--- a/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
+++ b/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
@@ -1,5 +1,16 @@
 package org.jabref.logic.bibtex;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.Importer;
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.importer.fileformat.BibtexParser;
+import org.jabref.model.entry.BibEntry;
+import org.junit.jupiter.api.Assertions;
+import org.mockito.Answers;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -11,18 +22,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.Importer;
-import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.importer.fileformat.BibtexParser;
-import org.jabref.model.entry.BibEntry;
-
-import org.junit.jupiter.api.Assertions;
-import org.mockito.Answers;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.Mockito.mock;
-
 public class BibEntryAssert {
 
     /**
@@ -64,7 +63,9 @@ public static void assertEquals(Class<?> clazz, String resourceName, List<BibEnt
     private static List<BibEntry> getListFromInputStream(InputStream is) throws IOException {
         ParserResult result;
         try (Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
-            BibtexParser parser = new BibtexParser(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+            BibtexParser parser =
+                    new BibtexParser(
+                            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
             result = parser.parse(reader);
         }
         assertNotNull(result);
@@ -83,7 +84,8 @@ public static void assertEquals(InputStream expectedInputStream, List<BibEntry>
             throws IOException {
         assertNotNull(expectedInputStream);
         assertNotNull(actualEntries);
-        // explicit reference of Assertions is needed here to disambiguate from the methods defined by this class
+        // explicit reference of Assertions is needed here to disambiguate from the methods defined
+        // by this class
         List<BibEntry> expectedEntries = getListFromInputStream(expectedInputStream);
         Assertions.assertEquals(expectedEntries, actualEntries);
     }
@@ -92,7 +94,8 @@ public static void assertEquals(List<BibEntry> expectedEntries, InputStream actu
             throws IOException {
         assertNotNull(actualInputStream);
         assertNotNull(expectedEntries);
-        // explicit reference of Assertions is needed here to disambiguate from the methods defined by this class
+        // explicit reference of Assertions is needed here to disambiguate from the methods defined
+        // by this class
         Assertions.assertEquals(expectedEntries, getListFromInputStream(actualInputStream));
     }
 
@@ -103,8 +106,7 @@ public static void assertEquals(List<BibEntry> expectedEntries, InputStream actu
      * @param expected the inputStream reading the entry from
      * @param actual   the entry to compare with
      */
-    public static void assertEquals(InputStream expected, BibEntry actual)
-            throws IOException {
+    public static void assertEquals(InputStream expected, BibEntry actual) throws IOException {
         assertEquals(expected, Collections.singletonList(actual));
     }
 
@@ -138,9 +140,10 @@ public static void assertEquals(InputStream expectedIs, URL fileToImport, Import
      */
     public static void assertEquals(List<BibEntry> expected, Path fileToImport, Importer importer)
             throws IOException {
-        List<BibEntry> actualEntries = importer.importDatabase(fileToImport)
-                                               .getDatabase().getEntries();
-        // explicit reference of Assertions is needed here to disambiguate from the methods defined by this class
+        List<BibEntry> actualEntries =
+                importer.importDatabase(fileToImport).getDatabase().getEntries();
+        // explicit reference of Assertions is needed here to disambiguate from the methods defined
+        // by this class
         Assertions.assertEquals(expected, actualEntries);
     }
 
diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
index 47d06d72ce46..057df20c94e1 100644
--- a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
@@ -1,13 +1,9 @@
 package org.jabref.logic.bibtex;
 
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.exporter.BibWriter;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -24,7 +20,6 @@
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.entry.types.UnknownEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -32,10 +27,14 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Stream;
 
 class BibEntryWriterTest {
 
@@ -47,57 +46,66 @@ class BibEntryWriterTest {
     @BeforeEach
     void setUpWriter() {
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        FieldPreferences fieldPreferences = new FieldPreferences(true, List.of(StandardField.MONTH), Collections.emptyList());
-        bibEntryWriter = new BibEntryWriter(new FieldWriter(fieldPreferences), new BibEntryTypesManager());
+        FieldPreferences fieldPreferences =
+                new FieldPreferences(true, List.of(StandardField.MONTH), Collections.emptyList());
+        bibEntryWriter =
+                new BibEntryWriter(new FieldWriter(fieldPreferences), new BibEntryTypesManager());
     }
 
     @Test
     void serialization() throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                // set required fields
-                .withField(StandardField.AUTHOR, "Foo Bar")
-                .withField(StandardField.JOURNAL, "International Journal of Something")
-                // set optional fields
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.NOTE, "some note")
-                .withChanged(true);
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        // set required fields
+                        .withField(StandardField.AUTHOR, "Foo Bar")
+                        .withField(StandardField.JOURNAL, "International Journal of Something")
+                        // set optional fields
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.NOTE, "some note")
+                        .withChanged(true);
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        String expected = """
+        String expected =
+                """
                 @Article{,
                   author  = {Foo Bar},
                   journal = {International Journal of Something},
                   note    = {some note},
                   number  = {1},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
     void bibEntryTwoSpacesBeforeAndAfterKept() throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "  two spaces before and after (before)  ")
-                .withChanged(true);
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "  two spaces before and after (before)  ")
+                        .withChanged(true);
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        String expected = """
+        String expected =
+                """
                 @Article{,
                   author = {  two spaces before and after (before)  },
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
     void bibEntryNotModified() throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "  two spaces before and after  ")
-                .withChanged(true);
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "  two spaces before and after  ")
+                        .withChanged(true);
 
         BibEntry original = (BibEntry) entry.clone();
 
@@ -108,16 +116,19 @@ void bibEntryNotModified() throws Exception {
 
     @Test
     void writeOtherTypeTest() throws Exception {
-        String expected = """
+        String expected =
+                """
                 @Other{test,
                   comment = {testentry},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
-        BibEntry entry = new BibEntry(new UnknownEntryType("other"))
-                .withField(StandardField.COMMENT, "testentry")
-                .withCitationKey("test")
-                .withChanged(true);
+        BibEntry entry =
+                new BibEntry(new UnknownEntryType("other"))
+                        .withField(StandardField.COMMENT, "testentry")
+                        .withCitationKey("test")
+                        .withChanged(true);
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
         assertEquals(expected, stringWriter.toString());
@@ -131,53 +142,61 @@ void writeEntryWithFile() throws Exception {
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        assertEquals("""
+        assertEquals(
+                """
                 @Article{,
                   file = {test:/home/uers/test.pdf:PDF},
                 }
-                """.replace("\n", OS.NEWLINE), stringWriter.toString());
+                """
+                        .replace("\n", OS.NEWLINE),
+                stringWriter.toString());
     }
 
     @Test
     void writeEntryWithOrField() throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.InBook)
-                // set a required OR field (author/editor)
-                .withField(StandardField.EDITOR, "Foo Bar")
-                .withField(StandardField.JOURNAL, "International Journal of Something")
-                // set an optional field
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.NOTE, "some note")
-                .withChanged(true);
+        BibEntry entry =
+                new BibEntry(StandardEntryType.InBook)
+                        // set a required OR field (author/editor)
+                        .withField(StandardField.EDITOR, "Foo Bar")
+                        .withField(StandardField.JOURNAL, "International Journal of Something")
+                        // set an optional field
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.NOTE, "some note")
+                        .withChanged(true);
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        String expected = """
+        String expected =
+                """
                 @InBook{,
                   editor  = {Foo Bar},
                   note    = {some note},
                   number  = {1},
                   journal = {International Journal of Something},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
     void writeEntryWithOrFieldBothFieldsPresent() throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.InBook)
-                // set a required OR field with both fields(author/editor)
-                .withField(StandardField.AUTHOR, "Foo Thor")
-                .withField(StandardField.EDITOR, "Edi Bar")
-                .withField(StandardField.JOURNAL, "International Journal of Something")
-                // set an optional field
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.NOTE, "some note")
-                .withChanged(true);
+        BibEntry entry =
+                new BibEntry(StandardEntryType.InBook)
+                        // set a required OR field with both fields(author/editor)
+                        .withField(StandardField.AUTHOR, "Foo Thor")
+                        .withField(StandardField.EDITOR, "Edi Bar")
+                        .withField(StandardField.JOURNAL, "International Journal of Something")
+                        // set an optional field
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.NOTE, "some note")
+                        .withChanged(true);
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        String expected = """
+        String expected =
+                """
                 @InBook{,
                   author  = {Foo Thor},
                   editor  = {Edi Bar},
@@ -185,18 +204,21 @@ void writeEntryWithOrFieldBothFieldsPresent() throws Exception {
                   number  = {1},
                   journal = {International Journal of Something},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
     void writeReallyUnknownTypeTest() throws Exception {
-        String expected = """
+        String expected =
+                """
                 @Reallyunknowntype{test,
                   comment = {testentry},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
         BibEntry entry = new BibEntry();
         entry.setType(new UnknownEntryType("ReallyUnknownType"));
@@ -209,17 +231,20 @@ void writeReallyUnknownTypeTest() throws Exception {
 
     @Test
     void roundTripTest() throws IOException {
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @Article{test,
                   Author                   = {Foo Bar},
                   Journal                  = {International Journal of Something},
                   Note                     = {some note},
                   Number                   = {1}
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // write out bibtex string
@@ -230,14 +255,17 @@ void roundTripTest() throws IOException {
 
     @Test
     void roundTripKeepsFilePathWithBackslashes() throws IOException {
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @Article{,
                   file = {Tagungen\\2013\\KWTK45},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // write out bibtex string
@@ -248,14 +276,17 @@ void roundTripKeepsFilePathWithBackslashes() throws IOException {
 
     @Test
     void roundTripKeepsEscapedCharacters() throws IOException {
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @Article{,
                   demofield = {Tagungen\\2013\\KWTK45},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // write out bibtex string
@@ -266,14 +297,17 @@ void roundTripKeepsEscapedCharacters() throws IOException {
 
     @Test
     void roundTripKeepsFilePathEndingWithBackslash() throws IOException {
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @Article{,
                   file = {dir\\},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // write out bibtex string
@@ -285,16 +319,24 @@ void roundTripKeepsFilePathEndingWithBackslash() throws IOException {
     @Test
     void roundTripWithPrependingNewlines() throws IOException {
         // @formatter:off
-        String bibtexEntry = "\r\n@Article{test," + OS.NEWLINE +
-                "  Author                   = {Foo Bar}," + OS.NEWLINE +
-                "  Journal                  = {International Journal of Something}," + OS.NEWLINE +
-                "  Note                     = {some note}," + OS.NEWLINE +
-                "  Number                   = {1}" + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String bibtexEntry =
+                "\r\n@Article{test,"
+                        + OS.NEWLINE
+                        + "  Author                   = {Foo Bar},"
+                        + OS.NEWLINE
+                        + "  Journal                  = {International Journal of Something},"
+                        + OS.NEWLINE
+                        + "  Note                     = {some note},"
+                        + OS.NEWLINE
+                        + "  Number                   = {1}"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE;
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // write out bibtex string
@@ -306,16 +348,18 @@ void roundTripWithPrependingNewlines() throws IOException {
     @Test
     void roundTripWithKeepsCRLFLineBreakStyle() throws IOException {
         // @formatter:off
-        String bibtexEntry = "@Article{test,\r\n" +
-                "  Author                   = {Foo Bar},\r\n" +
-                "  Journal                  = {International Journal of Something},\r\n" +
-                "  Note                     = {some note},\r\n" +
-                "  Number                   = {1}\r\n" +
-                "}\r\n";
+        String bibtexEntry =
+                "@Article{test,\r\n"
+                        + "  Author                   = {Foo Bar},\r\n"
+                        + "  Journal                  = {International Journal of Something},\r\n"
+                        + "  Note                     = {some note},\r\n"
+                        + "  Number                   = {1}\r\n"
+                        + "}\r\n";
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // write out bibtex string
@@ -329,16 +373,18 @@ void roundTripWithKeepsCRLFLineBreakStyle() throws IOException {
     @Test
     void roundTripWithKeepsLFLineBreakStyle() throws IOException {
         // @formatter:off
-        String bibtexEntry = "@Article{test,\n" +
-                "  Author                   = {Foo Bar},\n" +
-                "  Journal                  = {International Journal of Something},\n" +
-                "  Note                     = {some note},\n" +
-                "  Number                   = {1}\n" +
-                "}\n";
+        String bibtexEntry =
+                "@Article{test,\n"
+                        + "  Author                   = {Foo Bar},\n"
+                        + "  Journal                  = {International Journal of Something},\n"
+                        + "  Note                     = {some note},\n"
+                        + "  Number                   = {1}\n"
+                        + "}\n";
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // write out bibtex string
@@ -352,18 +398,21 @@ void roundTripWithKeepsLFLineBreakStyle() throws IOException {
     @Test
     void roundTripWithModification() throws IOException {
         // @formatter:off
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @Article{test,
                   Author                   = {Foo Bar},
                   Journal                  = {International Journal of Something},
                   Note                     = {some note},
                   Number                   = {1},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // Modify entry
@@ -373,14 +422,16 @@ void roundTripWithModification() throws IOException {
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
         // @formatter:off
-        String expected = """
+        String expected =
+                """
                 @Article{test,
                   author  = {BlaBla},
                   journal = {International Journal of Something},
                   note    = {some note},
                   number  = {1},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
         // @formatter:on
         assertEquals(expected, stringWriter.toString());
     }
@@ -388,7 +439,8 @@ void roundTripWithModification() throws IOException {
     @Test
     void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase() throws IOException {
         // @formatter:off
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @Article{test,
                   Author                   = {Foo Bar},
                   Journal                  = {International Journal of Something},
@@ -396,11 +448,13 @@ void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase() throws IOE
                   Note                     = {some note},
                   HowPublished             = {asdf},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // modify entry
@@ -410,7 +464,8 @@ void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase() throws IOE
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
         // @formatter:off
-        String expected = """
+        String expected =
+                """
                 @Article{test,
                   author       = {BlaBla},
                   journal      = {International Journal of Something},
@@ -418,7 +473,8 @@ void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase() throws IOE
                   number       = {1},
                   howpublished = {asdf},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
         // @formatter:on
         assertEquals(expected, stringWriter.toString());
     }
@@ -426,7 +482,8 @@ void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase() throws IOE
     @Test
     void entryTypeChange() throws IOException {
         // @formatter:off
-        String expected = """
+        String expected =
+                """
 
                 @Article{test,
                   author       = {BlaBla},
@@ -435,11 +492,13 @@ void entryTypeChange() throws IOException {
                   note         = {some note},
                   howpublished = {asdf},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(expected));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(expected));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // modify entry
@@ -449,7 +508,8 @@ void entryTypeChange() throws IOException {
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
         // @formatter:off
-        String expectedNewEntry = """
+        String expectedNewEntry =
+                """
                 @InProceedings{test,
                   author       = {BlaBla},
                   note         = {some note},
@@ -457,7 +517,8 @@ void entryTypeChange() throws IOException {
                   howpublished = {asdf},
                   journal      = {International Journal of Something},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
         // @formatter:on
         assertEquals(expectedNewEntry, stringWriter.toString());
     }
@@ -465,16 +526,23 @@ void entryTypeChange() throws IOException {
     @Test
     void roundTripWithAppendedNewlines() throws IOException {
         // @formatter:off
-        String bibtexEntry = "@Article{test," + OS.NEWLINE +
-                "  Author                   = {Foo Bar}," + OS.NEWLINE +
-                "  Journal                  = {International Journal of Something}," + OS.NEWLINE +
-                "  Number                   = {1}," + OS.NEWLINE +
-                "  Note                     = {some note}" + OS.NEWLINE +
-                "}\n\n";
+        String bibtexEntry =
+                "@Article{test,"
+                        + OS.NEWLINE
+                        + "  Author                   = {Foo Bar},"
+                        + OS.NEWLINE
+                        + "  Journal                  = {International Journal of Something},"
+                        + OS.NEWLINE
+                        + "  Number                   = {1},"
+                        + OS.NEWLINE
+                        + "  Note                     = {some note}"
+                        + OS.NEWLINE
+                        + "}\n\n";
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // write out bibtex string
@@ -489,42 +557,53 @@ void roundTripWithAppendedNewlines() throws IOException {
     @Test
     void roundTripNormalizesNewLines() throws IOException {
         // @formatter:off
-        String bibtexEntry = "@Article{test,\n" +
-                "  Author                   = {Foo Bar},\r\n" +
-                "  Journal                  = {International Journal of Something},\n" +
-                "  Number                   = {1},\n" +
-                "  Note                     = {some note}\r\n" +
-                "}\n\n";
+        String bibtexEntry =
+                "@Article{test,\n"
+                        + "  Author                   = {Foo Bar},\r\n"
+                        + "  Journal                  = {International Journal of Something},\n"
+                        + "  Number                   = {1},\n"
+                        + "  Note                     = {some note}\r\n"
+                        + "}\n\n";
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // write out bibtex string
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
         String actual = stringWriter.toString();
 
-        String expected = "@Article{test," + OS.NEWLINE +
-                "  Author                   = {Foo Bar}," + OS.NEWLINE +
-                "  Journal                  = {International Journal of Something}," + OS.NEWLINE +
-                "  Number                   = {1}," + OS.NEWLINE +
-                "  Note                     = {some note}" + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected =
+                "@Article{test,"
+                        + OS.NEWLINE
+                        + "  Author                   = {Foo Bar},"
+                        + OS.NEWLINE
+                        + "  Journal                  = {International Journal of Something},"
+                        + OS.NEWLINE
+                        + "  Number                   = {1},"
+                        + OS.NEWLINE
+                        + "  Note                     = {some note}"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE;
         assertEquals(expected, actual);
     }
 
     @Test
     void multipleWritesWithoutModification() throws IOException {
         // @formatter:off
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @Article{test,
                   Author                   = {Foo Bar},
                   Journal                  = {International Journal of Something},
                   Note                     = {some note},
                   Number                   = {1}
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
         // @formatter:on
 
         String result = testSingleWrite(bibtexEntry);
@@ -536,7 +615,8 @@ void multipleWritesWithoutModification() throws IOException {
 
     private String testSingleWrite(String bibtexEntry) throws IOException {
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // write out bibtex string
@@ -552,17 +632,20 @@ private String testSingleWrite(String bibtexEntry) throws IOException {
     @Test
     void monthFieldSpecialSyntax() throws IOException {
         // @formatter:off
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @Article{test,
                   Author                   = {Foo Bar},
                   Month                    = mar,
                   Number                   = {1}
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // check month field
@@ -579,7 +662,8 @@ void monthFieldSpecialSyntax() throws IOException {
     @Test
     void customTypeCanBewritten() throws IOException {
         // @formatter:off
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @reference{Broecker1984,
                   title = {International Center of Photography},
                   subtitle = {Encyclopedia of Photography},
@@ -597,7 +681,8 @@ void customTypeCanBewritten() throws IOException {
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         entry.setField(FieldFactory.parseField("location"), "NY");
@@ -605,7 +690,8 @@ void customTypeCanBewritten() throws IOException {
         // write out bibtex string
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        String expected = """
+        String expected =
+                """
                 @Reference{Broecker1984,
                   date       = {1984},
                   editor     = {Broecker, William L.},
@@ -619,49 +705,54 @@ void customTypeCanBewritten() throws IOException {
                   subtitle   = {Encyclopedia of Photography},
                   title      = {International Center of Photography},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
     void constantMonthApril() throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.MONTH, "#apr#");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Misc).withField(StandardField.MONTH, "#apr#");
         // enable writing
         entry.setChanged(true);
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        assertEquals("""
+        assertEquals(
+                """
                         @Misc{,
                           month = apr,
                         }
-                        """.replace("\n", OS.NEWLINE),
+                        """
+                        .replace("\n", OS.NEWLINE),
                 stringWriter.toString());
     }
 
     @Test
     void monthApril() throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.MONTH, "apr");
+        BibEntry entry = new BibEntry(StandardEntryType.Misc).withField(StandardField.MONTH, "apr");
         // enable writing
         entry.setChanged(true);
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        assertEquals("""
+        assertEquals(
+                """
                         @Misc{,
                           month = {apr},
                         }
-                        """.replace("\n", OS.NEWLINE),
+                        """
+                        .replace("\n", OS.NEWLINE),
                 stringWriter.toString());
     }
 
     @Test
     void filenameIsUnmodifiedDuringWrite() throws Exception {
         // source: https://github.com/JabRef/jabref/issues/7012#issuecomment-707788107
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                     @Book{Hue17,
                       author    = {Rudolf Huebener},
                       date      = {2017},
@@ -671,10 +762,12 @@ void filenameIsUnmodifiedDuringWrite() throws Exception {
                       file      = {:Hue17 - Leiter # Halbleiter # Supraleiter.pdf:PDF},
                       timestamp = {2020.10.13},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // write out bibtex string
@@ -686,16 +779,25 @@ void filenameIsUnmodifiedDuringWrite() throws Exception {
     @Test
     void addFieldWithLongerLength() throws IOException {
         // @formatter:off
-        String bibtexEntry = OS.NEWLINE + OS.NEWLINE + "@Article{test," + OS.NEWLINE +
-                "  author =  {BlaBla}," + OS.NEWLINE +
-                "  journal = {International Journal of Something}," + OS.NEWLINE +
-                "  number =  {1}," + OS.NEWLINE +
-                "  note =    {some note}," + OS.NEWLINE +
-                "}";
+        String bibtexEntry =
+                OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Article{test,"
+                        + OS.NEWLINE
+                        + "  author =  {BlaBla},"
+                        + OS.NEWLINE
+                        + "  journal = {International Journal of Something},"
+                        + OS.NEWLINE
+                        + "  number =  {1},"
+                        + OS.NEWLINE
+                        + "  note =    {some note},"
+                        + OS.NEWLINE
+                        + "}";
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // modify entry
@@ -705,13 +807,22 @@ void addFieldWithLongerLength() throws IOException {
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
         // @formatter:off
-        String expected = OS.NEWLINE + "@Article{test," + OS.NEWLINE +
-                "  author       = {BlaBla}," + OS.NEWLINE +
-                "  journal      = {International Journal of Something}," + OS.NEWLINE +
-                "  note         = {some note}," + OS.NEWLINE +
-                "  number       = {1}," + OS.NEWLINE +
-                "  howpublished = {asdf}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected =
+                OS.NEWLINE
+                        + "@Article{test,"
+                        + OS.NEWLINE
+                        + "  author       = {BlaBla},"
+                        + OS.NEWLINE
+                        + "  journal      = {International Journal of Something},"
+                        + OS.NEWLINE
+                        + "  note         = {some note},"
+                        + OS.NEWLINE
+                        + "  number       = {1},"
+                        + OS.NEWLINE
+                        + "  howpublished = {asdf},"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE;
         // @formatter:on
         assertEquals(expected, stringWriter.toString());
     }
@@ -724,9 +835,13 @@ void doNotWriteEmptyFields() throws IOException {
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        String expected = "@Article{," + OS.NEWLINE +
-                "  note   = {some note}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected =
+                "@Article{,"
+                        + OS.NEWLINE
+                        + "  note   = {some note},"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE;
 
         assertEquals(expected, stringWriter.toString());
     }
@@ -736,13 +851,16 @@ void writeThrowsErrorIfFieldContainsUnbalancedBraces() {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         entry.setField(StandardField.NOTE, "some text with unbalanced { braces");
 
-        assertThrows(IOException.class, () -> bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX));
+        assertThrows(
+                IOException.class,
+                () -> bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void roundTripWithPrecedingCommentTest() throws IOException {
         // @formatter:off
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 % Some random comment that should stay here
                 @Article{test,
                   Author                   = {Foo Bar},
@@ -750,11 +868,13 @@ void roundTripWithPrecedingCommentTest() throws IOException {
                   Note                     = {some note},
                   Number                   = {1}
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // write out bibtex string
@@ -766,7 +886,8 @@ void roundTripWithPrecedingCommentTest() throws IOException {
     @Test
     void roundTripWithPrecedingCommentAndModificationTest() throws IOException {
         // @formatter:off
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 % Some random comment that should stay here
                 @Article{test,
                   Author                   = {Foo Bar},
@@ -774,11 +895,13 @@ void roundTripWithPrecedingCommentAndModificationTest() throws IOException {
                   Number                   = {1},
                   Note                     = {some note}
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibEntry entry = result.getDatabase().getEntries().getFirst();
 
         // change the entry
@@ -787,7 +910,8 @@ void roundTripWithPrecedingCommentAndModificationTest() throws IOException {
         // write out bibtex string
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        String expected = """
+        String expected =
+                """
                 % Some random comment that should stay here
                 @Article{test,
                   author  = {John Doe},
@@ -795,7 +919,8 @@ void roundTripWithPrecedingCommentAndModificationTest() throws IOException {
                   note    = {some note},
                   number  = {1},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
         assertEquals(expected, stringWriter.toString());
     }
@@ -817,7 +942,8 @@ void alphabeticSerialization() throws IOException {
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBLATEX);
 
-        String expected = """
+        String expected =
+                """
                 @Article{,
                   author       = {Foo Bar},
                   date         = {2019-10-16},
@@ -828,7 +954,8 @@ void alphabeticSerialization() throws IOException {
                   chapter      = {chapter},
                   year         = {2019},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
         assertEquals(expected, stringWriter.toString());
     }
@@ -863,9 +990,11 @@ void serializeAll() throws IOException {
         entry2.setField(StandardField.YEAR, "2020");
         entry2.setField(StandardField.CHAPTER, "chapter");
 
-        String output = bibEntryWriter.serializeAll(List.of(entry1, entry2), BibDatabaseMode.BIBLATEX);
+        String output =
+                bibEntryWriter.serializeAll(List.of(entry1, entry2), BibDatabaseMode.BIBLATEX);
 
-        String expected1 = """
+        String expected1 =
+                """
                 @Article{,
                   author       = {Journal Author},
                   date         = {2020-11-16},
@@ -876,9 +1005,11 @@ void serializeAll() throws IOException {
                   chapter      = {chapter},
                   year         = {2019},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
-        String expected2 = """
+        String expected2 =
+                """
                 @Book{,
                   author    = {John Book},
                   date      = {2017-12-20},
@@ -889,7 +1020,8 @@ void serializeAll() throws IOException {
                   booktitle = {The Big Book of Books},
                   year      = {2020},
                 }
-                """.replace("\n", OS.NEWLINE);
+                """
+                        .replace("\n", OS.NEWLINE);
 
         assertEquals(expected1 + OS.NEWLINE + expected2, output);
     }
@@ -901,8 +1033,7 @@ static Stream<Arguments> getFormattedFieldName() {
                 Arguments.of("   = ", "", 2),
                 Arguments.of("a  = ", "a", 2),
                 Arguments.of("abc = ", "abc", 2),
-                Arguments.of("abcdef = ", "abcdef", 6)
-        );
+                Arguments.of("abcdef = ", "abcdef", 6));
     }
 
     @ParameterizedTest
@@ -915,10 +1046,13 @@ void getFormattedFieldName(String expected, String fieldName, int indent) {
     static Stream<Arguments> getLengthOfLongestFieldName() {
         return Stream.of(
                 Arguments.of(1, new BibEntry().withField(FieldFactory.parseField("t"), "t")),
-                Arguments.of(5, new BibEntry(EntryTypeFactory.parse("reference"))
-                        .withCitationKey("Broecker1984")
-                        .withField(StandardField.TITLE, "International Center of Photography}"))
-        );
+                Arguments.of(
+                        5,
+                        new BibEntry(EntryTypeFactory.parse("reference"))
+                                .withCitationKey("Broecker1984")
+                                .withField(
+                                        StandardField.TITLE,
+                                        "International Center of Photography}")));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java b/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java
index a5d47bd601dc..2a305bda610e 100644
--- a/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java
@@ -1,29 +1,30 @@
 package org.jabref.logic.bibtex;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.jabref.logic.os.OS;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.strings.StringUtil;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
 
 class FieldWriterTest {
 
     private FieldWriter writer;
 
     static Stream<Arguments> keepHashSignInComment() {
-        return Stream.of(Arguments.of("""
+        return Stream.of(
+                Arguments.of(
+                        """
                         # Changelog
 
                         All notable changes to this project will be documented in this file.
@@ -42,16 +43,16 @@ static Stream<Arguments> keepHashSignInComment() {
                                 #### Achievement\s
                                 Lorem ipsum dolor sit amet, consectetur adipiscing elit,
                                 #### Method
-                                Lorem ipsum dolor sit amet, consectetur adipiscing elit,"""
-                ),
+                                Lorem ipsum dolor sit amet, consectetur adipiscing elit,"""),
                 // source: https://github.com/JabRef/jabref/issues/8303 --> bug2.txt
-                Arguments.of("Particularly, we equip SOVA &#x2013; a Semantic and Ontological Variability Analysis method")
-                );
+                Arguments.of(
+                        "Particularly, we equip SOVA &#x2013; a Semantic and Ontological Variability Analysis method"));
     }
 
     @BeforeEach
     void setUp() {
-        FieldPreferences fieldPreferences = new FieldPreferences(true, List.of(StandardField.MONTH), Collections.emptyList());
+        FieldPreferences fieldPreferences =
+                new FieldPreferences(true, List.of(StandardField.MONTH), Collections.emptyList());
         writer = new FieldWriter(fieldPreferences);
     }
 
@@ -65,9 +66,11 @@ void keepHashSignInComment(String text) throws Exception {
 
     @Test
     void noNormalizationOfNewlinesInAbstractField() throws Exception {
-        String text = "lorem" + OS.NEWLINE + " ipsum lorem ipsum\nlorem ipsum \rlorem ipsum\r\ntest";
+        String text =
+                "lorem" + OS.NEWLINE + " ipsum lorem ipsum\nlorem ipsum \rlorem ipsum\r\ntest";
         String result = writer.write(StandardField.ABSTRACT, text);
-        // The normalization is done at org.jabref.logic.exporter.BibWriter, so no need to normalize here
+        // The normalization is done at org.jabref.logic.exporter.BibWriter, so no need to normalize
+        // here
         String expected = "{" + text + "}";
         assertEquals(expected, result);
     }
@@ -84,7 +87,8 @@ void preserveNewlineInAbstractField() throws Exception {
 
     @Test
     void preserveMultipleNewlinesInAbstractField() throws Exception {
-        String text = "lorem ipsum lorem ipsum" + OS.NEWLINE + OS.NEWLINE + "lorem ipsum lorem ipsum";
+        String text =
+                "lorem ipsum lorem ipsum" + OS.NEWLINE + OS.NEWLINE + "lorem ipsum lorem ipsum";
 
         String result = writer.write(StandardField.ABSTRACT, text);
         String expected = "{" + text + "}";
@@ -104,10 +108,12 @@ void preserveNewlineInReviewField() throws Exception {
 
     @Test
     void whitespaceFromNonMultiLineFieldsKept() throws Exception {
-        // This was a decision on 2024-06-15 when fixing https://github.com/JabRef/jabref/issues/4877
+        // This was a decision on 2024-06-15 when fixing
+        // https://github.com/JabRef/jabref/issues/4877
         // We want to have a clean architecture for reading and writing
         // Normalizing is done during write (and not during read)
-        // Furthermore, normalizing is done in the BibDatabaseWriter#applySaveActions and not in the fielld writer
+        // Furthermore, normalizing is done in the BibDatabaseWriter#applySaveActions and not in the
+        // fielld writer
 
         String original = "I\nshould\nnot\ninclude\nadditional\nwhitespaces  \nor\n\ttabs.";
         String expected = "{" + original + "}";
@@ -123,14 +129,18 @@ void whitespaceFromNonMultiLineFieldsKept() throws Exception {
     void reportUnbalancedBracing() throws Exception {
         String unbalanced = "{";
 
-        assertThrows(InvalidFieldValueException.class, () -> writer.write(new UnknownField("anyfield"), unbalanced));
+        assertThrows(
+                InvalidFieldValueException.class,
+                () -> writer.write(new UnknownField("anyfield"), unbalanced));
     }
 
     @Test
     void reportUnbalancedBracingWithEscapedBraces() throws Exception {
         String unbalanced = "{\\}";
 
-        assertThrows(InvalidFieldValueException.class, () -> writer.write(new UnknownField("anyfield"), unbalanced));
+        assertThrows(
+                InvalidFieldValueException.class,
+                () -> writer.write(new UnknownField("anyfield"), unbalanced));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java b/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java
index ff086d9b6612..ab1c59d2a69d 100644
--- a/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.bibtex;
 
-import java.nio.file.Path;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.jabref.model.entry.LinkedFile;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import java.nio.file.Path;
+import java.util.stream.Stream;
 
 class FileFieldWriterTest {
 
@@ -37,11 +36,10 @@ void quoteNull() {
 
     private static Stream<Arguments> getEncodingTestData() {
         return Stream.of(
-                Arguments.of("a:b;c:d", new String[][]{{"a", "b"}, {"c", "d"}}),
-                Arguments.of("a:;c:d", new String[][]{{"a", ""}, {"c", "d"}}),
-                Arguments.of("a:" + null + ";c:d", new String[][]{{"a", null}, {"c", "d"}}),
-                Arguments.of("a:\\:b;c\\;:d", new String[][]{{"a", ":b"}, {"c;", "d"}})
-        );
+                Arguments.of("a:b;c:d", new String[][] {{"a", "b"}, {"c", "d"}}),
+                Arguments.of("a:;c:d", new String[][] {{"a", ""}, {"c", "d"}}),
+                Arguments.of("a:" + null + ";c:d", new String[][] {{"a", null}, {"c", "d"}}),
+                Arguments.of("a:\\:b;c\\;:d", new String[][] {{"a", ":b"}, {"c;", "d"}}));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java
index 2146d4247b13..ab03e89b4a40 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java
@@ -1,24 +1,24 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Optional;
 
 class BibDatabaseDiffTest {
 
     @Test
     void compareOfEmptyDatabasesReportsNoDifferences() throws Exception {
-        BibDatabaseDiff diff = BibDatabaseDiff.compare(new BibDatabaseContext(), new BibDatabaseContext());
+        BibDatabaseDiff diff =
+                BibDatabaseDiff.compare(new BibDatabaseContext(), new BibDatabaseContext());
 
         assertEquals(Optional.empty(), diff.getPreambleDifferences());
         assertEquals(Optional.empty(), diff.getMetaDataDifferences());
@@ -37,8 +37,10 @@ void compareOfSameEntryReportsNoDifferences() throws Exception {
 
     @Test
     void compareOfDifferentEntriesWithSameDataReportsNoDifferences() throws Exception {
-        BibEntry entryOne = new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.TITLE, "test");
-        BibEntry entryTwo = new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.TITLE, "test");
+        BibEntry entryOne =
+                new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.TITLE, "test");
+        BibEntry entryTwo =
+                new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.TITLE, "test");
 
         BibDatabaseDiff diff = compareEntries(entryOne, entryTwo);
 
@@ -47,8 +49,10 @@ void compareOfDifferentEntriesWithSameDataReportsNoDifferences() throws Exceptio
 
     @Test
     void compareOfTwoEntriesWithSameContentAndLfEndingsReportsNoDifferences() throws Exception {
-        BibEntry entryOne = new BibEntry().withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
-        BibEntry entryTwo = new BibEntry().withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
+        BibEntry entryOne =
+                new BibEntry().withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
+        BibEntry entryTwo =
+                new BibEntry().withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
 
         BibDatabaseDiff diff = compareEntries(entryOne, entryTwo);
 
@@ -57,8 +61,10 @@ void compareOfTwoEntriesWithSameContentAndLfEndingsReportsNoDifferences() throws
 
     @Test
     void compareOfTwoEntriesWithSameContentAndCrLfEndingsReportsNoDifferences() throws Exception {
-        BibEntry entryOne = new BibEntry().withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
-        BibEntry entryTwo = new BibEntry().withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
+        BibEntry entryOne =
+                new BibEntry().withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
+        BibEntry entryTwo =
+                new BibEntry().withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
 
         BibDatabaseDiff diff = compareEntries(entryOne, entryTwo);
 
@@ -66,9 +72,12 @@ void compareOfTwoEntriesWithSameContentAndCrLfEndingsReportsNoDifferences() thro
     }
 
     @Test
-    void compareOfTwoEntriesWithSameContentAndMixedLineEndingsReportsNoDifferences() throws Exception {
-        BibEntry entryOne = new BibEntry().withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
-        BibEntry entryTwo = new BibEntry().withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
+    void compareOfTwoEntriesWithSameContentAndMixedLineEndingsReportsNoDifferences()
+            throws Exception {
+        BibEntry entryOne =
+                new BibEntry().withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
+        BibEntry entryTwo =
+                new BibEntry().withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
 
         BibDatabaseDiff diff = compareEntries(entryOne, entryTwo);
 
@@ -77,66 +86,100 @@ void compareOfTwoEntriesWithSameContentAndMixedLineEndingsReportsNoDifferences()
 
     @Test
     void compareOfTwoDifferentEntriesWithDifferentDataReportsDifferences() throws Exception {
-        BibEntry entryOne = new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.TITLE, "test");
-        BibEntry entryTwo = new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.TITLE, "another test");
+        BibEntry entryOne =
+                new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.TITLE, "test");
+        BibEntry entryTwo =
+                new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.TITLE, "another test");
 
         BibDatabaseDiff diff = compareEntries(entryOne, entryTwo);
 
         // two different entries between the databases
         assertEquals(2, diff.getEntryDifferences().size(), "incorrect amount of different entries");
 
-        assertEquals(entryOne, diff.getEntryDifferences().getFirst().originalEntry(), "there is another value as originalEntry");
+        assertEquals(
+                entryOne,
+                diff.getEntryDifferences().getFirst().originalEntry(),
+                "there is another value as originalEntry");
         assertNull(diff.getEntryDifferences().getFirst().newEntry(), "newEntry is not null");
-        assertEquals(entryTwo, diff.getEntryDifferences().get(1).newEntry(), "there is another value as newEntry");
+        assertEquals(
+                entryTwo,
+                diff.getEntryDifferences().get(1).newEntry(),
+                "there is another value as newEntry");
         assertNull(diff.getEntryDifferences().get(1).originalEntry(), "originalEntry is not null");
     }
 
     @Test
     void compareOfThreeDifferentEntriesWithDifferentDataReportsDifferences() throws Exception {
-        BibEntry entryOne = new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.TITLE, "test");
-        BibEntry entryTwo = new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.TITLE, "another test");
-        BibEntry entryThree = new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.TITLE, "again another test");
-        BibDatabaseContext databaseOne = new BibDatabaseContext(new BibDatabase(Collections.singletonList(entryOne)));
-        BibDatabaseContext databaseTwo = new BibDatabaseContext(new BibDatabase(Arrays.asList(entryTwo, entryThree)));
+        BibEntry entryOne =
+                new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.TITLE, "test");
+        BibEntry entryTwo =
+                new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.TITLE, "another test");
+        BibEntry entryThree =
+                new BibEntry(BibEntry.DEFAULT_TYPE)
+                        .withField(StandardField.TITLE, "again another test");
+        BibDatabaseContext databaseOne =
+                new BibDatabaseContext(new BibDatabase(Collections.singletonList(entryOne)));
+        BibDatabaseContext databaseTwo =
+                new BibDatabaseContext(new BibDatabase(Arrays.asList(entryTwo, entryThree)));
 
         BibDatabaseDiff diff = BibDatabaseDiff.compare(databaseOne, databaseTwo);
 
         // three different entries between the databases
         assertEquals(3, diff.getEntryDifferences().size(), "incorrect amount of different entries");
 
-        assertEquals(entryOne, diff.getEntryDifferences().getFirst().originalEntry(), "there is another value as originalEntry");
+        assertEquals(
+                entryOne,
+                diff.getEntryDifferences().getFirst().originalEntry(),
+                "there is another value as originalEntry");
         assertNull(diff.getEntryDifferences().getFirst().newEntry(), "newEntry is not null");
-        assertEquals(entryTwo, diff.getEntryDifferences().get(1).newEntry(), "there is another value as newEntry");
+        assertEquals(
+                entryTwo,
+                diff.getEntryDifferences().get(1).newEntry(),
+                "there is another value as newEntry");
         assertNull(diff.getEntryDifferences().get(1).originalEntry(), "originalEntry is not null");
-        assertEquals(entryThree, diff.getEntryDifferences().get(2).newEntry(), "there is another value as newEntry [2]");
-        assertNull(diff.getEntryDifferences().get(2).originalEntry(), "originalEntry is not null [2]");
+        assertEquals(
+                entryThree,
+                diff.getEntryDifferences().get(2).newEntry(),
+                "there is another value as newEntry [2]");
+        assertNull(
+                diff.getEntryDifferences().get(2).originalEntry(), "originalEntry is not null [2]");
     }
 
     @Test
     void compareOfTwoEntriesWithEqualCitationKeysShouldReportsOneDifference() {
-        BibEntry entryOne = new BibEntry(BibEntry.DEFAULT_TYPE)
-                .withField(StandardField.TITLE, "test")
-                .withField(StandardField.AUTHOR, "author")
-                .withField(StandardField.YEAR, "2001")
-                .withCitationKey("key");
-        BibEntry entryTwo = new BibEntry(BibEntry.DEFAULT_TYPE)
-                .withField(StandardField.TITLE, "test1")
-                .withField(StandardField.AUTHOR, "writer")
-                .withField(StandardField.YEAR, "1899")
-                .withCitationKey("key");
+        BibEntry entryOne =
+                new BibEntry(BibEntry.DEFAULT_TYPE)
+                        .withField(StandardField.TITLE, "test")
+                        .withField(StandardField.AUTHOR, "author")
+                        .withField(StandardField.YEAR, "2001")
+                        .withCitationKey("key");
+        BibEntry entryTwo =
+                new BibEntry(BibEntry.DEFAULT_TYPE)
+                        .withField(StandardField.TITLE, "test1")
+                        .withField(StandardField.AUTHOR, "writer")
+                        .withField(StandardField.YEAR, "1899")
+                        .withCitationKey("key");
 
         BibDatabaseDiff diff = compareEntries(entryOne, entryTwo);
 
         // two different entries between the databases
         assertEquals(1, diff.getEntryDifferences().size(), "incorrect amount of different entries");
 
-        assertEquals(entryOne, diff.getEntryDifferences().getFirst().originalEntry(), "there is another value as originalEntry");
-        assertEquals(entryTwo, diff.getEntryDifferences().getFirst().newEntry(), "there is another value as newEntry");
+        assertEquals(
+                entryOne,
+                diff.getEntryDifferences().getFirst().originalEntry(),
+                "there is another value as originalEntry");
+        assertEquals(
+                entryTwo,
+                diff.getEntryDifferences().getFirst().newEntry(),
+                "there is another value as newEntry");
     }
 
     private BibDatabaseDiff compareEntries(BibEntry entryOne, BibEntry entryTwo) {
-        BibDatabaseContext databaseOne = new BibDatabaseContext(new BibDatabase(Collections.singletonList(entryOne)));
-        BibDatabaseContext databaseTwo = new BibDatabaseContext(new BibDatabase(Collections.singletonList(entryTwo)));
+        BibDatabaseContext databaseOne =
+                new BibDatabaseContext(new BibDatabase(Collections.singletonList(entryOne)));
+        BibDatabaseContext databaseTwo =
+                new BibDatabaseContext(new BibDatabase(Collections.singletonList(entryTwo)));
 
         return BibDatabaseDiff.compare(databaseOne, databaseTwo);
     }
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/BibStringDiffTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/BibStringDiffTest.java
index f31bc64512f3..5fbf9f4c7e73 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/BibStringDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/BibStringDiffTest.java
@@ -1,24 +1,25 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibtexString;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Collections;
+import java.util.List;
 
 class BibStringDiffTest {
 
     private final BibDatabase originalDataBase = mock(BibDatabase.class);
     private final BibDatabase newDataBase = mock(BibDatabase.class);
-    private final BibStringDiff diff = new BibStringDiff(new BibtexString("name2", "content2"), new BibtexString("name2", "content3"));
+    private final BibStringDiff diff =
+            new BibStringDiff(
+                    new BibtexString("name2", "content2"), new BibtexString("name2", "content3"));
 
     @BeforeEach
     void setUp() {
@@ -28,8 +29,16 @@ void setUp() {
 
     @Test
     void compareTest() {
-        when(originalDataBase.getStringValues()).thenReturn(List.of(new BibtexString("name", "content"), new BibtexString("name2", "content2")));
-        when(newDataBase.getStringValues()).thenReturn(List.of(new BibtexString("name", "content"), new BibtexString("name2", "content3")));
+        when(originalDataBase.getStringValues())
+                .thenReturn(
+                        List.of(
+                                new BibtexString("name", "content"),
+                                new BibtexString("name2", "content2")));
+        when(newDataBase.getStringValues())
+                .thenReturn(
+                        List.of(
+                                new BibtexString("name", "content"),
+                                new BibtexString("name2", "content3")));
 
         List<BibStringDiff> result = BibStringDiff.compare(originalDataBase, newDataBase);
         assertEquals(List.of(diff), result);
@@ -84,18 +93,24 @@ void compareEmptyDatabases() {
 
     @Test
     void compareNameChange() {
-        when(originalDataBase.getStringValues()).thenReturn(List.of(new BibtexString("name", "content")));
-        when(newDataBase.getStringValues()).thenReturn(List.of(new BibtexString("name2", "content")));
+        when(originalDataBase.getStringValues())
+                .thenReturn(List.of(new BibtexString("name", "content")));
+        when(newDataBase.getStringValues())
+                .thenReturn(List.of(new BibtexString("name2", "content")));
 
         List<BibStringDiff> result = BibStringDiff.compare(originalDataBase, newDataBase);
-        BibStringDiff expectedDiff = new BibStringDiff(new BibtexString("name", "content"), new BibtexString("name2", "content"));
+        BibStringDiff expectedDiff =
+                new BibStringDiff(
+                        new BibtexString("name", "content"), new BibtexString("name2", "content"));
         assertEquals(List.of(expectedDiff), result);
     }
 
     @Test
     void compareNoDiff() {
-        when(originalDataBase.getStringValues()).thenReturn(List.of(new BibtexString("name", "content")));
-        when(newDataBase.getStringValues()).thenReturn(List.of(new BibtexString("name", "content")));
+        when(originalDataBase.getStringValues())
+                .thenReturn(List.of(new BibtexString("name", "content")));
+        when(newDataBase.getStringValues())
+                .thenReturn(List.of(new BibtexString("name", "content")));
 
         List<BibStringDiff> result = BibStringDiff.compare(originalDataBase, newDataBase);
         assertEquals(Collections.emptyList(), result);
@@ -103,7 +118,8 @@ void compareNoDiff() {
 
     @Test
     void compareRemovedString() {
-        when(originalDataBase.getStringValues()).thenReturn(List.of(new BibtexString("name", "content")));
+        when(originalDataBase.getStringValues())
+                .thenReturn(List.of(new BibtexString("name", "content")));
         when(newDataBase.getStringValues()).thenReturn(Collections.emptyList());
 
         List<BibStringDiff> result = BibStringDiff.compare(originalDataBase, newDataBase);
@@ -114,7 +130,8 @@ void compareRemovedString() {
     @Test
     void compareAddString() {
         when(originalDataBase.getStringValues()).thenReturn(Collections.emptyList());
-        when(newDataBase.getStringValues()).thenReturn(List.of(new BibtexString("name", "content")));
+        when(newDataBase.getStringValues())
+                .thenReturn(List.of(new BibtexString("name", "content")));
 
         List<BibStringDiff> result = BibStringDiff.compare(originalDataBase, newDataBase);
         BibStringDiff expectedDiff = new BibStringDiff(null, new BibtexString("name", "content"));
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java
index 9edb4229ff6a..3613f37d5c14 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java
@@ -1,12 +1,11 @@
 package org.jabref.logic.bibtex.comparator;
 
-import org.jabref.model.entry.BibtexString;
-
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.jabref.model.entry.BibtexString;
+import org.junit.jupiter.api.Test;
+
 class BibtexStringComparatorTest {
 
     private final BibtexStringComparator bsc1 = new BibtexStringComparator(false);
@@ -21,16 +20,25 @@ void test() {
         // Same string
         assertEquals(0, bsc1.compare(bs1, bs1), "Error when comparing the same string");
         // Same content
-        assertEquals(0, bsc1.compare(bs2, bs3), "Different strings do not contain the same content");
+        assertEquals(
+                0, bsc1.compare(bs2, bs3), "Different strings do not contain the same content");
         // Alphabetical order
         assertTrue(bsc1.compare(bs1, bs2) > 0, "bs1 does not lexicographically succeed bs2");
         assertTrue(bsc1.compare(bs2, bs1) < 0, "bs2 does not lexicographically precede bs1");
 
         // Same, but with the comparator checking for internal strings (none)
-        assertEquals(0, bsc2.compare(bs1, bs1), "Error when comparing the same string [internal checking enabled]");
-        assertEquals(0, bsc2.compare(bs2, bs3), "Different strings do not contain the same content [internal checking enabled]");
-        assertTrue(bsc2.compare(bs1, bs2) > 0, "bs1 does not succeed bs2 [internal checking enabled]");
-        assertTrue(bsc2.compare(bs2, bs1) < 0, "bs2 does not precede bs1 [internal checking enabled]");
+        assertEquals(
+                0,
+                bsc2.compare(bs1, bs1),
+                "Error when comparing the same string [internal checking enabled]");
+        assertEquals(
+                0,
+                bsc2.compare(bs2, bs3),
+                "Different strings do not contain the same content [internal checking enabled]");
+        assertTrue(
+                bsc2.compare(bs1, bs2) > 0, "bs1 does not succeed bs2 [internal checking enabled]");
+        assertTrue(
+                bsc2.compare(bs2, bs1) < 0, "bs2 does not precede bs1 [internal checking enabled]");
 
         // Create string with internal string
         BibtexString bs4 = new BibtexString("DSPVLSI", "#VLSI# #DSP#");
@@ -39,7 +47,8 @@ void test() {
         assertTrue(bsc1.compare(bs4, bs1) < 0, "bs4 does not lexicographically precede bs1");
 
         // bs4 after bs1 if considering that bs4 contains bs1
-        assertTrue(bsc2.compare(bs1, bs4) < 0, "bs4 does not contain bs1 [internal checking enabled]");
+        assertTrue(
+                bsc2.compare(bs1, bs4) < 0, "bs4 does not contain bs1 [internal checking enabled]");
         assertTrue(bsc2.compare(bs4, bs1) > 0, "bs4 contains bs1 [internal checking enabled]");
     }
 }
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java
index 70a040459f04..409aa7d13d95 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.bibtex.comparator;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class CrossRefEntryComparatorTest {
     private CrossRefEntryComparator comparator;
 
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java
index c8c44802d818..5aa7c8ec12c5 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java
@@ -1,28 +1,26 @@
 package org.jabref.logic.bibtex.comparator;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class EntryComparatorTest {
 
     @SuppressWarnings("EqualsWithItself")
     @Test
     void recognizeIdenticalObjectsAsEqual() {
         BibEntry entry = new BibEntry();
-        assertEquals(0, new EntryComparator(false, false, StandardField.TITLE).compare(entry, entry));
+        assertEquals(
+                0, new EntryComparator(false, false, StandardField.TITLE).compare(entry, entry));
     }
 
     @Test
     void compareAuthorFieldBiggerAscending() {
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.AUTHOR, "Stephen King");
-        BibEntry entry2 = new BibEntry()
-                .withField(StandardField.AUTHOR, "Henning Mankell");
+        BibEntry entry1 = new BibEntry().withField(StandardField.AUTHOR, "Stephen King");
+        BibEntry entry2 = new BibEntry().withField(StandardField.AUTHOR, "Henning Mankell");
         EntryComparator entryComparator = new EntryComparator(false, false, StandardField.AUTHOR);
 
         assertEquals(-2, entryComparator.compare(entry1, entry2));
@@ -30,10 +28,9 @@ void compareAuthorFieldBiggerAscending() {
 
     @Test
     void bothEntriesHaveNotSetTheFieldToCompareAscending() {
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.BOOKTITLE, "Stark - The Dark Half (1989)");
-        BibEntry entry2 = new BibEntry()
-                .withField(StandardField.COMMENTATOR, "Some Commentator");
+        BibEntry entry1 =
+                new BibEntry().withField(StandardField.BOOKTITLE, "Stark - The Dark Half (1989)");
+        BibEntry entry2 = new BibEntry().withField(StandardField.COMMENTATOR, "Some Commentator");
         EntryComparator entryComparator = new EntryComparator(false, false, StandardField.TITLE);
 
         assertEquals(-1, entryComparator.compare(entry1, entry2));
@@ -41,10 +38,9 @@ void bothEntriesHaveNotSetTheFieldToCompareAscending() {
 
     @Test
     void secondEntryHasNotSetFieldToCompareAscending() {
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.TITLE, "Stark - The Dark Half (1989)");
-        BibEntry entry2 = new BibEntry()
-                .withField(StandardField.COMMENTATOR, "Some Commentator");
+        BibEntry entry1 =
+                new BibEntry().withField(StandardField.TITLE, "Stark - The Dark Half (1989)");
+        BibEntry entry2 = new BibEntry().withField(StandardField.COMMENTATOR, "Some Commentator");
         EntryComparator entryComparator = new EntryComparator(false, false, StandardField.TITLE);
 
         assertEquals(1, entryComparator.compare(entry1, entry2));
@@ -52,10 +48,9 @@ void secondEntryHasNotSetFieldToCompareAscending() {
 
     @Test
     void firstEntryHasNotSetFieldToCompareAscending() {
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.COMMENTATOR, "Some Commentator");
-        BibEntry entry2 = new BibEntry()
-                .withField(StandardField.TITLE, "Stark - The Dark Half (1989)");
+        BibEntry entry1 = new BibEntry().withField(StandardField.COMMENTATOR, "Some Commentator");
+        BibEntry entry2 =
+                new BibEntry().withField(StandardField.TITLE, "Stark - The Dark Half (1989)");
 
         EntryComparator entryComparator = new EntryComparator(false, false, StandardField.TITLE);
 
@@ -64,10 +59,8 @@ void firstEntryHasNotSetFieldToCompareAscending() {
 
     @Test
     void bothEntriesNumericAscending() {
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.EDITION, "1");
-        BibEntry entry2 = new BibEntry()
-                .withField(StandardField.EDITION, "3");
+        BibEntry entry1 = new BibEntry().withField(StandardField.EDITION, "1");
+        BibEntry entry2 = new BibEntry().withField(StandardField.EDITION, "3");
 
         EntryComparator entryComparator = new EntryComparator(false, false, StandardField.EDITION);
 
@@ -76,85 +69,74 @@ void bothEntriesNumericAscending() {
 
     @Test
     void compareObjectsByKeyAscending() {
-        BibEntry e1 = new BibEntry()
-                .withCitationKey("Mayer2019b");
-        BibEntry e2 = new BibEntry()
-                .withCitationKey("Mayer2019a");
+        BibEntry e1 = new BibEntry().withCitationKey("Mayer2019b");
+        BibEntry e2 = new BibEntry().withCitationKey("Mayer2019a");
         assertEquals(1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e1, e2));
-        assertEquals(-1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e2, e1));
+        assertEquals(
+                -1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e2, e1));
     }
 
     @Test
     void compareObjectsByKeyWithNull() {
-        BibEntry e1 = new BibEntry()
-                .withCitationKey("Mayer2019b");
+        BibEntry e1 = new BibEntry().withCitationKey("Mayer2019b");
         BibEntry e2 = new BibEntry();
         assertEquals(1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e1, e2));
-        assertEquals(-1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e2, e1));
+        assertEquals(
+                -1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e2, e1));
     }
 
     @Test
     void compareObjectsByKeyWithBlank() {
-        BibEntry e1 = new BibEntry()
-                .withCitationKey("Mayer2019b");
-        BibEntry e2 = new BibEntry()
-                .withCitationKey(" ");
+        BibEntry e1 = new BibEntry().withCitationKey("Mayer2019b");
+        BibEntry e2 = new BibEntry().withCitationKey(" ");
         assertEquals(1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e1, e2));
-        assertEquals(-1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e2, e1));
+        assertEquals(
+                -1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e2, e1));
     }
 
     @Test
     void compareWithCrLfFields() {
-        BibEntry e1 = new BibEntry()
-                .withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
-        BibEntry e2 = new BibEntry()
-                .withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
+        BibEntry e1 =
+                new BibEntry().withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
+        BibEntry e2 =
+                new BibEntry().withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
         assertEquals(0, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e1, e2));
     }
 
     @Test
     void compareWithLfFields() {
-        BibEntry e1 = new BibEntry()
-                .withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
-        BibEntry e2 = new BibEntry()
-                .withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
+        BibEntry e1 = new BibEntry().withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
+        BibEntry e2 = new BibEntry().withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
         assertEquals(0, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e1, e2));
     }
 
     @Test
     void compareWithMixedLineEndings() {
-        BibEntry e1 = new BibEntry()
-                .withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
-        BibEntry e2 = new BibEntry()
-                .withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
-        assertEquals(-1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e1, e2));
+        BibEntry e1 = new BibEntry().withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
+        BibEntry e2 =
+                new BibEntry().withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
+        assertEquals(
+                -1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e1, e2));
     }
 
     @Test
     void withAuthorIsBeforeWithEmptyAuthorWhenSortingWithNonExistentKey() {
-        BibEntry e1 = new BibEntry()
-            .withField(StandardField.AUTHOR, "Stephen King");
-        BibEntry e2 = new BibEntry()
-            .withField(StandardField.AUTHOR, "");
+        BibEntry e1 = new BibEntry().withField(StandardField.AUTHOR, "Stephen King");
+        BibEntry e2 = new BibEntry().withField(StandardField.AUTHOR, "");
         assertEquals(-1, new EntryComparator(true, false, InternalField.KEY_FIELD).compare(e1, e2));
     }
 
     @Test
     void withAuthorIsBeforeEmptyAuthorWhenSortingWithAuthor() {
-        BibEntry e1 = new BibEntry()
-            .withField(StandardField.AUTHOR, "Stephen King");
-        BibEntry e2 = new BibEntry()
-            .withField(StandardField.AUTHOR, "");
+        BibEntry e1 = new BibEntry().withField(StandardField.AUTHOR, "Stephen King");
+        BibEntry e2 = new BibEntry().withField(StandardField.AUTHOR, "");
         assertEquals(-1, new EntryComparator(true, false, StandardField.AUTHOR).compare(e1, e2));
     }
 
     @Test
     void withAuthorIsBeforeWithoutAuthorWhenSortingWithAuthor() {
-        BibEntry e1 = new BibEntry()
-            .withField(StandardField.AUTHOR, "Stephen King");
+        BibEntry e1 = new BibEntry().withField(StandardField.AUTHOR, "Stephen King");
         BibEntry e2 = new BibEntry();
         assertEquals(1, new EntryComparator(false, false, StandardField.AUTHOR).compare(e1, e2));
     }
 }
-
-
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java
index bbe85f3e60ac..34de11157333 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java
@@ -1,26 +1,24 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class FieldComparatorTest {
     @Test
     void compareMonthFieldIdentity() throws Exception {
         FieldComparator comparator = new FieldComparator(StandardField.MONTH);
-        BibEntry equal = new BibEntry()
-                .withField(StandardField.MONTH, "1");
+        BibEntry equal = new BibEntry().withField(StandardField.MONTH, "1");
 
         assertEquals(0, comparator.compare(equal, equal));
     }
@@ -28,10 +26,8 @@ void compareMonthFieldIdentity() throws Exception {
     @Test
     void compareMonthFieldEquality() throws Exception {
         FieldComparator comparator = new FieldComparator(StandardField.MONTH);
-        BibEntry equal = new BibEntry()
-                .withField(StandardField.MONTH, "1");
-        BibEntry equal2 = new BibEntry()
-                .withField(StandardField.MONTH, "1");
+        BibEntry equal = new BibEntry().withField(StandardField.MONTH, "1");
+        BibEntry equal2 = new BibEntry().withField(StandardField.MONTH, "1");
 
         assertEquals(0, comparator.compare(equal, equal2));
     }
@@ -39,10 +35,8 @@ void compareMonthFieldEquality() throws Exception {
     @Test
     void compareMonthFieldBiggerAscending() throws Exception {
         FieldComparator comparator = new FieldComparator(StandardField.MONTH);
-        BibEntry smaller = new BibEntry()
-                .withField(StandardField.MONTH, "jan");
-        BibEntry bigger = new BibEntry()
-                .withField(StandardField.MONTH, "feb");
+        BibEntry smaller = new BibEntry().withField(StandardField.MONTH, "jan");
+        BibEntry bigger = new BibEntry().withField(StandardField.MONTH, "feb");
 
         assertEquals(1, comparator.compare(bigger, smaller));
     }
@@ -50,10 +44,8 @@ void compareMonthFieldBiggerAscending() throws Exception {
     @Test
     void compareMonthFieldBiggerDescending() throws Exception {
         FieldComparator comparator = new FieldComparator(new OrFields(StandardField.MONTH), true);
-        BibEntry smaller = new BibEntry()
-                .withField(StandardField.MONTH, "feb");
-        BibEntry bigger = new BibEntry()
-                .withField(StandardField.MONTH, "jan");
+        BibEntry smaller = new BibEntry().withField(StandardField.MONTH, "feb");
+        BibEntry bigger = new BibEntry().withField(StandardField.MONTH, "jan");
 
         assertEquals(1, comparator.compare(bigger, smaller));
     }
@@ -61,8 +53,7 @@ void compareMonthFieldBiggerDescending() throws Exception {
     @Test
     void compareYearFieldIdentity() throws Exception {
         FieldComparator comparator = new FieldComparator(StandardField.YEAR);
-        BibEntry equal = new BibEntry()
-                .withField(StandardField.YEAR, "2016");
+        BibEntry equal = new BibEntry().withField(StandardField.YEAR, "2016");
 
         assertEquals(0, comparator.compare(equal, equal));
     }
@@ -70,10 +61,8 @@ void compareYearFieldIdentity() throws Exception {
     @Test
     void compareYearFieldEquality() throws Exception {
         FieldComparator comparator = new FieldComparator(StandardField.YEAR);
-        BibEntry equal = new BibEntry()
-                .withField(StandardField.YEAR, "2016");
-        BibEntry equal2 = new BibEntry()
-                .withField(StandardField.YEAR, "2016");
+        BibEntry equal = new BibEntry().withField(StandardField.YEAR, "2016");
+        BibEntry equal2 = new BibEntry().withField(StandardField.YEAR, "2016");
 
         assertEquals(0, comparator.compare(equal, equal2));
     }
@@ -81,10 +70,8 @@ void compareYearFieldEquality() throws Exception {
     @Test
     void compareYearFieldBiggerAscending() throws Exception {
         FieldComparator comparator = new FieldComparator(StandardField.YEAR);
-        BibEntry smaller = new BibEntry()
-                .withField(StandardField.YEAR, "2000");
-        BibEntry bigger = new BibEntry()
-                .withField(StandardField.YEAR, "2016");
+        BibEntry smaller = new BibEntry().withField(StandardField.YEAR, "2000");
+        BibEntry bigger = new BibEntry().withField(StandardField.YEAR, "2016");
 
         assertEquals(1, comparator.compare(bigger, smaller));
     }
@@ -92,10 +79,8 @@ void compareYearFieldBiggerAscending() throws Exception {
     @Test
     void compareYearFieldBiggerDescending() throws Exception {
         FieldComparator comparator = new FieldComparator(new OrFields(StandardField.YEAR), true);
-        BibEntry smaller = new BibEntry()
-                .withField(StandardField.YEAR, "2016");
-        BibEntry bigger = new BibEntry()
-                .withField(StandardField.YEAR, "2000");
+        BibEntry smaller = new BibEntry().withField(StandardField.YEAR, "2016");
+        BibEntry bigger = new BibEntry().withField(StandardField.YEAR, "2000");
 
         assertEquals(1, comparator.compare(bigger, smaller));
     }
@@ -130,7 +115,8 @@ void compareTypeFieldBiggerAscending() throws Exception {
 
     @Test
     void compareTypeFieldBiggerDescending() throws Exception {
-        FieldComparator comparator = new FieldComparator(new OrFields(InternalField.TYPE_HEADER), true);
+        FieldComparator comparator =
+                new FieldComparator(new OrFields(InternalField.TYPE_HEADER), true);
         BibEntry bigger = new BibEntry(StandardEntryType.Article);
         BibEntry smaller = new BibEntry(StandardEntryType.Book);
 
@@ -140,8 +126,7 @@ void compareTypeFieldBiggerDescending() throws Exception {
     @Test
     void compareStringFieldsIdentity() throws Exception {
         FieldComparator comparator = new FieldComparator(StandardField.TITLE);
-        BibEntry equal = new BibEntry()
-                .withField(StandardField.TITLE, "title");
+        BibEntry equal = new BibEntry().withField(StandardField.TITLE, "title");
 
         assertEquals(0, comparator.compare(equal, equal));
     }
@@ -149,10 +134,8 @@ void compareStringFieldsIdentity() throws Exception {
     @Test
     void compareStringFieldsEquality() throws Exception {
         FieldComparator comparator = new FieldComparator(StandardField.TITLE);
-        BibEntry equal = new BibEntry()
-                .withField(StandardField.TITLE, "title");
-        BibEntry equal2 = new BibEntry()
-                .withField(StandardField.TITLE, "title");
+        BibEntry equal = new BibEntry().withField(StandardField.TITLE, "title");
+        BibEntry equal2 = new BibEntry().withField(StandardField.TITLE, "title");
 
         assertEquals(0, comparator.compare(equal, equal2));
     }
@@ -160,10 +143,8 @@ void compareStringFieldsEquality() throws Exception {
     @Test
     void compareStringFieldsBiggerAscending() throws Exception {
         FieldComparator comparator = new FieldComparator(StandardField.TITLE);
-        BibEntry bigger = new BibEntry()
-                .withField(StandardField.TITLE, "b");
-        BibEntry smaller = new BibEntry()
-                .withField(StandardField.TITLE, "a");
+        BibEntry bigger = new BibEntry().withField(StandardField.TITLE, "b");
+        BibEntry smaller = new BibEntry().withField(StandardField.TITLE, "a");
 
         assertEquals(1, comparator.compare(bigger, smaller));
     }
@@ -171,10 +152,8 @@ void compareStringFieldsBiggerAscending() throws Exception {
     @Test
     void compareStringFieldsBiggerDescending() throws Exception {
         FieldComparator comparator = new FieldComparator(new OrFields(StandardField.TITLE), true);
-        BibEntry bigger = new BibEntry()
-                .withField(StandardField.TITLE, "a");
-        BibEntry smaller = new BibEntry()
-                .withField(StandardField.TITLE, "b");
+        BibEntry bigger = new BibEntry().withField(StandardField.TITLE, "a");
+        BibEntry smaller = new BibEntry().withField(StandardField.TITLE, "b");
 
         assertEquals(1, comparator.compare(bigger, smaller));
     }
@@ -182,10 +161,8 @@ void compareStringFieldsBiggerDescending() throws Exception {
     @Test
     void compareNumericFieldsBiggerDescending() throws Exception {
         FieldComparator comparator = new FieldComparator(new OrFields(StandardField.PMID), true);
-        BibEntry smaller = new BibEntry()
-                .withField(StandardField.PMID, "234567");
-        BibEntry bigger = new BibEntry()
-                .withField(StandardField.PMID, "123456");
+        BibEntry smaller = new BibEntry().withField(StandardField.PMID, "234567");
+        BibEntry bigger = new BibEntry().withField(StandardField.PMID, "123456");
 
         assertEquals(1, comparator.compare(bigger, smaller));
     }
@@ -193,10 +170,8 @@ void compareNumericFieldsBiggerDescending() throws Exception {
     @Test
     void compareParsableWithNonParsableNumericFieldDescending() throws Exception {
         FieldComparator comparator = new FieldComparator(new OrFields(StandardField.PMID), true);
-        BibEntry parsable = new BibEntry()
-                .withField(StandardField.PMID, "123456");
-        BibEntry unparsable = new BibEntry()
-                .withField(StandardField.PMID, "abc##z");
+        BibEntry parsable = new BibEntry().withField(StandardField.PMID, "123456");
+        BibEntry unparsable = new BibEntry().withField(StandardField.PMID, "abc##z");
 
         assertEquals(1, comparator.compare(parsable, unparsable));
     }
@@ -205,10 +180,8 @@ void compareParsableWithNonParsableNumericFieldDescending() throws Exception {
     @MethodSource
     void compareNumericalValues(int comparisonResult, String id1, String id2, String message) {
         FieldComparator comparator = new FieldComparator(StandardField.PMID);
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.PMID, id1);
-        BibEntry entry2 = new BibEntry()
-                .withField(StandardField.PMID, id2);
+        BibEntry entry1 = new BibEntry().withField(StandardField.PMID, id1);
+        BibEntry entry2 = new BibEntry().withField(StandardField.PMID, id2);
 
         assertEquals(comparisonResult, comparator.compare(entry1, entry2), message);
     }
@@ -216,12 +189,21 @@ void compareNumericalValues(int comparisonResult, String id1, String id2, String
     private static Stream<Arguments> compareNumericalValues() {
         return Stream.of(
                 Arguments.of(0, "123456", "123456", "IDs should be lexicographically equal"),
-                Arguments.of(1, "234567", "123456", "234567 should be lexicographically greater than 123456"),
-                Arguments.of(1, "abc##z", "123456", "abc##z should be lexicographically greater than 123456 "),
+                Arguments.of(
+                        1,
+                        "234567",
+                        "123456",
+                        "234567 should be lexicographically greater than 123456"),
+                Arguments.of(
+                        1,
+                        "abc##z",
+                        "123456",
+                        "abc##z should be lexicographically greater than 123456 "),
                 Arguments.of(0, "", "", "Empty IDs should be lexicographically equal"),
-                Arguments.of(-1, "", "123456", "No ID should be lexicographically smaller than 123456"),
-                Arguments.of(1, "123456", "", "123456 should be lexicographically greater than no ID")
-        );
+                Arguments.of(
+                        -1, "", "123456", "No ID should be lexicographically smaller than 123456"),
+                Arguments.of(
+                        1, "123456", "", "123456 should be lexicographically greater than no ID"));
     }
 
     @ParameterizedTest
@@ -247,17 +229,14 @@ private static Stream<Arguments> nullTests() {
                 Arguments.of(0, null, null),
                 Arguments.of(0, "value", "value"),
                 Arguments.of(-1, null, "value"),
-                Arguments.of(1, "value", null)
-        );
+                Arguments.of(1, "value", null));
     }
 
     @Test
     void compareAuthorField() throws Exception {
         FieldComparator comparator = new FieldComparator(StandardField.AUTHOR);
-        BibEntry bigger = new BibEntry()
-                .withField(StandardField.AUTHOR, "Freund, Lucas");
-        BibEntry smaller = new BibEntry()
-                .withField(StandardField.AUTHOR, "Mustermann, Max");
+        BibEntry bigger = new BibEntry().withField(StandardField.AUTHOR, "Freund, Lucas");
+        BibEntry smaller = new BibEntry().withField(StandardField.AUTHOR, "Mustermann, Max");
 
         assertEquals(1, comparator.compare(smaller, bigger));
     }
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/GroupDiffTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/GroupDiffTest.java
index 1153b498ced4..3a634285ffd3 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/GroupDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/GroupDiffTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.model.groups.AllEntriesGroup;
 import org.jabref.model.groups.ExplicitGroup;
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.metadata.MetaData;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Optional;
 
 class GroupDiffTest {
 
@@ -25,8 +24,9 @@ class GroupDiffTest {
     void setup() {
         rootOriginal = GroupTreeNode.fromGroup(new AllEntriesGroup("All entries"));
         rootOriginal.addSubgroup(new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ','));
-        GroupTreeNode parent = rootOriginal
-                .addSubgroup(new ExplicitGroup("ExplicitParent", GroupHierarchyType.INDEPENDENT, ','));
+        GroupTreeNode parent =
+                rootOriginal.addSubgroup(
+                        new ExplicitGroup("ExplicitParent", GroupHierarchyType.INDEPENDENT, ','));
         parent.addSubgroup(new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ','));
     }
 
@@ -56,9 +56,14 @@ void compareWithChangedGroup() {
 
         Optional<GroupDiff> groupDiff = GroupDiff.compare(originalMetaData, newMetaData);
 
-        Optional<GroupDiff> expectedGroupDiff = Optional.of(new GroupDiff(originalMetaData.getGroups().get(), newMetaData.getGroups().get()));
+        Optional<GroupDiff> expectedGroupDiff =
+                Optional.of(
+                        new GroupDiff(
+                                originalMetaData.getGroups().get(), newMetaData.getGroups().get()));
 
         assertEquals(expectedGroupDiff.get().getNewGroupRoot(), groupDiff.get().getNewGroupRoot());
-        assertEquals(expectedGroupDiff.get().getOriginalGroupRoot(), groupDiff.get().getOriginalGroupRoot());
+        assertEquals(
+                expectedGroupDiff.get().getOriginalGroupRoot(),
+                groupDiff.get().getOriginalGroupRoot());
     }
 }
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java
index 447c227f7051..58f49408fee8 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java
@@ -1,7 +1,7 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.jabref.logic.groups.DefaultGroupsFactory;
 import org.jabref.model.entry.field.StandardField;
@@ -10,11 +10,10 @@
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.metadata.ContentSelector;
 import org.jabref.model.metadata.MetaData;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.List;
+import java.util.Optional;
 
 class MetaDataDiffTest {
     @Test
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/PreambleDiffTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/PreambleDiffTest.java
index f8007dd96b3c..2b2355727fc0 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/PreambleDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/PreambleDiffTest.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Optional;
 
 class PreambleDiffTest {
 
@@ -30,7 +29,9 @@ void compareSamePreambleTest() {
         when(originalDataBase.getPreamble()).thenReturn(Optional.of("preamble"));
         when(newDataBase.getPreamble()).thenReturn(Optional.of("preamble"));
 
-        assertEquals(Optional.empty(), PreambleDiff.compare(originalDataBaseContext, newDataBaseContext));
+        assertEquals(
+                Optional.empty(),
+                PreambleDiff.compare(originalDataBaseContext, newDataBaseContext));
     }
 
     @Test
@@ -38,8 +39,10 @@ void compareDifferentPreambleTest() {
         when(originalDataBase.getPreamble()).thenReturn(Optional.of("preamble"));
         when(newDataBase.getPreamble()).thenReturn(Optional.of("otherPreamble"));
 
-        Optional<PreambleDiff> expected = Optional.of(new PreambleDiff("preamble", "otherPreamble"));
-        Optional<PreambleDiff> result = PreambleDiff.compare(originalDataBaseContext, newDataBaseContext);
+        Optional<PreambleDiff> expected =
+                Optional.of(new PreambleDiff("preamble", "otherPreamble"));
+        Optional<PreambleDiff> result =
+                PreambleDiff.compare(originalDataBaseContext, newDataBaseContext);
         assertEquals(expected, result);
     }
 }
diff --git a/src/test/java/org/jabref/logic/bst/BstFunctionsTest.java b/src/test/java/org/jabref/logic/bst/BstFunctionsTest.java
index f9f8a85a8f10..be78a9f71b8f 100644
--- a/src/test/java/org/jabref/logic/bst/BstFunctionsTest.java
+++ b/src/test/java/org/jabref/logic/bst/BstFunctionsTest.java
@@ -1,24 +1,23 @@
 package org.jabref.logic.bst;
 
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.antlr.v4.runtime.RecognitionException;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import org.antlr.v4.runtime.RecognitionException;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 /**
  * For additional tests see for
@@ -33,7 +32,9 @@
 class BstFunctionsTest {
     @Test
     void compareFunctions() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { test.compare } {
                     #5  #5      =   % TRUE
                     #1  #2      =   % FALSE
@@ -66,7 +67,9 @@ void compareFunctions() throws RecognitionException {
 
     @Test
     void arithmeticFunctions() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { test } {
                     #1  #1  +   % 2
                     #5  #2  -   % 3
@@ -83,7 +86,9 @@ void arithmeticFunctions() throws RecognitionException {
 
     @Test
     void arithmeticFunctionTypeMismatch() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { test } {
                     #1  "HELLO" +   % Should throw exception
                 }
@@ -96,7 +101,9 @@ void arithmeticFunctionTypeMismatch() throws RecognitionException {
     @Test
     void stringOperations() throws RecognitionException {
         // Test for concat (*) and add.period
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { test } {
                     "H" "ello"      *           % Hello
                     "Johnny"        add.period$ % Johnny.
@@ -127,7 +134,9 @@ void stringOperations() throws RecognitionException {
 
     @Test
     void missing() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 ENTRY { title } { } { }
                 FUNCTION { presort } { cite$ 'sort.key$ := }
                 ITERATE { presort }
@@ -136,24 +145,27 @@ void missing() throws RecognitionException {
                 FUNCTION { test } { title missing$ cite$ }
                 ITERATE { test }
                 """);
-        List<BibEntry> testEntries = List.of(
-                BstVMTest.defaultTestEntry(),
-                new BibEntry(StandardEntryType.Article)
-                        .withCitationKey("test")
-                        .withField(StandardField.AUTHOR, "No title"));
+        List<BibEntry> testEntries =
+                List.of(
+                        BstVMTest.defaultTestEntry(),
+                        new BibEntry(StandardEntryType.Article)
+                                .withCitationKey("test")
+                                .withField(StandardField.AUTHOR, "No title"));
 
         vm.render(testEntries);
 
-        assertEquals("test", vm.getStack().pop());      // cite
-        assertEquals(BstVM.TRUE, vm.getStack().pop());          // missing title
-        assertEquals("canh05", vm.getStack().pop());    // cite
-        assertEquals(BstVM.FALSE, vm.getStack().pop());         // missing title
+        assertEquals("test", vm.getStack().pop()); // cite
+        assertEquals(BstVM.TRUE, vm.getStack().pop()); // missing title
+        assertEquals("canh05", vm.getStack().pop()); // cite
+        assertEquals(BstVM.FALSE, vm.getStack().pop()); // missing title
         assertEquals(0, vm.getStack().size());
     }
 
     @Test
     void numNames() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { test } {
                     "Johnny Foo { and } Mary Bar" num.names$
                     "Johnny Foo and Mary Bar" num.names$
@@ -170,7 +182,9 @@ void numNames() throws RecognitionException {
 
     @Test
     void substring() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { test } {
                     "123456789" #2  #1          substring$  % 2
                     "123456789" #4  global.max$ substring$  % 456789
@@ -200,19 +214,20 @@ void substring() throws RecognitionException {
 
     @ParameterizedTest
     @CsvSource({
-            "d, abcd, -1, 1",
-            "cd, abcd, -1, 2",
-            "bcd, abcd, -1, 3",
-            "c, abcd, -2, 1",
-            "abc, abcd, -2, 100",
-            "abc, abcd, -2, 2147483647",
-            "b, abcd, -3, 1",
-            "a, abcd, -4, 1",
-            "'', abcd, -5, 1",                    // invalid number -5
-            "'', abcd, -2147483647, 2147483647",  // invalid number
+        "d, abcd, -1, 1",
+        "cd, abcd, -1, 2",
+        "bcd, abcd, -1, 3",
+        "c, abcd, -2, 1",
+        "abc, abcd, -2, 100",
+        "abc, abcd, -2, 2147483647",
+        "b, abcd, -3, 1",
+        "a, abcd, -4, 1",
+        "'', abcd, -5, 1", // invalid number -5
+        "'', abcd, -2147483647, 2147483647", // invalid number
     })
     void substringPlain(String expected, String full, Integer start, Integer length) {
-        BstVMContext bstVMContext = new BstVMContext(List.of(), new BibDatabase(), Path.of("404.bst"));
+        BstVMContext bstVMContext =
+                new BstVMContext(List.of(), new BibDatabase(), Path.of("404.bst"));
         BstFunctions bstFunctions = new BstFunctions(bstVMContext, new StringBuilder());
         bstVMContext.stack().push(full);
         bstVMContext.stack().push(start);
@@ -223,7 +238,9 @@ void substringPlain(String expected, String full, Integer start, Integer length)
 
     @Test
     void empty() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 ENTRY { title } { } { }
                 READ
                 STRINGS { s }
@@ -250,7 +267,9 @@ void empty() throws RecognitionException {
 
     @Test
     void formatNameStatic() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { format }{ "Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin" #1 "{vv~}{ll}{, jj}{, f}?" format.name$ }
                 EXECUTE { format }
                 """);
@@ -264,7 +283,9 @@ void formatNameStatic() throws RecognitionException {
 
     @Test
     void formatNameInEntries() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 ENTRY { author } { } { }
                 FUNCTION { presort } { cite$ 'sort.key$ := }
                 ITERATE { presort }
@@ -273,11 +294,14 @@ void formatNameInEntries() throws RecognitionException {
                 FUNCTION { format }{ author #2 "{vv~}{ll}{, jj}{, f}?" format.name$ }
                 ITERATE { format }
                 """);
-        List<BibEntry> testEntries = List.of(
-                BstVMTest.defaultTestEntry(),
-                new BibEntry(StandardEntryType.Book)
-                        .withCitationKey("test")
-                        .withField(StandardField.AUTHOR, "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"));
+        List<BibEntry> testEntries =
+                List.of(
+                        BstVMTest.defaultTestEntry(),
+                        new BibEntry(StandardEntryType.Book)
+                                .withCitationKey("test")
+                                .withField(
+                                        StandardField.AUTHOR,
+                                        "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"));
 
         vm.render(testEntries);
 
@@ -288,7 +312,9 @@ void formatNameInEntries() throws RecognitionException {
 
     @Test
     void changeCase() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 STRINGS { title }
                 READ
                 FUNCTION { format.title } {
@@ -308,7 +334,8 @@ void changeCase() throws RecognitionException {
 
         vm.render(Collections.emptyList());
 
-        assertEquals("{A}{D}/{C}ycle: {I}{B}{M}'s {F}ramework for {A}pplication {D}evelopment and {C}ase",
+        assertEquals(
+                "{A}{D}/{C}ycle: {I}{B}{M}'s {F}ramework for {A}pplication {D}evelopment and {C}ase",
                 vm.getStack().pop());
         assertEquals("", vm.getStack().pop());
         assertEquals("Hello world", vm.getStack().pop());
@@ -318,7 +345,9 @@ void changeCase() throws RecognitionException {
 
     @Test
     void textLength() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { test } {
                     "hello world" text.length$                                  % 11
                     "Hello {W}orld" text.length$                                % 11
@@ -347,7 +376,9 @@ void textLength() throws RecognitionException {
 
     @Test
     void intToStr() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { test } { #3 int.to.str$ #9999 int.to.str$ }
                 EXECUTE { test }
                 """);
@@ -361,7 +392,9 @@ void intToStr() throws RecognitionException {
 
     @Test
     void chrToInt() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { test } { "H" chr.to.int$ }
                 EXECUTE { test }
                 """);
@@ -374,7 +407,9 @@ void chrToInt() throws RecognitionException {
 
     @Test
     void chrToIntIntToChr() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { test } { "H" chr.to.int$ int.to.chr$ }
                 EXECUTE {test}
                 """);
@@ -387,7 +422,9 @@ void chrToIntIntToChr() throws RecognitionException {
 
     @Test
     void type() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 ENTRY  { } { } { }
                 FUNCTION { presort } { cite$ 'sort.key$ := }
                 ITERATE { presort }
@@ -395,11 +432,12 @@ void type() throws RecognitionException {
                 FUNCTION { test } { type$ }
                 ITERATE { test }
                 """);
-        List<BibEntry> testEntries = List.of(
-                new BibEntry(StandardEntryType.Article).withCitationKey("a"),
-                new BibEntry(StandardEntryType.Book).withCitationKey("b"),
-                new BibEntry(StandardEntryType.Misc).withCitationKey("c"),
-                new BibEntry(StandardEntryType.InProceedings).withCitationKey("d"));
+        List<BibEntry> testEntries =
+                List.of(
+                        new BibEntry(StandardEntryType.Article).withCitationKey("a"),
+                        new BibEntry(StandardEntryType.Book).withCitationKey("b"),
+                        new BibEntry(StandardEntryType.Misc).withCitationKey("c"),
+                        new BibEntry(StandardEntryType.InProceedings).withCitationKey("d"));
 
         vm.render(testEntries);
 
@@ -412,7 +450,9 @@ void type() throws RecognitionException {
 
     @Test
     void callType() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 ENTRY { title } { } { }
                 FUNCTION { presort } { cite$ 'sort.key$ := }
                 ITERATE { presort }
@@ -422,11 +462,12 @@ void callType() throws RecognitionException {
                 FUNCTION { book }{ "Book called on " title * }
                 ITERATE { call.type$ }
                 """);
-        List<BibEntry> testEntries = List.of(
-                BstVMTest.defaultTestEntry(),
-                new BibEntry(StandardEntryType.Book)
-                        .withCitationKey("test")
-                        .withField(StandardField.TITLE, "Test"));
+        List<BibEntry> testEntries =
+                List.of(
+                        BstVMTest.defaultTestEntry(),
+                        new BibEntry(StandardEntryType.Book)
+                                .withCitationKey("test")
+                                .withField(StandardField.TITLE, "Test"));
 
         vm.render(testEntries);
 
@@ -439,7 +480,9 @@ void callType() throws RecognitionException {
 
     @Test
     void swap() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { a } { #3 "Hallo" swap$ }
                 EXECUTE { a }
                 """);
@@ -454,7 +497,9 @@ void swap() throws RecognitionException {
 
     @Test
     void assignFunction() {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 INTEGERS { test.var }
                 FUNCTION { test.func } { #1 'test.var := }
                 EXECUTE { test.func }
@@ -470,7 +515,9 @@ void assignFunction() {
 
     @Test
     void simpleIf() {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { path1 } { #1 }
                 FUNCTION { path0 } { #0 }
                 FUNCTION { test } {
@@ -489,7 +536,9 @@ void simpleIf() {
 
     @Test
     void simpleWhile() {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 INTEGERS { i }
                 FUNCTION { test } {
                     #3 'i :=
@@ -514,7 +563,9 @@ void simpleWhile() {
 
     @Test
     void nestedControlFunctions() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 STRINGS { t }
                 FUNCTION { not } { { #0 } { #1 } if$ }
                 FUNCTION { n.dashify } {
@@ -559,7 +610,9 @@ void nestedControlFunctions() throws RecognitionException {
 
     @Test
     void logic() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { not } { { #0 } { #1 } if$ }
                 FUNCTION { and } { 'skip$ { pop$ #0 } if$ }
                 FUNCTION { or } { { pop$ #1 } 'skip$ if$ }
@@ -598,7 +651,9 @@ void logic() throws RecognitionException {
      */
     @Test
     void width() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 ENTRY { address author title type } { } { label }
                 STRINGS { longest.label }
                 INTEGERS { number.label longest.label.width }
@@ -640,7 +695,9 @@ void width() throws RecognitionException {
 
     @Test
     void duplicateEmptyPopSwapIf() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { emphasize } {
                     duplicate$ empty$
                         { pop$ "" }
@@ -663,7 +720,9 @@ void duplicateEmptyPopSwapIf() throws RecognitionException {
 
     @Test
     void preambleWriteNewlineQuote() {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { test } {
                     preamble$
                     write$
diff --git a/src/test/java/org/jabref/logic/bst/BstPreviewLayoutTest.java b/src/test/java/org/jabref/logic/bst/BstPreviewLayoutTest.java
index ccd2ff2bb795..9eb6f274a263 100644
--- a/src/test/java/org/jabref/logic/bst/BstPreviewLayoutTest.java
+++ b/src/test/java/org/jabref/logic/bst/BstPreviewLayoutTest.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.bst;
 
-import java.nio.file.Path;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.nio.file.Path;
 
 class BstPreviewLayoutTest {
 
@@ -19,9 +18,13 @@ class BstPreviewLayoutTest {
 
     @Test
     void generatePreviewForSimpleEntryUsingAbbr() throws Exception {
-        BstPreviewLayout bstPreviewLayout = new BstPreviewLayout(Path.of(BstPreviewLayoutTest.class.getResource("abbrv.bst").toURI()));
-        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "Oliver Kopp")
-                                       .withField(StandardField.TITLE, "Thoughts on Development");
+        BstPreviewLayout bstPreviewLayout =
+                new BstPreviewLayout(
+                        Path.of(BstPreviewLayoutTest.class.getResource("abbrv.bst").toURI()));
+        BibEntry entry =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "Oliver Kopp")
+                        .withField(StandardField.TITLE, "Thoughts on Development");
         BibDatabase bibDatabase = mock(BibDatabase.class);
         String preview = bstPreviewLayout.generatePreview(entry, bibDatabaseContext);
         assertEquals("O. Kopp. Thoughts on development.", preview);
@@ -29,10 +32,14 @@ void generatePreviewForSimpleEntryUsingAbbr() throws Exception {
 
     @Test
     void monthMayIsCorrectlyRendered() throws Exception {
-        BstPreviewLayout bstPreviewLayout = new BstPreviewLayout(Path.of(BstPreviewLayoutTest.class.getResource("abbrv.bst").toURI()));
-        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "Oliver Kopp")
-                                       .withField(StandardField.TITLE, "Thoughts on Development")
-                                       .withField(StandardField.MONTH, "#May#");
+        BstPreviewLayout bstPreviewLayout =
+                new BstPreviewLayout(
+                        Path.of(BstPreviewLayoutTest.class.getResource("abbrv.bst").toURI()));
+        BibEntry entry =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "Oliver Kopp")
+                        .withField(StandardField.TITLE, "Thoughts on Development")
+                        .withField(StandardField.MONTH, "#May#");
         BibDatabase bibDatabase = mock(BibDatabase.class);
         String preview = bstPreviewLayout.generatePreview(entry, bibDatabaseContext);
         assertEquals("O. Kopp. Thoughts on development, May.", preview);
@@ -40,28 +47,44 @@ void monthMayIsCorrectlyRendered() throws Exception {
 
     @Test
     void generatePreviewForSliceTheoremPaperUsingAbbr() throws Exception {
-        BstPreviewLayout bstPreviewLayout = new BstPreviewLayout(Path.of(BstPreviewLayoutTest.class.getResource("abbrv.bst").toURI()));
-        String preview = bstPreviewLayout.generatePreview(getSliceTheoremPaper(), bibDatabaseContext);
-        assertEquals("T. Diez. Slice theorem for fréchet group actions and covariant symplectic field theory. May 2014.", preview);
+        BstPreviewLayout bstPreviewLayout =
+                new BstPreviewLayout(
+                        Path.of(BstPreviewLayoutTest.class.getResource("abbrv.bst").toURI()));
+        String preview =
+                bstPreviewLayout.generatePreview(getSliceTheoremPaper(), bibDatabaseContext);
+        assertEquals(
+                "T. Diez. Slice theorem for fréchet group actions and covariant symplectic field theory. May 2014.",
+                preview);
     }
 
     @Test
     void generatePreviewForSliceTheoremPaperUsingIEEE() throws Exception {
-        BstPreviewLayout bstPreviewLayout = new BstPreviewLayout(Path.of(ClassLoader.getSystemResource("bst/IEEEtran.bst").toURI()));
-        String preview = bstPreviewLayout.generatePreview(getSliceTheoremPaper(), bibDatabaseContext);
-        assertEquals("T. Diez, \"Slice theorem for fréchet group actions and covariant symplectic field theory\" May 2014.", preview);
+        BstPreviewLayout bstPreviewLayout =
+                new BstPreviewLayout(
+                        Path.of(ClassLoader.getSystemResource("bst/IEEEtran.bst").toURI()));
+        String preview =
+                bstPreviewLayout.generatePreview(getSliceTheoremPaper(), bibDatabaseContext);
+        assertEquals(
+                "T. Diez, \"Slice theorem for fréchet group actions and covariant symplectic field theory\" May 2014.",
+                preview);
     }
 
     private static BibEntry getSliceTheoremPaper() {
         return new BibEntry(StandardEntryType.Article)
                 .withField(StandardField.AUTHOR, "Tobias Diez")
-                .withField(StandardField.TITLE, "Slice theorem for Fréchet group actions and covariant symplectic field theory")
+                .withField(
+                        StandardField.TITLE,
+                        "Slice theorem for Fréchet group actions and covariant symplectic field theory")
                 .withField(StandardField.DATE, "2014-05-09")
-                .withField(StandardField.ABSTRACT, "A general slice theorem for the action of a Fr\\'echet Lie group on a Fr\\'echet manifolds is established. The Nash-Moser theorem provides the fundamental tool to generalize the result of Palais to this infinite-dimensional setting. The presented slice theorem is illustrated by its application to gauge theories: the action of the gauge transformation group admits smooth slices at every point and thus the gauge orbit space is stratified by Fr\\'echet manifolds. Furthermore, a covariant and symplectic formulation of classical field theory is proposed and extensively discussed. At the root of this novel framework is the incorporation of field degrees of freedom F and spacetime M into the product manifold F * M. The induced bigrading of differential forms is used in order to carry over the usual symplectic theory to this new setting. The examples of the Klein-Gordon field and general Yang-Mills theory illustrate that the presented approach conveniently handles the occurring symmetries.")
+                .withField(
+                        StandardField.ABSTRACT,
+                        "A general slice theorem for the action of a Fr\\'echet Lie group on a Fr\\'echet manifolds is established. The Nash-Moser theorem provides the fundamental tool to generalize the result of Palais to this infinite-dimensional setting. The presented slice theorem is illustrated by its application to gauge theories: the action of the gauge transformation group admits smooth slices at every point and thus the gauge orbit space is stratified by Fr\\'echet manifolds. Furthermore, a covariant and symplectic formulation of classical field theory is proposed and extensively discussed. At the root of this novel framework is the incorporation of field degrees of freedom F and spacetime M into the product manifold F * M. The induced bigrading of differential forms is used in order to carry over the usual symplectic theory to this new setting. The examples of the Klein-Gordon field and general Yang-Mills theory illustrate that the presented approach conveniently handles the occurring symmetries.")
                 .withField(StandardField.EPRINT, "1405.2249v1")
                 .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1405.2249v1:PDF")
                 .withField(StandardField.EPRINTTYPE, "arXiv")
                 .withField(StandardField.EPRINTCLASS, "math-ph")
-                .withField(StandardField.KEYWORDS, "math-ph, math.DG, math.MP, math.SG, 58B99, 58Z05, 58B25, 22E65, 58D19, 53D20, 53D42");
+                .withField(
+                        StandardField.KEYWORDS,
+                        "math-ph, math.DG, math.MP, math.SG, 58B99, 58Z05, 58B25, 22E65, 58D19, 53D20, 53D42");
     }
 }
diff --git a/src/test/java/org/jabref/logic/bst/BstVMTest.java b/src/test/java/org/jabref/logic/bst/BstVMTest.java
index e001be0a977e..c87bd1c19693 100644
--- a/src/test/java/org/jabref/logic/bst/BstVMTest.java
+++ b/src/test/java/org/jabref/logic/bst/BstVMTest.java
@@ -1,29 +1,34 @@
 package org.jabref.logic.bst;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.antlr.v4.runtime.RecognitionException;
 import org.jabref.logic.util.TestEntry;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import org.antlr.v4.runtime.RecognitionException;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
 
 public class BstVMTest {
 
     public static BibEntry defaultTestEntry() {
         return new BibEntry(StandardEntryType.InProceedings)
                 .withCitationKey("canh05")
-                .withField(StandardField.AUTHOR, "Crowston, K. and Annabi, H. and Howison, J. and Masango, C.")
-                .withField(StandardField.TITLE, "Effective work practices for floss development: A model and propositions")
-                .withField(StandardField.BOOKTITLE, "Hawaii International Conference On System Sciences (HICSS)")
+                .withField(
+                        StandardField.AUTHOR,
+                        "Crowston, K. and Annabi, H. and Howison, J. and Masango, C.")
+                .withField(
+                        StandardField.TITLE,
+                        "Effective work practices for floss development: A model and propositions")
+                .withField(
+                        StandardField.BOOKTITLE,
+                        "Hawaii International Conference On System Sciences (HICSS)")
                 .withField(StandardField.YEAR, "2005")
                 .withField(StandardField.OWNER, "oezbek")
                 .withField(StandardField.TIMESTAMP, "2006.05.29")
@@ -35,12 +40,11 @@ void abbrv() throws RecognitionException, IOException {
         BstVM vm = new BstVM(Path.of("src/test/resources/org/jabref/logic/bst/abbrv.bst"));
         List<BibEntry> testEntries = List.of(defaultTestEntry());
 
-        String expected = "\\begin{thebibliography}{1}\\bibitem{canh05}K.~Crowston, H.~Annabi, J.~Howison, and C.~Masango.\\newblock Effective work practices for floss development: A model and  propositions.\\newblock In {\\em Hawaii International Conference On System Sciences (HICSS)}, 2005.\\end{thebibliography}";
+        String expected =
+                "\\begin{thebibliography}{1}\\bibitem{canh05}K.~Crowston, H.~Annabi, J.~Howison, and C.~Masango.\\newblock Effective work practices for floss development: A model and  propositions.\\newblock In {\\em Hawaii International Conference On System Sciences (HICSS)}, 2005.\\end{thebibliography}";
         String result = vm.render(testEntries);
 
-        assertEquals(
-                expected.replaceAll("\\s", ""),
-                result.replaceAll("\\s", ""));
+        assertEquals(expected.replaceAll("\\s", ""), result.replaceAll("\\s", ""));
     }
 
     @Test
@@ -48,19 +52,20 @@ void ieeetran() throws RecognitionException, IOException {
         BstVM vm = new BstVM(Path.of("src/main/resources/bst/IEEEtran.bst"));
         List<BibEntry> testEntries = List.of(TestEntry.getTestEntry());
 
-        String expected = """
+        String expected =
+                """
                 %GeneratedbyIEEEtran.bst,version:1.14(2015/08/26)\\begin{thebibliography}{1}\\providecommand{\\url}[1]{#1}\\csnameurl@samestyle\\endcsname\\providecommand{\\newblock}{\\relax}\\providecommand{\\bibinfo}[2]{#2}\\providecommand{\\BIBentrySTDinterwordspacing}{\\spaceskip=0pt\\relax}\\providecommand{\\BIBentryALTinterwordstretchfactor}{4}\\providecommand{\\BIBentryALTinterwordspacing}{\\spaceskip=\\fontdimen2\\fontplus\\BIBentryALTinterwordstretchfactor\\fontdimen3\\fontminus\\fontdimen4\\font\\relax}\\providecommand{\\BIBforeignlanguage}[2]{{%\\expandafter\\ifx\\csnamel@#1\\endcsname\\relax\\typeout{**WARNING:IEEEtran.bst:Nohyphenationpatternhasbeen}%\\typeout{**loadedforthelanguage`#1'.Usingthepatternfor}%\\typeout{**thedefaultlanguageinstead.}%\\else\\language=\\csnamel@#1\\endcsname\\fi#2}}\\providecommand{\\BIBdecl}{\\relax}\\BIBdecl\\bibitem{Smith2016}\\BIBentryALTinterwordspacingB.~Smith,B.~Jones,andJ.~Williams,``Titleofthetestentry''\\emph{BibTeXJournal},vol.~34,no.~3,pp.45--67,July2016.[Online].Available:\\url{https://github.com/JabRef}\\BIBentrySTDinterwordspacing\\end{thebibliography}
                 """;
         String result = vm.render(testEntries);
 
-        assertEquals(
-                expected.replaceAll("\\s", ""),
-                result.replaceAll("\\s", ""));
+        assertEquals(expected.replaceAll("\\s", ""), result.replaceAll("\\s", ""));
     }
 
     @Test
     void simple() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 ENTRY { address author title type } { } { label }
                 INTEGERS { output.state before.all mid.sentence after.sentence after.block }
                 FUNCTION { init.state.consts }{
@@ -85,7 +90,9 @@ void simple() throws RecognitionException {
 
     @Test
     void label() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 ENTRY { title } {} { label }
                 FUNCTION { test } {
                     label #0 =
@@ -123,7 +130,9 @@ void buildIn() throws RecognitionException {
 
     @Test
     void variables() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 STRINGS { t }
                 FUNCTION { not } {
                     { #0 } { #1 } if$
@@ -143,11 +152,11 @@ void variables() throws RecognitionException {
     @Test
     void hyphenatedName() throws RecognitionException, IOException {
         BstVM vm = new BstVM(Path.of("src/test/resources/org/jabref/logic/bst/abbrv.bst"));
-        List<BibEntry> testEntries = List.of(
-                new BibEntry(StandardEntryType.Article)
-                        .withCitationKey("canh05")
-                        .withField(StandardField.AUTHOR, "Jean-Paul Sartre")
-        );
+        List<BibEntry> testEntries =
+                List.of(
+                        new BibEntry(StandardEntryType.Article)
+                                .withCitationKey("canh05")
+                                .withField(StandardField.AUTHOR, "Jean-Paul Sartre"));
 
         String result = vm.render(testEntries);
 
@@ -156,7 +165,9 @@ void hyphenatedName() throws RecognitionException, IOException {
 
     @Test
     void abbrevStyleChopWord() {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 STRINGS { s }
                 INTEGERS { len }
 
@@ -192,7 +203,9 @@ void abbrevStyleChopWord() {
 
     @Test
     void abbrevStyleSortFormatTitle() {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 STRINGS { s t }
                 INTEGERS { len }
                 FUNCTION { sortify } {
diff --git a/src/test/java/org/jabref/logic/bst/BstVMVisitorTest.java b/src/test/java/org/jabref/logic/bst/BstVMVisitorTest.java
index c8c57f250dbd..136c66ad5bee 100644
--- a/src/test/java/org/jabref/logic/bst/BstVMVisitorTest.java
+++ b/src/test/java/org/jabref/logic/bst/BstVMVisitorTest.java
@@ -1,23 +1,22 @@
 package org.jabref.logic.bst;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.types.StandardEntryType;
-
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.types.StandardEntryType;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
 class BstVMVisitorTest {
 
     @Test
@@ -52,7 +51,9 @@ void visitIntegersCommand() {
 
     @Test
     void visitFunctionCommand() {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 FUNCTION { test.func } { #1 'test.var := }
                 EXECUTE { test.func }
                 """);
@@ -66,7 +67,9 @@ void visitFunctionCommand() {
 
     @Test
     void visitMacroCommand() {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 MACRO { jan } { "January" }
                 EXECUTE { jan }
                 """);
@@ -99,7 +102,9 @@ void visitEntryCommand() {
 
     @Test
     void visitReadCommand() {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 ENTRY { author title booktitle year owner timestamp url } { } { }
                 READ
                 """);
@@ -108,9 +113,15 @@ void visitReadCommand() {
         vm.render(testEntries);
 
         Map<String, String> fields = vm.latestContext.entries().getFirst().fields;
-        assertEquals("Crowston, K. and Annabi, H. and Howison, J. and Masango, C.", fields.get("author"));
-        assertEquals("Effective work practices for floss development: A model and propositions", fields.get("title"));
-        assertEquals("Hawaii International Conference On System Sciences (HICSS)", fields.get("booktitle"));
+        assertEquals(
+                "Crowston, K. and Annabi, H. and Howison, J. and Masango, C.",
+                fields.get("author"));
+        assertEquals(
+                "Effective work practices for floss development: A model and propositions",
+                fields.get("title"));
+        assertEquals(
+                "Hawaii International Conference On System Sciences (HICSS)",
+                fields.get("booktitle"));
         assertEquals("2005", fields.get("year"));
         assertEquals("oezbek", fields.get("owner"));
         assertEquals("2006.05.29", fields.get("timestamp"));
@@ -119,7 +130,9 @@ void visitReadCommand() {
 
     @Test
     void visitExecuteCommand() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 INTEGERS { variable.a }
                 FUNCTION { init.state.consts } { #5 'variable.a := }
                 EXECUTE { init.state.consts }
@@ -132,16 +145,18 @@ void visitExecuteCommand() throws RecognitionException {
 
     @Test
     void visitIterateCommand() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 ENTRY { } { } { }
                 FUNCTION { test } { cite$ }
                 READ
                 ITERATE { test }
                 """);
-        List<BibEntry> testEntries = List.of(
-                BstVMTest.defaultTestEntry(),
-                new BibEntry(StandardEntryType.Article)
-                        .withCitationKey("test"));
+        List<BibEntry> testEntries =
+                List.of(
+                        BstVMTest.defaultTestEntry(),
+                        new BibEntry(StandardEntryType.Article).withCitationKey("test"));
 
         vm.render(testEntries);
 
@@ -152,16 +167,18 @@ void visitIterateCommand() throws RecognitionException {
 
     @Test
     void visitReverseCommand() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 ENTRY { } { } { }
                 FUNCTION { test } { cite$ }
                 READ
                 REVERSE { test }
                 """);
-        List<BibEntry> testEntries = List.of(
-                BstVMTest.defaultTestEntry(),
-                new BibEntry(StandardEntryType.Article)
-                        .withCitationKey("test"));
+        List<BibEntry> testEntries =
+                List.of(
+                        BstVMTest.defaultTestEntry(),
+                        new BibEntry(StandardEntryType.Article).withCitationKey("test"));
 
         vm.render(testEntries);
 
@@ -172,17 +189,20 @@ void visitReverseCommand() throws RecognitionException {
 
     @Test
     void visitSortCommand() throws RecognitionException {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 ENTRY { } { } { }
                 FUNCTION { presort } { cite$ 'sort.key$ := }
                 ITERATE { presort }
                 SORT
                 """);
-        List<BibEntry> testEntries = List.of(
-                new BibEntry(StandardEntryType.Article).withCitationKey("c"),
-                new BibEntry(StandardEntryType.Article).withCitationKey("b"),
-                new BibEntry(StandardEntryType.Article).withCitationKey("d"),
-                new BibEntry(StandardEntryType.Article).withCitationKey("a"));
+        List<BibEntry> testEntries =
+                List.of(
+                        new BibEntry(StandardEntryType.Article).withCitationKey("c"),
+                        new BibEntry(StandardEntryType.Article).withCitationKey("b"),
+                        new BibEntry(StandardEntryType.Article).withCitationKey("d"),
+                        new BibEntry(StandardEntryType.Article).withCitationKey("a"));
 
         vm.render(testEntries);
 
@@ -195,7 +215,9 @@ void visitSortCommand() throws RecognitionException {
 
     @Test
     void visitIdentifier() {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 ENTRY { } { local.variable } { local.label }
                 READ
                 STRINGS { label }
@@ -223,7 +245,9 @@ void visitIdentifier() {
 
     @Test
     void visitStackitem() {
-        BstVM vm = new BstVM("""
+        BstVM vm =
+                new BstVM(
+                        """
                 STRINGS { t }
                 FUNCTION { test2 } { #3 }
                 FUNCTION { test } {
diff --git a/src/test/java/org/jabref/logic/bst/util/BstCaseChangersTest.java b/src/test/java/org/jabref/logic/bst/util/BstCaseChangersTest.java
index 2404c32a8264..2377f7673cb7 100644
--- a/src/test/java/org/jabref/logic/bst/util/BstCaseChangersTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstCaseChangersTest.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.bst.util;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.bst.util.BstCaseChanger.FormatMode;
-
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class BstCaseChangersTest {
 
@@ -27,12 +26,19 @@ private static Stream<Arguments> provideStringsForTitleLowers() {
                 Arguments.of("Hi hi ", "Hi Hi "),
                 Arguments.of("{\\oe}", "{\\oe}"),
                 Arguments.of("Hi {\\oe   }hi ", "Hi {\\oe   }Hi "),
-                Arguments.of("Jonathan meyer and charles louis xavier joseph de la vall{\\'e}e poussin", "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"),
+                Arguments.of(
+                        "Jonathan meyer and charles louis xavier joseph de la vall{\\'e}e poussin",
+                        "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"),
                 Arguments.of("{\\'{E}}douard masterly", "{\\'{E}}douard Masterly"),
-                Arguments.of("Ulrich {\\\"{u}}nderwood and ned {\\~n}et and paul {\\={p}}ot", "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot"),
-                Arguments.of("An {$O(n \\log n / \\! \\log\\log n)$} sorting algorithm", "An {$O(n \\log n / \\! \\log\\log n)$} Sorting Algorithm"),
-                Arguments.of("On notions of information transfer in {VLSI} circuits", "On Notions of Information Transfer in {VLSI} Circuits"),
-
+                Arguments.of(
+                        "Ulrich {\\\"{u}}nderwood and ned {\\~n}et and paul {\\={p}}ot",
+                        "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot"),
+                Arguments.of(
+                        "An {$O(n \\log n / \\! \\log\\log n)$} sorting algorithm",
+                        "An {$O(n \\log n / \\! \\log\\log n)$} Sorting Algorithm"),
+                Arguments.of(
+                        "On notions of information transfer in {VLSI} circuits",
+                        "On Notions of Information Transfer in {VLSI} Circuits"),
                 Arguments.of("hallo", "hallo"),
                 Arguments.of("Hallo", "HAllo"),
                 Arguments.of("Hallo world", "HAllo World"),
@@ -51,9 +57,9 @@ private static Stream<Arguments> provideStringsForTitleLowers() {
 
                 // testSpecialBracketPlacement
                 Arguments.of("this i{S REALLY CraZy ST}uff", "tHIS I{S REALLY CraZy ST}UfF"),
-                Arguments.of("this i{S R{\\'E}ALLY CraZy ST}uff", "tHIS I{S R{\\'E}ALLY CraZy ST}UfF"),
-                Arguments.of("this is r{\\'e}ally crazy stuff", "tHIS IS R{\\'E}ALLY CraZy STUfF")
-        );
+                Arguments.of(
+                        "this i{S R{\\'E}ALLY CraZy ST}uff", "tHIS I{S R{\\'E}ALLY CraZy ST}UfF"),
+                Arguments.of("this is r{\\'e}ally crazy stuff", "tHIS IS R{\\'E}ALLY CraZy STUfF"));
     }
 
     @ParameterizedTest
@@ -69,12 +75,17 @@ private static Stream<Arguments> provideStringsForAllLowers() {
                 Arguments.of("hi hi ", "Hi Hi "),
                 Arguments.of("{\\oe}", "{\\oe}"),
                 Arguments.of("hi {\\oe   }hi ", "Hi {\\oe   }Hi "),
-                Arguments.of("jonathan meyer and charles louis xavier joseph de la vall{\\'e}e poussin", "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"),
+                Arguments.of(
+                        "jonathan meyer and charles louis xavier joseph de la vall{\\'e}e poussin",
+                        "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"),
                 Arguments.of("{\\'e}", "{\\'e}"),
                 Arguments.of("{\\'{e}}douard masterly", "{\\'{E}}douard Masterly"),
-                Arguments.of("ulrich {\\\"{u}}nderwood and ned {\\~n}et and paul {\\={p}}ot", "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot"),
-                Arguments.of("an {$O(n \\log n / \\! \\log\\log n)$} sorting algorithm", "An {$O(n \\log n / \\! \\log\\log n)$} Sorting Algorithm"),
-
+                Arguments.of(
+                        "ulrich {\\\"{u}}nderwood and ned {\\~n}et and paul {\\={p}}ot",
+                        "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot"),
+                Arguments.of(
+                        "an {$O(n \\log n / \\! \\log\\log n)$} sorting algorithm",
+                        "An {$O(n \\log n / \\! \\log\\log n)$} Sorting Algorithm"),
                 Arguments.of("hallo", "hallo"),
                 Arguments.of("hallo", "HAllo"),
                 Arguments.of("hallo world", "HAllo World"),
@@ -83,8 +94,9 @@ private static Stream<Arguments> provideStringsForAllLowers() {
                 Arguments.of("hallo {\\world}. how", "HAllo {\\WORLD}. HOW"),
 
                 // testSpecialBracketPlacement
-                Arguments.of("an {$O(n \\log n)$} sorting algorithm", "An {$O(n \\log n)$} Sorting Algorithm")
-        );
+                Arguments.of(
+                        "an {$O(n \\log n)$} sorting algorithm",
+                        "An {$O(n \\log n)$} Sorting Algorithm"));
     }
 
     @ParameterizedTest
@@ -100,12 +112,17 @@ private static Stream<Arguments> provideStringsForAllUppers() {
                 Arguments.of("HI HI ", "Hi Hi "),
                 Arguments.of("{\\OE}", "{\\oe}"),
                 Arguments.of("HI {\\OE   }HI ", "Hi {\\oe   }Hi "),
-                Arguments.of("JONATHAN MEYER AND CHARLES LOUIS XAVIER JOSEPH DE LA VALL{\\'E}E POUSSIN", "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"),
+                Arguments.of(
+                        "JONATHAN MEYER AND CHARLES LOUIS XAVIER JOSEPH DE LA VALL{\\'E}E POUSSIN",
+                        "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"),
                 Arguments.of("{\\'E}", "{\\'e}"),
                 Arguments.of("{\\'{E}}DOUARD MASTERLY", "{\\'{E}}douard Masterly"),
-                Arguments.of("ULRICH {\\\"{U}}NDERWOOD AND NED {\\~N}ET AND PAUL {\\={P}}OT", "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot"),
-                Arguments.of("AN {$O(n \\log n / \\! \\log\\log n)$} SORTING ALGORITHM", "An {$O(n \\log n / \\! \\log\\log n)$} Sorting Algorithm"),
-
+                Arguments.of(
+                        "ULRICH {\\\"{U}}NDERWOOD AND NED {\\~N}ET AND PAUL {\\={P}}OT",
+                        "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot"),
+                Arguments.of(
+                        "AN {$O(n \\log n / \\! \\log\\log n)$} SORTING ALGORITHM",
+                        "An {$O(n \\log n / \\! \\log\\log n)$} Sorting Algorithm"),
                 Arguments.of("HALLO", "hallo"),
                 Arguments.of("HALLO", "HAllo"),
                 Arguments.of("HALLO WORLD", "HAllo World"),
@@ -114,8 +131,9 @@ private static Stream<Arguments> provideStringsForAllUppers() {
                 Arguments.of("HALLO {\\WORLD}. HOW", "HAllo {\\woRld}. hoW"),
 
                 // testSpecialBracketPlacement
-                Arguments.of("AN {$O(n \\log n)$} SORTING ALGORITHM", "An {$O(n \\log n)$} Sorting Algorithm")
-        );
+                Arguments.of(
+                        "AN {$O(n \\log n)$} SORTING ALGORITHM",
+                        "An {$O(n \\log n)$} Sorting Algorithm"));
     }
 
     @ParameterizedTest
@@ -127,22 +145,31 @@ void titleCaseAllLowers(String expected, String toBeFormatted) {
     private static Stream<Arguments> provideTitleCaseAllLowers() {
         return Stream.of(
                 // CaseChangers.TITLE is good at keeping some words lower case
-                // Here some modified test cases to show that escaping with BibtexCaseChanger also works
-                // Examples taken from https://github.com/JabRef/jabref/pull/176#issuecomment-142723792
-                Arguments.of("this is a simple example {TITLE}", "This is a simple example {TITLE}"),
-                Arguments.of("this {IS} another simple example tit{LE}", "This {IS} another simple example tit{LE}"),
+                // Here some modified test cases to show that escaping with BibtexCaseChanger also
+                // works
+                // Examples taken from
+                // https://github.com/JabRef/jabref/pull/176#issuecomment-142723792
+                Arguments.of(
+                        "this is a simple example {TITLE}", "This is a simple example {TITLE}"),
+                Arguments.of(
+                        "this {IS} another simple example tit{LE}",
+                        "This {IS} another simple example tit{LE}"),
                 Arguments.of("{What ABOUT thIS} one?", "{What ABOUT thIS} one?"),
-                Arguments.of("{And {thIS} might {a{lso}} be possible}", "{And {thIS} might {a{lso}} be possible}")
-        );
+                Arguments.of(
+                        "{And {thIS} might {a{lso}} be possible}",
+                        "{And {thIS} might {a{lso}} be possible}"));
     }
 
     @Disabled
     @Test
     void titleCaseAllUppers() {
         /* the real test would look like as follows. Also from the comment of issue 176, order reversed as the "should be" comes first */
-        // assertCaseChangerTitleUppers("This is a Simple Example {TITLE}", "This is a simple example {TITLE}");
-        // assertCaseChangerTitleUppers("This {IS} Another Simple Example Tit{LE}", "This {IS} another simple example tit{LE}");
+        // assertCaseChangerTitleUppers("This is a Simple Example {TITLE}", "This is a simple
+        // example {TITLE}");
+        // assertCaseChangerTitleUppers("This {IS} Another Simple Example Tit{LE}", "This {IS}
+        // another simple example tit{LE}");
         // assertCaseChangerTitleUppers("{What ABOUT thIS} one?", "{What ABOUT thIS} one?");
-        // assertCaseChangerTitleUppers("{And {thIS} might {a{lso}} be possible}", "{And {thIS} might {a{lso}} be possible}")
+        // assertCaseChangerTitleUppers("{And {thIS} might {a{lso}} be possible}", "{And {thIS}
+        // might {a{lso}} be possible}")
     }
 }
diff --git a/src/test/java/org/jabref/logic/bst/util/BstNameFormatterTest.java b/src/test/java/org/jabref/logic/bst/util/BstNameFormatterTest.java
index 2d47240dcf39..e4f407fa3a1e 100644
--- a/src/test/java/org/jabref/logic/bst/util/BstNameFormatterTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstNameFormatterTest.java
@@ -1,18 +1,18 @@
 package org.jabref.logic.bst.util;
 
-import org.jabref.model.entry.AuthorList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.model.entry.AuthorList;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class BstNameFormatterTest {
 
     @Test
     void umlautsFullNames() {
         AuthorList list = AuthorList.parse("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
 
-        assertEquals("de~laVall{\\'e}e~PoussinCharles Louis Xavier~Joseph",
+        assertEquals(
+                "de~laVall{\\'e}e~PoussinCharles Louis Xavier~Joseph",
                 BstNameFormatter.formatName(list.getAuthor(0), "{vv}{ll}{jj}{ff}"));
     }
 
@@ -20,7 +20,8 @@ void umlautsFullNames() {
     void umlautsAbbreviations() {
         AuthorList list = AuthorList.parse("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
 
-        assertEquals("de~la Vall{\\'e}e~Poussin, C.~L. X.~J.",
+        assertEquals(
+                "de~la Vall{\\'e}e~Poussin, C.~L. X.~J.",
                 BstNameFormatter.formatName(list.getAuthor(0), "{vv~}{ll}{, jj}{, f.}"));
     }
 
@@ -28,7 +29,8 @@ void umlautsAbbreviations() {
     void umlautsAbbreviationsWithQuestionMark() {
         AuthorList list = AuthorList.parse("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
 
-        assertEquals("de~la Vall{\\'e}e~Poussin, C.~L. X.~J?",
+        assertEquals(
+                "de~la Vall{\\'e}e~Poussin, C.~L. X.~J?",
                 BstNameFormatter.formatName(list.getAuthor(0), "{vv~}{ll}{, jj}{, f}?"));
     }
 
@@ -38,18 +40,35 @@ void formatName() {
 
         assertEquals("dlVP", BstNameFormatter.formatName(list.getAuthor(0), "{v{}}{l{}}"));
 
-        assertNameFormatA("Meyer, J?", "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
-        assertNameFormatB("J.~Meyer", "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
-        assertNameFormatC("Jonathan Meyer", "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
+        assertNameFormatA(
+                "Meyer, J?",
+                "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
+        assertNameFormatB(
+                "J.~Meyer",
+                "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
+        assertNameFormatC(
+                "Jonathan Meyer",
+                "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
         assertNameFormatA("Masterly, {\\'{E}}?", "{\\'{E}}douard Masterly");
         assertNameFormatB("{\\'{E}}.~Masterly", "{\\'{E}}douard Masterly");
         assertNameFormatC("{\\'{E}}douard Masterly", "{\\'{E}}douard Masterly");
-        assertNameFormatA("{\\\"{U}}nderwood, U?", "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot");
-        assertNameFormatB("U.~{\\\"{U}}nderwood", "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot");
-        assertNameFormatC("Ulrich {\\\"{U}}nderwood", "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot");
-        assertNameFormatA("Victor, P.~{\\'E}?", "Paul {\\'E}mile Victor and and de la Cierva y Codorn{\\’\\i}u, Juan");
-        assertNameFormatB("P.~{\\'E}. Victor", "Paul {\\'E}mile Victor and and de la Cierva y Codorn{\\’\\i}u, Juan");
-        assertNameFormatC("Paul~{\\'E}mile Victor",
+        assertNameFormatA(
+                "{\\\"{U}}nderwood, U?",
+                "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot");
+        assertNameFormatB(
+                "U.~{\\\"{U}}nderwood",
+                "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot");
+        assertNameFormatC(
+                "Ulrich {\\\"{U}}nderwood",
+                "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot");
+        assertNameFormatA(
+                "Victor, P.~{\\'E}?",
+                "Paul {\\'E}mile Victor and and de la Cierva y Codorn{\\’\\i}u, Juan");
+        assertNameFormatB(
+                "P.~{\\'E}. Victor",
+                "Paul {\\'E}mile Victor and and de la Cierva y Codorn{\\’\\i}u, Juan");
+        assertNameFormatC(
+                "Paul~{\\'E}mile Victor",
                 "Paul {\\'E}mile Victor and and de la Cierva y Codorn{\\’\\i}u, Juan");
     }
 
@@ -72,21 +91,28 @@ private void assertNameFormatA(String string, String string2) {
     @Test
     void matchingBraceConsumedForCompleteWords() {
         StringBuilder sb = new StringBuilder();
-        assertEquals(6, BstNameFormatter.consumeToMatchingBrace(sb, "{HELLO} {WORLD}".toCharArray(), 0));
+        assertEquals(
+                6, BstNameFormatter.consumeToMatchingBrace(sb, "{HELLO} {WORLD}".toCharArray(), 0));
         assertEquals("{HELLO}", sb.toString());
     }
 
     @Test
     void matchingBraceConsumedForBracesInWords() {
         StringBuilder sb = new StringBuilder();
-        assertEquals(18, BstNameFormatter.consumeToMatchingBrace(sb, "{HE{L{}L}O} {WORLD}".toCharArray(), 12));
+        assertEquals(
+                18,
+                BstNameFormatter.consumeToMatchingBrace(
+                        sb, "{HE{L{}L}O} {WORLD}".toCharArray(), 12));
         assertEquals("{WORLD}", sb.toString());
     }
 
     @Test
     void consumeToMatchingBrace() {
         StringBuilder sb = new StringBuilder();
-        assertEquals(10, BstNameFormatter.consumeToMatchingBrace(sb, "{HE{L{}L}O} {WORLD}".toCharArray(), 0));
+        assertEquals(
+                10,
+                BstNameFormatter.consumeToMatchingBrace(
+                        sb, "{HE{L{}L}O} {WORLD}".toCharArray(), 0));
         assertEquals("{HE{L{}L}O}", sb.toString());
     }
 
diff --git a/src/test/java/org/jabref/logic/bst/util/BstPurifierTest.java b/src/test/java/org/jabref/logic/bst/util/BstPurifierTest.java
index e0eb7ac928ba..b71cbe7d8648 100644
--- a/src/test/java/org/jabref/logic/bst/util/BstPurifierTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstPurifierTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.bst.util;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class BstPurifierTest {
 
@@ -23,10 +23,13 @@ private static Stream<Arguments> provideTestStrings() {
                 Arguments.of("Hi Hi ", "Hi Hi "),
                 Arguments.of("oe", "{\\oe}"),
                 Arguments.of("Hi oeHi ", "Hi {\\oe   }Hi "),
-                Arguments.of("Jonathan Meyer and Charles Louis Xavier Joseph de la Vallee Poussin", "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"),
+                Arguments.of(
+                        "Jonathan Meyer and Charles Louis Xavier Joseph de la Vallee Poussin",
+                        "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"),
                 Arguments.of("e", "{\\'e}"),
                 Arguments.of("Edouard Masterly", "{\\'{E}}douard Masterly"),
-                Arguments.of("Ulrich Underwood and Ned Net and Paul Pot", "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot")
-        );
+                Arguments.of(
+                        "Ulrich Underwood and Ned Net and Paul Pot",
+                        "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/bst/util/BstTextPrefixerTest.java b/src/test/java/org/jabref/logic/bst/util/BstTextPrefixerTest.java
index 8f35589c6399..82968f4cac12 100644
--- a/src/test/java/org/jabref/logic/bst/util/BstTextPrefixerTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstTextPrefixerTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.bst.util;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 public class BstTextPrefixerTest {
     @ParameterizedTest
     @CsvSource({
diff --git a/src/test/java/org/jabref/logic/bst/util/BstWidthCalculatorTest.java b/src/test/java/org/jabref/logic/bst/util/BstWidthCalculatorTest.java
index e2c348ae24ea..3c9875f88483 100644
--- a/src/test/java/org/jabref/logic/bst/util/BstWidthCalculatorTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstWidthCalculatorTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.bst.util;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 /**
  * How to create these test using Bibtex:
@@ -51,10 +51,12 @@ private static Stream<Arguments> provideTestWidth() {
                 Arguments.of(778, "{\\oe}"),
                 Arguments.of(3390, "Hi {\\oe   }Hi "),
                 Arguments.of(444, "{\\'e}"),
-                Arguments.of(19762, "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot"),
+                Arguments.of(
+                        19762, "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot"),
                 Arguments.of(7861, "{\\'{E}}douard Masterly"),
-                Arguments.of(30514, "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin")
-        );
+                Arguments.of(
+                        30514,
+                        "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"));
     }
 
     @ParameterizedTest
@@ -69,7 +71,6 @@ private static Stream<Arguments> provideTestGetCharWidth() {
                 Arguments.of(361, 'I'),
                 Arguments.of(500, '~'),
                 Arguments.of(500, '}'),
-                Arguments.of(278, ' ')
-        );
+                Arguments.of(278, ' '));
     }
 }
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatternsTest.java b/src/test/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatternsTest.java
index 47c2666610b8..9b84ea416855 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatternsTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatternsTest.java
@@ -1,31 +1,35 @@
 package org.jabref.logic.citationkeypattern;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.mockito.Mockito;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-
 @Execution(ExecutionMode.CONCURRENT)
 class AbstractCitationKeyPatternsTest {
 
     @Test
     void AbstractCitationKeyPatternParse() {
-        AbstractCitationKeyPatterns pattern = mock(AbstractCitationKeyPatterns.class, Mockito.CALLS_REAL_METHODS);
+        AbstractCitationKeyPatterns pattern =
+                mock(AbstractCitationKeyPatterns.class, Mockito.CALLS_REAL_METHODS);
 
         pattern.setDefaultValue("[field1]spacer1[field2]spacer2[field3]");
-        CitationKeyPattern expectedPattern = new CitationKeyPattern("[field1]spacer1[field2]spacer2[field3]");
+        CitationKeyPattern expectedPattern =
+                new CitationKeyPattern("[field1]spacer1[field2]spacer2[field3]");
         assertEquals(expectedPattern, pattern.getDefaultValue());
     }
 
     @Test
     void AbstractCitationKeyPatternParseEmptySpacer() {
-        AbstractCitationKeyPatterns pattern = mock(AbstractCitationKeyPatterns.class, Mockito.CALLS_REAL_METHODS);
+        AbstractCitationKeyPatterns pattern =
+                mock(AbstractCitationKeyPatterns.class, Mockito.CALLS_REAL_METHODS);
 
         pattern.setDefaultValue("[field1][field2]spacer2[field3]");
-        CitationKeyPattern expectedPattern = new CitationKeyPattern("[field1][field2]spacer2[field3]");
+        CitationKeyPattern expectedPattern =
+                new CitationKeyPattern("[field1][field2]spacer2[field3]");
         assertEquals(expectedPattern, pattern.getDefaultValue());
     }
 }
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java b/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java
index 4d1b36497782..34dd191044e8 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java
@@ -1,6 +1,9 @@
 package org.jabref.logic.citationkeypattern;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.AuthorList;
@@ -8,7 +11,6 @@
 import org.jabref.model.entry.BibtexString;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
@@ -18,10 +20,7 @@
 import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.stream.Stream;
 
 /**
  * Tests based on a BibEntry are contained in {@link CitationKeyGeneratorTest}
@@ -35,23 +34,31 @@ class BracketedPatternTest {
 
     @BeforeEach
     void setUp() {
-        bibentry = new BibEntry().withField(StandardField.AUTHOR, "O. Kitsune")
-                                 .withField(StandardField.YEAR, "2017")
-                                 .withField(StandardField.PAGES, "213--216");
-
-        dbentry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("HipKro03")
-                .withField(StandardField.AUTHOR, "Eric von Hippel and Georg von Krogh")
-                .withField(StandardField.TITLE, "Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science")
-                .withField(StandardField.JOURNAL, "Organization Science")
-                .withField(StandardField.YEAR, "2003")
-                .withField(StandardField.VOLUME, "14")
-                .withField(StandardField.PAGES, "209--223")
-                .withField(StandardField.NUMBER, "2")
-                .withField(StandardField.ADDRESS, "Institute for Operations Research and the Management Sciences (INFORMS), Linthicum, Maryland, USA")
-                .withField(StandardField.DOI, "http://dx.doi.org/10.1287/orsc.14.2.209.14992")
-                .withField(StandardField.ISSN, "1526-5455")
-                .withField(StandardField.PUBLISHER, "INFORMS");
+        bibentry =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "O. Kitsune")
+                        .withField(StandardField.YEAR, "2017")
+                        .withField(StandardField.PAGES, "213--216");
+
+        dbentry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("HipKro03")
+                        .withField(StandardField.AUTHOR, "Eric von Hippel and Georg von Krogh")
+                        .withField(
+                                StandardField.TITLE,
+                                "Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science")
+                        .withField(StandardField.JOURNAL, "Organization Science")
+                        .withField(StandardField.YEAR, "2003")
+                        .withField(StandardField.VOLUME, "14")
+                        .withField(StandardField.PAGES, "209--223")
+                        .withField(StandardField.NUMBER, "2")
+                        .withField(
+                                StandardField.ADDRESS,
+                                "Institute for Operations Research and the Management Sciences (INFORMS), Linthicum, Maryland, USA")
+                        .withField(
+                                StandardField.DOI, "http://dx.doi.org/10.1287/orsc.14.2.209.14992")
+                        .withField(StandardField.ISSN, "1526-5455")
+                        .withField(StandardField.PUBLISHER, "INFORMS");
 
         database = new BibDatabase();
         database.insertEntry(dbentry);
@@ -62,11 +69,20 @@ static Stream<Arguments> allAuthors() {
                 Arguments.of("ArtemenkoEtAl", "Alexander Artemenko and others"),
                 Arguments.of("AachenEtAl", "Aachen and others"),
                 Arguments.of("AachenBerlinEtAl", "Aachen and Berlin and others"),
-                Arguments.of("AachenBerlinChemnitzEtAl", "Aachen and Berlin and Chemnitz and others"),
-                Arguments.of("AachenBerlinChemnitzDüsseldorf", "Aachen and Berlin and Chemnitz and Düsseldorf"),
-                Arguments.of("AachenBerlinChemnitzDüsseldorfEtAl", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
-                Arguments.of("AachenBerlinChemnitzDüsseldorfEssen", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
-                Arguments.of("AachenBerlinChemnitzDüsseldorfEssenEtAl", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+                Arguments.of(
+                        "AachenBerlinChemnitzEtAl", "Aachen and Berlin and Chemnitz and others"),
+                Arguments.of(
+                        "AachenBerlinChemnitzDüsseldorf",
+                        "Aachen and Berlin and Chemnitz and Düsseldorf"),
+                Arguments.of(
+                        "AachenBerlinChemnitzDüsseldorfEtAl",
+                        "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
+                Arguments.of(
+                        "AachenBerlinChemnitzDüsseldorfEssen",
+                        "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
+                Arguments.of(
+                        "AachenBerlinChemnitzDüsseldorfEssenEtAl",
+                        "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
     }
 
     @ParameterizedTest
@@ -86,7 +102,8 @@ static Stream<Arguments> authorsAlpha() {
                 Arguments.of("ABCD", "Aachen and Berlin and Chemnitz and Düsseldorf"),
                 Arguments.of("Aa", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
                 Arguments.of("ABCD", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
-                Arguments.of("Aa", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"),
+                Arguments.of(
+                        "Aa", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"),
                 Arguments.of("AB", "Abel, K.; Bibel, U."),
                 Arguments.of("ABC", "Abraham, N.; Bibel, U.; Corleone, P."),
                 Arguments.of("Az", "Azubi, L. et.al."),
@@ -117,16 +134,22 @@ static Stream<Arguments> oneAuthorPlusInitials() {
                 Arguments.of("NewtoM", "I. Newton and J. Maxwell"),
                 Arguments.of("NewtoME", "I. Newton and J. Maxwell and A. Einstein"),
                 Arguments.of("NewtoMEB", "I. Newton and J. Maxwell and A. Einstein and N. Bohr"),
-                Arguments.of("NewtoMEBU", "I. Newton and J. Maxwell and A. Einstein and N. Bohr and Harry Unknown"),
+                Arguments.of(
+                        "NewtoMEBU",
+                        "I. Newton and J. Maxwell and A. Einstein and N. Bohr and Harry Unknown"),
                 Arguments.of("Aache+", "Aachen and others"),
                 Arguments.of("AacheB", "Aachen and Berlin"),
                 Arguments.of("AacheB+", "Aachen and Berlin and others"),
                 Arguments.of("AacheBC", "Aachen and Berlin and Chemnitz"),
                 Arguments.of("AacheBC+", "Aachen and Berlin and Chemnitz and others"),
                 Arguments.of("AacheBCD", "Aachen and Berlin and Chemnitz and Düsseldorf"),
-                Arguments.of("AacheBCD+", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
-                Arguments.of("AacheBCDE", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
-                Arguments.of("AacheBCDE+", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+                Arguments.of(
+                        "AacheBCD+", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
+                Arguments.of(
+                        "AacheBCDE", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
+                Arguments.of(
+                        "AacheBCDE+",
+                        "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
     }
 
     @ParameterizedTest
@@ -140,7 +163,8 @@ static Stream<Arguments> authShort() {
                 Arguments.of("Newton", "Isaac Newton"),
                 Arguments.of("NM", "Isaac Newton and James Maxwell"),
                 Arguments.of("NME", "Isaac Newton and James Maxwell and Albert Einstein"),
-                Arguments.of("NME+", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
+                Arguments.of(
+                        "NME+", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
                 Arguments.of("Aachen", "Aachen"),
                 Arguments.of("A+", "Aachen and others"),
                 Arguments.of("AB", "Aachen and Berlin"),
@@ -150,7 +174,9 @@ static Stream<Arguments> authShort() {
                 Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and Düsseldorf"),
                 Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
                 Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
-                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+                Arguments.of(
+                        "ABC+",
+                        "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
     }
 
     @ParameterizedTest
@@ -174,7 +200,8 @@ static Stream<Arguments> authIni1() {
                 Arguments.of("A", "Aachen and Berlin and Chemnitz and Düsseldorf"),
                 Arguments.of("A", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
                 Arguments.of("A", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
-                Arguments.of("A", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+                Arguments.of(
+                        "A", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
     }
 
     @ParameterizedTest
@@ -188,7 +215,8 @@ static Stream<Arguments> authIni2() {
                 Arguments.of("Ne", "Isaac Newton"),
                 Arguments.of("NM", "Isaac Newton and James Maxwell"),
                 Arguments.of("NM", "Isaac Newton and James Maxwell and Albert Einstein"),
-                Arguments.of("NM", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
+                Arguments.of(
+                        "NM", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
                 Arguments.of("Aa", "Aachen"),
                 Arguments.of("A+", "Aachen and others"),
                 Arguments.of("AB", "Aachen and Berlin"),
@@ -199,7 +227,9 @@ static Stream<Arguments> authIni2() {
                 Arguments.of("AB", "Aachen and Berlin and Chemnitz and Düsseldorf"),
                 Arguments.of("AB", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
                 Arguments.of("AB", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
-                Arguments.of("AB", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+                Arguments.of(
+                        "AB",
+                        "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
     }
 
     @ParameterizedTest
@@ -213,7 +243,8 @@ static Stream<Arguments> authIni3() {
                 Arguments.of("New", "Isaac Newton"),
                 Arguments.of("NeM", "Isaac Newton and James Maxwell"),
                 Arguments.of("NME", "Isaac Newton and James Maxwell and Albert Einstein"),
-                Arguments.of("NME", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
+                Arguments.of(
+                        "NME", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
                 Arguments.of("Aac", "Aachen"),
                 Arguments.of("Aa+", "Aachen and others"),
                 Arguments.of("AaB", "Aachen and Berlin"),
@@ -224,7 +255,9 @@ static Stream<Arguments> authIni3() {
                 Arguments.of("ABC", "Aachen and Berlin and Chemnitz and Düsseldorf"),
                 Arguments.of("ABC", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
                 Arguments.of("ABC", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
-                Arguments.of("ABC", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+                Arguments.of(
+                        "ABC",
+                        "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
     }
 
     @ParameterizedTest
@@ -238,7 +271,8 @@ static Stream<Arguments> authIni4() {
                 Arguments.of("Newt", "Isaac Newton"),
                 Arguments.of("NeMa", "Isaac Newton and James Maxwell"),
                 Arguments.of("NeME", "Isaac Newton and James Maxwell and Albert Einstein"),
-                Arguments.of("NMEB", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
+                Arguments.of(
+                        "NMEB", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
                 Arguments.of("Aach", "Aachen"),
                 Arguments.of("Aac+", "Aachen and others"),
                 Arguments.of("AaBe", "Aachen and Berlin"),
@@ -248,7 +282,9 @@ static Stream<Arguments> authIni4() {
                 Arguments.of("ABCD", "Aachen and Berlin and Chemnitz and Düsseldorf"),
                 Arguments.of("ABCD", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
                 Arguments.of("ABCD", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
-                Arguments.of("ABCD", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+                Arguments.of(
+                        "ABCD",
+                        "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
     }
 
     @ParameterizedTest
@@ -262,7 +298,9 @@ static Stream<Arguments> authEtAlDotDotEal() {
                 Arguments.of("Newton", "Isaac Newton"),
                 Arguments.of("Newton.Maxwell", "Isaac Newton and James Maxwell"),
                 Arguments.of("Newton.etal", "Isaac Newton and James Maxwell and Albert Einstein"),
-                Arguments.of("Newton.etal", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
+                Arguments.of(
+                        "Newton.etal",
+                        "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
                 Arguments.of("Aachen", "Aachen"),
                 Arguments.of("Aachen.etal", "Aachen and others"),
                 Arguments.of("Aachen.Berlin", "Aachen and Berlin"),
@@ -270,9 +308,13 @@ static Stream<Arguments> authEtAlDotDotEal() {
                 Arguments.of("Aachen.etal", "Aachen and Berlin and Chemnitz"),
                 Arguments.of("Aachen.etal", "Aachen and Berlin and Chemnitz and others"),
                 Arguments.of("Aachen.etal", "Aachen and Berlin and Chemnitz and Düsseldorf"),
-                Arguments.of("Aachen.etal", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
-                Arguments.of("Aachen.etal", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
-                Arguments.of("Aachen.etal", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+                Arguments.of(
+                        "Aachen.etal", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
+                Arguments.of(
+                        "Aachen.etal", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
+                Arguments.of(
+                        "Aachen.etal",
+                        "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
     }
 
     @ParameterizedTest
@@ -285,8 +327,11 @@ static Stream<Arguments> authAuthEa() {
         return Stream.of(
                 Arguments.of("Newton", "Isaac Newton"),
                 Arguments.of("Newton.Maxwell", "Isaac Newton and James Maxwell"),
-                Arguments.of("Newton.Maxwell.ea", "Isaac Newton and James Maxwell and Albert Einstein"),
-                Arguments.of("Newton.Maxwell.ea", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
+                Arguments.of(
+                        "Newton.Maxwell.ea", "Isaac Newton and James Maxwell and Albert Einstein"),
+                Arguments.of(
+                        "Newton.Maxwell.ea",
+                        "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
                 Arguments.of("Aachen", "Aachen"),
                 Arguments.of("Aachen.ea", "Aachen and others"),
                 Arguments.of("Aachen.Berlin", "Aachen and Berlin"),
@@ -294,9 +339,15 @@ static Stream<Arguments> authAuthEa() {
                 Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and Chemnitz"),
                 Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and Chemnitz and others"),
                 Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and Chemnitz and Düsseldorf"),
-                Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
-                Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
-                Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+                Arguments.of(
+                        "Aachen.Berlin.ea",
+                        "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
+                Arguments.of(
+                        "Aachen.Berlin.ea",
+                        "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
+                Arguments.of(
+                        "Aachen.Berlin.ea",
+                        "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
     }
 
     @ParameterizedTest
@@ -307,24 +358,23 @@ void authShort(String expected, AuthorList list) {
 
     @ParameterizedTest
     @CsvSource({
-            "'Newton', '[auth]', 'Isaac Newton'",
-            "'Newton', '[authFirstFull]', 'Isaac Newton'",
-            "'I', '[authForeIni]', 'Isaac Newton'",
-            "'Newton', '[auth.etal]', 'Isaac Newton'",
-            "'Newton', '[authEtAl]', 'Isaac Newton'",
-            "'Newton', '[auth.auth.ea]', 'Isaac Newton'",
-            "'Newton', '[authors]', 'Isaac Newton'",
-            "'Newton', '[authors2]', 'Isaac Newton'",
-            "'Ne', '[authIni2]', 'Isaac Newton'",
-            "'New', '[auth3]', 'Isaac Newton'",
-            "'New', '[auth3_1]', 'Isaac Newton'",
-            "'Newton', '[authshort]', 'Isaac Newton'",
-            "'Ne', '[authorsAlpha]', 'Isaac Newton'",
-            "'Newton', '[authorLast]', 'Isaac Newton'",
-            "'I', '[authorLastForeIni]', 'Isaac Newton'",
-
-            "'Agency', '[authors]', 'European Union Aviation Safety Agency'",
-            "'EUASA', '[authors]', '{European Union Aviation Safety Agency}'"
+        "'Newton', '[auth]', 'Isaac Newton'",
+        "'Newton', '[authFirstFull]', 'Isaac Newton'",
+        "'I', '[authForeIni]', 'Isaac Newton'",
+        "'Newton', '[auth.etal]', 'Isaac Newton'",
+        "'Newton', '[authEtAl]', 'Isaac Newton'",
+        "'Newton', '[auth.auth.ea]', 'Isaac Newton'",
+        "'Newton', '[authors]', 'Isaac Newton'",
+        "'Newton', '[authors2]', 'Isaac Newton'",
+        "'Ne', '[authIni2]', 'Isaac Newton'",
+        "'New', '[auth3]', 'Isaac Newton'",
+        "'New', '[auth3_1]', 'Isaac Newton'",
+        "'Newton', '[authshort]', 'Isaac Newton'",
+        "'Ne', '[authorsAlpha]', 'Isaac Newton'",
+        "'Newton', '[authorLast]', 'Isaac Newton'",
+        "'I', '[authorLastForeIni]', 'Isaac Newton'",
+        "'Agency', '[authors]', 'European Union Aviation Safety Agency'",
+        "'EUASA', '[authors]', '{European Union Aviation Safety Agency}'"
     })
     void authorFieldMarkers(String expectedCitationKey, String pattern, String author) {
         BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, author);
@@ -340,15 +390,16 @@ private static Stream<Arguments> expandBracketsWithFallback() {
                 Arguments.of("", "[title:([YEAR)]"),
                 Arguments.of(")]", "[title:(YEAR])]"),
                 Arguments.of("2105.02891", "[title:([EPRINT:([YEAR])])]"),
-                Arguments.of("2021", "[title:([auth:([YEAR])])]")
-        );
+                Arguments.of("2021", "[title:([auth:([YEAR])])]"));
     }
 
     @ParameterizedTest
     @MethodSource()
     void expandBracketsWithFallback(String expandResult, String pattern) {
-        BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.YEAR, "2021").withField(StandardField.EPRINT, "2105.02891");
+        BibEntry bibEntry =
+                new BibEntry()
+                        .withField(StandardField.YEAR, "2021")
+                        .withField(StandardField.EPRINT, "2105.02891");
         BracketedPattern bracketedPattern = new BracketedPattern(pattern);
 
         assertEquals(expandResult, bracketedPattern.expand(bibEntry));
@@ -411,13 +462,13 @@ void databaseWithStringsExpansionTest() {
         BibDatabase another_database = new BibDatabase();
         BibtexString string = new BibtexString("sgr", "Saulius Gražulis");
         another_database.addString(string);
-        bibentry = new BibEntry()
-                .withField(StandardField.AUTHOR, "#sgr#")
-                .withField(StandardField.YEAR, "2017")
-                .withField(StandardField.PAGES, "213--216");
+        bibentry =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "#sgr#")
+                        .withField(StandardField.YEAR, "2017")
+                        .withField(StandardField.PAGES, "213--216");
         BracketedPattern pattern = new BracketedPattern("[year]_[auth]_[firstpage]");
-        assertEquals("2017_Gražulis_213", pattern.expand(bibentry,
-                another_database));
+        assertEquals("2017_Gražulis_213", pattern.expand(bibentry, another_database));
     }
 
     @Test
@@ -440,7 +491,8 @@ void entryTypeExpansionTest() {
 
     @Test
     void entryTypeExpansionLowercaseTest() {
-        BracketedPattern pattern = new BracketedPattern("[entrytype:lower]:[year]_[auth]_[firstpage]");
+        BracketedPattern pattern =
+                new BracketedPattern("[entrytype:lower]:[year]_[auth]_[firstpage]");
         assertEquals("misc:2017_Kitsune_213", pattern.expand(bibentry));
     }
 
@@ -448,10 +500,11 @@ void entryTypeExpansionLowercaseTest() {
     void suppliedBibentryBracketExpansionTest() {
         BibDatabase another_database = null;
         BracketedPattern pattern = new BracketedPattern("[year]_[auth]_[firstpage]");
-        BibEntry another_bibentry = new BibEntry()
-                .withField(StandardField.AUTHOR, "Gražulis, Saulius")
-                .withField(StandardField.YEAR, "2017")
-                .withField(StandardField.PAGES, "213--216");
+        BibEntry another_bibentry =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "Gražulis, Saulius")
+                        .withField(StandardField.YEAR, "2017")
+                        .withField(StandardField.PAGES, "213--216");
         assertEquals("2017_Gražulis_213", pattern.expand(another_bibentry, ';', another_database));
     }
 
@@ -460,14 +513,17 @@ void nullBibentryBracketExpansionTest() {
         BibDatabase another_database = null;
         BibEntry another_bibentry = null;
         BracketedPattern pattern = new BracketedPattern("[year]_[auth]_[firstpage]");
-        assertThrows(NullPointerException.class, () -> pattern.expand(another_bibentry, ';', another_database));
+        assertThrows(
+                NullPointerException.class,
+                () -> pattern.expand(another_bibentry, ';', another_database));
     }
 
     @Test
     void bracketedExpressionDefaultConstructorTest() {
         BibDatabase another_database = null;
         BracketedPattern pattern = new BracketedPattern();
-        assertThrows(NullPointerException.class, () -> pattern.expand(bibentry, ';', another_database));
+        assertThrows(
+                NullPointerException.class, () -> pattern.expand(bibentry, ';', another_database));
     }
 
     @Test
@@ -489,29 +545,37 @@ void emptyPatternAndValidModifierExpandsToEmptyString() {
     @Test
     void bibtexkeyPatternExpandsToCitationKey() {
         Character separator = ';';
-        assertEquals("HipKro03", BracketedPattern.expandBrackets("[bibtexkey]", separator, dbentry, database));
+        assertEquals(
+                "HipKro03",
+                BracketedPattern.expandBrackets("[bibtexkey]", separator, dbentry, database));
     }
 
     @Test
     void citationKeyPatternExpandsToCitationKey() {
         Character separator = ';';
-        assertEquals("HipKro03", BracketedPattern.expandBrackets("[citationkey]", separator, dbentry, database));
+        assertEquals(
+                "HipKro03",
+                BracketedPattern.expandBrackets("[citationkey]", separator, dbentry, database));
     }
 
     @Test
     void citationKeyPatternWithEmptyModifierExpandsToBibTeXKey() {
-        assertEquals("HipKro03", BracketedPattern.expandBrackets("[citationkey:]", ';', dbentry, database));
+        assertEquals(
+                "HipKro03",
+                BracketedPattern.expandBrackets("[citationkey:]", ';', dbentry, database));
     }
 
     @Test
     void authorPatternTreatsVonNamePrefixCorrectly() {
-        assertEquals("Eric von Hippel and Georg von Krogh",
+        assertEquals(
+                "Eric von Hippel and Georg von Krogh",
                 BracketedPattern.expandBrackets("[author]", ';', dbentry, database));
     }
 
     @Test
     void lowerFormatterWorksOnVonNamePrefixes() {
-        assertEquals("eric von hippel and georg von krogh",
+        assertEquals(
+                "eric von hippel and georg von krogh",
                 BracketedPattern.expandBrackets("[author:lower]", ';', dbentry, database));
     }
 
@@ -521,28 +585,32 @@ void resolvedFieldAndFormat() {
         database.insertEntry(child);
 
         Character separator = ';';
-        assertEquals("Eric von Hippel and Georg von Krogh",
+        assertEquals(
+                "Eric von Hippel and Georg von Krogh",
                 BracketedPattern.expandBrackets("[author]", separator, child, database));
 
-        assertEquals("", BracketedPattern.expandBrackets("[unknownkey]", separator, child, database));
+        assertEquals(
+                "", BracketedPattern.expandBrackets("[unknownkey]", separator, child, database));
 
         assertEquals("", BracketedPattern.expandBrackets("[:]", separator, child, database));
 
         assertEquals("", BracketedPattern.expandBrackets("[:lower]", separator, child, database));
 
-        assertEquals("eric von hippel and georg von krogh",
+        assertEquals(
+                "eric von hippel and georg von krogh",
                 BracketedPattern.expandBrackets("[author:lower]", separator, child, database));
 
         // the citation key is not inherited
-        assertEquals("", BracketedPattern.expandBrackets("[citationkey]", separator, child, database));
+        assertEquals(
+                "", BracketedPattern.expandBrackets("[citationkey]", separator, child, database));
 
-        assertEquals("", BracketedPattern.expandBrackets("[citationkey:]", separator, child, database));
+        assertEquals(
+                "", BracketedPattern.expandBrackets("[citationkey:]", separator, child, database));
     }
 
     @Test
     void resolvedParentNotInDatabase() {
-        BibEntry child = new BibEntry()
-                .withField(StandardField.CROSSREF, "HipKro03");
+        BibEntry child = new BibEntry().withField(StandardField.CROSSREF, "HipKro03");
         database.removeEntry(dbentry);
         database.insertEntry(child);
 
@@ -551,19 +619,30 @@ void resolvedParentNotInDatabase() {
 
     @Test
     void regularExpressionReplace() {
-        assertEquals("2003-JabRef Science",
-                BracketedPattern.expandBrackets("[year]-[journal:regex(\"Organization\",\"JabRef\")]", ';', dbentry, database));
+        assertEquals(
+                "2003-JabRef Science",
+                BracketedPattern.expandBrackets(
+                        "[year]-[journal:regex(\"Organization\",\"JabRef\")]",
+                        ';',
+                        dbentry,
+                        database));
     }
 
     @Test
     void regularExpressionWithBrackets() {
-        assertEquals("2003-JabRef Science",
-                BracketedPattern.expandBrackets("[year]-[journal:regex(\"[OX]rganization\",\"JabRef\")]", ';', dbentry, database));
+        assertEquals(
+                "2003-JabRef Science",
+                BracketedPattern.expandBrackets(
+                        "[year]-[journal:regex(\"[OX]rganization\",\"JabRef\")]",
+                        ';',
+                        dbentry,
+                        database));
     }
 
     @Test
     void emptyBrackets() {
-        assertEquals("2003-Organization Science",
+        assertEquals(
+                "2003-Organization Science",
                 BracketedPattern.expandBrackets("[year][]-[journal]", ';', dbentry, database));
     }
 
@@ -572,13 +651,16 @@ void emptyBrackets() {
      */
     @Test
     void expandBracketsChainsTwoTruncateModifiers() {
-        assertEquals("Open",
-                BracketedPattern.expandBrackets("[fulltitle:truncate6:truncate5]", ';', dbentry, database));
+        assertEquals(
+                "Open",
+                BracketedPattern.expandBrackets(
+                        "[fulltitle:truncate6:truncate5]", ';', dbentry, database));
     }
 
     @Test
     void expandBracketsDoesNotTruncateWithoutAnArgumentToTruncateModifier() {
-        assertEquals("Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science",
+        assertEquals(
+                "Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science",
                 BracketedPattern.expandBrackets("[fulltitle:truncate]", ';', dbentry, database));
     }
 
@@ -587,27 +669,37 @@ void expandBracketsDoesNotTruncateWithoutAnArgumentToTruncateModifier() {
      */
     @Test
     void expandBracketsCamelNTitle() {
-        assertEquals("Open",
-                BracketedPattern.expandBrackets("[camel1]", ';', dbentry, database));
-        assertEquals("OpenSourceSoftwareAnd",
+        assertEquals("Open", BracketedPattern.expandBrackets("[camel1]", ';', dbentry, database));
+        assertEquals(
+                "OpenSourceSoftwareAnd",
                 BracketedPattern.expandBrackets("[camel4]", ';', dbentry, database));
-        assertEquals("OpenSourceSoftwareAndThePrivateCollectiveInnovationModelIssues",
+        assertEquals(
+                "OpenSourceSoftwareAndThePrivateCollectiveInnovationModelIssues",
                 BracketedPattern.expandBrackets("[camel10]", ';', dbentry, database));
     }
 
     @Test
     void expandBracketsWithAuthorStartingWithBrackets() {
         // Issue https://github.com/JabRef/jabref/issues/3920
-        BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.AUTHOR, "Patrik {\\v{S}}pan{\\v{e}}l and Kseniya Dryahina and David Smith");
-        assertEquals("ŠpanělEtAl", BracketedPattern.expandBrackets("[authEtAl:latex_to_unicode]", null, bibEntry, null));
+        BibEntry bibEntry =
+                new BibEntry()
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Patrik {\\v{S}}pan{\\v{e}}l and Kseniya Dryahina and David Smith");
+        assertEquals(
+                "ŠpanělEtAl",
+                BracketedPattern.expandBrackets(
+                        "[authEtAl:latex_to_unicode]", null, bibEntry, null));
     }
 
     @Test
     void expandBracketsWithModifierContainingRegexCharacterClass() {
         BibEntry bibEntry = new BibEntry().withField(StandardField.TITLE, "Wickedness:Managing");
 
-        assertEquals("Wickedness.Managing", BracketedPattern.expandBrackets("[title:regex(\"[:]+\",\".\")]", null, bibEntry, null));
+        assertEquals(
+                "Wickedness.Managing",
+                BracketedPattern.expandBrackets(
+                        "[title:regex(\"[:]+\",\".\")]", null, bibEntry, null));
     }
 
     @Test
@@ -619,117 +711,138 @@ void expandBracketsEmptyStringFromEmptyBrackets() {
 
     @Test
     void expandBracketsInstitutionAbbreviationFromProvidedAbbreviation() {
-        BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.AUTHOR, "{European Union Aviation Safety Agency ({EUASABRACKET})}");
+        BibEntry bibEntry =
+                new BibEntry()
+                        .withField(
+                                StandardField.AUTHOR,
+                                "{European Union Aviation Safety Agency ({EUASABRACKET})}");
 
-        assertEquals("EUASABRACKET", BracketedPattern.expandBrackets("[auth]", null, bibEntry, null));
+        assertEquals(
+                "EUASABRACKET", BracketedPattern.expandBrackets("[auth]", null, bibEntry, null));
     }
 
     @Test
     void expandBracketsInstitutionAbbreviationForAuthorContainingUnion() {
-        BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.AUTHOR, "{European Union Aviation Safety Agency}");
+        BibEntry bibEntry =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "{European Union Aviation Safety Agency}");
 
         assertEquals("EUASA", BracketedPattern.expandBrackets("[auth]", null, bibEntry, null));
     }
 
     @Test
     void expandBracketsLastNameForAuthorStartingWithOnlyLastNameStartingWithLowerCase() {
-        BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.AUTHOR, "{eBay}");
+        BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, "{eBay}");
 
         assertEquals("eBay", BracketedPattern.expandBrackets("[auth]", null, bibEntry, null));
     }
 
     @Test
     void expandBracketsLastNameWithChineseCharacters() {
-        BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.AUTHOR, "杨秀群");
+        BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, "杨秀群");
 
         assertEquals("杨秀群", BracketedPattern.expandBrackets("[auth]", null, bibEntry, null));
     }
 
     @Test
     void expandBracketsUnmodifiedStringFromLongFirstPageNumber() {
-        BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.PAGES, "2325967120921344");
+        BibEntry bibEntry = new BibEntry().withField(StandardField.PAGES, "2325967120921344");
 
-        assertEquals("2325967120921344", BracketedPattern.expandBrackets("[firstpage]", null, bibEntry, null));
+        assertEquals(
+                "2325967120921344",
+                BracketedPattern.expandBrackets("[firstpage]", null, bibEntry, null));
     }
 
     @Test
     void expandBracketsUnmodifiedStringFromLongLastPageNumber() {
-        BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.PAGES, "2325967120921344");
+        BibEntry bibEntry = new BibEntry().withField(StandardField.PAGES, "2325967120921344");
 
-        assertEquals("2325967120921344", BracketedPattern.expandBrackets("[lastpage]", null, bibEntry, null));
+        assertEquals(
+                "2325967120921344",
+                BracketedPattern.expandBrackets("[lastpage]", null, bibEntry, null));
     }
 
     @Test
     void expandBracketsWithTestCasesFromRegExpBasedFileFinder() {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("HipKro03")
-                .withField(StandardField.AUTHOR, "Eric von Hippel and Georg von Krogh")
-                .withField(StandardField.TITLE, "Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science")
-                .withField(StandardField.JOURNAL, "Organization Science")
-                .withField(StandardField.YEAR, "2003")
-                .withField(StandardField.VOLUME, "14")
-                .withField(StandardField.PAGES, "209--223")
-                .withField(StandardField.NUMBER, "2")
-                .withField(StandardField.ADDRESS, "Institute for Operations Research and the Management Sciences (INFORMS), Linthicum, Maryland, USA")
-                .withField(StandardField.DOI, "http://dx.doi.org/10.1287/orsc.14.2.209.14992")
-                .withField(StandardField.ISSN, "1526-5455")
-                .withField(StandardField.PUBLISHER, "INFORMS");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("HipKro03")
+                        .withField(StandardField.AUTHOR, "Eric von Hippel and Georg von Krogh")
+                        .withField(
+                                StandardField.TITLE,
+                                "Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science")
+                        .withField(StandardField.JOURNAL, "Organization Science")
+                        .withField(StandardField.YEAR, "2003")
+                        .withField(StandardField.VOLUME, "14")
+                        .withField(StandardField.PAGES, "209--223")
+                        .withField(StandardField.NUMBER, "2")
+                        .withField(
+                                StandardField.ADDRESS,
+                                "Institute for Operations Research and the Management Sciences (INFORMS), Linthicum, Maryland, USA")
+                        .withField(
+                                StandardField.DOI, "http://dx.doi.org/10.1287/orsc.14.2.209.14992")
+                        .withField(StandardField.ISSN, "1526-5455")
+                        .withField(StandardField.PUBLISHER, "INFORMS");
 
         BibDatabase database = new BibDatabase();
         database.insertEntry(entry);
 
         assertEquals("", BracketedPattern.expandBrackets("", ',', entry, database));
 
-        assertEquals("dropped", BracketedPattern.expandBrackets("drop[unknownkey]ped", ',', entry, database));
+        assertEquals(
+                "dropped",
+                BracketedPattern.expandBrackets("drop[unknownkey]ped", ',', entry, database));
 
-        assertEquals("Eric von Hippel and Georg von Krogh",
+        assertEquals(
+                "Eric von Hippel and Georg von Krogh",
                 BracketedPattern.expandBrackets("[author]", ',', entry, database));
 
-        assertEquals("Eric von Hippel and Georg von Krogh are two famous authors.",
-                BracketedPattern.expandBrackets("[author] are two famous authors.", ',', entry, database));
+        assertEquals(
+                "Eric von Hippel and Georg von Krogh are two famous authors.",
+                BracketedPattern.expandBrackets(
+                        "[author] are two famous authors.", ',', entry, database));
 
-        assertEquals("Eric von Hippel and Georg von Krogh are two famous authors.",
-                BracketedPattern.expandBrackets("[author] are two famous authors.", ',', entry, database));
+        assertEquals(
+                "Eric von Hippel and Georg von Krogh are two famous authors.",
+                BracketedPattern.expandBrackets(
+                        "[author] are two famous authors.", ',', entry, database));
 
         assertEquals(
                 "Eric von Hippel and Georg von Krogh have published Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science in Organization Science.",
-                BracketedPattern.expandBrackets("[author] have published [fulltitle] in [journal].", ',', entry, database));
+                BracketedPattern.expandBrackets(
+                        "[author] have published [fulltitle] in [journal].", ',', entry, database));
 
         assertEquals(
                 "Eric von Hippel and Georg von Krogh have published Open Source Software and the \"Private Collective\" Innovation Model: Issues for Organization Science in Organization Science.",
-                BracketedPattern.expandBrackets("[author] have published [title] in [journal].", ',', entry, database));
+                BracketedPattern.expandBrackets(
+                        "[author] have published [title] in [journal].", ',', entry, database));
     }
 
     @Test
     void expandBracketsWithoutProtectiveBracesUsingUnprotectTermsModifier() {
-        BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.JOURNAL, "{ACS} Medicinal Chemistry Letters");
-        assertEquals("ACS Medicinal Chemistry Letters", BracketedPattern.expandBrackets("[JOURNAL:unprotect_terms]", null, bibEntry, null));
+        BibEntry bibEntry =
+                new BibEntry()
+                        .withField(StandardField.JOURNAL, "{ACS} Medicinal Chemistry Letters");
+        assertEquals(
+                "ACS Medicinal Chemistry Letters",
+                BracketedPattern.expandBrackets("[JOURNAL:unprotect_terms]", null, bibEntry, null));
     }
 
     @ParameterizedTest
     @CsvSource({
-            "'Newton', '[edtr]', 'Isaac Newton'",
-            "'I', '[edtrForeIni]', 'Isaac Newton'",
-            "'Newton', '[editors]', 'Isaac Newton'",
-            "'Ne', '[edtrIni2]', 'Isaac Newton'",
-            "'New', '[edtr3]', 'Isaac Newton'",
-            "'Newton', '[edtr7]', 'Isaac Newton'",
-            "'New', '[edtr3_1]', 'Isaac Newton'",
-            "'Newton.Maxwell', '[edtr.edtr.ea]', 'Isaac Newton and James Maxwell'",
-            "'Newton', '[edtrshort]', 'Isaac Newton'",
-            "'Newton', '[editorLast]', 'Isaac Newton'",
-            "'I', '[editorLastForeIni]', 'Isaac Newton'",
-
-            "'EUASA', '[editors]', '{European Union Aviation Safety Agency}'"
+        "'Newton', '[edtr]', 'Isaac Newton'",
+        "'I', '[edtrForeIni]', 'Isaac Newton'",
+        "'Newton', '[editors]', 'Isaac Newton'",
+        "'Ne', '[edtrIni2]', 'Isaac Newton'",
+        "'New', '[edtr3]', 'Isaac Newton'",
+        "'Newton', '[edtr7]', 'Isaac Newton'",
+        "'New', '[edtr3_1]', 'Isaac Newton'",
+        "'Newton.Maxwell', '[edtr.edtr.ea]', 'Isaac Newton and James Maxwell'",
+        "'Newton', '[edtrshort]', 'Isaac Newton'",
+        "'Newton', '[editorLast]', 'Isaac Newton'",
+        "'I', '[editorLastForeIni]', 'Isaac Newton'",
+        "'EUASA', '[editors]', '{European Union Aviation Safety Agency}'"
     })
-
     void editorFieldMarkers(String expectedCitationKey, String pattern, String editor) {
         BibEntry bibEntry = new BibEntry().withField(StandardField.EDITOR, editor);
         BracketedPattern bracketedPattern = new BracketedPattern(pattern);
@@ -752,8 +865,8 @@ void editorFieldMarkers(String expectedCitationKey, String pattern, String edito
         "'{Example School of Engineering, Department of Computer Science, Some Address}',SomeAddressEECS",
         "'{Example Institute, Computer Science Department, Some Address}',ExampleInstituteCS",
         "'{Short Part, Some Address}',ShortPart",
-        "'{Example with Several Tokens, Some Address}',EST"})
-
+        "'{Example with Several Tokens, Some Address}',EST"
+    })
     void generateInstitutionKeyTest(String input, String expected) {
         assertEquals(expected, BracketedPattern.generateInstitutionKey(input));
     }
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java b/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java
index c84f92c3019b..605cd6665c97 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java
@@ -1,7 +1,9 @@
 package org.jabref.logic.citationkeypattern;
 
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.jabref.logic.citationkeypattern.CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParseException;
@@ -9,7 +11,6 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -18,10 +19,8 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
-import static org.jabref.logic.citationkeypattern.CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 /**
  * Tests whole citation key patterns such as <code>[authorsAlpha][year]</code>.
@@ -34,33 +33,55 @@ class CitationKeyGeneratorTest {
     private static final BibEntry AUTHOR_EMPTY = createABibEntryAuthor("");
 
     private static final String AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1 = "Isaac Newton";
-    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1 = createABibEntryAuthor(AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1);
-
-    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2 = createABibEntryAuthor("Isaac Newton and James Maxwell");
-
-    private static final String AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3 = "Isaac Newton and James Maxwell and Albert Einstein";
-    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3 = createABibEntryAuthor(AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3);
-
-    private static final String AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_AND_OTHERS_COUNT_3 = "Isaac Newton and James Maxwell and others";
-    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_AND_OTHERS_COUNT_3 = createABibEntryAuthor(AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_AND_OTHERS_COUNT_3);
-
-    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1 = createABibEntryAuthor("Wil van der Aalst");
-    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2 = createABibEntryAuthor("Wil van der Aalst and Tammo van Lessen");
-
-    private static final BibEntry AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1 = createABibEntryAuthor("I. Newton");
-    private static final BibEntry AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2 = createABibEntryAuthor("I. Newton and J. Maxwell");
-    private static final BibEntry AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3 = createABibEntryAuthor("I. Newton and J. Maxwell and A. Einstein");
-    private static final BibEntry AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4 = createABibEntryAuthor("I. Newton and J. Maxwell and A. Einstein and N. Bohr");
-    private static final BibEntry AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5 = createABibEntryAuthor("I. Newton and J. Maxwell and A. Einstein and N. Bohr and Harry Unknown");
-
-    private static final String TITLE_STRING_ALL_LOWER_FOUR_SMALL_WORDS_ONE_EN_DASH = "application migration effort in the cloud - the case of cloud platforms";
-    private static final String TITLE_STRING_ALL_LOWER_FIRST_WORD_IN_BRACKETS_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON = "{BPEL} conformance in open source engines: the case of static analysis";
+    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1 =
+            createABibEntryAuthor(AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1);
+
+    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2 =
+            createABibEntryAuthor("Isaac Newton and James Maxwell");
+
+    private static final String AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3 =
+            "Isaac Newton and James Maxwell and Albert Einstein";
+    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3 =
+            createABibEntryAuthor(AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3);
+
+    private static final String AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_AND_OTHERS_COUNT_3 =
+            "Isaac Newton and James Maxwell and others";
+    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_AND_OTHERS_COUNT_3 =
+            createABibEntryAuthor(AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_AND_OTHERS_COUNT_3);
+
+    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1 =
+            createABibEntryAuthor("Wil van der Aalst");
+    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2 =
+            createABibEntryAuthor("Wil van der Aalst and Tammo van Lessen");
+
+    private static final BibEntry AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1 =
+            createABibEntryAuthor("I. Newton");
+    private static final BibEntry AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2 =
+            createABibEntryAuthor("I. Newton and J. Maxwell");
+    private static final BibEntry AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3 =
+            createABibEntryAuthor("I. Newton and J. Maxwell and A. Einstein");
+    private static final BibEntry AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4 =
+            createABibEntryAuthor("I. Newton and J. Maxwell and A. Einstein and N. Bohr");
+    private static final BibEntry AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5 =
+            createABibEntryAuthor(
+                    "I. Newton and J. Maxwell and A. Einstein and N. Bohr and Harry Unknown");
+
+    private static final String TITLE_STRING_ALL_LOWER_FOUR_SMALL_WORDS_ONE_EN_DASH =
+            "application migration effort in the cloud - the case of cloud platforms";
+    private static final String
+            TITLE_STRING_ALL_LOWER_FIRST_WORD_IN_BRACKETS_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON =
+                    "{BPEL} conformance in open source engines: the case of static analysis";
     private static final String TITLE_STRING_CASED = "Process Viewing Patterns";
-    private static final String TITLE_STRING_CASED_ONE_UPPER_WORD_ONE_SMALL_WORD = "BPMN Conformance in Open Source Engines";
-    private static final String TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AT_THE_BEGINNING = "The Difference Between Graph-Based and Block-Structured Business Process Modelling Languages";
-    private static final String TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON = "Cloud Computing: The Next Revolution in IT";
-    private static final String TITLE_STRING_CASED_TWO_SMALL_WORDS_ONE_CONNECTED_WORD = "Towards Choreography-based Process Distribution in the Cloud";
-    private static final String TITLE_STRING_CASED_FOUR_SMALL_WORDS_TWO_CONNECTED_WORDS = "On the Measurement of Design-Time Adaptability for Process-Based Systems ";
+    private static final String TITLE_STRING_CASED_ONE_UPPER_WORD_ONE_SMALL_WORD =
+            "BPMN Conformance in Open Source Engines";
+    private static final String TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AT_THE_BEGINNING =
+            "The Difference Between Graph-Based and Block-Structured Business Process Modelling Languages";
+    private static final String TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON =
+            "Cloud Computing: The Next Revolution in IT";
+    private static final String TITLE_STRING_CASED_TWO_SMALL_WORDS_ONE_CONNECTED_WORD =
+            "Towards Choreography-based Process Distribution in the Cloud";
+    private static final String TITLE_STRING_CASED_FOUR_SMALL_WORDS_TWO_CONNECTED_WORDS =
+            "On the Measurement of Design-Time Adaptability for Process-Based Systems ";
 
     private static final String AUTHSHORT = "[authshort]";
     private static final String AUTHNOFMTH = "[auth%d_%d]";
@@ -93,81 +114,102 @@ static String generateKey(BibEntry entry, String pattern) {
 
     static String generateKey(BibEntry entry, String pattern, BibDatabase database) {
         GlobalCitationKeyPatterns keyPattern = GlobalCitationKeyPatterns.fromPattern(pattern);
-        CitationKeyPatternPreferences patternPreferences = new CitationKeyPatternPreferences(
-                false,
-                false,
-                false,
-                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
-                "",
-                "",
-                DEFAULT_UNWANTED_CHARACTERS,
-                keyPattern,
-                "",
-                ',');
+        CitationKeyPatternPreferences patternPreferences =
+                new CitationKeyPatternPreferences(
+                        false,
+                        false,
+                        false,
+                        CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
+                        "",
+                        "",
+                        DEFAULT_UNWANTED_CHARACTERS,
+                        keyPattern,
+                        "",
+                        ',');
 
-        return new CitationKeyGenerator(keyPattern, database, patternPreferences).generateKey(entry);
+        return new CitationKeyGenerator(keyPattern, database, patternPreferences)
+                .generateKey(entry);
     }
 
     @Test
     void andInAuthorName() throws ParseException {
-        Optional<BibEntry> entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Simon Holland}}",
-                importFormatPreferences);
-        assertEquals("Holland",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
+        Optional<BibEntry> entry0 =
+                BibtexParser.singleFromString(
+                        "@ARTICLE{kohn, author={Simon Holland}}", importFormatPreferences);
+        assertEquals(
+                "Holland",
+                CitationKeyGenerator.cleanKey(
+                        generateKey(entry0.orElse(null), "[auth]", new BibDatabase()),
+                        DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
     void crossrefAndInAuthorNames() {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
-        BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.AUTHOR, "Simon Holland");
+        BibEntry entry2 =
+                new BibEntry()
+                        .withCitationKey("entry2")
+                        .withField(StandardField.AUTHOR, "Simon Holland");
         database.insertEntry(entry1);
         database.insertEntry(entry2);
 
-        assertEquals("Holland",
-                CitationKeyGenerator.cleanKey(generateKey(entry1, "[auth]",
-                        database), DEFAULT_UNWANTED_CHARACTERS));
+        assertEquals(
+                "Holland",
+                CitationKeyGenerator.cleanKey(
+                        generateKey(entry1, "[auth]", database), DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
     void andAuthorNames() throws ParseException {
-        String bibtexString = "@ARTICLE{whatevery, author={Mari D. Herland and Mona-Iren Hauge and Ingeborg M. Helgeland}}";
-        Optional<BibEntry> entry = BibtexParser.singleFromString(bibtexString, importFormatPreferences);
-        assertEquals("HerlandHaugeHelgeland",
-                CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[authors3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
+        String bibtexString =
+                "@ARTICLE{whatevery, author={Mari D. Herland and Mona-Iren Hauge and Ingeborg M. Helgeland}}";
+        Optional<BibEntry> entry =
+                BibtexParser.singleFromString(bibtexString, importFormatPreferences);
+        assertEquals(
+                "HerlandHaugeHelgeland",
+                CitationKeyGenerator.cleanKey(
+                        generateKey(entry.orElse(null), "[authors3]", new BibDatabase()),
+                        DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
     void crossrefAndAuthorNames() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
-        BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.AUTHOR, "Mari D. Herland and Mona-Iren Hauge and Ingeborg M. Helgeland");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry2 =
+                new BibEntry()
+                        .withCitationKey("entry2")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Mari D. Herland and Mona-Iren Hauge and Ingeborg M. Helgeland");
         database.insertEntry(entry1);
         database.insertEntry(entry2);
 
-        assertEquals("HerlandHaugeHelgeland",
-                CitationKeyGenerator.cleanKey(generateKey(entry1, "[authors3]",
-                        database), DEFAULT_UNWANTED_CHARACTERS));
+        assertEquals(
+                "HerlandHaugeHelgeland",
+                CitationKeyGenerator.cleanKey(
+                        generateKey(entry1, "[authors3]", database), DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
     void specialLatexCharacterInAuthorName() throws ParseException {
-        Optional<BibEntry> entry = BibtexParser.singleFromString(
-                "@ARTICLE{kohn, author={Simon Popovi\\v{c}ov\\'{a}}}", importFormatPreferences);
-        assertEquals("Popovicova",
-                CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[auth]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
+        Optional<BibEntry> entry =
+                BibtexParser.singleFromString(
+                        "@ARTICLE{kohn, author={Simon Popovi\\v{c}ov\\'{a}}}",
+                        importFormatPreferences);
+        assertEquals(
+                "Popovicova",
+                CitationKeyGenerator.cleanKey(
+                        generateKey(entry.orElse(null), "[auth]", new BibDatabase()),
+                        DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @ParameterizedTest(name = "bibtexString={0}, expectedResult={1}")
-    @CsvSource(quoteCharacter = '"', textBlock = """
+    @CsvSource(
+            quoteCharacter = '"',
+            textBlock =
+                    """
             # see https://sourceforge.net/forum/message.php?msg_id=4498555
             "@ARTICLE{kohn, author={Andreas Köning}, year={2000}}", "Koe",
 
@@ -195,10 +237,11 @@ void specialLatexCharacterInAuthorName() throws ParseException {
             "@ARTICLE{kohn, author={Oraib Al-Ketan}, year={2000}}", "AlK",
             "@ARTICLE{kohn, author={Andrés D'Alessandro}, year={2000}}", "DAl",
             "@ARTICLE{kohn, author={Andrés Aʹrnold}, year={2000}}", "Arn"
-            """
-    )
-    void makeLabelAndCheckLegalKeys(String bibtexString, String expectedResult) throws ParseException {
-        Optional<BibEntry> bibEntry = BibtexParser.singleFromString(bibtexString, importFormatPreferences);
+            """)
+    void makeLabelAndCheckLegalKeys(String bibtexString, String expectedResult)
+            throws ParseException {
+        Optional<BibEntry> bibEntry =
+                BibtexParser.singleFromString(bibtexString, importFormatPreferences);
         String citationKey = generateKey(bibEntry.orElse(null), "[auth3]", new BibDatabase());
 
         String cleanedKey = CitationKeyGenerator.cleanKey(citationKey, DEFAULT_UNWANTED_CHARACTERS);
@@ -208,8 +251,10 @@ void makeLabelAndCheckLegalKeys(String bibtexString, String expectedResult) thro
 
     @Test
     void firstAuthor() {
-        assertEquals("Newton", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, "[auth]"));
-        assertEquals("Newton", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[auth]"));
+        assertEquals(
+                "Newton", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, "[auth]"));
+        assertEquals(
+                "Newton", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[auth]"));
 
         // https://sourceforge.net/forum/message.php?msg_id=4498555
         assertEquals("Koening", generateKey(createABibEntryAuthor("K{\\\"o}ning"), "[auth]"));
@@ -219,11 +264,15 @@ void firstAuthor() {
 
     @Test
     void university() throws ParseException {
-        Optional<BibEntry> entry = BibtexParser.singleFromString(
-                "@ARTICLE{kohn, author={{Link{\\\"{o}}ping University}}}", importFormatPreferences);
-        assertEquals("UniLinkoeping",
-                CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[auth]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
+        Optional<BibEntry> entry =
+                BibtexParser.singleFromString(
+                        "@ARTICLE{kohn, author={{Link{\\\"{o}}ping University}}}",
+                        importFormatPreferences);
+        assertEquals(
+                "UniLinkoeping",
+                CitationKeyGenerator.cleanKey(
+                        generateKey(entry.orElse(null), "[auth]", new BibDatabase()),
+                        DEFAULT_UNWANTED_CHARACTERS));
     }
 
     /**
@@ -241,7 +290,10 @@ void university() throws ParseException {
      * @see CitationKeyGenerator#cleanKey(String, String)
      */
     @ParameterizedTest(name = "accents={0}, expectedResult={1}")
-    @CsvSource(quoteCharacter = '"', textBlock = """
+    @CsvSource(
+            quoteCharacter = '"',
+            textBlock =
+                    """
             "ÀàÈèÌìÒòÙù  â Ĉ ĉ Ê ê Ĝ ĝ Ĥ ĥ Î î Ĵ ĵ Ô ô Ŝ ŝ Û û Ŵ ŵ Ŷ ŷ", "AaEeIiOoUuAaCcEeGgHhIiJjOoSsUuWwYy",
             "ÄäËëÏïÖöÜüŸÿ", "AeaeEeIiOeoeUeueYy",
             "ÅåŮů", "AaaaUu",
@@ -262,139 +314,175 @@ void university() throws ParseException {
             "Ḛ ḛ Ḭ ḭ Ṵ ṵ", "EeIiUu",
             "Ċ ċ Ė ė Ġ ġ İ ı Ż ż   Ą ą Ę ę Į į Ǫ ǫ Ų ų   ", "CcEeGgIiZzAaEeIiOoUu",
             "Ḍ ḍ Ḥ ḥ Ḷ ḷ Ḹ ḹ Ṃ ṃ Ṇ ṇ Ṛ ṛ Ṝ ṝ Ṣ ṣ Ṭ ṭ   ", "DdHhLlLlMmNnRrRrSsTt"
-            """
-    )
+            """)
     void checkLegalKey(String accents, String expectedResult) {
-        assertEquals(expectedResult, CitationKeyGenerator.cleanKey(accents, DEFAULT_UNWANTED_CHARACTERS));
+        assertEquals(
+                expectedResult,
+                CitationKeyGenerator.cleanKey(accents, DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
     void crossrefUniversity() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
-        BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.AUTHOR, "{Link{\\\"{o}}ping University}");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry2 =
+                new BibEntry()
+                        .withCitationKey("entry2")
+                        .withField(StandardField.AUTHOR, "{Link{\\\"{o}}ping University}");
         database.insertEntry(entry1);
         database.insertEntry(entry2);
 
-        assertEquals("UniLinkoeping",
-                CitationKeyGenerator.cleanKey(generateKey(entry1, "[auth]",
-                        database), DEFAULT_UNWANTED_CHARACTERS));
+        assertEquals(
+                "UniLinkoeping",
+                CitationKeyGenerator.cleanKey(
+                        generateKey(entry1, "[auth]", database), DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
     void department() throws ParseException {
-        Optional<BibEntry> entry = BibtexParser.singleFromString(
-                "@ARTICLE{kohn, author={{Link{\\\"{o}}ping University, Department of Electrical Engineering}}}",
-                importFormatPreferences);
-        assertEquals("UniLinkoepingEE",
-                CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[auth]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
+        Optional<BibEntry> entry =
+                BibtexParser.singleFromString(
+                        "@ARTICLE{kohn, author={{Link{\\\"{o}}ping University, Department of Electrical Engineering}}}",
+                        importFormatPreferences);
+        assertEquals(
+                "UniLinkoepingEE",
+                CitationKeyGenerator.cleanKey(
+                        generateKey(entry.orElse(null), "[auth]", new BibDatabase()),
+                        DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
     void crossrefDepartment() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
-        BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.AUTHOR, "{Link{\\\"{o}}ping University, Department of Electrical Engineering}");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry2 =
+                new BibEntry()
+                        .withCitationKey("entry2")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "{Link{\\\"{o}}ping University, Department of Electrical Engineering}");
         database.insertEntry(entry1);
         database.insertEntry(entry2);
 
-        assertEquals("UniLinkoepingEE",
-                CitationKeyGenerator.cleanKey(generateKey(entry1, "[auth]",
-                        database), DEFAULT_UNWANTED_CHARACTERS));
+        assertEquals(
+                "UniLinkoepingEE",
+                CitationKeyGenerator.cleanKey(
+                        generateKey(entry1, "[auth]", database), DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
     void school() throws ParseException {
-        Optional<BibEntry> entry = BibtexParser.singleFromString(
-                "@ARTICLE{kohn, author={{Link{\\\"{o}}ping University, School of Computer Engineering}}}",
-                importFormatPreferences);
-        assertEquals("UniLinkoepingCE",
-                CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[auth]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
+        Optional<BibEntry> entry =
+                BibtexParser.singleFromString(
+                        "@ARTICLE{kohn, author={{Link{\\\"{o}}ping University, School of Computer Engineering}}}",
+                        importFormatPreferences);
+        assertEquals(
+                "UniLinkoepingCE",
+                CitationKeyGenerator.cleanKey(
+                        generateKey(entry.orElse(null), "[auth]", new BibDatabase()),
+                        DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
-    void generateKeyAbbreviateCorporateAuthorDepartmentWithoutAcademicInstitute() throws ParseException {
-        Optional<BibEntry> entry = BibtexParser.singleFromString(
-                "@ARTICLE{null, author={{Department of Localhost NullGenerators}}}",
-                importFormatPreferences);
-        assertEquals("DLN",
-                CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[auth]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
+    void generateKeyAbbreviateCorporateAuthorDepartmentWithoutAcademicInstitute()
+            throws ParseException {
+        Optional<BibEntry> entry =
+                BibtexParser.singleFromString(
+                        "@ARTICLE{null, author={{Department of Localhost NullGenerators}}}",
+                        importFormatPreferences);
+        assertEquals(
+                "DLN",
+                CitationKeyGenerator.cleanKey(
+                        generateKey(entry.orElse(null), "[auth]", new BibDatabase()),
+                        DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
-    void generateKeyAbbreviateCorporateAuthorSchoolWithoutAcademicInstitute() throws ParseException {
-        Optional<BibEntry> entry = BibtexParser.singleFromString(
-                "@ARTICLE{null, author={{The School of Null}}}",
-                importFormatPreferences);
-        assertEquals("SchoolNull",
-                CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[auth]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
+    void generateKeyAbbreviateCorporateAuthorSchoolWithoutAcademicInstitute()
+            throws ParseException {
+        Optional<BibEntry> entry =
+                BibtexParser.singleFromString(
+                        "@ARTICLE{null, author={{The School of Null}}}", importFormatPreferences);
+        assertEquals(
+                "SchoolNull",
+                CitationKeyGenerator.cleanKey(
+                        generateKey(entry.orElse(null), "[auth]", new BibDatabase()),
+                        DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
     void crossrefSchool() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
-        BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.AUTHOR, "{Link{\\\"{o}}ping University, School of Computer Engineering}");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry2 =
+                new BibEntry()
+                        .withCitationKey("entry2")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "{Link{\\\"{o}}ping University, School of Computer Engineering}");
         database.insertEntry(entry1);
         database.insertEntry(entry2);
 
-        assertEquals("UniLinkoepingCE",
-                CitationKeyGenerator.cleanKey(generateKey(entry1, "[auth]",
-                        database), DEFAULT_UNWANTED_CHARACTERS));
+        assertEquals(
+                "UniLinkoepingCE",
+                CitationKeyGenerator.cleanKey(
+                        generateKey(entry1, "[auth]", database), DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
     void instituteOfTechnology() throws ParseException {
-        Optional<BibEntry> entry = BibtexParser.singleFromString(
-                "@ARTICLE{kohn, author={{Massachusetts Institute of Technology}}}", importFormatPreferences);
-        assertEquals("MIT",
-                CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[auth]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
+        Optional<BibEntry> entry =
+                BibtexParser.singleFromString(
+                        "@ARTICLE{kohn, author={{Massachusetts Institute of Technology}}}",
+                        importFormatPreferences);
+        assertEquals(
+                "MIT",
+                CitationKeyGenerator.cleanKey(
+                        generateKey(entry.orElse(null), "[auth]", new BibDatabase()),
+                        DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
     void crossrefInstituteOfTechnology() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
-        BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.AUTHOR, "{Massachusetts Institute of Technology}");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry2 =
+                new BibEntry()
+                        .withCitationKey("entry2")
+                        .withField(StandardField.AUTHOR, "{Massachusetts Institute of Technology}");
         database.insertEntry(entry1);
         database.insertEntry(entry2);
 
-        assertEquals("MIT",
-                CitationKeyGenerator.cleanKey(generateKey(entry1, "[auth]",
-                        database), DEFAULT_UNWANTED_CHARACTERS));
+        assertEquals(
+                "MIT",
+                CitationKeyGenerator.cleanKey(
+                        generateKey(entry1, "[auth]", database), DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
     void authIniN() {
         assertEquals("", generateKey(AUTHOR_EMPTY, "[authIni4]"));
-        assertEquals("Newt", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni4]"));
-        assertEquals("NeMa", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, "[authIni4]"));
-        assertEquals("NeME", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, "[authIni4]"));
-        assertEquals("NMEB", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, "[authIni4]"));
-        assertEquals("NMEB", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, "[authIni4]"));
-
-        assertEquals("N", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni1]"));
+        assertEquals(
+                "Newt", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni4]"));
+        assertEquals(
+                "NeMa", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, "[authIni4]"));
+        assertEquals(
+                "NeME", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, "[authIni4]"));
+        assertEquals(
+                "NMEB", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, "[authIni4]"));
+        assertEquals(
+                "NMEB", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, "[authIni4]"));
+
+        assertEquals(
+                "N", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni1]"));
         assertEquals("", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni0]"));
 
-        assertEquals("Newton", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni6]"));
-        assertEquals("Newton", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni7]"));
+        assertEquals(
+                "Newton",
+                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni6]"));
+        assertEquals(
+                "Newton",
+                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni7]"));
     }
 
     @Test
@@ -407,9 +495,14 @@ void authIniNEmptyReturnsEmpty() {
      */
     @Test
     void authAuthEa() {
-        assertEquals("Newton", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1, AUTHAUTHEA));
-        assertEquals("Newton.Maxwell", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2, AUTHAUTHEA));
-        assertEquals("Newton.Maxwell.ea", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3, AUTHAUTHEA));
+        assertEquals(
+                "Newton", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1, AUTHAUTHEA));
+        assertEquals(
+                "Newton.Maxwell",
+                generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2, AUTHAUTHEA));
+        assertEquals(
+                "Newton.Maxwell.ea",
+                generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3, AUTHAUTHEA));
     }
 
     @Test
@@ -425,12 +518,18 @@ void authEtAl() {
         // tests taken from the comments
 
         // [auth.etal]
-        assertEquals("Newton.etal", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3, AUTH_ETAL));
-        assertEquals("Newton.Maxwell", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2, AUTH_ETAL));
+        assertEquals(
+                "Newton.etal", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3, AUTH_ETAL));
+        assertEquals(
+                "Newton.Maxwell",
+                generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2, AUTH_ETAL));
 
         // [authEtAl]
-        assertEquals("NewtonEtAl", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3, AUTHETAL));
-        assertEquals("NewtonMaxwell", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2, AUTHETAL));
+        assertEquals(
+                "NewtonEtAl", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3, AUTHETAL));
+        assertEquals(
+                "NewtonMaxwell",
+                generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2, AUTHETAL));
     }
 
     /**
@@ -439,10 +538,12 @@ void authEtAl() {
     @Test
     void authShort() {
         // tests taken from the comments
-        assertEquals("NME+", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHSHORT));
+        assertEquals(
+                "NME+", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHSHORT));
         assertEquals("NME", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHSHORT));
         assertEquals("NM", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHSHORT));
-        assertEquals("Newton", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHSHORT));
+        assertEquals(
+                "Newton", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHSHORT));
     }
 
     @Test
@@ -455,14 +556,42 @@ void authShortEmptyReturnsEmpty() {
      */
     @Test
     void authNM() {
-        assertEquals("N", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHNOFMTH.formatted(1, 1)));
-        assertEquals("Max", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHNOFMTH.formatted(3, 2)));
-        assertEquals("New", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHNOFMTH.formatted(3, 1)));
-        assertEquals("Bo", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHNOFMTH.formatted(2, 4)));
-        assertEquals("Bohr", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, AUTHNOFMTH.formatted(6, 4)));
-
-        assertEquals("Aal", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHNOFMTH.formatted(3, 1)));
-        assertEquals("Less", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHNOFMTH.formatted(4, 2)));
+        assertEquals(
+                "N",
+                generateKey(
+                        AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
+                        AUTHNOFMTH.formatted(1, 1)));
+        assertEquals(
+                "Max",
+                generateKey(
+                        AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2,
+                        AUTHNOFMTH.formatted(3, 2)));
+        assertEquals(
+                "New",
+                generateKey(
+                        AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3,
+                        AUTHNOFMTH.formatted(3, 1)));
+        assertEquals(
+                "Bo",
+                generateKey(
+                        AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4,
+                        AUTHNOFMTH.formatted(2, 4)));
+        assertEquals(
+                "Bohr",
+                generateKey(
+                        AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5,
+                        AUTHNOFMTH.formatted(6, 4)));
+
+        assertEquals(
+                "Aal",
+                generateKey(
+                        AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1,
+                        AUTHNOFMTH.formatted(3, 1)));
+        assertEquals(
+                "Less",
+                generateKey(
+                        AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2,
+                        AUTHNOFMTH.formatted(4, 2)));
 
         assertEquals("", generateKey(AUTHOR_EMPTY, AUTHNOFMTH.formatted(2, 4)));
     }
@@ -483,14 +612,20 @@ void firstAuthorForenameInitials() {
      */
     @Test
     void firstAuthorVonAndLast() {
-        assertEquals("vanderAalst", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHFIRSTFULL));
-        assertEquals("vanderAalst", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHFIRSTFULL));
+        assertEquals(
+                "vanderAalst",
+                generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHFIRSTFULL));
+        assertEquals(
+                "vanderAalst",
+                generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHFIRSTFULL));
     }
 
     @Test
     void firstAuthorVonAndLastNoVonInName() {
-        assertEquals("Newton", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1, AUTHFIRSTFULL));
-        assertEquals("Newton", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2, AUTHFIRSTFULL));
+        assertEquals(
+                "Newton", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1, AUTHFIRSTFULL));
+        assertEquals(
+                "Newton", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2, AUTHFIRSTFULL));
     }
 
     /**
@@ -498,9 +633,14 @@ void firstAuthorVonAndLastNoVonInName() {
      */
     @Test
     void allAuthors() {
-        assertEquals("Newton", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORS));
-        assertEquals("NewtonMaxwell", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORS));
-        assertEquals("NewtonMaxwellEinstein", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORS));
+        assertEquals(
+                "Newton", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORS));
+        assertEquals(
+                "NewtonMaxwell",
+                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORS));
+        assertEquals(
+                "NewtonMaxwellEinstein",
+                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORS));
     }
 
     static Stream<Arguments> authorsAlpha() {
@@ -510,10 +650,14 @@ static Stream<Arguments> authorsAlpha() {
                 Arguments.of("NME", AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORSALPHA),
                 Arguments.of("NMEB", AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHORSALPHA),
                 Arguments.of("NMEB", AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, AUTHORSALPHA),
-                Arguments.of("Aa", AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHORSALPHA),
-                Arguments.of("AL", AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHORSALPHA),
-                Arguments.of("Ne", AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_AND_OTHERS_COUNT_3, AUTHORSALPHA)
-        );
+                Arguments.of(
+                        "Aa", AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHORSALPHA),
+                Arguments.of(
+                        "AL", AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHORSALPHA),
+                Arguments.of(
+                        "Ne",
+                        AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_AND_OTHERS_COUNT_3,
+                        AUTHORSALPHA));
     }
 
     @ParameterizedTest
@@ -527,14 +671,24 @@ void authorsAlpha(String expected, BibEntry entry, String pattern) {
      */
     @Test
     void lastAuthor() {
-        assertEquals("Newton", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORLAST));
-        assertEquals("Maxwell", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORLAST));
-        assertEquals("Einstein", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORLAST));
-        assertEquals("Bohr", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHORLAST));
-        assertEquals("Unknown", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, AUTHORLAST));
-
-        assertEquals("Aalst", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHORLAST));
-        assertEquals("Lessen", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHORLAST));
+        assertEquals(
+                "Newton", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORLAST));
+        assertEquals(
+                "Maxwell", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORLAST));
+        assertEquals(
+                "Einstein",
+                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORLAST));
+        assertEquals(
+                "Bohr", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHORLAST));
+        assertEquals(
+                "Unknown", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, AUTHORLAST));
+
+        assertEquals(
+                "Aalst",
+                generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHORLAST));
+        assertEquals(
+                "Lessen",
+                generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHORLAST));
     }
 
     /**
@@ -542,14 +696,30 @@ void lastAuthor() {
      */
     @Test
     void lastAuthorForenameInitials() {
-        assertEquals("I", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORLASTFOREINI));
-        assertEquals("J", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORLASTFOREINI));
-        assertEquals("A", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORLASTFOREINI));
-        assertEquals("N", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHORLASTFOREINI));
-        assertEquals("H", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, AUTHORLASTFOREINI));
-
-        assertEquals("W", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHORLASTFOREINI));
-        assertEquals("T", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHORLASTFOREINI));
+        assertEquals(
+                "I",
+                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORLASTFOREINI));
+        assertEquals(
+                "J",
+                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORLASTFOREINI));
+        assertEquals(
+                "A",
+                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORLASTFOREINI));
+        assertEquals(
+                "N",
+                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHORLASTFOREINI));
+        assertEquals(
+                "H",
+                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, AUTHORLASTFOREINI));
+
+        assertEquals(
+                "W",
+                generateKey(
+                        AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHORLASTFOREINI));
+        assertEquals(
+                "T",
+                generateKey(
+                        AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHORLASTFOREINI));
     }
 
     /**
@@ -557,14 +727,24 @@ void lastAuthorForenameInitials() {
      */
     @Test
     void oneAuthorPlusIni() {
-        assertEquals("Newto", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORINI));
-        assertEquals("NewtoM", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORINI));
-        assertEquals("NewtoME", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORINI));
-        assertEquals("NewtoMEB", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHORINI));
-        assertEquals("NewtoMEBU", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, AUTHORINI));
-
-        assertEquals("Aalst", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHORINI));
-        assertEquals("AalstL", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHORINI));
+        assertEquals(
+                "Newto", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORINI));
+        assertEquals(
+                "NewtoM", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORINI));
+        assertEquals(
+                "NewtoME", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORINI));
+        assertEquals(
+                "NewtoMEB", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHORINI));
+        assertEquals(
+                "NewtoMEBU",
+                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, AUTHORINI));
+
+        assertEquals(
+                "Aalst",
+                generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHORINI));
+        assertEquals(
+                "AalstL",
+                generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHORINI));
     }
 
     /**
@@ -572,10 +752,18 @@ void oneAuthorPlusIni() {
      */
     @Test
     void nAuthors1() {
-        assertEquals("Newton", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORN.formatted(1)));
-        assertEquals("NewtonEtAl", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORN.formatted(1)));
-        assertEquals("NewtonEtAl", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORN.formatted(1)));
-        assertEquals("NewtonEtAl", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHORN.formatted(1)));
+        assertEquals(
+                "Newton",
+                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORN.formatted(1)));
+        assertEquals(
+                "NewtonEtAl",
+                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORN.formatted(1)));
+        assertEquals(
+                "NewtonEtAl",
+                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORN.formatted(1)));
+        assertEquals(
+                "NewtonEtAl",
+                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHORN.formatted(1)));
     }
 
     @Test
@@ -588,13 +776,17 @@ void nAuthors1EmptyReturnEmpty() {
      */
     @Test
     void nAuthors3() {
-        assertEquals("Newton",
+        assertEquals(
+                "Newton",
                 generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORN.formatted(3)));
-        assertEquals("NewtonMaxwell",
+        assertEquals(
+                "NewtonMaxwell",
                 generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORN.formatted(3)));
-        assertEquals("NewtonMaxwellEinstein",
+        assertEquals(
+                "NewtonMaxwellEinstein",
                 generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORN.formatted(3)));
-        assertEquals("NewtonMaxwellEinsteinEtAl",
+        assertEquals(
+                "NewtonMaxwellEinsteinEtAl",
                 generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHORN.formatted(3)));
     }
 
@@ -665,30 +857,52 @@ void lastPageNull() {
     void veryShortTitle() {
         // veryShortTitle is getTitleWords with "1" as count
         int count = 1;
-        assertEquals("application",
-                CitationKeyGenerator.getTitleWords(count,
-                        CitationKeyGenerator.removeSmallWords(TITLE_STRING_ALL_LOWER_FOUR_SMALL_WORDS_ONE_EN_DASH)));
-        assertEquals("BPEL", CitationKeyGenerator.getTitleWords(count,
-                CitationKeyGenerator.removeSmallWords(
-                        TITLE_STRING_ALL_LOWER_FIRST_WORD_IN_BRACKETS_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON)));
-        assertEquals("Process", CitationKeyGenerator.getTitleWords(count,
-                CitationKeyGenerator.removeSmallWords(TITLE_STRING_CASED)));
-        assertEquals("BPMN",
-                CitationKeyGenerator.getTitleWords(count,
-                        CitationKeyGenerator.removeSmallWords(TITLE_STRING_CASED_ONE_UPPER_WORD_ONE_SMALL_WORD)));
-        assertEquals("Difference", CitationKeyGenerator.getTitleWords(count,
-                CitationKeyGenerator.removeSmallWords(TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AT_THE_BEGINNING)));
-        assertEquals("Cloud",
-                CitationKeyGenerator.getTitleWords(count,
-                        CitationKeyGenerator
-                                .removeSmallWords(TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON)));
-        assertEquals("Towards",
-                CitationKeyGenerator.getTitleWords(count,
-                        CitationKeyGenerator.removeSmallWords(TITLE_STRING_CASED_TWO_SMALL_WORDS_ONE_CONNECTED_WORD)));
-        assertEquals("Measurement",
-                CitationKeyGenerator.getTitleWords(count,
-                        CitationKeyGenerator
-                                .removeSmallWords(TITLE_STRING_CASED_FOUR_SMALL_WORDS_TWO_CONNECTED_WORDS)));
+        assertEquals(
+                "application",
+                CitationKeyGenerator.getTitleWords(
+                        count,
+                        CitationKeyGenerator.removeSmallWords(
+                                TITLE_STRING_ALL_LOWER_FOUR_SMALL_WORDS_ONE_EN_DASH)));
+        assertEquals(
+                "BPEL",
+                CitationKeyGenerator.getTitleWords(
+                        count,
+                        CitationKeyGenerator.removeSmallWords(
+                                TITLE_STRING_ALL_LOWER_FIRST_WORD_IN_BRACKETS_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON)));
+        assertEquals(
+                "Process",
+                CitationKeyGenerator.getTitleWords(
+                        count, CitationKeyGenerator.removeSmallWords(TITLE_STRING_CASED)));
+        assertEquals(
+                "BPMN",
+                CitationKeyGenerator.getTitleWords(
+                        count,
+                        CitationKeyGenerator.removeSmallWords(
+                                TITLE_STRING_CASED_ONE_UPPER_WORD_ONE_SMALL_WORD)));
+        assertEquals(
+                "Difference",
+                CitationKeyGenerator.getTitleWords(
+                        count,
+                        CitationKeyGenerator.removeSmallWords(
+                                TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AT_THE_BEGINNING)));
+        assertEquals(
+                "Cloud",
+                CitationKeyGenerator.getTitleWords(
+                        count,
+                        CitationKeyGenerator.removeSmallWords(
+                                TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON)));
+        assertEquals(
+                "Towards",
+                CitationKeyGenerator.getTitleWords(
+                        count,
+                        CitationKeyGenerator.removeSmallWords(
+                                TITLE_STRING_CASED_TWO_SMALL_WORDS_ONE_CONNECTED_WORD)));
+        assertEquals(
+                "Measurement",
+                CitationKeyGenerator.getTitleWords(
+                        count,
+                        CitationKeyGenerator.removeSmallWords(
+                                TITLE_STRING_CASED_FOUR_SMALL_WORDS_TWO_CONNECTED_WORDS)));
     }
 
     /**
@@ -698,28 +912,52 @@ void veryShortTitle() {
     void shortTitle() {
         // shortTitle is getTitleWords with "3" as count and removed small words
         int count = 3;
-        assertEquals("application migration effort",
-                CitationKeyGenerator.getTitleWords(count,
-                        CitationKeyGenerator.removeSmallWords(TITLE_STRING_ALL_LOWER_FOUR_SMALL_WORDS_ONE_EN_DASH)));
-        assertEquals("BPEL conformance open",
-                CitationKeyGenerator.getTitleWords(count,
-                        CitationKeyGenerator.removeSmallWords(TITLE_STRING_ALL_LOWER_FIRST_WORD_IN_BRACKETS_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON)));
-        assertEquals("Process Viewing Patterns",
-                CitationKeyGenerator.getTitleWords(count,
-                        CitationKeyGenerator.removeSmallWords(TITLE_STRING_CASED)));
-        assertEquals("BPMN Conformance Open",
-                CitationKeyGenerator.getTitleWords(count,
-                        CitationKeyGenerator.removeSmallWords(TITLE_STRING_CASED_ONE_UPPER_WORD_ONE_SMALL_WORD)));
-        assertEquals("Difference Graph Based",
-                CitationKeyGenerator.getTitleWords(count,
-                        CitationKeyGenerator.removeSmallWords(TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AT_THE_BEGINNING)));
-        assertEquals("Cloud Computing: Next",
-                CitationKeyGenerator.getTitleWords(count,
-                        CitationKeyGenerator.removeSmallWords(TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON)));
-        assertEquals("Towards Choreography based",
-                CitationKeyGenerator.getTitleWords(count, CitationKeyGenerator.removeSmallWords(TITLE_STRING_CASED_TWO_SMALL_WORDS_ONE_CONNECTED_WORD)));
-        assertEquals("Measurement Design Time",
-                CitationKeyGenerator.getTitleWords(count, CitationKeyGenerator.removeSmallWords(TITLE_STRING_CASED_FOUR_SMALL_WORDS_TWO_CONNECTED_WORDS)));
+        assertEquals(
+                "application migration effort",
+                CitationKeyGenerator.getTitleWords(
+                        count,
+                        CitationKeyGenerator.removeSmallWords(
+                                TITLE_STRING_ALL_LOWER_FOUR_SMALL_WORDS_ONE_EN_DASH)));
+        assertEquals(
+                "BPEL conformance open",
+                CitationKeyGenerator.getTitleWords(
+                        count,
+                        CitationKeyGenerator.removeSmallWords(
+                                TITLE_STRING_ALL_LOWER_FIRST_WORD_IN_BRACKETS_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON)));
+        assertEquals(
+                "Process Viewing Patterns",
+                CitationKeyGenerator.getTitleWords(
+                        count, CitationKeyGenerator.removeSmallWords(TITLE_STRING_CASED)));
+        assertEquals(
+                "BPMN Conformance Open",
+                CitationKeyGenerator.getTitleWords(
+                        count,
+                        CitationKeyGenerator.removeSmallWords(
+                                TITLE_STRING_CASED_ONE_UPPER_WORD_ONE_SMALL_WORD)));
+        assertEquals(
+                "Difference Graph Based",
+                CitationKeyGenerator.getTitleWords(
+                        count,
+                        CitationKeyGenerator.removeSmallWords(
+                                TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AT_THE_BEGINNING)));
+        assertEquals(
+                "Cloud Computing: Next",
+                CitationKeyGenerator.getTitleWords(
+                        count,
+                        CitationKeyGenerator.removeSmallWords(
+                                TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON)));
+        assertEquals(
+                "Towards Choreography based",
+                CitationKeyGenerator.getTitleWords(
+                        count,
+                        CitationKeyGenerator.removeSmallWords(
+                                TITLE_STRING_CASED_TWO_SMALL_WORDS_ONE_CONNECTED_WORD)));
+        assertEquals(
+                "Measurement Design Time",
+                CitationKeyGenerator.getTitleWords(
+                        count,
+                        CitationKeyGenerator.removeSmallWords(
+                                TITLE_STRING_CASED_FOUR_SMALL_WORDS_TWO_CONNECTED_WORDS)));
     }
 
     /**
@@ -728,23 +966,37 @@ void shortTitle() {
     @Test
     void camel() {
         // camel capitalises and concatenates all the words of the title
-        assertEquals("ApplicationMigrationEffortInTheCloudTheCaseOfCloudPlatforms",
-                CitationKeyGenerator.getCamelizedTitle(TITLE_STRING_ALL_LOWER_FOUR_SMALL_WORDS_ONE_EN_DASH));
-        assertEquals("BPELConformanceInOpenSourceEnginesTheCaseOfStaticAnalysis",
+        assertEquals(
+                "ApplicationMigrationEffortInTheCloudTheCaseOfCloudPlatforms",
+                CitationKeyGenerator.getCamelizedTitle(
+                        TITLE_STRING_ALL_LOWER_FOUR_SMALL_WORDS_ONE_EN_DASH));
+        assertEquals(
+                "BPELConformanceInOpenSourceEnginesTheCaseOfStaticAnalysis",
                 CitationKeyGenerator.getCamelizedTitle(
                         TITLE_STRING_ALL_LOWER_FIRST_WORD_IN_BRACKETS_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON));
-        assertEquals("ProcessViewingPatterns", CitationKeyGenerator.getCamelizedTitle(TITLE_STRING_CASED));
-        assertEquals("BPMNConformanceInOpenSourceEngines",
-                CitationKeyGenerator.getCamelizedTitle(TITLE_STRING_CASED_ONE_UPPER_WORD_ONE_SMALL_WORD));
-        assertEquals("TheDifferenceBetweenGraphBasedAndBlockStructuredBusinessProcessModellingLanguages",
+        assertEquals(
+                "ProcessViewingPatterns",
+                CitationKeyGenerator.getCamelizedTitle(TITLE_STRING_CASED));
+        assertEquals(
+                "BPMNConformanceInOpenSourceEngines",
+                CitationKeyGenerator.getCamelizedTitle(
+                        TITLE_STRING_CASED_ONE_UPPER_WORD_ONE_SMALL_WORD));
+        assertEquals(
+                "TheDifferenceBetweenGraphBasedAndBlockStructuredBusinessProcessModellingLanguages",
                 CitationKeyGenerator.getCamelizedTitle(
                         TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AT_THE_BEGINNING));
-        assertEquals("CloudComputingTheNextRevolutionInIT",
-                CitationKeyGenerator.getCamelizedTitle(TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON));
-        assertEquals("TowardsChoreographyBasedProcessDistributionInTheCloud",
-                CitationKeyGenerator.getCamelizedTitle(TITLE_STRING_CASED_TWO_SMALL_WORDS_ONE_CONNECTED_WORD));
-        assertEquals("OnTheMeasurementOfDesignTimeAdaptabilityForProcessBasedSystems",
-                CitationKeyGenerator.getCamelizedTitle(TITLE_STRING_CASED_FOUR_SMALL_WORDS_TWO_CONNECTED_WORDS));
+        assertEquals(
+                "CloudComputingTheNextRevolutionInIT",
+                CitationKeyGenerator.getCamelizedTitle(
+                        TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON));
+        assertEquals(
+                "TowardsChoreographyBasedProcessDistributionInTheCloud",
+                CitationKeyGenerator.getCamelizedTitle(
+                        TITLE_STRING_CASED_TWO_SMALL_WORDS_ONE_CONNECTED_WORD));
+        assertEquals(
+                "OnTheMeasurementOfDesignTimeAdaptabilityForProcessBasedSystems",
+                CitationKeyGenerator.getCamelizedTitle(
+                        TITLE_STRING_CASED_FOUR_SMALL_WORDS_TWO_CONNECTED_WORDS));
     }
 
     /**
@@ -753,28 +1005,37 @@ void camel() {
     @Test
     void title() {
         // title capitalises the significant words of the title
-        // for the title case the concatenation happens at formatting, which is tested in MakeLabelWithDatabaseTest.java
-        assertEquals("Application Migration Effort in the Cloud the Case of Cloud Platforms",
-                CitationKeyGenerator
-                        .camelizeSignificantWordsInTitle(TITLE_STRING_ALL_LOWER_FOUR_SMALL_WORDS_ONE_EN_DASH));
-        assertEquals("BPEL Conformance in Open Source Engines: the Case of Static Analysis",
+        // for the title case the concatenation happens at formatting, which is tested in
+        // MakeLabelWithDatabaseTest.java
+        assertEquals(
+                "Application Migration Effort in the Cloud the Case of Cloud Platforms",
+                CitationKeyGenerator.camelizeSignificantWordsInTitle(
+                        TITLE_STRING_ALL_LOWER_FOUR_SMALL_WORDS_ONE_EN_DASH));
+        assertEquals(
+                "BPEL Conformance in Open Source Engines: the Case of Static Analysis",
                 CitationKeyGenerator.camelizeSignificantWordsInTitle(
                         TITLE_STRING_ALL_LOWER_FIRST_WORD_IN_BRACKETS_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON));
-        assertEquals("Process Viewing Patterns",
+        assertEquals(
+                "Process Viewing Patterns",
                 CitationKeyGenerator.camelizeSignificantWordsInTitle(TITLE_STRING_CASED));
-        assertEquals("BPMN Conformance in Open Source Engines",
-                CitationKeyGenerator
-                        .camelizeSignificantWordsInTitle(TITLE_STRING_CASED_ONE_UPPER_WORD_ONE_SMALL_WORD));
-        assertEquals("The Difference between Graph Based and Block Structured Business Process Modelling Languages",
+        assertEquals(
+                "BPMN Conformance in Open Source Engines",
+                CitationKeyGenerator.camelizeSignificantWordsInTitle(
+                        TITLE_STRING_CASED_ONE_UPPER_WORD_ONE_SMALL_WORD));
+        assertEquals(
+                "The Difference between Graph Based and Block Structured Business Process Modelling Languages",
                 CitationKeyGenerator.camelizeSignificantWordsInTitle(
                         TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AT_THE_BEGINNING));
-        assertEquals("Cloud Computing: the Next Revolution in IT",
+        assertEquals(
+                "Cloud Computing: the Next Revolution in IT",
                 CitationKeyGenerator.camelizeSignificantWordsInTitle(
                         TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON));
-        assertEquals("Towards Choreography Based Process Distribution in the Cloud",
-                CitationKeyGenerator
-                        .camelizeSignificantWordsInTitle(TITLE_STRING_CASED_TWO_SMALL_WORDS_ONE_CONNECTED_WORD));
-        assertEquals("On the Measurement of Design Time Adaptability for Process Based Systems",
+        assertEquals(
+                "Towards Choreography Based Process Distribution in the Cloud",
+                CitationKeyGenerator.camelizeSignificantWordsInTitle(
+                        TITLE_STRING_CASED_TWO_SMALL_WORDS_ONE_CONNECTED_WORD));
+        assertEquals(
+                "On the Measurement of Design Time Adaptability for Process Based Systems",
                 CitationKeyGenerator.camelizeSignificantWordsInTitle(
                         TITLE_STRING_CASED_FOUR_SMALL_WORDS_TWO_CONNECTED_WORDS));
     }
@@ -795,10 +1056,8 @@ void keywordNKeywordsSeparatedBySpace() {
     @Test
     void crossrefkeywordNKeywordsSeparatedBySpace() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
-        BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry2 = new BibEntry().withCitationKey("entry2");
         database.insertEntry(entry2);
         database.insertEntry(entry1);
         entry2.setField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
@@ -823,11 +1082,11 @@ void keywordsNKeywordsSeparatedBySpace() {
     @Test
     void crossrefkeywordsNKeywordsSeparatedBySpace() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
-        BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry2 =
+                new BibEntry()
+                        .withCitationKey("entry2")
+                        .withField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
         database.insertEntry(entry2);
         database.insertEntry(entry1);
 
@@ -837,7 +1096,10 @@ void crossrefkeywordsNKeywordsSeparatedBySpace() {
     @Test
     void checkLegalKeyUnwantedCharacters() {
         assertEquals("AAAA", CitationKeyGenerator.cleanKey("AA AA", DEFAULT_UNWANTED_CHARACTERS));
-        assertEquals("SPECIALCHARS", CitationKeyGenerator.cleanKey("SPECIAL CHARS#{\\\"}~,", DEFAULT_UNWANTED_CHARACTERS));
+        assertEquals(
+                "SPECIALCHARS",
+                CitationKeyGenerator.cleanKey(
+                        "SPECIAL CHARS#{\\\"}~,", DEFAULT_UNWANTED_CHARACTERS));
         assertEquals("", CitationKeyGenerator.cleanKey("\n\t\r", DEFAULT_UNWANTED_CHARACTERS));
     }
 
@@ -850,41 +1112,45 @@ void checkLegalKeyNoUnwantedCharacters() {
 
     @Test
     void checkLegalNullInNullOut() {
-        assertThrows(NullPointerException.class, () -> CitationKeyGenerator.cleanKey(null, DEFAULT_UNWANTED_CHARACTERS));
-        assertThrows(NullPointerException.class, () -> CitationKeyGenerator.cleanKey(null, DEFAULT_UNWANTED_CHARACTERS));
+        assertThrows(
+                NullPointerException.class,
+                () -> CitationKeyGenerator.cleanKey(null, DEFAULT_UNWANTED_CHARACTERS));
+        assertThrows(
+                NullPointerException.class,
+                () -> CitationKeyGenerator.cleanKey(null, DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
     void applyModifiers() {
-        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "Green Scheduling of Whatever");
+        BibEntry entry =
+                new BibEntry().withField(StandardField.TITLE, "Green Scheduling of Whatever");
         assertEquals("GSo", generateKey(entry, "[shorttitleINI]"));
-        assertEquals("GreenSchedulingWhatever", generateKey(entry, "[shorttitle]",
-                new BibDatabase()));
+        assertEquals(
+                "GreenSchedulingWhatever", generateKey(entry, "[shorttitle]", new BibDatabase()));
     }
 
     @Test
     void crossrefShorttitle() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
-        BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.TITLE, "Green Scheduling of Whatever");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry2 =
+                new BibEntry()
+                        .withCitationKey("entry2")
+                        .withField(StandardField.TITLE, "Green Scheduling of Whatever");
         database.insertEntry(entry2);
         database.insertEntry(entry1);
 
-        assertEquals("GreenSchedulingWhatever", generateKey(entry1, "[shorttitle]",
-                database));
+        assertEquals("GreenSchedulingWhatever", generateKey(entry1, "[shorttitle]", database));
     }
 
     @Test
     void crossrefShorttitleInitials() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
-        BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.TITLE, "Green Scheduling of Whatever");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry2 =
+                new BibEntry()
+                        .withCitationKey("entry2")
+                        .withField(StandardField.TITLE, "Green Scheduling of Whatever");
         database.insertEntry(entry2);
         database.insertEntry(entry1);
 
@@ -893,13 +1159,15 @@ void crossrefShorttitleInitials() {
 
     @Test
     void generateKeyStripsColonFromTitle() {
-        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "Green Scheduling of: Whatever");
+        BibEntry entry =
+                new BibEntry().withField(StandardField.TITLE, "Green Scheduling of: Whatever");
         assertEquals("GreenSchedulingOfWhatever", generateKey(entry, "[title]"));
     }
 
     @Test
     void generateKeyStripsApostropheFromTitle() {
-        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "Green Scheduling of `Whatever`");
+        BibEntry entry =
+                new BibEntry().withField(StandardField.TITLE, "Green Scheduling of `Whatever`");
         assertEquals("GreenSchedulingofWhatever", generateKey(entry, "[title]"));
     }
 
@@ -917,67 +1185,102 @@ void generateKeyWithTwoModifiers() {
 
     @Test
     void generateKeyWithTitleCapitalizeModifier() {
-        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "the InTeresting title longer than THREE words");
-        assertEquals("TheInterestingTitleLongerThanThreeWords", generateKey(entry, "[title:capitalize]"));
+        BibEntry entry =
+                new BibEntry()
+                        .withField(
+                                StandardField.TITLE,
+                                "the InTeresting title longer than THREE words");
+        assertEquals(
+                "TheInterestingTitleLongerThanThreeWords",
+                generateKey(entry, "[title:capitalize]"));
     }
 
     @Test
     void generateKeyWithShortTitleCapitalizeModifier() {
-        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "the InTeresting title longer than THREE words");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(
+                                StandardField.TITLE,
+                                "the InTeresting title longer than THREE words");
         assertEquals("InterestingTitleLonger", generateKey(entry, "[shorttitle:capitalize]"));
     }
 
     @Test
     void generateKeyWithTitleTitleCaseModifier() {
-        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "A title WITH some of The key words");
+        BibEntry entry =
+                new BibEntry().withField(StandardField.TITLE, "A title WITH some of The key words");
         assertEquals("ATitlewithSomeoftheKeyWords", generateKey(entry, "[title:titlecase]"));
     }
 
     @Test
     void generateKeyWithShortTitleTitleCaseModifier() {
-        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "the InTeresting title longer than THREE words");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(
+                                StandardField.TITLE,
+                                "the InTeresting title longer than THREE words");
         assertEquals("InterestingTitleLonger", generateKey(entry, "[shorttitle:titlecase]"));
     }
 
     @Test
     void generateKeyWithTitleSentenceCaseModifier() {
-        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "A title WITH some of The key words");
+        BibEntry entry =
+                new BibEntry().withField(StandardField.TITLE, "A title WITH some of The key words");
         assertEquals("Atitlewithsomeofthekeywords", generateKey(entry, "[title:sentencecase]"));
     }
 
     @Test
     void generateKeyWithAuthUpperYearShortTitleCapitalizeModifier() {
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.AUTHOR, AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1)
-                .withField(StandardField.YEAR, "2019")
-                .withField(StandardField.TITLE, "the InTeresting title longer than THREE words");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(
+                                StandardField.AUTHOR,
+                                AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1)
+                        .withField(StandardField.YEAR, "2019")
+                        .withField(
+                                StandardField.TITLE,
+                                "the InTeresting title longer than THREE words");
 
-        assertEquals("NEWTON2019InterestingTitleLonger", generateKey(entry, "[auth:upper][year][shorttitle:capitalize]"));
+        assertEquals(
+                "NEWTON2019InterestingTitleLonger",
+                generateKey(entry, "[auth:upper][year][shorttitle:capitalize]"));
     }
 
     @Test
     void generateKeyWithYearAuthUpperTitleSentenceCaseModifier() {
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.AUTHOR, AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3)
-                .withField(StandardField.YEAR, "2019")
-                .withField(StandardField.TITLE, "the InTeresting title longer than THREE words");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(
+                                StandardField.AUTHOR,
+                                AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3)
+                        .withField(StandardField.YEAR, "2019")
+                        .withField(
+                                StandardField.TITLE,
+                                "the InTeresting title longer than THREE words");
 
-        assertEquals("NewtonMaxwellEtAl_2019_TheInterestingTitleLongerThanThreeWords", generateKey(entry, "[authors2]_[year]_[title:capitalize]"));
+        assertEquals(
+                "NewtonMaxwellEtAl_2019_TheInterestingTitleLongerThanThreeWords",
+                generateKey(entry, "[authors2]_[year]_[title:capitalize]"));
     }
 
     @Test
     void generateKeyWithMinusInCitationStyleOutsideAField() {
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.AUTHOR, AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1)
-                .withField(StandardField.YEAR, "2019");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(
+                                StandardField.AUTHOR,
+                                AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1)
+                        .withField(StandardField.YEAR, "2019");
 
         assertEquals("Newton2019", generateKey(entry, "[auth]-[year]"));
     }
 
     @Test
     void generateKeyWithWithFirstNCharacters() {
-        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "Newton, Isaac")
-                                       .withField(StandardField.YEAR, "2019");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "Newton, Isaac")
+                        .withField(StandardField.YEAR, "2019");
 
         assertEquals("newt2019", generateKey(entry, "[auth4:lower]-[year]"));
     }
@@ -998,7 +1301,11 @@ void generateKeyCorrectKeyLengthWithAuthNofMthAndUnicode() {
 
     @Test
     void generateKeyWithNonNormalizedUnicode() {
-        BibEntry bibEntry = new BibEntry().withField(StandardField.TITLE, "Modèle et outil pour soutenir la scénarisation pédagogique de MOOC connectivistes");
+        BibEntry bibEntry =
+                new BibEntry()
+                        .withField(
+                                StandardField.TITLE,
+                                "Modèle et outil pour soutenir la scénarisation pédagogique de MOOC connectivistes");
 
         assertEquals("Modele", generateKey(bibEntry, "[veryshorttitle]"));
     }
@@ -1014,21 +1321,24 @@ void generateKeyWithModifierContainingRegexCharacterClass() {
     void generateKeyDoesNotModifyTheKeyWithIncorrectRegexReplacement() {
         String pattern = "[title]";
         GlobalCitationKeyPatterns keyPattern = GlobalCitationKeyPatterns.fromPattern(pattern);
-        CitationKeyPatternPreferences patternPreferences = new CitationKeyPatternPreferences(
-                false,
-                false,
-                false,
-                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
-                "[", // Invalid regexp
-                "",
-                DEFAULT_UNWANTED_CHARACTERS,
-                keyPattern,
-                "",
-                ',');
+        CitationKeyPatternPreferences patternPreferences =
+                new CitationKeyPatternPreferences(
+                        false,
+                        false,
+                        false,
+                        CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
+                        "[", // Invalid regexp
+                        "",
+                        DEFAULT_UNWANTED_CHARACTERS,
+                        keyPattern,
+                        "",
+                        ',');
 
         BibEntry bibEntry = new BibEntry().withField(StandardField.TITLE, "Wickedness Managing");
-        assertEquals("WickednessManaging",
-                new CitationKeyGenerator(keyPattern, new BibDatabase(), patternPreferences).generateKey(bibEntry));
+        assertEquals(
+                "WickednessManaging",
+                new CitationKeyGenerator(keyPattern, new BibDatabase(), patternPreferences)
+                        .generateKey(bibEntry));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java
index 3cafefc78460..13fe675ef0ba 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.citationkeypattern;
 
-import java.util.Optional;
+import static org.jabref.logic.citationkeypattern.CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 
-import static org.jabref.logic.citationkeypattern.CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 @Execution(ExecutionMode.CONCURRENT)
 class MakeLabelWithDatabaseTest {
@@ -34,17 +33,18 @@ void setUp() {
         database.insertEntry(entry);
         pattern = GlobalCitationKeyPatterns.fromPattern("[auth][year]");
         bibtexKeyPattern = new DatabaseCitationKeyPatterns(pattern);
-        preferences = new CitationKeyPatternPreferences(
-                false,
-                false,
-                false,
-                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
-                "",
-                "",
-                DEFAULT_UNWANTED_CHARACTERS,
-                pattern,
-                "",
-                ',');
+        preferences =
+                new CitationKeyPatternPreferences(
+                        false,
+                        false,
+                        false,
+                        CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
+                        "",
+                        "",
+                        DEFAULT_UNWANTED_CHARACTERS,
+                        pattern,
+                        "",
+                        ',');
     }
 
     @Test
@@ -55,7 +55,8 @@ void generateDefaultKey() {
 
     @Test
     void generateDefaultKeyAlreadyExistsDuplicatesStartAtA() {
-        CitationKeyGenerator keyGenerator = new CitationKeyGenerator(bibtexKeyPattern, database, preferences);
+        CitationKeyGenerator keyGenerator =
+                new CitationKeyGenerator(bibtexKeyPattern, database, preferences);
         keyGenerator.generateAndSetKey(entry);
         BibEntry entry2 = new BibEntry();
         entry2.setField(StandardField.AUTHOR, "John Doe");
@@ -66,17 +67,18 @@ void generateDefaultKeyAlreadyExistsDuplicatesStartAtA() {
 
     @Test
     void generateDefaultKeyAlwaysLetter() {
-        preferences = new CitationKeyPatternPreferences(
-                false,
-                false,
-                false,
-                CitationKeyPatternPreferences.KeySuffix.ALWAYS,
-                "",
-                "",
-                DEFAULT_UNWANTED_CHARACTERS,
-                pattern,
-                "",
-                ',');
+        preferences =
+                new CitationKeyPatternPreferences(
+                        false,
+                        false,
+                        false,
+                        CitationKeyPatternPreferences.KeySuffix.ALWAYS,
+                        "",
+                        "",
+                        DEFAULT_UNWANTED_CHARACTERS,
+                        pattern,
+                        "",
+                        ',');
 
         new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016a"), entry.getCitationKey());
@@ -84,19 +86,21 @@ void generateDefaultKeyAlwaysLetter() {
 
     @Test
     void generateDefaultKeyAlwaysLetterAlreadyExistsDuplicatesStartAtB() {
-        preferences = new CitationKeyPatternPreferences(
-                false,
-                false,
-                false,
-                CitationKeyPatternPreferences.KeySuffix.ALWAYS,
-                "",
-                "",
-                DEFAULT_UNWANTED_CHARACTERS,
-                pattern,
-                "",
-                ',');
-
-        CitationKeyGenerator keyGenerator = new CitationKeyGenerator(bibtexKeyPattern, database, preferences);
+        preferences =
+                new CitationKeyPatternPreferences(
+                        false,
+                        false,
+                        false,
+                        CitationKeyPatternPreferences.KeySuffix.ALWAYS,
+                        "",
+                        "",
+                        DEFAULT_UNWANTED_CHARACTERS,
+                        pattern,
+                        "",
+                        ',');
+
+        CitationKeyGenerator keyGenerator =
+                new CitationKeyGenerator(bibtexKeyPattern, database, preferences);
         keyGenerator.generateAndSetKey(entry);
         BibEntry entry2 = new BibEntry();
         entry2.setField(StandardField.AUTHOR, "John Doe");
@@ -107,17 +111,18 @@ void generateDefaultKeyAlwaysLetterAlreadyExistsDuplicatesStartAtB() {
 
     @Test
     void generateDefaultKeyStartDuplicatesAtB() {
-        preferences = new CitationKeyPatternPreferences(
-                false,
-                false,
-                false,
-                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_B,
-                "",
-                "",
-                DEFAULT_UNWANTED_CHARACTERS,
-                pattern,
-                "",
-                ',');
+        preferences =
+                new CitationKeyPatternPreferences(
+                        false,
+                        false,
+                        false,
+                        CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_B,
+                        "",
+                        "",
+                        DEFAULT_UNWANTED_CHARACTERS,
+                        pattern,
+                        "",
+                        ',');
 
         new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCitationKey());
@@ -125,19 +130,21 @@ void generateDefaultKeyStartDuplicatesAtB() {
 
     @Test
     void generateDefaultKeyAlreadyExistsDuplicatesStartAtB() {
-        preferences = new CitationKeyPatternPreferences(
-                false,
-                false,
-                false,
-                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_B,
-                "",
-                "",
-                DEFAULT_UNWANTED_CHARACTERS,
-                pattern,
-                "",
-                ',');
-
-        CitationKeyGenerator keyGenerator = new CitationKeyGenerator(bibtexKeyPattern, database, preferences);
+        preferences =
+                new CitationKeyPatternPreferences(
+                        false,
+                        false,
+                        false,
+                        CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_B,
+                        "",
+                        "",
+                        DEFAULT_UNWANTED_CHARACTERS,
+                        pattern,
+                        "",
+                        ',');
+
+        CitationKeyGenerator keyGenerator =
+                new CitationKeyGenerator(bibtexKeyPattern, database, preferences);
         keyGenerator.generateAndSetKey(entry);
         BibEntry entry2 = new BibEntry();
         entry2.setField(StandardField.AUTHOR, "John Doe");
@@ -149,7 +156,8 @@ void generateDefaultKeyAlreadyExistsDuplicatesStartAtB() {
     @SuppressWarnings("OptionalGetWithoutIsPresent")
     @Test
     void generateDefaultKeyAlreadyExistsManyDuplicates() {
-        CitationKeyGenerator keyGenerator = new CitationKeyGenerator(bibtexKeyPattern, database, preferences);
+        CitationKeyGenerator keyGenerator =
+                new CitationKeyGenerator(bibtexKeyPattern, database, preferences);
         keyGenerator.generateAndSetKey(entry);
         BibEntry entry2 = new BibEntry();
         entry2.setField(StandardField.AUTHOR, "John Doe");
@@ -168,7 +176,8 @@ void generateDefaultKeyAlreadyExistsManyDuplicates() {
     @SuppressWarnings("OptionalGetWithoutIsPresent")
     @Test
     void generateDefaultKeyFirstTwoAlreadyExists() {
-        CitationKeyGenerator keyGenerator = new CitationKeyGenerator(bibtexKeyPattern, database, preferences);
+        CitationKeyGenerator keyGenerator =
+                new CitationKeyGenerator(bibtexKeyPattern, database, preferences);
         keyGenerator.generateAndSetKey(entry);
         BibEntry entry2 = new BibEntry();
         entry2.setField(StandardField.AUTHOR, "John Doe");
@@ -426,17 +435,18 @@ void generateKeyAuthNMLargeMReallyReturnsEmptyString() {
 
     @Test
     void generateKeyRegExReplace() {
-        preferences = new CitationKeyPatternPreferences(
-                false,
-                false,
-                false,
-                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
-                "2",
-                "3",
-                DEFAULT_UNWANTED_CHARACTERS,
-                pattern,
-                "",
-                ',');
+        preferences =
+                new CitationKeyPatternPreferences(
+                        false,
+                        false,
+                        false,
+                        CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
+                        "2",
+                        "3",
+                        DEFAULT_UNWANTED_CHARACTERS,
+                        pattern,
+                        "",
+                        ',');
 
         bibtexKeyPattern.setDefaultValue("[auth][year]");
         entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java
index b02b69554ff2..1c00d89a1fea 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.citationkeypattern;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import javafx.beans.property.SimpleObjectProperty;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 @Execution(ExecutionMode.CONCURRENT)
 class MakeLabelWithoutDatabaseTest {
 
@@ -20,29 +19,33 @@ class MakeLabelWithoutDatabaseTest {
 
     @BeforeEach
     void setUp() {
-        GlobalCitationKeyPatterns keyPattern = new GlobalCitationKeyPatterns(CitationKeyPattern.NULL_CITATION_KEY_PATTERN);
+        GlobalCitationKeyPatterns keyPattern =
+                new GlobalCitationKeyPatterns(CitationKeyPattern.NULL_CITATION_KEY_PATTERN);
         keyPattern.setDefaultValue("[auth]");
-        CitationKeyPatternPreferences patternPreferences = new CitationKeyPatternPreferences(
-                false,
-                false,
-                false,
-                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
-                "",
-                "",
-                CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS,
-                keyPattern,
-                "",
-                new SimpleObjectProperty<>(','));
-
-        citationKeyGenerator = new CitationKeyGenerator(keyPattern, new BibDatabase(), patternPreferences);
+        CitationKeyPatternPreferences patternPreferences =
+                new CitationKeyPatternPreferences(
+                        false,
+                        false,
+                        false,
+                        CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
+                        "",
+                        "",
+                        CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS,
+                        keyPattern,
+                        "",
+                        new SimpleObjectProperty<>(','));
+
+        citationKeyGenerator =
+                new CitationKeyGenerator(keyPattern, new BibDatabase(), patternPreferences);
     }
 
     @Test
     void makeAuthorLabelForFileSearch() {
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.AUTHOR, "John Doe")
-        .withField(StandardField.YEAR, "2016")
-        .withField(StandardField.TITLE, "An awesome paper on JabRef");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "John Doe")
+                        .withField(StandardField.YEAR, "2016")
+                        .withField(StandardField.TITLE, "An awesome paper on JabRef");
 
         String label = citationKeyGenerator.generateKey(entry);
         assertEquals("Doe", label);
@@ -50,10 +53,11 @@ void makeAuthorLabelForFileSearch() {
 
     @Test
     void makeEditorLabelForFileSearch() {
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.EDITOR, "John Doe")
-                .withField(StandardField.YEAR, "2016")
-                .withField(StandardField.TITLE, "An awesome paper on JabRef");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(StandardField.EDITOR, "John Doe")
+                        .withField(StandardField.YEAR, "2016")
+                        .withField(StandardField.TITLE, "An awesome paper on JabRef");
 
         String label = citationKeyGenerator.generateKey(entry);
         assertEquals("Doe", label);
diff --git a/src/test/java/org/jabref/logic/citationstyle/CitationStyleCacheTest.java b/src/test/java/org/jabref/logic/citationstyle/CitationStyleCacheTest.java
index faff4fe5f48d..07180ec677f1 100644
--- a/src/test/java/org/jabref/logic/citationstyle/CitationStyleCacheTest.java
+++ b/src/test/java/org/jabref/logic/citationstyle/CitationStyleCacheTest.java
@@ -1,31 +1,30 @@
 package org.jabref.logic.citationstyle;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.util.List;
 
 class CitationStyleCacheTest {
 
-  private BibEntry bibEntry;
-  private List<BibEntry> entries;
-  private BibDatabase database;
-  private BibDatabaseContext databaseContext;
-  private CitationStyleCache csCache;
-
-  @Test
-  void getCitationForTest() {
-    BibEntry bibEntry = new BibEntry().withCitationKey("test");
-    List<BibEntry> entries = List.of(bibEntry);
-    BibDatabase database = new BibDatabase(entries);
-    BibDatabaseContext databaseContext = new BibDatabaseContext(database);
-    CitationStyleCache csCache = new CitationStyleCache(databaseContext);
-
-    assertNotNull(csCache.getCitationFor(bibEntry));
-  }
+    private BibEntry bibEntry;
+    private List<BibEntry> entries;
+    private BibDatabase database;
+    private BibDatabaseContext databaseContext;
+    private CitationStyleCache csCache;
+
+    @Test
+    void getCitationForTest() {
+        BibEntry bibEntry = new BibEntry().withCitationKey("test");
+        List<BibEntry> entries = List.of(bibEntry);
+        BibDatabase database = new BibDatabase(entries);
+        BibDatabaseContext databaseContext = new BibDatabaseContext(database);
+        CitationStyleCache csCache = new CitationStyleCache(databaseContext);
+
+        assertNotNull(csCache.getCitationFor(bibEntry));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java b/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
index d1a6891e8746..410ac8e0e9e5 100644
--- a/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
+++ b/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
@@ -1,8 +1,8 @@
 package org.jabref.logic.citationstyle;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import de.undercouch.citeproc.output.Citation;
 
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.TestEntry;
@@ -13,34 +13,44 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import de.undercouch.citeproc.output.Citation;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Stream;
 
 class CitationStyleGeneratorTest {
 
     private final BibEntry testEntry = TestEntry.getTestEntry();
-    private final BibDatabaseContext context = new BibDatabaseContext(new BibDatabase(List.of(testEntry)));
+    private final BibDatabaseContext context =
+            new BibDatabaseContext(new BibDatabase(List.of(testEntry)));
     private final BibEntryTypesManager bibEntryTypesManager = new BibEntryTypesManager();
     private final List<CitationStyle> styleList = CitationStyle.discoverCitationStyles();
 
     @Test
     void aCMCitation() {
         context.setMode(BibDatabaseMode.BIBLATEX);
-        CitationStyle style = styleList.stream().filter(e -> "ACM SIGGRAPH".equals(e.getTitle())).findAny().get();
-        String citation = CitationStyleGenerator.generateBibliography(List.of(testEntry), style.getSource(), CitationStyleOutputFormat.HTML, context, bibEntryTypesManager).getFirst();
+        CitationStyle style =
+                styleList.stream().filter(e -> "ACM SIGGRAPH".equals(e.getTitle())).findAny().get();
+        String citation =
+                CitationStyleGenerator.generateBibliography(
+                                List.of(testEntry),
+                                style.getSource(),
+                                CitationStyleOutputFormat.HTML,
+                                context,
+                                bibEntryTypesManager)
+                        .getFirst();
 
         // if the acm-siggraph.csl citation style changes this has to be modified
-        String expected = "  <div class=\"csl-entry\">"
-                + "<span style=\"font-variant: small-caps\">Smith, B., Jones, B., and Williams, J.</span> 2016. Title of the test entry. <span style=\"font-style: italic\">BibTeX Journal</span> <span style=\"font-style: italic\">34</span>, 3, 45&ndash;67."
-                + "</div>\n"
-                + "";
+        String expected =
+                "  <div class=\"csl-entry\">"
+                        + "<span style=\"font-variant: small-caps\">Smith, B., Jones, B., and Williams, J.</span> 2016. Title of the test entry. <span style=\"font-style: italic\">BibTeX Journal</span> <span style=\"font-style: italic\">34</span>, 3, 45&ndash;67."
+                        + "</div>\n"
+                        + "";
 
         assertEquals(expected, citation);
     }
@@ -48,14 +58,29 @@ void aCMCitation() {
     @Test
     void aPACitation() {
         context.setMode(BibDatabaseMode.BIBLATEX);
-        CitationStyle style = styleList.stream().filter(e -> "American Psychological Association 7th edition".equals(e.getTitle())).findAny().get();
-        String citation = CitationStyleGenerator.generateBibliography(List.of(testEntry), style.getSource(), CitationStyleOutputFormat.HTML, context, bibEntryTypesManager).getFirst();
+        CitationStyle style =
+                styleList.stream()
+                        .filter(
+                                e ->
+                                        "American Psychological Association 7th edition"
+                                                .equals(e.getTitle()))
+                        .findAny()
+                        .get();
+        String citation =
+                CitationStyleGenerator.generateBibliography(
+                                List.of(testEntry),
+                                style.getSource(),
+                                CitationStyleOutputFormat.HTML,
+                                context,
+                                bibEntryTypesManager)
+                        .getFirst();
 
         // if the apa-7th-citation.csl citation style changes this has to be modified
-        String expected = "  <div class=\"csl-entry\">"
-                + "Smith, B., Jones, B., &amp; Williams, J. (2016). Title of the test entry. <span style=\"font-style: italic\">BibTeX Journal</span>, <span style=\"font-style: italic\">34</span>(3), 45&ndash;67. https://doi.org/10.1001/bla.blubb"
-                + "</div>\n"
-                + "";
+        String expected =
+                "  <div class=\"csl-entry\">"
+                        + "Smith, B., Jones, B., &amp; Williams, J. (2016). Title of the test entry. <span style=\"font-style: italic\">BibTeX Journal</span>, <span style=\"font-style: italic\">34</span>(3), 45&ndash;67. https://doi.org/10.1001/bla.blubb"
+                        + "</div>\n"
+                        + "";
 
         assertEquals(expected, citation);
     }
@@ -68,8 +93,21 @@ void aPACitation() {
     @Disabled("Till alphanumeric citations are supported by citeproc-java")
     void din1502AlphanumericInTextCitation() throws IOException {
         context.setMode(BibDatabaseMode.BIBLATEX);
-        CitationStyle style = styleList.stream().filter(e -> "DIN 1505-2 (alphanumeric, Deutsch) - standard superseded by ISO-690".equals(e.getTitle())).findAny().get();
-        Citation citation = CitationStyleGenerator.generateCitation(List.of(testEntry), style.getSource(), CitationStyleOutputFormat.HTML, context, bibEntryTypesManager);
+        CitationStyle style =
+                styleList.stream()
+                        .filter(
+                                e ->
+                                        "DIN 1505-2 (alphanumeric, Deutsch) - standard superseded by ISO-690"
+                                                .equals(e.getTitle()))
+                        .findAny()
+                        .get();
+        Citation citation =
+                CitationStyleGenerator.generateCitation(
+                        List.of(testEntry),
+                        style.getSource(),
+                        CitationStyleOutputFormat.HTML,
+                        context,
+                        bibEntryTypesManager);
         String inTextCitationText = citation.getText();
 
         assertEquals("[Smit2016]", inTextCitationText);
@@ -81,10 +119,13 @@ void ignoreNewLine() {
         entry.setField(StandardField.AUTHOR, "Last, First and\nDoe, Jane");
 
         // if the default citation style changes this has to be modified
-        String expected = "  <div class=\"csl-entry\">\n" +
-                "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">F. Last and J. Doe, </div>\n" +
-                "  </div>\n";
-        String citation = CitationStyleGenerator.generateBibliography(List.of(entry), CitationStyle.getDefault(), bibEntryTypesManager);
+        String expected =
+                "  <div class=\"csl-entry\">\n"
+                        + "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">F. Last and J. Doe, </div>\n"
+                        + "  </div>\n";
+        String citation =
+                CitationStyleGenerator.generateBibliography(
+                        List.of(entry), CitationStyle.getDefault(), bibEntryTypesManager);
         assertEquals(expected, citation);
     }
 
@@ -94,91 +135,124 @@ void ignoreCarriageReturnNewLine() {
         entry.setField(StandardField.AUTHOR, "Last, First and\r\nDoe, Jane");
 
         // if the default citation style changes this has to be modified
-        String expected = "  <div class=\"csl-entry\">\n" +
-                "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">F. Last and J. Doe, </div>\n" +
-                "  </div>\n";
-        String citation = CitationStyleGenerator.generateBibliography(List.of(entry), CitationStyle.getDefault(), bibEntryTypesManager);
+        String expected =
+                "  <div class=\"csl-entry\">\n"
+                        + "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">F. Last and J. Doe, </div>\n"
+                        + "  </div>\n";
+        String citation =
+                CitationStyleGenerator.generateBibliography(
+                        List.of(entry), CitationStyle.getDefault(), bibEntryTypesManager);
         assertEquals(expected, citation);
     }
 
     @Test
     void missingCitationStyle() {
-        String expected = Localization.lang("Cannot generate preview based on selected citation style.");
-        String citation = CitationStyleGenerator.generateBibliography(List.of(new BibEntry()), "faulty citation style", bibEntryTypesManager);
+        String expected =
+                Localization.lang("Cannot generate preview based on selected citation style.");
+        String citation =
+                CitationStyleGenerator.generateBibliography(
+                        List.of(new BibEntry()), "faulty citation style", bibEntryTypesManager);
         assertEquals(expected, citation);
     }
 
     @Test
     void htmlFormat() {
-        String expectedCitation = "  <div class=\"csl-entry\">\n" +
-                "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, &ldquo;Title of the test entry,&rdquo; <span style=\"font-style: italic\">BibTeX Journal</span>, vol. 34, no. 3, pp. 45&ndash;67, Jul. 2016, doi: 10.1001/bla.blubb.</div>\n" +
-                "  </div>\n";
+        String expectedCitation =
+                "  <div class=\"csl-entry\">\n"
+                        + "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, &ldquo;Title of the test entry,&rdquo; <span style=\"font-style: italic\">BibTeX Journal</span>, vol. 34, no. 3, pp. 45&ndash;67, Jul. 2016, doi: 10.1001/bla.blubb.</div>\n"
+                        + "  </div>\n";
 
         String style = CitationStyle.getDefault().getSource();
         CitationStyleOutputFormat format = CitationStyleOutputFormat.HTML;
 
-        String actualCitation = CitationStyleGenerator.generateBibliography(List.of(testEntry), style, format, context, bibEntryTypesManager).getFirst();
+        String actualCitation =
+                CitationStyleGenerator.generateBibliography(
+                                List.of(testEntry), style, format, context, bibEntryTypesManager)
+                        .getFirst();
         assertEquals(expectedCitation, actualCitation);
     }
 
     @Test
     void textFormat() {
-        String expectedCitation = "[1]B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, Jul. 2016, doi: 10.1001/bla.blubb.\n";
+        String expectedCitation =
+                "[1]B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, Jul. 2016, doi: 10.1001/bla.blubb.\n";
 
         String style = CitationStyle.getDefault().getSource();
         CitationStyleOutputFormat format = CitationStyleOutputFormat.TEXT;
 
-        String actualCitation = CitationStyleGenerator.generateBibliography(List.of(testEntry), style, format, context, bibEntryTypesManager).getFirst();
+        String actualCitation =
+                CitationStyleGenerator.generateBibliography(
+                                List.of(testEntry), style, format, context, bibEntryTypesManager)
+                        .getFirst();
         assertEquals(expectedCitation, actualCitation);
     }
 
     @Test
     void handleDiacritics() {
         BibEntry entry = new BibEntry();
-        // We need to escape the backslash as well, because the slash is part of the LaTeX expression
+        // We need to escape the backslash as well, because the slash is part of the LaTeX
+        // expression
         entry.setField(StandardField.AUTHOR, "L{\\\"a}st, First and Doe, Jane");
         // if the default citation style changes this has to be modified.
         // in this case ä was added to check if it is formatted appropriately
-        String expected = "  <div class=\"csl-entry\">\n" +
-                "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">F. L&auml;st and J. Doe, </div>\n" +
-                "  </div>\n";
-        String citation = CitationStyleGenerator.generateBibliography(List.of(entry), CitationStyle.getDefault(), bibEntryTypesManager);
+        String expected =
+                "  <div class=\"csl-entry\">\n"
+                        + "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">F. L&auml;st and J. Doe, </div>\n"
+                        + "  </div>\n";
+        String citation =
+                CitationStyleGenerator.generateBibliography(
+                        List.of(entry), CitationStyle.getDefault(), bibEntryTypesManager);
         assertEquals(expected, citation);
     }
 
     @Test
     void handleAmpersand() {
-        String expectedCitation = "[1]B. Smith, B. Jones, and J. Williams, “Famous quote: “&TitleTest&” - that is it,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, Jul. 2016, doi: 10.1001/bla.blubb.\n";
+        String expectedCitation =
+                "[1]B. Smith, B. Jones, and J. Williams, “Famous quote: “&TitleTest&” - that is it,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, Jul. 2016, doi: 10.1001/bla.blubb.\n";
         testEntry.setField(StandardField.TITLE, "Famous quote: “&TitleTest&” - that is it");
         String style = CitationStyle.getDefault().getSource();
         CitationStyleOutputFormat format = CitationStyleOutputFormat.TEXT;
 
-        String actualCitation = CitationStyleGenerator.generateBibliography(List.of(testEntry), style, format, context, bibEntryTypesManager).getFirst();
+        String actualCitation =
+                CitationStyleGenerator.generateBibliography(
+                                List.of(testEntry), style, format, context, bibEntryTypesManager)
+                        .getFirst();
         assertEquals(expectedCitation, actualCitation);
     }
 
     @Test
     void handleCrossRefFields() {
-        BibEntry firstEntry = new BibEntry(StandardEntryType.InCollection)
-                .withCitationKey("smit2021")
-                .withField(StandardField.AUTHOR, "Smith, Bob")
-                .withField(StandardField.TITLE, "An article")
-                .withField(StandardField.PAGES, "1-10")
-                .withField(StandardField.CROSSREF, "jone2021");
-
-        BibEntry secondEntry = new BibEntry(StandardEntryType.Book)
-                .withCitationKey("jone2021")
-                .withField(StandardField.EDITOR, "Jones, John")
-                .withField(StandardField.PUBLISHER, "Great Publisher")
-                .withField(StandardField.TITLE, "A book")
-                .withField(StandardField.YEAR, "2021")
-                .withField(StandardField.ADDRESS, "Somewhere");
-
-        String expectedCitation = "[1]B. Smith, “An article,” J. Jones, Ed., Somewhere: Great Publisher, 2021, pp. 1–10.\n";
-        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(new BibDatabase(List.of(firstEntry, secondEntry)));
+        BibEntry firstEntry =
+                new BibEntry(StandardEntryType.InCollection)
+                        .withCitationKey("smit2021")
+                        .withField(StandardField.AUTHOR, "Smith, Bob")
+                        .withField(StandardField.TITLE, "An article")
+                        .withField(StandardField.PAGES, "1-10")
+                        .withField(StandardField.CROSSREF, "jone2021");
+
+        BibEntry secondEntry =
+                new BibEntry(StandardEntryType.Book)
+                        .withCitationKey("jone2021")
+                        .withField(StandardField.EDITOR, "Jones, John")
+                        .withField(StandardField.PUBLISHER, "Great Publisher")
+                        .withField(StandardField.TITLE, "A book")
+                        .withField(StandardField.YEAR, "2021")
+                        .withField(StandardField.ADDRESS, "Somewhere");
+
+        String expectedCitation =
+                "[1]B. Smith, “An article,” J. Jones, Ed., Somewhere: Great Publisher, 2021, pp. 1–10.\n";
+        BibDatabaseContext bibDatabaseContext =
+                new BibDatabaseContext(new BibDatabase(List.of(firstEntry, secondEntry)));
         String style = CitationStyle.getDefault().getSource();
 
-        String actualCitation = CitationStyleGenerator.generateBibliography(List.of(firstEntry), style, CitationStyleOutputFormat.TEXT, bibDatabaseContext, bibEntryTypesManager).getFirst();
+        String actualCitation =
+                CitationStyleGenerator.generateBibliography(
+                                List.of(firstEntry),
+                                style,
+                                CitationStyleOutputFormat.TEXT,
+                                bibDatabaseContext,
+                                bibEntryTypesManager)
+                        .getFirst();
         assertEquals(expectedCitation, actualCitation);
     }
 
@@ -230,7 +304,6 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.PAGES, "7--8")
                                 .withField(StandardField.ISSUE, "33"),
                         "ieee.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). volume + issue + number + pages. Bib(La)TeX Journal, 1(3number), 45–67.\n",
                         BibDatabaseMode.BIBTEX,
@@ -241,10 +314,11 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.PAGES, "45--67")
                                 .withField(StandardField.TITLE, "volume + issue + number + pages")
                                 .withField(StandardField.VOLUME, "1")
-                                .withField(StandardField.COMMENT, "The issue field does not exist in Bibtex standard, therefore there is no need to render it (The issue field exists in biblatex standard though)")
+                                .withField(
+                                        StandardField.COMMENT,
+                                        "The issue field does not exist in Bibtex standard, therefore there is no need to render it (The issue field exists in biblatex standard though)")
                                 .withField(StandardField.ISSUE, "9issue"),
                         "apa.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). volume + issue + pages. Bib(La)TeX Journal, 1(9), 45–67.\n",
                         BibDatabaseMode.BIBTEX,
@@ -254,10 +328,11 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.PAGES, "45--67")
                                 .withField(StandardField.TITLE, "volume + issue + pages")
                                 .withField(StandardField.VOLUME, "1")
-                                .withField(StandardField.COMMENT, "The issue field does not exist in Bibtex standard, therefore there is no need to render it (The issue field exists in biblatex standard though.). Since, for this entry, there is no number field present and therefore no data will be overwriten, enabling the user to be able to move the data within the issue field to the number field via cleanup action is something worth pursuing.")
+                                .withField(
+                                        StandardField.COMMENT,
+                                        "The issue field does not exist in Bibtex standard, therefore there is no need to render it (The issue field exists in biblatex standard though.). Since, for this entry, there is no number field present and therefore no data will be overwriten, enabling the user to be able to move the data within the issue field to the number field via cleanup action is something worth pursuing.")
                                 .withField(StandardField.ISSUE, "9"),
                         "apa.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). volume + pages. Bib(La)TeX Journal, 1, 45–67.\n",
                         BibDatabaseMode.BIBTEX,
@@ -268,7 +343,6 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.TITLE, "volume + pages")
                                 .withField(StandardField.VOLUME, "1"),
                         "apa.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). number. Bib(La)TeX Journal, 3number.\n",
                         BibDatabaseMode.BIBTEX,
@@ -279,7 +353,11 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.TITLE, "number"),
                         "apa.csl"),
 
-                // The issue field does not exist in bibtex standard, therefore there is no need to render it (it exists in biblatex standard though). Since, for this entry, there is no number field present and therefore no data will be overwriten, enabling the user to be able to move the data within the issue field to the number field via cleanup action is something worth pursuing.
+                // The issue field does not exist in bibtex standard, therefore there is no need to
+                // render it (it exists in biblatex standard though). Since, for this entry, there
+                // is no number field present and therefore no data will be overwriten, enabling the
+                // user to be able to move the data within the issue field to the number field via
+                // cleanup action is something worth pursuing.
                 Arguments.of(
                         "Foo, B. (n.d.). issue + pages. Bib(La)TeX Journal, 9, 45–67.\n",
                         BibDatabaseMode.BIBTEX,
@@ -291,7 +369,8 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.ISSUE, "9"),
                         "apa.csl"),
 
-                // The issue field does not exist in bibtex standard, therefore there is no need to render it (it exists in biblatex standard though)
+                // The issue field does not exist in bibtex standard, therefore there is no need to
+                // render it (it exists in biblatex standard though)
                 Arguments.of(
                         "Foo, B. (n.d.). issue + number. Bib(La)TeX Journal, 3number.\n",
                         BibDatabaseMode.BIBTEX,
@@ -303,7 +382,8 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.ISSUE, "9issue"),
                         "apa.csl"),
 
-                // The issue field does not exist in bibtex standard, therefore there is no need to render it (it exists in biblatex standard though)
+                // The issue field does not exist in bibtex standard, therefore there is no need to
+                // render it (it exists in biblatex standard though)
                 Arguments.of(
                         "Foo, B. (n.d.). issue + number + pages. Bib(La)TeX Journal, 3number, 45–67.\n",
                         BibDatabaseMode.BIBTEX,
@@ -316,7 +396,13 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.ISSUE, "9issue"),
                         "apa.csl"),
 
-                // "Article number" is not a field that exists in Bibtex standard. Printing the article number in the pages field is a workaround. Some Journals have opted to put the article number into the pages field. APA 7th Style recommends following procedure: If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range. Question: Should it be rendered WITH Article or WITHOUT the Word Article in Front? I guess without?
+                // "Article number" is not a field that exists in Bibtex standard. Printing the
+                // article number in the pages field is a workaround. Some Journals have opted to
+                // put the article number into the pages field. APA 7th Style recommends following
+                // procedure: If the journal article has an article number instead of a page range,
+                // include the word "Article" and then the article number instead of the page range.
+                // Question: Should it be rendered WITH Article or WITHOUT the Word Article in
+                // Front? I guess without?
                 Arguments.of(
                         "Foo, B. (n.d.). number + pages. Bib(La)TeX Journal, 3number, Article 777.\n",
                         BibDatabaseMode.BIBTEX,
@@ -326,10 +412,16 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.NUMBER, "3number")
                                 .withField(StandardField.PAGES, "Article 777")
                                 .withField(StandardField.TITLE, "number + pages")
-                                .withField(StandardField.COMMENT, "number + article-number WITH the word article instead of pagerange"),
+                                .withField(
+                                        StandardField.COMMENT,
+                                        "number + article-number WITH the word article instead of pagerange"),
                         "apa.csl"),
 
-                // "The issue field does not exist in bibtex standard, therefore there is no need to render it (it exists in biblatex standard though). Since, for this entry, there is no number field present and therefore no data will be overwriten, enabling the user to be able to move the data within the issue field to the number field via cleanup action is something worth pursuing."
+                // "The issue field does not exist in bibtex standard, therefore there is no need to
+                // render it (it exists in biblatex standard though). Since, for this entry, there
+                // is no number field present and therefore no data will be overwriten, enabling the
+                // user to be able to move the data within the issue field to the number field via
+                // cleanup action is something worth pursuing."
                 Arguments.of(
                         "Foo, B. (n.d.). issue. Bib(La)TeX Journal, 9issue.\n",
                         BibDatabaseMode.BIBTEX,
@@ -339,7 +431,6 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.TITLE, "issue")
                                 .withField(StandardField.ISSUE, "9issue"),
                         "apa.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). number + pages. Bib(La)TeX Journal, 3number, 45–67.\n",
                         BibDatabaseMode.BIBTEX,
@@ -351,7 +442,13 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.TITLE, "number + pages"),
                         "apa.csl"),
 
-                // "Article number" is not a field that exists in Bibtex standard. Printing the article number in the pages field is a workaround. Some Journals have opted to put the article number into the pages field. APA 7th Style recommends following procedure: If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range. Question: Should it be rendered WITH Article or WITHOUT the Word Article in Front? I guess without?
+                // "Article number" is not a field that exists in Bibtex standard. Printing the
+                // article number in the pages field is a workaround. Some Journals have opted to
+                // put the article number into the pages field. APA 7th Style recommends following
+                // procedure: If the journal article has an article number instead of a page range,
+                // include the word "Article" and then the article number instead of the page range.
+                // Question: Should it be rendered WITH Article or WITHOUT the Word Article in
+                // Front? I guess without?
                 Arguments.of(
                         "Foo, B. (n.d.). number + pages. BibTeX Journal, 3number, 777e23.\n",
                         BibDatabaseMode.BIBTEX,
@@ -361,10 +458,20 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.NUMBER, "3number")
                                 .withField(StandardField.PAGES, "777e23")
                                 .withField(StandardField.TITLE, "number + pages")
-                                .withField(StandardField.COMMENT, "number + article-number WITHOUT the word article instead of pagerange"),
+                                .withField(
+                                        StandardField.COMMENT,
+                                        "number + article-number WITHOUT the word article instead of pagerange"),
                         "apa.csl"),
 
-                // Not rendering the "eid" field here, is correct. The "eid" field(short for: electronic identifier) does not exist in Bibtex standard. It exists in Biblatex standard though and is the field, in which the "article number" should be entered into. "Article number" is a field that does not exist in Bibtex and also not in Biblatex standard. As a workaround, some Journals have opted to put the article number into the pages field. APA 7th Style recommends following procedure: "If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range." - Source: https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2. Additionally the APA style (7th edition) created by the CSL community "prints the issue (= the "number" field" in Biblatex)  whenever it is in the data and the number (= the "eid" field in Biblatex) when no page range is present, entirely independent of the issue number" - Source: https://github.com/citation-style-language/styles/issues/5827#issuecomment-1006011280). I personally think the "eid" field SHOULD be rendered here SOMEWHERE, maybe even IN ADDITION to the page range, because we have the data, right? Why not show it? - But this is just my humble opinion and may not be coherent with the current APA Style 7th edition. Not rendering the "issue" field here is sufficient for APA 7th edition. Under current circumstances the "number" field takes priority over the "issue" field (see https://github.com/JabRef/jabref/issues/8372#issuecomment-1023768144). [Keyword: IS RENDERING BOTH VIABLE?]. Ideally, they would coexist: "Roughly speaking number subdivides volume and issue is much closer to subdividing year. I don't think I would want to say that issue is subordinate to number or vice versa. They sort of operate on a similar level." (Source: https://github.com/plk/biblatex/issues/726#issuecomment-1010264258)
+                // Not rendering the "eid" field here, is correct. The "eid" field(short for:
+                // electronic identifier) does not exist in Bibtex standard. It exists in Biblatex
+                // standard though and is the field, in which the "article number" should be entered
+                // into. "Article number" is a field that does not exist in Bibtex and also not in
+                // Biblatex standard. As a workaround, some Journals have opted to put the article
+                // number into the pages field. APA 7th Style recommends following procedure: "If
+                // the journal article has an article number instead of a page range, include the
+                // word "Article" and then the article number instead of the page range." - Source:
+                // https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2. Additionally the APA style (7th edition) created by the CSL community "prints the issue (= the "number" field" in Biblatex)  whenever it is in the data and the number (= the "eid" field in Biblatex) when no page range is present, entirely independent of the issue number" - Source: https://github.com/citation-style-language/styles/issues/5827#issuecomment-1006011280). I personally think the "eid" field SHOULD be rendered here SOMEWHERE, maybe even IN ADDITION to the page range, because we have the data, right? Why not show it? - But this is just my humble opinion and may not be coherent with the current APA Style 7th edition. Not rendering the "issue" field here is sufficient for APA 7th edition. Under current circumstances the "number" field takes priority over the "issue" field (see https://github.com/JabRef/jabref/issues/8372#issuecomment-1023768144). [Keyword: IS RENDERING BOTH VIABLE?]. Ideally, they would coexist: "Roughly speaking number subdivides volume and issue is much closer to subdividing year. I don't think I would want to say that issue is subordinate to number or vice versa. They sort of operate on a similar level." (Source: https://github.com/plk/biblatex/issues/726#issuecomment-1010264258)
                 Arguments.of(
                         "Foo, B. (n.d.). eid + issue + number + pages. BibTeX Journal, 3number, 45–67.\n",
                         BibDatabaseMode.BIBTEX,
@@ -397,18 +504,20 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.ISSUE, "9issue"),
                         "apa.csl"),
 
-        /*
-        Not rendering the "eid" field here, is sufficient, but contested practice. This statement is based on the following reasoning: "eid" (in long: electronic identifier) is the field, which should be used to enter the "article number", when using the Biblatex standard. Both "eid" and "article number" do not exist in the older Bibtex standard. As a workaround, some Journals and publishers have opted to put the article number into the pages field. APA 7th Style recommends following procedure: "If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range." - Source: https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2. Additionally the APA style (7th edition) created by the CSL community "prints the issue [= the "number" field" in both Biblatex and Bibtex]  whenever it is in the data and the number [= the "eid" field in Biblatex] when no page range is present, entirely independent of the issue number" - Source: https://github.com/citation-style-language/styles/issues/5827#issuecomment-1006011280. I personally think the "eid" field SHOULD be rendered here SOMEWHERE, maybe even IN ADDITION to the page range, because we have the data, right? Why not show it? - But this is just my humble opinion and may not be coherent with the current APA Style 7th edition.
+                /*
+                Not rendering the "eid" field here, is sufficient, but contested practice. This statement is based on the following reasoning: "eid" (in long: electronic identifier) is the field, which should be used to enter the "article number", when using the Biblatex standard. Both "eid" and "article number" do not exist in the older Bibtex standard. As a workaround, some Journals and publishers have opted to put the article number into the pages field. APA 7th Style recommends following procedure: "If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range." - Source: https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2. Additionally the APA style (7th edition) created by the CSL community "prints the issue [= the "number" field" in both Biblatex and Bibtex]  whenever it is in the data and the number [= the "eid" field in Biblatex] when no page range is present, entirely independent of the issue number" - Source: https://github.com/citation-style-language/styles/issues/5827#issuecomment-1006011280. I personally think the "eid" field SHOULD be rendered here SOMEWHERE, maybe even IN ADDITION to the page range, because we have the data, right? Why not show it? - But this is just my humble opinion and may not be coherent with the current APA Style 7th edition.
 
-        Not rendering the "issue" field here is sufficient for APA 7th edition. Under current circumstances the "number" field takes priority over the "issue" field (see https://github.com/JabRef/jabref/issues/8372#issuecomment-1023768144). [Keyword: IS RENDERING BOTH VIABLE?]. Ideally, they would coexist: "Roughly speaking number subdivides volume and issue is much closer to subdividing year. I don't think I would want to say that issue is subordinate to number or vice versa. They sort of operate on a similar level." (Source: https://github.com/plk/biblatex/issues/726#issuecomment-1010264258)
-         */
+                Not rendering the "issue" field here is sufficient for APA 7th edition. Under current circumstances the "number" field takes priority over the "issue" field (see https://github.com/JabRef/jabref/issues/8372#issuecomment-1023768144). [Keyword: IS RENDERING BOTH VIABLE?]. Ideally, they would coexist: "Roughly speaking number subdivides volume and issue is much closer to subdividing year. I don't think I would want to say that issue is subordinate to number or vice versa. They sort of operate on a similar level." (Source: https://github.com/plk/biblatex/issues/726#issuecomment-1010264258)
+                 */
                 Arguments.of(
                         "Foo, B. (n.d.). volume + issue + number + pages + eid. Bib(La)TeX Journal, 1(3number), Article 6eid.\n",
                         BibDatabaseMode.BIBLATEX,
                         new BibEntry(StandardEntryType.Article)
                                 .withField(StandardField.AUTHOR, "Foo, Bar")
                                 .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                                .withField(StandardField.TITLE, "volume + issue + number + pages + eid")
+                                .withField(
+                                        StandardField.TITLE,
+                                        "volume + issue + number + pages + eid")
                                 .withField(StandardField.EID, "6eid")
                                 .withField(StandardField.ISSUE, "9issue")
                                 .withField(StandardField.NUMBER, "3number")
@@ -429,7 +538,6 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.PAGES, "45--67")
                                 .withField(StandardField.VOLUME, "1"),
                         "apa.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). volume + number + pages + eid. Bib(La)TeX Journal, 1(3number), Article 6eid.\n",
                         BibDatabaseMode.BIBLATEX,
@@ -442,7 +550,6 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.PAGES, "45--67")
                                 .withField(StandardField.VOLUME, "1"),
                         "apa.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). eid + issue. Bib(La)TeX Journal, 9issue, Article Article 6eid.\n",
                         BibDatabaseMode.BIBLATEX,
@@ -453,7 +560,6 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.EID, "Article 6eid")
                                 .withField(StandardField.ISSUE, "9issue"),
                         "apa.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). eid + issue + pages. Bib(La)TeX Journal, 9issue, Article 6eid.\n",
                         BibDatabaseMode.BIBLATEX,
@@ -465,7 +571,6 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.ISSUE, "9issue")
                                 .withField(StandardField.PAGES, "45--67"),
                         "apa.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). eid + issue + number. Bib(La)TeX Journal, 3number, Article Article 6eid.\n",
                         BibDatabaseMode.BIBLATEX,
@@ -477,7 +582,6 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.ISSUE, "9issue")
                                 .withField(StandardField.NUMBER, "3number"),
                         "apa.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). eid + issue + number + pages. Bib(La)TeX Journal, 3number, Article 6eid.\n",
                         BibDatabaseMode.BIBLATEX,
@@ -490,7 +594,6 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.NUMBER, "3number")
                                 .withField(StandardField.PAGES, "45--67"),
                         "apa.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). eid + pages. Bib(La)TeX Journal, Article 6eid.\n",
                         BibDatabaseMode.BIBLATEX,
@@ -501,7 +604,6 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.EID, "6eid")
                                 .withField(StandardField.PAGES, "45--67"),
                         "apa.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). eid. Bib(La)TeX Journal, Article Article 6eid.\n",
                         BibDatabaseMode.BIBLATEX,
@@ -511,7 +613,6 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.TITLE, "eid")
                                 .withField(StandardField.EID, "Article 6eid"),
                         "apa.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). volume + number + eid. Bib(La)TeX Journal, 1(3number), Article Article 6eid.\n",
                         BibDatabaseMode.BIBLATEX,
@@ -523,7 +624,6 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.NUMBER, "3number")
                                 .withField(StandardField.VOLUME, "1"),
                         "apa.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). volume + pages + eid. Bib(La)TeX Journal, 1, Article 6eid.\n",
                         BibDatabaseMode.BIBLATEX,
@@ -535,7 +635,6 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.PAGES, "45--67")
                                 .withField(StandardField.VOLUME, "1"),
                         "apa.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). eid + number. Bib(La)TeX Journal, 3number, Article Article 6eid.\n",
                         BibDatabaseMode.BIBLATEX,
@@ -546,7 +645,6 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.EID, "Article 6eid")
                                 .withField(StandardField.NUMBER, "3number"),
                         "apa.csl"),
-
                 Arguments.of(
                         "Foo, B. (n.d.). eid + number + pages. Bib(La)TeX Journal, 3number, Article 6eid.\n",
                         BibDatabaseMode.BIBLATEX,
@@ -559,7 +657,14 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.PAGES, "45--67"),
                         "apa.csl"),
 
-                // Not rendering the "issue" field here is sufficient for APA Style (7th edition). Under current circumstances the "number" field takes priority over the "issue" field (see https://github.com/JabRef/jabref/issues/8372#issuecomment-1023768144). [Keyword: IS RENDERING BOTH VIABLE?]. Ideally, they would coexist: "Roughly speaking number subdivides volume and issue is much closer to subdividing year. I don't think I would want to say that issue is subordinate to number or vice versa. They sort of operate on a similar level." (Source: https://github.com/plk/biblatex/issues/726#issuecomment-1010264258)
+                // Not rendering the "issue" field here is sufficient for APA Style (7th edition).
+                // Under current circumstances the "number" field takes priority over the "issue"
+                // field (see https://github.com/JabRef/jabref/issues/8372#issuecomment-1023768144).
+                // [Keyword: IS RENDERING BOTH VIABLE?]. Ideally, they would coexist: "Roughly
+                // speaking number subdivides volume and issue is much closer to subdividing year. I
+                // don't think I would want to say that issue is subordinate to number or vice
+                // versa. They sort of operate on a similar level." (Source:
+                // https://github.com/plk/biblatex/issues/726#issuecomment-1010264258)
                 Arguments.of(
                         "Foo, B. (n.d.). issue + number. Bib(La)TeX Journal, 3number.\n",
                         BibDatabaseMode.BIBLATEX,
@@ -571,7 +676,14 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.NUMBER, "3number"),
                         "apa.csl"),
 
-                // Not rendering the "issue" field here is sufficient for APA 7th edition. Under current circumstances the "number" field takes priority over the "issue" field (see https://github.com/JabRef/jabref/issues/8372#issuecomment-1023768144). [Keyword: IS RENDERING BOTH VIABLE?]. Ideally, they would coexist: "Roughly speaking number subdivides volume and issue is much closer to subdividing year. I don't think I would want to say that issue is subordinate to number or vice versa. They sort of operate on a similar level." (Source: https://github.com/plk/biblatex/issues/726#issuecomment-1010264258)
+                // Not rendering the "issue" field here is sufficient for APA 7th edition. Under
+                // current circumstances the "number" field takes priority over the "issue" field
+                // (see https://github.com/JabRef/jabref/issues/8372#issuecomment-1023768144).
+                // [Keyword: IS RENDERING BOTH VIABLE?]. Ideally, they would coexist: "Roughly
+                // speaking number subdivides volume and issue is much closer to subdividing year. I
+                // don't think I would want to say that issue is subordinate to number or vice
+                // versa. They sort of operate on a similar level." (Source:
+                // https://github.com/plk/biblatex/issues/726#issuecomment-1010264258)
                 Arguments.of(
                         "Foo, B. (n.d.). issue + number + pages. Bib(La)TeX Journal, 3number, 45–67.\n",
                         BibDatabaseMode.BIBLATEX,
@@ -582,8 +694,7 @@ static Stream<Arguments> cslMapping() {
                                 .withField(StandardField.ISSUE, "9issue")
                                 .withField(StandardField.NUMBER, "3number")
                                 .withField(StandardField.PAGES, "45--67"),
-                        "apa.csl")
-        );
+                        "apa.csl"));
     }
 
     @ParameterizedTest
@@ -591,12 +702,16 @@ static Stream<Arguments> cslMapping() {
     void cslMapping(String expected, BibDatabaseMode mode, BibEntry entry, String cslFileName) {
         context.setMode(mode);
 
-        String citation = CitationStyleGenerator.generateBibliography(
-                List.of(entry),
-                CitationStyle.createCitationStyleFromFile(cslFileName).orElseThrow().getSource(),
-                CitationStyleOutputFormat.TEXT,
-                context,
-                bibEntryTypesManager).getFirst();
+        String citation =
+                CitationStyleGenerator.generateBibliography(
+                                List.of(entry),
+                                CitationStyle.createCitationStyleFromFile(cslFileName)
+                                        .orElseThrow()
+                                        .getSource(),
+                                CitationStyleOutputFormat.TEXT,
+                                context,
+                                bibEntryTypesManager)
+                        .getFirst();
         assertEquals(expected, citation);
     }
 }
diff --git a/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java b/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java
index d6ac7203d9bf..971e790f315d 100644
--- a/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java
+++ b/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java
@@ -1,23 +1,22 @@
 package org.jabref.logic.citationstyle;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.logic.util.TestEntry;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntryTypesManager;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 class CitationStyleTest {
 
@@ -28,12 +27,21 @@ void getDefault() {
 
     @Test
     void defaultCitation() {
-        BibDatabaseContext context = new BibDatabaseContext(new BibDatabase(List.of(TestEntry.getTestEntry())));
+        BibDatabaseContext context =
+                new BibDatabaseContext(new BibDatabase(List.of(TestEntry.getTestEntry())));
         context.setMode(BibDatabaseMode.BIBLATEX);
-        String citation = CitationStyleGenerator.generateBibliography(List.of(TestEntry.getTestEntry()), CitationStyle.getDefault().getSource(), CitationStyleOutputFormat.HTML, context, new BibEntryTypesManager()).getFirst();
+        String citation =
+                CitationStyleGenerator.generateBibliography(
+                                List.of(TestEntry.getTestEntry()),
+                                CitationStyle.getDefault().getSource(),
+                                CitationStyleOutputFormat.HTML,
+                                context,
+                                new BibEntryTypesManager())
+                        .getFirst();
 
         // if the default citation style changes this has to be modified
-        String expected = """
+        String expected =
+                """
                   <div class="csl-entry">
                     <div class="csl-left-margin">[1]</div><div class="csl-right-inline">B. Smith, B. Jones, and J. Williams, &ldquo;Title of the test entry,&rdquo; <span style="font-style: italic">BibTeX Journal</span>, vol. 34, no. 3, pp. 45&ndash;67, Jul. 2016, doi: 10.1001/bla.blubb.</div>
                   </div>
@@ -51,7 +59,8 @@ void discoverCitationStylesNotNull() {
     @ParameterizedTest
     @MethodSource
     void citationStylePresent(String cslFileName) {
-        Optional<CitationStyle> citationStyle = CitationStyle.createCitationStyleFromFile(cslFileName);
+        Optional<CitationStyle> citationStyle =
+                CitationStyle.createCitationStyleFromFile(cslFileName);
         assertTrue(citationStyle.isPresent());
     }
 
@@ -61,15 +70,17 @@ static Stream<Arguments> citationStylePresent() {
                 Arguments.of("apa.csl"),
                 Arguments.of("vancouver.csl"),
                 Arguments.of("chicago-author-date.csl"),
-                Arguments.of("nature.csl")
-        );
+                Arguments.of("nature.csl"));
     }
 
     @ParameterizedTest
     @MethodSource
     void titleMatches(String expectedTitle, String cslFileName) {
-        Optional<CitationStyle> citationStyle = CitationStyle.createCitationStyleFromFile(cslFileName);
-        CitationStyle.StyleInfo styleInfo = new CitationStyle.StyleInfo(citationStyle.get().getTitle(), citationStyle.get().isNumericStyle());
+        Optional<CitationStyle> citationStyle =
+                CitationStyle.createCitationStyleFromFile(cslFileName);
+        CitationStyle.StyleInfo styleInfo =
+                new CitationStyle.StyleInfo(
+                        citationStyle.get().getTitle(), citationStyle.get().isNumericStyle());
         assertEquals(expectedTitle, styleInfo.title());
     }
 
@@ -78,16 +89,20 @@ static Stream<Arguments> titleMatches() {
                 Arguments.of("IEEE", "ieee.csl"),
                 Arguments.of("American Psychological Association 7th edition", "apa.csl"),
                 Arguments.of("Vancouver", "vancouver.csl"),
-                Arguments.of("Chicago Manual of Style 17th edition (author-date)", "chicago-author-date.csl"),
-                Arguments.of("Nature", "nature.csl")
-        );
+                Arguments.of(
+                        "Chicago Manual of Style 17th edition (author-date)",
+                        "chicago-author-date.csl"),
+                Arguments.of("Nature", "nature.csl"));
     }
 
     @ParameterizedTest
     @MethodSource
     void numericPropertyMatches(boolean expectedNumericNature, String cslFileName) {
-        Optional<CitationStyle> citationStyle = CitationStyle.createCitationStyleFromFile(cslFileName);
-        CitationStyle.StyleInfo styleInfo = new CitationStyle.StyleInfo(citationStyle.get().getTitle(), citationStyle.get().isNumericStyle());
+        Optional<CitationStyle> citationStyle =
+                CitationStyle.createCitationStyleFromFile(cslFileName);
+        CitationStyle.StyleInfo styleInfo =
+                new CitationStyle.StyleInfo(
+                        citationStyle.get().getTitle(), citationStyle.get().isNumericStyle());
         assertEquals(expectedNumericNature, styleInfo.isNumericStyle());
     }
 
@@ -97,7 +112,6 @@ private static Stream<Arguments> numericPropertyMatches() {
                 Arguments.of(false, "apa.csl"),
                 Arguments.of(true, "vancouver.csl"),
                 Arguments.of(false, "chicago-author-date.csl"),
-                Arguments.of(true, "nature.csl")
-        );
+                Arguments.of(true, "nature.csl"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/citationstyle/JabRefItemDataProviderTest.java b/src/test/java/org/jabref/logic/citationstyle/JabRefItemDataProviderTest.java
index 33172c354340..d63f4de2ab88 100644
--- a/src/test/java/org/jabref/logic/citationstyle/JabRefItemDataProviderTest.java
+++ b/src/test/java/org/jabref/logic/citationstyle/JabRefItemDataProviderTest.java
@@ -1,48 +1,51 @@
 package org.jabref.logic.citationstyle;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
 
 class JabRefItemDataProviderTest {
 
     @Test
     void toJsonOneEntry() {
-        BibDatabase bibDatabase = new BibDatabase(List.of(
-                new BibEntry()
-                        .withCitationKey("key")
-                        .withField(StandardField.AUTHOR, "Test Author")
-        ));
+        BibDatabase bibDatabase =
+                new BibDatabase(
+                        List.of(
+                                new BibEntry()
+                                        .withCitationKey("key")
+                                        .withField(StandardField.AUTHOR, "Test Author")));
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(bibDatabase);
         JabRefItemDataProvider jabRefItemDataProvider = new JabRefItemDataProvider();
         jabRefItemDataProvider.setData(bibDatabaseContext, new BibEntryTypesManager());
-        assertEquals("""
+        assertEquals(
+                """
                         [{"id":"key","type":"article","author":[{"family":"Author","given":"Test"}]}]""",
                 jabRefItemDataProvider.toJson());
     }
 
     @Test
     void toJsonTwoEntries() {
-        BibDatabase bibDatabase = new BibDatabase(List.of(
-                new BibEntry()
-                        .withCitationKey("key")
-                        .withField(StandardField.AUTHOR, "Test Author"),
-                new BibEntry()
-                        .withCitationKey("key2")
-                        .withField(StandardField.AUTHOR, "Second Author")
-        ));
+        BibDatabase bibDatabase =
+                new BibDatabase(
+                        List.of(
+                                new BibEntry()
+                                        .withCitationKey("key")
+                                        .withField(StandardField.AUTHOR, "Test Author"),
+                                new BibEntry()
+                                        .withCitationKey("key2")
+                                        .withField(StandardField.AUTHOR, "Second Author")));
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(bibDatabase);
         JabRefItemDataProvider jabRefItemDataProvider = new JabRefItemDataProvider();
         jabRefItemDataProvider.setData(bibDatabaseContext, new BibEntryTypesManager());
-        assertEquals("""
+        assertEquals(
+                """
                         [{"id":"key","type":"article","author":[{"family":"Author","given":"Test"}]},{"id":"key2","type":"article","author":[{"family":"Author","given":"Second"}]}]""",
                 jabRefItemDataProvider.toJson());
     }
diff --git a/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java b/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java
index c70156613f5f..9aa194b59df9 100644
--- a/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java
@@ -1,46 +1,55 @@
 package org.jabref.logic.cleanup;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class BibtexBiblatexRoundtripTest {
     private BibEntry bibtex;
     private BibEntry biblatex;
 
     @BeforeEach
     void setUp() {
-        bibtex = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Frame, J. S. and Robinson, G. de B. and Thrall, R. M.")
-                .withField(StandardField.TITLE, "The hook graphs of the symmetric groups")
-                .withField(StandardField.JOURNAL, "Canadian J. Math.")
-                .withField(new UnknownField("fjournal"), "Canadian Journal of Mathematics. Journal Canadien de Math\\'ematiques")
-                .withField(StandardField.VOLUME, "6")
-                .withField(StandardField.YEAR, "1954")
-                .withField(StandardField.PAGES, "316--324")
-                .withField(StandardField.ISSN, "0008-414X")
-                .withField(new UnknownField("mrclass"), "20.0X")
-                .withField(StandardField.MR_NUMBER, "0062127")
-                .withField(new UnknownField("mrreviewer"), "D. E. Littlewood");
+        bibtex =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Frame, J. S. and Robinson, G. de B. and Thrall, R. M.")
+                        .withField(StandardField.TITLE, "The hook graphs of the symmetric groups")
+                        .withField(StandardField.JOURNAL, "Canadian J. Math.")
+                        .withField(
+                                new UnknownField("fjournal"),
+                                "Canadian Journal of Mathematics. Journal Canadien de Math\\'ematiques")
+                        .withField(StandardField.VOLUME, "6")
+                        .withField(StandardField.YEAR, "1954")
+                        .withField(StandardField.PAGES, "316--324")
+                        .withField(StandardField.ISSN, "0008-414X")
+                        .withField(new UnknownField("mrclass"), "20.0X")
+                        .withField(StandardField.MR_NUMBER, "0062127")
+                        .withField(new UnknownField("mrreviewer"), "D. E. Littlewood");
 
-        biblatex = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Frame, J. S. and Robinson, G. de B. and Thrall, R. M.")
-                .withField(StandardField.TITLE, "The hook graphs of the symmetric groups")
-                .withField(StandardField.JOURNALTITLE, "Canadian J. Math.")
-                .withField(new UnknownField("fjournal"), "Canadian Journal of Mathematics. Journal Canadien de Math\\'ematiques")
-                .withField(StandardField.VOLUME, "6")
-                .withField(StandardField.DATE, "1954")
-                .withField(StandardField.PAGES, "316--324")
-                .withField(StandardField.ISSN, "0008-414X")
-                .withField(new UnknownField("mrclass"), "20.0X")
-                .withField(StandardField.MR_NUMBER, "0062127")
-                .withField(new UnknownField("mrreviewer"), "D. E. Littlewood");
+        biblatex =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Frame, J. S. and Robinson, G. de B. and Thrall, R. M.")
+                        .withField(StandardField.TITLE, "The hook graphs of the symmetric groups")
+                        .withField(StandardField.JOURNALTITLE, "Canadian J. Math.")
+                        .withField(
+                                new UnknownField("fjournal"),
+                                "Canadian Journal of Mathematics. Journal Canadien de Math\\'ematiques")
+                        .withField(StandardField.VOLUME, "6")
+                        .withField(StandardField.DATE, "1954")
+                        .withField(StandardField.PAGES, "316--324")
+                        .withField(StandardField.ISSN, "0008-414X")
+                        .withField(new UnknownField("mrclass"), "20.0X")
+                        .withField(StandardField.MR_NUMBER, "0062127")
+                        .withField(new UnknownField("mrreviewer"), "D. E. Littlewood");
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java b/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
index 5a4be09156cf..60eb6a96e880 100644
--- a/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
@@ -1,13 +1,10 @@
 package org.jabref.logic.cleanup;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.bibtex.FileFieldWriter;
@@ -29,21 +26,24 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.metadata.MetaData;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Optional;
 
 class CleanupWorkerTest {
 
-    private final CleanupPreferences emptyPreset = new CleanupPreferences(EnumSet.noneOf(CleanupPreferences.CleanupStep.class));
+    private final CleanupPreferences emptyPreset =
+            new CleanupPreferences(EnumSet.noneOf(CleanupPreferences.CleanupStep.class));
     private CleanupWorker worker;
 
     // Ensure that the folder stays the same for all tests.
@@ -96,7 +96,9 @@ void cleanupDoesNothingByDefault(@TempDir Path bibFolder) throws IOException {
         entry.setField(StandardField.ISSN, "aPsFile");
         entry.setField(StandardField.FILE, "link::");
         entry.setField(StandardField.JOURNAL, "test");
-        entry.setField(StandardField.TITLE, "<b>hallo</b> units 1 A case AlGaAs and latex $\\alpha$$\\beta$");
+        entry.setField(
+                StandardField.TITLE,
+                "<b>hallo</b> units 1 A case AlGaAs and latex $\\alpha$$\\beta$");
         entry.setField(StandardField.ABSTRACT, "Réflexions");
         Path path = bibFolder.resolve("ARandomlyNamedFile");
         Files.createFile(path);
@@ -109,7 +111,9 @@ void cleanupDoesNothingByDefault(@TempDir Path bibFolder) throws IOException {
 
     @Test
     void upgradeExternalLinksMoveFromPdfToFile() {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS);
+        CleanupPreferences preset =
+                new CleanupPreferences(
+                        CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS);
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.PDF, "aPdfFile");
 
@@ -120,7 +124,9 @@ void upgradeExternalLinksMoveFromPdfToFile() {
 
     @Test
     void upgradeExternalLinksMoveFromPsToFile() {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS);
+        CleanupPreferences preset =
+                new CleanupPreferences(
+                        CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS);
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.PS, "aPsFile");
 
@@ -131,54 +137,77 @@ void upgradeExternalLinksMoveFromPsToFile() {
 
     @Test
     void cleanupDoiRemovesLeadingHttp() {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_DOI);
+        CleanupPreferences preset =
+                new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_DOI);
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.DOI, "http://dx.doi.org/10.1016/0001-8708(80)90035-3");
 
         worker.cleanup(preset, entry);
-        assertEquals(Optional.of("10.1016/0001-8708(80)90035-3"), entry.getField(StandardField.DOI));
+        assertEquals(
+                Optional.of("10.1016/0001-8708(80)90035-3"), entry.getField(StandardField.DOI));
     }
 
     @Test
     void cleanupDoiReturnsChanges() {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_DOI);
+        CleanupPreferences preset =
+                new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_DOI);
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.DOI, "http://dx.doi.org/10.1016/0001-8708(80)90035-3");
 
         List<FieldChange> changes = worker.cleanup(preset, entry);
 
-        FieldChange expectedChange = new FieldChange(entry, StandardField.DOI, "http://dx.doi.org/10.1016/0001-8708(80)90035-3", "10.1016/0001-8708(80)90035-3");
+        FieldChange expectedChange =
+                new FieldChange(
+                        entry,
+                        StandardField.DOI,
+                        "http://dx.doi.org/10.1016/0001-8708(80)90035-3",
+                        "10.1016/0001-8708(80)90035-3");
         assertEquals(Collections.singletonList(expectedChange), changes);
     }
 
     @Test
     void cleanupDoiFindsDoiInURLFieldAndMoveItToDOIField() {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_DOI);
+        CleanupPreferences preset =
+                new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_DOI);
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.URL, "http://dx.doi.org/10.1016/0001-8708(80)90035-3");
 
         worker.cleanup(preset, entry);
-        assertEquals(Optional.of("10.1016/0001-8708(80)90035-3"), entry.getField(StandardField.DOI));
+        assertEquals(
+                Optional.of("10.1016/0001-8708(80)90035-3"), entry.getField(StandardField.DOI));
         assertEquals(Optional.empty(), entry.getField(StandardField.URL));
     }
 
     @Test
     void cleanupDoiReturnsChangeWhenDoiInURLField() {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_DOI);
+        CleanupPreferences preset =
+                new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_DOI);
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.URL, "http://dx.doi.org/10.1016/0001-8708(80)90035-3");
 
         List<FieldChange> changes = worker.cleanup(preset, entry);
         List<FieldChange> changeList = new ArrayList<>();
-        changeList.add(new FieldChange(entry, StandardField.DOI, null, "10.1016/0001-8708(80)90035-3"));
-        changeList.add(new FieldChange(entry, StandardField.URL, "http://dx.doi.org/10.1016/0001-8708(80)90035-3", null));
+        changeList.add(
+                new FieldChange(entry, StandardField.DOI, null, "10.1016/0001-8708(80)90035-3"));
+        changeList.add(
+                new FieldChange(
+                        entry,
+                        StandardField.URL,
+                        "http://dx.doi.org/10.1016/0001-8708(80)90035-3",
+                        null));
         assertEquals(changeList, changes);
     }
 
     @Test
     void cleanupMonthChangesNumberToBibtex() {
-        CleanupPreferences preset = new CleanupPreferences(new FieldFormatterCleanups(true,
-                Collections.singletonList(new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter()))));
+        CleanupPreferences preset =
+                new CleanupPreferences(
+                        new FieldFormatterCleanups(
+                                true,
+                                Collections.singletonList(
+                                        new FieldFormatterCleanup(
+                                                StandardField.MONTH,
+                                                new NormalizeMonthFormatter()))));
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.MONTH, "01");
 
@@ -188,8 +217,14 @@ void cleanupMonthChangesNumberToBibtex() {
 
     @Test
     void cleanupPageNumbersConvertsSingleDashToDouble() {
-        CleanupPreferences preset = new CleanupPreferences(new FieldFormatterCleanups(true,
-                Collections.singletonList(new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter()))));
+        CleanupPreferences preset =
+                new CleanupPreferences(
+                        new FieldFormatterCleanups(
+                                true,
+                                Collections.singletonList(
+                                        new FieldFormatterCleanup(
+                                                StandardField.PAGES,
+                                                new NormalizePagesFormatter()))));
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.PAGES, "1-2");
 
@@ -199,8 +234,14 @@ void cleanupPageNumbersConvertsSingleDashToDouble() {
 
     @Test
     void cleanupDatesConvertsToCorrectFormat() {
-        CleanupPreferences preset = new CleanupPreferences(new FieldFormatterCleanups(true,
-                Collections.singletonList(new FieldFormatterCleanup(StandardField.DATE, new NormalizeDateFormatter()))));
+        CleanupPreferences preset =
+                new CleanupPreferences(
+                        new FieldFormatterCleanups(
+                                true,
+                                Collections.singletonList(
+                                        new FieldFormatterCleanup(
+                                                StandardField.DATE,
+                                                new NormalizeDateFormatter()))));
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.DATE, "01/1999");
 
@@ -210,7 +251,8 @@ void cleanupDatesConvertsToCorrectFormat() {
 
     @Test
     void cleanupFixFileLinksMovesSingleDescriptionToLink() {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.FIX_FILE_LINKS);
+        CleanupPreferences preset =
+                new CleanupPreferences(CleanupPreferences.CleanupStep.FIX_FILE_LINKS);
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.FILE, "link::");
 
@@ -231,12 +273,15 @@ void cleanupMoveFilesMovesFileFromSubfolder(@TempDir Path bibFolder) throws IOEx
 
         worker.cleanup(preset, entry);
         LinkedFile newFileField = new LinkedFile("", tempFile.getFileName(), "");
-        assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField(StandardField.FILE));
+        assertEquals(
+                Optional.of(FileFieldWriter.getStringRepresentation(newFileField)),
+                entry.getField(StandardField.FILE));
     }
 
     @Test
     void cleanupRelativePathsConvertAbsoluteToRelativePath() throws IOException {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.MAKE_PATHS_RELATIVE);
+        CleanupPreferences preset =
+                new CleanupPreferences(CleanupPreferences.CleanupStep.MAKE_PATHS_RELATIVE);
 
         Path path = pdfPath.resolve("AnotherRandomlyNamedFile");
         Files.createFile(path);
@@ -246,29 +291,38 @@ void cleanupRelativePathsConvertAbsoluteToRelativePath() throws IOException {
 
         worker.cleanup(preset, entry);
         LinkedFile newFileField = new LinkedFile("", path.getFileName(), "");
-        assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField(StandardField.FILE));
+        assertEquals(
+                Optional.of(FileFieldWriter.getStringRepresentation(newFileField)),
+                entry.getField(StandardField.FILE));
     }
 
     @Test
     void cleanupRenamePdfRenamesRelativeFile() throws IOException {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.RENAME_PDF);
+        CleanupPreferences preset =
+                new CleanupPreferences(CleanupPreferences.CleanupStep.RENAME_PDF);
 
         Path path = pdfPath.resolve("AnotherRandomlyNamedFile.tmp");
         Files.createFile(path);
-        BibEntry entry = new BibEntry()
-                .withCitationKey("Toot");
+        BibEntry entry = new BibEntry().withCitationKey("Toot");
         LinkedFile fileField = new LinkedFile("", path.toAbsolutePath(), "");
         entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
 
         worker.cleanup(preset, entry);
         LinkedFile newFileField = new LinkedFile("", Path.of("Toot.tmp"), "");
-        assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField(StandardField.FILE));
+        assertEquals(
+                Optional.of(FileFieldWriter.getStringRepresentation(newFileField)),
+                entry.getField(StandardField.FILE));
     }
 
     @Test
     void cleanupHtmlToLatexConvertsEpsilonToLatex() {
-        CleanupPreferences preset = new CleanupPreferences(new FieldFormatterCleanups(true,
-                Collections.singletonList(new FieldFormatterCleanup(StandardField.TITLE, new HtmlToLatexFormatter()))));
+        CleanupPreferences preset =
+                new CleanupPreferences(
+                        new FieldFormatterCleanups(
+                                true,
+                                Collections.singletonList(
+                                        new FieldFormatterCleanup(
+                                                StandardField.TITLE, new HtmlToLatexFormatter()))));
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "&Epsilon;");
 
@@ -278,8 +332,14 @@ void cleanupHtmlToLatexConvertsEpsilonToLatex() {
 
     @Test
     void cleanupUnitsConvertsOneAmpereToLatex() {
-        CleanupPreferences preset = new CleanupPreferences(new FieldFormatterCleanups(true,
-                Collections.singletonList(new FieldFormatterCleanup(StandardField.TITLE, new UnitsToLatexFormatter()))));
+        CleanupPreferences preset =
+                new CleanupPreferences(
+                        new FieldFormatterCleanups(
+                                true,
+                                Collections.singletonList(
+                                        new FieldFormatterCleanup(
+                                                StandardField.TITLE,
+                                                new UnitsToLatexFormatter()))));
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "1 A");
 
@@ -289,12 +349,22 @@ void cleanupUnitsConvertsOneAmpereToLatex() {
 
     @Test
     void cleanupCasesAddsBracketAroundAluminiumGalliumArsenid() {
-        ProtectedTermsLoader protectedTermsLoader = new ProtectedTermsLoader(
-                new ProtectedTermsPreferences(ProtectedTermsLoader.getInternalLists(), Collections.emptyList(),
-                        Collections.emptyList(), Collections.emptyList()));
+        ProtectedTermsLoader protectedTermsLoader =
+                new ProtectedTermsLoader(
+                        new ProtectedTermsPreferences(
+                                ProtectedTermsLoader.getInternalLists(),
+                                Collections.emptyList(),
+                                Collections.emptyList(),
+                                Collections.emptyList()));
         assertNotEquals(Collections.emptyList(), protectedTermsLoader.getProtectedTerms());
-        CleanupPreferences preset = new CleanupPreferences(new FieldFormatterCleanups(true, Collections
-                .singletonList(new FieldFormatterCleanup(StandardField.TITLE, new ProtectTermsFormatter(protectedTermsLoader)))));
+        CleanupPreferences preset =
+                new CleanupPreferences(
+                        new FieldFormatterCleanups(
+                                true,
+                                Collections.singletonList(
+                                        new FieldFormatterCleanup(
+                                                StandardField.TITLE,
+                                                new ProtectTermsFormatter(protectedTermsLoader)))));
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "AlGaAs");
 
@@ -304,8 +374,14 @@ void cleanupCasesAddsBracketAroundAluminiumGalliumArsenid() {
 
     @Test
     void cleanupLatexMergesTwoLatexMathEnvironments() {
-        CleanupPreferences preset = new CleanupPreferences(new FieldFormatterCleanups(true,
-                Collections.singletonList(new FieldFormatterCleanup(StandardField.TITLE, new LatexCleanupFormatter()))));
+        CleanupPreferences preset =
+                new CleanupPreferences(
+                        new FieldFormatterCleanups(
+                                true,
+                                Collections.singletonList(
+                                        new FieldFormatterCleanup(
+                                                StandardField.TITLE,
+                                                new LatexCleanupFormatter()))));
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "$\\alpha$$\\beta$");
 
@@ -315,7 +391,8 @@ void cleanupLatexMergesTwoLatexMathEnvironments() {
 
     @Test
     void convertToBiblatexMovesAddressToLocation() {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.CONVERT_TO_BIBLATEX);
+        CleanupPreferences preset =
+                new CleanupPreferences(CleanupPreferences.CleanupStep.CONVERT_TO_BIBLATEX);
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.ADDRESS, "test");
 
@@ -326,7 +403,8 @@ void convertToBiblatexMovesAddressToLocation() {
 
     @Test
     void convertToBiblatexMovesJournalToJournalTitle() {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.CONVERT_TO_BIBLATEX);
+        CleanupPreferences preset =
+                new CleanupPreferences(CleanupPreferences.CleanupStep.CONVERT_TO_BIBLATEX);
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.JOURNAL, "test");
 
@@ -337,8 +415,14 @@ void convertToBiblatexMovesJournalToJournalTitle() {
 
     @Test
     void cleanupWithDisabledFieldFormatterChangesNothing() {
-        CleanupPreferences preset = new CleanupPreferences(new FieldFormatterCleanups(false,
-                Collections.singletonList(new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter()))));
+        CleanupPreferences preset =
+                new CleanupPreferences(
+                        new FieldFormatterCleanups(
+                                false,
+                                Collections.singletonList(
+                                        new FieldFormatterCleanup(
+                                                StandardField.MONTH,
+                                                new NormalizeMonthFormatter()))));
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.MONTH, "01");
 
diff --git a/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java
index 396c53225e99..38219df871f9 100644
--- a/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.cleanup;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 class ConvertToBiblatexCleanupTest {
 
diff --git a/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java
index 06a4a1df5d54..9a5381090972 100644
--- a/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.cleanup;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 class ConvertToBibtexCleanupTest {
 
@@ -54,7 +53,8 @@ void cleanupMovesJournaltitleToJournal() {
 
     @Test
     void cleanUpDoesntMoveFileField() {
-        String fileField = ":Ambriola2006 - On the Systematic Analysis of Natural Language Requirements with CIRCE.pdf:PDF";
+        String fileField =
+                ":Ambriola2006 - On the Systematic Analysis of Natural Language Requirements with CIRCE.pdf:PDF";
         BibEntry entry = new BibEntry().withField(StandardField.FILE, fileField);
 
         worker.cleanup(entry);
diff --git a/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java
index 062183766e86..66307215cb1e 100644
--- a/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.cleanup;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class DoiCleanupTest {
 
@@ -29,43 +28,53 @@ private static Stream<Arguments> provideDoiForAllLowers() {
 
         return Stream.of(
                 // cleanup for Doi field only
-                Arguments.of(doiResult, new BibEntry().withField(
-                        StandardField.URL, "https://doi.org/10.1145/2594455")),
+                Arguments.of(
+                        doiResult,
+                        new BibEntry()
+                                .withField(StandardField.URL, "https://doi.org/10.1145/2594455")),
 
                 // cleanup with Doi and URL to all entries
-                Arguments.of(doiResult, new BibEntry()
-                        .withField(StandardField.DOI, "10.1145/2594455")
-                        .withField(StandardField.URL, "https://doi.org/10.1145/2594455")
-                        .withField(StandardField.NOTE, "https://doi.org/10.1145/2594455")
-                        .withField(unknownField, "https://doi.org/10.1145/2594455")),
+                Arguments.of(
+                        doiResult,
+                        new BibEntry()
+                                .withField(StandardField.DOI, "10.1145/2594455")
+                                .withField(StandardField.URL, "https://doi.org/10.1145/2594455")
+                                .withField(StandardField.NOTE, "https://doi.org/10.1145/2594455")
+                                .withField(unknownField, "https://doi.org/10.1145/2594455")),
 
                 // cleanup with Doi and no URL to entries
                 Arguments.of(
                         new BibEntry()
-                        .withField(StandardField.DOI, "10.1145/2594455")
-                        .withField(StandardField.NOTE, "This is a random note to this Doi")
-                        .withField(unknownField, "This is a random ee field for this Doi"),
+                                .withField(StandardField.DOI, "10.1145/2594455")
+                                .withField(StandardField.NOTE, "This is a random note to this Doi")
+                                .withField(unknownField, "This is a random ee field for this Doi"),
                         new BibEntry()
-                        .withField(StandardField.DOI, "10.1145/2594455")
-                        .withField(StandardField.NOTE, "This is a random note to this Doi")
-                        .withField(unknownField, "This is a random ee field for this Doi")),
+                                .withField(StandardField.DOI, "10.1145/2594455")
+                                .withField(StandardField.NOTE, "This is a random note to this Doi")
+                                .withField(unknownField, "This is a random ee field for this Doi")),
 
                 // cleanup with spaced Doi
-                Arguments.of(doiResult, new BibEntry()
-                        .withField(StandardField.DOI, "10.1145 / 2594455")),
+                Arguments.of(
+                        doiResult,
+                        new BibEntry().withField(StandardField.DOI, "10.1145 / 2594455")),
 
                 // cleanup just Note field with URL
-                Arguments.of(doiResult, new BibEntry()
-                        .withField(StandardField.NOTE, "https://doi.org/10.1145/2594455")),
+                Arguments.of(
+                        doiResult,
+                        new BibEntry()
+                                .withField(StandardField.NOTE, "https://doi.org/10.1145/2594455")),
 
                 // cleanup just ee field with URL
-                Arguments.of(doiResult, new BibEntry()
-                        .withField(unknownField, "https://doi.org/10.1145/2594455")),
+                Arguments.of(
+                        doiResult,
+                        new BibEntry().withField(unknownField, "https://doi.org/10.1145/2594455")),
 
                 // cleanup of url encoded chars
-                Arguments.of(new BibEntry()
-                         .withField(StandardField.DOI, "10.18726/2018_3"),
-                          new BibEntry()
-                         .withField(unknownField, "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")));
-            }
+                Arguments.of(
+                        new BibEntry().withField(StandardField.DOI, "10.18726/2018_3"),
+                        new BibEntry()
+                                .withField(
+                                        unknownField,
+                                        "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/DoiDecodeCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/DoiDecodeCleanupTest.java
index 17b81a8ea29d..936065a88646 100644
--- a/src/test/java/org/jabref/logic/cleanup/DoiDecodeCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/DoiDecodeCleanupTest.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.cleanup;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class DoiDecodeCleanupTest {
 
@@ -29,38 +28,62 @@ private static Stream<Arguments> provideDoiForAllLowers() {
 
         return Stream.of(
                 // cleanup for Doi field only
-                Arguments.of(doiResult, new BibEntry().withField(
-                        StandardField.URL, "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")),
+                Arguments.of(
+                        doiResult,
+                        new BibEntry()
+                                .withField(
+                                        StandardField.URL,
+                                        "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")),
 
                 // cleanup with Doi and URL to all entries
-                Arguments.of(doiResult, new BibEntry()
-                        .withField(StandardField.DOI, "10.18726/2018%7B%5Ctextunderscore%7D3")
-                        .withField(StandardField.URL, "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")
-                        .withField(StandardField.NOTE, "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")
-                        .withField(unknownField, "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")),
+                Arguments.of(
+                        doiResult,
+                        new BibEntry()
+                                .withField(
+                                        StandardField.DOI, "10.18726/2018%7B%5Ctextunderscore%7D3")
+                                .withField(
+                                        StandardField.URL,
+                                        "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")
+                                .withField(
+                                        StandardField.NOTE,
+                                        "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")
+                                .withField(
+                                        unknownField,
+                                        "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")),
 
                 // cleanup with Doi and no URL to entries
                 Arguments.of(
                         new BibEntry()
-                        .withField(StandardField.DOI, "10.18726/2018_3")
-                        .withField(StandardField.NOTE, "This is a random note to this Doi")
-                        .withField(unknownField, "This is a random ee field for this Doi"),
+                                .withField(StandardField.DOI, "10.18726/2018_3")
+                                .withField(StandardField.NOTE, "This is a random note to this Doi")
+                                .withField(unknownField, "This is a random ee field for this Doi"),
                         new BibEntry()
-                        .withField(StandardField.DOI, "10.18726/2018_3")
-                        .withField(StandardField.NOTE, "This is a random note to this Doi")
-                        .withField(unknownField, "This is a random ee field for this Doi")),
+                                .withField(StandardField.DOI, "10.18726/2018_3")
+                                .withField(StandardField.NOTE, "This is a random note to this Doi")
+                                .withField(unknownField, "This is a random ee field for this Doi")),
 
                 // cleanup with spaced Doi
-                Arguments.of(doiResult, new BibEntry()
-                        .withField(StandardField.DOI, "10.18726/2018%7B%5Ctextunderscore%7D3")),
+                Arguments.of(
+                        doiResult,
+                        new BibEntry()
+                                .withField(
+                                        StandardField.DOI,
+                                        "10.18726/2018%7B%5Ctextunderscore%7D3")),
 
                 // cleanup just Note field with URL
-                Arguments.of(doiResult, new BibEntry()
-                        .withField(StandardField.NOTE, "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")),
+                Arguments.of(
+                        doiResult,
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")),
 
                 // cleanup just ee field with URL
-                Arguments.of(doiResult, new BibEntry()
-                        .withField(unknownField, "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3"))
-        );
+                Arguments.of(
+                        doiResult,
+                        new BibEntry()
+                                .withField(
+                                        unknownField,
+                                        "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")));
     }
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/EprintCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/EprintCleanupTest.java
index f391a4bd44fa..f2e1f07a2588 100644
--- a/src/test/java/org/jabref/logic/cleanup/EprintCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/EprintCleanupTest.java
@@ -1,26 +1,27 @@
 package org.jabref.logic.cleanup;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class EprintCleanupTest {
 
     @Test
     void cleanupCompleteEntry() {
-        BibEntry input = new BibEntry()
-                .withField(StandardField.JOURNALTITLE, "arXiv:1502.05795 [math]")
-                .withField(StandardField.NOTE, "arXiv: 1502.05795")
-                .withField(StandardField.URL, "http://arxiv.org/abs/1502.05795")
-                .withField(StandardField.URLDATE, "2018-09-07TZ");
-
-        BibEntry expected = new BibEntry()
-                .withField(StandardField.EPRINT, "1502.05795")
-                .withField(StandardField.EPRINTCLASS, "math")
-                .withField(StandardField.EPRINTTYPE, "arxiv");
+        BibEntry input =
+                new BibEntry()
+                        .withField(StandardField.JOURNALTITLE, "arXiv:1502.05795 [math]")
+                        .withField(StandardField.NOTE, "arXiv: 1502.05795")
+                        .withField(StandardField.URL, "http://arxiv.org/abs/1502.05795")
+                        .withField(StandardField.URLDATE, "2018-09-07TZ");
+
+        BibEntry expected =
+                new BibEntry()
+                        .withField(StandardField.EPRINT, "1502.05795")
+                        .withField(StandardField.EPRINTCLASS, "math")
+                        .withField(StandardField.EPRINTTYPE, "arxiv");
 
         EprintCleanup cleanup = new EprintCleanup();
         cleanup.cleanup(input);
@@ -30,15 +31,17 @@ void cleanupCompleteEntry() {
 
     @Test
     void cleanupEntryWithVersionAndInstitutionAndEid() {
-        BibEntry input = new BibEntry()
-                .withField(StandardField.NOTE, "arXiv: 1503.05173")
-                .withField(StandardField.VERSION, "1")
-                .withField(StandardField.INSTITUTION, "arXiv")
-                .withField(StandardField.EID, "arXiv:1503.05173");
-
-        BibEntry expected = new BibEntry()
-                .withField(StandardField.EPRINT, "1503.05173v1")
-                .withField(StandardField.EPRINTTYPE, "arxiv");
+        BibEntry input =
+                new BibEntry()
+                        .withField(StandardField.NOTE, "arXiv: 1503.05173")
+                        .withField(StandardField.VERSION, "1")
+                        .withField(StandardField.INSTITUTION, "arXiv")
+                        .withField(StandardField.EID, "arXiv:1503.05173");
+
+        BibEntry expected =
+                new BibEntry()
+                        .withField(StandardField.EPRINT, "1503.05173v1")
+                        .withField(StandardField.EPRINTTYPE, "arxiv");
 
         EprintCleanup cleanup = new EprintCleanup();
         cleanup.cleanup(input);
@@ -48,16 +51,18 @@ void cleanupEntryWithVersionAndInstitutionAndEid() {
 
     @Test
     void cleanupEntryWithOtherInstitution() {
-        BibEntry input = new BibEntry()
-                .withField(StandardField.NOTE, "arXiv: 1503.05173")
-                .withField(StandardField.VERSION, "1")
-                .withField(StandardField.INSTITUTION, "OtherInstitution")
-                .withField(StandardField.EID, "arXiv:1503.05173");
-
-        BibEntry expected = new BibEntry()
-                .withField(StandardField.EPRINT, "1503.05173v1")
-                .withField(StandardField.EPRINTTYPE, "arxiv")
-                .withField(StandardField.INSTITUTION, "OtherInstitution");
+        BibEntry input =
+                new BibEntry()
+                        .withField(StandardField.NOTE, "arXiv: 1503.05173")
+                        .withField(StandardField.VERSION, "1")
+                        .withField(StandardField.INSTITUTION, "OtherInstitution")
+                        .withField(StandardField.EID, "arXiv:1503.05173");
+
+        BibEntry expected =
+                new BibEntry()
+                        .withField(StandardField.EPRINT, "1503.05173v1")
+                        .withField(StandardField.EPRINTTYPE, "arxiv")
+                        .withField(StandardField.INSTITUTION, "OtherInstitution");
 
         EprintCleanup cleanup = new EprintCleanup();
         cleanup.cleanup(input);
diff --git a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java
index 795a8055456d..b5022d30a463 100644
--- a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.cleanup;
 
-import java.util.HashMap;
-import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.formatter.bibtexfields.UnicodeToLatexFormatter;
 import org.jabref.logic.formatter.casechanger.UpperCaseFormatter;
@@ -10,11 +9,11 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.HashMap;
+import java.util.Map;
 
 class FieldFormatterCleanupTest {
 
@@ -39,36 +38,63 @@ void setUp() {
 
     @Test
     void internalAllField() throws Exception {
-        FieldFormatterCleanup cleanup = new FieldFormatterCleanup(InternalField.INTERNAL_ALL_FIELD, new UpperCaseFormatter());
+        FieldFormatterCleanup cleanup =
+                new FieldFormatterCleanup(
+                        InternalField.INTERNAL_ALL_FIELD, new UpperCaseFormatter());
         cleanup.cleanup(entry);
 
-        assertEquals(fieldMap.get(StandardField.TITLE).toUpperCase(), entry.getField(StandardField.TITLE).get());
-        assertEquals(fieldMap.get(StandardField.BOOKTITLE).toUpperCase(), entry.getField(StandardField.BOOKTITLE).get());
-        assertEquals(fieldMap.get(StandardField.YEAR).toUpperCase(), entry.getField(StandardField.YEAR).get());
-        assertEquals(fieldMap.get(StandardField.MONTH).toUpperCase(), entry.getField(StandardField.MONTH).get());
-        assertEquals(fieldMap.get(StandardField.ABSTRACT).toUpperCase(), entry.getField(StandardField.ABSTRACT).get());
-        assertEquals(fieldMap.get(StandardField.DOI).toUpperCase(), entry.getField(StandardField.DOI).get());
-        assertEquals(fieldMap.get(StandardField.ISSN).toUpperCase(), entry.getField(StandardField.ISSN).get());
+        assertEquals(
+                fieldMap.get(StandardField.TITLE).toUpperCase(),
+                entry.getField(StandardField.TITLE).get());
+        assertEquals(
+                fieldMap.get(StandardField.BOOKTITLE).toUpperCase(),
+                entry.getField(StandardField.BOOKTITLE).get());
+        assertEquals(
+                fieldMap.get(StandardField.YEAR).toUpperCase(),
+                entry.getField(StandardField.YEAR).get());
+        assertEquals(
+                fieldMap.get(StandardField.MONTH).toUpperCase(),
+                entry.getField(StandardField.MONTH).get());
+        assertEquals(
+                fieldMap.get(StandardField.ABSTRACT).toUpperCase(),
+                entry.getField(StandardField.ABSTRACT).get());
+        assertEquals(
+                fieldMap.get(StandardField.DOI).toUpperCase(),
+                entry.getField(StandardField.DOI).get());
+        assertEquals(
+                fieldMap.get(StandardField.ISSN).toUpperCase(),
+                entry.getField(StandardField.ISSN).get());
     }
 
     @Test
     void internalAllTextFieldsField() throws Exception {
-        FieldFormatterCleanup cleanup = new FieldFormatterCleanup(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD, new UpperCaseFormatter());
+        FieldFormatterCleanup cleanup =
+                new FieldFormatterCleanup(
+                        InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD, new UpperCaseFormatter());
         cleanup.cleanup(entry);
 
-        assertEquals(fieldMap.get(StandardField.TITLE).toUpperCase(), entry.getField(StandardField.TITLE).get());
-        assertEquals(fieldMap.get(StandardField.BOOKTITLE).toUpperCase(), entry.getField(StandardField.BOOKTITLE).get());
+        assertEquals(
+                fieldMap.get(StandardField.TITLE).toUpperCase(),
+                entry.getField(StandardField.TITLE).get());
+        assertEquals(
+                fieldMap.get(StandardField.BOOKTITLE).toUpperCase(),
+                entry.getField(StandardField.BOOKTITLE).get());
         assertEquals(fieldMap.get(StandardField.YEAR), entry.getField(StandardField.YEAR).get());
         assertEquals(fieldMap.get(StandardField.MONTH), entry.getField(StandardField.MONTH).get());
-        assertEquals(fieldMap.get(StandardField.ABSTRACT).toUpperCase(), entry.getField(StandardField.ABSTRACT).get());
+        assertEquals(
+                fieldMap.get(StandardField.ABSTRACT).toUpperCase(),
+                entry.getField(StandardField.ABSTRACT).get());
         assertEquals(fieldMap.get(StandardField.DOI), entry.getField(StandardField.DOI).get());
         assertEquals(fieldMap.get(StandardField.ISSN), entry.getField(StandardField.ISSN).get());
     }
 
     @Test
     void cleanupAllFieldsIgnoresKeyField() throws Exception {
-        FieldFormatterCleanup cleanup = new FieldFormatterCleanup(InternalField.INTERNAL_ALL_FIELD, new UnicodeToLatexFormatter());
-        entry.setField(InternalField.KEY_FIELD, "François-Marie Arouet"); // Contains ç, not in Basic Latin
+        FieldFormatterCleanup cleanup =
+                new FieldFormatterCleanup(
+                        InternalField.INTERNAL_ALL_FIELD, new UnicodeToLatexFormatter());
+        entry.setField(
+                InternalField.KEY_FIELD, "François-Marie Arouet"); // Contains ç, not in Basic Latin
         cleanup.cleanup(entry);
 
         assertEquals("François-Marie Arouet", entry.getField(InternalField.KEY_FIELD).get());
@@ -76,8 +102,12 @@ void cleanupAllFieldsIgnoresKeyField() throws Exception {
 
     @Test
     void cleanupAllTextFieldsIgnoresKeyField() throws Exception {
-        FieldFormatterCleanup cleanup = new FieldFormatterCleanup(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD, new UnicodeToLatexFormatter());
-        entry.setField(InternalField.KEY_FIELD, "François-Marie Arouet"); // Contains ç, not in Basic Latin
+        FieldFormatterCleanup cleanup =
+                new FieldFormatterCleanup(
+                        InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD,
+                        new UnicodeToLatexFormatter());
+        entry.setField(
+                InternalField.KEY_FIELD, "François-Marie Arouet"); // Contains ç, not in Basic Latin
         cleanup.cleanup(entry);
 
         assertEquals("François-Marie Arouet", entry.getField(InternalField.KEY_FIELD).get());
@@ -85,8 +115,10 @@ void cleanupAllTextFieldsIgnoresKeyField() throws Exception {
 
     @Test
     void cleanupKeyFieldCleansUpKeyField() throws Exception {
-        FieldFormatterCleanup cleanup = new FieldFormatterCleanup(InternalField.KEY_FIELD, new UnicodeToLatexFormatter());
-        entry.setField(InternalField.KEY_FIELD, "François-Marie Arouet"); // Contains ç, not in Basic Latin
+        FieldFormatterCleanup cleanup =
+                new FieldFormatterCleanup(InternalField.KEY_FIELD, new UnicodeToLatexFormatter());
+        entry.setField(
+                InternalField.KEY_FIELD, "François-Marie Arouet"); // Contains ç, not in Basic Latin
         cleanup.cleanup(entry);
 
         assertEquals("Fran{\\c{c}}ois-Marie Arouet", entry.getField(InternalField.KEY_FIELD).get());
diff --git a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java
index e2582f2194bd..683ca10f7bb2 100644
--- a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java
@@ -1,11 +1,6 @@
 package org.jabref.logic.cleanup;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.formatter.IdentityFormatter;
 import org.jabref.logic.formatter.bibtexfields.EscapeAmpersandsFormatter;
@@ -22,14 +17,18 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 public class FieldFormatterCleanupsTest {
 
@@ -37,23 +36,30 @@ public class FieldFormatterCleanupsTest {
 
     @BeforeEach
     void setUp() {
-        entry = new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey("6055279")
-                .withField(StandardField.TITLE, "Educational session 1")
-                .withField(StandardField.BOOKTITLE, "Custom Integrated Circuits Conference (CICC), 2011 IEEE")
-                .withField(StandardField.YEAR, "2011")
-                .withField(StandardField.MONTH, "Sept.")
-                .withField(StandardField.PAGES, "1-7")
-                .withField(StandardField.ABSTRACT, "Start of the above-titled section of the conference proceedings record.")
-                .withField(StandardField.DOI, "10.1109/CICC.2011.6055279")
-                .withField(StandardField.ISSN, "0886-5930");
+        entry =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey("6055279")
+                        .withField(StandardField.TITLE, "Educational session 1")
+                        .withField(
+                                StandardField.BOOKTITLE,
+                                "Custom Integrated Circuits Conference (CICC), 2011 IEEE")
+                        .withField(StandardField.YEAR, "2011")
+                        .withField(StandardField.MONTH, "Sept.")
+                        .withField(StandardField.PAGES, "1-7")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Start of the above-titled section of the conference proceedings record.")
+                        .withField(StandardField.DOI, "10.1109/CICC.2011.6055279")
+                        .withField(StandardField.ISSN, "0886-5930");
     }
 
     @Test
     void checkSimpleUseCase() {
-        FieldFormatterCleanups actions = new FieldFormatterCleanups(true, FieldFormatterCleanups.parse("title[identity]"));
+        FieldFormatterCleanups actions =
+                new FieldFormatterCleanups(true, FieldFormatterCleanups.parse("title[identity]"));
 
-        FieldFormatterCleanup identityInTitle = new FieldFormatterCleanup(StandardField.TITLE, new IdentityFormatter());
+        FieldFormatterCleanup identityInTitle =
+                new FieldFormatterCleanup(StandardField.TITLE, new IdentityFormatter());
         assertEquals(Collections.singletonList(identityInTitle), actions.getConfiguredActions());
 
         actions.applySaveActions(entry);
@@ -63,7 +69,8 @@ void checkSimpleUseCase() {
 
     @Test
     void invalidSaveActionSting() {
-        FieldFormatterCleanups actions = new FieldFormatterCleanups(true, FieldFormatterCleanups.parse("title"));
+        FieldFormatterCleanups actions =
+                new FieldFormatterCleanups(true, FieldFormatterCleanups.parse("title"));
 
         assertEquals(Collections.emptyList(), actions.getConfiguredActions());
 
@@ -74,9 +81,11 @@ void invalidSaveActionSting() {
 
     @Test
     void checkLowerCaseSaveAction() {
-        FieldFormatterCleanups actions = new FieldFormatterCleanups(true, FieldFormatterCleanups.parse("title[lower_case]"));
+        FieldFormatterCleanups actions =
+                new FieldFormatterCleanups(true, FieldFormatterCleanups.parse("title[lower_case]"));
 
-        FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter());
+        FieldFormatterCleanup lowerCaseTitle =
+                new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter());
         assertEquals(List.of(lowerCaseTitle), actions.getConfiguredActions());
 
         actions.applySaveActions(entry);
@@ -86,11 +95,16 @@ void checkLowerCaseSaveAction() {
 
     @Test
     void checkTwoSaveActionsForOneField() {
-        FieldFormatterCleanups actions = new FieldFormatterCleanups(true, FieldFormatterCleanups.parse("title[lower_case,identity]"));
-
-        FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter());
-        FieldFormatterCleanup identityInTitle = new FieldFormatterCleanup(StandardField.TITLE, new IdentityFormatter());
-        assertEquals(Arrays.asList(lowerCaseTitle, identityInTitle), actions.getConfiguredActions());
+        FieldFormatterCleanups actions =
+                new FieldFormatterCleanups(
+                        true, FieldFormatterCleanups.parse("title[lower_case,identity]"));
+
+        FieldFormatterCleanup lowerCaseTitle =
+                new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter());
+        FieldFormatterCleanup identityInTitle =
+                new FieldFormatterCleanup(StandardField.TITLE, new IdentityFormatter());
+        assertEquals(
+                Arrays.asList(lowerCaseTitle, identityInTitle), actions.getConfiguredActions());
 
         actions.applySaveActions(entry);
 
@@ -99,12 +113,20 @@ void checkTwoSaveActionsForOneField() {
 
     @Test
     void checkThreeSaveActionsForOneField() {
-        FieldFormatterCleanups actions = new FieldFormatterCleanups(true, FieldFormatterCleanups.parse("title[lower_case,identity,normalize_date]"));
-
-        FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter());
-        FieldFormatterCleanup identityInTitle = new FieldFormatterCleanup(StandardField.TITLE, new IdentityFormatter());
-        FieldFormatterCleanup normalizeDatesInTitle = new FieldFormatterCleanup(StandardField.TITLE, new NormalizeDateFormatter());
-        assertEquals(Arrays.asList(lowerCaseTitle, identityInTitle, normalizeDatesInTitle), actions.getConfiguredActions());
+        FieldFormatterCleanups actions =
+                new FieldFormatterCleanups(
+                        true,
+                        FieldFormatterCleanups.parse("title[lower_case,identity,normalize_date]"));
+
+        FieldFormatterCleanup lowerCaseTitle =
+                new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter());
+        FieldFormatterCleanup identityInTitle =
+                new FieldFormatterCleanup(StandardField.TITLE, new IdentityFormatter());
+        FieldFormatterCleanup normalizeDatesInTitle =
+                new FieldFormatterCleanup(StandardField.TITLE, new NormalizeDateFormatter());
+        assertEquals(
+                Arrays.asList(lowerCaseTitle, identityInTitle, normalizeDatesInTitle),
+                actions.getConfiguredActions());
 
         actions.applySaveActions(entry);
 
@@ -113,11 +135,17 @@ void checkThreeSaveActionsForOneField() {
 
     @Test
     void checkMultipleSaveActions() {
-        FieldFormatterCleanups actions = new FieldFormatterCleanups(true, FieldFormatterCleanups.parse("pages[normalize_page_numbers]title[lower_case]"));
+        FieldFormatterCleanups actions =
+                new FieldFormatterCleanups(
+                        true,
+                        FieldFormatterCleanups.parse(
+                                "pages[normalize_page_numbers]title[lower_case]"));
         List<FieldFormatterCleanup> formatterCleanups = actions.getConfiguredActions();
 
-        FieldFormatterCleanup normalizePages = new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter());
-        FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter());
+        FieldFormatterCleanup normalizePages =
+                new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter());
+        FieldFormatterCleanup lowerCaseTitle =
+                new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter());
         assertEquals(Arrays.asList(normalizePages, lowerCaseTitle), formatterCleanups);
 
         actions.applySaveActions(entry);
@@ -128,14 +156,22 @@ void checkMultipleSaveActions() {
 
     @Test
     void checkMultipleSaveActionsWithMultipleFormatters() {
-        FieldFormatterCleanups actions = new FieldFormatterCleanups(true,
-                FieldFormatterCleanups.parse("pages[normalize_page_numbers,normalize_date]title[lower_case]"));
+        FieldFormatterCleanups actions =
+                new FieldFormatterCleanups(
+                        true,
+                        FieldFormatterCleanups.parse(
+                                "pages[normalize_page_numbers,normalize_date]title[lower_case]"));
         List<FieldFormatterCleanup> formatterCleanups = actions.getConfiguredActions();
 
-        FieldFormatterCleanup normalizePages = new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter());
-        FieldFormatterCleanup normalizeDatesInPages = new FieldFormatterCleanup(StandardField.PAGES, new NormalizeDateFormatter());
-        FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter());
-        assertEquals(Arrays.asList(normalizePages, normalizeDatesInPages, lowerCaseTitle), formatterCleanups);
+        FieldFormatterCleanup normalizePages =
+                new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter());
+        FieldFormatterCleanup normalizeDatesInPages =
+                new FieldFormatterCleanup(StandardField.PAGES, new NormalizeDateFormatter());
+        FieldFormatterCleanup lowerCaseTitle =
+                new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter());
+        assertEquals(
+                Arrays.asList(normalizePages, normalizeDatesInPages, lowerCaseTitle),
+                formatterCleanups);
 
         actions.applySaveActions(entry);
 
@@ -145,7 +181,8 @@ void checkMultipleSaveActionsWithMultipleFormatters() {
 
     @Test
     void clearFormatterRemovesField() {
-        FieldFormatterCleanups actions = new FieldFormatterCleanups(true, FieldFormatterCleanups.parse("month[clear]"));
+        FieldFormatterCleanups actions =
+                new FieldFormatterCleanups(true, FieldFormatterCleanups.parse("month[clear]"));
         actions.applySaveActions(entry);
 
         assertEquals(Optional.empty(), entry.getField(StandardField.MONTH));
@@ -153,7 +190,9 @@ void clearFormatterRemovesField() {
 
     @Test
     void parserKeepsSaveActions() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups = FieldFormatterCleanups.parse("""
+        List<FieldFormatterCleanup> fieldFormatterCleanups =
+                FieldFormatterCleanups.parse(
+                        """
                 month[normalize_month]
                 pages[normalize_page_numbers]
                 title[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
@@ -166,7 +205,13 @@ void parserKeepsSaveActions() {
         List<FieldFormatterCleanup> expected = new ArrayList<>(30);
         expected.add(new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter()));
         expected.add(new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter()));
-        for (Field field : List.of(StandardField.TITLE, StandardField.BOOKTITLE, StandardField.PUBLISHER, StandardField.JOURNAL, StandardField.ABSTRACT)) {
+        for (Field field :
+                List.of(
+                        StandardField.TITLE,
+                        StandardField.BOOKTITLE,
+                        StandardField.PUBLISHER,
+                        StandardField.JOURNAL,
+                        StandardField.ABSTRACT)) {
             expected.add(new FieldFormatterCleanup(field, new EscapeAmpersandsFormatter()));
             expected.add(new FieldFormatterCleanup(field, new EscapeDollarSignFormatter()));
             expected.add(new FieldFormatterCleanup(field, new EscapeUnderscoresFormatter()));
@@ -178,94 +223,121 @@ void parserKeepsSaveActions() {
 
     @Test
     void parserParsesLatexCleanupFormatter() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups = FieldFormatterCleanups.parse("""
+        List<FieldFormatterCleanup> fieldFormatterCleanups =
+                FieldFormatterCleanups.parse(
+                        """
                 title[latex_cleanup]
                 """);
         assertEquals(
-                List.of(new FieldFormatterCleanup(StandardField.TITLE, new LatexCleanupFormatter())),
+                List.of(
+                        new FieldFormatterCleanup(
+                                StandardField.TITLE, new LatexCleanupFormatter())),
                 fieldFormatterCleanups);
     }
 
     @Test
     void parserParsesTwoFormatters() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups = FieldFormatterCleanups.parse("""
+        List<FieldFormatterCleanup> fieldFormatterCleanups =
+                FieldFormatterCleanups.parse(
+                        """
                 title[escapeUnderscores,latex_cleanup]
                 """);
         assertEquals(
                 List.of(
-                        new FieldFormatterCleanup(StandardField.TITLE, new EscapeUnderscoresFormatter()),
-                        new FieldFormatterCleanup(StandardField.TITLE, new LatexCleanupFormatter())
-                ),
+                        new FieldFormatterCleanup(
+                                StandardField.TITLE, new EscapeUnderscoresFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.TITLE, new LatexCleanupFormatter())),
                 fieldFormatterCleanups);
     }
 
     @Test
     void parserParsesFourFormatters() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups = FieldFormatterCleanups.parse("""
+        List<FieldFormatterCleanup> fieldFormatterCleanups =
+                FieldFormatterCleanups.parse(
+                        """
                 title[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
                 """);
         assertEquals(
                 List.of(
-                        new FieldFormatterCleanup(StandardField.TITLE, new EscapeAmpersandsFormatter()),
-                        new FieldFormatterCleanup(StandardField.TITLE, new EscapeDollarSignFormatter()),
-                        new FieldFormatterCleanup(StandardField.TITLE, new EscapeUnderscoresFormatter()),
-                        new FieldFormatterCleanup(StandardField.TITLE, new LatexCleanupFormatter())
-                ),
+                        new FieldFormatterCleanup(
+                                StandardField.TITLE, new EscapeAmpersandsFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.TITLE, new EscapeDollarSignFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.TITLE, new EscapeUnderscoresFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.TITLE, new LatexCleanupFormatter())),
                 fieldFormatterCleanups);
     }
 
     @Test
     void parserParsesTwoFormattersWithCommas() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups = FieldFormatterCleanups.parse("""
+        List<FieldFormatterCleanup> fieldFormatterCleanups =
+                FieldFormatterCleanups.parse(
+                        """
                 title[escapeUnderscores,latex_cleanup]
                 booktitle[escapeAmpersands,escapeDollarSign]
                 """);
         assertEquals(
                 List.of(
-                        new FieldFormatterCleanup(StandardField.TITLE, new EscapeUnderscoresFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.TITLE, new EscapeUnderscoresFormatter()),
                         new FieldFormatterCleanup(StandardField.TITLE, new LatexCleanupFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeAmpersandsFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeDollarSignFormatter())
-                ),
+                        new FieldFormatterCleanup(
+                                StandardField.BOOKTITLE, new EscapeAmpersandsFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.BOOKTITLE, new EscapeDollarSignFormatter())),
                 fieldFormatterCleanups);
     }
 
     @Test
     void parserParsesTwoFormattersOneWithComma() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups = FieldFormatterCleanups.parse("""
+        List<FieldFormatterCleanup> fieldFormatterCleanups =
+                FieldFormatterCleanups.parse(
+                        """
                 pages[normalize_page_numbers]
                 booktitle[escapeAmpersands,escapeDollarSign]
                 """);
         assertEquals(
                 List.of(
-                        new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeAmpersandsFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeDollarSignFormatter())
-                ),
+                        new FieldFormatterCleanup(
+                                StandardField.PAGES, new NormalizePagesFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.BOOKTITLE, new EscapeAmpersandsFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.BOOKTITLE, new EscapeDollarSignFormatter())),
                 fieldFormatterCleanups);
     }
 
     @Test
     void parserParsesThreeFormattersTwoWithComma() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups = FieldFormatterCleanups.parse("""
+        List<FieldFormatterCleanup> fieldFormatterCleanups =
+                FieldFormatterCleanups.parse(
+                        """
                 pages[normalize_page_numbers]
                 title[escapeUnderscores,latex_cleanup]
                 booktitle[escapeAmpersands,escapeDollarSign]
                 """);
         assertEquals(
                 List.of(
-                        new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter()),
-                        new FieldFormatterCleanup(StandardField.TITLE, new EscapeUnderscoresFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.PAGES, new NormalizePagesFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.TITLE, new EscapeUnderscoresFormatter()),
                         new FieldFormatterCleanup(StandardField.TITLE, new LatexCleanupFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeAmpersandsFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeDollarSignFormatter())
-                ),
+                        new FieldFormatterCleanup(
+                                StandardField.BOOKTITLE, new EscapeAmpersandsFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.BOOKTITLE, new EscapeDollarSignFormatter())),
                 fieldFormatterCleanups);
     }
 
     @Test
     void parserWithTwoAndThree() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups = FieldFormatterCleanups.parse("""
+        List<FieldFormatterCleanup> fieldFormatterCleanups =
+                FieldFormatterCleanups.parse(
+                        """
                 title[escapeAmpersands,escapeUnderscores,latex_cleanup]
                 booktitle[escapeAmpersands,escapeUnderscores,latex_cleanup]
                 """);
@@ -282,41 +354,53 @@ void parserWithTwoAndThree() {
 
     @Test
     void parserWithFourEntries() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups = FieldFormatterCleanups.parse("""
+        List<FieldFormatterCleanup> fieldFormatterCleanups =
+                FieldFormatterCleanups.parse(
+                        """
                 title[escapeUnderscores,latex_cleanup]
                 booktitle[escapeAmpersands,escapeUnderscores,latex_cleanup]
                 """);
         assertEquals(
                 List.of(
-                        new FieldFormatterCleanup(StandardField.TITLE, new EscapeUnderscoresFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.TITLE, new EscapeUnderscoresFormatter()),
                         new FieldFormatterCleanup(StandardField.TITLE, new LatexCleanupFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeAmpersandsFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeUnderscoresFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new LatexCleanupFormatter())
-                ),
+                        new FieldFormatterCleanup(
+                                StandardField.BOOKTITLE, new EscapeAmpersandsFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.BOOKTITLE, new EscapeUnderscoresFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.BOOKTITLE, new LatexCleanupFormatter())),
                 fieldFormatterCleanups);
     }
 
     @Test
     void parserTest() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups = FieldFormatterCleanups.parse("""
+        List<FieldFormatterCleanup> fieldFormatterCleanups =
+                FieldFormatterCleanups.parse(
+                        """
                 title[escapeAmpersands,escapeUnderscores,latex_cleanup]
                 booktitle[escapeAmpersands,latex_cleanup]
                 """);
         assertEquals(
                 List.of(
-                        new FieldFormatterCleanup(StandardField.TITLE, new EscapeAmpersandsFormatter()),
-                        new FieldFormatterCleanup(StandardField.TITLE, new EscapeUnderscoresFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.TITLE, new EscapeAmpersandsFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.TITLE, new EscapeUnderscoresFormatter()),
                         new FieldFormatterCleanup(StandardField.TITLE, new LatexCleanupFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeAmpersandsFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new LatexCleanupFormatter())
-                ),
+                        new FieldFormatterCleanup(
+                                StandardField.BOOKTITLE, new EscapeAmpersandsFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.BOOKTITLE, new LatexCleanupFormatter())),
                 fieldFormatterCleanups);
     }
 
     @Test
     void identityCanBeParsed() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups = FieldFormatterCleanups.parse("""
+        List<FieldFormatterCleanup> fieldFormatterCleanups =
+                FieldFormatterCleanups.parse(
+                        """
                 all-text-fields[identity]
                 date[normalize_date]
                 month[normalize_month]
@@ -324,27 +408,36 @@ void identityCanBeParsed() {
                 """);
         assertEquals(
                 List.of(
-                        new FieldFormatterCleanup(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD, new IdentityFormatter()),
+                        new FieldFormatterCleanup(
+                                InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD,
+                                new IdentityFormatter()),
                         new FieldFormatterCleanup(StandardField.DATE, new NormalizeDateFormatter()),
-                        new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter()),
-                        new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter())
-                ),
+                        new FieldFormatterCleanup(
+                                StandardField.MONTH, new NormalizeMonthFormatter()),
+                        new FieldFormatterCleanup(
+                                StandardField.PAGES, new NormalizePagesFormatter())),
                 fieldFormatterCleanups);
     }
 
     @Test
     void getMetaDataStringWorks() {
-        assertEquals("""
+        assertEquals(
+                """
                 pages[normalize_page_numbers]
                 date[normalize_date]
                 month[normalize_month]
                 all-text-fields[replace_unicode_ligatures]
-                """, FieldFormatterCleanups.getMetaDataString(FieldFormatterCleanups.DEFAULT_SAVE_ACTIONS, "\n"));
+                """,
+                FieldFormatterCleanups.getMetaDataString(
+                        FieldFormatterCleanups.DEFAULT_SAVE_ACTIONS, "\n"));
     }
 
     @Test
     void parsingOfDefaultSaveActions() {
-        assertEquals(FieldFormatterCleanups.DEFAULT_SAVE_ACTIONS, FieldFormatterCleanups.parse("""
+        assertEquals(
+                FieldFormatterCleanups.DEFAULT_SAVE_ACTIONS,
+                FieldFormatterCleanups.parse(
+                        """
                 pages[normalize_page_numbers]
                 date[normalize_date]
                 month[normalize_month]
@@ -355,8 +448,7 @@ void parsingOfDefaultSaveActions() {
     public static Stream<Arguments> formatterFromString() {
         return Stream.of(
                 Arguments.of(new ReplaceUnicodeLigaturesFormatter(), "replace_unicode_ligatures"),
-                Arguments.of(new LowerCaseFormatter(), "lower_case")
-        );
+                Arguments.of(new LowerCaseFormatter(), "lower_case"));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
index 4bcadcde1c93..57810a990996 100644
--- a/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.cleanup;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.util.Optional;
 
 class ISSNCleanupTest {
 
@@ -20,15 +19,17 @@ class ISSNCleanupTest {
 
     @BeforeEach
     void setUp() {
-        worker = new CleanupWorker(
-                mock(BibDatabaseContext.class),
-                mock(FilePreferences.class),
-                mock(TimestampPreferences.class));
+        worker =
+                new CleanupWorker(
+                        mock(BibDatabaseContext.class),
+                        mock(FilePreferences.class),
+                        mock(TimestampPreferences.class));
     }
 
     @Test
     void cleanupISSNReturnsCorrectISSN() {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_ISSN);
+        CleanupPreferences preset =
+                new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_ISSN);
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.ISSN, "0123-4567");
 
@@ -38,7 +39,8 @@ void cleanupISSNReturnsCorrectISSN() {
 
     @Test
     void cleanupISSNAddsMissingDash() {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_ISSN);
+        CleanupPreferences preset =
+                new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_ISSN);
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.ISSN, "01234567");
 
@@ -48,7 +50,8 @@ void cleanupISSNAddsMissingDash() {
 
     @Test
     void cleanupISSNJunkStaysJunk() {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_ISSN);
+        CleanupPreferences preset =
+                new CleanupPreferences(CleanupPreferences.CleanupStep.CLEAN_UP_ISSN);
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.ISSN, "Banana");
 
diff --git a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
index 6197e896cd16..a01c3ff91480 100644
--- a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
@@ -1,12 +1,10 @@
 package org.jabref.logic.cleanup;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.bibtex.FileFieldWriter;
@@ -17,16 +15,17 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.MetaData;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 class MoveFilesCleanupTest {
 
@@ -63,7 +62,10 @@ void setUp(@TempDir Path bibFolder) throws IOException {
         entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
 
         filePreferences = mock(FilePreferences.class);
-        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(false); // Biblocation as Primary overwrites all other dirs, therefore we set it to false here
+        when(filePreferences.shouldStoreFilesRelativeToBibFile())
+                .thenReturn(
+                        false); // Biblocation as Primary overwrites all other dirs, therefore we
+                                // set it to false here
         cleanup = new MoveFilesCleanup(databaseContext, filePreferences);
     }
 
@@ -74,7 +76,9 @@ void movesFile() {
 
         Path fileAfter = defaultFileFolder.resolve("test.pdf");
         assertEquals(
-                Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", Path.of("test.pdf"), ""))),
+                Optional.of(
+                        FileFieldWriter.getStringRepresentation(
+                                new LinkedFile("", Path.of("test.pdf"), ""))),
                 entry.getField(StandardField.FILE));
         assertFalse(Files.exists(fileBefore));
         assertTrue(Files.exists(fileAfter));
@@ -83,21 +87,25 @@ void movesFile() {
     @Test
     void movesFileWithMulitpleLinked() {
         LinkedFile fileField = new LinkedFile("", fileBefore.toAbsolutePath(), "");
-        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(Arrays.asList(
-                new LinkedFile("", Path.of(""), ""),
-                fileField,
-                new LinkedFile("", Path.of(""), ""))));
+        entry.setField(
+                StandardField.FILE,
+                FileFieldWriter.getStringRepresentation(
+                        Arrays.asList(
+                                new LinkedFile("", Path.of(""), ""),
+                                fileField,
+                                new LinkedFile("", Path.of(""), ""))));
 
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
         cleanup.cleanup(entry);
 
         Path fileAfter = defaultFileFolder.resolve("test.pdf");
         assertEquals(
-                Optional.of(FileFieldWriter.getStringRepresentation(
-                        Arrays.asList(
-                                new LinkedFile("", Path.of(""), ""),
-                                new LinkedFile("", Path.of("test.pdf"), ""),
-                                new LinkedFile("", Path.of(""), "")))),
+                Optional.of(
+                        FileFieldWriter.getStringRepresentation(
+                                Arrays.asList(
+                                        new LinkedFile("", Path.of(""), ""),
+                                        new LinkedFile("", Path.of("test.pdf"), ""),
+                                        new LinkedFile("", Path.of(""), "")))),
                 entry.getField(StandardField.FILE));
         assertFalse(Files.exists(fileBefore));
         assertTrue(Files.exists(fileAfter));
@@ -110,7 +118,9 @@ void movesFileWithFileDirPattern() {
 
         Path fileAfter = defaultFileFolder.resolve("Misc").resolve("test.pdf");
         assertEquals(
-                Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", Path.of("Misc/test.pdf"), ""))),
+                Optional.of(
+                        FileFieldWriter.getStringRepresentation(
+                                new LinkedFile("", Path.of("Misc/test.pdf"), ""))),
                 entry.getField(StandardField.FILE));
         assertFalse(Files.exists(fileBefore));
         assertTrue(Files.exists(fileAfter));
@@ -123,7 +133,9 @@ void doesNotMoveFileWithEmptyFileDirPattern() {
 
         Path fileAfter = defaultFileFolder.resolve("test.pdf");
         assertEquals(
-                Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", Path.of("test.pdf"), ""))),
+                Optional.of(
+                        FileFieldWriter.getStringRepresentation(
+                                new LinkedFile("", Path.of("test.pdf"), ""))),
                 entry.getField(StandardField.FILE));
         assertFalse(Files.exists(fileBefore));
         assertTrue(Files.exists(fileAfter));
@@ -136,7 +148,9 @@ void movesFileWithSubdirectoryPattern() {
 
         Path fileAfter = defaultFileFolder.resolve("Misc").resolve("1989").resolve("test.pdf");
         assertEquals(
-                Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", Path.of("Misc/1989/test.pdf"), ""))),
+                Optional.of(
+                        FileFieldWriter.getStringRepresentation(
+                                new LinkedFile("", Path.of("Misc/1989/test.pdf"), ""))),
                 entry.getField(StandardField.FILE));
         assertFalse(Files.exists(fileBefore));
         assertTrue(Files.exists(fileAfter));
diff --git a/src/test/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFilesTest.java b/src/test/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFilesTest.java
index 141fb75638ae..2696613d0363 100644
--- a/src/test/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFilesTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/RemoveLinksToNotExistentFilesTest.java
@@ -1,9 +1,8 @@
 package org.jabref.logic.cleanup;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.bibtex.FileFieldWriter;
@@ -15,14 +14,14 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.metadata.MetaData;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
 
 class RemoveLinksToNotExistentFilesTest {
     private Path fileBefore;
@@ -51,22 +50,37 @@ void setUp(@TempDir Path bibFolder) throws IOException {
         LinkedFile fileField = new LinkedFile("", fileBefore.toAbsolutePath(), "");
 
         // Entry with one online and one normal linked file
-        entry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Shatakshi Sharma and Bhim Singh and Sukumar Mishra")
-                .withField(StandardField.DATE, "April 2020")
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.DOI, "10.1109/TII.2019.2935531")
-                .withField(StandardField.FILE, FileFieldWriter.getStringRepresentation(List.of(
-                    new LinkedFile("", "https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8801912", "PDF"),
-                    fileField)))
-                .withField(StandardField.ISSUE, "4")
-                .withField(StandardField.ISSN, "1941-0050")
-                .withField(StandardField.JOURNALTITLE, "IEEE Transactions on Industrial Informatics")
-                .withField(StandardField.PAGES, "2346--2356")
-                .withField(StandardField.PUBLISHER, "IEEE")
-                .withField(StandardField.TITLE, "Economic Operation and Quality Control in PV-BES-DG-Based Autonomous System")
-                .withField(StandardField.VOLUME, "16")
-                .withField(StandardField.KEYWORDS, "Batteries, Generators, Economics, Power quality, State of charge, Harmonic analysis, Control systems, Battery, diesel generator (DG), distributed generation, power quality, photovoltaic (PV), voltage source converter (VSC)");
+        entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Shatakshi Sharma and Bhim Singh and Sukumar Mishra")
+                        .withField(StandardField.DATE, "April 2020")
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.DOI, "10.1109/TII.2019.2935531")
+                        .withField(
+                                StandardField.FILE,
+                                FileFieldWriter.getStringRepresentation(
+                                        List.of(
+                                                new LinkedFile(
+                                                        "",
+                                                        "https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8801912",
+                                                        "PDF"),
+                                                fileField)))
+                        .withField(StandardField.ISSUE, "4")
+                        .withField(StandardField.ISSN, "1941-0050")
+                        .withField(
+                                StandardField.JOURNALTITLE,
+                                "IEEE Transactions on Industrial Informatics")
+                        .withField(StandardField.PAGES, "2346--2356")
+                        .withField(StandardField.PUBLISHER, "IEEE")
+                        .withField(
+                                StandardField.TITLE,
+                                "Economic Operation and Quality Control in PV-BES-DG-Based Autonomous System")
+                        .withField(StandardField.VOLUME, "16")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Batteries, Generators, Economics, Power quality, State of charge, Harmonic analysis, Control systems, Battery, diesel generator (DG), distributed generation, power quality, photovoltaic (PV), voltage source converter (VSC)");
 
         FilePreferences filePreferences = mock(FilePreferences.class);
         when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
@@ -76,27 +90,51 @@ void setUp(@TempDir Path bibFolder) throws IOException {
     @Test
     void deleteFileInEntryWithMultipleFileLinks() throws IOException {
         LinkedFile fileField = new LinkedFile("", fileBefore.toAbsolutePath(), "");
-        FieldChange expectedChange = new FieldChange(entry, StandardField.FILE,
-            FileFieldWriter.getStringRepresentation(List.of(
-            new LinkedFile("", "https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8801912", "PDF"),
-            fileField)),
-            FileFieldWriter.getStringRepresentation(new LinkedFile("", "https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8801912", "PDF"))
-        );
-        BibEntry expectedEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Shatakshi Sharma and Bhim Singh and Sukumar Mishra")
-                .withField(StandardField.DATE, "April 2020")
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.DOI, "10.1109/TII.2019.2935531")
-                .withField(StandardField.FILE, FileFieldWriter.getStringRepresentation(
-                    new LinkedFile("", "https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8801912", "PDF")))
-                .withField(StandardField.ISSUE, "4")
-                .withField(StandardField.ISSN, "1941-0050")
-                .withField(StandardField.JOURNALTITLE, "IEEE Transactions on Industrial Informatics")
-                .withField(StandardField.PAGES, "2346--2356")
-                .withField(StandardField.PUBLISHER, "IEEE")
-                .withField(StandardField.TITLE, "Economic Operation and Quality Control in PV-BES-DG-Based Autonomous System")
-                .withField(StandardField.VOLUME, "16")
-                .withField(StandardField.KEYWORDS, "Batteries, Generators, Economics, Power quality, State of charge, Harmonic analysis, Control systems, Battery, diesel generator (DG), distributed generation, power quality, photovoltaic (PV), voltage source converter (VSC)");
+        FieldChange expectedChange =
+                new FieldChange(
+                        entry,
+                        StandardField.FILE,
+                        FileFieldWriter.getStringRepresentation(
+                                List.of(
+                                        new LinkedFile(
+                                                "",
+                                                "https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8801912",
+                                                "PDF"),
+                                        fileField)),
+                        FileFieldWriter.getStringRepresentation(
+                                new LinkedFile(
+                                        "",
+                                        "https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8801912",
+                                        "PDF")));
+        BibEntry expectedEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Shatakshi Sharma and Bhim Singh and Sukumar Mishra")
+                        .withField(StandardField.DATE, "April 2020")
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.DOI, "10.1109/TII.2019.2935531")
+                        .withField(
+                                StandardField.FILE,
+                                FileFieldWriter.getStringRepresentation(
+                                        new LinkedFile(
+                                                "",
+                                                "https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8801912",
+                                                "PDF")))
+                        .withField(StandardField.ISSUE, "4")
+                        .withField(StandardField.ISSN, "1941-0050")
+                        .withField(
+                                StandardField.JOURNALTITLE,
+                                "IEEE Transactions on Industrial Informatics")
+                        .withField(StandardField.PAGES, "2346--2356")
+                        .withField(StandardField.PUBLISHER, "IEEE")
+                        .withField(
+                                StandardField.TITLE,
+                                "Economic Operation and Quality Control in PV-BES-DG-Based Autonomous System")
+                        .withField(StandardField.VOLUME, "16")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Batteries, Generators, Economics, Power quality, State of charge, Harmonic analysis, Control systems, Battery, diesel generator (DG), distributed generation, power quality, photovoltaic (PV), voltage source converter (VSC)");
 
         Files.delete(fileBefore);
         List<FieldChange> changes = removeLinks.cleanup(entry);
@@ -108,22 +146,37 @@ void deleteFileInEntryWithMultipleFileLinks() throws IOException {
     @Test
     void keepLinksToExistingFiles() {
         LinkedFile fileField = new LinkedFile("", fileBefore.toAbsolutePath(), "");
-        BibEntry expectedEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Shatakshi Sharma and Bhim Singh and Sukumar Mishra")
-                .withField(StandardField.DATE, "April 2020")
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.DOI, "10.1109/TII.2019.2935531")
-                .withField(StandardField.FILE, FileFieldWriter.getStringRepresentation(List.of(
-                    new LinkedFile("", "https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8801912", "PDF"),
-                    fileField)))
-                .withField(StandardField.ISSUE, "4")
-                .withField(StandardField.ISSN, "1941-0050")
-                .withField(StandardField.JOURNALTITLE, "IEEE Transactions on Industrial Informatics")
-                .withField(StandardField.PAGES, "2346--2356")
-                .withField(StandardField.PUBLISHER, "IEEE")
-                .withField(StandardField.TITLE, "Economic Operation and Quality Control in PV-BES-DG-Based Autonomous System")
-                .withField(StandardField.VOLUME, "16")
-                .withField(StandardField.KEYWORDS, "Batteries, Generators, Economics, Power quality, State of charge, Harmonic analysis, Control systems, Battery, diesel generator (DG), distributed generation, power quality, photovoltaic (PV), voltage source converter (VSC)");
+        BibEntry expectedEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Shatakshi Sharma and Bhim Singh and Sukumar Mishra")
+                        .withField(StandardField.DATE, "April 2020")
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.DOI, "10.1109/TII.2019.2935531")
+                        .withField(
+                                StandardField.FILE,
+                                FileFieldWriter.getStringRepresentation(
+                                        List.of(
+                                                new LinkedFile(
+                                                        "",
+                                                        "https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8801912",
+                                                        "PDF"),
+                                                fileField)))
+                        .withField(StandardField.ISSUE, "4")
+                        .withField(StandardField.ISSN, "1941-0050")
+                        .withField(
+                                StandardField.JOURNALTITLE,
+                                "IEEE Transactions on Industrial Informatics")
+                        .withField(StandardField.PAGES, "2346--2356")
+                        .withField(StandardField.PUBLISHER, "IEEE")
+                        .withField(
+                                StandardField.TITLE,
+                                "Economic Operation and Quality Control in PV-BES-DG-Based Autonomous System")
+                        .withField(StandardField.VOLUME, "16")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Batteries, Generators, Economics, Power quality, State of charge, Harmonic analysis, Control systems, Battery, diesel generator (DG), distributed generation, power quality, photovoltaic (PV), voltage source converter (VSC)");
 
         List<FieldChange> changes = removeLinks.cleanup(entry);
 
@@ -137,22 +190,34 @@ void deleteLinkedFile() throws IOException {
 
         // There is only one linked file in entry
         entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
-        FieldChange expectedChange = new FieldChange(entry, StandardField.FILE,
-            FileFieldWriter.getStringRepresentation(fileField),
-            null);
-        BibEntry expectedEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Shatakshi Sharma and Bhim Singh and Sukumar Mishra")
-                .withField(StandardField.DATE, "April 2020")
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.DOI, "10.1109/TII.2019.2935531")
-                .withField(StandardField.ISSUE, "4")
-                .withField(StandardField.ISSN, "1941-0050")
-                .withField(StandardField.JOURNALTITLE, "IEEE Transactions on Industrial Informatics")
-                .withField(StandardField.PAGES, "2346--2356")
-                .withField(StandardField.PUBLISHER, "IEEE")
-                .withField(StandardField.TITLE, "Economic Operation and Quality Control in PV-BES-DG-Based Autonomous System")
-                .withField(StandardField.VOLUME, "16")
-                .withField(StandardField.KEYWORDS, "Batteries, Generators, Economics, Power quality, State of charge, Harmonic analysis, Control systems, Battery, diesel generator (DG), distributed generation, power quality, photovoltaic (PV), voltage source converter (VSC)");
+        FieldChange expectedChange =
+                new FieldChange(
+                        entry,
+                        StandardField.FILE,
+                        FileFieldWriter.getStringRepresentation(fileField),
+                        null);
+        BibEntry expectedEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Shatakshi Sharma and Bhim Singh and Sukumar Mishra")
+                        .withField(StandardField.DATE, "April 2020")
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.DOI, "10.1109/TII.2019.2935531")
+                        .withField(StandardField.ISSUE, "4")
+                        .withField(StandardField.ISSN, "1941-0050")
+                        .withField(
+                                StandardField.JOURNALTITLE,
+                                "IEEE Transactions on Industrial Informatics")
+                        .withField(StandardField.PAGES, "2346--2356")
+                        .withField(StandardField.PUBLISHER, "IEEE")
+                        .withField(
+                                StandardField.TITLE,
+                                "Economic Operation and Quality Control in PV-BES-DG-Based Autonomous System")
+                        .withField(StandardField.VOLUME, "16")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Batteries, Generators, Economics, Power quality, State of charge, Harmonic analysis, Control systems, Battery, diesel generator (DG), distributed generation, power quality, photovoltaic (PV), voltage source converter (VSC)");
 
         Files.delete(fileBefore);
         List<FieldChange> changes = removeLinks.cleanup(entry);
diff --git a/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
index d94b68c3874f..004c49043b8f 100644
--- a/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
@@ -1,10 +1,8 @@
 package org.jabref.logic.cleanup;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.bibtex.FileFieldWriter;
@@ -14,14 +12,15 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.MetaData;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Optional;
 
 class RenamePdfCleanupTest {
 
@@ -30,7 +29,8 @@ class RenamePdfCleanupTest {
     private FilePreferences filePreferences;
     private RenamePdfCleanup cleanup;
 
-    // Ensure that the folder stays the same for all tests. By default @TempDir creates a new folder for each usage
+    // Ensure that the folder stays the same for all tests. By default @TempDir creates a new folder
+    // for each usage
     private Path testFolder;
 
     @BeforeEach
@@ -45,7 +45,10 @@ void setUp(@TempDir Path testFolder) {
         entry.setCitationKey("Toot");
 
         filePreferences = mock(FilePreferences.class);
-        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(true); // Set Biblocation as Primary Directory, otherwise the tmp folders won't be cleaned up correctly
+        when(filePreferences.shouldStoreFilesRelativeToBibFile())
+                .thenReturn(
+                        true); // Set Biblocation as Primary Directory, otherwise the tmp folders
+                               // won't be cleaned up correctly
         cleanup = new RenamePdfCleanup(false, context, filePreferences);
     }
 
@@ -64,7 +67,9 @@ void cleanupRenamePdfRenamesFileEvenIfOnlyDifferenceIsCase() throws IOException
         cleanup.cleanup(entry);
 
         LinkedFile newFileField = new LinkedFile("", Path.of("Toot.tmp"), "");
-        assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField(StandardField.FILE));
+        assertEquals(
+                Optional.of(FileFieldWriter.getStringRepresentation(newFileField)),
+                entry.getField(StandardField.FILE));
     }
 
     @Test
@@ -73,20 +78,24 @@ void cleanupRenamePdfRenamesWithMultipleFiles() throws IOException {
         Files.createFile(path);
 
         entry.setField(StandardField.TITLE, "test title");
-        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(
-                Arrays.asList(
-                        new LinkedFile("", Path.of(""), ""),
-                        new LinkedFile("", path.toAbsolutePath(), ""),
-                        new LinkedFile("", Path.of(""), ""))));
+        entry.setField(
+                StandardField.FILE,
+                FileFieldWriter.getStringRepresentation(
+                        Arrays.asList(
+                                new LinkedFile("", Path.of(""), ""),
+                                new LinkedFile("", path.toAbsolutePath(), ""),
+                                new LinkedFile("", Path.of(""), ""))));
 
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey] - [fulltitle]");
         cleanup.cleanup(entry);
 
-        assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(
-                Arrays.asList(
-                        new LinkedFile("", Path.of(""), ""),
-                        new LinkedFile("", Path.of("Toot - test title.tmp"), ""),
-                        new LinkedFile("", Path.of(""), "")))),
+        assertEquals(
+                Optional.of(
+                        FileFieldWriter.getStringRepresentation(
+                                Arrays.asList(
+                                        new LinkedFile("", Path.of(""), ""),
+                                        new LinkedFile("", Path.of("Toot - test title.tmp"), ""),
+                                        new LinkedFile("", Path.of(""), "")))),
                 entry.getField(StandardField.FILE));
     }
 
@@ -103,7 +112,9 @@ void cleanupRenamePdfRenamesFileStartingWithCitationKey() throws IOException {
         cleanup.cleanup(entry);
 
         LinkedFile newFileField = new LinkedFile("", Path.of("Toot - test title.tmp"), "");
-        assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField(StandardField.FILE));
+        assertEquals(
+                Optional.of(FileFieldWriter.getStringRepresentation(newFileField)),
+                entry.getField(StandardField.FILE));
     }
 
     @Test
@@ -118,6 +129,8 @@ void cleanupRenamePdfRenamesFileInSameFolder() throws IOException {
         cleanup.cleanup(entry);
 
         LinkedFile newFileField = new LinkedFile("", Path.of("Toot - test title.pdf"), "PDF");
-        assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField(StandardField.FILE));
+        assertEquals(
+                Optional.of(FileFieldWriter.getStringRepresentation(newFileField)),
+                entry.getField(StandardField.FILE));
     }
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/TimeStampToCreationDateTest.java b/src/test/java/org/jabref/logic/cleanup/TimeStampToCreationDateTest.java
index e6ddf0aff33c..7e140f6cb16d 100644
--- a/src/test/java/org/jabref/logic/cleanup/TimeStampToCreationDateTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/TimeStampToCreationDateTest.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.cleanup;
 
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.preferences.TimestampPreferences;
@@ -9,43 +8,42 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
+import java.util.stream.Stream;
 
 class TimeStampToCreationDateTest {
 
     private static final Field CUSTOM_TIME_STAMP_FIELD = new UnknownField("dateOfCreation");
 
-    private final TimestampPreferences timestampPreferences = Mockito.mock(TimestampPreferences.class);
+    private final TimestampPreferences timestampPreferences =
+            Mockito.mock(TimestampPreferences.class);
 
     public void makeMockReturnCustomField() {
-        Mockito.when(timestampPreferences.getTimestampField()).then(invocation -> CUSTOM_TIME_STAMP_FIELD);
+        Mockito.when(timestampPreferences.getTimestampField())
+                .then(invocation -> CUSTOM_TIME_STAMP_FIELD);
     }
 
     public void makeMockReturnStandardField() {
-        Mockito.when(timestampPreferences.getTimestampField()).then(invocation -> StandardField.TIMESTAMP);
+        Mockito.when(timestampPreferences.getTimestampField())
+                .then(invocation -> StandardField.TIMESTAMP);
     }
 
     public static Stream<Arguments> standardFieldToCreationDate() {
         return Stream.of(
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2018-09-10T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "2018-09-10")
-                ),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2018-09-10")),
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2020-12-24T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-24")
-                ),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-24")),
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2020-12-31T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-31")
-                )
-        );
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-31")));
     }
 
     /**
@@ -64,17 +62,13 @@ public static Stream<Arguments> customFieldToCreationDate() {
         return Stream.of(
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2018-09-10T00:00:00"),
-                        new BibEntry().withField(CUSTOM_TIME_STAMP_FIELD, "2018-09-10")
-                ),
+                        new BibEntry().withField(CUSTOM_TIME_STAMP_FIELD, "2018-09-10")),
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2020-12-24T00:00:00"),
-                        new BibEntry().withField(CUSTOM_TIME_STAMP_FIELD, "2020-12-24")
-                ),
+                        new BibEntry().withField(CUSTOM_TIME_STAMP_FIELD, "2020-12-24")),
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2020-12-31T00:00:00"),
-                        new BibEntry().withField(CUSTOM_TIME_STAMP_FIELD, "2020-12-31")
-                )
-        );
+                        new BibEntry().withField(CUSTOM_TIME_STAMP_FIELD, "2020-12-31")));
     }
 
     /**
@@ -94,74 +88,61 @@ public static Stream<Arguments> entriesMigratedToCreationDateFromDifferentFormat
                 // M/y
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-01T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "1/18")
-                ),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "1/18")),
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2018-02-01T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "2/2018")
-                ),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2/2018")),
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2018-03-01T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "03/2018")
-                ),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "03/2018")),
 
                 // MMMM, yyyy
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-01T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "January, 2018")
-                ),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "January, 2018")),
 
                 // MMMM dd, yyyy
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-02T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "January 2, 2018")
-                ),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "January 2, 2018")),
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-12T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "January 12, 2018")
-                ),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "January 12, 2018")),
 
                 // dd-MM-yyyy
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-02T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "2-1-2018")
-                ),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2-1-2018")),
 
                 // Double digit day/month
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-12T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "12-01-2018")
-                ),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "12-01-2018")),
 
                 // d.M.uuuu
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-02T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "2.1.2018")
-                ),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2.1.2018")),
 
                 // Double digit day/month
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-12T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "12.01.2018")
-                ),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "12.01.2018")),
 
                 // uuuu.M.d
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-02T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "2018.1.2")
-                ),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2018.1.2")),
 
                 // Double digit day/month
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-12T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "2018.01.12")
-                ),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2018.01.12")),
 
                 // MMM, uuuu
                 Arguments.of(
                         new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-01T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "Jan, 2018")
-                ));
+                        new BibEntry().withField(StandardField.TIMESTAMP, "Jan, 2018")));
     }
 
     /**
diff --git a/src/test/java/org/jabref/logic/cleanup/TimeStampToModificationDateTest.java b/src/test/java/org/jabref/logic/cleanup/TimeStampToModificationDateTest.java
index 092e8f3a565e..7118c9f8bfbd 100644
--- a/src/test/java/org/jabref/logic/cleanup/TimeStampToModificationDateTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/TimeStampToModificationDateTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.cleanup;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class TimeStampToModificationDateTest {
 
@@ -22,28 +21,29 @@ class TimeStampToModificationDateTest {
     private TimestampPreferences timestampPreferences = Mockito.mock(TimestampPreferences.class);
 
     public void makeMockReturnCustomField() {
-        Mockito.when(timestampPreferences.getTimestampField()).then(invocation -> customTimeStampField);
+        Mockito.when(timestampPreferences.getTimestampField())
+                .then(invocation -> customTimeStampField);
     }
 
     public void makeMockReturnStandardField() {
-        Mockito.when(timestampPreferences.getTimestampField()).then(invocation -> StandardField.TIMESTAMP);
+        Mockito.when(timestampPreferences.getTimestampField())
+                .then(invocation -> StandardField.TIMESTAMP);
     }
 
     public static Stream<Arguments> standardFieldToModificationDate() {
         return Stream.of(
                 Arguments.of(
-                        new BibEntry().withField(StandardField.MODIFICATIONDATE, "2018-09-10T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "2018-09-10")
-                ),
+                        new BibEntry()
+                                .withField(StandardField.MODIFICATIONDATE, "2018-09-10T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2018-09-10")),
                 Arguments.of(
-                        new BibEntry().withField(StandardField.MODIFICATIONDATE, "2020-12-24T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-24")
-                ),
+                        new BibEntry()
+                                .withField(StandardField.MODIFICATIONDATE, "2020-12-24T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-24")),
                 Arguments.of(
-                        new BibEntry().withField(StandardField.MODIFICATIONDATE, "2020-12-31T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-31")
-                )
-        );
+                        new BibEntry()
+                                .withField(StandardField.MODIFICATIONDATE, "2020-12-31T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-31")));
     }
 
     /**
@@ -53,7 +53,8 @@ public static Stream<Arguments> standardFieldToModificationDate() {
     @MethodSource("standardFieldToModificationDate")
     void withStandardFieldToModificationDate(BibEntry expected, BibEntry input) {
         makeMockReturnStandardField();
-        TimeStampToModificationDate migrator = new TimeStampToModificationDate(timestampPreferences);
+        TimeStampToModificationDate migrator =
+                new TimeStampToModificationDate(timestampPreferences);
         migrator.cleanup(input);
         assertEquals(expected, input);
     }
@@ -61,18 +62,17 @@ void withStandardFieldToModificationDate(BibEntry expected, BibEntry input) {
     public static Stream<Arguments> customFieldToModificationDate() {
         return Stream.of(
                 Arguments.of(
-                        new BibEntry().withField(StandardField.MODIFICATIONDATE, "2018-09-10T00:00:00"),
-                        new BibEntry().withField(customTimeStampField, "2018-09-10")
-                ),
+                        new BibEntry()
+                                .withField(StandardField.MODIFICATIONDATE, "2018-09-10T00:00:00"),
+                        new BibEntry().withField(customTimeStampField, "2018-09-10")),
                 Arguments.of(
-                        new BibEntry().withField(StandardField.MODIFICATIONDATE, "2020-12-24T00:00:00"),
-                        new BibEntry().withField(customTimeStampField, "2020-12-24")
-                ),
+                        new BibEntry()
+                                .withField(StandardField.MODIFICATIONDATE, "2020-12-24T00:00:00"),
+                        new BibEntry().withField(customTimeStampField, "2020-12-24")),
                 Arguments.of(
-                        new BibEntry().withField(StandardField.MODIFICATIONDATE, "2020-12-31T00:00:00"),
-                        new BibEntry().withField(customTimeStampField, "2020-12-31")
-                )
-        );
+                        new BibEntry()
+                                .withField(StandardField.MODIFICATIONDATE, "2020-12-31T00:00:00"),
+                        new BibEntry().withField(customTimeStampField, "2020-12-31")));
     }
 
     /**
@@ -82,7 +82,8 @@ public static Stream<Arguments> customFieldToModificationDate() {
     @MethodSource("customFieldToModificationDate")
     void withCustomFieldToModificationDate(BibEntry expected, BibEntry input) {
         makeMockReturnCustomField();
-        TimeStampToModificationDate migrator = new TimeStampToModificationDate(timestampPreferences);
+        TimeStampToModificationDate migrator =
+                new TimeStampToModificationDate(timestampPreferences);
         migrator.cleanup(input);
         assertEquals(expected, input);
     }
diff --git a/src/test/java/org/jabref/logic/cleanup/URLCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/URLCleanupTest.java
index 6c5ae1b247b3..2b61cb68765f 100644
--- a/src/test/java/org/jabref/logic/cleanup/URLCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/URLCleanupTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.cleanup;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class URLCleanupTest {
 
@@ -25,157 +24,178 @@ void changeURL(BibEntry expected, BibEntry urlInputField) {
     private static Stream<Arguments> provideURL() {
         return Stream.of(
 
-            // Input Note field has two arguments stored , with the latter being a url.
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "https://hdl.handle.net/10442/hedi/6089")
-                              .withField(StandardField.NOTE,
-                                    "this is a note"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "this is a note, \\url{https://hdl.handle.net/10442/hedi/6089}")),
-
-            // Input Note field has two arguments stored, with the former being a url.
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "https://hdl.handle.net/10442/hedi/6089")
-                              .withField(StandardField.NOTE,
-                                    "this is a note"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "\\url{https://hdl.handle.net/10442/hedi/6089}, this is a note")),
-
-            // Input Note field has more than one URLs stored.
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "https://hdl.handle.net/10442/hedi/6089")
-                              .withField(StandardField.NOTE,
-                                    "\\url{http://142.42.1.1:8080}"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "\\url{https://hdl.handle.net/10442/hedi/6089}, "
-                                        + "\\url{http://142.42.1.1:8080}")),
-
-            // Input entry holds the same URL both in Note and Url field.
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                     "https://hdl.handle.net/10442/hedi/6089"),
-                new BibEntry().withField(StandardField.NOTE,
-                                     "\\url{https://hdl.handle.net/10442/hedi/6089}")
-                              .withField(StandardField.URL,
-                                     "https://hdl.handle.net/10442/hedi/6089")),
-
-            // Input Note field has several values stored.
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "https://example.org")
-                              .withField(StandardField.NOTE,
-                                    "cited by Kramer, 2002."),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "\\url{https://example.org}, cited by Kramer, 2002.")),
-
-            /*
-             * Several input URL types (e.g, not secure protocol, password included for
-             * authentication, IP address, port etc.) to be correctly identified.
-             */
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "https://hdl.handle.net/10442/hedi/6089"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "\\url{https://hdl.handle.net/10442/hedi/6089}")),
-
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "http://hdl.handle.net/10442/hedi/6089"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "\\url{http://hdl.handle.net/10442/hedi/6089}")),
-
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "http://userid:password@example.com:8080"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "\\url{http://userid:password@example.com:8080}")),
-
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "http://142.42.1.1:8080"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "\\url{http://142.42.1.1:8080}")),
-
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "http://☺.damowmow.com"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "\\url{http://☺.damowmow.com}")),
-
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "\\url{http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com}")),
-
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "https://www.example.com/foo/?bar=baz&inga=42&quux"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "\\url{https://www.example.com/foo/?bar=baz&inga=42&quux}")),
-
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "https://www.example.com/foo/?bar=baz&inga=42&quux"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "https://www.example.com/foo/?bar=baz&inga=42&quux")),
-
-            // Expected entry returns formatted the url-date in the Urldate field.
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "http://142.42.1.1:8080")
-                              .withField(StandardField.URLDATE,
-                                    "2021-01-15"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "\\url{http://142.42.1.1:8080}, accessed on January 15, 2021")),
-
-            // Input entry doesn't hold any URL in the Note field.
-            Arguments.of(
-                new BibEntry().withField(StandardField.NOTE,
-                                    "Accessed on 2015-01-15"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "Accessed on 2015-01-15")),
-
-            // Input entry has multiple url-dates stored in the Note field.
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "http://142.42.1.1:8080")
-                              .withField(StandardField.URLDATE,
-                                    "2021-01-15")
-                              .withField(StandardField.NOTE,
-                                    "visited on February 12, 2017"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "\\url{http://142.42.1.1:8080}, accessed on January 15, 2021, visited on February 12, 2017")),
-
-            // Input entry holds the same url-date in both Note and Urldate field.
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "http://142.42.1.1:8080")
-                              .withField(StandardField.URLDATE,
-                                    "2015-01-15"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "\\url{http://142.42.1.1:8080}, visited on 2015.01.15")
-                              .withField(StandardField.URLDATE,
-                                    "2015-01-15")),
-
-            // Input Note field has several values stored.
-            Arguments.of(
-                new BibEntry().withField(StandardField.URL,
-                                    "https://example.org")
-                              .withField(StandardField.URLDATE,
-                                    "2023-04-11")
-                              .withField(StandardField.NOTE,
-                                    "cited by Kramer"),
-                new BibEntry().withField(StandardField.NOTE,
-                                    "\\url{https://example.org}, cited by Kramer, accessed on 2023-04-11"),
-            // test with no fields present
-            Arguments.of(
-                    new BibEntry(),
-                    new BibEntry())
-            )
-        );
+                // Input Note field has two arguments stored , with the latter being a url.
+                Arguments.of(
+                        new BibEntry()
+                                .withField(
+                                        StandardField.URL, "https://hdl.handle.net/10442/hedi/6089")
+                                .withField(StandardField.NOTE, "this is a note"),
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "this is a note, \\url{https://hdl.handle.net/10442/hedi/6089}")),
+
+                // Input Note field has two arguments stored, with the former being a url.
+                Arguments.of(
+                        new BibEntry()
+                                .withField(
+                                        StandardField.URL, "https://hdl.handle.net/10442/hedi/6089")
+                                .withField(StandardField.NOTE, "this is a note"),
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "\\url{https://hdl.handle.net/10442/hedi/6089}, this is a note")),
+
+                // Input Note field has more than one URLs stored.
+                Arguments.of(
+                        new BibEntry()
+                                .withField(
+                                        StandardField.URL, "https://hdl.handle.net/10442/hedi/6089")
+                                .withField(StandardField.NOTE, "\\url{http://142.42.1.1:8080}"),
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "\\url{https://hdl.handle.net/10442/hedi/6089}, "
+                                                + "\\url{http://142.42.1.1:8080}")),
+
+                // Input entry holds the same URL both in Note and Url field.
+                Arguments.of(
+                        new BibEntry()
+                                .withField(
+                                        StandardField.URL,
+                                        "https://hdl.handle.net/10442/hedi/6089"),
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "\\url{https://hdl.handle.net/10442/hedi/6089}")
+                                .withField(
+                                        StandardField.URL,
+                                        "https://hdl.handle.net/10442/hedi/6089")),
+
+                // Input Note field has several values stored.
+                Arguments.of(
+                        new BibEntry()
+                                .withField(StandardField.URL, "https://example.org")
+                                .withField(StandardField.NOTE, "cited by Kramer, 2002."),
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "\\url{https://example.org}, cited by Kramer, 2002.")),
+
+                /*
+                 * Several input URL types (e.g, not secure protocol, password included for
+                 * authentication, IP address, port etc.) to be correctly identified.
+                 */
+                Arguments.of(
+                        new BibEntry()
+                                .withField(
+                                        StandardField.URL,
+                                        "https://hdl.handle.net/10442/hedi/6089"),
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "\\url{https://hdl.handle.net/10442/hedi/6089}")),
+                Arguments.of(
+                        new BibEntry()
+                                .withField(
+                                        StandardField.URL, "http://hdl.handle.net/10442/hedi/6089"),
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "\\url{http://hdl.handle.net/10442/hedi/6089}")),
+                Arguments.of(
+                        new BibEntry()
+                                .withField(
+                                        StandardField.URL,
+                                        "http://userid:password@example.com:8080"),
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "\\url{http://userid:password@example.com:8080}")),
+                Arguments.of(
+                        new BibEntry().withField(StandardField.URL, "http://142.42.1.1:8080"),
+                        new BibEntry()
+                                .withField(StandardField.NOTE, "\\url{http://142.42.1.1:8080}")),
+                Arguments.of(
+                        new BibEntry().withField(StandardField.URL, "http://☺.damowmow.com"),
+                        new BibEntry()
+                                .withField(StandardField.NOTE, "\\url{http://☺.damowmow.com}")),
+                Arguments.of(
+                        new BibEntry()
+                                .withField(
+                                        StandardField.URL,
+                                        "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com"),
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "\\url{http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com}")),
+                Arguments.of(
+                        new BibEntry()
+                                .withField(
+                                        StandardField.URL,
+                                        "https://www.example.com/foo/?bar=baz&inga=42&quux"),
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "\\url{https://www.example.com/foo/?bar=baz&inga=42&quux}")),
+                Arguments.of(
+                        new BibEntry()
+                                .withField(
+                                        StandardField.URL,
+                                        "https://www.example.com/foo/?bar=baz&inga=42&quux"),
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "https://www.example.com/foo/?bar=baz&inga=42&quux")),
+
+                // Expected entry returns formatted the url-date in the Urldate field.
+                Arguments.of(
+                        new BibEntry()
+                                .withField(StandardField.URL, "http://142.42.1.1:8080")
+                                .withField(StandardField.URLDATE, "2021-01-15"),
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "\\url{http://142.42.1.1:8080}, accessed on January 15, 2021")),
+
+                // Input entry doesn't hold any URL in the Note field.
+                Arguments.of(
+                        new BibEntry().withField(StandardField.NOTE, "Accessed on 2015-01-15"),
+                        new BibEntry().withField(StandardField.NOTE, "Accessed on 2015-01-15")),
+
+                // Input entry has multiple url-dates stored in the Note field.
+                Arguments.of(
+                        new BibEntry()
+                                .withField(StandardField.URL, "http://142.42.1.1:8080")
+                                .withField(StandardField.URLDATE, "2021-01-15")
+                                .withField(StandardField.NOTE, "visited on February 12, 2017"),
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "\\url{http://142.42.1.1:8080}, accessed on January 15, 2021, visited on February 12, 2017")),
+
+                // Input entry holds the same url-date in both Note and Urldate field.
+                Arguments.of(
+                        new BibEntry()
+                                .withField(StandardField.URL, "http://142.42.1.1:8080")
+                                .withField(StandardField.URLDATE, "2015-01-15"),
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "\\url{http://142.42.1.1:8080}, visited on 2015.01.15")
+                                .withField(StandardField.URLDATE, "2015-01-15")),
+
+                // Input Note field has several values stored.
+                Arguments.of(
+                        new BibEntry()
+                                .withField(StandardField.URL, "https://example.org")
+                                .withField(StandardField.URLDATE, "2023-04-11")
+                                .withField(StandardField.NOTE, "cited by Kramer"),
+                        new BibEntry()
+                                .withField(
+                                        StandardField.NOTE,
+                                        "\\url{https://example.org}, cited by Kramer, accessed on 2023-04-11"),
+                        // test with no fields present
+                        Arguments.of(new BibEntry(), new BibEntry())));
     }
 }
diff --git a/src/test/java/org/jabref/logic/crawler/CrawlerTest.java b/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
index 9fcf26c2665a..1f7faf257a9a 100644
--- a/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
+++ b/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
@@ -1,12 +1,13 @@
 package org.jabref.logic.crawler;
 
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
+import static org.jabref.logic.citationkeypattern.CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
+import org.eclipse.jgit.api.Git;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPatterns;
 import org.jabref.logic.exporter.SaveConfiguration;
@@ -19,17 +20,15 @@
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.testutils.category.FetcherTest;
-
-import org.eclipse.jgit.api.Git;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.jabref.logic.citationkeypattern.CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
 
 /**
  * Integration test of the components used for SLR support
@@ -37,8 +36,7 @@
  */
 @FetcherTest
 class CrawlerTest {
-    @TempDir
-    Path tempRepositoryDirectory;
+    @TempDir Path tempRepositoryDirectory;
     ImportFormatPreferences importFormatPreferences;
     ImporterPreferences importerPreferences;
     SaveConfiguration saveConfiguration;
@@ -56,17 +54,18 @@ class CrawlerTest {
     void setUp() throws Exception {
         setUpRepository();
 
-        CitationKeyPatternPreferences citationKeyPatternPreferences = new CitationKeyPatternPreferences(
-                false,
-                false,
-                false,
-                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
-                "",
-                "",
-                DEFAULT_UNWANTED_CHARACTERS,
-                GlobalCitationKeyPatterns.fromPattern("[auth][year]"),
-                "",
-                ',');
+        CitationKeyPatternPreferences citationKeyPatternPreferences =
+                new CitationKeyPatternPreferences(
+                        false,
+                        false,
+                        false,
+                        CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
+                        "",
+                        "",
+                        DEFAULT_UNWANTED_CHARACTERS,
+                        GlobalCitationKeyPatterns.fromPattern("[auth][year]"),
+                        "",
+                        ',');
 
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         importerPreferences = mock(ImporterPreferences.class);
@@ -75,49 +74,67 @@ void setUp() throws Exception {
         when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
-        when(preferences.getCitationKeyPatternPreferences()).thenReturn(citationKeyPatternPreferences);
+        when(preferences.getCitationKeyPatternPreferences())
+                .thenReturn(citationKeyPatternPreferences);
 
         entryTypesManager = new BibEntryTypesManager();
     }
 
     private void setUpRepository() throws Exception {
-        Git git = Git.init()
-                     .setDirectory(tempRepositoryDirectory.toFile())
-                     .call();
+        Git git = Git.init().setDirectory(tempRepositoryDirectory.toFile()).call();
         setUpTestStudyDefinitionFile();
-        git.add()
-           .addFilepattern(".")
-           .call();
-        git.commit()
-           .setMessage("Initialize")
-           .call();
+        git.add().addFilepattern(".").call();
+        git.commit().setMessage("Initialize").call();
         git.close();
     }
 
     private void setUpTestStudyDefinitionFile() throws Exception {
-        Path destination = tempRepositoryDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME);
-        URL studyDefinition = this.getClass().getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
+        Path destination =
+                tempRepositoryDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME);
+        URL studyDefinition =
+                this.getClass().getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
         FileUtil.copyFile(Path.of(studyDefinition.toURI()), destination, false);
     }
 
     @Test
     void whetherAllFilesAreCreated() throws Exception {
-        Crawler testCrawler = new Crawler(getPathToStudyDefinitionFile(),
-                gitHandler,
-                preferences,
-                entryTypesManager,
-                new DummyFileUpdateMonitor());
+        Crawler testCrawler =
+                new Crawler(
+                        getPathToStudyDefinitionFile(),
+                        gitHandler,
+                        preferences,
+                        entryTypesManager,
+                        new DummyFileUpdateMonitor());
 
         testCrawler.performCrawl();
 
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum")));
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing")));
-
-        List<String> filesToAssert = List.of("ArXiv.bib", "Springer.bib", "result.bib", "Medline_PubMed.bib");
+        assertTrue(
+                Files.exists(
+                        Path.of(
+                                tempRepositoryDirectory.toString(),
+                                hashCodeQuantum + " - Quantum")));
+        assertTrue(
+                Files.exists(
+                        Path.of(
+                                tempRepositoryDirectory.toString(),
+                                hashCodeCloudComputing + " - Cloud Computing")));
+
+        List<String> filesToAssert =
+                List.of("ArXiv.bib", "Springer.bib", "result.bib", "Medline_PubMed.bib");
         filesToAssert.forEach(
                 fileName -> {
-                    assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum", fileName)));
-                    assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing", fileName)));
+                    assertTrue(
+                            Files.exists(
+                                    Path.of(
+                                            tempRepositoryDirectory.toString(),
+                                            hashCodeQuantum + " - Quantum",
+                                            fileName)));
+                    assertTrue(
+                            Files.exists(
+                                    Path.of(
+                                            tempRepositoryDirectory.toString(),
+                                            hashCodeCloudComputing + " - Cloud Computing",
+                                            fileName)));
                 });
         assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), "studyResult.bib")));
     }
diff --git a/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java b/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java
index e5c0ce3cf756..48384c4abcbf 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java
@@ -1,9 +1,8 @@
 package org.jabref.logic.crawler;
 
-import java.net.URL;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -17,23 +16,22 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.net.URL;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Collectors;
 
 class StudyCatalogToFetcherConverterTest {
     SaveConfiguration saveConfiguration;
     CliPreferences preferences;
     BibEntryTypesManager entryTypesManager;
     SlrGitHandler gitHandler;
-    @TempDir
-    Path tempRepositoryDirectory;
+    @TempDir Path tempRepositoryDirectory;
 
     @BeforeEach
     void setUpMocks() {
@@ -41,7 +39,8 @@ void setUpMocks() {
         saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
         when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
         when(preferences.getBibEntryPreferences().getKeywordSeparator()).thenReturn(',');
-        when(preferences.getImporterPreferences().getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        when(preferences.getImporterPreferences().getApiKeys())
+                .thenReturn(FXCollections.emptyObservableSet());
 
         entryTypesManager = new BibEntryTypesManager();
         gitHandler = mock(SlrGitHandler.class, Answers.RETURNS_DEFAULTS);
@@ -49,29 +48,32 @@ void setUpMocks() {
 
     @Test
     void getActiveFetcherInstances() throws Exception {
-        Path studyDefinition = tempRepositoryDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME);
+        Path studyDefinition =
+                tempRepositoryDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME);
         copyTestStudyDefinitionFileIntoDirectory(studyDefinition);
 
-        StudyRepository studyRepository = new StudyRepository(
-                tempRepositoryDirectory,
-                gitHandler,
-                preferences,
-                new DummyFileUpdateMonitor(),
-                entryTypesManager);
-        StudyCatalogToFetcherConverter converter = new StudyCatalogToFetcherConverter(
-                studyRepository.getActiveLibraryEntries(),
-                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        StudyRepository studyRepository =
+                new StudyRepository(
+                        tempRepositoryDirectory,
+                        gitHandler,
+                        preferences,
+                        new DummyFileUpdateMonitor(),
+                        entryTypesManager);
+        StudyCatalogToFetcherConverter converter =
+                new StudyCatalogToFetcherConverter(
+                        studyRepository.getActiveLibraryEntries(),
+                        mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS));
         List<SearchBasedFetcher> result = converter.getActiveFetchers();
 
         assertEquals(
                 List.of("Springer", "ArXiv", "Medline/PubMed"),
-                result.stream().map(SearchBasedFetcher::getName).collect(Collectors.toList())
-        );
+                result.stream().map(SearchBasedFetcher::getName).collect(Collectors.toList()));
     }
 
     private void copyTestStudyDefinitionFileIntoDirectory(Path destination) throws Exception {
-        URL studyDefinition = this.getClass().getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
+        URL studyDefinition =
+                this.getClass().getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
         FileUtil.copyFile(Path.of(studyDefinition.toURI()), destination, false);
     }
 }
diff --git a/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java b/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
index 057bfa069ba9..c82e71ef8e34 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.crawler;
 
-import java.io.IOException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
+import static org.jabref.logic.citationkeypattern.CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -29,19 +29,18 @@
 import org.jabref.model.study.FetchResult;
 import org.jabref.model.study.QueryResult;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.jabref.logic.citationkeypattern.CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 
 class StudyRepositoryTest {
     private static final String NON_EXISTING_DIRECTORY = "nonExistingTestRepositoryDirectory";
@@ -51,8 +50,7 @@ class StudyRepositoryTest {
     ImportFormatPreferences importFormatPreferences;
     SaveConfiguration saveConfiguration;
     BibEntryTypesManager entryTypesManager;
-    @TempDir
-    Path tempRepositoryDirectory;
+    @TempDir Path tempRepositoryDirectory;
     StudyRepository studyRepository;
     SlrGitHandler gitHandler = mock(SlrGitHandler.class, Answers.RETURNS_DEFAULTS);
     String hashCodeQuantum = String.valueOf("Quantum".hashCode());
@@ -68,36 +66,44 @@ void setUpMocks() throws Exception {
         saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         preferences = mock(CliPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        citationKeyPatternPreferences = new CitationKeyPatternPreferences(
-                false,
-                false,
-                false,
-                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
-                "",
-                "",
-                DEFAULT_UNWANTED_CHARACTERS,
-                GlobalCitationKeyPatterns.fromPattern("[auth][year]"),
-                "",
-                ',');
-        when(preferences.getCitationKeyPatternPreferences()).thenReturn(citationKeyPatternPreferences);
-        when(preferences.getImporterPreferences().getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        citationKeyPatternPreferences =
+                new CitationKeyPatternPreferences(
+                        false,
+                        false,
+                        false,
+                        CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
+                        "",
+                        "",
+                        DEFAULT_UNWANTED_CHARACTERS,
+                        GlobalCitationKeyPatterns.fromPattern("[auth][year]"),
+                        "",
+                        ',');
+        when(preferences.getCitationKeyPatternPreferences())
+                .thenReturn(citationKeyPatternPreferences);
+        when(preferences.getImporterPreferences().getApiKeys())
+                .thenReturn(FXCollections.emptyObservableSet());
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         when(preferences.getImportFormatPreferences()).thenReturn(importFormatPreferences);
-        when(preferences.getTimestampPreferences().getTimestampField()).then(invocation -> StandardField.TIMESTAMP);
+        when(preferences.getTimestampPreferences().getTimestampField())
+                .then(invocation -> StandardField.TIMESTAMP);
         entryTypesManager = new BibEntryTypesManager();
         getTestStudyRepository();
     }
 
     @Test
     void providePathToNonExistentRepositoryThrowsException() {
-        Path nonExistingRepositoryDirectory = tempRepositoryDirectory.resolve(NON_EXISTING_DIRECTORY);
+        Path nonExistingRepositoryDirectory =
+                tempRepositoryDirectory.resolve(NON_EXISTING_DIRECTORY);
 
-        assertThrows(IOException.class, () -> new StudyRepository(
-                nonExistingRepositoryDirectory,
-                gitHandler,
-                preferences,
-                new DummyFileUpdateMonitor(),
-                entryTypesManager));
+        assertThrows(
+                IOException.class,
+                () ->
+                        new StudyRepository(
+                                nonExistingRepositoryDirectory,
+                                gitHandler,
+                                preferences,
+                                new DummyFileUpdateMonitor(),
+                                entryTypesManager));
     }
 
     /**
@@ -106,18 +112,75 @@ void providePathToNonExistentRepositoryThrowsException() {
     @Test
     void repositoryStructureCorrectlyCreated() {
         // When repository is instantiated the directory structure is created
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum")));
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing")));
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeSoftwareEngineering + " - Software Engineering")));
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum", "ArXiv.bib")));
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing", "ArXiv.bib")));
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeSoftwareEngineering + " - Software Engineering", "ArXiv.bib")));
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum", "Springer.bib")));
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing", "Springer.bib")));
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeSoftwareEngineering + " - Software Engineering", "Springer.bib")));
-        assertFalse(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum", "IEEEXplore.bib")));
-        assertFalse(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing", "IEEEXplore.bib")));
-        assertFalse(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeSoftwareEngineering + " - Software Engineering", "IEEEXplore.bib")));
+        assertTrue(
+                Files.exists(
+                        Path.of(
+                                tempRepositoryDirectory.toString(),
+                                hashCodeQuantum + " - Quantum")));
+        assertTrue(
+                Files.exists(
+                        Path.of(
+                                tempRepositoryDirectory.toString(),
+                                hashCodeCloudComputing + " - Cloud Computing")));
+        assertTrue(
+                Files.exists(
+                        Path.of(
+                                tempRepositoryDirectory.toString(),
+                                hashCodeSoftwareEngineering + " - Software Engineering")));
+        assertTrue(
+                Files.exists(
+                        Path.of(
+                                tempRepositoryDirectory.toString(),
+                                hashCodeQuantum + " - Quantum",
+                                "ArXiv.bib")));
+        assertTrue(
+                Files.exists(
+                        Path.of(
+                                tempRepositoryDirectory.toString(),
+                                hashCodeCloudComputing + " - Cloud Computing",
+                                "ArXiv.bib")));
+        assertTrue(
+                Files.exists(
+                        Path.of(
+                                tempRepositoryDirectory.toString(),
+                                hashCodeSoftwareEngineering + " - Software Engineering",
+                                "ArXiv.bib")));
+        assertTrue(
+                Files.exists(
+                        Path.of(
+                                tempRepositoryDirectory.toString(),
+                                hashCodeQuantum + " - Quantum",
+                                "Springer.bib")));
+        assertTrue(
+                Files.exists(
+                        Path.of(
+                                tempRepositoryDirectory.toString(),
+                                hashCodeCloudComputing + " - Cloud Computing",
+                                "Springer.bib")));
+        assertTrue(
+                Files.exists(
+                        Path.of(
+                                tempRepositoryDirectory.toString(),
+                                hashCodeSoftwareEngineering + " - Software Engineering",
+                                "Springer.bib")));
+        assertFalse(
+                Files.exists(
+                        Path.of(
+                                tempRepositoryDirectory.toString(),
+                                hashCodeQuantum + " - Quantum",
+                                "IEEEXplore.bib")));
+        assertFalse(
+                Files.exists(
+                        Path.of(
+                                tempRepositoryDirectory.toString(),
+                                hashCodeCloudComputing + " - Cloud Computing",
+                                "IEEEXplore.bib")));
+        assertFalse(
+                Files.exists(
+                        Path.of(
+                                tempRepositoryDirectory.toString(),
+                                hashCodeSoftwareEngineering + " - Software Engineering",
+                                "IEEEXplore.bib")));
     }
 
     /**
@@ -126,7 +189,8 @@ void repositoryStructureCorrectlyCreated() {
     @Test
     void bibEntriesCorrectlyStored() throws Exception {
         setUpTestResultFile();
-        List<BibEntry> result = studyRepository.getFetcherResultEntries("Quantum", "ArXiv").getEntries();
+        List<BibEntry> result =
+                studyRepository.getFetcherResultEntries("Quantum", "ArXiv").getEntries();
         assertEquals(getArXivQuantumMockResults(), result);
     }
 
@@ -136,9 +200,19 @@ void fetcherResultsPersistedCorrectly() throws Exception {
 
         studyRepository.persist(mockResults);
 
-        assertEquals(getArXivQuantumMockResults(), getTestStudyRepository().getFetcherResultEntries("Quantum", "ArXiv").getEntries());
-        assertEquals(getSpringerQuantumMockResults(), getTestStudyRepository().getFetcherResultEntries("Quantum", "Springer").getEntries());
-        assertEquals(getSpringerCloudComputingMockResults(), getTestStudyRepository().getFetcherResultEntries("Cloud Computing", "Springer").getEntries());
+        assertEquals(
+                getArXivQuantumMockResults(),
+                getTestStudyRepository().getFetcherResultEntries("Quantum", "ArXiv").getEntries());
+        assertEquals(
+                getSpringerQuantumMockResults(),
+                getTestStudyRepository()
+                        .getFetcherResultEntries("Quantum", "Springer")
+                        .getEntries());
+        assertEquals(
+                getSpringerCloudComputingMockResults(),
+                getTestStudyRepository()
+                        .getFetcherResultEntries("Cloud Computing", "Springer")
+                        .getEntries());
     }
 
     @Test
@@ -152,25 +226,31 @@ void mergedResultsPersistedCorrectly() throws Exception {
         studyRepository.persist(mockResults);
 
         // All Springer results are duplicates for "Quantum"
-        assertEquals(expected, getTestStudyRepository().getQueryResultEntries("Quantum").getEntries());
-        assertEquals(getSpringerCloudComputingMockResults(), getTestStudyRepository().getQueryResultEntries("Cloud Computing").getEntries());
+        assertEquals(
+                expected, getTestStudyRepository().getQueryResultEntries("Quantum").getEntries());
+        assertEquals(
+                getSpringerCloudComputingMockResults(),
+                getTestStudyRepository().getQueryResultEntries("Cloud Computing").getEntries());
     }
 
     @Test
     void studyResultsPersistedCorrectly() throws Exception {
         List<QueryResult> mockResults = getMockResults();
         studyRepository.persist(mockResults);
-        assertEquals(new HashSet<>(getNonDuplicateBibEntryResult().getEntries()), new HashSet<>(getTestStudyRepository().getStudyResultEntries().getEntries()));
+        assertEquals(
+                new HashSet<>(getNonDuplicateBibEntryResult().getEntries()),
+                new HashSet<>(getTestStudyRepository().getStudyResultEntries().getEntries()));
     }
 
     private StudyRepository getTestStudyRepository() throws Exception {
         setUpTestStudyDefinitionFile();
-        studyRepository = new StudyRepository(
-                tempRepositoryDirectory,
-                gitHandler,
-                preferences,
-                new DummyFileUpdateMonitor(),
-                entryTypesManager);
+        studyRepository =
+                new StudyRepository(
+                        tempRepositoryDirectory,
+                        gitHandler,
+                        preferences,
+                        new DummyFileUpdateMonitor(),
+                        entryTypesManager);
         return studyRepository;
     }
 
@@ -178,8 +258,10 @@ private StudyRepository getTestStudyRepository() throws Exception {
      * Copies the study definition file into the test repository
      */
     private void setUpTestStudyDefinitionFile() throws Exception {
-        Path destination = tempRepositoryDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME);
-        URL studyDefinition = this.getClass().getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
+        Path destination =
+                tempRepositoryDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME);
+        URL studyDefinition =
+                this.getClass().getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
         FileUtil.copyFile(Path.of(studyDefinition.toURI()), destination, false);
     }
 
@@ -188,7 +270,8 @@ private void setUpTestStudyDefinitionFile() throws Exception {
      * The repository has to exist before this method is called.
      */
     private void setUpTestResultFile() throws Exception {
-        Path queryDirectory = Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum");
+        Path queryDirectory =
+                Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum");
         Path resultFileLocation = Path.of(queryDirectory.toString(), "ArXiv" + ".bib");
         URL resultFile = this.getClass().getResource("ArXivQuantumMock.bib");
         FileUtil.copyFile(Path.of(resultFile.toURI()), resultFileLocation, true);
@@ -199,7 +282,9 @@ private void setUpTestResultFile() throws Exception {
 
     private BibDatabase getNonDuplicateBibEntryResult() {
         BibDatabase mockResults = new BibDatabase(getSpringerCloudComputingMockResults());
-        DatabaseMerger merger = new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
+        DatabaseMerger merger =
+                new DatabaseMerger(
+                        importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
         merger.merge(mockResults, new BibDatabase(getSpringerQuantumMockResults()));
         merger.merge(mockResults, new BibDatabase(getArXivQuantumMockResults()));
         return mockResults;
@@ -207,10 +292,25 @@ private BibDatabase getNonDuplicateBibEntryResult() {
 
     private List<QueryResult> getMockResults() {
         QueryResult resultQuantum =
-                new QueryResult("Quantum", List.of(
-                        new FetchResult("ArXiv", new BibDatabase(stripCitationKeys(getArXivQuantumMockResults()))),
-                        new FetchResult("Springer", new BibDatabase(stripCitationKeys(getSpringerQuantumMockResults())))));
-        QueryResult resultCloudComputing = new QueryResult("Cloud Computing", List.of(new FetchResult("Springer", new BibDatabase(getSpringerCloudComputingMockResults()))));
+                new QueryResult(
+                        "Quantum",
+                        List.of(
+                                new FetchResult(
+                                        "ArXiv",
+                                        new BibDatabase(
+                                                stripCitationKeys(getArXivQuantumMockResults()))),
+                                new FetchResult(
+                                        "Springer",
+                                        new BibDatabase(
+                                                stripCitationKeys(
+                                                        getSpringerQuantumMockResults())))));
+        QueryResult resultCloudComputing =
+                new QueryResult(
+                        "Cloud Computing",
+                        List.of(
+                                new FetchResult(
+                                        "Springer",
+                                        new BibDatabase(getSpringerCloudComputingMockResults()))));
         return List.of(resultQuantum, resultCloudComputing);
     }
 
@@ -223,20 +323,27 @@ private List<BibEntry> stripCitationKeys(List<BibEntry> entries) {
     }
 
     private List<BibEntry> getArXivQuantumMockResults() {
-        BibEntry entry1 = new BibEntry()
-                .withCitationKey("Blaha")
-                .withField(StandardField.AUTHOR, "Stephen Blaha")
-                .withField(StandardField.TITLE, "Quantum Computers and Quantum Computer Languages: Quantum Assembly Language and Quantum C Language");
+        BibEntry entry1 =
+                new BibEntry()
+                        .withCitationKey("Blaha")
+                        .withField(StandardField.AUTHOR, "Stephen Blaha")
+                        .withField(
+                                StandardField.TITLE,
+                                "Quantum Computers and Quantum Computer Languages: Quantum Assembly Language and Quantum C Language");
         entry1.setType(StandardEntryType.Article);
-        BibEntry entry2 = new BibEntry()
-                .withCitationKey("Kaye")
-                .withField(StandardField.AUTHOR, "Phillip Kaye and Michele Mosca")
-                .withField(StandardField.TITLE, "Quantum Networks for Generating Arbitrary Quantum States");
+        BibEntry entry2 =
+                new BibEntry()
+                        .withCitationKey("Kaye")
+                        .withField(StandardField.AUTHOR, "Phillip Kaye and Michele Mosca")
+                        .withField(
+                                StandardField.TITLE,
+                                "Quantum Networks for Generating Arbitrary Quantum States");
         entry2.setType(StandardEntryType.Article);
-        BibEntry entry3 = new BibEntry()
-                .withCitationKey("Watrous")
-                .withField(StandardField.AUTHOR, "John Watrous")
-                .withField(StandardField.TITLE, "Quantum Computational Complexity");
+        BibEntry entry3 =
+                new BibEntry()
+                        .withCitationKey("Watrous")
+                        .withField(StandardField.AUTHOR, "John Watrous")
+                        .withField(StandardField.TITLE, "Quantum Computational Complexity");
         entry3.setType(StandardEntryType.Article);
 
         return List.of(entry1, entry2, entry3);
@@ -244,37 +351,55 @@ private List<BibEntry> getArXivQuantumMockResults() {
 
     private List<BibEntry> getSpringerQuantumMockResults() {
         // This is a duplicate of entry 1 of ArXiv
-        BibEntry entry1 = new BibEntry()
-                .withCitationKey("Blaha")
-                .withField(StandardField.AUTHOR, "Stephen Blaha")
-                .withField(StandardField.TITLE, "Quantum Computers and Quantum Computer Languages: Quantum Assembly Language and Quantum C Language");
+        BibEntry entry1 =
+                new BibEntry()
+                        .withCitationKey("Blaha")
+                        .withField(StandardField.AUTHOR, "Stephen Blaha")
+                        .withField(
+                                StandardField.TITLE,
+                                "Quantum Computers and Quantum Computer Languages: Quantum Assembly Language and Quantum C Language");
         entry1.setType(StandardEntryType.Article);
-        BibEntry entry2 = new BibEntry()
-                .withCitationKey("Kroeger")
-                .withField(StandardField.AUTHOR, "H. Kröger")
-                .withField(StandardField.TITLE, "Nonlinear Dynamics In Quantum Physics -- Quantum Chaos and Quantum Instantons");
+        BibEntry entry2 =
+                new BibEntry()
+                        .withCitationKey("Kroeger")
+                        .withField(StandardField.AUTHOR, "H. Kröger")
+                        .withField(
+                                StandardField.TITLE,
+                                "Nonlinear Dynamics In Quantum Physics -- Quantum Chaos and Quantum Instantons");
         entry2.setType(StandardEntryType.Article);
-        BibEntry entry3 = new BibEntry()
-                .withField(StandardField.AUTHOR, "Zieliński, Cezary")
-                .withField(StandardField.TITLE, "Automatic Control, Robotics, and Information Processing");
+        BibEntry entry3 =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "Zieliński, Cezary")
+                        .withField(
+                                StandardField.TITLE,
+                                "Automatic Control, Robotics, and Information Processing");
         entry3.setType(StandardEntryType.Article);
 
-        CitationKeyGenerator citationKeyGenerator = new CitationKeyGenerator(new BibDatabaseContext(), citationKeyPatternPreferences);
+        CitationKeyGenerator citationKeyGenerator =
+                new CitationKeyGenerator(new BibDatabaseContext(), citationKeyPatternPreferences);
         citationKeyGenerator.generateAndSetKey(entry3);
 
         return List.of(entry1, entry2, entry3);
     }
 
     private List<BibEntry> getSpringerCloudComputingMockResults() {
-        BibEntry entry1 = new BibEntry()
-                .withCitationKey("Gritzalis")
-                .withField(StandardField.AUTHOR, "Gritzalis, Dimitris and Stergiopoulos, George and Vasilellis, Efstratios and Anagnostopoulou, Argiro")
-                .withField(StandardField.TITLE, "Readiness Exercises: Are Risk Assessment Methodologies Ready for the Cloud?");
+        BibEntry entry1 =
+                new BibEntry()
+                        .withCitationKey("Gritzalis")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Gritzalis, Dimitris and Stergiopoulos, George and Vasilellis, Efstratios and Anagnostopoulou, Argiro")
+                        .withField(
+                                StandardField.TITLE,
+                                "Readiness Exercises: Are Risk Assessment Methodologies Ready for the Cloud?");
         entry1.setType(StandardEntryType.Article);
-        BibEntry entry2 = new BibEntry()
-                .withCitationKey("Rangras")
-                .withField(StandardField.AUTHOR, "Rangras, Jimit and Bhavsar, Sejal")
-                .withField(StandardField.TITLE, "Design of Framework for Disaster Recovery in Cloud Computing");
+        BibEntry entry2 =
+                new BibEntry()
+                        .withCitationKey("Rangras")
+                        .withField(StandardField.AUTHOR, "Rangras, Jimit and Bhavsar, Sejal")
+                        .withField(
+                                StandardField.TITLE,
+                                "Design of Framework for Disaster Recovery in Cloud Computing");
         entry2.setType(StandardEntryType.Article);
         return List.of(entry1, entry2);
     }
diff --git a/src/test/java/org/jabref/logic/crawler/StudyYamlParserTest.java b/src/test/java/org/jabref/logic/crawler/StudyYamlParserTest.java
index 1b82eae5741d..d2d5c4fdc1e4 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyYamlParserTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyYamlParserTest.java
@@ -1,52 +1,69 @@
 package org.jabref.logic.crawler;
 
-import java.net.URL;
-import java.nio.file.Path;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.study.Study;
 import org.jabref.model.study.StudyDatabase;
 import org.jabref.model.study.StudyQuery;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.net.URL;
+import java.nio.file.Path;
+import java.util.List;
 
 class StudyYamlParserTest {
-    @TempDir
-    static Path testDirectory;
+    @TempDir static Path testDirectory;
 
     Study expectedStudy;
 
     @BeforeEach
     void setupStudy() throws Exception {
         Path destination = testDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME);
-        URL studyDefinition = StudyYamlParser.class.getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
+        URL studyDefinition =
+                StudyYamlParser.class.getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
         FileUtil.copyFile(Path.of(studyDefinition.toURI()), destination, true);
 
         List<String> authors = List.of("Jab Ref");
         String studyName = "TestStudyName";
         List<String> researchQuestions = List.of("Question1", "Question2");
-        List<StudyQuery> queryEntries = List.of(new StudyQuery("Quantum"), new StudyQuery("Cloud Computing"), new StudyQuery("\"Software Engineering\""));
-        List<StudyDatabase> libraryEntries = List.of(new StudyDatabase("Springer", true), new StudyDatabase("ArXiv", true),
-                new StudyDatabase("Medline/PubMed", true), new StudyDatabase("IEEEXplore", false));
+        List<StudyQuery> queryEntries =
+                List.of(
+                        new StudyQuery("Quantum"),
+                        new StudyQuery("Cloud Computing"),
+                        new StudyQuery("\"Software Engineering\""));
+        List<StudyDatabase> libraryEntries =
+                List.of(
+                        new StudyDatabase("Springer", true),
+                        new StudyDatabase("ArXiv", true),
+                        new StudyDatabase("Medline/PubMed", true),
+                        new StudyDatabase("IEEEXplore", false));
 
-        expectedStudy = new Study(authors, studyName, researchQuestions, queryEntries, libraryEntries);
+        expectedStudy =
+                new Study(authors, studyName, researchQuestions, queryEntries, libraryEntries);
     }
 
     @Test
     void parseStudyFileSuccessfully() throws Exception {
-        Study study = new StudyYamlParser().parseStudyYamlFile(testDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME));
+        Study study =
+                new StudyYamlParser()
+                        .parseStudyYamlFile(
+                                testDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME));
         assertEquals(expectedStudy, study);
     }
 
     @Test
     void writeStudyFileSuccessfully() throws Exception {
-        new StudyYamlParser().writeStudyYamlFile(expectedStudy, testDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME));
-        Study study = new StudyYamlParser().parseStudyYamlFile(testDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME));
+        new StudyYamlParser()
+                .writeStudyYamlFile(
+                        expectedStudy,
+                        testDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME));
+        Study study =
+                new StudyYamlParser()
+                        .parseStudyYamlFile(
+                                testDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME));
         assertEquals(expectedStudy, study);
     }
 
@@ -54,7 +71,9 @@ void writeStudyFileSuccessfully() throws Exception {
     void readsJabRef57StudySuccessfully() throws Exception {
         // The field "last-search-date" was removed
         // If the field is "just" removed from the datamodel, one gets following exception:
-        //   com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException: Unrecognized field "last-search-date" (class org.jabref.model.study.Study), not marked as ignorable (5 known properties: "authors", "research-questions", "queries", "title", "databases"])
+        //   com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException: Unrecognized field
+        // "last-search-date" (class org.jabref.model.study.Study), not marked as ignorable (5 known
+        // properties: "authors", "research-questions", "queries", "title", "databases"])
         // This tests ensures that this exception does not occur
         URL studyDefinition = StudyYamlParser.class.getResource("study-jabref-5.7.yml");
         Study study = new StudyYamlParser().parseStudyYamlFile(Path.of(studyDefinition.toURI()));
diff --git a/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java b/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
index d761d7b2889b..13d9dfa0c1aa 100644
--- a/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
+++ b/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
@@ -1,7 +1,8 @@
 package org.jabref.logic.database;
 
-import java.util.List;
-import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -16,14 +17,12 @@
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.metadata.ContentSelector;
 import org.jabref.model.metadata.MetaData;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.List;
+import java.util.stream.Collectors;
 
 class DatabaseMergerTest {
     private ImportFormatPreferences importFormatPreferences;
@@ -37,19 +36,29 @@ void setUp() {
     @Test
     void mergeAddsNonDuplicateEntries() {
         // Entries 1 and 2 are identical
-        BibEntry entry1 = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Phillip Kaye and Michele Mosca")
-                .withField(StandardField.TITLE, "Quantum Networks for Generating Arbitrary Quantum States");
-        BibEntry entry2 = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Phillip Kaye and Michele Mosca")
-                .withField(StandardField.TITLE, "Quantum Networks for Generating Arbitrary Quantum States");
-        BibEntry entry3 = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Stephen Blaha")
-                .withField(StandardField.TITLE, "Quantum Computers and Quantum Computer Languages: Quantum Assembly Language and Quantum C Language");
+        BibEntry entry1 =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Phillip Kaye and Michele Mosca")
+                        .withField(
+                                StandardField.TITLE,
+                                "Quantum Networks for Generating Arbitrary Quantum States");
+        BibEntry entry2 =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Phillip Kaye and Michele Mosca")
+                        .withField(
+                                StandardField.TITLE,
+                                "Quantum Networks for Generating Arbitrary Quantum States");
+        BibEntry entry3 =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Stephen Blaha")
+                        .withField(
+                                StandardField.TITLE,
+                                "Quantum Computers and Quantum Computer Languages: Quantum Assembly Language and Quantum C Language");
 
         BibDatabase database = new BibDatabase(List.of(entry1));
         BibDatabase other = new BibDatabase(List.of(entry2, entry3));
-        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).merge(database, other);
+        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator())
+                .merge(database, other);
 
         assertEquals(List.of(entry1, entry3), database.getEntries());
     }
@@ -57,30 +66,35 @@ void mergeAddsNonDuplicateEntries() {
     @Test
     void mergeAddsWithDuplicateEntries() {
         // Entries 1 and 2 are identical,  Entries 3 and 4 are identical
-        BibEntry entry1 = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.AUTHOR, "Joshua Bloch")
-                .withField(StandardField.TITLE, "Effective Java")
-                .withField(StandardField.ISBN, "0-201-31005-8");
-        BibEntry entry2 = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.AUTHOR, "Joshua J. Bloch")
-                .withField(StandardField.TITLE, "Effective Java:Programming Language Guide")
-                .withField(StandardField.ISBN, "0-201-31005-8")
-                .withField(StandardField.YEAR, "2001")
-                .withField(StandardField.EDITION, "1");
-        BibEntry entry3 = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.AUTHOR, "Joshua J. Bloch")
-                .withField(StandardField.TITLE, "Effective Java")
-                .withField(StandardField.ISBN, "978-0-321-35668-0")
-                .withField(StandardField.YEAR, "2008")
-                .withField(StandardField.EDITION, "2");
-        BibEntry entry4 = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.AUTHOR, "Joshua Bloch")
-                .withField(StandardField.TITLE, "Effective Java:Programming Language Guide")
-                .withField(StandardField.ISBN, "978-0-321-35668-0");
+        BibEntry entry1 =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.AUTHOR, "Joshua Bloch")
+                        .withField(StandardField.TITLE, "Effective Java")
+                        .withField(StandardField.ISBN, "0-201-31005-8");
+        BibEntry entry2 =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.AUTHOR, "Joshua J. Bloch")
+                        .withField(StandardField.TITLE, "Effective Java:Programming Language Guide")
+                        .withField(StandardField.ISBN, "0-201-31005-8")
+                        .withField(StandardField.YEAR, "2001")
+                        .withField(StandardField.EDITION, "1");
+        BibEntry entry3 =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.AUTHOR, "Joshua J. Bloch")
+                        .withField(StandardField.TITLE, "Effective Java")
+                        .withField(StandardField.ISBN, "978-0-321-35668-0")
+                        .withField(StandardField.YEAR, "2008")
+                        .withField(StandardField.EDITION, "2");
+        BibEntry entry4 =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.AUTHOR, "Joshua Bloch")
+                        .withField(StandardField.TITLE, "Effective Java:Programming Language Guide")
+                        .withField(StandardField.ISBN, "978-0-321-35668-0");
 
         BibDatabase database = new BibDatabase(List.of(entry1, entry4));
         BibDatabase other = new BibDatabase(List.of(entry2, entry3));
-        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).merge(database, other);
+        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator())
+                .merge(database, other);
         assertEquals(List.of(entry1, entry4), database.getEntries());
     }
 
@@ -103,17 +117,23 @@ void mergeBibTexStringsWithSameNameAreImportedWithModifiedName() {
         source1.addString(sourceString1);
         source2.addString(sourceString2);
 
-        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).mergeStrings(target, source1);
-        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).mergeStrings(target, source2);
+        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator())
+                .mergeStrings(target, source1);
+        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator())
+                .mergeStrings(target, source2);
         // Use string representation to compare since the id will not match
-        List<String> resultStringsSorted = target.getStringValues()
-                .stream()
-                .map(BibtexString::toString)
-                .sorted()
-                .collect(Collectors.toList());
-
-        assertEquals(List.of(targetString.toString(), importedBibTeXString1.toString(),
-                importedBibTeXString2.toString()), resultStringsSorted);
+        List<String> resultStringsSorted =
+                target.getStringValues().stream()
+                        .map(BibtexString::toString)
+                        .sorted()
+                        .collect(Collectors.toList());
+
+        assertEquals(
+                List.of(
+                        targetString.toString(),
+                        importedBibTeXString1.toString(),
+                        importedBibTeXString2.toString()),
+                resultStringsSorted);
     }
 
     @Test
@@ -132,11 +152,12 @@ void mergeBibTexStringsWithSameNameAndContentAreIgnored() {
         source.addString(sourceString1);
         source.addString(sourceString2);
 
-        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).mergeStrings(target, source);
-        List<BibtexString> resultStringsSorted = target.getStringValues()
-                .stream()
-                .sorted(new BibtexStringComparator(false)::compare)
-                .collect(Collectors.toList());
+        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator())
+                .mergeStrings(target, source);
+        List<BibtexString> resultStringsSorted =
+                target.getStringValues().stream()
+                        .sorted(new BibtexStringComparator(false)::compare)
+                        .collect(Collectors.toList());
 
         assertEquals(List.of(targetString1, targetString2), resultStringsSorted);
     }
@@ -144,21 +165,29 @@ void mergeBibTexStringsWithSameNameAndContentAreIgnored() {
     @Test
     void mergeMetaDataWithoutAllEntriesGroup() {
         MetaData target = new MetaData();
-        target.addContentSelector(new ContentSelector(StandardField.AUTHOR, List.of("Test Author")));
-        GroupTreeNode targetRootGroup = new GroupTreeNode(new ExplicitGroup("targetGroup", GroupHierarchyType.INDEPENDENT, ','));
+        target.addContentSelector(
+                new ContentSelector(StandardField.AUTHOR, List.of("Test Author")));
+        GroupTreeNode targetRootGroup =
+                new GroupTreeNode(
+                        new ExplicitGroup("targetGroup", GroupHierarchyType.INDEPENDENT, ','));
         target.setGroups(targetRootGroup);
         MetaData other = new MetaData();
-        GroupTreeNode otherRootGroup = new GroupTreeNode(new ExplicitGroup("otherGroup", GroupHierarchyType.INCLUDING, ','));
+        GroupTreeNode otherRootGroup =
+                new GroupTreeNode(
+                        new ExplicitGroup("otherGroup", GroupHierarchyType.INCLUDING, ','));
         other.setGroups(otherRootGroup);
         other.addContentSelector(new ContentSelector(StandardField.TITLE, List.of("Test Title")));
         List<ContentSelector> expectedContentSelectors =
-                List.of(new ContentSelector(StandardField.AUTHOR, List.of("Test Author")),
+                List.of(
+                        new ContentSelector(StandardField.AUTHOR, List.of("Test Author")),
                         new ContentSelector(StandardField.TITLE, List.of("Test Title")));
 
-        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).mergeMetaData(target, other, "unknown", List.of());
+        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator())
+                .mergeMetaData(target, other, "unknown", List.of());
 
         // Assert that content selectors are all merged
-        assertEquals(expectedContentSelectors, target.getContentSelectorsSorted().stream().toList());
+        assertEquals(
+                expectedContentSelectors, target.getContentSelectorsSorted().stream().toList());
 
         // Assert that groups of other are children of root node of target
         assertEquals(targetRootGroup, target.getGroups().get());
@@ -169,7 +198,8 @@ void mergeMetaDataWithoutAllEntriesGroup() {
     @Test
     void mergeMetaDataWithAllEntriesGroup() {
         MetaData target = new MetaData();
-        target.addContentSelector(new ContentSelector(StandardField.AUTHOR, List.of("Test Author")));
+        target.addContentSelector(
+                new ContentSelector(StandardField.AUTHOR, List.of("Test Author")));
         GroupTreeNode targetRootGroup = new GroupTreeNode(new AllEntriesGroup("targetGroup"));
         target.setGroups(targetRootGroup);
         MetaData other = new MetaData();
@@ -177,16 +207,21 @@ void mergeMetaDataWithAllEntriesGroup() {
         other.setGroups(otherRootGroup);
         other.addContentSelector(new ContentSelector(StandardField.TITLE, List.of("Test Title")));
         List<ContentSelector> expectedContentSelectors =
-                List.of(new ContentSelector(StandardField.AUTHOR, List.of("Test Author")),
+                List.of(
+                        new ContentSelector(StandardField.AUTHOR, List.of("Test Author")),
                         new ContentSelector(StandardField.TITLE, List.of("Test Title")));
-        GroupTreeNode expectedImportedGroupNode = new GroupTreeNode(new ExplicitGroup("Imported unknown", GroupHierarchyType.INDEPENDENT, ';'));
+        GroupTreeNode expectedImportedGroupNode =
+                new GroupTreeNode(
+                        new ExplicitGroup("Imported unknown", GroupHierarchyType.INDEPENDENT, ';'));
 
-        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).mergeMetaData(target, other, "unknown", List.of());
+        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator())
+                .mergeMetaData(target, other, "unknown", List.of());
 
         // Assert that groups of other are children of root node of target
         assertEquals(targetRootGroup, target.getGroups().get());
         assertEquals(1, target.getGroups().get().getChildren().size());
         assertEquals(expectedImportedGroupNode, target.getGroups().get().getChildren().getFirst());
-        assertEquals(expectedContentSelectors, target.getContentSelectorsSorted().stream().toList());
+        assertEquals(
+                expectedContentSelectors, target.getContentSelectorsSorted().stream().toList());
     }
 }
diff --git a/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java b/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java
index 4cc2c79e6cf8..b09e2f2826ad 100644
--- a/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java
+++ b/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java
@@ -1,6 +1,8 @@
 package org.jabref.logic.database;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -8,16 +10,13 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.stream.Stream;
 
 public class DuplicateCheckTest {
 
@@ -69,49 +68,66 @@ void setUp() {
 
     @Test
     void duplicateDetectionWithSameAuthor() {
-        BibEntry one = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Billy Bob");
-        BibEntry two = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Billy Bob");
+        BibEntry one =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob");
+        BibEntry two =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob");
 
         assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void duplicateDetectionWithSameAuthorAndUmlauts() {
-        BibEntry one = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Billy Bobä");
-        BibEntry two = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Bill{\\\"{a}} Bob{\\\"{a}}");
+        BibEntry one =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bobä");
+        BibEntry two =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Bill{\\\"{a}} Bob{\\\"{a}}");
 
         assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void duplicateDetectionWithDifferentAuthors() {
-        BibEntry one = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Billy Bob");
-        BibEntry two = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "James Joyce");
+        BibEntry one =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob");
+        BibEntry two =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "James Joyce");
 
         assertFalse(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void duplicateDetectionWithDifferentTypes() {
-        BibEntry one = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Billy Bob");
-        BibEntry two = new BibEntry(StandardEntryType.Book).withField(StandardField.AUTHOR, "Billy Bob");
+        BibEntry one =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob");
+        BibEntry two =
+                new BibEntry(StandardEntryType.Book).withField(StandardField.AUTHOR, "Billy Bob");
 
         assertFalse(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void duplicateDetectionWithSameYearTitleJournal() {
-        BibEntry one = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.JOURNAL, "A");
-
-        BibEntry two = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.JOURNAL, "A");
+        BibEntry one =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.JOURNAL, "A");
+
+        BibEntry two =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.JOURNAL, "A");
 
         assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
         assertEquals(1.01, DuplicateCheck.compareEntriesStrictly(one, two), 0.01);
@@ -119,17 +135,19 @@ void duplicateDetectionWithSameYearTitleJournal() {
 
     @Test
     void duplicateDetectionWithDifferentJournal() {
-        BibEntry one = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.JOURNAL, "A");
-
-        BibEntry two = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.JOURNAL, "B");
+        BibEntry one =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.JOURNAL, "A");
+
+        BibEntry two =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.JOURNAL, "B");
 
         assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
         assertEquals(0.75, DuplicateCheck.compareEntriesStrictly(one, two), 0.01);
@@ -137,175 +155,191 @@ void duplicateDetectionWithDifferentJournal() {
 
     @Test
     void duplicateDetectionWithDifferentVolume() {
-        BibEntry one = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.JOURNAL, "A")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.VOLUME, "21");
-
-        BibEntry two = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.JOURNAL, "A")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.VOLUME, "22");
+        BibEntry one =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.JOURNAL, "A")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.VOLUME, "21");
+
+        BibEntry two =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.JOURNAL, "A")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.VOLUME, "22");
 
         assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void duplicateDetectionWithDifferentTitleSameVolume() {
-        BibEntry one = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.JOURNAL, "")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.VOLUME, "21");
-
-        BibEntry two = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "Another title")
-                .withField(StandardField.JOURNAL, "")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.VOLUME, "21");
+        BibEntry one =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.JOURNAL, "")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.VOLUME, "21");
+
+        BibEntry two =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "Another title")
+                        .withField(StandardField.JOURNAL, "")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.VOLUME, "21");
 
         assertFalse(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void duplicateDetectionWithSamePages() {
-        BibEntry one = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.JOURNAL, "A")
-                .withField(StandardField.VOLUME, "21")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "334--337");
-
-        BibEntry two = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.JOURNAL, "A")
-                .withField(StandardField.VOLUME, "21")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "334--337");
+        BibEntry one =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.JOURNAL, "A")
+                        .withField(StandardField.VOLUME, "21")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "334--337");
+
+        BibEntry two =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.JOURNAL, "A")
+                        .withField(StandardField.VOLUME, "21")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "334--337");
 
         assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void duplicateDetectionWithSamePagesOneEntryNoVolume() {
-        BibEntry one = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.JOURNAL, "A")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "334--337");
-
-        BibEntry two = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.JOURNAL, "A")
-                .withField(StandardField.VOLUME, "21")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "334--337");
+        BibEntry one =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.JOURNAL, "A")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "334--337");
+
+        BibEntry two =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.JOURNAL, "A")
+                        .withField(StandardField.VOLUME, "21")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "334--337");
 
         assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void duplicateDetectionDifferentVolumeNoJournal() {
-        BibEntry one = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.VOLUME, "21")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "334--337");
-
-        BibEntry two = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.VOLUME, "22")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "334--337");
+        BibEntry one =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.VOLUME, "21")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "334--337");
+
+        BibEntry two =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.VOLUME, "22")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "334--337");
 
         assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void duplicateDetectionDifferentTitleNoJournal() {
-        BibEntry one = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.VOLUME, "21")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "334--337");
-
-        BibEntry two = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "Another title")
-                .withField(StandardField.VOLUME, "22")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "334--337");
+        BibEntry one =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.VOLUME, "21")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "334--337");
+
+        BibEntry two =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "Another title")
+                        .withField(StandardField.VOLUME, "22")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "334--337");
 
         assertFalse(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void duplicateDetectionDifferentVolumeAllOthersEqual() {
-        BibEntry one = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.JOURNAL, "A")
-                .withField(StandardField.VOLUME, "21")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "334--337");
-
-        BibEntry two = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.JOURNAL, "A")
-                .withField(StandardField.VOLUME, "22")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "334--337");
+        BibEntry one =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.JOURNAL, "A")
+                        .withField(StandardField.VOLUME, "21")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "334--337");
+
+        BibEntry two =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.JOURNAL, "A")
+                        .withField(StandardField.VOLUME, "22")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "334--337");
 
         assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void duplicateDetectionDifferentVolumeDifferentJournalAllOthersEqual() {
-        BibEntry one = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.JOURNAL, "A")
-                .withField(StandardField.VOLUME, "21")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "334--337");
-
-        BibEntry two = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Billy Bob")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.TITLE, "A title")
-                .withField(StandardField.JOURNAL, "B")
-                .withField(StandardField.VOLUME, "22")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "334--337");
+        BibEntry one =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.JOURNAL, "A")
+                        .withField(StandardField.VOLUME, "21")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "334--337");
+
+        BibEntry two =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Billy Bob")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.TITLE, "A title")
+                        .withField(StandardField.JOURNAL, "B")
+                        .withField(StandardField.VOLUME, "22")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "334--337");
 
         assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
@@ -323,7 +357,9 @@ void wordCorrelation() {
 
     @Test
     void twoUnrelatedEntriesAreNoDuplicates() {
-        assertFalse(duplicateChecker.isDuplicate(simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX));
+        assertFalse(
+                duplicateChecker.isDuplicate(
+                        simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -331,7 +367,9 @@ void twoUnrelatedEntriesWithDifferentDoisAreNoDuplicates() {
         simpleArticle.setField(StandardField.DOI, "10.1016/j.is.2004.02.002");
         unrelatedArticle.setField(StandardField.DOI, "10.1016/j.is.2004.02.00X");
 
-        assertFalse(duplicateChecker.isDuplicate(simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX));
+        assertFalse(
+                duplicateChecker.isDuplicate(
+                        simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -339,7 +377,9 @@ void twoUnrelatedEntriesWithEqualDoisAreDuplicates() {
         simpleArticle.setField(StandardField.DOI, "10.1016/j.is.2004.02.002");
         unrelatedArticle.setField(StandardField.DOI, "10.1016/j.is.2004.02.002");
 
-        assertTrue(duplicateChecker.isDuplicate(simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX));
+        assertTrue(
+                duplicateChecker.isDuplicate(
+                        simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -347,7 +387,9 @@ void twoUnrelatedEntriesWithEqualPmidAreDuplicates() {
         simpleArticle.setField(StandardField.PMID, "12345678");
         unrelatedArticle.setField(StandardField.PMID, "12345678");
 
-        assertTrue(duplicateChecker.isDuplicate(simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX));
+        assertTrue(
+                duplicateChecker.isDuplicate(
+                        simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -355,7 +397,9 @@ void twoUnrelatedEntriesWithEqualEprintAreDuplicates() {
         simpleArticle.setField(StandardField.EPRINT, "12345678");
         unrelatedArticle.setField(StandardField.EPRINT, "12345678");
 
-        assertTrue(duplicateChecker.isDuplicate(simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX));
+        assertTrue(
+                duplicateChecker.isDuplicate(
+                        simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -364,7 +408,9 @@ void twoEntriesWithSameDoiButDifferentTypesAreDuplicates() {
         BibEntry duplicateWithDifferentType = (BibEntry) simpleArticle.clone();
         duplicateWithDifferentType.setType(StandardEntryType.InCollection);
 
-        assertTrue(duplicateChecker.isDuplicate(simpleArticle, duplicateWithDifferentType, BibDatabaseMode.BIBTEX));
+        assertTrue(
+                duplicateChecker.isDuplicate(
+                        simpleArticle, duplicateWithDifferentType, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -375,7 +421,9 @@ void twoEntriesWithDoiContainingUnderscoresAreNotEqual() {
         BibEntry duplicateWithDifferentType = unrelatedArticle;
         duplicateWithDifferentType.setType(StandardEntryType.InCollection);
 
-        assertFalse(duplicateChecker.isDuplicate(simpleArticle, duplicateWithDifferentType, BibDatabaseMode.BIBTEX));
+        assertFalse(
+                duplicateChecker.isDuplicate(
+                        simpleArticle, duplicateWithDifferentType, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -385,13 +433,17 @@ void twoEntriesWithSameISBNButDifferentTypesAreNotDuplicates() {
         BibEntry duplicateWithDifferentType = unrelatedArticle;
         duplicateWithDifferentType.setType(StandardEntryType.InCollection);
 
-        assertFalse(duplicateChecker.isDuplicate(simpleArticle, duplicateWithDifferentType, BibDatabaseMode.BIBTEX));
+        assertFalse(
+                duplicateChecker.isDuplicate(
+                        simpleArticle, duplicateWithDifferentType, BibDatabaseMode.BIBTEX));
     }
 
     public static Stream<Arguments> twoEntriesWithDifferentSpecificFieldsAreNotDuplicates() {
         return Stream.of(
                 // twoInbooksWithDifferentChaptersAreNotDuplicates
-                Arguments.of(getSimpleInBook(), StandardField.CHAPTER,
+                Arguments.of(
+                        getSimpleInBook(),
+                        StandardField.CHAPTER,
                         "Chapter One – Down the Rabbit Hole",
                         "Chapter Two – The Pool of Tears"),
                 // twoInbooksWithDifferentPagesAreNotDuplicates
@@ -399,16 +451,16 @@ public static Stream<Arguments> twoEntriesWithDifferentSpecificFieldsAreNotDupli
                 // twoIncollectionsWithDifferentChaptersAreNotDuplicates
                 Arguments.of(getSimpleInCollection(), StandardField.CHAPTER, "10", "9"),
                 // twoEntriesWithDifferentSpecificFieldsAreNotDuplicates
-                Arguments.of(getSimpleInCollection(), StandardField.PAGES, "1-20", "21-40")
-        );
+                Arguments.of(getSimpleInCollection(), StandardField.PAGES, "1-20", "21-40"));
     }
 
     @ParameterizedTest
     @MethodSource
-    private void twoEntriesWithDifferentSpecificFieldsAreNotDuplicates(final BibEntry cloneable,
-                                                                       final Field field,
-                                                                       final String firstValue,
-                                                                       final String secondValue) {
+    private void twoEntriesWithDifferentSpecificFieldsAreNotDuplicates(
+            final BibEntry cloneable,
+            final Field field,
+            final String firstValue,
+            final String secondValue) {
         final BibEntry entry1 = ((BibEntry) cloneable.clone()).withField(field, firstValue);
         final BibEntry entry2 = ((BibEntry) cloneable.clone()).withField(field, secondValue);
         assertFalse(duplicateChecker.isDuplicate(entry1, entry2, BibDatabaseMode.BIBTEX));
@@ -416,109 +468,127 @@ private void twoEntriesWithDifferentSpecificFieldsAreNotDuplicates(final BibEntr
 
     @Test
     void inbookWithoutChapterCouldBeDuplicateOfInbookWithChapter() {
-        final BibEntry inbook2 = ((BibEntry) simpleInBook.clone()).withField(StandardField.CHAPTER, "");
+        final BibEntry inbook2 =
+                ((BibEntry) simpleInBook.clone()).withField(StandardField.CHAPTER, "");
 
         assertTrue(duplicateChecker.isDuplicate(simpleInBook, inbook2, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void twoBooksWithDifferentEditionsAreNotDuplicates() {
-        BibEntry editionOne = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective Java")
-                .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                .withField(StandardField.PUBLISHER, "Prentice Hall")
-                .withField(StandardField.DATE, "2001")
-                .withField(StandardField.EDITION, "1");
-
-        BibEntry editionTwo = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective Java")
-                .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                .withField(StandardField.PUBLISHER, "Prentice Hall")
-                .withField(StandardField.DATE, "2008")
-                .withField(StandardField.EDITION, "2");
+        BibEntry editionOne =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "Effective Java")
+                        .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                        .withField(StandardField.PUBLISHER, "Prentice Hall")
+                        .withField(StandardField.DATE, "2001")
+                        .withField(StandardField.EDITION, "1");
+
+        BibEntry editionTwo =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "Effective Java")
+                        .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                        .withField(StandardField.PUBLISHER, "Prentice Hall")
+                        .withField(StandardField.DATE, "2008")
+                        .withField(StandardField.EDITION, "2");
 
         assertFalse(duplicateChecker.isDuplicate(editionOne, editionTwo, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void sameBooksWithMissingEditionAreDuplicates() {
-        BibEntry editionOne = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective Java")
-                .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                .withField(StandardField.PUBLISHER, "Prentice Hall")
-                .withField(StandardField.DATE, "2001");
-
-        BibEntry editionTwo = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective Java")
-                .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                .withField(StandardField.PUBLISHER, "Prentice Hall")
-                .withField(StandardField.DATE, "2008");
+        BibEntry editionOne =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "Effective Java")
+                        .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                        .withField(StandardField.PUBLISHER, "Prentice Hall")
+                        .withField(StandardField.DATE, "2001");
+
+        BibEntry editionTwo =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "Effective Java")
+                        .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                        .withField(StandardField.PUBLISHER, "Prentice Hall")
+                        .withField(StandardField.DATE, "2008");
 
         assertTrue(duplicateChecker.isDuplicate(editionOne, editionTwo, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void sameBooksWithPartiallyMissingEditionAreDuplicates() {
-        BibEntry editionOne = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective Java")
-                .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                .withField(StandardField.PUBLISHER, "Prentice Hall")
-                .withField(StandardField.DATE, "2001");
-
-        BibEntry editionTwo = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective Java")
-                .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                .withField(StandardField.PUBLISHER, "Prentice Hall")
-                .withField(StandardField.DATE, "2008")
-                .withField(StandardField.EDITION, "2");
+        BibEntry editionOne =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "Effective Java")
+                        .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                        .withField(StandardField.PUBLISHER, "Prentice Hall")
+                        .withField(StandardField.DATE, "2001");
+
+        BibEntry editionTwo =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "Effective Java")
+                        .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                        .withField(StandardField.PUBLISHER, "Prentice Hall")
+                        .withField(StandardField.DATE, "2008")
+                        .withField(StandardField.EDITION, "2");
 
         assertTrue(duplicateChecker.isDuplicate(editionOne, editionTwo, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void sameBooksWithDifferentEditionsAreNotDuplicates() {
-        BibEntry editionTwo = new BibEntry(StandardEntryType.Book)
-                .withCitationKey("Sutton17reinfLrnIntroBook")
-                .withField(StandardField.TITLE, "Reinforcement learning:An introduction")
-                .withField(StandardField.PUBLISHER, "MIT Press")
-                .withField(StandardField.YEAR, "2017")
-                .withField(StandardField.AUTHOR, "Sutton, Richard S and Barto, Andrew G")
-                .withField(StandardField.ADDRESS, "Cambridge, MA.USA")
-                .withField(StandardField.EDITION, "Second")
-                .withField(StandardField.JOURNAL, "MIT Press")
-                .withField(StandardField.URL, "https://webdocs.cs.ualberta.ca/~sutton/book/the-book-2nd.html");
-
-        BibEntry editionOne = new BibEntry(StandardEntryType.Book)
-                .withCitationKey("Sutton98reinfLrnIntroBook")
-                .withField(StandardField.TITLE, "Reinforcement learning: An introduction")
-                .withField(StandardField.PUBLISHER, "MIT press Cambridge")
-                .withField(StandardField.YEAR, "1998")
-                .withField(StandardField.AUTHOR, "Sutton, Richard S and Barto, Andrew G")
-                .withField(StandardField.VOLUME, "1")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.EDITION, "First");
+        BibEntry editionTwo =
+                new BibEntry(StandardEntryType.Book)
+                        .withCitationKey("Sutton17reinfLrnIntroBook")
+                        .withField(StandardField.TITLE, "Reinforcement learning:An introduction")
+                        .withField(StandardField.PUBLISHER, "MIT Press")
+                        .withField(StandardField.YEAR, "2017")
+                        .withField(StandardField.AUTHOR, "Sutton, Richard S and Barto, Andrew G")
+                        .withField(StandardField.ADDRESS, "Cambridge, MA.USA")
+                        .withField(StandardField.EDITION, "Second")
+                        .withField(StandardField.JOURNAL, "MIT Press")
+                        .withField(
+                                StandardField.URL,
+                                "https://webdocs.cs.ualberta.ca/~sutton/book/the-book-2nd.html");
+
+        BibEntry editionOne =
+                new BibEntry(StandardEntryType.Book)
+                        .withCitationKey("Sutton98reinfLrnIntroBook")
+                        .withField(StandardField.TITLE, "Reinforcement learning: An introduction")
+                        .withField(StandardField.PUBLISHER, "MIT press Cambridge")
+                        .withField(StandardField.YEAR, "1998")
+                        .withField(StandardField.AUTHOR, "Sutton, Richard S and Barto, Andrew G")
+                        .withField(StandardField.VOLUME, "1")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.EDITION, "First");
 
         assertFalse(duplicateChecker.isDuplicate(editionOne, editionTwo, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void compareOfTwoEntriesWithSameContentAndLfEndingsReportsNoDifferences() throws Exception {
-        BibEntry entryOne = new BibEntry().withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
-        BibEntry entryTwo = new BibEntry().withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
+        BibEntry entryOne =
+                new BibEntry().withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
+        BibEntry entryTwo =
+                new BibEntry().withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
         assertTrue(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void compareOfTwoEntriesWithSameContentAndCrLfEndingsReportsNoDifferences() throws Exception {
-        BibEntry entryOne = new BibEntry().withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
-        BibEntry entryTwo = new BibEntry().withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
+        BibEntry entryOne =
+                new BibEntry().withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
+        BibEntry entryTwo =
+                new BibEntry().withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
         assertTrue(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
     }
 
     @Test
-    void compareOfTwoEntriesWithSameContentAndMixedLineEndingsReportsNoDifferences() throws Exception {
-        BibEntry entryOne = new BibEntry().withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
-        BibEntry entryTwo = new BibEntry().withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
+    void compareOfTwoEntriesWithSameContentAndMixedLineEndingsReportsNoDifferences()
+            throws Exception {
+        BibEntry entryOne =
+                new BibEntry().withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
+        BibEntry entryTwo =
+                new BibEntry().withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
         assertTrue(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
     }
 
@@ -527,55 +597,61 @@ void compareOfTwoEntriesWithSameContentAndMixedLineEndingsReportsNoDifferences()
      */
     @Test
     void differentArticlesFromTheSameBookAreNotDuplicates() {
-        BibEntry entryOne = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Atkinson_1993")
-                .withField(StandardField.AUTHOR, "Richard Atkinson")
-                .withField(StandardField.CHAPTER, "11")
-                .withField(StandardField.PAGES, "91-100")
-                .withField(StandardField.TITLE, "Performance on a Signal")
-                .withField(StandardField.BOOKTITLE, "ABC")
-                .withField(StandardField.EDITOR, "ABC")
-                .withField(StandardField.PUBLISHER, "ABC")
-                .withField(StandardField.ISBN, "978-1-4684-8585-1")
-                .withField(StandardField.YEAR, "1993");
-
-        BibEntry entryTwo = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Ballard_1993")
-                .withField(StandardField.AUTHOR, "Elizabeth Ballard")
-                .withField(StandardField.CHAPTER, "20")
-                .withField(StandardField.PAGES, "187-203")
-                .withField(StandardField.TITLE, "Rest in Treatment")
-                .withField(StandardField.BOOKTITLE, "ABC")
-                .withField(StandardField.EDITOR, "ABC")
-                .withField(StandardField.PUBLISHER, "ABC")
-                .withField(StandardField.ISBN, "978-1-4684-8585-1")
-                .withField(StandardField.YEAR, "1993");
+        BibEntry entryOne =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("Atkinson_1993")
+                        .withField(StandardField.AUTHOR, "Richard Atkinson")
+                        .withField(StandardField.CHAPTER, "11")
+                        .withField(StandardField.PAGES, "91-100")
+                        .withField(StandardField.TITLE, "Performance on a Signal")
+                        .withField(StandardField.BOOKTITLE, "ABC")
+                        .withField(StandardField.EDITOR, "ABC")
+                        .withField(StandardField.PUBLISHER, "ABC")
+                        .withField(StandardField.ISBN, "978-1-4684-8585-1")
+                        .withField(StandardField.YEAR, "1993");
+
+        BibEntry entryTwo =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("Ballard_1993")
+                        .withField(StandardField.AUTHOR, "Elizabeth Ballard")
+                        .withField(StandardField.CHAPTER, "20")
+                        .withField(StandardField.PAGES, "187-203")
+                        .withField(StandardField.TITLE, "Rest in Treatment")
+                        .withField(StandardField.BOOKTITLE, "ABC")
+                        .withField(StandardField.EDITOR, "ABC")
+                        .withField(StandardField.PUBLISHER, "ABC")
+                        .withField(StandardField.ISBN, "978-1-4684-8585-1")
+                        .withField(StandardField.YEAR, "1993");
 
         assertFalse(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void differentInbooksWithTheSameISBNAreNotDuplicates() {
-        BibEntry entryOne = new BibEntry(StandardEntryType.InBook)
-                .withField(StandardField.TITLE, "Performance on a Signal")
-                .withField(StandardField.ISBN, "978-1-4684-8585-1");
+        BibEntry entryOne =
+                new BibEntry(StandardEntryType.InBook)
+                        .withField(StandardField.TITLE, "Performance on a Signal")
+                        .withField(StandardField.ISBN, "978-1-4684-8585-1");
 
-        BibEntry entryTwo = new BibEntry(StandardEntryType.InBook)
-                .withField(StandardField.TITLE, "Rest in Treatment")
-                .withField(StandardField.ISBN, "978-1-4684-8585-1");
+        BibEntry entryTwo =
+                new BibEntry(StandardEntryType.InBook)
+                        .withField(StandardField.TITLE, "Rest in Treatment")
+                        .withField(StandardField.ISBN, "978-1-4684-8585-1");
 
         assertFalse(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void differentInCollectionWithTheSameISBNAreNotDuplicates() {
-        BibEntry entryOne = new BibEntry(StandardEntryType.InCollection)
-                .withField(StandardField.TITLE, "Performance on a Signal")
-                .withField(StandardField.ISBN, "978-1-4684-8585-1");
-
-        BibEntry entryTwo = new BibEntry(StandardEntryType.InCollection)
-                .withField(StandardField.TITLE, "Rest in Treatment")
-                .withField(StandardField.ISBN, "978-1-4684-8585-1");
+        BibEntry entryOne =
+                new BibEntry(StandardEntryType.InCollection)
+                        .withField(StandardField.TITLE, "Performance on a Signal")
+                        .withField(StandardField.ISBN, "978-1-4684-8585-1");
+
+        BibEntry entryTwo =
+                new BibEntry(StandardEntryType.InCollection)
+                        .withField(StandardField.TITLE, "Rest in Treatment")
+                        .withField(StandardField.ISBN, "978-1-4684-8585-1");
 
         assertFalse(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
     }
diff --git a/src/test/java/org/jabref/logic/exporter/AtomicFileOutputStreamTest.java b/src/test/java/org/jabref/logic/exporter/AtomicFileOutputStreamTest.java
index af6058d17e95..9cd20d0ce0e5 100644
--- a/src/test/java/org/jabref/logic/exporter/AtomicFileOutputStreamTest.java
+++ b/src/test/java/org/jabref/logic/exporter/AtomicFileOutputStreamTest.java
@@ -1,22 +1,23 @@
 package org.jabref.logic.exporter;
 
-import java.io.ByteArrayInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.spy;
 
 import com.google.common.base.Strings;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mockito;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.spy;
+import java.io.ByteArrayInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 class AtomicFileOutputStreamTest {
 
@@ -46,20 +47,30 @@ void originalContentExistsAtWriteError(@TempDir Path tempDir) throws Exception {
 
         try (FileOutputStream outputStream = new FileOutputStream(pathToTmpFile.toFile())) {
             FileOutputStream spiedOutputStream = spy(outputStream);
-            doAnswer(invocation -> {
-                // by writing one byte, we ensure that the `.tmp` file is created
-                outputStream.write(((byte[]) invocation.getRawArguments()[0])[0]);
-                outputStream.flush();
-                throw new IOException();
-            }).when(spiedOutputStream)
-              .write(Mockito.any(byte[].class), anyInt(), anyInt());
+            doAnswer(
+                            invocation -> {
+                                // by writing one byte, we ensure that the `.tmp` file is created
+                                outputStream.write(((byte[]) invocation.getRawArguments()[0])[0]);
+                                outputStream.flush();
+                                throw new IOException();
+                            })
+                    .when(spiedOutputStream)
+                    .write(Mockito.any(byte[].class), anyInt(), anyInt());
 
-            assertThrows(IOException.class, () -> {
-                try (AtomicFileOutputStream atomicFileOutputStream = new AtomicFileOutputStream(pathToTestFile, pathToTmpFile, spiedOutputStream, false);
-                     InputStream inputStream = new ByteArrayInputStream(FIVE_THOUSAND_CHARS.getBytes())) {
-                    inputStream.transferTo(atomicFileOutputStream);
-                }
-            });
+            assertThrows(
+                    IOException.class,
+                    () -> {
+                        try (AtomicFileOutputStream atomicFileOutputStream =
+                                        new AtomicFileOutputStream(
+                                                pathToTestFile,
+                                                pathToTmpFile,
+                                                spiedOutputStream,
+                                                false);
+                                InputStream inputStream =
+                                        new ByteArrayInputStream(FIVE_THOUSAND_CHARS.getBytes())) {
+                            inputStream.transferTo(atomicFileOutputStream);
+                        }
+                    });
         }
 
         // Written file still has the contents as before the error
diff --git a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
index 08fbd0698bfb..5248406e0e59 100644
--- a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
@@ -1,17 +1,9 @@
 package org.jabref.logic.exporter;
 
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.AbstractCitationKeyPatterns;
@@ -50,16 +42,23 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Tests for reading can be found at {@link org.jabref.logic.importer.fileformat.BibtexImporterTest}
@@ -80,9 +79,16 @@ class BibtexDatabaseWriterTest {
 
     @BeforeEach
     void setUp() {
-        fieldPreferences = new FieldPreferences(true, Collections.emptyList(), Collections.emptyList());
-        saveConfiguration = new SelfContainedSaveConfiguration(SaveOrder.getDefaultSaveOrder(), false, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, false);
-        citationKeyPatternPreferences = mock(CitationKeyPatternPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        fieldPreferences =
+                new FieldPreferences(true, Collections.emptyList(), Collections.emptyList());
+        saveConfiguration =
+                new SelfContainedSaveConfiguration(
+                        SaveOrder.getDefaultSaveOrder(),
+                        false,
+                        BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
+                        false);
+        citationKeyPatternPreferences =
+                mock(CitationKeyPatternPreferences.class, Answers.RETURNS_DEEP_STUBS);
         entryTypesManager = new BibEntryTypesManager();
         stringWriter = new StringWriter();
         bibWriter = new BibWriter(stringWriter, OS.NEWLINE);
@@ -95,22 +101,27 @@ void setUp() {
     }
 
     private void initializeDatabaseWriter() {
-        databaseWriter = new BibtexDatabaseWriter(
-                bibWriter,
-                saveConfiguration,
-                fieldPreferences,
-                citationKeyPatternPreferences,
-                entryTypesManager);
+        databaseWriter =
+                new BibtexDatabaseWriter(
+                        bibWriter,
+                        saveConfiguration,
+                        fieldPreferences,
+                        citationKeyPatternPreferences,
+                        entryTypesManager);
     }
 
     @Test
     void writeWithNullContextThrowsException() throws Exception {
-        assertThrows(NullPointerException.class, () -> databaseWriter.savePartOfDatabase(null, Collections.emptyList()));
+        assertThrows(
+                NullPointerException.class,
+                () -> databaseWriter.savePartOfDatabase(null, Collections.emptyList()));
     }
 
     @Test
     void writeWithNullEntriesThrowsException() throws Exception {
-        assertThrows(NullPointerException.class, () -> databaseWriter.savePartOfDatabase(bibtexContext, null));
+        assertThrows(
+                NullPointerException.class,
+                () -> databaseWriter.savePartOfDatabase(bibtexContext, null));
     }
 
     @Test
@@ -147,8 +158,13 @@ void writePreambleAndEncoding() throws Exception {
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals("% Encoding: US-ASCII" + OS.NEWLINE + OS.NEWLINE +
-                "@Preamble{Test preamble}" + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+                "% Encoding: US-ASCII"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Preamble{Test preamble}"
+                        + OS.NEWLINE,
+                stringWriter.toString());
     }
 
     @Test
@@ -159,9 +175,7 @@ void writeEntry() throws Exception {
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
-        assertEquals("@Article{," + OS.NEWLINE + "}"
-                        + OS.NEWLINE,
-                stringWriter.toString());
+        assertEquals("@Article{," + OS.NEWLINE + "}" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
@@ -173,9 +187,13 @@ void writeEntryWithDuplicateKeywords() throws Exception {
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
-        assertEquals("@Article{," + OS.NEWLINE
-                        + "  keywords = {asdf,asdf,asdf}," + OS.NEWLINE
-                        + "}" + OS.NEWLINE,
+        assertEquals(
+                "@Article{,"
+                        + OS.NEWLINE
+                        + "  keywords = {asdf,asdf,asdf},"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE,
                 stringWriter.toString());
     }
 
@@ -188,9 +206,8 @@ void putKeyWordsRemovesDuplicateKeywordsIsVisibleDuringWrite() throws Exception
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
-        assertEquals("@Article{," + OS.NEWLINE
-                        + "  keywords = {asdf}," + OS.NEWLINE
-                        + "}" + OS.NEWLINE,
+        assertEquals(
+                "@Article{," + OS.NEWLINE + "  keywords = {asdf}," + OS.NEWLINE + "}" + OS.NEWLINE,
                 stringWriter.toString());
     }
 
@@ -204,8 +221,12 @@ void writeEncodingAndEntry() throws Exception {
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
         assertEquals(
-                "% Encoding: US-ASCII" + OS.NEWLINE + OS.NEWLINE +
-                        "@Article{," + OS.NEWLINE + "}"
+                "% Encoding: US-ASCII"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Article{,"
+                        + OS.NEWLINE
+                        + "}"
                         + OS.NEWLINE,
                 stringWriter.toString());
     }
@@ -226,8 +247,9 @@ void writeEpilogueAndEncoding() throws Exception {
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals("% Encoding: US-ASCII" + OS.NEWLINE + OS.NEWLINE +
-                "Test epilog" + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+                "% Encoding: US-ASCII" + OS.NEWLINE + OS.NEWLINE + "Test epilog" + OS.NEWLINE,
+                stringWriter.toString());
     }
 
     @Test
@@ -237,8 +259,7 @@ void utf8EncodingWrittenIfExplicitlyDefined() throws Exception {
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals("% Encoding: UTF-8" + OS.NEWLINE,
-                stringWriter.toString());
+        assertEquals("% Encoding: UTF-8" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
@@ -253,28 +274,35 @@ void utf8EncodingNotWrittenIfNotExplicitlyDefined() throws Exception {
 
     @Test
     void writeMetadata() throws Exception {
-        DatabaseCitationKeyPatterns bibtexKeyPattern = new DatabaseCitationKeyPatterns(mock(GlobalCitationKeyPatterns.class));
+        DatabaseCitationKeyPatterns bibtexKeyPattern =
+                new DatabaseCitationKeyPatterns(mock(GlobalCitationKeyPatterns.class));
         bibtexKeyPattern.setDefaultValue("test");
         metaData.setCiteKeyPattern(bibtexKeyPattern);
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals("@Comment{jabref-meta: keypatterndefault:test;}" + OS.NEWLINE,
+        assertEquals(
+                "@Comment{jabref-meta: keypatterndefault:test;}" + OS.NEWLINE,
                 stringWriter.toString());
     }
 
     @Test
     void writeMetadataAndEncoding() throws Exception {
-        DatabaseCitationKeyPatterns bibtexKeyPattern = new DatabaseCitationKeyPatterns(mock(GlobalCitationKeyPatterns.class));
+        DatabaseCitationKeyPatterns bibtexKeyPattern =
+                new DatabaseCitationKeyPatterns(mock(GlobalCitationKeyPatterns.class));
         bibtexKeyPattern.setDefaultValue("test");
         metaData.setCiteKeyPattern(bibtexKeyPattern);
         metaData.setEncoding(StandardCharsets.US_ASCII);
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals("% Encoding: US-ASCII" + OS.NEWLINE + OS.NEWLINE
-                +
-                "@Comment{jabref-meta: keypatterndefault:test;}" + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+                "% Encoding: US-ASCII"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Comment{jabref-meta: keypatterndefault:test;}"
+                        + OS.NEWLINE,
+                stringWriter.toString());
     }
 
     @Test
@@ -286,17 +314,25 @@ void writeGroups() throws Exception {
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         // @formatter:off
-        assertEquals("@Comment{jabref-meta: grouping:" + OS.NEWLINE
-                + "0 AllEntriesGroup:;" + OS.NEWLINE
-                + "1 StaticGroup:test\\;2\\;1\\;\\;\\;\\;;" + OS.NEWLINE
-                + "}" + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+                "@Comment{jabref-meta: grouping:"
+                        + OS.NEWLINE
+                        + "0 AllEntriesGroup:;"
+                        + OS.NEWLINE
+                        + "1 StaticGroup:test\\;2\\;1\\;\\;\\;\\;;"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE,
+                stringWriter.toString());
         // @formatter:on
     }
 
     @Test
     void writeGroupsAndEncoding() throws Exception {
         GroupTreeNode groupRoot = GroupTreeNode.fromGroup(new AllEntriesGroup(""));
-        groupRoot.addChild(GroupTreeNode.fromGroup(new ExplicitGroup("test", GroupHierarchyType.INCLUDING, ',')));
+        groupRoot.addChild(
+                GroupTreeNode.fromGroup(
+                        new ExplicitGroup("test", GroupHierarchyType.INCLUDING, ',')));
         metaData.setGroups(groupRoot);
         metaData.setEncoding(StandardCharsets.US_ASCII);
 
@@ -304,12 +340,18 @@ void writeGroupsAndEncoding() throws Exception {
 
         // @formatter:off
         assertEquals(
-                "% Encoding: US-ASCII" + OS.NEWLINE +
-                        OS.NEWLINE
-                        + "@Comment{jabref-meta: grouping:" + OS.NEWLINE
-                        + "0 AllEntriesGroup:;" + OS.NEWLINE
-                        + "1 StaticGroup:test\\;2\\;1\\;\\;\\;\\;;" + OS.NEWLINE
-                        + "}" + OS.NEWLINE, stringWriter.toString());
+                "% Encoding: US-ASCII"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Comment{jabref-meta: grouping:"
+                        + OS.NEWLINE
+                        + "0 AllEntriesGroup:;"
+                        + OS.NEWLINE
+                        + "1 StaticGroup:test\\;2\\;1\\;\\;\\;\\;;"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE,
+                stringWriter.toString());
         // @formatter:on
     }
 
@@ -340,8 +382,13 @@ void writeStringAndEncoding() throws Exception {
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals("% Encoding: US-ASCII" + OS.NEWLINE + OS.NEWLINE +
-                "@String{name = {content}}" + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+                "% Encoding: US-ASCII"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@String{name = {content}}"
+                        + OS.NEWLINE,
+                stringWriter.toString());
     }
 
     @Test
@@ -356,19 +403,20 @@ void doNotWriteUtf8StringAndEncoding() throws Exception {
     @Test
     void writeEntryWithCustomizedTypeAlsoWritesTypeDeclaration() throws Exception {
         EntryType customizedType = new UnknownEntryType("customizedType");
-        BibEntryType customizedBibType = new BibEntryType(
-                customizedType,
-                Arrays.asList(
-                        new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
-                        new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT),
-                        new BibField(StandardField.DATE, FieldPriority.IMPORTANT),
-                        new BibField(StandardField.YEAR, FieldPriority.IMPORTANT),
-                        new BibField(StandardField.MONTH, FieldPriority.IMPORTANT),
-                        new BibField(StandardField.PUBLISHER, FieldPriority.IMPORTANT)),
-                Arrays.asList(
-                        new OrFields(StandardField.TITLE),
-                        new OrFields(StandardField.AUTHOR),
-                        new OrFields(StandardField.DATE)));
+        BibEntryType customizedBibType =
+                new BibEntryType(
+                        customizedType,
+                        Arrays.asList(
+                                new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
+                                new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT),
+                                new BibField(StandardField.DATE, FieldPriority.IMPORTANT),
+                                new BibField(StandardField.YEAR, FieldPriority.IMPORTANT),
+                                new BibField(StandardField.MONTH, FieldPriority.IMPORTANT),
+                                new BibField(StandardField.PUBLISHER, FieldPriority.IMPORTANT)),
+                        Arrays.asList(
+                                new OrFields(StandardField.TITLE),
+                                new OrFields(StandardField.AUTHOR),
+                                new OrFields(StandardField.DATE)));
         entryTypesManager.addCustomOrModifiedType(customizedBibType, BibDatabaseMode.BIBTEX);
         BibEntry entry = new BibEntry(customizedType).withCitationKey("key");
         // needed to get a proper serialization
@@ -378,10 +426,17 @@ void writeEntryWithCustomizedTypeAlsoWritesTypeDeclaration() throws Exception {
 
         databaseWriter.saveDatabase(bibtexContext);
 
-        assertEquals("@Customizedtype{key," + OS.NEWLINE + "}" + OS.NEWLINE + OS.NEWLINE
+        assertEquals(
+                "@Customizedtype{key,"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
                         + "@Comment{jabref-meta: databaseType:bibtex;}"
-                        + OS.NEWLINE + OS.NEWLINE
-                        + "@Comment{jabref-entrytype: customizedtype: req[title;author;date] opt[year;month;publisher]}" + OS.NEWLINE,
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Comment{jabref-entrytype: customizedtype: req[title;author;date] opt[year;month;publisher]}"
+                        + OS.NEWLINE,
                 stringWriter.toString());
     }
 
@@ -389,14 +444,18 @@ void writeEntryWithCustomizedTypeAlsoWritesTypeDeclaration() throws Exception {
     void writeCustomizedTypesInAlphabeticalOrder() throws Exception {
         EntryType customizedType = new UnknownEntryType("customizedType");
         EntryType otherCustomizedType = new UnknownEntryType("otherCustomizedType");
-        BibEntryType customizedBibType = new BibEntryType(
-                customizedType,
-                Collections.singletonList(new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)),
-                Collections.singletonList(new OrFields(StandardField.TITLE)));
-        BibEntryType otherCustomizedBibType = new BibEntryType(
-                otherCustomizedType,
-                Collections.singletonList(new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)),
-                Collections.singletonList(new OrFields(StandardField.TITLE)));
+        BibEntryType customizedBibType =
+                new BibEntryType(
+                        customizedType,
+                        Collections.singletonList(
+                                new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)),
+                        Collections.singletonList(new OrFields(StandardField.TITLE)));
+        BibEntryType otherCustomizedBibType =
+                new BibEntryType(
+                        otherCustomizedType,
+                        Collections.singletonList(
+                                new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)),
+                        Collections.singletonList(new OrFields(StandardField.TITLE)));
         entryTypesManager.addCustomOrModifiedType(otherCustomizedBibType, BibDatabaseMode.BIBTEX);
         entryTypesManager.addCustomOrModifiedType(customizedBibType, BibDatabaseMode.BIBTEX);
         BibEntry entry = new BibEntry(customizedType);
@@ -408,12 +467,24 @@ void writeCustomizedTypesInAlphabeticalOrder() throws Exception {
         databaseWriter.savePartOfDatabase(bibtexContext, List.of(entry, otherEntry));
 
         assertEquals(
-                "@Customizedtype{," + OS.NEWLINE + "}" + OS.NEWLINE + OS.NEWLINE
-                        + "@Othercustomizedtype{," + OS.NEWLINE + "}" + OS.NEWLINE + OS.NEWLINE
+                "@Customizedtype{,"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Othercustomizedtype{,"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
                         + "@Comment{jabref-meta: databaseType:bibtex;}"
-                        + OS.NEWLINE + OS.NEWLINE
-                        + "@Comment{jabref-entrytype: customizedtype: req[title] opt[]}" + OS.NEWLINE + OS.NEWLINE
-                        + "@Comment{jabref-entrytype: othercustomizedtype: req[title] opt[]}" + OS.NEWLINE,
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Comment{jabref-entrytype: customizedtype: req[title] opt[]}"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Comment{jabref-entrytype: othercustomizedtype: req[title] opt[]}"
+                        + OS.NEWLINE,
                 stringWriter.toString());
     }
 
@@ -421,9 +492,11 @@ void writeCustomizedTypesInAlphabeticalOrder() throws Exception {
     void roundtripWithArticleMonths() throws Exception {
         Path testBibtexFile = Path.of("src/test/resources/testbib/articleWithMonths.bib");
         Charset encoding = StandardCharsets.UTF_8;
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
 
-        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
+        BibDatabaseContext context =
+                new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         // .gitattributes sets the .bib files to have LF line endings
         // This needs to be reflected here
@@ -436,47 +509,74 @@ void roundtripWithArticleMonths() throws Exception {
     @Test
     void roundtripUtf8EncodingHeaderRemoved() throws Exception {
         // @formatter:off
-        String bibtexEntry = OS.NEWLINE + "% Encoding: UTF8" + OS.NEWLINE +
-                OS.NEWLINE +
-                "@Article{," + OS.NEWLINE +
-                "  author  = {Foo Bar}," + OS.NEWLINE +
-                "  journal = {International Journal of Something}," + OS.NEWLINE +
-                "  note    = {some note}," + OS.NEWLINE +
-                "  number  = {1}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String bibtexEntry =
+                OS.NEWLINE
+                        + "% Encoding: UTF8"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Article{,"
+                        + OS.NEWLINE
+                        + "  author  = {Foo Bar},"
+                        + OS.NEWLINE
+                        + "  journal = {International Journal of Something},"
+                        + OS.NEWLINE
+                        + "  note    = {some note},"
+                        + OS.NEWLINE
+                        + "  number  = {1},"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE;
         // @formatter:on
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
-        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        BibDatabaseContext context =
+                new BibDatabaseContext(result.getDatabase(), result.getMetaData());
         databaseWriter.saveDatabase(context);
         // @formatter:off
-        String expected = "@Article{," + OS.NEWLINE +
-                "  author  = {Foo Bar}," + OS.NEWLINE +
-                "  journal = {International Journal of Something}," + OS.NEWLINE +
-                "  note    = {some note}," + OS.NEWLINE +
-                "  number  = {1}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected =
+                "@Article{,"
+                        + OS.NEWLINE
+                        + "  author  = {Foo Bar},"
+                        + OS.NEWLINE
+                        + "  journal = {International Journal of Something},"
+                        + OS.NEWLINE
+                        + "  note    = {some note},"
+                        + OS.NEWLINE
+                        + "  number  = {1},"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE;
         // @formatter:on
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
     void roundtripWin1252HeaderKept(@TempDir Path bibFolder) throws Exception {
-        Path testFile = Path.of(BibtexDatabaseWriterTest.class.getResource("encoding-windows-1252-with-header.bib").toURI());
-        ParserResult result = new BibtexImporter(importFormatPreferences, new DummyFileUpdateMonitor()).importDatabase(testFile);
-        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
+        Path testFile =
+                Path.of(
+                        BibtexDatabaseWriterTest.class
+                                .getResource("encoding-windows-1252-with-header.bib")
+                                .toURI());
+        ParserResult result =
+                new BibtexImporter(importFormatPreferences, new DummyFileUpdateMonitor())
+                        .importDatabase(testFile);
+        BibDatabaseContext context =
+                new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         Path pathToFile = bibFolder.resolve("JabRef.bib");
         Path file = Files.createFile(pathToFile);
         Charset charset = Charset.forName("windows-1252");
 
         try (BufferedWriter fileWriter = Files.newBufferedWriter(file, charset)) {
-            BibWriter bibWriter = new BibWriter(fileWriter, context.getDatabase().getNewLineSeparator());
-            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
-                    bibWriter,
-                    saveConfiguration,
-                    fieldPreferences,
-                    citationKeyPatternPreferences,
-                    entryTypesManager);
+            BibWriter bibWriter =
+                    new BibWriter(fileWriter, context.getDatabase().getNewLineSeparator());
+            BibtexDatabaseWriter databaseWriter =
+                    new BibtexDatabaseWriter(
+                            bibWriter,
+                            saveConfiguration,
+                            fieldPreferences,
+                            citationKeyPatternPreferences,
+                            entryTypesManager);
             databaseWriter.saveDatabase(context);
         }
 
@@ -485,22 +585,32 @@ void roundtripWin1252HeaderKept(@TempDir Path bibFolder) throws Exception {
 
     @Test
     void roundtripUtf8HeaderKept(@TempDir Path bibFolder) throws Exception {
-        Path testFile = Path.of(BibtexDatabaseWriterTest.class.getResource("encoding-utf-8-with-header-with-databasetypecomment.bib").toURI());
-        ParserResult result = new BibtexImporter(importFormatPreferences, new DummyFileUpdateMonitor()).importDatabase(testFile);
-        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
+        Path testFile =
+                Path.of(
+                        BibtexDatabaseWriterTest.class
+                                .getResource(
+                                        "encoding-utf-8-with-header-with-databasetypecomment.bib")
+                                .toURI());
+        ParserResult result =
+                new BibtexImporter(importFormatPreferences, new DummyFileUpdateMonitor())
+                        .importDatabase(testFile);
+        BibDatabaseContext context =
+                new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         Path pathToFile = bibFolder.resolve("JabRef.bib");
         Path file = Files.createFile(pathToFile);
         Charset charset = StandardCharsets.UTF_8;
 
         try (BufferedWriter fileWriter = Files.newBufferedWriter(file, charset)) {
-            BibWriter bibWriter = new BibWriter(fileWriter, context.getDatabase().getNewLineSeparator());
-            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
-                    bibWriter,
-                    saveConfiguration,
-                    fieldPreferences,
-                    citationKeyPatternPreferences,
-                    entryTypesManager);
+            BibWriter bibWriter =
+                    new BibWriter(fileWriter, context.getDatabase().getNewLineSeparator());
+            BibtexDatabaseWriter databaseWriter =
+                    new BibtexDatabaseWriter(
+                            bibWriter,
+                            saveConfiguration,
+                            fieldPreferences,
+                            citationKeyPatternPreferences,
+                            entryTypesManager);
             databaseWriter.saveDatabase(context);
         }
 
@@ -508,23 +618,34 @@ void roundtripUtf8HeaderKept(@TempDir Path bibFolder) throws Exception {
     }
 
     @Test
-    void roundtripNotExplicitUtf8HeaderNotInsertedDuringWrite(@TempDir Path bibFolder) throws Exception {
-        Path testFile = Path.of(BibtexDatabaseWriterTest.class.getResource("encoding-utf-8-without-header-with-databasetypecomment.bib").toURI());
-        ParserResult result = new BibtexImporter(importFormatPreferences, new DummyFileUpdateMonitor()).importDatabase(testFile);
-        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
+    void roundtripNotExplicitUtf8HeaderNotInsertedDuringWrite(@TempDir Path bibFolder)
+            throws Exception {
+        Path testFile =
+                Path.of(
+                        BibtexDatabaseWriterTest.class
+                                .getResource(
+                                        "encoding-utf-8-without-header-with-databasetypecomment.bib")
+                                .toURI());
+        ParserResult result =
+                new BibtexImporter(importFormatPreferences, new DummyFileUpdateMonitor())
+                        .importDatabase(testFile);
+        BibDatabaseContext context =
+                new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         Path pathToFile = bibFolder.resolve("JabRef.bib");
         Path file = Files.createFile(pathToFile);
         Charset charset = StandardCharsets.UTF_8;
 
         try (BufferedWriter fileWriter = Files.newBufferedWriter(file, charset)) {
-            BibWriter bibWriter = new BibWriter(fileWriter, context.getDatabase().getNewLineSeparator());
-            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
-                    bibWriter,
-                    saveConfiguration,
-                    fieldPreferences,
-                    citationKeyPatternPreferences,
-                    entryTypesManager);
+            BibWriter bibWriter =
+                    new BibWriter(fileWriter, context.getDatabase().getNewLineSeparator());
+            BibtexDatabaseWriter databaseWriter =
+                    new BibtexDatabaseWriter(
+                            bibWriter,
+                            saveConfiguration,
+                            fieldPreferences,
+                            citationKeyPatternPreferences,
+                            entryTypesManager);
             databaseWriter.saveDatabase(context);
         }
 
@@ -535,17 +656,21 @@ void roundtripNotExplicitUtf8HeaderNotInsertedDuringWrite(@TempDir Path bibFolde
     void roundtripWithComplexBib() throws Exception {
         Path testBibtexFile = Path.of("src/test/resources/testbib/complex.bib");
         Charset encoding = StandardCharsets.UTF_8;
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
-
-        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
-
-        BibWriter bibWriter = new BibWriter(stringWriter, context.getDatabase().getNewLineSeparator());
-        BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
-                bibWriter,
-                saveConfiguration,
-                fieldPreferences,
-                citationKeyPatternPreferences,
-                entryTypesManager);
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
+
+        BibDatabaseContext context =
+                new BibDatabaseContext(result.getDatabase(), result.getMetaData());
+
+        BibWriter bibWriter =
+                new BibWriter(stringWriter, context.getDatabase().getNewLineSeparator());
+        BibtexDatabaseWriter databaseWriter =
+                new BibtexDatabaseWriter(
+                        bibWriter,
+                        saveConfiguration,
+                        fieldPreferences,
+                        citationKeyPatternPreferences,
+                        entryTypesManager);
         databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
         assertEquals(Files.readString(testBibtexFile, encoding), stringWriter.toString());
     }
@@ -554,9 +679,11 @@ void roundtripWithComplexBib() throws Exception {
     void roundtripWithUserComment() throws Exception {
         Path testBibtexFile = Path.of("src/test/resources/testbib/bibWithUserComments.bib");
         Charset encoding = StandardCharsets.UTF_8;
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
 
-        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
+        BibDatabaseContext context =
+                new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         // .gitattributes sets the .bib files to have LF line endings
         // This needs to be reflected here
@@ -568,64 +695,74 @@ void roundtripWithUserComment() throws Exception {
 
     @Test
     void roundtripWithOneUserCommentAndEntryChange() throws Exception {
-        String bibEntry = "@Comment this in an unbracketed comment that should be preserved as well\n" +
-                "\n" +
-                "This is some arbitrary user comment that should be preserved\n" +
-                "\n" +
-                "@InProceedings{1137631,\n" +
-                "  author     = {Mr. Author},\n" +
-                "}\n";
+        String bibEntry =
+                "@Comment this in an unbracketed comment that should be preserved as well\n"
+                        + "\n"
+                        + "This is some arbitrary user comment that should be preserved\n"
+                        + "\n"
+                        + "@InProceedings{1137631,\n"
+                        + "  author     = {Mr. Author},\n"
+                        + "}\n";
 
         // read in bibtex string
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibEntry));
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibEntry));
 
         BibEntry entry = result.getDatabase().getEntryByCitationKey("1137631").get();
         entry.setField(StandardField.AUTHOR, "Mr. Author");
 
-        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
+        BibDatabaseContext context =
+                new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         // we need a new writer because "\n" instead of "OS.NEWLINE"
         bibWriter = new BibWriter(stringWriter, "\n");
-        databaseWriter = new BibtexDatabaseWriter(
-                bibWriter,
-                saveConfiguration,
-                fieldPreferences,
-                citationKeyPatternPreferences,
-                entryTypesManager);
+        databaseWriter =
+                new BibtexDatabaseWriter(
+                        bibWriter,
+                        saveConfiguration,
+                        fieldPreferences,
+                        citationKeyPatternPreferences,
+                        entryTypesManager);
         databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
         assertEquals(bibEntry, stringWriter.toString());
     }
 
     @Test
     void roundtripWithTwoEntriesAndOneUserCommentAndEntryChange() throws Exception {
-        String bibEntry = "@Article{test,}\n" +
-                "\n" +
-                "@Comment this in an unbracketed comment that should be preserved as well\n" +
-                "\n" +
-                "This is some arbitrary user comment that should be preserved\n" +
-                "\n" +
-                "@InProceedings{1137631,\n" +
-                "  author     = {Mr. Author},\n" +
-                "}\n";
+        String bibEntry =
+                "@Article{test,}\n"
+                        + "\n"
+                        + "@Comment this in an unbracketed comment that should be preserved as well\n"
+                        + "\n"
+                        + "This is some arbitrary user comment that should be preserved\n"
+                        + "\n"
+                        + "@InProceedings{1137631,\n"
+                        + "  author     = {Mr. Author},\n"
+                        + "}\n";
 
         // read in bibtex string
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibEntry));
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibEntry));
 
         BibEntry entry = result.getDatabase().getEntryByCitationKey("1137631").get();
         entry.setField(StandardField.AUTHOR, "Mr. Author");
 
-        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
+        BibDatabaseContext context =
+                new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         // we need a new writer because "\n" instead of "OS.NEWLINE"
         bibWriter = new BibWriter(stringWriter, "\n");
-        databaseWriter = new BibtexDatabaseWriter(
-                bibWriter,
-                saveConfiguration,
-                fieldPreferences,
-                citationKeyPatternPreferences,
-                entryTypesManager);
+        databaseWriter =
+                new BibtexDatabaseWriter(
+                        bibWriter,
+                        saveConfiguration,
+                        fieldPreferences,
+                        citationKeyPatternPreferences,
+                        entryTypesManager);
         databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
         assertEquals(bibEntry, stringWriter.toString());
     }
@@ -634,33 +771,41 @@ void roundtripWithTwoEntriesAndOneUserCommentAndEntryChange() throws Exception {
     void roundtripWithUserCommentAndEntryChange() throws Exception {
         Path testBibtexFile = Path.of("src/test/resources/testbib/bibWithUserComments.bib");
         Charset encoding = StandardCharsets.UTF_8;
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
 
         BibEntry entry = result.getDatabase().getEntryByCitationKey("1137631").get();
         entry.setField(StandardField.AUTHOR, "Mr. Author");
 
-        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
+        BibDatabaseContext context =
+                new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         // .gitattributes sets the .bib files to have LF line endings
         // This needs to be reflected here
         bibWriter = new BibWriter(stringWriter, "\n");
         initializeDatabaseWriter();
         databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
-        assertEquals(Files.readString(Path.of("src/test/resources/testbib/bibWithUserCommentAndEntryChange.bib"), encoding), stringWriter.toString());
+        assertEquals(
+                Files.readString(
+                        Path.of("src/test/resources/testbib/bibWithUserCommentAndEntryChange.bib"),
+                        encoding),
+                stringWriter.toString());
     }
 
     @Test
     void roundtripWithUserCommentBeforeStringAndChange() throws Exception {
         Path testBibtexFile = Path.of("src/test/resources/testbib/complex.bib");
         Charset encoding = StandardCharsets.UTF_8;
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
 
         for (BibtexString string : result.getDatabase().getStringValues()) {
             // Mark them as changed
             string.setContent(string.getContent());
         }
 
-        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
+        BibDatabaseContext context =
+                new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         // .gitattributes sets the .bib files to have LF line endings
         // This needs to be reflected here
@@ -675,9 +820,11 @@ void roundtripWithUserCommentBeforeStringAndChange() throws Exception {
     void roundtripWithUnknownMetaData() throws Exception {
         Path testBibtexFile = Path.of("src/test/resources/testbib/unknownMetaData.bib");
         Charset encoding = StandardCharsets.UTF_8;
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
+        ParserResult result =
+                new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
 
-        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
+        BibDatabaseContext context =
+                new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         // .gitattributes sets the .bib files to have LF line endings
         // This needs to be reflected here
@@ -689,8 +836,9 @@ void roundtripWithUnknownMetaData() throws Exception {
 
     @Test
     void writeSavedSerializationOfEntryIfUnchanged() throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Mr. author");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Mr. author");
         entry.setParsedSerialization("presaved serialization");
         entry.setChanged(false);
         database.insertEntry(entry);
@@ -702,17 +850,28 @@ void writeSavedSerializationOfEntryIfUnchanged() throws Exception {
 
     @Test
     void reformatEntryIfAskedToDoSo() throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Mr. author");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Mr. author");
         entry.setParsedSerialization("wrong serialization");
         entry.setChanged(false);
         database.insertEntry(entry);
 
-        saveConfiguration = new SelfContainedSaveConfiguration(SaveOrder.getDefaultSaveOrder(), false, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, true);
+        saveConfiguration =
+                new SelfContainedSaveConfiguration(
+                        SaveOrder.getDefaultSaveOrder(),
+                        false,
+                        BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
+                        true);
         initializeDatabaseWriter();
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
-        assertEquals("@Article{," + OS.NEWLINE + "  author = {Mr. author}," + OS.NEWLINE + "}"
+        assertEquals(
+                "@Article{,"
+                        + OS.NEWLINE
+                        + "  author = {Mr. author},"
+                        + OS.NEWLINE
+                        + "}"
                         + OS.NEWLINE,
                 stringWriter.toString());
     }
@@ -732,7 +891,12 @@ void reformatStringIfAskedToDoSo() throws Exception {
         BibtexString string = new BibtexString("name", "content", "wrong serialization");
         database.addString(string);
 
-        saveConfiguration = new SelfContainedSaveConfiguration(SaveOrder.getDefaultSaveOrder(), false, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, true);
+        saveConfiguration =
+                new SelfContainedSaveConfiguration(
+                        SaveOrder.getDefaultSaveOrder(),
+                        false,
+                        BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
+                        true);
         initializeDatabaseWriter();
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
@@ -741,50 +905,70 @@ void reformatStringIfAskedToDoSo() throws Exception {
 
     @Test
     void writeSaveActions() throws Exception {
-        FieldFormatterCleanups saveActions = new FieldFormatterCleanups(true,
-                Arrays.asList(
-                        new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter()),
-                        new FieldFormatterCleanup(StandardField.JOURNAL, new TitleCaseFormatter()),
-                        new FieldFormatterCleanup(StandardField.DAY, new UpperCaseFormatter())));
+        FieldFormatterCleanups saveActions =
+                new FieldFormatterCleanups(
+                        true,
+                        Arrays.asList(
+                                new FieldFormatterCleanup(
+                                        StandardField.TITLE, new LowerCaseFormatter()),
+                                new FieldFormatterCleanup(
+                                        StandardField.JOURNAL, new TitleCaseFormatter()),
+                                new FieldFormatterCleanup(
+                                        StandardField.DAY, new UpperCaseFormatter())));
         metaData.setSaveActions(saveActions);
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         // The order should be kept (the cleanups are a list, not a set)
-        assertEquals("@Comment{jabref-meta: saveActions:enabled;"
-                + OS.NEWLINE
-                + "title[lower_case]" + OS.NEWLINE
-                + "journal[title_case]" + OS.NEWLINE
-                + "day[upper_case]" + OS.NEWLINE
-                + ";}"
-                + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+                "@Comment{jabref-meta: saveActions:enabled;"
+                        + OS.NEWLINE
+                        + "title[lower_case]"
+                        + OS.NEWLINE
+                        + "journal[title_case]"
+                        + OS.NEWLINE
+                        + "day[upper_case]"
+                        + OS.NEWLINE
+                        + ";}"
+                        + OS.NEWLINE,
+                stringWriter.toString());
     }
 
     @Test
     void writeSaveOrderConfig() throws Exception {
-        SaveOrder saveOrder = new SaveOrder(SaveOrder.OrderType.SPECIFIED,
-                List.of(new SaveOrder.SortCriterion(StandardField.AUTHOR, false),
-                        new SaveOrder.SortCriterion(StandardField.YEAR, true),
-                        new SaveOrder.SortCriterion(StandardField.ABSTRACT, false)));
+        SaveOrder saveOrder =
+                new SaveOrder(
+                        SaveOrder.OrderType.SPECIFIED,
+                        List.of(
+                                new SaveOrder.SortCriterion(StandardField.AUTHOR, false),
+                                new SaveOrder.SortCriterion(StandardField.YEAR, true),
+                                new SaveOrder.SortCriterion(StandardField.ABSTRACT, false)));
         metaData.setSaveOrder(saveOrder);
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals("@Comment{jabref-meta: saveOrderConfig:specified;author;false;year;true;abstract;false;}"
-                + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+                "@Comment{jabref-meta: saveOrderConfig:specified;author;false;year;true;abstract;false;}"
+                        + OS.NEWLINE,
+                stringWriter.toString());
     }
 
     @Test
     void writeCustomKeyPattern() throws Exception {
-        AbstractCitationKeyPatterns pattern = new DatabaseCitationKeyPatterns(mock(GlobalCitationKeyPatterns.class));
+        AbstractCitationKeyPatterns pattern =
+                new DatabaseCitationKeyPatterns(mock(GlobalCitationKeyPatterns.class));
         pattern.setDefaultValue("test");
         pattern.addCitationKeyPattern(StandardEntryType.Article, "articleTest");
         metaData.setCiteKeyPattern(pattern);
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals("@Comment{jabref-meta: keypattern_article:articleTest;}" + OS.NEWLINE
-                        + OS.NEWLINE + "@Comment{jabref-meta: keypatterndefault:test;}" + OS.NEWLINE,
+        assertEquals(
+                "@Comment{jabref-meta: keypattern_article:articleTest;}"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Comment{jabref-meta: keypatterndefault:test;}"
+                        + OS.NEWLINE,
                 stringWriter.toString());
     }
 
@@ -794,7 +978,8 @@ void writeBiblatexMode() throws Exception {
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals("@Comment{jabref-meta: databaseType:biblatex;}" + OS.NEWLINE,
+        assertEquals(
+                "@Comment{jabref-meta: databaseType:biblatex;}" + OS.NEWLINE,
                 stringWriter.toString());
     }
 
@@ -804,8 +989,8 @@ void writeProtectedFlag() throws Exception {
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals("@Comment{jabref-meta: protectedFlag:true;}" + OS.NEWLINE,
-                stringWriter.toString());
+        assertEquals(
+                "@Comment{jabref-meta: protectedFlag:true;}" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
@@ -816,52 +1001,81 @@ void writeFileDirectories() throws Exception {
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals("@Comment{jabref-meta: fileDirectory:\\\\Literature\\\\;}" + OS.NEWLINE +
-                OS.NEWLINE + "@Comment{jabref-meta: fileDirectory-defaultOwner-user:D:\\\\Documents;}"
-                + OS.NEWLINE + OS.NEWLINE + "@Comment{jabref-meta: fileDirectoryLatex-defaultOwner-user:D:\\\\Latex;}" + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+                "@Comment{jabref-meta: fileDirectory:\\\\Literature\\\\;}"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Comment{jabref-meta: fileDirectory-defaultOwner-user:D:\\\\Documents;}"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Comment{jabref-meta: fileDirectoryLatex-defaultOwner-user:D:\\\\Latex;}"
+                        + OS.NEWLINE,
+                stringWriter.toString());
     }
 
     @Test
     void writeEntriesSorted() throws Exception {
-        SaveOrder saveOrder = new SaveOrder(SaveOrder.OrderType.SPECIFIED,
-                List.of(new SaveOrder.SortCriterion(StandardField.AUTHOR, false),
-                        new SaveOrder.SortCriterion(StandardField.YEAR, true),
-                        new SaveOrder.SortCriterion(StandardField.ABSTRACT, false)));
+        SaveOrder saveOrder =
+                new SaveOrder(
+                        SaveOrder.OrderType.SPECIFIED,
+                        List.of(
+                                new SaveOrder.SortCriterion(StandardField.AUTHOR, false),
+                                new SaveOrder.SortCriterion(StandardField.YEAR, true),
+                                new SaveOrder.SortCriterion(StandardField.ABSTRACT, false)));
         metaData.setSaveOrder(saveOrder);
 
-        BibEntry firstEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "A")
-                .withField(StandardField.YEAR, "2010")
-                .withChanged(true);
+        BibEntry firstEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "A")
+                        .withField(StandardField.YEAR, "2010")
+                        .withChanged(true);
 
-        BibEntry secondEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "A")
-                .withField(StandardField.YEAR, "2000")
-                .withChanged(true);
+        BibEntry secondEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "A")
+                        .withField(StandardField.YEAR, "2000")
+                        .withChanged(true);
 
-        BibEntry thirdEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "B")
-                .withField(StandardField.YEAR, "2000")
-                .withChanged(true);
+        BibEntry thirdEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "B")
+                        .withField(StandardField.YEAR, "2000")
+                        .withChanged(true);
 
         database.insertEntries(secondEntry, thirdEntry, firstEntry);
 
         databaseWriter.savePartOfDatabase(bibtexContext, database.getEntries());
 
-        assertEquals("@Article{," + OS.NEWLINE +
-                        "  author = {A}," + OS.NEWLINE +
-                        "  year   = {2010}," + OS.NEWLINE +
-                        "}" + OS.NEWLINE + OS.NEWLINE +
-                        "@Article{," + OS.NEWLINE +
-                        "  author = {A}," + OS.NEWLINE +
-                        "  year   = {2000}," + OS.NEWLINE +
-                        "}" + OS.NEWLINE + OS.NEWLINE +
-                        "@Article{," + OS.NEWLINE +
-                        "  author = {B}," + OS.NEWLINE +
-                        "  year   = {2000}," + OS.NEWLINE +
-                        "}" + OS.NEWLINE + OS.NEWLINE +
-                        "@Comment{jabref-meta: saveOrderConfig:specified;author;false;year;true;abstract;false;}" +
-                        OS.NEWLINE,
+        assertEquals(
+                "@Article{,"
+                        + OS.NEWLINE
+                        + "  author = {A},"
+                        + OS.NEWLINE
+                        + "  year   = {2010},"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Article{,"
+                        + OS.NEWLINE
+                        + "  author = {A},"
+                        + OS.NEWLINE
+                        + "  year   = {2000},"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Article{,"
+                        + OS.NEWLINE
+                        + "  author = {B},"
+                        + OS.NEWLINE
+                        + "  year   = {2000},"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Comment{jabref-meta: saveOrderConfig:specified;author;false;year;true;abstract;false;}"
+                        + OS.NEWLINE,
                 stringWriter.toString());
     }
 
@@ -888,53 +1102,73 @@ void writeEntriesInOriginalOrderWhenNoSaveOrderConfigIsSetInMetadata() throws Ex
 
         databaseWriter.savePartOfDatabase(bibtexContext, database.getEntries());
 
-        assertEquals("@Article{," + OS.NEWLINE +
-                        "  author = {A}," + OS.NEWLINE +
-                        "  year   = {2010}," + OS.NEWLINE +
-                        "}" + OS.NEWLINE + OS.NEWLINE +
-                        "@Article{," + OS.NEWLINE +
-                        "  author = {B}," + OS.NEWLINE +
-                        "  year   = {2000}," + OS.NEWLINE +
-                        "}" + OS.NEWLINE + OS.NEWLINE +
-                        "@Article{," + OS.NEWLINE +
-                        "  author = {A}," + OS.NEWLINE +
-                        "  year   = {2000}," + OS.NEWLINE +
-                        "}"
+        assertEquals(
+                "@Article{,"
+                        + OS.NEWLINE
+                        + "  author = {A},"
+                        + OS.NEWLINE
+                        + "  year   = {2010},"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Article{,"
+                        + OS.NEWLINE
+                        + "  author = {B},"
+                        + OS.NEWLINE
+                        + "  year   = {2000},"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Article{,"
+                        + OS.NEWLINE
+                        + "  author = {A},"
+                        + OS.NEWLINE
+                        + "  year   = {2000},"
+                        + OS.NEWLINE
+                        + "}"
                         + OS.NEWLINE,
                 stringWriter.toString());
     }
 
     @Test
     void normalizeWhitespacesCleanupOnlyInTextFields() throws Exception {
-        BibEntry firstEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Firstname1 Lastname1   and   Firstname2 Lastname2")
-                .withField(StandardField.FILE, "some  --  filename  -- spaces.pdf")
-                .withChanged(true);
+        BibEntry firstEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Firstname1 Lastname1   and   Firstname2 Lastname2")
+                        .withField(StandardField.FILE, "some  --  filename  -- spaces.pdf")
+                        .withChanged(true);
 
         database.insertEntry(firstEntry);
 
         databaseWriter.savePartOfDatabase(bibtexContext, database.getEntries());
 
-        assertEquals("""
+        assertEquals(
+                """
                 @Article{,
                   author = {Firstname1 Lastname1 and Firstname2 Lastname2},
                   file   = {some  --  filename  -- spaces.pdf},
                 }
-                """.replace("\n", OS.NEWLINE), stringWriter.toString());
+                """
+                        .replace("\n", OS.NEWLINE),
+                stringWriter.toString());
     }
 
     @Test
     void trimFieldContents() throws IOException {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.NOTE, "        some note    \t")
-                .withChanged(true);
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.NOTE, "        some note    \t")
+                        .withChanged(true);
         database.insertEntry(entry);
 
         databaseWriter.saveDatabase(bibtexContext);
 
-        assertEquals("@Article{," + OS.NEWLINE +
-                        "  note = {some note}," + OS.NEWLINE +
-                        "}" + OS.NEWLINE,
+        assertEquals(
+                "@Article{," + OS.NEWLINE + "  note = {some note}," + OS.NEWLINE + "}" + OS.NEWLINE,
                 stringWriter.toString());
     }
 
@@ -948,22 +1182,31 @@ void newlineAtEndOfAbstractFieldIsDeleted() throws Exception {
 
         databaseWriter.saveDatabase(bibtexContext);
 
-        assertEquals("@Article{," + OS.NEWLINE +
-                        "  abstract = {" + text + "}," + OS.NEWLINE +
-                        "}" + OS.NEWLINE,
+        assertEquals(
+                "@Article{,"
+                        + OS.NEWLINE
+                        + "  abstract = {"
+                        + text
+                        + "},"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE,
                 stringWriter.toString());
     }
 
     @Test
     void roundtripWithContentSelectorsAndUmlauts() throws Exception {
         String encodingHeader = "% Encoding: UTF-8" + OS.NEWLINE + OS.NEWLINE;
-        String commentEntry = "@Comment{jabref-meta: selector_journal:Test {\\\\\"U}mlaut;}" + OS.NEWLINE;
+        String commentEntry =
+                "@Comment{jabref-meta: selector_journal:Test {\\\\\"U}mlaut;}" + OS.NEWLINE;
         String fileContent = encodingHeader + commentEntry;
         Charset encoding = StandardCharsets.UTF_8;
 
-        ParserResult firstParse = new BibtexParser(importFormatPreferences).parse(new StringReader(fileContent));
+        ParserResult firstParse =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(fileContent));
 
-        BibDatabaseContext context = new BibDatabaseContext(firstParse.getDatabase(), firstParse.getMetaData());
+        BibDatabaseContext context =
+                new BibDatabaseContext(firstParse.getDatabase(), firstParse.getMetaData());
 
         databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
 
@@ -973,24 +1216,34 @@ void roundtripWithContentSelectorsAndUmlauts() throws Exception {
     @Test
     void saveAlsoSavesSecondModification() throws Exception {
         // @formatter:off
-        String bibtexEntry = OS.NEWLINE + "@Article{test," + OS.NEWLINE +
-                "  Author                   = {Foo Bar}," + OS.NEWLINE +
-                "  Journal                  = {International Journal of Something}," + OS.NEWLINE +
-                "  Note                     = {some note}," + OS.NEWLINE +
-                "  Number                   = {1}," + OS.NEWLINE +
-                "}";
+        String bibtexEntry =
+                OS.NEWLINE
+                        + "@Article{test,"
+                        + OS.NEWLINE
+                        + "  Author                   = {Foo Bar},"
+                        + OS.NEWLINE
+                        + "  Journal                  = {International Journal of Something},"
+                        + OS.NEWLINE
+                        + "  Note                     = {some note},"
+                        + OS.NEWLINE
+                        + "  Number                   = {1},"
+                        + OS.NEWLINE
+                        + "}";
         // @formatter:on
 
         // read in bibtex string
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        ParserResult firstParse = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ParserResult firstParse =
+                new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = firstParse.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
         // modify entry
         entry.setField(StandardField.AUTHOR, "BlaBla");
 
-        BibDatabaseContext context = new BibDatabaseContext(firstParse.getDatabase(), firstParse.getMetaData());
+        BibDatabaseContext context =
+                new BibDatabaseContext(firstParse.getDatabase(), firstParse.getMetaData());
         context.setMode(BibDatabaseMode.BIBTEX);
 
         databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
@@ -1001,37 +1254,58 @@ void saveAlsoSavesSecondModification() throws Exception {
         // write a second time
         stringWriter = new StringWriter();
         bibWriter = new BibWriter(stringWriter, OS.NEWLINE);
-        databaseWriter = new BibtexDatabaseWriter(
-                bibWriter,
-                saveConfiguration,
-                fieldPreferences,
-                citationKeyPatternPreferences,
-                entryTypesManager);
+        databaseWriter =
+                new BibtexDatabaseWriter(
+                        bibWriter,
+                        saveConfiguration,
+                        fieldPreferences,
+                        citationKeyPatternPreferences,
+                        entryTypesManager);
         databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
 
-        assertEquals("@Article{test," + OS.NEWLINE +
-                "  author  = {Test}," + OS.NEWLINE +
-                "  journal = {International Journal of Something}," + OS.NEWLINE +
-                "  note    = {some note}," + OS.NEWLINE +
-                "  number  = {1}," + OS.NEWLINE +
-                "}" + OS.NEWLINE + OS.NEWLINE +
-                "@Comment{jabref-meta: databaseType:bibtex;}" + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+                "@Article{test,"
+                        + OS.NEWLINE
+                        + "  author  = {Test},"
+                        + OS.NEWLINE
+                        + "  journal = {International Journal of Something},"
+                        + OS.NEWLINE
+                        + "  note    = {some note},"
+                        + OS.NEWLINE
+                        + "  number  = {1},"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE
+                        + OS.NEWLINE
+                        + "@Comment{jabref-meta: databaseType:bibtex;}"
+                        + OS.NEWLINE,
+                stringWriter.toString());
     }
 
     @Test
     void saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchanged() throws Exception {
         // @formatter:off
-        String bibtexEntry = "@Article{test," + OS.NEWLINE +
-                "  Author                   = {Foo Bar}," + OS.NEWLINE +
-                "  Journal                  = {International Journal of Something}," + OS.NEWLINE +
-                "  Number                   = {1}," + OS.NEWLINE +
-                "  Note                     = {some note}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String bibtexEntry =
+                "@Article{test,"
+                        + OS.NEWLINE
+                        + "  Author                   = {Foo Bar},"
+                        + OS.NEWLINE
+                        + "  Journal                  = {International Journal of Something},"
+                        + OS.NEWLINE
+                        + "  Number                   = {1},"
+                        + OS.NEWLINE
+                        + "  Note                     = {some note},"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE;
         // @formatter:on
 
         // read in bibtex string
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        ParserResult firstParse = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor()).parse(new StringReader(bibtexEntry));
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ParserResult firstParse =
+                new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor())
+                        .parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = firstParse.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -1042,33 +1316,47 @@ void saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchanged() throws Exception {
         entry.setChanged(false);
 
         // write entry
-        BibDatabaseContext context = new BibDatabaseContext(firstParse.getDatabase(), firstParse.getMetaData());
+        BibDatabaseContext context =
+                new BibDatabaseContext(firstParse.getDatabase(), firstParse.getMetaData());
         databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
 
         assertEquals(bibtexEntry, stringWriter.toString());
     }
 
     @Test
-    void saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchangedEvenInThePresenceOfSavedModifications() throws Exception {
+    void
+            saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchangedEvenInThePresenceOfSavedModifications()
+                    throws Exception {
         // @formatter:off
-        String bibtexEntry = "@Article{test," + OS.NEWLINE +
-                "  Author                   = {Foo Bar}," + OS.NEWLINE +
-                "  Journal                  = {International Journal of Something}," + OS.NEWLINE +
-                "  Note                     = {some note}," + OS.NEWLINE +
-                "  Number                   = {1}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String bibtexEntry =
+                "@Article{test,"
+                        + OS.NEWLINE
+                        + "  Author                   = {Foo Bar},"
+                        + OS.NEWLINE
+                        + "  Journal                  = {International Journal of Something},"
+                        + OS.NEWLINE
+                        + "  Note                     = {some note},"
+                        + OS.NEWLINE
+                        + "  Number                   = {1},"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE;
         // @formatter:on
 
         // read in bibtex string
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        ParserResult firstParse = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor()).parse(new StringReader(bibtexEntry));
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ParserResult firstParse =
+                new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor())
+                        .parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = firstParse.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
         // modify entry
         entry.setField(StandardField.AUTHOR, "BlaBla");
 
-        BibDatabaseContext context = new BibDatabaseContext(firstParse.getDatabase(), firstParse.getMetaData());
+        BibDatabaseContext context =
+                new BibDatabaseContext(firstParse.getDatabase(), firstParse.getMetaData());
 
         databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
 
@@ -1080,12 +1368,13 @@ void saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchangedEvenInThePresenceOfSav
         // write a second time
         stringWriter = new StringWriter();
         bibWriter = new BibWriter(stringWriter, OS.NEWLINE);
-        databaseWriter = new BibtexDatabaseWriter(
-                bibWriter,
-                saveConfiguration,
-                fieldPreferences,
-                citationKeyPatternPreferences,
-                entryTypesManager);
+        databaseWriter =
+                new BibtexDatabaseWriter(
+                        bibWriter,
+                        saveConfiguration,
+                        fieldPreferences,
+                        citationKeyPatternPreferences,
+                        entryTypesManager);
         databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
 
         // returns tu original entry, not to the last saved one
diff --git a/src/test/java/org/jabref/logic/exporter/CffExporterTest.java b/src/test/java/org/jabref/logic/exporter/CffExporterTest.java
index 5553b7527a60..67aade5904c9 100644
--- a/src/test/java/org/jabref/logic/exporter/CffExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/CffExporterTest.java
@@ -1,13 +1,8 @@
-
 package org.jabref.logic.exporter;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPatterns;
@@ -18,15 +13,18 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 class CffExporterTest {
 
@@ -49,58 +47,62 @@ final void exportForNoEntriesWritesNothing(@TempDir Path tempDir) throws Excepti
 
     @Test
     final void exportsCorrectContent(@TempDir Path tempDir) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.URL, "http://example.com");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.URL, "http://example.com");
 
         Path file = tempDir.resolve("RandomFileName");
         Files.createFile(file);
         cffExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "cff-version: 1.2.0",
-                "message: If you use this software, please cite it using the metadata from this file.",
-                "title: No title specified.",
-                "authors:",
-                "  - name: /",
-                "references:",
-                "  - title: Test Title",
-                "    authors:",
-                "      - family-names: Author",
-                "        given-names: Test",
-                "    type: article",
-                "    url: http://example.com");
+        List<String> expected =
+                List.of(
+                        "cff-version: 1.2.0",
+                        "message: If you use this software, please cite it using the metadata from this file.",
+                        "title: No title specified.",
+                        "authors:",
+                        "  - name: /",
+                        "references:",
+                        "  - title: Test Title",
+                        "    authors:",
+                        "      - family-names: Author",
+                        "        given-names: Test",
+                        "    type: article",
+                        "    url: http://example.com");
 
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
     final void usesCorrectType(@TempDir Path tempDir) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.DOI, "random_doi_value");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.DOI, "random_doi_value");
 
         Path file = tempDir.resolve("RandomFileName");
         Files.createFile(file);
         cffExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "cff-version: 1.2.0",
-                "message: If you use this software, please cite it using the metadata from this file.",
-                "title: No title specified.",
-                "authors:",
-                "  - name: /",
-                "references:",
-                "  - title: Test Title",
-                "    authors:",
-                "      - family-names: Author",
-                "        given-names: Test",
-                "    type: conference-paper",
-                "    doi: random_doi_value");
+        List<String> expected =
+                List.of(
+                        "cff-version: 1.2.0",
+                        "message: If you use this software, please cite it using the metadata from this file.",
+                        "title: No title specified.",
+                        "authors:",
+                        "  - name: /",
+                        "references:",
+                        "  - title: Test Title",
+                        "    authors:",
+                        "      - family-names: Author",
+                        "        given-names: Test",
+                        "    type: conference-paper",
+                        "    doi: random_doi_value");
 
         assertEquals(expected, Files.readAllLines(file));
     }
@@ -113,136 +115,143 @@ final void usesCorrectDefaultValues(@TempDir Path tempDir) throws Exception {
         Files.createFile(file);
         cffExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "cff-version: 1.2.0",
-                "message: If you use this software, please cite it using the metadata from this file.",
-                "title: No title specified.",
-                "authors:",
-                "  - name: /",
-                "references:",
-                "  - title: No title specified.",
-                "    authors:",
-                "      - name: /",
-                "    type: misc");
+        List<String> expected =
+                List.of(
+                        "cff-version: 1.2.0",
+                        "message: If you use this software, please cite it using the metadata from this file.",
+                        "title: No title specified.",
+                        "authors:",
+                        "  - name: /",
+                        "references:",
+                        "  - title: No title specified.",
+                        "    authors:",
+                        "      - name: /",
+                        "    type: misc");
 
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
     final void exportsSoftwareCorrectly(@TempDir Path tempDir) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Software)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.DOI, "random_doi_value");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Software)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.DOI, "random_doi_value");
 
         Path file = tempDir.resolve("RandomFileName");
         Files.createFile(file);
         cffExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "cff-version: 1.2.0",
-                "message: If you use this software, please cite it using the metadata from this file.",
-                "title: Test Title",
-                "authors:",
-                "  - family-names: Author",
-                "    given-names: Test",
-                "type: software",
-                "doi: random_doi_value");
+        List<String> expected =
+                List.of(
+                        "cff-version: 1.2.0",
+                        "message: If you use this software, please cite it using the metadata from this file.",
+                        "title: Test Title",
+                        "authors:",
+                        "  - family-names: Author",
+                        "    given-names: Test",
+                        "type: software",
+                        "doi: random_doi_value");
 
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
     final void exportsSoftwareDateCorrectly(@TempDir Path tempDir) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Software)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.DATE, "2003-11-06");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Software)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.DATE, "2003-11-06");
 
         Path file = tempDir.resolve("RandomFileName");
         Files.createFile(file);
         cffExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "cff-version: 1.2.0",
-                "message: If you use this software, please cite it using the metadata from this file.",
-                "title: Test Title",
-                "authors:",
-                "  - family-names: Author",
-                "    given-names: Test",
-                "type: software",
-                "date-released: '2003-11-06'");
+        List<String> expected =
+                List.of(
+                        "cff-version: 1.2.0",
+                        "message: If you use this software, please cite it using the metadata from this file.",
+                        "title: Test Title",
+                        "authors:",
+                        "  - family-names: Author",
+                        "    given-names: Test",
+                        "type: software",
+                        "date-released: '2003-11-06'");
 
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
     final void exportsArticleDateCorrectly(@TempDir Path tempDir) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.DATE, "2003-11");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.DATE, "2003-11");
 
         Path file = tempDir.resolve("RandomFileName");
         Files.createFile(file);
         cffExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "cff-version: 1.2.0",
-                "message: If you use this software, please cite it using the metadata from this file.",
-                "title: No title specified.",
-                "authors:",
-                "  - name: /",
-                "references:",
-                "  - title: Test Title",
-                "    authors:",
-                "      - family-names: Author",
-                "        given-names: Test",
-                "    type: article",
-                "    month: 11",
-                "    year: 2003");
+        List<String> expected =
+                List.of(
+                        "cff-version: 1.2.0",
+                        "message: If you use this software, please cite it using the metadata from this file.",
+                        "title: No title specified.",
+                        "authors:",
+                        "  - name: /",
+                        "references:",
+                        "  - title: Test Title",
+                        "    authors:",
+                        "      - family-names: Author",
+                        "        given-names: Test",
+                        "    type: article",
+                        "    month: 11",
+                        "    year: 2003");
 
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
     final void passesModifiedCharset(@TempDir Path tempDir) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "谷崎 潤一郎")
-                .withField(StandardField.TITLE, "細雪")
-                .withField(StandardField.URL, "http://example.com");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "谷崎 潤一郎")
+                        .withField(StandardField.TITLE, "細雪")
+                        .withField(StandardField.URL, "http://example.com");
 
         Path file = tempDir.resolve("RandomFileName");
         Files.createFile(file);
         cffExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "cff-version: 1.2.0",
-                "message: If you use this software, please cite it using the metadata from this file.",
-                "title: No title specified.",
-                "authors:",
-                "  - name: /",
-                "references:",
-                "  - title: 細雪",
-                "    authors:",
-                "      - family-names: 潤一郎",
-                "        given-names: 谷崎",
-                "    type: article",
-                "    url: http://example.com");
+        List<String> expected =
+                List.of(
+                        "cff-version: 1.2.0",
+                        "message: If you use this software, please cite it using the metadata from this file.",
+                        "title: No title specified.",
+                        "authors:",
+                        "  - name: /",
+                        "references:",
+                        "  - title: 細雪",
+                        "    authors:",
+                        "      - family-names: 潤一郎",
+                        "        given-names: 谷崎",
+                        "    type: article",
+                        "    url: http://example.com");
 
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
     final void roundTripTest(@TempDir Path tempDir) throws Exception {
-        CitationKeyPatternPreferences citationKeyPatternPreferences = mock(
-                CitationKeyPatternPreferences.class,
-                Answers.RETURNS_SMART_NULLS
-        );
+        CitationKeyPatternPreferences citationKeyPatternPreferences =
+                mock(CitationKeyPatternPreferences.class, Answers.RETURNS_SMART_NULLS);
         when(citationKeyPatternPreferences.getKeyPatterns())
                 .thenReturn(GlobalCitationKeyPatterns.fromPattern("[auth][year]"));
 
@@ -257,60 +266,61 @@ final void roundTripTest(@TempDir Path tempDir) throws Exception {
         Files.createFile(out);
         cffExporter.export(dbc, out, db.getEntries());
 
-        Set<String> expectedSoftware = Set.of(
-                "cff-version: 1.2.0",
-                "message: If you use this software, please cite it using the metadata from this file.",
-                "title: JabRef",
-                "authors:",
-                "  - family-names: Kopp",
-                "    given-names: Oliver",
-                "  - family-names: Diez",
-                "    given-names: Tobias",
-                "  - family-names: Schwentker",
-                "    given-names: Christoph",
-                "  - family-names: Snethlage",
-                "    given-names: Carl Christian",
-                "  - family-names: Asketorp",
-                "    given-names: Jonatan",
-                "  - family-names: Tutzer",
-                "    given-names: Benedikt",
-                "  - family-names: Ertel",
-                "    given-names: Thilo",
-                "  - family-names: Nasri",
-                "    given-names: Houssem",
-                "type: software",
-                "keywords:",
-                "  - reference manager",
-                "  - bibtex",
-                "  - biblatex",
-                "license: MIT",
-                "repository-code: https://github.com/jabref/jabref/",
-                "abstract: JabRef is an open-source, cross-platform citation and reference management tool.",
-                "url: https://www.jabref.org",
-                "preferred-citation:",
-                "  title: 'JabRef: BibTeX-based literature management software'",
-                "  authors:",
-                "    - family-names: Kopp",
-                "      given-names: Oliver",
-                "    - family-names: Snethlage",
-                "      given-names: Carl Christian",
-                "    - family-names: Schwentker",
-                "      given-names: Christoph",
-                "  type: article",
-                "  month: '11'",
-                "  issue: '138'",
-                "  volume: '44'",
-                "  year: '2023'",
-                "  doi: 10.47397/tb/44-3/tb138kopp-jabref",
-                "  journal: TUGboat",
-                "  number: '3'",
-                "  start: '441'",
-                "  end: '447'");
-
-        // Tests equality of sets since last lines order is random and relies on entries internal order
+        Set<String> expectedSoftware =
+                Set.of(
+                        "cff-version: 1.2.0",
+                        "message: If you use this software, please cite it using the metadata from this file.",
+                        "title: JabRef",
+                        "authors:",
+                        "  - family-names: Kopp",
+                        "    given-names: Oliver",
+                        "  - family-names: Diez",
+                        "    given-names: Tobias",
+                        "  - family-names: Schwentker",
+                        "    given-names: Christoph",
+                        "  - family-names: Snethlage",
+                        "    given-names: Carl Christian",
+                        "  - family-names: Asketorp",
+                        "    given-names: Jonatan",
+                        "  - family-names: Tutzer",
+                        "    given-names: Benedikt",
+                        "  - family-names: Ertel",
+                        "    given-names: Thilo",
+                        "  - family-names: Nasri",
+                        "    given-names: Houssem",
+                        "type: software",
+                        "keywords:",
+                        "  - reference manager",
+                        "  - bibtex",
+                        "  - biblatex",
+                        "license: MIT",
+                        "repository-code: https://github.com/jabref/jabref/",
+                        "abstract: JabRef is an open-source, cross-platform citation and reference management tool.",
+                        "url: https://www.jabref.org",
+                        "preferred-citation:",
+                        "  title: 'JabRef: BibTeX-based literature management software'",
+                        "  authors:",
+                        "    - family-names: Kopp",
+                        "      given-names: Oliver",
+                        "    - family-names: Snethlage",
+                        "      given-names: Carl Christian",
+                        "    - family-names: Schwentker",
+                        "      given-names: Christoph",
+                        "  type: article",
+                        "  month: '11'",
+                        "  issue: '138'",
+                        "  volume: '44'",
+                        "  year: '2023'",
+                        "  doi: 10.47397/tb/44-3/tb138kopp-jabref",
+                        "  journal: TUGboat",
+                        "  number: '3'",
+                        "  start: '441'",
+                        "  end: '447'");
+
+        // Tests equality of sets since last lines order is random and relies on entries internal
+        // order
         try (Stream<String> st = Files.lines(out)) {
             assertEquals(expectedSoftware, st.collect(Collectors.toSet()));
         }
     }
 }
-
diff --git a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
index 73f06d2e5dab..4fdf21c70aa3 100644
--- a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
@@ -1,9 +1,7 @@
 package org.jabref.logic.exporter;
 
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.StandardFileType;
@@ -11,15 +9,16 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.SaveOrder;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
 
 public class CsvExportFormatTest {
 
@@ -28,14 +27,15 @@ public class CsvExportFormatTest {
 
     @BeforeEach
     void setUp() {
-        exportFormat = new TemplateExporter(
-                "OpenOffice/LibreOffice CSV",
-                "oocsv",
-                "openoffice-csv",
-                "openoffice",
-                StandardFileType.CSV,
-                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                SaveOrder.getDefaultSaveOrder());
+        exportFormat =
+                new TemplateExporter(
+                        "OpenOffice/LibreOffice CSV",
+                        "oocsv",
+                        "openoffice-csv",
+                        "openoffice",
+                        StandardFileType.CSV,
+                        mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        SaveOrder.getDefaultSaveOrder());
 
         databaseContext = new BibDatabaseContext();
     }
@@ -65,7 +65,11 @@ void performExportForSingleAuthor(@TempDir Path testFolder) throws Exception {
     void performExportForMultipleAuthors(@TempDir Path testFolder) throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
 
-        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "von Neumann, John and Smith, John and Black Brown, Peter");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(
+                                StandardField.AUTHOR,
+                                "von Neumann, John and Smith, John and Black Brown, Peter");
         List<BibEntry> entries = List.of(entry);
 
         exportFormat.export(databaseContext, path, entries);
@@ -97,8 +101,11 @@ void performExportForSingleEditor(@TempDir Path testFolder) throws Exception {
     void performExportForMultipleEditors(@TempDir Path testFolder) throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
         File tmpFile = path.toFile();
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.EDITOR, "von Neumann, John and Smith, John and Black Brown, Peter");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(
+                                StandardField.EDITOR,
+                                "von Neumann, John and Smith, John and Black Brown, Peter");
         List<BibEntry> entries = List.of(entry);
 
         exportFormat.export(databaseContext, tmpFile.toPath(), entries);
diff --git a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
index d3dbc1c0c865..8ce5283b15f4 100644
--- a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
@@ -1,13 +1,7 @@
 package org.jabref.logic.exporter;
 
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.time.LocalDate;
-import java.util.Collections;
-import java.util.List;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.StandardFileType;
@@ -17,7 +11,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.metadata.SaveOrder;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -28,8 +21,14 @@
 import org.xmlunit.diff.ElementSelectors;
 import org.xmlunit.matchers.CompareMatcher;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.LocalDate;
+import java.util.Collections;
+import java.util.List;
 
 public class DocBook5ExporterTest {
 
@@ -42,26 +41,29 @@ public class DocBook5ExporterTest {
 
     @BeforeEach
     void setUp() throws URISyntaxException {
-        exporter = new TemplateExporter(
-                "DocBook 5.1",
-                "docbook5",
-                "docbook5",
-                null,
-                StandardFileType.XML,
-                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                SaveOrder.getDefaultSaveOrder());
+        exporter =
+                new TemplateExporter(
+                        "DocBook 5.1",
+                        "docbook5",
+                        "docbook5",
+                        null,
+                        StandardFileType.XML,
+                        mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        SaveOrder.getDefaultSaveOrder());
 
         LocalDate myDate = LocalDate.of(2018, 1, 1);
 
-        xmlFile = Path.of(DocBook5ExporterTest.class.getResource("Docbook5ExportFormat.xml").toURI());
+        xmlFile =
+                Path.of(DocBook5ExporterTest.class.getResource("Docbook5ExportFormat.xml").toURI());
         databaseContext = new BibDatabaseContext();
         charset = StandardCharsets.UTF_8;
-        BibEntry entry = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "my paper title")
-                .withField(StandardField.AUTHOR, "Stefan Kolb and Tobias Diez")
-                .withField(StandardField.ISBN, "1-2-34")
-                .withCitationKey("mykey")
-                .withDate(new Date(myDate));
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "my paper title")
+                        .withField(StandardField.AUTHOR, "Stefan Kolb and Tobias Diez")
+                        .withField(StandardField.ISBN, "1-2-34")
+                        .withCitationKey("mykey")
+                        .withDate(new Date(myDate));
         entries = Collections.singletonList(entry);
     }
 
@@ -74,8 +76,11 @@ void performExportForSingleEntry(@TempDir Path testFolder) throws Exception {
         Builder control = Input.from(Files.newInputStream(xmlFile));
         Builder test = Input.from(Files.newInputStream(path));
 
-        assertThat(test, CompareMatcher.isSimilarTo(control)
-                                       .normalizeWhitespace()
-                                       .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
+        assertThat(
+                test,
+                CompareMatcher.isSimilarTo(control)
+                        .normalizeWhitespace()
+                        .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText))
+                        .throwComparisonFailure());
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java
index 0b905925e6ea..a45f1d8f3207 100644
--- a/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java
@@ -1,11 +1,7 @@
 package org.jabref.logic.exporter;
 
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.StandardFileType;
@@ -13,14 +9,17 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.SaveOrder;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
 
 public class DocbookExporterTest {
 
@@ -31,14 +30,15 @@ public class DocbookExporterTest {
 
     @BeforeEach
     void setUp() {
-        exportFormat = new TemplateExporter(
-                "DocBook 4",
-                "docbook4",
-                "docbook4",
-                null,
-                StandardFileType.XML,
-                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                SaveOrder.getDefaultSaveOrder());
+        exportFormat =
+                new TemplateExporter(
+                        "DocBook 4",
+                        "docbook4",
+                        "docbook4",
+                        null,
+                        StandardFileType.XML,
+                        mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        SaveOrder.getDefaultSaveOrder());
     }
 
     @Test
@@ -46,7 +46,9 @@ void corruptedTitleBraces(@TempDir Path testFolder) throws Exception {
         Path tmpFile = testFolder.resolve("testBraces");
 
         BibEntry entry = new BibEntry();
-        entry.setField(StandardField.TITLE, "Peptidomics of the larval {{{D}rosophila melanogaster}} central nervous system.");
+        entry.setField(
+                StandardField.TITLE,
+                "Peptidomics of the larval {{{D}rosophila melanogaster}} central nervous system.");
 
         List<BibEntry> entries = Arrays.asList(entry);
 
@@ -54,7 +56,9 @@ void corruptedTitleBraces(@TempDir Path testFolder) throws Exception {
 
         List<String> lines = Files.readAllLines(tmpFile);
         assertEquals(20, lines.size());
-        assertEquals("   <citetitle pubwork=\"article\">Peptidomics of the larval Drosophila melanogaster central nervous system.</citetitle>", lines.get(9));
+        assertEquals(
+                "   <citetitle pubwork=\"article\">Peptidomics of the larval Drosophila melanogaster central nervous system.</citetitle>",
+                lines.get(9));
     }
 
     @Test
@@ -62,7 +66,9 @@ void corruptedTitleUnicode(@TempDir Path testFolder) throws Exception {
         Path tmpFile = testFolder.resolve("testBraces");
 
         BibEntry entry = new BibEntry();
-        entry.setField(StandardField.TITLE, "Insect neuropeptide bursicon homodimers induce innate immune and stress genes during molting by activating the {NF}-$\\kappa$B transcription factor Relish.");
+        entry.setField(
+                StandardField.TITLE,
+                "Insect neuropeptide bursicon homodimers induce innate immune and stress genes during molting by activating the {NF}-$\\kappa$B transcription factor Relish.");
 
         List<BibEntry> entries = Arrays.asList(entry);
 
@@ -70,6 +76,8 @@ void corruptedTitleUnicode(@TempDir Path testFolder) throws Exception {
 
         List<String> lines = Files.readAllLines(tmpFile);
         assertEquals(20, lines.size());
-        assertEquals("   <citetitle pubwork=\"article\">Insect neuropeptide bursicon homodimers induce innate immune and stress genes during molting by activating the NF&#45;&#954;B transcription factor Relish.</citetitle>", lines.get(9));
+        assertEquals(
+                "   <citetitle pubwork=\"article\">Insect neuropeptide bursicon homodimers induce innate immune and stress genes during molting by activating the NF&#45;&#954;B transcription factor Relish.</citetitle>",
+                lines.get(9));
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java b/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
index 772b0a902314..5e4a6c88725c 100644
--- a/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
@@ -1,13 +1,15 @@
 package org.jabref.logic.exporter;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -22,9 +24,6 @@
 import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -32,11 +31,11 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
 
 class EmbeddedBibFilePdfExporterTest {
 
@@ -80,7 +79,9 @@ private static void initBibEntries() throws IOException {
         olly2018.setFiles(List.of(linkedFile));
 
         toral2006.setField(StandardField.AUTHOR, "Toral, Antonio and Munoz, Rafael");
-        toral2006.setField(StandardField.TITLE, "A proposal to automatically build and maintain gazetteers for Named Entity Recognition by using Wikipedia");
+        toral2006.setField(
+                StandardField.TITLE,
+                "A proposal to automatically build and maintain gazetteers for Named Entity Recognition by using Wikipedia");
         toral2006.setField(StandardField.BOOKTITLE, "Proceedings of EACL");
         toral2006.setField(StandardField.PAGES, "56--61");
         toral2006.setField(StandardField.EPRINTTYPE, "asdf");
@@ -110,15 +111,17 @@ void setUp() throws IOException {
 
         BibDatabaseMode bibDatabaseMode = BibDatabaseMode.BIBTEX;
         BibEntryTypesManager bibEntryTypesManager = new BibEntryTypesManager();
-        FieldPreferences fieldPreferences = new FieldPreferences(
-                true,
-                List.of(StandardField.MONTH),
-                Collections.emptyList());
+        FieldPreferences fieldPreferences =
+                new FieldPreferences(true, List.of(StandardField.MONTH), Collections.emptyList());
 
-        exporter = new EmbeddedBibFilePdfExporter(bibDatabaseMode, bibEntryTypesManager, fieldPreferences);
+        exporter =
+                new EmbeddedBibFilePdfExporter(
+                        bibDatabaseMode, bibEntryTypesManager, fieldPreferences);
 
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.fieldPreferences().getNonWrappableFields()).thenReturn(FXCollections.emptyObservableList());
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.fieldPreferences().getNonWrappableFields())
+                .thenReturn(FXCollections.emptyObservableList());
         importer = new PdfEmbeddedBibFileImporter(importFormatPreferences);
 
         databaseContext = new BibDatabaseContext();
@@ -133,13 +136,26 @@ void setUp() throws IOException {
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithValidPdfFileLinks")
     void successfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
-        assertTrue(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018), abbreviationRepository));
+        assertTrue(
+                exporter.exportToAllFilesOfEntry(
+                        databaseContext,
+                        filePreferences,
+                        bibEntryWithValidPdfFileLink,
+                        List.of(olly2018),
+                        abbreviationRepository));
     }
 
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithInvalidPdfFileLinks")
-    void unsuccessfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
-        assertFalse(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018), abbreviationRepository));
+    void unsuccessfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink)
+            throws Exception {
+        assertFalse(
+                exporter.exportToAllFilesOfEntry(
+                        databaseContext,
+                        filePreferences,
+                        bibEntryWithValidPdfFileLink,
+                        List.of(olly2018),
+                        abbreviationRepository));
     }
 
     public static Stream<Arguments> provideBibEntriesWithValidPdfFileLinks() {
@@ -153,13 +169,17 @@ public static Stream<Arguments> provideBibEntriesWithInvalidPdfFileLinks() {
     @ParameterizedTest
     @MethodSource("providePathsToValidPDFs")
     void successfulExportToFileByPath(Path path) throws Exception {
-        assertTrue(exporter.exportToFileByPath(databaseContext, filePreferences, path, abbreviationRepository));
+        assertTrue(
+                exporter.exportToFileByPath(
+                        databaseContext, filePreferences, path, abbreviationRepository));
     }
 
     @ParameterizedTest
     @MethodSource("providePathsToInvalidPDFs")
     void unsuccessfulExportToFileByPath(Path path) throws Exception {
-        assertFalse(exporter.exportToFileByPath(databaseContext, filePreferences, path, abbreviationRepository));
+        assertFalse(
+                exporter.exportToFileByPath(
+                        databaseContext, filePreferences, path, abbreviationRepository));
     }
 
     public static Stream<Arguments> providePathToNewPDFs() {
@@ -178,7 +198,8 @@ public static Stream<Arguments> providePathsToInvalidPDFs() throws IOException {
                 Arguments.of(Path.of(existingFileThatIsNotLinked.getLink())));
     }
 
-    private static LinkedFile createDefaultLinkedFile(String fileName, Path tempDir) throws IOException {
+    private static LinkedFile createDefaultLinkedFile(String fileName, Path tempDir)
+            throws IOException {
         Path pdfFile = tempDir.resolve(fileName);
         try (PDDocument pdf = new PDDocument()) {
             pdf.addPage(new PDPage());
@@ -191,12 +212,13 @@ private static LinkedFile createDefaultLinkedFile(String fileName, Path tempDir)
     @ParameterizedTest
     @MethodSource("providePathToNewPDFs")
     void roundtripExportImport(Path path) throws Exception {
-        BibEntry expected = new BibEntry(StandardEntryType.Misc)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.URL, "http://example.com")
-                .withField(StandardField.DATE, "2020-10-14");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Misc)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.URL, "http://example.com")
+                        .withField(StandardField.DATE, "2020-10-14");
         expected.setChanged(true);
 
         List<BibEntry> expectedEntries = Collections.singletonList(expected);
diff --git a/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterFilesTest.java b/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterFilesTest.java
index e70945e89f3a..1d0cb5aef396 100644
--- a/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterFilesTest.java
@@ -1,11 +1,9 @@
 package org.jabref.logic.exporter;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
 
 import org.jabref.logic.bibtex.BibEntryAssert;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -15,7 +13,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -24,10 +21,12 @@
 import org.xmlunit.diff.DefaultNodeMatcher;
 import org.xmlunit.diff.ElementSelectors;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
 
 class EndnoteXmlExporterFilesTest {
 
@@ -40,8 +39,10 @@ class EndnoteXmlExporterFilesTest {
 
     @BeforeEach
     void setUp(@TempDir Path testFolder) throws Exception {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences()).thenReturn(mock(BibEntryPreferences.class));
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.bibEntryPreferences())
+                .thenReturn(mock(BibEntryPreferences.class));
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
         databaseContext = new BibDatabaseContext();
@@ -53,13 +54,21 @@ void setUp(@TempDir Path testFolder) throws Exception {
 
     static Stream<String> fileNames() throws IOException, URISyntaxException {
         // we have to point it to one existing file, otherwise it will return the default class path
-        Path resourceDir = Path.of(EndnoteXmlExporterFilesTest.class.getResource("EndnoteXmlExportTestSingleBookEntry.bib").toURI()).getParent();
+        Path resourceDir =
+                Path.of(
+                                EndnoteXmlExporterFilesTest.class
+                                        .getResource("EndnoteXmlExportTestSingleBookEntry.bib")
+                                        .toURI())
+                        .getParent();
         try (Stream<Path> stream = Files.list(resourceDir)) {
-            return stream.map(n -> n.getFileName().toString())
-                         .filter(n -> n.endsWith(".bib"))
-                         .filter(n -> n.startsWith("EndnoteXml"))
-                         // mapping required, because we get "source already consumed or closed" otherwise
-                         .toList().stream();
+            return stream
+                    .map(n -> n.getFileName().toString())
+                    .filter(n -> n.endsWith(".bib"))
+                    .filter(n -> n.startsWith("EndnoteXml"))
+                    // mapping required, because we get "source already consumed or closed"
+                    // otherwise
+                    .toList()
+                    .stream();
         }
     }
 
@@ -67,28 +76,33 @@ static Stream<String> fileNames() throws IOException, URISyntaxException {
     @MethodSource("fileNames")
     final void performExport(String filename) throws Exception {
         bibFileToExport = Path.of(EndnoteXmlExporterFilesTest.class.getResource(filename).toURI());
-        List<BibEntry> entries = bibtexImporter.importDatabase(bibFileToExport).getDatabase().getEntries();
+        List<BibEntry> entries =
+                bibtexImporter.importDatabase(bibFileToExport).getDatabase().getEntries();
         exporter.export(databaseContext, exportFile, entries);
         String actual = String.join("\n", Files.readAllLines(exportFile));
 
         String xmlFileName = filename.replace(".bib", ".xml");
-        Path expectedFile = Path.of(ModsExportFormatFilesTest.class.getResource(xmlFileName).toURI());
+        Path expectedFile =
+                Path.of(ModsExportFormatFilesTest.class.getResource(xmlFileName).toURI());
         String expected = String.join("\n", Files.readAllLines(expectedFile));
 
         // The order of the XML elements changes
         // The order does not really matter, so we ignore it.
         // Source: https://stackoverflow.com/a/16540679/873282
-        assertThat(actual, isSimilarTo(expected)
-                .ignoreWhitespace()
-                .normalizeWhitespace()
-                .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)));
+        assertThat(
+                actual,
+                isSimilarTo(expected)
+                        .ignoreWhitespace()
+                        .normalizeWhitespace()
+                        .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)));
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     final void exportAsEndnoteAndThenImportAsEndnote(String filename) throws Exception {
         bibFileToExport = Path.of(EndnoteXmlExporterFilesTest.class.getResource(filename).toURI());
-        List<BibEntry> entries = bibtexImporter.importDatabase(bibFileToExport).getDatabase().getEntries();
+        List<BibEntry> entries =
+                bibtexImporter.importDatabase(bibFileToExport).getDatabase().getEntries();
 
         exporter.export(databaseContext, exportFile, entries);
         BibEntryAssert.assertEquals(entries, exportFile, endnoteXmlImporter);
diff --git a/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterTest.java b/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterTest.java
index d93a13b9fcee..9e1323eb9258 100644
--- a/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/EndnoteXmlExporterTest.java
@@ -1,8 +1,9 @@
 package org.jabref.logic.exporter;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.database.BibDatabaseContext;
@@ -10,16 +11,14 @@
 import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
 
 class EndnoteXmlExporterTest {
 
@@ -29,22 +28,27 @@ class EndnoteXmlExporterTest {
 
     @BeforeEach
     void setUp() throws Exception {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences()).thenReturn(mock(BibEntryPreferences.class));
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.bibEntryPreferences())
+                .thenReturn(mock(BibEntryPreferences.class));
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
         databaseContext = new BibDatabaseContext();
         exporter = new EndnoteXmlExporter(new BibEntryPreferences(','));
 
-        bookEntry = new BibEntry(StandardEntryType.Book)
-                .withCitationKey("Bhattacharyya2013")
-                .withField(StandardField.EDITOR, "Bhattacharyya, R. and McCormick, M. E.")
-                .withField(StandardField.PUBLISHER, "Elsevier Science")
-                .withField(StandardField.TITLE, "Wave Energy Conversion")
-                .withField(StandardField.YEAR, "2013")
-                .withField(StandardField.ISBN, "9780080442129")
-                .withField(StandardField.FILE, "/home/mfg/acad/ext/arts/waves/water/[R._Bhattacharyya_and_M.E._McCormick_(Eds.)]_Wave_(z-lib.org).pdf")
-                .withField(StandardField.KEYWORDS, "waves, agua");
+        bookEntry =
+                new BibEntry(StandardEntryType.Book)
+                        .withCitationKey("Bhattacharyya2013")
+                        .withField(StandardField.EDITOR, "Bhattacharyya, R. and McCormick, M. E.")
+                        .withField(StandardField.PUBLISHER, "Elsevier Science")
+                        .withField(StandardField.TITLE, "Wave Energy Conversion")
+                        .withField(StandardField.YEAR, "2013")
+                        .withField(StandardField.ISBN, "9780080442129")
+                        .withField(
+                                StandardField.FILE,
+                                "/home/mfg/acad/ext/arts/waves/water/[R._Bhattacharyya_and_M.E._McCormick_(Eds.)]_Wave_(z-lib.org).pdf")
+                        .withField(StandardField.KEYWORDS, "waves, agua");
     }
 
     @Test
@@ -59,21 +63,23 @@ void exportForEmptyEntryList(@TempDir Path tempDir) throws Exception {
     void exportForNullDBThrowsException(@TempDir Path tempDir) {
         Path file = tempDir.resolve("NullDB");
 
-        assertThrows(NullPointerException.class, () ->
-                exporter.export(null, file, Collections.singletonList(bookEntry)));
+        assertThrows(
+                NullPointerException.class,
+                () -> exporter.export(null, file, Collections.singletonList(bookEntry)));
     }
 
     @Test
     void exportForNullExportPathThrowsException(@TempDir Path tempDir) {
-        assertThrows(NullPointerException.class, () ->
-                exporter.export(databaseContext, null, Collections.singletonList(bookEntry)));
+        assertThrows(
+                NullPointerException.class,
+                () -> exporter.export(databaseContext, null, Collections.singletonList(bookEntry)));
     }
 
     @Test
     void exportForNullEntryListThrowsException(@TempDir Path tempDir) {
         Path file = tempDir.resolve("EntryNull");
 
-        assertThrows(NullPointerException.class, () ->
-                exporter.export(databaseContext, file, null));
+        assertThrows(
+                NullPointerException.class, () -> exporter.export(databaseContext, file, null));
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/ExporterTest.java b/src/test/java/org/jabref/logic/exporter/ExporterTest.java
index b3490f8a0f2a..5b8a7c0d932f 100644
--- a/src/test/java/org/jabref/logic/exporter/ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ExporterTest.java
@@ -1,12 +1,9 @@
 package org.jabref.logic.exporter;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -15,17 +12,19 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.metadata.SaveOrder;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
 
 public class ExporterTest {
 
@@ -40,23 +39,25 @@ void setUp() {
 
     private static Stream<Object[]> exportFormats() {
         CliPreferences preferences = mock(CliPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(preferences.getExportPreferences().getExportSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
-        when(preferences.getExportPreferences().getCustomExporters()).thenReturn(FXCollections.emptyObservableList());
+        when(preferences.getExportPreferences().getExportSaveOrder())
+                .thenReturn(SaveOrder.getDefaultSaveOrder());
+        when(preferences.getExportPreferences().getCustomExporters())
+                .thenReturn(FXCollections.emptyObservableList());
 
-        ExporterFactory exporterFactory = ExporterFactory.create(
-                preferences,
-                mock(BibEntryTypesManager.class));
+        ExporterFactory exporterFactory =
+                ExporterFactory.create(preferences, mock(BibEntryTypesManager.class));
 
         Collection<Object[]> result = new ArrayList<>();
         for (Exporter format : exporterFactory.getExporters()) {
-            result.add(new Object[]{format, format.getName()});
+            result.add(new Object[] {format, format.getName()});
         }
         return result.stream();
     }
 
     @ParameterizedTest
     @MethodSource("exportFormats")
-    void exportingEmptyDatabaseYieldsEmptyFile(Exporter exportFormat, String name, @TempDir Path testFolder) throws Exception {
+    void exportingEmptyDatabaseYieldsEmptyFile(
+            Exporter exportFormat, String name, @TempDir Path testFolder) throws Exception {
         Path tmpFile = testFolder.resolve("ARandomlyNamedFile");
         Files.createFile(tmpFile);
         exportFormat.export(databaseContext, tmpFile, entries);
@@ -65,11 +66,14 @@ void exportingEmptyDatabaseYieldsEmptyFile(Exporter exportFormat, String name, @
 
     @ParameterizedTest
     @MethodSource("exportFormats")
-    void exportingNullDatabaseThrowsNPE(Exporter exportFormat, String name, @TempDir Path testFolder) {
-        assertThrows(NullPointerException.class, () -> {
-            Path tmpFile = testFolder.resolve("ARandomlyNamedFile");
-            Files.createFile(tmpFile);
-            exportFormat.export(null, tmpFile, entries);
-        });
+    void exportingNullDatabaseThrowsNPE(
+            Exporter exportFormat, String name, @TempDir Path testFolder) {
+        assertThrows(
+                NullPointerException.class,
+                () -> {
+                    Path tmpFile = testFolder.resolve("ARandomlyNamedFile");
+                    Files.createFile(tmpFile);
+                    exportFormat.export(null, tmpFile, entries);
+                });
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java b/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
index 64346f80347e..f16a87936f83 100644
--- a/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
+++ b/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
@@ -1,10 +1,6 @@
 package org.jabref.logic.exporter;
 
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import javafx.scene.paint.Color;
 
@@ -26,11 +22,14 @@
 import org.jabref.model.groups.WordKeywordGroup;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.search.SearchFlags;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
 
 /**
  * Loading of groups is tested at {@link org.jabref.logic.importer.util.GroupsParserTest}.
@@ -53,77 +52,141 @@ void serializeSingleAllEntriesGroup() {
 
     @Test
     void serializeSingleExplicitGroup() {
-        ExplicitGroup group = new ExplicitGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup group =
+                new ExplicitGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, ',');
         List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 StaticGroup:myExplicitGroup;0;1;;;;"), serialization);
+        assertEquals(
+                Collections.singletonList("0 StaticGroup:myExplicitGroup;0;1;;;;"), serialization);
     }
 
     @Test
     void serializeSingleExplicitGroupWithIconAndDescription() {
-        ExplicitGroup group = new ExplicitGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup group =
+                new ExplicitGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, ',');
         group.setIconName("test icon");
         group.setExpanded(true);
         group.setColor(Color.ALICEBLUE);
         group.setDescription("test description");
         List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 StaticGroup:myExplicitGroup;0;1;0xf0f8ffff;test icon;test description;"), serialization);
+        assertEquals(
+                Collections.singletonList(
+                        "0 StaticGroup:myExplicitGroup;0;1;0xf0f8ffff;test icon;test description;"),
+                serialization);
     }
 
     @Test
     // For https://github.com/JabRef/jabref/issues/1681
     void serializeSingleExplicitGroupWithEscapedSlash() {
-        ExplicitGroup group = new ExplicitGroup("B{\\\"{o}}hmer", GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup group =
+                new ExplicitGroup("B{\\\"{o}}hmer", GroupHierarchyType.INDEPENDENT, ',');
         List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 StaticGroup:B{\\\\\"{o}}hmer;0;1;;;;"), serialization);
+        assertEquals(
+                Collections.singletonList("0 StaticGroup:B{\\\\\"{o}}hmer;0;1;;;;"), serialization);
     }
 
     @Test
     void serializeSingleSimpleKeywordGroup() {
-        WordKeywordGroup group = new WordKeywordGroup("name", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, "test", false, ',', false);
+        WordKeywordGroup group =
+                new WordKeywordGroup(
+                        "name",
+                        GroupHierarchyType.INDEPENDENT,
+                        StandardField.KEYWORDS,
+                        "test",
+                        false,
+                        ',',
+                        false);
         List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 KeywordGroup:name;0;keywords;test;0;0;1;;;;"), serialization);
+        assertEquals(
+                Collections.singletonList("0 KeywordGroup:name;0;keywords;test;0;0;1;;;;"),
+                serialization);
     }
 
     @Test
     void serializeSingleRegexKeywordGroup() {
-        KeywordGroup group = new RegexKeywordGroup("myExplicitGroup", GroupHierarchyType.REFINING, StandardField.AUTHOR, "asdf", false);
+        KeywordGroup group =
+                new RegexKeywordGroup(
+                        "myExplicitGroup",
+                        GroupHierarchyType.REFINING,
+                        StandardField.AUTHOR,
+                        "asdf",
+                        false);
         List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 KeywordGroup:myExplicitGroup;1;author;asdf;0;1;1;;;;"), serialization);
+        assertEquals(
+                Collections.singletonList("0 KeywordGroup:myExplicitGroup;1;author;asdf;0;1;1;;;;"),
+                serialization);
     }
 
     @Test
     void serializeSingleSearchGroup() {
-        SearchGroup group = new SearchGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, "author=harrer", EnumSet.of(SearchFlags.CASE_SENSITIVE, SearchFlags.REGULAR_EXPRESSION));
+        SearchGroup group =
+                new SearchGroup(
+                        "myExplicitGroup",
+                        GroupHierarchyType.INDEPENDENT,
+                        "author=harrer",
+                        EnumSet.of(SearchFlags.CASE_SENSITIVE, SearchFlags.REGULAR_EXPRESSION));
         List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 SearchGroup:myExplicitGroup;0;author=harrer;1;1;1;;;;"), serialization);
+        assertEquals(
+                Collections.singletonList(
+                        "0 SearchGroup:myExplicitGroup;0;author=harrer;1;1;1;;;;"),
+                serialization);
     }
 
     @Test
     void serializeSingleSearchGroupWithRegex() {
-        SearchGroup group = new SearchGroup("myExplicitGroup", GroupHierarchyType.INCLUDING, "author=\"harrer\"", EnumSet.of(SearchFlags.CASE_SENSITIVE));
+        SearchGroup group =
+                new SearchGroup(
+                        "myExplicitGroup",
+                        GroupHierarchyType.INCLUDING,
+                        "author=\"harrer\"",
+                        EnumSet.of(SearchFlags.CASE_SENSITIVE));
         List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 SearchGroup:myExplicitGroup;2;author=\"harrer\";1;0;1;;;;"), serialization);
+        assertEquals(
+                Collections.singletonList(
+                        "0 SearchGroup:myExplicitGroup;2;author=\"harrer\";1;0;1;;;;"),
+                serialization);
     }
 
     @Test
     void serializeSingleAutomaticKeywordGroup() {
-        AutomaticGroup group = new AutomaticKeywordGroup("myAutomaticGroup", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, ',', '>');
+        AutomaticGroup group =
+                new AutomaticKeywordGroup(
+                        "myAutomaticGroup",
+                        GroupHierarchyType.INDEPENDENT,
+                        StandardField.KEYWORDS,
+                        ',',
+                        '>');
         List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 AutomaticKeywordGroup:myAutomaticGroup;0;keywords;,;>;1;;;;"), serialization);
+        assertEquals(
+                Collections.singletonList(
+                        "0 AutomaticKeywordGroup:myAutomaticGroup;0;keywords;,;>;1;;;;"),
+                serialization);
     }
 
     @Test
     void serializeSingleAutomaticPersonGroup() {
-        AutomaticPersonsGroup group = new AutomaticPersonsGroup("myAutomaticGroup", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR);
+        AutomaticPersonsGroup group =
+                new AutomaticPersonsGroup(
+                        "myAutomaticGroup", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR);
         List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 AutomaticPersonsGroup:myAutomaticGroup;0;author;1;;;;"), serialization);
+        assertEquals(
+                Collections.singletonList(
+                        "0 AutomaticPersonsGroup:myAutomaticGroup;0;author;1;;;;"),
+                serialization);
     }
 
     @Test
     void serializeSingleTexGroup() throws Exception {
-        TexGroup group = TexGroup.create("myTexGroup", GroupHierarchyType.INDEPENDENT, Path.of("path", "To", "File"), new DefaultAuxParser(new BibDatabase()), new MetaData());
+        TexGroup group =
+                TexGroup.create(
+                        "myTexGroup",
+                        GroupHierarchyType.INDEPENDENT,
+                        Path.of("path", "To", "File"),
+                        new DefaultAuxParser(new BibDatabase()),
+                        new MetaData());
         List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 TexGroup:myTexGroup;0;path/To/File;1;;;;"), serialization);
+        assertEquals(
+                Collections.singletonList("0 TexGroup:myTexGroup;0;path/To/File;1;;;;"),
+                serialization);
     }
 
     @Test
@@ -131,12 +194,12 @@ void getTreeAsStringInSimpleTree() throws Exception {
         GroupTreeNode root = GroupTreeNodeTest.getRoot();
         GroupTreeNodeTest.getNodeInSimpleTree(root);
 
-        List<String> expected = Arrays.asList(
-                "0 AllEntriesGroup:",
-                "1 StaticGroup:ExplicitA;2;1;;;;",
-                "1 StaticGroup:ExplicitParent;0;1;;;;",
-                "2 StaticGroup:ExplicitNode;1;1;;;;"
-        );
+        List<String> expected =
+                Arrays.asList(
+                        "0 AllEntriesGroup:",
+                        "1 StaticGroup:ExplicitA;2;1;;;;",
+                        "1 StaticGroup:ExplicitParent;0;1;;;;",
+                        "2 StaticGroup:ExplicitNode;1;1;;;;");
         assertEquals(expected, groupSerializer.serializeTree(root));
     }
 
@@ -145,22 +208,22 @@ void getTreeAsStringInComplexTree() throws Exception {
         GroupTreeNode root = GroupTreeNodeTest.getRoot();
         GroupTreeNodeTest.getNodeInComplexTree(root);
 
-        List<String> expected = Arrays.asList(
-                "0 AllEntriesGroup:",
-                "1 SearchGroup:SearchA;2;searchExpression;1;0;1;;;;",
-                "1 StaticGroup:ExplicitA;2;1;;;;",
-                "1 StaticGroup:ExplicitGrandParent;0;1;;;;",
-                "2 StaticGroup:ExplicitB;1;1;;;;",
-                "2 KeywordGroup:KeywordParent;0;keywords;searchExpression;1;0;1;;;;",
-                "3 KeywordGroup:KeywordNode;0;keywords;searchExpression;1;0;1;;;;",
-                "4 StaticGroup:ExplicitChild;1;1;;;;",
-                "3 SearchGroup:SearchC;2;searchExpression;1;0;1;;;;",
-                "3 StaticGroup:ExplicitC;1;1;;;;",
-                "3 KeywordGroup:KeywordC;0;keywords;searchExpression;1;0;1;;;;",
-                "2 SearchGroup:SearchB;2;searchExpression;1;0;1;;;;",
-                "2 KeywordGroup:KeywordB;0;keywords;searchExpression;1;0;1;;;;",
-                "1 KeywordGroup:KeywordA;0;keywords;searchExpression;1;0;1;;;;"
-        );
+        List<String> expected =
+                Arrays.asList(
+                        "0 AllEntriesGroup:",
+                        "1 SearchGroup:SearchA;2;searchExpression;1;0;1;;;;",
+                        "1 StaticGroup:ExplicitA;2;1;;;;",
+                        "1 StaticGroup:ExplicitGrandParent;0;1;;;;",
+                        "2 StaticGroup:ExplicitB;1;1;;;;",
+                        "2 KeywordGroup:KeywordParent;0;keywords;searchExpression;1;0;1;;;;",
+                        "3 KeywordGroup:KeywordNode;0;keywords;searchExpression;1;0;1;;;;",
+                        "4 StaticGroup:ExplicitChild;1;1;;;;",
+                        "3 SearchGroup:SearchC;2;searchExpression;1;0;1;;;;",
+                        "3 StaticGroup:ExplicitC;1;1;;;;",
+                        "3 KeywordGroup:KeywordC;0;keywords;searchExpression;1;0;1;;;;",
+                        "2 SearchGroup:SearchB;2;searchExpression;1;0;1;;;;",
+                        "2 KeywordGroup:KeywordB;0;keywords;searchExpression;1;0;1;;;;",
+                        "1 KeywordGroup:KeywordA;0;keywords;searchExpression;1;0;1;;;;");
         assertEquals(expected, groupSerializer.serializeTree(root));
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/HayagrivaYamlExporterTest.java b/src/test/java/org/jabref/logic/exporter/HayagrivaYamlExporterTest.java
index 7244d96a326a..9031ce71d9e1 100644
--- a/src/test/java/org/jabref/logic/exporter/HayagrivaYamlExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/HayagrivaYamlExporterTest.java
@@ -1,9 +1,7 @@
 package org.jabref.logic.exporter;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.StandardFileType;
@@ -12,14 +10,15 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.metadata.SaveOrder;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
 
 class HayagrivaYamlExporterTest {
 
@@ -28,15 +27,16 @@ class HayagrivaYamlExporterTest {
 
     @BeforeAll
     static void setUp() {
-        hayagrivaYamlExporter = new TemplateExporter(
-                "Hayagriva YAML",
-                "hayagrivayaml",
-                "hayagrivayaml",
-                null,
-                StandardFileType.YAML,
-                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                SaveOrder.getDefaultSaveOrder(),
-                BlankLineBehaviour.DELETE_BLANKS);
+        hayagrivaYamlExporter =
+                new TemplateExporter(
+                        "Hayagriva YAML",
+                        "hayagrivayaml",
+                        "hayagrivayaml",
+                        null,
+                        StandardFileType.YAML,
+                        mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        SaveOrder.getDefaultSaveOrder(),
+                        BlankLineBehaviour.DELETE_BLANKS);
 
         databaseContext = new BibDatabaseContext();
     }
@@ -51,166 +51,178 @@ final void exportForNoEntriesWritesNothing(@TempDir Path tempFile) throws Except
 
     @Test
     final void exportsCorrectContent(@TempDir Path tempFile) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.URL, "http://example.com")
-                .withField(StandardField.DATE, "2020-10-14");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.URL, "http://example.com")
+                        .withField(StandardField.DATE, "2020-10-14");
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
         hayagrivaYamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "---",
-                "test:",
-                "  type: article",
-                "  title: \"Test Title\"",
-                "  author:",
-                "    - Author, Test",
-                "  date: 2020-10-14",
-                "  url: http://example.com",
-                "---");
+        List<String> expected =
+                List.of(
+                        "---",
+                        "test:",
+                        "  type: article",
+                        "  title: \"Test Title\"",
+                        "  author:",
+                        "    - Author, Test",
+                        "  date: 2020-10-14",
+                        "  url: http://example.com",
+                        "---");
 
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
     final void exportsCorrectMultipleAuthors(@TempDir Path tempFile) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Test Author and Other One")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.URL, "http://example.com")
-                .withField(StandardField.DATE, "2020-10-14");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Test Author and Other One")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.URL, "http://example.com")
+                        .withField(StandardField.DATE, "2020-10-14");
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
         hayagrivaYamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "---",
-                "test:",
-                "  type: article",
-                "  title: \"Test Title\"",
-                "  author:",
-                "    - Author, Test",
-                "    - One, Other",
-                "  date: 2020-10-14",
-                "  url: http://example.com",
-                "---");
+        List<String> expected =
+                List.of(
+                        "---",
+                        "test:",
+                        "  type: article",
+                        "  title: \"Test Title\"",
+                        "  author:",
+                        "    - Author, Test",
+                        "    - One, Other",
+                        "  date: 2020-10-14",
+                        "  url: http://example.com",
+                        "---");
 
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
     final void formatsContentCorrect(@TempDir Path tempFile) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Misc)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.URL, "http://example.com")
-                .withField(StandardField.DATE, "2020-10-14");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Misc)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.URL, "http://example.com")
+                        .withField(StandardField.DATE, "2020-10-14");
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
         hayagrivaYamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "---",
-                "test:",
-                "  type: Misc",
-                "  title: \"Test Title\"",
-                "  author:",
-                "    - Author, Test",
-                "  date: 2020-10-14",
-                "  url: http://example.com",
-                "---");
+        List<String> expected =
+                List.of(
+                        "---",
+                        "test:",
+                        "  type: Misc",
+                        "  title: \"Test Title\"",
+                        "  author:",
+                        "    - Author, Test",
+                        "  date: 2020-10-14",
+                        "  url: http://example.com",
+                        "---");
 
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
     void passesModifiedCharset(@TempDir Path tempFile) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "谷崎 潤一郎")
-                .withField(StandardField.TITLE, "細雪")
-                .withField(StandardField.URL, "http://example.com")
-                .withField(StandardField.DATE, "2020-10-14");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "谷崎 潤一郎")
+                        .withField(StandardField.TITLE, "細雪")
+                        .withField(StandardField.URL, "http://example.com")
+                        .withField(StandardField.DATE, "2020-10-14");
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
         hayagrivaYamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "---",
-                "test:",
-                "  type: article",
-                "  title: \"細雪\"",
-                "  author:",
-                "    - 潤一郎, 谷崎",
-                "  date: 2020-10-14",
-                "  url: http://example.com",
-                "---");
+        List<String> expected =
+                List.of(
+                        "---",
+                        "test:",
+                        "  type: article",
+                        "  title: \"細雪\"",
+                        "  author:",
+                        "    - 潤一郎, 谷崎",
+                        "  date: 2020-10-14",
+                        "  url: http://example.com",
+                        "---");
 
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
     void passesModifiedCharsetNull(@TempDir Path tempFile) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "谷崎 潤一郎")
-                .withField(StandardField.TITLE, "細雪")
-                .withField(StandardField.URL, "http://example.com")
-                .withField(StandardField.DATE, "2020-10-14");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "谷崎 潤一郎")
+                        .withField(StandardField.TITLE, "細雪")
+                        .withField(StandardField.URL, "http://example.com")
+                        .withField(StandardField.DATE, "2020-10-14");
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
         hayagrivaYamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "---",
-                "test:",
-                "  type: article",
-                "  title: \"細雪\"",
-                "  author:",
-                "    - 潤一郎, 谷崎",
-                "  date: 2020-10-14",
-                "  url: http://example.com",
-                "---");
+        List<String> expected =
+                List.of(
+                        "---",
+                        "test:",
+                        "  type: article",
+                        "  title: \"細雪\"",
+                        "  author:",
+                        "    - 潤一郎, 谷崎",
+                        "  date: 2020-10-14",
+                        "  url: http://example.com",
+                        "---");
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
     final void exportsCorrectParentField(@TempDir Path tempFile) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.JOURNAL, "Test Publisher")
-                .withField(StandardField.URL, "http://example.com")
-                .withField(StandardField.DATE, "2020-10-14");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.JOURNAL, "Test Publisher")
+                        .withField(StandardField.URL, "http://example.com")
+                        .withField(StandardField.DATE, "2020-10-14");
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
         hayagrivaYamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "---",
-                "test:",
-                "  type: article",
-                "  title: \"Test Title\"",
-                "  author:",
-                "    - Author, Test",
-                "  date: 2020-10-14",
-                "  parent:",
-                "    type: periodical",
-                "    title: Test Publisher",
-                "  url: http://example.com",
-                "---");
+        List<String> expected =
+                List.of(
+                        "---",
+                        "test:",
+                        "  type: article",
+                        "  title: \"Test Title\"",
+                        "  author:",
+                        "    - Author, Test",
+                        "  date: 2020-10-14",
+                        "  parent:",
+                        "    type: periodical",
+                        "    title: Test Publisher",
+                        "  url: http://example.com",
+                        "---");
 
         assertEquals(expected, Files.readAllLines(file));
     }
diff --git a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
index 72f0c5ad84c1..cc4a8e926e32 100644
--- a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
@@ -1,10 +1,7 @@
 package org.jabref.logic.exporter;
 
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.StandardFileType;
@@ -12,15 +9,17 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.SaveOrder;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
 
 public class HtmlExportFormatTest {
     public BibDatabaseContext databaseContext;
@@ -30,13 +29,15 @@ public class HtmlExportFormatTest {
 
     @BeforeEach
     void setUp() {
-        exportFormat = new TemplateExporter("HTML",
-                "html",
-                "html",
-                null,
-                StandardFileType.HTML,
-                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                SaveOrder.getDefaultSaveOrder());
+        exportFormat =
+                new TemplateExporter(
+                        "HTML",
+                        "html",
+                        "html",
+                        null,
+                        StandardFileType.HTML,
+                        mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        SaveOrder.getDefaultSaveOrder());
 
         databaseContext = new BibDatabaseContext();
         charset = StandardCharsets.UTF_8;
diff --git a/src/test/java/org/jabref/logic/exporter/MSBibExportFormatFilesTest.java b/src/test/java/org/jabref/logic/exporter/MSBibExportFormatFilesTest.java
index 6a03d17cd3c8..bfd02152a307 100644
--- a/src/test/java/org/jabref/logic/exporter/MSBibExportFormatFilesTest.java
+++ b/src/test/java/org/jabref/logic/exporter/MSBibExportFormatFilesTest.java
@@ -1,20 +1,14 @@
 package org.jabref.logic.exporter;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -23,9 +17,14 @@
 import org.xmlunit.diff.DefaultNodeMatcher;
 import org.xmlunit.diff.ElementSelectors;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
 
 public class MSBibExportFormatFilesTest {
 
@@ -38,13 +37,21 @@ public class MSBibExportFormatFilesTest {
 
     static Stream<String> fileNames() throws IOException, URISyntaxException {
         // we have to point it to one existing file, otherwise it will return the default class path
-        resourceDir = Path.of(MSBibExportFormatFilesTest.class.getResource("MsBibExportFormatTest1.bib").toURI()).getParent();
+        resourceDir =
+                Path.of(
+                                MSBibExportFormatFilesTest.class
+                                        .getResource("MsBibExportFormatTest1.bib")
+                                        .toURI())
+                        .getParent();
         try (Stream<Path> stream = Files.list(resourceDir)) {
-            return stream.map(n -> n.getFileName().toString())
-                         .filter(n -> n.endsWith(".bib"))
-                         .filter(n -> n.startsWith("MsBib"))
-                         // mapping required, because we get "source already consumed or closed" otherwise
-                         .toList().stream();
+            return stream
+                    .map(n -> n.getFileName().toString())
+                    .filter(n -> n.endsWith(".bib"))
+                    .filter(n -> n.startsWith("MsBib"))
+                    // mapping required, because we get "source already consumed or closed"
+                    // otherwise
+                    .toList()
+                    .stream();
         }
     }
 
@@ -55,7 +62,10 @@ void setUp(@TempDir Path testFolder) throws Exception {
         exporter = new MSBibExporter();
         Path path = testFolder.resolve("ARandomlyNamedFile.tmp");
         exportedFile = Files.createFile(path);
-        testImporter = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
+        testImporter =
+                new BibtexImporter(
+                        mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        new DummyFileUpdateMonitor());
     }
 
     @ParameterizedTest(name = "{index} file={0}")
@@ -65,10 +75,14 @@ void performExport(String filename) throws IOException, SaveException {
         Path expectedFile = resourceDir.resolve(xmlFileName);
         Path importFile = resourceDir.resolve(filename);
 
-        BibDatabaseContext contextFromImport = testImporter.importDatabase(importFile).getDatabaseContext();
+        BibDatabaseContext contextFromImport =
+                testImporter.importDatabase(importFile).getDatabaseContext();
         List<BibEntry> entries = contextFromImport.getEntries();
 
-        contextFromImport.getDatabase().getStringValues().forEach(this.databaseContext.getDatabase()::addString);
+        contextFromImport
+                .getDatabase()
+                .getStringValues()
+                .forEach(this.databaseContext.getDatabase()::addString);
         exporter.export(databaseContext, exportedFile, entries);
 
         String expected = String.join("\n", Files.readAllLines(expectedFile));
@@ -77,9 +91,11 @@ void performExport(String filename) throws IOException, SaveException {
         // The order of the XML elements changes from Windows to Travis environment somehow
         // The order does not really matter, so we ignore it.
         // Source: https://stackoverflow.com/a/16540679/873282
-        assertThat(expected, isSimilarTo(actual)
-                .ignoreWhitespace()
-                .normalizeWhitespace()
-                .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)));
+        assertThat(
+                expected,
+                isSimilarTo(actual)
+                        .ignoreWhitespace()
+                        .normalizeWhitespace()
+                        .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)));
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java b/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java
index 5722d326d48c..fbddd612d00a 100644
--- a/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java
+++ b/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java
@@ -1,11 +1,6 @@
 package org.jabref.logic.exporter;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.TreeMap;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPatterns;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
@@ -24,14 +19,18 @@
 import org.jabref.model.entry.types.UnknownEntryType;
 import org.jabref.model.metadata.ContentSelector;
 import org.jabref.model.metadata.MetaData;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.TreeMap;
+import java.util.stream.Stream;
 
 public class MetaDataSerializerTest {
 
@@ -45,42 +44,49 @@ public class MetaDataSerializerTest {
     void setUp() {
         metaData = new MetaData();
         pattern = GlobalCitationKeyPatterns.fromPattern("[auth][year]");
-        newCustomType = new BibEntryType(
-                CUSTOM_TYPE,
-                List.of(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT)),
-                Collections.emptySet());
+        newCustomType =
+                new BibEntryType(
+                        CUSTOM_TYPE,
+                        List.of(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT)),
+                        Collections.emptySet());
     }
 
     @Test
     void serializeNewMetadataReturnsEmptyMap() {
-        assertEquals(Collections.emptyMap(), MetaDataSerializer.getSerializedStringMap(metaData, pattern));
+        assertEquals(
+                Collections.emptyMap(),
+                MetaDataSerializer.getSerializedStringMap(metaData, pattern));
     }
 
     @Test
     void serializeSingleSaveAction() {
-        FieldFormatterCleanups saveActions = new FieldFormatterCleanups(true,
-                Collections.singletonList(new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter())));
+        FieldFormatterCleanups saveActions =
+                new FieldFormatterCleanups(
+                        true,
+                        Collections.singletonList(
+                                new FieldFormatterCleanup(
+                                        StandardField.TITLE, new LowerCaseFormatter())));
         metaData.setSaveActions(saveActions);
 
         Map<String, String> expectedSerialization = new TreeMap<>();
-        expectedSerialization.put("saveActions",
-                "enabled;" + OS.NEWLINE + "title[lower_case]" + OS.NEWLINE + ";");
-        assertEquals(expectedSerialization, MetaDataSerializer.getSerializedStringMap(metaData, pattern));
+        expectedSerialization.put(
+                "saveActions", "enabled;" + OS.NEWLINE + "title[lower_case]" + OS.NEWLINE + ";");
+        assertEquals(
+                expectedSerialization,
+                MetaDataSerializer.getSerializedStringMap(metaData, pattern));
     }
 
     @Test
     void serializeSingleContentSelectors() {
-        List<String> values = List.of(
-                "approved",
-                "captured",
-                "received",
-                "status");
+        List<String> values = List.of("approved", "captured", "received", "status");
 
         metaData.addContentSelector(new ContentSelector(StandardField.PUBSTATE, values));
 
         Map<String, String> expectedSerialization = new TreeMap<>();
         expectedSerialization.put("selector_pubstate", "approved;captured;received;status;");
-        assertEquals(expectedSerialization, MetaDataSerializer.getSerializedStringMap(metaData, pattern));
+        assertEquals(
+                expectedSerialization,
+                MetaDataSerializer.getSerializedStringMap(metaData, pattern));
     }
 
     @Test
@@ -92,10 +98,11 @@ void parsingEmptyOrFieldsReturnsEmptyCollections() {
 
     @Test
     void parsingEmptyOptionalFieldsFieldsReturnsEmptyCollections() {
-        newCustomType = new BibEntryType(
-                CUSTOM_TYPE,
-                Collections.emptySet(),
-                Collections.singleton(new OrFields(StandardField.AUTHOR)));
+        newCustomType =
+                new BibEntryType(
+                        CUSTOM_TYPE,
+                        Collections.emptySet(),
+                        Collections.singleton(new OrFields(StandardField.AUTHOR)));
 
         String serialized = MetaDataSerializer.serializeCustomEntryTypes(newCustomType);
         Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(serialized);
@@ -111,33 +118,34 @@ public static Stream<Arguments> serializeCustomizedEntryType() {
                         new BibEntryTypeBuilder()
                                 .withType(new UnknownEntryType("test"))
                                 .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE),
-                        "jabref-entrytype: test: req[author;title] opt[]"
-                ),
+                        "jabref-entrytype: test: req[author;title] opt[]"),
                 Arguments.of(
                         new BibEntryTypeBuilder()
                                 .withType(new UnknownEntryType("test"))
                                 .withRequiredFields(StandardField.AUTHOR)
                                 .withImportantFields(StandardField.TITLE),
-                        "jabref-entrytype: test: req[author] opt[title]"
-                ),
+                        "jabref-entrytype: test: req[author] opt[title]"),
                 Arguments.of(
                         new BibEntryTypeBuilder()
                                 .withType(new UnknownEntryType("test"))
-                                .withRequiredFields(UnknownField.fromDisplayName("Test1"), UnknownField.fromDisplayName("Test2")),
-                        "jabref-entrytype: test: req[Test1;Test2] opt[]"
-                ),
+                                .withRequiredFields(
+                                        UnknownField.fromDisplayName("Test1"),
+                                        UnknownField.fromDisplayName("Test2")),
+                        "jabref-entrytype: test: req[Test1;Test2] opt[]"),
                 Arguments.of(
                         new BibEntryTypeBuilder()
                                 .withType(new UnknownEntryType("test"))
-                                .withRequiredFields(UnknownField.fromDisplayName("tEST"), UnknownField.fromDisplayName("tEsT2")),
-                        "jabref-entrytype: test: req[tEST;tEsT2] opt[]"
-                )
-        );
+                                .withRequiredFields(
+                                        UnknownField.fromDisplayName("tEST"),
+                                        UnknownField.fromDisplayName("tEsT2")),
+                        "jabref-entrytype: test: req[tEST;tEsT2] opt[]"));
     }
 
     @ParameterizedTest
     @MethodSource
     void serializeCustomizedEntryType(BibEntryTypeBuilder bibEntryTypeBuilder, String expected) {
-        assertEquals(expected, MetaDataSerializer.serializeCustomEntryTypes(bibEntryTypeBuilder.build()));
+        assertEquals(
+                expected,
+                MetaDataSerializer.serializeCustomEntryTypes(bibEntryTypeBuilder.build()));
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/ModsExportFormatFilesTest.java b/src/test/java/org/jabref/logic/exporter/ModsExportFormatFilesTest.java
index 2fb783d02cd6..64226bacdbe9 100644
--- a/src/test/java/org/jabref/logic/exporter/ModsExportFormatFilesTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ModsExportFormatFilesTest.java
@@ -1,11 +1,8 @@
 package org.jabref.logic.exporter;
 
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.bibtex.BibEntryAssert;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -15,7 +12,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -24,9 +20,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
 
 public class ModsExportFormatFilesTest {
     private static final Logger LOGGER = LoggerFactory.getLogger(ModsExportFormatFilesTest.class);
@@ -42,19 +41,30 @@ public class ModsExportFormatFilesTest {
     private Path importFile;
 
     public static Stream<String> fileNames() throws Exception {
-        resourceDir = Path.of(MSBibExportFormatFilesTest.class.getResource("ModsExportFormatTestAllFields.bib").toURI()).getParent();
+        resourceDir =
+                Path.of(
+                                MSBibExportFormatFilesTest.class
+                                        .getResource("ModsExportFormatTestAllFields.bib")
+                                        .toURI())
+                        .getParent();
         LOGGER.debug("Mods export resouce dir {}", resourceDir);
 
         try (Stream<Path> stream = Files.list(resourceDir)) {
-            return stream.map(n -> n.getFileName().toString()).filter(n -> n.endsWith(".bib"))
-                         .filter(n -> n.startsWith("Mods")).toList().stream();
+            return stream
+                    .map(n -> n.getFileName().toString())
+                    .filter(n -> n.endsWith(".bib"))
+                    .filter(n -> n.startsWith("Mods"))
+                    .toList()
+                    .stream();
         }
     }
 
     @BeforeEach
     void setUp(@TempDir Path testFolder) throws Exception {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences()).thenReturn(mock(BibEntryPreferences.class));
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.bibEntryPreferences())
+                .thenReturn(mock(BibEntryPreferences.class));
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
         databaseContext = new BibDatabaseContext();
@@ -73,8 +83,10 @@ void setUp(@TempDir Path testFolder) throws Exception {
     final void performExport(String filename) throws Exception {
         importFile = Path.of(ModsExportFormatFilesTest.class.getResource(filename).toURI());
         String xmlFileName = filename.replace(".bib", ".xml");
-        List<BibEntry> entries = bibtexImporter.importDatabase(importFile).getDatabase().getEntries();
-        Path expectedFile = Path.of(ModsExportFormatFilesTest.class.getResource(xmlFileName).toURI());
+        List<BibEntry> entries =
+                bibtexImporter.importDatabase(importFile).getDatabase().getEntries();
+        Path expectedFile =
+                Path.of(ModsExportFormatFilesTest.class.getResource(xmlFileName).toURI());
 
         exporter.export(databaseContext, exportedFile, entries);
 
@@ -87,7 +99,8 @@ final void performExport(String filename) throws Exception {
     @MethodSource("fileNames")
     final void exportAsModsAndThenImportAsMods(String filename) throws Exception {
         importFile = Path.of(ModsExportFormatFilesTest.class.getResource(filename).toURI());
-        List<BibEntry> entries = bibtexImporter.importDatabase(importFile).getDatabase().getEntries();
+        List<BibEntry> entries =
+                bibtexImporter.importDatabase(importFile).getDatabase().getEntries();
 
         exporter.export(databaseContext, exportedFile, entries);
         BibEntryAssert.assertEquals(entries, exportedFile, modsImporter);
diff --git a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java
index c08f76582c4e..32cedf3ae87e 100644
--- a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java
@@ -1,21 +1,20 @@
 package org.jabref.logic.exporter;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
 
 class ModsExportFormatTest {
 
@@ -26,8 +25,13 @@ class ModsExportFormatTest {
     void setUp() throws Exception {
         databaseContext = new BibDatabaseContext();
         modsExportFormat = new ModsExporter();
-        new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
-        Path.of(ModsExportFormatTest.class.getResource("ModsExportFormatTestAllFields.bib").toURI());
+        new BibtexImporter(
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                new DummyFileUpdateMonitor());
+        Path.of(
+                ModsExportFormatTest.class
+                        .getResource("ModsExportFormatTestAllFields.bib")
+                        .toURI());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java
index 956779c8a28c..82df821dab7b 100644
--- a/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.exporter;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
 
 public class MsBibExportFormatTest {
 
diff --git a/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java b/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
index 3ec4af000696..5978ae5b95b3 100644
--- a/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
+++ b/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
@@ -1,23 +1,11 @@
 package org.jabref.logic.exporter;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.util.Collections;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -26,7 +14,18 @@
 import org.xmlunit.diff.ElementSelectors;
 import org.xmlunit.matchers.CompareMatcher;
 
-import static org.hamcrest.MatcherAssert.assertThat;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.Collections;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
 public class OpenOfficeDocumentCreatorTest {
     public BibDatabaseContext databaseContext;
@@ -38,7 +37,11 @@ public class OpenOfficeDocumentCreatorTest {
 
     @BeforeEach
     void setUp() throws URISyntaxException {
-        xmlFile = Path.of(OpenOfficeDocumentCreatorTest.class.getResource("OldOpenOfficeCalcExportFormatContentSingleEntry.xml").toURI());
+        xmlFile =
+                Path.of(
+                        OpenOfficeDocumentCreatorTest.class
+                                .getResource("OldOpenOfficeCalcExportFormatContentSingleEntry.xml")
+                                .toURI());
 
         exporter = new OpenOfficeDocumentCreator();
 
@@ -47,7 +50,9 @@ void setUp() throws URISyntaxException {
 
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         entry.setField(StandardField.ADDRESS, "New York, NY, USA");
-        entry.setField(StandardField.TITLE, "Design and usability in security systems: daily life as a context of use?");
+        entry.setField(
+                StandardField.TITLE,
+                "Design and usability in security systems: daily life as a context of use?");
         entry.setField(StandardField.AUTHOR, "Tony Clear");
         entry.setField(StandardField.ISSN, "0097-8418");
         entry.setField(StandardField.DOI, "http://doi.acm.org/10.1145/820127.820136");
@@ -74,12 +79,16 @@ void performExportForSingleEntry(@TempDir Path testFolder) throws Exception {
         Input.Builder control = Input.from(Files.newInputStream(xmlFile));
         Input.Builder test = Input.from(Files.newInputStream(contentXmlPath));
         // for debugging purposes
-       // Path testPath = xmlFile.resolveSibling("test.xml");
-       // Files.copy(Files.newInputStream(contentXmlPath), testPath, StandardCopyOption.REPLACE_EXISTING);
-
-        assertThat(test, CompareMatcher.isSimilarTo(control)
-                                       .normalizeWhitespace()
-                                       .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
+        // Path testPath = xmlFile.resolveSibling("test.xml");
+        // Files.copy(Files.newInputStream(contentXmlPath), testPath,
+        // StandardCopyOption.REPLACE_EXISTING);
+
+        assertThat(
+                test,
+                CompareMatcher.isSimilarTo(control)
+                        .normalizeWhitespace()
+                        .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText))
+                        .throwComparisonFailure());
     }
 
     private static void unzipContentXml(Path zipFile, Path unzipFolder) throws IOException {
diff --git a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
index 64eae6945a7b..0c7e20cef71f 100644
--- a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
@@ -1,10 +1,8 @@
 package org.jabref.logic.exporter;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -12,14 +10,15 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 class XmpExporterTest {
 
@@ -41,8 +40,14 @@ void exportSingleEntry(@TempDir Path testFolder) throws Exception {
         entry.setField(StandardField.AUTHOR, "Alan Turing");
 
         exporter.export(databaseContext, file, Collections.singletonList(entry));
-        String actual = String.join("\n", Files.readAllLines(file)); // we are using \n to join, so we need it in the expected string as well, \r\n would fail
-        String expected = """
+        String actual =
+                String.join(
+                        "\n",
+                        Files.readAllLines(
+                                file)); // we are using \n to join, so we need it in the expected
+                                        // string as well, \r\n would fail
+        String expected =
+                """
                   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
                     <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about="">
                       <dc:creator>
@@ -58,7 +63,8 @@ void exportSingleEntry(@TempDir Path testFolder) throws Exception {
                       </dc:type>
                     </rdf:Description>
                   </rdf:RDF>
-                """.stripTrailing();
+                """
+                        .stripTrailing();
         assertEquals(expected, actual);
     }
 
@@ -76,9 +82,15 @@ void writeMultipleEntriesInASingleFile(@TempDir Path testFolder) throws Exceptio
 
         exporter.export(databaseContext, file, Arrays.asList(entryTuring, entryArmbrust));
 
-        String actual = String.join("\n", Files.readAllLines(file)); // we are using \n to join, so we need it in the expected string as well, \r\n would fail
+        String actual =
+                String.join(
+                        "\n",
+                        Files.readAllLines(
+                                file)); // we are using \n to join, so we need it in the expected
+                                        // string as well, \r\n would fail
 
-        String expected = """
+        String expected =
+                """
                     <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
                       <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about="">
                         <dc:creator>
@@ -112,7 +124,8 @@ void writeMultipleEntriesInASingleFile(@TempDir Path testFolder) throws Exceptio
                         </dc:type>
                       </rdf:Description>
                     </rdf:RDF>
-                  """.stripTrailing();
+                  """
+                        .stripTrailing();
         assertEquals(expected, actual);
     }
 
@@ -122,11 +135,11 @@ void writeMultipleEntriesInDifferentFiles(@TempDir Path testFolder) throws Excep
         Path file = testFolder.resolve(XmpExporter.XMP_SPLIT_DIRECTORY_INDICATOR);
         Files.createFile(file);
 
-        BibEntry entryTuring = new BibEntry()
-                .withField(StandardField.AUTHOR, "Alan Turing");
-        BibEntry entryArmbrust = new BibEntry()
-                .withField(StandardField.AUTHOR, "Michael Armbrust")
-                .withCitationKey("Armbrust2010");
+        BibEntry entryTuring = new BibEntry().withField(StandardField.AUTHOR, "Alan Turing");
+        BibEntry entryArmbrust =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "Michael Armbrust")
+                        .withCitationKey("Armbrust2010");
 
         exporter.export(databaseContext, file, List.of(entryTuring, entryArmbrust));
 
@@ -138,7 +151,8 @@ void writeMultipleEntriesInDifferentFiles(@TempDir Path testFolder) throws Excep
         Path fileTuring = Path.of(file.getParent().toString(), entryTuring.getId() + "_null.xmp");
         // we are using \n to join, so we need it in the expected string as well, \r\n would fail
         String actualTuring = String.join("\n", Files.readAllLines(fileTuring));
-        String expectedTuring = """
+        String expectedTuring =
+                """
                 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
                   <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about="">
                     <dc:creator>
@@ -154,14 +168,17 @@ void writeMultipleEntriesInDifferentFiles(@TempDir Path testFolder) throws Excep
                     </dc:type>
                   </rdf:Description>
                 </rdf:RDF>
-              """.stripTrailing();
+              """
+                        .stripTrailing();
         assertEquals(expectedTuring, actualTuring);
 
         // armbrust contains the armbrust entry only
-        Path fileArmbrust = Path.of(file.getParent().toString(), entryArmbrust.getId() + "_Armbrust2010.xmp");
+        Path fileArmbrust =
+                Path.of(file.getParent().toString(), entryArmbrust.getId() + "_Armbrust2010.xmp");
         // we are using \n to join, so we need it in the expected string as well, \r\n would fail
         String actualArmbrust = String.join("\n", Files.readAllLines(fileArmbrust));
-        String expectedArmbrust = """
+        String expectedArmbrust =
+                """
                   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
                     <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about="">
                       <dc:creator>
@@ -182,25 +199,28 @@ void writeMultipleEntriesInDifferentFiles(@TempDir Path testFolder) throws Excep
                       </dc:type>
                     </rdf:Description>
                   </rdf:RDF>
-                """.stripTrailing();
+                """
+                        .stripTrailing();
         assertEquals(expectedArmbrust, actualArmbrust);
     }
 
     @Test
     void exportSingleEntryWithPrivacyFilter(@TempDir Path testFolder) throws Exception {
-        when(xmpPreferences.getXmpPrivacyFilter()).thenReturn(FXCollections.observableSet(Collections.singleton(StandardField.AUTHOR)));
+        when(xmpPreferences.getXmpPrivacyFilter())
+                .thenReturn(
+                        FXCollections.observableSet(Collections.singleton(StandardField.AUTHOR)));
         when(xmpPreferences.shouldUseXmpPrivacyFilter()).thenReturn(true);
 
         Path file = testFolder.resolve("ThisIsARandomlyNamedFile");
         Files.createFile(file);
 
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.AUTHOR, "Alan Turing");
+        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "Alan Turing");
 
         exporter.export(databaseContext, file, Collections.singletonList(entry));
 
         String actual = String.join("\n", Files.readAllLines(file));
-        String expected = """
+        String expected =
+                """
                   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
                     <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about="">
                       <dc:format>application/pdf</dc:format>
@@ -211,7 +231,8 @@ void exportSingleEntryWithPrivacyFilter(@TempDir Path testFolder) throws Excepti
                       </dc:type>
                     </rdf:Description>
                   </rdf:RDF>
-                """.stripTrailing();
+                """
+                        .stripTrailing();
 
         assertEquals(expected, actual);
     }
diff --git a/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java b/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
index d4b79d56dab1..a67f44108db4 100644
--- a/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
@@ -1,14 +1,19 @@
 package org.jabref.logic.exporter;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.formatter.bibtexfields.NormalizeNamesFormatter;
@@ -24,12 +29,6 @@
 import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
@@ -38,11 +37,11 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
 
 class XmpPdfExporterTest {
 
@@ -60,38 +59,48 @@ class XmpPdfExporterTest {
     private FilePreferences filePreferences;
 
     private static void initBibEntries() throws IOException {
-        OLLY_2018.withCitationKey("Olly2018")
-                 .withField(StandardField.AUTHOR, "Olly and Johannes")
-                 .withField(StandardField.TITLE, "Stefan's palace")
-                 .withField(StandardField.JOURNAL, "Test Journal")
-                 .withField(StandardField.VOLUME, "1")
-                 .withField(StandardField.NUMBER, "1")
-                 .withField(StandardField.PAGES, "1-2")
-                 .withMonth(Month.MARCH)
-                 .withField(StandardField.ISSN, "978-123-123")
-                 .withField(StandardField.NOTE, "NOTE")
-                 .withField(StandardField.ABSTRACT, "ABSTRACT")
-                 .withField(StandardField.COMMENT, "COMMENT").withField(StandardField.DOI, "10/3212.3123").withField(StandardField.FILE, ":article_dublinCore.pdf:PDF")
-                 .withField(StandardField.GROUPS, "NO")
-                 .withField(StandardField.HOWPUBLISHED, "online")
-                 .withField(StandardField.KEYWORDS, "k1, k2").withField(StandardField.OWNER, "me").withField(StandardField.REVIEW, "review")
-                 .withField(StandardField.URL, "https://www.olly2018.edu")
-                 .withFiles(List.of(createDefaultLinkedFile("existing.pdf", tempDir)));
-
-        TORAL_2006.withField(StandardField.AUTHOR, "Toral, Antonio and Munoz, Rafael")
-                  .withField(StandardField.TITLE, "A proposal to automatically build and maintain gazetteers for Named Entity Recognition by using Wikipedia")
-                  .withField(StandardField.BOOKTITLE, "Proceedings of EACL")
-                  .withField(StandardField.PAGES, "56--61")
-                  .withField(StandardField.EPRINTTYPE, "asdf")
-                  .withField(StandardField.OWNER, "Ich")
-                  .withField(StandardField.URL, "www.url.de")
-                  .withFiles(List.of(new LinkedFile("non-existing", "path/to/nowhere.pdf", "PDF")));
-
-        VAPNIK_2000.withCitationKey("vapnik2000")
-                   .withField(StandardField.TITLE, "The Nature of Statistical Learning Theory")
-                   .withField(StandardField.PUBLISHER, "Springer Science + Business Media")
-                   .withField(StandardField.AUTHOR, "Vapnik, Vladimir N.")
-                   .withField(StandardField.DOI, "10.1007/978-1-4757-3264-1").withField(StandardField.OWNER, "Ich");
+        OLLY_2018
+                .withCitationKey("Olly2018")
+                .withField(StandardField.AUTHOR, "Olly and Johannes")
+                .withField(StandardField.TITLE, "Stefan's palace")
+                .withField(StandardField.JOURNAL, "Test Journal")
+                .withField(StandardField.VOLUME, "1")
+                .withField(StandardField.NUMBER, "1")
+                .withField(StandardField.PAGES, "1-2")
+                .withMonth(Month.MARCH)
+                .withField(StandardField.ISSN, "978-123-123")
+                .withField(StandardField.NOTE, "NOTE")
+                .withField(StandardField.ABSTRACT, "ABSTRACT")
+                .withField(StandardField.COMMENT, "COMMENT")
+                .withField(StandardField.DOI, "10/3212.3123")
+                .withField(StandardField.FILE, ":article_dublinCore.pdf:PDF")
+                .withField(StandardField.GROUPS, "NO")
+                .withField(StandardField.HOWPUBLISHED, "online")
+                .withField(StandardField.KEYWORDS, "k1, k2")
+                .withField(StandardField.OWNER, "me")
+                .withField(StandardField.REVIEW, "review")
+                .withField(StandardField.URL, "https://www.olly2018.edu")
+                .withFiles(List.of(createDefaultLinkedFile("existing.pdf", tempDir)));
+
+        TORAL_2006
+                .withField(StandardField.AUTHOR, "Toral, Antonio and Munoz, Rafael")
+                .withField(
+                        StandardField.TITLE,
+                        "A proposal to automatically build and maintain gazetteers for Named Entity Recognition by using Wikipedia")
+                .withField(StandardField.BOOKTITLE, "Proceedings of EACL")
+                .withField(StandardField.PAGES, "56--61")
+                .withField(StandardField.EPRINTTYPE, "asdf")
+                .withField(StandardField.OWNER, "Ich")
+                .withField(StandardField.URL, "www.url.de")
+                .withFiles(List.of(new LinkedFile("non-existing", "path/to/nowhere.pdf", "PDF")));
+
+        VAPNIK_2000
+                .withCitationKey("vapnik2000")
+                .withField(StandardField.TITLE, "The Nature of Statistical Learning Theory")
+                .withField(StandardField.PUBLISHER, "Springer Science + Business Media")
+                .withField(StandardField.AUTHOR, "Vapnik, Vladimir N.")
+                .withField(StandardField.DOI, "10.1007/978-1-4757-3264-1")
+                .withField(StandardField.OWNER, "Ich");
     }
 
     /**
@@ -104,11 +113,14 @@ void setUp() throws IOException {
         when(filePreferences.getUserAndHost()).thenReturn(tempDir.toAbsolutePath().toString());
         when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
 
-        xmpPreferences = new XmpPreferences(false, Collections.emptySet(), new SimpleObjectProperty<>(','));
+        xmpPreferences =
+                new XmpPreferences(false, Collections.emptySet(), new SimpleObjectProperty<>(','));
         exporter = new XmpPdfExporter(xmpPreferences);
 
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.fieldPreferences().getNonWrappableFields()).thenReturn(FXCollections.emptyObservableList());
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.fieldPreferences().getNonWrappableFields())
+                .thenReturn(FXCollections.emptyObservableList());
         importer = new PdfXmpImporter(xmpPreferences);
 
         databaseContext = new BibDatabaseContext();
@@ -134,13 +146,26 @@ void reset() throws IOException {
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithValidPdfFileLinks")
     void successfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
-        assertTrue(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(OLLY_2018), abbreviationRepository));
+        assertTrue(
+                exporter.exportToAllFilesOfEntry(
+                        databaseContext,
+                        filePreferences,
+                        bibEntryWithValidPdfFileLink,
+                        List.of(OLLY_2018),
+                        abbreviationRepository));
     }
 
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithInvalidPdfFileLinks")
-    void unsuccessfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
-        assertFalse(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(OLLY_2018), abbreviationRepository));
+    void unsuccessfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink)
+            throws Exception {
+        assertFalse(
+                exporter.exportToAllFilesOfEntry(
+                        databaseContext,
+                        filePreferences,
+                        bibEntryWithValidPdfFileLink,
+                        List.of(OLLY_2018),
+                        abbreviationRepository));
     }
 
     public static Stream<Arguments> provideBibEntriesWithValidPdfFileLinks() {
@@ -154,13 +179,17 @@ public static Stream<Arguments> provideBibEntriesWithInvalidPdfFileLinks() {
     @ParameterizedTest
     @MethodSource("providePathsToValidPDFs")
     void successfulExportToFileByPath(Path path) throws Exception {
-        assertTrue(exporter.exportToFileByPath(databaseContext, filePreferences, path, abbreviationRepository));
+        assertTrue(
+                exporter.exportToFileByPath(
+                        databaseContext, filePreferences, path, abbreviationRepository));
     }
 
     @ParameterizedTest
     @MethodSource("providePathsToInvalidPDFs")
     void unsuccessfulExportToFileByPath(Path path) throws Exception {
-        assertFalse(exporter.exportToFileByPath(databaseContext, filePreferences, path, abbreviationRepository));
+        assertFalse(
+                exporter.exportToFileByPath(
+                        databaseContext, filePreferences, path, abbreviationRepository));
     }
 
     @ParameterizedTest
@@ -174,15 +203,21 @@ void roundtripExportImport(Path path) throws Exception {
                 contentStream.beginText();
                 contentStream.newLineAtOffset(25, 500);
                 contentStream.setFont(new PDType1Font(Standard14Fonts.FontName.HELVETICA), 12);
-                contentStream.showText("This PDF was created by JabRef. It demonstrates the embedding of XMP data in PDF files. Please open the file metadata view of your PDF viewer to see the attached files. Note that the normal usage is to embed the BibTeX data in an existing PDF.");
+                contentStream.showText(
+                        "This PDF was created by JabRef. It demonstrates the embedding of XMP data in PDF files. Please open the file metadata view of your PDF viewer to see the attached files. Note that the normal usage is to embed the BibTeX data in an existing PDF.");
                 contentStream.endText();
             }
             document.save(path.toString());
         }
-        new XmpUtilWriter(xmpPreferences).writeXmp(path, databaseContext.getEntries(), databaseContext.getDatabase());
+        new XmpUtilWriter(xmpPreferences)
+                .writeXmp(path, databaseContext.getEntries(), databaseContext.getDatabase());
 
         List<BibEntry> importedEntries = importer.importDatabase(path).getDatabase().getEntries();
-        importedEntries.forEach(bibEntry -> new FieldFormatterCleanup(StandardField.AUTHOR, new NormalizeNamesFormatter()).cleanup(bibEntry));
+        importedEntries.forEach(
+                bibEntry ->
+                        new FieldFormatterCleanup(
+                                        StandardField.AUTHOR, new NormalizeNamesFormatter())
+                                .cleanup(bibEntry));
 
         List<BibEntry> expectedEntries = databaseContext.getEntries();
         for (BibEntry entry : expectedEntries) {
@@ -208,7 +243,8 @@ public static Stream<Arguments> providePathsToInvalidPDFs() throws IOException {
                 Arguments.of(Path.of(existingFileThatIsNotLinked.getLink())));
     }
 
-    private static LinkedFile createDefaultLinkedFile(String fileName, Path tempDir) throws IOException {
+    private static LinkedFile createDefaultLinkedFile(String fileName, Path tempDir)
+            throws IOException {
         Path pdfFile = tempDir.resolve(fileName);
         try (PDDocument pdf = new PDDocument()) {
             pdf.addPage(new PDPage());
@@ -218,4 +254,3 @@ private static LinkedFile createDefaultLinkedFile(String fileName, Path tempDir)
         return new LinkedFile("", pdfFile, "PDF");
     }
 }
-
diff --git a/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java b/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
index 88de5983f995..95686e88f7ac 100644
--- a/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
@@ -1,9 +1,7 @@
 package org.jabref.logic.exporter;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.StandardFileType;
@@ -12,14 +10,15 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.metadata.SaveOrder;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
 
 class YamlExporterTest {
 
@@ -28,15 +27,16 @@ class YamlExporterTest {
 
     @BeforeAll
     static void setUp() {
-        yamlExporter = new TemplateExporter(
-                "CSL YAML",
-                "yaml",
-                "yaml",
-                null,
-                StandardFileType.YAML,
-                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                SaveOrder.getDefaultSaveOrder(),
-                BlankLineBehaviour.DELETE_BLANKS);
+        yamlExporter =
+                new TemplateExporter(
+                        "CSL YAML",
+                        "yaml",
+                        "yaml",
+                        null,
+                        StandardFileType.YAML,
+                        mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        SaveOrder.getDefaultSaveOrder(),
+                        BlankLineBehaviour.DELETE_BLANKS);
 
         databaseContext = new BibDatabaseContext();
     }
@@ -51,112 +51,120 @@ final void exportForNoEntriesWritesNothing(@TempDir Path tempFile) throws Except
 
     @Test
     final void exportsCorrectContent(@TempDir Path tempFile) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.URL, "http://example.com")
-                .withField(StandardField.DATE, "2020-10-14");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.URL, "http://example.com")
+                        .withField(StandardField.DATE, "2020-10-14");
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
         yamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "---",
-                "references:",
-                "- id: test",
-                "  type: article",
-                "  author:",
-                "  - literal: \"Test Author\"",
-                "  title: \"Test Title\"",
-                "  issued: 2020-10-14",
-                "  url: http://example.com",
-                "---");
+        List<String> expected =
+                List.of(
+                        "---",
+                        "references:",
+                        "- id: test",
+                        "  type: article",
+                        "  author:",
+                        "  - literal: \"Test Author\"",
+                        "  title: \"Test Title\"",
+                        "  issued: 2020-10-14",
+                        "  url: http://example.com",
+                        "---");
 
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
     final void formatsContentCorrect(@TempDir Path tempFile) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Misc)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.URL, "http://example.com")
-                .withField(StandardField.DATE, "2020-10-14");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Misc)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.URL, "http://example.com")
+                        .withField(StandardField.DATE, "2020-10-14");
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
         yamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "---",
-                "references:",
-                "- id: test",
-                "  type: no-type",
-                "  author:",
-                "  - literal: \"Test Author\"",
-                "  title: \"Test Title\"",
-                "  issued: 2020-10-14",
-                "  url: http://example.com",
-                "---");
+        List<String> expected =
+                List.of(
+                        "---",
+                        "references:",
+                        "- id: test",
+                        "  type: no-type",
+                        "  author:",
+                        "  - literal: \"Test Author\"",
+                        "  title: \"Test Title\"",
+                        "  issued: 2020-10-14",
+                        "  url: http://example.com",
+                        "---");
 
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
     void passesModifiedCharset(@TempDir Path tempFile) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-            .withCitationKey("test")
-            .withField(StandardField.AUTHOR, "谷崎 潤一郎")
-            .withField(StandardField.TITLE, "細雪")
-            .withField(StandardField.URL, "http://example.com")
-            .withField(StandardField.DATE, "2020-10-14");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "谷崎 潤一郎")
+                        .withField(StandardField.TITLE, "細雪")
+                        .withField(StandardField.URL, "http://example.com")
+                        .withField(StandardField.DATE, "2020-10-14");
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
         yamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "---",
-                "references:",
-                "- id: test",
-                "  type: article",
-                "  author:",
-                "  - literal: \"谷崎 潤一郎\"",
-                "  title: \"細雪\"",
-                "  issued: 2020-10-14",
-                "  url: http://example.com",
-                "---");
+        List<String> expected =
+                List.of(
+                        "---",
+                        "references:",
+                        "- id: test",
+                        "  type: article",
+                        "  author:",
+                        "  - literal: \"谷崎 潤一郎\"",
+                        "  title: \"細雪\"",
+                        "  issued: 2020-10-14",
+                        "  url: http://example.com",
+                        "---");
 
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
     void passesModifiedCharsetNull(@TempDir Path tempFile) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-            .withCitationKey("test")
-            .withField(StandardField.AUTHOR, "谷崎 潤一郎")
-            .withField(StandardField.TITLE, "細雪")
-            .withField(StandardField.URL, "http://example.com")
-            .withField(StandardField.DATE, "2020-10-14");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "谷崎 潤一郎")
+                        .withField(StandardField.TITLE, "細雪")
+                        .withField(StandardField.URL, "http://example.com")
+                        .withField(StandardField.DATE, "2020-10-14");
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
         yamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        List<String> expected = List.of(
-                "---",
-                "references:",
-                "- id: test",
-                "  type: article",
-                "  author:",
-                "  - literal: \"谷崎 潤一郎\"",
-                "  title: \"細雪\"",
-                "  issued: 2020-10-14",
-                "  url: http://example.com",
-                "---");
+        List<String> expected =
+                List.of(
+                        "---",
+                        "references:",
+                        "- id: test",
+                        "  type: article",
+                        "  author:",
+                        "  - literal: \"谷崎 潤一郎\"",
+                        "  title: \"細雪\"",
+                        "  issued: 2020-10-14",
+                        "  url: http://example.com",
+                        "---");
         assertEquals(expected, Files.readAllLines(file));
     }
 }
diff --git a/src/test/java/org/jabref/logic/formatter/FormatterTest.java b/src/test/java/org/jabref/logic/formatter/FormatterTest.java
index d0d516941f11..b55d46a4cb70 100644
--- a/src/test/java/org/jabref/logic/formatter/FormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/FormatterTest.java
@@ -1,26 +1,25 @@
 package org.jabref.logic.formatter;
 
-import java.util.Collections;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.formatter.casechanger.ProtectTermsFormatter;
 import org.jabref.logic.formatter.minifier.TruncateFormatter;
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 import org.jabref.logic.protectedterms.ProtectedTermsPreferences;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.Collections;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 class FormatterTest {
 
@@ -28,9 +27,13 @@ class FormatterTest {
 
     @BeforeAll
     static void setUp() {
-        protectedTermsLoader = new ProtectedTermsLoader(
-                new ProtectedTermsPreferences(ProtectedTermsLoader.getInternalLists(), Collections.emptyList(),
-                        Collections.emptyList(), Collections.emptyList()));
+        protectedTermsLoader =
+                new ProtectedTermsLoader(
+                        new ProtectedTermsPreferences(
+                                ProtectedTermsLoader.getInternalLists(),
+                                Collections.emptyList(),
+                                Collections.emptyList(),
+                                Collections.emptyList()));
     }
 
     /**
@@ -40,14 +43,15 @@ static void setUp() {
     @Test
     void allFormatterKeysAreUnique() {
         // idea for uniqueness checking by https://stackoverflow.com/a/44032568/873282
-        assertEquals(Collections.emptyList(),
-                getFormatters().collect(Collectors.groupingBy(
-                                       Formatter::getKey,
-                        Collectors.counting()))
-                               .entrySet().stream()
-                               .filter(e -> e.getValue() > 1)
-                               .map(Map.Entry::getKey)
-                               .collect(Collectors.toList()));
+        assertEquals(
+                Collections.emptyList(),
+                getFormatters()
+                        .collect(Collectors.groupingBy(Formatter::getKey, Collectors.counting()))
+                        .entrySet()
+                        .stream()
+                        .filter(e -> e.getValue() > 1)
+                        .map(Map.Entry::getKey)
+                        .collect(Collectors.toList()));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/formatter/IdentityFormatterTest.java b/src/test/java/org/jabref/logic/formatter/IdentityFormatterTest.java
index 3a702a2ca7b3..8eb8bbf3ca9e 100644
--- a/src/test/java/org/jabref/logic/formatter/IdentityFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/IdentityFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatterTest.java
index 9511fbeeb02c..f08cfca36a30 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -64,7 +64,8 @@ void formatKeepsOnlyMatchingBraces() {
 
     @Test
     void formatDoesNotRemoveBracesInBrokenString() {
-        // We opt here for a conservative approach although one could argue that "A} and {B}" is also a valid return
+        // We opt here for a conservative approach although one could argue that "A} and {B}" is
+        // also a valid return
         assertEquals("{A} and {B}}", formatter.format("{A} and {B}}"));
     }
 
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
index 822eb6f082ba..1f7acd6ea058 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -19,13 +19,13 @@ void setUp() {
 
     @Test
     void removeSpecialSymbolsFromURLLink() {
-        assertEquals("http://wikipedia.org",
-                formatter.format("http%3A%2F%2Fwikipedia.org"));
+        assertEquals("http://wikipedia.org", formatter.format("http%3A%2F%2Fwikipedia.org"));
     }
 
     @Test
     void extractURLFormLink() {
-        assertEquals("http://wikipedia.org",
+        assertEquals(
+                "http://wikipedia.org",
                 formatter.format("away.php?to=http%3A%2F%2Fwikipedia.org&a=snippet"));
     }
 
@@ -36,7 +36,10 @@ void validUrlUnmodified() {
 
     @Test
     void latexCommandsNotRemoved() {
-        assertEquals("http://pi.informatik.uni-siegen.de/stt/36\\_2/./03\\_Technische\\_Beitraege/ZEUS2016/beitrag\\_2.pdf", formatter.format("http://pi.informatik.uni-siegen.de/stt/36\\_2/./03\\_Technische\\_Beitraege/ZEUS2016/beitrag\\_2.pdf"));
+        assertEquals(
+                "http://pi.informatik.uni-siegen.de/stt/36\\_2/./03\\_Technische\\_Beitraege/ZEUS2016/beitrag\\_2.pdf",
+                formatter.format(
+                        "http://pi.informatik.uni-siegen.de/stt/36\\_2/./03\\_Technische\\_Beitraege/ZEUS2016/beitrag\\_2.pdf"));
     }
 
     @Test
@@ -47,8 +50,9 @@ void urlencodedSlashesAreAlsoConverted() {
 
     @Test
     void formatExample() {
-        assertEquals("http://www.focus.de/" +
-                        "gesundheit/ratgeber/herz/test/lebenserwartung-werden-sie-100-jahre-alt_aid_363828.html",
+        assertEquals(
+                "http://www.focus.de/"
+                        + "gesundheit/ratgeber/herz/test/lebenserwartung-werden-sie-100-jahre-alt_aid_363828.html",
                 formatter.format(formatter.getExampleInput()));
     }
 
@@ -56,7 +60,7 @@ void formatExample() {
     void shouldNotReplacePlusOperatorAsASignInURL() {
         assertEquals(
                 "https://www.chicago.gov/content/dam/city/depts/cdot/Red Light Cameras/2022/Sutton+Tilahun_Chicago-Camera-Ticket_Exec Summary-Final-Jan10.pdf",
-                formatter.format("https://www.chicago.gov/content/dam/city/depts/cdot/Red Light Cameras/2022/Sutton+Tilahun_Chicago-Camera-Ticket_Exec Summary-Final-Jan10.pdf")
-        );
+                formatter.format(
+                        "https://www.chicago.gov/content/dam/city/depts/cdot/Red Light Cameras/2022/Sutton+Tilahun_Chicago-Camera-Ticket_Exec Summary-Final-Jan10.pdf"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java
index a83f67d5a195..559dc21c9fad 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatterTest.java
index 0f5258511f7f..b07fa128df79 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class EscapeAmpersandsFormatterTest {
 
     private EscapeAmpersandsFormatter formatter;
@@ -31,7 +31,8 @@ void formatExample() {
 
     @Test
     void formatReturnsSameTextInNewUserDefinedLatexCommandIfNoAmpersandsPresent() throws Exception {
-        assertEquals("\\newcommand[1]{Lorem ipsum}", formatter.format("\\newcommand[1]{Lorem ipsum}"));
+        assertEquals(
+                "\\newcommand[1]{Lorem ipsum}", formatter.format("\\newcommand[1]{Lorem ipsum}"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatterTest.java
index 55b4d543cc9a..70cf53bb4431 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatterTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class EscapeDollarSignFormatterTest {
 
@@ -21,10 +21,13 @@ private static Stream<Arguments> correctlyFormats() {
                 Arguments.of("Lorem\\$ipsum", "Lorem$ipsum"),
                 // keeps escapings
                 Arguments.of("Lorem\\$ipsum", "Lorem\\$ipsum"),
-                Arguments.of("Dollar sign: 1x: \\$ 2x: \\$\\$ 3x: \\$\\$\\$", "Dollar sign: 1x: \\$ 2x: \\$\\$ 3x: \\$\\$\\$"),
+                Arguments.of(
+                        "Dollar sign: 1x: \\$ 2x: \\$\\$ 3x: \\$\\$\\$",
+                        "Dollar sign: 1x: \\$ 2x: \\$\\$ 3x: \\$\\$\\$"),
                 // mixed field
-                Arguments.of("Dollar sign: 1x: \\$ 2x: \\$\\$ 3x: \\$\\$\\$", "Dollar sign: 1x: $ 2x: $$ 3x: $$$")
-        );
+                Arguments.of(
+                        "Dollar sign: 1x: \\$ 2x: \\$\\$ 3x: \\$\\$\\$",
+                        "Dollar sign: 1x: $ 2x: $$ 3x: $$$"));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java
index 2c756e7eebf6..5eaad8cd6842 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class EscapeUnderscoresFormatterTest {
 
     private EscapeUnderscoresFormatter formatter;
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java
index 2780f106acc2..22f080ca6c8b 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -24,7 +24,10 @@ void formatWithoutHtmlCharactersReturnsSameString() {
 
     @Test
     void formatIeeeHtml() {
-        assertEquals("Towards situation-aware adaptive workflows: SitOPT --- A general purpose situation-aware workflow management system", formatter.format("Towards situation-aware adaptive workflows: SitOPT &amp;#x2014; A general purpose situation-aware workflow management system"));
+        assertEquals(
+                "Towards situation-aware adaptive workflows: SitOPT --- A general purpose situation-aware workflow management system",
+                formatter.format(
+                        "Towards situation-aware adaptive workflows: SitOPT &amp;#x2014; A general purpose situation-aware workflow management system"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java
index 05f49c7639c0..01ffea47a66a 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class HtmlToUnicodeFormatterTest {
 
@@ -15,16 +15,16 @@ class HtmlToUnicodeFormatterTest {
 
     private static Stream<Arguments> data() {
         return Stream.of(
-                         Arguments.of("abc", "abc"),
-                         Arguments.of("åäö", "&aring;&auml;&ouml;"),
-                         Arguments.of("í", "i&#x301;"),
-                         Arguments.of("Ε", "&Epsilon;"),
-                         Arguments.of("ä", "&auml;"),
-                         Arguments.of("ä", "&#228;"),
-                         Arguments.of("ä", "&#xe4;"),
-                         Arguments.of("ñ", "&#241;"),
-                         Arguments.of("aaa", "<p>aaa</p>"),
-                         Arguments.of("bread & butter", "<b>bread</b> &amp; butter"));
+                Arguments.of("abc", "abc"),
+                Arguments.of("åäö", "&aring;&auml;&ouml;"),
+                Arguments.of("í", "i&#x301;"),
+                Arguments.of("Ε", "&Epsilon;"),
+                Arguments.of("ä", "&auml;"),
+                Arguments.of("ä", "&#228;"),
+                Arguments.of("ä", "&#xe4;"),
+                Arguments.of("ñ", "&#241;"),
+                Arguments.of("aaa", "<p>aaa</p>"),
+                Arguments.of("bread & butter", "<b>bread</b> &amp; butter"));
     }
 
     @BeforeEach
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java
index 3c98058713e2..28f09b2ad1fa 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class LatexCleanupFormatterTest {
 
     private LatexCleanupFormatter formatter;
@@ -19,7 +19,8 @@ void test() {
         assertEquals("$\\alpha\\beta$", formatter.format("$\\alpha$$\\beta$"));
         assertEquals("{VLSI DSP}", formatter.format("{VLSI} {DSP}"));
         assertEquals("\\textbf{VLSI} {DSP}", formatter.format("\\textbf{VLSI} {DSP}"));
-        assertEquals("A ${\\Delta\\Sigma}$ modulator for {FPGA DSP}",
+        assertEquals(
+                "A ${\\Delta\\Sigma}$ modulator for {FPGA DSP}",
                 formatter.format("A ${\\Delta}$${\\Sigma}$ modulator for {FPGA} {DSP}"));
     }
 
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java
index 858dac6691fd..11e503916b18 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeEnDashesFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeEnDashesFormatterTest.java
index 810e6acfc5a4..82477b4c78c0 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeEnDashesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeEnDashesFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -19,7 +19,9 @@ void setUp() {
 
     @Test
     void formatExample() {
-        assertEquals("Winery -- A Modeling Tool for TOSCA-based Cloud Applications", formatter.format(formatter.getExampleInput()));
+        assertEquals(
+                "Winery -- A Modeling Tool for TOSCA-based Cloud Applications",
+                formatter.format(formatter.getExampleInput()));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java
index 4c110af58aca..6b4432977c6d 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java
index 3301f8a4b0a7..55962cc973bb 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -19,56 +19,80 @@ void setUp() {
 
     @Test
     void normalizeAuthorList() {
-        assertEquals("{Society of Automotive Engineers}", formatter.format("{Society of Automotive Engineers}"));
+        assertEquals(
+                "{Society of Automotive Engineers}",
+                formatter.format("{Society of Automotive Engineers}"));
         assertEquals("{Company Name, LLC}", formatter.format("{Company Name, LLC}"));
 
         assertEquals("Bilbo, Staci D.", formatter.format("Staci D Bilbo"));
         assertEquals("Bilbo, Staci D.", formatter.format("Staci D. Bilbo"));
 
-        assertEquals("Bilbo, Staci D. and Smith, S. H. and Schwarz, Jaclyn M.", formatter.format("Staci D Bilbo and Smith SH and Jaclyn M Schwarz"));
+        assertEquals(
+                "Bilbo, Staci D. and Smith, S. H. and Schwarz, Jaclyn M.",
+                formatter.format("Staci D Bilbo and Smith SH and Jaclyn M Schwarz"));
 
         assertEquals("Ølver, M. A.", formatter.format("Ølver MA"));
 
-        assertEquals("Ølver, M. A. and Øie, G. G. and Øie, G. G. and Alfredsen, J. Å. Å. and Alfredsen, Jo and Olsen, Y. Y. and Olsen, Y. Y.",
-                formatter.format("Ølver MA; GG Øie; Øie GG; Alfredsen JÅÅ; Jo Alfredsen; Olsen Y.Y. and Olsen YY."));
+        assertEquals(
+                "Ølver, M. A. and Øie, G. G. and Øie, G. G. and Alfredsen, J. Å. Å. and Alfredsen, Jo and Olsen, Y. Y. and Olsen, Y. Y.",
+                formatter.format(
+                        "Ølver MA; GG Øie; Øie GG; Alfredsen JÅÅ; Jo Alfredsen; Olsen Y.Y. and Olsen YY."));
 
-        assertEquals("Ølver, M. A. and Øie, G. G. and Øie, G. G. and Alfredsen, J. Å. Å. and Alfredsen, Jo and Olsen, Y. Y. and Olsen, Y. Y.",
-                formatter.format("Ølver MA; GG Øie; Øie GG; Alfredsen JÅÅ; Jo Alfredsen; Olsen Y.Y.; Olsen YY."));
+        assertEquals(
+                "Ølver, M. A. and Øie, G. G. and Øie, G. G. and Alfredsen, J. Å. Å. and Alfredsen, Jo and Olsen, Y. Y. and Olsen, Y. Y.",
+                formatter.format(
+                        "Ølver MA; GG Øie; Øie GG; Alfredsen JÅÅ; Jo Alfredsen; Olsen Y.Y.; Olsen YY."));
 
-        assertEquals("Alver, Morten and Alver, Morten O. and Alfredsen, J. A. and Olsen, Y. Y.", formatter.format("Alver, Morten and Alver, Morten O and Alfredsen, JA and Olsen, Y.Y."));
+        assertEquals(
+                "Alver, Morten and Alver, Morten O. and Alfredsen, J. A. and Olsen, Y. Y.",
+                formatter.format(
+                        "Alver, Morten and Alver, Morten O and Alfredsen, JA and Olsen, Y.Y."));
 
-        assertEquals("Alver, M. A. and Alfredsen, J. A. and Olsen, Y. Y.", formatter.format("Alver, MA; Alfredsen, JA; Olsen Y.Y."));
+        assertEquals(
+                "Alver, M. A. and Alfredsen, J. A. and Olsen, Y. Y.",
+                formatter.format("Alver, MA; Alfredsen, JA; Olsen Y.Y."));
 
-        assertEquals("Kolb, Stefan and Lenhard, J{\\\"o}rg and Wirtz, Guido", formatter.format("Kolb, Stefan and J{\\\"o}rg Lenhard and Wirtz, Guido"));
+        assertEquals(
+                "Kolb, Stefan and Lenhard, J{\\\"o}rg and Wirtz, Guido",
+                formatter.format("Kolb, Stefan and J{\\\"o}rg Lenhard and Wirtz, Guido"));
     }
 
     @Test
     void twoAuthorsSeperatedByColon() {
-        assertEquals("Bilbo, Staci and Alver, Morten", formatter.format("Staci Bilbo; Morten Alver"));
+        assertEquals(
+                "Bilbo, Staci and Alver, Morten", formatter.format("Staci Bilbo; Morten Alver"));
     }
 
     @Test
     void threeAuthorsSeperatedByColon() {
-        assertEquals("Bilbo, Staci and Alver, Morten and Name, Test", formatter.format("Staci Bilbo; Morten Alver; Test Name"));
+        assertEquals(
+                "Bilbo, Staci and Alver, Morten and Name, Test",
+                formatter.format("Staci Bilbo; Morten Alver; Test Name"));
     }
 
     // Test for https://github.com/JabRef/jabref/issues/318
     @Test
     void threeAuthorsSeperatedByAnd() {
-        assertEquals("Kolb, Stefan and Lenhard, J{\\\"o}rg and Wirtz, Guido", formatter.format("Stefan Kolb and J{\\\"o}rg Lenhard and Guido Wirtz"));
+        assertEquals(
+                "Kolb, Stefan and Lenhard, J{\\\"o}rg and Wirtz, Guido",
+                formatter.format("Stefan Kolb and J{\\\"o}rg Lenhard and Guido Wirtz"));
     }
 
     // Test for https://github.com/JabRef/jabref/issues/318
     @Test
     void threeAuthorsSeperatedByAndWithDash() {
-        assertEquals("Jian, Heng-Yu and Xu, Z. and Chang, M.-C. F.", formatter.format("Heng-Yu Jian and Xu, Z. and Chang, M.-C.F."));
+        assertEquals(
+                "Jian, Heng-Yu and Xu, Z. and Chang, M.-C. F.",
+                formatter.format("Heng-Yu Jian and Xu, Z. and Chang, M.-C.F."));
     }
 
     // Test for https://github.com/JabRef/jabref/issues/318
     @Test
     void threeAuthorsSeperatedByAndWithLatex() {
-        assertEquals("Gustafsson, Oscar and DeBrunner, Linda S. and DeBrunner, Victor and Johansson, H{\\aa}kan",
-                formatter.format("Oscar Gustafsson and Linda S. DeBrunner and Victor DeBrunner and H{\\aa}kan Johansson"));
+        assertEquals(
+                "Gustafsson, Oscar and DeBrunner, Linda S. and DeBrunner, Victor and Johansson, H{\\aa}kan",
+                formatter.format(
+                        "Oscar Gustafsson and Linda S. DeBrunner and Victor DeBrunner and H{\\aa}kan Johansson"));
     }
 
     @Test
@@ -103,84 +127,123 @@ void lastThenJuniorThenFirst() {
 
     @Test
     void concatenationOfAuthorsWithCommas() {
-        assertEquals("Ali Babar, M. and Dingsøyr, T. and Lago, P. and van der Vliet, H.", formatter.format("Ali Babar, M., Dingsøyr, T., Lago, P., van der Vliet, H."));
+        assertEquals(
+                "Ali Babar, M. and Dingsøyr, T. and Lago, P. and van der Vliet, H.",
+                formatter.format("Ali Babar, M., Dingsøyr, T., Lago, P., van der Vliet, H."));
         assertEquals("Ali Babar, M.", formatter.format("Ali Babar, M."));
     }
 
     @Test
     void oddCountOfCommas() {
-        assertEquals("Ali Babar, M., Dingsøyr T. Lago P.", formatter.format("Ali Babar, M., Dingsøyr, T., Lago P."));
+        assertEquals(
+                "Ali Babar, M., Dingsøyr T. Lago P.",
+                formatter.format("Ali Babar, M., Dingsøyr, T., Lago P."));
     }
 
     @Test
     void formatExample() {
-        assertEquals("Einstein, Albert and Turing, Alan", formatter.format(formatter.getExampleInput()));
+        assertEquals(
+                "Einstein, Albert and Turing, Alan", formatter.format(formatter.getExampleInput()));
     }
 
     @Test
     void nameAffixe() {
-        assertEquals("Surname, jr, First and Surname2, First2", formatter.format("Surname, jr, First, Surname2, First2"));
+        assertEquals(
+                "Surname, jr, First and Surname2, First2",
+                formatter.format("Surname, jr, First, Surname2, First2"));
     }
 
     @Test
     void avoidSpecialCharacter() {
-        assertEquals("Surname, {, First; Surname2, First2", formatter.format("Surname, {, First; Surname2, First2"));
+        assertEquals(
+                "Surname, {, First; Surname2, First2",
+                formatter.format("Surname, {, First; Surname2, First2"));
     }
 
     @Test
     void andInName() {
-        assertEquals("Surname and , First, Surname2 First2", formatter.format("Surname, and , First, Surname2, First2"));
+        assertEquals(
+                "Surname and , First, Surname2 First2",
+                formatter.format("Surname, and , First, Surname2, First2"));
     }
 
     @Test
     void multipleNameAffixes() {
-        assertEquals("Mair, Jr, Daniel and Brühl, Sr, Daniel", formatter.format("Mair, Jr, Daniel, Brühl, Sr, Daniel"));
+        assertEquals(
+                "Mair, Jr, Daniel and Brühl, Sr, Daniel",
+                formatter.format("Mair, Jr, Daniel, Brühl, Sr, Daniel"));
     }
 
     @Test
     void commaSeperatedNames() {
-        assertEquals("Bosoi, Cristina and Oliveira, Mariana and Sanchez, Rafael Ochoa and Tremblay, Mélanie and TenHave, Gabrie and Deutz, Nicoolas and Rose, Christopher F. and Bemeur, Chantal",
-                formatter.format("Cristina Bosoi, Mariana Oliveira, Rafael Ochoa Sanchez, Mélanie Tremblay, Gabrie TenHave, Nicoolas Deutz, Christopher F. Rose, Chantal Bemeur"));
+        assertEquals(
+                "Bosoi, Cristina and Oliveira, Mariana and Sanchez, Rafael Ochoa and Tremblay, Mélanie and TenHave, Gabrie and Deutz, Nicoolas and Rose, Christopher F. and Bemeur, Chantal",
+                formatter.format(
+                        "Cristina Bosoi, Mariana Oliveira, Rafael Ochoa Sanchez, Mélanie Tremblay, Gabrie TenHave, Nicoolas Deutz, Christopher F. Rose, Chantal Bemeur"));
     }
 
     @Test
     void multipleSpaces() {
-        assertEquals("Bosoi, Cristina and Oliveira, Mariana and Sanchez, Rafael Ochoa and Tremblay, Mélanie and TenHave, Gabrie and Deutz, Nicoolas and Rose, Christopher F. and Bemeur, Chantal",
-                formatter.format("Cristina    Bosoi,    Mariana Oliveira, Rafael Ochoa Sanchez   ,   Mélanie Tremblay  , Gabrie TenHave, Nicoolas Deutz, Christopher F. Rose, Chantal Bemeur"));
+        assertEquals(
+                "Bosoi, Cristina and Oliveira, Mariana and Sanchez, Rafael Ochoa and Tremblay, Mélanie and TenHave, Gabrie and Deutz, Nicoolas and Rose, Christopher F. and Bemeur, Chantal",
+                formatter.format(
+                        "Cristina    Bosoi,    Mariana Oliveira, Rafael Ochoa Sanchez   ,   Mélanie Tremblay  , Gabrie TenHave, Nicoolas Deutz, Christopher F. Rose, Chantal Bemeur"));
     }
 
     @Test
     void avoidPreposition() {
-        assertEquals("von Zimmer, Hans and van Oberbergern, Michael and zu Berger, Kevin", formatter.format("Hans von Zimmer, Michael van Oberbergern, Kevin zu Berger"));
+        assertEquals(
+                "von Zimmer, Hans and van Oberbergern, Michael and zu Berger, Kevin",
+                formatter.format("Hans von Zimmer, Michael van Oberbergern, Kevin zu Berger"));
     }
 
     @Test
     void preposition() {
-        assertEquals("von Zimmer, Hans and van Oberbergern, Michael and zu Berger, Kevin", formatter.format("Hans von Zimmer, Michael van Oberbergern, Kevin zu Berger"));
+        assertEquals(
+                "von Zimmer, Hans and van Oberbergern, Michael and zu Berger, Kevin",
+                formatter.format("Hans von Zimmer, Michael van Oberbergern, Kevin zu Berger"));
     }
 
     @Test
     void oneCommaUntouched() {
-        assertEquals("Canon der Barbar, Alexander der Große", formatter.format("Canon der Barbar, Alexander der Große"));
+        assertEquals(
+                "Canon der Barbar, Alexander der Große",
+                formatter.format("Canon der Barbar, Alexander der Große"));
     }
 
     @Test
     void avoidNameAffixes() {
-        assertEquals("der Barbar, Canon and der Große, Alexander and der Alexander, Peter", formatter.format("Canon der Barbar, Alexander der Große, Peter der Alexander"));
+        assertEquals(
+                "der Barbar, Canon and der Große, Alexander and der Alexander, Peter",
+                formatter.format("Canon der Barbar, Alexander der Große, Peter der Alexander"));
     }
 
     @Test
     void upperCaseSensitiveList() {
-        assertEquals("der Barbar, Canon and der Große, Alexander", formatter.format("Canon der Barbar AND Alexander der Große"));
-        assertEquals("der Barbar, Canon and der Große, Alexander", formatter.format("Canon der Barbar aNd Alexander der Große"));
-        assertEquals("der Barbar, Canon and der Große, Alexander", formatter.format("Canon der Barbar AnD Alexander der Große"));
+        assertEquals(
+                "der Barbar, Canon and der Große, Alexander",
+                formatter.format("Canon der Barbar AND Alexander der Große"));
+        assertEquals(
+                "der Barbar, Canon and der Große, Alexander",
+                formatter.format("Canon der Barbar aNd Alexander der Große"));
+        assertEquals(
+                "der Barbar, Canon and der Große, Alexander",
+                formatter.format("Canon der Barbar AnD Alexander der Große"));
     }
 
     @Test
     void semiCorrectNamesWithSemicolon() {
-        assertEquals("Last, First and Last2, First2 and Last3, First3", formatter.format("Last, First; Last2, First2; Last3, First3"));
-        assertEquals("Last, Jr, First and Last2, First2", formatter.format("Last, Jr, First; Last2, First2"));
-        assertEquals("Last, First and Last2, First2 and Last3, First3 and Last4, First4", formatter.format("Last, First; Last2, First2; Last3, First3; First4 Last4"));
-        assertEquals("Last and Last2, First2 and Last3, First3 and Last4, First4", formatter.format("Last; Last2, First2; Last3, First3; Last4, First4"));
+        assertEquals(
+                "Last, First and Last2, First2 and Last3, First3",
+                formatter.format("Last, First; Last2, First2; Last3, First3"));
+        assertEquals(
+                "Last, Jr, First and Last2, First2",
+                formatter.format("Last, Jr, First; Last2, First2"));
+        assertEquals(
+                "Last, First and Last2, First2 and Last3, First3 and Last4, First4",
+                formatter.format("Last, First; Last2, First2; Last3, First3; First4 Last4"));
+        assertEquals(
+                "Last and Last2, First2 and Last3, First3 and Last4, First4",
+                formatter.format("Last; Last2, First2; Last3, First3; Last4, First4"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java
index e37409e45942..0789cbba8c31 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeUnicodeFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeUnicodeFormatterTest.java
index 482dae4d13ac..10458fcc74ff 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeUnicodeFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeUnicodeFormatterTest.java
@@ -1,19 +1,16 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class NormalizeUnicodeFormatterTest {
 
     private NormalizeUnicodeFormatter formatter = new NormalizeUnicodeFormatter();
 
     @ParameterizedTest
-    @CsvSource({
-            "John, John",
-            "\u00C5, \u0041\u030A"
-    })
+    @CsvSource({"John, John", "\u00C5, \u0041\u030A"})
     void format(String expected, String input) {
         assertEquals(expected, formatter.format(input));
     }
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeWhitespaceFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeWhitespaceFormatterTest.java
index 346cf6c62954..805bb54bfa44 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeWhitespaceFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeWhitespaceFormatterTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
 
 class NormalizeWhitespaceFormatterTest {
 
@@ -17,10 +16,10 @@ class NormalizeWhitespaceFormatterTest {
 
     @BeforeEach
     void setUp() {
-        parser = new NormalizeWhitespaceFormatter(new FieldPreferences(
-                false,
-                Collections.emptyList(),
-                Collections.emptyList()));
+        parser =
+                new NormalizeWhitespaceFormatter(
+                        new FieldPreferences(
+                                false, Collections.emptyList(), Collections.emptyList()));
     }
 
     @Test
@@ -28,7 +27,8 @@ void doesNotUnifyLineBreaks() {
         String original = "I\r\nunify\nline\rbreaks.";
         String processed = parser.format(new StringBuilder(original), StandardField.ABSTRACT);
 
-        // Normalization is done at org.jabref.logic.exporter.BibWriter, so no need to normalize here
+        // Normalization is done at org.jabref.logic.exporter.BibWriter, so no need to normalize
+        // here
         assertEquals(original, processed);
     }
 
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java
index a573cf4545c0..a9a6cd242391 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -37,21 +37,21 @@ void replaceSuperscriptsIgnoresCase() {
     void replaceSuperscriptsInMultilineStrings() {
         expectCorrect(
                 "replace on 1st line\nand on 2nd line.",
-                "replace on 1\\textsuperscript{st} line\nand on 2\\textsuperscript{nd} line."
-        );
+                "replace on 1\\textsuperscript{st} line\nand on 2\\textsuperscript{nd} line.");
     }
 
     @Test
     void replaceAllSuperscripts() {
         expectCorrect(
                 "1st 2nd 3rd 4th",
-                "1\\textsuperscript{st} 2\\textsuperscript{nd} 3\\textsuperscript{rd} 4\\textsuperscript{th}"
-        );
+                "1\\textsuperscript{st} 2\\textsuperscript{nd} 3\\textsuperscript{rd} 4\\textsuperscript{th}");
     }
 
     @Test
     void ignoreSuperscriptsInsideWords() {
-        expectCorrect("1st 1stword words1st inside1stwords", "1\\textsuperscript{st} 1stword words1st inside1stwords");
+        expectCorrect(
+                "1st 1stword words1st inside1stwords",
+                "1\\textsuperscript{st} 1stword words1st inside1stwords");
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java
index 8cd7b10ab5d6..d3521f8b2d45 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 class RegexFormatterTest {
 
     private RegexFormatter formatter;
@@ -17,31 +17,43 @@ void spacesReplacedCorrectly() {
     @Test
     void protectedSpacesNotReplacedInSingleProtectedBlock() {
         formatter = new RegexFormatter("(\" \",\"-\")");
-        assertEquals("replace-spaces-{not these ones}", formatter.format("replace spaces {not these ones}"));
+        assertEquals(
+                "replace-spaces-{not these ones}",
+                formatter.format("replace spaces {not these ones}"));
     }
 
     @Test
     void protectedSpacesNotReplacedInTwoProtectedBlocks() {
         formatter = new RegexFormatter("(\" \",\"-\")");
-        assertEquals("replace-spaces-{not these ones}-{or these ones}-but-these-ones", formatter.format("replace spaces {not these ones} {or these ones} but these ones"));
+        assertEquals(
+                "replace-spaces-{not these ones}-{or these ones}-but-these-ones",
+                formatter.format("replace spaces {not these ones} {or these ones} but these ones"));
     }
 
     @Test
     void escapedBracesAreNotReplaced() {
         formatter = new RegexFormatter("(\" \",\"-\")");
-        assertEquals("replace-spaces-\\{-these-ones\\}-and-these-ones", formatter.format("replace spaces \\{ these ones\\} and these ones"));
+        assertEquals(
+                "replace-spaces-\\{-these-ones\\}-and-these-ones",
+                formatter.format("replace spaces \\{ these ones\\} and these ones"));
     }
 
     @Test
     void escapedBracesAreNotReplacedInTwoCases() {
         formatter = new RegexFormatter("(\" \",\"-\")");
-        assertEquals("replace-spaces-\\{-these-ones\\},-these-ones,-and-\\{-these-ones\\}", formatter.format("replace spaces \\{ these ones\\}, these ones, and \\{ these ones\\}"));
+        assertEquals(
+                "replace-spaces-\\{-these-ones\\},-these-ones,-and-\\{-these-ones\\}",
+                formatter.format(
+                        "replace spaces \\{ these ones\\}, these ones, and \\{ these ones\\}"));
     }
 
     @Test
     void escapedBracesAreNotReplacedAndProtectionStillWorks() {
         formatter = new RegexFormatter("(\" \",\"-\")");
-        assertEquals("replace-spaces-{not these ones},-these-ones,-and-\\{-these-ones\\}", formatter.format("replace spaces {not these ones}, these ones, and \\{ these ones\\}"));
+        assertEquals(
+                "replace-spaces-{not these ones},-these-ones,-and-\\{-these-ones\\}",
+                formatter.format(
+                        "replace spaces {not these ones}, these ones, and \\{ these ones\\}"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveDigitsFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveDigitsFormatterTest.java
index 5421cc8d162d..d2da5b0c5c92 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveDigitsFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveDigitsFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class RemoveDigitsFormatterTest {
 
     private RemoveDigitsFormatter formatter;
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveEnclosingBracesFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveEnclosingBracesFormatterTest.java
index 513c8b116ba3..d8c1c0481601 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveEnclosingBracesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveEnclosingBracesFormatterTest.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -15,18 +15,18 @@ class RemoveEnclosingBracesFormatterTest {
 
     @ParameterizedTest
     @CsvSource({
-            "test, {test}", // formatRemovesSingleEnclosingBraces
-            "{test, {test", // formatKeepsUnmatchedBracesAtBeginning
-            "test}, test}", // formatKeepsUnmatchedBracesAtEnd
-            "t, t", // formatKeepsShortString
-            "'', {}", // formatRemovesBracesOnly
-            "test, {{test}}", // formatKeepsEmptyString
-            "test, {{{test}}}", // formatRemovesDoubleEnclosingBraces
-            "{A} and {B}, {A} and {B}", // formatRemovesTripleEnclosingBraces
-            "{A} and {B}, {{A} and {B}}", // formatKeepsNonMatchingBraces
-            "{A} and {B}}, {A} and {B}}", // formatRemovesOnlyMatchingBraces
-            "Vall{\\'e}e Poussin, {Vall{\\'e}e Poussin}", // formatDoesNotRemoveBracesInBrokenString
-            "Vall{\\'e}e Poussin, Vall{\\'e}e Poussin"
+        "test, {test}", // formatRemovesSingleEnclosingBraces
+        "{test, {test", // formatKeepsUnmatchedBracesAtBeginning
+        "test}, test}", // formatKeepsUnmatchedBracesAtEnd
+        "t, t", // formatKeepsShortString
+        "'', {}", // formatRemovesBracesOnly
+        "test, {{test}}", // formatKeepsEmptyString
+        "test, {{{test}}}", // formatRemovesDoubleEnclosingBraces
+        "{A} and {B}, {A} and {B}", // formatRemovesTripleEnclosingBraces
+        "{A} and {B}, {{A} and {B}}", // formatKeepsNonMatchingBraces
+        "{A} and {B}}, {A} and {B}}", // formatRemovesOnlyMatchingBraces
+        "Vall{\\'e}e Poussin, {Vall{\\'e}e Poussin}", // formatDoesNotRemoveBracesInBrokenString
+        "Vall{\\'e}e Poussin, Vall{\\'e}e Poussin"
     })
     void format(String expected, String input) {
         assertEquals(expected, formatter.format(input));
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java
index 4eda529c9419..d51b333b9d4c 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class RemoveHyphenatedNewlinesFormatterTest {
 
     private RemoveHyphenatedNewlinesFormatter formatter;
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java
index 777af811194d..8531355ec3ed 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatterTest.java
@@ -1,11 +1,10 @@
-
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class RemoveNewlinesFormatterTest {
 
     private RemoveNewlinesFormatter formatter;
@@ -38,6 +37,8 @@ void withoutNewLineUnmodified() {
     @Test
     void removePlatformSpecificNewLine() {
         String newLine = "%n".formatted();
-        assertEquals("linebreak on current platform", formatter.format("linebreak on" + newLine + "current platform"));
+        assertEquals(
+                "linebreak on current platform",
+                formatter.format("linebreak on" + newLine + "current platform"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveRedundantSpacesFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveRedundantSpacesFormatterTest.java
index 17cf9721f1d3..b78ea6068e70 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveRedundantSpacesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveRedundantSpacesFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class RemoveRedundantSpacesFormatterTest {
 
     private RemoveRedundantSpacesFormatter formatter;
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveWordEnclosingAndOuterEnclosingBracesFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveWordEnclosingAndOuterEnclosingBracesFormatterTest.java
index 8437c89faa8d..0b964ee9f6f8 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveWordEnclosingAndOuterEnclosingBracesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveWordEnclosingAndOuterEnclosingBracesFormatterTest.java
@@ -1,24 +1,25 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class RemoveWordEnclosingAndOuterEnclosingBracesFormatterTest {
-    private final RemoveWordEnclosingAndOuterEnclosingBracesFormatter formatter = new RemoveWordEnclosingAndOuterEnclosingBracesFormatter();
+    private final RemoveWordEnclosingAndOuterEnclosingBracesFormatter formatter =
+            new RemoveWordEnclosingAndOuterEnclosingBracesFormatter();
 
     @ParameterizedTest
     @CsvSource({
-            "A test B, {A} test {B}",
-            "A and B, {{A} and {B}}",
-            "{w}ord word wor{d}, {w}ord word wor{d}",
-            "{w}ord word word, {{w}ord word word}",
-            "{w}ord word wor{d}, {w}ord word {wor{d}}",
-            "Vall{\\'e}e Poussin, {Vall{\\'e}e} {Poussin}",
-            "Vall{\\'e}e Poussin, {Vall{\\'e}e Poussin}",
-            "Vall{\\'e}e Poussin, Vall{\\'e}e Poussin"
+        "A test B, {A} test {B}",
+        "A and B, {{A} and {B}}",
+        "{w}ord word wor{d}, {w}ord word wor{d}",
+        "{w}ord word word, {{w}ord word word}",
+        "{w}ord word wor{d}, {w}ord word {wor{d}}",
+        "Vall{\\'e}e Poussin, {Vall{\\'e}e} {Poussin}",
+        "Vall{\\'e}e Poussin, {Vall{\\'e}e Poussin}",
+        "Vall{\\'e}e Poussin, Vall{\\'e}e Poussin"
     })
     void format(String expected, String input) {
         assertEquals(expected, formatter.format(input));
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormaterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormaterTest.java
index b6e233c846ae..102aa03dece4 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormaterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormaterTest.java
@@ -1,11 +1,10 @@
-
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class ReplaceTabsBySpaceFormaterTest {
 
     private ReplaceTabsBySpaceFormater formatter;
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/ReplaceWithEscapedDoubleQuotesTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/ReplaceWithEscapedDoubleQuotesTest.java
index 7ba7ec2bb093..4b64ffbe6602 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/ReplaceWithEscapedDoubleQuotesTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/ReplaceWithEscapedDoubleQuotesTest.java
@@ -1,12 +1,11 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import org.jabref.logic.layout.format.ReplaceWithEscapedDoubleQuotes;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.format.ReplaceWithEscapedDoubleQuotes;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class ReplaceWithEscapedDoubleQuotesTest {
 
     private ReplaceWithEscapedDoubleQuotes formatter;
@@ -23,7 +22,8 @@ void replacingSingleDoubleQuote() {
 
     @Test
     void replacingMultipleDoubleQuote() {
-        assertEquals("multiple \"\"double\"\" quote", formatter.format("multiple \"double\" quote"));
+        assertEquals(
+                "multiple \"\"double\"\" quote", formatter.format("multiple \"double\" quote"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatterTest.java
index 950774f8fc0b..6ebb7dae01c6 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatterTest.java
@@ -1,12 +1,11 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import org.jabref.testutils.category.FetcherTest;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.testutils.category.FetcherTest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 @FetcherTest
 class ShortenDOIFormatterTest {
 
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java
index 48798526272c..77dc24e0bd9d 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java
@@ -1,11 +1,10 @@
-
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class TrimWhitespaceFormatterTest {
 
     private TrimWhitespaceFormatter formatter;
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java
index 12d8177ce798..1eb8e51a40bd 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeConverterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java
index 6784d6985e30..4b7a9c7ce780 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class UnicodeToLatexFormatterTest {
 
@@ -20,17 +20,21 @@ void setUp() {
 
     private static Stream<Arguments> testCases() {
         return Stream.of(
-                         Arguments.of("", ""), // empty string input
-                         Arguments.of("abc", "abc"), // non unicode input
-                         Arguments.of("{{\\aa}}{\\\"{a}}{\\\"{o}}", "\u00E5\u00E4\u00F6"), // multiple unicodes input
-                         Arguments.of("", "\u0081"), // high code point unicode, boundary case: cp = 129
-                         Arguments.of("€", "\u0080"), // high code point unicode, boundary case: cp = 128 < 129
-                         Arguments.of("M{\\\"{o}}nch", new UnicodeToLatexFormatter().getExampleInput()),
-                         Arguments.of("{\\i}", "ı"),
-                         Arguments.of("{\\i} {\\={\\i}}", "ı ī"),
-                         Arguments.of("{\\={\\i}}{\\={\\i}}", "\u0069\u0304\u0069\u0304"),
-                         Arguments.of("Pu{\\d{n}}ya-pattana-vidy{\\={a}}-p{\\={\\i}}{\\d{t}}h{\\={a}}dhi-k{\\d{r}}tai{\\d{h}} pr{\\={a}}-ka{{\\'{s}}}ya{\\d{m}} n{\\={\\i}}ta{\\d{h}}", "Puṇya-pattana-vidyā-pīṭhādhi-kṛtaiḥ prā-kaśyaṃ nītaḥ")
-        );
+                Arguments.of("", ""), // empty string input
+                Arguments.of("abc", "abc"), // non unicode input
+                Arguments.of(
+                        "{{\\aa}}{\\\"{a}}{\\\"{o}}",
+                        "\u00E5\u00E4\u00F6"), // multiple unicodes input
+                Arguments.of("", "\u0081"), // high code point unicode, boundary case: cp = 129
+                Arguments.of(
+                        "€", "\u0080"), // high code point unicode, boundary case: cp = 128 < 129
+                Arguments.of("M{\\\"{o}}nch", new UnicodeToLatexFormatter().getExampleInput()),
+                Arguments.of("{\\i}", "ı"),
+                Arguments.of("{\\i} {\\={\\i}}", "ı ī"),
+                Arguments.of("{\\={\\i}}{\\={\\i}}", "\u0069\u0304\u0069\u0304"),
+                Arguments.of(
+                        "Pu{\\d{n}}ya-pattana-vidy{\\={a}}-p{\\={\\i}}{\\d{t}}h{\\={a}}dhi-k{\\d{r}}tai{\\d{h}} pr{\\={a}}-ka{{\\'{s}}}ya{\\d{m}} n{\\={\\i}}ta{\\d{h}}",
+                        "Puṇya-pattana-vidyā-pīṭhādhi-kṛtaiḥ prā-kaśyaṃ nītaḥ"));
     }
 
     @ParameterizedTest()
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java
index 7ee0ce1899c9..10b34b0e2e06 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java
index 187a858d49f2..a9a45d4e7c91 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.formatter.casechanger;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -25,32 +25,43 @@ void formatExample() {
     }
 
     @ParameterizedTest(name = "input={0}, formattedStr={1}")
-    @CsvSource(value = {
-            "{}, {}", // {}
-            "{upper, {upper", // unmatched braces
-            "upper, Upper", // single word lower case
-            "Upper, Upper", // single word correct
-            "UPPER, Upper", // single word upper case
-            "upper each first, Upper Each First", // multiple words lower case
-            "Upper Each First, Upper Each First", // multiple words correct
-            "UPPER EACH FIRST, Upper Each First", // multiple words upper case
-            "upper each First, Upper Each First", // multiple words in lower and upper case
-            "{u}pp{e}r, {u}pp{e}r", // single word lower case with {}
-            "{U}pp{e}r, {U}pp{e}r", // single word correct with {}
-            "{U}PP{E}R, {U}pp{E}r", // single word upper case with {}
-            "upper each {NOT} first, Upper Each {NOT} First", // multiple words lower case with {}
-            "Upper {E}ach {NOT} First, Upper {E}ach {NOT} First", // multiple words correct with {}
-            "UPPER {E}ACH {NOT} FIRST, Upper {E}ach {NOT} First", // multiple words upper case with {}
-            "upper each first {NOT} {this}, Upper Each First {NOT} {this}", // multiple words in lower and upper case with {}
-            "upper each first {N}OT {t}his, Upper Each First {N}ot {t}his", // multiple words in lower and upper case with {} part 2
-            "upper-each-first, Upper-Each-First", // multiple words lower case with -
-            "Upper-Each-First, Upper-Each-First", // multiple words correct with -
-            "Upper-each-First, Upper-Each-First", // multiple words in lower and upper case with -
-            "UPPER-EACH-FIRST, Upper-Each-First", // multiple words upper case with -
-            "{u}pper-each-{f}irst, {u}pper-Each-{f}irst", // multiple words lower case with {} and -
-            "-upper, -Upper", // single word with -
-            "-{u}pper, -{u}pper", // single word with {} and -
-    })
+    @CsvSource(
+            value = {
+                "{}, {}", // {}
+                "{upper, {upper", // unmatched braces
+                "upper, Upper", // single word lower case
+                "Upper, Upper", // single word correct
+                "UPPER, Upper", // single word upper case
+                "upper each first, Upper Each First", // multiple words lower case
+                "Upper Each First, Upper Each First", // multiple words correct
+                "UPPER EACH FIRST, Upper Each First", // multiple words upper case
+                "upper each First, Upper Each First", // multiple words in lower and upper case
+                "{u}pp{e}r, {u}pp{e}r", // single word lower case with {}
+                "{U}pp{e}r, {U}pp{e}r", // single word correct with {}
+                "{U}PP{E}R, {U}pp{E}r", // single word upper case with {}
+                "upper each {NOT} first, Upper Each {NOT} First", // multiple words lower case with
+                                                                  // {}
+                "Upper {E}ach {NOT} First, Upper {E}ach {NOT} First", // multiple words correct with
+                                                                      // {}
+                "UPPER {E}ACH {NOT} FIRST, Upper {E}ach {NOT} First", // multiple words upper case
+                                                                      // with {}
+                "upper each first {NOT} {this}, Upper Each First {NOT} {this}", // multiple words in
+                                                                                // lower and upper
+                                                                                // case with {}
+                "upper each first {N}OT {t}his, Upper Each First {N}ot {t}his", // multiple words in
+                                                                                // lower and upper
+                                                                                // case with {} part
+                                                                                // 2
+                "upper-each-first, Upper-Each-First", // multiple words lower case with -
+                "Upper-Each-First, Upper-Each-First", // multiple words correct with -
+                "Upper-each-First, Upper-Each-First", // multiple words in lower and upper case with
+                                                      // -
+                "UPPER-EACH-FIRST, Upper-Each-First", // multiple words upper case with -
+                "{u}pper-each-{f}irst, {u}pper-Each-{f}irst", // multiple words lower case with {}
+                                                              // and -
+                "-upper, -Upper", // single word with -
+                "-{u}pper, -{u}pper", // single word with {} and -
+            })
     void inputs(String input, String expectedResult) {
         String formattedStr = formatter.format(input);
         assertEquals(expectedResult, formattedStr);
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java
index 531ab2c9b303..866ea38d9c9b 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java
@@ -1,6 +1,6 @@
 package org.jabref.logic.formatter.casechanger;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -8,7 +8,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
@@ -33,8 +33,7 @@ private static Stream<Arguments> provideStringsForFormat() {
                 Arguments.of("lower", "lower"),
                 Arguments.of("lower", "LOWER"),
                 Arguments.of("lower {UPPER}", "LOWER {UPPER}"),
-                Arguments.of("lower {U}pper", "LOWER {U}PPER")
-        );
+                Arguments.of("lower {U}pper", "LOWER {U}PPER"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java
index 086edaaf5427..b02308bbd647 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.formatter.casechanger;
 
-import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 import org.jabref.logic.protectedterms.ProtectedTermsPreferences;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
 
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
@@ -19,9 +18,14 @@ class ProtectTermsFormatterTest {
 
     @BeforeEach
     void setUp() {
-        formatter = new ProtectTermsFormatter(
-                new ProtectedTermsLoader(new ProtectedTermsPreferences(ProtectedTermsLoader.getInternalLists(),
-                        Collections.emptyList(), Collections.emptyList(), Collections.emptyList())));
+        formatter =
+                new ProtectTermsFormatter(
+                        new ProtectedTermsLoader(
+                                new ProtectedTermsPreferences(
+                                        ProtectedTermsLoader.getInternalLists(),
+                                        Collections.emptyList(),
+                                        Collections.emptyList(),
+                                        Collections.emptyList())));
     }
 
     @Test
@@ -53,7 +57,8 @@ void correctOrderingOfTerms() {
     void test() {
         assertEquals("{VLSI} {VLSI}", formatter.format("VLSI {VLSI}"));
         assertEquals("{BPEL}", formatter.format("{BPEL}"));
-        assertEquals("{Testing {BPEL} Engine Performance: A Survey}",
+        assertEquals(
+                "{Testing {BPEL} Engine Performance: A Survey}",
                 formatter.format("{Testing BPEL Engine Performance: A Survey}"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java
index e3bf31a964c7..21c982cb27fa 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.formatter.casechanger;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
@@ -27,18 +27,21 @@ private static Stream<Arguments> testData() {
                 Arguments.of("Upper first", "uPPER FIRST"),
                 Arguments.of("Upper {NOT} first", "upper {NOT} FIRST"),
                 Arguments.of("Upper {N}ot first", "upper {N}OT FIRST"),
-                Arguments.of("Whose music? A sociology of musical language",
+                Arguments.of(
+                        "Whose music? A sociology of musical language",
                         "Whose music? a sociology of musical language"),
-                Arguments.of("Bibliographic software. A comparison.",
+                Arguments.of(
+                        "Bibliographic software. A comparison.",
                         "bibliographic software. a comparison."),
-                Arguments.of("England’s monitor; The history of the separation",
+                Arguments.of(
+                        "England’s monitor; The history of the separation",
                         "England’s Monitor; the History of the Separation"),
-                Arguments.of("Dr. schultz: a dentist turned bounty hunter.",
+                Arguments.of(
+                        "Dr. schultz: a dentist turned bounty hunter.",
                         "Dr. schultz: a dentist turned bounty hunter."),
-                Arguments.of("Wetting-and-drying",
-                        "wetting-and-drying"),
-                Arguments.of("Example case. {EXCLUDED SENTENCE.}",
-                        "Example case. {EXCLUDED SENTENCE.}"),
+                Arguments.of("Wetting-and-drying", "wetting-and-drying"),
+                Arguments.of(
+                        "Example case. {EXCLUDED SENTENCE.}", "Example case. {EXCLUDED SENTENCE.}"),
                 Arguments.of("I have {Aa} dream", new SentenceCaseFormatter().getExampleInput()));
     }
 
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java
index 0c7906a75f7d..63aadc43f4a9 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.formatter.casechanger;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
@@ -27,39 +27,48 @@ private static Stream<Arguments> testData() {
                 Arguments.of("Upper Each First", "upper eACH first"),
                 Arguments.of("An Upper Each First And", "an upper each first and"),
                 Arguments.of("An Upper Each First And", "an upper each first AND"),
-                Arguments.of("An Upper Each of the and First And",
-                        "an upper each of the and first and"),
-                Arguments.of("An Upper Each of the and First And",
-                        "an upper each of the AND first and"),
-                Arguments.of("An Upper Each of: The and First And",
+                Arguments.of(
+                        "An Upper Each of the and First And", "an upper each of the and first and"),
+                Arguments.of(
+                        "An Upper Each of the and First And", "an upper each of the AND first and"),
+                Arguments.of(
+                        "An Upper Each of: The and First And",
                         "an upper each of: the and first and"),
-                Arguments.of("An Upper First with and without {CURLY} {brackets}",
+                Arguments.of(
+                        "An Upper First with and without {CURLY} {brackets}",
                         "AN UPPER FIRST WITH AND WITHOUT {CURLY} {brackets}"),
-                Arguments.of("An Upper First with {A}nd without {C}urly {b}rackets",
+                Arguments.of(
+                        "An Upper First with {A}nd without {C}urly {b}rackets",
                         "AN UPPER FIRST WITH {A}ND WITHOUT {C}URLY {b}rackets"),
-                Arguments.of("{b}rackets {b}rac{K}ets Brack{E}ts",
-                        "{b}RaCKeTS {b}RaC{K}eTS bRaCK{E}ts"),
-                Arguments.of("Two Experiences Designing for Effective Security",
+                Arguments.of(
+                        "{b}rackets {b}rac{K}ets Brack{E}ts", "{b}RaCKeTS {b}RaC{K}eTS bRaCK{E}ts"),
+                Arguments.of(
+                        "Two Experiences Designing for Effective Security",
                         "Two experiences designing for effective security"),
-                Arguments.of("Bibliographic Software. A Comparison.",
+                Arguments.of(
+                        "Bibliographic Software. A Comparison.",
                         "bibliographic software. a comparison."),
-                Arguments.of("Bibliographic Software. {A COMPARISON.}",
+                Arguments.of(
+                        "Bibliographic Software. {A COMPARISON.}",
                         "bibliographic software. {A COMPARISON.}"),
-                Arguments.of("--Test~Ing Dash--Like Characters",
-                        "--test~ing dash--like characters"),
-                Arguments.of("-⸗Test⸗Ing Dash〰Like Cha᐀᐀Racters",
-                        "-⸗test⸗ing dash〰like cha᐀᐀racters"),
-                Arguments.of("︲︲Test־Ing Dash⁓⁓Like Characters",
-                        "︲︲test־ing dash⁓⁓like characters"),
-                Arguments.of("⁻⁻Test−Ing Dash⸻Like Characters",
-                        "⁻⁻test−ing dash⸻like characters"),
-                Arguments.of("--Test〰Ing M-U~L゠T︱I⁓P︲L--~~︲E Dash⸻-Like Characters",
+                Arguments.of(
+                        "--Test~Ing Dash--Like Characters", "--test~ing dash--like characters"),
+                Arguments.of(
+                        "-⸗Test⸗Ing Dash〰Like Cha᐀᐀Racters", "-⸗test⸗ing dash〰like cha᐀᐀racters"),
+                Arguments.of(
+                        "︲︲Test־Ing Dash⁓⁓Like Characters", "︲︲test־ing dash⁓⁓like characters"),
+                Arguments.of("⁻⁻Test−Ing Dash⸻Like Characters", "⁻⁻test−ing dash⸻like characters"),
+                Arguments.of(
+                        "--Test〰Ing M-U~L゠T︱I⁓P︲L--~~︲E Dash⸻-Like Characters",
                         "--test〰ing M-u~l゠t︱i⁓p︲l--~~︲e dASH⸻-likE charACTErs"),
-                Arguments.of("--Wetting-and-Drying M-U~L゠T︱I⁓P︲L--~~︲E Dash⸻-Like Characters",
+                Arguments.of(
+                        "--Wetting-and-Drying M-U~L゠T︱I⁓P︲L--~~︲E Dash⸻-Like Characters",
                         "--wetting-and-drying M-u~l゠t︱i⁓p︲l--~~︲e dASH⸻-likE charACTErs"),
-                Arguments.of("Kinetic Studies on Enzyme-Catalyzed Reactions: Oxidation of Glucose, Decomposition of Hydrogen Peroxide and Their Combination",
+                Arguments.of(
+                        "Kinetic Studies on Enzyme-Catalyzed Reactions: Oxidation of Glucose, Decomposition of Hydrogen Peroxide and Their Combination",
                         "kinetic studies on enzyme-catalyzed reactions: oxidation of glucose, decomposition of hydrogen peroxide and their combination"),
-                Arguments.of("{BPMN} Conformance in Open Source Engines",
+                Arguments.of(
+                        "{BPMN} Conformance in Open Source Engines",
                         new TitleCaseFormatter().getExampleInput()));
     }
 
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatterTest.java
index 8d0b07ba838b..cd3d78fa3d9d 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatterTest.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.formatter.casechanger;
 
-import java.io.IOException;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.IOException;
+import java.util.stream.Stream;
 
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
@@ -32,9 +32,15 @@ private static Stream<Arguments> terms() throws IOException {
                 Arguments.of("BPEL", "{BPEL}"),
                 Arguments.of("3GPP 3G", "{3GPP} {3G}"),
                 Arguments.of("{A} and {B}}", "{A} and {B}}"),
-                Arguments.of("Testing BPEL Engine Performance: A Survey", "{Testing BPEL Engine Performance: A Survey}"),
-                Arguments.of("Testing BPEL Engine Performance: A Survey", "Testing {BPEL} Engine Performance: A Survey"),
-                Arguments.of("Testing BPEL Engine Performance: A Survey", "{Testing {BPEL} Engine Performance: A Survey}"),
+                Arguments.of(
+                        "Testing BPEL Engine Performance: A Survey",
+                        "{Testing BPEL Engine Performance: A Survey}"),
+                Arguments.of(
+                        "Testing BPEL Engine Performance: A Survey",
+                        "Testing {BPEL} Engine Performance: A Survey"),
+                Arguments.of(
+                        "Testing BPEL Engine Performance: A Survey",
+                        "{Testing {BPEL} Engine Performance: A Survey}"),
                 Arguments.of("In CDMA", new UnprotectTermsFormatter().getExampleInput()));
     }
 
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java
index 0a4cde56fb9b..2ecd5813c7fd 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.formatter.casechanger;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
@@ -30,8 +30,7 @@ private static Stream<Arguments> upperCaseTests() {
                 Arguments.of("UPPER {lower}", "upper {lower}"),
                 Arguments.of("UPPER {l}OWER", "upper {l}ower"),
                 Arguments.of("1", "1"),
-                Arguments.of("!", "!")
-        );
+                Arguments.of("!", "!"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java b/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java
index d3d8f9a24cc8..dc03cf45fed9 100644
--- a/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.formatter.minifier;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
@@ -32,9 +32,12 @@ private static Stream<Arguments> provideAuthorNames() {
                 Arguments.of("Simon Harrer", "Simon Harrer"),
                 Arguments.of("Simon Harrer and others", "Simon Harrer and others"),
                 Arguments.of("Simon Harrer and Jörg Lenhard", "Simon Harrer and Jörg Lenhard"),
-                Arguments.of("Simon Harrer and others", "Simon Harrer and Jörg Lenhard and Guido Wirtz"),
-                Arguments.of("Simon Harrer and others", "Simon Harrer and Jörg Lenhard and Guido Wirtz and others"),
-                Arguments.of("Stefan Kolb and others", new MinifyNameListFormatter().getExampleInput())
-                );
+                Arguments.of(
+                        "Simon Harrer and others", "Simon Harrer and Jörg Lenhard and Guido Wirtz"),
+                Arguments.of(
+                        "Simon Harrer and others",
+                        "Simon Harrer and Jörg Lenhard and Guido Wirtz and others"),
+                Arguments.of(
+                        "Stefan Kolb and others", new MinifyNameListFormatter().getExampleInput()));
     }
 }
diff --git a/src/test/java/org/jabref/logic/formatter/minifier/TruncateFormatterTest.java b/src/test/java/org/jabref/logic/formatter/minifier/TruncateFormatterTest.java
index deb94603f281..1c5fdbec3fd6 100644
--- a/src/test/java/org/jabref/logic/formatter/minifier/TruncateFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/minifier/TruncateFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.formatter.minifier;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import org.junit.jupiter.api.Test;
+
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
diff --git a/src/test/java/org/jabref/logic/git/GitHandlerTest.java b/src/test/java/org/jabref/logic/git/GitHandlerTest.java
index fb3ff026bf14..f47edfd6f25b 100644
--- a/src/test/java/org/jabref/logic/git/GitHandlerTest.java
+++ b/src/test/java/org/jabref/logic/git/GitHandlerTest.java
@@ -1,9 +1,6 @@
 package org.jabref.logic.git;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Iterator;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
@@ -14,11 +11,13 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Iterator;
 
 class GitHandlerTest {
-    @TempDir
-    Path repositoryPath;
+    @TempDir Path repositoryPath;
     private GitHandler gitHandler;
 
     @BeforeEach
@@ -43,9 +42,7 @@ void createCommitOnCurrentBranch() throws IOException, GitAPIException {
             gitHandler.createCommitOnCurrentBranch("TestCommit", false);
 
             AnyObjectId head = git.getRepository().resolve(Constants.HEAD);
-            Iterator<RevCommit> log = git.log()
-                                         .add(head)
-                                         .call().iterator();
+            Iterator<RevCommit> log = git.log().add(head).call().iterator();
             assertEquals("TestCommit", log.next().getFullMessage());
             assertEquals("Initial commit", log.next().getFullMessage());
         }
diff --git a/src/test/java/org/jabref/logic/git/SlrGitHandlerTest.java b/src/test/java/org/jabref/logic/git/SlrGitHandlerTest.java
index c73ec6823fd3..7b14a1bee626 100644
--- a/src/test/java/org/jabref/logic/git/SlrGitHandlerTest.java
+++ b/src/test/java/org/jabref/logic/git/SlrGitHandlerTest.java
@@ -1,10 +1,6 @@
 package org.jabref.logic.git;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.junit.jupiter.api.BeforeEach;
@@ -13,13 +9,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
 
 class SlrGitHandlerTest {
     private static final Logger LOGGER = LoggerFactory.getLogger(SlrGitHandlerTest.class);
 
-    @TempDir
-    Path repositoryPath;
+    @TempDir Path repositoryPath;
     private SlrGitHandler gitHandler;
 
     @BeforeEach
@@ -30,22 +29,28 @@ void setUpGitHandler() {
     @Test
     void calculateDiffOnBranch() throws IOException, GitAPIException {
         String expectedPatch =
-                "diff --git a/TestFolder/Test1.txt b/TestFolder/Test1.txt\n" +
-                        "index 74809e3..2ae1945 100644\n" +
-                        "--- a/TestFolder/Test1.txt\n" +
-                        "+++ b/TestFolder/Test1.txt\n" +
-                        "@@ -1 +1,2 @@\n" +
-                        "+This is a new line of text 2\n" +
-                        " This is a new line of text\n";
+                "diff --git a/TestFolder/Test1.txt b/TestFolder/Test1.txt\n"
+                        + "index 74809e3..2ae1945 100644\n"
+                        + "--- a/TestFolder/Test1.txt\n"
+                        + "+++ b/TestFolder/Test1.txt\n"
+                        + "@@ -1 +1,2 @@\n"
+                        + "+This is a new line of text 2\n"
+                        + " This is a new line of text\n";
 
         gitHandler.checkoutBranch("branch1");
         Files.createDirectory(Path.of(repositoryPath.toString(), "TestFolder"));
         Files.createFile(Path.of(repositoryPath.toString(), "TestFolder", "Test1.txt"));
-        Files.writeString(Path.of(repositoryPath.toString(), "TestFolder", "Test1.txt"), "This is a new line of text\n");
+        Files.writeString(
+                Path.of(repositoryPath.toString(), "TestFolder", "Test1.txt"),
+                "This is a new line of text\n");
         gitHandler.createCommitOnCurrentBranch("Commit 1 on branch1", false);
 
         Files.createFile(Path.of(repositoryPath.toString(), "Test2.txt"));
-        Files.writeString(Path.of(repositoryPath.toString(), "TestFolder", "Test1.txt"), "This is a new line of text 2\n" + Files.readString(Path.of(repositoryPath.toString(), "TestFolder", "Test1.txt")));
+        Files.writeString(
+                Path.of(repositoryPath.toString(), "TestFolder", "Test1.txt"),
+                "This is a new line of text 2\n"
+                        + Files.readString(
+                                Path.of(repositoryPath.toString(), "TestFolder", "Test1.txt")));
         gitHandler.createCommitOnCurrentBranch("Commit 2 on branch1", false);
 
         LOGGER.debug(gitHandler.calculatePatchOfNewSearchResults("branch1"));
@@ -55,16 +60,19 @@ void calculateDiffOnBranch() throws IOException, GitAPIException {
     @Test
     void calculatePatch() throws IOException, GitAPIException {
         Map<Path, String> expected = new HashMap<>();
-        expected.put(Path.of(repositoryPath.toString(), "TestFolder", "Test1.txt"), "This is a new line of text 2");
-
-        Map<Path, String> result = gitHandler.parsePatchForAddedEntries(
-                "diff --git a/TestFolder/Test1.txt b/TestFolder/Test1.txt\n" +
-                        "index 74809e3..2ae1945 100644\n" +
-                        "--- a/TestFolder/Test1.txt\n" +
-                        "+++ b/TestFolder/Test1.txt\n" +
-                        "@@ -1 +1,2 @@\n" +
-                        "+This is a new line of text 2\n" +
-                        " This is a new line of text");
+        expected.put(
+                Path.of(repositoryPath.toString(), "TestFolder", "Test1.txt"),
+                "This is a new line of text 2");
+
+        Map<Path, String> result =
+                gitHandler.parsePatchForAddedEntries(
+                        "diff --git a/TestFolder/Test1.txt b/TestFolder/Test1.txt\n"
+                                + "index 74809e3..2ae1945 100644\n"
+                                + "--- a/TestFolder/Test1.txt\n"
+                                + "+++ b/TestFolder/Test1.txt\n"
+                                + "@@ -1 +1,2 @@\n"
+                                + "+This is a new line of text 2\n"
+                                + " This is a new line of text");
 
         assertEquals(expected, result);
     }
@@ -76,12 +84,15 @@ void applyPatch() throws IOException, GitAPIException {
         gitHandler.createCommitOnCurrentBranch("Commit on branch1", false);
         gitHandler.checkoutBranch("branch2");
         Files.createFile(Path.of(repositoryPath.toString(), "Test2.txt"));
-        Files.writeString(Path.of(repositoryPath.toString(), "Test1.txt"), "This is a new line of text");
+        Files.writeString(
+                Path.of(repositoryPath.toString(), "Test1.txt"), "This is a new line of text");
         gitHandler.createCommitOnCurrentBranch("Commit on branch2.", false);
 
         gitHandler.checkoutBranch("branch1");
         gitHandler.appendLatestSearchResultsOntoCurrentBranch("TestMessage", "branch2");
 
-        assertEquals("This is a new line of text", Files.readString(Path.of(repositoryPath.toString(), "Test1.txt")));
+        assertEquals(
+                "This is a new line of text",
+                Files.readString(Path.of(repositoryPath.toString(), "Test1.txt")));
     }
 }
diff --git a/src/test/java/org/jabref/logic/help/HelpFileTest.java b/src/test/java/org/jabref/logic/help/HelpFileTest.java
index 63be3fb23162..ac7b43057cc8 100644
--- a/src/test/java/org/jabref/logic/help/HelpFileTest.java
+++ b/src/test/java/org/jabref/logic/help/HelpFileTest.java
@@ -1,5 +1,11 @@
 package org.jabref.logic.help;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.jabref.logic.net.URLDownload;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URI;
@@ -7,13 +13,6 @@
 import java.util.Arrays;
 import java.util.stream.Stream;
 
-import org.jabref.logic.net.URLDownload;
-
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class HelpFileTest {
 
     private final String jabrefHelp = "https://docs.jabref.org/";
diff --git a/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java b/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java
index 7fe5f4020be2..d0bb5ac153c1 100644
--- a/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.importer;
 
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 /**
  * Similar tests are available in {@link org.jabref.model.entry.AuthorListTest}
@@ -24,22 +23,53 @@ private static Stream<Arguments> parseSingleAuthorCorrectly() {
         return Stream.of(
                 Arguments.of("王, 军", new Author("军", "军.", null, "王", null)),
                 Arguments.of("Doe, John", new Author("John", "J.", null, "Doe", null)),
-                Arguments.of("von Berlichingen zu Hornberg, Johann Gottfried", new Author("Johann Gottfried", "J. G.", "von", "Berlichingen zu Hornberg", null)),
-                Arguments.of("{Robert and Sons, Inc.}", new Author(null, null, null, "{Robert and Sons, Inc.}", null)),
-                Arguments.of("al-Ṣāliḥ, Abdallāh", new Author("Abdallāh", "A.", null, "al-Ṣāliḥ", null)),
-                Arguments.of("de la Vallée Poussin, Jean Charles Gabriel", new Author("Jean Charles Gabriel", "J. C. G.", "de la", "Vallée Poussin", null)),
-                Arguments.of("de la Vallée Poussin, J. C. G.", new Author("J. C. G.", "J. C. G.", "de la", "Vallée Poussin", null)),
-                Arguments.of("{K}ent-{B}oswell, E. S.", new Author("E. S.", "E. S.", null, "{K}ent-{B}oswell", null)),
-                Arguments.of("Uhlenhaut, N Henriette", new Author("N Henriette", "N. H.", null, "Uhlenhaut", null)),
-                Arguments.of("Nu{\\~{n}}ez, Jose", new Author("Jose", "J.", null, "Nu{\\~{n}}ez", null)),
+                Arguments.of(
+                        "von Berlichingen zu Hornberg, Johann Gottfried",
+                        new Author(
+                                "Johann Gottfried",
+                                "J. G.",
+                                "von",
+                                "Berlichingen zu Hornberg",
+                                null)),
+                Arguments.of(
+                        "{Robert and Sons, Inc.}",
+                        new Author(null, null, null, "{Robert and Sons, Inc.}", null)),
+                Arguments.of(
+                        "al-Ṣāliḥ, Abdallāh", new Author("Abdallāh", "A.", null, "al-Ṣāliḥ", null)),
+                Arguments.of(
+                        "de la Vallée Poussin, Jean Charles Gabriel",
+                        new Author(
+                                "Jean Charles Gabriel",
+                                "J. C. G.",
+                                "de la",
+                                "Vallée Poussin",
+                                null)),
+                Arguments.of(
+                        "de la Vallée Poussin, J. C. G.",
+                        new Author("J. C. G.", "J. C. G.", "de la", "Vallée Poussin", null)),
+                Arguments.of(
+                        "{K}ent-{B}oswell, E. S.",
+                        new Author("E. S.", "E. S.", null, "{K}ent-{B}oswell", null)),
+                Arguments.of(
+                        "Uhlenhaut, N Henriette",
+                        new Author("N Henriette", "N. H.", null, "Uhlenhaut", null)),
+                Arguments.of(
+                        "Nu{\\~{n}}ez, Jose", new Author("Jose", "J.", null, "Nu{\\~{n}}ez", null)),
                 // parseAuthorWithFirstNameAbbreviationContainingUmlaut
-                Arguments.of("{\\OE}rjan Umlauts", new Author("{\\OE}rjan", "{\\OE}.", null, "Umlauts", null)),
-                Arguments.of("{Company Name, LLC}", new Author("", "", null, "{Company Name, LLC}", null)),
-                Arguments.of("{Society of Automotive Engineers}", new Author("", "", null, "{Society of Automotive Engineers}", null)),
+                Arguments.of(
+                        "{\\OE}rjan Umlauts",
+                        new Author("{\\OE}rjan", "{\\OE}.", null, "Umlauts", null)),
+                Arguments.of(
+                        "{Company Name, LLC}",
+                        new Author("", "", null, "{Company Name, LLC}", null)),
+                Arguments.of(
+                        "{Society of Automotive Engineers}",
+                        new Author("", "", null, "{Society of Automotive Engineers}", null)),
 
                 // Demonstrate the "von" part parsing of a non-braced name
-                Arguments.of("Society of Automotive Engineers", new Author("Society", "S.", "of", "Automotive Engineers", null))
-        );
+                Arguments.of(
+                        "Society of Automotive Engineers",
+                        new Author("Society", "S.", "of", "Automotive Engineers", null)));
     }
 
     @ParameterizedTest
@@ -50,12 +80,16 @@ void parseSingleAuthorCorrectly(String authorsString, Author authorsParsed) {
 
     @Test
     void dashedNamesWithoutSpaceNormalized() {
-        assertEquals(Optional.of("Z. Yao and D. S. Weld and W-P. Chen and H. Sun"), AuthorListParser.normalizeSimply("Z. Yao, D. S. Weld, W-P. Chen, and H. Sun"));
+        assertEquals(
+                Optional.of("Z. Yao and D. S. Weld and W-P. Chen and H. Sun"),
+                AuthorListParser.normalizeSimply("Z. Yao, D. S. Weld, W-P. Chen, and H. Sun"));
     }
 
     @Test
     void dashedNamesWithSpaceNormalized() {
-        assertEquals(Optional.of("Z. Yao and D. S. Weld and W.-P. Chen and H. Sun"), AuthorListParser.normalizeSimply("Z. Yao, D. S. Weld, W.-P. Chen, and H. Sun"));
+        assertEquals(
+                Optional.of("Z. Yao and D. S. Weld and W.-P. Chen and H. Sun"),
+                AuthorListParser.normalizeSimply("Z. Yao, D. S. Weld, W.-P. Chen, and H. Sun"));
     }
 
     private static Stream<Arguments> parseMultipleCorrectly() {
@@ -63,24 +97,20 @@ private static Stream<Arguments> parseMultipleCorrectly() {
                 Arguments.of(
                         AuthorList.of(
                                 new Author("Alexander", "A.", null, "Artemenko", null),
-                                Author.OTHERS
-                        ),
+                                Author.OTHERS),
                         "Alexander Artemenko and others"),
                 Arguments.of(
                         AuthorList.of(
                                 new Author("I.", "I.", null, "Podadera", null),
                                 new Author("J. M.", "J. M.", null, "Carmona", null),
                                 new Author("A.", "A.", null, "Ibarra", null),
-                                new Author("J.", "J.", null, "Molla", null)
-                        ),
+                                new Author("J.", "J.", null, "Molla", null)),
                         "I. Podadera, J. M. Carmona, A. Ibarra, and J. Molla"),
-                Arguments.of(AuthorList.of(
+                Arguments.of(
+                        AuthorList.of(
                                 new Author("Vivian", "V.", null, "U", null),
-                                new Author("Thomas", "T.", null, "Lai", null)
-                        ),
-                        "U, Vivian and Lai, Thomas"
-                )
-        );
+                                new Author("Thomas", "T.", null, "Lai", null)),
+                        "U, Vivian and Lai, Thomas"));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java b/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java
index fe4a73946ba4..4d99004001f4 100644
--- a/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.importer;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.model.database.BibDatabase;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 
 class BibDatabaseFilesTest {
 
@@ -26,15 +25,18 @@ void setUp() {
 
     @Test
     void resolveStrings() throws IOException {
-        try (FileInputStream stream = new FileInputStream("src/test/resources/org/jabref/util/twente.bib");
-             InputStreamReader fr = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
+        try (FileInputStream stream =
+                        new FileInputStream("src/test/resources/org/jabref/util/twente.bib");
+                InputStreamReader fr = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
             ParserResult result = new BibtexParser(importFormatPreferences).parse(fr);
 
             BibDatabase db = result.getDatabase();
 
             assertEquals("Arvind", db.resolveForStrings("#Arvind#"));
             assertEquals("Patterson, David", db.resolveForStrings("#Patterson#"));
-            assertEquals("Arvind and Patterson, David", db.resolveForStrings("#Arvind# and #Patterson#"));
+            assertEquals(
+                    "Arvind and Patterson, David",
+                    db.resolveForStrings("#Arvind# and #Patterson#"));
 
             // Strings that are not found return just the given string.
             assertEquals("#unknown#", db.resolveForStrings("#unknown#"));
diff --git a/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java b/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java
index e2ed83fc2a0e..a41cc3eca12c 100644
--- a/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java
+++ b/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.importer;
 
-import java.util.Collection;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.Mockito.mock;
+import java.util.Collection;
 
 class DatabaseFileLookupTest {
 
@@ -25,8 +24,11 @@ class DatabaseFileLookupTest {
 
     @BeforeEach
     void setUp() throws Exception {
-        ParserResult result = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor())
-                .importDatabase(ImportDataTest.UNLINKED_FILES_TEST_BIB);
+        ParserResult result =
+                new BibtexImporter(
+                                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                                new DummyFileUpdateMonitor())
+                        .importDatabase(ImportDataTest.UNLINKED_FILES_TEST_BIB);
         database = result.getDatabase();
         entries = database.getEntries();
 
diff --git a/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java b/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java
index 7a9ecf1d031f..4c736bf6ad14 100644
--- a/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java
@@ -1,22 +1,21 @@
 package org.jabref.logic.importer;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Optional;
-import java.util.Set;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.importer.fetcher.TrustLevel;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Optional;
+import java.util.Set;
 
 @FetcherTest
 class FulltextFetchersTest {
@@ -33,7 +32,8 @@ default TrustLevel getTrustLevel() {
 
     @Test
     void acceptPdfUrls() throws MalformedURLException {
-        URL pdfUrl = URI.create("http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf").toURL();
+        URL pdfUrl =
+                URI.create("http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf").toURL();
         FulltextFetcherWithTrustLevel finder = e -> Optional.of(pdfUrl);
         FulltextFetchers fetcher = new FulltextFetchers(Set.of(finder));
         assertEquals(Optional.of(pdfUrl), fetcher.findFullTextPDF(new BibEntry()));
@@ -50,7 +50,8 @@ void rejectNonPdfUrls() throws MalformedURLException {
 
     @Test
     void noTrustLevel() throws MalformedURLException {
-        URL pdfUrl = URI.create("http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf").toURL();
+        URL pdfUrl =
+                URI.create("http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf").toURL();
         FulltextFetcherWithTrustLevel finder = e -> Optional.of(pdfUrl);
         FulltextFetchers fetcher = new FulltextFetchers(Set.of(finder));
 
@@ -59,17 +60,22 @@ void noTrustLevel() throws MalformedURLException {
 
     @Test
     void higherTrustLevelWins() throws IOException, FetcherException {
-        // set an (arbitrary) DOI to the test entry to skip side effects inside the "findFullTextPDF" method
+        // set an (arbitrary) DOI to the test entry to skip side effects inside the
+        // "findFullTextPDF" method
         BibEntry entry = new BibEntry().withField(StandardField.DOI, "10.5220/0007903201120130");
 
         FulltextFetcher finderHigh = mock(FulltextFetcher.class);
         when(finderHigh.getTrustLevel()).thenReturn(TrustLevel.SOURCE);
-        final URL highUrl = URI.create("http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf").toURL();
+        final URL highUrl =
+                URI.create("http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf").toURL();
         when(finderHigh.findFullText(entry)).thenReturn(Optional.of(highUrl));
 
         FulltextFetcher finderLow = mock(FulltextFetcher.class);
         when(finderLow.getTrustLevel()).thenReturn(TrustLevel.UNKNOWN);
-        final URL lowUrl = URI.create("http://docs.oasis-open.org/opencsa/sca-bpel/sca-bpel-1.1-spec-cd-01.pdf").toURL();
+        final URL lowUrl =
+                URI.create(
+                                "http://docs.oasis-open.org/opencsa/sca-bpel/sca-bpel-1.1-spec-cd-01.pdf")
+                        .toURL();
         when(finderLow.findFullText(entry)).thenReturn(Optional.of(lowUrl));
 
         FulltextFetchers fetchers = new FulltextFetchers(Set.of(finderLow, finderHigh));
diff --git a/src/test/java/org/jabref/logic/importer/ImportDataTest.java b/src/test/java/org/jabref/logic/importer/ImportDataTest.java
index eeb6a3c84d17..81fe0f9d4956 100644
--- a/src/test/java/org/jabref/logic/importer/ImportDataTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportDataTest.java
@@ -1,21 +1,29 @@
 package org.jabref.logic.importer;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 public class ImportDataTest {
 
-    public static final Path FILE_IN_DATABASE = Path.of("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf");
-    public static final Path FILE_NOT_IN_DATABASE = Path.of("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf");
-    public static final Path EXISTING_FOLDER = Path.of("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder");
+    public static final Path FILE_IN_DATABASE =
+            Path.of(
+                    "src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfInDatabase.pdf");
+    public static final Path FILE_NOT_IN_DATABASE =
+            Path.of(
+                    "src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/pdfNotInDatabase.pdf");
+    public static final Path EXISTING_FOLDER =
+            Path.of("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder");
     public static final Path NOT_EXISTING_FOLDER = Path.of("notexistingfolder");
-    public static final Path NOT_EXISTING_PDF = Path.of("src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/null.pdf");
-    public static final Path UNLINKED_FILES_TEST_BIB = Path.of("src/test/resources/org/jabref/util/unlinkedFilesTestBib.bib");
+    public static final Path NOT_EXISTING_PDF =
+            Path.of(
+                    "src/test/resources/org/jabref/logic/importer/unlinkedFilesTestFolder/null.pdf");
+    public static final Path UNLINKED_FILES_TEST_BIB =
+            Path.of("src/test/resources/org/jabref/util/unlinkedFilesTestBib.bib");
 
     /**
      * Tests the testing environment.
@@ -23,13 +31,22 @@ public class ImportDataTest {
     @Test
     void environment() {
         assertTrue(Files.exists(ImportDataTest.EXISTING_FOLDER), "EXISTING_FOLDER does not exist");
-        assertTrue(Files.isDirectory(ImportDataTest.EXISTING_FOLDER), "EXISTING_FOLDER is not a directory");
-
-        assertTrue(Files.exists(ImportDataTest.FILE_IN_DATABASE), "FILE_IN_DATABASE does not exist");
-        assertTrue(Files.isRegularFile(ImportDataTest.FILE_IN_DATABASE), "FILE_IN_DATABASE is not a regular file");
-
-        assertTrue(Files.exists(ImportDataTest.FILE_NOT_IN_DATABASE), "FILE_NOT_IN_DATABASE does not exist");
-        assertTrue(Files.isRegularFile(ImportDataTest.FILE_NOT_IN_DATABASE), "FILE_NOT_IN_DATABASE is not a regular file");
+        assertTrue(
+                Files.isDirectory(ImportDataTest.EXISTING_FOLDER),
+                "EXISTING_FOLDER is not a directory");
+
+        assertTrue(
+                Files.exists(ImportDataTest.FILE_IN_DATABASE), "FILE_IN_DATABASE does not exist");
+        assertTrue(
+                Files.isRegularFile(ImportDataTest.FILE_IN_DATABASE),
+                "FILE_IN_DATABASE is not a regular file");
+
+        assertTrue(
+                Files.exists(ImportDataTest.FILE_NOT_IN_DATABASE),
+                "FILE_NOT_IN_DATABASE does not exist");
+        assertTrue(
+                Files.isRegularFile(ImportDataTest.FILE_NOT_IN_DATABASE),
+                "FILE_NOT_IN_DATABASE is not a regular file");
 
         assertFalse(Files.exists(ImportDataTest.NOT_EXISTING_FOLDER), "NOT_EXISTING_FOLDER exists");
         assertFalse(Files.exists(ImportDataTest.NOT_EXISTING_PDF), "NOT_EXISTING_PDF exists");
diff --git a/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java b/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
index e9548dc96672..c7b7ad4376b4 100644
--- a/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
@@ -1,24 +1,23 @@
 package org.jabref.logic.importer;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.stream.Stream;
 
 class ImportFormatReaderIntegrationTest {
 
@@ -26,20 +25,24 @@ class ImportFormatReaderIntegrationTest {
 
     @BeforeEach
     void setUp() {
-        ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importerPreferences.getCustomImporters()).thenReturn(FXCollections.emptyObservableSet());
-        reader = new ImportFormatReader(
-                importerPreferences,
-                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                mock(CitationKeyPatternPreferences.class), new DummyFileUpdateMonitor()
-        );
+        ImporterPreferences importerPreferences =
+                mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importerPreferences.getCustomImporters())
+                .thenReturn(FXCollections.emptyObservableSet());
+        reader =
+                new ImportFormatReader(
+                        importerPreferences,
+                        mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        mock(CitationKeyPatternPreferences.class),
+                        new DummyFileUpdateMonitor());
     }
 
     @ParameterizedTest
     @MethodSource("importFormats")
     void importUnknownFormat(String resource, String format, int count) throws Exception {
         Path file = Path.of(ImportFormatReaderIntegrationTest.class.getResource(resource).toURI());
-        ImportFormatReader.UnknownFormatImport unknownFormat = reader.importUnknownFormat(file, new DummyFileUpdateMonitor());
+        ImportFormatReader.UnknownFormatImport unknownFormat =
+                reader.importUnknownFormat(file, new DummyFileUpdateMonitor());
         assertEquals(count, unknownFormat.parserResult().getDatabase().getEntryCount());
     }
 
@@ -55,18 +58,20 @@ void importFormatFromFile(String resource, String format, int count) throws Exce
     void importUnknownFormatFromString(String resource, String format, int count) throws Exception {
         Path file = Path.of(ImportFormatReaderIntegrationTest.class.getResource(resource).toURI());
         String data = Files.readString(file);
-        assertEquals(count, reader.importUnknownFormat(data).parserResult().getDatabase().getEntries().size());
+        assertEquals(
+                count,
+                reader.importUnknownFormat(data).parserResult().getDatabase().getEntries().size());
     }
 
     private static Stream<Object[]> importFormats() {
         Collection<Object[]> result = new ArrayList<>();
-        result.add(new Object[]{"fileformat/RisImporterTest1.ris", "ris", 1});
-        result.add(new Object[]{"fileformat/IsiImporterTest1.isi", "isi", 1});
-        result.add(new Object[]{"fileformat/RepecNepImporterTest2.txt", "repecnep", 1});
-        result.add(new Object[]{"fileformat/OvidImporterTest3.txt", "ovid", 1});
-        result.add(new Object[]{"fileformat/Endnote.entries.enw", "refer", 5});
-        result.add(new Object[]{"fileformat/MsBibImporterTest4.xml", "msbib", 1});
-        result.add(new Object[]{"fileformat/MsBibImporterTest4.bib", "bibtex", 1});
+        result.add(new Object[] {"fileformat/RisImporterTest1.ris", "ris", 1});
+        result.add(new Object[] {"fileformat/IsiImporterTest1.isi", "isi", 1});
+        result.add(new Object[] {"fileformat/RepecNepImporterTest2.txt", "repecnep", 1});
+        result.add(new Object[] {"fileformat/OvidImporterTest3.txt", "ovid", 1});
+        result.add(new Object[] {"fileformat/Endnote.entries.enw", "refer", 5});
+        result.add(new Object[] {"fileformat/MsBibImporterTest4.xml", "msbib", 1});
+        result.add(new Object[] {"fileformat/MsBibImporterTest4.bib", "bibtex", 1});
         return result.stream();
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/ImportFormatReaderParameterlessTest.java b/src/test/java/org/jabref/logic/importer/ImportFormatReaderParameterlessTest.java
index 39f3fcc2f2ed..2820da51eeec 100644
--- a/src/test/java/org/jabref/logic/importer/ImportFormatReaderParameterlessTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportFormatReaderParameterlessTest.java
@@ -1,20 +1,19 @@
 package org.jabref.logic.importer;
 
-import java.nio.file.Path;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Path;
 
 class ImportFormatReaderParameterlessTest {
 
@@ -23,21 +22,34 @@ class ImportFormatReaderParameterlessTest {
 
     @BeforeEach
     void setUp() {
-        ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importerPreferences.getCustomImporters()).thenReturn(FXCollections.emptyObservableSet());
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        reader = new ImportFormatReader(importerPreferences, importFormatPreferences, mock(CitationKeyPatternPreferences.class), fileMonitor);
+        ImporterPreferences importerPreferences =
+                mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importerPreferences.getCustomImporters())
+                .thenReturn(FXCollections.emptyObservableSet());
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        reader =
+                new ImportFormatReader(
+                        importerPreferences,
+                        importFormatPreferences,
+                        mock(CitationKeyPatternPreferences.class),
+                        fileMonitor);
     }
 
     @Test
     void importUnknownFormatThrowsExceptionIfNoMatchingImporterWasFound() throws Exception {
-        Path file = Path.of(ImportFormatReaderParameterlessTest.class.getResource("fileformat/emptyFile.xml").toURI());
+        Path file =
+                Path.of(
+                        ImportFormatReaderParameterlessTest.class
+                                .getResource("fileformat/emptyFile.xml")
+                                .toURI());
         assertThrows(ImportException.class, () -> reader.importUnknownFormat(file, fileMonitor));
     }
 
     @Test
     void importUnknownFormatThrowsExceptionIfPathIsNull() {
-        assertThrows(NullPointerException.class, () -> reader.importUnknownFormat(null, fileMonitor));
+        assertThrows(
+                NullPointerException.class, () -> reader.importUnknownFormat(null, fileMonitor));
     }
 
     @Test
@@ -47,6 +59,8 @@ void importUnknownFormatThrowsExceptionIfDataIsNull() {
 
     @Test
     void importFromFileWithUnknownFormatThrowsException() {
-        assertThrows(ImportException.class, () -> reader.importFromFile("someunknownformat", Path.of("somepath")));
+        assertThrows(
+                ImportException.class,
+                () -> reader.importFromFile("someunknownformat", Path.of("somepath")));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/ImporterTest.java b/src/test/java/org/jabref/logic/importer/ImporterTest.java
index aaff89c967ab..61acfbb4f24a 100644
--- a/src/test/java/org/jabref/logic/importer/ImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImporterTest.java
@@ -1,8 +1,11 @@
 package org.jabref.logic.importer;
 
-import java.io.BufferedReader;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.importer.fileformat.BiblioscapeImporter;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
@@ -22,25 +25,22 @@
 import org.jabref.logic.importer.fileformat.RisImporter;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 import org.mockito.Mockito;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.BufferedReader;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 public class ImporterTest {
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
     void isRecognizedFormatWithNullForBufferedReaderThrowsException(Importer format) {
-        assertThrows(NullPointerException.class, () -> format.isRecognizedFormat((BufferedReader) null));
+        assertThrows(
+                NullPointerException.class, () -> format.isRecognizedFormat((BufferedReader) null));
     }
 
     @ParameterizedTest
@@ -52,7 +52,8 @@ void isRecognizedFormatWithNullForStringThrowsException(Importer format) {
     @ParameterizedTest
     @MethodSource("instancesToTest")
     void importDatabaseWithNullForBufferedReaderThrowsException(Importer format) {
-        assertThrows(NullPointerException.class, () -> format.importDatabase((BufferedReader) null));
+        assertThrows(
+                NullPointerException.class, () -> format.importDatabase((BufferedReader) null));
     }
 
     @ParameterizedTest
@@ -101,7 +102,8 @@ void getDescriptionDoesNotReturnNull(Importer format) {
     }
 
     public static Stream<Importer> instancesToTest() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         XmpPreferences xmpPreferences = mock(XmpPreferences.class);
         return Stream.of(
@@ -122,7 +124,6 @@ public static Stream<Importer> instancesToTest() {
                 new PdfContentImporter(),
                 new PdfXmpImporter(xmpPreferences),
                 new RepecNepImporter(importFormatPreferences),
-                new RisImporter()
-        );
+                new RisImporter());
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
index 0819e423d3ec..ae629f3beadd 100644
--- a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
@@ -1,12 +1,7 @@
 package org.jabref.logic.importer;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.LibraryPreferences;
 import org.jabref.model.database.BibDatabase;
@@ -14,13 +9,17 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Optional;
 
 class OpenDatabaseTest {
 
@@ -38,8 +37,10 @@ class OpenDatabaseTest {
         bibNoHeader = Path.of(OpenDatabaseTest.class.getResource("headerless.bib").toURI());
         bibWrongHeader = Path.of(OpenDatabaseTest.class.getResource("wrong-header.bib").toURI());
         bibHeader = Path.of(OpenDatabaseTest.class.getResource("encoding-header.bib").toURI());
-        bibHeaderAndSignature = Path.of(OpenDatabaseTest.class.getResource("jabref-header.bib").toURI());
-        bibEncodingWithoutNewline = Path.of(OpenDatabaseTest.class.getResource("encodingWithoutNewline.bib").toURI());
+        bibHeaderAndSignature =
+                Path.of(OpenDatabaseTest.class.getResource("jabref-header.bib").toURI());
+        bibEncodingWithoutNewline =
+                Path.of(OpenDatabaseTest.class.getResource("encodingWithoutNewline.bib").toURI());
     }
 
     @BeforeEach
@@ -50,56 +51,71 @@ void setUp() {
 
     @Test
     void useFallbackEncodingIfNoHeader() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibNoHeader, importFormatPreferences, fileMonitor);
+        ParserResult result =
+                OpenDatabase.loadDatabase(bibNoHeader, importFormatPreferences, fileMonitor);
         assertEquals(defaultEncoding, result.getMetaData().getEncoding().get());
     }
 
     @Test
     void useFallbackEncodingIfUnknownHeader() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibWrongHeader, importFormatPreferences, fileMonitor);
+        ParserResult result =
+                OpenDatabase.loadDatabase(bibWrongHeader, importFormatPreferences, fileMonitor);
         assertEquals(defaultEncoding, result.getMetaData().getEncoding().get());
     }
 
     @Test
     void useSpecifiedEncoding() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibHeader, importFormatPreferences, fileMonitor);
+        ParserResult result =
+                OpenDatabase.loadDatabase(bibHeader, importFormatPreferences, fileMonitor);
         assertEquals(defaultEncoding, result.getMetaData().getEncoding().get());
     }
 
     @Test
     void useSpecifiedEncodingWithSignature() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibHeaderAndSignature, importFormatPreferences, fileMonitor);
+        ParserResult result =
+                OpenDatabase.loadDatabase(
+                        bibHeaderAndSignature, importFormatPreferences, fileMonitor);
         assertEquals(defaultEncoding, result.getMetaData().getEncoding().get());
     }
 
     @Test
     void entriesAreParsedNoHeader() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibNoHeader, importFormatPreferences, fileMonitor);
+        ParserResult result =
+                OpenDatabase.loadDatabase(bibNoHeader, importFormatPreferences, fileMonitor);
         BibDatabase db = result.getDatabase();
 
         // Entry
         assertEquals(1, db.getEntryCount());
-        assertEquals(Optional.of("2014"), db.getEntryByCitationKey("1").get().getField(StandardField.YEAR));
+        assertEquals(
+                Optional.of("2014"),
+                db.getEntryByCitationKey("1").get().getField(StandardField.YEAR));
     }
 
     @Test
     void entriesAreParsedHeader() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibHeader, importFormatPreferences, fileMonitor);
+        ParserResult result =
+                OpenDatabase.loadDatabase(bibHeader, importFormatPreferences, fileMonitor);
         BibDatabase db = result.getDatabase();
 
         // Entry
         assertEquals(1, db.getEntryCount());
-        assertEquals(Optional.of("2014"), db.getEntryByCitationKey("1").get().getField(StandardField.YEAR));
+        assertEquals(
+                Optional.of("2014"),
+                db.getEntryByCitationKey("1").get().getField(StandardField.YEAR));
     }
 
     @Test
     void entriesAreParsedHeaderAndSignature() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibHeaderAndSignature, importFormatPreferences, fileMonitor);
+        ParserResult result =
+                OpenDatabase.loadDatabase(
+                        bibHeaderAndSignature, importFormatPreferences, fileMonitor);
         BibDatabase db = result.getDatabase();
 
         // Entry
         assertEquals(1, db.getEntryCount());
-        assertEquals(Optional.of("2014"), db.getEntryByCitationKey("1").get().getField(StandardField.YEAR));
+        assertEquals(
+                Optional.of("2014"),
+                db.getEntryByCitationKey("1").get().getField(StandardField.YEAR));
     }
 
     /**
@@ -107,7 +123,9 @@ void entriesAreParsedHeaderAndSignature() throws IOException {
      */
     @Test
     void correctlyParseEncodingWithoutNewline() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibEncodingWithoutNewline, importFormatPreferences, fileMonitor);
+        ParserResult result =
+                OpenDatabase.loadDatabase(
+                        bibEncodingWithoutNewline, importFormatPreferences, fileMonitor);
         assertEquals(StandardCharsets.US_ASCII, result.getMetaData().getEncoding().get());
 
         BibDatabase db = result.getDatabase();
diff --git a/src/test/java/org/jabref/logic/importer/ParserResultTest.java b/src/test/java/org/jabref/logic/importer/ParserResultTest.java
index 0e14f538ac81..2ca3868048b8 100644
--- a/src/test/java/org/jabref/logic/importer/ParserResultTest.java
+++ b/src/test/java/org/jabref/logic/importer/ParserResultTest.java
@@ -1,22 +1,21 @@
 package org.jabref.logic.importer;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
 
 class ParserResultTest {
     @Test
@@ -58,7 +57,8 @@ void doesNotHaveDuplicateWarnings() {
     @Test
     void warningAddedForWhitespaceInCitationKeyImport(@TempDir Path tmpDir) throws IOException {
         // whitespace after citation key "myArticle "
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @article{ myArticle ,
                   author    = "Author Name",
                   title     = "Title of the Article",
@@ -70,14 +70,21 @@ void warningAddedForWhitespaceInCitationKeyImport(@TempDir Path tmpDir) throws I
                 """;
         Path tempFile = tmpDir.resolve("invalidBibTex.bib");
         Files.write(tempFile, bibtexEntry.getBytes());
-        ParserResult parserResult = OpenDatabase.loadDatabase(tempFile, mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
-        assertEquals("Line 1: Found corrupted citation key  (contains whitespaces).", parserResult.warnings().getFirst());
+        ParserResult parserResult =
+                OpenDatabase.loadDatabase(
+                        tempFile,
+                        mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        new DummyFileUpdateMonitor());
+        assertEquals(
+                "Line 1: Found corrupted citation key  (contains whitespaces).",
+                parserResult.warnings().getFirst());
     }
 
     @Test
     void warningAddedForMissingCommaInCitationKeyImport(@TempDir Path tmpDir) throws IOException {
         // Comma replaced by whitespace instead in citation key "myArticle "
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
             @article{myArticle\s
                author    = "Author Name",
                title     = "Title of the Article",
@@ -89,13 +96,20 @@ void warningAddedForMissingCommaInCitationKeyImport(@TempDir Path tmpDir) throws
             """;
         Path tempFile = tmpDir.resolve("invalidBibTex.bib");
         Files.write(tempFile, bibtexEntry.getBytes());
-        ParserResult parserResult = OpenDatabase.loadDatabase(tempFile, mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
-        assertEquals("Line 1: Found corrupted citation key  (comma missing).", parserResult.warnings().getFirst());
+        ParserResult parserResult =
+                OpenDatabase.loadDatabase(
+                        tempFile,
+                        mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        new DummyFileUpdateMonitor());
+        assertEquals(
+                "Line 1: Found corrupted citation key  (comma missing).",
+                parserResult.warnings().getFirst());
     }
 
     @Test
     void warningAddedForCorruptedCitationKeyInImport(@TempDir Path tmpDir) throws IOException {
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
             @article{myArticle
                author    = "Author Name",
                title     = "Title of the Article",
@@ -108,14 +122,19 @@ void warningAddedForCorruptedCitationKeyInImport(@TempDir Path tmpDir) throws IO
 
         Path tempFile = tmpDir.resolve("invalidBibTex.bib");
         Files.write(tempFile, bibtexEntry.getBytes());
-        ParserResult parserResult = OpenDatabase.loadDatabase(tempFile, mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
+        ParserResult parserResult =
+                OpenDatabase.loadDatabase(
+                        tempFile,
+                        mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        new DummyFileUpdateMonitor());
         assertEquals("Line 2: Found corrupted citation key .", parserResult.warnings().getFirst());
     }
 
     @Test
     void skipsImportEntryForImproperSyntax(@TempDir Path tmpDir) throws IOException {
         // Comma after '=' character on line 2 throws error
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
             @article{myArticle,
                author    =, "Author Name",
                title     = "Title of the Article",
@@ -127,7 +146,11 @@ void skipsImportEntryForImproperSyntax(@TempDir Path tmpDir) throws IOException
             """;
         Path tempFile = tmpDir.resolve("invalidBibTex.bib");
         Files.write(tempFile, bibtexEntry.getBytes());
-        ParserResult parserResult = OpenDatabase.loadDatabase(tempFile, mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
+        ParserResult parserResult =
+                OpenDatabase.loadDatabase(
+                        tempFile,
+                        mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        new DummyFileUpdateMonitor());
         assertFalse(parserResult.getDatabase().hasEntries());
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/QueryParserTest.java b/src/test/java/org/jabref/logic/importer/QueryParserTest.java
index 9ad2f8fe371d..53b2e1e298c0 100644
--- a/src/test/java/org/jabref/logic/importer/QueryParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/QueryParserTest.java
@@ -1,46 +1,57 @@
 package org.jabref.logic.importer;
 
-import org.jabref.logic.importer.fetcher.ComplexSearchQuery;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.importer.fetcher.ComplexSearchQuery;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class QueryParserTest {
     QueryParser parser = new QueryParser();
 
     @Test
     void convertAuthorField() {
-        ComplexSearchQuery searchQuery = parser.parseQueryStringIntoComplexQuery("author:\"Igor Steinmacher\"").get();
-        ComplexSearchQuery expectedQuery = ComplexSearchQuery.builder().author("\"Igor Steinmacher\"").build();
+        ComplexSearchQuery searchQuery =
+                parser.parseQueryStringIntoComplexQuery("author:\"Igor Steinmacher\"").get();
+        ComplexSearchQuery expectedQuery =
+                ComplexSearchQuery.builder().author("\"Igor Steinmacher\"").build();
         assertEquals(expectedQuery, searchQuery);
     }
 
     @Test
     void convertDefaultField() {
-        ComplexSearchQuery searchQuery = parser.parseQueryStringIntoComplexQuery("\"default value\"").get();
-        ComplexSearchQuery expectedQuery = ComplexSearchQuery.builder().defaultFieldPhrase("\"default value\"").build();
+        ComplexSearchQuery searchQuery =
+                parser.parseQueryStringIntoComplexQuery("\"default value\"").get();
+        ComplexSearchQuery expectedQuery =
+                ComplexSearchQuery.builder().defaultFieldPhrase("\"default value\"").build();
         assertEquals(expectedQuery, searchQuery);
     }
 
     @Test
     void convertExplicitDefaultField() {
-        ComplexSearchQuery searchQuery = parser.parseQueryStringIntoComplexQuery("default:\"default value\"").get();
-        ComplexSearchQuery expectedQuery = ComplexSearchQuery.builder().defaultFieldPhrase("\"default value\"").build();
+        ComplexSearchQuery searchQuery =
+                parser.parseQueryStringIntoComplexQuery("default:\"default value\"").get();
+        ComplexSearchQuery expectedQuery =
+                ComplexSearchQuery.builder().defaultFieldPhrase("\"default value\"").build();
         assertEquals(expectedQuery, searchQuery);
     }
 
     @Test
     void convertJournalField() {
-        ComplexSearchQuery searchQuery = parser.parseQueryStringIntoComplexQuery("journal:Nature").get();
-        ComplexSearchQuery expectedQuery = ComplexSearchQuery.builder().journal("\"Nature\"").build();
+        ComplexSearchQuery searchQuery =
+                parser.parseQueryStringIntoComplexQuery("journal:Nature").get();
+        ComplexSearchQuery expectedQuery =
+                ComplexSearchQuery.builder().journal("\"Nature\"").build();
         assertEquals(expectedQuery, searchQuery);
     }
 
     @Test
     void convertAlphabeticallyFirstJournalField() {
-        ComplexSearchQuery searchQuery = parser.parseQueryStringIntoComplexQuery("journal:Nature journal:\"Complex Networks\"").get();
-        ComplexSearchQuery expectedQuery = ComplexSearchQuery.builder().journal("\"Complex Networks\"").build();
+        ComplexSearchQuery searchQuery =
+                parser.parseQueryStringIntoComplexQuery(
+                                "journal:Nature journal:\"Complex Networks\"")
+                        .get();
+        ComplexSearchQuery expectedQuery =
+                ComplexSearchQuery.builder().journal("\"Complex Networks\"").build();
         assertEquals(expectedQuery, searchQuery);
     }
 
@@ -53,22 +64,32 @@ void convertYearField() {
 
     @Test
     void convertNumericallyFirstYearField() {
-        ComplexSearchQuery searchQuery = parser.parseQueryStringIntoComplexQuery("year:2015 year:2014").get();
+        ComplexSearchQuery searchQuery =
+                parser.parseQueryStringIntoComplexQuery("year:2015 year:2014").get();
         ComplexSearchQuery expectedQuery = ComplexSearchQuery.builder().singleYear(2014).build();
         assertEquals(expectedQuery, searchQuery);
     }
 
     @Test
     void convertYearRangeField() {
-        ComplexSearchQuery searchQuery = parser.parseQueryStringIntoComplexQuery("year-range:2012-2015").get();
-        ComplexSearchQuery expectedQuery = ComplexSearchQuery.builder().fromYearAndToYear(2012, 2015).build();
+        ComplexSearchQuery searchQuery =
+                parser.parseQueryStringIntoComplexQuery("year-range:2012-2015").get();
+        ComplexSearchQuery expectedQuery =
+                ComplexSearchQuery.builder().fromYearAndToYear(2012, 2015).build();
         assertEquals(expectedQuery, searchQuery);
     }
 
     @Test
     void convertMultipleValuesWithTheSameField() {
-        ComplexSearchQuery searchQuery = parser.parseQueryStringIntoComplexQuery("author:\"Igor Steinmacher\" author:\"Christoph Treude\"").get();
-        ComplexSearchQuery expectedQuery = ComplexSearchQuery.builder().author("\"Igor Steinmacher\"").author("\"Christoph Treude\"").build();
+        ComplexSearchQuery searchQuery =
+                parser.parseQueryStringIntoComplexQuery(
+                                "author:\"Igor Steinmacher\" author:\"Christoph Treude\"")
+                        .get();
+        ComplexSearchQuery expectedQuery =
+                ComplexSearchQuery.builder()
+                        .author("\"Igor Steinmacher\"")
+                        .author("\"Christoph Treude\"")
+                        .build();
         assertEquals(expectedQuery, searchQuery);
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
index f22e4fac9ef2..f57cfeeade32 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -1,10 +1,11 @@
 package org.jabref.logic.importer;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
+import io.github.classgraph.ClassGraph;
+import io.github.classgraph.ClassInfoList;
+import io.github.classgraph.ScanResult;
 
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.importer.fetcher.AbstractIsbnFetcher;
@@ -19,30 +20,31 @@
 import org.jabref.logic.importer.fetcher.isbntobibtex.EbookDeIsbnFetcher;
 import org.jabref.logic.importer.fetcher.isbntobibtex.OpenLibraryIsbnFetcher;
 import org.jabref.model.database.BibDatabaseContext;
-
-import io.github.classgraph.ClassGraph;
-import io.github.classgraph.ClassInfoList;
-import io.github.classgraph.ScanResult;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 class WebFetchersTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(WebFetchersTest.class);
 
-    private static final Set<String> IGNORED_INACCESSIBLE_FETCHERS = Set.of(
-            "org.jabref.logic.importer.fetcher.ArXivFetcher$ArXiv",
-            "org.jabref.logic.importer.FulltextFetchersTest$FulltextFetcherWithTrustLevel");
+    private static final Set<String> IGNORED_INACCESSIBLE_FETCHERS =
+            Set.of(
+                    "org.jabref.logic.importer.fetcher.ArXivFetcher$ArXiv",
+                    "org.jabref.logic.importer.FulltextFetchersTest$FulltextFetcherWithTrustLevel");
 
     private ImportFormatPreferences importFormatPreferences;
     private ImporterPreferences importerPreferences;
-    private final ClassGraph classGraph = new ClassGraph().enableAllInfo().acceptPackages("org.jabref");
+    private final ClassGraph classGraph =
+            new ClassGraph().enableAllInfo().acceptPackages("org.jabref");
 
     @BeforeEach
     void setUp() {
@@ -52,26 +54,32 @@ void setUp() {
 
     private Set<Class<?>> getIgnoredInaccessibleClasses() {
         return IGNORED_INACCESSIBLE_FETCHERS.stream()
-                     .map(className -> "" + className)
-                     .map(classPath -> {
-                         try {
-                             return Class.forName(classPath);
-                         } catch (ClassNotFoundException e) {
-                             LOGGER.error("Some of the ignored classes were not found", e);
-                             return null;
-                         }
-                     }).filter(Objects::nonNull).collect(Collectors.toSet());
+                .map(className -> "" + className)
+                .map(
+                        classPath -> {
+                            try {
+                                return Class.forName(classPath);
+                            } catch (ClassNotFoundException e) {
+                                LOGGER.error("Some of the ignored classes were not found", e);
+                                return null;
+                            }
+                        })
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
     }
 
     @Test
     void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() {
-        Set<IdBasedFetcher> idFetchers = WebFetchers.getIdBasedFetchers(importFormatPreferences, importerPreferences);
+        Set<IdBasedFetcher> idFetchers =
+                WebFetchers.getIdBasedFetchers(importFormatPreferences, importerPreferences);
 
         try (ScanResult scanResult = classGraph.scan()) {
-            ClassInfoList controlClasses = scanResult.getClassesImplementing(IdBasedFetcher.class.getCanonicalName());
+            ClassInfoList controlClasses =
+                    scanResult.getClassesImplementing(IdBasedFetcher.class.getCanonicalName());
             Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
 
-            // Some classes implement IdBasedFetcher, but are only accessible to other fetcher, so ignore them
+            // Some classes implement IdBasedFetcher, but are only accessible to other fetcher, so
+            // ignore them
             expected.removeAll(getIgnoredInaccessibleClasses());
 
             expected.remove(AbstractIsbnFetcher.class);
@@ -95,14 +103,16 @@ void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() {
 
     @Test
     void getEntryBasedFetchersReturnsAllFetcherDerivingFromEntryBasedFetcher() {
-        Set<EntryBasedFetcher> idFetchers = WebFetchers.getEntryBasedFetchers(
-                mock(ImporterPreferences.class),
-                importFormatPreferences,
-                mock(FilePreferences.class),
-                mock(BibDatabaseContext.class));
+        Set<EntryBasedFetcher> idFetchers =
+                WebFetchers.getEntryBasedFetchers(
+                        mock(ImporterPreferences.class),
+                        importFormatPreferences,
+                        mock(FilePreferences.class),
+                        mock(BibDatabaseContext.class));
 
         try (ScanResult scanResult = classGraph.scan()) {
-            ClassInfoList controlClasses = scanResult.getClassesImplementing(EntryBasedFetcher.class.getCanonicalName());
+            ClassInfoList controlClasses =
+                    scanResult.getClassesImplementing(EntryBasedFetcher.class.getCanonicalName());
             Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
 
             expected.remove(EntryBasedParserFetcher.class);
@@ -113,12 +123,15 @@ void getEntryBasedFetchersReturnsAllFetcherDerivingFromEntryBasedFetcher() {
 
     @Test
     void getSearchBasedFetchersReturnsAllFetcherDerivingFromSearchBasedFetcher() {
-        Set<SearchBasedFetcher> searchBasedFetchers = WebFetchers.getSearchBasedFetchers(importFormatPreferences, importerPreferences);
+        Set<SearchBasedFetcher> searchBasedFetchers =
+                WebFetchers.getSearchBasedFetchers(importFormatPreferences, importerPreferences);
         try (ScanResult scanResult = classGraph.scan()) {
-            ClassInfoList controlClasses = scanResult.getClassesImplementing(SearchBasedFetcher.class.getCanonicalName());
+            ClassInfoList controlClasses =
+                    scanResult.getClassesImplementing(SearchBasedFetcher.class.getCanonicalName());
             Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
 
-            // Some classes implement SearchBasedFetcher, but are only accessible to other fetcher, so ignore them
+            // Some classes implement SearchBasedFetcher, but are only accessible to other fetcher,
+            // so ignore them
             expected.removeAll(getIgnoredInaccessibleClasses());
 
             // Remove interfaces
@@ -141,13 +154,16 @@ void getSearchBasedFetchersReturnsAllFetcherDerivingFromSearchBasedFetcher() {
 
     @Test
     void getFullTextFetchersReturnsAllFetcherDerivingFromFullTextFetcher() {
-        Set<FulltextFetcher> fullTextFetchers = WebFetchers.getFullTextFetchers(importFormatPreferences, importerPreferences);
+        Set<FulltextFetcher> fullTextFetchers =
+                WebFetchers.getFullTextFetchers(importFormatPreferences, importerPreferences);
 
         try (ScanResult scanResult = classGraph.scan()) {
-            ClassInfoList controlClasses = scanResult.getClassesImplementing(FulltextFetcher.class.getCanonicalName());
+            ClassInfoList controlClasses =
+                    scanResult.getClassesImplementing(FulltextFetcher.class.getCanonicalName());
             Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
 
-            // Some classes implement FulltextFetcher, but are only accessible to other fetcher, so ignore them
+            // Some classes implement FulltextFetcher, but are only accessible to other fetcher, so
+            // ignore them
             expected.removeAll(getIgnoredInaccessibleClasses());
 
             // Remove the following, because they don't work atm
@@ -163,10 +179,12 @@ void getIdFetchersReturnsAllFetcherDerivingFromIdFetcher() {
         Set<IdFetcher<?>> idFetchers = WebFetchers.getIdFetchers(importFormatPreferences);
 
         try (ScanResult scanResult = classGraph.scan()) {
-            ClassInfoList controlClasses = scanResult.getClassesImplementing(IdFetcher.class.getCanonicalName());
+            ClassInfoList controlClasses =
+                    scanResult.getClassesImplementing(IdFetcher.class.getCanonicalName());
             Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
 
-            // Some classes implement IdFetcher, but are only accessible to other fetcher, so ignore them
+            // Some classes implement IdFetcher, but are only accessible to other fetcher, so ignore
+            // them
             expected.removeAll(getIgnoredInaccessibleClasses());
 
             expected.remove(IdParserFetcher.class);
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java
index d22c67491b86..ee07d5ed10c6 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java
@@ -1,26 +1,25 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.List;
-import java.util.Optional;
+import static org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer.NO_EXPLICIT_FIELD;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;
+import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser;
+import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.fileformat.ACMPortalParser;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
-import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;
-import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser;
-import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer.NO_EXPLICIT_FIELD;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 class ACMPortalFetcherTest {
@@ -33,26 +32,38 @@ void setUp() {
 
     @Test
     void searchByQueryFindsEntry() throws Exception {
-        BibEntry searchEntry = new BibEntry(StandardEntryType.Conference)
-                        .withField(StandardField.AUTHOR, "Olsson, Tobias and Ericsson, Morgan and Wingkvist, Anna")
+        BibEntry searchEntry =
+                new BibEntry(StandardEntryType.Conference)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Olsson, Tobias and Ericsson, Morgan and Wingkvist, Anna")
                         .withField(StandardField.YEAR, "2017")
                         .withField(StandardField.MONTH, "9")
                         .withField(StandardField.DAY, "11")
                         .withField(StandardField.SERIES, "ECSA '17")
-                        .withField(StandardField.BOOKTITLE, "Proceedings of the 11th European Conference on Software Architecture: Companion Proceedings")
+                        .withField(
+                                StandardField.BOOKTITLE,
+                                "Proceedings of the 11th European Conference on Software Architecture: Companion Proceedings")
                         .withField(StandardField.DOI, "10.1145/3129790.3129810")
                         .withField(StandardField.LOCATION, "Canterbury, United Kingdom")
                         .withField(StandardField.ISBN, "9781450352178")
-                        .withField(StandardField.KEYWORDS, "conformance checking, repository data mining, software architecture")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "conformance checking, repository data mining, software architecture")
                         .withField(StandardField.PUBLISHER, "Association for Computing Machinery")
                         .withField(StandardField.ADDRESS, "New York, NY, USA")
-                        .withField(StandardField.TITLE, "The relationship of code churn and architectural violations in the open source software JabRef")
+                        .withField(
+                                StandardField.TITLE,
+                                "The relationship of code churn and architectural violations in the open source software JabRef")
                         .withField(StandardField.URL, "https://doi.org/10.1145/3129790.3129810")
                         .withField(StandardField.PAGETOTAL, "7")
                         .withField(StandardField.PAGES, "152–158");
 
-        List<BibEntry> fetchedEntries = fetcher.performSearch("The relationship of code churn and architectural violations in the open source software JabRef");
-        // we clear the abstract due to copyright reasons (JabRef's code should not contain copyrighted abstracts)
+        List<BibEntry> fetchedEntries =
+                fetcher.performSearch(
+                        "The relationship of code churn and architectural violations in the open source software JabRef");
+        // we clear the abstract due to copyright reasons (JabRef's code should not contain
+        // copyrighted abstracts)
         for (BibEntry bibEntry : fetchedEntries) {
             bibEntry.clearField(StandardField.ABSTRACT);
         }
@@ -60,7 +71,11 @@ void searchByQueryFindsEntry() throws Exception {
     }
 
     @Test
-    void getURLForQuery() throws FetcherException, MalformedURLException, URISyntaxException, QueryNodeParseException {
+    void getURLForQuery()
+            throws FetcherException,
+                    MalformedURLException,
+                    URISyntaxException,
+                    QueryNodeParseException {
         String testQuery = "test query url";
         SyntaxParser parser = new StandardSyntaxParser();
         URL url = fetcher.getURLForQuery(parser.parse(testQuery, NO_EXPLICIT_FIELD));
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java
index 71344372b5f7..31ac201d9928 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.URI;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.importer.FulltextFetcher;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.support.DisabledOnCIServer;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.net.URI;
+import java.util.Optional;
 
 @FetcherTest
 class ACSTest {
@@ -23,9 +22,10 @@ void findByDOI() throws Exception {
         // DOI randomly chosen from https://pubs.acs.org/toc/acscii/0/0
         BibEntry entry = new BibEntry().withField(StandardField.DOI, "10.1021/acscentsci.4c00971");
         assertEquals(
-                Optional.of(URI.create("https://pubs.acs.org/doi/pdf/10.1021/acscentsci.4c00971").toURL()),
-                fetcher.findFullText(entry)
-        );
+                Optional.of(
+                        URI.create("https://pubs.acs.org/doi/pdf/10.1021/acscentsci.4c00971")
+                                .toURL()),
+                fetcher.findFullText(entry));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java
index 72ec4e01f18b..75e9a00d3f3b 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.Optional;
 
 @FetcherTest
 public abstract class AbstractIsbnFetcherTest {
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ApsFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ApsFetcherTest.java
index a18cd2f7ed21..d682f3d88b75 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ApsFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ApsFetcherTest.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.URI;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.net.URI;
+import java.util.Optional;
 
 @FetcherTest
 class ApsFetcherTest {
@@ -24,25 +23,39 @@ void setUp() {
 
     @Test
     void findFullTextFromDoi() throws Exception {
-        BibEntry entry = new BibEntry().withField(StandardField.DOI, "10.1103/PhysRevLett.116.061102");
-        assertEquals(Optional.of(URI.create("https://journals.aps.org/prl/pdf/10.1103/PhysRevLett.116.061102").toURL()), finder.findFullText(entry));
+        BibEntry entry =
+                new BibEntry().withField(StandardField.DOI, "10.1103/PhysRevLett.116.061102");
+        assertEquals(
+                Optional.of(
+                        URI.create(
+                                        "https://journals.aps.org/prl/pdf/10.1103/PhysRevLett.116.061102")
+                                .toURL()),
+                finder.findFullText(entry));
     }
 
     @Test
     void findFullTextFromLowercaseDoi() throws Exception {
-        BibEntry entry = new BibEntry().withField(StandardField.DOI, "10.1103/physrevlett.124.029002");
-        assertEquals(Optional.of(URI.create("https://journals.aps.org/prl/pdf/10.1103/PhysRevLett.124.029002").toURL()), finder.findFullText(entry));
+        BibEntry entry =
+                new BibEntry().withField(StandardField.DOI, "10.1103/physrevlett.124.029002");
+        assertEquals(
+                Optional.of(
+                        URI.create(
+                                        "https://journals.aps.org/prl/pdf/10.1103/PhysRevLett.124.029002")
+                                .toURL()),
+                finder.findFullText(entry));
     }
 
     @Test
     void notFindFullTextForUnauthorized() throws Exception {
-        BibEntry entry = new BibEntry().withField(StandardField.DOI, "10.1103/PhysRevLett.89.127401");
+        BibEntry entry =
+                new BibEntry().withField(StandardField.DOI, "10.1103/PhysRevLett.89.127401");
         assertEquals(Optional.empty(), finder.findFullText(entry));
     }
 
     @Test
     void notFindFullTextForUnknownEntry() throws Exception {
-        BibEntry entry = new BibEntry().withField(StandardField.DOI, "10.1016/j.aasri.2014.0559.002");
+        BibEntry entry =
+                new BibEntry().withField(StandardField.DOI, "10.1016/j.aasri.2014.0559.002");
         assertEquals(Optional.empty(), finder.findFullText(entry));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java
index 68e6ae9115f3..f7e606565493 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java
@@ -1,12 +1,11 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.StringJoiner;
-import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -24,7 +23,6 @@
 import org.jabref.model.entry.identifier.ArXivIdentifier;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
@@ -32,12 +30,13 @@
 import org.mockito.Answers;
 import org.mockito.Mockito;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.StringJoiner;
+import java.util.stream.Collectors;
 
 @FetcherTest
 class ArXivFetcherTest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
@@ -55,15 +54,17 @@ static void setUp() {
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         // Used during DOI fetch process
-        when(importFormatPreferences.fieldPreferences().getNonWrappableFields()).thenReturn(
-                FXCollections.observableArrayList(List.of(
-                        StandardField.PDF,
-                        StandardField.PS,
-                        StandardField.URL,
-                        StandardField.DOI,
-                        StandardField.FILE,
-                        StandardField.ISBN,
-                        StandardField.ISSN)));
+        when(importFormatPreferences.fieldPreferences().getNonWrappableFields())
+                .thenReturn(
+                        FXCollections.observableArrayList(
+                                List.of(
+                                        StandardField.PDF,
+                                        StandardField.PS,
+                                        StandardField.URL,
+                                        StandardField.DOI,
+                                        StandardField.FILE,
+                                        StandardField.ISBN,
+                                        StandardField.ISSN)));
     }
 
     @BeforeEach
@@ -72,55 +73,87 @@ void eachSetUp() {
         entry = new BibEntry();
 
         // A BibEntry with information only from ArXiv API
-        mainOriginalPaper = new BibEntry(StandardEntryType.Article)
-                // ArXiv-original fields
-                .withField(StandardField.AUTHOR, "Joeran Beel and Andrew Collins and Akiko Aizawa")
-                .withField(StandardField.TITLE, "The Architecture of Mr. DLib's Scientific Recommender-System API")
-                .withField(StandardField.DATE, "2018-11-26")
-                .withField(StandardField.ABSTRACT, "Recommender systems in academia are not widely available. This may be in part due to the difficulty and cost of developing and maintaining recommender systems. Many operators of academic products such as digital libraries and reference managers avoid this effort, although a recommender system could provide significant benefits to their users. In this paper, we introduce Mr. DLib's \"Recommendations as-a-Service\" (RaaS) API that allows operators of academic products to easily integrate a scientific recommender system into their products. Mr. DLib generates recommendations for research articles but in the future, recommendations may include call for papers, grants, etc. Operators of academic products can request recommendations from Mr. DLib and display these recommendations to their users. Mr. DLib can be integrated in just a few hours or days; creating an equivalent recommender system from scratch would require several months for an academic operator. Mr. DLib has been used by GESIS Sowiport and by the reference manager JabRef. Mr. DLib is open source and its goal is to facilitate the application of, and research on, scientific recommender systems. In this paper, we present the motivation for Mr. DLib, the architecture and details about the effectiveness. Mr. DLib has delivered 94m recommendations over a span of two years with an average click-through rate of 0.12%.")
-                .withField(StandardField.EPRINT, "1811.10364")
-                .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1811.10364v1:PDF")
-                .withField(StandardField.EPRINTTYPE, "arXiv")
-                .withField(StandardField.EPRINTCLASS, "cs.IR")
-                .withField(StandardField.KEYWORDS, "cs.IR, cs.AI, cs.DL, cs.LG");
-
-        mainResultPaper = new BibEntry(StandardEntryType.Article)
-                // ArXiv-original fields
-//              .withField(StandardField.AUTHOR, "Joeran Beel and Andrew Collins and Akiko Aizawa")
-                .withField(StandardField.TITLE, "The Architecture of Mr. DLib's Scientific Recommender-System API")
-                .withField(StandardField.DATE, "2018-11-26")
-                .withField(StandardField.ABSTRACT, "Recommender systems in academia are not widely available. This may be in part due to the difficulty and cost of developing and maintaining recommender systems. Many operators of academic products such as digital libraries and reference managers avoid this effort, although a recommender system could provide significant benefits to their users. In this paper, we introduce Mr. DLib's \"Recommendations as-a-Service\" (RaaS) API that allows operators of academic products to easily integrate a scientific recommender system into their products. Mr. DLib generates recommendations for research articles but in the future, recommendations may include call for papers, grants, etc. Operators of academic products can request recommendations from Mr. DLib and display these recommendations to their users. Mr. DLib can be integrated in just a few hours or days; creating an equivalent recommender system from scratch would require several months for an academic operator. Mr. DLib has been used by GESIS Sowiport and by the reference manager JabRef. Mr. DLib is open source and its goal is to facilitate the application of, and research on, scientific recommender systems. In this paper, we present the motivation for Mr. DLib, the architecture and details about the effectiveness. Mr. DLib has delivered 94m recommendations over a span of two years with an average click-through rate of 0.12%.")
-                .withField(StandardField.EPRINT, "1811.10364")
-                .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1811.10364v1:PDF")
-                .withField(StandardField.EPRINTTYPE, "arXiv")
-                .withField(StandardField.EPRINTCLASS, "cs.IR")
-//              .withField(StandardField.KEYWORDS, "cs.IR, cs.AI, cs.DL, cs.LG")
-                // Unavailable info:
-                // StandardField.JOURNALTITLE // INFO NOT APPLICABLE TO THIS ENTRY
-                // ArXiv-issue DOI fields
-                .withField(new UnknownField("copyright"), "arXiv.org perpetual, non-exclusive license")
-                .withField((InternalField.KEY_FIELD), "https://doi.org/10.48550/arxiv.1811.10364")
-                .withField(StandardField.YEAR, "2018")
-                .withField(StandardField.KEYWORDS, "Information Retrieval (cs.IR), Artificial Intelligence (cs.AI), Digital Libraries (cs.DL), Machine Learning (cs.LG), FOS: Computer and information sciences")
-                .withField(StandardField.AUTHOR, "Beel, Joeran and Collins, Andrew and Aizawa, Akiko")
-                .withField(StandardField.PUBLISHER, "arXiv")
-                .withField(StandardField.DOI, "10.48550/ARXIV.1811.10364");
-
-        sliceTheoremPaper = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Diez, Tobias")
-                .withField(StandardField.TITLE, "Slice theorem for Fréchet group actions and covariant symplectic field theory")
-                .withField(StandardField.DATE, "2014-05-09")
-                .withField(StandardField.YEAR, "2014")
-                .withField(StandardField.PUBLISHER, "arXiv")
-                .withField(StandardField.ABSTRACT, "A general slice theorem for the action of a Fr\\'echet Lie group on a Fr\\'echet manifolds is established. The Nash-Moser theorem provides the fundamental tool to generalize the result of Palais to this infinite-dimensional setting. The presented slice theorem is illustrated by its application to gauge theories: the action of the gauge transformation group admits smooth slices at every point and thus the gauge orbit space is stratified by Fr\\'echet manifolds. Furthermore, a covariant and symplectic formulation of classical field theory is proposed and extensively discussed. At the root of this novel framework is the incorporation of field degrees of freedom F and spacetime M into the product manifold F * M. The induced bigrading of differential forms is used in order to carry over the usual symplectic theory to this new setting. The examples of the Klein-Gordon field and general Yang-Mills theory illustrate that the presented approach conveniently handles the occurring symmetries.")
-                .withField(StandardField.DOI, "10.48550/ARXIV.1405.2249")
-                .withField(StandardField.EPRINT, "1405.2249")
-                .withField(StandardField.EPRINTCLASS, "math-ph")
-                .withField(StandardField.EPRINTTYPE, "arXiv")
-                .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1405.2249v1:PDF")
-                .withField(StandardField.KEYWORDS, "Mathematical Physics (math-ph), Differential Geometry (math.DG), Symplectic Geometry (math.SG), FOS: Physical sciences, FOS: Mathematics, 58B99, 58Z05, 58B25, 22E65, 58D19, 53D20, 53D42")
-                .withField(InternalField.KEY_FIELD, "https://doi.org/10.48550/arxiv.1405.2249")
-                .withField(new UnknownField("copyright"), "arXiv.org perpetual, non-exclusive license");
+        mainOriginalPaper =
+                new BibEntry(StandardEntryType.Article)
+                        // ArXiv-original fields
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Joeran Beel and Andrew Collins and Akiko Aizawa")
+                        .withField(
+                                StandardField.TITLE,
+                                "The Architecture of Mr. DLib's Scientific Recommender-System API")
+                        .withField(StandardField.DATE, "2018-11-26")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Recommender systems in academia are not widely available. This may be in part due to the difficulty and cost of developing and maintaining recommender systems. Many operators of academic products such as digital libraries and reference managers avoid this effort, although a recommender system could provide significant benefits to their users. In this paper, we introduce Mr. DLib's \"Recommendations as-a-Service\" (RaaS) API that allows operators of academic products to easily integrate a scientific recommender system into their products. Mr. DLib generates recommendations for research articles but in the future, recommendations may include call for papers, grants, etc. Operators of academic products can request recommendations from Mr. DLib and display these recommendations to their users. Mr. DLib can be integrated in just a few hours or days; creating an equivalent recommender system from scratch would require several months for an academic operator. Mr. DLib has been used by GESIS Sowiport and by the reference manager JabRef. Mr. DLib is open source and its goal is to facilitate the application of, and research on, scientific recommender systems. In this paper, we present the motivation for Mr. DLib, the architecture and details about the effectiveness. Mr. DLib has delivered 94m recommendations over a span of two years with an average click-through rate of 0.12%.")
+                        .withField(StandardField.EPRINT, "1811.10364")
+                        .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1811.10364v1:PDF")
+                        .withField(StandardField.EPRINTTYPE, "arXiv")
+                        .withField(StandardField.EPRINTCLASS, "cs.IR")
+                        .withField(StandardField.KEYWORDS, "cs.IR, cs.AI, cs.DL, cs.LG");
+
+        mainResultPaper =
+                new BibEntry(StandardEntryType.Article)
+                        // ArXiv-original fields
+                        //              .withField(StandardField.AUTHOR, "Joeran Beel and Andrew
+                        // Collins and Akiko Aizawa")
+                        .withField(
+                                StandardField.TITLE,
+                                "The Architecture of Mr. DLib's Scientific Recommender-System API")
+                        .withField(StandardField.DATE, "2018-11-26")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Recommender systems in academia are not widely available. This may be in part due to the difficulty and cost of developing and maintaining recommender systems. Many operators of academic products such as digital libraries and reference managers avoid this effort, although a recommender system could provide significant benefits to their users. In this paper, we introduce Mr. DLib's \"Recommendations as-a-Service\" (RaaS) API that allows operators of academic products to easily integrate a scientific recommender system into their products. Mr. DLib generates recommendations for research articles but in the future, recommendations may include call for papers, grants, etc. Operators of academic products can request recommendations from Mr. DLib and display these recommendations to their users. Mr. DLib can be integrated in just a few hours or days; creating an equivalent recommender system from scratch would require several months for an academic operator. Mr. DLib has been used by GESIS Sowiport and by the reference manager JabRef. Mr. DLib is open source and its goal is to facilitate the application of, and research on, scientific recommender systems. In this paper, we present the motivation for Mr. DLib, the architecture and details about the effectiveness. Mr. DLib has delivered 94m recommendations over a span of two years with an average click-through rate of 0.12%.")
+                        .withField(StandardField.EPRINT, "1811.10364")
+                        .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1811.10364v1:PDF")
+                        .withField(StandardField.EPRINTTYPE, "arXiv")
+                        .withField(StandardField.EPRINTCLASS, "cs.IR")
+                        //              .withField(StandardField.KEYWORDS, "cs.IR, cs.AI, cs.DL,
+                        // cs.LG")
+                        // Unavailable info:
+                        // StandardField.JOURNALTITLE // INFO NOT APPLICABLE TO THIS ENTRY
+                        // ArXiv-issue DOI fields
+                        .withField(
+                                new UnknownField("copyright"),
+                                "arXiv.org perpetual, non-exclusive license")
+                        .withField(
+                                (InternalField.KEY_FIELD),
+                                "https://doi.org/10.48550/arxiv.1811.10364")
+                        .withField(StandardField.YEAR, "2018")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Information Retrieval (cs.IR), Artificial Intelligence (cs.AI), Digital Libraries (cs.DL), Machine Learning (cs.LG), FOS: Computer and information sciences")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Beel, Joeran and Collins, Andrew and Aizawa, Akiko")
+                        .withField(StandardField.PUBLISHER, "arXiv")
+                        .withField(StandardField.DOI, "10.48550/ARXIV.1811.10364");
+
+        sliceTheoremPaper =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Diez, Tobias")
+                        .withField(
+                                StandardField.TITLE,
+                                "Slice theorem for Fréchet group actions and covariant symplectic field theory")
+                        .withField(StandardField.DATE, "2014-05-09")
+                        .withField(StandardField.YEAR, "2014")
+                        .withField(StandardField.PUBLISHER, "arXiv")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "A general slice theorem for the action of a Fr\\'echet Lie group on a Fr\\'echet manifolds is established. The Nash-Moser theorem provides the fundamental tool to generalize the result of Palais to this infinite-dimensional setting. The presented slice theorem is illustrated by its application to gauge theories: the action of the gauge transformation group admits smooth slices at every point and thus the gauge orbit space is stratified by Fr\\'echet manifolds. Furthermore, a covariant and symplectic formulation of classical field theory is proposed and extensively discussed. At the root of this novel framework is the incorporation of field degrees of freedom F and spacetime M into the product manifold F * M. The induced bigrading of differential forms is used in order to carry over the usual symplectic theory to this new setting. The examples of the Klein-Gordon field and general Yang-Mills theory illustrate that the presented approach conveniently handles the occurring symmetries.")
+                        .withField(StandardField.DOI, "10.48550/ARXIV.1405.2249")
+                        .withField(StandardField.EPRINT, "1405.2249")
+                        .withField(StandardField.EPRINTCLASS, "math-ph")
+                        .withField(StandardField.EPRINTTYPE, "arXiv")
+                        .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1405.2249v1:PDF")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Mathematical Physics (math-ph), Differential Geometry (math.DG), Symplectic Geometry (math.SG), FOS: Physical sciences, FOS: Mathematics, 58B99, 58Z05, 58B25, 22E65, 58D19, 53D20, 53D42")
+                        .withField(
+                                InternalField.KEY_FIELD, "https://doi.org/10.48550/arxiv.1405.2249")
+                        .withField(
+                                new UnknownField("copyright"),
+                                "arXiv.org perpetual, non-exclusive license");
     }
 
     @Override
@@ -129,14 +162,16 @@ public SearchBasedFetcher getFetcher() {
     }
 
     public List<String> getInputTestAuthors() {
-        return Arrays.stream(mainOriginalPaper.getField(StandardField.AUTHOR).get()
-                                              .split("and")).map(String::trim).collect(Collectors.toList());
+        return Arrays.stream(mainOriginalPaper.getField(StandardField.AUTHOR).get().split("and"))
+                .map(String::trim)
+                .collect(Collectors.toList());
     }
 
     @Override
     public List<String> getTestAuthors() {
-        return Arrays.stream(mainResultPaper.getField(StandardField.AUTHOR).get()
-                                            .split("and")).map(String::trim).collect(Collectors.toList());
+        return Arrays.stream(mainResultPaper.getField(StandardField.AUTHOR).get().split("and"))
+                .map(String::trim)
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -158,16 +193,23 @@ public void supportsAuthorSearch() throws FetcherException {
         List<BibEntry> result = getFetcher().performSearch(queryBuilder.toString());
 
         FieldPreferences fieldPreferences = mock(FieldPreferences.class);
-        when(fieldPreferences.getNonWrappableFields()).thenReturn(FXCollections.observableArrayList());
+        when(fieldPreferences.getNonWrappableFields())
+                .thenReturn(FXCollections.observableArrayList());
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX, fieldPreferences).doPostCleanup(result);
 
         assertFalse(result.isEmpty());
-        result.forEach(bibEntry -> {
-            String author = bibEntry.getField(StandardField.AUTHOR).orElse("");
+        result.forEach(
+                bibEntry -> {
+                    String author = bibEntry.getField(StandardField.AUTHOR).orElse("");
 
-            // The co-authors differ, thus we check for the author present at all papers
-            getTestAuthors().forEach(expectedAuthor -> assertTrue(author.contains(expectedAuthor.replace("\"", ""))));
-        });
+                    // The co-authors differ, thus we check for the author present at all papers
+                    getTestAuthors()
+                            .forEach(
+                                    expectedAuthor ->
+                                            assertTrue(
+                                                    author.contains(
+                                                            expectedAuthor.replace("\"", ""))));
+                });
     }
 
     @Test
@@ -177,7 +219,8 @@ void noSupportsAuthorSearchWithLastFirstName() throws FetcherException {
 
         List<BibEntry> result = getFetcher().performSearch(queryBuilder.toString());
         FieldPreferences fieldPreferences = mock(FieldPreferences.class);
-        when(fieldPreferences.getNonWrappableFields()).thenReturn(FXCollections.observableArrayList());
+        when(fieldPreferences.getNonWrappableFields())
+                .thenReturn(FXCollections.observableArrayList());
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX, fieldPreferences).doPostCleanup(result);
 
         assertEquals(List.of(), result);
@@ -198,19 +241,25 @@ void findFullTextByDOI() throws IOException {
         entry.setField(StandardField.DOI, "10.1529/biophysj.104.047340");
         entry.setField(StandardField.TITLE, "Pause Point Spectra in DNA Constant-Force Unzipping");
 
-        assertEquals(Optional.of(URI.create("http://arxiv.org/pdf/cond-mat/0406246v1").toURL()), fetcher.findFullText(entry));
+        assertEquals(
+                Optional.of(URI.create("http://arxiv.org/pdf/cond-mat/0406246v1").toURL()),
+                fetcher.findFullText(entry));
     }
 
     @Test
     void findFullTextByEprint() throws IOException {
         entry.setField(StandardField.EPRINT, "1603.06570");
-        assertEquals(Optional.of(URI.create("http://arxiv.org/pdf/1603.06570v1").toURL()), fetcher.findFullText(entry));
+        assertEquals(
+                Optional.of(URI.create("http://arxiv.org/pdf/1603.06570v1").toURL()),
+                fetcher.findFullText(entry));
     }
 
     @Test
     void findFullTextByEprintWithPrefix() throws IOException {
         entry.setField(StandardField.EPRINT, "arXiv:1603.06570");
-        assertEquals(Optional.of(URI.create("http://arxiv.org/pdf/1603.06570v1").toURL()), fetcher.findFullText(entry));
+        assertEquals(
+                Optional.of(URI.create("http://arxiv.org/pdf/1603.06570v1").toURL()),
+                fetcher.findFullText(entry));
     }
 
     @Test
@@ -218,37 +267,53 @@ void findFullTextByEprintWithUnknownDOI() throws IOException {
         entry.setField(StandardField.DOI, "10.1529/unknown");
         entry.setField(StandardField.EPRINT, "1603.06570");
 
-        assertEquals(Optional.of(URI.create("http://arxiv.org/pdf/1603.06570v1").toURL()), fetcher.findFullText(entry));
+        assertEquals(
+                Optional.of(URI.create("http://arxiv.org/pdf/1603.06570v1").toURL()),
+                fetcher.findFullText(entry));
     }
 
     @Test
     void findFullTextByTitle() throws IOException {
         entry.setField(StandardField.TITLE, "Pause Point Spectra in DNA Constant-Force Unzipping");
 
-        assertEquals(Optional.of(URI.create("http://arxiv.org/pdf/cond-mat/0406246v1").toURL()), fetcher.findFullText(entry));
+        assertEquals(
+                Optional.of(URI.create("http://arxiv.org/pdf/cond-mat/0406246v1").toURL()),
+                fetcher.findFullText(entry));
     }
 
     @Test
     void findFullTextByTitleWithCurlyBracket() throws IOException {
-        entry.setField(StandardField.TITLE, "Machine versus {Human} {Attention} in {Deep} {Reinforcement} {Learning} {Tasks}");
+        entry.setField(
+                StandardField.TITLE,
+                "Machine versus {Human} {Attention} in {Deep} {Reinforcement} {Learning} {Tasks}");
 
-        assertEquals(Optional.of(URI.create("http://arxiv.org/pdf/2010.15942v3").toURL()), fetcher.findFullText(entry));
+        assertEquals(
+                Optional.of(URI.create("http://arxiv.org/pdf/2010.15942v3").toURL()),
+                fetcher.findFullText(entry));
     }
 
     @Test
     void findFullTextByTitleWithColonAndJournalWithoutEprint() throws IOException {
-        entry.setField(StandardField.TITLE, "Bayes-TrEx: a Bayesian Sampling Approach to Model Transparency by Example");
+        entry.setField(
+                StandardField.TITLE,
+                "Bayes-TrEx: a Bayesian Sampling Approach to Model Transparency by Example");
         entry.setField(StandardField.JOURNAL, "arXiv:2002.10248v4 [cs]");
 
-        assertEquals(Optional.of(URI.create("http://arxiv.org/pdf/2002.10248v4").toURL()), fetcher.findFullText(entry));
+        assertEquals(
+                Optional.of(URI.create("http://arxiv.org/pdf/2002.10248v4").toURL()),
+                fetcher.findFullText(entry));
     }
 
     @Test
     void findFullTextByTitleWithColonAndUrlWithoutEprint() throws IOException {
-        entry.setField(StandardField.TITLE, "Bayes-TrEx: a Bayesian Sampling Approach to Model Transparency by Example");
+        entry.setField(
+                StandardField.TITLE,
+                "Bayes-TrEx: a Bayesian Sampling Approach to Model Transparency by Example");
         entry.setField(StandardField.URL, "http://arxiv.org/abs/2002.10248v4");
 
-        assertEquals(Optional.of(URI.create("http://arxiv.org/pdf/2002.10248v4").toURL()), fetcher.findFullText(entry));
+        assertEquals(
+                Optional.of(URI.create("http://arxiv.org/pdf/2002.10248v4").toURL()),
+                fetcher.findFullText(entry));
     }
 
     @Test
@@ -256,15 +321,21 @@ void findFullTextByTitleAndPartOfAuthor() throws IOException {
         entry.setField(StandardField.TITLE, "Pause Point Spectra in DNA Constant-Force Unzipping");
         entry.setField(StandardField.AUTHOR, "Weeks and Lucks");
 
-        assertEquals(Optional.of(URI.create("http://arxiv.org/pdf/cond-mat/0406246v1").toURL()), fetcher.findFullText(entry));
+        assertEquals(
+                Optional.of(URI.create("http://arxiv.org/pdf/cond-mat/0406246v1").toURL()),
+                fetcher.findFullText(entry));
     }
 
     @Test
     void findFullTextByTitleWithCurlyBracketAndPartOfAuthor() throws IOException {
-        entry.setField(StandardField.TITLE, "Machine versus {Human} {Attention} in {Deep} {Reinforcement} {Learning} {Tasks}");
+        entry.setField(
+                StandardField.TITLE,
+                "Machine versus {Human} {Attention} in {Deep} {Reinforcement} {Learning} {Tasks}");
         entry.setField(StandardField.AUTHOR, "Zhang, Ruohan and Guo");
 
-        assertEquals(Optional.of(URI.create("http://arxiv.org/pdf/2010.15942v3").toURL()), fetcher.findFullText(entry));
+        assertEquals(
+                Optional.of(URI.create("http://arxiv.org/pdf/2010.15942v3").toURL()),
+                fetcher.findFullText(entry));
     }
 
     @Test
@@ -299,39 +370,52 @@ void findFullTextTrustLevel() {
 
     @Test
     void searchEntryByPartOfTitle() throws Exception {
-        assertEquals(List.of(mainResultPaper),
+        assertEquals(
+                List.of(mainResultPaper),
                 fetcher.performSearch("title:\"the architecture of mr. dLib's\""));
     }
 
     @Test
     void searchEntryByPartOfTitleWithAcuteAccent() throws Exception {
-        assertEquals(List.of(sliceTheoremPaper),
+        assertEquals(
+                List.of(sliceTheoremPaper),
                 fetcher.performSearch("title:\"slice theorem for Fréchet\""));
     }
 
     @Test
     void searchEntryByOldId() throws Exception {
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "{H1 Collaboration}")
-                .withField(StandardField.TITLE, "Multi-Electron Production at High Transverse Momenta in ep Collisions at HERA")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.VOLUME, "31")
-                .withField(StandardField.PAGES, "17--29")
-                .withField(StandardField.DATE, "2003-07-07")
-                .withField(StandardField.YEAR, "2003")
-                .withField(StandardField.MONTH, "#oct#")
-                .withField(StandardField.ISSN, "1434-6052")
-                .withField(StandardField.ABSTRACT, "Multi-electron production is studied at high electron transverse momentum in positron- and electron-proton collisions using the H1 detector at HERA. The data correspond to an integrated luminosity of 115 pb-1. Di-electron and tri-electron event yields are measured. Cross sections are derived in a restricted phase space region dominated by photon-photon collisions. In general good agreement is found with the Standard Model predictions. However, for electron pair invariant masses above 100 GeV, three di-electron events and three tri-electron events are observed, compared to Standard Model expectations of 0.30 \\pm 0.04 and 0.23 \\pm 0.04, respectively.")
-                .withField(StandardField.PUBLISHER, "Springer Science and Business Media LLC")
-                .withField(StandardField.EPRINT, "hep-ex/0307015")
-                .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/hep-ex/0307015v1:PDF")
-                .withField(StandardField.EPRINTTYPE, "arXiv")
-                .withField(StandardField.EPRINTCLASS, "hep-ex")
-                .withField(StandardField.KEYWORDS, "High Energy Physics - Experiment (hep-ex), FOS: Physical sciences")
-                .withField(StandardField.DOI, "10.1140/epjc/s2003-01326-x")
-                .withField(StandardField.JOURNAL, "Eur.Phys.J.C31:17-29,2003")
-                .withField(InternalField.KEY_FIELD, "2003")
-                .withField(new UnknownField("copyright"), "Assumed arXiv.org perpetual, non-exclusive license to distribute this article for submissions made before January 2004");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "{H1 Collaboration}")
+                        .withField(
+                                StandardField.TITLE,
+                                "Multi-Electron Production at High Transverse Momenta in ep Collisions at HERA")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.VOLUME, "31")
+                        .withField(StandardField.PAGES, "17--29")
+                        .withField(StandardField.DATE, "2003-07-07")
+                        .withField(StandardField.YEAR, "2003")
+                        .withField(StandardField.MONTH, "#oct#")
+                        .withField(StandardField.ISSN, "1434-6052")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Multi-electron production is studied at high electron transverse momentum in positron- and electron-proton collisions using the H1 detector at HERA. The data correspond to an integrated luminosity of 115 pb-1. Di-electron and tri-electron event yields are measured. Cross sections are derived in a restricted phase space region dominated by photon-photon collisions. In general good agreement is found with the Standard Model predictions. However, for electron pair invariant masses above 100 GeV, three di-electron events and three tri-electron events are observed, compared to Standard Model expectations of 0.30 \\pm 0.04 and 0.23 \\pm 0.04, respectively.")
+                        .withField(
+                                StandardField.PUBLISHER, "Springer Science and Business Media LLC")
+                        .withField(StandardField.EPRINT, "hep-ex/0307015")
+                        .withField(
+                                StandardField.FILE, ":http\\://arxiv.org/pdf/hep-ex/0307015v1:PDF")
+                        .withField(StandardField.EPRINTTYPE, "arXiv")
+                        .withField(StandardField.EPRINTCLASS, "hep-ex")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "High Energy Physics - Experiment (hep-ex), FOS: Physical sciences")
+                        .withField(StandardField.DOI, "10.1140/epjc/s2003-01326-x")
+                        .withField(StandardField.JOURNAL, "Eur.Phys.J.C31:17-29,2003")
+                        .withField(InternalField.KEY_FIELD, "2003")
+                        .withField(
+                                new UnknownField("copyright"),
+                                "Assumed arXiv.org perpetual, non-exclusive license to distribute this article for submissions made before January 2004");
 
         assertEquals(Optional.of(expected), fetcher.performSearchById("hep-ex/0307015"));
     }
@@ -353,14 +437,17 @@ void searchEntryByIdWith4DigitsAndPrefix() throws Exception {
 
     @Test
     void searchEntryByIdWith4DigitsAndPrefixAndNotTrimmed() throws Exception {
-        assertEquals(Optional.of(sliceTheoremPaper), fetcher.performSearchById("arXiv : 1405. 2249"));
+        assertEquals(
+                Optional.of(sliceTheoremPaper), fetcher.performSearchById("arXiv : 1405. 2249"));
     }
 
     @Test
     void searchEntryByIdWith5Digits() throws Exception {
-        assertEquals(Optional.of(
-                "An Optimal Convergence Theorem for Mean Curvature Flow of Arbitrary Codimension in Hyperbolic Spaces"),
-                fetcher.performSearchById("1503.06747").flatMap(entry -> entry.getField(StandardField.TITLE)));
+        assertEquals(
+                Optional.of(
+                        "An Optimal Convergence Theorem for Mean Curvature Flow of Arbitrary Codimension in Hyperbolic Spaces"),
+                fetcher.performSearchById("1503.06747")
+                        .flatMap(entry -> entry.getField(StandardField.TITLE)));
     }
 
     @Test
@@ -382,30 +469,34 @@ void searchEmptyId() throws Exception {
 
     @Test
     void searchWithHttpUrl() throws Exception {
-        assertEquals(Optional.of(sliceTheoremPaper), fetcher.performSearchById("http://arxiv.org/abs/1405.2249"));
+        assertEquals(
+                Optional.of(sliceTheoremPaper),
+                fetcher.performSearchById("http://arxiv.org/abs/1405.2249"));
     }
 
     @Test
     void searchWithHttpsUrl() throws Exception {
-        assertEquals(Optional.of(sliceTheoremPaper), fetcher.performSearchById("https://arxiv.org/abs/1405.2249"));
+        assertEquals(
+                Optional.of(sliceTheoremPaper),
+                fetcher.performSearchById("https://arxiv.org/abs/1405.2249"));
     }
 
     @Test
     void searchWithHttpsUrlNotTrimmed() throws Exception {
-        assertEquals(Optional.of(sliceTheoremPaper), fetcher.performSearchById("https : // arxiv . org / abs / 1405 . 2249 "));
+        assertEquals(
+                Optional.of(sliceTheoremPaper),
+                fetcher.performSearchById("https : // arxiv . org / abs / 1405 . 2249 "));
     }
 
     @Disabled("Is not supported by the current API")
     @Test
     @Override
-    public void supportsYearSearch() throws Exception {
-    }
+    public void supportsYearSearch() throws Exception {}
 
     @Disabled("Is not supported by the current API")
     @Test
     @Override
-    public void supportsYearRangeSearch() throws Exception {
-    }
+    public void supportsYearRangeSearch() throws Exception {}
 
     /**
      * A phrase is a sequence of terms wrapped in quotes.
@@ -413,8 +504,10 @@ public void supportsYearRangeSearch() throws Exception {
      */
     @Test
     void supportsPhraseSearch() throws Exception {
-        List<BibEntry> resultWithPhraseSearch = fetcher.performSearch("title:\"Taxonomy of Distributed\"");
-        List<BibEntry> resultWithOutPhraseSearch = fetcher.performSearch("title:Taxonomy AND title:of AND title:Distributed");
+        List<BibEntry> resultWithPhraseSearch =
+                fetcher.performSearch("title:\"Taxonomy of Distributed\"");
+        List<BibEntry> resultWithOutPhraseSearch =
+                fetcher.performSearch("title:Taxonomy AND title:of AND title:Distributed");
         // Phrase search result has to be subset of the default search result
         assertTrue(resultWithOutPhraseSearch.containsAll(resultWithPhraseSearch));
     }
@@ -425,54 +518,81 @@ void supportsPhraseSearch() throws Exception {
      */
     @Test
     void supportsPhraseSearchAndMatchesExact() throws Exception {
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Rafrastara, Fauzi Adi and Deyu, Qi")
-                .withField(StandardField.TITLE, "A Survey and Taxonomy of Distributed Data Mining Research Studies: A Systematic Literature Review")
-                .withField(StandardField.DATE, "2020-09-14")
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.PUBLISHER, "arXiv")
-                .withField(StandardField.ABSTRACT, "Context: Data Mining (DM) method has been evolving year by year and as of today there is also the enhancement of DM technique that can be run several times faster than the traditional one, called Distributed Data Mining (DDM). It is not a new field in data processing actually, but in the recent years many researchers have been paying more attention on this area. Problems: The number of publication regarding DDM in high reputation journals and conferences has increased significantly. It makes difficult for researchers to gain a comprehensive view of DDM that require further research. Solution: We conducted a systematic literature review to map the previous research in DDM field. Our objective is to provide the motivation for new research by identifying the gap in DDM field as well as the hot area itself. Result: Our analysis came up with some conclusions by answering 7 research questions proposed in this literature review. In addition, the taxonomy of DDM research area is presented in this paper. Finally, this systematic literature review provides the statistic of development of DDM since 2000 to 2015, in which this will help the future researchers to have a comprehensive overview of current situation of DDM.")
-                .withField(StandardField.EPRINT, "2009.10618")
-                .withField(StandardField.DOI, "10.48550/ARXIV.2009.10618")
-                .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/2009.10618v1:PDF")
-                .withField(StandardField.EPRINTTYPE, "arXiv")
-                .withField(StandardField.EPRINTCLASS, "cs.DC")
-                .withField(StandardField.KEYWORDS, "Distributed / Parallel / Cluster Computing (cs.DC), Machine Learning (cs.LG), FOS: Computer and information sciences")
-                .withField(InternalField.KEY_FIELD, "https://doi.org/10.48550/arxiv.2009.10618")
-                .withField(new UnknownField("copyright"), "arXiv.org perpetual, non-exclusive license");
-
-        List<BibEntry> resultWithPhraseSearch = fetcher.performSearch("title:\"Taxonomy of Distributed\"");
-
-        // There is only a single paper found by searching that contains the exact sequence "Taxonomy of Distributed" in the title.
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Rafrastara, Fauzi Adi and Deyu, Qi")
+                        .withField(
+                                StandardField.TITLE,
+                                "A Survey and Taxonomy of Distributed Data Mining Research Studies: A Systematic Literature Review")
+                        .withField(StandardField.DATE, "2020-09-14")
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.PUBLISHER, "arXiv")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Context: Data Mining (DM) method has been evolving year by year and as of today there is also the enhancement of DM technique that can be run several times faster than the traditional one, called Distributed Data Mining (DDM). It is not a new field in data processing actually, but in the recent years many researchers have been paying more attention on this area. Problems: The number of publication regarding DDM in high reputation journals and conferences has increased significantly. It makes difficult for researchers to gain a comprehensive view of DDM that require further research. Solution: We conducted a systematic literature review to map the previous research in DDM field. Our objective is to provide the motivation for new research by identifying the gap in DDM field as well as the hot area itself. Result: Our analysis came up with some conclusions by answering 7 research questions proposed in this literature review. In addition, the taxonomy of DDM research area is presented in this paper. Finally, this systematic literature review provides the statistic of development of DDM since 2000 to 2015, in which this will help the future researchers to have a comprehensive overview of current situation of DDM.")
+                        .withField(StandardField.EPRINT, "2009.10618")
+                        .withField(StandardField.DOI, "10.48550/ARXIV.2009.10618")
+                        .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/2009.10618v1:PDF")
+                        .withField(StandardField.EPRINTTYPE, "arXiv")
+                        .withField(StandardField.EPRINTCLASS, "cs.DC")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Distributed / Parallel / Cluster Computing (cs.DC), Machine Learning (cs.LG), FOS: Computer and information sciences")
+                        .withField(
+                                InternalField.KEY_FIELD,
+                                "https://doi.org/10.48550/arxiv.2009.10618")
+                        .withField(
+                                new UnknownField("copyright"),
+                                "arXiv.org perpetual, non-exclusive license");
+
+        List<BibEntry> resultWithPhraseSearch =
+                fetcher.performSearch("title:\"Taxonomy of Distributed\"");
+
+        // There is only a single paper found by searching that contains the exact sequence
+        // "Taxonomy of Distributed" in the title.
         assertEquals(List.of(expected), resultWithPhraseSearch);
     }
 
     @Test
     void supportsBooleanANDSearch() throws Exception {
-        // Example of a robust result, with information from both ArXiv-assigned and user-assigned DOIs
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Büscher, Tobias and Diez, Angel L. and Gompper, Gerhard and Elgeti, Jens")
-                .withField(StandardField.TITLE, "Instability and fingering of interfaces in growing tissue")
-                .withField(StandardField.DATE, "2020-03-10")
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.MONTH, "#aug#")
-                .withField(StandardField.NUMBER, "8")
-                .withField(StandardField.VOLUME, "22")
-                .withField(StandardField.ISSN, "1367-2630")
-                .withField(StandardField.PAGES, "083005")
-                .withField(StandardField.PUBLISHER, "IOP Publishing")
-                .withField(StandardField.JOURNAL, "New J. Phys., 22, 083005 (2020)")
-                .withField(StandardField.ABSTRACT, "Interfaces in tissues are ubiquitous, both between tissue and environment as well as between populations of different cell types. The propagation of an interface can be driven mechanically. % e.g. by a difference in the respective homeostatic stress of the different cell types. Computer simulations of growing tissues are employed to study the stability of the interface between two tissues on a substrate. From a mechanical perspective, the dynamics and stability of this system is controlled mainly by four parameters of the respective tissues: (i) the homeostatic stress (ii) cell motility (iii) tissue viscosity and (iv) substrate friction. For propagation driven by a difference in homeostatic stress, the interface is stable for tissue-specific substrate friction even for very large differences of homeostatic stress; however, it becomes unstable above a critical stress difference when the tissue with the larger homeostatic stress has a higher viscosity. A small difference in directed bulk motility between the two tissues suffices to result in propagation with a stable interface, even for otherwise identical tissues. Larger differences in motility force, however, result in a finite-wavelength instability of the interface. Interestingly, the instability is apparently bound by nonlinear effects and the amplitude of the interface undulations only grows to a finite value in time.")
-                .withField(StandardField.DOI, "10.1088/1367-2630/ab9e88")
-                .withField(StandardField.EPRINT, "2003.04601")
-                .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/2003.04601v1:PDF")
-                .withField(StandardField.EPRINTTYPE, "arXiv")
-                .withField(StandardField.EPRINTCLASS, "q-bio.TO")
-                .withField(StandardField.KEYWORDS, "Tissues and Organs (q-bio.TO), FOS: Biological sciences")
-                .withField(InternalField.KEY_FIELD, "B_scher_2020")
-                .withField(new UnknownField("copyright"), "arXiv.org perpetual, non-exclusive license");
-
-        List<BibEntry> result = fetcher.performSearch("author:\"Tobias Büscher\" AND title:\"Instability and fingering of interfaces\"");
+        // Example of a robust result, with information from both ArXiv-assigned and user-assigned
+        // DOIs
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Büscher, Tobias and Diez, Angel L. and Gompper, Gerhard and Elgeti, Jens")
+                        .withField(
+                                StandardField.TITLE,
+                                "Instability and fingering of interfaces in growing tissue")
+                        .withField(StandardField.DATE, "2020-03-10")
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.MONTH, "#aug#")
+                        .withField(StandardField.NUMBER, "8")
+                        .withField(StandardField.VOLUME, "22")
+                        .withField(StandardField.ISSN, "1367-2630")
+                        .withField(StandardField.PAGES, "083005")
+                        .withField(StandardField.PUBLISHER, "IOP Publishing")
+                        .withField(StandardField.JOURNAL, "New J. Phys., 22, 083005 (2020)")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Interfaces in tissues are ubiquitous, both between tissue and environment as well as between populations of different cell types. The propagation of an interface can be driven mechanically. % e.g. by a difference in the respective homeostatic stress of the different cell types. Computer simulations of growing tissues are employed to study the stability of the interface between two tissues on a substrate. From a mechanical perspective, the dynamics and stability of this system is controlled mainly by four parameters of the respective tissues: (i) the homeostatic stress (ii) cell motility (iii) tissue viscosity and (iv) substrate friction. For propagation driven by a difference in homeostatic stress, the interface is stable for tissue-specific substrate friction even for very large differences of homeostatic stress; however, it becomes unstable above a critical stress difference when the tissue with the larger homeostatic stress has a higher viscosity. A small difference in directed bulk motility between the two tissues suffices to result in propagation with a stable interface, even for otherwise identical tissues. Larger differences in motility force, however, result in a finite-wavelength instability of the interface. Interestingly, the instability is apparently bound by nonlinear effects and the amplitude of the interface undulations only grows to a finite value in time.")
+                        .withField(StandardField.DOI, "10.1088/1367-2630/ab9e88")
+                        .withField(StandardField.EPRINT, "2003.04601")
+                        .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/2003.04601v1:PDF")
+                        .withField(StandardField.EPRINTTYPE, "arXiv")
+                        .withField(StandardField.EPRINTCLASS, "q-bio.TO")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Tissues and Organs (q-bio.TO), FOS: Biological sciences")
+                        .withField(InternalField.KEY_FIELD, "B_scher_2020")
+                        .withField(
+                                new UnknownField("copyright"),
+                                "arXiv.org perpetual, non-exclusive license");
+
+        List<BibEntry> result =
+                fetcher.performSearch(
+                        "author:\"Tobias Büscher\" AND title:\"Instability and fingering of interfaces\"");
 
         // There is only one paper authored by Tobias Büscher with that phrase in the title
         assertEquals(List.of(expected), result);
@@ -480,106 +600,160 @@ void supportsBooleanANDSearch() throws Exception {
 
     @Test
     void retrievePureArxivEntryWhenAllDOIFetchingFails() throws FetcherException {
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Hai Zheng and Po-Yi Ho and Meiling Jiang and Bin Tang and Weirong Liu and Dengjin Li and Xuefeng Yu and Nancy E. Kleckner and Ariel Amir and Chenli Liu")
-                .withField(StandardField.TITLE, "Interrogating the Escherichia coli cell cycle by cell dimension perturbations")
-                .withField(StandardField.DATE, "2017-01-03")
-                .withField(StandardField.JOURNAL, "PNAS December 27, 2016 vol. 113 no. 52 15000-15005")
-                .withField(StandardField.ABSTRACT, "Bacteria tightly regulate and coordinate the various events in their cell cycles to duplicate themselves accurately and to control their cell sizes. Growth of Escherichia coli, in particular, follows a relation known as Schaechter 's growth law. This law says that the average cell volume scales exponentially with growth rate, with a scaling exponent equal to the time from initiation of a round of DNA replication to the cell division at which the corresponding sister chromosomes segregate. Here, we sought to test the robustness of the growth law to systematic perturbations in cell dimensions achieved by varying the expression levels of mreB and ftsZ. We found that decreasing the mreB level resulted in increased cell width, with little change in cell length, whereas decreasing the ftsZ level resulted in increased cell length. Furthermore, the time from replication termination to cell division increased with the perturbed dimension in both cases. Moreover, the growth law remained valid over a range of growth conditions and dimension perturbations. The growth law can be quantitatively interpreted as a consequence of a tight coupling of cell division to replication initiation. Thus, its robustness to perturbations in cell dimensions strongly supports models in which the timing of replication initiation governs that of cell division, and cell volume is the key phenomenological variable governing the timing of replication initiation. These conclusions are discussed in the context of our recently proposed adder-per-origin model, in which cells add a constant volume per origin between initiations and divide a constant time after initiation.")
-                .withField(StandardField.DOI, "10.1073/pnas.1617932114")
-                .withField(StandardField.EPRINT, "1701.00587")
-                .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1701.00587v1:PDF")
-                .withField(StandardField.EPRINTTYPE, "arXiv")
-                .withField(StandardField.EPRINTCLASS, "q-bio.CB")
-                .withField(StandardField.KEYWORDS, "q-bio.CB");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Hai Zheng and Po-Yi Ho and Meiling Jiang and Bin Tang and Weirong Liu and Dengjin Li and Xuefeng Yu and Nancy E. Kleckner and Ariel Amir and Chenli Liu")
+                        .withField(
+                                StandardField.TITLE,
+                                "Interrogating the Escherichia coli cell cycle by cell dimension perturbations")
+                        .withField(StandardField.DATE, "2017-01-03")
+                        .withField(
+                                StandardField.JOURNAL,
+                                "PNAS December 27, 2016 vol. 113 no. 52 15000-15005")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Bacteria tightly regulate and coordinate the various events in their cell cycles to duplicate themselves accurately and to control their cell sizes. Growth of Escherichia coli, in particular, follows a relation known as Schaechter 's growth law. This law says that the average cell volume scales exponentially with growth rate, with a scaling exponent equal to the time from initiation of a round of DNA replication to the cell division at which the corresponding sister chromosomes segregate. Here, we sought to test the robustness of the growth law to systematic perturbations in cell dimensions achieved by varying the expression levels of mreB and ftsZ. We found that decreasing the mreB level resulted in increased cell width, with little change in cell length, whereas decreasing the ftsZ level resulted in increased cell length. Furthermore, the time from replication termination to cell division increased with the perturbed dimension in both cases. Moreover, the growth law remained valid over a range of growth conditions and dimension perturbations. The growth law can be quantitatively interpreted as a consequence of a tight coupling of cell division to replication initiation. Thus, its robustness to perturbations in cell dimensions strongly supports models in which the timing of replication initiation governs that of cell division, and cell volume is the key phenomenological variable governing the timing of replication initiation. These conclusions are discussed in the context of our recently proposed adder-per-origin model, in which cells add a constant volume per origin between initiations and divide a constant time after initiation.")
+                        .withField(StandardField.DOI, "10.1073/pnas.1617932114")
+                        .withField(StandardField.EPRINT, "1701.00587")
+                        .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1701.00587v1:PDF")
+                        .withField(StandardField.EPRINTTYPE, "arXiv")
+                        .withField(StandardField.EPRINTCLASS, "q-bio.CB")
+                        .withField(StandardField.KEYWORDS, "q-bio.CB");
 
         DoiFetcher modifiedDoiFetcher = Mockito.spy(new DoiFetcher(importFormatPreferences));
-        when(modifiedDoiFetcher.performSearchById("10.1073/pnas.1617932114")).thenThrow(new FetcherException("Could not fetch user-assigned DOI"));
-        when(modifiedDoiFetcher.performSearchById("10.48550/arXiv.1701.00587")).thenThrow(new FetcherException("Could not fetch ArXiv-assigned DOI"));
+        when(modifiedDoiFetcher.performSearchById("10.1073/pnas.1617932114"))
+                .thenThrow(new FetcherException("Could not fetch user-assigned DOI"));
+        when(modifiedDoiFetcher.performSearchById("10.48550/arXiv.1701.00587"))
+                .thenThrow(new FetcherException("Could not fetch ArXiv-assigned DOI"));
 
-        ArXivFetcher modifiedArXivFetcher = Mockito.spy(new ArXivFetcher(importFormatPreferences, modifiedDoiFetcher));
+        ArXivFetcher modifiedArXivFetcher =
+                Mockito.spy(new ArXivFetcher(importFormatPreferences, modifiedDoiFetcher));
         assertEquals(Optional.of(expected), modifiedArXivFetcher.performSearchById("1701.00587"));
     }
 
     @Test
     void canReplicateArXivOnlySearchByPassingNullParameter() throws FetcherException {
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Hai Zheng and Po-Yi Ho and Meiling Jiang and Bin Tang and Weirong Liu and Dengjin Li and Xuefeng Yu and Nancy E. Kleckner and Ariel Amir and Chenli Liu")
-                .withField(StandardField.TITLE, "Interrogating the Escherichia coli cell cycle by cell dimension perturbations")
-                .withField(StandardField.DATE, "2017-01-03")
-                .withField(StandardField.JOURNAL, "PNAS December 27, 2016 vol. 113 no. 52 15000-15005")
-                .withField(StandardField.ABSTRACT, "Bacteria tightly regulate and coordinate the various events in their cell cycles to duplicate themselves accurately and to control their cell sizes. Growth of Escherichia coli, in particular, follows a relation known as Schaechter 's growth law. This law says that the average cell volume scales exponentially with growth rate, with a scaling exponent equal to the time from initiation of a round of DNA replication to the cell division at which the corresponding sister chromosomes segregate. Here, we sought to test the robustness of the growth law to systematic perturbations in cell dimensions achieved by varying the expression levels of mreB and ftsZ. We found that decreasing the mreB level resulted in increased cell width, with little change in cell length, whereas decreasing the ftsZ level resulted in increased cell length. Furthermore, the time from replication termination to cell division increased with the perturbed dimension in both cases. Moreover, the growth law remained valid over a range of growth conditions and dimension perturbations. The growth law can be quantitatively interpreted as a consequence of a tight coupling of cell division to replication initiation. Thus, its robustness to perturbations in cell dimensions strongly supports models in which the timing of replication initiation governs that of cell division, and cell volume is the key phenomenological variable governing the timing of replication initiation. These conclusions are discussed in the context of our recently proposed adder-per-origin model, in which cells add a constant volume per origin between initiations and divide a constant time after initiation.")
-                .withField(StandardField.DOI, "10.1073/pnas.1617932114")
-                .withField(StandardField.EPRINT, "1701.00587")
-                .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1701.00587v1:PDF")
-                .withField(StandardField.EPRINTTYPE, "arXiv")
-                .withField(StandardField.EPRINTCLASS, "q-bio.CB")
-                .withField(StandardField.KEYWORDS, "q-bio.CB");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Hai Zheng and Po-Yi Ho and Meiling Jiang and Bin Tang and Weirong Liu and Dengjin Li and Xuefeng Yu and Nancy E. Kleckner and Ariel Amir and Chenli Liu")
+                        .withField(
+                                StandardField.TITLE,
+                                "Interrogating the Escherichia coli cell cycle by cell dimension perturbations")
+                        .withField(StandardField.DATE, "2017-01-03")
+                        .withField(
+                                StandardField.JOURNAL,
+                                "PNAS December 27, 2016 vol. 113 no. 52 15000-15005")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Bacteria tightly regulate and coordinate the various events in their cell cycles to duplicate themselves accurately and to control their cell sizes. Growth of Escherichia coli, in particular, follows a relation known as Schaechter 's growth law. This law says that the average cell volume scales exponentially with growth rate, with a scaling exponent equal to the time from initiation of a round of DNA replication to the cell division at which the corresponding sister chromosomes segregate. Here, we sought to test the robustness of the growth law to systematic perturbations in cell dimensions achieved by varying the expression levels of mreB and ftsZ. We found that decreasing the mreB level resulted in increased cell width, with little change in cell length, whereas decreasing the ftsZ level resulted in increased cell length. Furthermore, the time from replication termination to cell division increased with the perturbed dimension in both cases. Moreover, the growth law remained valid over a range of growth conditions and dimension perturbations. The growth law can be quantitatively interpreted as a consequence of a tight coupling of cell division to replication initiation. Thus, its robustness to perturbations in cell dimensions strongly supports models in which the timing of replication initiation governs that of cell division, and cell volume is the key phenomenological variable governing the timing of replication initiation. These conclusions are discussed in the context of our recently proposed adder-per-origin model, in which cells add a constant volume per origin between initiations and divide a constant time after initiation.")
+                        .withField(StandardField.DOI, "10.1073/pnas.1617932114")
+                        .withField(StandardField.EPRINT, "1701.00587")
+                        .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1701.00587v1:PDF")
+                        .withField(StandardField.EPRINTTYPE, "arXiv")
+                        .withField(StandardField.EPRINTCLASS, "q-bio.CB")
+                        .withField(StandardField.KEYWORDS, "q-bio.CB");
 
         ArXivFetcher modifiedArXivFetcher = new ArXivFetcher(importFormatPreferences, null);
         assertEquals(Optional.of(expected), modifiedArXivFetcher.performSearchById("1701.00587"));
     }
 
     @Test
-    void retrievePartialResultWhenCannotGetInformationFromUserAssignedDOI() throws FetcherException {
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Zheng, Hai and Ho, Po-Yi and Jiang, Meiling and Tang, Bin and Liu, Weirong and Li, Dengjin and Yu, Xuefeng and Kleckner, Nancy E. and Amir, Ariel and Liu, Chenli")
-                .withField(StandardField.TITLE, "Interrogating the Escherichia coli cell cycle by cell dimension perturbations")
-                .withField(StandardField.DATE, "2017-01-03")
-                .withField(StandardField.JOURNAL, "PNAS December 27, 2016 vol. 113 no. 52 15000-15005")
-                .withField(StandardField.ABSTRACT, "Bacteria tightly regulate and coordinate the various events in their cell cycles to duplicate themselves accurately and to control their cell sizes. Growth of Escherichia coli, in particular, follows a relation known as Schaechter 's growth law. This law says that the average cell volume scales exponentially with growth rate, with a scaling exponent equal to the time from initiation of a round of DNA replication to the cell division at which the corresponding sister chromosomes segregate. Here, we sought to test the robustness of the growth law to systematic perturbations in cell dimensions achieved by varying the expression levels of mreB and ftsZ. We found that decreasing the mreB level resulted in increased cell width, with little change in cell length, whereas decreasing the ftsZ level resulted in increased cell length. Furthermore, the time from replication termination to cell division increased with the perturbed dimension in both cases. Moreover, the growth law remained valid over a range of growth conditions and dimension perturbations. The growth law can be quantitatively interpreted as a consequence of a tight coupling of cell division to replication initiation. Thus, its robustness to perturbations in cell dimensions strongly supports models in which the timing of replication initiation governs that of cell division, and cell volume is the key phenomenological variable governing the timing of replication initiation. These conclusions are discussed in the context of our recently proposed adder-per-origin model, in which cells add a constant volume per origin between initiations and divide a constant time after initiation.")
-                .withField(StandardField.DOI, "10.1073/pnas.1617932114")
-                .withField(StandardField.EPRINT, "1701.00587")
-                .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1701.00587v1:PDF")
-                .withField(StandardField.EPRINTTYPE, "arXiv")
-                .withField(StandardField.EPRINTCLASS, "q-bio.CB")
-                .withField(StandardField.KEYWORDS, "Cell Behavior (q-bio.CB), FOS: Biological sciences")
-                .withField(new UnknownField("copyright"), "arXiv.org perpetual, non-exclusive license")
-                .withField(InternalField.KEY_FIELD, "https://doi.org/10.48550/arxiv.1701.00587")
-                .withField(StandardField.YEAR, "2017")
-                .withField(StandardField.PUBLISHER, "arXiv");
+    void retrievePartialResultWhenCannotGetInformationFromUserAssignedDOI()
+            throws FetcherException {
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Zheng, Hai and Ho, Po-Yi and Jiang, Meiling and Tang, Bin and Liu, Weirong and Li, Dengjin and Yu, Xuefeng and Kleckner, Nancy E. and Amir, Ariel and Liu, Chenli")
+                        .withField(
+                                StandardField.TITLE,
+                                "Interrogating the Escherichia coli cell cycle by cell dimension perturbations")
+                        .withField(StandardField.DATE, "2017-01-03")
+                        .withField(
+                                StandardField.JOURNAL,
+                                "PNAS December 27, 2016 vol. 113 no. 52 15000-15005")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Bacteria tightly regulate and coordinate the various events in their cell cycles to duplicate themselves accurately and to control their cell sizes. Growth of Escherichia coli, in particular, follows a relation known as Schaechter 's growth law. This law says that the average cell volume scales exponentially with growth rate, with a scaling exponent equal to the time from initiation of a round of DNA replication to the cell division at which the corresponding sister chromosomes segregate. Here, we sought to test the robustness of the growth law to systematic perturbations in cell dimensions achieved by varying the expression levels of mreB and ftsZ. We found that decreasing the mreB level resulted in increased cell width, with little change in cell length, whereas decreasing the ftsZ level resulted in increased cell length. Furthermore, the time from replication termination to cell division increased with the perturbed dimension in both cases. Moreover, the growth law remained valid over a range of growth conditions and dimension perturbations. The growth law can be quantitatively interpreted as a consequence of a tight coupling of cell division to replication initiation. Thus, its robustness to perturbations in cell dimensions strongly supports models in which the timing of replication initiation governs that of cell division, and cell volume is the key phenomenological variable governing the timing of replication initiation. These conclusions are discussed in the context of our recently proposed adder-per-origin model, in which cells add a constant volume per origin between initiations and divide a constant time after initiation.")
+                        .withField(StandardField.DOI, "10.1073/pnas.1617932114")
+                        .withField(StandardField.EPRINT, "1701.00587")
+                        .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1701.00587v1:PDF")
+                        .withField(StandardField.EPRINTTYPE, "arXiv")
+                        .withField(StandardField.EPRINTCLASS, "q-bio.CB")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Cell Behavior (q-bio.CB), FOS: Biological sciences")
+                        .withField(
+                                new UnknownField("copyright"),
+                                "arXiv.org perpetual, non-exclusive license")
+                        .withField(
+                                InternalField.KEY_FIELD,
+                                "https://doi.org/10.48550/arxiv.1701.00587")
+                        .withField(StandardField.YEAR, "2017")
+                        .withField(StandardField.PUBLISHER, "arXiv");
 
         DoiFetcher modifiedDoiFetcher = Mockito.spy(new DoiFetcher(importFormatPreferences));
-        when(modifiedDoiFetcher.performSearchById("10.1073/pnas.1617932114")).thenThrow(new FetcherException("Could not fetch user-assigned DOI"));
+        when(modifiedDoiFetcher.performSearchById("10.1073/pnas.1617932114"))
+                .thenThrow(new FetcherException("Could not fetch user-assigned DOI"));
 
-        ArXivFetcher modifiedArXivFetcher = Mockito.spy(new ArXivFetcher(importFormatPreferences, modifiedDoiFetcher));
+        ArXivFetcher modifiedArXivFetcher =
+                Mockito.spy(new ArXivFetcher(importFormatPreferences, modifiedDoiFetcher));
         assertEquals(Optional.of(expected), modifiedArXivFetcher.performSearchById("1701.00587"));
     }
 
     @Test
-    void retrievePartialResultWhenCannotGetInformationFromArXivAssignedDOI() throws FetcherException {
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Hai Zheng and Po-Yi Ho and Meiling Jiang and Bin Tang and Weirong Liu and Dengjin Li and Xuefeng Yu and Nancy E. Kleckner and Ariel Amir and Chenli Liu")
-                .withField(StandardField.TITLE, "Interrogating the Escherichia coli cell cycle by cell dimension perturbations")
-                .withField(StandardField.DATE, "2017-01-03")
-                .withField(StandardField.JOURNAL, "PNAS December 27, 2016 vol. 113 no. 52 15000-15005")
-                .withField(StandardField.ABSTRACT, "Bacteria tightly regulate and coordinate the various events in their cell cycles to duplicate themselves accurately and to control their cell sizes. Growth of Escherichia coli, in particular, follows a relation known as Schaechter 's growth law. This law says that the average cell volume scales exponentially with growth rate, with a scaling exponent equal to the time from initiation of a round of DNA replication to the cell division at which the corresponding sister chromosomes segregate. Here, we sought to test the robustness of the growth law to systematic perturbations in cell dimensions achieved by varying the expression levels of mreB and ftsZ. We found that decreasing the mreB level resulted in increased cell width, with little change in cell length, whereas decreasing the ftsZ level resulted in increased cell length. Furthermore, the time from replication termination to cell division increased with the perturbed dimension in both cases. Moreover, the growth law remained valid over a range of growth conditions and dimension perturbations. The growth law can be quantitatively interpreted as a consequence of a tight coupling of cell division to replication initiation. Thus, its robustness to perturbations in cell dimensions strongly supports models in which the timing of replication initiation governs that of cell division, and cell volume is the key phenomenological variable governing the timing of replication initiation. These conclusions are discussed in the context of our recently proposed adder-per-origin model, in which cells add a constant volume per origin between initiations and divide a constant time after initiation.")
-                .withField(StandardField.DOI, "10.1073/pnas.1617932114")
-                .withField(StandardField.ISSN, "1091-6490")
-                .withField(StandardField.EPRINT, "1701.00587")
-                .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1701.00587v1:PDF")
-                .withField(StandardField.EPRINTTYPE, "arXiv")
-                .withField(StandardField.EPRINTCLASS, "q-bio.CB")
-                .withField(StandardField.KEYWORDS, "q-bio.CB")
-                .withField(StandardField.MONTH, "#dec#")
-                .withField(StandardField.YEAR, "2016")
-                .withField(StandardField.VOLUME, "113")
-                .withField(InternalField.KEY_FIELD, "Zheng_2016")
-                .withField(StandardField.PUBLISHER, "Proceedings of the National Academy of Sciences")
-                .withField(StandardField.PAGES, "15000--15005")
-                .withField(StandardField.NUMBER, "52");
+    void retrievePartialResultWhenCannotGetInformationFromArXivAssignedDOI()
+            throws FetcherException {
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Hai Zheng and Po-Yi Ho and Meiling Jiang and Bin Tang and Weirong Liu and Dengjin Li and Xuefeng Yu and Nancy E. Kleckner and Ariel Amir and Chenli Liu")
+                        .withField(
+                                StandardField.TITLE,
+                                "Interrogating the Escherichia coli cell cycle by cell dimension perturbations")
+                        .withField(StandardField.DATE, "2017-01-03")
+                        .withField(
+                                StandardField.JOURNAL,
+                                "PNAS December 27, 2016 vol. 113 no. 52 15000-15005")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Bacteria tightly regulate and coordinate the various events in their cell cycles to duplicate themselves accurately and to control their cell sizes. Growth of Escherichia coli, in particular, follows a relation known as Schaechter 's growth law. This law says that the average cell volume scales exponentially with growth rate, with a scaling exponent equal to the time from initiation of a round of DNA replication to the cell division at which the corresponding sister chromosomes segregate. Here, we sought to test the robustness of the growth law to systematic perturbations in cell dimensions achieved by varying the expression levels of mreB and ftsZ. We found that decreasing the mreB level resulted in increased cell width, with little change in cell length, whereas decreasing the ftsZ level resulted in increased cell length. Furthermore, the time from replication termination to cell division increased with the perturbed dimension in both cases. Moreover, the growth law remained valid over a range of growth conditions and dimension perturbations. The growth law can be quantitatively interpreted as a consequence of a tight coupling of cell division to replication initiation. Thus, its robustness to perturbations in cell dimensions strongly supports models in which the timing of replication initiation governs that of cell division, and cell volume is the key phenomenological variable governing the timing of replication initiation. These conclusions are discussed in the context of our recently proposed adder-per-origin model, in which cells add a constant volume per origin between initiations and divide a constant time after initiation.")
+                        .withField(StandardField.DOI, "10.1073/pnas.1617932114")
+                        .withField(StandardField.ISSN, "1091-6490")
+                        .withField(StandardField.EPRINT, "1701.00587")
+                        .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1701.00587v1:PDF")
+                        .withField(StandardField.EPRINTTYPE, "arXiv")
+                        .withField(StandardField.EPRINTCLASS, "q-bio.CB")
+                        .withField(StandardField.KEYWORDS, "q-bio.CB")
+                        .withField(StandardField.MONTH, "#dec#")
+                        .withField(StandardField.YEAR, "2016")
+                        .withField(StandardField.VOLUME, "113")
+                        .withField(InternalField.KEY_FIELD, "Zheng_2016")
+                        .withField(
+                                StandardField.PUBLISHER,
+                                "Proceedings of the National Academy of Sciences")
+                        .withField(StandardField.PAGES, "15000--15005")
+                        .withField(StandardField.NUMBER, "52");
 
         DoiFetcher modifiedDoiFetcher = Mockito.spy(new DoiFetcher(importFormatPreferences));
-        when(modifiedDoiFetcher.performSearchById("10.48550/arXiv.1701.00587")).thenThrow(new FetcherException("Could not fetch ArXiv-assigned DOI"));
+        when(modifiedDoiFetcher.performSearchById("10.48550/arXiv.1701.00587"))
+                .thenThrow(new FetcherException("Could not fetch ArXiv-assigned DOI"));
 
-        ArXivFetcher modifiedArXivFetcher = Mockito.spy(new ArXivFetcher(importFormatPreferences, modifiedDoiFetcher));
+        ArXivFetcher modifiedArXivFetcher =
+                Mockito.spy(new ArXivFetcher(importFormatPreferences, modifiedDoiFetcher));
         assertEquals(Optional.of(expected), modifiedArXivFetcher.performSearchById("1701.00587"));
     }
 
     @Test
     void abstractIsCleanedUp() throws Exception {
         Optional<BibEntry> entry = fetcher.performSearchById("2407.02238");
-        String escaped = "{One of the primary areas of interest in High Performance Computing is the improvement of performance of parallel workloads. Nowadays, compilable source code-based optimization tasks that employ deep learning often exploit LLVM Intermediate Representations (IRs) for extracting features from source code. Most such works target specific tasks, or are designed with a pre-defined set of heuristics. So far, pre-trained models are rare in this domain, but the possibilities have been widely discussed. Especially approaches mimicking large-language models (LLMs) have been proposed. But these have prohibitively large training costs. In this paper, we propose MIREncoder, a M}ulti-modal IR-based Auto-Encoder that can be pre-trained to generate a learned embedding space to be used for downstream tasks by machine learning-based approaches. A multi-modal approach enables us to better extract features from compilable programs. It allows us to better model code syntax, semantics and structure. For code-based performance optimizations, these features are very important while making optimization decisions. A pre-trained model/embedding implicitly enables the usage of transfer learning, and helps move away from task-specific trained models. Additionally, a pre-trained model used for downstream performance optimization should itself have reduced overhead, and be easily usable. These considerations have led us to propose a modeling approach that i) understands code semantics and structure, ii) enables use of transfer learning, and iii) is small and simple enough to be easily re-purposed or reused even with low resource availability. Our evaluations will show that our proposed approach can outperform the state of the art while reducing overhead.";
+        String escaped =
+                "{One of the primary areas of interest in High Performance Computing is the improvement of performance of parallel workloads. Nowadays, compilable source code-based optimization tasks that employ deep learning often exploit LLVM Intermediate Representations (IRs) for extracting features from source code. Most such works target specific tasks, or are designed with a pre-defined set of heuristics. So far, pre-trained models are rare in this domain, but the possibilities have been widely discussed. Especially approaches mimicking large-language models (LLMs) have been proposed. But these have prohibitively large training costs. In this paper, we propose MIREncoder, a M}ulti-modal IR-based Auto-Encoder that can be pre-trained to generate a learned embedding space to be used for downstream tasks by machine learning-based approaches. A multi-modal approach enables us to better extract features from compilable programs. It allows us to better model code syntax, semantics and structure. For code-based performance optimizations, these features are very important while making optimization decisions. A pre-trained model/embedding implicitly enables the usage of transfer learning, and helps move away from task-specific trained models. Additionally, a pre-trained model used for downstream performance optimization should itself have reduced overhead, and be easily usable. These considerations have led us to propose a modeling approach that i) understands code semantics and structure, ii) enables use of transfer learning, and iii) is small and simple enough to be easily re-purposed or reused even with low resource availability. Our evaluations will show that our proposed approach can outperform the state of the art while reducing overhead.";
         assertEquals(Optional.of(escaped), entry.get().getField(StandardField.ABSTRACT));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
index b18f514b68cc..bdf0aae1b0f9 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
@@ -1,7 +1,10 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -13,123 +16,171 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.paging.Page;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 public class AstrophysicsDataSystemTest implements PagedSearchFetcherTest {
 
     private AstrophysicsDataSystem fetcher;
     private BibEntry diezSliceTheoremEntry;
-    private BibEntry famaeyMcGaughEntry = new BibEntry(StandardEntryType.Article)
-            .withCitationKey("2012LRR....15...10F")
-            .withField(StandardField.AUTHOR, "Famaey, Beno{\\^\\i}t and McGaugh, Stacy S.")
-            .withField(StandardField.TITLE, "Modified Newtonian Dynamics (MOND): Observational Phenomenology and Relativistic Extensions")
-            .withField(StandardField.JOURNAL, "Living Reviews in Relativity")
-            .withField(StandardField.YEAR, "2012")
-            .withField(StandardField.VOLUME, "15")
-            .withField(StandardField.MONTH, "#dec#")
-            .withField(StandardField.NUMBER, "1")
-            .withField(StandardField.ARCHIVEPREFIX, "arXiv")
-            .withField(StandardField.DOI, "10.12942/lrr-2012-10")
-            .withField(StandardField.PRIMARYCLASS, "astro-ph.CO")
-            .withField(StandardField.EID, "10")
-            .withField(StandardField.EPRINT, "1112.3960")
-            .withField(StandardField.PAGES, "10")
-            .withField(StandardField.KEYWORDS, "astronomical observations, Newtonian limit, equations of motion, extragalactic astronomy, cosmology, theories of gravity, fundamental physics, astrophysics, Modified Newtonian Dynamics (MOND), Dark Matter, Baryonic Tully-Fisher Relation (BTFR), MOND Theories, Tidal Dwarf Galaxies (TDGs), Astrophysics - Cosmology and Nongalactic Astrophysics, Astrophysics - Astrophysics of Galaxies, General Relativity and Quantum Cosmology, High Energy Physics - Phenomenology, High Energy Physics - Theory")
-            .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2012LRR....15...10F");
+    private BibEntry famaeyMcGaughEntry =
+            new BibEntry(StandardEntryType.Article)
+                    .withCitationKey("2012LRR....15...10F")
+                    .withField(StandardField.AUTHOR, "Famaey, Beno{\\^\\i}t and McGaugh, Stacy S.")
+                    .withField(
+                            StandardField.TITLE,
+                            "Modified Newtonian Dynamics (MOND): Observational Phenomenology and Relativistic Extensions")
+                    .withField(StandardField.JOURNAL, "Living Reviews in Relativity")
+                    .withField(StandardField.YEAR, "2012")
+                    .withField(StandardField.VOLUME, "15")
+                    .withField(StandardField.MONTH, "#dec#")
+                    .withField(StandardField.NUMBER, "1")
+                    .withField(StandardField.ARCHIVEPREFIX, "arXiv")
+                    .withField(StandardField.DOI, "10.12942/lrr-2012-10")
+                    .withField(StandardField.PRIMARYCLASS, "astro-ph.CO")
+                    .withField(StandardField.EID, "10")
+                    .withField(StandardField.EPRINT, "1112.3960")
+                    .withField(StandardField.PAGES, "10")
+                    .withField(
+                            StandardField.KEYWORDS,
+                            "astronomical observations, Newtonian limit, equations of motion, extragalactic astronomy, cosmology, theories of gravity, fundamental physics, astrophysics, Modified Newtonian Dynamics (MOND), Dark Matter, Baryonic Tully-Fisher Relation (BTFR), MOND Theories, Tidal Dwarf Galaxies (TDGs), Astrophysics - Cosmology and Nongalactic Astrophysics, Astrophysics - Astrophysics of Galaxies, General Relativity and Quantum Cosmology, High Energy Physics - Phenomenology, High Energy Physics - Theory")
+                    .withField(
+                            StandardField.URL,
+                            "https://ui.adsabs.harvard.edu/abs/2012LRR....15...10F");
     private BibEntry sunWelchEntry;
     private BibEntry xiongSunEntry;
     private BibEntry ingersollPollardEntry;
-    private BibEntry luceyPaulEntry = new BibEntry(StandardEntryType.Article)
-            .withCitationKey("2000JGR...10520297L")
-            .withField(StandardField.AUTHOR, "Lucey, Paul G. and Blewett, David T. and Jolliff, Bradley L.")
-            .withField(StandardField.DOI, "10.1029/1999JE001117")
-            .withField(StandardField.JOURNAL, "\\jgr")
-            .withField(StandardField.KEYWORDS, "Planetology: Solid Surface Planets: Composition, Planetology: Solid Surface Planets: Remote sensing, Planetology: Solid Surface Planets: Surface materials and properties, Planetology: Solar System Objects: Moon (1221)")
-            .withField(StandardField.PAGES, "20297-20306")
-            .withField(StandardField.TITLE, "Lunar iron and titanium abundance algorithms based on final processing of Clementine ultraviolet-visible images")
-            .withField(StandardField.VOLUME, "105")
-            .withField(StandardField.YEAR, "2000")
-            .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2000JGR...10520297L")
-            .withField(StandardField.MONTH, "#jan#")
-            .withField(StandardField.NUMBER, "E8")
-            .withField(StandardField.ABSTRACT, "The Clementine mission to the Moon returned global imaging data         collected by the ultraviolet visible (UVVIS) camera. This data         set is now in a final state of calibration, and a five-band         multispectral digital image model (DIM) of the lunar surface         will soon be available to the science community. We have used         observations of the lunar sample-return sites and stations         extracted from the final DIM in conjunction with compositional         information for returned lunar soils to revise our previously         published algorithms for the spectral determination of the FeO         and TiO$_{2}$ content of the lunar surface. The algorithms         successfully normalize the effects of space weathering so that         composition may be determined without regard to a surface's         state of maturity. These algorithms permit anyone with access to         the standard archived DIM to construct high spatial resolution         maps of FeO and TiO$_{2}$ abundance. Such maps will be of great         utility in a variety of lunar geologic studies.");
+    private BibEntry luceyPaulEntry =
+            new BibEntry(StandardEntryType.Article)
+                    .withCitationKey("2000JGR...10520297L")
+                    .withField(
+                            StandardField.AUTHOR,
+                            "Lucey, Paul G. and Blewett, David T. and Jolliff, Bradley L.")
+                    .withField(StandardField.DOI, "10.1029/1999JE001117")
+                    .withField(StandardField.JOURNAL, "\\jgr")
+                    .withField(
+                            StandardField.KEYWORDS,
+                            "Planetology: Solid Surface Planets: Composition, Planetology: Solid Surface Planets: Remote sensing, Planetology: Solid Surface Planets: Surface materials and properties, Planetology: Solar System Objects: Moon (1221)")
+                    .withField(StandardField.PAGES, "20297-20306")
+                    .withField(
+                            StandardField.TITLE,
+                            "Lunar iron and titanium abundance algorithms based on final processing of Clementine ultraviolet-visible images")
+                    .withField(StandardField.VOLUME, "105")
+                    .withField(StandardField.YEAR, "2000")
+                    .withField(
+                            StandardField.URL,
+                            "https://ui.adsabs.harvard.edu/abs/2000JGR...10520297L")
+                    .withField(StandardField.MONTH, "#jan#")
+                    .withField(StandardField.NUMBER, "E8")
+                    .withField(
+                            StandardField.ABSTRACT,
+                            "The Clementine mission to the Moon returned global imaging data         collected by the ultraviolet visible (UVVIS) camera. This data         set is now in a final state of calibration, and a five-band         multispectral digital image model (DIM) of the lunar surface         will soon be available to the science community. We have used         observations of the lunar sample-return sites and stations         extracted from the final DIM in conjunction with compositional         information for returned lunar soils to revise our previously         published algorithms for the spectral determination of the FeO         and TiO$_{2}$ content of the lunar surface. The algorithms         successfully normalize the effects of space weathering so that         composition may be determined without regard to a surface's         state of maturity. These algorithms permit anyone with access to         the standard archived DIM to construct high spatial resolution         maps of FeO and TiO$_{2}$ abundance. Such maps will be of great         utility in a variety of lunar geologic studies.");
 
     @BeforeEach
     void setUp() throws Exception {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
         when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
 
         fetcher = new AstrophysicsDataSystem(importFormatPreferences, importerPreferences);
 
-        diezSliceTheoremEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("2018arXiv181204698D")
-                .withField(StandardField.AUTHOR, "Diez, Tobias and Rudolph, Gerd")
-                .withField(StandardField.TITLE, "Slice theorem and orbit type stratification in infinite dimensions")
-                .withField(StandardField.YEAR, "2018")
-                .withField(StandardField.ARCHIVEPREFIX, "arXiv")
-                .withField(StandardField.DOI, "10.48550/arXiv.1812.04698")
-                .withField(StandardField.EPRINT, "1812.04698")
-                .withField(StandardField.JOURNAL, "arXiv e-prints")
-                .withField(StandardField.KEYWORDS, "Mathematics - Differential Geometry, Mathematical Physics, 58B25, (58D19, 58B20, 22E99, 58A35)")
-                .withField(StandardField.MONTH, "#dec#")
-                .withField(StandardField.PAGES, "arXiv:1812.04698")
-                .withField(StandardField.EID, "arXiv:1812.04698")
-                .withField(StandardField.PRIMARYCLASS, "math.DG")
-                .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2018arXiv181204698D")
-                .withField(StandardField.ABSTRACT,
-                        "We establish a general slice theorem for the action of a locally convex         Lie group on a locally convex manifold, which generalizes the         classical slice theorem of Palais to infinite dimensions. We         discuss two important settings under which the assumptions of         this theorem are fulfilled. First, using Gl{\\\"o}ckner's inverse         function theorem, we show that the linear action of a compact         Lie group on a Fr{\\'e}chet space admits a slice. Second, using         the Nash--Moser theorem, we establish a slice theorem for the         tame action of a tame Fr{\\'e}chet Lie group on a tame         Fr{\\'e}chet manifold. For this purpose, we develop the concept         of a graded Riemannian metric, which allows the construction of         a path-length metric compatible with the manifold topology and         of a local addition. Finally, generalizing a classical result in         finite dimensions, we prove that the existence of a slice         implies that the decomposition of the manifold into orbit types         of the group action is a stratification.");
-
-        sunWelchEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("2012NatMa..11...44S")
-                .withField(StandardField.AUTHOR, "Sun, Yanming and Welch, Gregory C. and Leong, Wei Lin and Takacs, Christopher J. and Bazan, Guillermo C. and Heeger, Alan J.")
-                .withField(StandardField.DOI, "10.1038/nmat3160")
-                .withField(StandardField.JOURNAL, "Nature Materials")
-                .withField(StandardField.MONTH, "#jan#")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "44-48")
-                .withField(StandardField.TITLE, "Solution-processed small-molecule solar cells with 6.7\\% efficiency")
-                .withField(StandardField.VOLUME, "11")
-                .withField(StandardField.YEAR, "2012")
-                .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2012NatMa..11...44S");
-
-        xiongSunEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("2007ITGRS..45..879X")
-                .withField(StandardField.AUTHOR, "Xiong, Xiaoxiong and Sun, Junqiang and Barnes, William and Salomonson, Vincent and Esposito, Joseph and Erives, Hector and Guenther, Bruce")
-                .withField(StandardField.DOI, "10.1109/TGRS.2006.890567")
-                .withField(StandardField.JOURNAL, "IEEE Transactions on Geoscience and Remote Sensing")
-                .withField(StandardField.MONTH, "#apr#")
-                .withField(StandardField.NUMBER, "4")
-                .withField(StandardField.PAGES, "879-889")
-                .withField(StandardField.TITLE, "Multiyear On-Orbit Calibration and Performance of Terra MODIS Reflective Solar Bands")
-                .withField(StandardField.VOLUME, "45")
-                .withField(StandardField.YEAR, "2007")
-                .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2007ITGRS..45..879X");
-
-        ingersollPollardEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("1982Icar...52...62I")
-                .withField(StandardField.ABSTRACT, "If Jupiter's and Saturn's fluid interiors were inviscid and adiabatic,         any steady zonal motion would take the form of differentially         rotating cylinders concentric about the planetary axis of         rotation. B. A. Smith et al. [ Science215, 504-537 (1982)]         showed that Saturn's observed zonal wind profile extends a         significant distance below cloud base. Further extension into         the interior occurs if the values of the eddy viscosity and         superadiabaticity are small. We estimate these values using a         scaling analysis of deep convection in the presence of         differential rotation. The differential rotation inhibits the         convection and reduces the effective eddy viscosity. Viscous         dissipation of zonal mean kinetic energy is then within the         bounds set by the internal heat source. The differential         rotation increases the superadiabaticity, but not so much as to         eliminate the cylindrical structure of the flow. Very large         departures from adiabaticity, necessary for decoupling the         atmosphere and interior, do not occur. Using our scaling         analysis we develop the anelastic equations that describe         motions in Jupiter's and Saturn's interiors. A simple problem is         solved, that of an adiabatic fluid with a steady zonal wind         varying as a function of cylindrical radius. Low zonal         wavenumber perturbations are two dimensional (independent of the         axial coordinate) and obey a modified barotropic stability         equation. The parameter analogous to {\\ensuremath{\\beta}} is         negative and is three to four times larger than the         {\\ensuremath{\\beta}} for thin atmospheres. Jupiter's and         Saturn's observed zonal wind profiles are close to marginal         stability according to this deep sphere criterion, but are         several times supercritical according to the thin atmosphere         criterion.")
-                .withField(StandardField.AUTHOR, "Ingersoll, A.~P. and Pollard, D.")
-                .withField(StandardField.DOI, "10.1016/0019-1035(82)90169-5")
-                .withField(StandardField.JOURNAL, "\\icarus")
-                .withField(StandardField.KEYWORDS, "Atmospheric Circulation, Barotropic Flow, Convective Flow, Flow Stability, Jupiter Atmosphere, Rotating Fluids, Saturn Atmosphere, Adiabatic Flow, Anelasticity, Compressible Fluids, Planetary Rotation, Rotating Cylinders, Scaling Laws, Wind Profiles, PLANETS, JUPITER, SATURN, MOTION, INTERIORS, ATMOSPHERE, ANALYSIS, SCALE, BAROTROPY, CHARACTERISTICS, STRUCTURE, WINDS, VISCOSITY, DATA, CONVECTION, ROTATION, EDDY EFFECTS, ENERGY, ADIABATICITY, DIAGRAMS, REVIEW, LATITUDE, ZONES, VELOCITY, MATHEMATICAL MODELS, HEAT FLOW, EQUATIONS OF MOTION, FLUIDS, DYNAMICS, TEMPERATURE, GRADIENTS")
-                .withField(StandardField.MONTH, "#oct#")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "62-80")
-                .withField(StandardField.TITLE, "Motion in the interiors and atmospheres of Jupiter and Saturn: scale analysis, anelastic equations, barotropic stability criterion")
-                .withField(StandardField.VOLUME, "52")
-                .withField(StandardField.YEAR, "1982")
-                .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/1982Icar...52...62I");
+        diezSliceTheoremEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("2018arXiv181204698D")
+                        .withField(StandardField.AUTHOR, "Diez, Tobias and Rudolph, Gerd")
+                        .withField(
+                                StandardField.TITLE,
+                                "Slice theorem and orbit type stratification in infinite dimensions")
+                        .withField(StandardField.YEAR, "2018")
+                        .withField(StandardField.ARCHIVEPREFIX, "arXiv")
+                        .withField(StandardField.DOI, "10.48550/arXiv.1812.04698")
+                        .withField(StandardField.EPRINT, "1812.04698")
+                        .withField(StandardField.JOURNAL, "arXiv e-prints")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Mathematics - Differential Geometry, Mathematical Physics, 58B25, (58D19, 58B20, 22E99, 58A35)")
+                        .withField(StandardField.MONTH, "#dec#")
+                        .withField(StandardField.PAGES, "arXiv:1812.04698")
+                        .withField(StandardField.EID, "arXiv:1812.04698")
+                        .withField(StandardField.PRIMARYCLASS, "math.DG")
+                        .withField(
+                                StandardField.URL,
+                                "https://ui.adsabs.harvard.edu/abs/2018arXiv181204698D")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "We establish a general slice theorem for the action of a locally convex         Lie group on a locally convex manifold, which generalizes the         classical slice theorem of Palais to infinite dimensions. We         discuss two important settings under which the assumptions of         this theorem are fulfilled. First, using Gl{\\\"o}ckner's inverse         function theorem, we show that the linear action of a compact         Lie group on a Fr{\\'e}chet space admits a slice. Second, using         the Nash--Moser theorem, we establish a slice theorem for the         tame action of a tame Fr{\\'e}chet Lie group on a tame         Fr{\\'e}chet manifold. For this purpose, we develop the concept         of a graded Riemannian metric, which allows the construction of         a path-length metric compatible with the manifold topology and         of a local addition. Finally, generalizing a classical result in         finite dimensions, we prove that the existence of a slice         implies that the decomposition of the manifold into orbit types         of the group action is a stratification.");
+
+        sunWelchEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("2012NatMa..11...44S")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Sun, Yanming and Welch, Gregory C. and Leong, Wei Lin and Takacs, Christopher J. and Bazan, Guillermo C. and Heeger, Alan J.")
+                        .withField(StandardField.DOI, "10.1038/nmat3160")
+                        .withField(StandardField.JOURNAL, "Nature Materials")
+                        .withField(StandardField.MONTH, "#jan#")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "44-48")
+                        .withField(
+                                StandardField.TITLE,
+                                "Solution-processed small-molecule solar cells with 6.7\\% efficiency")
+                        .withField(StandardField.VOLUME, "11")
+                        .withField(StandardField.YEAR, "2012")
+                        .withField(
+                                StandardField.URL,
+                                "https://ui.adsabs.harvard.edu/abs/2012NatMa..11...44S");
+
+        xiongSunEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("2007ITGRS..45..879X")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Xiong, Xiaoxiong and Sun, Junqiang and Barnes, William and Salomonson, Vincent and Esposito, Joseph and Erives, Hector and Guenther, Bruce")
+                        .withField(StandardField.DOI, "10.1109/TGRS.2006.890567")
+                        .withField(
+                                StandardField.JOURNAL,
+                                "IEEE Transactions on Geoscience and Remote Sensing")
+                        .withField(StandardField.MONTH, "#apr#")
+                        .withField(StandardField.NUMBER, "4")
+                        .withField(StandardField.PAGES, "879-889")
+                        .withField(
+                                StandardField.TITLE,
+                                "Multiyear On-Orbit Calibration and Performance of Terra MODIS Reflective Solar Bands")
+                        .withField(StandardField.VOLUME, "45")
+                        .withField(StandardField.YEAR, "2007")
+                        .withField(
+                                StandardField.URL,
+                                "https://ui.adsabs.harvard.edu/abs/2007ITGRS..45..879X");
+
+        ingersollPollardEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("1982Icar...52...62I")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "If Jupiter's and Saturn's fluid interiors were inviscid and adiabatic,         any steady zonal motion would take the form of differentially         rotating cylinders concentric about the planetary axis of         rotation. B. A. Smith et al. [ Science215, 504-537 (1982)]         showed that Saturn's observed zonal wind profile extends a         significant distance below cloud base. Further extension into         the interior occurs if the values of the eddy viscosity and         superadiabaticity are small. We estimate these values using a         scaling analysis of deep convection in the presence of         differential rotation. The differential rotation inhibits the         convection and reduces the effective eddy viscosity. Viscous         dissipation of zonal mean kinetic energy is then within the         bounds set by the internal heat source. The differential         rotation increases the superadiabaticity, but not so much as to         eliminate the cylindrical structure of the flow. Very large         departures from adiabaticity, necessary for decoupling the         atmosphere and interior, do not occur. Using our scaling         analysis we develop the anelastic equations that describe         motions in Jupiter's and Saturn's interiors. A simple problem is         solved, that of an adiabatic fluid with a steady zonal wind         varying as a function of cylindrical radius. Low zonal         wavenumber perturbations are two dimensional (independent of the         axial coordinate) and obey a modified barotropic stability         equation. The parameter analogous to {\\ensuremath{\\beta}} is         negative and is three to four times larger than the         {\\ensuremath{\\beta}} for thin atmospheres. Jupiter's and         Saturn's observed zonal wind profiles are close to marginal         stability according to this deep sphere criterion, but are         several times supercritical according to the thin atmosphere         criterion.")
+                        .withField(StandardField.AUTHOR, "Ingersoll, A.~P. and Pollard, D.")
+                        .withField(StandardField.DOI, "10.1016/0019-1035(82)90169-5")
+                        .withField(StandardField.JOURNAL, "\\icarus")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Atmospheric Circulation, Barotropic Flow, Convective Flow, Flow Stability, Jupiter Atmosphere, Rotating Fluids, Saturn Atmosphere, Adiabatic Flow, Anelasticity, Compressible Fluids, Planetary Rotation, Rotating Cylinders, Scaling Laws, Wind Profiles, PLANETS, JUPITER, SATURN, MOTION, INTERIORS, ATMOSPHERE, ANALYSIS, SCALE, BAROTROPY, CHARACTERISTICS, STRUCTURE, WINDS, VISCOSITY, DATA, CONVECTION, ROTATION, EDDY EFFECTS, ENERGY, ADIABATICITY, DIAGRAMS, REVIEW, LATITUDE, ZONES, VELOCITY, MATHEMATICAL MODELS, HEAT FLOW, EQUATIONS OF MOTION, FLUIDS, DYNAMICS, TEMPERATURE, GRADIENTS")
+                        .withField(StandardField.MONTH, "#oct#")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "62-80")
+                        .withField(
+                                StandardField.TITLE,
+                                "Motion in the interiors and atmospheres of Jupiter and Saturn: scale analysis, anelastic equations, barotropic stability criterion")
+                        .withField(StandardField.VOLUME, "52")
+                        .withField(StandardField.YEAR, "1982")
+                        .withField(
+                                StandardField.URL,
+                                "https://ui.adsabs.harvard.edu/abs/1982Icar...52...62I");
     }
 
     @Test
@@ -146,13 +197,15 @@ void searchByQueryFindsEntry() throws Exception {
 
     @Test
     void searchByEntryFindsEntry() throws Exception {
-        BibEntry searchEntry = new BibEntry()
-                .withField(StandardField.TITLE, "slice theorem")
-                .withField(StandardField.AUTHOR, "Diez");
+        BibEntry searchEntry =
+                new BibEntry()
+                        .withField(StandardField.TITLE, "slice theorem")
+                        .withField(StandardField.AUTHOR, "Diez");
 
         List<BibEntry> fetchedEntries = fetcher.performSearch(searchEntry);
 
-        // The list contains more than one element, thus we need to check in two steps and cannot use assertEquals(List.of(diezSliceTheoremEntry, fetchedEntries))
+        // The list contains more than one element, thus we need to check in two steps and cannot
+        // use assertEquals(List.of(diezSliceTheoremEntry, fetchedEntries))
         assertFalse(fetchedEntries.isEmpty());
         assertTrue(fetchedEntries.contains(diezSliceTheoremEntry));
     }
@@ -160,7 +213,10 @@ void searchByEntryFindsEntry() throws Exception {
     @Test
     void performSearchByFamaeyMcGaughEntry() throws Exception {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.12942/lrr-2012-10");
-        fetchedEntry.ifPresent(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright
+        fetchedEntry.ifPresent(
+                entry ->
+                        entry.clearField(
+                                StandardField.ABSTRACT)); // Remove abstract due to copyright
         assertEquals(Optional.of(famaeyMcGaughEntry), fetchedEntry);
     }
 
@@ -178,7 +234,10 @@ void performSearchByIdInvalidDoi() throws Exception {
     @Test
     void performSearchBySunWelchEntry() throws Exception {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.1038/nmat3160");
-        fetchedEntry.ifPresent(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright
+        fetchedEntry.ifPresent(
+                entry ->
+                        entry.clearField(
+                                StandardField.ABSTRACT)); // Remove abstract due to copyright
         assertEquals(Optional.of(sunWelchEntry), fetchedEntry);
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/BiodiversityLibraryTest.java b/src/test/java/org/jabref/logic/importer/fetcher/BiodiversityLibraryTest.java
index 1df6e6ed6155..a7ee72b05b6e 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/BiodiversityLibraryTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/BiodiversityLibraryTest.java
@@ -1,10 +1,15 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
+import kong.unirest.core.json.JSONObject;
+
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.util.BuildInfo;
@@ -12,18 +17,13 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
-import kong.unirest.core.json.JSONObject;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 
 @FetcherTest
 class BiodiversityLibraryTest {
@@ -55,10 +55,10 @@ void biodiversityHeritageApiKeyIsNotEmpty() {
 
     @Test
     void baseURLConstruction() throws MalformedURLException, URISyntaxException {
-        String expected = fetcher
-                .getTestUrl()
-                .concat(buildInfo.biodiversityHeritageApiKey)
-                .concat(RESPONSE_FORMAT);
+        String expected =
+                fetcher.getTestUrl()
+                        .concat(buildInfo.biodiversityHeritageApiKey)
+                        .concat(RESPONSE_FORMAT);
 
         assertEquals(expected, fetcher.getBaseURL().toString());
     }
@@ -66,12 +66,12 @@ void baseURLConstruction() throws MalformedURLException, URISyntaxException {
     @ParameterizedTest
     @ValueSource(strings = {"1234", "331", "121"})
     void getPartMetadaUrl(String id) throws MalformedURLException, URISyntaxException {
-        String expected = fetcher
-                .getTestUrl()
-                .concat(buildInfo.biodiversityHeritageApiKey)
-                .concat(RESPONSE_FORMAT)
-                .concat("&op=GetPartMetadata&pages=f&names=f")
-                .concat("&id=");
+        String expected =
+                fetcher.getTestUrl()
+                        .concat(buildInfo.biodiversityHeritageApiKey)
+                        .concat(RESPONSE_FORMAT)
+                        .concat("&op=GetPartMetadata&pages=f&names=f")
+                        .concat("&id=");
 
         assertEquals(expected.concat(id), fetcher.getPartMetadataURL(id).toString());
     }
@@ -79,47 +79,60 @@ void getPartMetadaUrl(String id) throws MalformedURLException, URISyntaxExceptio
     @ParameterizedTest
     @ValueSource(strings = {"1234", "4321", "331"})
     void getItemMetadaUrl(String id) throws MalformedURLException, URISyntaxException {
-        String expected = fetcher
-                .getTestUrl()
-                .concat(buildInfo.biodiversityHeritageApiKey)
-                .concat(RESPONSE_FORMAT)
-                .concat("&op=GetItemMetadata&pages=f&ocr=f&ocr=f")
-                .concat("&id=");
+        String expected =
+                fetcher.getTestUrl()
+                        .concat(buildInfo.biodiversityHeritageApiKey)
+                        .concat(RESPONSE_FORMAT)
+                        .concat("&op=GetItemMetadata&pages=f&ocr=f&ocr=f")
+                        .concat("&id=");
 
         assertEquals(expected.concat(id), fetcher.getItemMetadataURL(id).toString());
     }
 
     @Test
     void performSearch() throws FetcherException {
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-            .withField(StandardField.AUTHOR, "Clark, John L. (John Littner)  and Neill, David A. ")
-            .withField(StandardField.JOURNALTITLE, "PhytoKeys")
-            .withField(StandardField.LANGUAGE, "English")
-            .withField(StandardField.PUBLISHER, "Pensoft Publishers")
-            .withField(StandardField.TITLE, "\uFEFFAmanoa condorensis (Phyllanthaceae), a new shrubby species from the Cordillera del Condor in southern Ecuador")
-            .withField(StandardField.URL, "https://www.biodiversitylibrary.org/part/356490")
-            .withField(StandardField.DATE, "2023")
-            .withField(StandardField.VOLUME, "227")
-            .withField(StandardField.PAGES, "89--97")
-            .withField(StandardField.DOI, "10.3897/phytokeys.227.104703");
-
-        assertEquals(expected, fetcher.performSearch("Amanoa condorensis (Phyllanthaceae)").getFirst());
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Clark, John L. (John Littner)  and Neill, David A. ")
+                        .withField(StandardField.JOURNALTITLE, "PhytoKeys")
+                        .withField(StandardField.LANGUAGE, "English")
+                        .withField(StandardField.PUBLISHER, "Pensoft Publishers")
+                        .withField(
+                                StandardField.TITLE,
+                                "\uFEFFAmanoa condorensis (Phyllanthaceae), a new shrubby species from the Cordillera del Condor in southern Ecuador")
+                        .withField(
+                                StandardField.URL,
+                                "https://www.biodiversitylibrary.org/part/356490")
+                        .withField(StandardField.DATE, "2023")
+                        .withField(StandardField.VOLUME, "227")
+                        .withField(StandardField.PAGES, "89--97")
+                        .withField(StandardField.DOI, "10.3897/phytokeys.227.104703");
+
+        assertEquals(
+                expected, fetcher.performSearch("Amanoa condorensis (Phyllanthaceae)").getFirst());
     }
 
     @Test
     void jsonResultToBibEntry() {
-        JSONObject input = new JSONObject("{\n\"BHLType\": \"Part\",\n\"FoundIn\": \"Metadata\",\n\"Volume\": \"3\",\n\"Authors\": [\n{\n\"Name\": \"Dimmock, George,\"\n}\n],\n\"PartUrl\": \"https://www.biodiversitylibrary.org/part/181199\",\n\"PartID\": \"181199\",\n\"Genre\": \"Article\",\n\"Title\": \"The Cocoons of Cionus Scrophulariae\",\n\"ContainerTitle\": \"Psyche.\",\n\"Date\": \"1882\",\n\"PageRange\": \"411--413\"\n}");
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.TITLE, "The Cocoons of Cionus Scrophulariae")
-                .withField(StandardField.AUTHOR, "Dimmock, George, ")
-                .withField(StandardField.PAGES, "411--413")
-                .withField(StandardField.DATE, "1882")
-                .withField(StandardField.JOURNALTITLE, "Psyche.")
-                .withField(StandardField.VOLUME, "3");
+        JSONObject input =
+                new JSONObject(
+                        "{\n\"BHLType\": \"Part\",\n\"FoundIn\": \"Metadata\",\n\"Volume\": \"3\",\n\"Authors\": [\n{\n\"Name\": \"Dimmock, George,\"\n}\n],\n\"PartUrl\": \"https://www.biodiversitylibrary.org/part/181199\",\n\"PartID\": \"181199\",\n\"Genre\": \"Article\",\n\"Title\": \"The Cocoons of Cionus Scrophulariae\",\n\"ContainerTitle\": \"Psyche.\",\n\"Date\": \"1882\",\n\"PageRange\": \"411--413\"\n}");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.TITLE, "The Cocoons of Cionus Scrophulariae")
+                        .withField(StandardField.AUTHOR, "Dimmock, George, ")
+                        .withField(StandardField.PAGES, "411--413")
+                        .withField(StandardField.DATE, "1882")
+                        .withField(StandardField.JOURNALTITLE, "Psyche.")
+                        .withField(StandardField.VOLUME, "3");
 
         assertEquals(expected, fetcher.jsonResultToBibEntry(input));
 
-        input = new JSONObject("""
+        input =
+                new JSONObject(
+                        """
                 {
                             "BHLType": "Item",
                             "FoundIn": "Metadata",
@@ -139,15 +152,20 @@ void jsonResultToBibEntry() {
                             "Genre": "Book",
                             "Title": "Potatoes : the poor man's own crop : illustrated with plates, showing the decay and disease of the potatoe [sic] : with hints to improve the land and life of the poor man : published to aid the Industrial Marlborough Exhibition"
                         }""");
-         expected = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Potatoes : the poor man's own crop : illustrated with plates, showing the decay and disease of the potatoe [sic] : with hints to improve the land and life of the poor man : published to aid the Industrial Marlborough Exhibition")
-                .withField(StandardField.AUTHOR, "George, George ")
-                .withField(StandardField.YEAR, "1861")
-                .withField(StandardField.LOCATION, "Salisbury")
-                .withField(StandardField.PUBLISHER, "Frederick A. Blake,");
+        expected =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(
+                                StandardField.TITLE,
+                                "Potatoes : the poor man's own crop : illustrated with plates, showing the decay and disease of the potatoe [sic] : with hints to improve the land and life of the poor man : published to aid the Industrial Marlborough Exhibition")
+                        .withField(StandardField.AUTHOR, "George, George ")
+                        .withField(StandardField.YEAR, "1861")
+                        .withField(StandardField.LOCATION, "Salisbury")
+                        .withField(StandardField.PUBLISHER, "Frederick A. Blake,");
         assertEquals(expected, fetcher.jsonResultToBibEntry(input));
 
-        input = new JSONObject("""
+        input =
+                new JSONObject(
+                        """
                 {
                             "BHLType": "Item",
                             "FoundIn": "Metadata",
@@ -167,12 +185,13 @@ void jsonResultToBibEntry() {
                             "Genre": "Book",
                             "Title": "The extra cost of producing clean milk."
                         }""");
-        expected = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "The extra cost of producing clean milk.")
-                .withField(StandardField.AUTHOR, "Whitaker, George M. (George Mason) ")
-                .withField(StandardField.YEAR, "1911")
-                .withField(StandardField.LOCATION, "Washington")
-                .withField(StandardField.PUBLISHER, "Government Prining Office,");
+        expected =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "The extra cost of producing clean milk.")
+                        .withField(StandardField.AUTHOR, "Whitaker, George M. (George Mason) ")
+                        .withField(StandardField.YEAR, "1911")
+                        .withField(StandardField.LOCATION, "Washington")
+                        .withField(StandardField.PUBLISHER, "Government Prining Office,");
         assertEquals(expected, fetcher.jsonResultToBibEntry(input));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java
index e1d08456fd4b..bbb6dae79b9c 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java
@@ -1,9 +1,11 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.URL;
-import java.util.Collections;
-import java.util.List;
+import static org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer.NO_EXPLICIT_FIELD;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
@@ -11,43 +13,53 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.Test;
 
-import static org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer.NO_EXPLICIT_FIELD;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
 
 @FetcherTest
 class BvbFetcherTest {
 
     BvbFetcher fetcher = new BvbFetcher();
-    BibEntry bibEntryISBN9783960886402 = new BibEntry(StandardEntryType.Misc)
-            .withField(StandardField.TITLE, "Effective Java")
-            .withField(StandardField.YEAR, "2018")
-            .withField(StandardField.SUBTITLE, "best practices für die Java-Plattform")
-            .withField(StandardField.AUTHOR, "Bloch, Joshua")
-            .withField(StandardField.TITLEADDON, "Joshua Bloch")
-            .withField(StandardField.EDITION, "3. Auflage, Übersetzung der englischsprachigen 3. Originalausgabe 2018")
-            .withFiles(List.of(new LinkedFile("", "http://search.ebscohost.com/login.aspx?direct=true&scope=site&db=nlebk&db=nlabk&AN=1906353", StandardFileType.PDF)))
-            .withField(StandardField.ISBN, "9783960886402")
-            .withField(StandardField.KEYWORDS, "Klassen, Interfaces, Generics, Enums, Annotationen, Lambdas, Streams, Module, parallel, Parallele Programmierung, Serialisierung, funktional, funktionale Programmierung, Java EE, Jakarta EE")
-            .withField(StandardField.ADDRESS, "Heidelberg")
-            .withField(StandardField.PAGETOTAL, "396")
-            .withField(StandardField.PUBLISHER, "{dpunkt.verlag} and {Dpunkt. Verlag (Heidelberg)}");
+    BibEntry bibEntryISBN9783960886402 =
+            new BibEntry(StandardEntryType.Misc)
+                    .withField(StandardField.TITLE, "Effective Java")
+                    .withField(StandardField.YEAR, "2018")
+                    .withField(StandardField.SUBTITLE, "best practices für die Java-Plattform")
+                    .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                    .withField(StandardField.TITLEADDON, "Joshua Bloch")
+                    .withField(
+                            StandardField.EDITION,
+                            "3. Auflage, Übersetzung der englischsprachigen 3. Originalausgabe 2018")
+                    .withFiles(
+                            List.of(
+                                    new LinkedFile(
+                                            "",
+                                            "http://search.ebscohost.com/login.aspx?direct=true&scope=site&db=nlebk&db=nlabk&AN=1906353",
+                                            StandardFileType.PDF)))
+                    .withField(StandardField.ISBN, "9783960886402")
+                    .withField(
+                            StandardField.KEYWORDS,
+                            "Klassen, Interfaces, Generics, Enums, Annotationen, Lambdas, Streams, Module, parallel, Parallele Programmierung, Serialisierung, funktional, funktionale Programmierung, Java EE, Jakarta EE")
+                    .withField(StandardField.ADDRESS, "Heidelberg")
+                    .withField(StandardField.PAGETOTAL, "396")
+                    .withField(
+                            StandardField.PUBLISHER,
+                            "{dpunkt.verlag} and {Dpunkt. Verlag (Heidelberg)}");
 
-    BibEntry bibEntryISBN0134685997 = new BibEntry(StandardEntryType.Misc)
-            .withField(StandardField.TITLE, "Effective Java")
-            .withField(StandardField.YEAR, "2018")
-            .withField(StandardField.AUTHOR, "Bloch, Joshua")
-            .withField(StandardField.TITLEADDON, "Joshua Bloch")
-            .withField(StandardField.EDITION, "Third edition")
-            .withField(StandardField.ISBN, "0134685997")
-            .withField(StandardField.PAGETOTAL, "392")
-            .withField(StandardField.ADDRESS, "Boston")
-            .withField(StandardField.PUBLISHER, "{Addison-Wesley}");
+    BibEntry bibEntryISBN0134685997 =
+            new BibEntry(StandardEntryType.Misc)
+                    .withField(StandardField.TITLE, "Effective Java")
+                    .withField(StandardField.YEAR, "2018")
+                    .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                    .withField(StandardField.TITLEADDON, "Joshua Bloch")
+                    .withField(StandardField.EDITION, "Third edition")
+                    .withField(StandardField.ISBN, "0134685997")
+                    .withField(StandardField.PAGETOTAL, "392")
+                    .withField(StandardField.ADDRESS, "Boston")
+                    .withField(StandardField.PUBLISHER, "{Addison-Wesley}");
 
     @Test
     void performTest() throws Exception {
@@ -55,10 +67,11 @@ void performTest() throws Exception {
         List<BibEntry> result = fetcher.performSearch(searchquery);
         assertFalse(result.isEmpty());
 
-//        System.out.println("Query:\n");
-//        System.out.println(fetcher.getURLForQuery(new StandardSyntaxParser().parse(searchquery, NO_EXPLICIT_FIELD)));
-//        System.out.println("Test result:\n");
-//        result.forEach(entry -> System.out.println(entry.toString()));
+        //        System.out.println("Query:\n");
+        //        System.out.println(fetcher.getURLForQuery(new
+        // StandardSyntaxParser().parse(searchquery, NO_EXPLICIT_FIELD)));
+        //        System.out.println("Test result:\n");
+        //        result.forEach(entry -> System.out.println(entry.toString()));
     }
 
     @Test
@@ -66,7 +79,9 @@ void simpleSearchQueryURLCorrect() throws Exception {
         String query = "java jdk";
         QueryNode luceneQuery = new StandardSyntaxParser().parse(query, NO_EXPLICIT_FIELD);
         URL url = fetcher.getURLForQuery(luceneQuery);
-        assertEquals("http://bvbr.bib-bvb.de:5661/bvb01sru?version=1.1&recordSchema=marcxml&operation=searchRetrieve&query=java%20jdk&maximumRecords=30", url.toString());
+        assertEquals(
+                "http://bvbr.bib-bvb.de:5661/bvb01sru?version=1.1&recordSchema=marcxml&operation=searchRetrieve&query=java%20jdk&maximumRecords=30",
+                url.toString());
     }
 
     @Test
@@ -74,13 +89,17 @@ void complexSearchQueryURLCorrect() throws Exception {
         String query = "title:jdk";
         QueryNode luceneQuery = new StandardSyntaxParser().parse(query, NO_EXPLICIT_FIELD);
         URL url = fetcher.getURLForQuery(luceneQuery);
-        assertEquals("http://bvbr.bib-bvb.de:5661/bvb01sru?version=1.1&recordSchema=marcxml&operation=searchRetrieve&query=jdk&maximumRecords=30", url.toString());
+        assertEquals(
+                "http://bvbr.bib-bvb.de:5661/bvb01sru?version=1.1&recordSchema=marcxml&operation=searchRetrieve&query=jdk&maximumRecords=30",
+                url.toString());
     }
 
     @Test
     void performSearchMatchingMultipleEntries() throws FetcherException {
         List<BibEntry> searchResult = fetcher.performSearch("effective java bloch");
-        assertEquals(List.of(bibEntryISBN9783960886402, bibEntryISBN0134685997), searchResult.subList(0, 2));
+        assertEquals(
+                List.of(bibEntryISBN9783960886402, bibEntryISBN0134685997),
+                searchResult.subList(0, 2));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java
index 9ecb239e06fa..277e2541bf7b 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java
@@ -1,27 +1,26 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
 
 @Disabled("Server not working as of 2024-05-20")
 @FetcherTest
@@ -31,49 +30,69 @@ class CiteSeerTest {
 
     @BeforeAll
     static void ensureCiteSeerIsAvailable() throws Exception {
-        assumeFalse(List.of().equals(new CiteSeer().performSearch("title:\"Rigorous Derivation from Landau-de Gennes Theory to Ericksen-leslie Theory\" AND pageSize:1")));
+        assumeFalse(
+                List.of()
+                        .equals(
+                                new CiteSeer()
+                                        .performSearch(
+                                                "title:\"Rigorous Derivation from Landau-de Gennes Theory to Ericksen-leslie Theory\" AND pageSize:1")));
     }
 
     @Test
     void searchByQueryFindsEntryRigorousDerivation() throws Exception {
         String title = "RIGOROUS DERIVATION FROM LANDAU-DE GENNES THEORY TO ERICKSEN-LESLIE THEORY";
-        BibEntry expected = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.DOI, "68b3fde1aa6354a34061f8811e2050e1b512af26")
-                .withField(StandardField.AUTHOR, "Wang, Wei and Zhang, Pingwen and Zhang, Zhifei")
-                .withField(StandardField.TITLE, title)
-                .withField(StandardField.ABSTRACT, "ar")
-                .withField(StandardField.YEAR, "0")
-                .withField(StandardField.URL, "http://arxiv.org/pdf/1307.0986.pdf");
-
-        List<BibEntry> fetchedEntries = fetcher.performSearch("title:\"Rigorous Derivation from Landau-de Gennes Theory to Ericksen-leslie Theory\" AND pageSize:1");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Misc)
+                        .withField(StandardField.DOI, "68b3fde1aa6354a34061f8811e2050e1b512af26")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Wang, Wei and Zhang, Pingwen and Zhang, Zhifei")
+                        .withField(StandardField.TITLE, title)
+                        .withField(StandardField.ABSTRACT, "ar")
+                        .withField(StandardField.YEAR, "0")
+                        .withField(StandardField.URL, "http://arxiv.org/pdf/1307.0986.pdf");
+
+        List<BibEntry> fetchedEntries =
+                fetcher.performSearch(
+                        "title:\"Rigorous Derivation from Landau-de Gennes Theory to Ericksen-leslie Theory\" AND pageSize:1");
         assertEquals(Collections.singletonList(expected), fetchedEntries);
     }
 
     @Test
     void searchByQueryFindsEntryCopingTheoryAndResearch() throws Exception {
-        BibEntry expected = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.DOI, "c16e0888b17cb2c689e5dfa4e2be4fdffb23869e")
-                .withField(StandardField.AUTHOR, "Lazarus, Richard S.")
-                .withField(StandardField.TITLE, "Coping theory and research: Past, present, and future")
-                .withField(StandardField.ABSTRACT, "In this essay in honor of Donald Oken, I emphasize coping as a key concept for theory and research on adaptation and health. My focus will be the contrasts between two approaches to coping, one that emphasizes")
-                .withField(StandardField.YEAR, "1993")
-                .withField(StandardField.VENUE, "Psychosomatic Medicine")
-                .withField(StandardField.URL, "http://intl.psychosomaticmedicine.org/content/55/3/234.full.pdf");
-
-        List<BibEntry> fetchedEntries = fetcher.performSearch("title:\"Coping Theory and Research: Past Present and Future\" AND pageSize:1");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Misc)
+                        .withField(StandardField.DOI, "c16e0888b17cb2c689e5dfa4e2be4fdffb23869e")
+                        .withField(StandardField.AUTHOR, "Lazarus, Richard S.")
+                        .withField(
+                                StandardField.TITLE,
+                                "Coping theory and research: Past, present, and future")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "In this essay in honor of Donald Oken, I emphasize coping as a key concept for theory and research on adaptation and health. My focus will be the contrasts between two approaches to coping, one that emphasizes")
+                        .withField(StandardField.YEAR, "1993")
+                        .withField(StandardField.VENUE, "Psychosomatic Medicine")
+                        .withField(
+                                StandardField.URL,
+                                "http://intl.psychosomaticmedicine.org/content/55/3/234.full.pdf");
+
+        List<BibEntry> fetchedEntries =
+                fetcher.performSearch(
+                        "title:\"Coping Theory and Research: Past Present and Future\" AND pageSize:1");
         assertEquals(Collections.singletonList(expected), fetchedEntries);
     }
 
     /*
-    * CiteSeer seems to only apply year ranges effectively when we search for entries
-    * with associated pdfs, year values do not accurately reflect realistic values
-    * */
+     * CiteSeer seems to only apply year ranges effectively when we search for entries
+     * with associated pdfs, year values do not accurately reflect realistic values
+     * */
     @Disabled
     @Test
     void searchWithSortingByYear() throws FetcherException {
         Optional<String> expected = Optional.of("1552");
-        List<BibEntry> fetchedEntries = fetcher.performSearch("title:Theory AND year:1552 AND sortBy:Year");
-        for (BibEntry actual: fetchedEntries) {
+        List<BibEntry> fetchedEntries =
+                fetcher.performSearch("title:Theory AND year:1552 AND sortBy:Year");
+        for (BibEntry actual : fetchedEntries) {
             if (actual.hasField(StandardField.YEAR)) {
                 assertEquals(expected, actual.getField(StandardField.YEAR));
             }
@@ -82,15 +101,19 @@ void searchWithSortingByYear() throws FetcherException {
 
     @Test
     void searchWithSortingByYearAndYearRange() throws FetcherException {
-        List<BibEntry> fetchedEntries = fetcher.performSearch("title:Theory AND year-range:2002-2012 AND sortBy:Year");
+        List<BibEntry> fetchedEntries =
+                fetcher.performSearch("title:Theory AND year-range:2002-2012 AND sortBy:Year");
         assertNotEquals(List.of(), fetchedEntries);
         Iterator<BibEntry> fetchedEntriesIter = fetchedEntries.iterator();
         BibEntry recentEntry = fetchedEntriesIter.next();
         while (fetchedEntriesIter.hasNext()) {
             BibEntry laterEntry = fetchedEntriesIter.next();
-            if (recentEntry.hasField(StandardField.YEAR) && laterEntry.hasField(StandardField.YEAR)) {
-                Integer recentYear = Integer.parseInt(recentEntry.getField(StandardField.YEAR).orElse("0"));
-                Integer laterYear = Integer.parseInt(laterEntry.getField(StandardField.YEAR).orElse("0"));
+            if (recentEntry.hasField(StandardField.YEAR)
+                    && laterEntry.hasField(StandardField.YEAR)) {
+                Integer recentYear =
+                        Integer.parseInt(recentEntry.getField(StandardField.YEAR).orElse("0"));
+                Integer laterYear =
+                        Integer.parseInt(laterEntry.getField(StandardField.YEAR).orElse("0"));
                 assertFalse(recentYear < laterYear);
             }
             recentEntry = laterEntry;
@@ -99,18 +122,30 @@ void searchWithSortingByYearAndYearRange() throws FetcherException {
 
     @Test
     void findByIdAsDOI() throws FetcherException, IOException {
-        BibEntry entry = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.DOI, "c16e0888b17cb2c689e5dfa4e2be4fdffb23869e");
-        Optional<URL> expected = Optional.of(URI.create("https://citeseerx.ist.psu.edu/document?repid=rep1&type=pdf&doi=c16e0888b17cb2c689e5dfa4e2be4fdffb23869e").toURL());
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Misc)
+                        .withField(StandardField.DOI, "c16e0888b17cb2c689e5dfa4e2be4fdffb23869e");
+        Optional<URL> expected =
+                Optional.of(
+                        URI.create(
+                                        "https://citeseerx.ist.psu.edu/document?repid=rep1&type=pdf&doi=c16e0888b17cb2c689e5dfa4e2be4fdffb23869e")
+                                .toURL());
         assertEquals(expected, fetcher.findFullText(entry));
     }
 
     @Test
     void findBySourceURL() throws FetcherException, IOException {
-        BibEntry entry = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.DOI, "")
-                .withField(StandardField.URL, "http://intl.psychosomaticmedicine.org/content/55/3/234.full.pdf");
-        Optional<URL> expected = Optional.of(URI.create("http://intl.psychosomaticmedicine.org/content/55/3/234.full.pdf").toURL());
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Misc)
+                        .withField(StandardField.DOI, "")
+                        .withField(
+                                StandardField.URL,
+                                "http://intl.psychosomaticmedicine.org/content/55/3/234.full.pdf");
+        Optional<URL> expected =
+                Optional.of(
+                        URI.create(
+                                        "http://intl.psychosomaticmedicine.org/content/55/3/234.full.pdf")
+                                .toURL());
         assertEquals(expected, fetcher.findFullText(entry));
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcherTest.java
index 39359444faef..250470b3a4a0 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcherTest.java
@@ -1,13 +1,11 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;
+import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer;
@@ -16,17 +14,18 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
-import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;
-import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @Disabled("https://github.com/JabRef/jabref-issue-melting-pot/issues/259")
 @FetcherTest
@@ -35,7 +34,8 @@ class CollectionOfComputerScienceBibliographiesFetcherTest {
 
     @BeforeEach
     void setUp() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         fetcher = new CollectionOfComputerScienceBibliographiesFetcher(importFormatPreferences);
     }
@@ -46,64 +46,97 @@ void getNameReturnsCorrectName() {
     }
 
     @Test
-    void getUrlForQueryReturnsCorrectUrl() throws MalformedURLException, URISyntaxException, FetcherException, QueryNodeParseException {
+    void getUrlForQueryReturnsCorrectUrl()
+            throws MalformedURLException,
+                    URISyntaxException,
+                    FetcherException,
+                    QueryNodeParseException {
         String query = "java jdk";
-        URL url = fetcher.getURLForQuery(new StandardSyntaxParser().parse(query, AbstractQueryTransformer.NO_EXPLICIT_FIELD));
-        assertEquals("http://liinwww.ira.uka.de/bibliography/rss?query=java+jdk&sort=score", url.toString());
+        URL url =
+                fetcher.getURLForQuery(
+                        new StandardSyntaxParser()
+                                .parse(query, AbstractQueryTransformer.NO_EXPLICIT_FIELD));
+        assertEquals(
+                "http://liinwww.ira.uka.de/bibliography/rss?query=java+jdk&sort=score",
+                url.toString());
     }
 
     @Test
     void performSearchReturnsMatchingMultipleEntries() throws FetcherException {
         List<BibEntry> searchResult = fetcher.performSearch("jabref");
 
-        BibEntry secondBibEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("oai:DiVA.org:lnu-68408")
-                .withField(StandardField.ISBN, "978-1-4503-5217-8")
-                .withField(StandardField.DOI, "10.1145/3129790.3129810")
-                .withField(new UnknownField("ISI"), "000505046100032")
-                .withField(new UnknownField("Scopus"), "2-s2.0-85037741580")
-                .withField(new UnknownField("subject"), "Software Architecture; Code Churn; Open Source; Architecrual Erosion; Technical Debt; Software Engineering; Programvaruteknik")
-                .withField(new UnknownField("relation"), "ACM International Conference Proceeding Series; ECSA '17~Proceedings of the 11th European Conference on Software Architecture : Companion Proceedings, p. 152-158")
-                .withField(StandardField.ABSTRACT, "The open source application JabRef has existed since" +
-                        " 2003. In 2015, the developers decided to make an" +
-                        " architectural refactoring as continued development was" +
-                        " deemed too demanding. The developers also introduced" +
-                        " Static Architecture Conformance Checking (SACC) to" +
-                        " prevent violations to the intended architecture." +
-                        " Measurements mined from source code repositories such" +
-                        " as code churn and code ownership has been linked to" +
-                        " several problems, for example fault proneness, security" +
-                        " vulnerabilities, code smells, and degraded" +
-                        " maintainability. The root cause of such problems can be" +
-                        " architectural. To determine the impact of the" +
-                        " refactoring of JabRef, we measure the code churn and" +
-                        " code ownership before and after the refactoring and" +
-                        " find that large files with violations had a" +
-                        " significantly higher code churn than large files" +
-                        " without violations before the refactoring. After the" +
-                        " refactoring, the files that had violations show a more" +
-                        " normal code churn. We find no such effect on code" +
-                        " ownership. We conclude that files that contain" +
-                        " violations detectable by SACC methods are connected to" +
-                        " higher than normal code churn.")
-                .withField(StandardField.TYPE, "info:eu-repo/semantics/conferenceObject")
-                .withField(new UnknownField("description"), "Information and Software Qualtiy")
-                .withField(StandardField.PAGES, "152--158")
-                .withField(new UnknownField("bibsource"), "OAI-PMH server at www.diva-portal.org")
-                .withField(new UnknownField("rights"), "info:eu-repo/semantics/openAccess")
-                .withField(StandardField.URL, "http://urn.kb.se/resolve?urn=urn:nbn:se:lnu:diva-68408")
-                .withField(new UnknownField("oai"), "oai:DiVA.org:lnu-68408")
-                .withField(StandardField.TITLE, "The relationship of code churn and architectural violations in the open source software JabRef")
-                .withField(StandardField.PUBLISHER, "Linn{\\'e}universitetet, Institutionen f{\\\"o}r datavetenskap (DV); Linn{\\'e}universitetet, Institutionen f{\\\"o}r datavetenskap (DV); Linn{\\'e}universitetet, Institutionen f{\\\"o}r datavetenskap (DV); New York, NY, USA")
-                .withField(StandardField.LANGUAGE, "eng")
-                .withField(StandardField.AUTHOR, "Tobias Olsson and Morgan Ericsson and Anna Wingkvist")
-                .withField(StandardField.YEAR, "2017");
+        BibEntry secondBibEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("oai:DiVA.org:lnu-68408")
+                        .withField(StandardField.ISBN, "978-1-4503-5217-8")
+                        .withField(StandardField.DOI, "10.1145/3129790.3129810")
+                        .withField(new UnknownField("ISI"), "000505046100032")
+                        .withField(new UnknownField("Scopus"), "2-s2.0-85037741580")
+                        .withField(
+                                new UnknownField("subject"),
+                                "Software Architecture; Code Churn; Open Source; Architecrual Erosion; Technical Debt; Software Engineering; Programvaruteknik")
+                        .withField(
+                                new UnknownField("relation"),
+                                "ACM International Conference Proceeding Series; ECSA '17~Proceedings of the 11th European Conference on Software Architecture : Companion Proceedings, p. 152-158")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "The open source application JabRef has existed since"
+                                        + " 2003. In 2015, the developers decided to make an"
+                                        + " architectural refactoring as continued development was"
+                                        + " deemed too demanding. The developers also introduced"
+                                        + " Static Architecture Conformance Checking (SACC) to"
+                                        + " prevent violations to the intended architecture."
+                                        + " Measurements mined from source code repositories such"
+                                        + " as code churn and code ownership has been linked to"
+                                        + " several problems, for example fault proneness, security"
+                                        + " vulnerabilities, code smells, and degraded"
+                                        + " maintainability. The root cause of such problems can be"
+                                        + " architectural. To determine the impact of the"
+                                        + " refactoring of JabRef, we measure the code churn and"
+                                        + " code ownership before and after the refactoring and"
+                                        + " find that large files with violations had a"
+                                        + " significantly higher code churn than large files"
+                                        + " without violations before the refactoring. After the"
+                                        + " refactoring, the files that had violations show a more"
+                                        + " normal code churn. We find no such effect on code"
+                                        + " ownership. We conclude that files that contain"
+                                        + " violations detectable by SACC methods are connected to"
+                                        + " higher than normal code churn.")
+                        .withField(StandardField.TYPE, "info:eu-repo/semantics/conferenceObject")
+                        .withField(
+                                new UnknownField("description"), "Information and Software Qualtiy")
+                        .withField(StandardField.PAGES, "152--158")
+                        .withField(
+                                new UnknownField("bibsource"),
+                                "OAI-PMH server at www.diva-portal.org")
+                        .withField(new UnknownField("rights"), "info:eu-repo/semantics/openAccess")
+                        .withField(
+                                StandardField.URL,
+                                "http://urn.kb.se/resolve?urn=urn:nbn:se:lnu:diva-68408")
+                        .withField(new UnknownField("oai"), "oai:DiVA.org:lnu-68408")
+                        .withField(
+                                StandardField.TITLE,
+                                "The relationship of code churn and architectural violations in the open source software JabRef")
+                        .withField(
+                                StandardField.PUBLISHER,
+                                "Linn{\\'e}universitetet, Institutionen f{\\\"o}r datavetenskap (DV); Linn{\\'e}universitetet, Institutionen f{\\\"o}r datavetenskap (DV); Linn{\\'e}universitetet, Institutionen f{\\\"o}r datavetenskap (DV); New York, NY, USA")
+                        .withField(StandardField.LANGUAGE, "eng")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Tobias Olsson and Morgan Ericsson and Anna Wingkvist")
+                        .withField(StandardField.YEAR, "2017");
 
-        // Checking a subset, because the query "jabref" is generic and returns a changing result set
-        assertEquals(Set.of(secondBibEntry), searchResult.stream().filter(bibEntry -> {
-            String citeKey = bibEntry.getCitationKey().get();
-            return citeKey.equals(secondBibEntry.getCitationKey().get());
-        }).collect(Collectors.toSet()));
+        // Checking a subset, because the query "jabref" is generic and returns a changing result
+        // set
+        assertEquals(
+                Set.of(secondBibEntry),
+                searchResult.stream()
+                        .filter(
+                                bibEntry -> {
+                                    String citeKey = bibEntry.getCitationKey().get();
+                                    return citeKey.equals(secondBibEntry.getCitationKey().get());
+                                })
+                        .collect(Collectors.toSet()));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParserTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParserTest.java
index af33cdfca8dd..a3ed076b1f5b 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParserTest.java
@@ -1,23 +1,22 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.bibtex.BibEntryAssert;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 @FetcherTest
 @Disabled
@@ -25,31 +24,48 @@ class CollectionOfComputerScienceBibliographiesParserTest {
 
     @Test
     void parseEntriesReturnsEmptyListIfXmlHasNoResults() throws Exception {
-        parseXmlAndCheckResults("collection_of_computer_science_bibliographies_empty_result.xml", Collections.emptyList());
+        parseXmlAndCheckResults(
+                "collection_of_computer_science_bibliographies_empty_result.xml",
+                Collections.emptyList());
     }
 
     @Disabled("Parse/fetcher remote side does not return anything valid for the link")
     @Test
     void parseEntriesReturnsOneBibEntryInListIfXmlHasSingleResult() throws Exception {
-        parseXmlAndCheckResults("collection_of_computer_science_bibliographies_single_result.xml", Collections.singletonList("collection_of_computer_science_bibliographies_single_result.bib"));
+        parseXmlAndCheckResults(
+                "collection_of_computer_science_bibliographies_single_result.xml",
+                Collections.singletonList(
+                        "collection_of_computer_science_bibliographies_single_result.bib"));
     }
 
     @Test
     void parseEntriesReturnsMultipleBibEntriesInListIfXmlHasMultipleResults() throws Exception {
-        parseXmlAndCheckResults("collection_of_computer_science_bibliographies_multiple_results.xml", Arrays.asList("collection_of_computer_science_bibliographies_multiple_results_first_result.bib", "collection_of_computer_science_bibliographies_multiple_results_second_result.bib"));
+        parseXmlAndCheckResults(
+                "collection_of_computer_science_bibliographies_multiple_results.xml",
+                Arrays.asList(
+                        "collection_of_computer_science_bibliographies_multiple_results_first_result.bib",
+                        "collection_of_computer_science_bibliographies_multiple_results_second_result.bib"));
     }
 
-    private void parseXmlAndCheckResults(String xmlName, List<String> resourceNames) throws Exception {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+    private void parseXmlAndCheckResults(String xmlName, List<String> resourceNames)
+            throws Exception {
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
-        InputStream is = CollectionOfComputerScienceBibliographiesParserTest.class.getResourceAsStream(xmlName);
-        CollectionOfComputerScienceBibliographiesParser parser = new CollectionOfComputerScienceBibliographiesParser(importFormatPreferences);
+        InputStream is =
+                CollectionOfComputerScienceBibliographiesParserTest.class.getResourceAsStream(
+                        xmlName);
+        CollectionOfComputerScienceBibliographiesParser parser =
+                new CollectionOfComputerScienceBibliographiesParser(importFormatPreferences);
         List<BibEntry> entries = parser.parseEntries(is);
         assertEquals(resourceNames.size(), entries.size());
         assertNotNull(entries);
         for (int i = 0; i < resourceNames.size(); i++) {
-            BibEntryAssert.assertEquals(CollectionOfComputerScienceBibliographiesParserTest.class, resourceNames.get(i), entries.get(i));
+            BibEntryAssert.assertEquals(
+                    CollectionOfComputerScienceBibliographiesParserTest.class,
+                    resourceNames.get(i),
+                    entries.get(i));
         }
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
index 02eb4c2f14ca..327158f0bfb2 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
@@ -1,7 +1,8 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.importer.CompositeIdFetcher;
 import org.jabref.logic.importer.FetcherException;
@@ -12,7 +13,6 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -20,9 +20,8 @@
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 /**
  * Tests the CompositeIdFetcher, for which Fetchers implementing the
@@ -38,8 +37,12 @@ public static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIdentifie
                 Arguments.arguments(
                         "performSearchByIdReturnsCorrectEntryForArXivId",
                         new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Cunningham, Emily C. and Sanderson, Robyn E. and Johnston, Kathryn V. and Panithanpaisal, Nondh and Ness, Melissa K. and Wetzel, Andrew and Loebman, Sarah R. and Escala, Ivanna and Horta, Danny and Faucher-Giguère, Claude-André")
-                                .withField(StandardField.TITLE, "Reading the CARDs: the Imprint of Accretion History in the Chemical Abundances of the Milky Way's Stellar Halo")
+                                .withField(
+                                        StandardField.AUTHOR,
+                                        "Cunningham, Emily C. and Sanderson, Robyn E. and Johnston, Kathryn V. and Panithanpaisal, Nondh and Ness, Melissa K. and Wetzel, Andrew and Loebman, Sarah R. and Escala, Ivanna and Horta, Danny and Faucher-Giguère, Claude-André")
+                                .withField(
+                                        StandardField.TITLE,
+                                        "Reading the CARDs: the Imprint of Accretion History in the Chemical Abundances of the Milky Way's Stellar Halo")
                                 .withField(StandardField.DATE, "2021-10-06")
                                 .withField(StandardField.YEAR, "2021")
                                 .withField(StandardField.MONTH, "#aug#")
@@ -49,18 +52,25 @@ public static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIdentifie
                                 .withField(StandardField.PUBLISHER, "American Astronomical Society")
                                 .withField(StandardField.JOURNAL, "The Astrophysical Journal")
                                 .withField(StandardField.PAGES, "172")
-                                .withField(StandardField.ABSTRACT, "In the era of large-scale spectroscopic surveys in the Local Group (LG), we can explore using chemical abundances of halo stars to study the star formation and chemical enrichment histories of the dwarf galaxy progenitors of the Milky Way (MW) and M31 stellar halos. In this paper, we investigate using the Chemical Abundance Ratio Distributions (CARDs) of seven stellar halos from the Latte suite of FIRE-2 simulations. We attempt to infer galaxies' assembly histories by modelling the CARDs of the stellar halos of the Latte galaxies as a linear combination of template CARDs from disrupted dwarfs, with different stellar masses $M_{\\star}$ and quenching times $t_{100}$. We present a method for constructing these templates using present-day dwarf galaxies. For four of the seven Latte halos studied in this work, we recover the mass spectrum of accreted dwarfs to a precision of $<10\\%$. For the fraction of mass accreted as a function of $t_{100}$, we find residuals of $20-30\\%$ for five of the seven simulations. We discuss the failure modes of this method, which arise from the diversity of star formation and chemical enrichment histories dwarf galaxies can take. These failure cases can be robustly identified by the high model residuals. Though the CARDs modeling method does not successfully infer the assembly histories in these cases, the CARDs of these disrupted dwarfs contain signatures of their unusual formation histories. Our results are promising for using CARDs to learn more about the histories of the progenitors of the MW and M31 stellar halos.")
+                                .withField(
+                                        StandardField.ABSTRACT,
+                                        "In the era of large-scale spectroscopic surveys in the Local Group (LG), we can explore using chemical abundances of halo stars to study the star formation and chemical enrichment histories of the dwarf galaxy progenitors of the Milky Way (MW) and M31 stellar halos. In this paper, we investigate using the Chemical Abundance Ratio Distributions (CARDs) of seven stellar halos from the Latte suite of FIRE-2 simulations. We attempt to infer galaxies' assembly histories by modelling the CARDs of the stellar halos of the Latte galaxies as a linear combination of template CARDs from disrupted dwarfs, with different stellar masses $M_{\\star}$ and quenching times $t_{100}$. We present a method for constructing these templates using present-day dwarf galaxies. For four of the seven Latte halos studied in this work, we recover the mass spectrum of accreted dwarfs to a precision of $<10\\%$. For the fraction of mass accreted as a function of $t_{100}$, we find residuals of $20-30\\%$ for five of the seven simulations. We discuss the failure modes of this method, which arise from the diversity of star formation and chemical enrichment histories dwarf galaxies can take. These failure cases can be robustly identified by the high model residuals. Though the CARDs modeling method does not successfully infer the assembly histories in these cases, the CARDs of these disrupted dwarfs contain signatures of their unusual formation histories. Our results are promising for using CARDs to learn more about the histories of the progenitors of the MW and M31 stellar halos.")
                                 .withField(StandardField.DOI, "10.3847/1538-4357/ac78ea")
                                 .withField(StandardField.EPRINT, "2110.02957")
                                 .withField(StandardField.DOI, "10.3847/1538-4357/ac78ea")
-                                .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/2110.02957v1:PDF")
+                                .withField(
+                                        StandardField.FILE,
+                                        ":http\\://arxiv.org/pdf/2110.02957v1:PDF")
                                 .withField(StandardField.EPRINTTYPE, "arXiv")
                                 .withField(StandardField.EPRINTCLASS, "astro-ph.GA")
-                                .withField(StandardField.KEYWORDS, "Astrophysics of Galaxies (astro-ph.GA), FOS: Physical sciences")
+                                .withField(
+                                        StandardField.KEYWORDS,
+                                        "Astrophysics of Galaxies (astro-ph.GA), FOS: Physical sciences")
                                 .withField(InternalField.KEY_FIELD, "Cunningham_2022")
-                                .withField(new UnknownField("copyright"), "Creative Commons Attribution 4.0 International"),
-                        "arXiv:2110.02957"
-                ),
+                                .withField(
+                                        new UnknownField("copyright"),
+                                        "Creative Commons Attribution 4.0 International"),
+                        "arXiv:2110.02957"),
                 /* disabled, because Iacr does not work
                 Arguments.arguments(
                         "performSearchByIdReturnsCorrectEntryForIacrEprintId",
@@ -85,13 +95,14 @@ public static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIdentifie
                                 .withField(StandardField.PUBLISHER, "Addison-Wesley")
                                 .withField(StandardField.YEAR, "2018")
                                 .withField(StandardField.ISBN, "9780134685991")
-                                .withField(StandardField.NOTE, "Titelzusätze auf dem Umschlag: \"Updated for Java 9. Best practices for ... the Java platform\"")
+                                .withField(
+                                        StandardField.NOTE,
+                                        "Titelzusätze auf dem Umschlag: \"Updated for Java 9. Best practices for ... the Java platform\"")
                                 .withField(StandardField.PAGETOTAL, "392")
                                 .withField(new UnknownField("ppn_gvk"), "100121840X")
                                 .withField(StandardField.EDITION, "Third edition")
                                 .withField(StandardField.ADDRESS, "Boston"),
-                        "9780134685991"
-                ),
+                        "9780134685991"),
                 Arguments.arguments(
                         "performSearchByIdReturnsCorrectEntryForDoiId",
                         new BibEntry(StandardEntryType.Book)
@@ -103,14 +114,13 @@ public static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIdentifie
                                 .withField(StandardField.ISBN, "9781118257517")
                                 .withField(StandardField.DOI, "10.1002/9781118257517")
                                 .withCitationKey("Burd_2011"),
-                        "10.1002/9781118257517"
-                )
-        );
+                        "10.1002/9781118257517"));
     }
 
     @BeforeEach
     void setUp() throws Exception {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         // Needed for ArXiv Fetcher keyword processing
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         compositeIdFetcher = new CompositeIdFetcher(importFormatPreferences);
@@ -118,13 +128,15 @@ void setUp() throws Exception {
 
     @ParameterizedTest
     @ValueSource(strings = "arZiv:2110.02957")
-    void performSearchByIdReturnsEmptyForInvalidId(String groundInvalidArXivId) throws FetcherException {
+    void performSearchByIdReturnsEmptyForInvalidId(String groundInvalidArXivId)
+            throws FetcherException {
         assertEquals(Optional.empty(), compositeIdFetcher.performSearchById(groundInvalidArXivId));
     }
 
     @ParameterizedTest(name = "{index} {0}")
     @MethodSource
-    void performSearchByIdReturnsCorrectEntryForIdentifier(String name, BibEntry bibEntry, String identifier) throws FetcherException {
+    void performSearchByIdReturnsCorrectEntryForIdentifier(
+            String name, BibEntry bibEntry, String identifier) throws FetcherException {
         assertEquals(Optional.of(bibEntry), compositeIdFetcher.performSearchById(identifier));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
index cab7679bf567..b7868f7e0497 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -19,7 +18,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.support.DisabledOnCIServer;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -28,30 +26,35 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Stream;
 
 @FetcherTest
 @DisabledOnCIServer("Produces too many requests on CI")
 class CompositeSearchBasedFetcherTest {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CompositeSearchBasedFetcherTest.class);
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(CompositeSearchBasedFetcherTest.class);
 
-    private final ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+    private final ImporterPreferences importerPreferences =
+            mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
 
     @Test
     void createCompositeFetcherWithNullSet() {
-        assertThrows(IllegalArgumentException.class,
+        assertThrows(
+                IllegalArgumentException.class,
                 () -> new CompositeSearchBasedFetcher(null, importerPreferences, 0));
     }
 
     @Test
     void performSearchWithoutFetchers() throws Exception {
         Set<SearchBasedFetcher> empty = new HashSet<>();
-        CompositeSearchBasedFetcher fetcher = new CompositeSearchBasedFetcher(empty, importerPreferences, Integer.MAX_VALUE);
+        CompositeSearchBasedFetcher fetcher =
+                new CompositeSearchBasedFetcher(empty, importerPreferences, Integer.MAX_VALUE);
 
         List<BibEntry> result = fetcher.performSearch("quantum");
 
@@ -61,20 +64,25 @@ void performSearchWithoutFetchers() throws Exception {
     @ParameterizedTest(name = "Perform Search on empty query.")
     @MethodSource("performSearchParameters")
     void performSearchOnEmptyQuery(Set<SearchBasedFetcher> fetchers) throws Exception {
-        CompositeSearchBasedFetcher compositeFetcher = new CompositeSearchBasedFetcher(fetchers, importerPreferences, Integer.MAX_VALUE);
+        CompositeSearchBasedFetcher compositeFetcher =
+                new CompositeSearchBasedFetcher(fetchers, importerPreferences, Integer.MAX_VALUE);
 
         List<BibEntry> queryResult = compositeFetcher.performSearch("");
 
         assertEquals(queryResult, Collections.emptyList());
     }
 
-    @ParameterizedTest(name = "Perform search on query \"quantum\". Using the CompositeFetcher of the following " +
-            "Fetchers: {arguments}")
+    @ParameterizedTest(
+            name =
+                    "Perform search on query \"quantum\". Using the CompositeFetcher of the following "
+                            + "Fetchers: {arguments}")
     @MethodSource("performSearchParameters")
     void performSearchOnNonEmptyQuery(Set<SearchBasedFetcher> fetchers) throws Exception {
-        CompositeSearchBasedFetcher compositeFetcher = new CompositeSearchBasedFetcher(fetchers, importerPreferences, Integer.MAX_VALUE);
+        CompositeSearchBasedFetcher compositeFetcher =
+                new CompositeSearchBasedFetcher(fetchers, importerPreferences, Integer.MAX_VALUE);
         FieldPreferences fieldPreferences = mock(FieldPreferences.class);
-        when(fieldPreferences.getNonWrappableFields()).thenReturn(FXCollections.observableArrayList());
+        when(fieldPreferences.getNonWrappableFields())
+                .thenReturn(FXCollections.observableArrayList());
         ImportCleanup cleanup = ImportCleanup.targeting(BibDatabaseMode.BIBTEX, fieldPreferences);
 
         List<BibEntry> compositeResult = compositeFetcher.performSearch("quantum");
@@ -82,7 +90,9 @@ void performSearchOnNonEmptyQuery(Set<SearchBasedFetcher> fetchers) throws Excep
             try {
                 List<BibEntry> fetcherResult = fetcher.performSearch("quantum");
                 fetcherResult.forEach(cleanup::doPostCleanup);
-                assertTrue(compositeResult.containsAll(fetcherResult), "Did not contain " + fetcherResult);
+                assertTrue(
+                        compositeResult.containsAll(fetcherResult),
+                        "Did not contain " + fetcherResult);
             } catch (FetcherException e) {
                 /* We catch the Fetcher exception here, since the failing fetcher also fails in the CompositeFetcher
                  * and just leads to no additional results in the returned list. Therefore, the test should not fail
@@ -99,25 +109,27 @@ void performSearchOnNonEmptyQuery(Set<SearchBasedFetcher> fetchers) throws Excep
      * @return A stream of Arguments wrapping set of fetchers.
      */
     static Stream<Arguments> performSearchParameters() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
         when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
         List<Set<SearchBasedFetcher>> fetcherParameters = new ArrayList<>();
 
-        List<SearchBasedFetcher> list = List.of(
-                new ArXivFetcher(importFormatPreferences),
-                new INSPIREFetcher(importFormatPreferences),
-                new GvkFetcher(importFormatPreferences),
-                new AstrophysicsDataSystem(importFormatPreferences, importerPreferences),
-                new MathSciNet(importFormatPreferences),
-                new ZbMATH(importFormatPreferences),
-                new GoogleScholar(importFormatPreferences),
-                new DBLPFetcher(importFormatPreferences),
-                new SpringerFetcher(importerPreferences),
-                new CrossRef(),
-                new CiteSeer(),
-                new DOAJFetcher(importFormatPreferences),
-                new IEEE(importFormatPreferences, importerPreferences));
+        List<SearchBasedFetcher> list =
+                List.of(
+                        new ArXivFetcher(importFormatPreferences),
+                        new INSPIREFetcher(importFormatPreferences),
+                        new GvkFetcher(importFormatPreferences),
+                        new AstrophysicsDataSystem(importFormatPreferences, importerPreferences),
+                        new MathSciNet(importFormatPreferences),
+                        new ZbMATH(importFormatPreferences),
+                        new GoogleScholar(importFormatPreferences),
+                        new DBLPFetcher(importFormatPreferences),
+                        new SpringerFetcher(importerPreferences),
+                        new CrossRef(),
+                        new CiteSeer(),
+                        new DOAJFetcher(importFormatPreferences),
+                        new IEEE(importFormatPreferences, importerPreferences));
 
         /* Disabled due to an issue regarding comparison: Title fields of the entries that otherwise are equivalent differ
          * due to different JAXBElements.
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java
index 98b048db92a9..f03eaeaff0c4 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java
@@ -1,8 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Collections;
-import java.util.Locale;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherException;
@@ -10,12 +9,12 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.Optional;
 
 @FetcherTest
 class CrossRefTest {
@@ -29,7 +28,9 @@ void setUp() throws Exception {
 
         barrosEntry = new BibEntry();
         barrosEntry.setField(StandardField.TITLE, "Service Interaction Patterns");
-        barrosEntry.setField(StandardField.AUTHOR, "Alistair Barros and Marlon Dumas and Arthur H. M. ter Hofstede");
+        barrosEntry.setField(
+                StandardField.AUTHOR,
+                "Alistair Barros and Marlon Dumas and Arthur H. M. ter Hofstede");
         barrosEntry.setField(StandardField.YEAR, "2005");
         barrosEntry.setField(StandardField.PUBLISHER, "Springer Berlin Heidelberg");
         barrosEntry.setField(StandardField.DOI, "10.1007/11538394_20");
@@ -41,24 +42,34 @@ void setUp() throws Exception {
     void findExactData() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "Service Interaction Patterns");
-        entry.setField(StandardField.AUTHOR, "Barros, Alistair and Dumas, Marlon and Arthur H.M. ter Hofstede");
+        entry.setField(
+                StandardField.AUTHOR,
+                "Barros, Alistair and Dumas, Marlon and Arthur H.M. ter Hofstede");
         entry.setField(StandardField.YEAR, "2005");
-        assertEquals("10.1007/11538394_20", fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH));
+        assertEquals(
+                "10.1007/11538394_20",
+                fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH));
     }
 
     @Test
     void findMissingAuthor() throws Exception {
         BibEntry entry = new BibEntry();
-        entry.setField(StandardField.TITLE, "Towards Application Portability in Platform as a Service");
+        entry.setField(
+                StandardField.TITLE, "Towards Application Portability in Platform as a Service");
         entry.setField(StandardField.AUTHOR, "Stefan Kolb");
-        assertEquals("10.1109/sose.2014.26", fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH));
+        assertEquals(
+                "10.1109/sose.2014.26",
+                fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH));
     }
 
     @Test
     void findTitleOnly() throws Exception {
         BibEntry entry = new BibEntry();
-        entry.setField(StandardField.TITLE, "Towards Application Portability in Platform as a Service");
-        assertEquals("10.1109/sose.2014.26", fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH));
+        entry.setField(
+                StandardField.TITLE, "Towards Application Portability in Platform as a Service");
+        assertEquals(
+                "10.1109/sose.2014.26",
+                fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH));
     }
 
     @Test
@@ -72,15 +83,21 @@ void notFindIncompleteTitle() throws Exception {
     @Test
     void acceptTitleUnderThreshold() throws Exception {
         BibEntry entry = new BibEntry();
-        entry.setField(StandardField.TITLE, "Towards Application Portability in Platform as a Service----");
+        entry.setField(
+                StandardField.TITLE,
+                "Towards Application Portability in Platform as a Service----");
         entry.setField(StandardField.AUTHOR, "Stefan Kolb and Guido Wirtz");
-        assertEquals("10.1109/sose.2014.26", fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH));
+        assertEquals(
+                "10.1109/sose.2014.26",
+                fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH));
     }
 
     @Test
     void notAcceptTitleOverThreshold() throws Exception {
         BibEntry entry = new BibEntry();
-        entry.setField(StandardField.TITLE, "Towards Application Portability in Platform as a Service-----");
+        entry.setField(
+                StandardField.TITLE,
+                "Towards Application Portability in Platform as a Service-----");
         entry.setField(StandardField.AUTHOR, "Stefan Kolb and Guido Wirtz");
         assertEquals(Optional.empty(), fetcher.findIdentifier(entry));
     }
@@ -88,17 +105,23 @@ void notAcceptTitleOverThreshold() throws Exception {
     @Test
     void findWrongAuthor() throws Exception {
         BibEntry entry = new BibEntry();
-        entry.setField(StandardField.TITLE, "Towards Application Portability in Platform as a Service");
+        entry.setField(
+                StandardField.TITLE, "Towards Application Portability in Platform as a Service");
         entry.setField(StandardField.AUTHOR, "Stefan Kolb and Simon Harrer");
-        assertEquals("10.1109/sose.2014.26", fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH));
+        assertEquals(
+                "10.1109/sose.2014.26",
+                fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH));
     }
 
     @Test
     void findWithSubtitle() throws Exception {
         BibEntry entry = new BibEntry();
-        // CrossRef entry will only include { "title": "A break in the clouds", "subtitle": "towards a cloud definition" }
+        // CrossRef entry will only include { "title": "A break in the clouds", "subtitle": "towards
+        // a cloud definition" }
         entry.setField(StandardField.TITLE, "A break in the clouds: towards a cloud definition");
-        assertEquals("10.1145/1496091.1496100", fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH));
+        assertEquals(
+                "10.1145/1496091.1496100",
+                fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH));
     }
 
     @Test
@@ -108,14 +131,22 @@ void findByDOI() throws Exception {
 
     @Test
     void findByAuthors() throws Exception {
-        assertEquals(Optional.of(barrosEntry), fetcher.performSearch("\"Barros, Alistair\" AND \"Dumas, Marlon\" AND \"Arthur H.M. ter Hofstede\"").stream().findFirst());
+        assertEquals(
+                Optional.of(barrosEntry),
+                fetcher
+                        .performSearch(
+                                "\"Barros, Alistair\" AND \"Dumas, Marlon\" AND \"Arthur H.M. ter Hofstede\"")
+                        .stream()
+                        .findFirst());
     }
 
     @Test
     void findByEntry() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "Service Interaction Patterns");
-        entry.setField(StandardField.AUTHOR, "Barros, Alistair and Dumas, Marlon and Arthur H.M. ter Hofstede");
+        entry.setField(
+                StandardField.AUTHOR,
+                "Barros, Alistair and Dumas, Marlon and Arthur H.M. ter Hofstede");
         entry.setField(StandardField.YEAR, "2005");
         assertEquals(Optional.of(barrosEntry), fetcher.performSearch(entry).stream().findFirst());
     }
@@ -151,6 +182,7 @@ void performSearchByEmptyQuery() throws Exception {
      */
     @Test
     void performSearchValidReturnNothingDOI() throws FetcherException {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("10.1392/BC1.0"));
+        assertThrows(
+                FetcherClientException.class, () -> fetcher.performSearchById("10.1392/BC1.0"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
index 6c17f38ae7e2..5d48e9728ec7 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
@@ -1,7 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -10,13 +10,12 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.util.Collections;
+import java.util.List;
 
 @FetcherTest
 class DBLPFetcherTest {
@@ -26,15 +25,20 @@ class DBLPFetcherTest {
 
     @BeforeEach
     void setUp() {
-        dblpFetcher = new DBLPFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        dblpFetcher =
+                new DBLPFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
         entry = new BibEntry();
 
         entry.setType(StandardEntryType.Article);
         entry.setCitationKey("DBLP:journals/stt/GeigerHL16");
-        entry.setField(StandardField.TITLE, """
+        entry.setField(
+                StandardField.TITLE,
+                """
                 Process Engine Benchmarking with Betsy in the Context of {ISO/IEC}
                                   Quality Standards""");
-        entry.setField(StandardField.AUTHOR, """
+        entry.setField(
+                StandardField.AUTHOR,
+                """
                 Matthias Geiger and
                                   Simon Harrer and
                                   J{\\\"{o}}rg Lenhard""");
@@ -42,16 +46,23 @@ void setUp() {
         entry.setField(StandardField.VOLUME, "36");
         entry.setField(StandardField.NUMBER, "2");
         entry.setField(StandardField.YEAR, "2016");
-        entry.setField(StandardField.URL,
+        entry.setField(
+                StandardField.URL,
                 "https://fb-swt.gi.de/fileadmin/FB/SWT/Softwaretechnik-Trends/Verzeichnis/Band_36_Heft_2/beitrag_2.pdf");
-        entry.setField(new UnknownField("biburl"), "https://dblp.org/rec/journals/stt/GeigerHL16.bib");
-        entry.setField(new UnknownField("bibsource"), "dblp computer science bibliography, https://dblp.org");
+        entry.setField(
+                new UnknownField("biburl"), "https://dblp.org/rec/journals/stt/GeigerHL16.bib");
+        entry.setField(
+                new UnknownField("bibsource"),
+                "dblp computer science bibliography, https://dblp.org");
     }
 
     @Test
     void findSingleEntry() throws FetcherException {
-        // In Lucene curly brackets are used for range queries, therefore they have to be escaped using "". See https://lucene.apache.org/core/5_4_0/queryparser/org/apache/lucene/queryparser/classic/package-summary.html
-        String query = "Process Engine Benchmarking with Betsy in the Context of \"{ISO/IEC}\" Quality Standards";
+        // In Lucene curly brackets are used for range queries, therefore they have to be escaped
+        // using "". See
+        // https://lucene.apache.org/core/5_4_0/queryparser/org/apache/lucene/queryparser/classic/package-summary.html
+        String query =
+                "Process Engine Benchmarking with Betsy in the Context of \"{ISO/IEC}\" Quality Standards";
         List<BibEntry> result = dblpFetcher.performSearch(query);
 
         assertEquals(Collections.singletonList(entry), result);
@@ -59,7 +70,10 @@ void findSingleEntry() throws FetcherException {
 
     @Test
     void findSingleEntryUsingComplexOperators() throws FetcherException {
-        String query = "geiger harrer betsy$ softw.trends"; // -wirtz Negative operators do no longer work,  see issue https://github.com/JabRef/jabref/issues/2890
+        String query =
+                "geiger harrer betsy$ softw.trends"; // -wirtz Negative operators do no longer work,
+                                                     //  see issue
+                                                     // https://github.com/JabRef/jabref/issues/2890
         List<BibEntry> result = dblpFetcher.performSearch(query);
 
         assertEquals(Collections.singletonList(entry), result);
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DOABFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DOABFetcherTest.java
index 756a52a0d32a..329f4f2333d3 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DOABFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DOABFetcherTest.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.model.entry.BibEntry;
@@ -9,13 +8,13 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.support.DisabledOnCIServer;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
+import java.util.stream.Stream;
 
 @FetcherTest
 @DisabledOnCIServer("Disable on CI Server to not hit the API call limit")
@@ -36,79 +35,114 @@ public static Stream<Arguments> performSearch() {
                                 .withField(StandardField.DOI, "10.21983/P3.0086.1.00")
                                 .withField(StandardField.PAGES, "56")
                                 .withField(StandardField.DATE, "2014")
-                                .withField(StandardField.URL, "http://library.oapen.org/handle/20.500.12657/25535")
-                                .withField(StandardField.URI, "https://directory.doabooks.org/handle/20.500.12854/34739")
+                                .withField(
+                                        StandardField.URL,
+                                        "http://library.oapen.org/handle/20.500.12657/25535")
+                                .withField(
+                                        StandardField.URI,
+                                        "https://directory.doabooks.org/handle/20.500.12854/34739")
                                 .withField(StandardField.LANGUAGE, "English")
                                 .withField(StandardField.KEYWORDS, "poetry, love, warfare")
                                 .withField(StandardField.PUBLISHER, "punctum books"),
-                        "i open fire"
-                ),
+                        "i open fire"),
                 Arguments.of(
                         new BibEntry(StandardEntryType.Book)
                                 .withField(StandardField.ISBN, "9789085551201")
                                 .withField(StandardField.AUTHOR, "Ronald Snijder")
-                                .withField(StandardField.TITLE, "The deliverance of open access books")
-                                .withField(StandardField.SUBTITLE, "Examining usage and dissemination")
+                                .withField(
+                                        StandardField.TITLE, "The deliverance of open access books")
+                                .withField(
+                                        StandardField.SUBTITLE, "Examining usage and dissemination")
                                 .withField(StandardField.DOI, "10.26530/OAPEN_1004809")
                                 .withField(StandardField.PAGES, "234")
                                 .withField(StandardField.DATE, "2019")
-                                .withField(StandardField.URL, "http://library.oapen.org/handle/20.500.12657/25287")
-                                .withField(StandardField.URI, "https://directory.doabooks.org/handle/20.500.12854/26303")
+                                .withField(
+                                        StandardField.URL,
+                                        "http://library.oapen.org/handle/20.500.12657/25287")
+                                .withField(
+                                        StandardField.URI,
+                                        "https://directory.doabooks.org/handle/20.500.12854/26303")
                                 .withField(StandardField.LANGUAGE, "English")
-                                .withField(StandardField.KEYWORDS, "Open Access, Monographs, OAPEN Library, " +
-                                        "Directory of Open Access Books")
+                                .withField(
+                                        StandardField.KEYWORDS,
+                                        "Open Access, Monographs, OAPEN Library, "
+                                                + "Directory of Open Access Books")
                                 .withField(StandardField.PUBLISHER, "Amsterdam University Press"),
-                        "the deliverance of open access books"
-                ),
+                        "the deliverance of open access books"),
                 Arguments.of(
                         new BibEntry(StandardEntryType.Book)
-                                .withField(StandardField.EDITOR, "Andrew Perrin and Loren T. Stuckenbruck")
-                                .withField(StandardField.TITLE, "Four Kingdom Motifs before and beyond the Book of Daniel")
+                                .withField(
+                                        StandardField.EDITOR,
+                                        "Andrew Perrin and Loren T. Stuckenbruck")
+                                .withField(
+                                        StandardField.TITLE,
+                                        "Four Kingdom Motifs before and beyond the Book of Daniel")
                                 .withField(StandardField.DOI, "10.1163/9789004443280")
                                 .withField(StandardField.PAGES, "354")
                                 .withField(StandardField.DATE, "2020")
-                                .withField(StandardField.URL, "https://library.oapen.org/handle/20.500.12657/48312")
-                                .withField(StandardField.URI, "https://directory.doabooks.org/handle/20.500.12854/68086")
+                                .withField(
+                                        StandardField.URL,
+                                        "https://library.oapen.org/handle/20.500.12657/48312")
+                                .withField(
+                                        StandardField.URI,
+                                        "https://directory.doabooks.org/handle/20.500.12854/68086")
                                 .withField(StandardField.LANGUAGE, "English")
                                 .withField(StandardField.KEYWORDS, "Religion")
                                 .withField(StandardField.PUBLISHER, "Brill"),
-                        "Four Kingdom Motifs before and beyond the Book of Daniel"
-                ),
+                        "Four Kingdom Motifs before and beyond the Book of Daniel"),
                 Arguments.of(
                         new BibEntry(StandardEntryType.Book)
-                                .withField(StandardField.EDITOR, "Felipe Gonzalez Toro and Antonios Tsourdos")
-                                .withField(StandardField.TITLE, "UAV Sensors for Environmental Monitoring")
+                                .withField(
+                                        StandardField.EDITOR,
+                                        "Felipe Gonzalez Toro and Antonios Tsourdos")
+                                .withField(
+                                        StandardField.TITLE,
+                                        "UAV Sensors for Environmental Monitoring")
                                 .withField(StandardField.DOI, "10.3390/books978-3-03842-754-4")
                                 .withField(StandardField.PAGES, "670")
                                 .withField(StandardField.DATE, "2018")
-                                .withField(StandardField.URI, "https://directory.doabooks.org/handle/20.500.12854/39793")
+                                .withField(
+                                        StandardField.URI,
+                                        "https://directory.doabooks.org/handle/20.500.12854/39793")
                                 .withField(StandardField.LANGUAGE, "English")
-                                .withField(StandardField.KEYWORDS, "UAV sensors, Environmental Monitoring, drones, unmanned aerial vehicles")
-                                .withField(StandardField.PUBLISHER, "MDPI - Multidisciplinary Digital Publishing Institute"),
-                        "UAV Sensors for Environmental Monitoring"
-                ),
+                                .withField(
+                                        StandardField.KEYWORDS,
+                                        "UAV sensors, Environmental Monitoring, drones, unmanned aerial vehicles")
+                                .withField(
+                                        StandardField.PUBLISHER,
+                                        "MDPI - Multidisciplinary Digital Publishing Institute"),
+                        "UAV Sensors for Environmental Monitoring"),
                 Arguments.of(
                         new BibEntry(StandardEntryType.Book)
-                                .withField(StandardField.AUTHOR, "Carl Marnewick and Wikus Erasmus and Joseph Nazeer")
-                                .withField(StandardField.TITLE, "The symbiosis between information system project complexity and information system project success")
+                                .withField(
+                                        StandardField.AUTHOR,
+                                        "Carl Marnewick and Wikus Erasmus and Joseph Nazeer")
+                                .withField(
+                                        StandardField.TITLE,
+                                        "The symbiosis between information system project complexity and information system project success")
                                 .withField(StandardField.DOI, "10.4102/aosis.2017.itpsc45")
                                 .withField(StandardField.PAGES, "184")
                                 .withField(StandardField.DATE, "2017")
-                                .withField(StandardField.URL, "http://library.oapen.org/handle/20.500.12657/30652")
-                                .withField(StandardField.URI, "https://directory.doabooks.org/handle/20.500.12854/38792")
+                                .withField(
+                                        StandardField.URL,
+                                        "http://library.oapen.org/handle/20.500.12657/30652")
+                                .withField(
+                                        StandardField.URI,
+                                        "https://directory.doabooks.org/handle/20.500.12854/38792")
                                 .withField(StandardField.LANGUAGE, "English")
-                                .withField(StandardField.KEYWORDS, "agile, structural equation modelling, information technology, success, models, strategic alignment, complexity, waterfall, project management, quantitative, Agile software development, Change management, Deliverable, Exploratory factor analysis, South Africa, thema EDItEUR::U Computing and Information Technology::UB Information technology: general topics")
+                                .withField(
+                                        StandardField.KEYWORDS,
+                                        "agile, structural equation modelling, information technology, success, models, strategic alignment, complexity, waterfall, project management, quantitative, Agile software development, Change management, Deliverable, Exploratory factor analysis, South Africa, thema EDItEUR::U Computing and Information Technology::UB Information technology: general topics")
                                 .withField(StandardField.PUBLISHER, "AOSIS"),
-                        "The symbiosis between information system project complexity and information system project success"
-                )
-        );
+                        "The symbiosis between information system project complexity and information system project success"));
     }
 
     @ParameterizedTest
     @MethodSource
     void performSearch(BibEntry expected, String query) throws FetcherException {
         List<BibEntry> entries = fetcher.performSearch(query);
-        // We must not contain abstracts in our code base; thus we remove the abstracts from the fetched results
+        // We must not contain abstracts in our code base; thus we remove the abstracts from the
+        // fetched results
         entries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
         assertEquals(List.of(expected), entries);
     }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java
index 5ab645ee4686..a2148d93caac 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java
@@ -1,24 +1,24 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import kong.unirest.core.json.JSONObject;
 
+import org.apache.hc.core5.net.URIBuilder;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
-import kong.unirest.core.json.JSONObject;
-import org.apache.hc.core5.net.URIBuilder;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 class DOAJFetcherTest {
@@ -27,27 +27,39 @@ class DOAJFetcherTest {
 
     @BeforeEach
     void setUp() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         fetcher = new DOAJFetcher(importFormatPreferences);
     }
 
     @Test
     void searchByQueryFindsEntry() throws Exception {
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-        .withField(StandardField.AUTHOR, "Nísea de A. Corrêa and Maria P. Foss and Paula R. B. Diniz")
-        .withField(StandardField.DOI, "10.11606/issn.2176-7262.v49i6p533-548")
-        .withField(StandardField.ISSN, "2176-7262")
-        .withField(StandardField.JOURNAL, "Medicina")
-        .withField(StandardField.PUBLISHER, "Universidade de São Paulo")
-        .withField(StandardField.TITLE, "Structural and functional changes related to memory deficit in non-demential elderly individuals")
-        .withField(StandardField.URL, "http://www.revistas.usp.br/rmrp/article/view/127443")
-        .withField(StandardField.VOLUME, "49")
-        .withField(StandardField.NUMBER, "6")
-        .withField(StandardField.YEAR, "2016")
-        .withField(StandardField.MONTH, "December")
-        .withField(StandardField.KEYWORDS, "Central Nervous System. Structural Changes. Functional Changes. Memory deficits. Aging. Normal Aging. Magnetic Resonance Imaging")
-        .withField(StandardField.ABSTRACT, "Objective: Based on Magnetic Resonance Imaging (MRI), verify the structural and functional changes related to memory deficits in non-demented elderly individuals in comparison with young adults. Methodology: Proceeded a systematic review based on Preferred Reporting Items for Systematic Review and Meta-Analysis (PRISMA) fluxogram. The search was done on PubMed, Scopus and EBSCO databases using JabRef 2.10, and Web of Science. It was included in the analysis quasi-experimental, cross-sectional, cohort and case-control studies published between 2005 and 2014 in national and international indexed periodicals that had as sample: non-demented individuals older than 60 years old, who were submitted to MRI investigation of their for any brain structural and functional changes associated with memory deficits, identified in neuropsychologicals tests. Results: About the imaging technique, we reviewed studies that used structural MRIs (two articles), functional MRIs (six articles), both techniques (four articles). In the 12 studies, 38 distinct neuropsychological tests were used, an average of five different tests for each study (variation of 1-12). The most used tests were WAIS Digit Span Backwards (seven articles), Trail Making Test A and B (four articles) and Wechsler Memory Scale (four articles). Conclusion: The review showed that in normal aging the parahippocampal white substance, the hippocampus volume and entorhinal cortex slightly shrink, causing verbal memory reduction, possibly due to fiber demyelination; reduced connections between temporal and frontal lobes contributing to an impairement of episodic, working memory and verbal fluency; reduction suppression of irrelevant information, affecting the register of information; changes on frontal and parietal areas, compromising recognition memory; modifications in activity and connectivity of the default mode network; reorganization of cognitive functions and also a slower response, probably due to reduction of pre-frontal cortex activation");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Nísea de A. Corrêa and Maria P. Foss and Paula R. B. Diniz")
+                        .withField(StandardField.DOI, "10.11606/issn.2176-7262.v49i6p533-548")
+                        .withField(StandardField.ISSN, "2176-7262")
+                        .withField(StandardField.JOURNAL, "Medicina")
+                        .withField(StandardField.PUBLISHER, "Universidade de São Paulo")
+                        .withField(
+                                StandardField.TITLE,
+                                "Structural and functional changes related to memory deficit in non-demential elderly individuals")
+                        .withField(
+                                StandardField.URL,
+                                "http://www.revistas.usp.br/rmrp/article/view/127443")
+                        .withField(StandardField.VOLUME, "49")
+                        .withField(StandardField.NUMBER, "6")
+                        .withField(StandardField.YEAR, "2016")
+                        .withField(StandardField.MONTH, "December")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Central Nervous System. Structural Changes. Functional Changes. Memory deficits. Aging. Normal Aging. Magnetic Resonance Imaging")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Objective: Based on Magnetic Resonance Imaging (MRI), verify the structural and functional changes related to memory deficits in non-demented elderly individuals in comparison with young adults. Methodology: Proceeded a systematic review based on Preferred Reporting Items for Systematic Review and Meta-Analysis (PRISMA) fluxogram. The search was done on PubMed, Scopus and EBSCO databases using JabRef 2.10, and Web of Science. It was included in the analysis quasi-experimental, cross-sectional, cohort and case-control studies published between 2005 and 2014 in national and international indexed periodicals that had as sample: non-demented individuals older than 60 years old, who were submitted to MRI investigation of their for any brain structural and functional changes associated with memory deficits, identified in neuropsychologicals tests. Results: About the imaging technique, we reviewed studies that used structural MRIs (two articles), functional MRIs (six articles), both techniques (four articles). In the 12 studies, 38 distinct neuropsychological tests were used, an average of five different tests for each study (variation of 1-12). The most used tests were WAIS Digit Span Backwards (seven articles), Trail Making Test A and B (four articles) and Wechsler Memory Scale (four articles). Conclusion: The review showed that in normal aging the parahippocampal white substance, the hippocampus volume and entorhinal cortex slightly shrink, causing verbal memory reduction, possibly due to fiber demyelination; reduced connections between temporal and frontal lobes contributing to an impairement of episodic, working memory and verbal fluency; reduction suppression of irrelevant information, affecting the register of information; changes on frontal and parietal areas, compromising recognition memory; modifications in activity and connectivity of the default mode network; reorganization of cognitive functions and also a slower response, probably due to reduction of pre-frontal cortex activation");
 
         List<BibEntry> fetchedEntries = fetcher.performSearch("JabRef MRI");
         assertEquals(Collections.singletonList(expected), fetchedEntries);
@@ -55,15 +67,21 @@ void searchByQueryFindsEntry() throws Exception {
 
     @Test
     void bibJSONConverter() {
-        String jsonString = "{\"title\":\"Design of Finite Word Length Linear-Phase FIR Filters in the Logarithmic Number System Domain\",\"journal\":{\"publisher\":\"Hindawi Publishing Corporation\",\"language\":[\"English\"],\"title\":\"VLSI Design\",\"country\":\"US\",\"volume\":\"2014\"},\"author\":[{\"name\":\"Syed Asad Alam\"},{\"name\":\"Oscar Gustafsson\"}],\"link\":[{\"url\":\"http://dx.doi.org/10.1155/2014/217495\",\"type\":\"fulltext\"}],\"year\":\"2014\",\"identifier\":[{\"type\":\"pissn\",\"id\":\"1065-514X\"},{\"type\":\"eissn\",\"id\":\"1563-5171\"},{\"type\":\"doi\",\"id\":\"10.1155/2014/217495\"}],\"created_date\":\"2014-05-09T19:38:31Z\"}";
+        String jsonString =
+                "{\"title\":\"Design of Finite Word Length Linear-Phase FIR Filters in the Logarithmic Number System Domain\",\"journal\":{\"publisher\":\"Hindawi Publishing Corporation\",\"language\":[\"English\"],\"title\":\"VLSI Design\",\"country\":\"US\",\"volume\":\"2014\"},\"author\":[{\"name\":\"Syed Asad Alam\"},{\"name\":\"Oscar Gustafsson\"}],\"link\":[{\"url\":\"http://dx.doi.org/10.1155/2014/217495\",\"type\":\"fulltext\"}],\"year\":\"2014\",\"identifier\":[{\"type\":\"pissn\",\"id\":\"1065-514X\"},{\"type\":\"eissn\",\"id\":\"1563-5171\"},{\"type\":\"doi\",\"id\":\"10.1155/2014/217495\"}],\"created_date\":\"2014-05-09T19:38:31Z\"}";
         JSONObject jsonObject = new JSONObject(jsonString);
         BibEntry bibEntry = DOAJFetcher.parseBibJSONtoBibtex(jsonObject, ',');
 
         assertEquals(StandardEntryType.Article, bibEntry.getType());
         assertEquals(Optional.of("VLSI Design"), bibEntry.getField(StandardField.JOURNAL));
         assertEquals(Optional.of("10.1155/2014/217495"), bibEntry.getField(StandardField.DOI));
-        assertEquals(Optional.of("Syed Asad Alam and Oscar Gustafsson"), bibEntry.getField(StandardField.AUTHOR));
-        assertEquals(Optional.of("Design of Finite Word Length Linear-Phase FIR Filters in the Logarithmic Number System Domain"), bibEntry.getField(StandardField.TITLE));
+        assertEquals(
+                Optional.of("Syed Asad Alam and Oscar Gustafsson"),
+                bibEntry.getField(StandardField.AUTHOR));
+        assertEquals(
+                Optional.of(
+                        "Design of Finite Word Length Linear-Phase FIR Filters in the Logarithmic Number System Domain"),
+                bibEntry.getField(StandardField.TITLE));
         assertEquals(Optional.of("2014"), bibEntry.getField(StandardField.YEAR));
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java b/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
index 165a7bacb3f5..c322c00e1b05 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
@@ -1,21 +1,20 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
+import java.util.Optional;
 
 @FetcherTest
 class DiVATest {
@@ -39,14 +38,17 @@ void performSearchById() throws Exception {
         entry.setCitationKey("Gustafsson260746");
         entry.setField(StandardField.AUTHOR, "Gustafsson, Oscar");
         entry.setField(StandardField.INSTITUTION, "The Institute of Technology");
-        entry.setField(StandardField.JOURNAL,
+        entry.setField(
+                StandardField.JOURNAL,
                 "IEEE transactions on circuits and systems. 2, Analog and digital signal processing (Print)");
         entry.setField(StandardField.NUMBER, "11");
         entry.setField(StandardField.PAGES, "974--978");
         entry.setField(StandardField.TITLE, "Lower bounds for constant multiplication problems");
         entry.setField(StandardField.VOLUME, "54");
         entry.setField(StandardField.YEAR, "2007");
-        entry.setField(StandardField.ABSTRACT, "Lower bounds for problems related to realizing multiplication by constants with shifts, adders, and subtracters are presented. These lower bounds are straightforwardly calculated and have applications in proving the optimality of solutions obtained by heuristics. ");
+        entry.setField(
+                StandardField.ABSTRACT,
+                "Lower bounds for problems related to realizing multiplication by constants with shifts, adders, and subtracters are presented. These lower bounds are straightforwardly calculated and have applications in proving the optimality of solutions obtained by heuristics. ");
         entry.setField(StandardField.DOI, "10.1109/TCSII.2007.903212");
 
         assertEquals(Optional.of(entry), fetcher.performSearchById("diva2:260746"));
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
index 3cf0c3f14b0a..c80a9cb08c33 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
@@ -1,6 +1,8 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -8,67 +10,84 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
+import java.util.Optional;
 
 @FetcherTest
 class DoiFetcherTest {
 
-    private final DoiFetcher fetcher = new DoiFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
-
-    private final BibEntry bibEntryBurd2011 = new BibEntry(StandardEntryType.Book)
-            .withCitationKey("Burd_2011")
-            .withField(StandardField.TITLE, "Java® For Dummies®")
-            .withField(StandardField.PUBLISHER, "Wiley")
-            .withField(StandardField.YEAR, "2011")
-            .withField(StandardField.AUTHOR, "Burd, Barry")
-            .withField(StandardField.MONTH, "#jul#")
-            .withField(StandardField.DOI, "10.1002/9781118257517")
-            .withField(StandardField.ISBN, "9781118257517");
-    private final BibEntry bibEntryDecker2007 = new BibEntry(StandardEntryType.InProceedings)
-            .withCitationKey("Decker_2007")
-            .withField(StandardField.AUTHOR, "Decker, Gero and Kopp, Oliver and Leymann, Frank and Weske, Mathias")
-            .withField(StandardField.BOOKTITLE, "IEEE International Conference on Web Services (ICWS 2007)")
-            .withField(StandardField.MONTH, "#jul#")
-            .withField(StandardField.PUBLISHER, "IEEE")
-            .withField(StandardField.TITLE, "BPEL4Chor: Extending BPEL for Modeling Choreographies")
-            .withField(StandardField.YEAR, "2007")
-            .withField(StandardField.DOI, "10.1109/icws.2007.59");
-    private final BibEntry bibEntryIannarelli2019 = new BibEntry(StandardEntryType.Article)
-            .withField(StandardField.AUTHOR,
-                    ""
-                            + "Iannarelli Riccardo  and "
-                            + "Novello Anna  and "
-                            + "Stricker Damien  and "
-                            + "Cisternino Marco  and "
-                            + "Gallizio Federico  and "
-                            + "Telib Haysam  and "
-                            + "Meyer Thierry ")
-            .withField(StandardField.PUBLISHER, "AIDIC: Italian Association of Chemical Engineering")
-            .withField(StandardField.TITLE, "Safety in research institutions: how to better communicate the risks using numerical simulations")
-            .withField(StandardField.YEAR, "2019")
-            .withField(StandardField.DOI, "10.3303/CET1977146")
-            .withField(StandardField.JOURNAL, "Chemical Engineering Transactions")
-            .withField(StandardField.PAGES, "871-876")
-            .withField(StandardField.VOLUME, "77");
-    private final BibEntry bibEntryStenzel2020 = new BibEntry(StandardEntryType.Article)
-            .withCitationKey("Stenzel_2020")
-            .withField(StandardField.AUTHOR, "Stenzel, L. and Hayward, A. L. C. and Schollwöck, U. and Heidrich-Meisner, F.")
-            .withField(StandardField.JOURNAL, "Physical Review A")
-            .withField(StandardField.TITLE, "Topological phases in the Fermi-Hofstadter-Hubbard model on hybrid-space ladders")
-            .withField(StandardField.YEAR, "2020")
-            .withField(StandardField.MONTH, "#aug#")
-            .withField(StandardField.VOLUME, "102")
-            .withField(StandardField.DOI, "10.1103/physreva.102.023315")
-            .withField(StandardField.ISSN, "2469-9934")
-            .withField(StandardField.PUBLISHER, "American Physical Society (APS)")
-            .withField(StandardField.PAGES, "023315")
-            .withField(StandardField.NUMBER, "2");
+    private final DoiFetcher fetcher =
+            new DoiFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+
+    private final BibEntry bibEntryBurd2011 =
+            new BibEntry(StandardEntryType.Book)
+                    .withCitationKey("Burd_2011")
+                    .withField(StandardField.TITLE, "Java® For Dummies®")
+                    .withField(StandardField.PUBLISHER, "Wiley")
+                    .withField(StandardField.YEAR, "2011")
+                    .withField(StandardField.AUTHOR, "Burd, Barry")
+                    .withField(StandardField.MONTH, "#jul#")
+                    .withField(StandardField.DOI, "10.1002/9781118257517")
+                    .withField(StandardField.ISBN, "9781118257517");
+    private final BibEntry bibEntryDecker2007 =
+            new BibEntry(StandardEntryType.InProceedings)
+                    .withCitationKey("Decker_2007")
+                    .withField(
+                            StandardField.AUTHOR,
+                            "Decker, Gero and Kopp, Oliver and Leymann, Frank and Weske, Mathias")
+                    .withField(
+                            StandardField.BOOKTITLE,
+                            "IEEE International Conference on Web Services (ICWS 2007)")
+                    .withField(StandardField.MONTH, "#jul#")
+                    .withField(StandardField.PUBLISHER, "IEEE")
+                    .withField(
+                            StandardField.TITLE,
+                            "BPEL4Chor: Extending BPEL for Modeling Choreographies")
+                    .withField(StandardField.YEAR, "2007")
+                    .withField(StandardField.DOI, "10.1109/icws.2007.59");
+    private final BibEntry bibEntryIannarelli2019 =
+            new BibEntry(StandardEntryType.Article)
+                    .withField(
+                            StandardField.AUTHOR,
+                            ""
+                                    + "Iannarelli Riccardo  and "
+                                    + "Novello Anna  and "
+                                    + "Stricker Damien  and "
+                                    + "Cisternino Marco  and "
+                                    + "Gallizio Federico  and "
+                                    + "Telib Haysam  and "
+                                    + "Meyer Thierry ")
+                    .withField(
+                            StandardField.PUBLISHER,
+                            "AIDIC: Italian Association of Chemical Engineering")
+                    .withField(
+                            StandardField.TITLE,
+                            "Safety in research institutions: how to better communicate the risks using numerical simulations")
+                    .withField(StandardField.YEAR, "2019")
+                    .withField(StandardField.DOI, "10.3303/CET1977146")
+                    .withField(StandardField.JOURNAL, "Chemical Engineering Transactions")
+                    .withField(StandardField.PAGES, "871-876")
+                    .withField(StandardField.VOLUME, "77");
+    private final BibEntry bibEntryStenzel2020 =
+            new BibEntry(StandardEntryType.Article)
+                    .withCitationKey("Stenzel_2020")
+                    .withField(
+                            StandardField.AUTHOR,
+                            "Stenzel, L. and Hayward, A. L. C. and Schollwöck, U. and Heidrich-Meisner, F.")
+                    .withField(StandardField.JOURNAL, "Physical Review A")
+                    .withField(
+                            StandardField.TITLE,
+                            "Topological phases in the Fermi-Hofstadter-Hubbard model on hybrid-space ladders")
+                    .withField(StandardField.YEAR, "2020")
+                    .withField(StandardField.MONTH, "#aug#")
+                    .withField(StandardField.VOLUME, "102")
+                    .withField(StandardField.DOI, "10.1103/physreva.102.023315")
+                    .withField(StandardField.ISSN, "2469-9934")
+                    .withField(StandardField.PUBLISHER, "American Physical Society (APS)")
+                    .withField(StandardField.PAGES, "023315")
+                    .withField(StandardField.NUMBER, "2");
 
     @Test
     void getName() {
@@ -100,12 +119,14 @@ void performSearchEmptyDOI() {
 
     @Test
     void performSearchInvalidDOI() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("10.1002/9781118257517F"));
+        assertThrows(
+                FetcherException.class, () -> fetcher.performSearchById("10.1002/9781118257517F"));
     }
 
     @Test
     void performSearchInvalidDOIClientResultsinFetcherClientException() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("10.1002/9781118257517F"));
+        assertThrows(
+                FetcherException.class, () -> fetcher.performSearchById("10.1002/9781118257517F"));
     }
 
     @Test
@@ -115,7 +136,8 @@ void performSearchInvalidDOIClientResultsinFetcherClientException2() {
 
     @Test
     void performSearchNonTrimmedDOI() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("http s://doi.org/ 10.1109 /ICWS .2007.59 ");
+        Optional<BibEntry> fetchedEntry =
+                fetcher.performSearchById("http s://doi.org/ 10.1109 /ICWS .2007.59 ");
         assertEquals(Optional.of(bibEntryDecker2007), fetchedEntry);
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java
index d66799df0bfd..c530b3bc4511 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java
@@ -1,21 +1,20 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.URI;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.preferences.DOIPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.net.URI;
+import java.util.Optional;
 
 @FetcherTest
 class DoiResolutionTest {
@@ -35,22 +34,32 @@ void setup() {
     void linkWithPdfInTitleTag() throws IOException {
         entry.setField(StandardField.DOI, "10.1051/0004-6361/201527330");
         assertEquals(
-                Optional.of(URI.create("https://www.aanda.org/articles/aa/pdf/2016/01/aa27330-15.pdf").toURL()),
-                finder.findFullText(entry)
-        );
+                Optional.of(
+                        URI.create("https://www.aanda.org/articles/aa/pdf/2016/01/aa27330-15.pdf")
+                                .toURL()),
+                finder.findFullText(entry));
     }
 
     @Disabled("Cannot fetch due to Cloudflare protection")
     @Test
     void linkWithPdfStringLeadsToFulltext() throws IOException {
         entry.setField(StandardField.DOI, "10.1002/acr2.11101");
-        assertEquals(Optional.of(URI.create("https://onlinelibrary.wiley.com/doi/pdf/10.1002/acr2.11101").toURL()), finder.findFullText(entry));
+        assertEquals(
+                Optional.of(
+                        URI.create("https://onlinelibrary.wiley.com/doi/pdf/10.1002/acr2.11101")
+                                .toURL()),
+                finder.findFullText(entry));
     }
 
     @Test
     void citationMetaTagLeadsToFulltext() throws IOException {
         entry.setField(StandardField.DOI, "10.1007/978-3-319-89963-3_28");
-        assertEquals(Optional.of(URI.create("https://link.springer.com/content/pdf/10.1007/978-3-319-89963-3_28.pdf").toURL()), finder.findFullText(entry));
+        assertEquals(
+                Optional.of(
+                        URI.create(
+                                        "https://link.springer.com/content/pdf/10.1007/978-3-319-89963-3_28.pdf")
+                                .toURL()),
+                finder.findFullText(entry));
     }
 
     @Test
@@ -65,7 +74,12 @@ void returnAnythingWhenBehindSpringerPayWall() throws IOException {
         // even if the user does not have access
         // We cannot easily handle this case, because other publisher return the wrong media type.
         entry.setField(StandardField.DOI, "10.1007/978-3-319-62594-2_12");
-        assertEquals(Optional.of(URI.create("https://link.springer.com/content/pdf/10.1007/978-3-319-62594-2_12.pdf").toURL()), finder.findFullText(entry));
+        assertEquals(
+                Optional.of(
+                        URI.create(
+                                        "https://link.springer.com/content/pdf/10.1007/978-3-319-62594-2_12.pdf")
+                                .toURL()),
+                finder.findFullText(entry));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java
index 7ac8d4e0216f..6d2953524338 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java
@@ -1,26 +1,26 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Optional;
-import java.util.Set;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.FulltextFetcher;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.WebFetchers;
 import org.jabref.model.entry.BibEntry;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
+import java.util.Optional;
+import java.util.Set;
 
 class FulltextFetcherTest {
 
     @SuppressWarnings("unused")
     private static Set<FulltextFetcher> fetcherProvider() {
-        return WebFetchers.getFullTextFetchers(mock(ImportFormatPreferences.class), mock(ImporterPreferences.class));
+        return WebFetchers.getFullTextFetchers(
+                mock(ImportFormatPreferences.class), mock(ImporterPreferences.class));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java b/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java
index b8a26327f79d..304f36b66167 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java
@@ -1,10 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.URI;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -15,13 +12,15 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.support.DisabledOnCIServer;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.io.IOException;
+import java.net.URI;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 @DisabledOnCIServer("CI server is blocked by Google")
@@ -32,24 +31,30 @@ class GoogleScholarTest implements SearchBasedFetcherCapabilityTest, PagedSearch
 
     @BeforeEach
     void setUp() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         finder = new GoogleScholar(importFormatPreferences);
         entry = new BibEntry();
     }
 
     @Test
     void linkFound() throws Exception {
-        entry.setField(StandardField.TITLE, "Towards Application Portability in Platform as a Service");
+        entry.setField(
+                StandardField.TITLE, "Towards Application Portability in Platform as a Service");
 
         assertEquals(
-                Optional.of(URI.create("https://www.uni-bamberg.de/fileadmin/uni/fakultaeten/wiai_lehrstuehle/praktische_informatik/Dateien/Publikationen/sose14-towards-application-portability-in-paas.pdf").toURL()),
-                finder.findFullText(entry)
-        );
+                Optional.of(
+                        URI.create(
+                                        "https://www.uni-bamberg.de/fileadmin/uni/fakultaeten/wiai_lehrstuehle/praktische_informatik/Dateien/Publikationen/sose14-towards-application-portability-in-paas.pdf")
+                                .toURL()),
+                finder.findFullText(entry));
     }
 
     @Test
     void noLinkFound() throws IOException, FetcherException {
-        entry.setField(StandardField.TITLE, "Curriculum programme of career-oriented java specialty guided by principles of software engineering");
+        entry.setField(
+                StandardField.TITLE,
+                "Curriculum programme of career-oriented java specialty guided by principles of software engineering");
 
         assertEquals(Optional.empty(), finder.findFullText(entry));
     }
@@ -58,13 +63,17 @@ void noLinkFound() throws IOException, FetcherException {
     void findSingleEntry() throws FetcherException {
         entry.setType(StandardEntryType.InProceedings);
         entry.setCitationKey("geiger2013detecting");
-        entry.setField(StandardField.TITLE, "Detecting Interoperability and Correctness Issues in BPMN 2.0 Process Models.");
+        entry.setField(
+                StandardField.TITLE,
+                "Detecting Interoperability and Correctness Issues in BPMN 2.0 Process Models.");
         entry.setField(StandardField.AUTHOR, "Geiger, Matthias and Wirtz, Guido");
         entry.setField(StandardField.BOOKTITLE, "ZEUS");
         entry.setField(StandardField.YEAR, "2013");
         entry.setField(StandardField.PAGES, "41--44");
 
-        List<BibEntry> foundEntries = finder.performSearch("Detecting Interoperability and Correctness Issues in BPMN 2.0 Process Models");
+        List<BibEntry> foundEntries =
+                finder.performSearch(
+                        "Detecting Interoperability and Correctness Issues in BPMN 2.0 Process Models");
 
         assertEquals(Collections.singletonList(entry), foundEntries);
     }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
index 7e04d02856dd..42b6bc39b28b 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
@@ -1,10 +1,11 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.SocketTimeoutException;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -14,103 +15,131 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
 
 @FetcherTest
 public class GrobidCitationFetcherTest {
 
-    static ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-    static GrobidPreferences grobidPreferences = new GrobidPreferences(
-            true,
-            false,
-            "http://grobid.jabref.org:8070");
-    static GrobidCitationFetcher grobidCitationFetcher = new GrobidCitationFetcher(grobidPreferences, importFormatPreferences);
-
-    static String example1 = "Derwing, T. M., Rossiter, M. J., & Munro, M. J. (2002). Teaching native speakers to listen to foreign-accented speech. Journal of Multilingual and Multicultural Development, 23(4), 245-259.";
-    static BibEntry example1AsBibEntry = new BibEntry(StandardEntryType.Article).withCitationKey("-1")
-                                                                                .withField(StandardField.AUTHOR, "Derwing, Tracey and Rossiter, Marian and Munro, Murray")
-                                                                                .withField(StandardField.TITLE, "Teaching Native Speakers to Listen to Foreign-accented Speech")
-                                                                                .withField(StandardField.JOURNAL, "Journal of Multilingual and Multicultural Development")
-                                                                                .withField(StandardField.DOI, "10.1080/01434630208666468")
-                                                                                .withField(StandardField.DATE, "2002-09")
-                                                                                .withField(StandardField.MONTH, "9")
-                                                                                .withField(StandardField.YEAR, "2002")
-                                                                                .withField(StandardField.PAGES, "245-259")
-                                                                                .withField(StandardField.VOLUME, "23")
-                                                                                .withField(StandardField.PUBLISHER, "Informa UK Limited")
-                                                                                .withField(StandardField.NUMBER, "4");
-
-    static String example2 = "Thomas, H. K. (2004). Training strategies for improving listeners' comprehension of foreign-accented speech (Doctoral dissertation). University of Colorado, Boulder.";
-    static BibEntry example2AsBibEntry = new BibEntry(BibEntry.DEFAULT_TYPE).withCitationKey("-1")
-                                                                            .withField(StandardField.AUTHOR, "Thomas, H")
-                                                                            .withField(StandardField.TITLE, "Training strategies for improving listeners' comprehension of foreign-accented speech (Doctoral dissertation)")
-                                                                            .withField(StandardField.DATE, "2004")
-                                                                            .withField(StandardField.PUBLISHER, "University of Colorado")
-                                                                            .withField(StandardField.YEAR, "2004")
-                                                                            .withField(StandardField.ADDRESS, "Boulder");
-
-    static String example3 = "Turk, J., Graham, P., & Verhulst, F. (2007). Child and adolescent psychiatry : A developmental approach. Oxford, England: Oxford University Press.";
-    static BibEntry example3AsBibEntry = new BibEntry(StandardEntryType.InBook).withCitationKey("-1")
-                                                                            .withField(StandardField.AUTHOR, "Turk, Jeremy and Graham, Philip and Verhulst, Frank")
-                                                                            .withField(StandardField.TITLE, "Developmental psychopathology")
-                                                                            .withField(StandardField.BOOKTITLE, "Child and Adolescent Psychiatry")
-                                                                            .withField(StandardField.PUBLISHER, "Oxford University Press")
-                                                                            .withField(StandardField.DATE, "2007-02")
-                                                                            .withField(StandardField.YEAR, "2007")
-                                                                            .withField(StandardField.MONTH, "2")
-                                                                            .withField(StandardField.PAGES, "191-264")
-                                                                            .withField(StandardField.DOI, "10.1093/med/9780199216697.003.0004")
-                                                                            .withField(StandardField.ADDRESS, "Oxford, England");
-
-    static String example4 = "Carr, I., & Kidner, R. (2003). Statutes and conventions on international trade law (4th ed.). London, England: Cavendish.";
-    static BibEntry example4AsBibEntry = new BibEntry(StandardEntryType.InBook).withCitationKey("-1")
-                                                                               .withField(StandardField.AUTHOR, "Carr, I and Kidner, R")
-                                                                               .withField(StandardField.BOOKTITLE, "Statutes and conventions on international trade law")
-                                                                               .withField(StandardField.PUBLISHER, "Cavendish")
-                                                                               .withField(StandardField.DATE, "2003")
-                                                                               .withField(StandardField.YEAR, "2003")
-                                                                               .withField(StandardField.NUMBER, "4")
-                                                                               .withField(StandardField.ADDRESS, "London, England");
+    static ImportFormatPreferences importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+    static GrobidPreferences grobidPreferences =
+            new GrobidPreferences(true, false, "http://grobid.jabref.org:8070");
+    static GrobidCitationFetcher grobidCitationFetcher =
+            new GrobidCitationFetcher(grobidPreferences, importFormatPreferences);
+
+    static String example1 =
+            "Derwing, T. M., Rossiter, M. J., & Munro, M. J. (2002). Teaching native speakers to listen to foreign-accented speech. Journal of Multilingual and Multicultural Development, 23(4), 245-259.";
+    static BibEntry example1AsBibEntry =
+            new BibEntry(StandardEntryType.Article)
+                    .withCitationKey("-1")
+                    .withField(
+                            StandardField.AUTHOR,
+                            "Derwing, Tracey and Rossiter, Marian and Munro, Murray")
+                    .withField(
+                            StandardField.TITLE,
+                            "Teaching Native Speakers to Listen to Foreign-accented Speech")
+                    .withField(
+                            StandardField.JOURNAL,
+                            "Journal of Multilingual and Multicultural Development")
+                    .withField(StandardField.DOI, "10.1080/01434630208666468")
+                    .withField(StandardField.DATE, "2002-09")
+                    .withField(StandardField.MONTH, "9")
+                    .withField(StandardField.YEAR, "2002")
+                    .withField(StandardField.PAGES, "245-259")
+                    .withField(StandardField.VOLUME, "23")
+                    .withField(StandardField.PUBLISHER, "Informa UK Limited")
+                    .withField(StandardField.NUMBER, "4");
+
+    static String example2 =
+            "Thomas, H. K. (2004). Training strategies for improving listeners' comprehension of foreign-accented speech (Doctoral dissertation). University of Colorado, Boulder.";
+    static BibEntry example2AsBibEntry =
+            new BibEntry(BibEntry.DEFAULT_TYPE)
+                    .withCitationKey("-1")
+                    .withField(StandardField.AUTHOR, "Thomas, H")
+                    .withField(
+                            StandardField.TITLE,
+                            "Training strategies for improving listeners' comprehension of foreign-accented speech (Doctoral dissertation)")
+                    .withField(StandardField.DATE, "2004")
+                    .withField(StandardField.PUBLISHER, "University of Colorado")
+                    .withField(StandardField.YEAR, "2004")
+                    .withField(StandardField.ADDRESS, "Boulder");
+
+    static String example3 =
+            "Turk, J., Graham, P., & Verhulst, F. (2007). Child and adolescent psychiatry : A developmental approach. Oxford, England: Oxford University Press.";
+    static BibEntry example3AsBibEntry =
+            new BibEntry(StandardEntryType.InBook)
+                    .withCitationKey("-1")
+                    .withField(
+                            StandardField.AUTHOR,
+                            "Turk, Jeremy and Graham, Philip and Verhulst, Frank")
+                    .withField(StandardField.TITLE, "Developmental psychopathology")
+                    .withField(StandardField.BOOKTITLE, "Child and Adolescent Psychiatry")
+                    .withField(StandardField.PUBLISHER, "Oxford University Press")
+                    .withField(StandardField.DATE, "2007-02")
+                    .withField(StandardField.YEAR, "2007")
+                    .withField(StandardField.MONTH, "2")
+                    .withField(StandardField.PAGES, "191-264")
+                    .withField(StandardField.DOI, "10.1093/med/9780199216697.003.0004")
+                    .withField(StandardField.ADDRESS, "Oxford, England");
+
+    static String example4 =
+            "Carr, I., & Kidner, R. (2003). Statutes and conventions on international trade law (4th ed.). London, England: Cavendish.";
+    static BibEntry example4AsBibEntry =
+            new BibEntry(StandardEntryType.InBook)
+                    .withCitationKey("-1")
+                    .withField(StandardField.AUTHOR, "Carr, I and Kidner, R")
+                    .withField(
+                            StandardField.BOOKTITLE,
+                            "Statutes and conventions on international trade law")
+                    .withField(StandardField.PUBLISHER, "Cavendish")
+                    .withField(StandardField.DATE, "2003")
+                    .withField(StandardField.YEAR, "2003")
+                    .withField(StandardField.NUMBER, "4")
+                    .withField(StandardField.ADDRESS, "London, England");
 
     public static Stream<Arguments> provideExamplesForCorrectResultTest() {
         return Stream.of(
                 Arguments.of("example1", example1AsBibEntry, example1),
                 Arguments.of("example2", example2AsBibEntry, example2),
                 Arguments.of("example3", example3AsBibEntry, example3),
-                Arguments.of("example4", example4AsBibEntry, example4)
-        );
+                Arguments.of("example4", example4AsBibEntry, example4));
     }
 
     public static Stream<Arguments> provideInvalidInput() {
-        return Stream.of(
-                Arguments.of("😋😋😋"),
-                Arguments.of("¦@#¦@#¦@#¦@#¦@#¦@#¦@°#¦@¦°¦@°")
-        );
+        return Stream.of(Arguments.of("😋😋😋"), Arguments.of("¦@#¦@#¦@#¦@#¦@#¦@#¦@°#¦@¦°¦@°"));
     }
 
     @ParameterizedTest(name = "{0}")
     @MethodSource("provideExamplesForCorrectResultTest")
-    void grobidPerformSearchCorrectResultTest(String testName, BibEntry expectedBibEntry, String searchQuery) throws FetcherException {
+    void grobidPerformSearchCorrectResultTest(
+            String testName, BibEntry expectedBibEntry, String searchQuery)
+            throws FetcherException {
         List<BibEntry> entries = grobidCitationFetcher.performSearch(searchQuery);
         assertEquals(List.of(expectedBibEntry), entries);
     }
 
     @Test
     void grobidPerformSearchCorrectlySplitsStringTest() throws FetcherException {
-        List<BibEntry> entries = grobidCitationFetcher.performSearch(example1 + "\n\n" + example2 + "\r\n\r\n" + example3 + "\r\r" + example4);
-        assertEquals(List.of(example1AsBibEntry, example2AsBibEntry, example3AsBibEntry, example4AsBibEntry), entries);
+        List<BibEntry> entries =
+                grobidCitationFetcher.performSearch(
+                        example1 + "\n\n" + example2 + "\r\n\r\n" + example3 + "\r\r" + example4);
+        assertEquals(
+                List.of(
+                        example1AsBibEntry,
+                        example2AsBibEntry,
+                        example3AsBibEntry,
+                        example4AsBibEntry),
+                entries);
     }
 
     @Test
@@ -122,17 +151,23 @@ void grobidPerformSearchWithEmptyStringsTest() throws FetcherException {
     @ParameterizedTest
     @MethodSource("provideInvalidInput")
     void grobidPerformSearchWithInvalidDataTest(String invalidInput) throws FetcherException {
-        assertThrows(FetcherException.class, () ->
-                grobidCitationFetcher.performSearch("invalidInput"), "performSearch should throw an FetcherException.");
+        assertThrows(
+                FetcherException.class,
+                () -> grobidCitationFetcher.performSearch("invalidInput"),
+                "performSearch should throw an FetcherException.");
     }
 
     @Test
     void performSearchThrowsExceptionInCaseOfConnectionIssues() throws IOException, ParseException {
         GrobidService grobidServiceMock = mock(GrobidService.class);
-        when(grobidServiceMock.processCitation(anyString(), any(), any())).thenThrow(new SocketTimeoutException("Timeout"));
-        grobidCitationFetcher = new GrobidCitationFetcher(importFormatPreferences, grobidServiceMock);
-
-        assertThrows(FetcherException.class, () ->
-                grobidCitationFetcher.performSearch("any text"), "performSearch should throw an FetcherException, when there are underlying IOException.");
+        when(grobidServiceMock.processCitation(anyString(), any(), any()))
+                .thenThrow(new SocketTimeoutException("Timeout"));
+        grobidCitationFetcher =
+                new GrobidCitationFetcher(importFormatPreferences, grobidServiceMock);
+
+        assertThrows(
+                FetcherException.class,
+                () -> grobidCitationFetcher.performSearch("any text"),
+                "performSearch should throw an FetcherException, when there are underlying IOException.");
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java
index ee173944c7ea..11c0d4afb784 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java
@@ -1,9 +1,11 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.URL;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer;
@@ -12,16 +14,13 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
 
 @FetcherTest
 class GvkFetcherTest {
@@ -34,30 +33,34 @@ class GvkFetcherTest {
     void setUp() {
         fetcher = new GvkFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
 
-        bibEntryPPN591166003 = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective Java")
-                .withField(StandardField.PUBLISHER, "Addison-Wesley")
-                .withField(StandardField.YEAR, "2008")
-                .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                .withField(StandardField.SERIES, "The Java series ... from the source")
-                .withField(StandardField.ADDRESS, "Upper Saddle River, NJ")
-                .withField(StandardField.EDITION, "2. ed., 5. print.")
-                .withField(StandardField.NOTE, "Includes bibliographical references and index. - Previous ed.: 2001. - Hier auch später erschienene, unveränderte Nachdrucke")
-                .withField(StandardField.ISBN, "9780321356680")
-                .withField(StandardField.PAGETOTAL, "346")
-                .withField(new UnknownField("ppn_gvk"), "591166003")
-                .withField(StandardField.SUBTITLE, "[revised and updated for JAVA SE 6]");
-
-        bibEntryPPN66391437X = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective unit testing")
-                .withField(StandardField.PUBLISHER, "Manning")
-                .withField(StandardField.YEAR, "2013")
-                .withField(StandardField.AUTHOR, "Koskela, Lasse")
-                .withField(StandardField.ADDRESS, "Shelter Island, NY")
-                .withField(StandardField.ISBN, "9781935182573")
-                .withField(StandardField.PAGETOTAL, "223")
-                .withField(new UnknownField("ppn_gvk"), "66391437X")
-                .withField(StandardField.SUBTITLE, "A guide for Java developers");
+        bibEntryPPN591166003 =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "Effective Java")
+                        .withField(StandardField.PUBLISHER, "Addison-Wesley")
+                        .withField(StandardField.YEAR, "2008")
+                        .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                        .withField(StandardField.SERIES, "The Java series ... from the source")
+                        .withField(StandardField.ADDRESS, "Upper Saddle River, NJ")
+                        .withField(StandardField.EDITION, "2. ed., 5. print.")
+                        .withField(
+                                StandardField.NOTE,
+                                "Includes bibliographical references and index. - Previous ed.: 2001. - Hier auch später erschienene, unveränderte Nachdrucke")
+                        .withField(StandardField.ISBN, "9780321356680")
+                        .withField(StandardField.PAGETOTAL, "346")
+                        .withField(new UnknownField("ppn_gvk"), "591166003")
+                        .withField(StandardField.SUBTITLE, "[revised and updated for JAVA SE 6]");
+
+        bibEntryPPN66391437X =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "Effective unit testing")
+                        .withField(StandardField.PUBLISHER, "Manning")
+                        .withField(StandardField.YEAR, "2013")
+                        .withField(StandardField.AUTHOR, "Koskela, Lasse")
+                        .withField(StandardField.ADDRESS, "Shelter Island, NY")
+                        .withField(StandardField.ISBN, "9781935182573")
+                        .withField(StandardField.PAGETOTAL, "223")
+                        .withField(new UnknownField("ppn_gvk"), "66391437X")
+                        .withField(StandardField.SUBTITLE, "A guide for Java developers");
     }
 
     @Test
@@ -68,17 +71,23 @@ void getName() {
     @Test
     void simpleSearchQueryURLCorrect() throws Exception {
         String query = "java jdk";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(query, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser().parse(query, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         URL url = fetcher.getURLForQuery(luceneQuery);
-        assertEquals("https://sru.k10plus.de/opac-de-627?version=1.1&operation=searchRetrieve&query=pica.all%3Djava%20and%20pica.all%3Djdk&maximumRecords=50&recordSchema=picaxml&sortKeys=Year%2C%2C1", url.toString());
+        assertEquals(
+                "https://sru.k10plus.de/opac-de-627?version=1.1&operation=searchRetrieve&query=pica.all%3Djava%20and%20pica.all%3Djdk&maximumRecords=50&recordSchema=picaxml&sortKeys=Year%2C%2C1",
+                url.toString());
     }
 
     @Test
     void complexSearchQueryURLCorrect() throws Exception {
         String query = "kon:java tit:jdk";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(query, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser().parse(query, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         URL url = fetcher.getURLForQuery(luceneQuery);
-        assertEquals("https://sru.k10plus.de/opac-de-627?version=1.1&operation=searchRetrieve&query=pica.kon%3Djava%20and%20pica.tit%3Djdk&maximumRecords=50&recordSchema=picaxml&sortKeys=Year%2C%2C1", url.toString());
+        assertEquals(
+                "https://sru.k10plus.de/opac-de-627?version=1.1&operation=searchRetrieve&query=pica.kon%3Djava%20and%20pica.tit%3Djdk&maximumRecords=50&recordSchema=picaxml&sortKeys=Year%2C%2C1",
+                url.toString());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java b/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java
index 60ae6d11a44a..52495521d725 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.URI;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -15,17 +15,16 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.net.URI;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 class IEEETest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
@@ -34,22 +33,33 @@ class IEEETest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTe
 
     private static ImporterPreferences importerPreferences;
 
-    private static final BibEntry IGOR_NEWCOMERS = new BibEntry(StandardEntryType.InProceedings)
-            .withField(StandardField.AUTHOR, "Igor Steinmacher and Tayana Uchoa Conte and Christoph Treude and Marco Aurélio Gerosa")
-            .withField(StandardField.DATE, "14-22 May 2016")
-            .withField(StandardField.YEAR, "2016")
-            .withField(StandardField.EVENTDATE, "14-22 May 2016")
-            .withField(StandardField.EVENTTITLEADDON, "Austin, TX, USA")
-            .withField(StandardField.LOCATION, "Austin, TX, USA")
-            .withField(StandardField.DOI, "10.1145/2884781.2884806")
-            .withField(StandardField.JOURNALTITLE, "2016 IEEE/ACM 38th International Conference on Software Engineering (ICSE)")
-            .withField(StandardField.PAGES, "273--284")
-            .withField(StandardField.ISBN, "978-1-5090-2071-3")
-            .withField(StandardField.ISSN, "1558-1225")
-            .withField(StandardField.PUBLISHER, "IEEE")
-            .withField(StandardField.KEYWORDS, "Portals, Documentation, Computer bugs, Joining processes, Industries, Open source software, Newcomers, Newbies, Novices, Beginners, Open Source Software, Barriers, Obstacles, Onboarding, Joining Process")
-            .withField(StandardField.TITLE, "Overcoming Open Source Project Entry Barriers with a Portal for Newcomers")
-            .withField(StandardField.FILE, ":https\\://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=7886910:PDF");
+    private static final BibEntry IGOR_NEWCOMERS =
+            new BibEntry(StandardEntryType.InProceedings)
+                    .withField(
+                            StandardField.AUTHOR,
+                            "Igor Steinmacher and Tayana Uchoa Conte and Christoph Treude and Marco Aurélio Gerosa")
+                    .withField(StandardField.DATE, "14-22 May 2016")
+                    .withField(StandardField.YEAR, "2016")
+                    .withField(StandardField.EVENTDATE, "14-22 May 2016")
+                    .withField(StandardField.EVENTTITLEADDON, "Austin, TX, USA")
+                    .withField(StandardField.LOCATION, "Austin, TX, USA")
+                    .withField(StandardField.DOI, "10.1145/2884781.2884806")
+                    .withField(
+                            StandardField.JOURNALTITLE,
+                            "2016 IEEE/ACM 38th International Conference on Software Engineering (ICSE)")
+                    .withField(StandardField.PAGES, "273--284")
+                    .withField(StandardField.ISBN, "978-1-5090-2071-3")
+                    .withField(StandardField.ISSN, "1558-1225")
+                    .withField(StandardField.PUBLISHER, "IEEE")
+                    .withField(
+                            StandardField.KEYWORDS,
+                            "Portals, Documentation, Computer bugs, Joining processes, Industries, Open source software, Newcomers, Newbies, Novices, Beginners, Open Source Software, Barriers, Obstacles, Onboarding, Joining Process")
+                    .withField(
+                            StandardField.TITLE,
+                            "Overcoming Open Source Project Entry Barriers with a Portal for Newcomers")
+                    .withField(
+                            StandardField.FILE,
+                            ":https\\://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=7886910:PDF");
 
     private IEEE fetcher;
 
@@ -75,47 +85,83 @@ void setUp() {
     @Disabled("IEEE seems to block us")
     void findByDOI() throws Exception {
         BibEntry entry = new BibEntry().withField(StandardField.DOI, "10.1109/ACCESS.2016.2535486");
-        assertEquals(Optional.of(URI.create("https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref=").toURL()),
+        assertEquals(
+                Optional.of(
+                        URI.create(
+                                        "https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref=")
+                                .toURL()),
                 fetcher.findFullText(entry));
     }
 
     @Test
     @Disabled("IEEE seems to block us")
     void findByDocumentUrl() throws Exception {
-        BibEntry entry = new BibEntry().withField(StandardField.URL, "https://ieeexplore.ieee.org/document/7421926/");
-        assertEquals(Optional.of(URI.create("https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref=").toURL()),
+        BibEntry entry =
+                new BibEntry()
+                        .withField(
+                                StandardField.URL, "https://ieeexplore.ieee.org/document/7421926/");
+        assertEquals(
+                Optional.of(
+                        URI.create(
+                                        "https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref=")
+                                .toURL()),
                 fetcher.findFullText(entry));
     }
 
     @Test
     @Disabled("IEEE seems to block us")
     void findByURL() throws Exception {
-        BibEntry entry = new BibEntry().withField(StandardField.URL, "https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=7421926&ref=");
-        assertEquals(Optional.of(URI.create("https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref=").toURL()),
+        BibEntry entry =
+                new BibEntry()
+                        .withField(
+                                StandardField.URL,
+                                "https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=7421926&ref=");
+        assertEquals(
+                Optional.of(
+                        URI.create(
+                                        "https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref=")
+                                .toURL()),
                 fetcher.findFullText(entry));
     }
 
     @Test
     @Disabled("IEEE blocks us - works in browser")
     void findByOldURL() throws Exception {
-        BibEntry entry = new BibEntry().withField(StandardField.URL, "https://ieeexplore.ieee.org/stamp/stamp.jsp?arnumber=7421926");
-        assertEquals(Optional.of(URI.create("https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref=").toURL()),
+        BibEntry entry =
+                new BibEntry()
+                        .withField(
+                                StandardField.URL,
+                                "https://ieeexplore.ieee.org/stamp/stamp.jsp?arnumber=7421926");
+        assertEquals(
+                Optional.of(
+                        URI.create(
+                                        "https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref=")
+                                .toURL()),
                 fetcher.findFullText(entry));
     }
 
     @Test
     @Disabled("IEEE seems to block us")
     void findByDOIButNotURL() throws Exception {
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.DOI, "10.1109/ACCESS.2016.2535486")
-                .withField(StandardField.URL, "http://dx.doi.org/10.1109/ACCESS.2016.2535486");
-        assertEquals(Optional.of(URI.create("https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref=").toURL()),
+        BibEntry entry =
+                new BibEntry()
+                        .withField(StandardField.DOI, "10.1109/ACCESS.2016.2535486")
+                        .withField(
+                                StandardField.URL, "http://dx.doi.org/10.1109/ACCESS.2016.2535486");
+        assertEquals(
+                Optional.of(
+                        URI.create(
+                                        "https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref=")
+                                .toURL()),
                 fetcher.findFullText(entry));
     }
 
     @Test
     void notFoundByURL() throws Exception {
-        BibEntry entry = new BibEntry().withField(StandardField.URL, "http://dx.doi.org/10.1109/ACCESS.2016.2535486");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(
+                                StandardField.URL, "http://dx.doi.org/10.1109/ACCESS.2016.2535486");
         assertEquals(Optional.empty(), fetcher.findFullText(entry));
     }
 
@@ -127,20 +173,31 @@ void notFoundByDOI() throws Exception {
 
     @Test
     void searchResultHasNoKeywordTerms() throws Exception {
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Shatakshi Sharma and Bhim Singh and Sukumar Mishra")
-                .withField(StandardField.DATE, "April 2020")
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.DOI, "10.1109/TII.2019.2935531")
-                .withField(StandardField.FILE, ":https\\://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8801912:PDF")
-                .withField(StandardField.ISSUE, "4")
-                .withField(StandardField.ISSN, "1941-0050")
-                .withField(StandardField.JOURNALTITLE, "IEEE Transactions on Industrial Informatics")
-                .withField(StandardField.PAGES, "2346--2356")
-                .withField(StandardField.PUBLISHER, "IEEE")
-                .withField(StandardField.TITLE, "Economic Operation and Quality Control in PV-BES-DG-Based Autonomous System")
-                .withField(StandardField.VOLUME, "16")
-                .withField(StandardField.KEYWORDS, "Batteries, Generators, Economics, Power quality, State of charge, Harmonic analysis, Control systems, Battery, diesel generator (DG), distributed generation, power quality, photovoltaic (PV), voltage source converter (VSC)");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Shatakshi Sharma and Bhim Singh and Sukumar Mishra")
+                        .withField(StandardField.DATE, "April 2020")
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.DOI, "10.1109/TII.2019.2935531")
+                        .withField(
+                                StandardField.FILE,
+                                ":https\\://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8801912:PDF")
+                        .withField(StandardField.ISSUE, "4")
+                        .withField(StandardField.ISSN, "1941-0050")
+                        .withField(
+                                StandardField.JOURNALTITLE,
+                                "IEEE Transactions on Industrial Informatics")
+                        .withField(StandardField.PAGES, "2346--2356")
+                        .withField(StandardField.PUBLISHER, "IEEE")
+                        .withField(
+                                StandardField.TITLE,
+                                "Economic Operation and Quality Control in PV-BES-DG-Based Autonomous System")
+                        .withField(StandardField.VOLUME, "16")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Batteries, Generators, Economics, Power quality, State of charge, Harmonic analysis, Control systems, Battery, diesel generator (DG), distributed generation, power quality, photovoltaic (PV), voltage source converter (VSC)");
 
         List<BibEntry> fetchedEntries = fetcher.performSearch("article_number:8801912");
         // Abstract should not be included in JabRef tests (copyrighted)
@@ -150,7 +207,9 @@ void searchResultHasNoKeywordTerms() throws Exception {
 
     @Test
     void searchByPlainQueryFindsEntry() throws Exception {
-        List<BibEntry> fetchedEntries = fetcher.performSearch("Overcoming Open Source Project Entry Barriers with a Portal for Newcomers");
+        List<BibEntry> fetchedEntries =
+                fetcher.performSearch(
+                        "Overcoming Open Source Project Entry Barriers with a Portal for Newcomers");
         // Abstract should not be included in JabRef tests
         fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
         assertEquals(Collections.singletonList(IGOR_NEWCOMERS), fetchedEntries);
@@ -158,7 +217,9 @@ void searchByPlainQueryFindsEntry() throws Exception {
 
     @Test
     void searchByQuotedQueryFindsEntry() throws Exception {
-        List<BibEntry> fetchedEntries = fetcher.performSearch("\"Overcoming Open Source Project Entry Barriers with a Portal for Newcomers\"");
+        List<BibEntry> fetchedEntries =
+                fetcher.performSearch(
+                        "\"Overcoming Open Source Project Entry Barriers with a Portal for Newcomers\"");
         // Abstract should not be included in JabRef tests
         fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
         assertEquals(Collections.singletonList(IGOR_NEWCOMERS), fetchedEntries);
@@ -171,7 +232,11 @@ public SearchBasedFetcher getFetcher() {
 
     @Override
     public List<String> getTestAuthors() {
-        return List.of("Igor Steinmacher", "Tayana Uchoa Conte", "Christoph Treude", "Marco Aurélio Gerosa");
+        return List.of(
+                "Igor Steinmacher",
+                "Tayana Uchoa Conte",
+                "Christoph Treude",
+                "Marco Aurélio Gerosa");
     }
 
     @Override
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java
index dfb4608e1ea9..edf0a510b1d6 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java
@@ -1,7 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
@@ -9,13 +9,12 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.util.Collections;
+import java.util.List;
 
 @FetcherTest
 class INSPIREFetcherTest {
@@ -24,57 +23,71 @@ class INSPIREFetcherTest {
 
     @BeforeEach
     void setUp() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         fetcher = new INSPIREFetcher(importFormatPreferences);
     }
 
     @Test
     void searchByQueryFindsEntry() throws Exception {
-        BibEntry master = new BibEntry(StandardEntryType.MastersThesis)
-                .withCitationKey("Diez:2013fdp")
-                .withField(StandardField.AUTHOR, "Diez, Tobias")
-                .withField(StandardField.TITLE, "Slice theorem for Fréchet group actions and covariant symplectic field theory")
-                .withField(StandardField.SCHOOL, "Leipzig U.")
-                .withField(StandardField.YEAR, "2013")
-                .withField(StandardField.EPRINT, "1405.2249")
-                .withField(StandardField.ARCHIVEPREFIX, "arXiv")
-                .withField(StandardField.PRIMARYCLASS, "math-ph");
+        BibEntry master =
+                new BibEntry(StandardEntryType.MastersThesis)
+                        .withCitationKey("Diez:2013fdp")
+                        .withField(StandardField.AUTHOR, "Diez, Tobias")
+                        .withField(
+                                StandardField.TITLE,
+                                "Slice theorem for Fréchet group actions and covariant symplectic field theory")
+                        .withField(StandardField.SCHOOL, "Leipzig U.")
+                        .withField(StandardField.YEAR, "2013")
+                        .withField(StandardField.EPRINT, "1405.2249")
+                        .withField(StandardField.ARCHIVEPREFIX, "arXiv")
+                        .withField(StandardField.PRIMARYCLASS, "math-ph");
         List<BibEntry> fetchedEntries = fetcher.performSearch("Fréchet group actions field");
         assertEquals(Collections.singletonList(master), fetchedEntries);
     }
 
     @Test
     void searchByIdentifierFindsEntry() throws Exception {
-        BibEntry article = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Melnikov:1998pr")
-                .withField(StandardField.AUTHOR, "Melnikov, Kirill and Yelkhovsky, Alexander")
-                .withField(StandardField.TITLE, "Top quark production at threshold with O(alpha-s**2) accuracy")
-                .withField(StandardField.DOI, "10.1016/S0550-3213(98)00348-4")
-                .withField(StandardField.JOURNAL, "Nucl. Phys. B")
-                .withField(StandardField.PAGES, "59--72")
-                .withField(StandardField.VOLUME, "528")
-                .withField(StandardField.YEAR, "1998")
-                .withField(StandardField.EPRINT, "hep-ph/9802379")
-                .withField(StandardField.ARCHIVEPREFIX, "arXiv")
-                .withField(new UnknownField("reportnumber"), "BUDKER-INP-1998-7, TTP-98-10");
+        BibEntry article =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("Melnikov:1998pr")
+                        .withField(
+                                StandardField.AUTHOR, "Melnikov, Kirill and Yelkhovsky, Alexander")
+                        .withField(
+                                StandardField.TITLE,
+                                "Top quark production at threshold with O(alpha-s**2) accuracy")
+                        .withField(StandardField.DOI, "10.1016/S0550-3213(98)00348-4")
+                        .withField(StandardField.JOURNAL, "Nucl. Phys. B")
+                        .withField(StandardField.PAGES, "59--72")
+                        .withField(StandardField.VOLUME, "528")
+                        .withField(StandardField.YEAR, "1998")
+                        .withField(StandardField.EPRINT, "hep-ph/9802379")
+                        .withField(StandardField.ARCHIVEPREFIX, "arXiv")
+                        .withField(
+                                new UnknownField("reportnumber"), "BUDKER-INP-1998-7, TTP-98-10");
         List<BibEntry> fetchedEntries = fetcher.performSearch("\"hep-ph/9802379\"");
         assertEquals(Collections.singletonList(article), fetchedEntries);
     }
 
     @Test
     void searchByExistingEntry() throws Exception {
-        BibEntry article = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Melnikov:1998pr")
-                .withField(StandardField.AUTHOR, "Melnikov, Kirill and Yelkhovsky, Alexander")
-                .withField(StandardField.TITLE, "Top quark production at threshold with O(alpha-s**2) accuracy")
-                .withField(StandardField.DOI, "10.1016/S0550-3213(98)00348-4")
-                .withField(StandardField.JOURNAL, "Nucl. Phys. B")
-                .withField(StandardField.PAGES, "59--72")
-                .withField(StandardField.VOLUME, "528")
-                .withField(StandardField.YEAR, "1998")
-                .withField(StandardField.EPRINT, "hep-ph/9802379")
-                .withField(StandardField.ARCHIVEPREFIX, "arXiv")
-                .withField(new UnknownField("reportnumber"), "BUDKER-INP-1998-7, TTP-98-10");
+        BibEntry article =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("Melnikov:1998pr")
+                        .withField(
+                                StandardField.AUTHOR, "Melnikov, Kirill and Yelkhovsky, Alexander")
+                        .withField(
+                                StandardField.TITLE,
+                                "Top quark production at threshold with O(alpha-s**2) accuracy")
+                        .withField(StandardField.DOI, "10.1016/S0550-3213(98)00348-4")
+                        .withField(StandardField.JOURNAL, "Nucl. Phys. B")
+                        .withField(StandardField.PAGES, "59--72")
+                        .withField(StandardField.VOLUME, "528")
+                        .withField(StandardField.YEAR, "1998")
+                        .withField(StandardField.EPRINT, "hep-ph/9802379")
+                        .withField(StandardField.ARCHIVEPREFIX, "arXiv")
+                        .withField(
+                                new UnknownField("reportnumber"), "BUDKER-INP-1998-7, TTP-98-10");
         List<BibEntry> fetchedEntries = fetcher.performSearch(article);
         assertEquals(Collections.singletonList(article), fetchedEntries);
     }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ISIDOREFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ISIDOREFetcherTest.java
index 219645eb6c0b..147bce541530 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ISIDOREFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ISIDOREFetcherTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 class ISIDOREFetcherTest {
@@ -28,16 +27,23 @@ void setup() {
     @Test
     @Disabled("Different result returned")
     void checkArticle1() throws FetcherException {
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.TITLE, "Investigating day-to-day variability of transit usage on a multimonth scale with smart card data. A case study in Lyon")
-                .withField(StandardField.AUTHOR, "Oscar Egu and Patrick Bonnel")
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.JOURNAL, "Travel Behaviour and Society")
-                .withField(StandardField.PUBLISHER, "HAL CCSD, Elsevier")
-                .withField(StandardField.DOI, "10.1016/j.tbs.2019.12.003")
-                .withField(StandardField.URL, "https://isidore.science/document/10670/1.hrzlqd");
-
-        List<BibEntry> actual = fetcher.performSearch("Investigating day-to-day variability of transit usage on a multimonth scale with smart card data. A case study in Lyon");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.TITLE,
+                                "Investigating day-to-day variability of transit usage on a multimonth scale with smart card data. A case study in Lyon")
+                        .withField(StandardField.AUTHOR, "Oscar Egu and Patrick Bonnel")
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.JOURNAL, "Travel Behaviour and Society")
+                        .withField(StandardField.PUBLISHER, "HAL CCSD, Elsevier")
+                        .withField(StandardField.DOI, "10.1016/j.tbs.2019.12.003")
+                        .withField(
+                                StandardField.URL,
+                                "https://isidore.science/document/10670/1.hrzlqd");
+
+        List<BibEntry> actual =
+                fetcher.performSearch(
+                        "Investigating day-to-day variability of transit usage on a multimonth scale with smart card data. A case study in Lyon");
 
         assertEquals(List.of(expected), actual);
     }
@@ -45,14 +51,21 @@ void checkArticle1() throws FetcherException {
     @Test
     @Disabled("Returns too much results")
     void checkArticle2() throws FetcherException {
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.TITLE, "Inequality – What Can Be Done ? Cambridge (Mass.) Harvard University Press, 2015, XI-384 p. ")
-                .withField(StandardField.AUTHOR, "Benoît Rapoport")
-                .withField(StandardField.YEAR, "2016")
-                .withField(StandardField.JOURNAL, "Population (édition française)")
-                .withField(StandardField.PUBLISHER, "HAL CCSD, INED - Institut national d’études démographiques")
-                .withField(StandardField.DOI, "10.3917/popu.1601.0153")
-                .withField(StandardField.URL, "https://isidore.science/document/10670/1.d2vlam");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.TITLE,
+                                "Inequality – What Can Be Done ? Cambridge (Mass.) Harvard University Press, 2015, XI-384 p. ")
+                        .withField(StandardField.AUTHOR, "Benoît Rapoport")
+                        .withField(StandardField.YEAR, "2016")
+                        .withField(StandardField.JOURNAL, "Population (édition française)")
+                        .withField(
+                                StandardField.PUBLISHER,
+                                "HAL CCSD, INED - Institut national d’études démographiques")
+                        .withField(StandardField.DOI, "10.3917/popu.1601.0153")
+                        .withField(
+                                StandardField.URL,
+                                "https://isidore.science/document/10670/1.d2vlam");
 
         List<BibEntry> actual = fetcher.performSearch("Inequality – What Can Be Done");
 
@@ -61,17 +74,23 @@ void checkArticle2() throws FetcherException {
 
     @Test
     void checkThesis() throws FetcherException {
-        BibEntry expected = new BibEntry(StandardEntryType.Thesis)
-                .withField(StandardField.TITLE, "Phosphate homeostasis and transport in relation with the liver microsomal glucose-6-phosphatase system")
-                .withField(StandardField.AUTHOR, "Wensheng Xie")
-                .withField(StandardField.YEAR, "2024");
-
-        List<BibEntry> actual = fetcher.performSearch("Phosphate homeostasis and transport in relation with the liver microsomal glucose-6-phosphatase system");
-
-        // The results obtained by the fetcher contain three entries (as of 2024), and the first matches our expected entry. So, we can use actual.getFirst(), but shall still use findFirst() in case the order of returned items changes.
-        Optional<BibEntry> matchingEntry = actual.stream()
-                                                 .filter(entry -> entry.equals(expected))
-                                                 .findFirst();
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Thesis)
+                        .withField(
+                                StandardField.TITLE,
+                                "Phosphate homeostasis and transport in relation with the liver microsomal glucose-6-phosphatase system")
+                        .withField(StandardField.AUTHOR, "Wensheng Xie")
+                        .withField(StandardField.YEAR, "2024");
+
+        List<BibEntry> actual =
+                fetcher.performSearch(
+                        "Phosphate homeostasis and transport in relation with the liver microsomal glucose-6-phosphatase system");
+
+        // The results obtained by the fetcher contain three entries (as of 2024), and the first
+        // matches our expected entry. So, we can use actual.getFirst(), but shall still use
+        // findFirst() in case the order of returned items changes.
+        Optional<BibEntry> matchingEntry =
+                actual.stream().filter(entry -> entry.equals(expected)).findFirst();
 
         assertEquals(Optional.of(expected), matchingEntry);
     }
@@ -79,15 +98,24 @@ void checkThesis() throws FetcherException {
     @Test
     @Disabled("No result returned. Searched for `Salvage Lymph Node`, results are returned")
     void checkArticle3() throws FetcherException {
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.TITLE, "Salvage Lymph Node Dissection for Nodal Recurrent Prostate Cancer: A Systematic Review.")
-                .withField(StandardField.AUTHOR, "G. Ploussard and G. Gandaglia and H. Borgmann and P. de Visschere and I. Heidegger and A. Kretschmer and R. Mathieu and C. Surcel and D. Tilki and I. Tsaur and M. Valerio and R. van den Bergh and P. Ost and A. Briganti")
-                .withField(StandardField.YEAR, "2019")
-                .withField(StandardField.JOURNAL, "European urology")
-                .withField(StandardField.DOI, "10.1016/j.eururo.2018.10.041")
-                .withField(StandardField.URL, "https://isidore.science/document/10670/1.zm7q2x");
-
-        List<BibEntry> actual = fetcher.performSearch("Salvage Lymph Node Dissection for Nodal Recurrent Prostate Cancer: A Systematic Review.");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.TITLE,
+                                "Salvage Lymph Node Dissection for Nodal Recurrent Prostate Cancer: A Systematic Review.")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "G. Ploussard and G. Gandaglia and H. Borgmann and P. de Visschere and I. Heidegger and A. Kretschmer and R. Mathieu and C. Surcel and D. Tilki and I. Tsaur and M. Valerio and R. van den Bergh and P. Ost and A. Briganti")
+                        .withField(StandardField.YEAR, "2019")
+                        .withField(StandardField.JOURNAL, "European urology")
+                        .withField(StandardField.DOI, "10.1016/j.eururo.2018.10.041")
+                        .withField(
+                                StandardField.URL,
+                                "https://isidore.science/document/10670/1.zm7q2x");
+
+        List<BibEntry> actual =
+                fetcher.performSearch(
+                        "Salvage Lymph Node Dissection for Nodal Recurrent Prostate Cancer: A Systematic Review.");
 
         assertEquals(List.of(expected), actual);
     }
@@ -101,11 +129,17 @@ void noResults() throws FetcherException {
     @Test
     void author() throws FetcherException {
         List<BibEntry> actual = fetcher.performSearch("author:\"Adam Strange\"");
-        assertEquals(List.of(new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Howard Green and Karen Boyland and Adam Strange")
-                .withField(StandardField.DOI, "doi:10.3406/htn.1990.2970")
-                .withField(StandardField.TITLE, "Le rôle des pépinières dans le développement des entreprises accueillies : essai d'évaluation. L'exemple du Yorkshire -Humberside (R.U.)")
-                .withField(StandardField.YEAR, "1990")
-        ), actual);
+        assertEquals(
+                List.of(
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(
+                                        StandardField.AUTHOR,
+                                        "Howard Green and Karen Boyland and Adam Strange")
+                                .withField(StandardField.DOI, "doi:10.3406/htn.1990.2970")
+                                .withField(
+                                        StandardField.TITLE,
+                                        "Le rôle des pépinières dans le développement des entreprises accueillies : essai d'évaluation. L'exemple du Yorkshire -Humberside (R.U.)")
+                                .withField(StandardField.YEAR, "1990")),
+                actual);
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
index a73954cb4a4d..c4811105787e 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
@@ -1,13 +1,11 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -16,7 +14,6 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.support.DisabledOnCIServer;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
@@ -25,15 +22,18 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 @FetcherTest
-@DisabledOnCIServer("eprint.iacr.org blocks with 500 when there are too many calls from the same IP address.")
+@DisabledOnCIServer(
+        "eprint.iacr.org blocks with 500 when there are too many calls from the same IP address.")
 class IacrEprintFetcherTest {
 
     private IacrEprintFetcher fetcher;
@@ -44,55 +44,89 @@ class IacrEprintFetcherTest {
 
     @BeforeEach
     void setUp() {
-        fetcher = new IacrEprintFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
-
-        abram2017 = new BibEntry(StandardEntryType.Misc)
-                .withCitationKey("cryptoeprint:2017/1118")
-                .withField(StandardField.ABSTRACT, "dummy")
-                .withField(StandardField.AUTHOR, "Ittai Abraham and Dahlia Malkhi and Kartik Nayak and Ling Ren and Alexander Spiegelman")
-                .withField(StandardField.DATE, "2017-11-24")
-                .withField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Paper 2017/1118")
-                .withField(StandardField.NOTE, "\\url{https://eprint.iacr.org/2017/1118}")
-                .withField(StandardField.TITLE, "Solida: A Blockchain Protocol Based on Reconfigurable Byzantine Consensus")
-                .withField(StandardField.URL, "https://eprint.iacr.org/2017/1118/20171124:064527")
-                .withField(StandardField.VERSION, "20171124:064527")
-                .withField(StandardField.YEAR, "2017");
-
-        abram2017noVersion = new BibEntry(StandardEntryType.Misc)
-                .withCitationKey("cryptoeprint:2017/1118")
-                .withField(StandardField.ABSTRACT, "dummy")
-                .withField(StandardField.AUTHOR, "Ittai Abraham and Dahlia Malkhi and Kartik Nayak and Ling Ren and Alexander Spiegelman")
-                .withField(StandardField.DATE, "2017-11-24")
-                .withField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Paper 2017/1118")
-                .withField(StandardField.NOTE, "\\url{https://eprint.iacr.org/2017/1118}")
-                .withField(StandardField.TITLE, "Solida: A Blockchain Protocol Based on Reconfigurable Byzantine Consensus")
-                .withField(StandardField.URL, "https://eprint.iacr.org/2017/1118")
-                .withField(StandardField.YEAR, "2017");
-
-        beierle2016 = new BibEntry(StandardEntryType.Misc)
-                .withCitationKey("cryptoeprint:2016/119")
-                .withField(StandardField.ABSTRACT, "dummy")
-                .withField(StandardField.AUTHOR, "Christof Beierle and Thorsten Kranz and Gregor Leander")
-                .withField(StandardField.DATE, "2017-02-17")
-                .withField(StandardField.DOI, "10.1007/978-3-662-53018-4_23")
-                .withField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Paper 2016/119")
-                .withField(StandardField.NOTE, "\\url{https://eprint.iacr.org/2016/119}")
-                .withField(StandardField.TITLE, "Lightweight Multiplication in GF(2^n) with Applications to MDS Matrices")
-                .withField(StandardField.URL, "https://eprint.iacr.org/2016/119/20170217:150415")
-                .withField(StandardField.VERSION, "20170217:150415")
-                .withField(StandardField.YEAR, "2016");
-
-        delgado2017 = new BibEntry(StandardEntryType.Misc)
-                .withCitationKey("cryptoeprint:2017/1095")
-                .withField(StandardField.ABSTRACT, "dummy")
-                .withField(StandardField.AUTHOR, "Sergi Delgado-Segura and Cristina Pérez-Solà and Guillermo Navarro-Arribas and Jordi Herrera-Joancomartí")
-                .withField(StandardField.DATE, "2018-01-19")
-                .withField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Paper 2017/1095")
-                .withField(StandardField.NOTE, "\\url{https://eprint.iacr.org/2017/1095}")
-                .withField(StandardField.TITLE, "Analysis of the Bitcoin UTXO set")
-                .withField(StandardField.URL, "https://eprint.iacr.org/2017/1095/20180119:113352")
-                .withField(StandardField.VERSION, "20180119:113352")
-                .withField(StandardField.YEAR, "2017");
+        fetcher =
+                new IacrEprintFetcher(
+                        mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+
+        abram2017 =
+                new BibEntry(StandardEntryType.Misc)
+                        .withCitationKey("cryptoeprint:2017/1118")
+                        .withField(StandardField.ABSTRACT, "dummy")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Ittai Abraham and Dahlia Malkhi and Kartik Nayak and Ling Ren and Alexander Spiegelman")
+                        .withField(StandardField.DATE, "2017-11-24")
+                        .withField(
+                                StandardField.HOWPUBLISHED,
+                                "Cryptology ePrint Archive, Paper 2017/1118")
+                        .withField(StandardField.NOTE, "\\url{https://eprint.iacr.org/2017/1118}")
+                        .withField(
+                                StandardField.TITLE,
+                                "Solida: A Blockchain Protocol Based on Reconfigurable Byzantine Consensus")
+                        .withField(
+                                StandardField.URL,
+                                "https://eprint.iacr.org/2017/1118/20171124:064527")
+                        .withField(StandardField.VERSION, "20171124:064527")
+                        .withField(StandardField.YEAR, "2017");
+
+        abram2017noVersion =
+                new BibEntry(StandardEntryType.Misc)
+                        .withCitationKey("cryptoeprint:2017/1118")
+                        .withField(StandardField.ABSTRACT, "dummy")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Ittai Abraham and Dahlia Malkhi and Kartik Nayak and Ling Ren and Alexander Spiegelman")
+                        .withField(StandardField.DATE, "2017-11-24")
+                        .withField(
+                                StandardField.HOWPUBLISHED,
+                                "Cryptology ePrint Archive, Paper 2017/1118")
+                        .withField(StandardField.NOTE, "\\url{https://eprint.iacr.org/2017/1118}")
+                        .withField(
+                                StandardField.TITLE,
+                                "Solida: A Blockchain Protocol Based on Reconfigurable Byzantine Consensus")
+                        .withField(StandardField.URL, "https://eprint.iacr.org/2017/1118")
+                        .withField(StandardField.YEAR, "2017");
+
+        beierle2016 =
+                new BibEntry(StandardEntryType.Misc)
+                        .withCitationKey("cryptoeprint:2016/119")
+                        .withField(StandardField.ABSTRACT, "dummy")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Christof Beierle and Thorsten Kranz and Gregor Leander")
+                        .withField(StandardField.DATE, "2017-02-17")
+                        .withField(StandardField.DOI, "10.1007/978-3-662-53018-4_23")
+                        .withField(
+                                StandardField.HOWPUBLISHED,
+                                "Cryptology ePrint Archive, Paper 2016/119")
+                        .withField(StandardField.NOTE, "\\url{https://eprint.iacr.org/2016/119}")
+                        .withField(
+                                StandardField.TITLE,
+                                "Lightweight Multiplication in GF(2^n) with Applications to MDS Matrices")
+                        .withField(
+                                StandardField.URL,
+                                "https://eprint.iacr.org/2016/119/20170217:150415")
+                        .withField(StandardField.VERSION, "20170217:150415")
+                        .withField(StandardField.YEAR, "2016");
+
+        delgado2017 =
+                new BibEntry(StandardEntryType.Misc)
+                        .withCitationKey("cryptoeprint:2017/1095")
+                        .withField(StandardField.ABSTRACT, "dummy")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Sergi Delgado-Segura and Cristina Pérez-Solà and Guillermo Navarro-Arribas and Jordi Herrera-Joancomartí")
+                        .withField(StandardField.DATE, "2018-01-19")
+                        .withField(
+                                StandardField.HOWPUBLISHED,
+                                "Cryptology ePrint Archive, Paper 2017/1095")
+                        .withField(StandardField.NOTE, "\\url{https://eprint.iacr.org/2017/1095}")
+                        .withField(StandardField.TITLE, "Analysis of the Bitcoin UTXO set")
+                        .withField(
+                                StandardField.URL,
+                                "https://eprint.iacr.org/2017/1095/20180119:113352")
+                        .withField(StandardField.VERSION, "20180119:113352")
+                        .withField(StandardField.YEAR, "2017");
     }
 
     @Test
@@ -113,7 +147,8 @@ void searchByIdWithValidId2() throws FetcherException {
 
     @Test
     void searchByIdWithValidIdAndNonAsciiChars() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("some random 2017/1095 stuff around the id");
+        Optional<BibEntry> fetchedEntry =
+                fetcher.performSearchById("some random 2017/1095 stuff around the id");
         assertFalse(fetchedEntry.get().getField(StandardField.ABSTRACT).get().isEmpty());
         fetchedEntry.get().setField(StandardField.ABSTRACT, "dummy");
         assertEquals(Optional.of(delgado2017), fetchedEntry);
@@ -167,9 +202,18 @@ void searchByIdWithOldHtmlFormatAndCheckDate() throws FetcherException {
     void searchByIdWithOldHtmlFormatWithoutDateCheck(String id) throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById(id);
         assertTrue(fetchedEntry.isPresent(), "Expected to get an entry for id " + id);
-        assertNotEquals(Optional.empty(), fetchedEntry.get().getField(StandardField.DATE), "Expected non empty date field, entry is\n" + fetchedEntry.toString());
-        assertEquals(10, fetchedEntry.get().getField(StandardField.DATE).get().length(), "Expected yyyy-MM-dd date format, entry is\n" + fetchedEntry.toString());
-        assertNotEquals(Optional.empty(), fetchedEntry.get().getField(StandardField.ABSTRACT), "Expected non empty abstract field, entry is\n" + fetchedEntry.toString());
+        assertNotEquals(
+                Optional.empty(),
+                fetchedEntry.get().getField(StandardField.DATE),
+                "Expected non empty date field, entry is\n" + fetchedEntry.toString());
+        assertEquals(
+                10,
+                fetchedEntry.get().getField(StandardField.DATE).get().length(),
+                "Expected yyyy-MM-dd date format, entry is\n" + fetchedEntry.toString());
+        assertNotEquals(
+                Optional.empty(),
+                fetchedEntry.get().getField(StandardField.ABSTRACT),
+                "Expected non empty abstract field, entry is\n" + fetchedEntry.toString());
     }
 
     /**
@@ -203,13 +247,16 @@ private static Stream<String> allNonWithdrawnIdsWithOldHtmlFormat() {
     @Test
     void getFulltextWithVersion() throws FetcherException, IOException {
         Optional<URL> pdfUrl = fetcher.findFullText(abram2017);
-        assertEquals(Optional.of("https://eprint.iacr.org/archive/2017/1118/1511505927.pdf"), pdfUrl.map(URL::toString));
+        assertEquals(
+                Optional.of("https://eprint.iacr.org/archive/2017/1118/1511505927.pdf"),
+                pdfUrl.map(URL::toString));
     }
 
     @Test
     void getFulltextWithoutVersion() throws FetcherException, IOException {
         Optional<URL> pdfUrl = fetcher.findFullText(abram2017noVersion);
-        assertEquals(Optional.of("https://eprint.iacr.org/2017/1118.pdf"), pdfUrl.map(URL::toString));
+        assertEquals(
+                Optional.of("https://eprint.iacr.org/2017/1118.pdf"), pdfUrl.map(URL::toString));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IssnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IssnFetcherTest.java
index 47f260b4b9b3..93d6f1954a95 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IssnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IssnFetcherTest.java
@@ -1,7 +1,8 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -9,13 +10,11 @@
 import org.jabref.model.entry.BibEntryPreferences;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 class IssnFetcherTest {
@@ -31,10 +30,11 @@ void setUp() {
 
         fetcher = new IssnFetcher();
 
-        bibEntry = new BibEntry()
-                .withField(StandardField.ISSN, "15454509")
-                .withField(StandardField.JOURNALTITLE, "Annual Review of Biochemistry")
-                .withField(StandardField.PUBLISHER, "Annual Reviews Inc.");
+        bibEntry =
+                new BibEntry()
+                        .withField(StandardField.ISSN, "15454509")
+                        .withField(StandardField.JOURNALTITLE, "Annual Review of Biochemistry")
+                        .withField(StandardField.PUBLISHER, "Annual Reviews Inc.");
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/JstorFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/JstorFetcherTest.java
index 283dc2cdf415..41bf7aba1ece 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/JstorFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/JstorFetcherTest.java
@@ -1,12 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.net.URI;
-import java.net.URL;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.SearchBasedFetcher;
@@ -15,51 +10,70 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.support.DisabledOnCIServer;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.net.URI;
+import java.net.URL;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 @DisabledOnCIServer("CI server is blocked by JSTOR")
 public class JstorFetcherTest implements SearchBasedFetcherCapabilityTest {
 
-    private final JstorFetcher fetcher = new JstorFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
-
-    private final BibEntry bibEntry = new BibEntry(StandardEntryType.Article)
-            .withCitationKey("10.2307/90002164")
-            .withField(StandardField.AUTHOR, "Yang Yanxia")
-            .withField(StandardField.TITLE, "Test Anxiety Analysis of Chinese College Students in Computer-based Spoken English Test")
-            .withField(StandardField.ISSN, "11763647, 14364522")
-            .withField(StandardField.JOURNAL, "Journal of Educational Technology & Society")
-            .withField(StandardField.ABSTRACT, "ABSTRACT Test anxiety was a commonly known or assumed factor that could greatly influence performance of test takers. With the employment of designed questionnaires and computer-based spoken English test, this paper explored test anxiety manifestation of Chinese college students from both macro and micro aspects, and found out that the major anxiety in computer-based spoken English test was spoken English test anxiety, which consisted of test anxiety and communication apprehension. Regard to proximal test anxiety, the causes listed in proper order as low spoken English abilities, lack of speaking techniques, anxiety from the evaluative process and inadaptability with computer-based spoken English test format. As to distal anxiety causes, attitude toward learning spoken English and self-evaluation of speaking abilities were significantly negatively correlated with test anxiety. Besides, as test anxiety significantly associated often with test performance, a look at pedagogical implications has been discussed in this paper.")
-            .withField(StandardField.PUBLISHER, "International Forum of Educational Technology & Society")
-            .withField(StandardField.NUMBER, "2")
-            .withField(StandardField.PAGES, "63--73")
-            .withField(StandardField.VOLUME, "20")
-            .withField(StandardField.URL, "http://www.jstor.org/stable/90002164")
-            .withField(StandardField.YEAR, "2017");
-
-    private final BibEntry doiEntry = new BibEntry(StandardEntryType.Article)
-            .withCitationKey("10.1086/501484")
-            .withField(StandardField.AUTHOR, "Johnmarshall Reeve")
-            .withField(StandardField.TITLE, "Teachers as Facilitators: What Autonomy‐Supportive Teachers Do and Why Their Students Benefit")
-            .withField(StandardField.ISSN, "00135984, 15548279")
-            .withField(StandardField.JOURNAL, "The Elementary School Journal")
-            .withField(StandardField.ABSTRACT, "Abstract Students are sometimes proactive and engaged in classroom learning activities, but they are also sometimes only reactive and passive. Recognizing this, in this article I argue that students’ classroom engagement depends, in part, on the supportive quality of the classroom climate in which they learn. According to the dialectical framework within self‐determination theory, students possess inner motivational resources that classroom conditions can support or frustrate. When teachers find ways to nurture these inner resources, they adopt an autonomy‐supportive motivating style. After articulating what autonomy‐supportive teachers say and do during instruction, I discuss 3 points: teachers can learn how to be more autonomy supportive toward students; teachers most engage students when they offer high levels of both autonomy support and structure; and an autonomy‐supportive motivating style is an important element to a high‐quality teacher‐student relationship.")
-            .withField(StandardField.PUBLISHER, "The University of Chicago Press")
-            .withField(StandardField.NUMBER, "3")
-            .withField(StandardField.PAGES, "225--236")
-            .withField(StandardField.VOLUME, "106")
-            .withField(StandardField.URL, "http://www.jstor.org/stable/10.1086/501484")
-            .withField(StandardField.YEAR, "2006");
+    private final JstorFetcher fetcher =
+            new JstorFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+
+    private final BibEntry bibEntry =
+            new BibEntry(StandardEntryType.Article)
+                    .withCitationKey("10.2307/90002164")
+                    .withField(StandardField.AUTHOR, "Yang Yanxia")
+                    .withField(
+                            StandardField.TITLE,
+                            "Test Anxiety Analysis of Chinese College Students in Computer-based Spoken English Test")
+                    .withField(StandardField.ISSN, "11763647, 14364522")
+                    .withField(StandardField.JOURNAL, "Journal of Educational Technology & Society")
+                    .withField(
+                            StandardField.ABSTRACT,
+                            "ABSTRACT Test anxiety was a commonly known or assumed factor that could greatly influence performance of test takers. With the employment of designed questionnaires and computer-based spoken English test, this paper explored test anxiety manifestation of Chinese college students from both macro and micro aspects, and found out that the major anxiety in computer-based spoken English test was spoken English test anxiety, which consisted of test anxiety and communication apprehension. Regard to proximal test anxiety, the causes listed in proper order as low spoken English abilities, lack of speaking techniques, anxiety from the evaluative process and inadaptability with computer-based spoken English test format. As to distal anxiety causes, attitude toward learning spoken English and self-evaluation of speaking abilities were significantly negatively correlated with test anxiety. Besides, as test anxiety significantly associated often with test performance, a look at pedagogical implications has been discussed in this paper.")
+                    .withField(
+                            StandardField.PUBLISHER,
+                            "International Forum of Educational Technology & Society")
+                    .withField(StandardField.NUMBER, "2")
+                    .withField(StandardField.PAGES, "63--73")
+                    .withField(StandardField.VOLUME, "20")
+                    .withField(StandardField.URL, "http://www.jstor.org/stable/90002164")
+                    .withField(StandardField.YEAR, "2017");
+
+    private final BibEntry doiEntry =
+            new BibEntry(StandardEntryType.Article)
+                    .withCitationKey("10.1086/501484")
+                    .withField(StandardField.AUTHOR, "Johnmarshall Reeve")
+                    .withField(
+                            StandardField.TITLE,
+                            "Teachers as Facilitators: What Autonomy‐Supportive Teachers Do and Why Their Students Benefit")
+                    .withField(StandardField.ISSN, "00135984, 15548279")
+                    .withField(StandardField.JOURNAL, "The Elementary School Journal")
+                    .withField(
+                            StandardField.ABSTRACT,
+                            "Abstract Students are sometimes proactive and engaged in classroom learning activities, but they are also sometimes only reactive and passive. Recognizing this, in this article I argue that students’ classroom engagement depends, in part, on the supportive quality of the classroom climate in which they learn. According to the dialectical framework within self‐determination theory, students possess inner motivational resources that classroom conditions can support or frustrate. When teachers find ways to nurture these inner resources, they adopt an autonomy‐supportive motivating style. After articulating what autonomy‐supportive teachers say and do during instruction, I discuss 3 points: teachers can learn how to be more autonomy supportive toward students; teachers most engage students when they offer high levels of both autonomy support and structure; and an autonomy‐supportive motivating style is an important element to a high‐quality teacher‐student relationship.")
+                    .withField(StandardField.PUBLISHER, "The University of Chicago Press")
+                    .withField(StandardField.NUMBER, "3")
+                    .withField(StandardField.PAGES, "225--236")
+                    .withField(StandardField.VOLUME, "106")
+                    .withField(StandardField.URL, "http://www.jstor.org/stable/10.1086/501484")
+                    .withField(StandardField.YEAR, "2006");
 
     @Test
     void searchByTitle() throws Exception {
-        List<BibEntry> entries = fetcher.performSearch("title: \"Test Anxiety Analysis of Chinese College Students in Computer-based Spoken English Test\"");
+        List<BibEntry> entries =
+                fetcher.performSearch(
+                        "title: \"Test Anxiety Analysis of Chinese College Students in Computer-based Spoken English Test\"");
         assertEquals(Collections.singletonList(bibEntry), entries);
     }
 
@@ -73,14 +87,19 @@ void searchById() throws Exception {
 
     @Test
     void searchByUrlUsingId() throws Exception {
-        doiEntry.setField(StandardField.URLDATE, LocalDate.now().format(DateTimeFormatter.ISO_DATE));
-        assertEquals(Optional.of(doiEntry), fetcher.performSearchById("https://www.jstor.org/stable/10.1086/501484?seq=1"));
+        doiEntry.setField(
+                StandardField.URLDATE, LocalDate.now().format(DateTimeFormatter.ISO_DATE));
+        assertEquals(
+                Optional.of(doiEntry),
+                fetcher.performSearchById("https://www.jstor.org/stable/10.1086/501484?seq=1"));
     }
 
     @Test
     void fetchPDF() throws Exception {
         Optional<URL> url = fetcher.findFullText(bibEntry);
-        assertEquals(Optional.of(URI.create("https://www.jstor.org/stable/pdf/90002164.pdf").toURL()), url);
+        assertEquals(
+                Optional.of(URI.create("https://www.jstor.org/stable/pdf/90002164.pdf").toURL()),
+                url);
     }
 
     @Override
@@ -101,16 +120,13 @@ public String getTestJournal() {
 
     @Disabled("jstor does not support search only based on year")
     @Override
-    public void supportsYearRangeSearch() throws Exception {
-    }
+    public void supportsYearRangeSearch() throws Exception {}
 
     @Disabled("jstor does not provide articles with journals")
     @Override
-    public void supportsJournalSearch() throws Exception {
-    }
+    public void supportsJournalSearch() throws Exception {}
 
     @Disabled("jstor does not support search only based on year")
     @Override
-    public void supportsYearSearch() throws Exception {
-    }
+    public void supportsYearSearch() throws Exception {}
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/LOBIDFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/LOBIDFetcherTest.java
index 9b5de6f84f02..258bb6eb4bd3 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/LOBIDFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/LOBIDFetcherTest.java
@@ -1,7 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedFetcher;
@@ -10,13 +10,12 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.util.Collections;
+import java.util.List;
 
 @FetcherTest
 class LOBIDFetcherTest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
@@ -37,46 +36,64 @@ public String queryForUniqueResultsPerPage() {
 
     @Test
     void searchByQueryFindsEntry() throws Exception {
-        BibEntry firstArticle = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.AUTHOR, "Nichols, Cathrine and Blume, Eugen and DruckVerlag Kettler GmbH")
-                .withField(StandardField.PUBLISHER, "Verlag Kettler")
-                .withField(StandardField.DATE, "2016")
-                .withField(StandardField.ISBN, "9783862065752")
-                .withField(StandardField.KEYWORDS, "(Produktform)Hardback, Cathrine Nichols, Eugen Blume, Staatliche Museen zu Berlin, (Produktgruppe)Ausst: Ausstellungskatalog, (VLB-WN)1580: Hardcover, Softcover / Kunst")
-                .withField(StandardField.LANGUAGE, "Deutsch")
-                .withField(StandardField.LOCATION, "Dortmund")
-                .withField(StandardField.TITLE, "Das Kapital")
-                .withField(StandardField.TITLEADDON, "Schuld, Territorium, Utopie")
-                .withField(StandardField.TYPE, "BibliographicResource, Book")
-                .withField(StandardField.URL, "http://lobid.org/resources/991002500969706485")
-                .withField(StandardField.YEAR, "2016");
-
-        BibEntry secondArticle = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Nielsen, Cathrin")
-                .withField(StandardField.TITLE, "\"... und die Substanz ist natürlich allein schon ein seelischer Prozeß\"")
-                .withField(StandardField.JOURNAL, "Beuys. Die Revolution sind wir")
-                .withField(StandardField.DATE, "2008")
-                .withField(StandardField.KEYWORDS, "Beuys, Joseph, Physis")
-                .withField(StandardField.LANGUAGE, "Deutsch")
-                .withField(StandardField.TYPE, "BibliographicResource, Article")
-                .withField(StandardField.URL, "http://lobid.org/resources/990173112890206441")
-                .withField(StandardField.YEAR, "2008");
-
-        BibEntry thirdArticle = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.AUTHOR, "Nichols, Catherine and Blume, Eugen and Hamburger Bahnhof - Museum für Gegenwart - Berlin and Nationalgalerie (Berlin) and DruckVerlag Kettler GmbH")
-                .withField(StandardField.ABSTRACT, "Impresum: \"Diese Publikation erscheint anlässlich der Ausstellung Das Kapital. Schuld-Territorium-Utopie. Eine Ausstellung der Nationalgalerie im Hamburger Bahnhof - Museum für Gegenwart - Berlin, 2. Juli-6. November 2016\"")
-                .withField(StandardField.PUBLISHER, "Verlag Kettler")
-                .withField(StandardField.DATE, "2016")
-                .withField(StandardField.EDITION, "1. Auflage")
-                .withField(StandardField.ISBN, "9783862065752")
-                .withField(StandardField.KEYWORDS, "Cathrine Nichols, Eugen Blume, Staatliche Museen zu Berlin, Beuys, Joseph: Das Kapital Raum 1970-1977, Kunst, Kapitalismus (Motiv), Geschichte")
-                .withField(StandardField.LANGUAGE, "Deutsch")
-                .withField(StandardField.LOCATION, "Dortmund")
-                .withField(StandardField.TITLE, "Das Kapital")
-                .withField(StandardField.TITLEADDON, "Schuld - Territorium - Utopie")
-                .withField(StandardField.TYPE, "BibliographicResource, Book")
-                .withField(StandardField.URL, "http://lobid.org/resources/990212549810206441")
-                .withField(StandardField.YEAR, "2016");
+        BibEntry firstArticle =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Nichols, Cathrine and Blume, Eugen and DruckVerlag Kettler GmbH")
+                        .withField(StandardField.PUBLISHER, "Verlag Kettler")
+                        .withField(StandardField.DATE, "2016")
+                        .withField(StandardField.ISBN, "9783862065752")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "(Produktform)Hardback, Cathrine Nichols, Eugen Blume, Staatliche Museen zu Berlin, (Produktgruppe)Ausst: Ausstellungskatalog, (VLB-WN)1580: Hardcover, Softcover / Kunst")
+                        .withField(StandardField.LANGUAGE, "Deutsch")
+                        .withField(StandardField.LOCATION, "Dortmund")
+                        .withField(StandardField.TITLE, "Das Kapital")
+                        .withField(StandardField.TITLEADDON, "Schuld, Territorium, Utopie")
+                        .withField(StandardField.TYPE, "BibliographicResource, Book")
+                        .withField(
+                                StandardField.URL, "http://lobid.org/resources/991002500969706485")
+                        .withField(StandardField.YEAR, "2016");
+
+        BibEntry secondArticle =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Nielsen, Cathrin")
+                        .withField(
+                                StandardField.TITLE,
+                                "\"... und die Substanz ist natürlich allein schon ein seelischer Prozeß\"")
+                        .withField(StandardField.JOURNAL, "Beuys. Die Revolution sind wir")
+                        .withField(StandardField.DATE, "2008")
+                        .withField(StandardField.KEYWORDS, "Beuys, Joseph, Physis")
+                        .withField(StandardField.LANGUAGE, "Deutsch")
+                        .withField(StandardField.TYPE, "BibliographicResource, Article")
+                        .withField(
+                                StandardField.URL, "http://lobid.org/resources/990173112890206441")
+                        .withField(StandardField.YEAR, "2008");
+
+        BibEntry thirdArticle =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Nichols, Catherine and Blume, Eugen and Hamburger Bahnhof - Museum für Gegenwart - Berlin and Nationalgalerie (Berlin) and DruckVerlag Kettler GmbH")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Impresum: \"Diese Publikation erscheint anlässlich der Ausstellung Das Kapital. Schuld-Territorium-Utopie. Eine Ausstellung der Nationalgalerie im Hamburger Bahnhof - Museum für Gegenwart - Berlin, 2. Juli-6. November 2016\"")
+                        .withField(StandardField.PUBLISHER, "Verlag Kettler")
+                        .withField(StandardField.DATE, "2016")
+                        .withField(StandardField.EDITION, "1. Auflage")
+                        .withField(StandardField.ISBN, "9783862065752")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Cathrine Nichols, Eugen Blume, Staatliche Museen zu Berlin, Beuys, Joseph: Das Kapital Raum 1970-1977, Kunst, Kapitalismus (Motiv), Geschichte")
+                        .withField(StandardField.LANGUAGE, "Deutsch")
+                        .withField(StandardField.LOCATION, "Dortmund")
+                        .withField(StandardField.TITLE, "Das Kapital")
+                        .withField(StandardField.TITLEADDON, "Schuld - Territorium - Utopie")
+                        .withField(StandardField.TYPE, "BibliographicResource, Book")
+                        .withField(
+                                StandardField.URL, "http://lobid.org/resources/990212549810206441")
+                        .withField(StandardField.YEAR, "2016");
 
         List<BibEntry> fetchedEntries = fetcher.performSearch("Cathrine Nichols");
         assertEquals(List.of(firstArticle, secondArticle, thirdArticle), fetchedEntries);
@@ -90,8 +107,7 @@ void searchByEmptyQueryFindsNothing() throws Exception {
     @Test
     @Override
     @Disabled("Results returned contain a few incorrect years. The majority are accurate")
-    public void supportsYearSearch() {
-    }
+    public void supportsYearSearch() {}
 
     @Override
     public PagedSearchBasedFetcher getPagedFetcher() {
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java b/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
index e0e3055e00da..9e3b56e07700 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
@@ -1,6 +1,9 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -9,14 +12,10 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Optional;
 
 @FetcherTest
 class LibraryOfCongressTest {
@@ -26,7 +25,8 @@ class LibraryOfCongressTest {
     @BeforeEach
     void setUp() {
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class);
-        when(importFormatPreferences.bibEntryPreferences()).thenReturn(mock(BibEntryPreferences.class));
+        when(importFormatPreferences.bibEntryPreferences())
+                .thenReturn(mock(BibEntryPreferences.class));
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
         fetcher = new LibraryOfCongress(importFormatPreferences);
@@ -34,20 +34,23 @@ void setUp() {
 
     @Test
     void performSearchById() throws Exception {
-        BibEntry expected = new BibEntry()
-                .withField(StandardField.ADDRESS, "mau, Burlington, MA")
-                .withField(StandardField.AUTHOR, "West, Matthew")
-                .withField(StandardField.DATE, "2011")
-                .withField(StandardField.ISBN, "0123751063 (pbk.)")
-                .withField(new UnknownField("issuance"), "monographic")
-                .withField(StandardField.KEYWORDS, "Database design, Data structures (Computer science)")
-                .withField(StandardField.LANGUAGE, "eng")
-                .withField(new UnknownField("lccn"), "2010045158")
-                .withField(StandardField.NOTE, "Matthew West., Includes index.")
-                .withField(new UnknownField("oclc"), "ocn665135773")
-                .withField(new UnknownField("source"), "aacr")
-                .withField(StandardField.TITLE, "Developing high quality data models")
-                .withField(StandardField.YEAR, "2011");
+        BibEntry expected =
+                new BibEntry()
+                        .withField(StandardField.ADDRESS, "mau, Burlington, MA")
+                        .withField(StandardField.AUTHOR, "West, Matthew")
+                        .withField(StandardField.DATE, "2011")
+                        .withField(StandardField.ISBN, "0123751063 (pbk.)")
+                        .withField(new UnknownField("issuance"), "monographic")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Database design, Data structures (Computer science)")
+                        .withField(StandardField.LANGUAGE, "eng")
+                        .withField(new UnknownField("lccn"), "2010045158")
+                        .withField(StandardField.NOTE, "Matthew West., Includes index.")
+                        .withField(new UnknownField("oclc"), "ocn665135773")
+                        .withField(new UnknownField("source"), "aacr")
+                        .withField(StandardField.TITLE, "Developing high quality data models")
+                        .withField(StandardField.YEAR, "2011");
 
         assertEquals(Optional.of(expected), fetcher.performSearchById("2010045158"));
     }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
index 264986c3c508..031f537ada3d 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
@@ -1,7 +1,9 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.InputStream;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -13,15 +15,12 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.support.DisabledOnCIServer;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.InputStream;
+import java.util.List;
 
 @FetcherTest
 class MathSciNetTest {
@@ -31,34 +30,42 @@ class MathSciNetTest {
 
     @BeforeEach
     void setUp() throws Exception {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         fetcher = new MathSciNet(importFormatPreferences);
         FieldPreferences fieldPreferences = mock(FieldPreferences.class);
-        when(fieldPreferences.getNonWrappableFields()).thenReturn(FXCollections.observableArrayList());
+        when(fieldPreferences.getNonWrappableFields())
+                .thenReturn(FXCollections.observableArrayList());
         normalizeWhitespacesCleanup = new NormalizeWhitespacesCleanup(fieldPreferences);
 
-        ratiuEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("MR3537908")
-                .withField(StandardField.AUTHOR, "Chechkin, Gregory A. and Ratiu, Tudor S. and Romanov, Maxim S. and Samokhin, Vyacheslav N.")
-                .withField(StandardField.TITLE, "Existence and uniqueness theorems for the two-dimensional {E}ricksen-{L}eslie system")
-                .withField(StandardField.JOURNAL, "Journal of Mathematical Fluid Mechanics")
-                .withField(StandardField.VOLUME, "18")
-                .withField(StandardField.YEAR, "2016")
-                .withField(StandardField.NUMBER, "3")
-                .withField(StandardField.PAGES, "571--589")
-                .withField(StandardField.KEYWORDS, "76A15 (35A01 35A02 35K61 82D30)")
-                .withField(StandardField.MR_NUMBER, "3537908")
-                .withField(StandardField.ISSN, "1422-6928,1422-6952")
-                .withField(StandardField.DOI, "10.1007/s00021-016-0250-0");
+        ratiuEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("MR3537908")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Chechkin, Gregory A. and Ratiu, Tudor S. and Romanov, Maxim S. and Samokhin, Vyacheslav N.")
+                        .withField(
+                                StandardField.TITLE,
+                                "Existence and uniqueness theorems for the two-dimensional {E}ricksen-{L}eslie system")
+                        .withField(StandardField.JOURNAL, "Journal of Mathematical Fluid Mechanics")
+                        .withField(StandardField.VOLUME, "18")
+                        .withField(StandardField.YEAR, "2016")
+                        .withField(StandardField.NUMBER, "3")
+                        .withField(StandardField.PAGES, "571--589")
+                        .withField(StandardField.KEYWORDS, "76A15 (35A01 35A02 35K61 82D30)")
+                        .withField(StandardField.MR_NUMBER, "3537908")
+                        .withField(StandardField.ISSN, "1422-6928,1422-6952")
+                        .withField(StandardField.DOI, "10.1007/s00021-016-0250-0");
     }
 
     @Test
     void searchByEntryFindsEntry() throws Exception {
-        BibEntry searchEntry = new BibEntry()
-                .withField(StandardField.TITLE, "existence")
-                .withField(StandardField.AUTHOR, "Ratiu")
-                .withField(StandardField.JOURNAL, "fluid");
+        BibEntry searchEntry =
+                new BibEntry()
+                        .withField(StandardField.TITLE, "existence")
+                        .withField(StandardField.AUTHOR, "Ratiu")
+                        .withField(StandardField.JOURNAL, "fluid");
 
         List<BibEntry> fetchedEntries = fetcher.performSearch(searchEntry);
         if (!fetchedEntries.isEmpty()) {
@@ -68,10 +75,10 @@ void searchByEntryFindsEntry() throws Exception {
     }
 
     @Test
-    @DisabledOnCIServer("CI server has no subscription to MathSciNet and thus gets 401 response. One single call goes through, but subsequent calls fail.")
+    @DisabledOnCIServer(
+            "CI server has no subscription to MathSciNet and thus gets 401 response. One single call goes through, but subsequent calls fail.")
     void searchByIdInEntryFindsEntry() throws Exception {
-        BibEntry searchEntry = new BibEntry()
-                .withField(StandardField.MR_NUMBER, "3537908");
+        BibEntry searchEntry = new BibEntry().withField(StandardField.MR_NUMBER, "3537908");
 
         List<BibEntry> fetchedEntries = fetcher.performSearch(searchEntry);
         if (!fetchedEntries.isEmpty()) {
@@ -81,9 +88,12 @@ void searchByIdInEntryFindsEntry() throws Exception {
     }
 
     @Test
-    @DisabledOnCIServer("CI server has no subscription to MathSciNet and thus gets 401 response. One single call goes through, but subsequent calls fail.")
+    @DisabledOnCIServer(
+            "CI server has no subscription to MathSciNet and thus gets 401 response. One single call goes through, but subsequent calls fail.")
     void searchByQueryFindsEntry() throws Exception {
-        List<BibEntry> fetchedEntries = fetcher.performSearch("Existence and uniqueness theorems Two-Dimensional Ericksen Leslie System");
+        List<BibEntry> fetchedEntries =
+                fetcher.performSearch(
+                        "Existence and uniqueness theorems Two-Dimensional Ericksen Leslie System");
         assertFalse(fetchedEntries.isEmpty());
         BibEntry secondEntry = fetchedEntries.get(1);
         normalizeWhitespacesCleanup.cleanup(secondEntry);
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
index 8e7fdcf425db..065ef38fec1d 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
@@ -1,8 +1,8 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.model.entry.BibEntry;
@@ -10,13 +10,12 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 class MedlineFetcherTest {
@@ -34,96 +33,129 @@ void setUp() throws InterruptedException {
 
         fetcher = new MedlineFetcher();
 
-        entryWijedasa = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Wijedasa, Lahiru S. and Jauhiainen, Jyrki and Könönen, Mari and Lampela, Maija and Vasander, Harri and Leblanc, Marie-Claire and Evers, Stephanie and Smith, Thomas E. L. and Yule, Catherine M. and Varkkey, Helena and Lupascu, Massimo and Parish, Faizal and Singleton, Ian and Clements, Gopalasamy R. and Aziz, Sheema Abdul and Harrison, Mark E. and Cheyne, Susan and Anshari, Gusti Z. and Meijaard, Erik and Goldstein, Jenny E. and Waldron, Susan and Hergoualc'h, Kristell and Dommain, Rene and Frolking, Steve and Evans, Christopher D. and Posa, Mary Rose C. and Glaser, Paul H. and Suryadiputra, Nyoman and Lubis, Reza and Santika, Truly and Padfield, Rory and Kurnianto, Sofyan and Hadisiswoyo, Panut and Lim, Teck Wyn and Page, Susan E. and Gauci, Vincent and Van Der Meer, Peter J. and Buckland, Helen and Garnier, Fabien and Samuel, Marshall K. and Choo, Liza Nuriati Lim Kim and O'Reilly, Patrick and Warren, Matthew and Suksuwan, Surin and Sumarga, Elham and Jain, Anuj and Laurance, William F. and Couwenberg, John and Joosten, Hans and Vernimmen, Ronald and Hooijer, Aljosja and Malins, Chris and Cochrane, Mark A. and Perumal, Balu and Siegert, Florian and Peh, Kelvin S.-H. and Comeau, Louis-Pierre and Verchot, Louis and Harvey, Charles F. and Cobb, Alex and Jaafar, Zeehan and Wösten, Henk and Manuri, Solichin and Müller, Moritz and Giesen, Wim and Phelps, Jacob and Yong, Ding Li and Silvius, Marcel and Wedeux, Béatrice M. M. and Hoyt, Alison and Osaki, Mitsuru and Hirano, Takashi and Takahashi, Hidenori and Kohyama, Takashi S. and Haraguchi, Akira and Nugroho, Nunung P. and Coomes, David A. and Quoi, Le Phat and Dohong, Alue and Gunawan, Haris and Gaveau, David L. A. and Langner, Andreas and Lim, Felix K. S. and Edwards, David P. and Giam, Xingli and Van Der Werf, Guido and Carmenta, Rachel and Verwer, Caspar C. and Gibson, Luke and Gandois, Laure and Graham, Laura Linda Bozena and Regalino, Jhanson and Wich, Serge A. and Rieley, Jack and Kettridge, Nicholas and Brown, Chloe and Pirard, Romain and Moore, Sam and Capilla, B. Ripoll and Ballhorn, Uwe and Ho, Hua Chew and Hoscilo, Agata and Lohberger, Sandra and Evans, Theodore A. and Yulianti, Nina and Blackham, Grace and Onrizal and Husson, Simon and Murdiyarso, Daniel and Pangala, Sunita and Cole, Lydia E. S. and Tacconi, Luca and Segah, Hendrik and Tonoto, Prayoto and Lee, Janice S. H. and Schmilewski, Gerald and Wulffraat, Stephan and Putra, Erianto Indra and Cattau, Megan E. and Clymo, R. S. and Morrison, Ross and Mujahid, Aazani and Miettinen, Jukka and Liew, Soo Chin and Valpola, Samu and Wilson, David and D'Arcy, Laura and Gerding, Michiel and Sundari, Siti and Thornton, Sara A. and Kalisz, Barbara and Chapman, Stephen J. and Su, Ahmad Suhaizi Mat and Basuki, Imam and Itoh, Masayuki and Traeholt, Carl and Sloan, Sean and Sayok, Alexander K. and Andersen, Roxane")
-                .withField(new UnknownField("country"), "England")
-                .withField(StandardField.DOI, "10.1111/gcb.13516")
-                .withField(StandardField.ISSN, "1365-2486")
-                .withField(new UnknownField("issn-linking"), "1354-1013")
-                .withField(StandardField.ISSUE, "3")
-                .withField(StandardField.JOURNAL, "Global change biology")
-                .withField(StandardField.MONTH, "#mar#")
-                .withField(new UnknownField("nlm-id"), "9888746")
-                .withField(StandardField.OWNER, "NLM")
-                .withField(StandardField.PAGES, "977--982")
-                .withField(StandardField.PMID, "27670948")
-                .withField(new UnknownField("pubmodel"), "Print-Electronic")
-                .withField(StandardField.PUBSTATE, "ppublish")
-                .withField(new UnknownField("revised"), "2019-11-20")
-                .withField(StandardField.TITLE, "Denial of long-term issues with agriculture on tropical peatlands will have devastating consequences.")
-                .withField(StandardField.VOLUME, "23")
-                .withField(StandardField.YEAR, "2017");
-
-        entryEndharti = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.TITLE, "Dendrophthoe pentandra (L.) Miq extract effectively inhibits inflammation, proliferation and induces p53 expression on colitis-associated colon cancer.")
-                .withField(StandardField.AUTHOR, "Endharti, Agustina Tri and Wulandari, Adisti and Listyana, Anik and Norahmawati, Eviana and Permana, Sofy")
-                .withField(new UnknownField("country"), "England")
-                .withField(StandardField.DOI, "10.1186/s12906-016-1345-0")
-                .withField(new UnknownField("pii"), "374")
-                .withField(new UnknownField("pmc"), "PMC5037598")
-                .withField(StandardField.ISSN, "1472-6882")
-                .withField(new UnknownField("issn-linking"), "1472-6882")
-                .withField(StandardField.ISSUE, "1")
-                .withField(StandardField.JOURNAL, "BMC complementary and alternative medicine")
-                .withField(StandardField.KEYWORDS, "CAC; Dendrophtoe pentandra; IL-22; MPO; Proliferation; p53")
-                .withField(new UnknownField("nlm-id"), "101088661")
-                .withField(StandardField.OWNER, "NLM")
-                .withField(StandardField.PAGES, "374")
-                .withField(StandardField.MONTH, "#sep#")
-                .withField(StandardField.PMID, "27670445")
-                .withField(new UnknownField("pubmodel"), "Electronic")
-                .withField(StandardField.PUBSTATE, "epublish")
-                .withField(new UnknownField("revised"), "2022-04-08")
-                .withField(StandardField.VOLUME, "16")
-                .withField(StandardField.YEAR, "2016");
-
-        bibEntryIchikawa = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Ichikawa-Seki, Madoka and Guswanto, Azirwan and Allamanda, Puttik and Mariamah, Euis Siti and Wibowo, Putut Eko and Igarashi, Ikuo and Nishikawa, Yoshifumi")
-                .withField(new UnknownField("chemicals"), "Antibodies, Protozoan, Antigens, Protozoan, GRA7 protein, Toxoplasma gondii, Protozoan Proteins")
-                .withField(new UnknownField("citation-subset"), "IM")
-                .withField(new UnknownField("completed"), "2016-07-26")
-                .withField(new UnknownField("country"), "Netherlands")
-                .withField(StandardField.DOI, "10.1016/j.parint.2015.07.004")
-                .withField(StandardField.ISSN, "1873-0329")
-                .withField(StandardField.PUBSTATE, "ppublish")
-                .withField(new UnknownField("revised"), "2015-09-26")
-                .withField(new UnknownField("issn-linking"), "1383-5769")
-                .withField(StandardField.ISSUE, "6")
-                .withField(StandardField.JOURNAL, "Parasitology international")
-                .withField(StandardField.KEYWORDS, "Animals; Antibodies, Protozoan, blood; Antigens, Protozoan, immunology; Cattle, parasitology; Cattle Diseases, epidemiology, parasitology; Enzyme-Linked Immunosorbent Assay, veterinary; Geography; Humans; Indonesia, epidemiology; Livestock, immunology, parasitology; Meat, parasitology; Protozoan Proteins, immunology; Seroepidemiologic Studies; Swine, parasitology; Swine Diseases, epidemiology, parasitology; Toxoplasma, immunology; Toxoplasmosis, Animal, epidemiology, immunology, parasitology; Cattle; ELISA; Indonesia; Pig; TgGRA7; Toxoplasma gondii")
-                .withField(StandardField.MONTH, "#dec#")
-                .withField(new UnknownField("nlm-id"), "9708549")
-                .withField(StandardField.OWNER, "NLM")
-                .withField(StandardField.PAGES, "484--486")
-                .withField(new UnknownField("pii"), "S1383-5769(15)00124-5")
-                .withField(StandardField.PMID, "26197440")
-                .withField(new UnknownField("pubmodel"), "Print-Electronic")
-                .withField(StandardField.TITLE, "Seroprevalence of antibody to TgGRA7 antigen of Toxoplasma gondii in livestock animals from Western Java, Indonesia.")
-                .withField(StandardField.VOLUME, "64")
-                .withField(StandardField.YEAR, "2015");
-
-        bibEntrySari = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Sari, Yulia and Haryati, Sri and Raharjo, Irvan and Prasetyo, Afiono Agung")
-                .withField(new UnknownField("chemicals"), "Antibodies, Protozoan, Antibodies, Viral, HTLV-I Antibodies, HTLV-II Antibodies, Hepatitis Antibodies, Hepatitis B Antibodies, Hepatitis C Antibodies, Immunoglobulin G, Immunoglobulin M")
-                .withField(new UnknownField("citation-subset"), "IM")
-                .withField(new UnknownField("completed"), "2016-04-21")
-                .withField(new UnknownField("country"), "Thailand")
-                .withField(StandardField.ISSN, "0125-1562")
-                .withField(new UnknownField("issn-linking"), "0125-1562")
-                .withField(StandardField.ISSUE, "6")
-                .withField(StandardField.JOURNAL, "The Southeast Asian journal of tropical medicine and public health")
-                .withField(StandardField.KEYWORDS, "Antibodies, Protozoan; Antibodies, Viral, immunology; Coinfection, epidemiology, immunology; Female; HIV Infections, epidemiology; HTLV-I Antibodies, immunology; HTLV-I Infections, epidemiology, immunology; HTLV-II Antibodies, immunology; HTLV-II Infections, epidemiology, immunology; Hepatitis Antibodies, immunology; Hepatitis B Antibodies, immunology; Hepatitis C Antibodies, immunology; Hepatitis Delta Virus, immunology; Hepatitis, Viral, Human, epidemiology, immunology; Humans; Immunoglobulin G, immunology; Immunoglobulin M, immunology; Indonesia, epidemiology; Male; Prisoners; Seroepidemiologic Studies; Toxoplasma, immunology; Toxoplasmosis, epidemiology, immunology")
-                .withField(StandardField.MONTH, "#nov#")
-                .withField(StandardField.PUBSTATE, "ppublish")
-                .withField(new UnknownField("revised"), "2018-12-02")
-                .withField(new UnknownField("nlm-id"), "0266303")
-                .withField(StandardField.OWNER, "NLM")
-                .withField(StandardField.PAGES, "977--985")
-                .withField(StandardField.PMID, "26867355")
-                .withField(new UnknownField("pubmodel"), "Print")
-                .withField(StandardField.TITLE, "TOXOPLASMA AND VIRAL ANTIBODIES AMONG HIV PATIENTS AND INMATES IN CENTRAL JAVA, INDONESIA.")
-                .withField(StandardField.VOLUME, "46")
-                .withField(StandardField.YEAR, "2015");
+        entryWijedasa =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Wijedasa, Lahiru S. and Jauhiainen, Jyrki and Könönen, Mari and Lampela, Maija and Vasander, Harri and Leblanc, Marie-Claire and Evers, Stephanie and Smith, Thomas E. L. and Yule, Catherine M. and Varkkey, Helena and Lupascu, Massimo and Parish, Faizal and Singleton, Ian and Clements, Gopalasamy R. and Aziz, Sheema Abdul and Harrison, Mark E. and Cheyne, Susan and Anshari, Gusti Z. and Meijaard, Erik and Goldstein, Jenny E. and Waldron, Susan and Hergoualc'h, Kristell and Dommain, Rene and Frolking, Steve and Evans, Christopher D. and Posa, Mary Rose C. and Glaser, Paul H. and Suryadiputra, Nyoman and Lubis, Reza and Santika, Truly and Padfield, Rory and Kurnianto, Sofyan and Hadisiswoyo, Panut and Lim, Teck Wyn and Page, Susan E. and Gauci, Vincent and Van Der Meer, Peter J. and Buckland, Helen and Garnier, Fabien and Samuel, Marshall K. and Choo, Liza Nuriati Lim Kim and O'Reilly, Patrick and Warren, Matthew and Suksuwan, Surin and Sumarga, Elham and Jain, Anuj and Laurance, William F. and Couwenberg, John and Joosten, Hans and Vernimmen, Ronald and Hooijer, Aljosja and Malins, Chris and Cochrane, Mark A. and Perumal, Balu and Siegert, Florian and Peh, Kelvin S.-H. and Comeau, Louis-Pierre and Verchot, Louis and Harvey, Charles F. and Cobb, Alex and Jaafar, Zeehan and Wösten, Henk and Manuri, Solichin and Müller, Moritz and Giesen, Wim and Phelps, Jacob and Yong, Ding Li and Silvius, Marcel and Wedeux, Béatrice M. M. and Hoyt, Alison and Osaki, Mitsuru and Hirano, Takashi and Takahashi, Hidenori and Kohyama, Takashi S. and Haraguchi, Akira and Nugroho, Nunung P. and Coomes, David A. and Quoi, Le Phat and Dohong, Alue and Gunawan, Haris and Gaveau, David L. A. and Langner, Andreas and Lim, Felix K. S. and Edwards, David P. and Giam, Xingli and Van Der Werf, Guido and Carmenta, Rachel and Verwer, Caspar C. and Gibson, Luke and Gandois, Laure and Graham, Laura Linda Bozena and Regalino, Jhanson and Wich, Serge A. and Rieley, Jack and Kettridge, Nicholas and Brown, Chloe and Pirard, Romain and Moore, Sam and Capilla, B. Ripoll and Ballhorn, Uwe and Ho, Hua Chew and Hoscilo, Agata and Lohberger, Sandra and Evans, Theodore A. and Yulianti, Nina and Blackham, Grace and Onrizal and Husson, Simon and Murdiyarso, Daniel and Pangala, Sunita and Cole, Lydia E. S. and Tacconi, Luca and Segah, Hendrik and Tonoto, Prayoto and Lee, Janice S. H. and Schmilewski, Gerald and Wulffraat, Stephan and Putra, Erianto Indra and Cattau, Megan E. and Clymo, R. S. and Morrison, Ross and Mujahid, Aazani and Miettinen, Jukka and Liew, Soo Chin and Valpola, Samu and Wilson, David and D'Arcy, Laura and Gerding, Michiel and Sundari, Siti and Thornton, Sara A. and Kalisz, Barbara and Chapman, Stephen J. and Su, Ahmad Suhaizi Mat and Basuki, Imam and Itoh, Masayuki and Traeholt, Carl and Sloan, Sean and Sayok, Alexander K. and Andersen, Roxane")
+                        .withField(new UnknownField("country"), "England")
+                        .withField(StandardField.DOI, "10.1111/gcb.13516")
+                        .withField(StandardField.ISSN, "1365-2486")
+                        .withField(new UnknownField("issn-linking"), "1354-1013")
+                        .withField(StandardField.ISSUE, "3")
+                        .withField(StandardField.JOURNAL, "Global change biology")
+                        .withField(StandardField.MONTH, "#mar#")
+                        .withField(new UnknownField("nlm-id"), "9888746")
+                        .withField(StandardField.OWNER, "NLM")
+                        .withField(StandardField.PAGES, "977--982")
+                        .withField(StandardField.PMID, "27670948")
+                        .withField(new UnknownField("pubmodel"), "Print-Electronic")
+                        .withField(StandardField.PUBSTATE, "ppublish")
+                        .withField(new UnknownField("revised"), "2019-11-20")
+                        .withField(
+                                StandardField.TITLE,
+                                "Denial of long-term issues with agriculture on tropical peatlands will have devastating consequences.")
+                        .withField(StandardField.VOLUME, "23")
+                        .withField(StandardField.YEAR, "2017");
+
+        entryEndharti =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.TITLE,
+                                "Dendrophthoe pentandra (L.) Miq extract effectively inhibits inflammation, proliferation and induces p53 expression on colitis-associated colon cancer.")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Endharti, Agustina Tri and Wulandari, Adisti and Listyana, Anik and Norahmawati, Eviana and Permana, Sofy")
+                        .withField(new UnknownField("country"), "England")
+                        .withField(StandardField.DOI, "10.1186/s12906-016-1345-0")
+                        .withField(new UnknownField("pii"), "374")
+                        .withField(new UnknownField("pmc"), "PMC5037598")
+                        .withField(StandardField.ISSN, "1472-6882")
+                        .withField(new UnknownField("issn-linking"), "1472-6882")
+                        .withField(StandardField.ISSUE, "1")
+                        .withField(
+                                StandardField.JOURNAL, "BMC complementary and alternative medicine")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "CAC; Dendrophtoe pentandra; IL-22; MPO; Proliferation; p53")
+                        .withField(new UnknownField("nlm-id"), "101088661")
+                        .withField(StandardField.OWNER, "NLM")
+                        .withField(StandardField.PAGES, "374")
+                        .withField(StandardField.MONTH, "#sep#")
+                        .withField(StandardField.PMID, "27670445")
+                        .withField(new UnknownField("pubmodel"), "Electronic")
+                        .withField(StandardField.PUBSTATE, "epublish")
+                        .withField(new UnknownField("revised"), "2022-04-08")
+                        .withField(StandardField.VOLUME, "16")
+                        .withField(StandardField.YEAR, "2016");
+
+        bibEntryIchikawa =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Ichikawa-Seki, Madoka and Guswanto, Azirwan and Allamanda, Puttik and Mariamah, Euis Siti and Wibowo, Putut Eko and Igarashi, Ikuo and Nishikawa, Yoshifumi")
+                        .withField(
+                                new UnknownField("chemicals"),
+                                "Antibodies, Protozoan, Antigens, Protozoan, GRA7 protein, Toxoplasma gondii, Protozoan Proteins")
+                        .withField(new UnknownField("citation-subset"), "IM")
+                        .withField(new UnknownField("completed"), "2016-07-26")
+                        .withField(new UnknownField("country"), "Netherlands")
+                        .withField(StandardField.DOI, "10.1016/j.parint.2015.07.004")
+                        .withField(StandardField.ISSN, "1873-0329")
+                        .withField(StandardField.PUBSTATE, "ppublish")
+                        .withField(new UnknownField("revised"), "2015-09-26")
+                        .withField(new UnknownField("issn-linking"), "1383-5769")
+                        .withField(StandardField.ISSUE, "6")
+                        .withField(StandardField.JOURNAL, "Parasitology international")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Animals; Antibodies, Protozoan, blood; Antigens, Protozoan, immunology; Cattle, parasitology; Cattle Diseases, epidemiology, parasitology; Enzyme-Linked Immunosorbent Assay, veterinary; Geography; Humans; Indonesia, epidemiology; Livestock, immunology, parasitology; Meat, parasitology; Protozoan Proteins, immunology; Seroepidemiologic Studies; Swine, parasitology; Swine Diseases, epidemiology, parasitology; Toxoplasma, immunology; Toxoplasmosis, Animal, epidemiology, immunology, parasitology; Cattle; ELISA; Indonesia; Pig; TgGRA7; Toxoplasma gondii")
+                        .withField(StandardField.MONTH, "#dec#")
+                        .withField(new UnknownField("nlm-id"), "9708549")
+                        .withField(StandardField.OWNER, "NLM")
+                        .withField(StandardField.PAGES, "484--486")
+                        .withField(new UnknownField("pii"), "S1383-5769(15)00124-5")
+                        .withField(StandardField.PMID, "26197440")
+                        .withField(new UnknownField("pubmodel"), "Print-Electronic")
+                        .withField(
+                                StandardField.TITLE,
+                                "Seroprevalence of antibody to TgGRA7 antigen of Toxoplasma gondii in livestock animals from Western Java, Indonesia.")
+                        .withField(StandardField.VOLUME, "64")
+                        .withField(StandardField.YEAR, "2015");
+
+        bibEntrySari =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Sari, Yulia and Haryati, Sri and Raharjo, Irvan and Prasetyo, Afiono Agung")
+                        .withField(
+                                new UnknownField("chemicals"),
+                                "Antibodies, Protozoan, Antibodies, Viral, HTLV-I Antibodies, HTLV-II Antibodies, Hepatitis Antibodies, Hepatitis B Antibodies, Hepatitis C Antibodies, Immunoglobulin G, Immunoglobulin M")
+                        .withField(new UnknownField("citation-subset"), "IM")
+                        .withField(new UnknownField("completed"), "2016-04-21")
+                        .withField(new UnknownField("country"), "Thailand")
+                        .withField(StandardField.ISSN, "0125-1562")
+                        .withField(new UnknownField("issn-linking"), "0125-1562")
+                        .withField(StandardField.ISSUE, "6")
+                        .withField(
+                                StandardField.JOURNAL,
+                                "The Southeast Asian journal of tropical medicine and public health")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "Antibodies, Protozoan; Antibodies, Viral, immunology; Coinfection, epidemiology, immunology; Female; HIV Infections, epidemiology; HTLV-I Antibodies, immunology; HTLV-I Infections, epidemiology, immunology; HTLV-II Antibodies, immunology; HTLV-II Infections, epidemiology, immunology; Hepatitis Antibodies, immunology; Hepatitis B Antibodies, immunology; Hepatitis C Antibodies, immunology; Hepatitis Delta Virus, immunology; Hepatitis, Viral, Human, epidemiology, immunology; Humans; Immunoglobulin G, immunology; Immunoglobulin M, immunology; Indonesia, epidemiology; Male; Prisoners; Seroepidemiologic Studies; Toxoplasma, immunology; Toxoplasmosis, epidemiology, immunology")
+                        .withField(StandardField.MONTH, "#nov#")
+                        .withField(StandardField.PUBSTATE, "ppublish")
+                        .withField(new UnknownField("revised"), "2018-12-02")
+                        .withField(new UnknownField("nlm-id"), "0266303")
+                        .withField(StandardField.OWNER, "NLM")
+                        .withField(StandardField.PAGES, "977--985")
+                        .withField(StandardField.PMID, "26867355")
+                        .withField(new UnknownField("pubmodel"), "Print")
+                        .withField(
+                                StandardField.TITLE,
+                                "TOXOPLASMA AND VIRAL ANTIBODIES AMONG HIV PATIENTS AND INMATES IN CENTRAL JAVA, INDONESIA.")
+                        .withField(StandardField.VOLUME, "46")
+                        .withField(StandardField.YEAR, "2015");
     }
 
     @Test
@@ -170,27 +202,40 @@ void searchByIDSari() throws Exception {
     @Test
     void multipleEntries() throws Exception {
         List<BibEntry> entryList = fetcher.performSearch("java");
-        entryList.forEach(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright);
+        entryList.forEach(
+                entry ->
+                        entry.clearField(
+                                StandardField.ABSTRACT)); // Remove abstract due to copyright);
         assertEquals(50, entryList.size());
     }
 
     @Test
     void withLuceneQueryAuthorDate() throws Exception {
         List<BibEntry> entryList = fetcher.performSearch("author:vigmond AND year:2021");
-        entryList.forEach(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright);
+        entryList.forEach(
+                entry ->
+                        entry.clearField(
+                                StandardField.ABSTRACT)); // Remove abstract due to copyright);
         assertEquals(18, entryList.size());
     }
 
     @Test
     void withLuceneQueryAuthorDateRange() throws Exception {
         List<BibEntry> entryList = fetcher.performSearch("author:vigmond AND year-range:2020-2021");
-        entryList.forEach(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright);
+        entryList.forEach(
+                entry ->
+                        entry.clearField(
+                                StandardField.ABSTRACT)); // Remove abstract due to copyright);
         assertEquals(28, entryList.size());
     }
 
     @Test
     void invalidSearchTerm() throws Exception {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("this.is.a.invalid.search.term.for.the.medline.fetcher"));
+        assertThrows(
+                FetcherClientException.class,
+                () ->
+                        fetcher.performSearchById(
+                                "this.is.a.invalid.search.term.for.the.medline.fetcher"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java
index 308e8b77101b..0e46eeec254d 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java
@@ -1,7 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.FetcherServerException;
@@ -9,14 +9,13 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 @FetcherTest
 class MedraTest {
@@ -25,23 +24,26 @@ class MedraTest {
 
     private static Stream<Arguments> getDoiBibEntryPairs() {
         return Stream.of(
-                Arguments.of("10.2143/TVF.80.3.3285690",
+                Arguments.of(
+                        "10.2143/TVF.80.3.3285690",
                         Optional.of(
                                 new BibEntry(StandardEntryType.Article)
                                         .withField(StandardField.AUTHOR, "SPILEERS, Steven ")
-                                        .withField(StandardField.PUBLISHER, "Peeters online journals")
+                                        .withField(
+                                                StandardField.PUBLISHER, "Peeters online journals")
                                         .withField(StandardField.TITLE, "Algemene kroniek")
                                         .withField(StandardField.YEAR, "2018")
                                         .withField(StandardField.DOI, "10.2143/TVF.80.3.3285690")
                                         .withField(StandardField.ISSN, "2031-8952, 2031-8952")
-                                        .withField(StandardField.JOURNAL, "Tijdschrift voor Filosofie")
-                                        .withField(StandardField.PAGES, "625-629")
-                        )),
-
-                Arguments.of("10.3303/CET1977146",
+                                        .withField(
+                                                StandardField.JOURNAL, "Tijdschrift voor Filosofie")
+                                        .withField(StandardField.PAGES, "625-629"))),
+                Arguments.of(
+                        "10.3303/CET1977146",
                         Optional.of(
                                 new BibEntry(StandardEntryType.Article)
-                                        .withField(StandardField.AUTHOR,
+                                        .withField(
+                                                StandardField.AUTHOR,
                                                 ""
                                                         + "Iannarelli Riccardo  and "
                                                         + "Novello Anna  and "
@@ -50,25 +52,35 @@ private static Stream<Arguments> getDoiBibEntryPairs() {
                                                         + "Gallizio Federico  and "
                                                         + "Telib Haysam  and "
                                                         + "Meyer Thierry ")
-                                        .withField(StandardField.PUBLISHER, "AIDIC: Italian Association of Chemical Engineering")
-                                        .withField(StandardField.TITLE, "Safety in research institutions: how to better communicate the risks using numerical simulations")
+                                        .withField(
+                                                StandardField.PUBLISHER,
+                                                "AIDIC: Italian Association of Chemical Engineering")
+                                        .withField(
+                                                StandardField.TITLE,
+                                                "Safety in research institutions: how to better communicate the risks using numerical simulations")
                                         .withField(StandardField.YEAR, "2019")
                                         .withField(StandardField.DOI, "10.3303/CET1977146")
-                                        .withField(StandardField.JOURNAL, "Chemical Engineering Transactions")
+                                        .withField(
+                                                StandardField.JOURNAL,
+                                                "Chemical Engineering Transactions")
                                         .withField(StandardField.PAGES, "871-876")
                                         .withField(StandardField.VOLUME, "77"))),
-                Arguments.of("10.1400/115378",
+                Arguments.of(
+                        "10.1400/115378",
                         Optional.of(
                                 new BibEntry(StandardEntryType.Article)
                                         .withField(StandardField.AUTHOR, "Paola Cisternino")
-                                        .withField(StandardField.PUBLISHER, "Edizioni Otto Novecento")
-                                        .withField(StandardField.TITLE, "Diagramma semantico dei lemmi : casa, parola, silenzio e attesa in È fatto giorno e Margherite e rosolacci di Rocco Scotellaro")
+                                        .withField(
+                                                StandardField.PUBLISHER, "Edizioni Otto Novecento")
+                                        .withField(
+                                                StandardField.TITLE,
+                                                "Diagramma semantico dei lemmi : casa, parola, silenzio e attesa in È fatto giorno e Margherite e rosolacci di Rocco Scotellaro")
                                         .withField(StandardField.ISSN, "03912639")
                                         .withField(StandardField.YEAR, "1999")
                                         .withField(StandardField.DOI, "10.1400/115378")
-                                        .withField(StandardField.JOURNAL, "Otto/Novecento : rivista quadrimestrale di critica e storia letteraria")
-                        ))
-        );
+                                        .withField(
+                                                StandardField.JOURNAL,
+                                                "Otto/Novecento : rivista quadrimestrale di critica e storia letteraria"))));
     }
 
     @Test
@@ -83,7 +95,9 @@ void performSearchEmptyDOI() throws FetcherException {
 
     @Test
     void performNonExistent() throws FetcherException {
-        assertThrows(FetcherServerException.class, () -> fetcher.performSearchById("10.1016/j.bjoms.2007.08.004"));
+        assertThrows(
+                FetcherServerException.class,
+                () -> fetcher.performSearchById("10.1016/j.bjoms.2007.08.004"));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
index 4ec77571fe0a..e97cefb09c93 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.util.Version;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import java.util.List;
 
 @FetcherTest
 class MrDLibFetcherTest {
@@ -21,11 +20,7 @@ class MrDLibFetcherTest {
 
     @BeforeEach
     void setUp() {
-        MrDlibPreferences mrDlibPreferences = new MrDlibPreferences(
-                true,
-                false,
-                false,
-                false);
+        MrDlibPreferences mrDlibPreferences = new MrDlibPreferences(true, false, false, false);
         fetcher = new MrDLibFetcher("", Version.parse(""), mrDlibPreferences);
     }
 
@@ -43,14 +38,20 @@ void performSearchForHornecker2006() throws FetcherException {
         bibEntry.setCitationKey("Hornecker:2006:GGT:1124772.1124838");
         bibEntry.setField(StandardField.ADDRESS, "New York, NY, USA");
         bibEntry.setField(StandardField.AUTHOR, "Hornecker, Eva and Buur, Jacob");
-        bibEntry.setField(StandardField.BOOKTITLE, "Proceedings of the SIGCHI Conference on Human Factors in Computing Systems");
+        bibEntry.setField(
+                StandardField.BOOKTITLE,
+                "Proceedings of the SIGCHI Conference on Human Factors in Computing Systems");
         bibEntry.setField(StandardField.DOI, "10.1145/1124772.1124838");
         bibEntry.setField(StandardField.ISBN, "1-59593-372-7");
-        bibEntry.setField(StandardField.KEYWORDS, "CSCW,analysis,collaboration,design,framework,social interaction,tangible interaction,tangible interface");
+        bibEntry.setField(
+                StandardField.KEYWORDS,
+                "CSCW,analysis,collaboration,design,framework,social interaction,tangible interaction,tangible interface");
         bibEntry.setField(StandardField.PAGES, "437--446");
         bibEntry.setField(StandardField.PUBLISHER, "ACM");
         bibEntry.setField(StandardField.SERIES, "CHI '06");
-        bibEntry.setField(StandardField.TITLE, "{Getting a Grip on Tangible Interaction: A Framework on Physical Space and Social Interaction}");
+        bibEntry.setField(
+                StandardField.TITLE,
+                "{Getting a Grip on Tangible Interaction: A Framework on Physical Space and Social Interaction}");
         bibEntry.setField(StandardField.URL, "http://doi.acm.org/10.1145/1124772.1124838");
         bibEntry.setField(StandardField.YEAR, "2006");
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java b/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java
index dfaf7a99ffe1..b88daa2aa9bb 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.URI;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.IOException;
+import java.net.URI;
+import java.util.Optional;
 
 @FetcherTest
 class OpenAccessDoiTest {
@@ -28,7 +27,12 @@ void setUp() {
     @Test
     void findByDOI() throws IOException {
         entry.setField(StandardField.DOI, "10.1186/s12993-024-00248-9");
-        assertEquals(Optional.of(URI.create("https://behavioralandbrainfunctions.biomedcentral.com/counter/pdf/10.1186/s12993-024-00248-9").toURL()), finder.findFullText(entry));
+        assertEquals(
+                Optional.of(
+                        URI.create(
+                                        "https://behavioralandbrainfunctions.biomedcentral.com/counter/pdf/10.1186/s12993-024-00248-9")
+                                .toURL()),
+                finder.findFullText(entry));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/PagedSearchFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/PagedSearchFetcherTest.java
index dad5618923c2..cc8cc5efc817 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/PagedSearchFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/PagedSearchFetcherTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.importer.fetcher;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
 import org.jabref.logic.importer.PagedSearchBasedFetcher;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.paging.Page;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
 /**
  * This interface provides general test methods for paged fetchers
  */
@@ -32,7 +31,9 @@ default void pageSearchReturnsUniqueResultsPerPage() throws Exception {
         assertEquals(20, secondPage.getSize());
 
         for (BibEntry entry : firstPage.getContent()) {
-            assertFalse(secondPage.getContent().contains(entry), "%s contained in %s".formatted(entry, secondPage.getContent()));
+            assertFalse(
+                    secondPage.getContent().contains(entry),
+                    "%s contained in %s".formatted(entry, secondPage.getContent()));
         }
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/PicaXmlParserTest.java b/src/test/java/org/jabref/logic/importer/fetcher/PicaXmlParserTest.java
index ef59c20cf9ca..72a55a6aa908 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/PicaXmlParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/PicaXmlParserTest.java
@@ -1,26 +1,26 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.jabref.logic.bibtex.BibEntryAssert;
 import org.jabref.logic.importer.fileformat.PicaXmlParser;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 class PicaXmlParserTest {
 
-    private void doTest(String xmlName, int expectedSize, List<String> resourceNames) throws Exception {
+    private void doTest(String xmlName, int expectedSize, List<String> resourceNames)
+            throws Exception {
         try (InputStream is = PicaXmlParserTest.class.getResourceAsStream(xmlName)) {
             PicaXmlParser parser = new PicaXmlParser();
             List<BibEntry> entries = parser.parseEntries(is);
@@ -41,7 +41,10 @@ void emptyResult() throws Exception {
 
     @Test
     void resultFor797485368() throws Exception {
-        doTest("gvk_result_for_797485368.xml", 1, Collections.singletonList("gvk_result_for_797485368.bib"));
+        doTest(
+                "gvk_result_for_797485368.xml",
+                1,
+                Collections.singletonList("gvk_result_for_797485368.bib"));
     }
 
     @Test
@@ -51,7 +54,8 @@ void gMP() throws Exception {
 
     @Test
     void subTitleTest() throws Exception {
-        try (InputStream is = PicaXmlParserTest.class.getResourceAsStream("gvk_artificial_subtitle_test.xml")) {
+        try (InputStream is =
+                PicaXmlParserTest.class.getResourceAsStream("gvk_artificial_subtitle_test.xml")) {
             PicaXmlParser parser = new PicaXmlParser();
             List<BibEntry> entries = parser.parseEntries(is);
             assertNotNull(entries);
@@ -60,8 +64,10 @@ void subTitleTest() throws Exception {
             assertEquals(Optional.empty(), entries.getFirst().getField(StandardField.SUBTITLE));
             assertEquals(Optional.of("C"), entries.get(1).getField(StandardField.SUBTITLE));
             assertEquals(Optional.of("Word"), entries.get(2).getField(StandardField.SUBTITLE));
-            assertEquals(Optional.of("Word1 word2"), entries.get(3).getField(StandardField.SUBTITLE));
-            assertEquals(Optional.of("Word1 word2"), entries.get(4).getField(StandardField.SUBTITLE));
+            assertEquals(
+                    Optional.of("Word1 word2"), entries.get(3).getField(StandardField.SUBTITLE));
+            assertEquals(
+                    Optional.of("Word1 word2"), entries.get(4).getField(StandardField.SUBTITLE));
         }
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ResearchGateTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ResearchGateTest.java
index 46db0d3b191a..e365e2833622 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ResearchGateTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ResearchGateTest.java
@@ -1,10 +1,12 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.URI;
-import java.util.List;
-import java.util.Optional;
+import static org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer.NO_EXPLICIT_FIELD;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
@@ -13,24 +15,23 @@
 import org.jabref.model.entry.types.UnknownEntryType;
 import org.jabref.support.DisabledOnCIServer;
 import org.jabref.testutils.category.FetcherTest;
-
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer.NO_EXPLICIT_FIELD;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
+import java.io.IOException;
+import java.net.URI;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 @DisabledOnCIServer("Blocked by Cloudflare")
 class ResearchGateTest {
 
-    private static final String URL_PDF = "https://www.researchgate.net/profile/Abdurrazzak-Gehani/publication/4207355_Paranoid_a_global_secure_file_access_control_system/links/5457747d0cf2cf516480995e/Paranoid-a-global-secure-file-access-control-system.pdf";
-    private final String URL_PAGE = "https://www.researchgate.net/publication/4207355_Paranoid_a_global_secure_file_access_control_system";
+    private static final String URL_PDF =
+            "https://www.researchgate.net/profile/Abdurrazzak-Gehani/publication/4207355_Paranoid_a_global_secure_file_access_control_system/links/5457747d0cf2cf516480995e/Paranoid-a-global-secure-file-access-control-system.pdf";
+    private final String URL_PAGE =
+            "https://www.researchgate.net/publication/4207355_Paranoid_a_global_secure_file_access_control_system";
     private ResearchGate fetcher;
     private BibEntry entry;
 
@@ -74,68 +75,94 @@ void trustLevel() {
 
     @Test
     void performSearchWithString() throws Exception {
-        BibEntry master = new BibEntry(StandardEntryType.PhdThesis)
-                .withCitationKey("phdthesis")
-                .withField(StandardField.AUTHOR, "Diez, Tobias")
-                .withField(StandardField.TITLE, "Slice theorem for Fréchet group actions and covariant symplectic field theory")
-                .withField(StandardField.MONTH, "10")
-                .withField(StandardField.YEAR, "2013");
-        List<BibEntry> fetchedEntries = fetcher.performSearch("Slice theorem for Fréchet group actions and covariant symplectic");
+        BibEntry master =
+                new BibEntry(StandardEntryType.PhdThesis)
+                        .withCitationKey("phdthesis")
+                        .withField(StandardField.AUTHOR, "Diez, Tobias")
+                        .withField(
+                                StandardField.TITLE,
+                                "Slice theorem for Fréchet group actions and covariant symplectic field theory")
+                        .withField(StandardField.MONTH, "10")
+                        .withField(StandardField.YEAR, "2013");
+        List<BibEntry> fetchedEntries =
+                fetcher.performSearch(
+                        "Slice theorem for Fréchet group actions and covariant symplectic");
         assertEquals(Optional.of(master), fetchedEntries.stream().findFirst());
     }
 
     @Test
     void performSearchWithLuceneQuery() throws Exception {
-        BibEntry master = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("article")
-                .withField(StandardField.TITLE, "Wine Microbiology and Predictive Microbiology: " +
-                        "A Short Overview on Application, and Perspectives")
-                .withField(StandardField.DOI, "10.3390/microorganisms10020421")
-                .withField(StandardField.JOURNAL, "Microorganisms")
-                .withField(StandardField.MONTH, "02")
-                .withField(StandardField.PAGES, "421")
-                .withField(StandardField.VOLUME, "10")
-                .withField(StandardField.YEAR, "2022")
-                .withField(StandardField.AUTHOR, "Petruzzi, Leonardo and Campaniello, Daniela and Corbo," +
-                        " Maria and Speranza, Barbara and Altieri, Clelia and Sinigaglia, Milena and Bevilacqua, Antonio");
-
-        QueryNode queryNode = new StandardSyntaxParser().parse("Wine Microbiology and Predictive " +
-                "Microbiology: A Short Overview on Application, and Perspectives", NO_EXPLICIT_FIELD);
+        BibEntry master =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("article")
+                        .withField(
+                                StandardField.TITLE,
+                                "Wine Microbiology and Predictive Microbiology: "
+                                        + "A Short Overview on Application, and Perspectives")
+                        .withField(StandardField.DOI, "10.3390/microorganisms10020421")
+                        .withField(StandardField.JOURNAL, "Microorganisms")
+                        .withField(StandardField.MONTH, "02")
+                        .withField(StandardField.PAGES, "421")
+                        .withField(StandardField.VOLUME, "10")
+                        .withField(StandardField.YEAR, "2022")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Petruzzi, Leonardo and Campaniello, Daniela and Corbo,"
+                                        + " Maria and Speranza, Barbara and Altieri, Clelia and Sinigaglia, Milena and Bevilacqua, Antonio");
+
+        QueryNode queryNode =
+                new StandardSyntaxParser()
+                        .parse(
+                                "Wine Microbiology and Predictive "
+                                        + "Microbiology: A Short Overview on Application, and Perspectives",
+                                NO_EXPLICIT_FIELD);
         assertEquals(Optional.of(master), fetcher.performSearch(queryNode).stream().findFirst());
     }
 
     @Test
     void performSearchWithBibEntry() throws FetcherException {
-        BibEntry entryZaffar = new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey("inproceedings")
-                .withField(StandardField.ISBN, "0-7695-2461-3")
-                .withField(StandardField.TITLE, "Looking Back at the Bell-La Padula Model")
-                .withField(StandardField.MONTH, "01")
-                .withField(StandardField.PAGES, "15 pp. - 351")
-                .withField(StandardField.DOI, "10.1109/CSAC.2005.37")
-                .withField(StandardField.VOLUME, "2005")
-                .withField(StandardField.YEAR, "2006")
-                .withField(StandardField.JOURNAL, "Proceedings - Annual Computer Security Applications Conference, ACSAC")
-                .withField(StandardField.AUTHOR, "Bell, D.E.");
-        assertEquals(Optional.of(entryZaffar), fetcher.performSearch(entryZaffar).stream().findFirst());
+        BibEntry entryZaffar =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey("inproceedings")
+                        .withField(StandardField.ISBN, "0-7695-2461-3")
+                        .withField(StandardField.TITLE, "Looking Back at the Bell-La Padula Model")
+                        .withField(StandardField.MONTH, "01")
+                        .withField(StandardField.PAGES, "15 pp. - 351")
+                        .withField(StandardField.DOI, "10.1109/CSAC.2005.37")
+                        .withField(StandardField.VOLUME, "2005")
+                        .withField(StandardField.YEAR, "2006")
+                        .withField(
+                                StandardField.JOURNAL,
+                                "Proceedings - Annual Computer Security Applications Conference, ACSAC")
+                        .withField(StandardField.AUTHOR, "Bell, D.E.");
+        assertEquals(
+                Optional.of(entryZaffar), fetcher.performSearch(entryZaffar).stream().findFirst());
     }
 
     @Test
     @DisabledOnCIServer("CI server is unreliable")
     void performSearchWithTitleWithCurlyBraces() throws FetcherException {
-        BibEntry entryInput = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.TITLE, "Communicating {COVID}-19 against the backdrop of conspiracy ideologies: {HOW} {PUBLIC} {FIGURES} {DISCUSS} {THE} {MATTER} {ON} {FACEBOOK} {AND} {TELEGRAM}");
-
-        Optional<BibEntry> expected = Optional.of(new BibEntry(new UnknownEntryType("unknown"))
-                .withCitationKey("unknown")
-                .withField(StandardField.TITLE, "Communicating COVID-19 against the backdrop of conspiracy ideologies: HOW PUBLIC FIGURES DISCUSS THE MATTER ON FACEBOOK AND TELEGRAM")
-                .withField(StandardField.MONTH, "05")
-                .withField(StandardField.YEAR, "2021")
-                .withField(StandardField.AUTHOR, "Hohlfeld, Ralf and Bauerfeind, Franziska and Braglia, Ilenia and Butt, Aqib and Dietz, Anna-Lena and Drexel, Denise and Fedlmeier, Julia and Fischer, Lana and Gandl, Vanessa and Glaser, Felia and Haberzettel, Eva and Helling, Teresa and Käsbauer, Isabel and Kast, Matthias and Krieger, Anja and Lächner, Anja and Malkanova, Adriana and Raab, Marie-Kristin and Rech, Anastasia and Weymar, Pia")
-                .withField(StandardField.DOI, "10.13140/RG.2.2.36822.78406"));
-
-        Optional<BibEntry> actual = fetcher.performSearch(entryInput)
-                                                     .stream().findFirst();
+        BibEntry entryInput =
+                new BibEntry(StandardEntryType.Misc)
+                        .withField(
+                                StandardField.TITLE,
+                                "Communicating {COVID}-19 against the backdrop of conspiracy ideologies: {HOW} {PUBLIC} {FIGURES} {DISCUSS} {THE} {MATTER} {ON} {FACEBOOK} {AND} {TELEGRAM}");
+
+        Optional<BibEntry> expected =
+                Optional.of(
+                        new BibEntry(new UnknownEntryType("unknown"))
+                                .withCitationKey("unknown")
+                                .withField(
+                                        StandardField.TITLE,
+                                        "Communicating COVID-19 against the backdrop of conspiracy ideologies: HOW PUBLIC FIGURES DISCUSS THE MATTER ON FACEBOOK AND TELEGRAM")
+                                .withField(StandardField.MONTH, "05")
+                                .withField(StandardField.YEAR, "2021")
+                                .withField(
+                                        StandardField.AUTHOR,
+                                        "Hohlfeld, Ralf and Bauerfeind, Franziska and Braglia, Ilenia and Butt, Aqib and Dietz, Anna-Lena and Drexel, Denise and Fedlmeier, Julia and Fischer, Lana and Gandl, Vanessa and Glaser, Felia and Haberzettel, Eva and Helling, Teresa and Käsbauer, Isabel and Kast, Matthias and Krieger, Anja and Lächner, Anja and Malkanova, Adriana and Raab, Marie-Kristin and Rech, Anastasia and Weymar, Pia")
+                                .withField(StandardField.DOI, "10.13140/RG.2.2.36822.78406"));
+
+        Optional<BibEntry> actual = fetcher.performSearch(entryInput).stream().findFirst();
         assertEquals(expected, actual);
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
index e89e028129db..e4ceb858367f 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
@@ -1,6 +1,8 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -9,34 +11,37 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
+import java.util.Optional;
 
 @FetcherTest
 class RfcFetcherTest {
 
-    private RfcFetcher fetcher = new RfcFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
-    private BibEntry bibEntry = new BibEntry(StandardEntryType.Misc)
-            .withCitationKey("rfc1945")
-            .withField(StandardField.SERIES, "Request for Comments")
-            .withField(StandardField.NUMBER, "1945")
-            .withField(StandardField.HOWPUBLISHED, "RFC 1945")
-            .withField(StandardField.PUBLISHER, "RFC Editor")
-            .withField(StandardField.DOI, "10.17487/RFC1945")
-            .withField(StandardField.URL, "https://www.rfc-editor.org/info/rfc1945")
-            .withField(StandardField.AUTHOR, "Henrik Nielsen and Roy T. Fielding and Tim Berners-Lee")
-            .withField(StandardField.TITLE, "{Hypertext Transfer Protocol -- HTTP/1.0}")
-            .withField(StandardField.PAGETOTAL, "60")
-            .withField(StandardField.YEAR, "1996")
-            .withField(StandardField.MONTH, "#may#")
-            .withField(StandardField.ABSTRACT, "The Hypertext Transfer Protocol (HTTP) is an application-level protocol with the lightness and speed necessary for distributed, collaborative, hypermedia information systems. This memo provides information for the Internet community. This memo does not specify an Internet standard of any kind.");
+    private RfcFetcher fetcher =
+            new RfcFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+    private BibEntry bibEntry =
+            new BibEntry(StandardEntryType.Misc)
+                    .withCitationKey("rfc1945")
+                    .withField(StandardField.SERIES, "Request for Comments")
+                    .withField(StandardField.NUMBER, "1945")
+                    .withField(StandardField.HOWPUBLISHED, "RFC 1945")
+                    .withField(StandardField.PUBLISHER, "RFC Editor")
+                    .withField(StandardField.DOI, "10.17487/RFC1945")
+                    .withField(StandardField.URL, "https://www.rfc-editor.org/info/rfc1945")
+                    .withField(
+                            StandardField.AUTHOR,
+                            "Henrik Nielsen and Roy T. Fielding and Tim Berners-Lee")
+                    .withField(StandardField.TITLE, "{Hypertext Transfer Protocol -- HTTP/1.0}")
+                    .withField(StandardField.PAGETOTAL, "60")
+                    .withField(StandardField.YEAR, "1996")
+                    .withField(StandardField.MONTH, "#may#")
+                    .withField(
+                            StandardField.ABSTRACT,
+                            "The Hypertext Transfer Protocol (HTTP) is an application-level protocol with the lightness and speed necessary for distributed, collaborative, hypermedia information systems. This memo provides information for the Internet community. This memo does not specify an Internet standard of any kind.");
 
     @Test
     void getNameReturnsEqualIdName() {
@@ -45,24 +50,33 @@ void getNameReturnsEqualIdName() {
 
     @Test
     void performSearchByIdFindsEntryWithDraftIdentifier() throws Exception {
-        BibEntry bibDraftEntry = new BibEntry(StandardEntryType.TechReport)
-                .withField(InternalField.KEY_FIELD, "fielding-http-spec-01")
-                .withField(StandardField.AUTHOR, "Henrik Nielsen and Roy T. Fielding and Tim Berners-Lee")
-                .withField(StandardField.DAY, "20")
-                .withField(StandardField.INSTITUTION, "Internet Engineering Task Force")
-                .withField(StandardField.MONTH, "#dec#")
-                .withField(StandardField.NOTE, "Work in Progress")
-                .withField(StandardField.NUMBER, "draft-fielding-http-spec-01")
-                .withField(StandardField.PAGETOTAL, "41")
-                .withField(StandardField.PUBLISHER, "Internet Engineering Task Force")
-                .withField(StandardField.TITLE, "{Hypertext Transfer Protocol -- HTTP/1.0}")
-                .withField(StandardField.TYPE, "Internet-Draft")
-                .withField(StandardField.URL, "https://datatracker.ietf.org/doc/draft-fielding-http-spec/01/")
-                .withField(StandardField.YEAR, "1994")
-                .withField(StandardField.ABSTRACT, "The Hypertext Transfer Protocol (HTTP) is an application-level protocol with the lightness and speed necessary for distributed, collaborative, hypermedia information systems. It is a generic, stateless, object-oriented protocol which can be used for many tasks, such as name servers and distributed object management systems, through extension of its request methods (commands). A feature of HTTP is the typing and negotiation of data representation, allowing systems to be built independently of the data being transferred. HTTP has been in use by the World-Wide Web global information initiative since 1990. This specification reflects preferred usage of the protocol referred to as 'HTTP/1.0', and is compatible with the most commonly used HTTP server and client programs implemented prior to November 1994.");
-        bibDraftEntry.setCommentsBeforeEntry("%% You should probably cite draft-ietf-http-v10-spec instead of this I-D.\n");
+        BibEntry bibDraftEntry =
+                new BibEntry(StandardEntryType.TechReport)
+                        .withField(InternalField.KEY_FIELD, "fielding-http-spec-01")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Henrik Nielsen and Roy T. Fielding and Tim Berners-Lee")
+                        .withField(StandardField.DAY, "20")
+                        .withField(StandardField.INSTITUTION, "Internet Engineering Task Force")
+                        .withField(StandardField.MONTH, "#dec#")
+                        .withField(StandardField.NOTE, "Work in Progress")
+                        .withField(StandardField.NUMBER, "draft-fielding-http-spec-01")
+                        .withField(StandardField.PAGETOTAL, "41")
+                        .withField(StandardField.PUBLISHER, "Internet Engineering Task Force")
+                        .withField(StandardField.TITLE, "{Hypertext Transfer Protocol -- HTTP/1.0}")
+                        .withField(StandardField.TYPE, "Internet-Draft")
+                        .withField(
+                                StandardField.URL,
+                                "https://datatracker.ietf.org/doc/draft-fielding-http-spec/01/")
+                        .withField(StandardField.YEAR, "1994")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "The Hypertext Transfer Protocol (HTTP) is an application-level protocol with the lightness and speed necessary for distributed, collaborative, hypermedia information systems. It is a generic, stateless, object-oriented protocol which can be used for many tasks, such as name servers and distributed object management systems, through extension of its request methods (commands). A feature of HTTP is the typing and negotiation of data representation, allowing systems to be built independently of the data being transferred. HTTP has been in use by the World-Wide Web global information initiative since 1990. This specification reflects preferred usage of the protocol referred to as 'HTTP/1.0', and is compatible with the most commonly used HTTP server and client programs implemented prior to November 1994.");
+        bibDraftEntry.setCommentsBeforeEntry(
+                "%% You should probably cite draft-ietf-http-v10-spec instead of this I-D.\n");
 
-        assertEquals(Optional.of(bibDraftEntry), fetcher.performSearchById("draft-fielding-http-spec"));
+        assertEquals(
+                Optional.of(bibDraftEntry), fetcher.performSearchById("draft-fielding-http-spec"));
     }
 
     @ParameterizedTest
@@ -78,11 +92,12 @@ void performSearchByIdFindsNothingWithoutIdentifier() throws Exception {
 
     @ParameterizedTest
     @CsvSource({
-            // syntactically valid identifier
-            "draft-test-draft-spec",
-            "RFC9999",
-            // invalid identifier
-            "banana"})
+        // syntactically valid identifier
+        "draft-test-draft-spec",
+        "RFC9999",
+        // invalid identifier
+        "banana"
+    })
     void performSearchByIdFindsNothingWithValidDraftIdentifier(String identifier) throws Exception {
         assertThrows(FetcherClientException.class, () -> fetcher.performSearchById(identifier));
     }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcherTest.java
index 5aa8522cc83d..2b344a340839 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcherTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.List;
 
 @FetcherTest
 class ScholarArchiveFetcherTest {
@@ -23,10 +22,15 @@ class ScholarArchiveFetcherTest {
     @BeforeEach
     void setUp() {
         fetcher = new ScholarArchiveFetcher();
-        bibEntry = new BibEntry(StandardEntryType.InProceedings)
-                .withField(StandardField.TITLE, "BPELscript: A Simplified Script Syntax for WS-BPEL 2.0")
-                .withField(StandardField.AUTHOR, "Marc Bischof and Oliver Kopp and Tammo van Lessen and Frank Leymann ")
-                .withField(StandardField.YEAR, "2009");
+        bibEntry =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withField(
+                                StandardField.TITLE,
+                                "BPELscript: A Simplified Script Syntax for WS-BPEL 2.0")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Marc Bischof and Oliver Kopp and Tammo van Lessen and Frank Leymann ")
+                        .withField(StandardField.YEAR, "2009");
     }
 
     @Test
@@ -39,9 +43,7 @@ void getNameReturnsCorrectName() {
     void performSearchReturnsExpectedResults() throws FetcherException {
         List<BibEntry> fetchedEntries = fetcher.performSearch("bpelscript");
         fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
-        assertTrue(fetchedEntries.contains(bibEntry), "Found the following entries " + fetchedEntries);
+        assertTrue(
+                fetchedEntries.contains(bibEntry), "Found the following entries " + fetchedEntries);
     }
 }
-
-
-
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java
index f516a5d458db..49fa2c39b4ea 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java
@@ -1,8 +1,8 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.URI;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -11,13 +11,12 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.support.DisabledOnCIServer;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.net.URI;
+import java.util.Optional;
 
 @FetcherTest
 class ScienceDirectTest {
@@ -39,9 +38,11 @@ void findByDoiOldPage() throws IOException {
         entry.setField(StandardField.DOI, "10.1016/j.jrmge.2015.08.004");
 
         assertEquals(
-                Optional.of(URI.create("https://www.sciencedirect.com/science/article/pii/S1674775515001079/pdfft?md5=2b19b19a387cffbae237ca6a987279df&pid=1-s2.0-S1674775515001079-main.pdf").toURL()),
-                finder.findFullText(entry)
-        );
+                Optional.of(
+                        URI.create(
+                                        "https://www.sciencedirect.com/science/article/pii/S1674775515001079/pdfft?md5=2b19b19a387cffbae237ca6a987279df&pid=1-s2.0-S1674775515001079-main.pdf")
+                                .toURL()),
+                finder.findFullText(entry));
     }
 
     @Test
@@ -50,9 +51,11 @@ void findByDoiNewPage() throws IOException {
         entry.setField(StandardField.DOI, "10.1016/j.aasri.2014.09.002");
 
         assertEquals(
-                Optional.of(URI.create("https://www.sciencedirect.com/science/article/pii/S2212671614001024/pdf?md5=4e2e9a369b4d5b3db5100aba599bef8b&pid=1-s2.0-S2212671614001024-main.pdf").toURL()),
-                finder.findFullText(entry)
-        );
+                Optional.of(
+                        URI.create(
+                                        "https://www.sciencedirect.com/science/article/pii/S2212671614001024/pdf?md5=4e2e9a369b4d5b3db5100aba599bef8b&pid=1-s2.0-S2212671614001024-main.pdf")
+                                .toURL()),
+                finder.findFullText(entry));
     }
 
     @Test
@@ -62,9 +65,11 @@ void findByDoiWorksForBoneArticle() throws IOException {
         entry.setField(StandardField.DOI, "https://doi.org/10.1016/j.bone.2020.115226");
 
         assertEquals(
-                Optional.of(URI.create("https://www.sciencedirect.com/science/article/pii/S8756328220300065/pdfft?md5=0ad75ff155637dec358e5c9fb8b90afd&pid=1-s2.0-S8756328220300065-main.pdf").toURL()),
-                finder.findFullText(entry)
-        );
+                Optional.of(
+                        URI.create(
+                                        "https://www.sciencedirect.com/science/article/pii/S8756328220300065/pdfft?md5=0ad75ff155637dec358e5c9fb8b90afd&pid=1-s2.0-S8756328220300065-main.pdf")
+                                .toURL()),
+                finder.findFullText(entry));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/SearchBasedFetcherCapabilityTest.java b/src/test/java/org/jabref/logic/importer/fetcher/SearchBasedFetcherCapabilityTest.java
index 5de34281403f..1a1796572d09 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SearchBasedFetcherCapabilityTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SearchBasedFetcherCapabilityTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.StringJoiner;
-import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -14,14 +14,13 @@
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.StringJoiner;
+import java.util.stream.Collectors;
 
 /**
  * Defines the set of capability tests that each tests a given search capability, e.g. author based search.
@@ -41,16 +40,23 @@ default void supportsAuthorSearch() throws Exception {
 
         List<BibEntry> result = getFetcher().performSearch(queryBuilder.toString());
         FieldPreferences fieldPreferences = mock(FieldPreferences.class);
-        when(fieldPreferences.getNonWrappableFields()).thenReturn(FXCollections.observableArrayList());
+        when(fieldPreferences.getNonWrappableFields())
+                .thenReturn(FXCollections.observableArrayList());
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX, fieldPreferences).doPostCleanup(result);
 
         assertFalse(result.isEmpty());
-        result.forEach(bibEntry -> {
-            String author = bibEntry.getField(StandardField.AUTHOR).orElse("");
-
-            // The co-authors differ, thus we check for the author present at all papers
-            getTestAuthors().forEach(expectedAuthor -> assertTrue(author.contains(expectedAuthor.replace("\"", ""))));
-        });
+        result.forEach(
+                bibEntry -> {
+                    String author = bibEntry.getField(StandardField.AUTHOR).orElse("");
+
+                    // The co-authors differ, thus we check for the author present at all papers
+                    getTestAuthors()
+                            .forEach(
+                                    expectedAuthor ->
+                                            assertTrue(
+                                                    author.contains(
+                                                            expectedAuthor.replace("\"", ""))));
+                });
     }
 
     /**
@@ -60,14 +66,16 @@ default void supportsAuthorSearch() throws Exception {
     default void supportsYearSearch() throws Exception {
         List<BibEntry> result = getFetcher().performSearch("year:" + getTestYear());
         FieldPreferences fieldPreferences = mock(FieldPreferences.class);
-        when(fieldPreferences.getNonWrappableFields()).thenReturn(FXCollections.observableArrayList());
+        when(fieldPreferences.getNonWrappableFields())
+                .thenReturn(FXCollections.observableArrayList());
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX, fieldPreferences).doPostCleanup(result);
-        List<String> differentYearsInResult = result.stream()
-                                                    .map(bibEntry -> bibEntry.getField(StandardField.YEAR))
-                                                    .filter(Optional::isPresent)
-                                                    .map(Optional::get)
-                                                    .distinct()
-                                                    .collect(Collectors.toList());
+        List<String> differentYearsInResult =
+                result.stream()
+                        .map(bibEntry -> bibEntry.getField(StandardField.YEAR))
+                        .filter(Optional::isPresent)
+                        .map(Optional::get)
+                        .distinct()
+                        .collect(Collectors.toList());
 
         assertEquals(Collections.singletonList(getTestYear().toString()), differentYearsInResult);
     }
@@ -81,14 +89,16 @@ default void supportsYearRangeSearch() throws Exception {
 
         List<BibEntry> result = getFetcher().performSearch("year-range:2018-2020");
         FieldPreferences fieldPreferences = mock(FieldPreferences.class);
-        when(fieldPreferences.getNonWrappableFields()).thenReturn(FXCollections.observableArrayList());
+        when(fieldPreferences.getNonWrappableFields())
+                .thenReturn(FXCollections.observableArrayList());
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX, fieldPreferences).doPostCleanup(result);
-        List<String> differentYearsInResult = result.stream()
-                                                    .map(bibEntry -> bibEntry.getField(StandardField.YEAR))
-                                                    .filter(Optional::isPresent)
-                                                    .map(Optional::get)
-                                                    .distinct()
-                                                    .collect(Collectors.toList());
+        List<String> differentYearsInResult =
+                result.stream()
+                        .map(bibEntry -> bibEntry.getField(StandardField.YEAR))
+                        .filter(Optional::isPresent)
+                        .map(Optional::get)
+                        .distinct()
+                        .collect(Collectors.toList());
         assertFalse(result.isEmpty());
         assertTrue(yearsInYearRange.containsAll(differentYearsInResult));
     }
@@ -103,15 +113,17 @@ default void supportsYearRangeSearch() throws Exception {
     default void supportsJournalSearch() throws Exception {
         List<BibEntry> result = getFetcher().performSearch("journal:\"" + getTestJournal() + "\"");
         FieldPreferences fieldPreferences = mock(FieldPreferences.class);
-        when(fieldPreferences.getNonWrappableFields()).thenReturn(FXCollections.observableArrayList());
+        when(fieldPreferences.getNonWrappableFields())
+                .thenReturn(FXCollections.observableArrayList());
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX, fieldPreferences).doPostCleanup(result);
 
         assertFalse(result.isEmpty());
-        result.forEach(bibEntry -> {
-            assertTrue(bibEntry.hasField(StandardField.JOURNAL));
-            String journal = bibEntry.getField(StandardField.JOURNAL).orElse("");
-            assertTrue(journal.contains(getTestJournal().replace("\"", "")));
-        });
+        result.forEach(
+                bibEntry -> {
+                    assertTrue(bibEntry.hasField(StandardField.JOURNAL));
+                    String journal = bibEntry.getField(StandardField.JOURNAL).orElse("");
+                    assertTrue(journal.contains(getTestJournal().replace("\"", "")));
+                });
     }
 
     SearchBasedFetcher getFetcher();
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/SemanticScholarTest.java b/src/test/java/org/jabref/logic/importer/fetcher/SemanticScholarTest.java
index f9f9a75a594f..5021ce7e26f4 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SemanticScholarTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SemanticScholarTest.java
@@ -1,14 +1,11 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
+import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;
+import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser;
+import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedFetcher;
@@ -17,16 +14,18 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.support.DisabledOnCIServer;
 import org.jabref.testutils.category.FetcherTest;
-
-import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;
-import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser;
-import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 public class SemanticScholarTest implements PagedSearchFetcherTest {
@@ -35,13 +34,22 @@ public class SemanticScholarTest implements PagedSearchFetcherTest {
 
     private final ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
 
-    private final BibEntry IGOR_NEWCOMERS = new BibEntry(StandardEntryType.Article)
-            .withField(StandardField.AUTHOR, "Igor Steinmacher and T. Conte and Christoph Treude and M. Gerosa")
-            .withField(StandardField.YEAR, "2016")
-            .withField(StandardField.DOI, "10.1145/2884781.2884806")
-            .withField(StandardField.TITLE, "Overcoming Open Source Project Entry Barriers with a Portal for Newcomers")
-            .withField(StandardField.URL, "https://www.semanticscholar.org/paper/4bea2b4029a895bf898701329409e5a784fc2090")
-            .withField(StandardField.VENUE, "International Conference on Software Engineering");
+    private final BibEntry IGOR_NEWCOMERS =
+            new BibEntry(StandardEntryType.Article)
+                    .withField(
+                            StandardField.AUTHOR,
+                            "Igor Steinmacher and T. Conte and Christoph Treude and M. Gerosa")
+                    .withField(StandardField.YEAR, "2016")
+                    .withField(StandardField.DOI, "10.1145/2884781.2884806")
+                    .withField(
+                            StandardField.TITLE,
+                            "Overcoming Open Source Project Entry Barriers with a Portal for Newcomers")
+                    .withField(
+                            StandardField.URL,
+                            "https://www.semanticscholar.org/paper/4bea2b4029a895bf898701329409e5a784fc2090")
+                    .withField(
+                            StandardField.VENUE,
+                            "International Conference on Software Engineering");
 
     private SemanticScholar fetcher;
 
@@ -52,10 +60,13 @@ void setUp() {
 
     @Test
     void getDocument() throws IOException, FetcherException {
-        String source = fetcher.getURLBySource(
-                "https://api.semanticscholar.org/v1/paper/%s".formatted(DOI));
+        String source =
+                fetcher.getURLBySource(
+                        "https://api.semanticscholar.org/v1/paper/%s".formatted(DOI));
 
-        assertEquals("https://www.semanticscholar.org/paper/7f7b38604a2c167f6d5fb1c5dffcbb127d0525c0", source);
+        assertEquals(
+                "https://www.semanticscholar.org/paper/7f7b38604a2c167f6d5fb1c5dffcbb127d0525c0",
+                source);
     }
 
     @Test
@@ -64,9 +75,9 @@ void getDocument() throws IOException, FetcherException {
     void fullTextFindByDOI() throws Exception {
         BibEntry entry = new BibEntry().withField(StandardField.DOI, "10.1038/nrn3241");
         assertEquals(
-                Optional.of(new URI("https://europepmc.org/articles/pmc4907333?pdf=render").toURL()),
-                fetcher.findFullText(entry)
-        );
+                Optional.of(
+                        new URI("https://europepmc.org/articles/pmc4907333?pdf=render").toURL()),
+                fetcher.findFullText(entry));
     }
 
     @Test
@@ -74,9 +85,12 @@ void fullTextFindByDOI() throws Exception {
     @Disabled("Sometimes, does not find any thing")
     void fullTextFindByDOIAlternate() throws Exception {
         assertEquals(
-                Optional.of(new URI("https://pdfs.semanticscholar.org/7f6e/61c254bc2df38a784c1228f56c13317caded.pdf").toURL()),
-                fetcher.findFullText(new BibEntry()
-                        .withField(StandardField.DOI, "10.3390/healthcare9020206")));
+                Optional.of(
+                        new URI(
+                                        "https://pdfs.semanticscholar.org/7f6e/61c254bc2df38a784c1228f56c13317caded.pdf")
+                                .toURL()),
+                fetcher.findFullText(
+                        new BibEntry().withField(StandardField.DOI, "10.3390/healthcare9020206")));
     }
 
     @Test
@@ -88,8 +102,10 @@ void fullTextSearchOnEmptyEntry() throws IOException, FetcherException {
     @Test
     @DisabledOnCIServer("CI server is unreliable")
     void fullTextNotFoundByDOI() throws IOException, FetcherException {
-        BibEntry entry = new BibEntry().withField(StandardField.DOI, DOI)
-                                       .withField(StandardField.DOI, "10.1021/bk-2006-WWW.ch014");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(StandardField.DOI, DOI)
+                        .withField(StandardField.DOI, "10.1021/bk-2006-WWW.ch014");
 
         assertEquals(Optional.empty(), fetcher.findFullText(entry));
     }
@@ -97,12 +113,13 @@ void fullTextNotFoundByDOI() throws IOException, FetcherException {
     @Test
     @DisabledOnCIServer("CI server is unreliable")
     void fullTextFindByArXiv() throws Exception {
-        BibEntry entry = new BibEntry().withField(StandardField.EPRINT, "1407.3561")
-                              .withField(StandardField.ARCHIVEPREFIX, "arXiv");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(StandardField.EPRINT, "1407.3561")
+                        .withField(StandardField.ARCHIVEPREFIX, "arXiv");
         assertEquals(
                 Optional.of(new URI("https://arxiv.org/pdf/1407.3561.pdf").toURL()),
-                fetcher.findFullText(entry)
-        );
+                fetcher.findFullText(entry));
     }
 
     @Test
@@ -121,24 +138,37 @@ public PagedSearchBasedFetcher getPagedFetcher() {
     }
 
     @Test
-    void getURLForQueryWithLucene() throws QueryNodeParseException, MalformedURLException, FetcherException, URISyntaxException {
+    void getURLForQueryWithLucene()
+            throws QueryNodeParseException,
+                    MalformedURLException,
+                    FetcherException,
+                    URISyntaxException {
         String query = "Software engineering";
         SyntaxParser parser = new StandardSyntaxParser();
         URL url = fetcher.getURLForQuery(parser.parse(query, "default"), 0);
-        assertEquals("https://api.semanticscholar.org/graph/v1/paper/search?query=Software%20engineering&offset=0&limit=20&fields=paperId%2CexternalIds%2Curl%2Ctitle%2Cabstract%2Cvenue%2Cyear%2Cauthors", url.toString());
+        assertEquals(
+                "https://api.semanticscholar.org/graph/v1/paper/search?query=Software%20engineering&offset=0&limit=20&fields=paperId%2CexternalIds%2Curl%2Ctitle%2Cabstract%2Cvenue%2Cyear%2Cauthors",
+                url.toString());
     }
 
     @Test
     @Disabled("We seem to be blocked")
     void searchByQueryFindsEntry() throws Exception {
-        BibEntry master = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Tobias Diez")
-                .withField(StandardField.TITLE, "Slice theorem for Fréchet group actions and covariant symplectic field theory")
-                .withField(StandardField.YEAR, "2014")
-                .withField(StandardField.EPRINT, "1405.2249")
-                .withField(StandardField.EPRINTTYPE, "arXiv")
-                .withField(StandardField.URL, "https://www.semanticscholar.org/paper/4986c1060236e7190b63f934df7806fbf2056cec");
-        List<BibEntry> fetchedEntries = fetcher.performSearch("Slice theorem for Fréchet group actions and covariant symplectic");
+        BibEntry master =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Tobias Diez")
+                        .withField(
+                                StandardField.TITLE,
+                                "Slice theorem for Fréchet group actions and covariant symplectic field theory")
+                        .withField(StandardField.YEAR, "2014")
+                        .withField(StandardField.EPRINT, "1405.2249")
+                        .withField(StandardField.EPRINTTYPE, "arXiv")
+                        .withField(
+                                StandardField.URL,
+                                "https://www.semanticscholar.org/paper/4986c1060236e7190b63f934df7806fbf2056cec");
+        List<BibEntry> fetchedEntries =
+                fetcher.performSearch(
+                        "Slice theorem for Fréchet group actions and covariant symplectic");
         // Abstract should not be included in JabRef tests
         fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
         assertEquals(Collections.singletonList(master), fetchedEntries);
@@ -147,7 +177,9 @@ void searchByQueryFindsEntry() throws Exception {
     @Test
     @Disabled("We seem to be blocked")
     void searchByPlainQueryFindsEntry() throws Exception {
-        List<BibEntry> fetchedEntries = fetcher.performSearch("Overcoming Open Source Project Entry Barriers with a Portal for Newcomers");
+        List<BibEntry> fetchedEntries =
+                fetcher.performSearch(
+                        "Overcoming Open Source Project Entry Barriers with a Portal for Newcomers");
         // Abstract should not be included in JabRef tests
         fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
         assertEquals(Collections.singletonList(IGOR_NEWCOMERS), fetchedEntries);
@@ -156,7 +188,9 @@ void searchByPlainQueryFindsEntry() throws Exception {
     @Test
     @Disabled("We seem to be blocked")
     void searchByQuotedQueryFindsEntry() throws Exception {
-        List<BibEntry> fetchedEntries = fetcher.performSearch("\"Overcoming Open Source Project Entry Barriers with a Portal for Newcomers\"");
+        List<BibEntry> fetchedEntries =
+                fetcher.performSearch(
+                        "\"Overcoming Open Source Project Entry Barriers with a Portal for Newcomers\"");
         // Abstract should not be included in JabRef tests
         fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
         assertEquals(Collections.singletonList(IGOR_NEWCOMERS), fetchedEntries);
@@ -170,15 +204,26 @@ void performSearchByEmptyQuery() throws Exception {
     @Test
     @Disabled("We seem to be blocked")
     void findByEntry() throws Exception {
-        BibEntry barrosEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.TITLE, "Formalising BPMN Service Interaction Patterns")
-                .withField(StandardField.AUTHOR, "Chiara Muzi and Luise Pufahl and Lorenzo Rossi and M. Weske and F. Tiezzi")
-                .withField(StandardField.YEAR, "2018")
-                .withField(StandardField.DOI, "10.1007/978-3-030-02302-7_1")
-                .withField(StandardField.URL, "https://www.semanticscholar.org/paper/3bb026fd67db7d8e0e25de3189d6b7031b12783e")
-                .withField(StandardField.VENUE, "The Practice of Enterprise Modeling");
-
-        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "Formalising BPMN Service Interaction Patterns");
+        BibEntry barrosEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.TITLE,
+                                "Formalising BPMN Service Interaction Patterns")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Chiara Muzi and Luise Pufahl and Lorenzo Rossi and M. Weske and F. Tiezzi")
+                        .withField(StandardField.YEAR, "2018")
+                        .withField(StandardField.DOI, "10.1007/978-3-030-02302-7_1")
+                        .withField(
+                                StandardField.URL,
+                                "https://www.semanticscholar.org/paper/3bb026fd67db7d8e0e25de3189d6b7031b12783e")
+                        .withField(StandardField.VENUE, "The Practice of Enterprise Modeling");
+
+        BibEntry entry =
+                new BibEntry()
+                        .withField(
+                                StandardField.TITLE,
+                                "Formalising BPMN Service Interaction Patterns");
         BibEntry actual = fetcher.performSearch(entry).getFirst();
         // Abstract should not be included in JabRef tests
         actual.clearField(StandardField.ABSTRACT);
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java
index a1e5bd7e982f..7821a574b277 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java
@@ -1,11 +1,14 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
+import kong.unirest.core.json.JSONObject;
+
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedFetcher;
 import org.jabref.logic.importer.SearchBasedFetcher;
@@ -13,16 +16,13 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
-import kong.unirest.core.json.JSONObject;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 class SpringerFetcherTest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
@@ -39,90 +39,144 @@ void setUp() {
     @Test
     void searchByQueryFindsEntry() throws Exception {
 
-        BibEntry articleTagThatIssue = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Santos, Fabio and Vargovich, Joseph and Trinkenreich, Bianca and Santos, Italo and Penney, Jacob and Britto, Ricardo and Pimentel, João Felipe and Wiese, Igor and Steinmacher, Igor and Sarma, Anita and Gerosa, Marco A.")
-                .withField(StandardField.DATE, "2023-08-31")
-                .withField(StandardField.DOI, "10.1007/s10664-023-10329-4")
-                .withField(StandardField.FILE, ":http\\://link.springer.com/openurl/pdf?id=doi\\:10.1007/s10664-023-10329-4:PDF")
-                .withField(StandardField.ISSN, "1382-3256")
-                .withField(StandardField.JOURNAL, "Empirical Software Engineering")
-                .withField(StandardField.MONTH, "#aug#")
-                .withField(StandardField.NUMBER, "5")
-                .withField(StandardField.PAGES, "1--52")
-                .withField(StandardField.PUBLISHER, "Springer")
-                .withField(StandardField.TITLE, "Tag that issue: applying API-domain labels in issue tracking systems")
-                .withField(StandardField.VOLUME, "28")
-                .withField(StandardField.YEAR, "2023")
-                .withField(StandardField.ABSTRACT, "Labeling issues with the skills required to complete them can help contributors to choose tasks in Open Source Software projects. However, manually labeling issues is time-consuming and error-prone, and current automated approaches are mostly limited to classifying issues as bugs/non-bugs. We investigate the feasibility and relevance of automatically labeling issues with what we call “API-domains,” which are high-level categories of APIs. Therefore, we posit that the APIs used in the source code affected by an issue can be a proxy for the type of skills (e.g., DB, security, UI) needed to work on the issue. We ran a user study (n=74) to assess API-domain labels’ relevancy to potential contributors, leveraged the issues’ descriptions and the project history to build prediction models, and validated the predictions with contributors (n=20) of the projects. Our results show that (i) newcomers to the project consider API-domain labels useful in choosing tasks, (ii) labels can be predicted with a precision of 84% and a recall of 78.6% on average, (iii) the results of the predictions reached up to 71.3% in precision and 52.5% in recall when training with a project and testing in another (transfer learning), and (iv) project contributors consider most of the predictions helpful in identifying needed skills. These findings suggest our approach can be applied in practice to automatically label issues, assisting developers in finding tasks that better match their skills.");
-
-        BibEntry firstArticle = new BibEntry(StandardEntryType.Article)
-            .withField(StandardField.AUTHOR, "Steinmacher, Igor and Balali, Sogol and Trinkenreich, Bianca and Guizani, Mariam and Izquierdo-Cortazar, Daniel and Cuevas Zambrano, Griselda G. and Gerosa, Marco Aurelio and Sarma, Anita")
-            .withField(StandardField.DATE, "2021-09-09")
-            .withField(StandardField.DOI, "10.1186/s13174-021-00140-z")
-            .withField(StandardField.ISSN, "1867-4828")
-            .withField(StandardField.JOURNAL, "Journal of Internet Services and Applications")
-            .withField(StandardField.MONTH, "#sep#")
-            .withField(StandardField.PAGES, "1--33")
-            .withField(StandardField.NUMBER, "1")
-            .withField(StandardField.VOLUME, "12")
-            .withField(StandardField.PUBLISHER, "Springer")
-            .withField(StandardField.TITLE, "Being a Mentor in open source projects")
-            .withField(StandardField.YEAR, "2021")
-            .withField(StandardField.FILE, ":https\\://www.biomedcentral.com/openurl/pdf?id=doi\\:10.1186/s13174-021-00140-z:PDF")
-            .withField(StandardField.ABSTRACT, "Mentoring is a well-known way to help newcomers to Open Source Software (OSS) projects overcome initial contribution barriers. Through mentoring, newcomers learn to acquire essential technical, social, and organizational skills. Despite the importance of OSS mentors, they are understudied in the literature. Understanding who OSS project mentors are, the challenges they face, and the strategies they use can help OSS projects better support mentors’ work. In this paper, we employ a two-stage study to comprehensively investigate mentors in OSS. First, we identify the characteristics of mentors in the Apache Software Foundation, a large OSS community, using an online survey. We found that less experienced volunteer contributors are less likely to take on the mentorship role. Second, through interviews with OSS mentors (n=18), we identify the challenges that mentors face and how they mitigate them. In total, we identified 25 general mentorship challenges and 7 sub-categories of challenges regarding task recommendation. We also identified 13 strategies to overcome the challenges related to task recommendation. Our results provide insights for OSS communities, formal mentorship programs, and tool builders who design automated support for task assignment and internship.");
-
-        BibEntry secondArticle = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Steinmacher, Igor and Gerosa, Marco and Conte, Tayana U. and Redmiles, David F.")
-                .withField(StandardField.DATE, "2019-04-15")
-                .withField(StandardField.DOI, "10.1007/s10606-018-9335-z")
-                .withField(StandardField.ISSN, "0925-9724")
-                .withField(StandardField.JOURNAL, "Computer Supported Cooperative Work (CSCW)")
-                .withField(StandardField.MONTH, "#apr#")
-                .withField(StandardField.PAGES, "247--290")
-                .withField(StandardField.NUMBER, "1-2")
-                .withField(StandardField.VOLUME, "28")
-                .withField(StandardField.PUBLISHER, "Springer")
-                .withField(StandardField.TITLE, "Overcoming Social Barriers When Contributing to Open Source Software Projects")
-                .withField(StandardField.YEAR, "2019")
-                .withField(StandardField.FILE, ":http\\://link.springer.com/openurl/pdf?id=doi\\:10.1007/s10606-018-9335-z:PDF")
-                .withField(StandardField.ABSTRACT, "An influx of newcomers is critical to the survival, long-term success, and continuity of many Open Source Software (OSS) community-based projects. However, newcomers face many barriers when making their first contribution, leading in many cases to dropouts. Due to the collaborative nature of community-based OSS projects, newcomers may be susceptible to social barriers, such as communication breakdowns and reception issues. In this article, we report a two-phase study aimed at better understanding social barriers faced by newcomers. In the first phase, we qualitatively analyzed the literature and data collected from practitioners to identify barriers that hinder newcomers’ first contribution. We designed a model composed of 58 barriers, including 13 social barriers. In the second phase, based on the barriers model, we developed FLOSScoach, a portal to support newcomers making their first contribution. We evaluated the portal in a diary-based study and found that the portal guided the newcomers and reduced the need for communication. Our results provide insights for communities that want to support newcomers and lay a foundation for building better onboarding tools. The contributions of this paper include identifying and gathering empirical evidence of social barriers faced by newcomers; understanding how social barriers can be reduced or avoided by using a portal that organizes proper information for newcomers (FLOSScoach); presenting guidelines for communities and newcomers on how to reduce or avoid social barriers; and identifying new streams of research.");
-
-        BibEntry thirdArticle = new BibEntry(StandardEntryType.InCollection)
-            .withField(StandardField.AUTHOR, "Serrano Alves, Luiz Philipe and Wiese, Igor Scaliante and Chaves, Ana Paula and Steinmacher, Igor")
-            .withField(StandardField.BOOKTITLE, "Chatbot Research and Design")
-            .withField(StandardField.DATE, "2022-01-01")
-            .withField(StandardField.DOI, "10.1007/978-3-030-94890-0_6")
-            .withField(StandardField.ISBN, "978-3-030-94889-4")
-            .withField(StandardField.FILE, ":http\\://link.springer.com/openurl/pdf?id=doi\\:10.1007/978-3-030-94890-0_6:PDF")
-            .withField(StandardField.MONTH, "#jan#")
-            .withField(StandardField.PUBLISHER, "Springer")
-            .withField(StandardField.YEAR, "2022")
-            .withField(StandardField.TITLE, "How to Find My Task? Chatbot to Assist Newcomers in Choosing Tasks in OSS Projects")
-            .withField(StandardField.ABSTRACT, "Open Source Software (OSS) is making a meteoric rise in the software industry since several big companies have entered this market. Unfortunately, newcomers enter these projects and usually lose interest in contributing because of several factors. This paper aims to reduce the problems users face when they walk their first steps into OSS projects: finding the appropriate task. This paper presents a chatbot that filters tasks to help newcomers choose a task that fits their skills. We performed a quantitative and a qualitative study comparing the chatbot with the current GitHub issue tracker interface, which uses labels to categorize and identify tasks. The results show that users perceived the chatbot as easier to use than the GitHub issue tracker. Additionally, users tend to interpret the use of chatbots as situational, helping mainly newcomers and inexperienced contributors.");
-
-        BibEntry fourthArticle = new BibEntry(StandardEntryType.Article)
-            .withField(StandardField.AUTHOR, "Calefato, Fabio and Gerosa, Marco Aurélio and Iaffaldano, Giuseppe and Lanubile, Filippo and Steinmacher, Igor")
-            .withField(StandardField.DATE, "2022-03-19")
-            .withField(StandardField.DOI, "10.1007/s10664-021-10012-6")
-            .withField(StandardField.FILE, ":http\\://link.springer.com/openurl/pdf?id=doi\\:10.1007/s10664-021-10012-6:PDF")
-            .withField(StandardField.ISSN, "1382-3256")
-            .withField(StandardField.JOURNAL, "Empirical Software Engineering")
-            .withField(StandardField.MONTH, "#mar#")
-            .withField(StandardField.NUMBER, "3")
-            .withField(StandardField.PAGES, "1--41")
-            .withField(StandardField.PUBLISHER, "Springer")
-            .withField(StandardField.TITLE, "Will you come back to contribute? Investigating the inactivity of OSS core developers in GitHub")
-            .withField(StandardField.VOLUME, "27")
-            .withField(StandardField.YEAR, "2022")
-            .withField(StandardField.ABSTRACT, "Several Open-Source Software (OSS) projects depend on the continuity of their development communities to remain sustainable. Understanding how developers become inactive or why they take breaks can help communities prevent abandonment and incentivize developers to come back. In this paper, we propose a novel method to identify developers’ inactive periods by analyzing the individual rhythm of contributions to the projects. Using this method, we quantitatively analyze the inactivity of core developers in 18 OSS organizations hosted on GitHub. We also survey core developers to receive their feedback about the identified breaks and transitions. Our results show that our method was effective for identifying developers’ breaks. About 94% of the surveyed core developers agreed with our state model of inactivity; 71% and 79% of them acknowledged their breaks and state transition, respectively. We also show that all core developers take breaks (at least once) and about a half of them (~45%) have completely disengaged from a project for at least one year. We also analyzed the probability of transitions to/from inactivity and found that developers who pause their activity have a ~35 to ~55% chance to return to an active state; yet, if the break lasts for a year or longer, then the probability of resuming activities drops to ~21–26%, with a ~54% chance of complete disengagement. These results may support the creation of policies and mechanisms to make OSS community managers aware of breaks and potential project abandonment.");
+        BibEntry articleTagThatIssue =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Santos, Fabio and Vargovich, Joseph and Trinkenreich, Bianca and Santos, Italo and Penney, Jacob and Britto, Ricardo and Pimentel, João Felipe and Wiese, Igor and Steinmacher, Igor and Sarma, Anita and Gerosa, Marco A.")
+                        .withField(StandardField.DATE, "2023-08-31")
+                        .withField(StandardField.DOI, "10.1007/s10664-023-10329-4")
+                        .withField(
+                                StandardField.FILE,
+                                ":http\\://link.springer.com/openurl/pdf?id=doi\\:10.1007/s10664-023-10329-4:PDF")
+                        .withField(StandardField.ISSN, "1382-3256")
+                        .withField(StandardField.JOURNAL, "Empirical Software Engineering")
+                        .withField(StandardField.MONTH, "#aug#")
+                        .withField(StandardField.NUMBER, "5")
+                        .withField(StandardField.PAGES, "1--52")
+                        .withField(StandardField.PUBLISHER, "Springer")
+                        .withField(
+                                StandardField.TITLE,
+                                "Tag that issue: applying API-domain labels in issue tracking systems")
+                        .withField(StandardField.VOLUME, "28")
+                        .withField(StandardField.YEAR, "2023")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Labeling issues with the skills required to complete them can help contributors to choose tasks in Open Source Software projects. However, manually labeling issues is time-consuming and error-prone, and current automated approaches are mostly limited to classifying issues as bugs/non-bugs. We investigate the feasibility and relevance of automatically labeling issues with what we call “API-domains,” which are high-level categories of APIs. Therefore, we posit that the APIs used in the source code affected by an issue can be a proxy for the type of skills (e.g., DB, security, UI) needed to work on the issue. We ran a user study (n=74) to assess API-domain labels’ relevancy to potential contributors, leveraged the issues’ descriptions and the project history to build prediction models, and validated the predictions with contributors (n=20) of the projects. Our results show that (i) newcomers to the project consider API-domain labels useful in choosing tasks, (ii) labels can be predicted with a precision of 84% and a recall of 78.6% on average, (iii) the results of the predictions reached up to 71.3% in precision and 52.5% in recall when training with a project and testing in another (transfer learning), and (iv) project contributors consider most of the predictions helpful in identifying needed skills. These findings suggest our approach can be applied in practice to automatically label issues, assisting developers in finding tasks that better match their skills.");
+
+        BibEntry firstArticle =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Steinmacher, Igor and Balali, Sogol and Trinkenreich, Bianca and Guizani, Mariam and Izquierdo-Cortazar, Daniel and Cuevas Zambrano, Griselda G. and Gerosa, Marco Aurelio and Sarma, Anita")
+                        .withField(StandardField.DATE, "2021-09-09")
+                        .withField(StandardField.DOI, "10.1186/s13174-021-00140-z")
+                        .withField(StandardField.ISSN, "1867-4828")
+                        .withField(
+                                StandardField.JOURNAL,
+                                "Journal of Internet Services and Applications")
+                        .withField(StandardField.MONTH, "#sep#")
+                        .withField(StandardField.PAGES, "1--33")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.VOLUME, "12")
+                        .withField(StandardField.PUBLISHER, "Springer")
+                        .withField(StandardField.TITLE, "Being a Mentor in open source projects")
+                        .withField(StandardField.YEAR, "2021")
+                        .withField(
+                                StandardField.FILE,
+                                ":https\\://www.biomedcentral.com/openurl/pdf?id=doi\\:10.1186/s13174-021-00140-z:PDF")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Mentoring is a well-known way to help newcomers to Open Source Software (OSS) projects overcome initial contribution barriers. Through mentoring, newcomers learn to acquire essential technical, social, and organizational skills. Despite the importance of OSS mentors, they are understudied in the literature. Understanding who OSS project mentors are, the challenges they face, and the strategies they use can help OSS projects better support mentors’ work. In this paper, we employ a two-stage study to comprehensively investigate mentors in OSS. First, we identify the characteristics of mentors in the Apache Software Foundation, a large OSS community, using an online survey. We found that less experienced volunteer contributors are less likely to take on the mentorship role. Second, through interviews with OSS mentors (n=18), we identify the challenges that mentors face and how they mitigate them. In total, we identified 25 general mentorship challenges and 7 sub-categories of challenges regarding task recommendation. We also identified 13 strategies to overcome the challenges related to task recommendation. Our results provide insights for OSS communities, formal mentorship programs, and tool builders who design automated support for task assignment and internship.");
+
+        BibEntry secondArticle =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Steinmacher, Igor and Gerosa, Marco and Conte, Tayana U. and Redmiles, David F.")
+                        .withField(StandardField.DATE, "2019-04-15")
+                        .withField(StandardField.DOI, "10.1007/s10606-018-9335-z")
+                        .withField(StandardField.ISSN, "0925-9724")
+                        .withField(
+                                StandardField.JOURNAL, "Computer Supported Cooperative Work (CSCW)")
+                        .withField(StandardField.MONTH, "#apr#")
+                        .withField(StandardField.PAGES, "247--290")
+                        .withField(StandardField.NUMBER, "1-2")
+                        .withField(StandardField.VOLUME, "28")
+                        .withField(StandardField.PUBLISHER, "Springer")
+                        .withField(
+                                StandardField.TITLE,
+                                "Overcoming Social Barriers When Contributing to Open Source Software Projects")
+                        .withField(StandardField.YEAR, "2019")
+                        .withField(
+                                StandardField.FILE,
+                                ":http\\://link.springer.com/openurl/pdf?id=doi\\:10.1007/s10606-018-9335-z:PDF")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "An influx of newcomers is critical to the survival, long-term success, and continuity of many Open Source Software (OSS) community-based projects. However, newcomers face many barriers when making their first contribution, leading in many cases to dropouts. Due to the collaborative nature of community-based OSS projects, newcomers may be susceptible to social barriers, such as communication breakdowns and reception issues. In this article, we report a two-phase study aimed at better understanding social barriers faced by newcomers. In the first phase, we qualitatively analyzed the literature and data collected from practitioners to identify barriers that hinder newcomers’ first contribution. We designed a model composed of 58 barriers, including 13 social barriers. In the second phase, based on the barriers model, we developed FLOSScoach, a portal to support newcomers making their first contribution. We evaluated the portal in a diary-based study and found that the portal guided the newcomers and reduced the need for communication. Our results provide insights for communities that want to support newcomers and lay a foundation for building better onboarding tools. The contributions of this paper include identifying and gathering empirical evidence of social barriers faced by newcomers; understanding how social barriers can be reduced or avoided by using a portal that organizes proper information for newcomers (FLOSScoach); presenting guidelines for communities and newcomers on how to reduce or avoid social barriers; and identifying new streams of research.");
+
+        BibEntry thirdArticle =
+                new BibEntry(StandardEntryType.InCollection)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Serrano Alves, Luiz Philipe and Wiese, Igor Scaliante and Chaves, Ana Paula and Steinmacher, Igor")
+                        .withField(StandardField.BOOKTITLE, "Chatbot Research and Design")
+                        .withField(StandardField.DATE, "2022-01-01")
+                        .withField(StandardField.DOI, "10.1007/978-3-030-94890-0_6")
+                        .withField(StandardField.ISBN, "978-3-030-94889-4")
+                        .withField(
+                                StandardField.FILE,
+                                ":http\\://link.springer.com/openurl/pdf?id=doi\\:10.1007/978-3-030-94890-0_6:PDF")
+                        .withField(StandardField.MONTH, "#jan#")
+                        .withField(StandardField.PUBLISHER, "Springer")
+                        .withField(StandardField.YEAR, "2022")
+                        .withField(
+                                StandardField.TITLE,
+                                "How to Find My Task? Chatbot to Assist Newcomers in Choosing Tasks in OSS Projects")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Open Source Software (OSS) is making a meteoric rise in the software industry since several big companies have entered this market. Unfortunately, newcomers enter these projects and usually lose interest in contributing because of several factors. This paper aims to reduce the problems users face when they walk their first steps into OSS projects: finding the appropriate task. This paper presents a chatbot that filters tasks to help newcomers choose a task that fits their skills. We performed a quantitative and a qualitative study comparing the chatbot with the current GitHub issue tracker interface, which uses labels to categorize and identify tasks. The results show that users perceived the chatbot as easier to use than the GitHub issue tracker. Additionally, users tend to interpret the use of chatbots as situational, helping mainly newcomers and inexperienced contributors.");
+
+        BibEntry fourthArticle =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Calefato, Fabio and Gerosa, Marco Aurélio and Iaffaldano, Giuseppe and Lanubile, Filippo and Steinmacher, Igor")
+                        .withField(StandardField.DATE, "2022-03-19")
+                        .withField(StandardField.DOI, "10.1007/s10664-021-10012-6")
+                        .withField(
+                                StandardField.FILE,
+                                ":http\\://link.springer.com/openurl/pdf?id=doi\\:10.1007/s10664-021-10012-6:PDF")
+                        .withField(StandardField.ISSN, "1382-3256")
+                        .withField(StandardField.JOURNAL, "Empirical Software Engineering")
+                        .withField(StandardField.MONTH, "#mar#")
+                        .withField(StandardField.NUMBER, "3")
+                        .withField(StandardField.PAGES, "1--41")
+                        .withField(StandardField.PUBLISHER, "Springer")
+                        .withField(
+                                StandardField.TITLE,
+                                "Will you come back to contribute? Investigating the inactivity of OSS core developers in GitHub")
+                        .withField(StandardField.VOLUME, "27")
+                        .withField(StandardField.YEAR, "2022")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "Several Open-Source Software (OSS) projects depend on the continuity of their development communities to remain sustainable. Understanding how developers become inactive or why they take breaks can help communities prevent abandonment and incentivize developers to come back. In this paper, we propose a novel method to identify developers’ inactive periods by analyzing the individual rhythm of contributions to the projects. Using this method, we quantitatively analyze the inactivity of core developers in 18 OSS organizations hosted on GitHub. We also survey core developers to receive their feedback about the identified breaks and transitions. Our results show that our method was effective for identifying developers’ breaks. About 94% of the surveyed core developers agreed with our state model of inactivity; 71% and 79% of them acknowledged their breaks and state transition, respectively. We also show that all core developers take breaks (at least once) and about a half of them (~45%) have completely disengaged from a project for at least one year. We also analyzed the probability of transitions to/from inactivity and found that developers who pause their activity have a ~35 to ~55% chance to return to an active state; yet, if the break lasts for a year or longer, then the probability of resuming activities drops to ~21–26%, with a ~54% chance of complete disengagement. These results may support the creation of policies and mechanisms to make OSS community managers aware of breaks and potential project abandonment.");
 
         List<BibEntry> fetchedEntries = fetcher.performSearch("JabRef Social Barriers Steinmacher");
-        assertEquals(List.of(articleTagThatIssue, fourthArticle, thirdArticle, firstArticle, secondArticle), fetchedEntries);
+        assertEquals(
+                List.of(
+                        articleTagThatIssue,
+                        fourthArticle,
+                        thirdArticle,
+                        firstArticle,
+                        secondArticle),
+                fetchedEntries);
     }
 
     @Test
     void springerJSONToBibtex() {
-        String jsonString = """
+        String jsonString =
+                """
                 {\r
                             "identifier":"doi:10.1007/BF01201962",\r
                             "title":"Book reviews",\r
@@ -157,43 +211,50 @@ void searchByEmptyQueryFindsNothing() throws Exception {
     @Test
     @Disabled("Year search is currently broken, because the API returns mutliple years.")
     @Override
-    public void supportsYearSearch() {
-    }
+    public void supportsYearSearch() {}
 
     @Test
-    @Disabled("Year range search is not natively supported by the API, but can be emulated by multiple single year searches.")
+    @Disabled(
+            "Year range search is not natively supported by the API, but can be emulated by multiple single year searches.")
     @Override
-    public void supportsYearRangeSearch() {
-    }
+    public void supportsYearRangeSearch() {}
 
     @Test
     @Disabled("401 as of 2024-08-18")
     @Override
-    public void supportsAuthorSearch() {
-    }
+    public void supportsAuthorSearch() {}
 
     @Test
     @Disabled("401 as of 2024-08-18")
     @Override
-    public void supportsJournalSearch() {
-    }
+    public void supportsJournalSearch() {}
 
     @Test
     @Disabled("401 as of 2024-08-18")
     void supportsPhraseSearch() throws Exception {
-        // Normal search should match due to Redmiles, Elissa M., phrase search on the other hand should not find it.
-        BibEntry expected = new BibEntry(StandardEntryType.InCollection)
-                .withField(StandardField.AUTHOR, "Booth, Kayla M. and Dosono, Bryan and Redmiles, Elissa M. and Morales, Miraida and Depew, Michael and Farzan, Rosta and Herman, Everett and Trahan, Keith and Tananis, Cindy")
-                .withField(StandardField.DATE, "2018-01-01")
-                .withField(StandardField.DOI, "10.1007/978-3-319-78105-1_75")
-                .withField(StandardField.ISBN, "978-3-319-78104-4")
-                .withField(StandardField.MONTH, "#jan#")
-                .withField(StandardField.PUBLISHER, "Springer")
-                .withField(StandardField.BOOKTITLE, "Transforming Digital Worlds")
-                .withField(StandardField.TITLE, "Diversifying the Next Generation of Information Scientists: Six Years of Implementation and Outcomes for a Year-Long REU Program")
-                .withField(StandardField.YEAR, "2018")
-                .withField(StandardField.FILE, ":http\\://link.springer.com/openurl/pdf?id=doi\\:10.1007/978-3-319-78105-1_75:PDF")
-                .withField(StandardField.ABSTRACT, "The iSchool Inclusion Institute (i3) is a Research Experience for Undergraduates (REU) program in the US designed to address underrepresentation in the information sciences. i3 is a year-long, cohort-based program that prepares undergraduate students for graduate school in information science and is rooted in a research and leadership development curriculum. Using data from six years of i3 cohorts, we present in this paper a qualitative and quantitative evaluation of the program in terms of student learning, research production, and graduate school enrollment. We find that students who participate in i3 report significant learning gains in information-science- and graduate-school-related areas and that 52% of i3 participants enroll in graduate school, over 2 $$\\times $$ × the national average. Based on these and additional results, we distill recommendations for future implementations of similar programs to address underrepresentation in information science.");
+        // Normal search should match due to Redmiles, Elissa M., phrase search on the other hand
+        // should not find it.
+        BibEntry expected =
+                new BibEntry(StandardEntryType.InCollection)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Booth, Kayla M. and Dosono, Bryan and Redmiles, Elissa M. and Morales, Miraida and Depew, Michael and Farzan, Rosta and Herman, Everett and Trahan, Keith and Tananis, Cindy")
+                        .withField(StandardField.DATE, "2018-01-01")
+                        .withField(StandardField.DOI, "10.1007/978-3-319-78105-1_75")
+                        .withField(StandardField.ISBN, "978-3-319-78104-4")
+                        .withField(StandardField.MONTH, "#jan#")
+                        .withField(StandardField.PUBLISHER, "Springer")
+                        .withField(StandardField.BOOKTITLE, "Transforming Digital Worlds")
+                        .withField(
+                                StandardField.TITLE,
+                                "Diversifying the Next Generation of Information Scientists: Six Years of Implementation and Outcomes for a Year-Long REU Program")
+                        .withField(StandardField.YEAR, "2018")
+                        .withField(
+                                StandardField.FILE,
+                                ":http\\://link.springer.com/openurl/pdf?id=doi\\:10.1007/978-3-319-78105-1_75:PDF")
+                        .withField(
+                                StandardField.ABSTRACT,
+                                "The iSchool Inclusion Institute (i3) is a Research Experience for Undergraduates (REU) program in the US designed to address underrepresentation in the information sciences. i3 is a year-long, cohort-based program that prepares undergraduate students for graduate school in information science and is rooted in a research and leadership development curriculum. Using data from six years of i3 cohorts, we present in this paper a qualitative and quantitative evaluation of the program in terms of student learning, research production, and graduate school enrollment. We find that students who participate in i3 report significant learning gains in information-science- and graduate-school-related areas and that 52% of i3 participants enroll in graduate school, over 2 $$\\times $$ × the national average. Based on these and additional results, we distill recommendations for future implementations of similar programs to address underrepresentation in information science.");
 
         List<BibEntry> resultPhrase = fetcher.performSearch("author:\"Redmiles David\"");
         List<BibEntry> result = fetcher.performSearch("author:Redmiles David");
@@ -208,18 +269,25 @@ void supportsPhraseSearch() throws Exception {
     @Disabled("401 as of 2024-08-18")
     void supportsBooleanANDSearch() throws Exception {
         List<BibEntry> resultJustByAuthor = fetcher.performSearch("author:\"Redmiles, David\"");
-        List<BibEntry> result = fetcher.performSearch("author:\"Redmiles, David\" AND journal:\"Computer Supported Cooperative Work\"");
+        List<BibEntry> result =
+                fetcher.performSearch(
+                        "author:\"Redmiles, David\" AND journal:\"Computer Supported Cooperative Work\"");
 
         assertTrue(resultJustByAuthor.containsAll(result));
-        List<BibEntry> allEntriesFromCSCW = result.stream()
-                                                  .filter(bibEntry -> "Computer Supported Cooperative Work (CSCW)"
-                                                                              .equals(bibEntry.getField(StandardField.JOURNAL)
-                                                                                              .orElse("")))
-                                                  .toList();
+        List<BibEntry> allEntriesFromCSCW =
+                result.stream()
+                        .filter(
+                                bibEntry ->
+                                        "Computer Supported Cooperative Work (CSCW)"
+                                                .equals(
+                                                        bibEntry.getField(StandardField.JOURNAL)
+                                                                .orElse("")))
+                        .toList();
         allEntriesFromCSCW.stream()
-                          .map(bibEntry -> bibEntry.getField(StandardField.AUTHOR))
-                          .filter(Optional::isPresent)
-                          .map(Optional::get).forEach(authorField -> assertTrue(authorField.contains("Redmiles")));
+                .map(bibEntry -> bibEntry.getField(StandardField.AUTHOR))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .forEach(authorField -> assertTrue(authorField.contains("Redmiles")));
     }
 
     @Override
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java b/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java
index 116afd1791dd..7a67ee65c0f8 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java
@@ -1,8 +1,9 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
-import java.net.URI;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -11,14 +12,12 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.support.DisabledOnCIServer;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.net.URI;
+import java.util.Optional;
 
 @FetcherTest
 class SpringerLinkTest {
@@ -49,7 +48,10 @@ void doiNotPresent() throws IOException {
     void findByDOI() throws IOException {
         entry.setField(StandardField.DOI, "10.1186/s13677-015-0042-8");
         assertEquals(
-                Optional.of(URI.create("http://link.springer.com/content/pdf/10.1186/s13677-015-0042-8.pdf").toURL()),
+                Optional.of(
+                        URI.create(
+                                        "http://link.springer.com/content/pdf/10.1186/s13677-015-0042-8.pdf")
+                                .toURL()),
                 finder.findFullText(entry));
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
index 5446b6a9151c..811cf29878cc 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -8,13 +9,11 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.util.Optional;
 
 @FetcherTest
 class TitleFetcherTest {
@@ -26,17 +25,24 @@ class TitleFetcherTest {
     void setUp() {
         fetcher = new TitleFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
 
-        bibEntryBischof2009 = new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey("Bischof_2009")
-                .withField(StandardField.AUTHOR, "Bischof, Marc and Kopp, Oliver and van Lessen, Tammo and Leymann, Frank")
-                .withField(StandardField.BOOKTITLE, "2009 35th Euromicro Conference on Software Engineering and Advanced Applications")
-                .withField(StandardField.PUBLISHER, "IEEE")
-                .withField(StandardField.TITLE, "BPELscript: A Simplified Script Syntax for WS-BPEL 2.0")
-                .withField(StandardField.VOLUME, "5331")
-                .withField(StandardField.YEAR, "2009")
-                .withField(StandardField.MONTH, "#aug#")
-                .withField(StandardField.PAGES, "39--46")
-                .withField(StandardField.DOI, "10.1109/seaa.2009.21");
+        bibEntryBischof2009 =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey("Bischof_2009")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Bischof, Marc and Kopp, Oliver and van Lessen, Tammo and Leymann, Frank")
+                        .withField(
+                                StandardField.BOOKTITLE,
+                                "2009 35th Euromicro Conference on Software Engineering and Advanced Applications")
+                        .withField(StandardField.PUBLISHER, "IEEE")
+                        .withField(
+                                StandardField.TITLE,
+                                "BPELscript: A Simplified Script Syntax for WS-BPEL 2.0")
+                        .withField(StandardField.VOLUME, "5331")
+                        .withField(StandardField.YEAR, "2009")
+                        .withField(StandardField.MONTH, "#aug#")
+                        .withField(StandardField.PAGES, "39--46")
+                        .withField(StandardField.DOI, "10.1109/seaa.2009.21");
     }
 
     @Test
@@ -46,7 +52,8 @@ void getName() {
 
     @Test
     void performSearchKopp2007() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("BPELscript: A simplified script syntax for WS-BPEL 2.0");
+        Optional<BibEntry> fetchedEntry =
+                fetcher.performSearchById("BPELscript: A simplified script syntax for WS-BPEL 2.0");
         assertEquals(Optional.of(bibEntryBischof2009), fetchedEntry);
     }
 
@@ -58,7 +65,8 @@ void performSearchEmptyTitle() throws FetcherException {
 
     @Test
     void performSearchInvalidTitle() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("An unknown title where noi DOI can be determined");
+        Optional<BibEntry> fetchedEntry =
+                fetcher.performSearchById("An unknown title where noi DOI can be determined");
         assertEquals(Optional.empty(), fetchedEntry);
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java
index 9128ed477e84..eceb4461feef 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java
@@ -1,8 +1,8 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
@@ -10,14 +10,13 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 class ZbMATHTest {
@@ -26,7 +25,8 @@ class ZbMATHTest {
 
     @BeforeEach
     void setUp() throws Exception {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
         fetcher = new ZbMATH(importFormatPreferences);
@@ -41,7 +41,8 @@ void setUp() throws Exception {
         donaldsonEntry.setField(StandardField.LANGUAGE, "English");
         donaldsonEntry.setField(StandardField.KEYWORDS, "57N13,57R10,53C05,58J99,57R65");
         donaldsonEntry.setField(StandardField.PAGES, "279--315");
-        donaldsonEntry.setField(StandardField.TITLE, "An application of gauge theory to four dimensional topology");
+        donaldsonEntry.setField(
+                StandardField.TITLE, "An application of gauge theory to four dimensional topology");
         donaldsonEntry.setField(StandardField.VOLUME, "18");
         donaldsonEntry.setField(StandardField.YEAR, "1983");
         donaldsonEntry.setField(StandardField.ZBL_NUMBER, "0507.57010");
@@ -63,7 +64,8 @@ void searchByIdFindsEntry() throws Exception {
     @Test
     void searchByEntryFindsEntry() throws Exception {
         BibEntry searchEntry = new BibEntry();
-        searchEntry.setField(StandardField.TITLE, "An application of gauge theory to four dimensional topology");
+        searchEntry.setField(
+                StandardField.TITLE, "An application of gauge theory to four dimensional topology");
         searchEntry.setField(StandardField.AUTHOR, "S. K. {Donaldson}");
 
         List<BibEntry> fetchedEntries = fetcher.performSearch(searchEntry);
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/DoiToBibtexConverterComIsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/DoiToBibtexConverterComIsbnFetcherTest.java
index 0034c3360c34..fbf8c6189fcb 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/DoiToBibtexConverterComIsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/DoiToBibtexConverterComIsbnFetcherTest.java
@@ -1,6 +1,8 @@
 package org.jabref.logic.importer.fetcher.isbntobibtex;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherException;
@@ -10,15 +12,12 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
+import java.util.Optional;
 
 @Disabled("Page https://doi-to-bibtex-converter.herokuapp.com is down")
 @FetcherTest
@@ -26,15 +25,20 @@ class DoiToBibtexConverterComIsbnFetcherTest extends AbstractIsbnFetcherTest {
 
     @BeforeEach
     void setUp() {
-        bibEntryEffectiveJava = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective Java(TM) Programming Language Guide (2nd Edition) (The Java Series)")
-                .withField(StandardField.PUBLISHER, "Prentice Hall PTR")
-                .withField(StandardField.YEAR, "2007")
-                .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                .withField(StandardField.ISBN, "9780321356680")
-                .withField(StandardField.PAGES, "256");
+        bibEntryEffectiveJava =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(
+                                StandardField.TITLE,
+                                "Effective Java(TM) Programming Language Guide (2nd Edition) (The Java Series)")
+                        .withField(StandardField.PUBLISHER, "Prentice Hall PTR")
+                        .withField(StandardField.YEAR, "2007")
+                        .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                        .withField(StandardField.ISBN, "9780321356680")
+                        .withField(StandardField.PAGES, "256");
 
-        fetcher = new DoiToBibtexConverterComIsbnFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        fetcher =
+                new DoiToBibtexConverterComIsbnFetcher(
+                        mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
     }
 
     @Test
@@ -60,26 +64,29 @@ public void searchByIdSuccessfulWithLongISBN() {
     @Test
     @Override
     public void authorsAreCorrectlyFormatted() throws Exception {
-        BibEntry bibEntry = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Repository")
-                .withField(StandardField.ISBN, "9783110702125")
-                .withField(StandardField.AUTHOR, "Hans-Joachim Habermann and Frank Leymann")
-                .withField(StandardField.PAGES, "294")
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.DAY, "12")
-                .withField(StandardField.MONTH, "10");
+        BibEntry bibEntry =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "Repository")
+                        .withField(StandardField.ISBN, "9783110702125")
+                        .withField(StandardField.AUTHOR, "Hans-Joachim Habermann and Frank Leymann")
+                        .withField(StandardField.PAGES, "294")
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.DAY, "12")
+                        .withField(StandardField.MONTH, "10");
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9783110702125");
         assertEquals(Optional.of(bibEntry), fetchedEntry);
     }
 
     @Test
     void isbnNeitherAvailable() {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("9785646216541"));
+        assertThrows(
+                FetcherClientException.class, () -> fetcher.performSearchById("9785646216541"));
     }
 
     @Test
     void searchByIdFailedWithLongISBN() {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("9780321356680"));
+        assertThrows(
+                FetcherClientException.class, () -> fetcher.performSearchById("9780321356680"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/EbookDeIsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/EbookDeIsbnFetcherTest.java
index 985602bcdecc..b9bdc46963b8 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/EbookDeIsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/EbookDeIsbnFetcherTest.java
@@ -1,6 +1,8 @@
 package org.jabref.logic.importer.fetcher.isbntobibtex;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherException;
@@ -11,15 +13,12 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
+import java.util.Optional;
 
 @Disabled
 @FetcherTest
@@ -27,18 +26,23 @@ class EbookDeIsbnFetcherTest extends AbstractIsbnFetcherTest {
 
     @BeforeEach
     void setUp() {
-        bibEntryEffectiveJava = new BibEntry(StandardEntryType.Book)
-                .withCitationKey("9780134685991")
-                .withField(StandardField.TITLE, "Effective Java")
-                .withField(StandardField.PUBLISHER, "Addison Wesley")
-                .withField(StandardField.YEAR, "2018")
-                .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                .withField(StandardField.DATE, "2018-01-15")
-                .withField(new UnknownField("ean"), "9780134685991")
-                .withField(StandardField.ISBN, "0134685997")
-                .withField(StandardField.URL, "https://www.ebook.de/de/product/28983211/joshua_bloch_effective_java.html");
+        bibEntryEffectiveJava =
+                new BibEntry(StandardEntryType.Book)
+                        .withCitationKey("9780134685991")
+                        .withField(StandardField.TITLE, "Effective Java")
+                        .withField(StandardField.PUBLISHER, "Addison Wesley")
+                        .withField(StandardField.YEAR, "2018")
+                        .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                        .withField(StandardField.DATE, "2018-01-15")
+                        .withField(new UnknownField("ean"), "9780134685991")
+                        .withField(StandardField.ISBN, "0134685997")
+                        .withField(
+                                StandardField.URL,
+                                "https://www.ebook.de/de/product/28983211/joshua_bloch_effective_java.html");
 
-        fetcher = new EbookDeIsbnFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        fetcher =
+                new EbookDeIsbnFetcher(
+                        mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
     }
 
     @Test
@@ -64,17 +68,23 @@ public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
     @Test
     @Override
     public void authorsAreCorrectlyFormatted() throws Exception {
-        BibEntry bibEntry = new BibEntry(StandardEntryType.Book)
-                .withCitationKey("9783662585856")
-                .withField(StandardField.TITLE, "Fundamentals of Business Process Management")
-                .withField(StandardField.PUBLISHER, "Springer Berlin Heidelberg")
-                .withField(StandardField.YEAR, "2019")
-                .withField(StandardField.AUTHOR, "Dumas, Marlon and Rosa, Marcello La and Mendling, Jan and Reijers, Hajo A.")
-                .withField(StandardField.DATE, "2019-02-01")
-                .withField(StandardField.PAGETOTAL, "560")
-                .withField(new UnknownField("ean"), "9783662585856")
-                .withField(StandardField.ISBN, "3662585855")
-                .withField(StandardField.URL, "https://www.ebook.de/de/product/35805105/marlon_dumas_marcello_la_rosa_jan_mendling_hajo_a_reijers_fundamentals_of_business_process_management.html");
+        BibEntry bibEntry =
+                new BibEntry(StandardEntryType.Book)
+                        .withCitationKey("9783662585856")
+                        .withField(
+                                StandardField.TITLE, "Fundamentals of Business Process Management")
+                        .withField(StandardField.PUBLISHER, "Springer Berlin Heidelberg")
+                        .withField(StandardField.YEAR, "2019")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Dumas, Marlon and Rosa, Marcello La and Mendling, Jan and Reijers, Hajo A.")
+                        .withField(StandardField.DATE, "2019-02-01")
+                        .withField(StandardField.PAGETOTAL, "560")
+                        .withField(new UnknownField("ean"), "9783662585856")
+                        .withField(StandardField.ISBN, "3662585855")
+                        .withField(
+                                StandardField.URL,
+                                "https://www.ebook.de/de/product/35805105/marlon_dumas_marcello_la_rosa_jan_mendling_hajo_a_reijers_fundamentals_of_business_process_management.html");
 
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3662585855");
         assertEquals(Optional.of(bibEntry), fetchedEntry);
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/GVKIsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/GVKIsbnFetcherTest.java
index 9319ec74651f..0f86336d5786 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/GVKIsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/GVKIsbnFetcherTest.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.importer.fetcher.isbntobibtex;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -10,13 +11,11 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.util.Optional;
 
 class GVKIsbnFetcherTest extends AbstractIsbnFetcherTest {
 
@@ -24,27 +23,33 @@ class GVKIsbnFetcherTest extends AbstractIsbnFetcherTest {
 
     @BeforeEach
     void setUp() {
-        bibEntryEffectiveJava = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective Java(TM) Programming Language Guide (2nd Edition) (The Java Series)")
-                .withField(StandardField.PUBLISHER, "Prentice Hall PTR")
-                .withField(StandardField.YEAR, "2007")
-                .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                .withField(StandardField.ISBN, "9780321356680")
-                .withField(StandardField.PAGES, "256");
-
-        bibEntryEffectiveJavaLongISBN = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective Java")
-                .withField(StandardField.PUBLISHER, "Addison-Wesley")
-                .withField(StandardField.YEAR, "2011")
-                .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                .withField(StandardField.SERIES, "The @Java series")
-                .withField(StandardField.ADDRESS, "Upper Saddle River, NJ [u.a.]")
-                .withField(StandardField.EDITION, "2. ed., rev. and updated for Java SE 6")
-                .withField(StandardField.NOTE, "*Hier auch später erschienene, unveränderte Nachdrucke*")
-                .withField(StandardField.ISBN, "9780321356680")
-                .withField(StandardField.PAGETOTAL, "346")
-                .withField(new UnknownField("ppn_gvk"), "67954951X")
-                .withField(StandardField.SUBTITLE, "[revised and updated for Java SE 6]");
+        bibEntryEffectiveJava =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(
+                                StandardField.TITLE,
+                                "Effective Java(TM) Programming Language Guide (2nd Edition) (The Java Series)")
+                        .withField(StandardField.PUBLISHER, "Prentice Hall PTR")
+                        .withField(StandardField.YEAR, "2007")
+                        .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                        .withField(StandardField.ISBN, "9780321356680")
+                        .withField(StandardField.PAGES, "256");
+
+        bibEntryEffectiveJavaLongISBN =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "Effective Java")
+                        .withField(StandardField.PUBLISHER, "Addison-Wesley")
+                        .withField(StandardField.YEAR, "2011")
+                        .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                        .withField(StandardField.SERIES, "The @Java series")
+                        .withField(StandardField.ADDRESS, "Upper Saddle River, NJ [u.a.]")
+                        .withField(StandardField.EDITION, "2. ed., rev. and updated for Java SE 6")
+                        .withField(
+                                StandardField.NOTE,
+                                "*Hier auch später erschienene, unveränderte Nachdrucke*")
+                        .withField(StandardField.ISBN, "9780321356680")
+                        .withField(StandardField.PAGETOTAL, "346")
+                        .withField(new UnknownField("ppn_gvk"), "67954951X")
+                        .withField(StandardField.SUBTITLE, "[revised and updated for Java SE 6]");
 
         fetcher = new GvkFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
     }
@@ -72,20 +77,21 @@ public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
     @Test
     @Override
     public void authorsAreCorrectlyFormatted() throws Exception {
-        BibEntry bibEntry = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Repository")
-                .withField(StandardField.SUBTITLE, "Eine Einführung")
-                .withField(StandardField.PUBLISHER, "De Gruyter Oldenbourg")
-                .withField(StandardField.AUTHOR, "Habermann, Hans-Joachim")
-                .withField(StandardField.ISBN, "9783110702125")
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.ADDRESS, "München")
-                .withField(StandardField.EDITION, "Reprint 2020")
-                .withField(StandardField.EDITOR, "Frank Leymann")
-                .withField(StandardField.NUMBER, "8.1")
-                .withField(StandardField.PAGETOTAL, "1294")
-                .withField(StandardField.SERIES, "Handbuch der Informatik")
-                .withField(new UnknownField("ppn_gvk"), "1738076555");
+        BibEntry bibEntry =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "Repository")
+                        .withField(StandardField.SUBTITLE, "Eine Einführung")
+                        .withField(StandardField.PUBLISHER, "De Gruyter Oldenbourg")
+                        .withField(StandardField.AUTHOR, "Habermann, Hans-Joachim")
+                        .withField(StandardField.ISBN, "9783110702125")
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.ADDRESS, "München")
+                        .withField(StandardField.EDITION, "Reprint 2020")
+                        .withField(StandardField.EDITOR, "Frank Leymann")
+                        .withField(StandardField.NUMBER, "8.1")
+                        .withField(StandardField.PAGETOTAL, "1294")
+                        .withField(StandardField.SERIES, "Handbuch der Informatik")
+                        .withField(new UnknownField("ppn_gvk"), "1738076555");
 
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9783110702125");
         assertEquals(Optional.of(bibEntry), fetchedEntry);
@@ -98,11 +104,13 @@ public void authorsAreCorrectlyFormatted() throws Exception {
     void isbnNeitherAvailableOnEbookDeNorOrViaOpenLibrary() throws Exception {
         // In this test, the ISBN needs to be a valid (syntax+checksum) ISBN number
         // However, the ISBN number must not be assigned to a real book
-       assertEquals(Optional.empty(), fetcher.performSearchById("9785646216541"));
+        assertEquals(Optional.empty(), fetcher.performSearchById("9785646216541"));
     }
 
     @Test
     void eResourceIsbnIsReturnedAsBoook() throws Exception {
-        assertEquals(Optional.of(StandardEntryType.Book), fetcher.performSearchById("978-0-8229-4557-4").map(BibEntry::getType));
+        assertEquals(
+                Optional.of(StandardEntryType.Book),
+                fetcher.performSearchById("978-0-8229-4557-4").map(BibEntry::getType));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcherTest.java
index df4df8c82536..794d0809be29 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcherTest.java
@@ -1,8 +1,9 @@
 package org.jabref.logic.importer.fetcher.isbntobibtex;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -11,15 +12,13 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 class IsbnFetcherTest {
@@ -31,17 +30,20 @@ class IsbnFetcherTest {
     void setUp() {
         fetcher = new IsbnFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
 
-        bibEntry = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                .withField(StandardField.TITLE, "Effective Java")
-                .withField(StandardField.PUBLISHER, "Addison-Wesley")
-                .withField(StandardField.YEAR, "2018")
-                .withField(StandardField.ISBN, "9780134685991")
-                .withField(StandardField.NOTE, "Titelzusätze auf dem Umschlag: \"Updated for Java 9. Best practices for ... the Java platform\"")
-                .withField(StandardField.PAGETOTAL, "392")
-                .withField(new UnknownField("ppn_gvk"), "100121840X")
-                .withField(StandardField.EDITION, "Third edition")
-                .withField(StandardField.ADDRESS, "Boston");
+        bibEntry =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                        .withField(StandardField.TITLE, "Effective Java")
+                        .withField(StandardField.PUBLISHER, "Addison-Wesley")
+                        .withField(StandardField.YEAR, "2018")
+                        .withField(StandardField.ISBN, "9780134685991")
+                        .withField(
+                                StandardField.NOTE,
+                                "Titelzusätze auf dem Umschlag: \"Updated for Java 9. Best practices for ... the Java platform\"")
+                        .withField(StandardField.PAGETOTAL, "392")
+                        .withField(new UnknownField("ppn_gvk"), "100121840X")
+                        .withField(StandardField.EDITION, "Third edition")
+                        .withField(StandardField.ADDRESS, "Boston");
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/OpenLibraryIsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/OpenLibraryIsbnFetcherTest.java
index f88b2ad91db5..69a497e69c65 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/OpenLibraryIsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/OpenLibraryIsbnFetcherTest.java
@@ -1,6 +1,8 @@
 package org.jabref.logic.importer.fetcher.isbntobibtex;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherException;
@@ -9,28 +11,30 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
+import java.util.Optional;
 
 class OpenLibraryIsbnFetcherTest extends AbstractIsbnFetcherTest {
 
     @BeforeEach
     void setUp() {
-        bibEntryEffectiveJava = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective Java(TM) Programming Language Guide (2nd Edition) (The Java Series)")
-                .withField(StandardField.PUBLISHER, "Prentice Hall PTR")
-                .withField(StandardField.YEAR, "2007")
-                .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                .withField(StandardField.ISBN, "9780321356680")
-                .withField(StandardField.PAGES, "256");
+        bibEntryEffectiveJava =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(
+                                StandardField.TITLE,
+                                "Effective Java(TM) Programming Language Guide (2nd Edition) (The Java Series)")
+                        .withField(StandardField.PUBLISHER, "Prentice Hall PTR")
+                        .withField(StandardField.YEAR, "2007")
+                        .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                        .withField(StandardField.ISBN, "9780321356680")
+                        .withField(StandardField.PAGES, "256");
 
-        fetcher = new OpenLibraryIsbnFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        fetcher =
+                new OpenLibraryIsbnFetcher(
+                        mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
     }
 
     @Test
@@ -56,13 +60,15 @@ public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
     @Test
     @Override
     public void authorsAreCorrectlyFormatted() throws Exception {
-        BibEntry bibEntry = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Repository Eine Einführung")
-                .withField(StandardField.SUBTITLE, "Eine Einführung")
-                .withField(StandardField.PUBLISHER, "de Gruyter GmbH, Walter")
-                .withField(StandardField.AUTHOR, "Habermann, Hans-Joachim and Leymann, Frank")
-                .withField(StandardField.ISBN, "9783110702125")
-                .withField(StandardField.YEAR, "2020");
+        BibEntry bibEntry =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "Repository Eine Einführung")
+                        .withField(StandardField.SUBTITLE, "Eine Einführung")
+                        .withField(StandardField.PUBLISHER, "de Gruyter GmbH, Walter")
+                        .withField(
+                                StandardField.AUTHOR, "Habermann, Hans-Joachim and Leymann, Frank")
+                        .withField(StandardField.ISBN, "9783110702125")
+                        .withField(StandardField.YEAR, "2020");
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9783110702125");
         assertEquals(Optional.of(bibEntry), fetchedEntry);
     }
@@ -74,6 +80,7 @@ public void authorsAreCorrectlyFormatted() throws Exception {
     void isbnNeitherAvailableOnEbookDeNorOrViaOpenLibrary() throws Exception {
         // In this test, the ISBN needs to be a valid (syntax+checksum) ISBN number
         // However, the ISBN number must not be assigned to a real book
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("9785646216541"));
+        assertThrows(
+                FetcherClientException.class, () -> fetcher.performSearchById("9785646216541"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformerTest.java
index 26c5f2839726..9122e7f1dd97 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformerTest.java
@@ -1,14 +1,15 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
-class ArXivQueryTransformerTest extends YearRangeByFilteringQueryTransformerTest<ArXivQueryTransformer> {
+class ArXivQueryTransformerTest
+        extends YearRangeByFilteringQueryTransformerTest<ArXivQueryTransformer> {
 
     @Override
     public ArXivQueryTransformer getTransformer() {
@@ -40,7 +41,9 @@ public String getTitlePrefix() {
     public void convertYearField() throws Exception {
         ArXivQueryTransformer transformer = getTransformer();
         String queryString = "year:2018";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> query = transformer.transformLuceneQuery(luceneQuery);
         assertEquals(Optional.of("2018"), query);
         assertEquals(Optional.of(2018), transformer.getStartYear());
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/CiteSeerQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/CiteSeerQueryTransformerTest.java
index dacf6d25f9de..02bcf735365f 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/CiteSeerQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/CiteSeerQueryTransformerTest.java
@@ -1,24 +1,24 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import org.jabref.logic.importer.FetcherException;
-import org.jabref.model.strings.StringUtil;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import kong.unirest.core.json.JSONObject;
+
 import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.model.strings.StringUtil;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 class CiteSeerQueryTransformerTest extends InfixTransformerTest<CiteSeerQueryTransformer> {
 
@@ -31,7 +31,9 @@ protected CiteSeerQueryTransformer getTransformer() {
     @Test
     public void convertYearField() throws Exception {
         String queryString = "year:2023";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         CiteSeerQueryTransformer transformer = getTransformer();
         transformer.transformLuceneQuery(luceneQuery);
 
@@ -45,7 +47,9 @@ public void convertYearField() throws Exception {
     @Test
     public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2019-2023";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         CiteSeerQueryTransformer transformer = getTransformer();
         transformer.transformLuceneQuery(luceneQuery);
 
@@ -58,7 +62,9 @@ public void convertYearRangeField() throws Exception {
     @Test
     void convertPageField() throws Exception {
         String queryString = "page:2";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         CiteSeerQueryTransformer transformer = getTransformer();
         transformer.transformLuceneQuery(luceneQuery);
 
@@ -69,7 +75,9 @@ void convertPageField() throws Exception {
     @Test
     void convertPageSizeField() throws Exception {
         String queryString = "pageSize:20";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         CiteSeerQueryTransformer transformer = getTransformer();
         transformer.transformLuceneQuery(luceneQuery);
 
@@ -80,18 +88,23 @@ void convertPageSizeField() throws Exception {
     @Test
     void convertSortByField() throws Exception {
         String queryString = "sortBy:relevance";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         CiteSeerQueryTransformer transformer = getTransformer();
         transformer.transformLuceneQuery(luceneQuery);
 
-        Optional<String> sortBy = Optional.of(transformer.getJSONPayload().get("sortBy").toString());
+        Optional<String> sortBy =
+                Optional.of(transformer.getJSONPayload().get("sortBy").toString());
         assertEquals(Optional.of("relevance"), sortBy);
     }
 
     @Test
     void convertMultipleAuthors() throws Exception {
         String queryString = "author:\"Wang Wei\" author:\"Zhang Pingwen\" author:\"Zhang Zhifei\"";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         CiteSeerQueryTransformer transformer = getTransformer();
         transformer.transformLuceneQuery(luceneQuery);
 
@@ -101,11 +114,13 @@ void convertMultipleAuthors() throws Exception {
     }
 
     private static Stream<Arguments> getJSONWithYearVariations() throws FetcherException {
-        String baseString = "title:Ericksen-Leslie page:1 pageSize:20 must_have_pdf:false sortBy:relevance";
-        List<String> withYearAndYearRange = List.of(
-                StringUtil.join(new String[]{baseString, "year:2020"}, " ", 0, 2),
-                StringUtil.join(new String[]{baseString, "year-range:2019-2023"}, " ", 0, 2)
-        );
+        String baseString =
+                "title:Ericksen-Leslie page:1 pageSize:20 must_have_pdf:false sortBy:relevance";
+        List<String> withYearAndYearRange =
+                List.of(
+                        StringUtil.join(new String[] {baseString, "year:2020"}, " ", 0, 2),
+                        StringUtil.join(
+                                new String[] {baseString, "year-range:2019-2023"}, " ", 0, 2));
 
         JSONObject expectedJson = new JSONObject();
         expectedJson.put("queryString", "Ericksen-Leslie");
@@ -115,28 +130,34 @@ private static Stream<Arguments> getJSONWithYearVariations() throws FetcherExcep
         expectedJson.put("sortBy", "relevance");
 
         List<JSONObject> actualJSONObjects = new ArrayList<>();
-        withYearAndYearRange.forEach(requestStr -> {
-            QueryNode luceneQuery = null;
-            try {
-                luceneQuery = new StandardSyntaxParser().parse(requestStr, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-            } catch (QueryNodeParseException e) {
-                throw new RuntimeException(e);
-            }
-            CiteSeerQueryTransformer transformer = new CiteSeerQueryTransformer();
-            transformer.transformLuceneQuery(luceneQuery);
-            actualJSONObjects.add(transformer.getJSONPayload());
-        });
+        withYearAndYearRange.forEach(
+                requestStr -> {
+                    QueryNode luceneQuery = null;
+                    try {
+                        luceneQuery =
+                                new StandardSyntaxParser()
+                                        .parse(
+                                                requestStr,
+                                                AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+                    } catch (QueryNodeParseException e) {
+                        throw new RuntimeException(e);
+                    }
+                    CiteSeerQueryTransformer transformer = new CiteSeerQueryTransformer();
+                    transformer.transformLuceneQuery(luceneQuery);
+                    actualJSONObjects.add(transformer.getJSONPayload());
+                });
 
         Iterator<JSONObject> jsonObjectIterator = actualJSONObjects.iterator();
         return Stream.of(
                 Arguments.of(expectedJson, 2020, 2020, jsonObjectIterator.next()),
-                Arguments.of(expectedJson, 2019, 2023, jsonObjectIterator.next())
-        );
+                Arguments.of(expectedJson, 2019, 2023, jsonObjectIterator.next()));
     }
 
     @ParameterizedTest
     @MethodSource("getJSONWithYearVariations")
-    void compareJSONRequestsWithYearVariations(JSONObject expected, Integer yearStart, Integer yearEnd, JSONObject actual) throws Exception {
+    void compareJSONRequestsWithYearVariations(
+            JSONObject expected, Integer yearStart, Integer yearEnd, JSONObject actual)
+            throws Exception {
         expected.put("yearStart", yearStart);
         expected.put("yearEnd", yearEnd);
         assertEquals(expected, actual);
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/CollectionOfComputerScienceBibliographiesQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/CollectionOfComputerScienceBibliographiesQueryTransformerTest.java
index 93f421bdc54c..95153581f1d5 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/CollectionOfComputerScienceBibliographiesQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/CollectionOfComputerScienceBibliographiesQueryTransformerTest.java
@@ -1,14 +1,15 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
-class CollectionOfComputerScienceBibliographiesQueryTransformerTest extends InfixTransformerTest<CollectionOfComputerScienceBibliographiesQueryTransformer> {
+class CollectionOfComputerScienceBibliographiesQueryTransformerTest
+        extends InfixTransformerTest<CollectionOfComputerScienceBibliographiesQueryTransformer> {
 
     @Override
     public CollectionOfComputerScienceBibliographiesQueryTransformer getTransformer() {
@@ -39,7 +40,9 @@ public String getTitlePrefix() {
     @Test
     public void convertYearField() throws Exception {
         String queryString = "year:2018";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> query = getTransformer().transformLuceneQuery(luceneQuery);
         assertEquals(Optional.of("year:2018"), query);
     }
@@ -48,7 +51,9 @@ public void convertYearField() throws Exception {
     @Test
     public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2018-2021";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> query = getTransformer().transformLuceneQuery(luceneQuery);
         assertEquals(Optional.of("year:2018 OR year:2019 OR year:2020 OR year:2021"), query);
     }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/DBLPQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/DBLPQueryTransformerTest.java
index 8851f075daf4..b3073ad141f4 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/DBLPQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/DBLPQueryTransformerTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 class DBLPQueryTransformerTest extends InfixTransformerTest<DBLPQueryTransformer> {
 
@@ -39,7 +39,9 @@ public String getTitlePrefix() {
     @Test
     public void convertYearField() throws Exception {
         String queryString = "year:2015";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         DBLPQueryTransformer transformer = getTransformer();
         Optional<String> searchQuery = transformer.transformLuceneQuery(luceneQuery);
         assertEquals(Optional.empty(), searchQuery);
@@ -51,7 +53,9 @@ public void convertYearField() throws Exception {
     @Test
     public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2012-2015";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         DBLPQueryTransformer transformer = getTransformer();
         Optional<String> searchQuery = transformer.transformLuceneQuery(luceneQuery);
         assertEquals(Optional.empty(), searchQuery);
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/DefaultQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/DefaultQueryTransformerTest.java
index 70b4e4a5bfba..6eac400f7160 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/DefaultQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/DefaultQueryTransformerTest.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-class DefaultQueryTransformerTest extends YearAndYearRangeByFilteringQueryTransformerTest<DefaultQueryTransformer> {
+class DefaultQueryTransformerTest
+        extends YearAndYearRangeByFilteringQueryTransformerTest<DefaultQueryTransformer> {
 
     @Override
     protected DefaultQueryTransformer getTransformer() {
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/GVKQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/GVKQueryTransformerTest.java
index 4ffdc6844667..c1ee5949e0e4 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/GVKQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/GVKQueryTransformerTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 class GVKQueryTransformerTest extends InfixTransformerTest<GVKQueryTransformer> {
 
@@ -40,7 +40,9 @@ public String getTitlePrefix() {
     @Test
     public void convertYearField() throws Exception {
         String queryString = "year:2018";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> query = getTransformer().transformLuceneQuery(luceneQuery);
 
         Optional<String> expected = Optional.of("pica.erj=2018");
@@ -50,6 +52,5 @@ public void convertYearField() throws Exception {
     @Disabled("Not supported by GVK")
     @Override
     @Test
-    public void convertYearRangeField() throws Exception {
-    }
+    public void convertYearRangeField() throws Exception {}
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/IEEEQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/IEEEQueryTransformerTest.java
index 3044c5cf7840..280ab395bc5a 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/IEEEQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/IEEEQueryTransformerTest.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
@@ -10,7 +9,8 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 class IEEEQueryTransformerTest extends InfixTransformerTest<IEEEQueryTransformer> {
 
@@ -45,7 +45,9 @@ public void convertJournalFieldPrefix() throws Exception {
         IEEEQueryTransformer transformer = getTransformer();
 
         String queryString = "journal:Nature";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         transformer.transformLuceneQuery(luceneQuery);
 
         assertEquals(Optional.of("Nature"), transformer.getJournal());
@@ -60,7 +62,9 @@ public void convertYearField() throws Exception {
         IEEEQueryTransformer transformer = getTransformer();
 
         String queryString = "year:2021";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         transformer.transformLuceneQuery(luceneQuery);
 
         assertEquals(Optional.of(2021), transformer.getStartYear());
@@ -73,7 +77,9 @@ public void convertYearRangeField() throws Exception {
         IEEEQueryTransformer transformer = getTransformer();
 
         String queryString = "year-range:2018-2021";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         transformer.transformLuceneQuery(luceneQuery);
 
         assertEquals(Optional.of(2018), transformer.getStartYear());
@@ -82,16 +88,21 @@ public void convertYearRangeField() throws Exception {
 
     private static Stream<Arguments> getTitleTestData() {
         return Stream.of(
-                Arguments.of("Overcoming AND Open AND Source AND Project AND Entry AND Barriers AND Portal AND Newcomers", "Overcoming Open Source Project Entry Barriers with a Portal for Newcomers"),
-                Arguments.of("Overcoming AND Open AND Source AND Project AND Entry AND Barriers", "Overcoming Open Source Project Entry Barriers"),
-                Arguments.of(null, "and")
-        );
+                Arguments.of(
+                        "Overcoming AND Open AND Source AND Project AND Entry AND Barriers AND Portal AND Newcomers",
+                        "Overcoming Open Source Project Entry Barriers with a Portal for Newcomers"),
+                Arguments.of(
+                        "Overcoming AND Open AND Source AND Project AND Entry AND Barriers",
+                        "Overcoming Open Source Project Entry Barriers"),
+                Arguments.of(null, "and"));
     }
 
     @ParameterizedTest
     @MethodSource("getTitleTestData")
     void stopWordRemoval(String expected, String queryString) throws Exception {
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> result = getTransformer().transformLuceneQuery(luceneQuery);
         assertEquals(Optional.ofNullable(expected), result);
     }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/InfixTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/InfixTransformerTest.java
index c27584fa1b87..56e73ab750ae 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/InfixTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/InfixTransformerTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 /**
  * Test Interface for all transformers that use infix notation for their logical binary operators
@@ -38,7 +38,9 @@ protected String getTitlePrefix() {
     @Test
     public void convertAuthorFieldPrefix() throws Exception {
         String queryString = "author:\"Igor Steinmacher\"";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of(getAuthorPrefix() + "\"Igor Steinmacher\"");
         assertEquals(expected, searchQuery);
@@ -47,7 +49,9 @@ public void convertAuthorFieldPrefix() throws Exception {
     @Test
     public void convertUnFieldedTermPrefix() throws Exception {
         String queryString = "\"default value\"";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of(getUnFieldedPrefix() + queryString);
         assertEquals(expected, searchQuery);
@@ -56,7 +60,9 @@ public void convertUnFieldedTermPrefix() throws Exception {
     @Test
     public void convertExplicitUnFieldedTermPrefix() throws Exception {
         String queryString = "default:\"default value\"";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of(getUnFieldedPrefix() + "\"default value\"");
         assertEquals(expected, searchQuery);
@@ -65,7 +71,9 @@ public void convertExplicitUnFieldedTermPrefix() throws Exception {
     @Test
     public void convertJournalFieldPrefix() throws Exception {
         String queryString = "journal:Nature";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of(getJournalPrefix() + "Nature");
         assertEquals(expected, searchQuery);
@@ -80,27 +88,62 @@ public void convertJournalFieldPrefix() throws Exception {
     @Test
     public void convertMultipleValuesWithTheSameFieldPrefix() throws Exception {
         String queryString = "author:\"Igor Steinmacher\" author:\"Christoph Treude\"";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(getAuthorPrefix() + "\"Igor Steinmacher\"" + getTransformer().getLogicalAndOperator() + getAuthorPrefix() + "\"Christoph Treude\"");
+        Optional<String> expected =
+                Optional.of(
+                        getAuthorPrefix()
+                                + "\"Igor Steinmacher\""
+                                + getTransformer().getLogicalAndOperator()
+                                + getAuthorPrefix()
+                                + "\"Christoph Treude\"");
         assertEquals(expected, searchQuery);
     }
 
     @Test
     public void groupedOperationsPrefix() throws Exception {
-        String queryString = "(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\" AND author:\"Christoph Freunde\") AND title:test";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        String queryString =
+                "(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\" AND author:\"Christoph Freunde\") AND title:test";
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of("(" + getAuthorPrefix() + "\"Igor Steinmacher\"" + getTransformer().getLogicalOrOperator() + "(" + getAuthorPrefix() + "\"Christoph Treude\"" + getTransformer().getLogicalAndOperator() + getAuthorPrefix() + "\"Christoph Freunde\"))" + getTransformer().getLogicalAndOperator() + getTitlePrefix() + "test");
+        Optional<String> expected =
+                Optional.of(
+                        "("
+                                + getAuthorPrefix()
+                                + "\"Igor Steinmacher\""
+                                + getTransformer().getLogicalOrOperator()
+                                + "("
+                                + getAuthorPrefix()
+                                + "\"Christoph Treude\""
+                                + getTransformer().getLogicalAndOperator()
+                                + getAuthorPrefix()
+                                + "\"Christoph Freunde\"))"
+                                + getTransformer().getLogicalAndOperator()
+                                + getTitlePrefix()
+                                + "test");
         assertEquals(expected, searchQuery);
     }
 
     @Test
     public void notOperatorPrefix() throws Exception {
         String queryString = "!(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\")";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(getTransformer().getLogicalNotOperator() + "(" + getAuthorPrefix() + "\"Igor Steinmacher\"" + getTransformer().getLogicalOrOperator() + getAuthorPrefix() + "\"Christoph Treude\")");
+        Optional<String> expected =
+                Optional.of(
+                        getTransformer().getLogicalNotOperator()
+                                + "("
+                                + getAuthorPrefix()
+                                + "\"Igor Steinmacher\""
+                                + getTransformer().getLogicalOrOperator()
+                                + getAuthorPrefix()
+                                + "\"Christoph Treude\")");
         assertEquals(expected, searchQuery);
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/JstorQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/JstorQueryTransformerTest.java
index 8baeb76555ce..c837f9bcd0d5 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/JstorQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/JstorQueryTransformerTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 class JstorQueryTransformerTest extends InfixTransformerTest<JstorQueryTransformer> {
 
@@ -39,7 +39,9 @@ public String getTitlePrefix() {
     @Test
     public void convertYearField() throws Exception {
         String queryString = "year:2018";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> query = getTransformer().transformLuceneQuery(luceneQuery);
         assertEquals(Optional.of("sd:2018 AND ed:2018"), query);
     }
@@ -48,7 +50,9 @@ public void convertYearField() throws Exception {
     @Test
     public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2018-2021";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> query = getTransformer().transformLuceneQuery(luceneQuery);
         assertEquals(Optional.of("sd:2018 AND ed:2021"), query);
     }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/ScholarQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/ScholarQueryTransformerTest.java
index 069c356290c0..ff1bc85be27b 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/ScholarQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/ScholarQueryTransformerTest.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-class ScholarQueryTransformerTest extends YearAndYearRangeByFilteringQueryTransformerTest<ScholarQueryTransformer> {
+class ScholarQueryTransformerTest
+        extends YearAndYearRangeByFilteringQueryTransformerTest<ScholarQueryTransformer> {
 
     @Override
     public ScholarQueryTransformer getTransformer() {
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/SpringerQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/SpringerQueryTransformerTest.java
index 81bba3e77159..d96bcf3189f0 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/SpringerQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/SpringerQueryTransformerTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 class SpringerQueryTransformerTest extends InfixTransformerTest<SpringerQueryTransformer> {
 
@@ -39,7 +39,9 @@ public String getTitlePrefix() {
     @Test
     public void convertYearField() throws Exception {
         String queryString = "year:2015";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
 
         Optional<String> expected = Optional.of("date:2015*");
@@ -50,10 +52,13 @@ public void convertYearField() throws Exception {
     @Test
     public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2012-2015";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
 
-        Optional<String> expected = Optional.of("date:2012* OR date:2013* OR date:2014* OR date:2015*");
+        Optional<String> expected =
+                Optional.of("date:2012* OR date:2013* OR date:2014* OR date:2015*");
         assertEquals(expected, searchQuery);
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/SuffixTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/SuffixTransformerTest.java
index 31b3b2239a6c..81d8f6d96eca 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/SuffixTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/SuffixTransformerTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 /**
  * Test Interface for all transformers that use suffix notation for their logical binary operators
@@ -26,7 +26,9 @@ public abstract class SuffixTransformerTest<T extends AbstractQueryTransformer>
     @Test
     public void convertAuthorFieldSuffix() throws Exception {
         String queryString = "author:\"Igor Steinmacher\"";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of("\"Igor Steinmacher\"" + getAuthorSuffix());
         assertEquals(expected, searchQuery);
@@ -35,7 +37,9 @@ public void convertAuthorFieldSuffix() throws Exception {
     @Test
     public void convertUnFieldedTermSuffix() throws Exception {
         String queryString = "\"default value\"";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of(queryString + getUnFieldedSuffix());
         assertEquals(expected, searchQuery);
@@ -44,7 +48,9 @@ public void convertUnFieldedTermSuffix() throws Exception {
     @Test
     public void convertExplicitUnFieldedTermSuffix() throws Exception {
         String queryString = "default:\"default value\"";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of("\"default value\"" + getUnFieldedSuffix());
         assertEquals(expected, searchQuery);
@@ -53,7 +59,9 @@ public void convertExplicitUnFieldedTermSuffix() throws Exception {
     @Test
     public void convertJournalFieldSuffix() throws Exception {
         String queryString = "journal:Nature";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of("Nature" + getJournalSuffix());
         assertEquals(expected, searchQuery);
@@ -68,27 +76,63 @@ public void convertJournalFieldSuffix() throws Exception {
     @Test
     public void convertMultipleValuesWithTheSameSuffix() throws Exception {
         String queryString = "author:\"Igor Steinmacher\" author:\"Christoph Treude\"";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of("\"Igor Steinmacher\"" + getAuthorSuffix() + getTransformer().getLogicalAndOperator() + "\"Christoph Treude\"" + getAuthorSuffix());
+        Optional<String> expected =
+                Optional.of(
+                        "\"Igor Steinmacher\""
+                                + getAuthorSuffix()
+                                + getTransformer().getLogicalAndOperator()
+                                + "\"Christoph Treude\""
+                                + getAuthorSuffix());
         assertEquals(expected, searchQuery);
     }
 
     @Test
     public void groupedOperationsSuffix() throws Exception {
-        String queryString = "(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\" AND author:\"Christoph Freunde\") AND title:test";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        String queryString =
+                "(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\" AND author:\"Christoph Freunde\") AND title:test";
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of("(" + "\"Igor Steinmacher\"" + getAuthorSuffix() + getTransformer().getLogicalOrOperator() + "(" + "\"Christoph Treude\"" + getAuthorSuffix() + getTransformer().getLogicalAndOperator() + "\"Christoph Freunde\"" + getAuthorSuffix() + "))" + getTransformer().getLogicalAndOperator() + "test" + getTitleSuffix());
+        Optional<String> expected =
+                Optional.of(
+                        "("
+                                + "\"Igor Steinmacher\""
+                                + getAuthorSuffix()
+                                + getTransformer().getLogicalOrOperator()
+                                + "("
+                                + "\"Christoph Treude\""
+                                + getAuthorSuffix()
+                                + getTransformer().getLogicalAndOperator()
+                                + "\"Christoph Freunde\""
+                                + getAuthorSuffix()
+                                + "))"
+                                + getTransformer().getLogicalAndOperator()
+                                + "test"
+                                + getTitleSuffix());
         assertEquals(expected, searchQuery);
     }
 
     @Test
     public void notOperatorSufix() throws Exception {
         String queryString = "!(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\")";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(getTransformer().getLogicalNotOperator() + "(" + "\"Igor Steinmacher\"" + getAuthorSuffix() + getTransformer().getLogicalOrOperator() + "\"Christoph Treude\")" + getAuthorSuffix());
+        Optional<String> expected =
+                Optional.of(
+                        getTransformer().getLogicalNotOperator()
+                                + "("
+                                + "\"Igor Steinmacher\""
+                                + getAuthorSuffix()
+                                + getTransformer().getLogicalOrOperator()
+                                + "\"Christoph Treude\")"
+                                + getAuthorSuffix());
         assertEquals(expected, searchQuery);
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/YearAndYearRangeByFilteringQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/YearAndYearRangeByFilteringQueryTransformerTest.java
index 3c327b65c16a..c8df8c26c0f7 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/YearAndYearRangeByFilteringQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/YearAndYearRangeByFilteringQueryTransformerTest.java
@@ -1,20 +1,24 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
-public abstract class YearAndYearRangeByFilteringQueryTransformerTest<T extends YearAndYearRangeByFilteringQueryTransformer> extends YearRangeByFilteringQueryTransformerTest<T> {
+public abstract class YearAndYearRangeByFilteringQueryTransformerTest<
+                T extends YearAndYearRangeByFilteringQueryTransformer>
+        extends YearRangeByFilteringQueryTransformerTest<T> {
     @Override
     @Test
     public void convertYearField() throws Exception {
         YearAndYearRangeByFilteringQueryTransformer transformer = getTransformer();
         String queryString = "year:2021";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> query = transformer.transformLuceneQuery(luceneQuery);
         assertEquals(Optional.empty(), query);
         assertEquals(Optional.of(2021), transformer.getStartYear());
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/YearRangeByFilteringQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/YearRangeByFilteringQueryTransformerTest.java
index 3f8730addb99..26d2dadff0cd 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/YearRangeByFilteringQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/YearRangeByFilteringQueryTransformerTest.java
@@ -1,14 +1,16 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
-public abstract class YearRangeByFilteringQueryTransformerTest<T extends YearRangeByFilteringQueryTransformer> extends InfixTransformerTest<T> {
+public abstract class YearRangeByFilteringQueryTransformerTest<
+                T extends YearRangeByFilteringQueryTransformer>
+        extends InfixTransformerTest<T> {
 
     @Override
     @Test
@@ -16,7 +18,9 @@ public void convertYearRangeField() throws Exception {
         YearRangeByFilteringQueryTransformer transformer = getTransformer();
 
         String queryString = "year-range:2018-2021";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> result = transformer.transformLuceneQuery(luceneQuery);
 
         // The API does not support querying for a year range
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/ZbMathQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/ZbMathQueryTransformerTest.java
index 6be32badf55f..a0a97aa91a33 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/ZbMathQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/ZbMathQueryTransformerTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 class ZbMathQueryTransformerTest extends InfixTransformerTest<ZbMathQueryTransformer> {
 
@@ -39,7 +39,9 @@ public String getTitlePrefix() {
     @Test
     public void convertYearField() throws Exception {
         String queryString = "year:2015";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of("py:2015");
         assertEquals(expected, searchQuery);
@@ -49,7 +51,9 @@ public void convertYearField() throws Exception {
     @Test
     public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2012-2015";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        QueryNode luceneQuery =
+                new StandardSyntaxParser()
+                        .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of("py:2012-2015");
         assertEquals(expected, searchQuery);
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/ACMPortalParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/ACMPortalParserTest.java
index 80dfde0ac8c7..ea133980e5c5 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/ACMPortalParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/ACMPortalParserTest.java
@@ -1,27 +1,26 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.net.CookieHandler;
-import java.net.CookieManager;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import org.apache.hc.core5.net.URIBuilder;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.net.URLDownload;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
-import org.apache.hc.core5.net.URIBuilder;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import java.net.CookieHandler;
+import java.net.CookieManager;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 class ACMPortalParserTest {
@@ -29,41 +28,62 @@ class ACMPortalParserTest {
     ACMPortalParser parser;
     List<BibEntry> searchEntryList;
     URL searchUrl;
-    String searchQuery = "The relationship of code churn and architectural violations in the open source software JabRef";
-    String jsonStr = "{\"id\":\"10.1145/3129790.3129810\",\"type\":\"PAPER_CONFERENCE\",\"author\":[{\"family\":\"Olsson\",\"given\":\"Tobias\"},{\"family\":\"Ericsson\",\"given\":\"Morgan\"},{\"family\":\"Wingkvist\",\"given\":\"Anna\"}],\"accessed\":{\"date-parts\":[[2021,5,12]]},\"issued\":{\"date-parts\":[[2017,9,11]]},\"original-date\":{\"date-parts\":[[2017,9,11]]},\"abstract\":\"The open source application JabRef has existed since 2003. In 2015, the developers decided to make an architectural refactoring as continued development was deemed too demanding. The developers also introduced Static Architecture Conformance Checking (SACC) to prevent violations to the intended architecture. Measurements mined from source code repositories such as code churn and code ownership has been linked to several problems, for example fault proneness, security vulnerabilities, code smells, and degraded maintainability. The root cause of such problems can be architectural. To determine the impact of the refactoring of JabRef, we measure the code churn and code ownership before and after the refactoring and find that large files with violations had a significantly higher code churn than large files without violations before the refactoring. After the refactoring, the files that had violations show a more normal code churn. We find no such effect on code ownership. We conclude that files that contain violations detectable by SACC methods are connected to higher than normal code churn.\",\"call-number\":\"10.1145/3129790.3129810\",\"collection-title\":\"ECSA '17\",\"container-title\":\"Proceedings of the 11th European Conference on Software Architecture: Companion Proceedings\",\"DOI\":\"10.1145/3129790.3129810\",\"event-place\":\"Canterbury, United Kingdom\",\"ISBN\":\"9781450352178\",\"keyword\":\"software architecture, conformance checking, repository data mining\",\"number-of-pages\":\"7\",\"page\":\"152–158\",\"publisher\":\"Association for Computing Machinery\",\"publisher-place\":\"New York, NY, USA\",\"title\":\"The relationship of code churn and architectural violations in the open source software JabRef\",\"URL\":\"https://doi.org/10.1145/3129790.3129810\"}";
+    String searchQuery =
+            "The relationship of code churn and architectural violations in the open source software JabRef";
+    String jsonStr =
+            "{\"id\":\"10.1145/3129790.3129810\",\"type\":\"PAPER_CONFERENCE\",\"author\":[{\"family\":\"Olsson\",\"given\":\"Tobias\"},{\"family\":\"Ericsson\",\"given\":\"Morgan\"},{\"family\":\"Wingkvist\",\"given\":\"Anna\"}],\"accessed\":{\"date-parts\":[[2021,5,12]]},\"issued\":{\"date-parts\":[[2017,9,11]]},\"original-date\":{\"date-parts\":[[2017,9,11]]},\"abstract\":\"The open source application JabRef has existed since 2003. In 2015, the developers decided to make an architectural refactoring as continued development was deemed too demanding. The developers also introduced Static Architecture Conformance Checking (SACC) to prevent violations to the intended architecture. Measurements mined from source code repositories such as code churn and code ownership has been linked to several problems, for example fault proneness, security vulnerabilities, code smells, and degraded maintainability. The root cause of such problems can be architectural. To determine the impact of the refactoring of JabRef, we measure the code churn and code ownership before and after the refactoring and find that large files with violations had a significantly higher code churn than large files without violations before the refactoring. After the refactoring, the files that had violations show a more normal code churn. We find no such effect on code ownership. We conclude that files that contain violations detectable by SACC methods are connected to higher than normal code churn.\",\"call-number\":\"10.1145/3129790.3129810\",\"collection-title\":\"ECSA '17\",\"container-title\":\"Proceedings of the 11th European Conference on Software Architecture: Companion Proceedings\",\"DOI\":\"10.1145/3129790.3129810\",\"event-place\":\"Canterbury, United Kingdom\",\"ISBN\":\"9781450352178\",\"keyword\":\"software architecture, conformance checking, repository data mining\",\"number-of-pages\":\"7\",\"page\":\"152–158\",\"publisher\":\"Association for Computing Machinery\",\"publisher-place\":\"New York, NY, USA\",\"title\":\"The relationship of code churn and architectural violations in the open source software JabRef\",\"URL\":\"https://doi.org/10.1145/3129790.3129810\"}";
 
     @BeforeEach
     void setUp() throws URISyntaxException, MalformedURLException {
         parser = new ACMPortalParser();
-        searchUrl = new URIBuilder("https://dl.acm.org/action/doSearch")
-                .addParameter("AllField", searchQuery).build().toURL();
-        searchEntryList = List.of(
-                new BibEntry(StandardEntryType.Conference)
-                        .withField(StandardField.AUTHOR, "Olsson, Tobias and Ericsson, Morgan and Wingkvist, Anna")
-                        .withField(StandardField.YEAR, "2017")
-                        .withField(StandardField.MONTH, "9")
-                        .withField(StandardField.DAY, "11")
-                        .withField(StandardField.SERIES, "ECSA '17")
-                        .withField(StandardField.BOOKTITLE, "Proceedings of the 11th European Conference on Software Architecture: Companion Proceedings")
-                        .withField(StandardField.DOI, "10.1145/3129790.3129810")
-                        .withField(StandardField.LOCATION, "Canterbury, United Kingdom")
-                        .withField(StandardField.ISBN, "9781450352178")
-                        .withField(StandardField.KEYWORDS, "conformance checking, repository data mining, software architecture")
-                        .withField(StandardField.PUBLISHER, "Association for Computing Machinery")
-                        .withField(StandardField.ADDRESS, "New York, NY, USA")
-                        .withField(StandardField.TITLE, "The relationship of code churn and architectural violations in the open source software JabRef")
-                        .withField(StandardField.URL, "https://doi.org/10.1145/3129790.3129810")
-                        .withField(StandardField.PAGETOTAL, "7")
-                        .withField(StandardField.PAGES, "152–158"),
-                new BibEntry(StandardEntryType.Book)
-                        .withField(StandardField.YEAR, "2016")
-                        .withField(StandardField.MONTH, "10")
-                        .withField(StandardField.TITLE, "Proceedings of the 2016 24th ACM SIGSOFT International Symposium on Foundations of Software Engineering")
-                        .withField(StandardField.LOCATION, "Seattle, WA, USA")
-                        .withField(StandardField.ISBN, "9781450342186")
-                        .withField(StandardField.PUBLISHER, "Association for Computing Machinery")
-                        .withField(StandardField.ADDRESS, "New York, NY, USA")
-        );
+        searchUrl =
+                new URIBuilder("https://dl.acm.org/action/doSearch")
+                        .addParameter("AllField", searchQuery)
+                        .build()
+                        .toURL();
+        searchEntryList =
+                List.of(
+                        new BibEntry(StandardEntryType.Conference)
+                                .withField(
+                                        StandardField.AUTHOR,
+                                        "Olsson, Tobias and Ericsson, Morgan and Wingkvist, Anna")
+                                .withField(StandardField.YEAR, "2017")
+                                .withField(StandardField.MONTH, "9")
+                                .withField(StandardField.DAY, "11")
+                                .withField(StandardField.SERIES, "ECSA '17")
+                                .withField(
+                                        StandardField.BOOKTITLE,
+                                        "Proceedings of the 11th European Conference on Software Architecture: Companion Proceedings")
+                                .withField(StandardField.DOI, "10.1145/3129790.3129810")
+                                .withField(StandardField.LOCATION, "Canterbury, United Kingdom")
+                                .withField(StandardField.ISBN, "9781450352178")
+                                .withField(
+                                        StandardField.KEYWORDS,
+                                        "conformance checking, repository data mining, software architecture")
+                                .withField(
+                                        StandardField.PUBLISHER,
+                                        "Association for Computing Machinery")
+                                .withField(StandardField.ADDRESS, "New York, NY, USA")
+                                .withField(
+                                        StandardField.TITLE,
+                                        "The relationship of code churn and architectural violations in the open source software JabRef")
+                                .withField(
+                                        StandardField.URL,
+                                        "https://doi.org/10.1145/3129790.3129810")
+                                .withField(StandardField.PAGETOTAL, "7")
+                                .withField(StandardField.PAGES, "152–158"),
+                        new BibEntry(StandardEntryType.Book)
+                                .withField(StandardField.YEAR, "2016")
+                                .withField(StandardField.MONTH, "10")
+                                .withField(
+                                        StandardField.TITLE,
+                                        "Proceedings of the 2016 24th ACM SIGSOFT International Symposium on Foundations of Software Engineering")
+                                .withField(StandardField.LOCATION, "Seattle, WA, USA")
+                                .withField(StandardField.ISBN, "9781450342186")
+                                .withField(
+                                        StandardField.PUBLISHER,
+                                        "Association for Computing Machinery")
+                                .withField(StandardField.ADDRESS, "New York, NY, USA"));
     }
 
     @Test
@@ -80,7 +100,8 @@ void parseEntries() throws Exception {
     void parseDoiSearchPage() throws Exception {
         String testDoi = "10.1145/3129790.3129810";
         CookieHandler.setDefault(new CookieManager());
-        List<String> doiList = parser.parseDoiSearchPage(new URLDownload(searchUrl).asInputStream());
+        List<String> doiList =
+                parser.parseDoiSearchPage(new URLDownload(searchUrl).asInputStream());
         assertFalse(doiList.isEmpty());
         assertEquals(testDoi, doiList.getFirst());
     }
@@ -97,7 +118,8 @@ void getBibEntriesFromDoiList() throws FetcherException {
 
     @Test
     void getUrlFromDoiList() throws MalformedURLException, URISyntaxException {
-        String target = "https://dl.acm.org/action/exportCiteProcCitation?targetFile=custom-bibtex&format=bibTex&dois=10.1145%2F3129790.3129810%2C10.1145%2F2950290";
+        String target =
+                "https://dl.acm.org/action/exportCiteProcCitation?targetFile=custom-bibtex&format=bibTex&dois=10.1145%2F3129790.3129810%2C10.1145%2F2950290";
 
         List<String> doiList = List.of("10.1145/3129790.3129810", "10.1145/2950290");
         URL url = parser.getUrlFromDoiList(doiList);
@@ -113,24 +135,34 @@ void parseBibEntry() {
 
     @Test
     void parseBibEntryWithFamilyAuthorOnly() {
-        String json = "{\"id\":\"10.1145/3011077.3011113\",\"type\":\"PAPER_CONFERENCE\",\"author\":[{\"family\":\"Ngo-Thi-Thu-Trang\"},{\"family\":\"Bui\",\"given\":\"Hieu T.\"},{\"family\":\"Nguyen\",\"given\":\"Nhan D.\"}],\"accessed\":{\"date-parts\":[[2023,8,4]]},\"issued\":{\"date-parts\":[[2016,12,8]]},\"original-date\":{\"date-parts\":[[2016,12,8]]},\"abstract\":\"\",\"call-number\":\"10.1145/3011077.3011113\",\"collection-title\":\"SoICT '16\",\"container-title\":\"Proceedings of the 7th Symposium on Information and Communication Technology\",\"DOI\":\"10.1145/3011077.3011113\",\"event-place\":\"Ho Chi Minh City, Vietnam\",\"ISBN\":\"9781450348157\",\"keyword\":\"orthogonal frequency division multiplexing (OFDM), long-range passive optical network (LR PON), four-wave mixing (FWM), wavelength division multiplexing (WDM)\",\"number-of-pages\":\"6\",\"page\":\"216–221\",\"publisher\":\"Association for Computing Machinery\",\"publisher-place\":\"New York, NY, USA\",\"title\":\"A simple performance analysis of IM-DD OFDM WDM systems in long range PON application\",\"URL\":\"https://doi.org/10.1145/3011077.3011113\"}";
-        BibEntry expectedEntry = new BibEntry(StandardEntryType.Conference)
-            .withField(StandardField.AUTHOR, "Ngo-Thi-Thu-Trang and Bui, Hieu T. and Nguyen, Nhan D.")
-            .withField(StandardField.TITLE, "A simple performance analysis of IM-DD OFDM WDM systems in long range PON application")
-            .withField(StandardField.BOOKTITLE, "Proceedings of the 7th Symposium on Information and Communication Technology")
-            .withField(StandardField.YEAR, "2016")
-            .withField(StandardField.SERIES, "SoICT '16")
-            .withField(StandardField.PAGES, "216–221")
-            .withField(StandardField.ADDRESS, "New York, NY, USA")
-            .withField(StandardField.MONTH, "12")
-            .withField(StandardField.PUBLISHER, "Association for Computing Machinery")
-            .withField(StandardField.LOCATION, "Ho Chi Minh City, Vietnam")
-            .withField(StandardField.ISBN, "9781450348157")
-            .withField(StandardField.DAY, "8")
-            .withField(StandardField.PAGETOTAL, "6")
-            .withField(StandardField.DOI, "10.1145/3011077.3011113")
-            .withField(StandardField.KEYWORDS, "four-wave mixing (FWM), long-range passive optical network (LR PON), orthogonal frequency division multiplexing (OFDM), wavelength division multiplexing (WDM)")
-            .withField(StandardField.URL, "https://doi.org/10.1145/3011077.3011113");
+        String json =
+                "{\"id\":\"10.1145/3011077.3011113\",\"type\":\"PAPER_CONFERENCE\",\"author\":[{\"family\":\"Ngo-Thi-Thu-Trang\"},{\"family\":\"Bui\",\"given\":\"Hieu T.\"},{\"family\":\"Nguyen\",\"given\":\"Nhan D.\"}],\"accessed\":{\"date-parts\":[[2023,8,4]]},\"issued\":{\"date-parts\":[[2016,12,8]]},\"original-date\":{\"date-parts\":[[2016,12,8]]},\"abstract\":\"\",\"call-number\":\"10.1145/3011077.3011113\",\"collection-title\":\"SoICT '16\",\"container-title\":\"Proceedings of the 7th Symposium on Information and Communication Technology\",\"DOI\":\"10.1145/3011077.3011113\",\"event-place\":\"Ho Chi Minh City, Vietnam\",\"ISBN\":\"9781450348157\",\"keyword\":\"orthogonal frequency division multiplexing (OFDM), long-range passive optical network (LR PON), four-wave mixing (FWM), wavelength division multiplexing (WDM)\",\"number-of-pages\":\"6\",\"page\":\"216–221\",\"publisher\":\"Association for Computing Machinery\",\"publisher-place\":\"New York, NY, USA\",\"title\":\"A simple performance analysis of IM-DD OFDM WDM systems in long range PON application\",\"URL\":\"https://doi.org/10.1145/3011077.3011113\"}";
+        BibEntry expectedEntry =
+                new BibEntry(StandardEntryType.Conference)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Ngo-Thi-Thu-Trang and Bui, Hieu T. and Nguyen, Nhan D.")
+                        .withField(
+                                StandardField.TITLE,
+                                "A simple performance analysis of IM-DD OFDM WDM systems in long range PON application")
+                        .withField(
+                                StandardField.BOOKTITLE,
+                                "Proceedings of the 7th Symposium on Information and Communication Technology")
+                        .withField(StandardField.YEAR, "2016")
+                        .withField(StandardField.SERIES, "SoICT '16")
+                        .withField(StandardField.PAGES, "216–221")
+                        .withField(StandardField.ADDRESS, "New York, NY, USA")
+                        .withField(StandardField.MONTH, "12")
+                        .withField(StandardField.PUBLISHER, "Association for Computing Machinery")
+                        .withField(StandardField.LOCATION, "Ho Chi Minh City, Vietnam")
+                        .withField(StandardField.ISBN, "9781450348157")
+                        .withField(StandardField.DAY, "8")
+                        .withField(StandardField.PAGETOTAL, "6")
+                        .withField(StandardField.DOI, "10.1145/3011077.3011113")
+                        .withField(
+                                StandardField.KEYWORDS,
+                                "four-wave mixing (FWM), long-range passive optical network (LR PON), orthogonal frequency division multiplexing (OFDM), wavelength division multiplexing (WDM)")
+                        .withField(StandardField.URL, "https://doi.org/10.1145/3011077.3011113");
 
         BibEntry parsedEntry = parser.parseBibEntry(json);
         assertEquals(expectedEntry, parsedEntry);
@@ -139,7 +171,10 @@ void parseBibEntryWithFamilyAuthorOnly() {
     @Test
     void noEntryFound() throws Exception {
         CookieHandler.setDefault(new CookieManager());
-        URL url = new URIBuilder("https://dl.acm.org/action/doSearch?AllField=10.1145/3129790.31298").build().toURL();
+        URL url =
+                new URIBuilder("https://dl.acm.org/action/doSearch?AllField=10.1145/3129790.31298")
+                        .build()
+                        .toURL();
         List<BibEntry> bibEntries = parser.parseEntries(new URLDownload(url).asInputStream());
         assertEquals(Collections.emptyList(), bibEntries);
     }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibliographyFromPdfImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibliographyFromPdfImporterTest.java
index 661f30c04b2b..c727b33670bd 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibliographyFromPdfImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibliographyFromPdfImporterTest.java
@@ -1,139 +1,203 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
 
 class BibliographyFromPdfImporterTest {
 
-    private static final BibEntry KNASTER_2017 = new BibEntry(StandardEntryType.Article)
-            .withCitationKey("1")
-            .withField(StandardField.AUTHOR, "J. Knaster and others")
-            .withField(StandardField.TITLE, "Overview of the IFMIF/EVEDA project")
-            .withField(StandardField.JOURNAL, "Nucl. Fusion")
-            .withField(StandardField.VOLUME, "57")
-            .withField(StandardField.PAGES, "102016")
-            .withField(StandardField.YEAR, "2017")
-            .withField(StandardField.DOI, "10.1088/1741-4326/aa6a6a")
-            .withField(StandardField.COMMENT, "[1] J. Knaster et al., “Overview of the IFMIF/EVEDA project”, Nucl. Fusion, vol. 57, p. 102016, 2017. doi:10.1088/ 1741-4326/aa6a6a");
-    private static final BibEntry SHIMOSAKI_2019 = new BibEntry(StandardEntryType.InProceedings)
-            .withCitationKey("3")
-            .withField(StandardField.AUTHOR, "Y. Shimosaki and others")
-            .withField(StandardField.TITLE, "Lattice design for 5 MeV - 125 mA CW RFQ operation in LIPAc")
-            .withField(StandardField.BOOKTITLE, "Proc. IPAC’19, Melbourne, Australia")
-            .withField(StandardField.MONTH, "#may#")
-            .withField(StandardField.YEAR, "2019")
-            .withField(StandardField.PAGES, "977-979")
-            .withField(StandardField.DOI, "10.18429/JACoW-IPAC2019-MOPTS051")
-            .withField(StandardField.COMMENT, "[3] Y. Shimosaki et al., “Lattice design for 5 MeV – 125 mA CW RFQ operation in LIPAc”, in Proc. IPAC’19, Mel- bourne, Australia, May 2019, pp. 977-979. doi:10.18429/ JACoW-IPAC2019-MOPTS051");
-    private static final BibEntry BELLAN_2021 = new BibEntry(StandardEntryType.InProceedings)
-            .withCitationKey("6")
-            .withField(StandardField.AUTHOR, "L. Bellan and others")
-            .withField(StandardField.TITLE, "Acceleration of the high current deuteron beam through the IFMIF-EVEDA beam dynamics performances")
-            .withField(StandardField.BOOKTITLE, "Proc. HB’21, Batavia, IL, USA")
-            .withField(StandardField.MONTH, "#oct#")
-            .withField(StandardField.YEAR, "2021")
-            .withField(StandardField.PAGES, "197-202")
-            .withField(StandardField.DOI, "10.18429/JACoW-HB2021-WEDC2")
-            .withField(StandardField.COMMENT, "[6] L. Bellan et al., “Acceleration of the high current deuteron beam through the IFMIF-EVEDA beam dynamics perfor- mances”, in Proc. HB’21, Batavia, IL, USA, Oct. 2021, pp. 197-202. doi:10.18429/JACoW-HB2021-WEDC2");
-    private static final BibEntry MASUDA_2022 = new BibEntry(StandardEntryType.InProceedings)
-            .withCitationKey("7")
-            .withField(StandardField.AUTHOR, "K. Masuda and others")
-            .withField(StandardField.TITLE, "Commissioning of IFMIF Prototype Accelerator towards CW operation")
-            .withField(StandardField.BOOKTITLE, "Proc. LINAC’22, Liverpool, UK")
-            .withField(StandardField.MONTH, "#aug#")
-            .withField(StandardField.YEAR, "2022")
-            .withField(StandardField.PAGES, "319-323")
-            .withField(StandardField.DOI, "10.18429/JACoW-LINAC2022-TU2AA04")
-            .withField(StandardField.COMMENT, "[7] K. Masuda et al., “Commissioning of IFMIF Prototype Ac- celerator towards CW operation”, in Proc. LINAC’22, Liv- erpool, UK, Aug.-Sep. 2022, pp. 319-323. doi:10.18429/ JACoW-LINAC2022-TU2AA04");
-    private static final BibEntry PODADERA_2012 = new BibEntry(StandardEntryType.InProceedings)
-            .withCitationKey("11")
-            .withField(StandardField.AUTHOR, "I. Podadera and J. M. Carmona and A. Ibarra and J. Molla")
-            .withField(StandardField.TITLE, "Beam position monitor development for LIPAc")
-            .withField(StandardField.BOOKTITLE, "th 8th DITANET Topical Workshop on Beam Position Monitors, CERN, Geneva, Switzreland")
-            .withField(StandardField.MONTH, "#jan#")
-            .withField(StandardField.YEAR, "2012")
-            .withField(StandardField.COMMENT, "[11] I. Podadera, J. M. Carmona, A. Ibarra, and J. Molla, “Beam position monitor development for LIPAc”, presented at th 8th DITANET Topical Workshop on Beam Position Monitors, CERN, Geneva, Switzreland, Jan. 2012.");
-    private static final BibEntry AKAGI_2023 = new BibEntry(StandardEntryType.InProceedings)
-            .withCitationKey("15")
-            .withField(StandardField.AUTHOR, "T. Akagi and others")
-            .withField(StandardField.TITLE, "Achievement of high-current continuouswave deuteron injector for Linear IFMIF Prototype Accelerator (LIPAc)")
-            .withField(StandardField.BOOKTITLE, "IAEA FEC’23, London, UK")
-            .withField(StandardField.MONTH, "#oct#")
-            .withField(StandardField.URL, "https://www.iaea.org/events/fec2023")
-            .withField(StandardField.YEAR, "2023")
-            .withField(StandardField.COMMENT, "[15] T. Akagi et al., “Achievement of high-current continuous- wave deuteron injector for Linear IFMIF Prototype Accelera- tor (LIPAc)”, to be presented at IAEA FEC’23, London, UK, Oct. 2023. https://www.iaea.org/events/fec2023");
-    private static final BibEntry INTERNAL_NOTE = new BibEntry(StandardEntryType.TechReport)
-            .withCitationKey("16")
-            .withField(StandardField.TITLE, "AF4.1.1 SRF Linac Engineering Design Report")
-            .withField(StandardField.NOTE, "Internal note")
-            .withField(StandardField.COMMENT, "[16] “AF4.1.1 SRF Linac Engineering Design Report”, Internal note.");
-    private static final BibEntry KWON_2023 = new BibEntry(StandardEntryType.InProceedings)
-            .withCitationKey("14")
-            .withField(StandardField.AUTHOR, "S. Kwon and others")
-            .withField(StandardField.TITLE, "High beam current operation with beam di-agnostics at LIPAc")
-            .withField(StandardField.BOOKTITLE, "HB’23, Geneva, Switzerland, paper FRC1I2, this conference")
-            .withField(StandardField.MONTH, "#oct#")
-            .withField(StandardField.YEAR, "2023")
-            .withField(StandardField.COMMENT, "[14] S. Kwon et al., “High beam current operation with beam di-agnostics at LIPAc”, presented at HB’23, Geneva, Switzer- land, Oct. 2023, paper FRC1I2, this conference.");
-    private static final BibEntry ALVER2007 = new BibEntry(StandardEntryType.Article)
-            .withCitationKey("1")
-            .withField(StandardField.AUTHOR, "M. O. Alver and T. Tennøy and J. A. Alfredsen and G. Øie")
-            .withField(StandardField.TITLE, "Automatic measurement of rotifer brachionus plicatilis densities in first feeding tanks")
-            .withField(StandardField.JOURNAL, "Aquacultural engineering")
-            .withField(StandardField.VOLUME, "36")
-            .withField(StandardField.NUMBER, "2")
-            .withField(StandardField.YEAR, "2007")
-            .withField(StandardField.PAGES, "115-121")
-            .withField(StandardField.COMMENT, "[1] M. O. Alver, T. Tennøy, J. A. Alfredsen, and G. Øie, “Automatic measurement of rotifer brachionus plicatilis densities in first feeding tanks,” Aquacultural engineering, vol. 36, no. 2, pp. 115–121, 2007.");
-    private static final BibEntry ALVER2007A = new BibEntry(StandardEntryType.Article)
-            .withCitationKey("2")
-            .withField(StandardField.AUTHOR, "M. O. Alver and others")
-            .withField(StandardField.TITLE, "Estimating larval density in cod (gadus morhua) first feeding tanks using measurements of feed density and larval growth rates")
-            .withField(StandardField.JOURNAL, "Aquaculture")
-            .withField(StandardField.VOLUME, "268")
-            .withField(StandardField.NUMBER, "1")
-            .withField(StandardField.YEAR, "2007")
-            .withField(StandardField.PAGES, "216-226")
-            .withField(StandardField.COMMENT, "[2] M. O. Alver et al., “Estimating larval density in cod (gadus morhua) first feeding tanks using measurements of feed density and larval growth rates,” Aquaculture, vol. 268, no. 1, pp. 216–226, 2007.");
-    private static final BibEntry KOPP2012 = new BibEntry(StandardEntryType.InProceedings)
-            .withCitationKey("3")
-            .withField(StandardField.AUTHOR, "O. Kopp and others")
-            .withField(StandardField.TITLE, "BPMN4TOSCA: A domain-specific language to model management plans for composite applications")
-            .withField(StandardField.BOOKTITLE, "Business Process Model and Notation")
-            .withField(StandardField.SERIES, "LNCS")
-            .withField(StandardField.VOLUME, "125")
-            .withField(StandardField.YEAR, "2012")
-            .withField(StandardField.PUBLISHER, "Springer")
-            .withField(StandardField.COMMENT, "[3] O. Kopp et al., “BPMN4TOSCA: A domain-specific language to model management plans for composite applications,” in Business Process Model and Notation, ser. LNCS, vol. 125. Springer, 2012.");
-    private static final BibEntry KOPPP2018 = new BibEntry(StandardEntryType.InProceedings)
-            .withCitationKey("4")
-            .withField(StandardField.AUTHOR, "O. Kopp and A. Armbruster and O. Zimmermann")
-            .withField(StandardField.TITLE, "Markdown architectural decision records: Format and tool support")
-            .withField(StandardField.BOOKTITLE, "ZEUS")
-            .withField(StandardField.YEAR, "2018")
-            .withField(StandardField.PUBLISHER, "CEUR-WS.org")
-            .withField(StandardField.COMMENT, "[4] O. Kopp, A. Armbruster, and O. Zimmermann, “Markdown architectural decision records: Format and tool support,” in ZEUS. CEUR-WS.org, 2018.");
-    private static final BibEntry KOENIG2023 = new BibEntry(StandardEntryType.InProceedings)
-            .withCitationKey("5")
-            .withField(StandardField.AUTHOR, "S. König and others")
-            .withField(StandardField.TITLE, "BPMN4Cars: A car-tailored workflow engine")
-            .withField(StandardField.BOOKTITLE, "INDIN")
-            .withField(StandardField.PUBLISHER, "IEEE")
-            .withField(StandardField.YEAR, "2023")
-            .withField(StandardField.COMMENT, "[5] S. König et al., “BPMN4Cars: A car-tailored workflow engine,” in INDIN. IEEE, 2023.");
+    private static final BibEntry KNASTER_2017 =
+            new BibEntry(StandardEntryType.Article)
+                    .withCitationKey("1")
+                    .withField(StandardField.AUTHOR, "J. Knaster and others")
+                    .withField(StandardField.TITLE, "Overview of the IFMIF/EVEDA project")
+                    .withField(StandardField.JOURNAL, "Nucl. Fusion")
+                    .withField(StandardField.VOLUME, "57")
+                    .withField(StandardField.PAGES, "102016")
+                    .withField(StandardField.YEAR, "2017")
+                    .withField(StandardField.DOI, "10.1088/1741-4326/aa6a6a")
+                    .withField(
+                            StandardField.COMMENT,
+                            "[1] J. Knaster et al., “Overview of the IFMIF/EVEDA project”, Nucl. Fusion, vol. 57, p. 102016, 2017. doi:10.1088/ 1741-4326/aa6a6a");
+    private static final BibEntry SHIMOSAKI_2019 =
+            new BibEntry(StandardEntryType.InProceedings)
+                    .withCitationKey("3")
+                    .withField(StandardField.AUTHOR, "Y. Shimosaki and others")
+                    .withField(
+                            StandardField.TITLE,
+                            "Lattice design for 5 MeV - 125 mA CW RFQ operation in LIPAc")
+                    .withField(StandardField.BOOKTITLE, "Proc. IPAC’19, Melbourne, Australia")
+                    .withField(StandardField.MONTH, "#may#")
+                    .withField(StandardField.YEAR, "2019")
+                    .withField(StandardField.PAGES, "977-979")
+                    .withField(StandardField.DOI, "10.18429/JACoW-IPAC2019-MOPTS051")
+                    .withField(
+                            StandardField.COMMENT,
+                            "[3] Y. Shimosaki et al., “Lattice design for 5 MeV – 125 mA CW RFQ operation in LIPAc”, in Proc. IPAC’19, Mel- bourne, Australia, May 2019, pp. 977-979. doi:10.18429/ JACoW-IPAC2019-MOPTS051");
+    private static final BibEntry BELLAN_2021 =
+            new BibEntry(StandardEntryType.InProceedings)
+                    .withCitationKey("6")
+                    .withField(StandardField.AUTHOR, "L. Bellan and others")
+                    .withField(
+                            StandardField.TITLE,
+                            "Acceleration of the high current deuteron beam through the IFMIF-EVEDA beam dynamics performances")
+                    .withField(StandardField.BOOKTITLE, "Proc. HB’21, Batavia, IL, USA")
+                    .withField(StandardField.MONTH, "#oct#")
+                    .withField(StandardField.YEAR, "2021")
+                    .withField(StandardField.PAGES, "197-202")
+                    .withField(StandardField.DOI, "10.18429/JACoW-HB2021-WEDC2")
+                    .withField(
+                            StandardField.COMMENT,
+                            "[6] L. Bellan et al., “Acceleration of the high current deuteron beam through the IFMIF-EVEDA beam dynamics perfor- mances”, in Proc. HB’21, Batavia, IL, USA, Oct. 2021, pp. 197-202. doi:10.18429/JACoW-HB2021-WEDC2");
+    private static final BibEntry MASUDA_2022 =
+            new BibEntry(StandardEntryType.InProceedings)
+                    .withCitationKey("7")
+                    .withField(StandardField.AUTHOR, "K. Masuda and others")
+                    .withField(
+                            StandardField.TITLE,
+                            "Commissioning of IFMIF Prototype Accelerator towards CW operation")
+                    .withField(StandardField.BOOKTITLE, "Proc. LINAC’22, Liverpool, UK")
+                    .withField(StandardField.MONTH, "#aug#")
+                    .withField(StandardField.YEAR, "2022")
+                    .withField(StandardField.PAGES, "319-323")
+                    .withField(StandardField.DOI, "10.18429/JACoW-LINAC2022-TU2AA04")
+                    .withField(
+                            StandardField.COMMENT,
+                            "[7] K. Masuda et al., “Commissioning of IFMIF Prototype Ac- celerator towards CW operation”, in Proc. LINAC’22, Liv- erpool, UK, Aug.-Sep. 2022, pp. 319-323. doi:10.18429/ JACoW-LINAC2022-TU2AA04");
+    private static final BibEntry PODADERA_2012 =
+            new BibEntry(StandardEntryType.InProceedings)
+                    .withCitationKey("11")
+                    .withField(
+                            StandardField.AUTHOR,
+                            "I. Podadera and J. M. Carmona and A. Ibarra and J. Molla")
+                    .withField(StandardField.TITLE, "Beam position monitor development for LIPAc")
+                    .withField(
+                            StandardField.BOOKTITLE,
+                            "th 8th DITANET Topical Workshop on Beam Position Monitors, CERN, Geneva, Switzreland")
+                    .withField(StandardField.MONTH, "#jan#")
+                    .withField(StandardField.YEAR, "2012")
+                    .withField(
+                            StandardField.COMMENT,
+                            "[11] I. Podadera, J. M. Carmona, A. Ibarra, and J. Molla, “Beam position monitor development for LIPAc”, presented at th 8th DITANET Topical Workshop on Beam Position Monitors, CERN, Geneva, Switzreland, Jan. 2012.");
+    private static final BibEntry AKAGI_2023 =
+            new BibEntry(StandardEntryType.InProceedings)
+                    .withCitationKey("15")
+                    .withField(StandardField.AUTHOR, "T. Akagi and others")
+                    .withField(
+                            StandardField.TITLE,
+                            "Achievement of high-current continuouswave deuteron injector for Linear IFMIF Prototype Accelerator (LIPAc)")
+                    .withField(StandardField.BOOKTITLE, "IAEA FEC’23, London, UK")
+                    .withField(StandardField.MONTH, "#oct#")
+                    .withField(StandardField.URL, "https://www.iaea.org/events/fec2023")
+                    .withField(StandardField.YEAR, "2023")
+                    .withField(
+                            StandardField.COMMENT,
+                            "[15] T. Akagi et al., “Achievement of high-current continuous- wave deuteron injector for Linear IFMIF Prototype Accelera- tor (LIPAc)”, to be presented at IAEA FEC’23, London, UK, Oct. 2023. https://www.iaea.org/events/fec2023");
+    private static final BibEntry INTERNAL_NOTE =
+            new BibEntry(StandardEntryType.TechReport)
+                    .withCitationKey("16")
+                    .withField(StandardField.TITLE, "AF4.1.1 SRF Linac Engineering Design Report")
+                    .withField(StandardField.NOTE, "Internal note")
+                    .withField(
+                            StandardField.COMMENT,
+                            "[16] “AF4.1.1 SRF Linac Engineering Design Report”, Internal note.");
+    private static final BibEntry KWON_2023 =
+            new BibEntry(StandardEntryType.InProceedings)
+                    .withCitationKey("14")
+                    .withField(StandardField.AUTHOR, "S. Kwon and others")
+                    .withField(
+                            StandardField.TITLE,
+                            "High beam current operation with beam di-agnostics at LIPAc")
+                    .withField(
+                            StandardField.BOOKTITLE,
+                            "HB’23, Geneva, Switzerland, paper FRC1I2, this conference")
+                    .withField(StandardField.MONTH, "#oct#")
+                    .withField(StandardField.YEAR, "2023")
+                    .withField(
+                            StandardField.COMMENT,
+                            "[14] S. Kwon et al., “High beam current operation with beam di-agnostics at LIPAc”, presented at HB’23, Geneva, Switzer- land, Oct. 2023, paper FRC1I2, this conference.");
+    private static final BibEntry ALVER2007 =
+            new BibEntry(StandardEntryType.Article)
+                    .withCitationKey("1")
+                    .withField(
+                            StandardField.AUTHOR,
+                            "M. O. Alver and T. Tennøy and J. A. Alfredsen and G. Øie")
+                    .withField(
+                            StandardField.TITLE,
+                            "Automatic measurement of rotifer brachionus plicatilis densities in first feeding tanks")
+                    .withField(StandardField.JOURNAL, "Aquacultural engineering")
+                    .withField(StandardField.VOLUME, "36")
+                    .withField(StandardField.NUMBER, "2")
+                    .withField(StandardField.YEAR, "2007")
+                    .withField(StandardField.PAGES, "115-121")
+                    .withField(
+                            StandardField.COMMENT,
+                            "[1] M. O. Alver, T. Tennøy, J. A. Alfredsen, and G. Øie, “Automatic measurement of rotifer brachionus plicatilis densities in first feeding tanks,” Aquacultural engineering, vol. 36, no. 2, pp. 115–121, 2007.");
+    private static final BibEntry ALVER2007A =
+            new BibEntry(StandardEntryType.Article)
+                    .withCitationKey("2")
+                    .withField(StandardField.AUTHOR, "M. O. Alver and others")
+                    .withField(
+                            StandardField.TITLE,
+                            "Estimating larval density in cod (gadus morhua) first feeding tanks using measurements of feed density and larval growth rates")
+                    .withField(StandardField.JOURNAL, "Aquaculture")
+                    .withField(StandardField.VOLUME, "268")
+                    .withField(StandardField.NUMBER, "1")
+                    .withField(StandardField.YEAR, "2007")
+                    .withField(StandardField.PAGES, "216-226")
+                    .withField(
+                            StandardField.COMMENT,
+                            "[2] M. O. Alver et al., “Estimating larval density in cod (gadus morhua) first feeding tanks using measurements of feed density and larval growth rates,” Aquaculture, vol. 268, no. 1, pp. 216–226, 2007.");
+    private static final BibEntry KOPP2012 =
+            new BibEntry(StandardEntryType.InProceedings)
+                    .withCitationKey("3")
+                    .withField(StandardField.AUTHOR, "O. Kopp and others")
+                    .withField(
+                            StandardField.TITLE,
+                            "BPMN4TOSCA: A domain-specific language to model management plans for composite applications")
+                    .withField(StandardField.BOOKTITLE, "Business Process Model and Notation")
+                    .withField(StandardField.SERIES, "LNCS")
+                    .withField(StandardField.VOLUME, "125")
+                    .withField(StandardField.YEAR, "2012")
+                    .withField(StandardField.PUBLISHER, "Springer")
+                    .withField(
+                            StandardField.COMMENT,
+                            "[3] O. Kopp et al., “BPMN4TOSCA: A domain-specific language to model management plans for composite applications,” in Business Process Model and Notation, ser. LNCS, vol. 125. Springer, 2012.");
+    private static final BibEntry KOPPP2018 =
+            new BibEntry(StandardEntryType.InProceedings)
+                    .withCitationKey("4")
+                    .withField(StandardField.AUTHOR, "O. Kopp and A. Armbruster and O. Zimmermann")
+                    .withField(
+                            StandardField.TITLE,
+                            "Markdown architectural decision records: Format and tool support")
+                    .withField(StandardField.BOOKTITLE, "ZEUS")
+                    .withField(StandardField.YEAR, "2018")
+                    .withField(StandardField.PUBLISHER, "CEUR-WS.org")
+                    .withField(
+                            StandardField.COMMENT,
+                            "[4] O. Kopp, A. Armbruster, and O. Zimmermann, “Markdown architectural decision records: Format and tool support,” in ZEUS. CEUR-WS.org, 2018.");
+    private static final BibEntry KOENIG2023 =
+            new BibEntry(StandardEntryType.InProceedings)
+                    .withCitationKey("5")
+                    .withField(StandardField.AUTHOR, "S. König and others")
+                    .withField(StandardField.TITLE, "BPMN4Cars: A car-tailored workflow engine")
+                    .withField(StandardField.BOOKTITLE, "INDIN")
+                    .withField(StandardField.PUBLISHER, "IEEE")
+                    .withField(StandardField.YEAR, "2023")
+                    .withField(
+                            StandardField.COMMENT,
+                            "[5] S. König et al., “BPMN4Cars: A car-tailored workflow engine,” in INDIN. IEEE, 2023.");
 
     private BibliographyFromPdfImporter bibliographyFromPdfImporter;
 
@@ -144,103 +208,157 @@ void setup() {
 
     @Test
     void tua3i2refpage() throws Exception {
-        Path file = Path.of(BibliographyFromPdfImporterTest.class.getResource("/pdfs/IEEE/tua3i2refpage.pdf").toURI());
+        Path file =
+                Path.of(
+                        BibliographyFromPdfImporterTest.class
+                                .getResource("/pdfs/IEEE/tua3i2refpage.pdf")
+                                .toURI());
         ParserResult parserResult = bibliographyFromPdfImporter.importDatabase(file);
-        BibEntry entry02 = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("2")
-                .withField(StandardField.AUTHOR, "K. Kondo and others")
-                .withField(StandardField.TITLE, "Validation of the Linear IFMIF Prototype Accelerator (LIPAc) in Rokkasho")
-                .withField(StandardField.JOURNAL, "Fusion Eng. Des") // TODO: Final dot should be kept
-                .withField(StandardField.VOLUME, "153")
-                .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.PAGES, "111503")
-                .withField(StandardField.DOI, "10.1016/j.fusengdes.2020.111503")
-                .withField(StandardField.COMMENT, "[2] K. Kondo et al., “Validation of the Linear IFMIF Prototype Accelerator (LIPAc) in Rokkasho”, Fusion Eng. Des., vol. 153, p. 111503, 2020. doi:10.1016/j.fusengdes.2020. 111503");
+        BibEntry entry02 =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("2")
+                        .withField(StandardField.AUTHOR, "K. Kondo and others")
+                        .withField(
+                                StandardField.TITLE,
+                                "Validation of the Linear IFMIF Prototype Accelerator (LIPAc) in Rokkasho")
+                        .withField(
+                                StandardField.JOURNAL,
+                                "Fusion Eng. Des") // TODO: Final dot should be kept
+                        .withField(StandardField.VOLUME, "153")
+                        .withField(StandardField.YEAR, "2020")
+                        .withField(StandardField.PAGES, "111503")
+                        .withField(StandardField.DOI, "10.1016/j.fusengdes.2020.111503")
+                        .withField(
+                                StandardField.COMMENT,
+                                "[2] K. Kondo et al., “Validation of the Linear IFMIF Prototype Accelerator (LIPAc) in Rokkasho”, Fusion Eng. Des., vol. 153, p. 111503, 2020. doi:10.1016/j.fusengdes.2020. 111503");
 
-        BibEntry entry04 = new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey("4")
-                .withField(StandardField.AUTHOR, "G. Devanz and others")
-                .withField(StandardField.TITLE, "Manufacturing and validation tests of IFMIF low-beta HWRs")
-                .withField(StandardField.BOOKTITLE, "Proc. IPAC’17, Copenhagen, Denmark")
-                .withField(StandardField.MONTH, "#may#")
-                .withField(StandardField.YEAR, "2017")
-                .withField(StandardField.PAGES, "942-944")
-                .withField(StandardField.DOI, "10.18429/JACoW-IPAC2017-MOPVA039")
-                .withField(StandardField.COMMENT, "[4] G. Devanz et al., “Manufacturing and validation tests of IFMIF low-beta HWRs”, in Proc. IPAC’17, Copen- hagen, Denmark, May 2017, pp. 942-944. doi:10.18429/ JACoW-IPAC2017-MOPVA039");
+        BibEntry entry04 =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey("4")
+                        .withField(StandardField.AUTHOR, "G. Devanz and others")
+                        .withField(
+                                StandardField.TITLE,
+                                "Manufacturing and validation tests of IFMIF low-beta HWRs")
+                        .withField(StandardField.BOOKTITLE, "Proc. IPAC’17, Copenhagen, Denmark")
+                        .withField(StandardField.MONTH, "#may#")
+                        .withField(StandardField.YEAR, "2017")
+                        .withField(StandardField.PAGES, "942-944")
+                        .withField(StandardField.DOI, "10.18429/JACoW-IPAC2017-MOPVA039")
+                        .withField(
+                                StandardField.COMMENT,
+                                "[4] G. Devanz et al., “Manufacturing and validation tests of IFMIF low-beta HWRs”, in Proc. IPAC’17, Copen- hagen, Denmark, May 2017, pp. 942-944. doi:10.18429/ JACoW-IPAC2017-MOPVA039");
 
-        BibEntry entry05 = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("5")
-                .withField(StandardField.AUTHOR, "B. Brañas and others")
-                .withField(StandardField.TITLE, "The LIPAc Beam Dump")
-                .withField(StandardField.JOURNAL, "Fusion Eng. Des")
-                .withField(StandardField.VOLUME, "127")
-                .withField(StandardField.PAGES, "127-138")
-                .withField(StandardField.YEAR, "2018")
-                .withField(StandardField.DOI, "10.1016/j.fusengdes.2017.12.018")
-                .withField(StandardField.COMMENT, "[5] B. Brañas et al., “The LIPAc Beam Dump”, Fusion Eng. Des., vol. 127, pp. 127-138, 2018. doi:10.1016/j.fusengdes. 2017.12.018");
+        BibEntry entry05 =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("5")
+                        .withField(StandardField.AUTHOR, "B. Brañas and others")
+                        .withField(StandardField.TITLE, "The LIPAc Beam Dump")
+                        .withField(StandardField.JOURNAL, "Fusion Eng. Des")
+                        .withField(StandardField.VOLUME, "127")
+                        .withField(StandardField.PAGES, "127-138")
+                        .withField(StandardField.YEAR, "2018")
+                        .withField(StandardField.DOI, "10.1016/j.fusengdes.2017.12.018")
+                        .withField(
+                                StandardField.COMMENT,
+                                "[5] B. Brañas et al., “The LIPAc Beam Dump”, Fusion Eng. Des., vol. 127, pp. 127-138, 2018. doi:10.1016/j.fusengdes. 2017.12.018");
 
-        BibEntry entry08 = new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey("8")
-                .withField(StandardField.AUTHOR, "F. Scantamburlo and others")
-                .withField(StandardField.TITLE, "Linear IFMIF Prototype Accelera-tor (LIPAc) Radio Frequency Quadrupole’s (RFQ) RF couplers enhancement towards CW operation at nominal voltage")
-                .withField(StandardField.BOOKTITLE, "Proc. ISFNT’23, Las Palmas de Gran Canaria, Spain")
-                .withField(StandardField.MONTH, "#sep#")
-                .withField(StandardField.YEAR, "2023")
-                .withField(StandardField.COMMENT, "[8] F. Scantamburlo et al., “Linear IFMIF Prototype Accelera-tor (LIPAc) Radio Frequency Quadrupole’s (RFQ) RF couplers enhancement towards CW operation at nominal voltage”, in Proc. ISFNT’23, Sep. 2023, Las Palmas de Gran Canaria, Spain.");
+        BibEntry entry08 =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey("8")
+                        .withField(StandardField.AUTHOR, "F. Scantamburlo and others")
+                        .withField(
+                                StandardField.TITLE,
+                                "Linear IFMIF Prototype Accelera-tor (LIPAc) Radio Frequency Quadrupole’s (RFQ) RF couplers enhancement towards CW operation at nominal voltage")
+                        .withField(
+                                StandardField.BOOKTITLE,
+                                "Proc. ISFNT’23, Las Palmas de Gran Canaria, Spain")
+                        .withField(StandardField.MONTH, "#sep#")
+                        .withField(StandardField.YEAR, "2023")
+                        .withField(
+                                StandardField.COMMENT,
+                                "[8] F. Scantamburlo et al., “Linear IFMIF Prototype Accelera-tor (LIPAc) Radio Frequency Quadrupole’s (RFQ) RF couplers enhancement towards CW operation at nominal voltage”, in Proc. ISFNT’23, Sep. 2023, Las Palmas de Gran Canaria, Spain.");
 
-        BibEntry entry09 = new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey("9")
-                .withField(StandardField.AUTHOR, "A. De Franco and others")
+        BibEntry entry09 =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey("9")
+                        .withField(StandardField.AUTHOR, "A. De Franco and others")
                         .withField(StandardField.BOOKTITLE, "Proc. IPAC’23, Venice, Italy")
-                .withField(StandardField.TITLE, "RF conditioning towards continuous wave of the FRQ of the Linear IFMIF Prototype Accelerator")
-                .withField(StandardField.PAGES, "2345-2348")
-                .withField(StandardField.MONTH, "#may#")
-                .withField(StandardField.YEAR, "2023")
+                        .withField(
+                                StandardField.TITLE,
+                                "RF conditioning towards continuous wave of the FRQ of the Linear IFMIF Prototype Accelerator")
+                        .withField(StandardField.PAGES, "2345-2348")
+                        .withField(StandardField.MONTH, "#may#")
+                        .withField(StandardField.YEAR, "2023")
                         .withField(StandardField.DOI, "10.18429/JACoW-IPAC2023-TUPM065")
-                                .withField(StandardField.COMMENT, "[9] A. De Franco et al., “RF conditioning towards continuous wave of the FRQ of the Linear IFMIF Prototype Accelerator”, in Proc. IPAC’23, Venice, Italy, May 2023, pp. 2345-2348. doi:10.18429/JACoW-IPAC2023-TUPM065");
+                        .withField(
+                                StandardField.COMMENT,
+                                "[9] A. De Franco et al., “RF conditioning towards continuous wave of the FRQ of the Linear IFMIF Prototype Accelerator”, in Proc. IPAC’23, Venice, Italy, May 2023, pp. 2345-2348. doi:10.18429/JACoW-IPAC2023-TUPM065");
 
-        BibEntry entry10 = new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey("10")
-                .withField(StandardField.AUTHOR, "K. Hirosawa and others")
-                .withField(StandardField.BOOKTITLE, "Proc. PASJ’23, Japan")
-                .withField(StandardField.TITLE, "High-Power RF tests of repaired circulator for LIPAc RFQ")
-                .withField(StandardField.YEAR, "2023")
-                .withField(StandardField.COMMENT, "[10] K. Hirosawa et al., “High-Power RF tests of repaired circu- lator for LIPAc RFQ”, in Proc. PASJ’23, 2023, Japan.");
+        BibEntry entry10 =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey("10")
+                        .withField(StandardField.AUTHOR, "K. Hirosawa and others")
+                        .withField(StandardField.BOOKTITLE, "Proc. PASJ’23, Japan")
+                        .withField(
+                                StandardField.TITLE,
+                                "High-Power RF tests of repaired circulator for LIPAc RFQ")
+                        .withField(StandardField.YEAR, "2023")
+                        .withField(
+                                StandardField.COMMENT,
+                                "[10] K. Hirosawa et al., “High-Power RF tests of repaired circu- lator for LIPAc RFQ”, in Proc. PASJ’23, 2023, Japan.");
 
-        BibEntry entry12 = new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey("12")
-                .withField(StandardField.AUTHOR, "I. Podadera and others")
-                .withField(StandardField.TITLE, "Beam commissioning of beam position and phase monitors for LIPAc")
-                .withField(StandardField.BOOKTITLE, "Proc. IBIC’19, Malmö, Sweden")
-                .withField(StandardField.PAGES, "534-538")
-                .withField(StandardField.MONTH, "#sep#")
-                .withField(StandardField.YEAR, "2019")
-                .withField(StandardField.DOI, "10.18429/JACoW-IBIC2019-WEPP013")
-                .withField(StandardField.COMMENT, "[12] I. Podadera et al., “Beam commissioning of beam posi- tion and phase monitors for LIPAc”, in Proc. IBIC’19, Malmö, Sweden, Sep. 2019, pp. 534-538. doi:10.18429/ JACoW-IBIC2019-WEPP013");
+        BibEntry entry12 =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey("12")
+                        .withField(StandardField.AUTHOR, "I. Podadera and others")
+                        .withField(
+                                StandardField.TITLE,
+                                "Beam commissioning of beam position and phase monitors for LIPAc")
+                        .withField(StandardField.BOOKTITLE, "Proc. IBIC’19, Malmö, Sweden")
+                        .withField(StandardField.PAGES, "534-538")
+                        .withField(StandardField.MONTH, "#sep#")
+                        .withField(StandardField.YEAR, "2019")
+                        .withField(StandardField.DOI, "10.18429/JACoW-IBIC2019-WEPP013")
+                        .withField(
+                                StandardField.COMMENT,
+                                "[12] I. Podadera et al., “Beam commissioning of beam posi- tion and phase monitors for LIPAc”, in Proc. IBIC’19, Malmö, Sweden, Sep. 2019, pp. 534-538. doi:10.18429/ JACoW-IBIC2019-WEPP013");
 
-        BibEntry entry13 = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("13")
-                .withField(StandardField.AUTHOR, "K. Kondo and others")
-                .withField(StandardField.TITLE, "Neutron production measurement in the 125 mA 5 MeV Deuteron beam commissioning of Linear IFMIF Prototype Accelerator (LIPAc) RFQ")
-                .withField(StandardField.JOURNAL, "Nucl. Fusion")
-                .withField(StandardField.VOLUME, "61")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "116002")
-                .withField(StandardField.YEAR, "2021")
-                .withField(StandardField.DOI, "82310.1088/1741-4326/ac233c")
-                .withField(StandardField.COMMENT, "[13] K. Kondo et al., “Neutron production measurement in the 125 mA 5 MeV Deuteron beam commissioning of Linear IFMIF Prototype Accelerator (LIPAc) RFQ”, Nucl. Fusion, vol. 61, no. 1, p. 116002, 2021. doi:82310.1088/1741-4326/ ac233c");
+        BibEntry entry13 =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("13")
+                        .withField(StandardField.AUTHOR, "K. Kondo and others")
+                        .withField(
+                                StandardField.TITLE,
+                                "Neutron production measurement in the 125 mA 5 MeV Deuteron beam commissioning of Linear IFMIF Prototype Accelerator (LIPAc) RFQ")
+                        .withField(StandardField.JOURNAL, "Nucl. Fusion")
+                        .withField(StandardField.VOLUME, "61")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "116002")
+                        .withField(StandardField.YEAR, "2021")
+                        .withField(StandardField.DOI, "82310.1088/1741-4326/ac233c")
+                        .withField(
+                                StandardField.COMMENT,
+                                "[13] K. Kondo et al., “Neutron production measurement in the 125 mA 5 MeV Deuteron beam commissioning of Linear IFMIF Prototype Accelerator (LIPAc) RFQ”, Nucl. Fusion, vol. 61, no. 1, p. 116002, 2021. doi:82310.1088/1741-4326/ ac233c");
 
-        BibEntry entry17 = new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey("17")
-                .withField(StandardField.AUTHOR, "L. Bellan and others")
-                .withField(StandardField.BOOKTITLE, "Proc. ICIS’21, TRIUMF, Vancouver, BC, Canada")
-                .withField(StandardField.COMMENT, "[17] L. Bellan et al., “Extraction and low energy beam transport models used for the IFMIF/EVEDA RFQ commissioning”, in Proc. ICIS’21, TRIUMF, Vancouver, BC, Canada, Sep. 2021. https://indico.cern.ch/event/1027296/")
-                .withField(StandardField.MONTH, "#sep#")
-                .withField(StandardField.TITLE, "Extraction and low energy beam transport models used for the IFMIF/EVEDA RFQ commissioning")
-                .withField(StandardField.URL, "https://indico.cern.ch/event/1027296/")
-                .withField(StandardField.YEAR, "2021");
+        BibEntry entry17 =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey("17")
+                        .withField(StandardField.AUTHOR, "L. Bellan and others")
+                        .withField(
+                                StandardField.BOOKTITLE,
+                                "Proc. ICIS’21, TRIUMF, Vancouver, BC, Canada")
+                        .withField(
+                                StandardField.COMMENT,
+                                "[17] L. Bellan et al., “Extraction and low energy beam transport models used for the IFMIF/EVEDA RFQ commissioning”, in Proc. ICIS’21, TRIUMF, Vancouver, BC, Canada, Sep. 2021. https://indico.cern.ch/event/1027296/")
+                        .withField(StandardField.MONTH, "#sep#")
+                        .withField(
+                                StandardField.TITLE,
+                                "Extraction and low energy beam transport models used for the IFMIF/EVEDA RFQ commissioning")
+                        .withField(StandardField.URL, "https://indico.cern.ch/event/1027296/")
+                        .withField(StandardField.YEAR, "2021");
 
-        assertEquals(List.of(
+        assertEquals(
+                List.of(
                         KNASTER_2017,
                         entry02,
                         SHIMOSAKI_2019,
@@ -263,9 +381,15 @@ void tua3i2refpage() throws Exception {
 
     @Test
     void ieeePaper() throws Exception {
-        Path file = Path.of(BibliographyFromPdfImporterTest.class.getResource("/pdfs/IEEE/ieee-paper.pdf").toURI());
+        Path file =
+                Path.of(
+                        BibliographyFromPdfImporterTest.class
+                                .getResource("/pdfs/IEEE/ieee-paper.pdf")
+                                .toURI());
         ParserResult parserResult = bibliographyFromPdfImporter.importDatabase(file);
-        assertEquals(List.of(ALVER2007, ALVER2007A, KOPP2012, KOPPP2018, KOENIG2023), parserResult.getDatabase().getEntries());
+        assertEquals(
+                List.of(ALVER2007, ALVER2007A, KOPP2012, KOPPP2018, KOENIG2023),
+                parserResult.getDatabase().getEntries());
     }
 
     static Stream<BibEntry> references() {
@@ -280,22 +404,35 @@ static Stream<BibEntry> references() {
                 AKAGI_2023,
                 INTERNAL_NOTE,
                 new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey("18")
-                .withField(StandardField.AUTHOR, "Z. Yao and D. S. Weld and W-P. Chen and H. Sun")
-                .withField(StandardField.BOOKTITLE, "Proceedings of the 2018 World Wide Web Conference")
-                .withField(StandardField.COMMENT, "[18] Z. Yao, D. S. Weld, W.-P. Chen, and H. Sun, “Staqc: A systematically mined question-code dataset from stack overflow,” in Proceedings of the 2018 World Wide Web Conference, 2018, pp. 1693–1703.")
-                .withField(StandardField.TITLE, "Staqc: A systematically mined question-code dataset from stack overflow")
-                .withField(StandardField.PAGES, "1693-1703")
-                .withField(StandardField.YEAR, "2018")
-        );
+                        .withCitationKey("18")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Z. Yao and D. S. Weld and W-P. Chen and H. Sun")
+                        .withField(
+                                StandardField.BOOKTITLE,
+                                "Proceedings of the 2018 World Wide Web Conference")
+                        .withField(
+                                StandardField.COMMENT,
+                                "[18] Z. Yao, D. S. Weld, W.-P. Chen, and H. Sun, “Staqc: A systematically mined question-code dataset from stack overflow,” in Proceedings of the 2018 World Wide Web Conference, 2018, pp. 1693–1703.")
+                        .withField(
+                                StandardField.TITLE,
+                                "Staqc: A systematically mined question-code dataset from stack overflow")
+                        .withField(StandardField.PAGES, "1693-1703")
+                        .withField(StandardField.YEAR, "2018"));
     }
 
     @ParameterizedTest
     @MethodSource
     void references(BibEntry expectedEntry) {
-        List<BibliographyFromPdfImporter.IntermediateData> intermediateDataList = BibliographyFromPdfImporter.getIntermediateData(expectedEntry.getField(StandardField.COMMENT).get());
+        List<BibliographyFromPdfImporter.IntermediateData> intermediateDataList =
+                BibliographyFromPdfImporter.getIntermediateData(
+                        expectedEntry.getField(StandardField.COMMENT).get());
         assertEquals(1, intermediateDataList.size());
-        BibliographyFromPdfImporter.IntermediateData intermediateData = intermediateDataList.getFirst();
-        assertEquals(expectedEntry, bibliographyFromPdfImporter.parseReference(intermediateData.number(), intermediateData.reference()));
+        BibliographyFromPdfImporter.IntermediateData intermediateData =
+                intermediateDataList.getFirst();
+        assertEquals(
+                expectedEntry,
+                bibliographyFromPdfImporter.parseReference(
+                        intermediateData.number(), intermediateData.reference()));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterFilesTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterFilesTest.java
index e30bb8b83713..ff93ca49c44d 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterFilesTest.java
@@ -1,19 +1,22 @@
 package org.jabref.logic.importer.fileformat;
 
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import java.io.IOException;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
 class BiblioscapeImporterFilesTest {
 
     private static final String FILE_ENDING = ".txt";
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("BiblioscapeImporterTest")
-                && name.endsWith(FILE_ENDING) && !name.contains("Corrupt");
+        Predicate<String> fileName =
+                name ->
+                        name.startsWith("BiblioscapeImporterTest")
+                                && name.endsWith(FILE_ENDING)
+                                && !name.contains("Corrupt");
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java
index 8909cad12f15..001c4585e4b6 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.nio.file.Path;
-import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.util.StandardFileType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.nio.file.Path;
+import java.util.Collections;
 
 class BiblioscapeImporterTest {
 
@@ -31,8 +30,10 @@ void sGetExtensions() {
 
     @Test
     void getDescription() {
-        assertEquals("Imports a Biblioscape Tag File.\n" +
-                "Several Biblioscape field types are ignored. Others are only included in the BibTeX field \"comment\".", importer.getDescription());
+        assertEquals(
+                "Imports a Biblioscape Tag File.\n"
+                        + "Several Biblioscape field types are ignored. Others are only included in the BibTeX field \"comment\".",
+                importer.getDescription());
     }
 
     @Test
@@ -42,8 +43,12 @@ void getCLIID() {
 
     @Test
     void importEntriesAbortion() throws Throwable {
-        Path file = Path.of(BiblioscapeImporter.class.getResource("BiblioscapeImporterTestCorrupt.txt").toURI());
-        assertEquals(Collections.emptyList(),
-                importer.importDatabase(file).getDatabase().getEntries());
+        Path file =
+                Path.of(
+                        BiblioscapeImporter.class
+                                .getResource("BiblioscapeImporterTestCorrupt.txt")
+                                .toURI());
+        assertEquals(
+                Collections.emptyList(), importer.importDatabase(file).getDatabase().getEntries());
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTypesTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTypesTest.java
index a0fbfd3dafa9..655e4478b9bd 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTypesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTypesTest.java
@@ -1,22 +1,21 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
 
 class BiblioscapeImporterTypesTest {
 
@@ -30,18 +29,28 @@ private static Stream<Arguments> types() {
                 Arguments.of("report", StandardEntryType.TechReport),
                 Arguments.of("master thesis", StandardEntryType.MastersThesis),
                 Arguments.of("thesis", StandardEntryType.PhdThesis),
-                Arguments.of("master", StandardEntryType.Misc)
-        );
+                Arguments.of("master", StandardEntryType.Misc));
     }
 
     @ParameterizedTest
     @MethodSource("types")
-    void importConvertsToCorrectBibType(String biblioscapeType, EntryType bibtexType) throws IOException {
-        String bsInput = "--AU-- Baklouti, F.\n" + "--YP-- 1999\n" + "--KW-- Cells; Rna; Isoforms\n" + "--TI-- Blood\n"
-                + "--RT-- " + biblioscapeType + "\n" + "------";
+    void importConvertsToCorrectBibType(String biblioscapeType, EntryType bibtexType)
+            throws IOException {
+        String bsInput =
+                "--AU-- Baklouti, F.\n"
+                        + "--YP-- 1999\n"
+                        + "--KW-- Cells; Rna; Isoforms\n"
+                        + "--TI-- Blood\n"
+                        + "--RT-- "
+                        + biblioscapeType
+                        + "\n"
+                        + "------";
 
-        List<BibEntry> bibEntries = new BiblioscapeImporter().importDatabase(new BufferedReader(new StringReader(bsInput)))
-                                                             .getDatabase().getEntries();
+        List<BibEntry> bibEntries =
+                new BiblioscapeImporter()
+                        .importDatabase(new BufferedReader(new StringReader(bsInput)))
+                        .getDatabase()
+                        .getEntries();
 
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, "Baklouti, F.");
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
index 3a3465ac620a..de9d859d82e7 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
@@ -1,13 +1,9 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParserResult;
@@ -17,7 +13,6 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -26,10 +21,14 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 /**
  * This class tests the BibtexImporter.
@@ -43,18 +42,29 @@ class BibtexImporterTest {
 
     @BeforeEach
     void setUp() {
-        importer = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
+        importer =
+                new BibtexImporter(
+                        mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        new DummyFileUpdateMonitor());
     }
 
     @Test
     void isRecognizedFormat() throws IOException, URISyntaxException {
-        Path file = Path.of(BibtexImporterTest.class.getResource("BibtexImporter.examples.bib").toURI());
+        Path file =
+                Path.of(
+                        BibtexImporterTest.class
+                                .getResource("BibtexImporter.examples.bib")
+                                .toURI());
         assertTrue(importer.isRecognizedFormat(file));
     }
 
     @Test
     void importEntries() throws IOException, URISyntaxException {
-        Path file = Path.of(BibtexImporterTest.class.getResource("BibtexImporter.examples.bib").toURI());
+        Path file =
+                Path.of(
+                        BibtexImporterTest.class
+                                .getResource("BibtexImporter.examples.bib")
+                                .toURI());
         List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
 
         assertEquals(4, bibEntries.size());
@@ -70,20 +80,24 @@ void importEntries() throws IOException, URISyntaxException {
                         entry.getField(StandardField.AUTHOR));
                 assertEquals(Optional.of("aksin"), entry.getCitationKey());
                 assertEquals(Optional.of("2006"), entry.getField(StandardField.DATE));
-                assertEquals(Optional.of("Effect of immobilization on catalytic characteristics"), entry.getField(new UnknownField("indextitle")));
+                assertEquals(
+                        Optional.of("Effect of immobilization on catalytic characteristics"),
+                        entry.getField(new UnknownField("indextitle")));
                 assertEquals(Optional.of("#jomch#"), entry.getField(StandardField.JOURNAL));
                 assertEquals(Optional.of("13"), entry.getField(StandardField.NUMBER));
                 assertEquals(Optional.of("3027-3036"), entry.getField(StandardField.PAGES));
-                assertEquals(Optional
-                                .of("""
+                assertEquals(
+                        Optional.of(
+                                """
                                         Effect of immobilization on catalytic characteristics of
                                                           saturated {Pd-N}-heterocyclic carbenes in {Mizoroki-Heck}
                                                           reactions"""),
                         entry.getField(StandardField.TITLE));
                 assertEquals(Optional.of("691"), entry.getField(StandardField.VOLUME));
             } else if ("stdmodel".equals(entry.getCitationKey().get())) {
-                assertEquals(Optional
-                                .of("""
+                assertEquals(
+                        Optional.of(
+                                """
                                         A \\texttt{set} with three members discussing the standard
                                                           model of particle physics. The \\texttt{crossref} field
                                                           in the \\texttt{@set} entry and the \\texttt{entryset} field in
@@ -91,30 +105,40 @@ void importEntries() throws IOException, URISyntaxException {
                                                           backend"""),
                         entry.getField(StandardField.ANNOTATION));
                 assertEquals(Optional.of("stdmodel"), entry.getCitationKey());
-                assertEquals(Optional.of("glashow,weinberg,salam"), entry.getField(StandardField.ENTRYSET));
+                assertEquals(
+                        Optional.of("glashow,weinberg,salam"),
+                        entry.getField(StandardField.ENTRYSET));
             } else if ("set".equals(entry.getCitationKey().get())) {
-                assertEquals(Optional
-                                .of("""
+                assertEquals(
+                        Optional.of(
+                                """
                                         A \\texttt{set} with three members. The \\texttt{crossref} field
                                                           in the \\texttt{@set} entry and the \\texttt{entryset} field in
                                                           each set member entry is needed only when using BibTeX as the
                                                           backend"""),
                         entry.getField(StandardField.ANNOTATION));
                 assertEquals(Optional.of("set"), entry.getCitationKey());
-                assertEquals(Optional.of("herrmann,aksin,yoon"), entry.getField(StandardField.ENTRYSET));
+                assertEquals(
+                        Optional.of("herrmann,aksin,yoon"), entry.getField(StandardField.ENTRYSET));
             } else if ("Preissel2016".equals(entry.getCitationKey().get())) {
                 assertEquals(Optional.of("Heidelberg"), entry.getField(StandardField.ADDRESS));
                 assertEquals(Optional.of("Preißel, René"), entry.getField(StandardField.AUTHOR));
                 assertEquals(Optional.of("Preissel2016"), entry.getCitationKey());
-                assertEquals(Optional.of("3., aktualisierte und erweiterte Auflage"),
+                assertEquals(
+                        Optional.of("3., aktualisierte und erweiterte Auflage"),
                         entry.getField(StandardField.EDITION));
                 assertEquals(Optional.of("978-3-86490-311-3"), entry.getField(StandardField.ISBN));
-                assertEquals(Optional.of("Versionsverwaltung"), entry.getField(StandardField.KEYWORDS));
+                assertEquals(
+                        Optional.of("Versionsverwaltung"), entry.getField(StandardField.KEYWORDS));
                 assertEquals(Optional.of("XX, 327 Seiten"), entry.getField(StandardField.PAGES));
                 assertEquals(Optional.of("dpunkt.verlag"), entry.getField(StandardField.PUBLISHER));
-                assertEquals(Optional.of("Git: dezentrale Versionsverwaltung im Team : Grundlagen und Workflows"),
+                assertEquals(
+                        Optional.of(
+                                "Git: dezentrale Versionsverwaltung im Team : Grundlagen und Workflows"),
                         entry.getField(StandardField.TITLE));
-                assertEquals(Optional.of("http://d-nb.info/107601965X"), entry.getField(StandardField.URL));
+                assertEquals(
+                        Optional.of("http://d-nb.info/107601965X"),
+                        entry.getField(StandardField.URL));
                 assertEquals(Optional.of("2016"), entry.getField(StandardField.YEAR));
             }
         }
@@ -132,8 +156,13 @@ void getExtensions() {
 
     @Test
     void recognizesDatabaseID() throws Exception {
-        Path file = Path.of(BibtexImporterTest.class.getResource("AutosavedSharedDatabase.bib").toURI());
-        String sharedDatabaseID = importer.importDatabase(file).getDatabase().getSharedDatabaseID().get();
+        Path file =
+                Path.of(
+                        BibtexImporterTest.class
+                                .getResource("AutosavedSharedDatabase.bib")
+                                .toURI());
+        String sharedDatabaseID =
+                importer.importDatabase(file).getDatabase().getSharedDatabaseID().get();
         assertEquals("13ceoc8dm42f5g1iitao3dj2ap", sharedDatabaseID);
     }
 
@@ -141,38 +170,53 @@ static Stream<Arguments> parsingOfEncodedFileWithHeader() {
         return Stream.of(
                 Arguments.of(StandardCharsets.US_ASCII, "encoding-us-ascii-with-header.bib"),
                 Arguments.of(StandardCharsets.UTF_8, "encoding-utf-8-with-header.bib"),
-                Arguments.of(Charset.forName("Windows-1252"), "encoding-windows-1252-with-header.bib"),
+                Arguments.of(
+                        Charset.forName("Windows-1252"), "encoding-windows-1252-with-header.bib"),
                 Arguments.of(StandardCharsets.UTF_16BE, "encoding-utf-16BE-with-header.bib"),
-                Arguments.of(StandardCharsets.UTF_16BE, "encoding-utf-16BE-without-header.bib")
-        );
+                Arguments.of(StandardCharsets.UTF_16BE, "encoding-utf-16BE-without-header.bib"));
     }
 
     @ParameterizedTest
     @MethodSource
     void parsingOfEncodedFileWithHeader(Charset charset, String fileName) throws Exception {
-        ParserResult parserResult = importer.importDatabase(
-                Path.of(BibtexImporterTest.class.getResource(fileName).toURI()));
+        ParserResult parserResult =
+                importer.importDatabase(
+                        Path.of(BibtexImporterTest.class.getResource(fileName).toURI()));
         assertEquals(Optional.of(charset), parserResult.getMetaData().getEncoding());
     }
 
     @ParameterizedTest
-    @CsvSource({"encoding-windows-1252-with-header.bib", "encoding-windows-1252-without-header.bib"})
-    void parsingOfWindows1252EncodedFileReadsDegreeCharacterCorrectly(String filename) throws Exception {
-        ParserResult parserResult = importer.importDatabase(
-                Path.of(BibtexImporterTest.class.getResource(filename).toURI()));
+    @CsvSource({
+        "encoding-windows-1252-with-header.bib",
+        "encoding-windows-1252-without-header.bib"
+    })
+    void parsingOfWindows1252EncodedFileReadsDegreeCharacterCorrectly(String filename)
+            throws Exception {
+        ParserResult parserResult =
+                importer.importDatabase(
+                        Path.of(BibtexImporterTest.class.getResource(filename).toURI()));
         assertEquals(
-                List.of(new BibEntry(StandardEntryType.Article).withField(StandardField.ABSTRACT, "25° C")),
+                List.of(
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.ABSTRACT, "25° C")),
                 parserResult.getDatabase().getEntries());
     }
 
     @ParameterizedTest
-    @CsvSource({"encoding-utf-8-with-header.bib", "encoding-utf-8-without-header.bib",
-            "encoding-utf-16BE-with-header.bib", "encoding-utf-16BE-without-header.bib"})
+    @CsvSource({
+        "encoding-utf-8-with-header.bib",
+        "encoding-utf-8-without-header.bib",
+        "encoding-utf-16BE-with-header.bib",
+        "encoding-utf-16BE-without-header.bib"
+    })
     void parsingFilesReadsUmlautCharacterCorrectly(String filename) throws Exception {
-        ParserResult parserResult = importer.importDatabase(
-                Path.of(BibtexImporterTest.class.getResource(filename).toURI()));
+        ParserResult parserResult =
+                importer.importDatabase(
+                        Path.of(BibtexImporterTest.class.getResource(filename).toURI()));
         assertEquals(
-                List.of(new BibEntry(StandardEntryType.Article).withField(StandardField.TITLE, "Ü ist ein Umlaut")),
+                List.of(
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.TITLE, "Ü ist ein Umlaut")),
                 parserResult.getDatabase().getEntries());
     }
 
@@ -181,33 +225,48 @@ private static Stream<Arguments> encodingExplicitlySuppliedCorrectlyDetermined()
                 Arguments.of("encoding-utf-8-with-header.bib", true),
                 Arguments.of("encoding-utf-8-without-header.bib", false),
                 Arguments.of("encoding-utf-16BE-with-header.bib", true),
-                Arguments.of("encoding-utf-16BE-without-header.bib", false)
-        );
+                Arguments.of("encoding-utf-16BE-without-header.bib", false));
     }
 
     @ParameterizedTest
     @MethodSource
-    void encodingExplicitlySuppliedCorrectlyDetermined(String filename, boolean encodingExplicitlySupplied) throws Exception {
-        ParserResult parserResult = importer.importDatabase(
-                Path.of(BibtexImporterTest.class.getResource(filename).toURI()));
-        assertEquals(encodingExplicitlySupplied, parserResult.getMetaData().getEncodingExplicitlySupplied());
+    void encodingExplicitlySuppliedCorrectlyDetermined(
+            String filename, boolean encodingExplicitlySupplied) throws Exception {
+        ParserResult parserResult =
+                importer.importDatabase(
+                        Path.of(BibtexImporterTest.class.getResource(filename).toURI()));
+        assertEquals(
+                encodingExplicitlySupplied,
+                parserResult.getMetaData().getEncodingExplicitlySupplied());
     }
 
     @Test
     void wrongEncodingSupplied() throws Exception {
-        ParserResult parserResult = importer.importDatabase(
-                Path.of(BibtexImporterTest.class.getResource("encoding-windows-1252-but-utf-8-declared--decoding-fails.bib").toURI()));
+        ParserResult parserResult =
+                importer.importDatabase(
+                        Path.of(
+                                BibtexImporterTest.class
+                                        .getResource(
+                                                "encoding-windows-1252-but-utf-8-declared--decoding-fails.bib")
+                                        .toURI()));
 
-        // The test file contains "Test{NBSP}I. Last" where the character "{NBSP}" is encoded using Windows-1252 instead of UTF-8
+        // The test file contains "Test{NBSP}I. Last" where the character "{NBSP}" is encoded using
+        // Windows-1252 instead of UTF-8
         assertEquals(
-                List.of(new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Test�I. Last")),
+                List.of(
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Test�I. Last")),
                 parserResult.getDatabase().getEntries());
     }
 
     @Test
     void encodingNotSupplied() throws Exception {
-        ParserResult parserResult = importer.importDatabase(
-                Path.of(BibtexImporterTest.class.getResource("encoding-utf-8-without-header.bib").toURI()));
+        ParserResult parserResult =
+                importer.importDatabase(
+                        Path.of(
+                                BibtexImporterTest.class
+                                        .getResource("encoding-utf-8-without-header.bib")
+                                        .toURI()));
         assertFalse(parserResult.getMetaData().getEncodingExplicitlySupplied());
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
index b42755b8363f..4534df6cf7a8 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -1,16 +1,11 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.io.StringReader;
-import java.net.InetAddress;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -56,7 +51,6 @@
 import org.jabref.model.groups.TexGroup;
 import org.jabref.model.groups.WordKeywordGroup;
 import org.jabref.model.metadata.SaveOrder;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -65,12 +59,17 @@
 import org.junit.jupiter.params.provider.CsvSource;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.InetAddress;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
 
 /**
  * Tests for reading whole bib files can be found at {@link org.jabref.logic.importer.fileformat.BibtexImporterTest}
@@ -97,11 +96,11 @@ void parseWithNullThrowsNullPointerException() {
 
     @Test
     void fromStringRecognizesEntry() throws ParseException {
-        List<BibEntry> result = parser
-                .parseEntries("@article{test,author={Ed von Test}}");
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Ed von Test");
+        List<BibEntry> result = parser.parseEntries("@article{test,author={Ed von Test}}");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Ed von Test");
         assertEquals(List.of(expected), result);
     }
 
@@ -113,35 +112,39 @@ void fromStringReturnsEmptyListFromEmptyString() throws ParseException {
 
     @Test
     void fromStringReturnsEmptyListIfNoEntryRecognized() throws ParseException {
-        Collection<BibEntry> parsed = parser
-                .parseEntries("@@article@@{{{{{{}");
+        Collection<BibEntry> parsed = parser.parseEntries("@@article@@{{{{{{}");
         assertEquals(Collections.emptyList(), parsed);
     }
 
     @Test
     void singleFromStringRecognizesEntry() throws ParseException {
-        Optional<BibEntry> parsed = BibtexParser.singleFromString(
-                """
+        Optional<BibEntry> parsed =
+                BibtexParser.singleFromString(
+                        """
                         @article{canh05,  author = {Crowston, K. and Annabi, H.},
                           title = {Title A}}
                         """,
-                importFormatPreferences);
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("canh05")
-                .withField(StandardField.AUTHOR, "Crowston, K. and Annabi, H.")
-                .withField(StandardField.TITLE, "Title A");
+                        importFormatPreferences);
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("canh05")
+                        .withField(StandardField.AUTHOR, "Crowston, K. and Annabi, H.")
+                        .withField(StandardField.TITLE, "Title A");
         assertEquals(Optional.of(expected), parsed);
     }
 
     @Test
     void singleFromStringRecognizesEntryInMultiple() throws ParseException {
-        Optional<BibEntry> parsed = BibtexParser.singleFromString("""
+        Optional<BibEntry> parsed =
+                BibtexParser.singleFromString(
+                        """
                         @article{canh05, author = {Crowston, K. and Annabi, H.},
                             title = {Title A}}
                         @inProceedings{foo,  author={Norton Bar}}""",
-                importFormatPreferences);
-        assertTrue(parsed.get().getCitationKey().equals(Optional.of("canh05"))
-                || parsed.get().getCitationKey().equals(Optional.of("foo")));
+                        importFormatPreferences);
+        assertTrue(
+                parsed.get().getCitationKey().equals(Optional.of("canh05"))
+                        || parsed.get().getCitationKey().equals(Optional.of("foo")));
     }
 
     @Test
@@ -152,152 +155,175 @@ void singleFromStringReturnsEmptyFromEmptyString() throws ParseException {
 
     @Test
     void singleFromStringReturnsEmptyIfNoEntryRecognized() throws ParseException {
-        Optional<BibEntry> parsed = BibtexParser.singleFromString("@@article@@{{{{{{}", importFormatPreferences);
+        Optional<BibEntry> parsed =
+                BibtexParser.singleFromString("@@article@@{{{{{{}", importFormatPreferences);
         assertEquals(Optional.empty(), parsed);
     }
 
     @Test
     void parseRecognizesEntry() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author={Ed von Test}}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Ed von Test");
+        ParserResult result = parser.parse(new StringReader("@article{test,author={Ed von Test}}"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Ed von Test");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesFieldValuesInQuotationMarks() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author=\"Ed von Test\"}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Ed von Test");
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,author=\"Ed von Test\"}"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Ed von Test");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryOnlyWithKey() throws IOException {
         ParserResult result = parser.parse(new StringReader("@article{test}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test");
+        BibEntry expected = new BibEntry(StandardEntryType.Article).withCitationKey("test");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryWithWhitespaceAtBeginning() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader(" @article{test,author={Ed von Test}}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withUserComments(" ")
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Ed von Test");
+        ParserResult result =
+                parser.parse(new StringReader(" @article{test,author={Ed von Test}}"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withUserComments(" ")
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Ed von Test");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryWithWhitespace() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article { test,author={Ed von Test}}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Ed von Test");
+        ParserResult result =
+                parser.parse(new StringReader("@article { test,author={Ed von Test}}"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Ed von Test");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryWithNewlines() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article\n{\ntest,author={Ed von Test}}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Ed von Test");
+        ParserResult result =
+                parser.parse(new StringReader("@article\n{\ntest,author={Ed von Test}}"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Ed von Test");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryWithUnknownType() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@unknown{test,author={Ed von Test}}"));
-        BibEntry expected = new BibEntry(new UnknownEntryType("unknown"))
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Ed von Test");
+        ParserResult result = parser.parse(new StringReader("@unknown{test,author={Ed von Test}}"));
+        BibEntry expected =
+                new BibEntry(new UnknownEntryType("unknown"))
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Ed von Test");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryWithVeryLongType() throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader("@thisIsALongStringToTestMaybeItIsToLongWhoKnowsNOTme{test,author={Ed von Test}}"));
-        BibEntry expected = new BibEntry(new UnknownEntryType("thisisalongstringtotestmaybeitistolongwhoknowsnotme"))
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Ed von Test");
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@thisIsALongStringToTestMaybeItIsToLongWhoKnowsNOTme{test,author={Ed von Test}}"));
+        BibEntry expected =
+                new BibEntry(
+                                new UnknownEntryType(
+                                        "thisisalongstringtotestmaybeitistolongwhoknowsnotme"))
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Ed von Test");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryInParenthesis() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article(test,author={Ed von Test})"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Ed von Test");
+        ParserResult result = parser.parse(new StringReader("@article(test,author={Ed von Test})"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Ed von Test");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryWithBigNumbers() throws IOException {
-        ParserResult result = parser.parse(new StringReader("""
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                 @article{canh05,isbn = 1234567890123456789,
                 isbn2 = {1234567890123456789},
                 small = 1234,
                 }"""));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("canh05")
-                .withField(StandardField.ISBN, "1234567890123456789")
-                .withField(new UnknownField("isbn2"), "1234567890123456789")
-                .withField(new UnknownField("small"), "1234");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("canh05")
+                        .withField(StandardField.ISBN, "1234567890123456789")
+                        .withField(new UnknownField("isbn2"), "1234567890123456789")
+                        .withField(new UnknownField("small"), "1234");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesCitationKeyWithSpecialCharacters() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{te_st:with-special(characters),author={Ed von Test}}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("te_st:with-special(characters)")
-                .withField(StandardField.AUTHOR, "Ed von Test");
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@article{te_st:with-special(characters),author={Ed von Test}}"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("te_st:with-special(characters)")
+                        .withField(StandardField.AUTHOR, "Ed von Test");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryWhereLastFieldIsFinishedWithComma() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author={Ed von Test},}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Ed von Test");
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,author={Ed von Test},}"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Ed von Test");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryWithAtInField() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author={Ed von T@st}}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withField(InternalField.KEY_FIELD, "test")
-                .withField(StandardField.AUTHOR, "Ed von T@st");
+        ParserResult result = parser.parse(new StringReader("@article{test,author={Ed von T@st}}"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(InternalField.KEY_FIELD, "test")
+                        .withField(StandardField.AUTHOR, "Ed von T@st");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryPrecedingComment() throws IOException {
-        String comment = "@Comment{@article{myarticle,}" + OS.NEWLINE
-                + "@inproceedings{blabla, title={the proceedings of bl@bl@}; }" + OS.NEWLINE + "}" + OS.NEWLINE;
+        String comment =
+                "@Comment{@article{myarticle,}"
+                        + OS.NEWLINE
+                        + "@inproceedings{blabla, title={the proceedings of bl@bl@}; }"
+                        + OS.NEWLINE
+                        + "}"
+                        + OS.NEWLINE;
         String entryWithComment = comment + "@article{test,author={Ed von T@st}}";
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withField(InternalField.KEY_FIELD, "test")
-                .withField(StandardField.AUTHOR, "Ed von T@st");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(InternalField.KEY_FIELD, "test")
+                        .withField(StandardField.AUTHOR, "Ed von T@st");
         expected.setCommentsBeforeEntry(comment);
 
         ParserResult result = parser.parse(new StringReader(entryWithComment));
@@ -309,78 +335,100 @@ void parseRecognizesEntryPrecedingComment() throws IOException {
 
     @Test
     void parseRecognizesMultipleEntries() throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader("""
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                         @article{canh05,  author = {Crowston, K. and Annabi, H.},
                           title = {Title A}}
                         @inProceedings{foo,  author={Norton Bar}}"""));
-        List<BibEntry> expected = List.of(
-                new BibEntry(StandardEntryType.Article)
-                        .withCitationKey("canh05")
-                        .withField(StandardField.AUTHOR, "Crowston, K. and Annabi, H.")
-                        .withField(StandardField.TITLE, "Title A"),
-                new BibEntry(StandardEntryType.InProceedings)
-                        .withCitationKey("foo")
-                        .withField(StandardField.AUTHOR, "Norton Bar"));
+        List<BibEntry> expected =
+                List.of(
+                        new BibEntry(StandardEntryType.Article)
+                                .withCitationKey("canh05")
+                                .withField(StandardField.AUTHOR, "Crowston, K. and Annabi, H.")
+                                .withField(StandardField.TITLE, "Title A"),
+                        new BibEntry(StandardEntryType.InProceedings)
+                                .withCitationKey("foo")
+                                .withField(StandardField.AUTHOR, "Norton Bar"));
         assertEquals(expected, result.getDatabase().getEntries());
     }
 
     @Test
     void parseSetsParsedSerialization() throws IOException {
-        String firstEntry = "@article{canh05," + "  author = {Crowston, K. and Annabi, H.}," + OS.NEWLINE
-                + "  title = {Title A}}" + OS.NEWLINE;
+        String firstEntry =
+                "@article{canh05,"
+                        + "  author = {Crowston, K. and Annabi, H.},"
+                        + OS.NEWLINE
+                        + "  title = {Title A}}"
+                        + OS.NEWLINE;
         String secondEntry = "@inProceedings{foo," + "  author={Norton Bar}}";
-        List<BibEntry> parsedEntries = parser.parse(new StringReader(firstEntry + secondEntry))
-                                             .getDatabase().getEntries();
+        List<BibEntry> parsedEntries =
+                parser.parse(new StringReader(firstEntry + secondEntry)).getDatabase().getEntries();
         assertEquals(firstEntry, parsedEntries.getFirst().getParsedSerialization());
         assertEquals(secondEntry, parsedEntries.get(1).getParsedSerialization());
     }
 
     @Test
     void parseRecognizesMultipleEntriesOnSameLine() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{canh05}" + "@inProceedings{foo}"));
-        List<BibEntry> expected = List.of(
-                new BibEntry(StandardEntryType.Article)
-                        .withCitationKey("canh05"),
-                new BibEntry(StandardEntryType.InProceedings)
-                        .withCitationKey("foo"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{canh05}" + "@inProceedings{foo}"));
+        List<BibEntry> expected =
+                List.of(
+                        new BibEntry(StandardEntryType.Article).withCitationKey("canh05"),
+                        new BibEntry(StandardEntryType.InProceedings).withCitationKey("foo"));
         assertEquals(expected, result.getDatabase().getEntries());
     }
 
     @Test
     void parseCombinesMultipleAuthorFields() throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader("@article{test,author={Ed von Test},author={Second Author},author={Third Author}}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Ed von Test and Second Author and Third Author");
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@article{test,author={Ed von Test},author={Second Author},author={Third Author}}"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Ed von Test and Second Author and Third Author");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseCombinesMultipleEditorFields() throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader("@article{test,editor={Ed von Test},editor={Second Author},editor={Third Author}}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.EDITOR, "Ed von Test and Second Author and Third Author");
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@article{test,editor={Ed von Test},editor={Second Author},editor={Third Author}}"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(
+                                StandardField.EDITOR,
+                                "Ed von Test and Second Author and Third Author");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseCombinesMultipleKeywordsFields() throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader("@article{test,Keywords={Test},Keywords={Second Keyword},Keywords={Third Keyword}}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.KEYWORDS, "Test, Second Keyword, Third Keyword");
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@article{test,Keywords={Test},Keywords={Second Keyword},Keywords={Third Keyword}}"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.KEYWORDS, "Test, Second Keyword, Third Keyword");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesHeaderButIgnoresEncoding() throws IOException {
-        ParserResult result = parser.parse(new StringReader("""
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                 This file was created with JabRef 2.1 beta 2.
                 Encoding: Cp1252
 
@@ -402,21 +450,30 @@ void parseRecognizesHeaderButIgnoresEncoding() throws IOException {
         assertEquals(StandardEntryType.InProceedings, entry.getType());
         assertEquals(8, entry.getFields().size());
         assertEquals(Optional.of("CroAnnHow05"), entry.getCitationKey());
-        assertEquals(Optional.of("Crowston, K. and Annabi, H. and Howison, J. and Masango, C."), entry.getField(StandardField.AUTHOR));
-        assertEquals(Optional.of("Effective work practices for floss development: A model and propositions"),
+        assertEquals(
+                Optional.of("Crowston, K. and Annabi, H. and Howison, J. and Masango, C."),
+                entry.getField(StandardField.AUTHOR));
+        assertEquals(
+                Optional.of(
+                        "Effective work practices for floss development: A model and propositions"),
                 entry.getField(StandardField.TITLE));
-        assertEquals(Optional.of("Hawaii International Conference On System Sciences (HICSS)"),
+        assertEquals(
+                Optional.of("Hawaii International Conference On System Sciences (HICSS)"),
                 entry.getField(StandardField.BOOKTITLE));
         assertEquals(Optional.of("2005"), entry.getField(StandardField.YEAR));
         assertEquals(Optional.of("oezbek"), entry.getField(StandardField.OWNER));
         assertEquals(Optional.of("2006.05.29"), entry.getField(StandardField.TIMESTAMP));
-        assertEquals(Optional.of("http://james.howison.name/publications.html"), entry.getField(StandardField.URL));
+        assertEquals(
+                Optional.of("http://james.howison.name/publications.html"),
+                entry.getField(StandardField.URL));
     }
 
     @Test
     void parseRecognizesFormatedEntry() throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader("""
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                         @INPROCEEDINGS{CroAnnHow05,
                           author = {Crowston, K. and Annabi, H. and Howison, J. and Masango, C.},
                           title = {Effective work practices for floss development: A model and propositions},
@@ -427,62 +484,75 @@ void parseRecognizesFormatedEntry() throws IOException {
                           url = {http://james.howison.name/publications.html}
                         }))"""));
 
-        BibEntry expected = new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey("CroAnnHow05")
-                .withField(StandardField.AUTHOR, "Crowston, K. and Annabi, H. and Howison, J. and Masango, C.")
-                .withField(StandardField.TITLE, "Effective work practices for floss development: A model and propositions")
-                .withField(StandardField.BOOKTITLE, "Hawaii International Conference On System Sciences (HICSS)")
-                .withField(StandardField.YEAR, "2005")
-                .withField(StandardField.OWNER, "oezbek")
-                .withField(StandardField.TIMESTAMP, "2006.05.29")
-                .withField(StandardField.URL, "http://james.howison.name/publications.html");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey("CroAnnHow05")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Crowston, K. and Annabi, H. and Howison, J. and Masango, C.")
+                        .withField(
+                                StandardField.TITLE,
+                                "Effective work practices for floss development: A model and propositions")
+                        .withField(
+                                StandardField.BOOKTITLE,
+                                "Hawaii International Conference On System Sciences (HICSS)")
+                        .withField(StandardField.YEAR, "2005")
+                        .withField(StandardField.OWNER, "oezbek")
+                        .withField(StandardField.TIMESTAMP, "2006.05.29")
+                        .withField(
+                                StandardField.URL, "http://james.howison.name/publications.html");
 
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesNumbersWithoutBracketsOrQuotationMarks() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,year = 2005}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.YEAR, "2005");
+        ParserResult result = parser.parse(new StringReader("@article{test,year = 2005}"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.YEAR, "2005");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesUppercaseFields() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,AUTHOR={Ed von Test}}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Ed von Test");
+        ParserResult result = parser.parse(new StringReader("@article{test,AUTHOR={Ed von Test}}"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Ed von Test");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesAbsoluteFile() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,file = {D:\\Documents\\literature\\Tansel-PRL2006.pdf}}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.FILE, "D:\\Documents\\literature\\Tansel-PRL2006.pdf");
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@article{test,file = {D:\\Documents\\literature\\Tansel-PRL2006.pdf}}"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(
+                                StandardField.FILE,
+                                "D:\\Documents\\literature\\Tansel-PRL2006.pdf");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesFinalSlashAsSlash() throws Exception {
-        ParserResult result = parser
-                .parse(new StringReader("""
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                         @misc{,
                           test = {wired\\},
                         }
                         """));
         assertEquals(
-                List.of(new BibEntry()
-                        .withField(new UnknownField("test"), "wired\\")),
-                result.getDatabase().getEntries()
-        );
+                List.of(new BibEntry().withField(new UnknownField("test"), "wired\\")),
+                result.getDatabase().getEntries());
     }
 
     /**
@@ -497,18 +567,20 @@ void parseFailsWithFinalSlashAsSlashWhenSingleLine() throws Exception {
 
     @Test
     void parseRecognizesDateFieldWithConcatenation() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,date = {1-4~} # nov}"));
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.DATE, "1-4~#nov#");
+        ParserResult result = parser.parse(new StringReader("@article{test,date = {1-4~} # nov}"));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.DATE, "1-4~#nov#");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseReturnsEmptyListIfNoEntryRecognized() throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader("""
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                           author = {Crowston, K. and Annabi, H. and Howison, J. and Masango, C.},
                           title = {Effective work practices for floss development: A model and propositions},
                           booktitle = {Hawaii International Conference On System Sciences (HICSS)},
@@ -523,8 +595,10 @@ void parseReturnsEmptyListIfNoEntryRecognized() throws IOException {
 
     @Test
     void parseReturnsEmptyListIfNoEntryExistent() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("""
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                         This was created with JabRef 2.1 beta 2.
                         Encoding: Cp1252
                         """));
@@ -533,50 +607,53 @@ void parseReturnsEmptyListIfNoEntryExistent() throws IOException {
 
     @Test
     void parseNotWarnsAboutEntryWithoutCitationKey() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{,author={Ed von Test}}"));
+        ParserResult result = parser.parse(new StringReader("@article{,author={Ed von Test}}"));
         assertFalse(result.hasWarnings());
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Ed von Test");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Ed von Test");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracket() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author={author missing bracket}"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,author={author missing bracket}"));
         assertTrue(result.hasWarnings());
         assertEquals(List.of(), result.getDatabase().getEntries());
     }
 
     @Test
     void parseAddsEscapedOpenBracketToFieldValue() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,review={escaped \\{ bracket}}"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,review={escaped \\{ bracket}}"));
         assertFalse(result.hasWarnings());
 
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.REVIEW, "escaped \\{ bracket");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.REVIEW, "escaped \\{ bracket");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseAddsEscapedClosingBracketToFieldValue() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,review={escaped \\} bracket}}"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,review={escaped \\} bracket}}"));
 
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.REVIEW, "escaped \\} bracket");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.REVIEW, "escaped \\} bracket");
 
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
-    void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracketInQuotationMarks() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author=\"author {missing bracket\"}"));
+    void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracketInQuotationMarks()
+            throws IOException {
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,author=\"author {missing bracket\"}"));
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
 
@@ -586,8 +663,8 @@ void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracketInQuotationMarks() th
 
     @Test
     void parseMovesArbitraryContentAfterEntryToEpilog() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author={author bracket }}}"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,author={author bracket }}}"));
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
 
@@ -597,16 +674,20 @@ void parseMovesArbitraryContentAfterEntryToEpilog() throws IOException {
 
     @Test
     void parseWarnsAboutUnmatchedContentInEntryWithoutComma() throws IOException {
-        ParserResult result = parser.parse(new StringReader("@article{test,author={author bracket } too much}"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,author={author bracket } too much}"));
 
         List<BibEntry> entries = result.getDatabase().getEntries();
 
-        assertEquals(Optional.of("author bracket #too##much#"), entries.getFirst().getField(StandardField.AUTHOR));
+        assertEquals(
+                Optional.of("author bracket #too##much#"),
+                entries.getFirst().getField(StandardField.AUTHOR));
     }
 
     @Test
     void parseWarnsAboutUnmatchedContentInEntry() throws IOException {
-        ParserResult result = parser.parse(new StringReader("@article{test,author={author bracket }, too much}"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,author={author bracket }, too much}"));
 
         List<BibEntry> entries = result.getDatabase().getEntries();
 
@@ -616,35 +697,38 @@ void parseWarnsAboutUnmatchedContentInEntry() throws IOException {
 
     @Test
     void parseAcceptsEntryWithAtSymbolInBrackets() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author={author @ good}}"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,author={author @ good}}"));
 
         List<BibEntry> entries = result.getDatabase().getEntries();
 
         assertEquals(1, entries.size());
-        assertEquals(Optional.of("author @ good"), entries.getFirst().getField(StandardField.AUTHOR));
+        assertEquals(
+                Optional.of("author @ good"), entries.getFirst().getField(StandardField.AUTHOR));
     }
 
     @Test
     void parseRecognizesEntryWithAtSymbolInQuotationMarks() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author=\"author @ good\"}"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,author=\"author @ good\"}"));
 
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "author @ good");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "author @ good");
 
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesFieldsWithBracketsEnclosedInQuotationMarks() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author=\"Test {Ed {von} Test}\"}"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,author=\"Test {Ed {von} Test}\"}"));
 
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Test {Ed {von} Test}");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Test {Ed {von} Test}");
 
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
@@ -652,32 +736,36 @@ void parseRecognizesFieldsWithBracketsEnclosedInQuotationMarks() throws IOExcept
     @Test
     void parseRecognizesFieldsWithEscapedQuotationMarks() throws IOException {
         // Quotes in fields of the form key = "value" have to be escaped by putting them into braces
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author=\"Test {\" Test}\"}"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,author=\"Test {\" Test}\"}"));
 
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, "Test {\" Test}");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Test {\" Test}");
 
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesFieldsWithQuotationMarksInBrackets() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,title=\"Comments on {\"}Filenames and Fonts{\"}\"}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@article{test,title=\"Comments on {\"}Filenames and Fonts{\"}\"}"));
 
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.TITLE, "Comments on {\"}Filenames and Fonts{\"}");
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.TITLE, "Comments on {\"}Filenames and Fonts{\"}");
 
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseIgnoresAndWarnsAboutEntryWithFieldsThatAreNotSeperatedByComma() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author={Ed von Test} year=2005}"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,author={Ed von Test} year=2005}"));
 
         assertEquals(List.of(), result.getDatabase().getEntries());
         assertTrue(result.hasWarnings());
@@ -685,9 +773,11 @@ void parseIgnoresAndWarnsAboutEntryWithFieldsThatAreNotSeperatedByComma() throws
 
     @Test
     void parseIgnoresAndWarnsAboutCorruptedEntryButRecognizeOthers() throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader(
-                        "@article{test,author={author missing bracket}" + "@article{test,author={Ed von Test}}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@article{test,author={author missing bracket}"
+                                        + "@article{test,author={Ed von Test}}"));
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
         BibEntry entry = parsed.iterator().next();
@@ -702,8 +792,8 @@ void parseIgnoresAndWarnsAboutCorruptedEntryButRecognizeOthers() throws IOExcept
 
     @Test
     void parseRecognizesMonthFieldsWithFollowingComma() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author={Ed von Test},month={8,}},"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,author={Ed von Test},month={8,}},"));
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
         BibEntry entry = parsed.iterator().next();
@@ -718,48 +808,45 @@ void parseRecognizesMonthFieldsWithFollowingComma() throws IOException {
 
     @Test
     void parseRecognizesPreamble() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@preamble{some text and \\latex}"));
+        ParserResult result = parser.parse(new StringReader("@preamble{some text and \\latex}"));
 
         assertEquals(Optional.of("some text and \\latex"), result.getDatabase().getPreamble());
     }
 
     @Test
     void parseRecognizesUppercasePreamble() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@PREAMBLE{some text and \\latex}"));
+        ParserResult result = parser.parse(new StringReader("@PREAMBLE{some text and \\latex}"));
 
         assertEquals(Optional.of("some text and \\latex"), result.getDatabase().getPreamble());
     }
 
     @Test
     void parseRecognizesPreambleWithWhitespace() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@preamble {some text and \\latex}"));
+        ParserResult result = parser.parse(new StringReader("@preamble {some text and \\latex}"));
 
         assertEquals(Optional.of("some text and \\latex"), result.getDatabase().getPreamble());
     }
 
     @Test
     void parseRecognizesPreambleInParenthesis() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@preamble(some text and \\latex)"));
+        ParserResult result = parser.parse(new StringReader("@preamble(some text and \\latex)"));
 
         assertEquals(Optional.of("some text and \\latex"), result.getDatabase().getPreamble());
     }
 
     @Test
     void parseRecognizesPreambleWithConcatenation() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@preamble{\"some text\" # \"and \\latex\"}"));
+        ParserResult result =
+                parser.parse(new StringReader("@preamble{\"some text\" # \"and \\latex\"}"));
 
-        assertEquals(Optional.of("\"some text\" # \"and \\latex\""), result.getDatabase().getPreamble());
+        assertEquals(
+                Optional.of("\"some text\" # \"and \\latex\""), result.getDatabase().getPreamble());
     }
 
     @Test
     void parseRecognizesString() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@string{bourdieu = {Bourdieu, Pierre}}"));
+        ParserResult result =
+                parser.parse(new StringReader("@string{bourdieu = {Bourdieu, Pierre}}"));
 
         BibtexString string = result.getDatabase().getStringValues().iterator().next();
 
@@ -770,8 +857,8 @@ void parseRecognizesString() throws IOException {
 
     @Test
     void parseRecognizesStringWithQuotes() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@string{bourdieu = \"Bourdieu, Pierre\"}"));
+        ParserResult result =
+                parser.parse(new StringReader("@string{bourdieu = \"Bourdieu, Pierre\"}"));
 
         BibtexString string = result.getDatabase().getStringValues().iterator().next();
 
@@ -783,8 +870,7 @@ void parseRecognizesStringWithQuotes() throws IOException {
     @Test
     void parseSavesOneNewlineAfterStringInParsedSerialization() throws IOException {
         String string = "@string{bourdieu = {Bourdieu, Pierre}}" + OS.NEWLINE;
-        ParserResult result = parser
-                .parse(new StringReader(string + OS.NEWLINE + OS.NEWLINE));
+        ParserResult result = parser.parse(new StringReader(string + OS.NEWLINE + OS.NEWLINE));
 
         BibtexString parsedString = result.getDatabase().getStringValues().iterator().next();
 
@@ -794,8 +880,8 @@ void parseSavesOneNewlineAfterStringInParsedSerialization() throws IOException {
 
     @Test
     void parseRecognizesStringWithWhitespace() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@string {bourdieu = {Bourdieu, Pierre}}"));
+        ParserResult result =
+                parser.parse(new StringReader("@string {bourdieu = {Bourdieu, Pierre}}"));
 
         BibtexString parsedString = result.getDatabase().getStringValues().iterator().next();
 
@@ -806,8 +892,8 @@ void parseRecognizesStringWithWhitespace() throws IOException {
 
     @Test
     void parseRecognizesStringInParenthesis() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@string(bourdieu = {Bourdieu, Pierre})"));
+        ParserResult result =
+                parser.parse(new StringReader("@string(bourdieu = {Bourdieu, Pierre})"));
 
         BibtexString parsedString = result.getDatabase().getStringValues().iterator().next();
 
@@ -818,8 +904,11 @@ void parseRecognizesStringInParenthesis() throws IOException {
 
     @Test
     void parseRecognizesMultipleStrings() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@string{bourdieu = {Bourdieu, Pierre}}" + "@string{adieu = {Adieu, Pierre}}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@string{bourdieu = {Bourdieu, Pierre}}"
+                                        + "@string{adieu = {Adieu, Pierre}}"));
 
         Iterator<BibtexString> iterator = result.getDatabase().getStringValues().iterator();
         BibtexString first = iterator.next();
@@ -840,11 +929,18 @@ void parseRecognizesMultipleStrings() throws IOException {
 
     @Test
     void parseRecognizesStringAndEntry() throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader("@string{bourdieu = {Bourdieu, Pierre}}"
-                        + "@book{bourdieu-2002-questions-sociologie, " + "    Address = {Paris}," + "    Author = bourdieu,"
-                        + "    Isbn = 2707318256," + "    Publisher = {Minuit}," + "    Title = {Questions de sociologie},"
-                        + "    Year = 2002" + "}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@string{bourdieu = {Bourdieu, Pierre}}"
+                                        + "@book{bourdieu-2002-questions-sociologie, "
+                                        + "    Address = {Paris},"
+                                        + "    Author = bourdieu,"
+                                        + "    Isbn = 2707318256,"
+                                        + "    Publisher = {Minuit},"
+                                        + "    Title = {Questions de sociologie},"
+                                        + "    Year = 2002"
+                                        + "}"));
 
         BibtexString parsedString = result.getDatabase().getStringValues().iterator().next();
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
@@ -855,19 +951,24 @@ void parseRecognizesStringAndEntry() throws IOException {
         assertEquals("Bourdieu, Pierre", parsedString.getContent());
         assertEquals(1, parsedEntries.size());
         assertEquals(StandardEntryType.Book, parsedEntry.getType());
-        assertEquals(Optional.of("bourdieu-2002-questions-sociologie"), parsedEntry.getCitationKey());
+        assertEquals(
+                Optional.of("bourdieu-2002-questions-sociologie"), parsedEntry.getCitationKey());
         assertEquals(Optional.of("Paris"), parsedEntry.getField(StandardField.ADDRESS));
         assertEquals(Optional.of("#bourdieu#"), parsedEntry.getField(StandardField.AUTHOR));
         assertEquals(Optional.of("2707318256"), parsedEntry.getField(StandardField.ISBN));
         assertEquals(Optional.of("Minuit"), parsedEntry.getField(StandardField.PUBLISHER));
-        assertEquals(Optional.of("Questions de sociologie"), parsedEntry.getField(StandardField.TITLE));
+        assertEquals(
+                Optional.of("Questions de sociologie"), parsedEntry.getField(StandardField.TITLE));
         assertEquals(Optional.of("2002"), parsedEntry.getField(StandardField.YEAR));
     }
 
     @Test
     void parseWarnsAboutStringsWithSameNameAndOnlyKeepsOne() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@string{bourdieu = {Bourdieu, Pierre}}" + "@string{bourdieu = {Other}}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@string{bourdieu = {Bourdieu, Pierre}}"
+                                        + "@string{bourdieu = {Other}}"));
 
         assertTrue(result.hasWarnings());
         assertEquals(1, result.getDatabase().getStringCount());
@@ -875,8 +976,7 @@ void parseWarnsAboutStringsWithSameNameAndOnlyKeepsOne() throws IOException {
 
     @Test
     void parseIgnoresComments() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@comment{some text and \\latex}"));
+        ParserResult result = parser.parse(new StringReader("@comment{some text and \\latex}"));
 
         assertEquals(List.of(), result.getDatabase().getEntries());
     }
@@ -884,48 +984,59 @@ void parseIgnoresComments() throws IOException {
     // TODO: We should keep @comment if it is the only "thing" in the file
     @Test
     void parseIgnoresUppercaseComments() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@COMMENT{some text and \\latex}"));
+        ParserResult result = parser.parse(new StringReader("@COMMENT{some text and \\latex}"));
         assertFalse(result.hasWarnings()); // FIXME: We silently remove @COMMENT
         assertEquals(List.of(), result.getDatabase().getEntries());
     }
 
     @Test
     void parseKeepsCommentsAsUserComments() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@comment{some text and \\latex}" + "@article{test,author={Ed von Test}}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@comment{some text and \\latex}"
+                                        + "@article{test,author={Ed von Test}}"));
 
-        assertEquals(List.of(new BibEntry(StandardEntryType.Article)
-                        .withCitationKey("test")
-                        .withField(StandardField.AUTHOR, "Ed von Test")
-                        .withUserComments("@comment{some text and \\latex}")),
+        assertEquals(
+                List.of(
+                        new BibEntry(StandardEntryType.Article)
+                                .withCitationKey("test")
+                                .withField(StandardField.AUTHOR, "Ed von Test")
+                                .withUserComments("@comment{some text and \\latex}")),
                 result.getDatabase().getEntries());
     }
 
     @Test
     void parseIgnoresCommentsAfterEntry() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author={Ed von Test}}" + "@comment{some text and \\latex}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@article{test,author={Ed von Test}}"
+                                        + "@comment{some text and \\latex}"));
 
-        assertEquals(List.of(new BibEntry(StandardEntryType.Article)
-                        .withCitationKey("test")
-                        .withField(StandardField.AUTHOR, "Ed von Test")),
+        assertEquals(
+                List.of(
+                        new BibEntry(StandardEntryType.Article)
+                                .withCitationKey("test")
+                                .withField(StandardField.AUTHOR, "Ed von Test")),
                 result.getDatabase().getEntries());
         assertEquals("@comment{some text and \\latex}", result.getDatabase().getEpilog());
     }
 
     @Test
     void parseIgnoresText() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("comment{some text and \\latex"));
+        ParserResult result = parser.parse(new StringReader("comment{some text and \\latex"));
 
         assertEquals(0, result.getDatabase().getEntries().size());
     }
 
     @Test
     void parseIgnoresTextBeforeEntry() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("comment{some text and \\latex" + "@article{test,author={Ed von Test}}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "comment{some text and \\latex"
+                                        + "@article{test,author={Ed von Test}}"));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -939,8 +1050,11 @@ void parseIgnoresTextBeforeEntry() throws IOException {
 
     @Test
     void parseIgnoresTextAfterEntry() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author={Ed von Test}}" + "comment{some text and \\latex"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@article{test,author={Ed von Test}}"
+                                        + "comment{some text and \\latex"));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -954,8 +1068,7 @@ void parseIgnoresTextAfterEntry() throws IOException {
 
     @Test
     void parsKeesNewlines() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,a = {a\nb}}"));
+        ParserResult result = parser.parse(new StringReader("@article{test,a = {a\nb}}"));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -965,8 +1078,10 @@ void parsKeesNewlines() throws IOException {
 
     @Test
     void parsKeepsMultipleNewlines() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("""
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                         @article{test,a = {a
 
                         b},b = {a
@@ -985,8 +1100,7 @@ void parsKeepsMultipleNewlines() throws IOException {
 
     @Test
     void parseKeepsTabs() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,a = {a\tb}}"));
+        ParserResult result = parser.parse(new StringReader("@article{test,a = {a\tb}}"));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -996,8 +1110,12 @@ void parseKeepsTabs() throws IOException {
 
     @Test
     void parsKeepsMultipleTabs() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,a = {a\t\tb}," + "b = {a\t \tb}," + "c = {a \t \t b}}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@article{test,a = {a\t\tb},"
+                                        + "b = {a\t \tb},"
+                                        + "c = {a \t \t b}}"));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -1009,11 +1127,10 @@ void parsKeepsMultipleTabs() throws IOException {
 
     @Test
     void parsePreservesMultipleSpacesInNonWrappableField() throws IOException {
-        when(importFormatPreferences.fieldPreferences().getNonWrappableFields()).thenReturn(
-                FXCollections.observableArrayList(List.of(StandardField.FILE)));
+        when(importFormatPreferences.fieldPreferences().getNonWrappableFields())
+                .thenReturn(FXCollections.observableArrayList(List.of(StandardField.FILE)));
         BibtexParser parser = new BibtexParser(importFormatPreferences);
-        ParserResult result = parser
-                .parse(new StringReader("@article{canh05,file = {ups  sala}}"));
+        ParserResult result = parser.parse(new StringReader("@article{canh05,file = {ups  sala}}"));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -1023,7 +1140,8 @@ void parsePreservesMultipleSpacesInNonWrappableField() throws IOException {
 
     @Test
     void parsePreservesTabsInAbstractField() throws IOException {
-        ParserResult result = parser.parse(new StringReader("@article{canh05,abstract = {ups  \tsala}}"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{canh05,abstract = {ups  \tsala}}"));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -1033,7 +1151,8 @@ void parsePreservesTabsInAbstractField() throws IOException {
 
     @Test
     void parsePreservesNewlineInAbstractField() throws IOException {
-        ParserResult result = parser.parse(new StringReader("@article{canh05,abstract = {ups \nsala}}"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{canh05,abstract = {ups \nsala}}"));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -1043,8 +1162,8 @@ void parsePreservesNewlineInAbstractField() throws IOException {
 
     @Test
     void parseHandlesAccentsCorrectly() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author = {H'{e}lne Fiaux}}"));
+        ParserResult result =
+                parser.parse(new StringReader("@article{test,author = {H'{e}lne Fiaux}}"));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -1061,8 +1180,10 @@ void parseHandlesAccentsCorrectly() throws IOException {
      */
     @Test
     void parsePreambleAndEntryWithoutNewLine() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@preamble{some text and \\latex}@article{test,author = {H'{e}lne Fiaux}}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@preamble{some text and \\latex}@article{test,author = {H'{e}lne Fiaux}}"));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -1077,8 +1198,9 @@ void parsePreambleAndEntryWithoutNewLine() throws IOException {
 
     @Test
     void parseFileHeaderAndPreambleWithoutNewLine() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("\\% Encoding: US-ASCII@preamble{some text and \\latex}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader("\\% Encoding: US-ASCII@preamble{some text and \\latex}"));
 
         assertFalse(result.hasWarnings());
         assertEquals(Optional.of("some text and \\latex"), result.getDatabase().getPreamble());
@@ -1099,8 +1221,7 @@ void parseSavesEntryInParsedSerialization() throws IOException {
     @Test
     void parseSavesOneNewlineAfterEntryInParsedSerialization() throws IOException {
         String testEntry = "@article{test,author={Ed von Test}}";
-        ParserResult result = parser
-                .parse(new StringReader(testEntry + OS.NEWLINE + OS.NEWLINE));
+        ParserResult result = parser.parse(new StringReader(testEntry + OS.NEWLINE + OS.NEWLINE));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -1112,8 +1233,8 @@ void parseSavesOneNewlineAfterEntryInParsedSerialization() throws IOException {
     @Test
     void parseSavesAllButOneNewlinesBeforeEntryInParsedSerialization() throws IOException {
         String testEntry = "@article{test,author={Ed von Test}}";
-        ParserResult result = parser
-                .parse(new StringReader(OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + testEntry));
+        ParserResult result =
+                parser.parse(new StringReader(OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + testEntry));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -1126,8 +1247,14 @@ void parseSavesAllButOneNewlinesBeforeEntryInParsedSerialization() throws IOExce
     @Test
     void parseRemovesEncodingLineAndSeparatorInParsedSerialization() throws IOException {
         String testEntry = "@article{test,author={Ed von Test}}";
-        ParserResult result = parser.parse(
-                new StringReader(SaveConfiguration.ENCODING_PREFIX + OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + testEntry));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                SaveConfiguration.ENCODING_PREFIX
+                                        + OS.NEWLINE
+                                        + OS.NEWLINE
+                                        + OS.NEWLINE
+                                        + testEntry));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -1142,8 +1269,14 @@ void parseRemovesEncodingLineAndSeparatorInParsedSerialization() throws IOExcept
     void parseSavesNewlinesBetweenEntriesInParsedSerialization() throws IOException {
         String testEntryOne = "@article{test1,author={Ed von Test}}";
         String testEntryTwo = "@article{test2,author={Ed von Test}}";
-        ParserResult result = parser
-                .parse(new StringReader(testEntryOne + OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + testEntryTwo));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                testEntryOne
+                                        + OS.NEWLINE
+                                        + OS.NEWLINE
+                                        + OS.NEWLINE
+                                        + testEntryTwo));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         Iterator<BibEntry> iterator = parsedEntries.iterator();
@@ -1172,8 +1305,15 @@ void parseIgnoresWhitespaceInEpilogue() throws IOException {
     @Test
     void parseIgnoresWhitespaceInEpilogueAfterEntry() throws IOException {
         String testEntry = "@article{test,author={Ed von Test}}";
-        ParserResult result = parser
-                .parse(new StringReader(testEntry + OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + "  " + OS.NEWLINE));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                testEntry
+                                        + OS.NEWLINE
+                                        + OS.NEWLINE
+                                        + OS.NEWLINE
+                                        + "  "
+                                        + OS.NEWLINE));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -1186,8 +1326,15 @@ void parseIgnoresWhitespaceInEpilogueAfterEntry() throws IOException {
     @Test
     void parseTrimsWhitespaceInEpilogueAfterEntry() throws IOException {
         String testEntry = "@article{test,author={Ed von Test}}";
-        ParserResult result = parser
-                .parse(new StringReader(testEntry + OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + " epilogue " + OS.NEWLINE));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                testEntry
+                                        + OS.NEWLINE
+                                        + OS.NEWLINE
+                                        + OS.NEWLINE
+                                        + " epilogue "
+                                        + OS.NEWLINE));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -1199,8 +1346,10 @@ void parseTrimsWhitespaceInEpilogueAfterEntry() throws IOException {
 
     @Test
     void parseRecognizesSaveActionsAfterEntry() throws IOException {
-        ParserResult parserResult = parser.parse(
-                new StringReader("""
+        ParserResult parserResult =
+                parser.parse(
+                        new StringReader(
+                                """
                         @InProceedings{6055279,
                           Title                    = {Educational session 1},
                           Booktitle                = {Custom Integrated Circuits Conference (CICC), 2011 IEEE},
@@ -1217,14 +1366,17 @@ void parseRecognizesSaveActionsAfterEntry() throws IOException {
         FieldFormatterCleanups saveActions = parserResult.getMetaData().getSaveActions().get();
 
         assertTrue(saveActions.isEnabled());
-        assertEquals(List.of(new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter())),
+        assertEquals(
+                List.of(new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter())),
                 saveActions.getConfiguredActions());
     }
 
     @Test
     void parserKeepsSaveActions() throws IOException {
-        ParserResult parserResult = parser.parse(
-                new StringReader("""
+        ParserResult parserResult =
+                parser.parse(
+                        new StringReader(
+                                """
                         @InProceedings{6055279,
                           Title                    = {Educational session 1},
                           Booktitle                = {Custom Integrated Circuits Conference (CICC), 2011 IEEE},
@@ -1254,7 +1406,13 @@ void parserKeepsSaveActions() throws IOException {
         List<FieldFormatterCleanup> expected = new ArrayList<>(30);
         expected.add(new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter()));
         expected.add(new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter()));
-        for (Field field : List.of(StandardField.TITLE, StandardField.BOOKTITLE, StandardField.PUBLISHER, StandardField.JOURNAL, StandardField.ABSTRACT)) {
+        for (Field field :
+                List.of(
+                        StandardField.TITLE,
+                        StandardField.BOOKTITLE,
+                        StandardField.PUBLISHER,
+                        StandardField.JOURNAL,
+                        StandardField.ABSTRACT)) {
             expected.add(new FieldFormatterCleanup(field, new EscapeAmpersandsFormatter()));
             expected.add(new FieldFormatterCleanup(field, new EscapeDollarSignFormatter()));
             expected.add(new FieldFormatterCleanup(field, new EscapeUnderscoresFormatter()));
@@ -1265,8 +1423,10 @@ void parserKeepsSaveActions() throws IOException {
 
     @Test
     void parseRecognizesCRLFLineBreak() throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader("""
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                         @InProceedings{6055279,\r
                           Title                    = {Educational session 1},\r
                           Booktitle                = {Custom Integrated Circuits Conference (CICC), 2011 IEEE},\r
@@ -1283,8 +1443,10 @@ void parseRecognizesCRLFLineBreak() throws IOException {
 
     @Test
     void parseRecognizesLFLineBreak() throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader("""
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                         @InProceedings{6055279,
                           Title                    = {Educational session 1},
                           Booktitle                = {Custom Integrated Circuits Conference (CICC), 2011 IEEE},
@@ -1301,59 +1463,72 @@ void parseRecognizesLFLineBreak() throws IOException {
 
     @Test
     void integrationTestSaveActions() throws IOException {
-        ParserResult parserResult = parser
-                .parse(new StringReader("@comment{jabref-meta: saveActions:enabled;title[lower_case]}"));
+        ParserResult parserResult =
+                parser.parse(
+                        new StringReader(
+                                "@comment{jabref-meta: saveActions:enabled;title[lower_case]}"));
 
         FieldFormatterCleanups saveActions = parserResult.getMetaData().getSaveActions().get();
 
         assertTrue(saveActions.isEnabled());
-        assertEquals(List.of(new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter())),
+        assertEquals(
+                List.of(new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter())),
                 saveActions.getConfiguredActions());
     }
 
     @Test
     void integrationTestBibEntryType() throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader("@comment{jabref-entrytype: Lecturenotes: req[author;title] opt[language;url]}"));
-
-        BibEntryType expectedEntryType = new BibEntryType(
-                new UnknownEntryType("lecturenotes"),
-                Arrays.asList(
-                        new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT),
-                        new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
-                        new BibField(StandardField.LANGUAGE, FieldPriority.IMPORTANT),
-                        new BibField(StandardField.URL, FieldPriority.IMPORTANT)),
-                Arrays.asList(
-                        new OrFields(StandardField.AUTHOR),
-                        new OrFields(StandardField.TITLE)
-                ));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@comment{jabref-entrytype: Lecturenotes: req[author;title] opt[language;url]}"));
+
+        BibEntryType expectedEntryType =
+                new BibEntryType(
+                        new UnknownEntryType("lecturenotes"),
+                        Arrays.asList(
+                                new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT),
+                                new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
+                                new BibField(StandardField.LANGUAGE, FieldPriority.IMPORTANT),
+                                new BibField(StandardField.URL, FieldPriority.IMPORTANT)),
+                        Arrays.asList(
+                                new OrFields(StandardField.AUTHOR),
+                                new OrFields(StandardField.TITLE)));
 
         assertEquals(Collections.singleton(expectedEntryType), result.getEntryTypes());
     }
 
     @Test
     void integrationTestSaveOrderConfig() throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader(
-                        "@Comment{jabref-meta: saveOrderConfig:specified;author;false;year;true;abstract;false;}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@Comment{jabref-meta: saveOrderConfig:specified;author;false;year;true;abstract;false;}"));
 
         Optional<SaveOrder> saveOrderConfig = result.getMetaData().getSaveOrder();
 
-        assertEquals(new SaveOrder(SaveOrder.OrderType.SPECIFIED, List.of(
-                        new SaveOrder.SortCriterion(StandardField.AUTHOR, false),
-                        new SaveOrder.SortCriterion(StandardField.YEAR, true),
-                        new SaveOrder.SortCriterion(StandardField.ABSTRACT, false))),
+        assertEquals(
+                new SaveOrder(
+                        SaveOrder.OrderType.SPECIFIED,
+                        List.of(
+                                new SaveOrder.SortCriterion(StandardField.AUTHOR, false),
+                                new SaveOrder.SortCriterion(StandardField.YEAR, true),
+                                new SaveOrder.SortCriterion(StandardField.ABSTRACT, false))),
                 saveOrderConfig.get());
     }
 
     @Test
     void integrationTestCustomKeyPattern() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@comment{jabref-meta: keypattern_article:articleTest;}" + OS.NEWLINE
-                        + "@comment{jabref-meta: keypatterndefault:test;}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@comment{jabref-meta: keypattern_article:articleTest;}"
+                                        + OS.NEWLINE
+                                        + "@comment{jabref-meta: keypatterndefault:test;}"));
 
         GlobalCitationKeyPatterns pattern = mock(GlobalCitationKeyPatterns.class);
-        AbstractCitationKeyPatterns bibtexKeyPatterns = result.getMetaData().getCiteKeyPatterns(pattern);
+        AbstractCitationKeyPatterns bibtexKeyPatterns =
+                result.getMetaData().getCiteKeyPatterns(pattern);
         AbstractCitationKeyPatterns expectedPatterns = new DatabaseCitationKeyPatterns(pattern);
         expectedPatterns.setDefaultValue("test");
         expectedPatterns.addCitationKeyPattern(StandardEntryType.Article, "articleTest");
@@ -1363,8 +1538,8 @@ void integrationTestCustomKeyPattern() throws IOException {
 
     @Test
     void integrationTestBiblatexMode() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@comment{jabref-meta: databaseType:biblatex;}"));
+        ParserResult result =
+                parser.parse(new StringReader("@comment{jabref-meta: databaseType:biblatex;}"));
 
         Optional<BibDatabaseMode> mode = result.getMetaData().getMode();
 
@@ -1373,7 +1548,10 @@ void integrationTestBiblatexMode() throws IOException {
 
     @Test
     void integrationTestGroupTree() throws IOException {
-        ParserResult result = parser.parse(new StringReader("""
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                 @comment{jabref-meta: groupsversion:3;}
                 @comment{jabref-meta: groupstree:
                 0 AllEntriesGroup:;
@@ -1386,12 +1564,25 @@ void integrationTestGroupTree() throws IOException {
         assertEquals(new AllEntriesGroup("All entries"), root.getGroup());
         assertEquals(3, root.getNumberOfChildren());
         assertEquals(
-                new RegexKeywordGroup("Fréchet", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, "FrechetSpace", false),
+                new RegexKeywordGroup(
+                        "Fréchet",
+                        GroupHierarchyType.INDEPENDENT,
+                        StandardField.KEYWORDS,
+                        "FrechetSpace",
+                        false),
                 root.getChildren().getFirst().getGroup());
         assertEquals(
-                new WordKeywordGroup("Invariant theory", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, "GIT", false, ',', false),
+                new WordKeywordGroup(
+                        "Invariant theory",
+                        GroupHierarchyType.INDEPENDENT,
+                        StandardField.KEYWORDS,
+                        "GIT",
+                        false,
+                        ',',
+                        false),
                 root.getChildren().get(1).getGroup());
-        assertEquals(Arrays.asList("Key1", "Key2"),
+        assertEquals(
+                Arrays.asList("Key1", "Key2"),
                 ((ExplicitGroup) root.getChildren().get(2).getGroup()).getLegacyEntryKeys());
     }
 
@@ -1400,7 +1591,10 @@ void integrationTestGroupTree() throws IOException {
      */
     @Test
     void integrationTestBibDeskStaticGroup() throws Exception {
-        ParserResult result = parser.parse(new StringReader("""
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                 @article{Swain:2023aa,
                     author = {Subhashree Swain and P. Shalima and K.V.P. Latha},
                     date-added = {2023-09-14 20:09:08 +0200},
@@ -1449,21 +1643,40 @@ void integrationTestBibDeskStaticGroup() throws Exception {
 
         GroupTreeNode root = result.getMetaData().getGroups().get();
         assertEquals(new AllEntriesGroup("All entries"), root.getGroup());
-        assertEquals(Optional.of(BIB_DESK_ROOT_GROUP_NAME), root.getFirstChild().map(GroupTreeNode::getName));
+        assertEquals(
+                Optional.of(BIB_DESK_ROOT_GROUP_NAME),
+                root.getFirstChild().map(GroupTreeNode::getName));
 
-        ExplicitGroup firstTestGroupExpected = new ExplicitGroup("firstTestGroup", GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup firstTestGroupExpected =
+                new ExplicitGroup("firstTestGroup", GroupHierarchyType.INDEPENDENT, ',');
         firstTestGroupExpected.setExpanded(true);
 
-        assertEquals(Optional.of(firstTestGroupExpected), root.getFirstChild().flatMap(TreeNode::getFirstChild).map(GroupTreeNode::getGroup));
+        assertEquals(
+                Optional.of(firstTestGroupExpected),
+                root.getFirstChild().flatMap(TreeNode::getFirstChild).map(GroupTreeNode::getGroup));
 
-        ExplicitGroup secondTestGroupExpected = new ExplicitGroup("secondTestGroup", GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup secondTestGroupExpected =
+                new ExplicitGroup("secondTestGroup", GroupHierarchyType.INDEPENDENT, ',');
         secondTestGroupExpected.setExpanded(true);
-        assertEquals(Optional.of(secondTestGroupExpected), root.getFirstChild().flatMap(TreeNode::getLastChild).map(GroupTreeNode::getGroup));
+        assertEquals(
+                Optional.of(secondTestGroupExpected),
+                root.getFirstChild().flatMap(TreeNode::getLastChild).map(GroupTreeNode::getGroup));
 
         BibDatabase db = result.getDatabase();
 
-        assertEquals(List.of(root.getGroup(), firstTestGroupExpected), root.getContainingGroups(db.getEntries(), true).stream().map(GroupTreeNode::getGroup).toList());
-        assertEquals(List.of(root.getGroup(), firstTestGroupExpected), root.getContainingGroups(db.getEntryByCitationKey("Heyl:2023aa").stream().toList(), false).stream().map(GroupTreeNode::getGroup).toList());
+        assertEquals(
+                List.of(root.getGroup(), firstTestGroupExpected),
+                root.getContainingGroups(db.getEntries(), true).stream()
+                        .map(GroupTreeNode::getGroup)
+                        .toList());
+        assertEquals(
+                List.of(root.getGroup(), firstTestGroupExpected),
+                root
+                        .getContainingGroups(
+                                db.getEntryByCitationKey("Heyl:2023aa").stream().toList(), false)
+                        .stream()
+                        .map(GroupTreeNode::getGroup)
+                        .toList());
     }
 
     /**
@@ -1472,7 +1685,10 @@ void integrationTestBibDeskStaticGroup() throws Exception {
     @Test
     @Disabled("Not yet supported")
     void integrationTestBibDeskSmartGroup() throws Exception {
-        ParserResult result = parser.parse(new StringReader("""
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                 @article{Kraljic:2023aa,
                     author = {Katarina Kraljic and Florent Renaud and Yohan Dubois and Christophe Pichon and Oscar Agertz and Eric Andersson and Julien Devriendt and Jonathan Freundlich and Sugata Kaviraj and Taysun Kimm and Garreth Martin and S{\\'e}bastien Peirani and {\\'A}lvaro Segovia Otero and Marta Volonteri and Sukyoung K. Yi},
                     date-added = {2023-09-14 20:09:10 +0200},
@@ -1570,10 +1786,12 @@ void integrationTestBibDeskSmartGroup() throws Exception {
         GroupTreeNode root = result.getMetaData().getGroups().get();
         assertEquals(new AllEntriesGroup("All entries"), root.getGroup());
         assertEquals(2, root.getNumberOfChildren());
-        ExplicitGroup firstTestGroupExpected = new ExplicitGroup("article", GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup firstTestGroupExpected =
+                new ExplicitGroup("article", GroupHierarchyType.INDEPENDENT, ',');
         firstTestGroupExpected.setExpanded(false);
         assertEquals(firstTestGroupExpected, root.getChildren().getFirst().getGroup());
-        ExplicitGroup secondTestGroupExpected = new ExplicitGroup("Swain", GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup secondTestGroupExpected =
+                new ExplicitGroup("Swain", GroupHierarchyType.INDEPENDENT, ',');
         secondTestGroupExpected.setExpanded(false);
         assertEquals(secondTestGroupExpected, root.getChildren().get(1).getGroup());
 
@@ -1581,8 +1799,16 @@ void integrationTestBibDeskSmartGroup() throws Exception {
         List<BibEntry> firstTestGroupEntriesExpected = new ArrayList<>();
         firstTestGroupEntriesExpected.add(db.getEntryByCitationKey("Kraljic:2023aa").get());
         firstTestGroupEntriesExpected.add(db.getEntryByCitationKey("Swain:2023aa").get());
-        assertTrue(root.getChildren().getFirst().getGroup().containsAll(firstTestGroupEntriesExpected));
-        assertFalse(root.getChildren().get(1).getGroup().contains(db.getEntryByCitationKey("Swain:2023aa").get()));
+        assertTrue(
+                root.getChildren()
+                        .getFirst()
+                        .getGroup()
+                        .containsAll(firstTestGroupEntriesExpected));
+        assertFalse(
+                root.getChildren()
+                        .get(1)
+                        .getGroup()
+                        .contains(db.getEntryByCitationKey("Swain:2023aa").get()));
     }
 
     /**
@@ -1591,7 +1817,10 @@ void integrationTestBibDeskSmartGroup() throws Exception {
     @Test
     @Disabled("Not yet supported")
     void integrationTestBibDeskMultipleGroup() throws Exception {
-        ParserResult result = parser.parse(new StringReader("""
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                 @article{Kraljic:2023aa,
                     author = {Katarina Kraljic and Florent Renaud and Yohan Dubois and Christophe Pichon and Oscar Agertz and Eric Andersson and Julien Devriendt and Jonathan Freundlich and Sugata Kaviraj and Taysun Kimm and Garreth Martin and S{\\'e}bastien Peirani and {\\'A}lvaro Segovia Otero and Marta Volonteri and Sukyoung K. Yi},
                     date-added = {2023-09-14 20:09:10 +0200},
@@ -1685,10 +1914,12 @@ void integrationTestBibDeskMultipleGroup() throws Exception {
         GroupTreeNode root = result.getMetaData().getGroups().get();
         assertEquals(new AllEntriesGroup("All entries"), root.getGroup());
         assertEquals(2, root.getNumberOfChildren());
-        ExplicitGroup firstTestGroupExpected = new ExplicitGroup("firstTestGroup", GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup firstTestGroupExpected =
+                new ExplicitGroup("firstTestGroup", GroupHierarchyType.INDEPENDENT, ',');
         firstTestGroupExpected.setExpanded(false);
         assertEquals(firstTestGroupExpected, root.getChildren().getFirst().getGroup());
-        ExplicitGroup secondTestGroupExpected = new ExplicitGroup("article", GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup secondTestGroupExpected =
+                new ExplicitGroup("article", GroupHierarchyType.INDEPENDENT, ',');
         secondTestGroupExpected.setExpanded(false);
         assertEquals(secondTestGroupExpected, root.getChildren().get(1).getGroup());
 
@@ -1705,41 +1936,54 @@ void integrationTestBibDeskMultipleGroup() throws Exception {
      */
     @Test
     void integrationTestTexGroup() throws Exception {
-        ParserResult result = parser.parse(new StringReader(
-                "@comment{jabref-meta: grouping:" + OS.NEWLINE
-                        + "0 AllEntriesGroup:;" + OS.NEWLINE
-                        + "1 TexGroup:cited entries\\;0\\;paper.aux\\;1\\;0x8a8a8aff\\;\\;\\;;"
-                        + "}" + OS.NEWLINE
-                        + "@Comment{jabref-meta: databaseType:biblatex;}" + OS.NEWLINE
-                        + "@Comment{jabref-meta: fileDirectory:src/test/resources/org/jabref/model/groups;}" + OS.NEWLINE
-                        + "@Comment{jabref-meta: fileDirectory-"
-                        + System.getProperty("user.name") + "-"
-                        + InetAddress.getLocalHost().getHostName()
-                        + ":src/test/resources/org/jabref/model/groups;}" + OS.NEWLINE
-                        + "@Comment{jabref-meta: fileDirectoryLatex-"
-                        + System.getProperty("user.name") + "-"
-                        + InetAddress.getLocalHost().getHostName()
-                        + ":src/test/resources/org/jabref/model/groups;}" + OS.NEWLINE
-        ));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@comment{jabref-meta: grouping:"
+                                        + OS.NEWLINE
+                                        + "0 AllEntriesGroup:;"
+                                        + OS.NEWLINE
+                                        + "1 TexGroup:cited entries\\;0\\;paper.aux\\;1\\;0x8a8a8aff\\;\\;\\;;"
+                                        + "}"
+                                        + OS.NEWLINE
+                                        + "@Comment{jabref-meta: databaseType:biblatex;}"
+                                        + OS.NEWLINE
+                                        + "@Comment{jabref-meta: fileDirectory:src/test/resources/org/jabref/model/groups;}"
+                                        + OS.NEWLINE
+                                        + "@Comment{jabref-meta: fileDirectory-"
+                                        + System.getProperty("user.name")
+                                        + "-"
+                                        + InetAddress.getLocalHost().getHostName()
+                                        + ":src/test/resources/org/jabref/model/groups;}"
+                                        + OS.NEWLINE
+                                        + "@Comment{jabref-meta: fileDirectoryLatex-"
+                                        + System.getProperty("user.name")
+                                        + "-"
+                                        + InetAddress.getLocalHost().getHostName()
+                                        + ":src/test/resources/org/jabref/model/groups;}"
+                                        + OS.NEWLINE));
 
         GroupTreeNode root = result.getMetaData().getGroups().get();
 
-        assertEquals(((TexGroup) root.getChildren().getFirst().getGroup()).getFilePath(),
+        assertEquals(
+                ((TexGroup) root.getChildren().getFirst().getGroup()).getFilePath(),
                 Path.of("src/test/resources/org/jabref/model/groups/paper.aux"));
     }
 
     @Test
     void integrationTestProtectedFlag() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@comment{jabref-meta: protectedFlag:true;}"));
+        ParserResult result =
+                parser.parse(new StringReader("@comment{jabref-meta: protectedFlag:true;}"));
 
         assertTrue(result.getMetaData().isProtected());
     }
 
     @Test
     void integrationTestContentSelectors() throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader("@Comment{jabref-meta: selector_pubstate:approved;captured;received;status;}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@Comment{jabref-meta: selector_pubstate:approved;captured;received;status;}"));
 
         List<String> values = new ArrayList<>(4);
         values.add("approved");
@@ -1747,12 +1991,17 @@ void integrationTestContentSelectors() throws IOException {
         values.add("received");
         values.add("status");
 
-        assertEquals(values, result.getMetaData().getContentSelectors().getSelectorValuesForField(StandardField.PUBSTATE));
+        assertEquals(
+                values,
+                result.getMetaData()
+                        .getContentSelectors()
+                        .getSelectorValuesForField(StandardField.PUBSTATE));
     }
 
     @Test
     void parseReallyUnknownType() throws Exception {
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @ReallyUnknownType{test,
                  Comment                  = {testentry}
                 }""";
@@ -1768,7 +2017,8 @@ void parseReallyUnknownType() throws Exception {
 
     @Test
     void parseOtherTypeTest() throws Exception {
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @Other{test,
                  Comment                  = {testentry}
                 }""";
@@ -1785,9 +2035,8 @@ void parseOtherTypeTest() throws Exception {
     @Test
     void parseRecognizesDatabaseID() throws Exception {
         String expectedDatabaseID = "q1w2e3r4t5z6";
-        String sharedDatabaseFileContent = "\\% DBID: " + expectedDatabaseID +
-                OS.NEWLINE +
-                "@Article{a}";
+        String sharedDatabaseFileContent =
+                "\\% DBID: " + expectedDatabaseID + OS.NEWLINE + "@Article{a}";
 
         ParserResult parserResult = parser.parse(new StringReader(sharedDatabaseFileContent));
         String actualDatabaseID = parserResult.getDatabase().getSharedDatabaseID().get();
@@ -1797,9 +2046,12 @@ void parseRecognizesDatabaseID() throws Exception {
 
     @Test
     void parseDoesNotRecognizeDatabaseIDasUserComment() throws Exception {
-        String sharedDatabaseFileContent = "\\% Encoding: UTF-8" + OS.NEWLINE +
-                "\\% DBID: q1w2e3r4t5z6" + OS.NEWLINE +
-                "@Article{a}";
+        String sharedDatabaseFileContent =
+                "\\% Encoding: UTF-8"
+                        + OS.NEWLINE
+                        + "\\% DBID: q1w2e3r4t5z6"
+                        + OS.NEWLINE
+                        + "@Article{a}";
 
         ParserResult parserResult = parser.parse(new StringReader(sharedDatabaseFileContent));
         List<BibEntry> entries = parserResult.getDatabase().getEntries();
@@ -1810,36 +2062,46 @@ void parseDoesNotRecognizeDatabaseIDasUserComment() throws Exception {
 
     @Test
     void integrationTestFileDirectories() throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader("@comment{jabref-meta: fileDirectory:\\\\Literature\\\\;}"
-                        + "@comment{jabref-meta: fileDirectory-defaultOwner-user:D:\\\\Documents;}"
-                        + "@comment{jabref-meta: fileDirectoryLatex-defaultOwner-user:D:\\\\Latex;}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                "@comment{jabref-meta: fileDirectory:\\\\Literature\\\\;}"
+                                        + "@comment{jabref-meta: fileDirectory-defaultOwner-user:D:\\\\Documents;}"
+                                        + "@comment{jabref-meta: fileDirectoryLatex-defaultOwner-user:D:\\\\Latex;}"));
 
         assertEquals("\\Literature\\", result.getMetaData().getDefaultFileDirectory().get());
-        assertEquals("D:\\Documents", result.getMetaData().getUserFileDirectory("defaultOwner-user").get());
-        assertEquals("D:\\Latex", result.getMetaData().getLatexFileDirectory("defaultOwner-user").get().toString());
+        assertEquals(
+                "D:\\Documents",
+                result.getMetaData().getUserFileDirectory("defaultOwner-user").get());
+        assertEquals(
+                "D:\\Latex",
+                result.getMetaData().getLatexFileDirectory("defaultOwner-user").get().toString());
     }
 
     @ParameterizedTest
     @CsvSource({
-            // single backslash kept
-            "C:\\temp\\test",
-            "\\\\servername\\path\\to\\file",
-            "//servername/path/to/file",
-            "."})
+        // single backslash kept
+        "C:\\temp\\test",
+        "\\\\servername\\path\\to\\file",
+        "//servername/path/to/file",
+        "."
+    })
     void fileDirectoriesUnmodified(String directory) throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader("@comment{jabref-meta: fileDirectory:" + directory + "}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader("@comment{jabref-meta: fileDirectory:" + directory + "}"));
         assertEquals(directory, result.getMetaData().getDefaultFileDirectory().get());
     }
 
     @ParameterizedTest
     @CsvSource({
-            "C:\\temp\\test, C:\\\\temp\\\\test",
-            "\\\\servername\\path\\to\\file, \\\\\\\\servername\\\\path\\\\to\\\\file"})
+        "C:\\temp\\test, C:\\\\temp\\\\test",
+        "\\\\servername\\path\\to\\file, \\\\\\\\servername\\\\path\\\\to\\\\file"
+    })
     void fileDirectoryWithDoubleEscapeIsRead(String expected, String provided) throws IOException {
-        ParserResult result = parser.parse(
-                new StringReader("@comment{jabref-meta: fileDirectory: " + provided + "}"));
+        ParserResult result =
+                parser.parse(
+                        new StringReader("@comment{jabref-meta: fileDirectory: " + provided + "}"));
         assertEquals(expected, result.getMetaData().getDefaultFileDirectory().get());
     }
 
@@ -1861,8 +2123,10 @@ void parseReturnsEntriesInSameOrder() throws IOException {
         third.setCitationKey("c");
         expected.add(third);
 
-        ParserResult result = parser
-                .parse(new StringReader("""
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                         @article{a}
                         @article{b}
                         @inProceedings{c}"""));
@@ -1872,7 +2136,8 @@ void parseReturnsEntriesInSameOrder() throws IOException {
 
     @Test
     void parsePrecedingComment() throws IOException {
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 % Some random comment that should stay here
                 @Article{test,
                   Author                   = {Foo Bar},
@@ -1896,7 +2161,8 @@ void parsePrecedingComment() throws IOException {
 
     @Test
     void parseCommentAndEntryInOneLine() throws IOException {
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 Some random comment that should stay here @Article{test,
                   Author                   = {Foo Bar},
                   Journal                  = {International Journal of Something},
@@ -1919,12 +2185,14 @@ void parseCommentAndEntryInOneLine() throws IOException {
 
     @Test
     void preserveEncodingPrefixInsideEntry() throws ParseException {
-        BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test")
-                .withField(StandardField.AUTHOR, SaveConfiguration.ENCODING_PREFIX);
+        BibEntry expected =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, SaveConfiguration.ENCODING_PREFIX);
 
-        List<BibEntry> parsed = parser
-                .parseEntries("@article{test,author={" + SaveConfiguration.ENCODING_PREFIX + "}}");
+        List<BibEntry> parsed =
+                parser.parseEntries(
+                        "@article{test,author={" + SaveConfiguration.ENCODING_PREFIX + "}}");
 
         assertEquals(List.of(expected), parsed);
     }
@@ -1940,7 +2208,8 @@ void parseBracketedComment() throws IOException {
 
     @Test
     void parseRegularCommentBeforeEntry() throws IOException {
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @Comment{someComment}
                 @Article{test,
                   Author                   = {Foo Bar},
@@ -1967,7 +2236,8 @@ void parseCommentWithoutBrackets() throws IOException {
 
     @Test
     void parseCommentWithoutBracketsBeforeEntry() throws IOException {
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @Comment someComment
                 @Article{test,
                   Author                   = {Foo Bar},
@@ -1985,7 +2255,8 @@ void parseCommentWithoutBracketsBeforeEntry() throws IOException {
 
     @Test
     void parseCommentContainingEntries() throws IOException {
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @Comment{@article{myarticle,}
                 @inproceedings{blabla, title={the proceedings of blabla}; }
                 }
@@ -2005,7 +2276,8 @@ void parseCommentContainingEntries() throws IOException {
 
     @Test
     void parseCommentContainingEntriesAndAtSymbols() throws IOException {
-        String bibtexEntry = """
+        String bibtexEntry =
+                """
                 @Comment{@article{myarticle,}
                 @inproceedings{blabla, title={the proceedings of bl@bl@}; }
                 }
@@ -2041,21 +2313,24 @@ void parseEmptyFileLeadsToPreamble() throws IOException {
 
     @Test
     void parseYearWithMonthString() throws Exception {
-        Optional<BibEntry> result = parser.parseSingleEntry("@ARTICLE{HipKro03, year = {2003}, month = feb }");
+        Optional<BibEntry> result =
+                parser.parseSingleEntry("@ARTICLE{HipKro03, year = {2003}, month = feb }");
 
         assertEquals(new Date(2003, 2), result.get().getPublicationDate().get());
     }
 
     @Test
     void parseYearWithIllFormattedMonthString() throws Exception {
-        Optional<BibEntry> result = parser.parseSingleEntry("@ARTICLE{HipKro03, year = {2003}, month = #FEB# }");
+        Optional<BibEntry> result =
+                parser.parseSingleEntry("@ARTICLE{HipKro03, year = {2003}, month = #FEB# }");
 
         assertEquals(new Date(2003, 2), result.get().getPublicationDate().get());
     }
 
     @Test
     void parseYearWithMonthNumber() throws Exception {
-        Optional<BibEntry> result = parser.parseSingleEntry("@ARTICLE{HipKro03, year = {2003}, month = 2 }");
+        Optional<BibEntry> result =
+                parser.parseSingleEntry("@ARTICLE{HipKro03, year = {2003}, month = 2 }");
 
         assertEquals(new Date(2003, 2), result.get().getPublicationDate().get());
     }
@@ -2070,15 +2345,17 @@ void parseYear() throws Exception {
     @Test
     void parseEntryUsingStringConstantsForTwoAuthorsWithEtAsStringConstant() throws ParseException {
         // source of the example: https://docs.jabref.org/fields/strings
-        Collection<BibEntry> parsed = parser
-                .parseEntries("@String { kopp = \"Kopp, Oliver\" }" +
-                        "@String { kubovy = \"Kubovy, Jan\" }" +
-                        "@String { et = \" and \" }" +
-                        "@Misc{m1, author = kopp # et # kubovy }");
-
-        BibEntry expectedEntry = new BibEntry(StandardEntryType.Misc)
-                .withCitationKey("m1")
-                .withField(StandardField.AUTHOR, "#kopp##et##kubovy#");
+        Collection<BibEntry> parsed =
+                parser.parseEntries(
+                        "@String { kopp = \"Kopp, Oliver\" }"
+                                + "@String { kubovy = \"Kubovy, Jan\" }"
+                                + "@String { et = \" and \" }"
+                                + "@Misc{m1, author = kopp # et # kubovy }");
+
+        BibEntry expectedEntry =
+                new BibEntry(StandardEntryType.Misc)
+                        .withCitationKey("m1")
+                        .withField(StandardField.AUTHOR, "#kopp##et##kubovy#");
 
         assertEquals(List.of(expectedEntry), parsed);
     }
@@ -2086,15 +2363,17 @@ void parseEntryUsingStringConstantsForTwoAuthorsWithEtAsStringConstant() throws
     @Test
     void parseStringConstantsForTwoAuthorsHasCorrectBibTeXEntry() throws ParseException {
         // source of the example: https://docs.jabref.org/fields/strings
-        Collection<BibEntry> parsed = parser
-                .parseEntries("@String { kopp = \"Kopp, Oliver\" }" +
-                        "@String { kubovy = \"Kubovy, Jan\" }" +
-                        "@String { et = \" and \" }" +
-                        "@Misc{m2, author = kopp # \" and \" # kubovy }");
-
-        BibEntry expectedEntry = new BibEntry(StandardEntryType.Misc)
-                .withCitationKey("m2")
-                .withField(StandardField.AUTHOR, "#kopp# and #kubovy#");
+        Collection<BibEntry> parsed =
+                parser.parseEntries(
+                        "@String { kopp = \"Kopp, Oliver\" }"
+                                + "@String { kubovy = \"Kubovy, Jan\" }"
+                                + "@String { et = \" and \" }"
+                                + "@Misc{m2, author = kopp # \" and \" # kubovy }");
+
+        BibEntry expectedEntry =
+                new BibEntry(StandardEntryType.Misc)
+                        .withCitationKey("m2")
+                        .withField(StandardField.AUTHOR, "#kopp# and #kubovy#");
 
         assertEquals(List.of(expectedEntry), parsed);
     }
@@ -2102,13 +2381,16 @@ void parseStringConstantsForTwoAuthorsHasCorrectBibTeXEntry() throws ParseExcept
     @Test
     void parseStringConstantsForTwoAuthors() throws ParseException {
         // source of the example: https://docs.jabref.org/fields/strings
-        Collection<BibEntry> parsed = parser
-                .parseEntries("@String { kopp = \"Kopp, Oliver\" }" +
-                        "@String { kubovy = \"Kubovy, Jan\" }" +
-                        "@String { et = \" and \" }" +
-                        "@Misc{m2, author = kopp # \" and \" # kubovy }");
+        Collection<BibEntry> parsed =
+                parser.parseEntries(
+                        "@String { kopp = \"Kopp, Oliver\" }"
+                                + "@String { kubovy = \"Kubovy, Jan\" }"
+                                + "@String { et = \" and \" }"
+                                + "@Misc{m2, author = kopp # \" and \" # kubovy }");
 
-        assertEquals("#kopp# and #kubovy#", parsed.iterator().next().getField(StandardField.AUTHOR).get());
+        assertEquals(
+                "#kopp# and #kubovy#",
+                parsed.iterator().next().getField(StandardField.AUTHOR).get());
     }
 
     @Test
@@ -2148,28 +2430,34 @@ void bibTeXConstantAprilIsParsedAsStringMonthAprilWhenReadingTheField() throws P
 
     @Test
     void parseDuplicateKeywordsWithOnlyOneEntry() throws ParseException {
-        Optional<BibEntry> result = parser.parseSingleEntry("""
+        Optional<BibEntry> result =
+                parser.parseSingleEntry(
+                        """
                 @Article{,
                 Keywords={asdf,asdf,asdf},
                 }
                 """);
 
-        BibEntry expectedEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.KEYWORDS, "asdf,asdf,asdf");
+        BibEntry expectedEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.KEYWORDS, "asdf,asdf,asdf");
 
         assertEquals(Optional.of(expectedEntry), result);
     }
 
     @Test
     void parseDuplicateKeywordsWithTwoEntries() throws Exception {
-        BibEntry expectedEntryFirst = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.KEYWORDS, "bbb")
-                .withCitationKey("Test2017");
+        BibEntry expectedEntryFirst =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.KEYWORDS, "bbb")
+                        .withCitationKey("Test2017");
 
-        BibEntry expectedEntrySecond = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.KEYWORDS, "asdf,asdf,asdf");
+        BibEntry expectedEntrySecond =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.KEYWORDS, "asdf,asdf,asdf");
 
-        String entries = """
+        String entries =
+                """
                 @Article{Test2017,
                   keywords = {bbb},
                 }
@@ -2179,26 +2467,36 @@ void parseDuplicateKeywordsWithTwoEntries() throws Exception {
                 },
                 """;
         ParserResult result = parser.parse(new StringReader(entries));
-        assertEquals(List.of(expectedEntryFirst, expectedEntrySecond), result.getDatabase().getEntries());
+        assertEquals(
+                List.of(expectedEntryFirst, expectedEntrySecond),
+                result.getDatabase().getEntries());
     }
 
     @Test
     void parseBibDeskLinkedFiles() throws IOException {
 
         BibEntry expectedEntry = new BibEntry(StandardEntryType.Article);
-        expectedEntry.withCitationKey("Kovakkuni:2023aa")
-                     .withField(StandardField.AUTHOR, "Navyasree Kovakkuni and Federico Lelli and Pierre-alain Duc and M{\\'e}d{\\'e}ric Boquien and Jonathan Braine and Elias Brinks and Vassilis Charmandaris and Francoise Combes and Jeremy Fensch and Ute Lisenfeld and Stacy McGaugh and J. Chris Mihos and Marcel. S. Pawlowski and Yves. Revaz and Peter. M. Weilbacher")
-                     .withField(new UnknownField("date-added"), "2023-09-14 20:09:12 +0200")
-                     .withField(new UnknownField("date-modified"), "2023-09-14 20:09:12 +0200")
-                     .withField(StandardField.EPRINT, "2309.06478")
-                     .withField(StandardField.MONTH, "09")
-                     .withField(StandardField.TITLE, "Molecular and Ionized Gas in Tidal Dwarf Galaxies: The Spatially Resolved Star-Formation Relation")
-                     .withField(StandardField.URL, "https://arxiv.org/pdf/2309.06478.pdf")
-                     .withField(StandardField.YEAR, "2023")
-                     .withField(new UnknownField("bdsk-url-1"), "https://arxiv.org/abs/2309.06478")
-                     .withField(StandardField.FILE, ":../../Downloads/2309.06478.pdf:");
-
-        ParserResult result = parser.parse(new StringReader("""
+        expectedEntry
+                .withCitationKey("Kovakkuni:2023aa")
+                .withField(
+                        StandardField.AUTHOR,
+                        "Navyasree Kovakkuni and Federico Lelli and Pierre-alain Duc and M{\\'e}d{\\'e}ric Boquien and Jonathan Braine and Elias Brinks and Vassilis Charmandaris and Francoise Combes and Jeremy Fensch and Ute Lisenfeld and Stacy McGaugh and J. Chris Mihos and Marcel. S. Pawlowski and Yves. Revaz and Peter. M. Weilbacher")
+                .withField(new UnknownField("date-added"), "2023-09-14 20:09:12 +0200")
+                .withField(new UnknownField("date-modified"), "2023-09-14 20:09:12 +0200")
+                .withField(StandardField.EPRINT, "2309.06478")
+                .withField(StandardField.MONTH, "09")
+                .withField(
+                        StandardField.TITLE,
+                        "Molecular and Ionized Gas in Tidal Dwarf Galaxies: The Spatially Resolved Star-Formation Relation")
+                .withField(StandardField.URL, "https://arxiv.org/pdf/2309.06478.pdf")
+                .withField(StandardField.YEAR, "2023")
+                .withField(new UnknownField("bdsk-url-1"), "https://arxiv.org/abs/2309.06478")
+                .withField(StandardField.FILE, ":../../Downloads/2309.06478.pdf:");
+
+        ParserResult result =
+                parser.parse(
+                        new StringReader(
+                                """
                 @article{Kovakkuni:2023aa,
                     author = {Navyasree Kovakkuni and Federico Lelli and Pierre-alain Duc and M{\\'e}d{\\'e}ric Boquien and Jonathan Braine and Elias Brinks and Vassilis Charmandaris and Francoise Combes and Jeremy Fensch and Ute Lisenfeld and Stacy McGaugh and J. Chris Mihos and Marcel. S. Pawlowski and Yves. Revaz and Peter. M. Weilbacher},
                     date-added = {2023-09-14 20:09:12 +0200},
@@ -2219,8 +2517,10 @@ void parseBibDeskLinkedFiles() throws IOException {
 
     @Test
     void parseInvalidBibDeskFilesResultsInWarnings() throws IOException {
-        // the first entry is invalid base 64, the second entry is correct plist format but does not contain the key
-        String entries = """
+        // the first entry is invalid base 64, the second entry is correct plist format but does not
+        // contain the key
+        String entries =
+                """
                 @Article{Test2017,
                     bdsk-file-1 = {////=},
                 }
@@ -2231,10 +2531,8 @@ void parseInvalidBibDeskFilesResultsInWarnings() throws IOException {
                 """;
         ParserResult result = parser.parse(new StringReader(entries));
 
-        BibEntry firstEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Test2017");
-        BibEntry secondEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Test2");
+        BibEntry firstEntry = new BibEntry(StandardEntryType.Article).withCitationKey("Test2017");
+        BibEntry secondEntry = new BibEntry(StandardEntryType.Article).withCitationKey("Test2");
 
         assertEquals(List.of(firstEntry, secondEntry), result.getDatabase().getEntries());
     }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/CffImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/CffImporterTest.java
index 195d7bd713b1..0030e4fcbba3 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CffImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CffImporterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPatterns;
@@ -14,16 +14,15 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
 
 public class CffImporterTest {
 
@@ -31,10 +30,8 @@ public class CffImporterTest {
 
     @BeforeEach
     void setUp() {
-        CitationKeyPatternPreferences citationKeyPatternPreferences = mock(
-                CitationKeyPatternPreferences.class,
-                Answers.RETURNS_SMART_NULLS
-        );
+        CitationKeyPatternPreferences citationKeyPatternPreferences =
+                mock(CitationKeyPatternPreferences.class, Answers.RETURNS_SMART_NULLS);
         when(citationKeyPatternPreferences.getKeyPatterns())
                 .thenReturn(GlobalCitationKeyPatterns.fromPattern("[auth][year]"));
         importer = new CffImporter(citationKeyPatternPreferences);
@@ -57,7 +54,8 @@ void sGetExtensions() {
 
     @Test
     void getDescription() {
-        assertEquals("Importer for the CFF format, which is intended to make software and datasets citable.",
+        assertEquals(
+                "Importer for the CFF format, which is intended to make software and datasets citable.",
                 importer.getDescription());
     }
 
@@ -69,7 +67,8 @@ void isRecognizedFormat() throws IOException, URISyntaxException {
 
     @Test
     void isRecognizedFormatReject() throws IOException, URISyntaxException {
-        List<String> list = Arrays.asList("CffImporterTestInvalid1.cff", "CffImporterTestInvalid2.cff");
+        List<String> list =
+                Arrays.asList("CffImporterTestInvalid1.cff", "CffImporterTestInvalid2.cff");
         for (String string : list) {
             Path file = Path.of(CffImporterTest.class.getResource(string).toURI());
             assertFalse(importer.isRecognizedFormat(file));
@@ -87,7 +86,11 @@ void importEntriesBasic() throws IOException, URISyntaxException {
 
     @Test
     void importEntriesMultipleAuthors() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestValidMultAuthors.cff").toURI());
+        Path file =
+                Path.of(
+                        CffImporterTest.class
+                                .getResource("CffImporterTestValidMultAuthors.cff")
+                                .toURI());
         List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.getFirst();
         BibEntry expected = getPopulatedEntry();
@@ -96,27 +99,42 @@ void importEntriesMultipleAuthors() throws IOException, URISyntaxException {
 
     @Test
     void importEntriesSwhIdSelect1() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestValidSwhIdSelect1.cff").toURI());
+        Path file =
+                Path.of(
+                        CffImporterTest.class
+                                .getResource("CffImporterTestValidSwhIdSelect1.cff")
+                                .toURI());
         List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.getFirst();
-        BibEntry expected = getPopulatedEntry()
-                .withField(BiblatexSoftwareField.SWHID, "swh:1:rel:22ece559cc7cc2364edc5e5593d63ae8bd229f9f");
+        BibEntry expected =
+                getPopulatedEntry()
+                        .withField(
+                                BiblatexSoftwareField.SWHID,
+                                "swh:1:rel:22ece559cc7cc2364edc5e5593d63ae8bd229f9f");
         assertEquals(entry, expected);
     }
 
     @Test
     void importEntriesSwhIdSelect2() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestValidSwhIdSelect2.cff").toURI());
+        Path file =
+                Path.of(
+                        CffImporterTest.class
+                                .getResource("CffImporterTestValidSwhIdSelect2.cff")
+                                .toURI());
         List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.getFirst();
-        BibEntry expected = getPopulatedEntry()
-                .withField(BiblatexSoftwareField.SWHID, "swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2");
+        BibEntry expected =
+                getPopulatedEntry()
+                        .withField(
+                                BiblatexSoftwareField.SWHID,
+                                "swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2");
         assertEquals(entry, expected);
     }
 
     @Test
     void importEntriesDataset() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestDataset.cff").toURI());
+        Path file =
+                Path.of(CffImporterTest.class.getResource("CffImporterTestDataset.cff").toURI());
         BibEntry entry = importer.importDatabase(file).getDatabase().getEntries().getFirst();
         BibEntry expected = getPopulatedEntry();
         expected.setType(StandardEntryType.Dataset);
@@ -125,7 +143,8 @@ void importEntriesDataset() throws IOException, URISyntaxException {
 
     @Test
     void importEntriesDoiSelect() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestDoiSelect.cff").toURI());
+        Path file =
+                Path.of(CffImporterTest.class.getResource("CffImporterTestDoiSelect.cff").toURI());
         BibEntry entry = importer.importDatabase(file).getDatabase().getEntries().getFirst();
         BibEntry expected = getPopulatedEntry();
         assertEquals(entry, expected);
@@ -133,7 +152,11 @@ void importEntriesDoiSelect() throws IOException, URISyntaxException {
 
     @Test
     void importEntriesUnknownFields() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestUnknownFields.cff").toURI());
+        Path file =
+                Path.of(
+                        CffImporterTest.class
+                                .getResource("CffImporterTestUnknownFields.cff")
+                                .toURI());
         BibEntry entry = importer.importDatabase(file).getDatabase().getEntries().getFirst();
         BibEntry expected = getPopulatedEntry().withField(new UnknownField("commit"), "10ad");
         assertEquals(entry, expected);
@@ -141,10 +164,17 @@ void importEntriesUnknownFields() throws IOException, URISyntaxException {
 
     @Test
     void importEntriesMultilineAbstract() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestMultilineAbstract.cff").toURI());
+        Path file =
+                Path.of(
+                        CffImporterTest.class
+                                .getResource("CffImporterTestMultilineAbstract.cff")
+                                .toURI());
         BibEntry entry = importer.importDatabase(file).getDatabase().getEntries().getFirst();
-        BibEntry expected = getPopulatedEntry().withField(StandardField.ABSTRACT,
-                """
+        BibEntry expected =
+                getPopulatedEntry()
+                        .withField(
+                                StandardField.ABSTRACT,
+                                """
                         Lorem ipsum dolor sit amet, consectetur adipiscing elit.
                         Morbi vel tortor sem. Suspendisse posuere nibh commodo nunc iaculis,
                         sed eleifend justo malesuada. Curabitur sodales auctor cursus.
@@ -163,7 +193,11 @@ void importEntriesMultilineAbstract() throws IOException, URISyntaxException {
 
     @Test
     void importEntriesPreferredCitation() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterPreferredCitation.cff").toURI());
+        Path file =
+                Path.of(
+                        CffImporterTest.class
+                                .getResource("CffImporterPreferredCitation.cff")
+                                .toURI());
         List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry mainEntry = bibEntries.getFirst();
@@ -172,11 +206,12 @@ void importEntriesPreferredCitation() throws IOException, URISyntaxException {
 
         BibEntry expectedMain = getPopulatedEntry().withField(StandardField.CITES, citeKey);
 
-        BibEntry expectedPreferred = new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey(citeKey)
-                .withField(StandardField.AUTHOR, "Jonathan von Duke and Jim Kingston, Jr.")
-                .withField(StandardField.DOI, "10.0001/TEST")
-                .withField(StandardField.URL, "www.github.com");
+        BibEntry expectedPreferred =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey(citeKey)
+                        .withField(StandardField.AUTHOR, "Jonathan von Duke and Jim Kingston, Jr.")
+                        .withField(StandardField.DOI, "10.0001/TEST")
+                        .withField(StandardField.URL, "www.github.com");
 
         assertEquals(mainEntry, expectedMain);
         assertEquals(preferredEntry, expectedPreferred);
@@ -192,20 +227,23 @@ void importEntriesReferences() throws IOException, URISyntaxException {
         String citeKey1 = referenceEntry1.getCitationKey().orElse("");
         String citeKey2 = referenceEntry2.getCitationKey().orElse("");
 
-        BibEntry expectedMain = getPopulatedEntry().withField(StandardField.RELATED, citeKey1 + "," + citeKey2);
-
-        BibEntry expectedReference1 = new BibEntry(StandardEntryType.InProceedings)
-                .withCitationKey(citeKey1)
-                .withField(StandardField.AUTHOR, "Jonathan von Duke and Jim Kingston, Jr.")
-                .withField(StandardField.YEAR, "2007")
-                .withField(StandardField.DOI, "10.0001/TEST")
-                .withField(StandardField.URL, "www.example.com");
-
-        BibEntry expectedReference2 = new BibEntry(StandardEntryType.Manual)
-                .withCitationKey(citeKey2)
-                .withField(StandardField.AUTHOR, "Arthur Clark, Jr. and Luca von Diamond")
-                .withField(StandardField.DOI, "10.0002/TEST")
-                .withField(StandardField.URL, "www.facebook.com");
+        BibEntry expectedMain =
+                getPopulatedEntry().withField(StandardField.RELATED, citeKey1 + "," + citeKey2);
+
+        BibEntry expectedReference1 =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey(citeKey1)
+                        .withField(StandardField.AUTHOR, "Jonathan von Duke and Jim Kingston, Jr.")
+                        .withField(StandardField.YEAR, "2007")
+                        .withField(StandardField.DOI, "10.0001/TEST")
+                        .withField(StandardField.URL, "www.example.com");
+
+        BibEntry expectedReference2 =
+                new BibEntry(StandardEntryType.Manual)
+                        .withCitationKey(citeKey2)
+                        .withField(StandardField.AUTHOR, "Arthur Clark, Jr. and Luca von Diamond")
+                        .withField(StandardField.DOI, "10.0002/TEST")
+                        .withField(StandardField.URL, "www.facebook.com");
 
         assertEquals(mainEntry, expectedMain);
         assertEquals(referenceEntry1, expectedReference1);
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterFilesTest.java b/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterFilesTest.java
index b97c6ffd4c99..aeabce077e25 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterFilesTest.java
@@ -1,19 +1,20 @@
 package org.jabref.logic.importer.fileformat;
 
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import java.io.IOException;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
 class CitaviXmlImporterFilesTest {
 
     private static final String FILE_ENDING = ".ctv6bak";
     private final CitaviXmlImporter citaviXmlImporter = new CitaviXmlImporter();
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("CitaviXmlImporterTest") && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName =
+                name -> name.startsWith("CitaviXmlImporterTest") && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest.java
index ab8ddd6e1e69..a81ff35e048a 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class CitaviXmlImporterTest {
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterFilesTest.java b/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterFilesTest.java
index daab696d2c88..8233ebc7a74e 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterFilesTest.java
@@ -1,19 +1,19 @@
 package org.jabref.logic.importer.fileformat;
 
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import java.io.IOException;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
 class CopacImporterFilesTest {
 
     private static final String FILE_ENDING = ".txt";
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("CopacImporterTest")
-                && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName =
+                name -> name.startsWith("CopacImporterTest") && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java
index df4272af7e45..a21dbc025b80 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
 
 class CopacImporterTest {
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java
index 68f495da041b..79d148432f35 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.nio.file.Path;
-import java.util.Arrays;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.logic.importer.Importer;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.nio.file.Path;
+import java.util.Arrays;
 
 class CustomImporterTest {
 
@@ -37,14 +36,18 @@ void getClassName() {
 
     @Test
     void getBasePath() {
-        assertEquals(Path.of("src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java"),
+        assertEquals(
+                Path.of("src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java"),
                 importer.getBasePath());
     }
 
     @Test
     void getAsStringList() {
-        assertEquals(Arrays.asList("src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java",
-                "org.jabref.logic.importer.fileformat.CopacImporter"), importer.getAsStringList());
+        assertEquals(
+                Arrays.asList(
+                        "src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java",
+                        "org.jabref.logic.importer.fileformat.CopacImporter"),
+                importer.getAsStringList());
     }
 
     @Test
@@ -77,16 +80,19 @@ void testToString() {
 
     @Test
     void classicConstructor() throws Exception {
-        CustomImporter customImporter = new CustomImporter(
-                "src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java",
-                "org.jabref.logic.importer.fileformat.CopacImporter");
+        CustomImporter customImporter =
+                new CustomImporter(
+                        "src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java",
+                        "org.jabref.logic.importer.fileformat.CopacImporter");
 
         assertEquals(importer, customImporter);
     }
 
     private CustomImporter asCustomImporter(Importer importer) throws Exception {
         return new CustomImporter(
-                "src/main/java/org/jabref/logic/importer/fileformat/" + importer.getName() + "Importer.java",
+                "src/main/java/org/jabref/logic/importer/fileformat/"
+                        + importer.getName()
+                        + "Importer.java",
                 importer.getClass().getName());
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java
index edc9a3fec039..cfafaa6ced0e 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java
@@ -1,25 +1,24 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
 
 class EndnoteImporterTest {
 
@@ -47,13 +46,19 @@ void sGetExtensions() {
 
     @Test
     void getDescription() {
-        assertEquals("Importer for the Refer/Endnote format."
-                + " Modified to use article number for pages if pages are missing.", importer.getDescription());
+        assertEquals(
+                "Importer for the Refer/Endnote format."
+                        + " Modified to use article number for pages if pages are missing.",
+                importer.getDescription());
     }
 
     @Test
     void isRecognizedFormat() throws IOException, URISyntaxException {
-        List<String> list = Arrays.asList("Endnote.pattern.A.enw", "Endnote.pattern.E.enw", "Endnote.book.example.enw");
+        List<String> list =
+                Arrays.asList(
+                        "Endnote.pattern.A.enw",
+                        "Endnote.pattern.E.enw",
+                        "Endnote.book.example.enw");
 
         for (String string : list) {
             Path file = Path.of(EndnoteImporterTest.class.getResource(string).toURI());
@@ -63,9 +68,17 @@ void isRecognizedFormat() throws IOException, URISyntaxException {
 
     @Test
     void isRecognizedFormatReject() throws IOException, URISyntaxException {
-        List<String> list = Arrays.asList("IEEEImport1.txt", "IsiImporterTest1.isi", "IsiImporterTestInspec.isi",
-                "IsiImporterTestWOS.isi", "IsiImporterTestMedline.isi", "RisImporterTest1.ris",
-                "Endnote.pattern.no_enw", "empty.pdf", "annotated.pdf");
+        List<String> list =
+                Arrays.asList(
+                        "IEEEImport1.txt",
+                        "IsiImporterTest1.isi",
+                        "IsiImporterTestInspec.isi",
+                        "IsiImporterTestWOS.isi",
+                        "IsiImporterTestMedline.isi",
+                        "RisImporterTest1.ris",
+                        "Endnote.pattern.no_enw",
+                        "empty.pdf",
+                        "annotated.pdf");
 
         for (String string : list) {
             Path file = Path.of(EndnoteImporterTest.class.getResource(string).toURI());
@@ -121,8 +134,10 @@ void importEntries0() throws IOException, URISyntaxException {
     @Test
     void importEntries1() throws IOException {
         String medlineString = "%O Artn\\\\s testO\n%A testA,\n%E testE0, testE1";
-        List<BibEntry> bibEntries = importer.importDatabase(new BufferedReader(new StringReader(medlineString))).getDatabase()
-                                            .getEntries();
+        List<BibEntry> bibEntries =
+                importer.importDatabase(new BufferedReader(new StringReader(medlineString)))
+                        .getDatabase()
+                        .getEntries();
 
         BibEntry entry = bibEntries.getFirst();
 
@@ -135,7 +150,8 @@ void importEntries1() throws IOException {
 
     @Test
     void importEntriesBookExample() throws IOException, URISyntaxException {
-        Path file = Path.of(EndnoteImporterTest.class.getResource("Endnote.book.example.enw").toURI());
+        Path file =
+                Path.of(EndnoteImporterTest.class.getResource("Endnote.book.example.enw").toURI());
         List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry entry = bibEntries.getFirst();
@@ -143,12 +159,18 @@ void importEntriesBookExample() throws IOException, URISyntaxException {
         assertEquals(1, bibEntries.size());
         assertEquals(StandardEntryType.Book, entry.getType());
         assertEquals(Optional.of("Heidelberg"), entry.getField(StandardField.ADDRESS));
-        assertEquals(Optional.of("Preißel, René and Stachmann, Bjørn"), entry.getField(StandardField.AUTHOR));
-        assertEquals(Optional.of("3., aktualisierte und erweiterte Auflage"), entry.getField(StandardField.EDITION));
+        assertEquals(
+                Optional.of("Preißel, René and Stachmann, Bjørn"),
+                entry.getField(StandardField.AUTHOR));
+        assertEquals(
+                Optional.of("3., aktualisierte und erweiterte Auflage"),
+                entry.getField(StandardField.EDITION));
         assertEquals(Optional.of("Versionsverwaltung"), entry.getField(StandardField.KEYWORDS));
         assertEquals(Optional.of("XX, 327"), entry.getField(StandardField.PAGES));
         assertEquals(Optional.of("dpunkt.verlag"), entry.getField(StandardField.PUBLISHER));
-        assertEquals(Optional.of("Git : dezentrale Versionsverwaltung im Team : Grundlagen und Workflows"),
+        assertEquals(
+                Optional.of(
+                        "Git : dezentrale Versionsverwaltung im Team : Grundlagen und Workflows"),
                 entry.getField(StandardField.TITLE));
         assertEquals(Optional.of("http://d-nb.info/107601965X"), entry.getField(StandardField.URL));
         assertEquals(Optional.of("2016"), entry.getField(StandardField.YEAR));
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporterFilesTest.java b/src/test/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporterFilesTest.java
index e4f4103dad59..2f515e067dfb 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporterFilesTest.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 class EndnoteXmlImporterFilesTest {
 
@@ -20,7 +19,8 @@ class EndnoteXmlImporterFilesTest {
     private ImportFormatPreferences importFormatPreferences;
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("EndnoteXmlImporterTest") && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName =
+                name -> name.startsWith("EndnoteXmlImporterTest") && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
@@ -38,18 +38,21 @@ void setUp() {
     @ParameterizedTest
     @MethodSource("fileNames")
     void isRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(new EndnoteXmlImporter(importFormatPreferences), fileName);
+        ImporterTestEngine.testIsRecognizedFormat(
+                new EndnoteXmlImporter(importFormatPreferences), fileName);
     }
 
     @ParameterizedTest
     @MethodSource("invalidFileNames")
     void isNotRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsNotRecognizedFormat(new EndnoteXmlImporter(importFormatPreferences), fileName);
+        ImporterTestEngine.testIsNotRecognizedFormat(
+                new EndnoteXmlImporter(importFormatPreferences), fileName);
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     void importEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(new EndnoteXmlImporter(importFormatPreferences), fileName, FILE_ENDING);
+        ImporterTestEngine.testImportEntries(
+                new EndnoteXmlImporter(importFormatPreferences), fileName, FILE_ENDING);
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java b/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java
index 5b7a1e309073..55a6f241d327 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java
@@ -1,5 +1,15 @@
 package org.jabref.logic.importer.fileformat;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.jabref.logic.bibtex.BibEntryAssert;
+import org.jabref.logic.importer.ImportException;
+import org.jabref.logic.importer.Importer;
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.model.entry.BibEntry;
+
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
@@ -11,49 +21,44 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.jabref.logic.bibtex.BibEntryAssert;
-import org.jabref.logic.importer.ImportException;
-import org.jabref.logic.importer.Importer;
-import org.jabref.logic.importer.ParserResult;
-import org.jabref.model.entry.BibEntry;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 public class ImporterTestEngine {
 
-    private static final String TEST_RESOURCES = "src/test/resources/org/jabref/logic/importer/fileformat";
+    private static final String TEST_RESOURCES =
+            "src/test/resources/org/jabref/logic/importer/fileformat";
 
     /**
      * @param fileNamePredicate A predicate that describes the files which contain tests
      * @return A collection with the names of files in the test folder
      * @throws IOException if there is a problem when trying to read the files in the file system
      */
-    public static Collection<String> getTestFiles(Predicate<String> fileNamePredicate) throws IOException {
+    public static Collection<String> getTestFiles(Predicate<String> fileNamePredicate)
+            throws IOException {
         try (Stream<Path> stream = Files.list(Path.of(TEST_RESOURCES))) {
-            return stream
-                    .map(path -> path.getFileName().toString())
+            return stream.map(path -> path.getFileName().toString())
                     .filter(fileNamePredicate)
                     .collect(Collectors.toList());
         }
     }
 
-    public static void testIsRecognizedFormat(Importer importer, String fileName) throws IOException {
+    public static void testIsRecognizedFormat(Importer importer, String fileName)
+            throws IOException {
         assertTrue(importer.isRecognizedFormat(getPath(fileName)));
     }
 
-    public static void testIsNotRecognizedFormat(Importer importer, String fileName) throws IOException {
+    public static void testIsNotRecognizedFormat(Importer importer, String fileName)
+            throws IOException {
         assertFalse(importer.isRecognizedFormat(getPath(fileName)));
     }
 
-    public static void testImportEntries(Importer importer, String fileName, String fileType) throws IOException, ImportException {
+    public static void testImportEntries(Importer importer, String fileName, String fileType)
+            throws IOException, ImportException {
         ParserResult parserResult = importer.importDatabase(getPath(fileName));
         if (parserResult.isInvalid()) {
             throw new ImportException(parserResult.getErrorMessage());
         }
         List<BibEntry> entries = parserResult.getDatabase().getEntries();
-        BibEntryAssert.assertEquals(ImporterTestEngine.class, fileName.replaceAll(fileType, ".bib"), entries);
+        BibEntryAssert.assertEquals(
+                ImporterTestEngine.class, fileName.replaceAll(fileType, ".bib"), entries);
     }
 
     private static Path getPath(String fileName) throws IOException {
@@ -64,9 +69,10 @@ private static Path getPath(String fileName) throws IOException {
         }
     }
 
-    public static void testImportMalformedFiles(Importer importer, String fileName) throws IOException {
-        List<BibEntry> entries = importer.importDatabase(getPath(fileName)).getDatabase()
-                                         .getEntries();
+    public static void testImportMalformedFiles(Importer importer, String fileName)
+            throws IOException {
+        List<BibEntry> entries =
+                importer.importDatabase(getPath(fileName)).getDatabase().getEntries();
         assertEquals(entries, new ArrayList<BibEntry>());
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java
index 02ec6c960c7e..78ad650ccc7c 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java
@@ -1,26 +1,25 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.bibtex.BibEntryAssert;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.URISyntaxException;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 class InspecImporterTest {
 
@@ -28,9 +27,11 @@ class InspecImporterTest {
     private InspecImporter importer;
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("InspecImportTest")
-                && !name.contains("False")
-                && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName =
+                name ->
+                        name.startsWith("InspecImportTest")
+                                && !name.contains("False")
+                                && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
@@ -59,7 +60,9 @@ void isRecognizedFormatReject(String fileName) throws IOException {
     @Test
     void completeBibtexEntryOnJournalPaperImport() throws IOException, URISyntaxException {
         BibEntry expectedEntry = new BibEntry(StandardEntryType.Article);
-        expectedEntry.setField(StandardField.TITLE, "The SIS project : software reuse with a natural language approach");
+        expectedEntry.setField(
+                StandardField.TITLE,
+                "The SIS project : software reuse with a natural language approach");
         expectedEntry.setField(StandardField.AUTHOR, "Prechelt, Lutz");
         expectedEntry.setField(StandardField.YEAR, "1992");
         expectedEntry.setField(StandardField.ABSTRACT, "Abstrakt");
@@ -68,16 +71,16 @@ void completeBibtexEntryOnJournalPaperImport() throws IOException, URISyntaxExce
         expectedEntry.setField(StandardField.PAGES, "20");
         expectedEntry.setField(StandardField.VOLUME, "19");
 
-        BibEntryAssert.assertEquals(Collections.singletonList(expectedEntry),
-                InspecImporterTest.class.getResource("InspecImportTest2.txt"), importer);
+        BibEntryAssert.assertEquals(
+                Collections.singletonList(expectedEntry),
+                InspecImporterTest.class.getResource("InspecImportTest2.txt"),
+                importer);
     }
 
     @Test
     void importConferencePaperGivesInproceedings() throws IOException {
-        String testInput = "Record.*INSPEC.*\n" +
-                "\n" +
-                "RT ~ Conference-Paper\n" +
-                "AU ~ Prechelt, Lutz";
+        String testInput =
+                "Record.*INSPEC.*\n" + "\n" + "RT ~ Conference-Paper\n" + "AU ~ Prechelt, Lutz";
         BibEntry expectedEntry = new BibEntry(StandardEntryType.InProceedings);
         expectedEntry.setField(StandardField.AUTHOR, "Prechelt, Lutz");
 
@@ -89,10 +92,7 @@ void importConferencePaperGivesInproceedings() throws IOException {
 
     @Test
     void importMiscGivesMisc() throws IOException {
-        String testInput = "Record.*INSPEC.*\n" +
-                "\n" +
-                "AU ~ Prechelt, Lutz \n" +
-                "RT ~ Misc";
+        String testInput = "Record.*INSPEC.*\n" + "\n" + "AU ~ Prechelt, Lutz \n" + "RT ~ Misc";
         BibEntry expectedEntry = new BibEntry(StandardEntryType.Misc);
         expectedEntry.setField(StandardField.AUTHOR, "Prechelt, Lutz");
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
index 9b08f4a15ef6..0132df256f08 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
@@ -1,13 +1,6 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
@@ -16,12 +9,18 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 class IsiImporterTest {
 
@@ -29,9 +28,11 @@ class IsiImporterTest {
     private final IsiImporter importer = new IsiImporter();
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("IsiImporterTest")
-                && !name.contains("Empty")
-                && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName =
+                name ->
+                        name.startsWith("IsiImporterTest")
+                                && !name.contains("Empty")
+                                && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
@@ -124,7 +125,8 @@ void importEntries1() throws IOException, URISyntaxException {
         BibEntry entry = entries.getFirst();
 
         assertEquals(1, entries.size());
-        assertEquals(Optional.of("Optical properties of MgO doped LiNbO$_3$ single crystals"),
+        assertEquals(
+                Optional.of("Optical properties of MgO doped LiNbO$_3$ single crystals"),
                 entry.getField(StandardField.TITLE));
         assertEquals(
                 Optional.of(
@@ -145,7 +147,8 @@ void importEntries2() throws IOException, URISyntaxException {
         BibEntry entry = entries.getFirst();
 
         assertEquals(3, entries.size());
-        assertEquals(Optional.of("Optical properties of MgO doped LiNbO$_3$ single crystals"),
+        assertEquals(
+                Optional.of("Optical properties of MgO doped LiNbO$_3$ single crystals"),
                 entry.getField(StandardField.TITLE));
         assertEquals(StandardEntryType.Misc, entry.getType());
         assertEquals(Optional.of("Optical Materials"), entry.getField(StandardField.JOURNAL));
@@ -163,8 +166,10 @@ void importEntriesINSPEC() throws IOException, URISyntaxException {
         BibEntry first = entries.getFirst();
         BibEntry second = entries.get(1);
 
-        if (first.getField(StandardField.TITLE).equals(
-                Optional.of("Optical and photoelectric spectroscopy of photorefractive Sn$_2$P$_2$S$_6$ crystals"))) {
+        if (first.getField(StandardField.TITLE)
+                .equals(
+                        Optional.of(
+                                "Optical and photoelectric spectroscopy of photorefractive Sn$_2$P$_2$S$_6$ crystals"))) {
             BibEntry tmp = first;
             first = second;
             second = tmp;
@@ -177,7 +182,8 @@ void importEntriesINSPEC() throws IOException, URISyntaxException {
                 first.getField(StandardField.TITLE));
         assertEquals(StandardEntryType.Article, first.getType());
 
-        assertEquals(Optional.of("Degl'Innocenti, R. and Guarino, A. and Poberaj, G. and Gunter, P."),
+        assertEquals(
+                Optional.of("Degl'Innocenti, R. and Guarino, A. and Poberaj, G. and Gunter, P."),
                 first.getField(StandardField.AUTHOR));
         assertEquals(Optional.of("Applied Physics Letters"), first.getField(StandardField.JOURNAL));
         assertEquals(Optional.of("2006"), first.getField(StandardField.YEAR));
@@ -187,7 +193,8 @@ void importEntriesINSPEC() throws IOException, URISyntaxException {
         assertEquals(Optional.of("Lorem ipsum abstract"), first.getField(StandardField.ABSTRACT));
         assertEquals(Optional.of("Aip"), first.getField(StandardField.PUBLISHER));
         assertEquals(
-                Optional.of("Optical and photoelectric spectroscopy of photorefractive Sn$_2$P$_2$S$_6$ crystals"),
+                Optional.of(
+                        "Optical and photoelectric spectroscopy of photorefractive Sn$_2$P$_2$S$_6$ crystals"),
                 second.getField(StandardField.TITLE));
         assertEquals(StandardEntryType.Article, second.getType());
     }
@@ -202,12 +209,18 @@ void importEntriesWOS() throws IOException, URISyntaxException {
 
         assertEquals(2, entries.size());
 
-        assertEquals(Optional.of("Optical and photoelectric spectroscopy of photorefractive Sn2P2S6 crystals"),
+        assertEquals(
+                Optional.of(
+                        "Optical and photoelectric spectroscopy of photorefractive Sn2P2S6 crystals"),
                 first.getField(StandardField.TITLE));
-        assertEquals(Optional.of("Optical waveguides in Sn2P2S6 by low fluence MeV He+ ion implantation"),
+        assertEquals(
+                Optional.of(
+                        "Optical waveguides in Sn2P2S6 by low fluence MeV He+ ion implantation"),
                 second.getField(StandardField.TITLE));
 
-        assertEquals(Optional.of("Journal of Physics-Condensed Matter"), first.getField(StandardField.JOURNAL));
+        assertEquals(
+                Optional.of("Journal of Physics-Condensed Matter"),
+                first.getField(StandardField.JOURNAL));
     }
 
     @Test
@@ -256,17 +269,25 @@ void importIEEEExport() throws IOException, URISyntaxException {
 
         assertEquals(1, entries.size());
         assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("Geoscience and Remote Sensing Letters, IEEE"), entry.getField(StandardField.JOURNAL));
-        assertEquals(Optional.of("Improving Urban Road Extraction in High-Resolution "
-                        + "Images Exploiting Directional Filtering, Perceptual " + "Grouping, and Simple Topological Concepts"),
+        assertEquals(
+                Optional.of("Geoscience and Remote Sensing Letters, IEEE"),
+                entry.getField(StandardField.JOURNAL));
+        assertEquals(
+                Optional.of(
+                        "Improving Urban Road Extraction in High-Resolution "
+                                + "Images Exploiting Directional Filtering, Perceptual "
+                                + "Grouping, and Simple Topological Concepts"),
                 entry.getField(StandardField.TITLE));
         assertEquals(Optional.of("4"), entry.getField(StandardField.VOLUME));
         assertEquals(Optional.of("3"), entry.getField(StandardField.NUMBER));
         assertEquals(Optional.of("1545-598X"), entry.getField(new UnknownField("SN")));
         assertEquals(Optional.of("387--391"), entry.getField(StandardField.PAGES));
-        assertEquals(Optional.of("Gamba, P. and Dell'Acqua, F. and Lisini, G."), entry.getField(StandardField.AUTHOR));
+        assertEquals(
+                Optional.of("Gamba, P. and Dell'Acqua, F. and Lisini, G."),
+                entry.getField(StandardField.AUTHOR));
         assertEquals(Optional.of("2006"), entry.getField(StandardField.YEAR));
-        assertEquals(Optional.of("Perceptual grouping, street extraction, urban remote sensing"),
+        assertEquals(
+                Optional.of("Perceptual grouping, street extraction, urban remote sensing"),
                 entry.getField(StandardField.KEYWORDS));
         assertEquals(Optional.of("Lorem ipsum abstract"), entry.getField(StandardField.ABSTRACT));
     }
@@ -279,7 +300,9 @@ void iEEEImport() throws IOException, URISyntaxException {
 
         assertEquals(1, entries.size());
         assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("Geoscience and Remote Sensing Letters, IEEE"), entry.getField(StandardField.JOURNAL));
+        assertEquals(
+                Optional.of("Geoscience and Remote Sensing Letters, IEEE"),
+                entry.getField(StandardField.JOURNAL));
         assertEquals(
                 Optional.of(
                         "Improving Urban Road Extraction in High-Resolution Images Exploiting Directional Filtering, Perceptual Grouping, and Simple Topological Concepts"),
@@ -288,16 +311,20 @@ void iEEEImport() throws IOException, URISyntaxException {
         assertEquals(Optional.of("3"), entry.getField(StandardField.NUMBER));
         assertEquals(Optional.of("1545-598X"), entry.getField(new UnknownField("SN")));
         assertEquals(Optional.of("387--391"), entry.getField(StandardField.PAGES));
-        assertEquals(Optional.of("Gamba, P. and Dell'Acqua, F. and Lisini, G."), entry.getField(StandardField.AUTHOR));
+        assertEquals(
+                Optional.of("Gamba, P. and Dell'Acqua, F. and Lisini, G."),
+                entry.getField(StandardField.AUTHOR));
         assertEquals(Optional.of("2006"), entry.getField(StandardField.YEAR));
-        assertEquals(Optional.of("Perceptual grouping, street extraction, urban remote sensing"),
+        assertEquals(
+                Optional.of("Perceptual grouping, street extraction, urban remote sensing"),
                 entry.getField(StandardField.KEYWORDS));
         assertEquals(Optional.of("Lorem ipsum abstract"), entry.getField(StandardField.ABSTRACT));
     }
 
     @Test
     void importEntriesMedline() throws IOException, URISyntaxException {
-        Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTestMedline.isi").toURI());
+        Path file =
+                Path.of(IsiImporterTest.class.getResource("IsiImporterTestMedline.isi").toURI());
         List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry first = entries.getFirst();
@@ -305,7 +332,8 @@ void importEntriesMedline() throws IOException, URISyntaxException {
 
         assertEquals(2, entries.size());
         assertEquals(
-                Optional.of("Effects of modafinil on cognitive performance and alertness during sleep deprivation."),
+                Optional.of(
+                        "Effects of modafinil on cognitive performance and alertness during sleep deprivation."),
                 first.getField(StandardField.TITLE));
         assertEquals(Optional.of("Wesensten, Nancy J."), first.getField(StandardField.AUTHOR));
         assertEquals(Optional.of("Curr Pharm Des"), first.getField(StandardField.JOURNAL));
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MarcXmlParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MarcXmlParserTest.java
index 60ee9da6da77..2795400ff00a 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MarcXmlParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MarcXmlParserTest.java
@@ -1,26 +1,26 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.jabref.logic.bibtex.BibEntryAssert;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.entry.BibEntry;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 class MarcXmlParserTest {
 
     private static final String FILE_ENDING = ".xml";
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("MarcXMLParserTest") && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName =
+                name -> name.startsWith("MarcXMLParserTest") && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterFilesTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterFilesTest.java
index fceb4bd7a9e1..30323bb33222 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterFilesTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer.fileformat;
 
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import java.io.IOException;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
 class MedlineImporterFilesTest {
 
     private static final String FILE_ENDING = ".xml";
@@ -14,8 +14,11 @@ class MedlineImporterFilesTest {
     private static final String MALFORMED_KEY_WORD = "Malformed";
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("MedlineImporterTest") && name.endsWith(FILE_ENDING)
-                && !name.contains(MALFORMED_KEY_WORD);
+        Predicate<String> fileName =
+                name ->
+                        name.startsWith("MedlineImporterTest")
+                                && name.endsWith(FILE_ENDING)
+                                && !name.contains(MALFORMED_KEY_WORD);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
@@ -43,8 +46,10 @@ void importEntries(String fileName) throws Exception {
     }
 
     private static Stream<String> malformedFileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("MedlineImporterTest" + MALFORMED_KEY_WORD)
-                && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName =
+                name ->
+                        name.startsWith("MedlineImporterTest" + MALFORMED_KEY_WORD)
+                                && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java
index d9987d9a8ade..06781a7c6427 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java
@@ -1,12 +1,11 @@
 package org.jabref.logic.importer.fileformat;
 
-import org.jabref.logic.util.StandardFileType;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.util.StandardFileType;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Articles in the medline format can be downloaded from http://www.ncbi.nlm.nih.gov/pubmed/.
  * <ol>
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
index e23df96ffe4c..485a24f6cebf 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
@@ -1,23 +1,18 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.bibtex.BibEntryAssert;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
@@ -26,13 +21,17 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 class MedlinePlainImporterTest {
 
@@ -40,8 +39,8 @@ class MedlinePlainImporterTest {
     private MedlinePlainImporter importer;
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("MedlinePlainImporterTest")
-                && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName =
+                name -> name.startsWith("MedlinePlainImporterTest") && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
@@ -51,7 +50,8 @@ private BufferedReader readerForString(String string) {
 
     @BeforeEach
     void setUp() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         importer = new MedlinePlainImporter(importFormatPreferences);
     }
@@ -69,16 +69,21 @@ void doesNotRecognizeEmptyFiles() throws IOException {
 
     @Test
     void importMultipleEntriesInSingleFile() throws IOException, URISyntaxException {
-        Path inputFile = Path.of(MedlinePlainImporter.class.getResource("MedlinePlainImporterTestMultipleEntries.txt").toURI());
+        Path inputFile =
+                Path.of(
+                        MedlinePlainImporter.class
+                                .getResource("MedlinePlainImporterTestMultipleEntries.txt")
+                                .toURI());
 
-        List<BibEntry> entries = importer.importDatabase(inputFile).getDatabase()
-                                         .getEntries();
+        List<BibEntry> entries = importer.importDatabase(inputFile).getDatabase().getEntries();
         BibEntry testEntry = entries.getFirst();
 
         assertEquals(7, entries.size());
         assertEquals(StandardEntryType.Article, testEntry.getType());
         assertEquals(Optional.empty(), testEntry.getField(StandardField.MONTH));
-        assertEquals(Optional.of("Long, Vicky and Marland, Hilary"), testEntry.getField(StandardField.AUTHOR));
+        assertEquals(
+                Optional.of("Long, Vicky and Marland, Hilary"),
+                testEntry.getField(StandardField.AUTHOR));
         assertEquals(
                 Optional.of(
                         "From danger and motherhood to health and beauty: health advice for the factory girl in early twentieth-century Britain."),
@@ -103,32 +108,37 @@ void importMultipleEntriesInSingleFile() throws IOException, URISyntaxException
 
         testEntry = entries.get(4);
         assertEquals(StandardEntryType.InProceedings, testEntry.getType());
-        assertEquals(Optional.of("Inproceedings book title"), testEntry.getField(StandardField.BOOKTITLE));
+        assertEquals(
+                Optional.of("Inproceedings book title"),
+                testEntry.getField(StandardField.BOOKTITLE));
 
-        BibEntry expectedEntry5 = new BibEntry(StandardEntryType.Proceedings)
-                .withField(StandardField.KEYWORDS, "Female")
+        BibEntry expectedEntry5 =
+                new BibEntry(StandardEntryType.Proceedings)
+                        .withField(StandardField.KEYWORDS, "Female")
                         .withField(StandardField.PMID, "96578310");
         assertEquals(expectedEntry5, entries.get(5));
 
-        BibEntry expectedEntry6 = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.KEYWORDS, "Female")
+        BibEntry expectedEntry6 =
+                new BibEntry(StandardEntryType.Misc)
+                        .withField(StandardField.KEYWORDS, "Female")
                         .withField(StandardField.PMID, "45984220");
         assertEquals(expectedEntry6, entries.get(6));
     }
 
     @Test
     void emptyFileImport() throws IOException {
-        List<BibEntry> emptyEntries = importer.importDatabase(readerForString("")).getDatabase().getEntries();
+        List<BibEntry> emptyEntries =
+                importer.importDatabase(readerForString("")).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), emptyEntries);
     }
 
     @ParameterizedTest
     @CsvSource({
-            "MedlinePlainImporterTestCompleteEntry",
-            "MedlinePlainImporterTestMultiAbstract",
-            "MedlinePlainImporterTestMultiTitle",
-            "MedlinePlainImporterTestDOI",
-            "MedlinePlainImporterTestInproceeding"
+        "MedlinePlainImporterTestCompleteEntry",
+        "MedlinePlainImporterTestMultiAbstract",
+        "MedlinePlainImporterTestMultiTitle",
+        "MedlinePlainImporterTestDOI",
+        "MedlinePlainImporterTestInproceeding"
     })
     void importSingleEntriesInSingleFiles(String testFile) throws IOException, URISyntaxException {
         String medlineFile = testFile + ".txt";
@@ -149,7 +159,9 @@ private void assertImportOfMedlineFileEqualsBibtexFile(String medlineFile, Strin
 
     @Test
     void multiLineComments() throws IOException {
-        try (BufferedReader reader = readerForString("""
+        try (BufferedReader reader =
+                readerForString(
+                        """
                 PMID-22664220
                 CON - Comment1
                 CIN - Comment2\
@@ -170,11 +182,13 @@ void multiLineComments() throws IOException {
                 UOF - Comment14
                 SPIN- Comment15
                 ORI - Comment16""")) {
-            List<BibEntry> actualEntries = importer.importDatabase(reader).getDatabase().getEntries();
+            List<BibEntry> actualEntries =
+                    importer.importDatabase(reader).getDatabase().getEntries();
             BibEntry expectedEntry = new BibEntry();
 
             expectedEntry.setField(StandardField.PMID, "22664220");
-            expectedEntry.setField(StandardField.COMMENT,
+            expectedEntry.setField(
+                    StandardField.COMMENT,
                     """
                             Comment1
                             Comment2
@@ -198,11 +212,14 @@ void multiLineComments() throws IOException {
 
     @Test
     void keyWords() throws IOException {
-        try (BufferedReader reader = readerForString("""
+        try (BufferedReader reader =
+                readerForString(
+                        """
                 PMID-22664795
                 MH  - Female
                 OT  - Male""")) {
-            List<BibEntry> actualEntries = importer.importDatabase(reader).getDatabase().getEntries();
+            List<BibEntry> actualEntries =
+                    importer.importDatabase(reader).getDatabase().getEntries();
 
             BibEntry expectedEntry = new BibEntry();
             expectedEntry.setField(StandardField.PMID, "22664795");
@@ -214,7 +231,8 @@ void keyWords() throws IOException {
 
     @Test
     void withNbibFile() throws IOException, URISyntaxException {
-        Path file = Path.of(MedlinePlainImporter.class.getResource("NbibImporterTest.nbib").toURI());
+        Path file =
+                Path.of(MedlinePlainImporter.class.getResource("NbibImporterTest.nbib").toURI());
 
         List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
@@ -223,16 +241,25 @@ void withNbibFile() throws IOException, URISyntaxException {
 
     @Test
     void withMultipleEntriesInvalidFormat() throws IOException, URISyntaxException {
-        Path file = Path.of(MedlinePlainImporter.class.getResource("MedlinePlainImporterStringOutOfBounds.txt").toURI());
+        Path file =
+                Path.of(
+                        MedlinePlainImporter.class
+                                .getResource("MedlinePlainImporterStringOutOfBounds.txt")
+                                .toURI());
 
         List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
-        BibEntryAssert.assertEquals(MedlinePlainImporter.class, "MedlinePlainImporterStringOutOfBounds.bib", entries);
+        BibEntryAssert.assertEquals(
+                MedlinePlainImporter.class, "MedlinePlainImporterStringOutOfBounds.bib", entries);
     }
 
     @Test
     void invalidFormat() throws URISyntaxException, IOException {
-        Path file = Path.of(MedlinePlainImporter.class.getResource("MedlinePlainImporterTestInvalidFormat.xml").toURI());
+        Path file =
+                Path.of(
+                        MedlinePlainImporter.class
+                                .getResource("MedlinePlainImporterTestInvalidFormat.xml")
+                                .toURI());
 
         List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
@@ -241,17 +268,20 @@ void invalidFormat() throws URISyntaxException, IOException {
 
     @Test
     void nullReader() throws IOException {
-        Executable fail = () -> {
-            try (BufferedReader reader = null) {
-                importer.importDatabase(reader);
-            }
-        };
+        Executable fail =
+                () -> {
+                    try (BufferedReader reader = null) {
+                        importer.importDatabase(reader);
+                    }
+                };
         assertThrows(NullPointerException.class, fail);
     }
 
     @Test
     void allArticleTypes() throws IOException {
-        try (BufferedReader reader = readerForString("""
+        try (BufferedReader reader =
+                readerForString(
+                        """
                 PMID-22664795
                 MH  - Female
                 PT  - journal article\
@@ -260,11 +290,13 @@ void allArticleTypes() throws IOException {
                 PT  - corrected and republished article
                 PT  - introductory journal article
                 PT  - newspaper article""")) {
-            List<BibEntry> actualEntries = importer.importDatabase(reader).getDatabase().getEntries();
+            List<BibEntry> actualEntries =
+                    importer.importDatabase(reader).getDatabase().getEntries();
 
-            BibEntry expectedEntry = new BibEntry(StandardEntryType.Article)
-                    .withField(StandardField.KEYWORDS, "Female")
-                    .withField(StandardField.PMID, "22664795");
+            BibEntry expectedEntry =
+                    new BibEntry(StandardEntryType.Article)
+                            .withField(StandardField.KEYWORDS, "Female")
+                            .withField(StandardField.PMID, "22664795");
 
             assertEquals(Collections.singletonList(expectedEntry), actualEntries);
         }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterFilesTest.java b/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterFilesTest.java
index f51f0ce7fdcc..6cc8d03c5349 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterFilesTest.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 class ModsImporterFilesTest {
 
@@ -33,12 +32,14 @@ void setUp() {
     @ParameterizedTest
     @MethodSource("fileNames")
     void isRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(new ModsImporter(importFormatPreferences), fileName);
+        ImporterTestEngine.testIsRecognizedFormat(
+                new ModsImporter(importFormatPreferences), fileName);
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     void importEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(new ModsImporter(importFormatPreferences), fileName, FILE_ENDING);
+        ImporterTestEngine.testImportEntries(
+                new ModsImporter(importFormatPreferences), fileName, FILE_ENDING);
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java
index f6619dcb4dea..478e75b15c8e 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertSame;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.List;
 
 class MrDLibImporterTest {
 
@@ -23,7 +22,8 @@ class MrDLibImporterTest {
     @BeforeEach
     void setUp() {
         importer = new MrDLibImporter();
-        String testInput = "{\"label\": {\"label-description\": \"The following articles are similar to the document have currently selected.\", \"label-language\": \"en\", \"label-text\": \"Related Articles\"},    \"recommendation_set_id\": \"1\",    \"recommendations\": {        \"74021358\": {            \"abstract\": \"abstract\",            \"authors\":\"Sajovic, Marija\",            \"published_year\": \"2006\",            \"item_id_original\": \"12088644\",            \"keywords\": [                \"visoko\\u0161olski program Geodezija - smer Prostorska informatika\"            ],            \"language_provided\": \"sl\",            \"recommendation_id\": \"1\",            \"title\": \"The protection of rural lands with the spatial development strategy on the case of Hrastnik commune\",            \"url\": \"http://drugg.fgg.uni-lj.si/701/1/GEV_0199_Sajovic.pdf\"        },        \"82005804\": {            \"abstract\": \"abstract\",            \"year_published\": null,            \"item_id_original\": \"30145702\",            \"language_provided\": null,            \"recommendation_id\": \"2\",            \"title\": \"Engagement of the volunteers in the solution to the accidents in the South-Moravia region\"        },        \"82149599\": {            \"abstract\": \"abstract\",            \"year_published\": null,            \"item_id_original\": \"97690763\",            \"language_provided\": null,            \"recommendation_id\": \"3\",            \"title\": \"\\\"The only Father's word\\\". The relationship of the Father and the Son in the documents of saint John of the Cross\",            \"url\": \"http://www.nusl.cz/ntk/nusl-285711\"        },        \"84863921\": {            \"abstract\": \"abstract\",            \"authors\":\"Kaffa, Elena\",            \"year_published\": null,            \"item_id_original\": \"19397104\",            \"keywords\": [                \"BX\",                \"D111\"            ],            \"language_provided\": \"en\",            \"recommendation_id\": \"4\",            \"title\": \"Greek Church of Cyprus, the Morea and Constantinople during the Frankish Era (1196-1303)\"        },        \"88950992\": {            \"abstract\": \"abstract\",            \"authors\":\"Yasui, Kono\",            \"year_published\": null,            \"item_id_original\": \"38763657\",            \"language_provided\": null,            \"recommendation_id\": \"5\",            \"title\": \"A Phylogenetic Consideration on the Vascular Plants, Cotyledonary Node Including Hypocotyl Being Taken as the Ancestral Form : A Preliminary Note\"        }    }}";
+        String testInput =
+                "{\"label\": {\"label-description\": \"The following articles are similar to the document have currently selected.\", \"label-language\": \"en\", \"label-text\": \"Related Articles\"},    \"recommendation_set_id\": \"1\",    \"recommendations\": {        \"74021358\": {            \"abstract\": \"abstract\",            \"authors\":\"Sajovic, Marija\",            \"published_year\": \"2006\",            \"item_id_original\": \"12088644\",            \"keywords\": [                \"visoko\\u0161olski program Geodezija - smer Prostorska informatika\"            ],            \"language_provided\": \"sl\",            \"recommendation_id\": \"1\",            \"title\": \"The protection of rural lands with the spatial development strategy on the case of Hrastnik commune\",            \"url\": \"http://drugg.fgg.uni-lj.si/701/1/GEV_0199_Sajovic.pdf\"        },        \"82005804\": {            \"abstract\": \"abstract\",            \"year_published\": null,            \"item_id_original\": \"30145702\",            \"language_provided\": null,            \"recommendation_id\": \"2\",            \"title\": \"Engagement of the volunteers in the solution to the accidents in the South-Moravia region\"        },        \"82149599\": {            \"abstract\": \"abstract\",            \"year_published\": null,            \"item_id_original\": \"97690763\",            \"language_provided\": null,            \"recommendation_id\": \"3\",            \"title\": \"\\\"The only Father's word\\\". The relationship of the Father and the Son in the documents of saint John of the Cross\",            \"url\": \"http://www.nusl.cz/ntk/nusl-285711\"        },        \"84863921\": {            \"abstract\": \"abstract\",            \"authors\":\"Kaffa, Elena\",            \"year_published\": null,            \"item_id_original\": \"19397104\",            \"keywords\": [                \"BX\",                \"D111\"            ],            \"language_provided\": \"en\",            \"recommendation_id\": \"4\",            \"title\": \"Greek Church of Cyprus, the Morea and Constantinople during the Frankish Era (1196-1303)\"        },        \"88950992\": {            \"abstract\": \"abstract\",            \"authors\":\"Yasui, Kono\",            \"year_published\": null,            \"item_id_original\": \"38763657\",            \"language_provided\": null,            \"recommendation_id\": \"5\",            \"title\": \"A Phylogenetic Consideration on the Vascular Plants, Cotyledonary Node Including Hypocotyl Being Taken as the Ancestral Form : A Preliminary Note\"        }    }}";
         input = new BufferedReader(new StringReader(testInput));
     }
 
@@ -33,8 +33,7 @@ void importDatabaseIsYearSetCorrectly() throws IOException {
 
         List<BibEntry> resultList = parserResult.getDatabase().getEntries();
 
-        assertEquals("2006",
-                resultList.getFirst().getFieldLatexFree(StandardField.YEAR).get());
+        assertEquals("2006", resultList.getFirst().getFieldLatexFree(StandardField.YEAR).get());
     }
 
     @Test
@@ -43,7 +42,8 @@ void importDatabaseIsTitleSetCorrectly() throws IOException {
 
         List<BibEntry> resultList = parserResult.getDatabase().getEntries();
 
-        assertEquals("The protection of rural lands with the spatial development strategy on the case of Hrastnik commune",
+        assertEquals(
+                "The protection of rural lands with the spatial development strategy on the case of Hrastnik commune",
                 resultList.getFirst().getFieldLatexFree(StandardField.TITLE).get());
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterFilesTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterFilesTest.java
index 9b679ab7b456..c870ee74ef07 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterFilesTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.importer.fileformat;
 
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import java.io.IOException;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
 class MsBibImporterFilesTest {
 
     private static final String FILE_ENDING = ".xml";
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("MsBib")
-                && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName = name -> name.startsWith("MsBib") && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java
index c86292562674..16ce6f79b367 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java
@@ -1,5 +1,12 @@
 package org.jabref.logic.importer.fileformat;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import org.jabref.logic.importer.Importer;
+import org.jabref.model.entry.BibEntry;
+import org.junit.jupiter.api.Test;
+
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Path;
@@ -7,22 +14,19 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jabref.logic.importer.Importer;
-import org.jabref.model.entry.BibEntry;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
 class MsBibImporterTest {
 
     Importer importer = new MsBibImporter();
 
     @Test
     final void isNotRecognizedFormat() throws Exception {
-        List<String> notAccepted = Arrays.asList("CopacImporterTest1.txt", "IsiImporterTest1.isi",
-                "IsiImporterTestInspec.isi", "emptyFile.xml", "IsiImporterTestWOS.isi");
+        List<String> notAccepted =
+                Arrays.asList(
+                        "CopacImporterTest1.txt",
+                        "IsiImporterTest1.isi",
+                        "IsiImporterTestInspec.isi",
+                        "emptyFile.xml",
+                        "IsiImporterTestWOS.isi");
         for (String s : notAccepted) {
             Path file = Path.of(MsBibImporter.class.getResource(s).toURI());
             assertFalse(importer.isRecognizedFormat(file));
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java
index e36ccd7d3459..a92d01ba3e9f 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java
@@ -1,27 +1,26 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.jabref.logic.bibtex.BibEntryAssert;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 class OvidImporterTest {
 
@@ -29,9 +28,11 @@ class OvidImporterTest {
     private OvidImporter importer = new OvidImporter();
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("OvidImporterTest")
-                && !name.contains("Invalid")
-                && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName =
+                name ->
+                        name.startsWith("OvidImporterTest")
+                                && !name.contains("Invalid")
+                                && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
@@ -67,7 +68,8 @@ void importEntries1() throws IOException, URISyntaxException {
 
         BibEntry entry = entries.getFirst();
         assertEquals(StandardEntryType.Misc, entry.getType());
-        assertEquals(Optional.of("Mustermann and Musterfrau"), entry.getField(StandardField.AUTHOR));
+        assertEquals(
+                Optional.of("Mustermann and Musterfrau"), entry.getField(StandardField.AUTHOR));
         assertEquals(Optional.of("Short abstract"), entry.getField(StandardField.ABSTRACT));
         assertEquals(Optional.of("Musterbuch"), entry.getField(StandardField.TITLE));
         assertEquals(Optional.of("Einleitung"), entry.getField(new UnknownField("chaptertitle")));
@@ -123,10 +125,14 @@ void importEntries2() throws IOException, URISyntaxException {
     void importSingleEntries() throws IOException, URISyntaxException {
 
         for (int n = 3; n <= 7; n++) {
-            Path file = Path.of(OvidImporter.class.getResource("OvidImporterTest" + n + ".txt").toURI());
-            try (InputStream nis = OvidImporter.class.getResourceAsStream("OvidImporterTestBib" + n + ".bib")) {
-                List<BibEntry> entries = importer.importDatabase(file).getDatabase()
-                                                 .getEntries();
+            Path file =
+                    Path.of(
+                            OvidImporter.class
+                                    .getResource("OvidImporterTest" + n + ".txt")
+                                    .toURI());
+            try (InputStream nis =
+                    OvidImporter.class.getResourceAsStream("OvidImporterTestBib" + n + ".bib")) {
+                List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
                 assertNotNull(entries);
                 assertEquals(1, entries.size());
                 BibEntryAssert.assertEquals(nis, entries.getFirst());
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterFilesTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterFilesTest.java
index 326b5c0bd024..da1d91b61e29 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterFilesTest.java
@@ -1,20 +1,20 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import java.io.IOException;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
 class PdfContentImporterFilesTest {
 
     private static final String FILE_ENDING = ".pdf";
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("LNCS-minimal")
-                && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName =
+                name -> name.startsWith("LNCS-minimal") && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
index 62443d3accfc..788523b2bf56 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
 
 class PdfContentImporterTest {
 
@@ -29,25 +28,31 @@ void importTwiceWorksAsExpected() throws Exception {
         Path file = Path.of(PdfContentImporter.class.getResource("/pdfs/minimal.pdf").toURI());
         List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
 
-        BibEntry expected = new BibEntry(StandardEntryType.InProceedings)
-                .withField(StandardField.AUTHOR, "1 ")
-                .withField(StandardField.TITLE, "Hello World")
-                .withFiles(List.of(new LinkedFile("", file.toAbsolutePath(), "PDF")));
+        BibEntry expected =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withField(StandardField.AUTHOR, "1 ")
+                        .withField(StandardField.TITLE, "Hello World")
+                        .withFiles(List.of(new LinkedFile("", file.toAbsolutePath(), "PDF")));
         assertEquals(List.of(expected), result);
 
-        List<BibEntry> resultSecondImport = importer.importDatabase(file).getDatabase().getEntries();
+        List<BibEntry> resultSecondImport =
+                importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(List.of(expected), resultSecondImport);
     }
 
     @Test
     void parsingEditorWithoutPagesorSeriesInformation() {
-        BibEntry entry = new BibEntry(StandardEntryType.InProceedings)
-                .withField(StandardField.AUTHOR, "Anke Lüdeling and Merja Kytö (Eds.)")
-                .withField(StandardField.EDITOR, "Anke Lüdeling and Merja Kytö")
-                .withField(StandardField.PUBLISHER, "Springer")
-                .withField(StandardField.TITLE, "Corpus Linguistics – An International Handbook – Lüdeling, Anke, Kytö, Merja (Eds.)");
-
-        String firstPageContents = """
+        BibEntry entry =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withField(StandardField.AUTHOR, "Anke Lüdeling and Merja Kytö (Eds.)")
+                        .withField(StandardField.EDITOR, "Anke Lüdeling and Merja Kytö")
+                        .withField(StandardField.PUBLISHER, "Springer")
+                        .withField(
+                                StandardField.TITLE,
+                                "Corpus Linguistics – An International Handbook – Lüdeling, Anke, Kytö, Merja (Eds.)");
+
+        String firstPageContents =
+                """
                 Corpus Linguistics – An International Handbook – Lüdeling, Anke,
                 Kytö, Merja (Eds.)
 
@@ -70,12 +75,18 @@ void parsingEditorWithoutPagesorSeriesInformation() {
 
     @Test
     void parsingWithoutActualDOINumber() {
-        BibEntry entry = new BibEntry(StandardEntryType.InProceedings)
-                .withField(StandardField.AUTHOR, "Link to record in KAR and http://kar.kent.ac.uk/51043/  and Document Version and UNSPECIFIED  and Master of Research (MRes) thesis and University of Kent")
-                .withField(StandardField.TITLE, "Kent Academic Repository Full text document (pdf) Citation for published version Smith, Lucy Anna (2014) Mortality in the Ornamental Fish Retail Sector: an Analysis of Stock Losses and Stakeholder Opinions. DOI")
-                .withField(StandardField.YEAR, "5104");
-
-        String firstPageContents = """
+        BibEntry entry =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Link to record in KAR and http://kar.kent.ac.uk/51043/  and Document Version and UNSPECIFIED  and Master of Research (MRes) thesis and University of Kent")
+                        .withField(
+                                StandardField.TITLE,
+                                "Kent Academic Repository Full text document (pdf) Citation for published version Smith, Lucy Anna (2014) Mortality in the Ornamental Fish Retail Sector: an Analysis of Stock Losses and Stakeholder Opinions. DOI")
+                        .withField(StandardField.YEAR, "5104");
+
+        String firstPageContents =
+                """
                 Kent Academic Repository Full text document (pdf)
                 Citation for published version
                 Smith, Lucy Anna (2014) Mortality in the Ornamental Fish Retail Sector: an Analysis of Stock
@@ -93,13 +104,17 @@ Smith, Lucy Anna (2014) Mortality in the Ornamental Fish Retail Sector: an Analy
 
     @Test
     void extractDOIFromPage1() {
-        BibEntry entry = new BibEntry(StandardEntryType.InProceedings)
-                .withField(StandardField.DOI, "10.1017/S0007114507795296")
-                .withField(StandardField.AUTHOR, "Review Article")
-                .withField(StandardField.TITLE, "British Journal of Nutrition (2008), 99, 1–11 doi: 10.1017/S0007114507795296 q The Authors")
-                .withField(StandardField.YEAR, "2008");
-
-        String firstPageContent = """
+        BibEntry entry =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withField(StandardField.DOI, "10.1017/S0007114507795296")
+                        .withField(StandardField.AUTHOR, "Review Article")
+                        .withField(
+                                StandardField.TITLE,
+                                "British Journal of Nutrition (2008), 99, 1–11 doi: 10.1017/S0007114507795296 q The Authors")
+                        .withField(StandardField.YEAR, "2008");
+
+        String firstPageContent =
+                """
                 British Journal of Nutrition (2008), 99, 1–11 doi: 10.1017/S0007114507795296
                 q The Authors 2008
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporterTest.java
index 82e79d10698b..46b939919531 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporterTest.java
@@ -1,8 +1,8 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -10,14 +10,13 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
 
 class PdfEmbeddedBibFileImporterTest {
 
@@ -25,21 +24,31 @@ class PdfEmbeddedBibFileImporterTest {
 
     @BeforeEach
     void setUp() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.fieldPreferences().getNonWrappableFields()).thenReturn(FXCollections.emptyObservableList());
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.fieldPreferences().getNonWrappableFields())
+                .thenReturn(FXCollections.emptyObservableList());
         importer = new PdfEmbeddedBibFileImporter(importFormatPreferences);
     }
 
     @Test
     void doesNotHandleEncryptedPdfs() throws Exception {
-        Path file = Path.of(PdfEmbeddedBibFileImporter.class.getResource("/pdfs/encrypted.pdf").toURI());
+        Path file =
+                Path.of(
+                        PdfEmbeddedBibFileImporter.class
+                                .getResource("/pdfs/encrypted.pdf")
+                                .toURI());
         List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
     void importWorksAsExpected() throws Exception {
-        Path file = Path.of(PdfEmbeddedBibFileImporterTest.class.getResource("mixedMetadata.pdf").toURI());
+        Path file =
+                Path.of(
+                        PdfEmbeddedBibFileImporterTest.class
+                                .getResource("mixedMetadata.pdf")
+                                .toURI());
         List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry expected = new BibEntry(StandardEntryType.Misc);
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfGrobidImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfGrobidImporterTest.java
index 1d737b38fd18..49fc0c6f5ccc 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfGrobidImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfGrobidImporterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fetcher.GrobidPreferences;
@@ -12,17 +12,16 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 class PdfGrobidImporterTest {
@@ -31,11 +30,13 @@ class PdfGrobidImporterTest {
 
     @BeforeEach
     void setUp() {
-        GrobidPreferences grobidPreferences = mock(GrobidPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        GrobidPreferences grobidPreferences =
+                mock(GrobidPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(grobidPreferences.isGrobidEnabled()).thenReturn(true);
         when(grobidPreferences.getGrobidURL()).thenReturn("http://grobid.jabref.org:8070");
 
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         when(importFormatPreferences.grobidPreferences()).thenReturn(grobidPreferences);
 
@@ -69,7 +70,11 @@ void isRecognizedFormat() throws IOException, URISyntaxException {
 
     @Test
     void isRecognizedFormatReject() throws IOException, URISyntaxException {
-        Path file = Path.of(PdfGrobidImporterTest.class.getResource("BibtexImporter.examples.bib").toURI());
+        Path file =
+                Path.of(
+                        PdfGrobidImporterTest.class
+                                .getResource("BibtexImporter.examples.bib")
+                                .toURI());
         assertFalse(importer.isRecognizedFormat(file));
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporterTest.java
index 6951e6bd64a0..35d8937782d8 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporterTest.java
@@ -1,8 +1,8 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -15,15 +15,14 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
 
 @FetcherTest
 class PdfMergeMetadataImporterTest {
@@ -32,12 +31,15 @@ class PdfMergeMetadataImporterTest {
 
     @BeforeEach
     void setUp() {
-        GrobidPreferences grobidPreferences = mock(GrobidPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        GrobidPreferences grobidPreferences =
+                mock(GrobidPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(grobidPreferences.isGrobidEnabled()).thenReturn(true);
         when(grobidPreferences.getGrobidURL()).thenReturn("http://grobid.jabref.org:8070");
 
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.fieldPreferences().getNonWrappableFields()).thenReturn(FXCollections.emptyObservableList());
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.fieldPreferences().getNonWrappableFields())
+                .thenReturn(FXCollections.emptyObservableList());
         when(importFormatPreferences.grobidPreferences()).thenReturn(grobidPreferences);
 
         importer = new PdfMergeMetadataImporter(importFormatPreferences);
@@ -45,7 +47,8 @@ void setUp() {
 
     @Test
     void doesNotHandleEncryptedPdfs() throws Exception {
-        Path file = Path.of(PdfMergeMetadataImporter.class.getResource("/pdfs/encrypted.pdf").toURI());
+        Path file =
+                Path.of(PdfMergeMetadataImporter.class.getResource("/pdfs/encrypted.pdf").toURI());
         List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), result);
     }
@@ -53,7 +56,11 @@ void doesNotHandleEncryptedPdfs() throws Exception {
     @Test
     @Disabled("Switch from ottobib to OpenLibraryFetcher changed the results")
     void importWorksAsExpected() throws Exception {
-        Path file = Path.of(PdfMergeMetadataImporterTest.class.getResource("mixedMetadata.pdf").toURI());
+        Path file =
+                Path.of(
+                        PdfMergeMetadataImporterTest.class
+                                .getResource("mixedMetadata.pdf")
+                                .toURI());
         List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
 
         // From DOI (contained in embedded bib file)
@@ -70,7 +77,9 @@ void importWorksAsExpected() throws Exception {
         expected.setField(StandardField.DATE, "2018-01-31");
         expected.setField(new UnknownField("ean"), "9780134685991");
         expected.setField(StandardField.ISBN, "0134685997");
-        expected.setField(StandardField.URL, "https://www.ebook.de/de/product/28983211/joshua_bloch_effective_java.html");
+        expected.setField(
+                StandardField.URL,
+                "https://www.ebook.de/de/product/28983211/joshua_bloch_effective_java.html");
 
         // From embedded bib file
         expected.setField(StandardField.COMMENT, "From embedded bib");
@@ -80,7 +89,8 @@ void importWorksAsExpected() throws Exception {
         expected.setField(StandardField.VOLUME, "1");
 
         // From merge
-        expected.setFiles(List.of(new LinkedFile("", file.toAbsolutePath(), StandardFileType.PDF.getName())));
+        expected.setFiles(
+                List.of(new LinkedFile("", file.toAbsolutePath(), StandardFileType.PDF.getName())));
 
         assertEquals(Collections.singletonList(expected), result);
     }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporterTest.java
index a5ddb3ec89b1..2fe9769804f3 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporterTest.java
@@ -1,8 +1,8 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -11,14 +11,13 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
 
 class PdfVerbatimBibTextImporterTest {
 
@@ -26,21 +25,31 @@ class PdfVerbatimBibTextImporterTest {
 
     @BeforeEach
     void setUp() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.fieldPreferences().getNonWrappableFields()).thenReturn(FXCollections.emptyObservableList());
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.fieldPreferences().getNonWrappableFields())
+                .thenReturn(FXCollections.emptyObservableList());
         importer = new PdfVerbatimBibTextImporter(importFormatPreferences);
     }
 
     @Test
     void doesNotHandleEncryptedPdfs() throws Exception {
-        Path file = Path.of(PdfVerbatimBibTextImporter.class.getResource("/pdfs/encrypted.pdf").toURI());
+        Path file =
+                Path.of(
+                        PdfVerbatimBibTextImporter.class
+                                .getResource("/pdfs/encrypted.pdf")
+                                .toURI());
         List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
     void importTwiceWorksAsExpected() throws Exception {
-        Path file = Path.of(PdfVerbatimBibTextImporterTest.class.getResource("mixedMetadata.pdf").toURI());
+        Path file =
+                Path.of(
+                        PdfVerbatimBibTextImporterTest.class
+                                .getResource("mixedMetadata.pdf")
+                                .toURI());
         List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry expected = new BibEntry(StandardEntryType.Article);
@@ -51,9 +60,11 @@ void importTwiceWorksAsExpected() throws Exception {
         expected.setField(StandardField.JOURNAL, "Some Journal");
         expected.setField(StandardField.YEAR, "2021");
         expected.setField(StandardField.ISBN, "0134685997");
-        expected.setFiles(Collections.singletonList(new LinkedFile("", file.toAbsolutePath(), "PDF")));
+        expected.setFiles(
+                Collections.singletonList(new LinkedFile("", file.toAbsolutePath(), "PDF")));
 
-        List<BibEntry> resultSecondImport = importer.importDatabase(file).getDatabase().getEntries();
+        List<BibEntry> resultSecondImport =
+                importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.singletonList(expected), result);
         assertEquals(Collections.singletonList(expected), resultSecondImport);
     }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java
index da36987f6746..c9dd9e37bd37 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java
@@ -1,27 +1,26 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 class PdfXmpImporterTest {
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/RISImporterFilesTest.java b/src/test/java/org/jabref/logic/importer/fileformat/RISImporterFilesTest.java
index d343a3925bf2..e6ffa47b8e9b 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/RISImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/RISImporterFilesTest.java
@@ -1,18 +1,19 @@
 package org.jabref.logic.importer.fileformat;
 
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import java.io.IOException;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
 class RISImporterFilesTest {
 
     private static final String FILE_ENDING = ".ris";
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("RisImporterTest") && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName =
+                name -> name.startsWith("RisImporterTest") && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java
index 4a893870eb58..6fd3a868d247 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
 
 class RISImporterTest {
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java
index 6ee8279e352a..e35a49d2ce99 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.IOException;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 class RepecNepImporterTest {
 
@@ -22,15 +21,16 @@ class RepecNepImporterTest {
 
     @BeforeEach
     void setUp() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        ImportFormatPreferences importFormatPreferences =
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
         testImporter = new RepecNepImporter(importFormatPreferences);
     }
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("RepecNepImporter")
-                && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName =
+                name -> name.startsWith("RepecNepImporter") && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java b/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
index 7de789227fee..27d16a65eeea 100644
--- a/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
@@ -1,220 +1,251 @@
 package org.jabref.logic.importer.util;
 
-import java.net.URI;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.LinkedFile;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.net.URI;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
 
 class FileFieldParserTest {
 
     private static Stream<Arguments> testData() {
         return Stream.of(
                 Arguments.of(
-                        new LinkedFile("arXiv Fulltext PDF", "https://arxiv.org/pdf/1109.0517.pdf", "application/pdf"),
-                        List.of("arXiv Fulltext PDF", "https://arxiv.org/pdf/1109.0517.pdf", "application/pdf")
-                ),
-                Arguments.of(
-                        new LinkedFile("arXiv Fulltext PDF", "https/://arxiv.org/pdf/1109.0517.pdf", "application/pdf"),
-                        List.of("arXiv Fulltext PDF", "https\\://arxiv.org/pdf/1109.0517.pdf", "application/pdf")
-                )
-        );
+                        new LinkedFile(
+                                "arXiv Fulltext PDF",
+                                "https://arxiv.org/pdf/1109.0517.pdf",
+                                "application/pdf"),
+                        List.of(
+                                "arXiv Fulltext PDF",
+                                "https://arxiv.org/pdf/1109.0517.pdf",
+                                "application/pdf")),
+                Arguments.of(
+                        new LinkedFile(
+                                "arXiv Fulltext PDF",
+                                "https/://arxiv.org/pdf/1109.0517.pdf",
+                                "application/pdf"),
+                        List.of(
+                                "arXiv Fulltext PDF",
+                                "https\\://arxiv.org/pdf/1109.0517.pdf",
+                                "application/pdf")));
     }
 
     @ParameterizedTest
     @MethodSource("testData")
     void check(LinkedFile expected, List<String> input) {
-        // we need to convert the unmodifiable list to a modifiable because of the side effect of "convert"
+        // we need to convert the unmodifiable list to a modifiable because of the side effect of
+        // "convert"
         assertEquals(expected, FileFieldParser.convert(new ArrayList<>(input)));
     }
 
     private static Stream<Arguments> stringsToParseTest() throws Exception {
         return Stream.of(
                 // null string
-                Arguments.of(
-                        Collections.emptyList(),
-                        null
-                ),
+                Arguments.of(Collections.emptyList(), null),
 
                 // empty string
-                Arguments.of(
-                        Collections.emptyList(),
-                        ""
-                ),
+                Arguments.of(Collections.emptyList(), ""),
 
                 // correct input
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("Desc", Path.of("File.PDF"), "PDF")),
-                        "Desc:File.PDF:PDF"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile("Desc", Path.of("File.PDF"), "PDF")),
+                        "Desc:File.PDF:PDF"),
 
                 // Mendeley input
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("", Path.of("C:/Users/XXXXXX/AppData/Local/Mendeley Ltd./Mendeley Desktop/Downloaded/Brown - 2017 - Physical test methods for elastomers.pdf"), "pdf")),
-                        ":C$\\backslash$:/Users/XXXXXX/AppData/Local/Mendeley Ltd./Mendeley Desktop/Downloaded/Brown - 2017 - Physical test methods for elastomers.pdf:pdf"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile(
+                                        "",
+                                        Path.of(
+                                                "C:/Users/XXXXXX/AppData/Local/Mendeley Ltd./Mendeley Desktop/Downloaded/Brown - 2017 - Physical test methods for elastomers.pdf"),
+                                        "pdf")),
+                        ":C$\\backslash$:/Users/XXXXXX/AppData/Local/Mendeley Ltd./Mendeley Desktop/Downloaded/Brown - 2017 - Physical test methods for elastomers.pdf:pdf"),
 
                 // parseCorrectOnlineInput
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile(URI.create("http://arxiv.org/pdf/2010.08497v1").toURL(), "PDF")),
-                        ":http\\://arxiv.org/pdf/2010.08497v1:PDF"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile(
+                                        URI.create("http://arxiv.org/pdf/2010.08497v1").toURL(),
+                                        "PDF")),
+                        ":http\\://arxiv.org/pdf/2010.08497v1:PDF"),
 
                 // parseFaultyOnlineInput
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("", "htt://arxiv.org/pdf/2010.08497v1", "PDF")),
-                        ":htt\\://arxiv.org/pdf/2010.08497v1:PDF"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile("", "htt://arxiv.org/pdf/2010.08497v1", "PDF")),
+                        ":htt\\://arxiv.org/pdf/2010.08497v1:PDF"),
 
                 // parseFaultyArxivOnlineInput
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("arXiv Fulltext PDF", "https://arxiv.org/pdf/1109.0517.pdf", "application/pdf")),
-                        "arXiv Fulltext PDF:https\\://arxiv.org/pdf/1109.0517.pdf:application/pdf"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile(
+                                        "arXiv Fulltext PDF",
+                                        "https://arxiv.org/pdf/1109.0517.pdf",
+                                        "application/pdf")),
+                        "arXiv Fulltext PDF:https\\://arxiv.org/pdf/1109.0517.pdf:application/pdf"),
 
                 // ignoreMissingDescription
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("", Path.of("wei2005ahp.pdf"), "PDF")),
-                        ":wei2005ahp.pdf:PDF"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile("", Path.of("wei2005ahp.pdf"), "PDF")),
+                        ":wei2005ahp.pdf:PDF"),
 
                 // interpretLinkAsOnlyMandatoryField: single
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("", Path.of("wei2005ahp.pdf"), "")),
-                        "wei2005ahp.pdf"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile("", Path.of("wei2005ahp.pdf"), "")),
+                        "wei2005ahp.pdf"),
 
                 // interpretLinkAsOnlyMandatoryField: multiple
                 Arguments.of(
                         List.of(
                                 new LinkedFile("", Path.of("wei2005ahp.pdf"), ""),
-                                new LinkedFile("", Path.of("other.pdf"), "")
-                        ),
-                        "wei2005ahp.pdf;other.pdf"
-                ),
+                                new LinkedFile("", Path.of("other.pdf"), "")),
+                        "wei2005ahp.pdf;other.pdf"),
 
                 // escapedCharactersInDescription
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("test:;", Path.of("wei2005ahp.pdf"), "PDF")),
-                        "test\\:\\;:wei2005ahp.pdf:PDF"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile("test:;", Path.of("wei2005ahp.pdf"), "PDF")),
+                        "test\\:\\;:wei2005ahp.pdf:PDF"),
 
                 // handleXmlCharacters
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("test&#44;st:;", Path.of("wei2005ahp.pdf"), "PDF")),
-                        "test&#44\\;st\\:\\;:wei2005ahp.pdf:PDF"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile("test&#44;st:;", Path.of("wei2005ahp.pdf"), "PDF")),
+                        "test&#44\\;st\\:\\;:wei2005ahp.pdf:PDF"),
 
                 // handleEscapedFilePath
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("desc", Path.of("C:\\test.pdf"), "PDF")),
-                        "desc:C\\:\\\\test.pdf:PDF"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile("desc", Path.of("C:\\test.pdf"), "PDF")),
+                        "desc:C\\:\\\\test.pdf:PDF"),
 
                 // handleNonEscapedFilePath
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("desc", Path.of("C:\\test.pdf"), "PDF")),
-                        "desc:C:\\test.pdf:PDF"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile("desc", Path.of("C:\\test.pdf"), "PDF")),
+                        "desc:C:\\test.pdf:PDF"),
 
                 // Source: https://github.com/JabRef/jabref/issues/8991#issuecomment-1214131042
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("Boyd2012.pdf", Path.of("C:\\Users\\Literature_database\\Boyd2012.pdf"), "PDF")),
-                        "Boyd2012.pdf:C\\:\\\\Users\\\\Literature_database\\\\Boyd2012.pdf:PDF"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile(
+                                        "Boyd2012.pdf",
+                                        Path.of("C:\\Users\\Literature_database\\Boyd2012.pdf"),
+                                        "PDF")),
+                        "Boyd2012.pdf:C\\:\\\\Users\\\\Literature_database\\\\Boyd2012.pdf:PDF"),
 
                 // subsetOfFieldsResultsInFileLink: description only
                 Arguments.of(
                         Collections.singletonList(new LinkedFile("", Path.of("file.pdf"), "")),
-                        "file.pdf::"
-                ),
+                        "file.pdf::"),
 
                 // subsetOfFieldsResultsInFileLink: file only
                 Arguments.of(
                         Collections.singletonList(new LinkedFile("", Path.of("file.pdf"), "")),
-                        ":file.pdf"
-                ),
+                        ":file.pdf"),
 
                 // subsetOfFieldsResultsInFileLink: type only
                 Arguments.of(
                         Collections.singletonList(new LinkedFile("", Path.of("file.pdf"), "")),
-                        "::file.pdf"
-                ),
+                        "::file.pdf"),
 
                 // tooManySeparators
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("desc", Path.of("file.pdf"), "PDF", "qwer")),
-                        "desc:file.pdf:PDF:qwer:asdf:uiop"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile("desc", Path.of("file.pdf"), "PDF", "qwer")),
+                        "desc:file.pdf:PDF:qwer:asdf:uiop"),
 
                 // www inside filename
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("", Path.of("/home/www.google.de.pdf"), "")),
-                        ":/home/www.google.de.pdf"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile("", Path.of("/home/www.google.de.pdf"), "")),
+                        ":/home/www.google.de.pdf"),
 
                 // url
                 Arguments.of(
-                         Collections.singletonList(new LinkedFile(URI.create("https://books.google.de/").toURL(), "")),
-                         "https://books.google.de/"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile(URI.create("https://books.google.de/").toURL(), "")),
+                        "https://books.google.de/"),
 
                 // url with www
                 Arguments.of(
-                             Collections.singletonList(new LinkedFile(URI.create("https://www.google.de/").toURL(), "")),
-                             "https://www.google.de/"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile(URI.create("https://www.google.de/").toURL(), "")),
+                        "https://www.google.de/"),
 
                 // url as file
                 Arguments.of(
-                             Collections.singletonList(new LinkedFile("", URI.create("http://ceur-ws.org/Vol-438").toURL(), "URL")),
-                             ":http\\://ceur-ws.org/Vol-438:URL"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile(
+                                        "",
+                                        URI.create("http://ceur-ws.org/Vol-438").toURL(),
+                                        "URL")),
+                        ":http\\://ceur-ws.org/Vol-438:URL"),
                 // url as file with desc
                 Arguments.of(
-                             Collections.singletonList(new LinkedFile("desc", URI.create("http://ceur-ws.org/Vol-438").toURL(), "URL")),
-                             "desc:http\\://ceur-ws.org/Vol-438:URL"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile(
+                                        "desc",
+                                        URI.create("http://ceur-ws.org/Vol-438").toURL(),
+                                        "URL")),
+                        "desc:http\\://ceur-ws.org/Vol-438:URL"),
                 // link with source url
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("arXiv Fulltext PDF", "matheus.ea explicit.pdf", "PDF", "https://arxiv.org/pdf/1109.0517.pdf")),
-                        "arXiv Fulltext PDF:matheus.ea explicit.pdf:PDF:https\\://arxiv.org/pdf/1109.0517.pdf"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile(
+                                        "arXiv Fulltext PDF",
+                                        "matheus.ea explicit.pdf",
+                                        "PDF",
+                                        "https://arxiv.org/pdf/1109.0517.pdf")),
+                        "arXiv Fulltext PDF:matheus.ea explicit.pdf:PDF:https\\://arxiv.org/pdf/1109.0517.pdf"),
                 // link without description and with source url
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("", "matheus.ea explicit.pdf", "PDF", "https://arxiv.org/pdf/1109.0517.pdf")),
-                        ":matheus.ea explicit.pdf:PDF:https\\://arxiv.org/pdf/1109.0517.pdf"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile(
+                                        "",
+                                        "matheus.ea explicit.pdf",
+                                        "PDF",
+                                        "https://arxiv.org/pdf/1109.0517.pdf")),
+                        ":matheus.ea explicit.pdf:PDF:https\\://arxiv.org/pdf/1109.0517.pdf"),
                 // no link but with source url
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("arXiv Fulltext PDF", "", "PDF", "https://arxiv.org/pdf/1109.0517.pdf")),
-                        "arXiv Fulltext PDF::PDF:https\\://arxiv.org/pdf/1109.0517.pdf"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile(
+                                        "arXiv Fulltext PDF",
+                                        "",
+                                        "PDF",
+                                        "https://arxiv.org/pdf/1109.0517.pdf")),
+                        "arXiv Fulltext PDF::PDF:https\\://arxiv.org/pdf/1109.0517.pdf"),
                 // No description or file type but with sourceURL
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("", "matheus.ea explicit.pdf", "", "https://arxiv.org/pdf/1109.0517.pdf")),
-                        ":matheus.ea explicit.pdf::https\\://arxiv.org/pdf/1109.0517.pdf"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile(
+                                        "",
+                                        "matheus.ea explicit.pdf",
+                                        "",
+                                        "https://arxiv.org/pdf/1109.0517.pdf")),
+                        ":matheus.ea explicit.pdf::https\\://arxiv.org/pdf/1109.0517.pdf"),
                 // Absolute path
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("", "A:\\Zotero\\storage\\test.pdf", "")),
-                        ":A:\\Zotero\\storage\\test.pdf"
-                ),
+                        Collections.singletonList(
+                                new LinkedFile("", "A:\\Zotero\\storage\\test.pdf", "")),
+                        ":A:\\Zotero\\storage\\test.pdf"),
                 // zotero absolute path
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("", "A:\\Zotero\\storage\\test.pdf", "")),
-                        "A:\\Zotero\\storage\\test.pdf"
-                )
-        );
+                        Collections.singletonList(
+                                new LinkedFile("", "A:\\Zotero\\storage\\test.pdf", "")),
+                        "A:\\Zotero\\storage\\test.pdf"));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java b/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java
index 5cba17289dfe..475ed32cbdca 100644
--- a/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.importer.util;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParseException;
@@ -14,17 +14,16 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @FetcherTest
 class GrobidServiceTest {
@@ -37,57 +36,73 @@ static void setup() {
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
-        GrobidPreferences grobidPreferences = new GrobidPreferences(
-                true,
-                false,
-                "http://grobid.jabref.org:8070");
+        GrobidPreferences grobidPreferences =
+                new GrobidPreferences(true, false, "http://grobid.jabref.org:8070");
         grobidService = new GrobidService(grobidPreferences);
     }
 
     @Test
     void processValidCitationTest() throws IOException, ParseException {
-        BibEntry exampleBibEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("-1")
-                .withField(StandardField.AUTHOR, "Derwing, Tracey and Rossiter, Marian and Munro, Murray")
-                .withField(StandardField.TITLE, "Teaching Native Speakers to Listen to Foreign-accented Speech")
-                .withField(StandardField.JOURNAL, "Journal of Multilingual and Multicultural Development")
-                .withField(StandardField.PUBLISHER, "Informa UK Limited")
-                .withField(StandardField.DOI, "10.1080/01434630208666468")
-                .withField(StandardField.DATE, "2002-09")
-                .withField(StandardField.YEAR, "2002")
-                .withField(StandardField.MONTH, "9")
-                .withField(StandardField.PAGES, "245-259")
-                .withField(StandardField.VOLUME, "23")
-                .withField(StandardField.NUMBER, "4");
-        Optional<BibEntry> response = grobidService.processCitation("Derwing, T. M., Rossiter, M. J., & Munro, " +
-                "M. J. (2002). Teaching native speakers to listen to foreign-accented speech. " +
-                "Journal of Multilingual and Multicultural Development, 23(4), 245-259.", importFormatPreferences, GrobidService.ConsolidateCitations.WITH_METADATA);
+        BibEntry exampleBibEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("-1")
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Derwing, Tracey and Rossiter, Marian and Munro, Murray")
+                        .withField(
+                                StandardField.TITLE,
+                                "Teaching Native Speakers to Listen to Foreign-accented Speech")
+                        .withField(
+                                StandardField.JOURNAL,
+                                "Journal of Multilingual and Multicultural Development")
+                        .withField(StandardField.PUBLISHER, "Informa UK Limited")
+                        .withField(StandardField.DOI, "10.1080/01434630208666468")
+                        .withField(StandardField.DATE, "2002-09")
+                        .withField(StandardField.YEAR, "2002")
+                        .withField(StandardField.MONTH, "9")
+                        .withField(StandardField.PAGES, "245-259")
+                        .withField(StandardField.VOLUME, "23")
+                        .withField(StandardField.NUMBER, "4");
+        Optional<BibEntry> response =
+                grobidService.processCitation(
+                        "Derwing, T. M., Rossiter, M. J., & Munro, "
+                                + "M. J. (2002). Teaching native speakers to listen to foreign-accented speech. "
+                                + "Journal of Multilingual and Multicultural Development, 23(4), 245-259.",
+                        importFormatPreferences,
+                        GrobidService.ConsolidateCitations.WITH_METADATA);
         assertTrue(response.isPresent());
         assertEquals(exampleBibEntry, response.get());
     }
 
     @Test
     void processEmptyStringTest() throws IOException, ParseException {
-        Optional<BibEntry> response = grobidService.processCitation(" ", importFormatPreferences, GrobidService.ConsolidateCitations.WITH_METADATA);
+        Optional<BibEntry> response =
+                grobidService.processCitation(
+                        " ",
+                        importFormatPreferences,
+                        GrobidService.ConsolidateCitations.WITH_METADATA);
         assertNotNull(response);
         assertEquals(Optional.empty(), response);
     }
 
     @Test
     void processInvalidCitationTest() {
-        assertThrows(IOException.class, () -> grobidService.processCitation(
-                "Iiiiiiiiiiiiiiiiiiiiiiii",
-                importFormatPreferences,
-                GrobidService.ConsolidateCitations.WITH_METADATA));
+        assertThrows(
+                IOException.class,
+                () ->
+                        grobidService.processCitation(
+                                "Iiiiiiiiiiiiiiiiiiiiiiii",
+                                importFormatPreferences,
+                                GrobidService.ConsolidateCitations.WITH_METADATA));
     }
 
     @Test
     void failsWhenGrobidDisabled() {
-        GrobidPreferences importSettingsWithGrobidDisabled = new GrobidPreferences(
-                false,
-                false,
-                "http://grobid.jabref.org:8070");
-        assertThrows(UnsupportedOperationException.class, () -> new GrobidService(importSettingsWithGrobidDisabled));
+        GrobidPreferences importSettingsWithGrobidDisabled =
+                new GrobidPreferences(false, false, "http://grobid.jabref.org:8070");
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> new GrobidService(importSettingsWithGrobidDisabled));
     }
 
     @Test
@@ -103,19 +118,27 @@ void processPdfTest() throws IOException, ParseException, URISyntaxException {
 
     @Test
     void extractsReferencesFromPdf() throws IOException, ParseException, URISyntaxException {
-        BibEntry ref1 = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Kopp, O")
-                .withField(StandardField.ADDRESS, "Berlin; Heidelberg")
-                .withField(StandardField.DATE, "2013")
-                .withField(StandardField.JOURNAL, "All links were last followed on October")
-                .withField(StandardField.PAGES, "700--704")
-                .withField(StandardField.PUBLISHER, "Springer")
-                .withField(StandardField.TITLE, "Winery -A Modeling Tool for TOSCA-based Cloud Applications")
-                .withField(StandardField.VOLUME, "8274")
-                .withField(StandardField.YEAR, "2013");
+        BibEntry ref1 =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Kopp, O")
+                        .withField(StandardField.ADDRESS, "Berlin; Heidelberg")
+                        .withField(StandardField.DATE, "2013")
+                        .withField(StandardField.JOURNAL, "All links were last followed on October")
+                        .withField(StandardField.PAGES, "700--704")
+                        .withField(StandardField.PUBLISHER, "Springer")
+                        .withField(
+                                StandardField.TITLE,
+                                "Winery -A Modeling Tool for TOSCA-based Cloud Applications")
+                        .withField(StandardField.VOLUME, "8274")
+                        .withField(StandardField.YEAR, "2013");
 
-        Path file = Path.of(Objects.requireNonNull(GrobidServiceTest.class.getResource("LNCS-minimal.pdf")).toURI());
-        List<BibEntry> extractedReferences = grobidService.processReferences(file, importFormatPreferences);
+        Path file =
+                Path.of(
+                        Objects.requireNonNull(
+                                        GrobidServiceTest.class.getResource("LNCS-minimal.pdf"))
+                                .toURI());
+        List<BibEntry> extractedReferences =
+                grobidService.processReferences(file, importFormatPreferences);
         assertEquals(List.of(ref1), extractedReferences);
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java b/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
index a2e7f667b876..1d2440c9c37e 100644
--- a/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
@@ -1,9 +1,7 @@
 package org.jabref.logic.importer.util;
 
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import javafx.scene.paint.Color;
 
@@ -24,12 +22,13 @@
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.List;
 
 class GroupsParserTest {
     private FileUpdateMonitor fileMonitor;
@@ -44,44 +43,73 @@ void setUp() throws Exception {
     @Test
     // For https://github.com/JabRef/jabref/issues/1681
     void fromStringParsesExplicitGroupWithEscapedCharacterInName() throws Exception {
-        ExplicitGroup expected = new ExplicitGroup("B{\\\"{o}}hmer", GroupHierarchyType.INDEPENDENT, ',');
-        AbstractGroup parsed = GroupsParser.fromString("ExplicitGroup:B{\\\\\"{o}}hmer;0;", ',', fileMonitor, metaData);
+        ExplicitGroup expected =
+                new ExplicitGroup("B{\\\"{o}}hmer", GroupHierarchyType.INDEPENDENT, ',');
+        AbstractGroup parsed =
+                GroupsParser.fromString(
+                        "ExplicitGroup:B{\\\\\"{o}}hmer;0;", ',', fileMonitor, metaData);
 
         assertEquals(expected, parsed);
     }
 
     @Test
     void keywordDelimiterThatNeedsToBeEscaped() throws Exception {
-        AutomaticGroup expected = new AutomaticKeywordGroup("group1", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, ';', '>');
-        AbstractGroup parsed = GroupsParser.fromString("AutomaticKeywordGroup:group1;0;keywords;\\;;>;1;;;;;", ';', fileMonitor, metaData);
+        AutomaticGroup expected =
+                new AutomaticKeywordGroup(
+                        "group1", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, ';', '>');
+        AbstractGroup parsed =
+                GroupsParser.fromString(
+                        "AutomaticKeywordGroup:group1;0;keywords;\\;;>;1;;;;;",
+                        ';',
+                        fileMonitor,
+                        metaData);
         assertEquals(expected, parsed);
     }
 
     @Test
     void hierarchicalDelimiterThatNeedsToBeEscaped() throws Exception {
-        AutomaticGroup expected = new AutomaticKeywordGroup("group1", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, ',', ';');
-        AbstractGroup parsed = GroupsParser.fromString("AutomaticKeywordGroup:group1;0;keywords;,;\\;;1;;;;;", ';', fileMonitor, metaData);
+        AutomaticGroup expected =
+                new AutomaticKeywordGroup(
+                        "group1", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, ',', ';');
+        AbstractGroup parsed =
+                GroupsParser.fromString(
+                        "AutomaticKeywordGroup:group1;0;keywords;,;\\;;1;;;;;",
+                        ';',
+                        fileMonitor,
+                        metaData);
         assertEquals(expected, parsed);
     }
 
     @Test
     void fromStringThrowsParseExceptionForNotEscapedGroupName() throws Exception {
-        assertThrows(ParseException.class, () -> GroupsParser.fromString("ExplicitGroup:slit\\\\;0\\;mertsch_slit2_2007\\;;", ',', fileMonitor, metaData));
+        assertThrows(
+                ParseException.class,
+                () ->
+                        GroupsParser.fromString(
+                                "ExplicitGroup:slit\\\\;0\\;mertsch_slit2_2007\\;;",
+                                ',',
+                                fileMonitor,
+                                metaData));
     }
 
     @Test
     void importSubGroups() throws Exception {
 
-        List<String> orderedData = Arrays.asList("0 AllEntriesGroup:", "1 ExplicitGroup:1;0;",
-                "2 ExplicitGroup:2;0;", "0 ExplicitGroup:3;0;");
+        List<String> orderedData =
+                Arrays.asList(
+                        "0 AllEntriesGroup:",
+                        "1 ExplicitGroup:1;0;",
+                        "2 ExplicitGroup:2;0;",
+                        "0 ExplicitGroup:3;0;");
         // Create group hierarchy:
         //  Level 0 Name: All entries
         //  Level 1 Name: 1
         //  Level 2 Name: 2
         //  Level 1 Name: 3
 
-        GroupTreeNode rootNode = new GroupTreeNode(
-                new ExplicitGroup("All entries", GroupHierarchyType.INDEPENDENT, ','));
+        GroupTreeNode rootNode =
+                new GroupTreeNode(
+                        new ExplicitGroup("All entries", GroupHierarchyType.INDEPENDENT, ','));
 
         AbstractGroup firstSubGrpLvl1 = new ExplicitGroup("1", GroupHierarchyType.INDEPENDENT, ',');
         rootNode.addSubgroup(firstSubGrpLvl1);
@@ -92,52 +120,102 @@ void importSubGroups() throws Exception {
         AbstractGroup thirdSubGrpLvl1 = new ExplicitGroup("3", GroupHierarchyType.INDEPENDENT, ',');
         rootNode.addSubgroup(thirdSubGrpLvl1);
 
-        GroupTreeNode parsedNode = GroupsParser.importGroups(orderedData, ',', fileMonitor, metaData);
+        GroupTreeNode parsedNode =
+                GroupsParser.importGroups(orderedData, ',', fileMonitor, metaData);
         assertEquals(rootNode.getChildren(), parsedNode.getChildren());
     }
 
     @Test
     void fromStringParsesExplicitGroupWithIconAndDescription() throws Exception {
-        ExplicitGroup expected = new ExplicitGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup expected =
+                new ExplicitGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, ',');
         expected.setIconName("test icon");
         expected.setExpanded(true);
         expected.setColor(Color.ALICEBLUE);
         expected.setDescription("test description");
-        AbstractGroup parsed = GroupsParser.fromString("StaticGroup:myExplicitGroup;0;1;0xf0f8ffff;test icon;test description;", ',', fileMonitor, metaData);
+        AbstractGroup parsed =
+                GroupsParser.fromString(
+                        "StaticGroup:myExplicitGroup;0;1;0xf0f8ffff;test icon;test description;",
+                        ',',
+                        fileMonitor,
+                        metaData);
 
         assertEquals(expected, parsed);
     }
 
     @Test
     void fromStringParsesAutomaticKeywordGroup() throws Exception {
-        AutomaticGroup expected = new AutomaticKeywordGroup("myAutomaticGroup", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, ',', '>');
-        AbstractGroup parsed = GroupsParser.fromString("AutomaticKeywordGroup:myAutomaticGroup;0;keywords;,;>;1;;;;", ',', fileMonitor, metaData);
+        AutomaticGroup expected =
+                new AutomaticKeywordGroup(
+                        "myAutomaticGroup",
+                        GroupHierarchyType.INDEPENDENT,
+                        StandardField.KEYWORDS,
+                        ',',
+                        '>');
+        AbstractGroup parsed =
+                GroupsParser.fromString(
+                        "AutomaticKeywordGroup:myAutomaticGroup;0;keywords;,;>;1;;;;",
+                        ',',
+                        fileMonitor,
+                        metaData);
         assertEquals(expected, parsed);
     }
 
     @Test
     void fromStringParsesAutomaticPersonGroup() throws Exception {
-        AutomaticPersonsGroup expected = new AutomaticPersonsGroup("myAutomaticGroup", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR);
-        AbstractGroup parsed = GroupsParser.fromString("AutomaticPersonsGroup:myAutomaticGroup;0;author;1;;;;", ',', fileMonitor, metaData);
+        AutomaticPersonsGroup expected =
+                new AutomaticPersonsGroup(
+                        "myAutomaticGroup", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR);
+        AbstractGroup parsed =
+                GroupsParser.fromString(
+                        "AutomaticPersonsGroup:myAutomaticGroup;0;author;1;;;;",
+                        ',',
+                        fileMonitor,
+                        metaData);
         assertEquals(expected, parsed);
     }
 
     @Test
     void fromStringParsesTexGroup() throws Exception {
-        TexGroup expected = TexGroup.create("myTexGroup", GroupHierarchyType.INDEPENDENT, Path.of("path", "To", "File"), new DefaultAuxParser(new BibDatabase()), metaData);
-        AbstractGroup parsed = GroupsParser.fromString("TexGroup:myTexGroup;0;path/To/File;1;;;;", ',', fileMonitor, metaData);
+        TexGroup expected =
+                TexGroup.create(
+                        "myTexGroup",
+                        GroupHierarchyType.INDEPENDENT,
+                        Path.of("path", "To", "File"),
+                        new DefaultAuxParser(new BibDatabase()),
+                        metaData);
+        AbstractGroup parsed =
+                GroupsParser.fromString(
+                        "TexGroup:myTexGroup;0;path/To/File;1;;;;", ',', fileMonitor, metaData);
         assertEquals(expected, parsed);
     }
 
     @Test
     void fromStringUnknownGroupThrowsException() throws Exception {
-        assertThrows(ParseException.class, () -> GroupsParser.fromString("0 UnknownGroup:myUnknownGroup;0;;1;;;;", ',', fileMonitor, metaData));
+        assertThrows(
+                ParseException.class,
+                () ->
+                        GroupsParser.fromString(
+                                "0 UnknownGroup:myUnknownGroup;0;;1;;;;",
+                                ',',
+                                fileMonitor,
+                                metaData));
     }
 
     @Test
     void fromStringParsesSearchGroup() throws Exception {
-        SearchGroup expected = new SearchGroup("Data", GroupHierarchyType.INCLUDING, "project=data|number|quant*", EnumSet.of(SearchFlags.REGULAR_EXPRESSION));
-        AbstractGroup parsed = GroupsParser.fromString("SearchGroup:Data;2;project=data|number|quant*;0;1;1;;;;;", ',', fileMonitor, metaData);
+        SearchGroup expected =
+                new SearchGroup(
+                        "Data",
+                        GroupHierarchyType.INCLUDING,
+                        "project=data|number|quant*",
+                        EnumSet.of(SearchFlags.REGULAR_EXPRESSION));
+        AbstractGroup parsed =
+                GroupsParser.fromString(
+                        "SearchGroup:Data;2;project=data|number|quant*;0;1;1;;;;;",
+                        ',',
+                        fileMonitor,
+                        metaData);
         assertEquals(expected, parsed);
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/util/JsonReaderTest.java b/src/test/java/org/jabref/logic/importer/util/JsonReaderTest.java
index 4f2e697df575..f1ac7f855fba 100644
--- a/src/test/java/org/jabref/logic/importer/util/JsonReaderTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/JsonReaderTest.java
@@ -1,29 +1,33 @@
 package org.jabref.logic.importer.util;
 
-import java.io.ByteArrayInputStream;
-
-import org.jabref.logic.importer.ParseException;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import kong.unirest.core.json.JSONObject;
+
+import org.jabref.logic.importer.ParseException;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.io.ByteArrayInputStream;
 
 class JsonReaderTest {
 
     @Test
     void nullStreamThrowsNullPointerException() {
-        assertThrows(NullPointerException.class, () -> {
-            JsonReader.toJsonObject(null);
-        });
+        assertThrows(
+                NullPointerException.class,
+                () -> {
+                    JsonReader.toJsonObject(null);
+                });
     }
 
     @Test
     void invalidJsonThrowsParserException() {
-        assertThrows(ParseException.class, () -> {
-            JsonReader.toJsonObject(new ByteArrayInputStream("invalid JSON".getBytes()));
-        });
+        assertThrows(
+                ParseException.class,
+                () -> {
+                    JsonReader.toJsonObject(new ByteArrayInputStream("invalid JSON".getBytes()));
+                });
     }
 
     @Test
@@ -35,9 +39,11 @@ void emptyStringResultsInEmptyObject() throws Exception {
     @Test
     void arrayThrowsParserException() {
         // Reason: We expect a JSON object, not a JSON array
-        assertThrows(ParseException.class, () -> {
-            JsonReader.toJsonObject(new ByteArrayInputStream("[]".getBytes()));
-        });
+        assertThrows(
+                ParseException.class,
+                () -> {
+                    JsonReader.toJsonObject(new ByteArrayInputStream("[]".getBytes()));
+                });
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/util/MathMLParserTest.java b/src/test/java/org/jabref/logic/importer/util/MathMLParserTest.java
index d7f8c661e0ee..97afe532959d 100644
--- a/src/test/java/org/jabref/logic/importer/util/MathMLParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/MathMLParserTest.java
@@ -1,18 +1,18 @@
 package org.jabref.logic.importer.util;
 
-import java.io.StringReader;
-import java.util.stream.Stream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.StringReader;
+import java.util.stream.Stream;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
 
 class MathMLParserTest {
     private static XMLInputFactory xmlInputFactory;
@@ -32,7 +32,8 @@ void parserConvertsMathMLIntoLatex(String expected, String input) throws XMLStre
 
     private static Stream<Arguments> tests() {
         return Stream.of(
-                Arguments.of("$\\begin{pmatrix}0 & 1 & 0\\\\ 0 & 0 & 1\\\\ 1 & 0 & 0\\end{pmatrix}$",
+                Arguments.of(
+                        "$\\begin{pmatrix}0 & 1 & 0\\\\ 0 & 0 & 1\\\\ 1 & 0 & 0\\end{pmatrix}$",
                         """
                                 <math xmlns="http://www.w3.org/1998/Math/MathML">
                                     <matrix>
@@ -48,7 +49,8 @@ private static Stream<Arguments> tests() {
                                     </matrix>
                                 </math>
                                 """),
-                Arguments.of("${\\eta }_{p}^{2}$",
+                Arguments.of(
+                        "${\\eta }_{p}^{2}$",
                         """
                                 <mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML">
                                     <mml:mrow>
@@ -60,7 +62,8 @@ private static Stream<Arguments> tests() {
                                     </mml:mrow>
                                 </mml:math>
                                 """),
-                Arguments.of("<Unsupported MathML expression>",
+                Arguments.of(
+                        "<Unsupported MathML expression>",
                         """
                                 <mml:math xmlns=http://www.w3.org/1998/Math/MathML>
                                     <mml:mrow>
@@ -70,7 +73,8 @@ private static Stream<Arguments> tests() {
                                     </mml:mrow>
                                 </mml:math>
                                 """),
-                Arguments.of("$\\underset{a}{\\overset{b}{\\int }}\\left(5x+2\\mathrm{sin}\\left(x\\right)\\right)\\mathrm{dx}$",
+                Arguments.of(
+                        "$\\underset{a}{\\overset{b}{\\int }}\\left(5x+2\\mathrm{sin}\\left(x\\right)\\right)\\mathrm{dx}$",
                         """
                                 <math xmlns="http://www.w3.org/1998/Math/MathML">
                                     <munderover>
@@ -91,7 +95,8 @@ private static Stream<Arguments> tests() {
                                     <mi>dx</mi>
                                 </math>
                                 """),
-                Arguments.of("$\\stackrel{\\to }{v}=\\left({v}_{1},{v}_{2},{v}_{3}\\right)$",
+                Arguments.of(
+                        "$\\stackrel{\\to }{v}=\\left({v}_{1},{v}_{2},{v}_{3}\\right)$",
                         """
                                 <math xmlns="http://www.w3.org/1998/Math/MathML">
                                     <mover>
@@ -114,7 +119,6 @@ private static Stream<Arguments> tests() {
                                         </msub>
                                     </mfenced>
                                 </math>
-                                """)
-        );
+                                """));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java b/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java
index 73bd5e2d62c6..4ef55baf3096 100644
--- a/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java
@@ -1,9 +1,6 @@
 package org.jabref.logic.importer.util;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
@@ -15,26 +12,28 @@
 import org.jabref.model.entry.types.UnknownEntryType;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 public class MetaDataParserTest {
 
     @ParameterizedTest
     @CsvSource({
-            "C:\\temp\\test,                 C:\\temp\\test",
-            "\\\\servername\\path\\to\\file, \\\\\\\\servername\\\\path\\\\to\\\\file",
-            "\\\\servername\\path\\to\\file, \\\\servername\\path\\to\\file",
-            "//servername/path/to/file,      //servername/path/to/file",
-            ".\\pdfs,                        .\\pdfs,",
-            ".\\pdfs,                        .\\\\pdfs,",
-            ".,                              .",
+        "C:\\temp\\test,                 C:\\temp\\test",
+        "\\\\servername\\path\\to\\file, \\\\\\\\servername\\\\path\\\\to\\\\file",
+        "\\\\servername\\path\\to\\file, \\\\servername\\path\\to\\file",
+        "//servername/path/to/file,      //servername/path/to/file",
+        ".\\pdfs,                        .\\pdfs,",
+        ".\\pdfs,                        .\\\\pdfs,",
+        ".,                              .",
     })
     void parseDirectory(String expected, String input) {
         assertEquals(expected, MetaDataParser.parseDirectory(input));
@@ -48,16 +47,17 @@ public static Stream<Arguments> parseCustomizedEntryType() {
                 Arguments.of(
                         new BibEntryTypeBuilder()
                                 .withType(new UnknownEntryType("test"))
-                                .withRequiredFields(UnknownField.fromDisplayName("Test1"), UnknownField.fromDisplayName("Test2")),
-                        "jabref-entrytype: test: req[Test1;Test2] opt[]"
-                ),
+                                .withRequiredFields(
+                                        UnknownField.fromDisplayName("Test1"),
+                                        UnknownField.fromDisplayName("Test2")),
+                        "jabref-entrytype: test: req[Test1;Test2] opt[]"),
                 Arguments.of(
                         new BibEntryTypeBuilder()
                                 .withType(new UnknownEntryType("test"))
-                                .withRequiredFields(UnknownField.fromDisplayName("tEST"), UnknownField.fromDisplayName("tEsT2")),
-                        "jabref-entrytype: test: req[tEST;tEsT2] opt[]"
-                )
-        );
+                                .withRequiredFields(
+                                        UnknownField.fromDisplayName("tEST"),
+                                        UnknownField.fromDisplayName("tEsT2")),
+                        "jabref-entrytype: test: req[tEST;tEsT2] opt[]"));
     }
 
     @ParameterizedTest
@@ -73,7 +73,12 @@ void saveActions() throws Exception {
         MetaData parsed = metaDataParser.parse(new MetaData(), data, ',');
 
         MetaData expected = new MetaData();
-        FieldFormatterCleanups fieldFormatterCleanups = new FieldFormatterCleanups(true, List.of(new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter())));
+        FieldFormatterCleanups fieldFormatterCleanups =
+                new FieldFormatterCleanups(
+                        true,
+                        List.of(
+                                new FieldFormatterCleanup(
+                                        StandardField.TITLE, new LowerCaseFormatter())));
         expected.setSaveActions(fieldFormatterCleanups);
         assertEquals(expected, parsed);
     }
diff --git a/src/test/java/org/jabref/logic/importer/util/ShortDOIServiceTest.java b/src/test/java/org/jabref/logic/importer/util/ShortDOIServiceTest.java
index 26ea47060300..64fa23d0b4ae 100644
--- a/src/test/java/org/jabref/logic/importer/util/ShortDOIServiceTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/ShortDOIServiceTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.importer.util;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 @FetcherTest
 class ShortDOIServiceTest {
 
diff --git a/src/test/java/org/jabref/logic/importer/util/StaxParserTest.java b/src/test/java/org/jabref/logic/importer/util/StaxParserTest.java
index 9c14e80a1565..79cf0df0ac7f 100644
--- a/src/test/java/org/jabref/logic/importer/util/StaxParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/StaxParserTest.java
@@ -1,18 +1,18 @@
 package org.jabref.logic.importer.util;
 
-import java.io.StringReader;
-import java.util.stream.Stream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.StringReader;
+import java.util.stream.Stream;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
 
 class StaxParserTest {
     private static XMLInputFactory xmlInputFactory;
@@ -32,16 +32,19 @@ void getsCompleteXMLContent(String expected, String input) throws XMLStreamExcep
 
     private static Stream<Arguments> tests() {
         return Stream.of(
-                Arguments.of("<ForeName xmlns=\"\" attr=\"1\">Alan</ForeName>",
+                Arguments.of(
+                        "<ForeName xmlns=\"\" attr=\"1\">Alan</ForeName>",
                         """
                                 <ForeName attr="1">Alan</ForeName>
                                 """),
-                Arguments.of("<ForeName xmlns=\"\" attr=\"1\">Alan</ForeName>",
+                Arguments.of(
+                        "<ForeName xmlns=\"\" attr=\"1\">Alan</ForeName>",
                         """
                                 <ForeName attr="1">Alan</ForeName>
                                 <LastName attr="2">Grant</LastName>
                                 """),
-                Arguments.of("<ForeName xmlns=\"\" attr=\"1\">Alan<ForeName attr=\"5\">MiddleName</ForeName></ForeName>",
+                Arguments.of(
+                        "<ForeName xmlns=\"\" attr=\"1\">Alan<ForeName attr=\"5\">MiddleName</ForeName></ForeName>",
                         """
                                 <ForeName attr="1">
                                     Alan
@@ -49,7 +52,8 @@ private static Stream<Arguments> tests() {
                                 </ForeName>
                                 <LastName attr="2">Grant</LastName>
                                 """),
-                Arguments.of("<PubDate xmlns=\"\"><Year>2020</Year><Month>Jul</Month><Day>24</Day></PubDate>",
+                Arguments.of(
+                        "<PubDate xmlns=\"\"><Year>2020</Year><Month>Jul</Month><Day>24</Day></PubDate>",
                         """
                                 <PubDate>
                                     <Year>2020</Year>
@@ -57,7 +61,8 @@ private static Stream<Arguments> tests() {
                                     <Day>24</Day>
                                 </PubDate>
                                 """),
-                Arguments.of("<mml:math xmlns:mml=\"http://www.w3.org/1998/Math/MathML\"><mml:mrow><mml:msubsup><mml:mi>η</mml:mi><mml:mi>p</mml:mi><mml:mn>2</mml:mn></mml:msubsup></mml:mrow></mml:math>",
+                Arguments.of(
+                        "<mml:math xmlns:mml=\"http://www.w3.org/1998/Math/MathML\"><mml:mrow><mml:msubsup><mml:mi>η</mml:mi><mml:mi>p</mml:mi><mml:mn>2</mml:mn></mml:msubsup></mml:mrow></mml:math>",
                         """
                                 <mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML">
                                     <mml:mrow>
@@ -69,7 +74,8 @@ private static Stream<Arguments> tests() {
                                     </mml:mrow>
                                 </mml:math>
                                 """),
-                Arguments.of("<Journal xmlns=\"\"><ISSN IssnType=\"Electronic\">1613-4516</ISSN><JournalIssue CitedMedium=\"Internet\"><Volume>17</Volume><Issue>2-3</Issue><PubDate><Year>2020</Year><Month>Jul</Month><Day>24</Day></PubDate></JournalIssue><Title>Journal of integrative bioinformatics</Title><ISOAbbreviation>J Integr Bioinform</ISOAbbreviation></Journal>",
+                Arguments.of(
+                        "<Journal xmlns=\"\"><ISSN IssnType=\"Electronic\">1613-4516</ISSN><JournalIssue CitedMedium=\"Internet\"><Volume>17</Volume><Issue>2-3</Issue><PubDate><Year>2020</Year><Month>Jul</Month><Day>24</Day></PubDate></JournalIssue><Title>Journal of integrative bioinformatics</Title><ISOAbbreviation>J Integr Bioinform</ISOAbbreviation></Journal>",
                         """
                                 <Journal>
                                     <ISSN IssnType="Electronic">1613-4516</ISSN>
@@ -85,7 +91,6 @@ private static Stream<Arguments> tests() {
                                     <Title>Journal of integrative bioinformatics</Title>
                                     <ISOAbbreviation>J Integr Bioinform</ISOAbbreviation>
                                 </Journal>
-                                """)
-        );
+                                """));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java b/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java
index da2557e8860b..2b6900b7f50b 100644
--- a/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
+import java.util.List;
 
 class ASCIICharacterCheckerTest {
 
@@ -24,13 +23,21 @@ void fieldAcceptsAsciiCharacters() {
     @Test
     void fieldDoesNotAcceptUmlauts() {
         entry.setField(StandardField.MONTH, "Umlauts are nöt ällowed");
-        assertEquals(List.of(new IntegrityMessage("Non-ASCII encoded character found", entry, StandardField.MONTH)), checker.check(entry));
+        assertEquals(
+                List.of(
+                        new IntegrityMessage(
+                                "Non-ASCII encoded character found", entry, StandardField.MONTH)),
+                checker.check(entry));
     }
 
     @Test
     void fieldDoesNotAcceptUnicode() {
         entry.setField(StandardField.AUTHOR, "Some unicode ⊕");
-        assertEquals(List.of(new IntegrityMessage("Non-ASCII encoded character found", entry, StandardField.AUTHOR)), checker.check(entry));
+        assertEquals(
+                List.of(
+                        new IntegrityMessage(
+                                "Non-ASCII encoded character found", entry, StandardField.AUTHOR)),
+                checker.check(entry));
     }
 
     @Test
@@ -47,6 +54,10 @@ void fieldAcceptsOnlyAsciiCharacters() {
     void fieldDoesNotAcceptNonAsciiCharacters() {
         String field = Character.toString(31) + Character.toString(128);
         entry.setField(StandardField.TITLE, field);
-        assertEquals(List.of(new IntegrityMessage("Non-ASCII encoded character found", entry, StandardField.TITLE)), checker.check(entry));
+        assertEquals(
+                List.of(
+                        new IntegrityMessage(
+                                "Non-ASCII encoded character found", entry, StandardField.TITLE)),
+                checker.check(entry));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/AbbreviationCheckerTest.java b/src/test/java/org/jabref/logic/integrity/AbbreviationCheckerTest.java
index 1969a2e03dab..c70338501eeb 100644
--- a/src/test/java/org/jabref/logic/integrity/AbbreviationCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/AbbreviationCheckerTest.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.jabref.logic.journals.Abbreviation;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
@@ -8,12 +9,10 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Collections;
 
 class AbbreviationCheckerTest {
 
@@ -55,13 +54,17 @@ void checkEntryDoesNotComplainAboutJournalNameThatHasSameAbbreviation() {
 
     @Test
     void checkEntryWorksForLaTeXField() {
-        entry.setField(StandardField.BOOKTITLE, "Reducing Complexity and Power of Digital Multibit Error-Feedback $\\Delta$$\\Sigma$ Modulators");
+        entry.setField(
+                StandardField.BOOKTITLE,
+                "Reducing Complexity and Power of Digital Multibit Error-Feedback $\\Delta$$\\Sigma$ Modulators");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
     void checkEntryWorksForLaTeXFieldStilContainingIllegalChars() {
-        entry.setField(StandardField.BOOKTITLE, "Proceedings of the 5\\({}^{\\mbox{th}}\\) Central-European Workshop on Services and their Composition, Rostock, Germany, February 21-22, 2013");
+        entry.setField(
+                StandardField.BOOKTITLE,
+                "Proceedings of the 5\\({}^{\\mbox{th}}\\) Central-European Workshop on Services and their Composition, Rostock, Germany, February 21-22, 2013");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/AmpersandCheckerTest.java b/src/test/java/org/jabref/logic/integrity/AmpersandCheckerTest.java
index 5f78fb3fc5b4..29bdfee5d8c6 100644
--- a/src/test/java/org/jabref/logic/integrity/AmpersandCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/AmpersandCheckerTest.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.integrity;
 
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
+import java.util.stream.Stream;
 
 class AmpersandCheckerTest {
 
@@ -31,34 +30,45 @@ private static Stream<Arguments> provideAcceptedInputs() {
                 Arguments.of(StandardField.FOREWORD, "Properly escaped \\&"),
                 Arguments.of(StandardField.AUTHOR, "\\& Multiple properly escaped \\&"),
                 Arguments.of(StandardField.BOOKTITLE, "\\\\\\& With multiple backslashes"),
-                Arguments.of(StandardField.COMMENT, "\\\\\\& With multiple backslashes multiple times \\\\\\\\\\&"),
+                Arguments.of(
+                        StandardField.COMMENT,
+                        "\\\\\\& With multiple backslashes multiple times \\\\\\\\\\&"),
                 Arguments.of(StandardField.NOTE, "In the \\& middle of \\\\\\& something"),
 
                 // Verbatim fields
                 Arguments.of(StandardField.FILE, "one & another.pdf"),
-                Arguments.of(StandardField.URL, "https://example.org?key=value&key2=value2")
-        );
+                Arguments.of(StandardField.URL, "https://example.org?key=value&key2=value2"));
     }
 
     @ParameterizedTest
     @MethodSource("provideUnacceptedInputs")
     void rejectsDisallowedInputs(String expectedMessage, Field field, String value) {
         entry.setField(field, value);
-        assertEquals(List.of(new IntegrityMessage(expectedMessage, entry, field)), checker.check(entry));
+        assertEquals(
+                List.of(new IntegrityMessage(expectedMessage, entry, field)), checker.check(entry));
     }
 
     private static Stream<Arguments> provideUnacceptedInputs() {
         return Stream.of(
                 Arguments.of("Found 1 unescaped '&'", StandardField.SUBTITLE, "A single &"),
-                Arguments.of("Found 2 unescaped '&'", StandardField.ABSTRACT, "Multiple \\\\& not properly & escaped"),
-                Arguments.of("Found 1 unescaped '&'", StandardField.AUTHOR, "To many backslashes \\\\&"),
-                Arguments.of("Found 2 unescaped '&'", StandardField.LABEL, "\\\\\\\\& Multiple times \\\\& multiple backslashes"),
+                Arguments.of(
+                        "Found 2 unescaped '&'",
+                        StandardField.ABSTRACT,
+                        "Multiple \\\\& not properly & escaped"),
+                Arguments.of(
+                        "Found 1 unescaped '&'", StandardField.AUTHOR, "To many backslashes \\\\&"),
+                Arguments.of(
+                        "Found 2 unescaped '&'",
+                        StandardField.LABEL,
+                        "\\\\\\\\& Multiple times \\\\& multiple backslashes"),
 
                 // entryWithEscapedAndUnescapedAmpersand
                 Arguments.of("Found 1 unescaped '&'", StandardField.TITLE, "Jack \\& Jill & more"),
 
                 // entryWithMultipleEscapedAndUnescapedAmpersands
-                Arguments.of("Found 4 unescaped '&'", StandardField.AFTERWORD, "May the force be with you & live long \\\\& prosper \\& to infinity \\\\\\& beyond & assemble \\\\\\\\& excelsior!")
-        );
+                Arguments.of(
+                        "Found 4 unescaped '&'",
+                        StandardField.AFTERWORD,
+                        "May the force be with you & live long \\\\& prosper \\& to infinity \\\\\\& beyond & assemble \\\\\\\\& excelsior!"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/BibStringCheckerTest.java b/src/test/java/org/jabref/logic/integrity/BibStringCheckerTest.java
index 87ea138fa717..1422987e9549 100644
--- a/src/test/java/org/jabref/logic/integrity/BibStringCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/BibStringCheckerTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
 
 class BibStringCheckerTest {
 
@@ -29,21 +28,30 @@ void acceptsAllowedInputs(List<IntegrityMessage> expected, Field field, String v
 
     private static Stream<Arguments> provideAcceptedInputs() {
         return Stream.of(
-                Arguments.of(Collections.emptyList(), StandardField.TITLE, "Not a single hash mark"),
+                Arguments.of(
+                        Collections.emptyList(), StandardField.TITLE, "Not a single hash mark"),
                 Arguments.of(Collections.emptyList(), StandardField.MONTH, "#jan#"),
-                Arguments.of(Collections.emptyList(), StandardField.AUTHOR, "#einstein# and #newton#")
-        );
+                Arguments.of(
+                        Collections.emptyList(), StandardField.AUTHOR, "#einstein# and #newton#"));
     }
 
     @Test
     void monthDoesNotAcceptOddNumberOfHashMarks() {
         entry.setField(StandardField.MONTH, "#jan");
-        assertEquals(List.of(new IntegrityMessage("odd number of unescaped '#'", entry, StandardField.MONTH)), checker.check(entry));
+        assertEquals(
+                List.of(
+                        new IntegrityMessage(
+                                "odd number of unescaped '#'", entry, StandardField.MONTH)),
+                checker.check(entry));
     }
 
     @Test
     void authorDoesNotAcceptOddNumberOfHashMarks() {
         entry.setField(StandardField.AUTHOR, "#einstein# #amp; #newton#");
-        assertEquals(List.of(new IntegrityMessage("odd number of unescaped '#'", entry, StandardField.AUTHOR)), checker.check(entry));
+        assertEquals(
+                List.of(
+                        new IntegrityMessage(
+                                "odd number of unescaped '#'", entry, StandardField.AUTHOR)),
+                checker.check(entry));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/BooktitleCheckerTest.java b/src/test/java/org/jabref/logic/integrity/BooktitleCheckerTest.java
index 129b424225a1..2e616c820b3a 100644
--- a/src/test/java/org/jabref/logic/integrity/BooktitleCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/BooktitleCheckerTest.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Optional;
 
 class BooktitleCheckerTest {
 
@@ -13,12 +13,18 @@ class BooktitleCheckerTest {
 
     @Test
     void booktitleAcceptsIfItDoesNotEndWithConferenceOn() {
-        assertEquals(Optional.empty(), checker.checkValue("2014 Fourth International Conference on Digital Information and Communication Technology and it's Applications (DICTAP)"));
+        assertEquals(
+                Optional.empty(),
+                checker.checkValue(
+                        "2014 Fourth International Conference on Digital Information and Communication Technology and it's Applications (DICTAP)"));
     }
 
     @Test
     void booktitleDoesNotAcceptsIfItEndsWithConferenceOn() {
-        assertNotEquals(Optional.empty(), checker.checkValue("Digital Information and Communication Technology and it's Applications (DICTAP), 2014 Fourth International Conference on"));
+        assertNotEquals(
+                Optional.empty(),
+                checker.checkValue(
+                        "Digital Information and Communication Technology and it's Applications (DICTAP), 2014 Fourth International Conference on"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java b/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java
index 092992b63531..24b6566e0da1 100644
--- a/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java
+++ b/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.integrity;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
+import org.junit.jupiter.api.Test;
+
 class BracesCorrectorTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/integrity/BracketCheckerTest.java b/src/test/java/org/jabref/logic/integrity/BracketCheckerTest.java
index 658eb5ff8a75..31f662837516 100644
--- a/src/test/java/org/jabref/logic/integrity/BracketCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/BracketCheckerTest.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Optional;
 
 class BracketCheckerTest {
 
diff --git a/src/test/java/org/jabref/logic/integrity/CitationKeyCheckerTest.java b/src/test/java/org/jabref/logic/integrity/CitationKeyCheckerTest.java
index 17d891623b6f..66208f9540f0 100644
--- a/src/test/java/org/jabref/logic/integrity/CitationKeyCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/CitationKeyCheckerTest.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
+import java.util.List;
 
 class CitationKeyCheckerTest {
 
@@ -18,34 +17,49 @@ class CitationKeyCheckerTest {
 
     @Test
     void bibTexAcceptsKeyFromAuthorAndYear() {
-        BibEntry entry = new BibEntry().withField(InternalField.KEY_FIELD, "Knuth2014")
-                                       .withField(StandardField.AUTHOR, "Knuth")
-                                       .withField(StandardField.YEAR, "2014");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(InternalField.KEY_FIELD, "Knuth2014")
+                        .withField(StandardField.AUTHOR, "Knuth")
+                        .withField(StandardField.YEAR, "2014");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
     void acceptsKeyFromAuthorAndTitle() {
-        BibEntry entry = new BibEntry().withField(InternalField.KEY_FIELD, "BrownTheTitle")
-                                       .withField(StandardField.AUTHOR, "Brown")
-                                       .withField(StandardField.TITLE, "The Title");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(InternalField.KEY_FIELD, "BrownTheTitle")
+                        .withField(StandardField.AUTHOR, "Brown")
+                        .withField(StandardField.TITLE, "The Title");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
     void acceptsKeyFromTitleAndYear() {
-        BibEntry entry = new BibEntry().withField(InternalField.KEY_FIELD, "TheTitle2021")
-                                       .withField(StandardField.TITLE, "The Title")
-                                       .withField(StandardField.YEAR, "2021");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(InternalField.KEY_FIELD, "TheTitle2021")
+                        .withField(StandardField.TITLE, "The Title")
+                        .withField(StandardField.YEAR, "2021");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
     void emptyCitationKey() {
-        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "Brown")
-                                       .withField(StandardField.TITLE, "The Title")
-                                       .withField(StandardField.YEAR, "2021");
-        List<IntegrityMessage> expected = Collections.singletonList(new IntegrityMessage(Localization.lang("empty citation key") + ": " + entry.getAuthorTitleYear(100), entry, InternalField.KEY_FIELD));
+        BibEntry entry =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "Brown")
+                        .withField(StandardField.TITLE, "The Title")
+                        .withField(StandardField.YEAR, "2021");
+        List<IntegrityMessage> expected =
+                Collections.singletonList(
+                        new IntegrityMessage(
+                                Localization.lang("empty citation key")
+                                        + ": "
+                                        + entry.getAuthorTitleYear(100),
+                                entry,
+                                InternalField.KEY_FIELD));
         assertEquals(expected, checker.check(entry));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/CitationKeyDeviationCheckerTest.java b/src/test/java/org/jabref/logic/integrity/CitationKeyDeviationCheckerTest.java
index b0edf9e100d2..0833dde7f0fa 100644
--- a/src/test/java/org/jabref/logic/integrity/CitationKeyDeviationCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/CitationKeyDeviationCheckerTest.java
@@ -1,7 +1,8 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.citationkeypattern.AbstractCitationKeyPatterns;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
@@ -13,39 +14,48 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.MetaData;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Collections;
+import java.util.List;
 
 class CitationKeyDeviationCheckerTest {
 
     private final BibDatabaseContext bibDatabaseContext = mock(BibDatabaseContext.class);
     private final BibDatabase bibDatabase = mock(BibDatabase.class);
     private final MetaData metaData = mock(MetaData.class);
-    private final AbstractCitationKeyPatterns abstractCitationKeyPatterns = mock(AbstractCitationKeyPatterns.class);
-    private final GlobalCitationKeyPatterns globalCitationKeyPatterns = mock(GlobalCitationKeyPatterns.class);
-    private final CitationKeyPatternPreferences citationKeyPatternPreferences = mock(CitationKeyPatternPreferences.class);
-    private final CitationKeyDeviationChecker checker = new CitationKeyDeviationChecker(bibDatabaseContext, citationKeyPatternPreferences);
+    private final AbstractCitationKeyPatterns abstractCitationKeyPatterns =
+            mock(AbstractCitationKeyPatterns.class);
+    private final GlobalCitationKeyPatterns globalCitationKeyPatterns =
+            mock(GlobalCitationKeyPatterns.class);
+    private final CitationKeyPatternPreferences citationKeyPatternPreferences =
+            mock(CitationKeyPatternPreferences.class);
+    private final CitationKeyDeviationChecker checker =
+            new CitationKeyDeviationChecker(bibDatabaseContext, citationKeyPatternPreferences);
 
     @BeforeEach
     void setUp() {
         when(bibDatabaseContext.getMetaData()).thenReturn(metaData);
         when(citationKeyPatternPreferences.getKeyPatterns()).thenReturn(globalCitationKeyPatterns);
-        when(metaData.getCiteKeyPatterns(citationKeyPatternPreferences.getKeyPatterns())).thenReturn(abstractCitationKeyPatterns);
+        when(metaData.getCiteKeyPatterns(citationKeyPatternPreferences.getKeyPatterns()))
+                .thenReturn(abstractCitationKeyPatterns);
         when(bibDatabaseContext.getDatabase()).thenReturn(bibDatabase);
     }
 
     @Test
     void citationKeyDeviatesFromGeneratedKey() {
-        BibEntry entry = new BibEntry().withField(InternalField.KEY_FIELD, "Knuth2014")
-                                       .withField(StandardField.AUTHOR, "Knuth")
-                                       .withField(StandardField.YEAR, "2014");
-        List<IntegrityMessage> expected = Collections.singletonList(new IntegrityMessage(
-                Localization.lang("Citation key deviates from generated key"), entry, InternalField.KEY_FIELD));
+        BibEntry entry =
+                new BibEntry()
+                        .withField(InternalField.KEY_FIELD, "Knuth2014")
+                        .withField(StandardField.AUTHOR, "Knuth")
+                        .withField(StandardField.YEAR, "2014");
+        List<IntegrityMessage> expected =
+                Collections.singletonList(
+                        new IntegrityMessage(
+                                Localization.lang("Citation key deviates from generated key"),
+                                entry,
+                                InternalField.KEY_FIELD));
         assertEquals(expected, checker.check(entry));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/CitationKeyDuplicationCheckerTest.java b/src/test/java/org/jabref/logic/integrity/CitationKeyDuplicationCheckerTest.java
index 97eb6e70c450..597d01f917e8 100644
--- a/src/test/java/org/jabref/logic/integrity/CitationKeyDuplicationCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/CitationKeyDuplicationCheckerTest.java
@@ -1,25 +1,26 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
+import java.util.List;
 
 class CitationKeyDuplicationCheckerTest {
 
     @Test
     void emptyCitationKey() {
-        BibEntry entry = new BibEntry().withField(InternalField.KEY_FIELD, "")
-                                       .withField(StandardField.AUTHOR, "Knuth")
-                                       .withField(StandardField.YEAR, "2014");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(InternalField.KEY_FIELD, "")
+                        .withField(StandardField.AUTHOR, "Knuth")
+                        .withField(StandardField.YEAR, "2014");
         BibDatabase bibDatabase = new BibDatabase(List.of(entry));
         CitationKeyDuplicationChecker checker = new CitationKeyDuplicationChecker(bibDatabase);
 
@@ -29,17 +30,25 @@ void emptyCitationKey() {
 
     @Test
     void hasDuplicateCitationKey() {
-        BibEntry entry = new BibEntry().withField(InternalField.KEY_FIELD, "Knuth2014")
-                                       .withField(StandardField.AUTHOR, "Knuth")
-                                       .withField(StandardField.YEAR, "2014");
-        BibEntry entry2 = new BibEntry().withField(InternalField.KEY_FIELD, "Knuth2014")
-                                        .withField(StandardField.AUTHOR, "Knuth")
-                                        .withField(StandardField.YEAR, "2014");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(InternalField.KEY_FIELD, "Knuth2014")
+                        .withField(StandardField.AUTHOR, "Knuth")
+                        .withField(StandardField.YEAR, "2014");
+        BibEntry entry2 =
+                new BibEntry()
+                        .withField(InternalField.KEY_FIELD, "Knuth2014")
+                        .withField(StandardField.AUTHOR, "Knuth")
+                        .withField(StandardField.YEAR, "2014");
         BibDatabase bibDatabase = new BibDatabase(List.of(entry, entry2));
         CitationKeyDuplicationChecker checker = new CitationKeyDuplicationChecker(bibDatabase);
 
-        List<IntegrityMessage> expected = Collections.singletonList(
-                new IntegrityMessage(Localization.lang("Duplicate citation key"), entry, StandardField.KEY));
+        List<IntegrityMessage> expected =
+                Collections.singletonList(
+                        new IntegrityMessage(
+                                Localization.lang("Duplicate citation key"),
+                                entry,
+                                StandardField.KEY));
         assertEquals(expected, checker.check(entry));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/DateCheckerTest.java b/src/test/java/org/jabref/logic/integrity/DateCheckerTest.java
index f8e2d8fbcd42..24408ecd48d1 100644
--- a/src/test/java/org/jabref/logic/integrity/DateCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/DateCheckerTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 class DateCheckerTest {
 
@@ -18,13 +18,35 @@ void acceptsEmptyInput() {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"2018-04-21", "2018-04", "21-04-2018", "04-2018", "04/18", "04/2018", "April 21, 2018", "April, 2018", "21.04.2018", "2018.04.21", "2018"})
+    @ValueSource(
+            strings = {
+                "2018-04-21",
+                "2018-04",
+                "21-04-2018",
+                "04-2018",
+                "04/18",
+                "04/2018",
+                "April 21, 2018",
+                "April, 2018",
+                "21.04.2018",
+                "2018.04.21",
+                "2018"
+            })
     void acceptsValidDates(String s) {
         assertEquals(Optional.empty(), checker.checkValue(s));
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"2018-04-21TZ", "2018-Apr-21", "2018-Apr-Twentyone", "2018-Apr-Twentyfirst", "2018_04_21", "2018 04 21", "2018~04~21"})
+    @ValueSource(
+            strings = {
+                "2018-04-21TZ",
+                "2018-Apr-21",
+                "2018-Apr-Twentyone",
+                "2018-Apr-Twentyfirst",
+                "2018_04_21",
+                "2018 04 21",
+                "2018~04~21"
+            })
     void complainsAboutInvalidInput(String s) {
         assertEquals(Optional.of("incorrect format"), checker.checkValue(s));
     }
diff --git a/src/test/java/org/jabref/logic/integrity/DoiDuplicationCheckerTest.java b/src/test/java/org/jabref/logic/integrity/DoiDuplicationCheckerTest.java
index b2052938fd95..bff97bbf863a 100644
--- a/src/test/java/org/jabref/logic/integrity/DoiDuplicationCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/DoiDuplicationCheckerTest.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
+import java.util.List;
 
 class DoiDuplicationCheckerTest {
 
@@ -28,19 +27,42 @@ class DoiDuplicationCheckerTest {
     void onePairDuplicateDOI() {
         List<BibEntry> entries = List.of(doiA_entry1, doiA_entry2, doiC_entry1);
         BibDatabase database = new BibDatabase(entries);
-        List<IntegrityMessage> results = List.of(new IntegrityMessage(Localization.lang("Same DOI used in multiple entries"), doiA_entry1, StandardField.DOI),
-        new IntegrityMessage(Localization.lang("Same DOI used in multiple entries"), doiA_entry2, StandardField.DOI));
+        List<IntegrityMessage> results =
+                List.of(
+                        new IntegrityMessage(
+                                Localization.lang("Same DOI used in multiple entries"),
+                                doiA_entry1,
+                                StandardField.DOI),
+                        new IntegrityMessage(
+                                Localization.lang("Same DOI used in multiple entries"),
+                                doiA_entry2,
+                                StandardField.DOI));
         assertEquals(results, checker.check(database));
     }
 
     @Test
     void multiPairsDuplicateDOI() {
-        List<BibEntry> entries = List.of(doiA_entry1, doiA_entry2, doiB_entry1, doiB_entry2, doiC_entry1);
+        List<BibEntry> entries =
+                List.of(doiA_entry1, doiA_entry2, doiB_entry1, doiB_entry2, doiC_entry1);
         BibDatabase database = new BibDatabase(entries);
-        List<IntegrityMessage> results = List.of(new IntegrityMessage(Localization.lang("Same DOI used in multiple entries"), doiA_entry1, StandardField.DOI),
-                new IntegrityMessage(Localization.lang("Same DOI used in multiple entries"), doiA_entry2, StandardField.DOI),
-                new IntegrityMessage(Localization.lang("Same DOI used in multiple entries"), doiB_entry1, StandardField.DOI),
-                new IntegrityMessage(Localization.lang("Same DOI used in multiple entries"), doiB_entry2, StandardField.DOI));
+        List<IntegrityMessage> results =
+                List.of(
+                        new IntegrityMessage(
+                                Localization.lang("Same DOI used in multiple entries"),
+                                doiA_entry1,
+                                StandardField.DOI),
+                        new IntegrityMessage(
+                                Localization.lang("Same DOI used in multiple entries"),
+                                doiA_entry2,
+                                StandardField.DOI),
+                        new IntegrityMessage(
+                                Localization.lang("Same DOI used in multiple entries"),
+                                doiB_entry1,
+                                StandardField.DOI),
+                        new IntegrityMessage(
+                                Localization.lang("Same DOI used in multiple entries"),
+                                doiB_entry2,
+                                StandardField.DOI));
         assertEquals(results, checker.check(database));
     }
 
diff --git a/src/test/java/org/jabref/logic/integrity/DoiValidityCheckerTest.java b/src/test/java/org/jabref/logic/integrity/DoiValidityCheckerTest.java
index 932e35eafdc8..5b7ed9b03513 100644
--- a/src/test/java/org/jabref/logic/integrity/DoiValidityCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/DoiValidityCheckerTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Optional;
 
 class DoiValidityCheckerTest {
 
@@ -30,7 +30,9 @@ void doiAcceptsValidInputWithNotOnlyNumbers() {
 
     @Test
     void doiAcceptsValidInputNoMatterTheLengthOfTheDOIName() {
-        assertEquals(Optional.empty(), checker.checkValue("10.1002/(SICI)1097-4571(199205)43:4<284::AID-ASI3>3.0.CO;2-0"));
+        assertEquals(
+                Optional.empty(),
+                checker.checkValue("10.1002/(SICI)1097-4571(199205)43:4<284::AID-ASI3>3.0.CO;2-0"));
     }
 
     @Test
@@ -39,7 +41,15 @@ void doiDoesNotAcceptInvalidInput() {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"11.1000/182", "01.1000/182", "100.1000/182", "110.1000/182", "a10.1000/182", "10a.1000/182"})
+    @ValueSource(
+            strings = {
+                "11.1000/182",
+                "01.1000/182",
+                "100.1000/182",
+                "110.1000/182",
+                "a10.1000/182",
+                "10a.1000/182"
+            })
     void doiDoesNotAcceptInputWithTypoInFirstPart(String s) {
         assertNotEquals(Optional.empty(), checker.checkValue(s));
     }
diff --git a/src/test/java/org/jabref/logic/integrity/EditionCheckerTest.java b/src/test/java/org/jabref/logic/integrity/EditionCheckerTest.java
index 19744e61fce4..d223f96f7562 100644
--- a/src/test/java/org/jabref/logic/integrity/EditionCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/EditionCheckerTest.java
@@ -1,37 +1,43 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Optional;
 
 class EditionCheckerTest {
     @Test
     void isFirstCharacterANumber() {
-        assertTrue(createSimpleEditionChecker(new BibDatabaseContext(), false).isFirstCharDigit("0HelloWorld"));
+        assertTrue(
+                createSimpleEditionChecker(new BibDatabaseContext(), false)
+                        .isFirstCharDigit("0HelloWorld"));
     }
 
     @Test
     void isFirstCharacterANumberFalseForEmptyString() {
-        assertFalse(createSimpleEditionChecker(new BibDatabaseContext(), false).isFirstCharDigit(""));
+        assertFalse(
+                createSimpleEditionChecker(new BibDatabaseContext(), false).isFirstCharDigit(""));
     }
 
     @Test
     void isFirstCharacterNotANumber() {
-        assertFalse(createSimpleEditionChecker(new BibDatabaseContext(), false).isFirstCharDigit("HelloWorld"));
+        assertFalse(
+                createSimpleEditionChecker(new BibDatabaseContext(), false)
+                        .isFirstCharDigit("HelloWorld"));
     }
 
     @Test
     void editionCheckerDoesNotComplainIfAllowIntegerEditionIsEnabled() {
-        assertEquals(Optional.empty(), createSimpleEditionChecker(new BibDatabaseContext(), true).checkValue("2"));
+        assertEquals(
+                Optional.empty(),
+                createSimpleEditionChecker(new BibDatabaseContext(), true).checkValue("2"));
     }
 
     @Test
@@ -66,17 +72,22 @@ void bibTexNullValueAsInput() {
 
     @Test
     void bibTexDoesNotAcceptIntegerOnly() {
-        assertEquals(Optional.of(Localization.lang("no integer as values for edition allowed")), createBibtexEditionChecker(false).checkValue("3"));
+        assertEquals(
+                Optional.of(Localization.lang("no integer as values for edition allowed")),
+                createBibtexEditionChecker(false).checkValue("3"));
     }
 
     @Test
     void bibTexAcceptsFirstEditionAlsoIfIntegerEditionDisallowed() {
-        assertEquals(Optional.of(Localization.lang("edition of book reported as just 1")), createBibtexEditionChecker(false).checkValue("1"));
+        assertEquals(
+                Optional.of(Localization.lang("edition of book reported as just 1")),
+                createBibtexEditionChecker(false).checkValue("1"));
     }
 
     @Test
     void bibLaTexAcceptsEditionWithCapitalFirstLetter() {
-        assertEquals(Optional.empty(), createBiblatexEditionChecker(true).checkValue("Edition 2000"));
+        assertEquals(
+                Optional.empty(), createBiblatexEditionChecker(true).checkValue("Edition 2000"));
     }
 
     @Test
@@ -86,7 +97,10 @@ void bibLaTexAcceptsIntegerInputInEdition() {
 
     @Test
     void bibLaTexAcceptsEditionAsLiteralString() {
-        assertEquals(Optional.empty(), createBiblatexEditionChecker(true).checkValue("Third, revised and expanded edition"));
+        assertEquals(
+                Optional.empty(),
+                createBiblatexEditionChecker(true)
+                        .checkValue("Third, revised and expanded edition"));
     }
 
     @Test
@@ -106,7 +120,8 @@ private EditionChecker createBiblatexEditionChecker(Boolean allowIntegerEdition)
         return new EditionChecker(biblatex, allowIntegerEdition);
     }
 
-    private EditionChecker createSimpleEditionChecker(BibDatabaseContext bibDatabaseContextEdition, boolean allowIntegerEdition) {
+    private EditionChecker createSimpleEditionChecker(
+            BibDatabaseContext bibDatabaseContextEdition, boolean allowIntegerEdition) {
         return new EditionChecker(bibDatabaseContextEdition, allowIntegerEdition);
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java b/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java
index e4885246c66d..d3bfbc53e1ec 100644
--- a/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.Collections;
+import java.util.List;
 
 class EntryLinkCheckerTest {
 
diff --git a/src/test/java/org/jabref/logic/integrity/HTMLCharacterCheckerTest.java b/src/test/java/org/jabref/logic/integrity/HTMLCharacterCheckerTest.java
index 16b54f789c13..5e42dbcef391 100644
--- a/src/test/java/org/jabref/logic/integrity/HTMLCharacterCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/HTMLCharacterCheckerTest.java
@@ -1,20 +1,19 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
 
 class HTMLCharacterCheckerTest {
 
@@ -23,10 +22,7 @@ class HTMLCharacterCheckerTest {
 
     @Test
     void settingNullThrowsNPE() {
-        assertThrows(
-                NullPointerException.class,
-                () -> entry.setField(StandardField.AUTHOR, null)
-        );
+        assertThrows(NullPointerException.class, () -> entry.setField(StandardField.AUTHOR, null));
     }
 
     @Test
@@ -49,27 +45,36 @@ void authorAcceptsNonHTMLEncodedCharacters() {
 
     @Test
     void urlAcceptsNonHTMLEncodedCharacters() {
-        entry.setField(StandardField.URL, "http://www.thinkmind.org/index.php?view=article&amp;articleid=cloud_computing_2013_1_20_20130");
+        entry.setField(
+                StandardField.URL,
+                "http://www.thinkmind.org/index.php?view=article&amp;articleid=cloud_computing_2013_1_20_20130");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
     void authorDoesNotAcceptHTMLEncodedCharacters() {
         entry.setField(StandardField.AUTHOR, "Lenhard, J&#227;rg");
-        assertEquals(List.of(new IntegrityMessage("HTML encoded character found", entry, StandardField.AUTHOR)), checker.check(entry));
+        assertEquals(
+                List.of(
+                        new IntegrityMessage(
+                                "HTML encoded character found", entry, StandardField.AUTHOR)),
+                checker.check(entry));
     }
 
     @Test
     void journalDoesNotAcceptHTMLEncodedCharacters() {
         entry.setField(StandardField.JOURNAL, "&Auml;rling Str&ouml;m for &#8211; &#x2031;");
-        assertEquals(List.of(new IntegrityMessage("HTML encoded character found", entry, StandardField.JOURNAL)), checker.check(entry));
+        assertEquals(
+                List.of(
+                        new IntegrityMessage(
+                                "HTML encoded character found", entry, StandardField.JOURNAL)),
+                checker.check(entry));
     }
 
     static Stream<Arguments> entryWithVerabitmFieldsNotCausingMessages() {
         return Stream.of(
                 Arguments.of(StandardField.FILE, "one &amp; another.pdf"),
-                Arguments.of(StandardField.URL, "https://example.org?key=value&key2=value2")
-        );
+                Arguments.of(StandardField.URL, "https://example.org?key=value&key2=value2"));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java b/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java
index 99ecdc51680f..b753d7d038c0 100644
--- a/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Optional;
 
 class HowPublishedCheckerTest {
 
diff --git a/src/test/java/org/jabref/logic/integrity/ISBNCheckerTest.java b/src/test/java/org/jabref/logic/integrity/ISBNCheckerTest.java
index d779c86a61bc..4522f071ba48 100644
--- a/src/test/java/org/jabref/logic/integrity/ISBNCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/ISBNCheckerTest.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.jabref.logic.l10n.Localization;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 class ISBNCheckerTest {
 
@@ -46,8 +45,10 @@ void checkISBNValue(Optional optValue, String id) {
     private static Stream<Arguments> provideBoundaryArgumentsForISBN13() {
         return Stream.of(
                 Arguments.of(Optional.empty(), "978-0-306-40615-7"),
-                Arguments.of(Optional.of(Localization.lang("incorrect control digit")), "978-0-306-40615-2"),
-                Arguments.of(Optional.of(Localization.lang("incorrect format")), "978_0_306_40615_7")
-        );
+                Arguments.of(
+                        Optional.of(Localization.lang("incorrect control digit")),
+                        "978-0-306-40615-2"),
+                Arguments.of(
+                        Optional.of(Localization.lang("incorrect format")), "978_0_306_40615_7"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/ISSNCheckerTest.java b/src/test/java/org/jabref/logic/integrity/ISSNCheckerTest.java
index 6d69f6269865..2144204fc435 100644
--- a/src/test/java/org/jabref/logic/integrity/ISSNCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/ISSNCheckerTest.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.jabref.logic.l10n.Localization;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 class ISSNCheckerTest {
 
@@ -45,14 +44,12 @@ void emptyIssnValue() {
     @ParameterizedTest
     @MethodSource("provideIncorrectFormatArguments")
     void issnWithWrongFormat(String wrongISSN) {
-        assertEquals(Optional.of(Localization.lang("incorrect format")), checker.checkValue(wrongISSN));
+        assertEquals(
+                Optional.of(Localization.lang("incorrect format")), checker.checkValue(wrongISSN));
     }
 
     private static Stream<Arguments> provideIncorrectFormatArguments() {
         return Stream.of(
-                Arguments.of("020-721"),
-                Arguments.of("0020-72109"),
-                Arguments.of("0020~72109")
-        );
+                Arguments.of("020-721"), Arguments.of("0020-72109"), Arguments.of("0020~72109"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
index afc8b5852bea..140fe859fd70 100644
--- a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
+++ b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
@@ -1,12 +1,10 @@
 package org.jabref.logic.integrity;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
@@ -24,18 +22,19 @@
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.metadata.MetaData;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Stream;
 
 /**
  * This class tests the Integrity Checker as a whole.
@@ -46,22 +45,34 @@ class IntegrityCheckTest {
 
     @Test
     void bibTexAcceptsStandardEntryType() throws Exception {
-        assertCorrect(withMode(createContext(StandardField.TITLE, "sometitle", StandardEntryType.Article), BibDatabaseMode.BIBTEX));
+        assertCorrect(
+                withMode(
+                        createContext(StandardField.TITLE, "sometitle", StandardEntryType.Article),
+                        BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void bibTexDoesNotAcceptIEEETranEntryType() throws Exception {
-        assertWrong(withMode(createContext(StandardField.TITLE, "sometitle", IEEETranEntryType.Patent), BibDatabaseMode.BIBTEX));
+        assertWrong(
+                withMode(
+                        createContext(StandardField.TITLE, "sometitle", IEEETranEntryType.Patent),
+                        BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void bibLaTexAcceptsIEEETranEntryType() throws Exception {
-        assertCorrect((withMode(createContext(StandardField.TITLE, "sometitle", IEEETranEntryType.Patent), BibDatabaseMode.BIBLATEX)));
+        assertCorrect(
+                (withMode(
+                        createContext(StandardField.TITLE, "sometitle", IEEETranEntryType.Patent),
+                        BibDatabaseMode.BIBLATEX)));
     }
 
     @Test
     void bibLaTexAcceptsStandardEntryType() throws Exception {
-        assertCorrect(withMode(createContext(StandardField.TITLE, "sometitle", StandardEntryType.Article), BibDatabaseMode.BIBLATEX));
+        assertCorrect(
+                withMode(
+                        createContext(StandardField.TITLE, "sometitle", StandardEntryType.Article),
+                        BibDatabaseMode.BIBLATEX));
     }
 
     @ParameterizedTest
@@ -85,10 +96,13 @@ private static Stream<String> provideCorrectFormat() {
     }
 
     private static Stream<String> provideIncorrectFormat() {
-        return Stream.of("   Knuth, Donald E. ",
+        return Stream.of(
+                "   Knuth, Donald E. ",
                 "Knuth, Donald E. and Kurt Cobain and A. Einstein",
-                ", and Kurt Cobain and A. Einstein", "Donald E. Knuth and Kurt Cobain and ,",
-                "and Kurt Cobain and A. Einstein", "Donald E. Knuth and Kurt Cobain and");
+                ", and Kurt Cobain and A. Einstein",
+                "Donald E. Knuth and Kurt Cobain and ,",
+                "and Kurt Cobain and A. Einstein",
+                "Donald E. Knuth and Kurt Cobain and");
     }
 
     @Test
@@ -96,11 +110,13 @@ void fileChecks() throws Exception {
         MetaData metaData = mock(MetaData.class);
         Mockito.when(metaData.getDefaultFileDirectory()).thenReturn(Optional.of("."));
         Mockito.when(metaData.getUserFileDirectory(any(String.class))).thenReturn(Optional.empty());
-        // FIXME: must be set as checkBibtexDatabase only activates title checker based on database mode
+        // FIXME: must be set as checkBibtexDatabase only activates title checker based on database
+        // mode
         Mockito.when(metaData.getMode()).thenReturn(Optional.of(BibDatabaseMode.BIBTEX));
 
         assertCorrect(createContext(StandardField.FILE, ":build.gradle:gradle", metaData));
-        assertCorrect(createContext(StandardField.FILE, "description:build.gradle:gradle", metaData));
+        assertCorrect(
+                createContext(StandardField.FILE, "description:build.gradle:gradle", metaData));
         assertWrong(createContext(StandardField.FILE, ":asflakjfwofja:PDF", metaData));
     }
 
@@ -135,27 +151,26 @@ void entryIsUnchangedAfterChecks() throws Exception {
         bibDatabase.insertEntry(entry);
         BibDatabaseContext context = new BibDatabaseContext(bibDatabase);
 
-        new IntegrityCheck(context,
-                mock(FilePreferences.class),
-                createCitationKeyPatternPreferences(),
-                JournalAbbreviationLoader.loadBuiltInRepository(),
-                false)
+        new IntegrityCheck(
+                        context,
+                        mock(FilePreferences.class),
+                        createCitationKeyPatternPreferences(),
+                        JournalAbbreviationLoader.loadBuiltInRepository(),
+                        false)
                 .check();
 
         assertEquals(clonedEntry, entry);
     }
 
     private BibDatabaseContext createContext(Field field, String value, EntryType type) {
-        BibEntry entry = new BibEntry(type)
-                .withField(field, value);
+        BibEntry entry = new BibEntry(type).withField(field, value);
         BibDatabase bibDatabase = new BibDatabase();
         bibDatabase.insertEntry(entry);
         return new BibDatabaseContext(bibDatabase);
     }
 
     private BibDatabaseContext createContext(Field field, String value, MetaData metaData) {
-        BibEntry entry = new BibEntry()
-                .withField(field, value);
+        BibEntry entry = new BibEntry().withField(field, value);
         BibDatabase bibDatabase = new BibDatabase();
         bibDatabase.insertEntry(entry);
         return new BibDatabaseContext(bibDatabase, metaData);
@@ -170,12 +185,14 @@ private BibDatabaseContext createContext(Field field, String value) {
     private void assertWrong(BibDatabaseContext context) throws Exception {
         List<IntegrityMessage> messages;
 
-        messages = new IntegrityCheck(context,
-                mock(FilePreferences.class),
-                createCitationKeyPatternPreferences(),
-                JournalAbbreviationLoader.loadBuiltInRepository(),
-                false)
-                .check();
+        messages =
+                new IntegrityCheck(
+                                context,
+                                mock(FilePreferences.class),
+                                createCitationKeyPatternPreferences(),
+                                JournalAbbreviationLoader.loadBuiltInRepository(),
+                                false)
+                        .check();
 
         assertNotEquals(Collections.emptyList(), messages);
     }
@@ -185,12 +202,14 @@ private void assertCorrect(BibDatabaseContext context) throws Exception {
         when(filePreferencesMock.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
         List<IntegrityMessage> messages;
 
-        messages = new IntegrityCheck(context,
-                filePreferencesMock,
-                createCitationKeyPatternPreferences(),
-                JournalAbbreviationLoader.loadBuiltInRepository(),
-                false)
-                .check();
+        messages =
+                new IntegrityCheck(
+                                context,
+                                filePreferencesMock,
+                                createCitationKeyPatternPreferences(),
+                                JournalAbbreviationLoader.loadBuiltInRepository(),
+                                false)
+                        .check();
 
         assertEquals(Collections.emptyList(), messages);
     }
diff --git a/src/test/java/org/jabref/logic/integrity/JournalInAbbreviationListCheckerTest.java b/src/test/java/org/jabref/logic/integrity/JournalInAbbreviationListCheckerTest.java
index 85e25eb995c2..0b11bb723bc6 100644
--- a/src/test/java/org/jabref/logic/integrity/JournalInAbbreviationListCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/JournalInAbbreviationListCheckerTest.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.journals.Abbreviation;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
+import java.util.List;
 
 class JournalInAbbreviationListCheckerTest {
 
@@ -25,8 +24,11 @@ class JournalInAbbreviationListCheckerTest {
     void setUp() {
         abbreviationRepository = JournalAbbreviationLoader.loadBuiltInRepository();
         abbreviationRepository.addCustomAbbreviation(new Abbreviation("IEEE Software", "IEEE SW"));
-        checker = new JournalInAbbreviationListChecker(StandardField.JOURNAL, abbreviationRepository);
-        checkerb = new JournalInAbbreviationListChecker(StandardField.JOURNALTITLE, abbreviationRepository);
+        checker =
+                new JournalInAbbreviationListChecker(StandardField.JOURNAL, abbreviationRepository);
+        checkerb =
+                new JournalInAbbreviationListChecker(
+                        StandardField.JOURNALTITLE, abbreviationRepository);
         entry = new BibEntry();
     }
 
@@ -39,18 +41,36 @@ void journalAcceptsNameInTheList() {
     @Test
     void journalDoesNotAcceptNameNotInList() {
         entry.setField(StandardField.JOURNAL, "IEEE Whocares");
-        assertEquals(List.of(new IntegrityMessage("journal not found in abbreviation list", entry, StandardField.JOURNAL)), checker.check(entry));
+        assertEquals(
+                List.of(
+                        new IntegrityMessage(
+                                "journal not found in abbreviation list",
+                                entry,
+                                StandardField.JOURNAL)),
+                checker.check(entry));
     }
 
     @Test
     void journalTitleDoesNotAcceptRandomInputInTitle() {
         entry.setField(StandardField.JOURNALTITLE, "A journal");
-        assertEquals(List.of(new IntegrityMessage("journal not found in abbreviation list", entry, StandardField.JOURNALTITLE)), checkerb.check(entry));
+        assertEquals(
+                List.of(
+                        new IntegrityMessage(
+                                "journal not found in abbreviation list",
+                                entry,
+                                StandardField.JOURNALTITLE)),
+                checkerb.check(entry));
     }
 
     @Test
     void journalDoesNotAcceptRandomInputInTitle() {
         entry.setField(StandardField.JOURNAL, "A journal");
-        assertEquals(List.of(new IntegrityMessage("journal not found in abbreviation list", entry, StandardField.JOURNAL)), checker.check(entry));
+        assertEquals(
+                List.of(
+                        new IntegrityMessage(
+                                "journal not found in abbreviation list",
+                                entry,
+                                StandardField.JOURNAL)),
+                checker.check(entry));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/LatexIntegrityCheckerTest.java b/src/test/java/org/jabref/logic/integrity/LatexIntegrityCheckerTest.java
index e6c1dcfec615..7a6da7d3527a 100644
--- a/src/test/java/org/jabref/logic/integrity/LatexIntegrityCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/LatexIntegrityCheckerTest.java
@@ -1,19 +1,19 @@
 package org.jabref.logic.integrity;
 
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UserSpecificCommentField;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+
 import uk.ac.ed.ph.snuggletex.definitions.CoreErrorCode;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
+import java.util.stream.Stream;
 
 class LatexIntegrityCheckerTest {
 
@@ -73,24 +73,43 @@ private static Stream<Arguments> provideAcceptedInputs() {
 
                 // Equations and alignment
                 // Currently Unsupported
-                // Arguments.of(StandardField.TITLE, "\\begin{align} x + y &= z \\\\ a &= b + c \\end{align}"),
-                // Arguments.of(StandardField.TITLE, "\\begin{align*} A &:= B \\\\ C &\\rightarrow D \\end{align*}"),
+                // Arguments.of(StandardField.TITLE, "\\begin{align} x + y &= z \\\\ a &= b + c
+                // \\end{align}"),
+                // Arguments.of(StandardField.TITLE, "\\begin{align*} A &:= B \\\\ C &\\rightarrow D
+                // \\end{align*}"),
                 // Arguments.of(StandardField.TITLE, "\\begin{equation} E = mc^2 \\end{equation}"),
-                // Arguments.of(StandardField.TITLE, "\\begin{align*} x + y &= z \\\\ a &= b + c \\\\ p &= \\frac{q}{r} \\end{align*}"),
-                Arguments.of(StandardField.TITLE, "\\begin{eqnarray} x + y &= z \\\\ a &= b + c \\\\ p &= \\frac{q}{r} \\end{eqnarray}"),
+                // Arguments.of(StandardField.TITLE, "\\begin{align*} x + y &= z \\\\ a &= b + c
+                // \\\\ p &= \\frac{q}{r} \\end{align*}"),
+                Arguments.of(
+                        StandardField.TITLE,
+                        "\\begin{eqnarray} x + y &= z \\\\ a &= b + c \\\\ p &= \\frac{q}{r} \\end{eqnarray}"),
 
                 // Equations and matrices
-                Arguments.of(StandardField.TITLE, "\\[ \\begin{pmatrix} a & b \\\\ c & d \\end{pmatrix} \\]"),
-                Arguments.of(StandardField.TITLE, "\\[ \\begin{bmatrix} x & y & z \\\\ u & v & w \\end{bmatrix} \\]"),
+                Arguments.of(
+                        StandardField.TITLE,
+                        "\\[ \\begin{pmatrix} a & b \\\\ c & d \\end{pmatrix} \\]"),
+                Arguments.of(
+                        StandardField.TITLE,
+                        "\\[ \\begin{bmatrix} x & y & z \\\\ u & v & w \\end{bmatrix} \\]"),
 
                 // Tables
-                Arguments.of(StandardField.TITLE, "\\begin{tabular}{|c|c|} \\hline 1 & 2 \\\\ 3 & 4 \\\\ \\hline \\end{tabular}"),
-                Arguments.of(StandardField.TITLE, "\\begin{tabular}{cc} A & B \\\\ C & D \\end{tabular}"),
-                Arguments.of(StandardField.TITLE, "\\begin{tabular}{|l|r|} \\hline Item & Quantity \\\\ \\hline Apple & 3 \\\\ Banana & 5 \\\\ \\hline \\end{tabular}"),
+                Arguments.of(
+                        StandardField.TITLE,
+                        "\\begin{tabular}{|c|c|} \\hline 1 & 2 \\\\ 3 & 4 \\\\ \\hline \\end{tabular}"),
+                Arguments.of(
+                        StandardField.TITLE,
+                        "\\begin{tabular}{cc} A & B \\\\ C & D \\end{tabular}"),
+                Arguments.of(
+                        StandardField.TITLE,
+                        "\\begin{tabular}{|l|r|} \\hline Item & Quantity \\\\ \\hline Apple & 3 \\\\ Banana & 5 \\\\ \\hline \\end{tabular}"),
 
                 // Lists and enumerations
-                Arguments.of(StandardField.TITLE, "\\begin{itemize} \\item Item 1 \\item Item 2 \\item Item 3 \\end{itemize}"),
-                Arguments.of(StandardField.TITLE, "\\begin{enumerate} \\item First \\item Second \\item Third \\end{enumerate}"),
+                Arguments.of(
+                        StandardField.TITLE,
+                        "\\begin{itemize} \\item Item 1 \\item Item 2 \\item Item 3 \\end{itemize}"),
+                Arguments.of(
+                        StandardField.TITLE,
+                        "\\begin{enumerate} \\item First \\item Second \\item Third \\end{enumerate}"),
 
                 // Line breaks and spacing
                 Arguments.of(StandardField.TITLE, "First Line \\\\ Second Line"),
@@ -99,14 +118,20 @@ private static Stream<Arguments> provideAcceptedInputs() {
                 // Arguments.of(StandardField.TITLE, "Some \\vspace{1cm} Space"),
 
                 // Multiple commands and environments
-                Arguments.of(StandardField.TITLE, "\\textbf{\\emph{Bold and Emphasized Text}} $5-3_k$"),
-                Arguments.of(StandardField.TITLE, "\\begin{itemize} \\item\\begin{quote} \\textbf{Quoted} \\emph{Text} \\end{quote} \\end{itemize}"),
+                Arguments.of(
+                        StandardField.TITLE, "\\textbf{\\emph{Bold and Emphasized Text}} $5-3_k$"),
+                Arguments.of(
+                        StandardField.TITLE,
+                        "\\begin{itemize} \\item\\begin{quote} \\textbf{Quoted} \\emph{Text} \\end{quote} \\end{itemize}"),
 
                 // More currently unsupported operations
 
                 // Figures and Graphics
-                // Arguments.of(StandardField.TITLE, } "\\includegraphics[width=0.5\\textwidth]{image.jpg}"),
-                // Arguments.of(StandardField.TITLE, "\\begin{figure} \\centering \\includegraphics[width=0.8\\textwidth]{plot.png} \\caption{Plot Caption} \\label{fig:plot} \\end{figure}"),
+                // Arguments.of(StandardField.TITLE, }
+                // "\\includegraphics[width=0.5\\textwidth]{image.jpg}"),
+                // Arguments.of(StandardField.TITLE, "\\begin{figure} \\centering
+                // \\includegraphics[width=0.8\\textwidth]{plot.png} \\caption{Plot Caption}
+                // \\label{fig:plot} \\end{figure}"),
 
                 // Citations and references
                 // Arguments.of(StandardField.TITLE, "\\cite{key}"),
@@ -122,25 +147,32 @@ private static Stream<Arguments> provideAcceptedInputs() {
 
                 // Some commands not supported by SnuggleTeX as default
                 // Source: https://github.com/JabRef/jabref/issues/8712#issuecomment-1730441206
-                Arguments.of(StandardField.ABSTRACT, "\\textless{}xml\\textgreater{} \\textbar something \textbackslash"),
+                Arguments.of(
+                        StandardField.ABSTRACT,
+                        "\\textless{}xml\\textgreater{} \\textbar something \textbackslash"),
 
-                // Mirrored from org.jabref.logic.integrity.AmpersandCheckerTest.provideAcceptedInputs
+                // Mirrored from
+                // org.jabref.logic.integrity.AmpersandCheckerTest.provideAcceptedInputs
                 Arguments.of(StandardField.TITLE, "No ampersand at all"),
                 Arguments.of(StandardField.FOREWORD, "Properly escaped \\&"),
                 Arguments.of(StandardField.AUTHOR, "\\& Multiple properly escaped \\&"),
                 Arguments.of(StandardField.BOOKTITLE, "\\\\\\& With multiple backslashes"),
-                Arguments.of(StandardField.COMMENT, "\\\\\\& With multiple backslashes multiple times \\\\\\\\\\&"),
+                Arguments.of(
+                        StandardField.COMMENT,
+                        "\\\\\\& With multiple backslashes multiple times \\\\\\\\\\&"),
                 Arguments.of(StandardField.NOTE, "In the \\& middle of \\\\\\& something"),
                 Arguments.of(StandardField.DOI, "10.1007/0-387-22874-8_7"),
-                Arguments.of(new UserSpecificCommentField("test"), "_something_ which is triggers the integrity check ^^^ $")
-        );
+                Arguments.of(
+                        new UserSpecificCommentField("test"),
+                        "_something_ which is triggers the integrity check ^^^ $"));
     }
 
     @ParameterizedTest
     @MethodSource("provideUnacceptedInputs")
     void rejectsDisallowedInputs(String expectedMessage, Field field, String value) {
         entry.setField(field, value);
-        assertEquals(List.of(new IntegrityMessage(expectedMessage, entry, field)), checker.check(entry));
+        assertEquals(
+                List.of(new IntegrityMessage(expectedMessage, entry, field)), checker.check(entry));
     }
 
     /**
@@ -151,53 +183,94 @@ void rejectsDisallowedInputs(String expectedMessage, Field field, String value)
     private static Stream<Arguments> provideUnacceptedInputs() {
         return Stream.of(
 
-                // ------------------------------------ LATEX PARSING/TOKENISATION ERRORS ------------------------------------
+                // ------------------------------------ LATEX PARSING/TOKENISATION ERRORS
+                // ------------------------------------
                 // TTEG00: Finished reading document before finding required terminator "{0}"
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEG00, "}"), StandardField.ABSTRACT, "Unbalanced braces {"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEG00, "}"),
+                        StandardField.ABSTRACT,
+                        "Unbalanced braces {"),
 
                 // TTEG01: Nothing following \
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEG01), StandardField.ABSTRACT, "\\"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEG01),
+                        StandardField.ABSTRACT,
+                        "\\"),
 
-                // TTEG02: Non-ASCII character {0} (Unicode U+{1}) at offset {2} in input document - replaced with ’x’
+                // TTEG02: Non-ASCII character {0} (Unicode U+{1}) at offset {2} in input document -
+                // replaced with ’x’
                 // todo find out how to trigger / activate - is this even implemented in snuggletex?
-                // Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEG02, "€", "20AC", "3"), StandardField.TITLE, "A title with € symbol"),
+                // Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEG02,
+                // "€", "20AC", "3"), StandardField.TITLE, "A title with € symbol"),
 
                 // TTEG03: Delimiter {0} closing Math mode followed no matching opener
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEG03, "\\]"), StandardField.TITLE, "1+1=2\\]"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEG03, "\\]"),
+                        StandardField.TITLE,
+                        "1+1=2\\]"),
 
-                // TTEG04: Argument placeholder tokens (e.g. #1) may only appear in command and environment definitions
+                // TTEG04: Argument placeholder tokens (e.g. #1) may only appear in command and
+                // environment definitions
                 // Excluded
                 // Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEG04), StandardField.FOREWORD, "Text with #1 placeholder"),
 
                 // TTEM00: Already in math mode - cannot use \( or \[
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEM00), StandardField.ABSTRACT, "Braces inside: $\\(1+1\\)=2$"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEM00),
+                        StandardField.ABSTRACT,
+                        "Braces inside: $\\(1+1\\)=2$"),
 
                 // TTEM01: $ was ended by $$
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEM01), StandardField.TITLE, "$1+1=2$$"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEM01),
+                        StandardField.TITLE,
+                        "$1+1=2$$"),
 
                 // TTEM02: Math mode opened by {0} but matching {1} was never found
                 // SKipped
 
-                // TTEM03: Math superscript (^) and subscript (_) characters are not allowed in text mode
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEM03), StandardField.SUBTITLE, "_ or ^ Outside Math-Environment"),
+                // TTEM03: Math superscript (^) and subscript (_) characters are not allowed in text
+                // mode
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEM03),
+                        StandardField.SUBTITLE,
+                        "_ or ^ Outside Math-Environment"),
 
                 // TTEM04: $ characters cannot be used inside math mode
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEM04), StandardField.TITLE, "\\$ inside math mode \\($1+1=2$\\)"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEM04),
+                        StandardField.TITLE,
+                        "\\$ inside math mode \\($1+1=2$\\)"),
 
                 // TTEV00: \verb or \verb* must be followed by a non-whitespace delimiter character
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEV00), StandardField.KEYWORDS, "\\verb "),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEV00),
+                        StandardField.KEYWORDS,
+                        "\\verb "),
 
                 // TTEV01: Line ended before the end delimiter of \verb or \verb* was found
                 // Skipped
 
                 // TTEC00: Undefined command \{0}
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEC00, "undefinedCommand"), StandardField.ABSTRACT, "\\undefinedCommand"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(
+                                CoreErrorCode.TTEC00, "undefinedCommand"),
+                        StandardField.ABSTRACT,
+                        "\\undefinedCommand"),
 
                 // TTEC01: Command \{0} cannot be used in {1} mode
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEC01, "par", "MATH"), StandardField.TITLE, "$\\par$"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(
+                                CoreErrorCode.TTEC01, "par", "MATH"),
+                        StandardField.TITLE,
+                        "$\\par$"),
 
                 // TTEC02: Command \{0} is missing required argument #{1}
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEC02, "textbf", "1"), StandardField.KEYWORDS, "\\textbf"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(
+                                CoreErrorCode.TTEC02, "textbf", "1"),
+                        StandardField.KEYWORDS,
+                        "\\textbf"),
 
                 // TTEC03: Could not find target for combining command \{0}
                 // Skipped
@@ -206,40 +279,81 @@ private static Stream<Arguments> provideUnacceptedInputs() {
                 // Skipped
 
                 // TTEE00: Found \end of environment {0} instead of {1}
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEE00, "align", "itemize"), StandardField.ABSTRACT, "\\begin{itemize} \\end{align}"),
-
-                // TTEE01: Expected to read valid environment name enclosed in braces without whitespace
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEE01), StandardField.TITLE, "\\begin{ align }"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(
+                                CoreErrorCode.TTEE00, "align", "itemize"),
+                        StandardField.ABSTRACT,
+                        "\\begin{itemize} \\end{align}"),
+
+                // TTEE01: Expected to read valid environment name enclosed in braces without
+                // whitespace
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEE01),
+                        StandardField.TITLE,
+                        "\\begin{ align }"),
 
                 // TTEE02: Undefined environment {0}
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEE02, "undefinedEnv"), StandardField.ABSTRACT, "\\begin{undefinedEnv}"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(
+                                CoreErrorCode.TTEE02, "undefinedEnv"),
+                        StandardField.ABSTRACT,
+                        "\\begin{undefinedEnv}"),
 
                 // TTEE03: Environment {0} cannot be used in {1} mode
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEE03, "itemize", "MATH"), StandardField.TITLE, "$\\begin{itemize}$"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(
+                                CoreErrorCode.TTEE03, "itemize", "MATH"),
+                        StandardField.TITLE,
+                        "$\\begin{itemize}$"),
 
                 // TTEE04: Environment {0} was still open at end of input document
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEE04, "itemize"), StandardField.ABSTRACT, "\\begin{itemize}"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(
+                                CoreErrorCode.TTEE04, "itemize"),
+                        StandardField.ABSTRACT,
+                        "\\begin{itemize}"),
 
                 // TTEE05: Unexpected \end - no environment is currently open
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEE05), StandardField.KEYWORDS, "\\end{itemize}"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEE05),
+                        StandardField.KEYWORDS,
+                        "\\end{itemize}"),
 
                 // TTEE06: Environment {0} is missing required argument #{1}
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEE06, "tabular", "1"), StandardField.TITLE, "\\begin{tabular}\\end{tabular}"),
-
-                // TTEU00: Expansion limit ({0}) for user-defined commands and environments has been exceeded. Possible recursion?
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(
+                                CoreErrorCode.TTEE06, "tabular", "1"),
+                        StandardField.TITLE,
+                        "\\begin{tabular}\\end{tabular}"),
+
+                // TTEU00: Expansion limit ({0}) for user-defined commands and environments has been
+                // exceeded. Possible recursion?
                 // Skipped
 
                 // TTEUC0: Input ended before name of new command was found
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC0), StandardField.TITLE, "\\newcommand{\\"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC0),
+                        StandardField.TITLE,
+                        "\\newcommand{\\"),
 
                 // TTEUC1: Name of new command must be preceded by \
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC1), StandardField.TITLE, "\\newcommand{MyCommand}"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC1),
+                        StandardField.TITLE,
+                        "\\newcommand{MyCommand}"),
 
                 // TTEUC2: Input ended before end of new command definition
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC2), StandardField.TITLE, "\\newcommand{\\MyCommand}{"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC2),
+                        StandardField.TITLE,
+                        "\\newcommand{\\MyCommand}{"),
 
                 // TTEUC3: No definition provided for new command {0}
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC3, "MyCommand"), StandardField.TITLE, "\\newcommand{\\MyCommand}"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(
+                                CoreErrorCode.TTEUC3, "MyCommand"),
+                        StandardField.TITLE,
+                        "\\newcommand{\\MyCommand}"),
 
                 // TTEUC4: Command \{0} has not already been defined so cannot be renewed
                 // Skipped
@@ -248,25 +362,52 @@ private static Stream<Arguments> provideUnacceptedInputs() {
                 // Skipped
 
                 // TTEUC6: No ’}’ found after new command name
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC6), StandardField.TITLE, "\\newcommand{\\MyCommand"),
-
-                // TTEUC7: Number of arguments specified in command or environment definition {0} must be an integer between 1 and 9 - not {1}
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC7, "MyCommand", "0"), StandardField.TITLE, "\\newcommand{\\MyCommand}[0]{Text}"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC6),
+                        StandardField.TITLE,
+                        "\\newcommand{\\MyCommand"),
+
+                // TTEUC7: Number of arguments specified in command or environment definition {0}
+                // must be an integer between 1 and 9 - not {1}
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(
+                                CoreErrorCode.TTEUC7, "MyCommand", "0"),
+                        StandardField.TITLE,
+                        "\\newcommand{\\MyCommand}[0]{Text}"),
 
                 // TTEUC8: Reserved command {0} cannot be redefined
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC8, "begin"), StandardField.TITLE, "\\renewcommand{\\begin}{}"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(
+                                CoreErrorCode.TTEUC8, "begin"),
+                        StandardField.TITLE,
+                        "\\renewcommand{\\begin}{}"),
 
                 // TTEUC9: Input ended before end of argument count specification
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC9), StandardField.TITLE, "\\newcommand{\\MyCommand}["),
-
-                // TTEUCA: Definition of command {0} refers to argument #{1} but only {2} have been declared
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUCA, "MyCommand", "2", "1"), StandardField.TITLE, "\\newcommand{\\MyCommand}[1]{#2}"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC9),
+                        StandardField.TITLE,
+                        "\\newcommand{\\MyCommand}["),
+
+                // TTEUCA: Definition of command {0} refers to argument #{1} but only {2} have been
+                // declared
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(
+                                CoreErrorCode.TTEUCA, "MyCommand", "2", "1"),
+                        StandardField.TITLE,
+                        "\\newcommand{\\MyCommand}[1]{#2}"),
 
                 // TTEUE0: Expected to read name of new environment enclosed in braces
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUE0), StandardField.TITLE, "\\newenvironment{}"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUE0),
+                        StandardField.TITLE,
+                        "\\newenvironment{}"),
 
                 // TTEUE1: No {0} definition provided for new environment {1}
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUE1, "begin", "MyEnvironment"), StandardField.TITLE, "\\newenvironment{MyEnvironment}"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(
+                                CoreErrorCode.TTEUE1, "begin", "MyEnvironment"),
+                        StandardField.TITLE,
+                        "\\newenvironment{MyEnvironment}"),
 
                 // TTEUE2: Environment {0} has not already been defined so cannot be renewed
                 // Skipped
@@ -274,36 +415,65 @@ private static Stream<Arguments> provideUnacceptedInputs() {
                 // TTEUE3: Environment {0} already exists - use \renewenvironment to redefine it
                 // Skipped
 
-                // TTEUE5: Definition of begin of environment {0} refers to argument #{1} but only {2} have been declared
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUE5, "MyEnvironment", "1", "0"), StandardField.TITLE, "\\newenvironment{MyEnvironment}{#1}{}"),
-
-                // TTEUE6: Definition of end of environment {0} refers to argument #{1} but arguments may not be used here
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUE6, "MyEnvironment", "2"), StandardField.TITLE, "\\newenvironment{MyEnvironment}[1]{#1}{#2}"),
-
-                // ------------------------------------ TOKEN FIX-UP ERRORS ------------------------------------
+                // TTEUE5: Definition of begin of environment {0} refers to argument #{1} but only
+                // {2} have been declared
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(
+                                CoreErrorCode.TTEUE5, "MyEnvironment", "1", "0"),
+                        StandardField.TITLE,
+                        "\\newenvironment{MyEnvironment}{#1}{}"),
+
+                // TTEUE6: Definition of end of environment {0} refers to argument #{1} but
+                // arguments may not be used here
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(
+                                CoreErrorCode.TTEUE6, "MyEnvironment", "2"),
+                        StandardField.TITLE,
+                        "\\newenvironment{MyEnvironment}[1]{#1}{#2}"),
+
+                // ------------------------------------ TOKEN FIX-UP ERRORS
+                // ------------------------------------
                 // TFEG00: Block token {0} cannot be used in LR mode
                 // Skipped
 
                 // TFEL00: Found content before first \item
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEL00), StandardField.TITLE, "\\begin{itemize}content before first \\item{}\\end{itemize}"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEL00),
+                        StandardField.TITLE,
+                        "\\begin{itemize}content before first \\item{}\\end{itemize}"),
 
                 // TFEM00: Ambiguous multiple use of \over at current level
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM00), StandardField.TITLE, "$1 \\over \\over 3$"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM00),
+                        StandardField.TITLE,
+                        "$1 \\over \\over 3$"),
 
                 // TFEM01: Trailing subscript/superscript token
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM01), StandardField.TITLE, "$x_$"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM01),
+                        StandardField.TITLE,
+                        "$x_$"),
 
                 // TFEM02: Double subscript/superscript token is ambiguous - use curly brackets
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM02), StandardField.TITLE, "$x_i_j$"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM02),
+                        StandardField.TITLE,
+                        "$x_i_j$"),
 
                 // TFEM03: \right had no preceding \left
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM03), StandardField.TITLE, "$\\right)$"),
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM03),
+                        StandardField.TITLE,
+                        "$\\right)$"),
 
                 // TFEM04: \left had no following \right
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM04), StandardField.TITLE, "$\\left($")
+                Arguments.of(
+                        LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM04),
+                        StandardField.TITLE,
+                        "$\\left($")
 
                 // TFETB0: \hline must be the only token in table row
                 // Skipped
-        );
+                );
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/MonthCheckerTest.java b/src/test/java/org/jabref/logic/integrity/MonthCheckerTest.java
index 4bc8f4fdad0c..bd197807ee5a 100644
--- a/src/test/java/org/jabref/logic/integrity/MonthCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/MonthCheckerTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Optional;
 
 class MonthCheckerTest {
 
diff --git a/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java b/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
index 46ade9e221e6..8e4bdd54108e 100644
--- a/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
 
 class NoBibTexFieldCheckerTest {
 
@@ -33,8 +32,7 @@ private static Stream<Field> nonBiblatexOnlyFields() {
                 StandardField.INSTITUTION,
                 StandardField.JOURNAL,
                 StandardField.KEYWORDS,
-                StandardField.REVIEW
-        );
+                StandardField.REVIEW);
     }
 
     @ParameterizedTest()
@@ -45,11 +43,7 @@ void nonBiblatexOnlyField(Field field) {
     }
 
     @ParameterizedTest(name = "field={0}")
-    @CsvSource({
-            "AFTERWORD",
-            "JOURNALTITLE",
-            "LOCATION"
-    })
+    @CsvSource({"AFTERWORD", "JOURNALTITLE", "LOCATION"})
     void biblatexOnlyField(StandardField field) {
         BibEntry entry = new BibEntry().withField(field, "test");
         IntegrityMessage message = new IntegrityMessage("biblatex field only", entry, field);
diff --git a/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java b/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java
index 37fcb177d43d..e81d032d5e73 100644
--- a/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Optional;
 
 class NoteCheckerTest {
 
diff --git a/src/test/java/org/jabref/logic/integrity/PagesCheckerBiblatexTest.java b/src/test/java/org/jabref/logic/integrity/PagesCheckerBiblatexTest.java
index 13ffba0fb58f..8bc03bd96ddb 100644
--- a/src/test/java/org/jabref/logic/integrity/PagesCheckerBiblatexTest.java
+++ b/src/test/java/org/jabref/logic/integrity/PagesCheckerBiblatexTest.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 public class PagesCheckerBiblatexTest {
 
@@ -25,7 +24,8 @@ void setUp() {
     }
 
     public static Stream<String> bibtexAccepts() {
-        return Stream.of("",
+        return Stream.of(
+                "",
                 // single dash
                 "1-2",
                 // double dash
@@ -37,8 +37,7 @@ public static Stream<String> bibtexAccepts() {
                 // bibTexAcceptsNoSimpleRangeOfNumbers
                 "43+",
                 // bibTexAcceptsMorePageNumbersWithRangeOfNumbers
-                "7+,41--43,73"
-                );
+                "7+,41--43,73");
     }
 
     @ParameterizedTest
@@ -54,8 +53,7 @@ public static Stream<String> bibtexRejects() {
                 // bibTexDoesNotAcceptMorePageNumbersWithoutComma
                 "1 2",
                 // bibTexDoesNotAcceptBrackets
-                "{1}-{2}"
-                );
+                "{1}-{2}");
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/integrity/PagesCheckerBibtexTest.java b/src/test/java/org/jabref/logic/integrity/PagesCheckerBibtexTest.java
index d9cdac14197e..f34d7bf09832 100644
--- a/src/test/java/org/jabref/logic/integrity/PagesCheckerBibtexTest.java
+++ b/src/test/java/org/jabref/logic/integrity/PagesCheckerBibtexTest.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 public class PagesCheckerBibtexTest {
 
@@ -25,7 +24,8 @@ void setUp() {
     }
 
     public static Stream<String> bibtexAccepts() {
-        return Stream.of("",
+        return Stream.of(
+                "",
                 // double dash
                 "1--2",
                 // one page number
@@ -35,8 +35,7 @@ public static Stream<String> bibtexAccepts() {
                 // bibTexAcceptsNoSimpleRangeOfNumbers
                 "43+",
                 // bibTexAcceptsMorePageNumbersWithRangeOfNumbers
-                "7+,41--43,73"
-                );
+                "7+,41--43,73");
     }
 
     @ParameterizedTest
@@ -54,8 +53,7 @@ public static Stream<String> bibtexRejects() {
                 // bibTexDoesNotAcceptMorePageNumbersWithoutComma
                 "1 2",
                 // bibTexDoesNotAcceptBrackets
-                "{1}-{2}"
-                );
+                "{1}-{2}");
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java b/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java
index bd357ed378d8..37ac555f08d9 100644
--- a/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 class PersonNamesCheckerTest {
 
@@ -37,24 +36,22 @@ void validNames(String name) {
 
     private static Stream<String> provideValidNames() {
         return Stream.of(
-                "Kolb, Stefan",                     // single [Name, Firstname]
-                "Kolb, Stefan and Harrer, Simon",   // multiple [Name, Firstname]
-                "Stefan Kolb",                      // single [Firstname Name]
-                "Stefan Kolb and Simon Harrer",     // multiple [Firstname Name]
-
-                "M. J. Gotay",                      // second name in front
-
-                "{JabRef}",                         // corporate name in brackets
-                "{JabRef} and Stefan Kolb",         // mixed corporate name with name
+                "Kolb, Stefan", // single [Name, Firstname]
+                "Kolb, Stefan and Harrer, Simon", // multiple [Name, Firstname]
+                "Stefan Kolb", // single [Firstname Name]
+                "Stefan Kolb and Simon Harrer", // multiple [Firstname Name]
+                "M. J. Gotay", // second name in front
+                "{JabRef}", // corporate name in brackets
+                "{JabRef} and Stefan Kolb", // mixed corporate name with name
                 "{JabRef} and Kolb, Stefan",
-
-                "hugo Para{\\~n}os"                 // tilde in name
-        );
+                "hugo Para{\\~n}os" // tilde in name
+                );
     }
 
     @Test
     void complainAboutPersonStringWithTwoManyCommas() {
-        assertEquals(Optional.of("Names are not in the standard BibTeX format."),
+        assertEquals(
+                Optional.of("Names are not in the standard BibTeX format."),
                 checker.checkValue("Test1, Test2, Test3, Test4, Test5, Test6"));
     }
 
@@ -71,10 +68,7 @@ void authorNameInIncorrectFormatsShouldComplain(String input) {
     }
 
     private static Stream<String> provideCorrectFormats() {
-        return Stream.of(
-                "",
-                "Knuth",
-                "Donald E. Knuth and Kurt Cobain and A. Einstein");
+        return Stream.of("", "Knuth", "Donald E. Knuth and Kurt Cobain and A. Einstein");
     }
 
     private static Stream<String> provideIncorrectFormats() {
diff --git a/src/test/java/org/jabref/logic/integrity/TitleCheckerTest.java b/src/test/java/org/jabref/logic/integrity/TitleCheckerTest.java
index 231507a133c0..f268b0809649 100644
--- a/src/test/java/org/jabref/logic/integrity/TitleCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/TitleCheckerTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 public class TitleCheckerTest {
     @Nested
@@ -43,31 +42,60 @@ void titleShouldRaiseWarning(String message, String title) {
 
         static Stream<Arguments> validTitle() {
             return Stream.of(
-                    Arguments.of("firstLetterAsOnlyCapitalLetterInSubTitle2 ", "This is a sub title 1: This is a sub title 2"),
-                    Arguments.of("noCapitalLetterInSubTitle2 ", "This is a sub title 1: this is a sub title 2"),
-                    Arguments.of("twoCapitalLettersInSubTitle2WithCurlyBrackets ", "This is a sub title 1: This is {A} sub title 2"),
-                    Arguments.of("middleLetterAsOnlyCapitalLetterInSubTitle2WithCurlyBrackets ", "This is a sub title 1: this is {A} sub title 2"),
-                    Arguments.of("firstLetterAsOnlyCapitalLetterInSubTitle2AfterContinuousDelimiters ", "This is a sub title 1...This is a sub title 2"),
-                    Arguments.of("firstLetterAsOnlyCapitalLetterInEverySubTitleWithContinuousDelimiters ", "This is; A sub title 1.... This is a sub title 2"),
-                    Arguments.of("firstLetterAsOnlyCapitalLetterInEverySubTitleWithRandomDelimiters ", "This!is!!A!Title??"),
-                    Arguments.of("bibTexAcceptsTitleWithOnlyFirstCapitalLetter ", "This is a title"),
+                    Arguments.of(
+                            "firstLetterAsOnlyCapitalLetterInSubTitle2 ",
+                            "This is a sub title 1: This is a sub title 2"),
+                    Arguments.of(
+                            "noCapitalLetterInSubTitle2 ",
+                            "This is a sub title 1: this is a sub title 2"),
+                    Arguments.of(
+                            "twoCapitalLettersInSubTitle2WithCurlyBrackets ",
+                            "This is a sub title 1: This is {A} sub title 2"),
+                    Arguments.of(
+                            "middleLetterAsOnlyCapitalLetterInSubTitle2WithCurlyBrackets ",
+                            "This is a sub title 1: this is {A} sub title 2"),
+                    Arguments.of(
+                            "firstLetterAsOnlyCapitalLetterInSubTitle2AfterContinuousDelimiters ",
+                            "This is a sub title 1...This is a sub title 2"),
+                    Arguments.of(
+                            "firstLetterAsOnlyCapitalLetterInEverySubTitleWithContinuousDelimiters ",
+                            "This is; A sub title 1.... This is a sub title 2"),
+                    Arguments.of(
+                            "firstLetterAsOnlyCapitalLetterInEverySubTitleWithRandomDelimiters ",
+                            "This!is!!A!Title??"),
+                    Arguments.of(
+                            "bibTexAcceptsTitleWithOnlyFirstCapitalLetter ", "This is a title"),
                     Arguments.of("bibTexRemovesCapitalLetterInsideTitle ", "This is a {T}itle"),
-                    Arguments.of("bibTexRemovesEverythingInBracketsAndAcceptsNoTitleInput ", "{This is a Title}"),
+                    Arguments.of(
+                            "bibTexRemovesEverythingInBracketsAndAcceptsNoTitleInput ",
+                            "{This is a Title}"),
                     Arguments.of("bibTexRemovesEverythingInBrackets ", "This is a {Title}"),
-                    Arguments.of("bibTexAcceptsTitleWithLowercaseFirstLetter ", "{C}urrent {C}hronicle"),
-                    Arguments.of("bibTexAcceptsOriginalAndTranslatedTitle ", "This is a title [This is translated title]")
-            );
+                    Arguments.of(
+                            "bibTexAcceptsTitleWithLowercaseFirstLetter ", "{C}urrent {C}hronicle"),
+                    Arguments.of(
+                            "bibTexAcceptsOriginalAndTranslatedTitle ",
+                            "This is a title [This is translated title]"));
         }
 
         static Stream<Arguments> invalidTitle() {
             return Stream.of(
-                    Arguments.of("twoCapitalLettersInSubTitle2 ", "This is a sub title 1: This is A sub title 2"),
-                    Arguments.of("middleLetterAsOnlyCapitalLetterInSubTitle2 ", "This is a sub title 1: this is A sub title 2"),
-                    Arguments.of("middleLetterAsOnlyCapitalLetterInSubTitle2AfterContinuousDelimiters ", "This is a sub title 1... this is a sub Title 2"),
-                    Arguments.of("moreThanOneCapitalLetterInSubTitleWithoutCurlyBrackets ", "This!is!!A!TitlE??"),
-                    Arguments.of("bibTexDoesNotAcceptCapitalLettersInsideTitle ", "This is a Title"),
-                    Arguments.of("bibTexDoesNotAcceptsLeadingTranslatedTitleWithOriginal ", "[This is translated title] This is a title")
-            );
+                    Arguments.of(
+                            "twoCapitalLettersInSubTitle2 ",
+                            "This is a sub title 1: This is A sub title 2"),
+                    Arguments.of(
+                            "middleLetterAsOnlyCapitalLetterInSubTitle2 ",
+                            "This is a sub title 1: this is A sub title 2"),
+                    Arguments.of(
+                            "middleLetterAsOnlyCapitalLetterInSubTitle2AfterContinuousDelimiters ",
+                            "This is a sub title 1... this is a sub Title 2"),
+                    Arguments.of(
+                            "moreThanOneCapitalLetterInSubTitleWithoutCurlyBrackets ",
+                            "This!is!!A!TitlE??"),
+                    Arguments.of(
+                            "bibTexDoesNotAcceptCapitalLettersInsideTitle ", "This is a Title"),
+                    Arguments.of(
+                            "bibTexDoesNotAcceptsLeadingTranslatedTitleWithOriginal ",
+                            "[This is translated title] This is a title"));
         }
     }
 
@@ -91,21 +119,41 @@ void titleShouldNotRaiseWarning(String message, String title) {
 
         static Stream<Arguments> validTitle() {
             return Stream.of(
-                    Arguments.of("bibLaTexAcceptsTitleWithOnlyFirstCapitalLetter", "This is a title"),
+                    Arguments.of(
+                            "bibLaTexAcceptsTitleWithOnlyFirstCapitalLetter", "This is a title"),
                     Arguments.of("bibLaTexAcceptsCapitalLettersInsideTitle", "This is a Title"),
                     Arguments.of("bibLaTexRemovesCapitalLetterInsideTitle", "This is a {T}itle"),
-                    Arguments.of("bibLaTexRemovesEverythingInBracketsAndAcceptsNoTitleInput", "{This is a Title}"),
+                    Arguments.of(
+                            "bibLaTexRemovesEverythingInBracketsAndAcceptsNoTitleInput",
+                            "{This is a Title}"),
                     Arguments.of("bibLaTexRemovesEverythingInBrackets", "This is a {Title}"),
-                    Arguments.of("bibLaTexAcceptsTitleWithLowercaseFirstLetter", "{C}urrent {C}hronicle"),
-                    Arguments.of("bibLaTexAcceptsSubTitlesWithOnlyFirstCapitalLetter", "This is a sub title 1: This is a sub title 2"),
-                    Arguments.of("bibLaTexAcceptsSubTitleWithLowercaseFirstLetter", "This is a sub title 1: this is a sub title 2"),
-                    Arguments.of("bibLaTexAcceptsCapitalLettersInsideSubTitle", "This is a sub title 1: This is A sub title 2"),
-                    Arguments.of("bibLaTexRemovesCapitalLetterInsideSubTitle", "This is a sub title 1: this is {A} sub title 2"),
-                    Arguments.of("bibLaTexSplitsSubTitlesBasedOnDots", "This is a sub title 1...This is a sub title 2"),
-                    Arguments.of("bibLaTexSplitsSubTitleBasedOnSpecialCharacters", "This is; A sub title 1.... This is a sub title 2"),
-                    Arguments.of("bibLaTexAcceptsCapitalLetterAfterSpecialCharacter", "This!is!!A!Title??"),
-                    Arguments.of("bibLaTexAcceptsCapitalLetterNotOnlyAfterSpecialCharacter", "This!is!!A!TitlE??")
-            );
+                    Arguments.of(
+                            "bibLaTexAcceptsTitleWithLowercaseFirstLetter",
+                            "{C}urrent {C}hronicle"),
+                    Arguments.of(
+                            "bibLaTexAcceptsSubTitlesWithOnlyFirstCapitalLetter",
+                            "This is a sub title 1: This is a sub title 2"),
+                    Arguments.of(
+                            "bibLaTexAcceptsSubTitleWithLowercaseFirstLetter",
+                            "This is a sub title 1: this is a sub title 2"),
+                    Arguments.of(
+                            "bibLaTexAcceptsCapitalLettersInsideSubTitle",
+                            "This is a sub title 1: This is A sub title 2"),
+                    Arguments.of(
+                            "bibLaTexRemovesCapitalLetterInsideSubTitle",
+                            "This is a sub title 1: this is {A} sub title 2"),
+                    Arguments.of(
+                            "bibLaTexSplitsSubTitlesBasedOnDots",
+                            "This is a sub title 1...This is a sub title 2"),
+                    Arguments.of(
+                            "bibLaTexSplitsSubTitleBasedOnSpecialCharacters",
+                            "This is; A sub title 1.... This is a sub title 2"),
+                    Arguments.of(
+                            "bibLaTexAcceptsCapitalLetterAfterSpecialCharacter",
+                            "This!is!!A!Title??"),
+                    Arguments.of(
+                            "bibLaTexAcceptsCapitalLetterNotOnlyAfterSpecialCharacter",
+                            "This!is!!A!TitlE??"));
         }
     }
 
diff --git a/src/test/java/org/jabref/logic/integrity/TypeCheckerTest.java b/src/test/java/org/jabref/logic/integrity/TypeCheckerTest.java
index f4b6cfaccfb2..01efee4be5a3 100644
--- a/src/test/java/org/jabref/logic/integrity/TypeCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/TypeCheckerTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.integrity;
 
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
+import java.util.List;
 
 class TypeCheckerTest {
 
@@ -27,6 +26,12 @@ void inProceedingsHasPagesNumbers() {
     void proceedingsDoesNotHavePageNumbers() {
         entry = new BibEntry(StandardEntryType.Proceedings);
         entry.setField(StandardField.PAGES, "11--15");
-        assertEquals(List.of(new IntegrityMessage("wrong entry type as proceedings has page numbers", entry, StandardField.PAGES)), checker.check(entry));
+        assertEquals(
+                List.of(
+                        new IntegrityMessage(
+                                "wrong entry type as proceedings has page numbers",
+                                entry,
+                                StandardField.PAGES)),
+                checker.check(entry));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java b/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java
index 42378717004f..1c5b627b9425 100644
--- a/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.integrity;
 
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.List;
 
 class UTF8CheckerTest {
 
@@ -45,7 +44,11 @@ void fieldDoesNotAcceptUmlauts() throws UnsupportedEncodingException {
         UTF8Checker checker = new UTF8Checker(Charset.forName("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));
+        assertEquals(
+                List.of(
+                        new IntegrityMessage(
+                                "Non-UTF-8 encoded field found", entry, StandardField.MONTH)),
+                checker.check(entry));
     }
 
     /**
@@ -58,7 +61,7 @@ void fieldDoesNotAcceptUmlauts() throws UnsupportedEncodingException {
     @Test
     void NonUTF8EncodingCheckerTest() throws UnsupportedEncodingException {
         String NonUTF8 = new String("你好，这条语句使用GBK字符集".getBytes(StandardCharsets.UTF_8), GBK);
-            assertFalse(UTF8Checker.UTF8EncodingChecker(NonUTF8.getBytes(GBK)));
+        assertFalse(UTF8Checker.UTF8EncodingChecker(NonUTF8.getBytes(GBK)));
     }
 
     /**
@@ -67,7 +70,9 @@ void NonUTF8EncodingCheckerTest() throws UnsupportedEncodingException {
      */
     @Test
     void UTF8EncodingCheckerTest() {
-        String UTF8Demo = new String("你好，这条语句使用GBK字符集".getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
-            assertTrue(UTF8Checker.UTF8EncodingChecker(UTF8Demo.getBytes(StandardCharsets.UTF_8)));
+        String UTF8Demo =
+                new String(
+                        "你好，这条语句使用GBK字符集".getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
+        assertTrue(UTF8Checker.UTF8EncodingChecker(UTF8Demo.getBytes(StandardCharsets.UTF_8)));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/UnicodeNormalFormCanonicalCompositionCheckTest.java b/src/test/java/org/jabref/logic/integrity/UnicodeNormalFormCanonicalCompositionCheckTest.java
index bb025f62ab87..c1a882caf483 100644
--- a/src/test/java/org/jabref/logic/integrity/UnicodeNormalFormCanonicalCompositionCheckTest.java
+++ b/src/test/java/org/jabref/logic/integrity/UnicodeNormalFormCanonicalCompositionCheckTest.java
@@ -1,44 +1,50 @@
 package org.jabref.logic.integrity;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
 
 class UnicodeNormalFormCanonicalCompositionCheckTest {
-    UnicodeNormalFormCanonicalCompositionCheck checker = new UnicodeNormalFormCanonicalCompositionCheck();
+    UnicodeNormalFormCanonicalCompositionCheck checker =
+            new UnicodeNormalFormCanonicalCompositionCheck();
 
     @Test
     void asciiStringShouldReturnEmptyList() {
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.TITLE, "Some Title")
-                .withField(StandardField.AUTHOR, "John Doe");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(StandardField.TITLE, "Some Title")
+                        .withField(StandardField.AUTHOR, "John Doe");
         assertEquals(List.of(), checker.check(entry));
     }
 
     @Test
     void normalizedStringShouldReturnEmptyList() {
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.TITLE, "Caf́é")
-                .withField(StandardField.AUTHOR, "John Doe");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(StandardField.TITLE, "Caf́é")
+                        .withField(StandardField.AUTHOR, "John Doe");
         assertEquals(List.of(), checker.check(entry));
     }
 
     @Test
     void nonNormalizedLetterAWithAcuteShouldReturnIntegrityMessage() {
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.TITLE, "\u0041\u0301");
-        assertEquals(List.of(new IntegrityMessage("Value is not in Unicode's Normalization Form \"Canonical Composition\" (NFC) format", entry, StandardField.TITLE)), checker.check(entry));
+        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "\u0041\u0301");
+        assertEquals(
+                List.of(
+                        new IntegrityMessage(
+                                "Value is not in Unicode's Normalization Form \"Canonical Composition\" (NFC) format",
+                                entry,
+                                StandardField.TITLE)),
+                checker.check(entry));
     }
 
     @Test
     void checkWithNormalizedLetterAWithAcuteShouldReturnIntegrityMessage() {
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.TITLE, "\u00C1");
+        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "\u00C1");
         assertEquals(List.of(), checker.check(entry));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/UrlCheckerTest.java b/src/test/java/org/jabref/logic/integrity/UrlCheckerTest.java
index 238d9e3bba4f..2b1dbe7e47b1 100644
--- a/src/test/java/org/jabref/logic/integrity/UrlCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/UrlCheckerTest.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Optional;
 
 class UrlCheckerTest {
 
@@ -23,7 +23,10 @@ void urlFieldAcceptsFullLocalPath() {
 
     @Test
     void urlFieldAcceptsFullPathHttpAddress() {
-        assertEquals(Optional.empty(), checker.checkValue("http://scikit-learn.org/stable/modules/ensemble.html#random-forests"));
+        assertEquals(
+                Optional.empty(),
+                checker.checkValue(
+                        "http://scikit-learn.org/stable/modules/ensemble.html#random-forests"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/integrity/ValidCitationKeyCheckerTest.java b/src/test/java/org/jabref/logic/integrity/ValidCitationKeyCheckerTest.java
index 5543a092c40c..3d1b390c0bdc 100644
--- a/src/test/java/org/jabref/logic/integrity/ValidCitationKeyCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/ValidCitationKeyCheckerTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.l10n.Localization;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 class ValidCitationKeyCheckerTest {
 
@@ -25,7 +24,7 @@ private static Stream<Arguments> provideCitationKeys() {
         return Stream.of(
                 Arguments.of(Optional.of(Localization.lang("empty citation key")), ""),
                 Arguments.of(Optional.empty(), "Seaver2019"),
-                Arguments.of(Optional.of(Localization.lang("Invalid citation key")), "Seaver_2019}")
-        );
+                Arguments.of(
+                        Optional.of(Localization.lang("Invalid citation key")), "Seaver_2019}"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/YearCheckerTest.java b/src/test/java/org/jabref/logic/integrity/YearCheckerTest.java
index 3d99a3c66dc7..95459e9c129a 100644
--- a/src/test/java/org/jabref/logic/integrity/YearCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/YearCheckerTest.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.Optional;
 
 class YearCheckerTest {
 
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java
index a8a883dd42bf..151c0ce2d32f 100644
--- a/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java
@@ -1,16 +1,16 @@
 package org.jabref.logic.journals;
 
-import java.io.BufferedWriter;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Set;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.BufferedWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Set;
 
 class AbbreviationParserTest {
 
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationTest.java
index 1cd3bb5b4e11..229b5d4dc505 100644
--- a/src/test/java/org/jabref/logic/journals/AbbreviationTest.java
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.journals;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
+import org.junit.jupiter.api.Test;
+
 class AbbreviationTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java
index bf207b25da75..8fd15ad65fa4 100644
--- a/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java
@@ -1,15 +1,15 @@
 package org.jabref.logic.journals;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
 
 @Execution(ExecutionMode.CONCURRENT)
 class AbbreviationWriterTest {
@@ -18,19 +18,16 @@ class AbbreviationWriterTest {
     void shortestUniqueAbbreviationWrittenIfItDiffers(@TempDir Path tempDir) throws Exception {
         Abbreviation abbreviation = new Abbreviation("Full", "Abbr", "A");
         Path csvFile = tempDir.resolve("test.csv");
-        AbbreviationWriter.writeOrCreate(
-                csvFile,
-                List.of(abbreviation));
+        AbbreviationWriter.writeOrCreate(csvFile, List.of(abbreviation));
         assertEquals(List.of("Full,Abbr,A"), Files.readAllLines(csvFile));
     }
 
     @Test
-    void doNotWriteShortestUniqueAbbreviationWrittenIfItDiffers(@TempDir Path tempDir) throws Exception {
+    void doNotWriteShortestUniqueAbbreviationWrittenIfItDiffers(@TempDir Path tempDir)
+            throws Exception {
         Abbreviation abbreviation = new Abbreviation("Full", "Abbr");
         Path csvFile = tempDir.resolve("test.csv");
-        AbbreviationWriter.writeOrCreate(
-                csvFile,
-                List.of(abbreviation));
+        AbbreviationWriter.writeOrCreate(csvFile, List.of(abbreviation));
         assertEquals(List.of("Full,Abbr"), Files.readAllLines(csvFile));
     }
 }
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java
index 075148c1f53c..0b83056f6db6 100644
--- a/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.journals;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class AbbreviationsTest {
 
     private JournalAbbreviationRepository repository;
diff --git a/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java b/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
index 66614ce76f54..4786d6f8ec79 100644
--- a/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
+++ b/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
@@ -1,8 +1,8 @@
 package org.jabref.logic.journals;
 
-import java.util.Set;
-
-import javax.swing.undo.CompoundEdit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.architecture.AllowedToUseSwing;
 import org.jabref.gui.journals.AbbreviationType;
@@ -13,15 +13,15 @@
 import org.jabref.model.entry.field.AMSField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Set;
+
+import javax.swing.undo.CompoundEdit;
 
-@AllowedToUseSwing("UndoableUnabbreviator and UndoableAbbreviator requires Swing Compound Edit in order test the abbreviation and unabbreviation of journal titles")
+@AllowedToUseSwing(
+        "UndoableUnabbreviator and UndoableAbbreviator requires Swing Compound Edit in order test the abbreviation and unabbreviation of journal titles")
 class JournalAbbreviationRepositoryTest {
 
     private JournalAbbreviationRepository repository;
@@ -51,7 +51,8 @@ void oneElement() {
         assertEquals("L N", repository.getDotless("Long Name").orElse("WRONG"));
         assertEquals("UNKNOWN", repository.getDotless("?").orElse("UNKNOWN"));
 
-        assertEquals("L. N.", repository.getShortestUniqueAbbreviation("Long Name").orElse("WRONG"));
+        assertEquals(
+                "L. N.", repository.getShortestUniqueAbbreviation("Long Name").orElse("WRONG"));
         assertEquals("UNKNOWN", repository.getShortestUniqueAbbreviation("?").orElse("UNKNOWN"));
 
         assertEquals("L. N.", repository.getNextAbbreviation("Long Name").orElse("WRONG"));
@@ -156,36 +157,61 @@ void duplicateKeysWithShortestUniqueAbbreviation() {
 
     @Test
     void getFromFullName() {
-        assertEquals(new Abbreviation("American Journal of Public Health", "Am. J. Public Health"), repository.get("American Journal of Public Health").get());
+        assertEquals(
+                new Abbreviation("American Journal of Public Health", "Am. J. Public Health"),
+                repository.get("American Journal of Public Health").get());
     }
 
     @Test
     void getFromAbbreviatedName() {
-        assertEquals(new Abbreviation("American Journal of Public Health", "Am. J. Public Health"), repository.get("Am. J. Public Health").get());
+        assertEquals(
+                new Abbreviation("American Journal of Public Health", "Am. J. Public Health"),
+                repository.get("Am. J. Public Health").get());
     }
 
     @Test
     void abbreviationsWithEscapedAmpersand() {
-        assertEquals(new Abbreviation("ACS Applied Materials & Interfaces", "ACS Appl. Mater. Interfaces"), repository.get("ACS Applied Materials & Interfaces").get());
-        assertEquals(new Abbreviation("ACS Applied Materials & Interfaces", "ACS Appl. Mater. Interfaces"), repository.get("ACS Applied Materials \\& Interfaces").get());
-        assertEquals(new Abbreviation("Antioxidants & Redox Signaling", "Antioxid. Redox Sign."), repository.get("Antioxidants & Redox Signaling").get());
-        assertEquals(new Abbreviation("Antioxidants & Redox Signaling", "Antioxid. Redox Sign."), repository.get("Antioxidants \\& Redox Signaling").get());
+        assertEquals(
+                new Abbreviation(
+                        "ACS Applied Materials & Interfaces", "ACS Appl. Mater. Interfaces"),
+                repository.get("ACS Applied Materials & Interfaces").get());
+        assertEquals(
+                new Abbreviation(
+                        "ACS Applied Materials & Interfaces", "ACS Appl. Mater. Interfaces"),
+                repository.get("ACS Applied Materials \\& Interfaces").get());
+        assertEquals(
+                new Abbreviation("Antioxidants & Redox Signaling", "Antioxid. Redox Sign."),
+                repository.get("Antioxidants & Redox Signaling").get());
+        assertEquals(
+                new Abbreviation("Antioxidants & Redox Signaling", "Antioxid. Redox Sign."),
+                repository.get("Antioxidants \\& Redox Signaling").get());
 
         repository.addCustomAbbreviation(new Abbreviation("Long & Name", "L. N.", "LN"));
-        assertEquals(new Abbreviation("Long & Name", "L. N.", "LN"), repository.get("Long & Name").get());
-        assertEquals(new Abbreviation("Long & Name", "L. N.", "LN"), repository.get("Long \\& Name").get());
+        assertEquals(
+                new Abbreviation("Long & Name", "L. N.", "LN"),
+                repository.get("Long & Name").get());
+        assertEquals(
+                new Abbreviation("Long & Name", "L. N.", "LN"),
+                repository.get("Long \\& Name").get());
     }
 
     @Test
     void journalAbbreviationWithEscapedAmpersand() {
-        UndoableAbbreviator undoableAbbreviator = new UndoableAbbreviator(repository, AbbreviationType.DEFAULT, false);
+        UndoableAbbreviator undoableAbbreviator =
+                new UndoableAbbreviator(repository, AbbreviationType.DEFAULT, false);
 
         BibEntry entryWithEscapedAmpersandInJournal = new BibEntry(StandardEntryType.Article);
-        entryWithEscapedAmpersandInJournal.setField(StandardField.JOURNAL, "ACS Applied Materials \\& Interfaces");
-
-        undoableAbbreviator.abbreviate(bibDatabase, entryWithEscapedAmpersandInJournal, StandardField.JOURNAL, new CompoundEdit());
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces");
+        entryWithEscapedAmpersandInJournal.setField(
+                StandardField.JOURNAL, "ACS Applied Materials \\& Interfaces");
+
+        undoableAbbreviator.abbreviate(
+                bibDatabase,
+                entryWithEscapedAmpersandInJournal,
+                StandardField.JOURNAL,
+                new CompoundEdit());
+        BibEntry expectedAbbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces");
         assertEquals(expectedAbbreviatedJournalEntry, entryWithEscapedAmpersandInJournal);
     }
 
@@ -194,82 +220,110 @@ void journalUnabbreviate() {
         BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article);
         abbreviatedJournalEntry.setField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces");
 
-        undoableUnabbreviator.unabbreviate(bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
+        undoableUnabbreviator.unabbreviate(
+                bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
+        BibEntry expectedAbbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
 
     @Test
     void journalAbbreviateWithoutEscapedAmpersand() {
-        UndoableAbbreviator undoableAbbreviator = new UndoableAbbreviator(repository, AbbreviationType.DEFAULT, false);
-
-        BibEntry entryWithoutEscapedAmpersandInJournal = new BibEntry(StandardEntryType.Article)
-            .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
-
-        undoableAbbreviator.abbreviate(bibDatabase, entryWithoutEscapedAmpersandInJournal, StandardField.JOURNAL, new CompoundEdit());
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces");
+        UndoableAbbreviator undoableAbbreviator =
+                new UndoableAbbreviator(repository, AbbreviationType.DEFAULT, false);
+
+        BibEntry entryWithoutEscapedAmpersandInJournal =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
+
+        undoableAbbreviator.abbreviate(
+                bibDatabase,
+                entryWithoutEscapedAmpersandInJournal,
+                StandardField.JOURNAL,
+                new CompoundEdit());
+        BibEntry expectedAbbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces");
         assertEquals(expectedAbbreviatedJournalEntry, entryWithoutEscapedAmpersandInJournal);
     }
 
     @Test
     void journalAbbreviateWithEmptyFJournal() {
-        UndoableAbbreviator undoableAbbreviator = new UndoableAbbreviator(repository, AbbreviationType.DEFAULT, true);
-
-        BibEntry entryWithoutEscapedAmpersandInJournal = new BibEntry(StandardEntryType.Article)
-            .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces")
-            .withField(AMSField.FJOURNAL, "&nbsp;");
-
-        undoableAbbreviator.abbreviate(bibDatabase, entryWithoutEscapedAmpersandInJournal, StandardField.JOURNAL, new CompoundEdit());
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces")
-                .withField(AMSField.FJOURNAL, "ACS Applied Materials & Interfaces");
+        UndoableAbbreviator undoableAbbreviator =
+                new UndoableAbbreviator(repository, AbbreviationType.DEFAULT, true);
+
+        BibEntry entryWithoutEscapedAmpersandInJournal =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces")
+                        .withField(AMSField.FJOURNAL, "&nbsp;");
+
+        undoableAbbreviator.abbreviate(
+                bibDatabase,
+                entryWithoutEscapedAmpersandInJournal,
+                StandardField.JOURNAL,
+                new CompoundEdit());
+        BibEntry expectedAbbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces")
+                        .withField(AMSField.FJOURNAL, "ACS Applied Materials & Interfaces");
         assertEquals(expectedAbbreviatedJournalEntry, entryWithoutEscapedAmpersandInJournal);
     }
 
     @Test
     void unabbreviateWithJournalExistsAndFJournalNot() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-            .withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces");
-
-        undoableUnabbreviator.unabbreviate(bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
+        BibEntry abbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces");
+
+        undoableUnabbreviator.unabbreviate(
+                bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
+        BibEntry expectedAbbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
 
     @Test
     void unabbreviateWithJournalExistsAndFJournalExists() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-            .withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces")
-            .withField(AMSField.FJOURNAL, "ACS Applied Materials & Interfaces");
-
-        undoableUnabbreviator.unabbreviate(bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
+        BibEntry abbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces")
+                        .withField(AMSField.FJOURNAL, "ACS Applied Materials & Interfaces");
+
+        undoableUnabbreviator.unabbreviate(
+                bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
+        BibEntry expectedAbbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
 
     @Test
     void journalDotlessAbbreviation() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.JOURNAL, "ACS Appl Mater Interfaces");
-
-        undoableUnabbreviator.unabbreviate(bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
+        BibEntry abbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "ACS Appl Mater Interfaces");
+
+        undoableUnabbreviator.unabbreviate(
+                bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
+        BibEntry expectedAbbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
 
     @Test
     void journalDotlessAbbreviationWithCurlyBraces() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.JOURNAL, "{ACS Appl Mater Interfaces}");
-
-        undoableUnabbreviator.unabbreviate(bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
+        BibEntry abbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "{ACS Appl Mater Interfaces}");
+
+        undoableUnabbreviator.unabbreviate(
+                bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
+        BibEntry expectedAbbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
 
@@ -278,13 +332,16 @@ void journalDotlessAbbreviationWithCurlyBraces() {
      */
     @Test
     void titleEmbeddedWithCurlyBracesHavingNoChangesKeepsBraces() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.InCollection)
-                .withField(StandardField.JOURNAL, "{The Visualization Handbook}");
+        BibEntry abbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.InCollection)
+                        .withField(StandardField.JOURNAL, "{The Visualization Handbook}");
 
-        undoableUnabbreviator.unabbreviate(bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
+        undoableUnabbreviator.unabbreviate(
+                bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
 
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.InCollection)
-                .withField(StandardField.JOURNAL, "{The Visualization Handbook}");
+        BibEntry expectedAbbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.InCollection)
+                        .withField(StandardField.JOURNAL, "{The Visualization Handbook}");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
 
@@ -293,25 +350,35 @@ void titleEmbeddedWithCurlyBracesHavingNoChangesKeepsBraces() {
      */
     @Test
     void titleWithNestedCurlyBracesHavingNoChangesKeepsBraces() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.InProceedings)
-                .withField(StandardField.BOOKTITLE, "2015 {IEEE} International Conference on Digital Signal Processing, {DSP} 2015, Singapore, July 21-24, 2015");
-
-        undoableUnabbreviator.unabbreviate(bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
-
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.InProceedings)
-                .withField(StandardField.BOOKTITLE, "2015 {IEEE} International Conference on Digital Signal Processing, {DSP} 2015, Singapore, July 21-24, 2015");
+        BibEntry abbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withField(
+                                StandardField.BOOKTITLE,
+                                "2015 {IEEE} International Conference on Digital Signal Processing, {DSP} 2015, Singapore, July 21-24, 2015");
+
+        undoableUnabbreviator.unabbreviate(
+                bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
+
+        BibEntry expectedAbbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withField(
+                                StandardField.BOOKTITLE,
+                                "2015 {IEEE} International Conference on Digital Signal Processing, {DSP} 2015, Singapore, July 21-24, 2015");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
 
     @Test
     void dotlessForPhysRevB() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.JOURNAL, "Phys Rev B");
+        BibEntry abbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "Phys Rev B");
 
-        undoableUnabbreviator.unabbreviate(bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
+        undoableUnabbreviator.unabbreviate(
+                bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
 
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.JOURNAL, "Physical Review B");
+        BibEntry expectedAbbreviatedJournalEntry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.JOURNAL, "Physical Review B");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
 }
diff --git a/src/test/java/org/jabref/logic/journals/JournalInformationFetcherTest.java b/src/test/java/org/jabref/logic/journals/JournalInformationFetcherTest.java
index b874538e186b..540b08e94df7 100644
--- a/src/test/java/org/jabref/logic/journals/JournalInformationFetcherTest.java
+++ b/src/test/java/org/jabref/logic/journals/JournalInformationFetcherTest.java
@@ -1,45 +1,236 @@
 package org.jabref.logic.journals;
 
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import javafx.util.Pair;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.fetcher.JournalInformationFetcher;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.List;
+import java.util.Optional;
 
 @FetcherTest
 class JournalInformationFetcherTest {
 
     private final JournalInformationFetcher fetcher = new JournalInformationFetcher();
 
-    private final JournalInformation journalInformation = new JournalInformation(
-            "Annual Review of Biochemistry",
-            "Annual Reviews Inc.",
-            "",
-            "",
-            "Biochemistry,  Genetics and Molecular Biology",
-            "United States",
-            "Biochemistry (Q1)",
-            "16801",
-            "316",
-            "15454509,  00664154",
-            List.of(new Pair<>(1999, 50.518), new Pair<>(2000, 39.127), new Pair<>(2001, 39.946), new Pair<>(2002, 35.423), new Pair<>(2003, 35.186), new Pair<>(2004, 34.766), new Pair<>(2005, 32.241), new Pair<>(2006, 35.708), new Pair<>(2007, 34.376), new Pair<>(2008, 35.294), new Pair<>(2009, 31.033), new Pair<>(2010, 30.879), new Pair<>(2011, 30.916), new Pair<>(2012, 27.081), new Pair<>(2013, 27.872), new Pair<>(2014, 23.931), new Pair<>(2015, 24.589), new Pair<>(2016, 20.325), new Pair<>(2017, 18.513), new Pair<>(2018, 17.5), new Pair<>(2019, 17.387), new Pair<>(2020, 16.921), new Pair<>(2021, 13.085), new Pair<>(2022, 11.154)),
-            List.of(),
-            List.of(new Pair<>(1999, 30.0), new Pair<>(2000, 31.0), new Pair<>(2001, 23.0), new Pair<>(2002, 27.0), new Pair<>(2003, 24.0), new Pair<>(2004, 33.0), new Pair<>(2005, 28.0), new Pair<>(2006, 30.0), new Pair<>(2007, 33.0), new Pair<>(2008, 31.0), new Pair<>(2009, 35.0), new Pair<>(2010, 28.0), new Pair<>(2011, 42.0), new Pair<>(2012, 32.0), new Pair<>(2013, 28.0), new Pair<>(2014, 31.0), new Pair<>(2015, 35.0), new Pair<>(2016, 29.0), new Pair<>(2017, 35.0), new Pair<>(2018, 40.0), new Pair<>(2019, 30.0), new Pair<>(2020, 32.0), new Pair<>(2021, 32.0), new Pair<>(2022, 29.0)),
-            List.of(new Pair<>(1999, 79.0), new Pair<>(2000, 84.0), new Pair<>(2001, 88.0), new Pair<>(2002, 84.0), new Pair<>(2003, 81.0), new Pair<>(2004, 74.0), new Pair<>(2005, 84.0), new Pair<>(2006, 85.0), new Pair<>(2007, 91.0), new Pair<>(2008, 91.0), new Pair<>(2009, 94.0), new Pair<>(2010, 99.0), new Pair<>(2011, 94.0), new Pair<>(2012, 105.0), new Pair<>(2013, 102.0), new Pair<>(2014, 102.0), new Pair<>(2015, 91.0), new Pair<>(2016, 94.0), new Pair<>(2017, 95.0), new Pair<>(2018, 99.0), new Pair<>(2019, 104.0), new Pair<>(2020, 105.0), new Pair<>(2021, 102.0), new Pair<>(2022, 94.0)),
-            List.of(new Pair<>(1999, 79.0), new Pair<>(2000, 84.0), new Pair<>(2001, 88.0), new Pair<>(2002, 84.0), new Pair<>(2003, 81.0), new Pair<>(2004, 74.0), new Pair<>(2005, 84.0), new Pair<>(2006, 85.0), new Pair<>(2007, 91.0), new Pair<>(2008, 91.0), new Pair<>(2009, 94.0), new Pair<>(2010, 99.0), new Pair<>(2011, 94.0), new Pair<>(2012, 105.0), new Pair<>(2013, 102.0), new Pair<>(2014, 102.0), new Pair<>(2015, 91.0), new Pair<>(2016, 94.0), new Pair<>(2017, 95.0), new Pair<>(2018, 99.0), new Pair<>(2019, 104.0), new Pair<>(2020, 105.0), new Pair<>(2021, 102.0), new Pair<>(2022, 94.0)),
-            List.of(new Pair<>(1999, 3477.0), new Pair<>(2000, 3423.0), new Pair<>(2001, 4143.0), new Pair<>(2002, 3586.0), new Pair<>(2003, 3266.0), new Pair<>(2004, 3004.0), new Pair<>(2005, 3064.0), new Pair<>(2006, 3422.0), new Pair<>(2007, 3287.0), new Pair<>(2008, 3194.0), new Pair<>(2009, 3193.0), new Pair<>(2010, 3410.0), new Pair<>(2011, 3445.0), new Pair<>(2012, 3617.0), new Pair<>(2013, 3523.0), new Pair<>(2014, 3000.0), new Pair<>(2015, 2634.0), new Pair<>(2016, 2279.0), new Pair<>(2017, 2218.0), new Pair<>(2018, 2655.0), new Pair<>(2019, 2902.0), new Pair<>(2020, 3350.0), new Pair<>(2021, 2788.0), new Pair<>(2022, 2389.0)),
-            List.of(new Pair<>(1999, 36.15), new Pair<>(2000, 43.37), new Pair<>(2001, 32.46), new Pair<>(2002, 37.22), new Pair<>(2003, 39.46), new Pair<>(2004, 33.18), new Pair<>(2005, 34.46), new Pair<>(2006, 39.18), new Pair<>(2007, 33.69), new Pair<>(2008, 31.49), new Pair<>(2009, 32.16), new Pair<>(2010, 31.52), new Pair<>(2011, 36.89), new Pair<>(2012, 30.5), new Pair<>(2013, 29.01), new Pair<>(2014, 32.67), new Pair<>(2015, 23.68), new Pair<>(2016, 21.65), new Pair<>(2017, 22.08), new Pair<>(2018, 28.06), new Pair<>(2019, 27.41), new Pair<>(2020, 22.46), new Pair<>(2021, 26.55), new Pair<>(2022, 17.13)),
-            List.of(new Pair<>(1999, 5913.0), new Pair<>(2000, 5859.0), new Pair<>(2001, 4150.0), new Pair<>(2002, 4856.0), new Pair<>(2003, 4453.0), new Pair<>(2004, 5355.0), new Pair<>(2005, 4201.0), new Pair<>(2006, 4354.0), new Pair<>(2007, 4786.0), new Pair<>(2008, 4666.0), new Pair<>(2009, 5344.0), new Pair<>(2010, 4477.0), new Pair<>(2011, 6209.0), new Pair<>(2012, 4863.0), new Pair<>(2013, 4697.0), new Pair<>(2014, 5207.0), new Pair<>(2015, 5186.0), new Pair<>(2016, 4508.0), new Pair<>(2017, 5103.0), new Pair<>(2018, 5630.0), new Pair<>(2019, 4749.0), new Pair<>(2020, 4637.0), new Pair<>(2021, 4872.0), new Pair<>(2022, 4437.0)),
-            List.of(new Pair<>(1999, 197.1), new Pair<>(2000, 189.0), new Pair<>(2001, 180.43), new Pair<>(2002, 179.85), new Pair<>(2003, 185.54), new Pair<>(2004, 162.27), new Pair<>(2005, 150.04), new Pair<>(2006, 145.13), new Pair<>(2007, 145.03), new Pair<>(2008, 150.52), new Pair<>(2009, 152.69), new Pair<>(2010, 159.89), new Pair<>(2011, 147.83), new Pair<>(2012, 151.97), new Pair<>(2013, 167.75), new Pair<>(2014, 167.97), new Pair<>(2015, 148.17), new Pair<>(2016, 155.45), new Pair<>(2017, 145.8), new Pair<>(2018, 140.75), new Pair<>(2019, 158.3), new Pair<>(2020, 144.91), new Pair<>(2021, 152.25), new Pair<>(2022, 153.0))
-    );
+    private final JournalInformation journalInformation =
+            new JournalInformation(
+                    "Annual Review of Biochemistry",
+                    "Annual Reviews Inc.",
+                    "",
+                    "",
+                    "Biochemistry,  Genetics and Molecular Biology",
+                    "United States",
+                    "Biochemistry (Q1)",
+                    "16801",
+                    "316",
+                    "15454509,  00664154",
+                    List.of(
+                            new Pair<>(1999, 50.518),
+                            new Pair<>(2000, 39.127),
+                            new Pair<>(2001, 39.946),
+                            new Pair<>(2002, 35.423),
+                            new Pair<>(2003, 35.186),
+                            new Pair<>(2004, 34.766),
+                            new Pair<>(2005, 32.241),
+                            new Pair<>(2006, 35.708),
+                            new Pair<>(2007, 34.376),
+                            new Pair<>(2008, 35.294),
+                            new Pair<>(2009, 31.033),
+                            new Pair<>(2010, 30.879),
+                            new Pair<>(2011, 30.916),
+                            new Pair<>(2012, 27.081),
+                            new Pair<>(2013, 27.872),
+                            new Pair<>(2014, 23.931),
+                            new Pair<>(2015, 24.589),
+                            new Pair<>(2016, 20.325),
+                            new Pair<>(2017, 18.513),
+                            new Pair<>(2018, 17.5),
+                            new Pair<>(2019, 17.387),
+                            new Pair<>(2020, 16.921),
+                            new Pair<>(2021, 13.085),
+                            new Pair<>(2022, 11.154)),
+                    List.of(),
+                    List.of(
+                            new Pair<>(1999, 30.0),
+                            new Pair<>(2000, 31.0),
+                            new Pair<>(2001, 23.0),
+                            new Pair<>(2002, 27.0),
+                            new Pair<>(2003, 24.0),
+                            new Pair<>(2004, 33.0),
+                            new Pair<>(2005, 28.0),
+                            new Pair<>(2006, 30.0),
+                            new Pair<>(2007, 33.0),
+                            new Pair<>(2008, 31.0),
+                            new Pair<>(2009, 35.0),
+                            new Pair<>(2010, 28.0),
+                            new Pair<>(2011, 42.0),
+                            new Pair<>(2012, 32.0),
+                            new Pair<>(2013, 28.0),
+                            new Pair<>(2014, 31.0),
+                            new Pair<>(2015, 35.0),
+                            new Pair<>(2016, 29.0),
+                            new Pair<>(2017, 35.0),
+                            new Pair<>(2018, 40.0),
+                            new Pair<>(2019, 30.0),
+                            new Pair<>(2020, 32.0),
+                            new Pair<>(2021, 32.0),
+                            new Pair<>(2022, 29.0)),
+                    List.of(
+                            new Pair<>(1999, 79.0),
+                            new Pair<>(2000, 84.0),
+                            new Pair<>(2001, 88.0),
+                            new Pair<>(2002, 84.0),
+                            new Pair<>(2003, 81.0),
+                            new Pair<>(2004, 74.0),
+                            new Pair<>(2005, 84.0),
+                            new Pair<>(2006, 85.0),
+                            new Pair<>(2007, 91.0),
+                            new Pair<>(2008, 91.0),
+                            new Pair<>(2009, 94.0),
+                            new Pair<>(2010, 99.0),
+                            new Pair<>(2011, 94.0),
+                            new Pair<>(2012, 105.0),
+                            new Pair<>(2013, 102.0),
+                            new Pair<>(2014, 102.0),
+                            new Pair<>(2015, 91.0),
+                            new Pair<>(2016, 94.0),
+                            new Pair<>(2017, 95.0),
+                            new Pair<>(2018, 99.0),
+                            new Pair<>(2019, 104.0),
+                            new Pair<>(2020, 105.0),
+                            new Pair<>(2021, 102.0),
+                            new Pair<>(2022, 94.0)),
+                    List.of(
+                            new Pair<>(1999, 79.0),
+                            new Pair<>(2000, 84.0),
+                            new Pair<>(2001, 88.0),
+                            new Pair<>(2002, 84.0),
+                            new Pair<>(2003, 81.0),
+                            new Pair<>(2004, 74.0),
+                            new Pair<>(2005, 84.0),
+                            new Pair<>(2006, 85.0),
+                            new Pair<>(2007, 91.0),
+                            new Pair<>(2008, 91.0),
+                            new Pair<>(2009, 94.0),
+                            new Pair<>(2010, 99.0),
+                            new Pair<>(2011, 94.0),
+                            new Pair<>(2012, 105.0),
+                            new Pair<>(2013, 102.0),
+                            new Pair<>(2014, 102.0),
+                            new Pair<>(2015, 91.0),
+                            new Pair<>(2016, 94.0),
+                            new Pair<>(2017, 95.0),
+                            new Pair<>(2018, 99.0),
+                            new Pair<>(2019, 104.0),
+                            new Pair<>(2020, 105.0),
+                            new Pair<>(2021, 102.0),
+                            new Pair<>(2022, 94.0)),
+                    List.of(
+                            new Pair<>(1999, 3477.0),
+                            new Pair<>(2000, 3423.0),
+                            new Pair<>(2001, 4143.0),
+                            new Pair<>(2002, 3586.0),
+                            new Pair<>(2003, 3266.0),
+                            new Pair<>(2004, 3004.0),
+                            new Pair<>(2005, 3064.0),
+                            new Pair<>(2006, 3422.0),
+                            new Pair<>(2007, 3287.0),
+                            new Pair<>(2008, 3194.0),
+                            new Pair<>(2009, 3193.0),
+                            new Pair<>(2010, 3410.0),
+                            new Pair<>(2011, 3445.0),
+                            new Pair<>(2012, 3617.0),
+                            new Pair<>(2013, 3523.0),
+                            new Pair<>(2014, 3000.0),
+                            new Pair<>(2015, 2634.0),
+                            new Pair<>(2016, 2279.0),
+                            new Pair<>(2017, 2218.0),
+                            new Pair<>(2018, 2655.0),
+                            new Pair<>(2019, 2902.0),
+                            new Pair<>(2020, 3350.0),
+                            new Pair<>(2021, 2788.0),
+                            new Pair<>(2022, 2389.0)),
+                    List.of(
+                            new Pair<>(1999, 36.15),
+                            new Pair<>(2000, 43.37),
+                            new Pair<>(2001, 32.46),
+                            new Pair<>(2002, 37.22),
+                            new Pair<>(2003, 39.46),
+                            new Pair<>(2004, 33.18),
+                            new Pair<>(2005, 34.46),
+                            new Pair<>(2006, 39.18),
+                            new Pair<>(2007, 33.69),
+                            new Pair<>(2008, 31.49),
+                            new Pair<>(2009, 32.16),
+                            new Pair<>(2010, 31.52),
+                            new Pair<>(2011, 36.89),
+                            new Pair<>(2012, 30.5),
+                            new Pair<>(2013, 29.01),
+                            new Pair<>(2014, 32.67),
+                            new Pair<>(2015, 23.68),
+                            new Pair<>(2016, 21.65),
+                            new Pair<>(2017, 22.08),
+                            new Pair<>(2018, 28.06),
+                            new Pair<>(2019, 27.41),
+                            new Pair<>(2020, 22.46),
+                            new Pair<>(2021, 26.55),
+                            new Pair<>(2022, 17.13)),
+                    List.of(
+                            new Pair<>(1999, 5913.0),
+                            new Pair<>(2000, 5859.0),
+                            new Pair<>(2001, 4150.0),
+                            new Pair<>(2002, 4856.0),
+                            new Pair<>(2003, 4453.0),
+                            new Pair<>(2004, 5355.0),
+                            new Pair<>(2005, 4201.0),
+                            new Pair<>(2006, 4354.0),
+                            new Pair<>(2007, 4786.0),
+                            new Pair<>(2008, 4666.0),
+                            new Pair<>(2009, 5344.0),
+                            new Pair<>(2010, 4477.0),
+                            new Pair<>(2011, 6209.0),
+                            new Pair<>(2012, 4863.0),
+                            new Pair<>(2013, 4697.0),
+                            new Pair<>(2014, 5207.0),
+                            new Pair<>(2015, 5186.0),
+                            new Pair<>(2016, 4508.0),
+                            new Pair<>(2017, 5103.0),
+                            new Pair<>(2018, 5630.0),
+                            new Pair<>(2019, 4749.0),
+                            new Pair<>(2020, 4637.0),
+                            new Pair<>(2021, 4872.0),
+                            new Pair<>(2022, 4437.0)),
+                    List.of(
+                            new Pair<>(1999, 197.1),
+                            new Pair<>(2000, 189.0),
+                            new Pair<>(2001, 180.43),
+                            new Pair<>(2002, 179.85),
+                            new Pair<>(2003, 185.54),
+                            new Pair<>(2004, 162.27),
+                            new Pair<>(2005, 150.04),
+                            new Pair<>(2006, 145.13),
+                            new Pair<>(2007, 145.03),
+                            new Pair<>(2008, 150.52),
+                            new Pair<>(2009, 152.69),
+                            new Pair<>(2010, 159.89),
+                            new Pair<>(2011, 147.83),
+                            new Pair<>(2012, 151.97),
+                            new Pair<>(2013, 167.75),
+                            new Pair<>(2014, 167.97),
+                            new Pair<>(2015, 148.17),
+                            new Pair<>(2016, 155.45),
+                            new Pair<>(2017, 145.8),
+                            new Pair<>(2018, 140.75),
+                            new Pair<>(2019, 158.3),
+                            new Pair<>(2020, 144.91),
+                            new Pair<>(2021, 152.25),
+                            new Pair<>(2022, 153.0)));
 
     @Test
     void getsName() {
@@ -48,32 +239,41 @@ void getsName() {
 
     @Test
     void getsJournalInfoValidISSN() throws FetcherException {
-        assertEquals(Optional.of(journalInformation), fetcher.getJournalInformation("1545-4509", ""));
+        assertEquals(
+                Optional.of(journalInformation), fetcher.getJournalInformation("1545-4509", ""));
     }
 
     @Test
     void getsJournalInfoUsingName() throws FetcherException {
-        assertEquals(Optional.of(journalInformation), fetcher.getJournalInformation("", "Annual Review of Biochemistry"));
+        assertEquals(
+                Optional.of(journalInformation),
+                fetcher.getJournalInformation("", "Annual Review of Biochemistry"));
     }
 
     @Test
     void sameEntryReturnedFromISSNOrName() throws FetcherException {
-        assertEquals(fetcher.getJournalInformation("1545-4509", ""), fetcher.getJournalInformation("", "Annual Review of Biochemistry"));
+        assertEquals(
+                fetcher.getJournalInformation("1545-4509", ""),
+                fetcher.getJournalInformation("", "Annual Review of Biochemistry"));
     }
 
     @Test
     void getsJournalInfoValidISSNWithoutHyphen() throws FetcherException {
-        assertEquals(Optional.of(journalInformation), fetcher.getJournalInformation("15454509", ""));
+        assertEquals(
+                Optional.of(journalInformation), fetcher.getJournalInformation("15454509", ""));
     }
 
     @Test
     void getsJournalInfoNonTrimmedISSN() throws FetcherException {
-        assertEquals(Optional.of(journalInformation), fetcher.getJournalInformation(" 1545-4509   ", ""));
+        assertEquals(
+                Optional.of(journalInformation),
+                fetcher.getJournalInformation(" 1545-4509   ", ""));
     }
 
     @Test
     void getJournalInfoExtraSpaceISSN() {
-        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("1545 - 4509", ""));
+        assertThrows(
+                FetcherException.class, () -> fetcher.getJournalInformation("1545 - 4509", ""));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/l10n/EncodingsTest.java b/src/test/java/org/jabref/logic/l10n/EncodingsTest.java
index f377ec42ba4b..a3ec87a88b78 100644
--- a/src/test/java/org/jabref/logic/l10n/EncodingsTest.java
+++ b/src/test/java/org/jabref/logic/l10n/EncodingsTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.l10n;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import org.junit.jupiter.api.Test;
+
 class EncodingsTest {
     @Test
     void charsetsShouldNotBeNull() {
diff --git a/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParser.java b/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParser.java
index 034b0697e154..06c10b00e948 100644
--- a/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParser.java
+++ b/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParser.java
@@ -9,15 +9,32 @@ class JavaLocalizationEntryParser {
 
     private static final String INFINITE_WHITESPACE = "\\s*";
     private static final String DOT = "\\.";
-    private static final Pattern LOCALIZATION_START_PATTERN = Pattern.compile("Localization" + INFINITE_WHITESPACE + DOT + INFINITE_WHITESPACE + "lang" + INFINITE_WHITESPACE + "\\(");
-
-    private static final Pattern LOCALIZATION_MENU_START_PATTERN = Pattern.compile("Localization" + INFINITE_WHITESPACE + DOT + INFINITE_WHITESPACE + "menuTitle" + INFINITE_WHITESPACE + "\\(");
+    private static final Pattern LOCALIZATION_START_PATTERN =
+            Pattern.compile(
+                    "Localization"
+                            + INFINITE_WHITESPACE
+                            + DOT
+                            + INFINITE_WHITESPACE
+                            + "lang"
+                            + INFINITE_WHITESPACE
+                            + "\\(");
+
+    private static final Pattern LOCALIZATION_MENU_START_PATTERN =
+            Pattern.compile(
+                    "Localization"
+                            + INFINITE_WHITESPACE
+                            + DOT
+                            + INFINITE_WHITESPACE
+                            + "menuTitle"
+                            + INFINITE_WHITESPACE
+                            + "\\(");
     private static final Pattern ESCAPED_QUOTATION_SYMBOL = Pattern.compile("\\\\\"");
 
     private static final String QUOTATION_PLACEHOLDER = "QUOTATIONPLACEHOLDER";
     private static final Pattern QUOTATION_SYMBOL_PATTERN = Pattern.compile(QUOTATION_PLACEHOLDER);
 
-    public static List<String> getLanguageKeysInString(String content, LocalizationBundleForTest type) {
+    public static List<String> getLanguageKeysInString(
+            String content, LocalizationBundleForTest type) {
         List<String> parameters = getLocalizationParameter(content, type);
 
         List<String> result = new ArrayList<>();
@@ -26,16 +43,24 @@ public static List<String> getLanguageKeysInString(String content, LocalizationB
             String languageKey = getContentWithinQuotes(param);
             if (languageKey.contains("\\\n") || languageKey.contains("\\\\n")) {
                 // see also https://stackoverflow.com/a/10285687/873282
-                // '\n' (newline character) in the language key is stored as text "\n" in the .properties file. This is OK.
-                throw new RuntimeException("\"" + languageKey + "\" contains an escaped new line character. The newline character has to be written with a single backslash, not with a double one: \\n is correct, \\\\n is wrong.");
+                // '\n' (newline character) in the language key is stored as text "\n" in the
+                // .properties file. This is OK.
+                throw new RuntimeException(
+                        "\""
+                                + languageKey
+                                + "\" contains an escaped new line character. The newline character has to be written with a single backslash, not with a double one: \\n is correct, \\\\n is wrong.");
             }
 
             // Java escape chars which are not used in property file keys
             // The call to `getPropertiesKey` escapes them
-            String languagePropertyKey = LocalizationKey.fromEscapedJavaString(languageKey).getKey();
+            String languagePropertyKey =
+                    LocalizationKey.fromEscapedJavaString(languageKey).getKey();
 
             if (languagePropertyKey.endsWith(" ")) {
-                throw new RuntimeException("\"" + languageKey + "\" ends with a space. As this is a localization key, this is illegal!");
+                throw new RuntimeException(
+                        "\""
+                                + languageKey
+                                + "\" ends with a space. As this is a localization key, this is illegal!");
             }
 
             if (!languagePropertyKey.trim().isEmpty()) {
@@ -48,7 +73,8 @@ public static List<String> getLanguageKeysInString(String content, LocalizationB
 
     private static String getContentWithinQuotes(String param) {
         // protect \" in string
-        String contentWithProtectedEscapedQuote = ESCAPED_QUOTATION_SYMBOL.matcher(param).replaceAll(QUOTATION_PLACEHOLDER);
+        String contentWithProtectedEscapedQuote =
+                ESCAPED_QUOTATION_SYMBOL.matcher(param).replaceAll(QUOTATION_PLACEHOLDER);
 
         // extract text between "..."
         StringBuilder stringBuilder = new StringBuilder();
@@ -66,12 +92,14 @@ private static String getContentWithinQuotes(String param) {
         }
 
         // re-introduce \" (escaped quotes) into string
-        String languageKey = QUOTATION_SYMBOL_PATTERN.matcher(stringBuilder.toString()).replaceAll("\\\"");
+        String languageKey =
+                QUOTATION_SYMBOL_PATTERN.matcher(stringBuilder.toString()).replaceAll("\\\"");
 
         return languageKey;
     }
 
-    public static List<String> getLocalizationParameter(String content, LocalizationBundleForTest type) {
+    public static List<String> getLocalizationParameter(
+            String content, LocalizationBundleForTest type) {
         List<String> result = new ArrayList<>();
 
         Matcher matcher;
diff --git a/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParserTest.java b/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParserTest.java
index a22895705aa7..5cd668ab9546 100644
--- a/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParserTest.java
+++ b/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParserTest.java
@@ -1,23 +1,26 @@
 package org.jabref.logic.l10n;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
 
 public class JavaLocalizationEntryParserTest {
     public static Stream<Arguments> singleLineChecks() {
         return Stream.of(
                 Arguments.of("Localization.lang(\"one per line\")", "one per line"),
 
-                // '\c' is an escaped character, thus "\cite" is wrong as lookup text. It has to be "\\cite" in the .properties file
-                Arguments.of("Localization.lang(\"Copy \\\\cite{citation key}\")", "Copy \\\\cite{citation key}"),
+                // '\c' is an escaped character, thus "\cite" is wrong as lookup text. It has to be
+                // "\\cite" in the .properties file
+                Arguments.of(
+                        "Localization.lang(\"Copy \\\\cite{citation key}\")",
+                        "Copy \\\\cite{citation key}"),
 
                 // " is kept unescaped
                 Arguments.of("Localization.lang(\"\\\"Hey\\\"\")", "\"Hey\""),
@@ -25,27 +28,34 @@ public static Stream<Arguments> singleLineChecks() {
                 // \n is a "real" newline character in the simulated read read Java source code
                 Arguments.of("Localization.lang(\"multi \" + \n\"line\")", "multi line"),
                 Arguments.of("Localization.lang(\n            \"A string\")", "A string"),
-
-                Arguments.of("Localization.lang(\"one per line with var\", var)", "one per line with var"),
+                Arguments.of(
+                        "Localization.lang(\"one per line with var\", var)",
+                        "one per line with var"),
                 Arguments.of("Localization.lang(\"Search %0\", \"Springer\")", "Search %0"),
-                Arguments.of("Localization.lang(\"Reset preferences (key1,key2,... or 'all')\")", "Reset preferences (key1,key2,... or 'all')"),
-                Arguments.of("Localization.lang(\"Multiple entries selected. Do you want to change the type of all these to '%0'?\")",
+                Arguments.of(
+                        "Localization.lang(\"Reset preferences (key1,key2,... or 'all')\")",
+                        "Reset preferences (key1,key2,... or 'all')"),
+                Arguments.of(
+                        "Localization.lang(\"Multiple entries selected. Do you want to change the type of all these to '%0'?\")",
                         "Multiple entries selected. Do you want to change the type of all these to '%0'?"),
-                Arguments.of("Localization.lang(\"Run fetcher, e.g. \\\"--fetch=Medline:cancer\\\"\");",
+                Arguments.of(
+                        "Localization.lang(\"Run fetcher, e.g. \\\"--fetch=Medline:cancer\\\"\");",
                         "Run fetcher, e.g. \"--fetch=Medline:cancer\""),
 
                 // \n is allowed. See // see also https://stackoverflow.com/a/10285687/873282
                 // It appears as "\n" literally in the source code
                 // It appears as "\n" as key of the localization, too
                 // To mirror that, we have to write \\n here
-                Arguments.of("Localization.lang(\"First line\\nSecond line\")", "First line\\nSecond line")
-        );
+                Arguments.of(
+                        "Localization.lang(\"First line\\nSecond line\")",
+                        "First line\\nSecond line"));
     }
 
     public static Stream<Arguments> multiLineChecks() {
         return Stream.of(
-                Arguments.of("Localization.lang(\"two per line\") Localization.lang(\"two per line\")", Arrays.asList("two per line", "two per line"))
-        );
+                Arguments.of(
+                        "Localization.lang(\"two per line\") Localization.lang(\"two per line\")",
+                        Arrays.asList("two per line", "two per line")));
     }
 
     public static Stream<Arguments> singleLineParameterChecks() {
@@ -53,16 +63,16 @@ public static Stream<Arguments> singleLineParameterChecks() {
                 Arguments.of("Localization.lang(\"one per line\")", "\"one per line\""),
                 Arguments.of("Localization.lang(\"one per line\" + var)", "\"one per line\" + var"),
                 Arguments.of("Localization.lang(var + \"one per line\")", "var + \"one per line\""),
-                Arguments.of("Localization.lang(\"Search %0\", \"Springer\")", "\"Search %0\", \"Springer\"")
-        );
+                Arguments.of(
+                        "Localization.lang(\"Search %0\", \"Springer\")",
+                        "\"Search %0\", \"Springer\""));
     }
 
     public static Stream<String> causesRuntimeExceptions() {
         return Stream.of(
                 "Localization.lang(\"Ends with a space \")",
                 // "\\n" in the *.java source file
-                "Localization.lang(\"Escaped newline\\\\nthere\")"
-        );
+                "Localization.lang(\"Escaped newline\\\\nthere\")");
     }
 
     @ParameterizedTest
@@ -74,20 +84,28 @@ void localizationKeyParsing(String code, String expectedLanguageKeys) {
     @ParameterizedTest
     @MethodSource("multiLineChecks")
     void localizationKeyParsing(String code, List<String> expectedLanguageKeys) {
-        List<String> languageKeysInString = JavaLocalizationEntryParser.getLanguageKeysInString(code, LocalizationBundleForTest.LANG);
+        List<String> languageKeysInString =
+                JavaLocalizationEntryParser.getLanguageKeysInString(
+                        code, LocalizationBundleForTest.LANG);
         assertEquals(expectedLanguageKeys, languageKeysInString);
     }
 
     @ParameterizedTest
     @MethodSource("singleLineParameterChecks")
     void localizationParameterParsing(String code, String expectedParameter) {
-        List<String> languageKeysInString = JavaLocalizationEntryParser.getLocalizationParameter(code, LocalizationBundleForTest.LANG);
+        List<String> languageKeysInString =
+                JavaLocalizationEntryParser.getLocalizationParameter(
+                        code, LocalizationBundleForTest.LANG);
         assertEquals(List.of(expectedParameter), languageKeysInString);
     }
 
     @ParameterizedTest
     @MethodSource("causesRuntimeExceptions")
     void throwsRuntimeException(String code) {
-        assertThrows(RuntimeException.class, () -> JavaLocalizationEntryParser.getLanguageKeysInString(code, LocalizationBundleForTest.LANG));
+        assertThrows(
+                RuntimeException.class,
+                () ->
+                        JavaLocalizationEntryParser.getLanguageKeysInString(
+                                code, LocalizationBundleForTest.LANG));
     }
 }
diff --git a/src/test/java/org/jabref/logic/l10n/LanguageTest.java b/src/test/java/org/jabref/logic/l10n/LanguageTest.java
index c645611973d8..22b1dae2fbdb 100644
--- a/src/test/java/org/jabref/logic/l10n/LanguageTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LanguageTest.java
@@ -1,24 +1,27 @@
 package org.jabref.logic.l10n;
 
-import java.util.Locale;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.Locale;
+import java.util.Optional;
 
 class LanguageTest {
 
     @Test
     void convertKnownLanguageOnly() {
-        assertEquals(Optional.of(Locale.of("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(Locale.of("pt", "BR")), Language.convertToSupportedLocale(Language.BRAZILIAN_PORTUGUESE));
+        assertEquals(
+                Optional.of(Locale.of("pt", "BR")),
+                Language.convertToSupportedLocale(Language.BRAZILIAN_PORTUGUESE));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationBundleForTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationBundleForTest.java
index 77b55b211e22..93df052f6792 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationBundleForTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationBundleForTest.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.l10n;
 
 enum LocalizationBundleForTest {
-    LANG, MENU
+    LANG,
+    MENU
 }
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
index e88a90f5c5c9..b0a6da79598d 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
@@ -1,5 +1,15 @@
 package org.jabref.logic.l10n;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.testfx.framework.junit5.ApplicationExtension;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -21,16 +31,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.testfx.framework.junit5.ApplicationExtension;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 // Need to run on JavaFX thread since we are parsing FXML files
 @ExtendWith(ApplicationExtension.class)
 class LocalizationConsistencyTest {
@@ -41,19 +41,25 @@ void allFilesMustBeInLanguages() throws IOException {
         // e.g., "<bundle>_en.properties", where <bundle> is [JabRef, Menu]
         Pattern propertiesFile = Pattern.compile("%s_.{2,}.properties".formatted(bundle));
         Set<String> localizationFiles = new HashSet<>();
-        try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Path.of("src/main/resources/l10n"))) {
+        try (DirectoryStream<Path> directoryStream =
+                Files.newDirectoryStream(Path.of("src/main/resources/l10n"))) {
             for (Path fullPath : directoryStream) {
                 String fileName = fullPath.getFileName().toString();
                 if (propertiesFile.matcher(fileName).matches()) {
-                    localizationFiles.add(fileName.substring(bundle.length() + 1, fileName.length() - ".properties".length()));
+                    localizationFiles.add(
+                            fileName.substring(
+                                    bundle.length() + 1,
+                                    fileName.length() - ".properties".length()));
                 }
             }
         }
 
-        Set<String> knownLanguages = Stream.of(Language.values())
-                                           .map(Language::getId)
-                                           .collect(Collectors.toSet());
-        assertEquals(knownLanguages, localizationFiles, "There are some localization files that are not present in org.jabref.logic.l10n.Language or vice versa!");
+        Set<String> knownLanguages =
+                Stream.of(Language.values()).map(Language::getId).collect(Collectors.toSet());
+        assertEquals(
+                knownLanguages,
+                localizationFiles,
+                "There are some localization files that are not present in org.jabref.logic.l10n.Language or vice versa!");
     }
 
     @Test
@@ -64,7 +70,8 @@ void ensureNoDuplicates() {
 
             // read in
             DuplicationDetectionProperties properties = new DuplicationDetectionProperties();
-            try (InputStream is = LocalizationConsistencyTest.class.getResourceAsStream(propertyFilePath)) {
+            try (InputStream is =
+                    LocalizationConsistencyTest.class.getResourceAsStream(propertyFilePath)) {
                 assert is != null;
                 try (InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
                     properties.load(reader);
@@ -75,84 +82,115 @@ void ensureNoDuplicates() {
 
             List<String> duplicates = properties.getDuplicates();
 
-            assertEquals(Collections.emptyList(), duplicates, "Duplicate keys inside bundle " + bundle + "_" + lang.getId());
+            assertEquals(
+                    Collections.emptyList(),
+                    duplicates,
+                    "Duplicate keys inside bundle " + bundle + "_" + lang.getId());
         }
     }
 
     @Test
     void keyValueShouldBeEqualForEnglishPropertiesMessages() {
-        Properties englishKeys = LocalizationParser.getProperties("/l10n/%s_%s.properties".formatted("JabRef", "en"));
+        Properties englishKeys =
+                LocalizationParser.getProperties(
+                        "/l10n/%s_%s.properties".formatted("JabRef", "en"));
         for (Map.Entry<Object, Object> entry : englishKeys.entrySet()) {
-            String expectedKeyEqualsKey = "%s=%s".formatted(entry.getKey(), entry.getKey().toString().replace("\n", "\\n"));
-            String actualKeyEqualsValue = "%s=%s".formatted(entry.getKey(), entry.getValue().toString().replace("\n", "\\n"));
+            String expectedKeyEqualsKey =
+                    "%s=%s"
+                            .formatted(
+                                    entry.getKey(), entry.getKey().toString().replace("\n", "\\n"));
+            String actualKeyEqualsValue =
+                    "%s=%s"
+                            .formatted(
+                                    entry.getKey(),
+                                    entry.getValue().toString().replace("\n", "\\n"));
             assertEquals(expectedKeyEqualsKey, actualKeyEqualsValue);
         }
     }
 
     @Test
     void languageKeysShouldNotContainUnderscoresForSpaces() throws IOException {
-        final List<LocalizationEntry> quotedEntries = LocalizationParser
-                .findLocalizationParametersStringsInJavaFiles(LocalizationBundleForTest.LANG)
-                .stream()
-                .filter(key -> key.getKey().contains("\\_"))
-                .collect(Collectors.toList());
-        assertEquals(Collections.emptyList(), quotedEntries,
-                "Language keys must not use underscores for spaces! Use \"This is a message\" instead of \"This_is_a_message\".\n" +
-                        "Please correct the following entries:\n" +
-                        quotedEntries
-                                .stream()
+        final List<LocalizationEntry> quotedEntries =
+                LocalizationParser.findLocalizationParametersStringsInJavaFiles(
+                                LocalizationBundleForTest.LANG)
+                        .stream()
+                        .filter(key -> key.getKey().contains("\\_"))
+                        .collect(Collectors.toList());
+        assertEquals(
+                Collections.emptyList(),
+                quotedEntries,
+                "Language keys must not use underscores for spaces! Use \"This is a message\" instead of \"This_is_a_message\".\n"
+                        + "Please correct the following entries:\n"
+                        + quotedEntries.stream()
                                 .map(key -> "\n%s (%s)\n".formatted(key.getKey(), key.getPath()))
                                 .toList());
     }
 
     @Test
     void languageKeysShouldNotContainHtmlBrAndHtmlP() throws IOException {
-        final List<LocalizationEntry> entriesWithHtml = LocalizationParser
-                .findLocalizationParametersStringsInJavaFiles(LocalizationBundleForTest.LANG)
-                .stream()
-                .filter(key -> key.getKey().contains("<br>") || key.getKey().contains("<p>"))
-                .collect(Collectors.toList());
-        assertEquals(Collections.emptyList(), entriesWithHtml,
-                "Language keys must not contain HTML <br> or <p>. Use \\n for a line break.\n" +
-                        "Please correct the following entries:\n" +
-                        entriesWithHtml
-                                .stream()
+        final List<LocalizationEntry> entriesWithHtml =
+                LocalizationParser.findLocalizationParametersStringsInJavaFiles(
+                                LocalizationBundleForTest.LANG)
+                        .stream()
+                        .filter(
+                                key ->
+                                        key.getKey().contains("<br>")
+                                                || key.getKey().contains("<p>"))
+                        .collect(Collectors.toList());
+        assertEquals(
+                Collections.emptyList(),
+                entriesWithHtml,
+                "Language keys must not contain HTML <br> or <p>. Use \\n for a line break.\n"
+                        + "Please correct the following entries:\n"
+                        + entriesWithHtml.stream()
                                 .map(key -> "\n%s (%s)\n".formatted(key.getKey(), key.getPath()))
                                 .toList());
     }
 
     @Test
     void findMissingLocalizationKeys() throws IOException {
-        List<LocalizationEntry> missingKeys = new ArrayList<>(LocalizationParser.findMissingKeys(LocalizationBundleForTest.LANG));
-        assertEquals(Collections.emptyList(), missingKeys,
+        List<LocalizationEntry> missingKeys =
+                new ArrayList<>(LocalizationParser.findMissingKeys(LocalizationBundleForTest.LANG));
+        assertEquals(
+                Collections.emptyList(),
+                missingKeys,
                 missingKeys.stream()
-                           .map(key -> LocalizationKey.fromKey(key.getKey()))
-                           .map(key -> "%s=%s".formatted(
-                                   key.getEscapedPropertiesKey(),
-                                   key.getValueForEnglishPropertiesFile()))
-                           .collect(Collectors.joining("\n",
-                                   """
+                        .map(key -> LocalizationKey.fromKey(key.getKey()))
+                        .map(
+                                key ->
+                                        "%s=%s"
+                                                .formatted(
+                                                        key.getEscapedPropertiesKey(),
+                                                        key.getValueForEnglishPropertiesFile()))
+                        .collect(
+                                Collectors.joining(
+                                        "\n",
+                                        """
 
                                            DETECTED LANGUAGE KEYS WHICH ARE NOT IN THE ENGLISH LANGUAGE FILE
                                            PASTE THESE INTO THE ENGLISH LANGUAGE FILE "JabRef_en.properties"
 
                                            """,
-                                   "\n\n")));
+                                        "\n\n")));
     }
 
     @Test
     void findObsoleteLocalizationKeys() throws IOException {
         Set<String> obsoleteKeys = LocalizationParser.findObsolete(LocalizationBundleForTest.LANG);
-        assertEquals(Collections.emptySet(), obsoleteKeys,
-                obsoleteKeys.stream().collect(Collectors.joining("\n",
-                        "Obsolete keys found in language properties file: \n\n",
-                        """
+        assertEquals(
+                Collections.emptySet(),
+                obsoleteKeys,
+                obsoleteKeys.stream()
+                        .collect(
+                                Collectors.joining(
+                                        "\n",
+                                        "Obsolete keys found in language properties file: \n\n",
+                                        """
 
                                 1. CHECK IF THE KEY IS REALLY NOT USED ANYMORE
                                 2. REMOVE THESE FROM THE ENGLISH LANGUAGE FILE "JabRef_en.properties"
 
-                                """))
-        );
+                                """)));
     }
 
     @Test
@@ -162,17 +200,28 @@ void localizationParameterMustIncludeAString() throws IOException {
         // - Localization.lang("test %1", var)
         // - Localization.lang("Problem downloading from %1", address)
         // - Localization.lang("test %1 %2", var1, var2)
-        Set<LocalizationEntry> keys = LocalizationParser.findLocalizationParametersStringsInJavaFiles(LocalizationBundleForTest.LANG);
+        Set<LocalizationEntry> keys =
+                LocalizationParser.findLocalizationParametersStringsInJavaFiles(
+                        LocalizationBundleForTest.LANG);
         for (LocalizationEntry e : keys) {
             // TODO: Forbidden Localization.lang("test" + var2) not covered by the test
             //       In case this kind of code is found, an error should be reported
-            //       JabRef's infrastructure only supports Localization.lang("Some Message"); and not something else.
-            assertTrue(e.getKey().startsWith("\""), "Illegal localization parameter found. Must include a String with potential concatenation or replacement parameters. Illegal parameter: Localization.lang(" + e.getKey());
+            //       JabRef's infrastructure only supports Localization.lang("Some Message"); and
+            // not something else.
+            assertTrue(
+                    e.getKey().startsWith("\""),
+                    "Illegal localization parameter found. Must include a String with potential concatenation or replacement parameters. Illegal parameter: Localization.lang("
+                            + e.getKey());
         }
 
-        keys = LocalizationParser.findLocalizationParametersStringsInJavaFiles(LocalizationBundleForTest.MENU);
+        keys =
+                LocalizationParser.findLocalizationParametersStringsInJavaFiles(
+                        LocalizationBundleForTest.MENU);
         for (LocalizationEntry e : keys) {
-            assertTrue(e.getKey().startsWith("\""), "Illegal localization parameter found. Must include a String with potential concatenation or replacement parameters. Illegal parameter: Localization.lang(" + e.getKey());
+            assertTrue(
+                    e.getKey().startsWith("\""),
+                    "Illegal localization parameter found. Must include a String with potential concatenation or replacement parameters. Illegal parameter: Localization.lang("
+                            + e.getKey());
         }
     }
 
@@ -183,7 +232,13 @@ private static Language[] installedLanguages() {
     @ParameterizedTest
     @MethodSource("installedLanguages")
     void resourceBundleExists(Language language) {
-        Path messagesPropertyFile = Path.of("src/main/resources").resolve(Localization.RESOURCE_PREFIX + "_" + language.getId() + ".properties");
+        Path messagesPropertyFile =
+                Path.of("src/main/resources")
+                        .resolve(
+                                Localization.RESOURCE_PREFIX
+                                        + "_"
+                                        + language.getId()
+                                        + ".properties");
         assertTrue(Files.exists(messagesPropertyFile));
     }
 
@@ -194,7 +249,8 @@ void languageCanBeLoaded(Language language) {
         try {
             Locale locale = Language.convertToSupportedLocale(language).get();
             Locale.setDefault(locale);
-            ResourceBundle messages = ResourceBundle.getBundle(Localization.RESOURCE_PREFIX, locale);
+            ResourceBundle messages =
+                    ResourceBundle.getBundle(Localization.RESOURCE_PREFIX, locale);
             assertNotNull(messages);
         } finally {
             Locale.setDefault(oldLocale);
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java
index ac2c4a9c85e6..ced26418f941 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.l10n;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.stream.Stream;
 
 class LocalizationKeyParamsTest {
 
@@ -23,13 +23,21 @@ private static Stream<Arguments> provideTestData() {
                 Arguments.of("biblatex mode", new LocalizationKeyParams("biblatex mode")),
                 Arguments.of("biblatex mode", new LocalizationKeyParams("%0 mode", "biblatex")),
                 Arguments.of("C:\\bla mode", new LocalizationKeyParams("%0 mode", "C:\\bla")),
-                Arguments.of("What \n : %e %c a b", new LocalizationKeyParams("What \n : %e %c %0 %1", "a", "b")),
-                Arguments.of("What \n : %e %c_a b", new LocalizationKeyParams("What \n : %e %c_%0 %1", "a", "b"))
-        );
+                Arguments.of(
+                        "What \n : %e %c a b",
+                        new LocalizationKeyParams("What \n : %e %c %0 %1", "a", "b")),
+                Arguments.of(
+                        "What \n : %e %c_a b",
+                        new LocalizationKeyParams("What \n : %e %c_%0 %1", "a", "b")));
     }
 
     @Test
     void tooManyParams() {
-        assertThrows(IllegalStateException.class, () -> new LocalizationKeyParams("", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0"));
+        assertThrows(
+                IllegalStateException.class,
+                () ->
+                        new LocalizationKeyParams(
+                                "", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0",
+                                "0", "0", "0", "0"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java
index 85d1dd1a89a0..d69d2a5a77d5 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.l10n;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class LocalizationKeyTest {
 
@@ -17,7 +17,9 @@ private static Stream<Arguments> propertiesKeyTestCases() {
 
                 // Java code: Copy \\cite{citation key}
                 // String representation: "Copy \\\\cite{citation key}"
-                // In other words: The property is "Copy\ \\cite{citation\\ key}", because the "\" before "cite" is a backslash, not an escape for the c. That property is "Copy\ \\cite{citation\ key}" in Java code, because of the escaping of the backslash.
+                // In other words: The property is "Copy\ \\cite{citation\\ key}", because the "\"
+                // before "cite" is a backslash, not an escape for the c. That property is "Copy\
+                // \\cite{citation\ key}" in Java code, because of the escaping of the backslash.
                 Arguments.of("Copy\\ \\\\cite{citation\\ key}", "Copy \\\\cite{citation key}"),
 
                 // Java code: Newline follows\n
@@ -26,14 +28,16 @@ private static Stream<Arguments> propertiesKeyTestCases() {
 
                 // Java code: First line\nSecond line
                 // String representation: "First line\\nSecond line"
-                // In other words: "First line\nSecond line" is the wrong test case, because the source code contains "First line\nSecond line", which is rendered as Java String as "First line\\nSecond line"
-                Arguments.of("First\\ line\\nSecond\\ line", "First line\\nSecond line")
-        );
+                // In other words: "First line\nSecond line" is the wrong test case, because the
+                // source code contains "First line\nSecond line", which is rendered as Java String
+                // as "First line\\nSecond line"
+                Arguments.of("First\\ line\\nSecond\\ line", "First line\\nSecond line"));
     }
 
     @ParameterizedTest
     @MethodSource("propertiesKeyTestCases")
     void getPropertiesKeyReturnsCorrectValue(String expected, String input) {
-        assertEquals(expected, LocalizationKey.fromEscapedJavaString(input).getEscapedPropertiesKey());
+        assertEquals(
+                expected, LocalizationKey.fromEscapedJavaString(input).getEscapedPropertiesKey());
     }
 }
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationParser.java b/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
index 81dcc522cf2d..dc0908d0b567 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
@@ -1,5 +1,13 @@
 package org.jabref.logic.l10n;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
+import javafx.fxml.FXMLLoader;
+
+import org.mockito.Answers;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -22,20 +30,13 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javafx.fxml.FXMLLoader;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import org.mockito.Answers;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
-
 public class LocalizationParser {
 
-    public static SortedSet<LocalizationEntry> findMissingKeys(LocalizationBundleForTest type) throws IOException {
+    public static SortedSet<LocalizationEntry> findMissingKeys(LocalizationBundleForTest type)
+            throws IOException {
         Set<LocalizationEntry> entries = findLocalizationEntriesInFiles(type);
-        Set<String> keysInJavaFiles = entries.stream()
-                                             .map(LocalizationEntry::getKey)
-                                             .collect(Collectors.toSet());
+        Set<String> keysInJavaFiles =
+                entries.stream().map(LocalizationEntry::getKey).collect(Collectors.toSet());
 
         Set<String> englishKeys;
         if (type == LocalizationBundleForTest.LANG) {
@@ -47,24 +48,28 @@ public static SortedSet<LocalizationEntry> findMissingKeys(LocalizationBundleFor
         missingKeys.removeAll(englishKeys);
 
         return entries.stream()
-                      .filter(e -> missingKeys.contains(e.getKey()))
-                      .collect(Collectors.toCollection(TreeSet::new));
+                .filter(e -> missingKeys.contains(e.getKey()))
+                .collect(Collectors.toCollection(TreeSet::new));
     }
 
-    public static SortedSet<String> findObsolete(LocalizationBundleForTest type) throws IOException {
+    public static SortedSet<String> findObsolete(LocalizationBundleForTest type)
+            throws IOException {
         Set<String> englishKeys;
         if (type == LocalizationBundleForTest.LANG) {
             englishKeys = getKeysInPropertiesFile("/l10n/JabRef_en.properties");
         } else {
             englishKeys = getKeysInPropertiesFile("/l10n/Menu_en.properties");
         }
-        Set<String> keysInSourceFiles = findLocalizationEntriesInFiles(type)
-                .stream().map(LocalizationEntry::getKey).collect(Collectors.toSet());
+        Set<String> keysInSourceFiles =
+                findLocalizationEntriesInFiles(type).stream()
+                        .map(LocalizationEntry::getKey)
+                        .collect(Collectors.toSet());
         englishKeys.removeAll(keysInSourceFiles);
         return new TreeSet<>(englishKeys);
     }
 
-    private static Set<LocalizationEntry> findLocalizationEntriesInFiles(LocalizationBundleForTest type) throws IOException {
+    private static Set<LocalizationEntry> findLocalizationEntriesInFiles(
+            LocalizationBundleForTest type) throws IOException {
         if (type == LocalizationBundleForTest.MENU) {
             return findLocalizationEntriesInJavaFiles(type);
         } else {
@@ -75,8 +80,8 @@ private static Set<LocalizationEntry> findLocalizationEntriesInFiles(Localizatio
         }
     }
 
-    public static Set<LocalizationEntry> findLocalizationParametersStringsInJavaFiles(LocalizationBundleForTest type)
-            throws IOException {
+    public static Set<LocalizationEntry> findLocalizationParametersStringsInJavaFiles(
+            LocalizationBundleForTest type) throws IOException {
         try (Stream<Path> pathStream = Files.walk(Path.of("src/main"))) {
             return pathStream
                     .filter(LocalizationParser::isJavaFile)
@@ -87,8 +92,8 @@ public static Set<LocalizationEntry> findLocalizationParametersStringsInJavaFile
         }
     }
 
-    private static Set<LocalizationEntry> findLocalizationEntriesInJavaFiles(LocalizationBundleForTest type)
-            throws IOException {
+    private static Set<LocalizationEntry> findLocalizationEntriesInJavaFiles(
+            LocalizationBundleForTest type) throws IOException {
         try (Stream<Path> pathStream = Files.walk(Path.of("src/main"))) {
             return pathStream
                     .filter(LocalizationParser::isJavaFile)
@@ -99,8 +104,8 @@ private static Set<LocalizationEntry> findLocalizationEntriesInJavaFiles(Localiz
         }
     }
 
-    private static Set<LocalizationEntry> findLocalizationEntriesInFxmlFiles(LocalizationBundleForTest type)
-            throws IOException {
+    private static Set<LocalizationEntry> findLocalizationEntriesInFxmlFiles(
+            LocalizationBundleForTest type) throws IOException {
         try (Stream<Path> pathStream = Files.walk(Path.of("src/main"))) {
             return pathStream
                     .filter(LocalizationParser::isFxmlFile)
@@ -117,20 +122,21 @@ private static Set<LocalizationEntry> findLocalizationEntriesInFxmlFiles(Localiz
     public static SortedSet<String> getKeysInPropertiesFile(String path) {
         Properties properties = getProperties(path);
         return properties.keySet().stream()
-                         .map(Object::toString)
-                         .map(String::trim)
-                         .map(key -> key
-                                 // escape keys to make them comparable
-                                 .replace("\\", "\\\\")
-                                 .replace("\n", "\\n")
-                         )
-                         .collect(Collectors.toCollection(TreeSet::new));
+                .map(Object::toString)
+                .map(String::trim)
+                .map(
+                        key ->
+                                key
+                                        // escape keys to make them comparable
+                                        .replace("\\", "\\\\")
+                                        .replace("\n", "\\n"))
+                .collect(Collectors.toCollection(TreeSet::new));
     }
 
     public static Properties getProperties(String path) {
         Properties properties = new Properties();
         try (InputStream is = LocalizationConsistencyTest.class.getResourceAsStream(path);
-             InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
+                InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
             properties.load(reader);
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -146,7 +152,8 @@ private static boolean isFxmlFile(Path path) {
         return path.toString().endsWith(".fxml");
     }
 
-    private static List<LocalizationEntry> getLanguageKeysInJavaFile(Path path, LocalizationBundleForTest type) {
+    private static List<LocalizationEntry> getLanguageKeysInJavaFile(
+            Path path, LocalizationBundleForTest type) {
         List<String> lines;
         try {
             lines = Files.readAllLines(path, StandardCharsets.UTF_8);
@@ -155,11 +162,12 @@ private static List<LocalizationEntry> getLanguageKeysInJavaFile(Path path, Loca
         }
         String content = String.join("\n", lines);
         return JavaLocalizationEntryParser.getLanguageKeysInString(content, type).stream()
-                                          .map(key -> new LocalizationEntry(path, key, type))
-                                          .collect(Collectors.toList());
+                .map(key -> new LocalizationEntry(path, key, type))
+                .collect(Collectors.toList());
     }
 
-    private static List<LocalizationEntry> getLocalizationParametersInJavaFile(Path path, LocalizationBundleForTest type) {
+    private static List<LocalizationEntry> getLocalizationParametersInJavaFile(
+            Path path, LocalizationBundleForTest type) {
         List<String> lines;
         try {
             lines = Files.readAllLines(path, StandardCharsets.UTF_8);
@@ -168,8 +176,8 @@ private static List<LocalizationEntry> getLocalizationParametersInJavaFile(Path
         }
         String content = String.join("\n", lines);
         return JavaLocalizationEntryParser.getLocalizationParameter(content, type).stream()
-                                          .map(key -> new LocalizationEntry(path, key, type))
-                                          .collect(Collectors.toList());
+                .map(key -> new LocalizationEntry(path, key, type))
+                .collect(Collectors.toList());
     }
 
     /**
@@ -177,39 +185,43 @@ private static List<LocalizationEntry> getLocalizationParametersInJavaFile(Path
      *
      * Note: FXML prefixes localization keys with <code>%</code>.
      */
-    private static Collection<LocalizationEntry> getLanguageKeysInFxmlFile(Path path, LocalizationBundleForTest type) {
+    private static Collection<LocalizationEntry> getLanguageKeysInFxmlFile(
+            Path path, LocalizationBundleForTest type) {
         Collection<String> result = new ArrayList<>();
 
         // Afterburner ViewLoader forces a controller factory, but we do not need any controller
-        MockedStatic<ViewLoader> viewLoader = Mockito.mockStatic(ViewLoader.class, Answers.RETURNS_DEEP_STUBS);
+        MockedStatic<ViewLoader> viewLoader =
+                Mockito.mockStatic(ViewLoader.class, Answers.RETURNS_DEEP_STUBS);
 
         // Record which keys are requested; we pretend that we have all keys
-        ResourceBundle registerUsageResourceBundle = new ResourceBundle() {
-            @Override
-            protected Object handleGetObject(String key) {
-                // Here, we get the key without the percent sign at the beginning.
-                // All the "magic" is done at "loader.load()" called below.
-                result.add(key);
-                return "test";
-            }
-
-            @Override
-            public Enumeration<String> getKeys() {
-                return null;
-            }
-
-            @Override
-            public boolean containsKey(String key) {
-                return true;
-            }
-        };
+        ResourceBundle registerUsageResourceBundle =
+                new ResourceBundle() {
+                    @Override
+                    protected Object handleGetObject(String key) {
+                        // Here, we get the key without the percent sign at the beginning.
+                        // All the "magic" is done at "loader.load()" called below.
+                        result.add(key);
+                        return "test";
+                    }
+
+                    @Override
+                    public Enumeration<String> getKeys() {
+                        return null;
+                    }
+
+                    @Override
+                    public boolean containsKey(String key) {
+                        return true;
+                    }
+                };
 
         try {
             FXMLLoader loader = new FXMLLoader(path.toUri().toURL(), registerUsageResourceBundle);
             // We don't want to initialize controller
             loader.setControllerFactory(Mockito::mock);
 
-            // We need to load in "static mode" because otherwise fxml files with fx:root doesn't work
+            // We need to load in "static mode" because otherwise fxml files with fx:root doesn't
+            // work
             setStaticLoad(loader);
             loader.load();
         } catch (IOException exception) {
@@ -218,22 +230,26 @@ public boolean containsKey(String key) {
             viewLoader.close();
         }
 
-        return result.stream()
-                     .map(key -> new LocalizationEntry(path, key, type))
-                     .toList();
+        return result.stream().map(key -> new LocalizationEntry(path, key, type)).toList();
     }
 
     private static void setStaticLoad(FXMLLoader loader) {
         // Somebody decided to make "setStaticLoad" package-private, so let's use reflection
         //
         // Issues in JFX:
-        //   - https://bugs.openjdk.java.net/browse/JDK-8159005 "SceneBuilder needs public access to FXMLLoader setStaticLoad" --> call for "request from community users with use cases"
-        //   - https://bugs.openjdk.java.net/browse/JDK-8127532 "FXMLLoader#setStaticLoad is deprecated"
+        //   - https://bugs.openjdk.java.net/browse/JDK-8159005 "SceneBuilder needs public access to
+        // FXMLLoader setStaticLoad" --> call for "request from community users with use cases"
+        //   - https://bugs.openjdk.java.net/browse/JDK-8127532 "FXMLLoader#setStaticLoad is
+        // deprecated"
         try {
             Method method = FXMLLoader.class.getDeclaredMethod("setStaticLoad", boolean.class);
             method.setAccessible(true);
             method.invoke(loader, true);
-        } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+        } catch (SecurityException
+                | NoSuchMethodException
+                | IllegalAccessException
+                | IllegalArgumentException
+                | InvocationTargetException e) {
             throw new RuntimeException(e);
         }
     }
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationTest.java
index c373608566c2..46905f0121cf 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.l10n;
 
-import java.util.Locale;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Locale;
 
 class LocalizationTest {
 
@@ -51,7 +51,10 @@ void knownGermanTranslation() {
     @Test
     void newLineIsAvailableAndKeptUnescaped() {
         Localization.setLanguage(Language.ENGLISH);
-        assertEquals("Hint: To search specific fields only, enter for example:\n<tt>author=smith and title=electrical</tt>", Localization.lang("Hint: To search specific fields only, enter for example:\n<tt>author=smith and title=electrical</tt>"));
+        assertEquals(
+                "Hint: To search specific fields only, enter for example:\n<tt>author=smith and title=electrical</tt>",
+                Localization.lang(
+                        "Hint: To search specific fields only, enter for example:\n<tt>author=smith and title=electrical</tt>"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java b/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
index 0c394cbed819..9d278335ecfa 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.layout;
 
-import java.io.IOException;
-import java.io.StringReader;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.io.IOException;
+import java.io.StringReader;
 
 /**
  * The test class LayoutEntryTest test the net.sf.jabref.export.layout.LayoutEntry. Indirectly the
@@ -29,7 +28,6 @@
  * sensitivity. - There is one word which will be highlighted case sensitivity. - There are more words which will be
  * highlighted case sensitivity.
  */
-
 public class LayoutEntryTest {
 
     private BibEntry mBTE;
@@ -37,16 +35,25 @@ public class LayoutEntryTest {
     @BeforeEach
     void setUp() {
         mBTE = new BibEntry();
-        mBTE.setField(StandardField.ABSTRACT, "In this paper, we initiate a formal study of security on Android: Google's new open-source platform for mobile devices. Tags: Paper android google Open-Source Devices");
-        //  Specifically, we present a core typed language to describe Android applications, and to reason about their data-flow security properties. Our operational semantics and type system provide some necessary foundations to help both users and developers of Android applications deal with their security concerns.
+        mBTE.setField(
+                StandardField.ABSTRACT,
+                "In this paper, we initiate a formal study of security on Android: Google's new open-source platform for mobile devices. Tags: Paper android google Open-Source Devices");
+        //  Specifically, we present a core typed language to describe Android applications, and to
+        // reason about their data-flow security properties. Our operational semantics and type
+        // system provide some necessary foundations to help both users and developers of Android
+        // applications deal with their security concerns.
         mBTE.setField(StandardField.KEYWORDS, "android, mobile devices, security");
         mBTE.setField(new UnknownField("posted-at"), "2010-08-11 15:00:49");
         mBTE.setField(StandardField.LOCATION, "Dublin, Ireland");
         mBTE.setCitationKey("chaudhuri-plas09");
         mBTE.setField(StandardField.PAGES, "1--7");
-        mBTE.setField(StandardField.BOOKTITLE, "PLAS '09: Proceedings of the ACM SIGPLAN Fourth Workshop on Programming Languages and Analysis for Security");
+        mBTE.setField(
+                StandardField.BOOKTITLE,
+                "PLAS '09: Proceedings of the ACM SIGPLAN Fourth Workshop on Programming Languages and Analysis for Security");
         mBTE.setField(new UnknownField("citeulike-article-id"), "7615801");
-        mBTE.setField(new UnknownField("citeulike-linkout-1"), "http://dx.doi.org/10.1145/1554339.1554341");
+        mBTE.setField(
+                new UnknownField("citeulike-linkout-1"),
+                "http://dx.doi.org/10.1145/1554339.1554341");
         mBTE.setField(StandardField.URL, "http://dx.doi.org/10.1145/1554339.1554341");
         mBTE.setField(StandardField.PUBLISHER, "ACM");
         mBTE.setField(StandardField.TIMESTAMP, "2010.11.11");
@@ -57,13 +64,20 @@ void setUp() {
         mBTE.setField(StandardField.ISBN, "978-1-60558-645-8");
         mBTE.setField(StandardField.OWNER, "Arne");
         mBTE.setField(StandardField.YEAR, "2009");
-        mBTE.setField(new UnknownField("citeulike-linkout-0"), "http://portal.acm.org/citation.cfm?id=1554339.1554341");
+        mBTE.setField(
+                new UnknownField("citeulike-linkout-0"),
+                "http://portal.acm.org/citation.cfm?id=1554339.1554341");
         mBTE.setField(StandardField.DOI, "10.1145/1554339.1554341");
     }
 
     public String layout(String layoutFile, BibEntry entry) throws IOException {
         StringReader sr = new StringReader(layoutFile.replace("__NEWLINE__", "\n"));
-        Layout layout = new LayoutHelper(sr, mock(LayoutFormatterPreferences.class), mock(JournalAbbreviationRepository.class)).getLayoutFromText();
+        Layout layout =
+                new LayoutHelper(
+                                sr,
+                                mock(LayoutFormatterPreferences.class),
+                                mock(JournalAbbreviationRepository.class))
+                        .getLayoutFromText();
 
         return layout.doLayout(entry, null);
     }
@@ -77,22 +91,37 @@ void parseMethodCalls() {
         assertEquals("bla", (LayoutEntry.parseMethodsCalls("bla,").getFirst()).getFirst());
 
         assertEquals(1, LayoutEntry.parseMethodsCalls("_bla.bla.blub,").size());
-        assertEquals("_bla.bla.blub", (LayoutEntry.parseMethodsCalls("_bla.bla.blub,").getFirst()).getFirst());
+        assertEquals(
+                "_bla.bla.blub",
+                (LayoutEntry.parseMethodsCalls("_bla.bla.blub,").getFirst()).getFirst());
 
         assertEquals(2, LayoutEntry.parseMethodsCalls("bla,foo").size());
         assertEquals("bla", (LayoutEntry.parseMethodsCalls("bla,foo").getFirst()).getFirst());
         assertEquals("foo", (LayoutEntry.parseMethodsCalls("bla,foo").get(1)).getFirst());
 
         assertEquals(2, LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").size());
-        assertEquals("bla", (LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").getFirst()).getFirst());
-        assertEquals("foo", (LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").get(1)).getFirst());
-        assertEquals("test", (LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").getFirst()).get(1));
-        assertEquals("fark", (LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").get(1)).get(1));
+        assertEquals(
+                "bla",
+                (LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").getFirst())
+                        .getFirst());
+        assertEquals(
+                "foo",
+                (LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").get(1)).getFirst());
+        assertEquals(
+                "test",
+                (LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").getFirst()).get(1));
+        assertEquals(
+                "fark",
+                (LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").get(1)).get(1));
 
         assertEquals(2, LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").size());
-        assertEquals("bla", (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").getFirst()).getFirst());
-        assertEquals("foo", (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").get(1)).getFirst());
-        assertEquals("test", (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").getFirst()).get(1));
+        assertEquals(
+                "bla",
+                (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").getFirst()).getFirst());
+        assertEquals(
+                "foo", (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").get(1)).getFirst());
+        assertEquals(
+                "test", (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").getFirst()).get(1));
         assertEquals("fark", (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").get(1)).get(1));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/LayoutHelperTest.java b/src/test/java/org/jabref/logic/layout/LayoutHelperTest.java
index ec8d4667731c..ce9b472140c3 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutHelperTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutHelperTest.java
@@ -1,32 +1,35 @@
 package org.jabref.logic.layout;
 
-import java.io.IOException;
-import java.io.StringReader;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
+import java.io.IOException;
+import java.io.StringReader;
 
 class LayoutHelperTest {
 
-    private final LayoutFormatterPreferences layoutFormatterPreferences = mock(LayoutFormatterPreferences.class);
-    private final JournalAbbreviationRepository abbreviationRepository = mock(JournalAbbreviationRepository.class);
+    private final LayoutFormatterPreferences layoutFormatterPreferences =
+            mock(LayoutFormatterPreferences.class);
+    private final JournalAbbreviationRepository abbreviationRepository =
+            mock(JournalAbbreviationRepository.class);
 
     @Test
     void backslashDoesNotTriggerException() {
         StringReader stringReader = new StringReader("\\");
-        LayoutHelper layoutHelper = new LayoutHelper(stringReader, layoutFormatterPreferences, abbreviationRepository);
+        LayoutHelper layoutHelper =
+                new LayoutHelper(stringReader, layoutFormatterPreferences, abbreviationRepository);
         assertThrows(IOException.class, layoutHelper::getLayoutFromText);
     }
 
     @Test
     void unbalancedBeginEndIsParsed() throws Exception {
         StringReader stringReader = new StringReader("\\begin{doi}, DOI: \\doi");
-        LayoutHelper layoutHelper = new LayoutHelper(stringReader, layoutFormatterPreferences, abbreviationRepository);
+        LayoutHelper layoutHelper =
+                new LayoutHelper(stringReader, layoutFormatterPreferences, abbreviationRepository);
         Layout layout = layoutHelper.getLayoutFromText();
         assertNotNull(layout);
     }
@@ -34,7 +37,8 @@ void unbalancedBeginEndIsParsed() throws Exception {
     @Test
     void minimalExampleWithDoiGetsParsed() throws Exception {
         StringReader stringReader = new StringReader("\\begin{doi}, DOI: \\doi\\end{doi}");
-        LayoutHelper layoutHelper = new LayoutHelper(stringReader, layoutFormatterPreferences, abbreviationRepository);
+        LayoutHelper layoutHelper =
+                new LayoutHelper(stringReader, layoutFormatterPreferences, abbreviationRepository);
         Layout layout = layoutHelper.getLayoutFromText();
         assertNotNull(layout);
     }
diff --git a/src/test/java/org/jabref/logic/layout/LayoutTest.java b/src/test/java/org/jabref/logic/layout/LayoutTest.java
index e27e75380b26..92890b220cca 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutTest.java
@@ -1,11 +1,8 @@
 package org.jabref.logic.layout;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.format.NameFormatterPreferences;
@@ -15,14 +12,16 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.entry.types.UnknownEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
 
 class LayoutTest {
 
@@ -31,14 +30,20 @@ class LayoutTest {
 
     @BeforeEach
     void setUp() {
-        layoutFormatterPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        layoutFormatterPreferences =
+                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         abbreviationRepository = mock(JournalAbbreviationRepository.class);
     }
 
-    private String layout(String layout, List<Path> fileDirForDatabase, BibEntry entry) throws IOException {
+    private String layout(String layout, List<Path> fileDirForDatabase, BibEntry entry)
+            throws IOException {
         StringReader layoutStringReader = new StringReader(layout.replace("__NEWLINE__", "\n"));
 
-        return new LayoutHelper(layoutStringReader, fileDirForDatabase, layoutFormatterPreferences, abbreviationRepository)
+        return new LayoutHelper(
+                        layoutStringReader,
+                        fileDirForDatabase,
+                        layoutFormatterPreferences,
+                        abbreviationRepository)
                 .getLayoutFromText()
                 .doLayout(entry, null);
     }
@@ -49,28 +54,34 @@ private String layout(String layout, BibEntry entry) throws IOException {
 
     @Test
     void entryTypeForUnknown() throws IOException {
-        BibEntry entry = new BibEntry(new UnknownEntryType("unknown")).withField(StandardField.AUTHOR, "test");
+        BibEntry entry =
+                new BibEntry(new UnknownEntryType("unknown"))
+                        .withField(StandardField.AUTHOR, "test");
 
         assertEquals("Unknown", layout("\\bibtextype", entry));
     }
 
     @Test
     void entryTypeForArticle() throws IOException {
-        BibEntry entry = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "test");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "test");
 
         assertEquals("Article", layout("\\bibtextype", entry));
     }
 
     @Test
     void entryTypeForMisc() throws IOException {
-        BibEntry entry = new BibEntry(StandardEntryType.Misc).withField(StandardField.AUTHOR, "test");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Misc).withField(StandardField.AUTHOR, "test");
 
         assertEquals("Misc", layout("\\bibtextype", entry));
     }
 
     @Test
     void HTMLChar() throws IOException {
-        BibEntry entry = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "This\nis\na\ntext");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "This\nis\na\ntext");
 
         String actual = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author}", entry);
 
@@ -79,30 +90,38 @@ void HTMLChar() throws IOException {
 
     @Test
     void HTMLCharWithDoubleLineBreak() throws IOException {
-        BibEntry entry = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "This\nis\na\n\ntext");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "This\nis\na\n\ntext");
 
-        String layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author} ", entry);
+        String layoutText =
+                layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author} ", entry);
 
         assertEquals("This<br>is<br>a<p>text ", layoutText);
     }
 
     @Test
     void nameFormatter() throws IOException {
-        BibEntry entry = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Joe Doe and Jane, Moon");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Joe Doe and Jane, Moon");
 
-        String layoutText = layout("\\begin{author}\\format[NameFormatter]{\\author}\\end{author}", entry);
+        String layoutText =
+                layout("\\begin{author}\\format[NameFormatter]{\\author}\\end{author}", entry);
 
         assertEquals("Joe Doe, Moon Jane", layoutText);
     }
 
     @Test
     void HTMLCharsWithDotlessIAndTiled() throws IOException {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.ABSTRACT, "\\~{n} \\~n \\'i \\i \\i");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.ABSTRACT, "\\~{n} \\~n \\'i \\i \\i");
 
-        String layoutText = layout(
-                "<font face=\"arial\">\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract}\\end{abstract}</font>",
-                entry);
+        String layoutText =
+                layout(
+                        "<font face=\"arial\">\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract}\\end{abstract}</font>",
+                        entry);
 
         assertEquals(
                 "<font face=\"arial\"><BR><BR><b>Abstract: </b> &ntilde; &ntilde; &iacute; &imath; &imath;</font>",
@@ -111,16 +130,22 @@ void HTMLCharsWithDotlessIAndTiled() throws IOException {
 
     @Test
     void beginConditionals() throws IOException {
-        BibEntry entry = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.AUTHOR, "Author");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Misc).withField(StandardField.AUTHOR, "Author");
 
         // || (OR)
-        String layoutText = layout("\\begin{editor||author}\\format[HTMLChars]{\\author}\\end{editor||author}", entry);
+        String layoutText =
+                layout(
+                        "\\begin{editor||author}\\format[HTMLChars]{\\author}\\end{editor||author}",
+                        entry);
 
         assertEquals("Author", layoutText);
 
         // && (AND)
-        layoutText = layout("\\begin{editor&&author}\\format[HTMLChars]{\\author}\\end{editor&&author}", entry);
+        layoutText =
+                layout(
+                        "\\begin{editor&&author}\\format[HTMLChars]{\\author}\\end{editor&&author}",
+                        entry);
 
         assertEquals("", layoutText);
 
@@ -130,9 +155,11 @@ void beginConditionals() throws IOException {
         assertEquals("(no year)", layoutText);
 
         // combined (!a&&b)
-        layoutText = layout(
-                "\\begin{!editor&&author}\\format[HTMLChars]{\\author}\\end{!editor&&author}" +
-                "\\begin{editor&&!author}\\format[HTMLChars]{\\editor} (eds.)\\end{editor&&!author}", entry);
+        layoutText =
+                layout(
+                        "\\begin{!editor&&author}\\format[HTMLChars]{\\author}\\end{!editor&&author}"
+                                + "\\begin{editor&&!author}\\format[HTMLChars]{\\editor} (eds.)\\end{editor&&!author}",
+                        entry);
 
         assertEquals("Author", layoutText);
     }
@@ -145,19 +172,23 @@ void wrapFileLinksExpandFile() throws IOException {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         entry.addFile(new LinkedFile("Test file", Path.of("encrypted.pdf"), "PDF"));
 
-        String layoutText = layout(
-                "\\begin{file}\\format[WrapFileLinks(\\i. \\d (\\p))]{\\file}\\end{file}",
-                Collections.singletonList(Path.of("src/test/resources/pdfs/")),
-                entry);
+        String layoutText =
+                layout(
+                        "\\begin{file}\\format[WrapFileLinks(\\i. \\d (\\p))]{\\file}\\end{file}",
+                        Collections.singletonList(Path.of("src/test/resources/pdfs/")),
+                        entry);
 
         assertEquals(
-                "1. Test file (" + new File("src/test/resources/pdfs/encrypted.pdf").getCanonicalPath() + ")",
+                "1. Test file ("
+                        + new File("src/test/resources/pdfs/encrypted.pdf").getCanonicalPath()
+                        + ")",
                 layoutText);
     }
 
     @Test
     void expandCommandIfTerminatedByMinus() throws IOException {
-        BibEntry entry = new BibEntry(StandardEntryType.Article).withField(StandardField.EDITION, "2");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article).withField(StandardField.EDITION, "2");
 
         String layoutText = layout("\\edition-th ed.-", entry);
 
@@ -166,9 +197,15 @@ void expandCommandIfTerminatedByMinus() throws IOException {
 
     @Test
     void customNameFormatter() throws IOException {
-        when(layoutFormatterPreferences.getNameFormatterPreferences()).thenReturn(
-                new NameFormatterPreferences(Collections.singletonList("DCA"), Collections.singletonList("1@*@{ll}@@2@1..1@{ff}{ll}@2..2@ and {ff}{l}@@*@*@more")));
-        BibEntry entry = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Joe Doe and Mary Jane");
+        when(layoutFormatterPreferences.getNameFormatterPreferences())
+                .thenReturn(
+                        new NameFormatterPreferences(
+                                Collections.singletonList("DCA"),
+                                Collections.singletonList(
+                                        "1@*@{ll}@@2@1..1@{ff}{ll}@2..2@ and {ff}{l}@@*@*@more")));
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Joe Doe and Mary Jane");
 
         String layoutText = layout("\\begin{author}\\format[DCA]{\\author}\\end{author}", entry);
 
@@ -178,12 +215,15 @@ void customNameFormatter() throws IOException {
     @Test
     void annotatedField() throws IOException {
         UnknownField annotatedField = new UnknownField("author+an");
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-            .withField(annotatedField, "1:corresponding,2:highlight")
-            .withField(StandardField.AUTHOR, "Joe Doe and Mary Jane");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(annotatedField, "1:corresponding,2:highlight")
+                        .withField(StandardField.AUTHOR, "Joe Doe and Mary Jane");
 
         String layoutText = layout("\\author: \\author \\author+an", entry);
 
-        assertEquals("Joe Doe and Mary Jane: Joe Doe and Mary Jane 1:corresponding,2:highlight", layoutText);
+        assertEquals(
+                "Joe Doe and Mary Jane: Joe Doe and Mary Jane 1:corresponding,2:highlight",
+                layoutText);
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AbstractParamLayoutFormatterTest.java b/src/test/java/org/jabref/logic/layout/format/AbstractParamLayoutFormatterTest.java
index 6cc2ede6ed0f..75350e9e8f38 100644
--- a/src/test/java/org/jabref/logic/layout/format/AbstractParamLayoutFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AbstractParamLayoutFormatterTest.java
@@ -1,12 +1,11 @@
 package org.jabref.logic.layout.format;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.AbstractParamLayoutFormatter;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
 
 public class AbstractParamLayoutFormatterTest {
     static class ParseArgumentTester extends AbstractParamLayoutFormatter {
@@ -20,23 +19,26 @@ public String format(String fieldText) {
         }
 
         @Override
-        public void setArgument(String arg) {
-        }
+        public void setArgument(String arg) {}
     }
 
     @Test
     void simpleArguments() {
         String input = "arg1,arg2,arg3";
         List<String> result = ParseArgumentTester.callParseArgument(input);
-        assertEquals(List.of("arg1", "arg2", "arg3"), result,
-            "Simple arguments should be split correctly by commas");
+        assertEquals(
+                List.of("arg1", "arg2", "arg3"),
+                result,
+                "Simple arguments should be split correctly by commas");
     }
 
     @Test
     void escapedCommas() {
         String input = "arg1\\,arg2,arg3";
         List<String> result = ParseArgumentTester.callParseArgument(input);
-        assertEquals(List.of("arg1,arg2", "arg3"), result,
+        assertEquals(
+                List.of("arg1,arg2", "arg3"),
+                result,
                 "Escaped commas should be treated as literal commas");
     }
 
@@ -44,7 +46,10 @@ void escapedCommas() {
     void escapedBackslash() {
         String input = "arg1\\\\,arg2";
         List<String> result = ParseArgumentTester.callParseArgument(input);
-        assertEquals(List.of("arg1\\", "arg2"), result, "Escaped backslashes should be treated correctly");
+        assertEquals(
+                List.of("arg1\\", "arg2"),
+                result,
+                "Escaped backslashes should be treated correctly");
     }
 
     @Test
@@ -58,7 +63,9 @@ void emptyArgument() {
     void singleArgument() {
         String input = "singleArg";
         List<String> result = ParseArgumentTester.callParseArgument(input);
-        assertEquals(List.of("singleArg"), result,
+        assertEquals(
+                List.of("singleArg"),
+                result,
                 "Single argument should return a list with the argument itself");
     }
 
@@ -66,7 +73,9 @@ void singleArgument() {
     void newlineAndTabEscapeSequences() {
         String input = "arg1\\narg2\\targ3";
         List<String> result = ParseArgumentTester.callParseArgument(input);
-        assertEquals(List.of("arg1\narg2\targ3"), result,
+        assertEquals(
+                List.of("arg1\narg2\targ3"),
+                result,
                 "Escape sequences like newline and tab should be handled correctly");
     }
 
@@ -74,7 +83,9 @@ void newlineAndTabEscapeSequences() {
     void multipleEscapedCharacters() {
         String input = "arg1\\n,arg2\\t,arg3\\,arg4";
         List<String> result = ParseArgumentTester.callParseArgument(input);
-        assertEquals(List.of("arg1\n", "arg2\t", "arg3,arg4"), result,
+        assertEquals(
+                List.of("arg1\n", "arg2\t", "arg3,arg4"),
+                result,
                 "Multiple escaped characters should be handled correctly");
     }
 
@@ -82,7 +93,9 @@ void multipleEscapedCharacters() {
     void mixedCases() {
         String input = "arg1,arg2\\,withComma,arg3\\nnewline,arg4\\\\backslash";
         List<String> result = ParseArgumentTester.callParseArgument(input);
-        assertEquals(List.of("arg1", "arg2,withComma", "arg3\nnewline", "arg4\\backslash"), result,
+        assertEquals(
+                List.of("arg1", "arg2,withComma", "arg3\nnewline", "arg4\\backslash"),
+                result,
                 "Mixed cases should be parsed correctly");
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java
index 6ad5954c8a23..2dcab003cb04 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.LayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.LayoutFormatter;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 /**
  * Is the save as the AuthorLastFirstAbbreviator.
  */
@@ -19,7 +18,8 @@ void format() {
         assertEquals(b.format(""), a.format(""));
         assertEquals(b.format("Someone, Van Something"), a.format("Someone, Van Something"));
         assertEquals(b.format("Smith, John"), a.format("Smith, John"));
-        assertEquals(b.format("von Neumann, John and Smith, John and Black Brown, Peter"), a
-                .format("von Neumann, John and Smith, John and Black Brown, Peter"));
+        assertEquals(
+                b.format("von Neumann, John and Smith, John and Black Brown, Peter"),
+                a.format("von Neumann, John and Smith, John and Black Brown, Peter"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java
index c568fa4a7297..b15c38a81585 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.LayoutFormatter;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class AuthorAndToSemicolonReplacerTest {
 
@@ -17,8 +16,12 @@ private static Stream<Arguments> data() {
                 Arguments.of("", ""),
                 Arguments.of("Someone, Van Something", "Someone, Van Something"),
                 Arguments.of("John Smith and Black Brown, Peter", "John Smith; Black Brown, Peter"),
-                Arguments.of("von Neumann, John and Smith, John and Black Brown, Peter", "von Neumann, John; Smith, John; Black Brown, Peter"),
-                Arguments.of("John von Neumann and John Smith and Peter Black Brown", "John von Neumann; John Smith; Peter Black Brown"));
+                Arguments.of(
+                        "von Neumann, John and Smith, John and Black Brown, Peter",
+                        "von Neumann, John; Smith, John; Black Brown, Peter"),
+                Arguments.of(
+                        "John von Neumann and John Smith and Peter Black Brown",
+                        "John von Neumann; John Smith; Peter Black Brown"));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java
index 7af3db18137f..e40b54f1493d 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.LayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.LayoutFormatter;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class AuthorAndsCommaReplacerTest {
 
     /**
@@ -22,11 +21,13 @@ void format() {
         assertEquals("Someone, Van Something", a.format("Someone, Van Something"));
 
         // Two names just an &
-        assertEquals("John von Neumann & Peter Black Brown",
+        assertEquals(
+                "John von Neumann & Peter Black Brown",
                 a.format("John von Neumann and Peter Black Brown"));
 
         // Three names put a comma:
-        assertEquals("von Neumann, John, Smith, John & Black Brown, Peter",
+        assertEquals(
+                "von Neumann, John, Smith, John & Black Brown, Peter",
                 a.format("von Neumann, John and Smith, John and Black Brown, Peter"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java
index 077a8b47ebf8..5e197f7eea57 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.LayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.LayoutFormatter;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class AuthorAndsReplacerTest {
 
     /**
@@ -22,14 +21,16 @@ void format() {
         assertEquals("Someone, Van Something", a.format("Someone, Van Something"));
 
         // Two names just an &
-        assertEquals("John Smith & Black Brown, Peter", a
-                .format("John Smith and Black Brown, Peter"));
+        assertEquals(
+                "John Smith & Black Brown, Peter", a.format("John Smith and Black Brown, Peter"));
 
         // Three names put a comma:
-        assertEquals("von Neumann, John; Smith, John & Black Brown, Peter", a
-                .format("von Neumann, John and Smith, John and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, John; Smith, John & Black Brown, Peter",
+                a.format("von Neumann, John and Smith, John and Black Brown, Peter"));
 
-        assertEquals("John von Neumann; John Smith & Peter Black Brown", a
-                .format("John von Neumann and John Smith and Peter Black Brown"));
+        assertEquals(
+                "John von Neumann; John Smith & Peter Black Brown",
+                a.format("John von Neumann and John Smith and Peter Black Brown"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java
index c75884dcaa6f..860d5ee6da6d 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastCommasTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.LayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.LayoutFormatter;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class AuthorFirstAbbrLastCommasTest {
 
     @Test
@@ -19,14 +18,17 @@ void format() {
         assertEquals("V. S. Someone", a.format("Someone, Van Something"));
 
         // Two names
-        assertEquals("J. von Neumann and P. Black Brown", a
-                .format("John von Neumann and Black Brown, Peter"));
+        assertEquals(
+                "J. von Neumann and P. Black Brown",
+                a.format("John von Neumann and Black Brown, Peter"));
 
         // Three names
-        assertEquals("J. von Neumann, J. Smith and P. Black Brown", a
-                .format("von Neumann, John and Smith, John and Black Brown, Peter"));
+        assertEquals(
+                "J. von Neumann, J. Smith and P. Black Brown",
+                a.format("von Neumann, John and Smith, John and Black Brown, Peter"));
 
-        assertEquals("J. von Neumann, J. Smith and P. Black Brown", a
-                .format("John von Neumann and John Smith and Black Brown, Peter"));
+        assertEquals(
+                "J. von Neumann, J. Smith and P. Black Brown",
+                a.format("John von Neumann and John Smith and Black Brown, Peter"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java
index 9bef98763084..fad7a73b3d5c 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstAbbrLastOxfordCommasTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.LayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.LayoutFormatter;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class AuthorFirstAbbrLastOxfordCommasTest {
 
     /**
@@ -22,14 +21,17 @@ void format() {
         assertEquals("V. S. Someone", a.format("Someone, Van Something"));
 
         // Two names
-        assertEquals("J. von Neumann and P. Black Brown", a
-                .format("John von Neumann and Black Brown, Peter"));
+        assertEquals(
+                "J. von Neumann and P. Black Brown",
+                a.format("John von Neumann and Black Brown, Peter"));
 
         // Three names
-        assertEquals("J. von Neumann, J. Smith, and P. Black Brown", a
-                .format("von Neumann, John and Smith, John and Black Brown, Peter"));
+        assertEquals(
+                "J. von Neumann, J. Smith, and P. Black Brown",
+                a.format("von Neumann, John and Smith, John and Black Brown, Peter"));
 
-        assertEquals("J. von Neumann, J. Smith, and P. Black Brown", a
-                .format("John von Neumann and John Smith and Black Brown, Peter"));
+        assertEquals(
+                "J. von Neumann, J. Smith, and P. Black Brown",
+                a.format("John von Neumann and John Smith and Black Brown, Peter"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java
index 8762c16f89b4..54784cbc514b 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.layout.format;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 class AuthorFirstFirstCommasTest {
 
     /**
@@ -11,7 +11,8 @@ class AuthorFirstFirstCommasTest {
      */
     @Test
     void format() {
-        assertEquals("John von Neumann, John Smith and Peter Black Brown, Jr",
+        assertEquals(
+                "John von Neumann, John Smith and Peter Black Brown, Jr",
                 new AuthorFirstFirstCommas()
                         .format("von Neumann,,John and John Smith and Black Brown, Jr, Peter"));
     }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java
index 6a13c3447e68..e1cb3b175578 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.layout.format;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 class AuthorFirstFirstTest {
 
     /**
@@ -11,7 +11,8 @@ class AuthorFirstFirstTest {
      */
     @Test
     void format() {
-        assertEquals("John von Neumann and John Smith and Peter Black Brown, Jr",
+        assertEquals(
+                "John von Neumann and John Smith and Peter Black Brown, Jr",
                 new AuthorFirstFirst()
                         .format("von Neumann,,John and John Smith and Black Brown, Jr, Peter"));
     }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java
index 145f4f4be268..69a4852318d1 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.LayoutFormatter;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class AuthorFirstLastCommasTest {
 
@@ -27,11 +26,20 @@ private static Stream<Arguments> formatTests() {
         return Stream.of(
                 Arguments.of("", ""),
                 Arguments.of("Van Something Someone", "Someone, Van Something"),
-                Arguments.of("John von Neumann and Peter Black Brown", "John von Neumann and Peter Black Brown"),
-                Arguments.of("John von Neumann, John Smith and Peter Black Brown", "von Neumann, John and Smith, John and Black Brown, Peter"),
-                Arguments.of("John von Neumann, John Smith and Peter Black Brown", "John von Neumann and John Smith and Black Brown, Peter"),
-                Arguments.of("John von Neumann and Peter Black Brown", "John von Neumann and Peter Black Brown"),
-                Arguments.of("John von Neumann and Peter Black Brown", "John von Neumann and Peter Black Brown")
-        );
+                Arguments.of(
+                        "John von Neumann and Peter Black Brown",
+                        "John von Neumann and Peter Black Brown"),
+                Arguments.of(
+                        "John von Neumann, John Smith and Peter Black Brown",
+                        "von Neumann, John and Smith, John and Black Brown, Peter"),
+                Arguments.of(
+                        "John von Neumann, John Smith and Peter Black Brown",
+                        "John von Neumann and John Smith and Black Brown, Peter"),
+                Arguments.of(
+                        "John von Neumann and Peter Black Brown",
+                        "John von Neumann and Peter Black Brown"),
+                Arguments.of(
+                        "John von Neumann and Peter Black Brown",
+                        "John von Neumann and Peter Black Brown"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java
index 0fede1004e86..dd690f9b566f 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.LayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.LayoutFormatter;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class AuthorFirstLastOxfordCommasTest {
 
     /**
@@ -22,14 +21,17 @@ void format() {
         assertEquals("Van Something Someone", a.format("Someone, Van Something"));
 
         // Two names
-        assertEquals("John von Neumann and Peter Black Brown", a
-                .format("John von Neumann and Peter Black Brown"));
+        assertEquals(
+                "John von Neumann and Peter Black Brown",
+                a.format("John von Neumann and Peter Black Brown"));
 
         // Three names
-        assertEquals("John von Neumann, John Smith, and Peter Black Brown", a
-                .format("von Neumann, John and Smith, John and Black Brown, Peter"));
+        assertEquals(
+                "John von Neumann, John Smith, and Peter Black Brown",
+                a.format("von Neumann, John and Smith, John and Black Brown, Peter"));
 
-        assertEquals("John von Neumann, John Smith, and Peter Black Brown", a
-                .format("John von Neumann and John Smith and Black Brown, Peter"));
+        assertEquals(
+                "John von Neumann, John Smith, and Peter Black Brown",
+                a.format("John von Neumann and John Smith and Black Brown, Peter"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java
index eb46d73c1888..9b40594aca3b 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFAbbrTest.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.layout.format;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 class AuthorLF_FFAbbrTest {
 
     /**
@@ -11,7 +11,8 @@ class AuthorLF_FFAbbrTest {
      */
     @Test
     void format() {
-        assertEquals("von Neumann, J. and J. Smith and P. Black Brown, Jr",
+        assertEquals(
+                "von Neumann, J. and J. Smith and P. Black Brown, Jr",
                 new AuthorLF_FFAbbr()
                         .format("von Neumann,,John and John Smith and Black Brown, Jr, Peter"));
     }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java
index 539133985889..d06f330637cc 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLF_FFTest.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.layout.format;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 class AuthorLF_FFTest {
 
     /**
@@ -11,7 +11,8 @@ class AuthorLF_FFTest {
      */
     @Test
     void format() {
-        assertEquals("von Neumann, John and John Smith and Peter Black Brown, Jr",
+        assertEquals(
+                "von Neumann, John and John Smith and Peter Black Brown, Jr",
                 new AuthorLF_FF()
                         .format("von Neumann,,John and John Smith and Black Brown, Jr, Peter"));
     }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java
index acad69c75757..eafe0a06a5dd 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrCommasTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.LayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.LayoutFormatter;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class AuthorLastFirstAbbrCommasTest {
 
     /**
@@ -22,14 +21,17 @@ void format() {
         assertEquals("Someone, V. S.", a.format("Van Something Someone"));
 
         // Two names
-        assertEquals("von Neumann, J. and Black Brown, P.", a
-                .format("John von Neumann and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, J. and Black Brown, P.",
+                a.format("John von Neumann and Black Brown, Peter"));
 
         // Three names
-        assertEquals("von Neumann, J., Smith, J. and Black Brown, P.", a
-                .format("von Neumann, John and Smith, John and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, J., Smith, J. and Black Brown, P.",
+                a.format("von Neumann, John and Smith, John and Black Brown, Peter"));
 
-        assertEquals("von Neumann, J., Smith, J. and Black Brown, P.", a
-                .format("John von Neumann and John Smith and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, J., Smith, J. and Black Brown, P.",
+                a.format("John von Neumann and John Smith and Black Brown, Peter"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java
index b7d355f2b064..ad9df6f4376c 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbrOxfordCommasTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.LayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.LayoutFormatter;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class AuthorLastFirstAbbrOxfordCommasTest {
 
     /**
@@ -22,14 +21,17 @@ void format() {
         assertEquals("Someone, V. S.", a.format("Van Something Someone"));
 
         // Two names
-        assertEquals("von Neumann, J. and Black Brown, P.", a
-                .format("John von Neumann and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, J. and Black Brown, P.",
+                a.format("John von Neumann and Black Brown, Peter"));
 
         // Three names
-        assertEquals("von Neumann, J., Smith, J., and Black Brown, P.", a
-                .format("von Neumann, John and Smith, John and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, J., Smith, J., and Black Brown, P.",
+                a.format("von Neumann, John and Smith, John and Black Brown, Peter"));
 
-        assertEquals("von Neumann, J., Smith, J., and Black Brown, P.", a
-                .format("John von Neumann and John Smith and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, J., Smith, J., and Black Brown, P.",
+                a.format("John von Neumann and John Smith and Black Brown, Peter"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTest.java
index 42ea2e8db89d..1ed1feb3ce1f 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTest.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.layout.format;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 /**
  * Test case  that verifies the functionalities of the formater AuthorLastFirstAbbreviator.
  */
@@ -52,7 +52,8 @@ void format() {
         assertEquals("", abbreviate(""));
         assertEquals("Someone, V. S.", abbreviate("Someone, Van Something"));
         assertEquals("Smith, J.", abbreviate("Smith, John"));
-        assertEquals("von Neumann, J. and Smith, J. and Black Brown, P.",
+        assertEquals(
+                "von Neumann, J. and Smith, J. and Black Brown, P.",
                 abbreviate("von Neumann, John and Smith, John and Black Brown, Peter"));
     }
 
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java
index 374ebe02f4aa..fdd1e7410c8c 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.LayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.LayoutFormatter;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class AuthorLastFirstCommasTest {
 
     /**
@@ -22,14 +21,17 @@ void format() {
         assertEquals("Someone, Van Something", a.format("Van Something Someone"));
 
         // Two names
-        assertEquals("von Neumann, John and Black Brown, Peter", a
-                .format("John von Neumann and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, John and Black Brown, Peter",
+                a.format("John von Neumann and Black Brown, Peter"));
 
         // Three names
-        assertEquals("von Neumann, John, Smith, John and Black Brown, Peter", a
-                .format("von Neumann, John and Smith, John and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, John, Smith, John and Black Brown, Peter",
+                a.format("von Neumann, John and Smith, John and Black Brown, Peter"));
 
-        assertEquals("von Neumann, John, Smith, John and Black Brown, Peter", a
-                .format("John von Neumann and John Smith and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, John, Smith, John and Black Brown, Peter",
+                a.format("John von Neumann and John Smith and Black Brown, Peter"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java
index 7d20d8dd275d..b78eb8c43cdc 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.LayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.LayoutFormatter;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class AuthorLastFirstOxfordCommasTest {
 
     /**
@@ -22,14 +21,17 @@ void format() {
         assertEquals("Someone, Van Something", a.format("Van Something Someone"));
 
         // Two names
-        assertEquals("von Neumann, John and Black Brown, Peter", a
-                .format("John von Neumann and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, John and Black Brown, Peter",
+                a.format("John von Neumann and Black Brown, Peter"));
 
         // Three names
-        assertEquals("von Neumann, John, Smith, John, and Black Brown, Peter", a
-                .format("von Neumann, John and Smith, John and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, John, Smith, John, and Black Brown, Peter",
+                a.format("von Neumann, John and Smith, John and Black Brown, Peter"));
 
-        assertEquals("von Neumann, John, Smith, John, and Black Brown, Peter", a
-                .format("John von Neumann and John Smith and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, John, Smith, John, and Black Brown, Peter",
+                a.format("John von Neumann and John Smith and Black Brown, Peter"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java
index eaacb19bea2d..f8963d28445d 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.LayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.LayoutFormatter;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class AuthorLastFirstTest {
 
     @Test
@@ -19,14 +18,17 @@ void format() {
         assertEquals("Someone, Van Something", a.format("Van Something Someone"));
 
         // Two names
-        assertEquals("von Neumann, John and Black Brown, Peter", a
-                .format("John von Neumann and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, John and Black Brown, Peter",
+                a.format("John von Neumann and Black Brown, Peter"));
 
         // Three names
-        assertEquals("von Neumann, John and Smith, John and Black Brown, Peter", a
-                .format("von Neumann, John and Smith, John and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, John and Smith, John and Black Brown, Peter",
+                a.format("von Neumann, John and Smith, John and Black Brown, Peter"));
 
-        assertEquals("von Neumann, John and Smith, John and Black Brown, Peter", a
-                .format("John von Neumann and John Smith and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, John and Smith, John and Black Brown, Peter",
+                a.format("John von Neumann and John Smith and Black Brown, Peter"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java
index 4daacb2ea226..ba8cf150053f 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.LayoutFormatter;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class AuthorNatBibTest {
 
@@ -22,12 +21,15 @@ void paramLayoutFormatTest(String expectedString, String inputString) {
 
     private static Stream<Arguments> formatTests() {
         return Stream.of(
-                // Test method for {@link org.jabref.logic.layout.format.AuthorNatBib#format(java.lang.String)}.
-                Arguments.of("von Neumann et al.", "von Neumann,,John and John Smith and Black Brown, Jr, Peter"),
-
-                // Test method for {@link org.jabref.logic.layout.format.AuthorLF_FF#format(java.lang.String)}.
+                // Test method for {@link
+                // org.jabref.logic.layout.format.AuthorNatBib#format(java.lang.String)}.
+                Arguments.of(
+                        "von Neumann et al.",
+                        "von Neumann,,John and John Smith and Black Brown, Jr, Peter"),
+
+                // Test method for {@link
+                // org.jabref.logic.layout.format.AuthorLF_FF#format(java.lang.String)}.
                 Arguments.of("von Neumann and Smith", "von Neumann,,John and John Smith"),
-                Arguments.of("von Neumann", "von Neumann, John")
-        );
+                Arguments.of("von Neumann", "von Neumann, John"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java
index 922032821ca8..d146404574ab 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java
@@ -1,19 +1,19 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.LayoutFormatter;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class AuthorOrgSciTest {
 
     LayoutFormatter authorOrgNatFormatter = new AuthorOrgSci();
-    LayoutFormatter authorOrgNatFormatterComposite = new CompositeFormat(new AuthorOrgSci(), new NoSpaceBetweenAbbreviations());
+    LayoutFormatter authorOrgNatFormatterComposite =
+            new CompositeFormat(new AuthorOrgSci(), new NoSpaceBetweenAbbreviations());
 
     @ParameterizedTest
     @MethodSource("formatTests")
@@ -31,15 +31,17 @@ private static Stream<Arguments> formatTests() {
         return Stream.of(
                 Arguments.of("Flynn, J., S. Gartska", "John Flynn and Sabine Gartska"),
                 Arguments.of("Garvin, D. A.", "David A. Garvin"),
-                Arguments.of("Makridakis, S., S. C. Wheelwright, V. E. McGee", "Sa Makridakis and Sa Ca Wheelwright and Va Ea McGee")
-        );
+                Arguments.of(
+                        "Makridakis, S., S. C. Wheelwright, V. E. McGee",
+                        "Sa Makridakis and Sa Ca Wheelwright and Va Ea McGee"));
     }
 
     private static Stream<Arguments> formatTestsComposite() {
         return Stream.of(
                 Arguments.of("Flynn, J., S. Gartska", "John Flynn and Sabine Gartska"),
                 Arguments.of("Garvin, D.A.", "David A. Garvin"),
-                Arguments.of("Makridakis, S., S.C. Wheelwright, V.E. McGee", "Sa Makridakis and Sa Ca Wheelwright and Va Ea McGee")
-        );
+                Arguments.of(
+                        "Makridakis, S., S.C. Wheelwright, V.E. McGee",
+                        "Sa Makridakis and Sa Ca Wheelwright and Va Ea McGee"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java
index 29bb513c551f..06445c2cf005 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java
@@ -1,68 +1,83 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.ParamLayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.ParamLayoutFormatter;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class AuthorsTest {
 
     private ParamLayoutFormatter authorsLayoutFormatter = new Authors();
 
     @Test
     void standardUsage() {
-        assertEquals("B. C. Bruce, C. Manson and J. Jumper",
-                authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper"));
+        assertEquals(
+                "B. C. Bruce, C. Manson and J. Jumper",
+                authorsLayoutFormatter.format(
+                        "Bob Croydon Bruce and Charles Manson and Jolly Jumper"));
     }
 
     @Test
     void standardUsageOne() {
         authorsLayoutFormatter.setArgument("fullname, LastFirst, Comma, Comma");
-        assertEquals("Bruce, Bob Croydon, Jumper, Jolly", authorsLayoutFormatter.format("Bob Croydon Bruce and Jolly Jumper"));
+        assertEquals(
+                "Bruce, Bob Croydon, Jumper, Jolly",
+                authorsLayoutFormatter.format("Bob Croydon Bruce and Jolly Jumper"));
     }
 
     @Test
     void standardUsageTwo() {
         authorsLayoutFormatter.setArgument("initials");
-        assertEquals("B. C. Bruce and J. Jumper", authorsLayoutFormatter.format("Bob Croydon Bruce and Jolly Jumper"));
+        assertEquals(
+                "B. C. Bruce and J. Jumper",
+                authorsLayoutFormatter.format("Bob Croydon Bruce and Jolly Jumper"));
     }
 
     @Test
     void standardUsageThree() {
         authorsLayoutFormatter.setArgument("fullname, LastFirst, Comma");
-        assertEquals("Bruce, Bob Croydon, Manson, Charles and Jumper, Jolly",
-                authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper"));
+        assertEquals(
+                "Bruce, Bob Croydon, Manson, Charles and Jumper, Jolly",
+                authorsLayoutFormatter.format(
+                        "Bob Croydon Bruce and Charles Manson and Jolly Jumper"));
     }
 
     @Test
     void standardUsageFour() {
         authorsLayoutFormatter.setArgument("fullname, LastFirst, Comma, 2");
-        assertEquals("Bruce, Bob Croydon et al.",
-                authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper"));
+        assertEquals(
+                "Bruce, Bob Croydon et al.",
+                authorsLayoutFormatter.format(
+                        "Bob Croydon Bruce and Charles Manson and Jolly Jumper"));
     }
 
     @Test
     void standardUsageFive() {
         authorsLayoutFormatter.setArgument("fullname, LastFirst, Comma, 3");
-        assertEquals("Bruce, Bob Croydon et al.",
-                authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles"));
+        assertEquals(
+                "Bruce, Bob Croydon et al.",
+                authorsLayoutFormatter.format(
+                        "Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles"));
     }
 
     @Test
     void standardUsageSix() {
         authorsLayoutFormatter.setArgument("fullname, LastFirst, Comma, 3, 2");
-        assertEquals("Bruce, Bob Croydon, Manson, Charles et al.",
-                authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles"));
+        assertEquals(
+                "Bruce, Bob Croydon, Manson, Charles et al.",
+                authorsLayoutFormatter.format(
+                        "Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles"));
     }
 
     @Test
     void specialEtAl() {
         authorsLayoutFormatter.setArgument("fullname, LastFirst, Comma, 3, etal= and a few more");
-        assertEquals("Bruce, Bob Croydon and a few more",
-                authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles"));
+        assertEquals(
+                "Bruce, Bob Croydon and a few more",
+                authorsLayoutFormatter.format(
+                        "Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles"));
     }
 
     @Test
@@ -73,132 +88,159 @@ void standardUsageNull() {
     @Test
     void standardOxford() {
         authorsLayoutFormatter.setArgument("Oxford");
-        assertEquals("B. C. Bruce, C. Manson, and J. Jumper",
-                authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper"));
+        assertEquals(
+                "B. C. Bruce, C. Manson, and J. Jumper",
+                authorsLayoutFormatter.format(
+                        "Bob Croydon Bruce and Charles Manson and Jolly Jumper"));
     }
 
     @Test
     void standardOxfordFullName() {
         authorsLayoutFormatter.setArgument("FullName,Oxford");
-        assertEquals("Bob Croydon Bruce, Charles Manson, and Jolly Jumper",
-                authorsLayoutFormatter.format("Bruce, Bob Croydon and Charles Manson and Jolly Jumper"));
+        assertEquals(
+                "Bob Croydon Bruce, Charles Manson, and Jolly Jumper",
+                authorsLayoutFormatter.format(
+                        "Bruce, Bob Croydon and Charles Manson and Jolly Jumper"));
     }
 
     @Test
     void standardCommaFullName() {
         authorsLayoutFormatter.setArgument("FullName,Comma,Comma");
-        assertEquals("Bob Croydon Bruce, Charles Manson, Jolly Jumper",
-                authorsLayoutFormatter.format("Bruce, Bob Croydon and Charles Manson and Jolly Jumper"));
+        assertEquals(
+                "Bob Croydon Bruce, Charles Manson, Jolly Jumper",
+                authorsLayoutFormatter.format(
+                        "Bruce, Bob Croydon and Charles Manson and Jolly Jumper"));
     }
 
     @Test
     void standardAmpFullName() {
         authorsLayoutFormatter.setArgument("FullName,Amp");
-        assertEquals("Bob Croydon Bruce, Charles Manson & Jolly Jumper",
-                authorsLayoutFormatter.format("Bruce, Bob Croydon and Charles Manson and Jolly Jumper"));
+        assertEquals(
+                "Bob Croydon Bruce, Charles Manson & Jolly Jumper",
+                authorsLayoutFormatter.format(
+                        "Bruce, Bob Croydon and Charles Manson and Jolly Jumper"));
     }
 
     @Test
     void lastName() {
         authorsLayoutFormatter.setArgument("LastName");
-        assertEquals("Bruce, von Manson and Jumper",
-                authorsLayoutFormatter.format("Bruce, Bob Croydon and Charles von Manson and Jolly Jumper"));
+        assertEquals(
+                "Bruce, von Manson and Jumper",
+                authorsLayoutFormatter.format(
+                        "Bruce, Bob Croydon and Charles von Manson and Jolly Jumper"));
     }
 
     @Test
     void middleInitial() {
         authorsLayoutFormatter.setArgument("MiddleInitial");
-        assertEquals("Bob C. Bruce, Charles K. von Manson and Jolly Jumper",
-                authorsLayoutFormatter.format("Bruce, Bob Croydon and Charles Kermit von Manson and Jumper, Jolly"));
+        assertEquals(
+                "Bob C. Bruce, Charles K. von Manson and Jolly Jumper",
+                authorsLayoutFormatter.format(
+                        "Bruce, Bob Croydon and Charles Kermit von Manson and Jumper, Jolly"));
     }
 
     @Test
     void noPeriod() {
         authorsLayoutFormatter.setArgument("NoPeriod");
-        assertEquals("B C Bruce, C K von Manson and J Jumper",
-                authorsLayoutFormatter.format("Bruce, Bob Croydon and Charles Kermit von Manson and Jumper, Jolly"));
+        assertEquals(
+                "B C Bruce, C K von Manson and J Jumper",
+                authorsLayoutFormatter.format(
+                        "Bruce, Bob Croydon and Charles Kermit von Manson and Jumper, Jolly"));
     }
 
     @Test
     void etAl() {
         authorsLayoutFormatter.setArgument("2,1");
-        assertEquals("B. C. Bruce et al.",
-                authorsLayoutFormatter.format("Bruce, Bob Croydon and Charles Kermit von Manson and Jumper, Jolly"));
+        assertEquals(
+                "B. C. Bruce et al.",
+                authorsLayoutFormatter.format(
+                        "Bruce, Bob Croydon and Charles Kermit von Manson and Jumper, Jolly"));
     }
 
     @Test
     void etAlNotEnoughAuthors() {
         authorsLayoutFormatter.setArgument("2,1");
-        assertEquals("B. C. Bruce and C. K. von Manson",
+        assertEquals(
+                "B. C. Bruce and C. K. von Manson",
                 authorsLayoutFormatter.format("Bruce, Bob Croydon and Charles Kermit von Manson"));
     }
 
     @Test
     void emptyEtAl() {
         authorsLayoutFormatter.setArgument("fullname, LastFirst, Comma, 3, etal=");
-        assertEquals("Bruce, Bob Croydon",
-                authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles"));
+        assertEquals(
+                "Bruce, Bob Croydon",
+                authorsLayoutFormatter.format(
+                        "Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles"));
     }
 
     @ParameterizedTest(name = "arg={0}, formattedStr={1}")
     @CsvSource({
-            "FirstFirst, 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // FirstFirst
-            "LastFirst, 'Bruce, B. C., Manson, C., Jumper, J. and Chuckles, C.'", // LastFirst
-            "LastFirstFirstFirst, 'Bruce, B. C., C. Manson, J. Jumper and C. Chuckles'" // LastFirstFirstFirst
+        "FirstFirst, 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // FirstFirst
+        "LastFirst, 'Bruce, B. C., Manson, C., Jumper, J. and Chuckles, C.'", // LastFirst
+        "LastFirstFirstFirst, 'Bruce, B. C., C. Manson, J. Jumper and C. Chuckles'" // LastFirstFirstFirst
     })
     void authorOrder(String arg, String expectedResult) {
         authorsLayoutFormatter.setArgument(arg);
-        String formattedStr = authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles");
+        String formattedStr =
+                authorsLayoutFormatter.format(
+                        "Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles");
         assertEquals(expectedResult, formattedStr);
     }
 
     @ParameterizedTest(name = "arg={0}, formattedStr={1}")
     @CsvSource({
-            "FullName, 'Bob Croydon Bruce, Charles Manson, Jolly Jumper and Chuck Chuckles'", // FullName
-            "Initials, 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // Initials
-            "FirstInitial, 'B. Bruce, C. Manson, J. Jumper and C. Chuckles'", // FirstInitial
-            "MiddleInitial, 'Bob C. Bruce, Charles Manson, Jolly Jumper and Chuck Chuckles'", // MiddleInitial
-            "LastName, 'Bruce, Manson, Jumper and Chuckles'", // LastName
-            "InitialsNoSpace, 'B.C. Bruce, C. Manson, J. Jumper and C. Chuckles'" // InitialsNoSpace
+        "FullName, 'Bob Croydon Bruce, Charles Manson, Jolly Jumper and Chuck Chuckles'", // FullName
+        "Initials, 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // Initials
+        "FirstInitial, 'B. Bruce, C. Manson, J. Jumper and C. Chuckles'", // FirstInitial
+        "MiddleInitial, 'Bob C. Bruce, Charles Manson, Jolly Jumper and Chuck Chuckles'", // MiddleInitial
+        "LastName, 'Bruce, Manson, Jumper and Chuckles'", // LastName
+        "InitialsNoSpace, 'B.C. Bruce, C. Manson, J. Jumper and C. Chuckles'" // InitialsNoSpace
     })
     void authorABRV(String arg, String expectedResult) {
         authorsLayoutFormatter.setArgument(arg);
-        String formattedStr = authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles");
+        String formattedStr =
+                authorsLayoutFormatter.format(
+                        "Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles");
         assertEquals(expectedResult, formattedStr);
     }
 
     @ParameterizedTest(name = "arg={0}, formattedStr={1}")
     @CsvSource({
-            "FullPunc, 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // FullPunc
-            "NoPunc, 'B C Bruce, C Manson, J Jumper and C Chuckles'", // NoPunc
-            "NoComma, 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // NoComma
-            "NoPeriod, 'B C Bruce, C Manson, J Jumper and C Chuckles'" // NoPeriod
+        "FullPunc, 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // FullPunc
+        "NoPunc, 'B C Bruce, C Manson, J Jumper and C Chuckles'", // NoPunc
+        "NoComma, 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // NoComma
+        "NoPeriod, 'B C Bruce, C Manson, J Jumper and C Chuckles'" // NoPeriod
     })
     void authorPUNC(String arg, String expectedResult) {
         authorsLayoutFormatter.setArgument(arg);
-        String formattedStr = authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles");
+        String formattedStr =
+                authorsLayoutFormatter.format(
+                        "Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles");
         assertEquals(expectedResult, formattedStr);
     }
 
     @ParameterizedTest(name = "arg={0}, formattedStr={1}")
     @CsvSource({
-            "Comma, 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // Comma
-            "And, 'B. C. Bruce and C. Manson and J. Jumper and C. Chuckles'", // And
-            "Colon, 'B. C. Bruce: C. Manson: J. Jumper and C. Chuckles'", // Colon
-            "Semicolon, 'B. C. Bruce; C. Manson; J. Jumper and C. Chuckles'", // Semicolon
-            "Oxford, 'B. C. Bruce, C. Manson, J. Jumper, and C. Chuckles'", // Oxford
-            "Amp, 'B. C. Bruce, C. Manson, J. Jumper & C. Chuckles'", // Amp
-            "Sep, 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // Sep
-            "LastSep, 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // LastSep
-            "Sep=|, 'B. C. Bruce|C. Manson|J. Jumper and C. Chuckles'", // Custom Sep
-            "LastSep=|, 'B. C. Bruce, C. Manson, J. Jumper|C. Chuckles'", // Custom LastSep
-            "'Comma, And', 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // Comma And
-            "'Comma, Colon', 'B. C. Bruce, C. Manson, J. Jumper: C. Chuckles'", // Comma Colon
-            "'Comma, Semicolon', 'B. C. Bruce, C. Manson, J. Jumper; C. Chuckles'", // Comma Semicolon
+        "Comma, 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // Comma
+        "And, 'B. C. Bruce and C. Manson and J. Jumper and C. Chuckles'", // And
+        "Colon, 'B. C. Bruce: C. Manson: J. Jumper and C. Chuckles'", // Colon
+        "Semicolon, 'B. C. Bruce; C. Manson; J. Jumper and C. Chuckles'", // Semicolon
+        "Oxford, 'B. C. Bruce, C. Manson, J. Jumper, and C. Chuckles'", // Oxford
+        "Amp, 'B. C. Bruce, C. Manson, J. Jumper & C. Chuckles'", // Amp
+        "Sep, 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // Sep
+        "LastSep, 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // LastSep
+        "Sep=|, 'B. C. Bruce|C. Manson|J. Jumper and C. Chuckles'", // Custom Sep
+        "LastSep=|, 'B. C. Bruce, C. Manson, J. Jumper|C. Chuckles'", // Custom LastSep
+        "'Comma, And', 'B. C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // Comma And
+        "'Comma, Colon', 'B. C. Bruce, C. Manson, J. Jumper: C. Chuckles'", // Comma Colon
+        "'Comma, Semicolon', 'B. C. Bruce, C. Manson, J. Jumper; C. Chuckles'", // Comma Semicolon
     })
     void authorSEPARATORS(String arg, String expectedResult) {
         authorsLayoutFormatter.setArgument(arg);
-        String formattedStr = authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles");
+        String formattedStr =
+                authorsLayoutFormatter.format(
+                        "Bob Croydon Bruce and Charles Manson and Jolly Jumper and Chuck Chuckles");
         assertEquals(expectedResult, formattedStr);
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java b/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java
index a682dcbfadd1..52168675127c 100644
--- a/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.LayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.LayoutFormatter;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class CompositeFormatTest {
 
     @Test
@@ -16,21 +15,29 @@ void emptyComposite() {
 
     @Test
     void arrayComposite() {
-        LayoutFormatter f = new CompositeFormat(new LayoutFormatter[]{fieldText -> fieldText + fieldText,
-                fieldText -> "A" + fieldText, fieldText -> "B" + fieldText});
+        LayoutFormatter f =
+                new CompositeFormat(
+                        new LayoutFormatter[] {
+                            fieldText -> fieldText + fieldText,
+                            fieldText -> "A" + fieldText,
+                            fieldText -> "B" + fieldText
+                        });
 
         assertEquals("BAff", f.format("f"));
     }
 
     @Test
     void doubleComposite() {
-        LayoutFormatter f = new CompositeFormat(new AuthorOrgSci(), new NoSpaceBetweenAbbreviations());
+        LayoutFormatter f =
+                new CompositeFormat(new AuthorOrgSci(), new NoSpaceBetweenAbbreviations());
         LayoutFormatter first = new AuthorOrgSci();
         LayoutFormatter second = new NoSpaceBetweenAbbreviations();
 
-        assertEquals(second.format(first.format("John Flynn and Sabine Gartska")),
+        assertEquals(
+                second.format(first.format("John Flynn and Sabine Gartska")),
                 f.format("John Flynn and Sabine Gartska"));
-        assertEquals(second.format(first.format("Sa Makridakis and Sa Ca Wheelwright and Va Ea McGee")),
+        assertEquals(
+                second.format(first.format("Sa Makridakis and Sa Ca Wheelwright and Va Ea McGee")),
                 f.format("Sa Makridakis and Sa Ca Wheelwright and Va Ea McGee"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java b/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java
index ab3691c250a7..2141cb4b07c1 100644
--- a/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.logic.preferences.DOIPreferences;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.stream.Stream;
 
 class DOICheckTest {
 
@@ -29,22 +28,29 @@ void formatDOI(String formattedDOI, String originalDOI) {
     void formatDOIWithCustomBase() {
         when(doiPreferences.isUseCustom()).thenReturn(true);
         when(doiPreferences.getDefaultBaseURI()).thenReturn("http://example.org");
-        assertEquals("http://example.org/10.1000/ISBN1-900512-44-0", layoutFormatter.format("10.1000/ISBN1-900512-44-0"));
+        assertEquals(
+                "http://example.org/10.1000/ISBN1-900512-44-0",
+                layoutFormatter.format("10.1000/ISBN1-900512-44-0"));
     }
 
     private static Stream<Arguments> provideDOI() {
         return Stream.of(
                 Arguments.of("", ""),
                 Arguments.of(null, null),
-                Arguments.of("https://doi.org/10.1000/ISBN1-900512-44-0", "10.1000/ISBN1-900512-44-0"),
-                Arguments.of("https://doi.org/10.1000/ISBN1-900512-44-0", "http://dx.doi.org/10.1000/ISBN1-900512-44-0"),
-                Arguments.of("https://doi.org/10.1000/ISBN1-900512-44-0", "http://doi.acm.org/10.1000/ISBN1-900512-44-0"),
-                Arguments.of("https://doi.org/10.1145/354401.354407", "http://doi.acm.org/10.1145/354401.354407"),
+                Arguments.of(
+                        "https://doi.org/10.1000/ISBN1-900512-44-0", "10.1000/ISBN1-900512-44-0"),
+                Arguments.of(
+                        "https://doi.org/10.1000/ISBN1-900512-44-0",
+                        "http://dx.doi.org/10.1000/ISBN1-900512-44-0"),
+                Arguments.of(
+                        "https://doi.org/10.1000/ISBN1-900512-44-0",
+                        "http://doi.acm.org/10.1000/ISBN1-900512-44-0"),
+                Arguments.of(
+                        "https://doi.org/10.1145/354401.354407",
+                        "http://doi.acm.org/10.1145/354401.354407"),
                 Arguments.of("https://doi.org/10.1145/354401.354407", "10.1145/354401.354407"),
                 Arguments.of("https://doi.org/10.1145/354401.354407", "/10.1145/354401.354407"),
                 Arguments.of("10", "10"),
-                Arguments.of("1", "1")
-
-        );
+                Arguments.of("1", "1"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java b/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java
index 019886ab5a75..fbeae7c05920 100644
--- a/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java
@@ -1,35 +1,36 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.LayoutFormatter;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class DOIStripTest {
 
-  LayoutFormatter layoutFormatter = new DOIStrip();
+    LayoutFormatter layoutFormatter = new DOIStrip();
 
     @ParameterizedTest
     @MethodSource("provideDOI")
     void formatDOIStrip(String formattedDOI, String originalDOI) {
-      assertEquals(formattedDOI, layoutFormatter.format(originalDOI));
-  }
-
-  private static Stream<Arguments> provideDOI() {
-    return Stream.of(
-            Arguments.of("", ""),
-            Arguments.of(null, null),
-            Arguments.of("10.1000/ISBN1-900512-44-0", "10.1000/ISBN1-900512-44-0"),
-            Arguments.of("10.1000/ISBN1-900512-44-0", "http://dx.doi.org/10.1000/ISBN1-900512-44-0"),
-            Arguments.of("10.1000/ISBN1-900512-44-0", "http://doi.acm.org/10.1000/ISBN1-900512-44-0"),
-            Arguments.of("10.1145/354401.354407", "http://doi.acm.org/10.1145/354401.354407"),
-            Arguments.of("10", "10"),
-            Arguments.of("1", "1")
-    );
-  }
+        assertEquals(formattedDOI, layoutFormatter.format(originalDOI));
+    }
+
+    private static Stream<Arguments> provideDOI() {
+        return Stream.of(
+                Arguments.of("", ""),
+                Arguments.of(null, null),
+                Arguments.of("10.1000/ISBN1-900512-44-0", "10.1000/ISBN1-900512-44-0"),
+                Arguments.of(
+                        "10.1000/ISBN1-900512-44-0", "http://dx.doi.org/10.1000/ISBN1-900512-44-0"),
+                Arguments.of(
+                        "10.1000/ISBN1-900512-44-0",
+                        "http://doi.acm.org/10.1000/ISBN1-900512-44-0"),
+                Arguments.of("10.1145/354401.354407", "http://doi.acm.org/10.1145/354401.354407"),
+                Arguments.of("10", "10"),
+                Arguments.of("1", "1"));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java b/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java
index 217c43835e24..880f9b2b4700 100644
--- a/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.ParamLayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.ParamLayoutFormatter;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class DateFormatterTest {
 
     private ParamLayoutFormatter formatter;
@@ -31,11 +30,11 @@ void requestedFormat() {
 
     @ParameterizedTest(name = "formatArg={0}, input={1}, formattedStr={2}")
     @CsvSource({
-            "MM/dd/yyyy, 2016-07-15, 07/15/2016", // MM/dd/yyyy
-            "dd MMMM yyyy, 2016-07-15, 15 July 2016", // dd MMMM yyyy
-            "MM-dd-yyyy, 2016-07-15, 07-15-2016", // MM-dd-yyyy
-            "yyyy.MM.dd, 2016-07-15, 2016.07.15", // yyyy.MM.dd
-            "yyyy/MM, 2016-07-15, 2016/07", // yyyy/MM
+        "MM/dd/yyyy, 2016-07-15, 07/15/2016", // MM/dd/yyyy
+        "dd MMMM yyyy, 2016-07-15, 15 July 2016", // dd MMMM yyyy
+        "MM-dd-yyyy, 2016-07-15, 07-15-2016", // MM-dd-yyyy
+        "yyyy.MM.dd, 2016-07-15, 2016.07.15", // yyyy.MM.dd
+        "yyyy/MM, 2016-07-15, 2016/07", // yyyy/MM
     })
     void otherFormats(String formatArg, String input, String expectedResult) {
         formatter.setArgument(formatArg);
diff --git a/src/test/java/org/jabref/logic/layout/format/DefaultTest.java b/src/test/java/org/jabref/logic/layout/format/DefaultTest.java
index ddaea45c2fb3..b8f2a4271ff9 100644
--- a/src/test/java/org/jabref/logic/layout/format/DefaultTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/DefaultTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.ParamLayoutFormatter;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class DefaultTest {
 
@@ -16,7 +15,8 @@ class DefaultTest {
 
     @ParameterizedTest
     @MethodSource("formatTests")
-    void paramLayoutFormatTest(String expectedString, String inputString, String formatterArgument) {
+    void paramLayoutFormatTest(
+            String expectedString, String inputString, String formatterArgument) {
         if (!formatterArgument.isEmpty()) {
             paramLayoutFormatter.setArgument(formatterArgument);
         }
@@ -30,7 +30,6 @@ private static Stream<Arguments> formatTests() {
                 Arguments.of("DEFAULT TEXT", "", "DEFAULT TEXT"),
                 Arguments.of("Bob Bruce and Jolly Jumper", "Bob Bruce and Jolly Jumper", ""),
                 Arguments.of("", null, ""),
-                Arguments.of("", "", "")
-        );
+                Arguments.of("", "", ""));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java b/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java
index e9cfcfc684e2..2c97d0c32228 100644
--- a/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class EntryTypeFormatterTest {
 
@@ -23,7 +23,6 @@ private static Stream<Arguments> formatTests() {
                 Arguments.of("Article", "article"),
                 Arguments.of("Banana", "banana"),
                 Arguments.of("InBook", "inbook"),
-                Arguments.of("Aarticle", "aarticle")
-        );
+                Arguments.of("Aarticle", "aarticle"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java b/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java
index 1b58d4a07c79..840068c6a84d 100644
--- a/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.layout.format;
 
-import java.util.Collections;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.ParamLayoutFormatter;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
+import java.util.stream.Stream;
 
 class FileLinkTest {
 
@@ -38,7 +37,6 @@ private static Stream<Arguments> provideFileLinks() {
                 Arguments.of("test.pdf", "paper:test.pdf:PDF", ""),
                 Arguments.of("test.pdf", "paper:test.pdf:PDF;presentation:pres.ppt:PPT", ""),
                 Arguments.of("pres.ppt", "paper:test.pdf:PDF;presentation:pres.ppt:PPT", "ppt"),
-                Arguments.of("", "paper:test.pdf:PDF;presentation:pres.ppt:PPT", "doc")
-        );
+                Arguments.of("", "paper:test.pdf:PDF;presentation:pres.ppt:PPT", "doc"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java b/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java
index 9326bbd0f5bd..bfbb62025a98 100644
--- a/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.LayoutFormatter;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class FirstPageTest {
 
@@ -26,7 +25,6 @@ private static Stream<Arguments> providePages() {
                 Arguments.of("", null),
                 Arguments.of("345", "345"),
                 Arguments.of("345", "345-350"),
-                Arguments.of("345", "345--350")
-        );
+                Arguments.of("345", "345--350"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java b/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java
index da6acd50c169..4bd2bdba7c87 100644
--- a/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java
@@ -1,17 +1,16 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.logic.layout.ParamLayoutFormatter;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class HTMLCharsTest {
 
@@ -29,9 +28,13 @@ private static Stream<Arguments> provideBasicFormattingData() {
         return Stream.of(
                 Arguments.of("", ""),
                 Arguments.of("hallo", "hallo"),
-                Arguments.of("Réflexions sur le timing de la quantité", "Réflexions sur le timing de la quantité"),
+                Arguments.of(
+                        "Réflexions sur le timing de la quantité",
+                        "Réflexions sur le timing de la quantité"),
                 Arguments.of("%%%", "\\%\\%\\%"),
-                Arguments.of("People remember 10%, 20%…Oh Really?", "{{People remember 10\\%, 20\\%…Oh Really?}}"),
+                Arguments.of(
+                        "People remember 10%, 20%…Oh Really?",
+                        "{{People remember 10\\%, 20\\%…Oh Really?}}"),
                 Arguments.of("h&aacute;llo", "h\\'allo"),
                 Arguments.of("&imath; &imath;", "\\i \\i"),
                 Arguments.of("&imath;", "\\i"),
@@ -43,8 +46,8 @@ private static Stream<Arguments> provideBasicFormattingData() {
                 Arguments.of("&Ccedil;", "{\\c{C}}"),
                 Arguments.of("&Ccedil;", "\\c{C}"),
                 Arguments.of("&Oogon;&imath;", "\\k{O}\\i"),
-                Arguments.of("&ntilde; &ntilde; &iacute; &imath; &imath;", "\\~{n} \\~n \\'i \\i \\i")
-        );
+                Arguments.of(
+                        "&ntilde; &ntilde; &iacute; &imath; &imath;", "\\~{n} \\~n \\'i \\i \\i"));
     }
 
     @ParameterizedTest
@@ -58,22 +61,17 @@ private static Stream<Arguments> provideLaTeXHighlightingFormattingData() {
                 Arguments.of("<em>hallo</em>", "\\emph{hallo}"),
                 Arguments.of("<em>hallo</em>", "{\\emph hallo}"),
                 Arguments.of("<em>hallo</em>", "{\\em hallo}"),
-
                 Arguments.of("<i>hallo</i>", "\\textit{hallo}"),
                 Arguments.of("<i>hallo</i>", "{\\textit hallo}"),
                 Arguments.of("<i>hallo</i>", "{\\it hallo}"),
-
                 Arguments.of("<b>hallo</b>", "\\textbf{hallo}"),
                 Arguments.of("<b>hallo</b>", "{\\textbf hallo}"),
                 Arguments.of("<b>hallo</b>", "{\\bf hallo}"),
-
                 Arguments.of("<sup>hallo</sup>", "\\textsuperscript{hallo}"),
                 Arguments.of("<sub>hallo</sub>", "\\textsubscript{hallo}"),
-
                 Arguments.of("<u>hallo</u>", "\\underline{hallo}"),
                 Arguments.of("<s>hallo</s>", "\\sout{hallo}"),
-                Arguments.of("<tt>hallo</tt>", "\\texttt{hallo}")
-        );
+                Arguments.of("<tt>hallo</tt>", "\\texttt{hallo}"));
     }
 
     @ParameterizedTest
@@ -86,8 +84,9 @@ private static Stream<Arguments> provideEquationTestData() {
         return Stream.of(
                 Arguments.of("&dollar;", "\\$"),
                 Arguments.of("&sigma;", "$\\sigma$"),
-                Arguments.of("A 32&nbsp;mA &Sigma;&Delta;-modulator", "A 32~{mA} {$\\Sigma\\Delta$}-modulator")
-        );
+                Arguments.of(
+                        "A 32&nbsp;mA &Sigma;&Delta;-modulator",
+                        "A 32~{mA} {$\\Sigma\\Delta$}-modulator"));
     }
 
     @ParameterizedTest
@@ -97,10 +96,7 @@ void equations(String expected, String input) {
     }
 
     private static Stream<Arguments> provideNewLineTestData() {
-        return Stream.of(
-                Arguments.of("a<br>b", "a\nb"),
-                Arguments.of("a<p>b", "a\n\nb")
-        );
+        return Stream.of(Arguments.of("a<br>b", "a\nb"), Arguments.of("a<p>b", "a\n\nb"));
     }
 
     @ParameterizedTest
@@ -140,8 +136,7 @@ private static Stream<Arguments> provideHTMLEntityFormattingData() {
                 Arguments.of("&amp;HelloWorld", "&HelloWorld"),
                 Arguments.of("&amp;amp;", "\\\\&"),
                 Arguments.of("&lt;", "&lt;"),
-                Arguments.of("&gt;", "&gt;")
-        );
+                Arguments.of("&gt;", "&gt;"));
     }
 
     @ParameterizedTest
@@ -152,15 +147,14 @@ void hTMLEntityFormatting(String expected, String input) {
 
     private static Stream<Arguments> provideBracesKeepFormattingData() {
         return Stream.of(
-            Arguments.of("{&auml;}", "{\\\"{a}}"),
-            Arguments.of("{&auml;}", "{\\\"a}"),
-            Arguments.of("{&Ccedil;}", "{\\c{C}}"),
-            Arguments.of("{<em>hallo</em>}", "{\\emph hallo}"),
-            Arguments.of("{<b>hallo</b>}", "{\\textbf hallo}"),
-            Arguments.of("{<b>hallo</b>}", "{\\bf hallo}"),
-            Arguments.of("{&#39;}", "{\\textquotesingle}"),
-            Arguments.of("{{ test }}", "{{ test }}")
-        );
+                Arguments.of("{&auml;}", "{\\\"{a}}"),
+                Arguments.of("{&auml;}", "{\\\"a}"),
+                Arguments.of("{&Ccedil;}", "{\\c{C}}"),
+                Arguments.of("{<em>hallo</em>}", "{\\emph hallo}"),
+                Arguments.of("{<b>hallo</b>}", "{\\textbf hallo}"),
+                Arguments.of("{<b>hallo</b>}", "{\\bf hallo}"),
+                Arguments.of("{&#39;}", "{\\textquotesingle}"),
+                Arguments.of("{{ test }}", "{{ test }}"));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java b/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java
index bd88e13ec574..a816415166d4 100644
--- a/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.LayoutFormatter;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class HTMLParagraphsTest {
 
@@ -25,8 +24,11 @@ private static Stream<Arguments> htmlFormatTests() {
                 Arguments.of("", ""),
                 Arguments.of("<p>\nHello\n</p>", "Hello"),
                 Arguments.of("<p>\nHello\nWorld\n</p>", "Hello\nWorld"),
-                Arguments.of("<p>\nHello World\n</p>\n<p>\nWhat a lovely day\n</p>", "Hello World\n   \nWhat a lovely day\n"),
-                Arguments.of("<p>\nHello World\n</p>\n<p>\nCould not be any better\n</p>\n<p>\nWhat a lovely day\n</p>", "Hello World\n \n\nCould not be any better\n\nWhat a lovely day\n")
-        );
+                Arguments.of(
+                        "<p>\nHello World\n</p>\n<p>\nWhat a lovely day\n</p>",
+                        "Hello World\n   \nWhat a lovely day\n"),
+                Arguments.of(
+                        "<p>\nHello World\n</p>\n<p>\nCould not be any better\n</p>\n<p>\nWhat a lovely day\n</p>",
+                        "Hello World\n \n\nCould not be any better\n\nWhat a lovely day\n"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java b/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java
index 00fccb97fb61..cc19a0d1d9b1 100644
--- a/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/IfPluralTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.ParamLayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.ParamLayoutFormatter;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class IfPluralTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/LastPageTest.java b/src/test/java/org/jabref/logic/layout/format/LastPageTest.java
index 84b34eee8f98..32ae15d6e434 100644
--- a/src/test/java/org/jabref/logic/layout/format/LastPageTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/LastPageTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.LayoutFormatter;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class LastPageTest {
 
@@ -27,7 +26,6 @@ private static Stream<Arguments> provideArguments() {
                 Arguments.of("345", "345"),
                 Arguments.of("350", "345-350"),
                 Arguments.of("350", "345--350"),
-                Arguments.of("", "--")
-        );
+                Arguments.of("", "--"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java b/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java
index 61a22bd4012b..4dd602b65882 100644
--- a/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.layout.format;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class LatexToUnicodeFormatterTest {
 
     final LatexToUnicodeFormatter formatter = new LatexToUnicodeFormatter();
@@ -23,10 +23,7 @@ void formatUmlaut() {
     }
 
     @ParameterizedTest
-    @CsvSource({
-            "ı, \\i",
-            "ı, {\\i}"
-    })
+    @CsvSource({"ı, \\i", "ı, {\\i}"})
     void smallIwithoutDot(String expected, String input) {
         assertEquals(expected, formatter.format(input));
     }
@@ -39,7 +36,9 @@ void preserveUnknownCommand() {
     @Test
     void formatTextit() {
         // See #1464
-        assertEquals("\uD835\uDC61\uD835\uDC52\uD835\uDC65\uD835\uDC61", formatter.format("\\textit{text}"));
+        assertEquals(
+                "\uD835\uDC61\uD835\uDC52\uD835\uDC65\uD835\uDC61",
+                formatter.format("\\textit{text}"));
     }
 
     @Test
@@ -54,7 +53,8 @@ void equationsSingleSymbol() {
 
     @Test
     void equationsMoreComplicatedFormatting() {
-        assertEquals("A 32 mA ΣΔ-modulator", formatter.format("A 32~{mA} {$\\Sigma\\Delta$}-modulator"));
+        assertEquals(
+                "A 32 mA ΣΔ-modulator", formatter.format("A 32~{mA} {$\\Sigma\\Delta$}-modulator"));
     }
 
     @Test
@@ -81,7 +81,8 @@ void iWithDiaresis() {
 
     @Test
     void iWithDiaresisAndEscapedI() {
-        // this might look strange in the test, but is actually a correct translation and renders identically to the above example in the UI
+        // this might look strange in the test, but is actually a correct translation and renders
+        // identically to the above example in the UI
         assertEquals("ı̈", formatter.format("\\\"{\\i}"));
     }
 
@@ -179,7 +180,10 @@ void conversionOfUnderscoreWithBraces() {
      */
     @Test
     void twoDifferentMacrons() {
-        assertEquals("Puṇya-pattana-vidyā-pı̄ṭhādhi-kṛtaiḥ prā-kaśyaṃ nı̄taḥ", formatter.format("Pu{\\d{n}}ya-pattana-vidy{\\={a}}-p{\\={\\i}}{\\d{t}}h{\\={a}}dhi-k{\\d{r}}tai{\\d{h}} pr{\\={a}}-ka{{\\'{s}}}ya{\\d{m}} n{\\={\\i}}ta{\\d{h}}"));
+        assertEquals(
+                "Puṇya-pattana-vidyā-pı̄ṭhādhi-kṛtaiḥ prā-kaśyaṃ nı̄taḥ",
+                formatter.format(
+                        "Pu{\\d{n}}ya-pattana-vidy{\\={a}}-p{\\={\\i}}{\\d{t}}h{\\={a}}dhi-k{\\d{r}}tai{\\d{h}} pr{\\={a}}-ka{{\\'{s}}}ya{\\d{m}} n{\\={\\i}}ta{\\d{h}}"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/MarkdownFormatterTest.java b/src/test/java/org/jabref/logic/layout/format/MarkdownFormatterTest.java
index 2bfb5ef4caaa..5f31b8442da8 100644
--- a/src/test/java/org/jabref/logic/layout/format/MarkdownFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/MarkdownFormatterTest.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -8,8 +9,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.stream.Stream;
 
 class MarkdownFormatterTest {
 
@@ -22,73 +22,75 @@ void setUp() {
 
     @Test
     void formatWhenFormattingNullThenThrowsException() {
-        Exception exception = assertThrows(NullPointerException.class, () -> markdownFormatter.format(null));
-        assertEquals("Field Text should not be null, when handed to formatter", exception.getMessage());
+        Exception exception =
+                assertThrows(NullPointerException.class, () -> markdownFormatter.format(null));
+        assertEquals(
+                "Field Text should not be null, when handed to formatter", exception.getMessage());
     }
 
     private static Stream<Arguments> provideMarkdownAndHtml() {
         return Stream.of(
                 Arguments.of("Hello World", "<p>Hello World</p>"),
-                Arguments.of("""
+                Arguments.of(
+                        """
                         Markup
-                        
+
                         * list item one
                         * list item two
-                        
+
                          rest
                         """,
-                        "<p>Markup</p> <ul> <li>list item one</li> <li>list item two</li> </ul> <p>rest</p>"
-                ),
-                Arguments.of("""
+                        "<p>Markup</p> <ul> <li>list item one</li> <li>list item two</li> </ul> <p>rest</p>"),
+                Arguments.of(
+                        """
                         ```
                         Hello World
                         ```
                         """,
-                        "<pre><code>Hello World </code></pre>"
-                ),
-                Arguments.of("""
+                        "<pre><code>Hello World </code></pre>"),
+                Arguments.of(
+                        """
                        First line
-                    
+
                        Second line
-                    
+
                        ```java
                        String test;
                        ```
                     """,
-                    "<p>First line</p> <p>Second line</p> <pre><code class=\"language-java\">String test; </code></pre>"
-                ),
-                Arguments.of("""
+                        "<p>First line</p> <p>Second line</p> <pre><code class=\"language-java\">String test; </code></pre>"),
+                Arguments.of(
+                        """
                        Some text.
                        ```javascript
                        let test = "Hello World";
                        ```
-                    
+
                        ```java
                        String test = "Hello World";
                        ```
                        Some more text.
                     """,
-                    "<p>Some text.</p> <pre><code class=\"language-javascript\">let test = &quot;Hello World&quot;; " +
-                            "</code></pre> <pre><code class=\"language-java\">String test = &quot;Hello World&quot;; " +
-                            "</code></pre> <p>Some more text.</p>"
-                ),
-                Arguments.of("""
+                        "<p>Some text.</p> <pre><code class=\"language-javascript\">let test = &quot;Hello World&quot;; "
+                                + "</code></pre> <pre><code class=\"language-java\">String test = &quot;Hello World&quot;; "
+                                + "</code></pre> <p>Some more text.</p>"),
+                Arguments.of(
+                        """
                         Some text.
-                        
+
                         ```java
                         int foo = 0;
                         foo = 1;
-                        
+
                         ```
                         """,
-                        "<p>Some text.</p> <pre><code class=\"language-java\">int foo = 0; foo = 1;  </code></pre>"
-                )
-        );
+                        "<p>Some text.</p> <pre><code class=\"language-java\">int foo = 0; foo = 1;  </code></pre>"));
     }
 
     @ParameterizedTest
     @MethodSource("provideMarkdownAndHtml")
-    void formatWhenFormattingCodeBlockThenReturnsCodeBlockInHtml(String markdown, String expectedHtml) {
+    void formatWhenFormattingCodeBlockThenReturnsCodeBlockInHtml(
+            String markdown, String expectedHtml) {
         assertEquals(expectedHtml, markdownFormatter.format(markdown));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java b/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java
index a1154cd233ea..f64711308d6a 100644
--- a/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.layout.format;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 class NameFormatterTest {
 
     @Test
@@ -12,20 +12,32 @@ void formatStringStringBibtexEntry() {
 
         assertEquals("Doe", l.format("Joe Doe", "1@*@{ll}"));
 
-        assertEquals("moremoremoremore", l.format("Joe Doe and Mary Jane and Bruce Bar and Arthur Kay",
-                "1@*@{ll}@@2@1..1@{ff}{ll}@2..2@ and {ff}{last}@@*@*@more"));
-
-        assertEquals("Doe", l.format("Joe Doe", "1@*@{ll}@@2@1..1@{ff}{ll}@2..2@ and {ff}{last}@@*@*@more"));
-
-        assertEquals("JoeDoe and MaryJ",
-                l.format("Joe Doe and Mary Jane", "1@*@{ll}@@2@1..1@{ff}{ll}@2..2@ and {ff}{l}@@*@*@more"));
-
-        assertEquals("Doe, Joe and Jane, M. and Kamp, J.~A.",
-                l.format("Joe Doe and Mary Jane and John Arthur van Kamp",
+        assertEquals(
+                "moremoremoremore",
+                l.format(
+                        "Joe Doe and Mary Jane and Bruce Bar and Arthur Kay",
+                        "1@*@{ll}@@2@1..1@{ff}{ll}@2..2@ and {ff}{last}@@*@*@more"));
+
+        assertEquals(
+                "Doe",
+                l.format("Joe Doe", "1@*@{ll}@@2@1..1@{ff}{ll}@2..2@ and {ff}{last}@@*@*@more"));
+
+        assertEquals(
+                "JoeDoe and MaryJ",
+                l.format(
+                        "Joe Doe and Mary Jane",
+                        "1@*@{ll}@@2@1..1@{ff}{ll}@2..2@ and {ff}{l}@@*@*@more"));
+
+        assertEquals(
+                "Doe, Joe and Jane, M. and Kamp, J.~A.",
+                l.format(
+                        "Joe Doe and Mary Jane and John Arthur van Kamp",
                         "1@*@{ll}, {ff}@@*@1@{ll}, {ff}@2..-1@ and {ll}, {f}."));
 
-        assertEquals("Doe Joe and Jane, M. and Kamp, J.~A.",
-                l.format("Joe Doe and Mary Jane and John Arthur van Kamp",
+        assertEquals(
+                "Doe Joe and Jane, M. and Kamp, J.~A.",
+                l.format(
+                        "Joe Doe and Mary Jane and John Arthur van Kamp",
                         "1@*@{ll}, {ff}@@*@1@{ll} {ff}@2..-1@ and {ll}, {f}."));
     }
 
@@ -36,24 +48,31 @@ void format() {
         // Empty case
         assertEquals("", a.format(""));
 
-        String formatString = "1@1@{vv }{ll}{ ff}@@2@1@{vv }{ll}{ ff}@2@ and {vv }{ll}{, ff}@@*@1@{vv }{ll}{ ff}@2..-2@, {vv }{ll}{, ff}@-1@ and {vv }{ll}{, ff}";
+        String formatString =
+                "1@1@{vv }{ll}{ ff}@@2@1@{vv }{ll}{ ff}@2@ and {vv }{ll}{, ff}@@*@1@{vv }{ll}{ ff}@2..-2@, {vv }{ll}{, ff}@-1@ and {vv }{ll}{, ff}";
 
         // Single Names
         assertEquals("Vandekamp Mary~Ann", a.format("Mary Ann Vandekamp", formatString));
 
         // Two names
-        assertEquals("von Neumann John and Black~Brown, Peter",
+        assertEquals(
+                "von Neumann John and Black~Brown, Peter",
                 a.format("John von Neumann and Black Brown, Peter", formatString));
 
         // Three names
-        assertEquals("von Neumann John, Smith, John and Black~Brown, Peter",
+        assertEquals(
+                "von Neumann John, Smith, John and Black~Brown, Peter",
                 a.format("von Neumann, John and Smith, John and Black Brown, Peter", formatString));
 
-        assertEquals("von Neumann John, Smith, John and Black~Brown, Peter",
+        assertEquals(
+                "von Neumann John, Smith, John and Black~Brown, Peter",
                 a.format("John von Neumann and John Smith and Black Brown, Peter", formatString));
 
         // Four names
-        assertEquals("von Neumann John, Smith, John, Vandekamp, Mary~Ann and Black~Brown, Peter", a.format(
-                "von Neumann, John and Smith, John and Vandekamp, Mary Ann and Black Brown, Peter", formatString));
+        assertEquals(
+                "von Neumann John, Smith, John, Vandekamp, Mary~Ann and Black~Brown, Peter",
+                a.format(
+                        "von Neumann, John and Smith, John and Vandekamp, Mary Ann and Black Brown, Peter",
+                        formatString));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java b/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java
index 9e9c00463b7e..14a830845239 100644
--- a/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.LayoutFormatter;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class NoSpaceBetweenAbbreviationsTest {
 
@@ -26,7 +25,7 @@ private static Stream<Arguments> provideAbbreviations() {
                 Arguments.of("John Meier", "John Meier"),
                 Arguments.of("J.F. Kennedy", "J. F. Kennedy"),
                 Arguments.of("J.R.R. Tolkien", "J. R. R. Tolkien"),
-                Arguments.of("J.R.R. Tolkien and J.F. Kennedy", "J. R. R. Tolkien and J. F. Kennedy")
-        );
+                Arguments.of(
+                        "J.R.R. Tolkien and J.F. Kennedy", "J. R. R. Tolkien and J. F. Kennedy"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/OrdinalTest.java b/src/test/java/org/jabref/logic/layout/format/OrdinalTest.java
index 928928714d0a..ef6586790a69 100644
--- a/src/test/java/org/jabref/logic/layout/format/OrdinalTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/OrdinalTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
+import org.junit.jupiter.api.Test;
+
 class OrdinalTest {
 
     @Test
@@ -43,7 +43,8 @@ void alreadyOrdinals() {
     void fullSentence() {
         assertEquals("1st edn.", new Ordinal().format("1 edn."));
         assertEquals("1st edition", new Ordinal().format("1st edition"));
-        assertEquals("The 2nd conference on 3rd.14th", new Ordinal().format("The 2 conference on 3.14"));
+        assertEquals(
+                "The 2nd conference on 3rd.14th", new Ordinal().format("The 2 conference on 3.14"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java b/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
index 554a97ff9ad8..5175c6ad5374 100644
--- a/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.LayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.LayoutFormatter;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class RTFCharsTest {
     private LayoutFormatter formatter;
 
@@ -29,7 +28,8 @@ void basicFormat() {
 
         assertEquals("hallo", formatter.format("hallo"));
 
-        assertEquals("R\\u233eflexions sur le timing de la quantit\\u233e",
+        assertEquals(
+                "R\\u233eflexions sur le timing de la quantit\\u233e",
                 formatter.format("Réflexions sur le timing de la quantité"));
 
         assertEquals("h\\'e1llo", formatter.format("h\\'allo"));
@@ -40,7 +40,9 @@ void basicFormat() {
     void laTeXHighlighting() {
         assertEquals("{\\i hallo}", formatter.format("\\emph{hallo}"));
         assertEquals("{\\i hallo}", formatter.format("{\\emph hallo}"));
-        assertEquals("An article title with {\\i a book title} emphasized", formatter.format("An article title with \\emph{a book title} emphasized"));
+        assertEquals(
+                "An article title with {\\i a book title} emphasized",
+                formatter.format("An article title with \\emph{a book title} emphasized"));
 
         assertEquals("{\\i hallo}", formatter.format("\\textit{hallo}"));
         assertEquals("{\\i hallo}", formatter.format("{\\textit hallo}"));
@@ -51,7 +53,8 @@ void laTeXHighlighting() {
 
     @Test
     void complicated() {
-        assertEquals("R\\u233eflexions sur le timing de la quantit\\u233e {\\u230ae} should be \\u230ae",
+        assertEquals(
+                "R\\u233eflexions sur le timing de la quantit\\u233e {\\u230ae} should be \\u230ae",
                 formatter.format("Réflexions sur le timing de la quantité {\\ae} should be æ"));
     }
 
@@ -62,34 +65,42 @@ void complicated2() {
 
     @Test
     void complicated3() {
-        assertEquals("Le c\\u339oeur d\\u233e\\u231cu mais l'\\u226ame plut\\u244ot na\\u239ive, Lou\\u255ys r" +
-                "\\u234eva de crapa\\u252?ter en cano\\u235e au del\\u224a des \\u238iles, pr\\u232es du m\\u228alstr" +
-                "\\u246om o\\u249u br\\u251ulent les nov\\u230ae.", formatter.format("Le cœur déçu mais l'âme plutôt " +
-                "naïve, Louÿs rêva de crapaüter en canoë au delà des îles, près du mälström où brûlent les novæ."));
+        assertEquals(
+                "Le c\\u339oeur d\\u233e\\u231cu mais l'\\u226ame plut\\u244ot na\\u239ive, Lou\\u255ys r"
+                        + "\\u234eva de crapa\\u252?ter en cano\\u235e au del\\u224a des \\u238iles, pr\\u232es du m\\u228alstr"
+                        + "\\u246om o\\u249u br\\u251ulent les nov\\u230ae.",
+                formatter.format(
+                        "Le cœur déçu mais l'âme plutôt "
+                                + "naïve, Louÿs rêva de crapaüter en canoë au delà des îles, près du mälström où brûlent les novæ."));
     }
 
     @Test
     void complicated4() {
-        assertEquals("l'\\u238ile exigu\\u235e\n" +
-                "  O\\u249u l'ob\\u232ese jury m\\u251ur\n" +
-                "  F\\u234ete l'ha\\u239i volap\\u252?k,\n" +
-                "  \\u194Ane ex a\\u233equo au whist,\n" +
-                "  \\u212Otez ce v\\u339oeu d\\u233e\\u231cu.", formatter.format("l'île exiguë\n" +
-                "  Où l'obèse jury mûr\n" +
-                "  Fête l'haï volapük,\n" +
-                "  Âne ex aéquo au whist,\n" +
-                "  Ôtez ce vœu déçu."));
+        assertEquals(
+                "l'\\u238ile exigu\\u235e\n"
+                        + "  O\\u249u l'ob\\u232ese jury m\\u251ur\n"
+                        + "  F\\u234ete l'ha\\u239i volap\\u252?k,\n"
+                        + "  \\u194Ane ex a\\u233equo au whist,\n"
+                        + "  \\u212Otez ce v\\u339oeu d\\u233e\\u231cu.",
+                formatter.format(
+                        "l'île exiguë\n"
+                                + "  Où l'obèse jury mûr\n"
+                                + "  Fête l'haï volapük,\n"
+                                + "  Âne ex aéquo au whist,\n"
+                                + "  Ôtez ce vœu déçu."));
     }
 
     @Test
     void complicated5() {
-        assertEquals("\\u193Arv\\u237izt\\u369?r\\u337? t\\u252?k\\u246orf\\u250ur\\u243og\\u233ep",
+        assertEquals(
+                "\\u193Arv\\u237izt\\u369?r\\u337? t\\u252?k\\u246orf\\u250ur\\u243og\\u233ep",
                 formatter.format("Árvíztűrő tükörfúrógép"));
     }
 
     @Test
     void complicated6() {
-        assertEquals("Pchn\\u261a\\u263c w t\\u281e \\u322l\\u243od\\u378z je\\u380za lub o\\u347sm skrzy\\u324n fig",
+        assertEquals(
+                "Pchn\\u261a\\u263c w t\\u281e \\u322l\\u243od\\u378z je\\u380za lub o\\u347sm skrzy\\u324n fig",
                 formatter.format("Pchnąć w tę łódź jeża lub ośm skrzyń fig"));
     }
 
@@ -134,51 +145,51 @@ void specialCharacters() {
 
     @ParameterizedTest(name = "specialChar={0}, formattedStr={1}")
     @CsvSource({
-            "ÀÁÂÃÄĀĂĄ, \\u192A\\u193A\\u194A\\u195A\\u196A\\u256A\\u258A\\u260A", // A
-            "àáâãäåāăą, \\u224a\\u225a\\u226a\\u227a\\u228a\\u229a\\u257a\\u259a\\u261a", // a
-            "ÇĆĈĊČ, \\u199C\\u262C\\u264C\\u266C\\u268C", // C
-            "çćĉċč, \\u231c\\u263c\\u265c\\u267c\\u269c", // c
-            "ÐĐ, \\u208D\\u272D", // D
-            "ðđ, \\u240d\\u273d", // d
-            "ÈÉÊËĒĔĖĘĚ, \\u200E\\u201E\\u202E\\u203E\\u274E\\u276E\\u278E\\u280E\\u282E", // E
-            "èéêëēĕėęě, \\u232e\\u233e\\u234e\\u235e\\u275e\\u277e\\u279e\\u281e\\u283e", // e
-            "ĜĞĠĢŊ, \\u284G\\u286G\\u288G\\u290G\\u330G", // G
-            "ĝğġģŋ, \\u285g\\u287g\\u289g\\u291g\\u331g", // g
-            "ĤĦ, \\u292H\\u294H", // H
-            "ĥħ, \\u293h\\u295h", // h
-            "ÌÍÎÏĨĪĬĮİ, \\u204I\\u205I\\u206I\\u207I\\u296I\\u298I\\u300I\\u302I\\u304I", // I
-            "ìíîïĩīĭį, \\u236i\\u237i\\u238i\\u239i\\u297i\\u299i\\u301i\\u303i", // i
-            "Ĵ, \\u308J", // J
-            "ĵ, \\u309j", // j
-            "Ķ, \\u310K", // K
-            "ķ, \\u311k", // k
-            "ĹĻĿ, \\u313L\\u315L\\u319L", // L
-            "ĺļŀł, \\u314l\\u316l\\u320l\\u322l", // l
-            "ÑŃŅŇ, \\u209N\\u323N\\u325N\\u327N", // N
-            "ñńņň, \\u241n\\u324n\\u326n\\u328n", // n
-            "ÒÓÔÕÖØŌŎ, \\u210O\\u211O\\u212O\\u213O\\u214O\\u216O\\u332O\\u334O", // O
-            "òóôõöøōŏ, \\u242o\\u243o\\u244o\\u245o\\u246o\\u248o\\u333o\\u335o", // o
-            "ŔŖŘ, \\u340R\\u342R\\u344R", // R
-            "ŕŗř, \\u341r\\u343r\\u345r", // r
-            "ŚŜŞŠ, \\u346S\\u348S\\u350S\\u352S", // S
-            "śŝşš, \\u347s\\u349s\\u351s\\u353s", // s
-            "ŢŤŦ, \\u354T\\u356T\\u358T", // T
-            "ţŧ, \\u355t\\u359t", // t
-            "ÙÚÛÜŨŪŬŮŲ, \\u217U\\u218U\\u219U\\u220U\\u360U\\u362U\\u364U\\u366U\\u370U", // U
-            "ùúûũūŭůų, \\u249u\\u250u\\u251u\\u361u\\u363u\\u365u\\u367u\\u371u", // u
-            "Ŵ, \\u372W", // W
-            "ŵ, \\u373w", // w
-            "ŶŸÝ, \\u374Y\\u376Y\\u221Y", // Y
-            "ŷÿ, \\u375y\\u255y", // y
-            "ŹŻŽ, \\u377Z\\u379Z\\u381Z", // Z
-            "źżž, \\u378z\\u380z\\u382z", // z
-            "Æ, \\u198AE", // AE
-            "æ, \\u230ae", // ae
-            "Œ, \\u338OE", // OE
-            "œ, \\u339oe", // oe
-            "Þ, \\u222TH", // TH
-            "ß, \\u223ss", // ss
-            "¡, \\u161!" // !
+        "ÀÁÂÃÄĀĂĄ, \\u192A\\u193A\\u194A\\u195A\\u196A\\u256A\\u258A\\u260A", // A
+        "àáâãäåāăą, \\u224a\\u225a\\u226a\\u227a\\u228a\\u229a\\u257a\\u259a\\u261a", // a
+        "ÇĆĈĊČ, \\u199C\\u262C\\u264C\\u266C\\u268C", // C
+        "çćĉċč, \\u231c\\u263c\\u265c\\u267c\\u269c", // c
+        "ÐĐ, \\u208D\\u272D", // D
+        "ðđ, \\u240d\\u273d", // d
+        "ÈÉÊËĒĔĖĘĚ, \\u200E\\u201E\\u202E\\u203E\\u274E\\u276E\\u278E\\u280E\\u282E", // E
+        "èéêëēĕėęě, \\u232e\\u233e\\u234e\\u235e\\u275e\\u277e\\u279e\\u281e\\u283e", // e
+        "ĜĞĠĢŊ, \\u284G\\u286G\\u288G\\u290G\\u330G", // G
+        "ĝğġģŋ, \\u285g\\u287g\\u289g\\u291g\\u331g", // g
+        "ĤĦ, \\u292H\\u294H", // H
+        "ĥħ, \\u293h\\u295h", // h
+        "ÌÍÎÏĨĪĬĮİ, \\u204I\\u205I\\u206I\\u207I\\u296I\\u298I\\u300I\\u302I\\u304I", // I
+        "ìíîïĩīĭį, \\u236i\\u237i\\u238i\\u239i\\u297i\\u299i\\u301i\\u303i", // i
+        "Ĵ, \\u308J", // J
+        "ĵ, \\u309j", // j
+        "Ķ, \\u310K", // K
+        "ķ, \\u311k", // k
+        "ĹĻĿ, \\u313L\\u315L\\u319L", // L
+        "ĺļŀł, \\u314l\\u316l\\u320l\\u322l", // l
+        "ÑŃŅŇ, \\u209N\\u323N\\u325N\\u327N", // N
+        "ñńņň, \\u241n\\u324n\\u326n\\u328n", // n
+        "ÒÓÔÕÖØŌŎ, \\u210O\\u211O\\u212O\\u213O\\u214O\\u216O\\u332O\\u334O", // O
+        "òóôõöøōŏ, \\u242o\\u243o\\u244o\\u245o\\u246o\\u248o\\u333o\\u335o", // o
+        "ŔŖŘ, \\u340R\\u342R\\u344R", // R
+        "ŕŗř, \\u341r\\u343r\\u345r", // r
+        "ŚŜŞŠ, \\u346S\\u348S\\u350S\\u352S", // S
+        "śŝşš, \\u347s\\u349s\\u351s\\u353s", // s
+        "ŢŤŦ, \\u354T\\u356T\\u358T", // T
+        "ţŧ, \\u355t\\u359t", // t
+        "ÙÚÛÜŨŪŬŮŲ, \\u217U\\u218U\\u219U\\u220U\\u360U\\u362U\\u364U\\u366U\\u370U", // U
+        "ùúûũūŭůų, \\u249u\\u250u\\u251u\\u361u\\u363u\\u365u\\u367u\\u371u", // u
+        "Ŵ, \\u372W", // W
+        "ŵ, \\u373w", // w
+        "ŶŸÝ, \\u374Y\\u376Y\\u221Y", // Y
+        "ŷÿ, \\u375y\\u255y", // y
+        "ŹŻŽ, \\u377Z\\u379Z\\u381Z", // Z
+        "źżž, \\u378z\\u380z\\u382z", // z
+        "Æ, \\u198AE", // AE
+        "æ, \\u230ae", // ae
+        "Œ, \\u338OE", // OE
+        "œ, \\u339oe", // oe
+        "Þ, \\u222TH", // TH
+        "ß, \\u223ss", // ss
+        "¡, \\u161!" // !
     })
     void moreSpecialCharacters(String specialChar, String expectedResult) {
         String formattedStr = formatter.format(specialChar);
diff --git a/src/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.java b/src/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.java
index f2dce2085ac8..655a5b12060d 100644
--- a/src/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.LayoutFormatter;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class RemoveBracketsAddCommaTest {
     private LayoutFormatter formatter;
@@ -29,7 +28,6 @@ private static Stream<Arguments> provideExamples() {
         return Stream.of(
                 Arguments.of("some text,", "{some text}"),
                 Arguments.of("some text", "{some text"),
-                Arguments.of("some text,", "some text}")
-        );
+                Arguments.of("some text,", "some text}"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java b/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java
index 589f45427f03..7a808cdc90a9 100644
--- a/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java
@@ -1,12 +1,11 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.LayoutFormatter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.layout.LayoutFormatter;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class RemoveBracketsTest {
     private LayoutFormatter formatter;
 
diff --git a/src/test/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatterTest.java b/src/test/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatterTest.java
index a3915f83d43d..665193619da2 100644
--- a/src/test/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.layout.format;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class RemoveLatexCommandsFormatterTest {
 
     private RemoveLatexCommandsFormatter formatter;
@@ -56,6 +56,9 @@ void escapedUnderscoreReplaces() {
 
     @Test
     void exampleUrlCorrectlyCleaned() {
-        assertEquals("http://pi.informatik.uni-siegen.de/stt/36_2/./03_Technische_Beitraege/ZEUS2016/beitrag_2.pdf", formatter.format("http://pi.informatik.uni-siegen.de/stt/36\\_2/./03\\_Technische\\_Beitraege/ZEUS2016/beitrag\\_2.pdf"));
+        assertEquals(
+                "http://pi.informatik.uni-siegen.de/stt/36_2/./03_Technische_Beitraege/ZEUS2016/beitrag_2.pdf",
+                formatter.format(
+                        "http://pi.informatik.uni-siegen.de/stt/36\\_2/./03\\_Technische\\_Beitraege/ZEUS2016/beitrag\\_2.pdf"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java b/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java
index ae832ef7316c..c65e196daf39 100644
--- a/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.LayoutFormatter;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class RemoveTildeTest {
     private LayoutFormatter formatter;
@@ -33,8 +32,9 @@ private static Stream<Arguments> provideArguments() {
                 Arguments.of("   ", "~~~"),
                 Arguments.of(" \\~ ", "~\\~~"),
                 Arguments.of("\\\\ ", "\\\\~"),
-                Arguments.of("Doe Joe and Jane, M. and Kamp, J. A.", "Doe Joe and Jane, M. and Kamp, J.~A."),
-                Arguments.of("T\\~olkien, J. R. R.", "T\\~olkien, J.~R.~R.")
-        );
+                Arguments.of(
+                        "Doe Joe and Jane, M. and Kamp, J. A.",
+                        "Doe Joe and Jane, M. and Kamp, J.~A."),
+                Arguments.of("T\\~olkien, J. R. R.", "T\\~olkien, J.~R.~R."));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java b/src/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java
index bb4a61bdba16..08661cd06465 100644
--- a/src/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
+import org.junit.jupiter.api.Test;
+
 class RemoveWhitespaceTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java b/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java
index 4dfd366cc796..a51269dcf24b 100644
--- a/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java
@@ -1,12 +1,11 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.layout.ParamLayoutFormatter;
-
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
+import org.jabref.logic.layout.ParamLayoutFormatter;
+import org.junit.jupiter.api.Test;
+
 class ReplaceTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatterTest.java b/src/test/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatterTest.java
index f3391ea974e3..7a9efd3a5de0 100644
--- a/src/test/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatterTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.layout.format;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class ReplaceUnicodeLigaturesFormatterTest {
 
     private ReplaceUnicodeLigaturesFormatter formatter;
diff --git a/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java b/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java
index feb28f1b3567..b0b7ad6fc35c 100644
--- a/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.os.OS;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.os.OS;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class RisKeywordsTest {
 
     @Test
@@ -25,12 +24,20 @@ void singleKeyword() {
 
     @Test
     void twoKeywords() {
-        assertEquals("KW  - abcd" + OS.NEWLINE + "KW  - efg", new RisKeywords().format("abcd, efg"));
+        assertEquals(
+                "KW  - abcd" + OS.NEWLINE + "KW  - efg", new RisKeywords().format("abcd, efg"));
     }
 
     @Test
     void multipleKeywords() {
-        assertEquals("KW  - abcd" + OS.NEWLINE + "KW  - efg" + OS.NEWLINE + "KW  - hij" + OS.NEWLINE
-                + "KW  - klm", new RisKeywords().format("abcd, efg, hij, klm"));
+        assertEquals(
+                "KW  - abcd"
+                        + OS.NEWLINE
+                        + "KW  - efg"
+                        + OS.NEWLINE
+                        + "KW  - hij"
+                        + OS.NEWLINE
+                        + "KW  - klm",
+                new RisKeywords().format("abcd, efg, hij, klm"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java b/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java
index bba8f10e1bee..d322e71e716a 100644
--- a/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RisMonthTest.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.layout.format;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class RisMonthTest {
 
     @Test
@@ -20,18 +20,18 @@ void testNull() {
 
     @ParameterizedTest(name = "input={0}, formattedStr={1}")
     @CsvSource({
-            "jan, 01", // jan
-            "feb, 02", // feb
-            "mar, 03", // mar
-            "apr, 04", // apr
-            "may, 05", // may
-            "jun, 06", // jun
-            "jul, 07", // jul
-            "aug, 08", // aug
-            "sep, 09", // sep
-            "oct, 10", // oct
-            "nov, 11", // nov
-            "dec, 12", // dec
+        "jan, 01", // jan
+        "feb, 02", // feb
+        "mar, 03", // mar
+        "apr, 04", // apr
+        "may, 05", // may
+        "jun, 06", // jun
+        "jul, 07", // jul
+        "aug, 08", // aug
+        "sep, 09", // sep
+        "oct, 10", // oct
+        "nov, 11", // nov
+        "dec, 12", // dec
     })
     void validMonth(String input, String expectedResult) {
         String formattedStr = new RisMonth().format(input);
diff --git a/src/test/java/org/jabref/logic/layout/format/ShortMonthFormatterTest.java b/src/test/java/org/jabref/logic/layout/format/ShortMonthFormatterTest.java
index 6091f3ea481b..1491e79d6673 100644
--- a/src/test/java/org/jabref/logic/layout/format/ShortMonthFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ShortMonthFormatterTest.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.LayoutFormatter;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class ShortMonthFormatterTest {
 
@@ -39,7 +38,6 @@ private static Stream<Arguments> provideArguments() {
                 Arguments.of("jan", "Januar"),
                 Arguments.of("jan", "01"),
                 Arguments.of("", "Invented Month"),
-                Arguments.of("", "")
-        );
+                Arguments.of("", ""));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java b/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java
index 522154d62338..6455434831f7 100644
--- a/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java
@@ -1,14 +1,14 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import java.util.stream.Stream;
 
 class ToLowerCaseTest {
 
@@ -31,7 +31,6 @@ private static Stream<Arguments> provideArguments() {
                 Arguments.of("abcd efg", "abCD eFg"),
                 Arguments.of("abcd123efg", "abCD123eFg"),
                 Arguments.of("hello!*#", "Hello!*#"),
-                Arguments.of("123*%&456", "123*%&456")
-        );
+                Arguments.of("123*%&456", "123*%&456"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java b/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java
index 62235429eea1..00e44a08a026 100644
--- a/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class ToUpperCaseTest {
 
@@ -24,7 +24,6 @@ private static Stream<Arguments> toUpperCaseTests() {
                 Arguments.of(null, null),
                 Arguments.of("ABCD EFG", "abcd efg"),
                 Arguments.of("ABCD EFG", "ABCD EFG"),
-                Arguments.of("ABCD EFG", "abCD eFg")
-        );
+                Arguments.of("ABCD EFG", "abCD eFg"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java b/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java
index 7146ff172d48..7122298a49a4 100644
--- a/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.layout.ParamLayoutFormatter;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class WrapContentTest {
 
@@ -33,7 +32,6 @@ private static Stream<Arguments> provideContent() {
                 Arguments.of(null, null, "Eds.,Ed."),
                 Arguments.of("", "", "Eds.,Ed."),
                 Arguments.of("Bob Bruce and Jolly Jumper", "Bob Bruce and Jolly Jumper", ""),
-                Arguments.of("Bob Bruce and Jolly Jumper", "Bob Bruce and Jolly Jumper", "Eds.")
-        );
+                Arguments.of("Bob Bruce and Jolly Jumper", "Bob Bruce and Jolly Jumper", "Eds."));
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java b/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java
index a09d2e78fde7..ed9b65e637cb 100644
--- a/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java
@@ -1,15 +1,15 @@
 package org.jabref.logic.layout.format;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
 
 class WrapFileLinksTest {
 
@@ -97,9 +97,12 @@ void endingBracket() {
 
     @Test
     void path() throws IOException {
-        formatter = new WrapFileLinks(Collections.singletonList(Path.of("src/test/resources/pdfs/")), "");
+        formatter =
+                new WrapFileLinks(
+                        Collections.singletonList(Path.of("src/test/resources/pdfs/")), "");
         formatter.setArgument("\\p");
-        assertEquals(new File("src/test/resources/pdfs/encrypted.pdf").getCanonicalPath(),
+        assertEquals(
+                new File("src/test/resources/pdfs/encrypted.pdf").getCanonicalPath(),
                 formatter.format("Preferences:encrypted.pdf:PDF"));
     }
 
@@ -107,13 +110,16 @@ void path() throws IOException {
     void pathFallBackToGeneratedDir() throws IOException {
         formatter = new WrapFileLinks(Collections.emptyList(), "src/test/resources/pdfs/");
         formatter.setArgument("\\p");
-        assertEquals(new File("src/test/resources/pdfs/encrypted.pdf").getCanonicalPath(),
+        assertEquals(
+                new File("src/test/resources/pdfs/encrypted.pdf").getCanonicalPath(),
                 formatter.format("Preferences:encrypted.pdf:PDF"));
     }
 
     @Test
     void pathReturnsRelativePathIfNotFound() {
-        formatter = new WrapFileLinks(Collections.singletonList(Path.of("src/test/resources/pdfs/")), "");
+        formatter =
+                new WrapFileLinks(
+                        Collections.singletonList(Path.of("src/test/resources/pdfs/")), "");
         formatter.setArgument("\\p");
         assertEquals("test.pdf", formatter.format("Preferences:test.pdf:PDF"));
     }
diff --git a/src/test/java/org/jabref/logic/msbib/MSBibConverterTest.java b/src/test/java/org/jabref/logic/msbib/MSBibConverterTest.java
index c254cbcc4789..59f684a88f72 100644
--- a/src/test/java/org/jabref/logic/msbib/MSBibConverterTest.java
+++ b/src/test/java/org/jabref/logic/msbib/MSBibConverterTest.java
@@ -1,32 +1,42 @@
 package org.jabref.logic.msbib;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class MSBibConverterTest {
 
-    private final BibEntry BIB_ENTRY_TEST = new BibEntry(StandardEntryType.InProceedings)
-            .withField(StandardField.AUTHOR, "Igor Steinmacher and Tayana Uchoa Conte and Christoph Treude and Marco Aurélio Gerosa")
-            .withField(StandardField.DATE, "14-22 May 2016")
-            .withField(StandardField.YEAR, "2016")
-            .withField(StandardField.EVENTDATE, "14-22 May 2016")
-            .withField(StandardField.EVENTTITLEADDON, "Austin, TX, USA")
-            .withField(StandardField.LOCATION, "Austin, TX, USA")
-            .withField(StandardField.DOI, "10.1145/2884781.2884806")
-            .withField(StandardField.JOURNALTITLE, "2016 IEEE/ACM 38th International Conference on Software Engineering (ICSE)")
-            .withField(StandardField.PAGES, "273--284")
-            .withField(StandardField.ISBN, "978-1-5090-2071-3")
-            .withField(StandardField.ISSN, "1558-1225")
-            .withField(StandardField.LANGUAGE, "english")
-            .withField(StandardField.PUBLISHER, "IEEE")
-            .withField(StandardField.KEYWORDS, "Portals, Documentation, Computer bugs, Joining processes, Industries, Open source software, Newcomers, Newbies, Novices, Beginners, Open Source Software, Barriers, Obstacles, Onboarding, Joining Process")
-            .withField(StandardField.TITLE, "Overcoming Open Source Project Entry Barriers with a Portal for Newcomers")
-            .withField(StandardField.FILE, ":https\\://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=7886910:PDF");
+    private final BibEntry BIB_ENTRY_TEST =
+            new BibEntry(StandardEntryType.InProceedings)
+                    .withField(
+                            StandardField.AUTHOR,
+                            "Igor Steinmacher and Tayana Uchoa Conte and Christoph Treude and Marco Aurélio Gerosa")
+                    .withField(StandardField.DATE, "14-22 May 2016")
+                    .withField(StandardField.YEAR, "2016")
+                    .withField(StandardField.EVENTDATE, "14-22 May 2016")
+                    .withField(StandardField.EVENTTITLEADDON, "Austin, TX, USA")
+                    .withField(StandardField.LOCATION, "Austin, TX, USA")
+                    .withField(StandardField.DOI, "10.1145/2884781.2884806")
+                    .withField(
+                            StandardField.JOURNALTITLE,
+                            "2016 IEEE/ACM 38th International Conference on Software Engineering (ICSE)")
+                    .withField(StandardField.PAGES, "273--284")
+                    .withField(StandardField.ISBN, "978-1-5090-2071-3")
+                    .withField(StandardField.ISSN, "1558-1225")
+                    .withField(StandardField.LANGUAGE, "english")
+                    .withField(StandardField.PUBLISHER, "IEEE")
+                    .withField(
+                            StandardField.KEYWORDS,
+                            "Portals, Documentation, Computer bugs, Joining processes, Industries, Open source software, Newcomers, Newbies, Novices, Beginners, Open Source Software, Barriers, Obstacles, Onboarding, Joining Process")
+                    .withField(
+                            StandardField.TITLE,
+                            "Overcoming Open Source Project Entry Barriers with a Portal for Newcomers")
+                    .withField(
+                            StandardField.FILE,
+                            ":https\\://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=7886910:PDF");
 
     @Test
     void convert() {
diff --git a/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java b/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
index 66fc347dd5a6..c7fa1e4c2f70 100644
--- a/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
+++ b/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
@@ -1,12 +1,11 @@
 package org.jabref.logic.msbib;
 
-import org.jabref.model.entry.Author;
-
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
+import org.jabref.model.entry.Author;
+import org.junit.jupiter.api.Test;
+
 class MsBibAuthorTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/msbib/MsBibMappingTest.java b/src/test/java/org/jabref/logic/msbib/MsBibMappingTest.java
index 5dd63ec8287d..ae8cf2798ff2 100644
--- a/src/test/java/org/jabref/logic/msbib/MsBibMappingTest.java
+++ b/src/test/java/org/jabref/logic/msbib/MsBibMappingTest.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.msbib;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 class MsBibMappingTest {
     @Test
     void getLanguage() {
diff --git a/src/test/java/org/jabref/logic/net/ProxyTest.java b/src/test/java/org/jabref/logic/net/ProxyTest.java
index 36a8869ff497..0e0eaef615cb 100644
--- a/src/test/java/org/jabref/logic/net/ProxyTest.java
+++ b/src/test/java/org/jabref/logic/net/ProxyTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.net;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Test;
+
 class ProxyTest {
     /**
      * The test checks if ProxyPreference class is still able to store password and use it from memory,
@@ -12,32 +12,27 @@ class ProxyTest {
      */
     @Test
     void proxyPreferencesStorePassword() {
-       // mock data
-       boolean useProxy = true;
-       String hostname = "testName";
-       String port = "8080";
-       boolean useAuthentication = true;
-       String username = "testUserName";
-       String password = "testPassword";
-       boolean persist = false;
+        // mock data
+        boolean useProxy = true;
+        String hostname = "testName";
+        String port = "8080";
+        boolean useAuthentication = true;
+        String username = "testUserName";
+        String password = "testPassword";
+        boolean persist = false;
 
-       // Creates proxy preference
-       ProxyPreferences proxyPref = new ProxyPreferences(
-               useProxy,
-               hostname,
-               port,
-               useAuthentication,
-               username,
-               password,
-               persist);
+        // Creates proxy preference
+        ProxyPreferences proxyPref =
+                new ProxyPreferences(
+                        useProxy, hostname, port, useAuthentication, username, password, persist);
 
-       // Check if mock data is stored in object memory and can be extracted
-       assertTrue(proxyPref.shouldUseProxy());
-       assertEquals(proxyPref.getHostname(), hostname);
-       assertEquals(proxyPref.getPort(), port);
-       assertTrue(proxyPref.shouldUseAuthentication());
-       assertEquals(proxyPref.getUsername(), username);
-       assertEquals(proxyPref.getPassword(), password);
-       assertEquals(proxyPref.shouldPersistPassword(), persist);
-   }
+        // Check if mock data is stored in object memory and can be extracted
+        assertTrue(proxyPref.shouldUseProxy());
+        assertEquals(proxyPref.getHostname(), hostname);
+        assertEquals(proxyPref.getPort(), port);
+        assertTrue(proxyPref.shouldUseAuthentication());
+        assertEquals(proxyPref.getUsername(), username);
+        assertEquals(proxyPref.getPassword(), password);
+        assertEquals(proxyPref.shouldPersistPassword(), persist);
+    }
 }
diff --git a/src/test/java/org/jabref/logic/net/URLDownloadTest.java b/src/test/java/org/jabref/logic/net/URLDownloadTest.java
index ac5af134e71c..44946a8d9e51 100644
--- a/src/test/java/org/jabref/logic/net/URLDownloadTest.java
+++ b/src/test/java/org/jabref/logic/net/URLDownloadTest.java
@@ -1,33 +1,35 @@
 package org.jabref.logic.net;
 
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+
+import kong.unirest.core.UnirestException;
 
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherServerException;
 import org.jabref.support.DisabledOnCIServer;
 import org.jabref.testutils.category.FetcherTest;
-
-import com.github.tomakehurst.wiremock.WireMockServer;
-import kong.unirest.core.UnirestException;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 @FetcherTest
 class URLDownloadTest {
@@ -45,7 +47,9 @@ void stringDownloadWithSetEncoding() throws Exception {
     void stringDownload() throws Exception {
         URLDownload dl = new URLDownload(URI.create("http://www.google.com").toURL());
 
-        assertTrue(dl.asString(StandardCharsets.UTF_8).contains("Google"), "google.com should contain google");
+        assertTrue(
+                dl.asString(StandardCharsets.UTF_8).contains("Google"),
+                "google.com should contain google");
     }
 
     @Test
@@ -80,7 +84,9 @@ void downloadToTemporaryFilePathWithoutFileSavesAsTmpFile() throws Exception {
 
     @Test
     void downloadToTemporaryFileKeepsName() throws Exception {
-        URLDownload google = new URLDownload(URI.create("https://github.com/JabRef/jabref/blob/main/LICENSE").toURL());
+        URLDownload google =
+                new URLDownload(
+                        URI.create("https://github.com/JabRef/jabref/blob/main/LICENSE").toURL());
 
         String path = google.toTemporaryFile().toString();
         assertTrue(path.contains("LICENSE"), path);
@@ -89,7 +95,11 @@ void downloadToTemporaryFileKeepsName() throws Exception {
     @Test
     @DisabledOnCIServer("CI Server is apparently blocked")
     void downloadOfFTPSucceeds() throws Exception {
-        URLDownload ftp = new URLDownload(URI.create("ftp://ftp.informatik.uni-stuttgart.de/pub/library/ncstrl.ustuttgart_fi/INPROC-2016-15/INPROC-2016-15.pdf").toURL());
+        URLDownload ftp =
+                new URLDownload(
+                        URI.create(
+                                        "ftp://ftp.informatik.uni-stuttgart.de/pub/library/ncstrl.ustuttgart_fi/INPROC-2016-15/INPROC-2016-15.pdf")
+                                .toURL());
 
         Path path = ftp.toTemporaryFile();
         assertNotNull(path);
@@ -128,7 +138,8 @@ void checkConnectionFail() throws MalformedURLException {
     @Test
     void connectTimeoutIsNeverNull() throws MalformedURLException {
         URLDownload urlDownload = new URLDownload(URI.create("http://www.example.com").toURL());
-        assertNotNull(urlDownload.getConnectTimeout(), "there's a non-null default by the constructor");
+        assertNotNull(
+                urlDownload.getConnectTimeout(), "there's a non-null default by the constructor");
 
         urlDownload.setConnectTimeout(null);
         assertNotNull(urlDownload.getConnectTimeout(), "no null value can be set");
@@ -151,18 +162,20 @@ void redirectWorks(@TempDir Path tempDir) throws Exception {
         WireMockServer wireMockServer = new WireMockServer(2222);
         wireMockServer.start();
         configureFor("localhost", 2222);
-        stubFor(get("/redirect")
-                .willReturn(aResponse()
-                        .withStatus(302)
-                        .withHeader("Location", "/final")));
+        stubFor(
+                get("/redirect")
+                        .willReturn(aResponse().withStatus(302).withHeader("Location", "/final")));
         byte[] pdfContent = {0x00};
-        stubFor(get(urlEqualTo("/final"))
-                .willReturn(aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "application/pdf")
-                        .withBody(pdfContent)));
-
-        URLDownload urlDownload = new URLDownload(URI.create("http://localhost:2222/redirect").toURL());
+        stubFor(
+                get(urlEqualTo("/final"))
+                        .willReturn(
+                                aResponse()
+                                        .withStatus(200)
+                                        .withHeader("Content-Type", "application/pdf")
+                                        .withBody(pdfContent)));
+
+        URLDownload urlDownload =
+                new URLDownload(URI.create("http://localhost:2222/redirect").toURL());
         Path downloadedFile = tempDir.resolve("download.pdf");
         urlDownload.toFile(downloadedFile);
         byte[] actual = Files.readAllBytes(downloadedFile);
diff --git a/src/test/java/org/jabref/logic/net/URLUtilTest.java b/src/test/java/org/jabref/logic/net/URLUtilTest.java
index d69d7a1df7e8..e5081f2420cf 100644
--- a/src/test/java/org/jabref/logic/net/URLUtilTest.java
+++ b/src/test/java/org/jabref/logic/net/URLUtilTest.java
@@ -1,13 +1,12 @@
 package org.jabref.logic.net;
 
-import org.jabref.gui.fieldeditors.URLUtil;
-
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.jabref.gui.fieldeditors.URLUtil;
+import org.junit.jupiter.api.Test;
+
 class URLUtilTest {
 
     @Test
@@ -18,48 +17,76 @@ void cleanGoogleSearchURL() throws Exception {
         // no URL
         assertEquals("this is no url!", URLUtil.cleanGoogleSearchURL("this is no url!"));
         // no Google search URL
-        assertEquals("http://dl.acm.org/citation.cfm?id=321811", URLUtil.cleanGoogleSearchURL("http://dl.acm.org/citation.cfm?id=321811"));
+        assertEquals(
+                "http://dl.acm.org/citation.cfm?id=321811",
+                URLUtil.cleanGoogleSearchURL("http://dl.acm.org/citation.cfm?id=321811"));
         // malformed Google URL
-        assertEquals("https://www.google.de/url♥", URLUtil.cleanGoogleSearchURL("https://www.google.de/url♥"));
+        assertEquals(
+                "https://www.google.de/url♥",
+                URLUtil.cleanGoogleSearchURL("https://www.google.de/url♥"));
         // no queries
-        assertEquals("https://www.google.de/url", URLUtil.cleanGoogleSearchURL("https://www.google.de/url"));
-        assertEquals("https://www.google.de/url?", URLUtil.cleanGoogleSearchURL("https://www.google.de/url?"));
+        assertEquals(
+                "https://www.google.de/url",
+                URLUtil.cleanGoogleSearchURL("https://www.google.de/url"));
+        assertEquals(
+                "https://www.google.de/url?",
+                URLUtil.cleanGoogleSearchURL("https://www.google.de/url?"));
         // no multiple queries
-        assertEquals("https://www.google.de/url?key=value", URLUtil.cleanGoogleSearchURL("https://www.google.de/url?key=value"));
+        assertEquals(
+                "https://www.google.de/url?key=value",
+                URLUtil.cleanGoogleSearchURL("https://www.google.de/url?key=value"));
         // no key values
-        assertEquals("https://www.google.de/url?key", URLUtil.cleanGoogleSearchURL("https://www.google.de/url?key"));
-        assertEquals("https://www.google.de/url?url", URLUtil.cleanGoogleSearchURL("https://www.google.de/url?url"));
-        assertEquals("https://www.google.de/url?key=", URLUtil.cleanGoogleSearchURL("https://www.google.de/url?key="));
+        assertEquals(
+                "https://www.google.de/url?key",
+                URLUtil.cleanGoogleSearchURL("https://www.google.de/url?key"));
+        assertEquals(
+                "https://www.google.de/url?url",
+                URLUtil.cleanGoogleSearchURL("https://www.google.de/url?url"));
+        assertEquals(
+                "https://www.google.de/url?key=",
+                URLUtil.cleanGoogleSearchURL("https://www.google.de/url?key="));
         // no url param
-        assertEquals("https://www.google.de/url?key=value&key2=value2", URLUtil.cleanGoogleSearchURL("https://www.google.de/url?key=value&key2=value2"));
+        assertEquals(
+                "https://www.google.de/url?key=value&key2=value2",
+                URLUtil.cleanGoogleSearchURL("https://www.google.de/url?key=value&key2=value2"));
         // no url param value
-        assertEquals("https://www.google.de/url?url=", URLUtil.cleanGoogleSearchURL("https://www.google.de/url?url="));
+        assertEquals(
+                "https://www.google.de/url?url=",
+                URLUtil.cleanGoogleSearchURL("https://www.google.de/url?url="));
         // url param value no URL
-        assertEquals("https://www.google.de/url?url=this+is+no+url", URLUtil.cleanGoogleSearchURL("https://www.google.de/url?url=this+is+no+url"));
+        assertEquals(
+                "https://www.google.de/url?url=this+is+no+url",
+                URLUtil.cleanGoogleSearchURL("https://www.google.de/url?url=this+is+no+url"));
         // Http
         assertEquals(
                 "http://moz.com/ugc/the-ultimate-guide-to-the-google-search-parameters",
-                URLUtil.cleanGoogleSearchURL("http://www.google.de/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CCEQFjAAahUKEwjJurHd2sfHAhWBsxQKHSrEAaM&url=http%3A%2F%2Fmoz.com%2Fugc%2Fthe-ultimate-guide-to-the-google-search-parameters&ei=0THeVYmOJIHnUqqIh5gK&usg=AFQjCNHnid_r_d2LP8_MqvI7lQnTC3lB_g&sig2=ICzxDroG2ENTJSUGmdhI2w"));
+                URLUtil.cleanGoogleSearchURL(
+                        "http://www.google.de/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CCEQFjAAahUKEwjJurHd2sfHAhWBsxQKHSrEAaM&url=http%3A%2F%2Fmoz.com%2Fugc%2Fthe-ultimate-guide-to-the-google-search-parameters&ei=0THeVYmOJIHnUqqIh5gK&usg=AFQjCNHnid_r_d2LP8_MqvI7lQnTC3lB_g&sig2=ICzxDroG2ENTJSUGmdhI2w"));
         // Https
         assertEquals(
                 "https://moz.com/ugc/the-ultimate-guide-to-the-google-search-parameters",
-                URLUtil.cleanGoogleSearchURL("https://www.google.de/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CCEQFjAAahUKEwjJurHd2sfHAhWBsxQKHSrEAaM&url=https%3A%2F%2Fmoz.com%2Fugc%2Fthe-ultimate-guide-to-the-google-search-parameters&ei=0THeVYmOJIHnUqqIh5gK&usg=AFQjCNHnid_r_d2LP8_MqvI7lQnTC3lB_g&sig2=ICzxDroG2ENTJSUGmdhI2w"));
+                URLUtil.cleanGoogleSearchURL(
+                        "https://www.google.de/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CCEQFjAAahUKEwjJurHd2sfHAhWBsxQKHSrEAaM&url=https%3A%2F%2Fmoz.com%2Fugc%2Fthe-ultimate-guide-to-the-google-search-parameters&ei=0THeVYmOJIHnUqqIh5gK&usg=AFQjCNHnid_r_d2LP8_MqvI7lQnTC3lB_g&sig2=ICzxDroG2ENTJSUGmdhI2w"));
         // root domain
         assertEquals(
                 "https://moz.com/ugc/the-ultimate-guide-to-the-google-search-parameters",
-                URLUtil.cleanGoogleSearchURL("https://google.de/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CCEQFjAAahUKEwjJurHd2sfHAhWBsxQKHSrEAaM&url=https%3A%2F%2Fmoz.com%2Fugc%2Fthe-ultimate-guide-to-the-google-search-parameters&ei=0THeVYmOJIHnUqqIh5gK&usg=AFQjCNHnid_r_d2LP8_MqvI7lQnTC3lB_g&sig2=ICzxDroG2ENTJSUGmdhI2w"));
+                URLUtil.cleanGoogleSearchURL(
+                        "https://google.de/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CCEQFjAAahUKEwjJurHd2sfHAhWBsxQKHSrEAaM&url=https%3A%2F%2Fmoz.com%2Fugc%2Fthe-ultimate-guide-to-the-google-search-parameters&ei=0THeVYmOJIHnUqqIh5gK&usg=AFQjCNHnid_r_d2LP8_MqvI7lQnTC3lB_g&sig2=ICzxDroG2ENTJSUGmdhI2w"));
         // foreign domain
         assertEquals(
                 "https://moz.com/ugc/the-ultimate-guide-to-the-google-search-parameters",
-                URLUtil.cleanGoogleSearchURL("https://www.google.fr/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CCEQFjAAahUKEwjJurHd2sfHAhWBsxQKHSrEAaM&url=https%3A%2F%2Fmoz.com%2Fugc%2Fthe-ultimate-guide-to-the-google-search-parameters&ei=0THeVYmOJIHnUqqIh5gK&usg=AFQjCNHnid_r_d2LP8_MqvI7lQnTC3lB_g&sig2=ICzxDroG2ENTJSUGmdhI2w"));
+                URLUtil.cleanGoogleSearchURL(
+                        "https://www.google.fr/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CCEQFjAAahUKEwjJurHd2sfHAhWBsxQKHSrEAaM&url=https%3A%2F%2Fmoz.com%2Fugc%2Fthe-ultimate-guide-to-the-google-search-parameters&ei=0THeVYmOJIHnUqqIh5gK&usg=AFQjCNHnid_r_d2LP8_MqvI7lQnTC3lB_g&sig2=ICzxDroG2ENTJSUGmdhI2w"));
         // foreign domain co.uk
         assertEquals(
                 "https://moz.com/ugc/the-ultimate-guide-to-the-google-search-parameters",
-                URLUtil.cleanGoogleSearchURL("https://www.google.co.uk/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CCEQFjAAahUKEwjJurHd2sfHAhWBsxQKHSrEAaM&url=https%3A%2F%2Fmoz.com%2Fugc%2Fthe-ultimate-guide-to-the-google-search-parameters&ei=0THeVYmOJIHnUqqIh5gK&usg=AFQjCNHnid_r_d2LP8_MqvI7lQnTC3lB_g&sig2=ICzxDroG2ENTJSUGmdhI2w"));
+                URLUtil.cleanGoogleSearchURL(
+                        "https://www.google.co.uk/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CCEQFjAAahUKEwjJurHd2sfHAhWBsxQKHSrEAaM&url=https%3A%2F%2Fmoz.com%2Fugc%2Fthe-ultimate-guide-to-the-google-search-parameters&ei=0THeVYmOJIHnUqqIh5gK&usg=AFQjCNHnid_r_d2LP8_MqvI7lQnTC3lB_g&sig2=ICzxDroG2ENTJSUGmdhI2w"));
         // accept ftp results
         assertEquals(
                 "ftp://moz.com/ugc/the-ultimate-guide-to-the-google-search-parameters",
-                URLUtil.cleanGoogleSearchURL("https://www.google.fr/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CCEQFjAAahUKEwjJurHd2sfHAhWBsxQKHSrEAaM&url=ftp%3A%2F%2Fmoz.com%2Fugc%2Fthe-ultimate-guide-to-the-google-search-parameters&ei=0THeVYmOJIHnUqqIh5gK&usg=AFQjCNHnid_r_d2LP8_MqvI7lQnTC3lB_g&sig2=ICzxDroG2ENTJSUGmdhI2w"));
+                URLUtil.cleanGoogleSearchURL(
+                        "https://www.google.fr/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CCEQFjAAahUKEwjJurHd2sfHAhWBsxQKHSrEAaM&url=ftp%3A%2F%2Fmoz.com%2Fugc%2Fthe-ultimate-guide-to-the-google-search-parameters&ei=0THeVYmOJIHnUqqIh5gK&usg=AFQjCNHnid_r_d2LP8_MqvI7lQnTC3lB_g&sig2=ICzxDroG2ENTJSUGmdhI2w"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/openoffice/ReferenceMarkTest.java b/src/test/java/org/jabref/logic/openoffice/ReferenceMarkTest.java
index a23895b1f935..1cf99053d642 100644
--- a/src/test/java/org/jabref/logic/openoffice/ReferenceMarkTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/ReferenceMarkTest.java
@@ -1,21 +1,25 @@
 package org.jabref.logic.openoffice;
 
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
+import java.util.stream.Stream;
 
 class ReferenceMarkTest {
 
     @ParameterizedTest
     @MethodSource
     @DisplayName("Test parsing of valid reference marks")
-    void validParsing(String name, List<String> expectedCitationKeys, List<Integer> expectedCitationNumbers, String expectedUniqueId) {
+    void validParsing(
+            String name,
+            List<String> expectedCitationKeys,
+            List<Integer> expectedCitationNumbers,
+            String expectedUniqueId) {
         ReferenceMark referenceMark = new ReferenceMark(name);
 
         assertEquals(expectedCitationKeys, referenceMark.getCitationKeys());
@@ -28,22 +32,25 @@ private static Stream<Arguments> validParsing() {
                 // Single citation cases
                 Arguments.of(
                         "JABREF_key1 CID_12345 uniqueId1",
-                        List.of("key1"), List.of(12345), "uniqueId1"
-                ),
+                        List.of("key1"),
+                        List.of(12345),
+                        "uniqueId1"),
                 Arguments.of(
                         "JABREF_key2 CID_67890 uniqueId2",
-                        List.of("key2"), List.of(67890), "uniqueId2"
-                ),
+                        List.of("key2"),
+                        List.of(67890),
+                        "uniqueId2"),
 
                 // Multiple citation cases
                 Arguments.of(
                         "JABREF_key3 CID_54321, JABREF_key4 CID_98765 uniqueId3",
-                        List.of("key3", "key4"), List.of(54321, 98765), "uniqueId3"
-                ),
+                        List.of("key3", "key4"),
+                        List.of(54321, 98765),
+                        "uniqueId3"),
                 Arguments.of(
                         "JABREF_key5 CID_11111, JABREF_key6 CID_22222, JABREF_key7 CID_33333 uniqueId4",
-                        List.of("key5", "key6", "key7"), List.of(11111, 22222, 33333), "uniqueId4"
-                )
-        );
+                        List.of("key5", "key6", "key7"),
+                        List.of(11111, 22222, 33333),
+                        "uniqueId4"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtilsTest.java b/src/test/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtilsTest.java
index 57e054027faf..32e5c098b063 100644
--- a/src/test/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtilsTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtilsTest.java
@@ -1,8 +1,9 @@
 package org.jabref.logic.openoffice.oocsltext;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.jabref.logic.openoffice.oocsltext.CSLFormatUtils.generateAlphanumericCitation;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import de.undercouch.citeproc.output.Citation;
 
 import org.jabref.logic.citationstyle.CitationStyle;
 import org.jabref.logic.citationstyle.CitationStyleGenerator;
@@ -16,21 +17,21 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.openoffice.ootext.OOText;
-
-import de.undercouch.citeproc.output.Citation;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.jabref.logic.openoffice.oocsltext.CSLFormatUtils.generateAlphanumericCitation;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Stream;
 
 class CSLFormatUtilsTest {
 
     private static final List<CitationStyle> STYLE_LIST = CitationStyle.discoverCitationStyles();
 
     private final BibEntry testEntry = TestEntry.getTestEntry();
-    private final BibDatabaseContext context = new BibDatabaseContext(new BibDatabase(List.of(TestEntry.getTestEntry())));
+    private final BibDatabaseContext context =
+            new BibDatabaseContext(new BibDatabase(List.of(TestEntry.getTestEntry())));
     private final BibEntryTypesManager bibEntryTypesManager = new BibEntryTypesManager();
 
     /**
@@ -49,95 +50,70 @@ static Stream<Arguments> ooHTMLTransformFromRawHTML() {
                 // region: general test cases for unescaping HTML entities
 
                 // Ampersand (&amp entity)
-                Arguments.of(
-                        "Smith & Jones",
-                        "Smith &amp; Jones"
-                ),
+                Arguments.of("Smith & Jones", "Smith &amp; Jones"),
 
                 // Non-breaking space (&nbsp; entity)
                 Arguments.of(
-                        "Text with non-breaking spaces",
-                        "Text with&nbsp;non-breaking&nbsp;spaces"
-                ),
+                        "Text with non-breaking spaces", "Text with&nbsp;non-breaking&nbsp;spaces"),
 
                 // Bold formatting, less than, greater than symbols (&lt, &gt entities)
-                Arguments.of(
-                        "<b>Bold Text</b>",
-                        "&lt;b&gt;Bold Text&lt;/b&gt;"
-                ),
+                Arguments.of("<b>Bold Text</b>", "&lt;b&gt;Bold Text&lt;/b&gt;"),
 
                 // endregion
 
                 // Handling margins
                 Arguments.of(
                         "[1] Citation text",
-                        "<div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">Citation text</div>"
-                ),
+                        "<div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">Citation text</div>"),
 
                 // Removing unsupported div tags
-                Arguments.of(
-                        "Aligned text",
-                        "<div style=\"text-align:left;\">Aligned text</div>"
-                ),
+                Arguments.of("Aligned text", "<div style=\"text-align:left;\">Aligned text</div>"),
 
                 // Removing unsupported links
-                Arguments.of(
-                        "Text with link",
-                        "Text with <a href=\"http://example.com\">link</a>"
-                ),
+                Arguments.of("Text with link", "Text with <a href=\"http://example.com\">link</a>"),
 
                 // Replacing span tags with inline styles for bold
                 Arguments.of(
                         "Text with <b>bold</b>",
-                        "Text with <span style=\"font-weight:bold;\">bold</span>"
-                ),
+                        "Text with <span style=\"font-weight:bold;\">bold</span>"),
 
                 // Replacing span tags with inline styles for italic
                 Arguments.of(
                         "Text with <i>italic</i>",
-                        "Text with <span style=\"font-style:italic;\">italic</span>"
-                ),
+                        "Text with <span style=\"font-style:italic;\">italic</span>"),
 
                 // Replacing span tags with inline styles for underline
                 Arguments.of(
                         "Text with <u>underline</u>",
-                        "Text with <span style=\"text-decoration:underline;\">underline</span>"
-                ),
+                        "Text with <span style=\"text-decoration:underline;\">underline</span>"),
 
                 // Replacing span tags with inline styles for small-caps
                 Arguments.of(
                         "Text with <smallcaps>small caps</smallcaps>",
-                        "Text with <span style=\"font-variant:small-caps;\">small caps</span>"
-                ),
+                        "Text with <span style=\"font-variant:small-caps;\">small caps</span>"),
 
                 // Test case for cleaning up remaining span tags
                 Arguments.of(
-                        "Text with unnecessary span",
-                        "Text with <span>unnecessary span</span>"
-                ),
+                        "Text with unnecessary span", "Text with <span>unnecessary span</span>"),
 
                 // Test case combining multiple transformations
                 Arguments.of(
                         "[1] <b>Author</b>, \"Title,\" <i>Journal</i>, vol. 1, no. 1, pp. 1-10, 2023.",
-                        "<div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\"><span style=\"font-weight:bold;\">Author</span>, &quot;Title,&quot; <span style=\"font-style:italic;\">Journal</span>, vol. 1, no. 1, pp. 1-10, 2023.</div>"
-                ),
+                        "<div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\"><span style=\"font-weight:bold;\">Author</span>, &quot;Title,&quot; <span style=\"font-style:italic;\">Journal</span>, vol. 1, no. 1, pp. 1-10, 2023.</div>"),
 
                 // Comprehensive test
                 Arguments.of(
-                        "[1] <b>Smith & Jones</b>, " +
-                                "\"<i>Analysis of <code> in HTML</i>,\" " +
-                                "<smallcaps>Journal of Web Development</smallcaps>, " +
-                                "vol. 1, no. 1, pp. 1-10, 2023. " +
-                                "https://doi.org/10.1000/example",
-
-                        "<div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">" +
-                                "<span style=\"font-weight:bold;\">Smith&nbsp;&amp;&nbsp;Jones</span>, " +
-                                "&quot;<span style=\"font-style:italic;\">Analysis of &lt;code&gt; in HTML</span>,&quot; " +
-                                "<span style=\"font-variant:small-caps;\">Journal of Web&nbsp;Development</span>, " +
-                                "vol. 1, no. 1, pp. 1-10, 2023. " +
-                                "<a href=\"https://doi.org/10.1000/example\">https://doi.org/10.1000/example</a></div>"
-                )
-        );
+                        "[1] <b>Smith & Jones</b>, "
+                                + "\"<i>Analysis of <code> in HTML</i>,\" "
+                                + "<smallcaps>Journal of Web Development</smallcaps>, "
+                                + "vol. 1, no. 1, pp. 1-10, 2023. "
+                                + "https://doi.org/10.1000/example",
+                        "<div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">"
+                                + "<span style=\"font-weight:bold;\">Smith&nbsp;&amp;&nbsp;Jones</span>, "
+                                + "&quot;<span style=\"font-style:italic;\">Analysis of &lt;code&gt; in HTML</span>,&quot; "
+                                + "<span style=\"font-variant:small-caps;\">Journal of Web&nbsp;Development</span>, "
+                                + "vol. 1, no. 1, pp. 1-10, 2023. "
+                                + "<a href=\"https://doi.org/10.1000/example\">https://doi.org/10.1000/example</a></div>"));
     }
 
     /**
@@ -149,7 +125,14 @@ static Stream<Arguments> ooHTMLTransformFromRawHTML() {
     @ParameterizedTest
     @MethodSource
     void ooHTMLTransformFromRawBibliography(String expected, CitationStyle style) {
-        String citation = CitationStyleGenerator.generateBibliography(List.of(testEntry), style.getSource(), CSLFormatUtils.OUTPUT_FORMAT, context, bibEntryTypesManager).getFirst();
+        String citation =
+                CitationStyleGenerator.generateBibliography(
+                                List.of(testEntry),
+                                style.getSource(),
+                                CSLFormatUtils.OUTPUT_FORMAT,
+                                context,
+                                bibEntryTypesManager)
+                        .getFirst();
         String actual = CSLFormatUtils.transformHTML(citation);
         assertEquals(expected, actual);
     }
@@ -160,116 +143,174 @@ static Stream<Arguments> ooHTMLTransformFromRawBibliography() {
                 // Non-numeric, parentheses, commas, full stops, slashes, hyphens, colons, italics
                 Arguments.of(
                         "  Smith, B., Jones, B., & Williams, J. (2016). Title of the test entry. <i>BibTeX Journal</i>, <i>34</i>(3), 45–67. https://doi.org/10.1001/bla.blubb\n",
-                        STYLE_LIST.stream().filter(e -> "American Psychological Association 7th edition".equals(e.getTitle())).findAny().get()
-                ),
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "American Psychological Association 7th edition"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Numeric type "[1]", brackets, newlines
                 Arguments.of(
-                        "  \n" +
-                                "    [1] B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <i>BibTeX Journal</i>, vol. 34, no. 3, pp. 45–67, Jul. 2016, doi: 10.1001/bla.blubb.\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "IEEE".equals(e.getTitle())).findAny().get()
-                ),
+                        "  \n"
+                                + "    [1] B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <i>BibTeX Journal</i>, vol. 34, no. 3, pp. 45–67, Jul. 2016, doi: 10.1001/bla.blubb.\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(e -> "IEEE".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Numeric type "1."
                 Arguments.of(
-                        "  \n" +
-                                "    1. Smith, B., Jones, B., Williams, J.: Title of the test entry. BibTeX Journal. 34, 45–67 (2016). https://doi.org/10.1001/bla.blubb.\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "Springer - Lecture Notes in Computer Science".equals(e.getTitle())).findAny().get()
-                ),
-
+                        "  \n"
+                                + "    1. Smith, B., Jones, B., Williams, J.: Title of the test entry. BibTeX Journal. 34, 45–67 (2016). https://doi.org/10.1001/bla.blubb.\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Springer - Lecture Notes in Computer Science"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "  Smith, Bill, Bob Jones, and Jeff Williams. 2016. “Title of the Test Entry.” Edited by Phil Taylor. <i>BibTeX Journal</i> 34 (3): 45–67. https://doi.org/10.1001/bla.blubb.\n",
-                        STYLE_LIST.stream().filter(e -> "Chicago Manual of Style 17th edition (author-date)".equals(e.getTitle())).findAny().get()
-                ),
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Chicago Manual of Style 17th edition (author-date)"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Semicolons
                 Arguments.of(
-                        "  \n" +
-                                "    1. Smith B, Jones B, Williams J. Title of the test entry. Taylor P, editor. BibTeX Journal [Internet]. 2016 Jul;34(3):45–67. Available from: https://github.com/JabRef\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "Vancouver".equals(e.getTitle())).findAny().get()
-                ),
-
-                Arguments.of(
-                        "  \n" +
-                                "    1. Smith, B., Jones, B. & Williams, J. Title of the test entry. <i>BibTeX Journal</i> <b>34</b>, 45–67 (2016).\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "Nature".equals(e.getTitle())).findAny().get()
-                ),
-
-                Arguments.of(
-                        "  \n" +
-                                "    1. Smith B, Jones B, Williams J. Title of the test entry. Taylor P, ed. <i>BibTeX Journal</i>. 2016;34(3):45-67. doi:10.1001/bla.blubb\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "American Medical Association 11th edition".equals(e.getTitle())).findAny().get()
-                ),
+                        "  \n"
+                                + "    1. Smith B, Jones B, Williams J. Title of the test entry. Taylor P, editor. BibTeX Journal [Internet]. 2016 Jul;34(3):45–67. Available from: https://github.com/JabRef\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(e -> "Vancouver".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
+                Arguments.of(
+                        "  \n"
+                                + "    1. Smith, B., Jones, B. & Williams, J. Title of the test entry. <i>BibTeX Journal</i> <b>34</b>, 45–67 (2016).\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(e -> "Nature".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
+                Arguments.of(
+                        "  \n"
+                                + "    1. Smith B, Jones B, Williams J. Title of the test entry. Taylor P, ed. <i>BibTeX Journal</i>. 2016;34(3):45-67. doi:10.1001/bla.blubb\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "American Medical Association 11th edition"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Small-caps
                 Arguments.of(
                         "  <smallcaps>Smith</smallcaps>, <smallcaps>B.</smallcaps>, <smallcaps>Jones</smallcaps>, <smallcaps>B.</smallcaps>, <smallcaps>Williams</smallcaps>, <smallcaps>J.</smallcaps> (2016) Title of the test entry <smallcaps>Taylor</smallcaps>, <smallcaps>P.</smallcaps> (ed.). <i>BibTeX Journal</i>, 34(3), pp. 45–67.\n",
-                        STYLE_LIST.stream().filter(e -> "De Montfort University - Harvard".equals(e.getTitle())).findAny().get()
-                ),
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "De Montfort University - Harvard"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Underlines
                 Arguments.of(
                         "  Smith, Bill, Bob Jones, and Jeff Williams. “Title of the test entry.” Ed. Phil Taylor. <u>BibTeX Journal</u> 34.3 (2016): 45–67. <https://github.com/JabRef>.\n",
-                        STYLE_LIST.stream().filter(e -> "Modern Language Association 7th edition (underline)".equals(e.getTitle())).findAny().get()
-                ),
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Modern Language Association 7th edition (underline)"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Non-breaking spaces
                 Arguments.of(
                         "  Smith, Bill, Bob Jones, & Jeff Williams, “Title of the test entry,” <i>BibTeX Journal</i>, 2016, vol. 34, no. 3, pp. 45–67.\n",
-                        STYLE_LIST.stream().filter(e -> "Histoire & Mesure (Français)".equals(e.getTitle())).findAny().get()
-                ),
+                        STYLE_LIST.stream()
+                                .filter(e -> "Histoire & Mesure (Français)".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Numeric with a full stop - "1."
                 Arguments.of(
-                        "  \n" +
-                                "    1. Smith, B., Jones, B. and Williams, J. 2016. Title of the test entry. <i>BibTeX Journal</i>. <b>34</b>: 45–67.\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "The Journal of Veterinary Medical Science".equals(e.getTitle())).findAny().get()
-                ),
+                        "  \n"
+                                + "    1. Smith, B., Jones, B. and Williams, J. 2016. Title of the test entry. <i>BibTeX Journal</i>. <b>34</b>: 45–67.\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "The Journal of Veterinary Medical Science"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Bold text, bold numeric with a full stop - "<BOLD>1."
                 Arguments.of(
-                        "  \n" +
-                                "    <b>1</b>. <b>Smith  B, Jones  B, Williams  J</b>. Title of the test entry. <i>BibTeX Journal</i> 2016 ; 34 : 45–67.\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "Acta Orthopædica Belgica".equals(e.getTitle())).findAny().get()
-                ),
+                        "  \n"
+                                + "    <b>1</b>. <b>Smith  B, Jones  B, Williams  J</b>. Title of the test entry. <i>BibTeX Journal</i> 2016 ; 34 : 45–67.\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(e -> "Acta Orthopædica Belgica".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Naked numeric - "1"
                 Arguments.of(
-                        "  \n" +
-                                "    1 Smith Bill, Jones Bob, Williams Jeff. Title of the test entry. <i>BibTeX Journal</i> 2016;<b>34</b>(3):45–67. Doi: 10.1001/bla.blubb.\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "Acta Anaesthesiologica Taiwanica".equals(e.getTitle())).findAny().get()
-                ),
+                        "  \n"
+                                + "    1 Smith Bill, Jones Bob, Williams Jeff. Title of the test entry. <i>BibTeX Journal</i> 2016;<b>34</b>(3):45–67. Doi: 10.1001/bla.blubb.\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Acta Anaesthesiologica Taiwanica"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Numeric in parentheses - "(1)"
                 Arguments.of(
-                        "  \n" +
-                                "    (1) Smith, B.; Jones, B.; Williams, J. Title of the Test Entry. <i>BibTeX Journal</i> <b>2016</b>, <i>34</i> (3), 45–67. https://doi.org/10.1001/bla.blubb.\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "American Chemical Society".equals(e.getTitle())).findAny().get()
-                ),
+                        "  \n"
+                                + "    (1) Smith, B.; Jones, B.; Williams, J. Title of the Test Entry. <i>BibTeX Journal</i> <b>2016</b>, <i>34</i> (3), 45–67. https://doi.org/10.1001/bla.blubb.\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(e -> "American Chemical Society".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Numeric with right parenthesis - "1)"
                 Arguments.of(
-                        "  \n" +
-                                "    1) Smith B., Jones B., Williams J., <i>BibTeX Journal</i>, <b>34</b>, 45–67 (2016).\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "Chemical and Pharmaceutical Bulletin".equals(e.getTitle())).findAny().get()
-                ),
+                        "  \n"
+                                + "    1) Smith B., Jones B., Williams J., <i>BibTeX Journal</i>, <b>34</b>, 45–67 (2016).\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Chemical and Pharmaceutical Bulletin"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Numeric in superscript - "<SUPERSCRIPT>1"
                 Arguments.of(
                         "  <sup>1</sup> B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal <b>34</b>(3), 45–67 (2016).\n",
-                        STYLE_LIST.stream().filter(e -> "American Institute of Physics 4th edition".equals(e.getTitle())).findAny().get()
-                )
-        );
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "American Institute of Physics 4th edition"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()));
     }
 
     /**
@@ -280,8 +321,15 @@ static Stream<Arguments> ooHTMLTransformFromRawBibliography() {
      */
     @ParameterizedTest
     @MethodSource
-    void ooHTMLTransformFromCitationWithSingleEntry(String expected, CitationStyle style) throws IOException {
-        Citation citation = CitationStyleGenerator.generateCitation(List.of(testEntry), style.getSource(), CSLFormatUtils.OUTPUT_FORMAT, context, bibEntryTypesManager);
+    void ooHTMLTransformFromCitationWithSingleEntry(String expected, CitationStyle style)
+            throws IOException {
+        Citation citation =
+                CitationStyleGenerator.generateCitation(
+                        List.of(testEntry),
+                        style.getSource(),
+                        CSLFormatUtils.OUTPUT_FORMAT,
+                        context,
+                        bibEntryTypesManager);
         String inTextCitationText = citation.getText();
         String actual = CSLFormatUtils.transformHTML(inTextCitationText);
         OOText ooText = OOText.fromString(actual);
@@ -290,88 +338,135 @@ void ooHTMLTransformFromCitationWithSingleEntry(String expected, CitationStyle s
 
     static Stream<Arguments> ooHTMLTransformFromCitationWithSingleEntry() {
         return Stream.of(
-
                 Arguments.of(
                         "(Smith et al., 2016)",
-                        STYLE_LIST.stream().filter(e -> "American Psychological Association 7th edition".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "American Psychological Association 7th edition"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "[1]",
-                        STYLE_LIST.stream().filter(e -> "IEEE".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(e -> "IEEE".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "[1]",
-                        STYLE_LIST.stream().filter(e -> "Springer - Lecture Notes in Computer Science".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Springer - Lecture Notes in Computer Science"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "(Smith, Jones, and Williams 2016)",
-                        STYLE_LIST.stream().filter(e -> "Chicago Manual of Style 17th edition (author-date)".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Chicago Manual of Style 17th edition (author-date)"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "(1)",
-                        STYLE_LIST.stream().filter(e -> "Vancouver".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(e -> "Vancouver".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "<sup>1</sup>",
-                        STYLE_LIST.stream().filter(e -> "Nature".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(e -> "Nature".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "<sup>1</sup>",
-                        STYLE_LIST.stream().filter(e -> "American Medical Association 11th edition".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "American Medical Association 11th edition"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "(Smith, Jones, Williams, 2016)",
-                        STYLE_LIST.stream().filter(e -> "De Montfort University - Harvard".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "De Montfort University - Harvard"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "(Smith, Jones, & Williams)",
-                        STYLE_LIST.stream().filter(e -> "Modern Language Association 7th edition (underline)".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Modern Language Association 7th edition (underline)"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "Smith, B., B. Jones, and J. Williams, 2016.",
-                        STYLE_LIST.stream().filter(e -> "Histoire & Mesure (Français)".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(e -> "Histoire & Mesure (Français)".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "[1]",
-                        STYLE_LIST.stream().filter(e -> "The Journal of Veterinary Medical Science".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "The Journal of Veterinary Medical Science"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "(<i>1</i>)",
-                        STYLE_LIST.stream().filter(e -> "Acta Orthopædica Belgica".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(e -> "Acta Orthopædica Belgica".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "<sup>1</sup>",
-                        STYLE_LIST.stream().filter(e -> "Acta Anaesthesiologica Taiwanica".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Acta Anaesthesiologica Taiwanica"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "<sup>1</sup>",
-                        STYLE_LIST.stream().filter(e -> "American Chemical Society".equals(e.getTitle())).findAny().get()
-                ),
+                        STYLE_LIST.stream()
+                                .filter(e -> "American Chemical Society".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
-                // Note: not sure if the right parenthesis outside the superscript is correct, but that's how citeproc-java generates it in raw form as well.
+                // Note: not sure if the right parenthesis outside the superscript is correct, but
+                // that's how citeproc-java generates it in raw form as well.
                 Arguments.of(
                         "<sup>1</sup>)",
-                        STYLE_LIST.stream().filter(e -> "Chemical and Pharmaceutical Bulletin".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Chemical and Pharmaceutical Bulletin"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "<sup>1</sup>",
-                        STYLE_LIST.stream().filter(e -> "American Institute of Physics 4th edition".equals(e.getTitle())).findAny().get()
-                )
-        );
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "American Institute of Physics 4th edition"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()));
     }
 
     /**
@@ -382,33 +477,42 @@ static Stream<Arguments> ooHTMLTransformFromCitationWithSingleEntry() {
      */
     @ParameterizedTest
     @MethodSource
-    void ooHTMLTransformFromCitationWithMultipleEntries(String expected, CitationStyle style) throws IOException {
-        BibEntry entry1 = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Garcia, Maria and Lee, David")
-                .withField(StandardField.JOURNAL, "International Review of Physics")
-                .withField(StandardField.NUMBER, "6")
-                .withField(StandardField.PAGES, "789--810")
-                .withField(StandardField.TITLE, "Quantum Entanglement in Superconductors")
-                .withField(StandardField.VOLUME, "28")
-                .withField(StandardField.ISSUE, "3")
-                .withField(StandardField.YEAR, "2021")
-                .withCitationKey("Garcia_2021");
-
-        BibEntry entry2 = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Smith, John and Johnson, Emily")
-                .withField(StandardField.JOURNAL, "Journal of Computer Science")
-                .withField(StandardField.NUMBER, "4")
-                .withField(StandardField.PAGES, "101--120")
-                .withField(StandardField.TITLE, "A Study on Machine Learning Algorithms")
-                .withField(StandardField.VOLUME, "15")
-                .withField(StandardField.ISSUE, "2")
-                .withField(StandardField.YEAR, "2020")
-                .withCitationKey("Smith_2020");
+    void ooHTMLTransformFromCitationWithMultipleEntries(String expected, CitationStyle style)
+            throws IOException {
+        BibEntry entry1 =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Garcia, Maria and Lee, David")
+                        .withField(StandardField.JOURNAL, "International Review of Physics")
+                        .withField(StandardField.NUMBER, "6")
+                        .withField(StandardField.PAGES, "789--810")
+                        .withField(StandardField.TITLE, "Quantum Entanglement in Superconductors")
+                        .withField(StandardField.VOLUME, "28")
+                        .withField(StandardField.ISSUE, "3")
+                        .withField(StandardField.YEAR, "2021")
+                        .withCitationKey("Garcia_2021");
+
+        BibEntry entry2 =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Smith, John and Johnson, Emily")
+                        .withField(StandardField.JOURNAL, "Journal of Computer Science")
+                        .withField(StandardField.NUMBER, "4")
+                        .withField(StandardField.PAGES, "101--120")
+                        .withField(StandardField.TITLE, "A Study on Machine Learning Algorithms")
+                        .withField(StandardField.VOLUME, "15")
+                        .withField(StandardField.ISSUE, "2")
+                        .withField(StandardField.YEAR, "2020")
+                        .withCitationKey("Smith_2020");
 
         List<BibEntry> entries = List.of(entry1, entry2);
         BibDatabaseContext context = new BibDatabaseContext(new BibDatabase(entries));
         context.setMode(BibDatabaseMode.BIBLATEX);
-        Citation citation = CitationStyleGenerator.generateCitation(entries, style.getSource(), CSLFormatUtils.OUTPUT_FORMAT, context, bibEntryTypesManager);
+        Citation citation =
+                CitationStyleGenerator.generateCitation(
+                        entries,
+                        style.getSource(),
+                        CSLFormatUtils.OUTPUT_FORMAT,
+                        context,
+                        bibEntryTypesManager);
         String inTextCitationText = citation.getText();
         String actual = CSLFormatUtils.transformHTML(inTextCitationText);
         assertEquals(expected, actual);
@@ -418,84 +522,130 @@ static Stream<Arguments> ooHTMLTransformFromCitationWithMultipleEntries() {
         return Stream.of(
                 Arguments.of(
                         "(Garcia & Lee, 2021; Smith & Johnson, 2020)",
-                        STYLE_LIST.stream().filter(e -> "American Psychological Association 7th edition".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "American Psychological Association 7th edition"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "[1], [2]",
-                        STYLE_LIST.stream().filter(e -> "IEEE".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(e -> "IEEE".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "[1, 2]",
-                        STYLE_LIST.stream().filter(e -> "Springer - Lecture Notes in Computer Science".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Springer - Lecture Notes in Computer Science"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "(Garcia and Lee 2021; Smith and Johnson 2020)",
-                        STYLE_LIST.stream().filter(e -> "Chicago Manual of Style 17th edition (author-date)".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Chicago Manual of Style 17th edition (author-date)"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "(1,2)",
-                        STYLE_LIST.stream().filter(e -> "Vancouver".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(e -> "Vancouver".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "<sup>1,2</sup>",
-                        STYLE_LIST.stream().filter(e -> "Nature".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(e -> "Nature".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "<sup>1,2</sup>",
-                        STYLE_LIST.stream().filter(e -> "American Medical Association 11th edition".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "American Medical Association 11th edition"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "(Garcia, Lee, 2021; Smith, Johnson, 2020)",
-                        STYLE_LIST.stream().filter(e -> "De Montfort University - Harvard".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "De Montfort University - Harvard"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "(Garcia & Lee; Smith & Johnson)",
-                        STYLE_LIST.stream().filter(e -> "Modern Language Association 7th edition (underline)".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Modern Language Association 7th edition (underline)"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "Garcia, M. and D. Lee, 2021 ; Smith, J. and E. Johnson, 2020.",
-                        STYLE_LIST.stream().filter(e -> "Histoire & Mesure (Français)".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(e -> "Histoire & Mesure (Français)".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "[1, 2]",
-                        STYLE_LIST.stream().filter(e -> "The Journal of Veterinary Medical Science".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "The Journal of Veterinary Medical Science"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "(<i>1,2</i>)",
-                        STYLE_LIST.stream().filter(e -> "Acta Orthopædica Belgica".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(e -> "Acta Orthopædica Belgica".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "<sup>1,2</sup>",
-                        STYLE_LIST.stream().filter(e -> "Acta Anaesthesiologica Taiwanica".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Acta Anaesthesiologica Taiwanica"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "<sup>1,2</sup>",
-                        STYLE_LIST.stream().filter(e -> "American Chemical Society".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(e -> "American Chemical Society".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "<sup>1,2</sup>)",
-                        STYLE_LIST.stream().filter(e -> "Chemical and Pharmaceutical Bulletin".equals(e.getTitle())).findAny().get()
-                ),
-
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Chemical and Pharmaceutical Bulletin"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
                 Arguments.of(
                         "<sup>1,2</sup>",
-                        STYLE_LIST.stream().filter(e -> "American Institute of Physics 4th edition".equals(e.getTitle())).findAny().get()
-                )
-        );
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "American Institute of Physics 4th edition"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()));
     }
 
     /**
@@ -510,7 +660,14 @@ static Stream<Arguments> ooHTMLTransformFromCitationWithMultipleEntries() {
     @ParameterizedTest
     @MethodSource
     void updateSingleNumericCitation(String expected, CitationStyle style) {
-        String citation = CitationStyleGenerator.generateBibliography(List.of(testEntry), style.getSource(), CSLFormatUtils.OUTPUT_FORMAT, context, bibEntryTypesManager).getFirst();
+        String citation =
+                CitationStyleGenerator.generateBibliography(
+                                List.of(testEntry),
+                                style.getSource(),
+                                CSLFormatUtils.OUTPUT_FORMAT,
+                                context,
+                                bibEntryTypesManager)
+                        .getFirst();
         String transformedCitation = CSLFormatUtils.transformHTML(citation);
         String actual = CSLFormatUtils.updateSingleBibliographyNumber(transformedCitation, 3);
         assertEquals(expected, actual);
@@ -521,58 +678,83 @@ static Stream<Arguments> updateSingleNumericCitation() {
 
                 // Type: "[1]"
                 Arguments.of(
-                        "  \n" +
-                                "    [3] B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <i>BibTeX Journal</i>, vol. 34, no. 3, pp. 45–67, Jul. 2016, doi: 10.1001/bla.blubb.\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "IEEE".equals(e.getTitle())).findAny().get()
-                ),
+                        "  \n"
+                                + "    [3] B. Smith, B. Jones, and J. Williams, “Title of the test entry,” <i>BibTeX Journal</i>, vol. 34, no. 3, pp. 45–67, Jul. 2016, doi: 10.1001/bla.blubb.\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(e -> "IEEE".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Type: "1."
                 Arguments.of(
-                        "  \n" +
-                                "    3. Smith, B., Jones, B. and Williams, J. 2016. Title of the test entry. <i>BibTeX Journal</i>. <b>34</b>: 45–67.\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "The Journal of Veterinary Medical Science".equals(e.getTitle())).findAny().get()
-                ),
+                        "  \n"
+                                + "    3. Smith, B., Jones, B. and Williams, J. 2016. Title of the test entry. <i>BibTeX Journal</i>. <b>34</b>: 45–67.\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "The Journal of Veterinary Medical Science"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Type:"<BOLD>1."
                 Arguments.of(
-                        "  \n" +
-                                "    <b>3</b>. <b>Smith  B, Jones  B, Williams  J</b>. Title of the test entry. <i>BibTeX Journal</i> 2016 ; 34 : 45–67.\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "Acta Orthopædica Belgica".equals(e.getTitle())).findAny().get()
-                ),
+                        "  \n"
+                                + "    <b>3</b>. <b>Smith  B, Jones  B, Williams  J</b>. Title of the test entry. <i>BibTeX Journal</i> 2016 ; 34 : 45–67.\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(e -> "Acta Orthopædica Belgica".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Type: "1"
                 Arguments.of(
-                        "  \n" +
-                                "    3 Smith Bill, Jones Bob, Williams Jeff. Title of the test entry. <i>BibTeX Journal</i> 2016;<b>34</b>(3):45–67. Doi: 10.1001/bla.blubb.\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "Acta Anaesthesiologica Taiwanica".equals(e.getTitle())).findAny().get()
-                ),
+                        "  \n"
+                                + "    3 Smith Bill, Jones Bob, Williams Jeff. Title of the test entry. <i>BibTeX Journal</i> 2016;<b>34</b>(3):45–67. Doi: 10.1001/bla.blubb.\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Acta Anaesthesiologica Taiwanica"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Type: "(1)"
                 Arguments.of(
-                        "  \n" +
-                                "    (3) Smith, B.; Jones, B.; Williams, J. Title of the Test Entry. <i>BibTeX Journal</i> <b>2016</b>, <i>34</i> (3), 45–67. https://doi.org/10.1001/bla.blubb.\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "American Chemical Society".equals(e.getTitle())).findAny().get()
-                ),
+                        "  \n"
+                                + "    (3) Smith, B.; Jones, B.; Williams, J. Title of the Test Entry. <i>BibTeX Journal</i> <b>2016</b>, <i>34</i> (3), 45–67. https://doi.org/10.1001/bla.blubb.\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(e -> "American Chemical Society".equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Type: "1)"
                 Arguments.of(
-                        "  \n" +
-                                "    3) Smith B., Jones B., Williams J., <i>BibTeX Journal</i>, <b>34</b>, 45–67 (2016).\n" +
-                                "  \n",
-                        STYLE_LIST.stream().filter(e -> "Chemical and Pharmaceutical Bulletin".equals(e.getTitle())).findAny().get()
-                ),
+                        "  \n"
+                                + "    3) Smith B., Jones B., Williams J., <i>BibTeX Journal</i>, <b>34</b>, 45–67 (2016).\n"
+                                + "  \n",
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "Chemical and Pharmaceutical Bulletin"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()),
 
                 // Type: "<SUPERSCRIPT>1"
                 Arguments.of(
                         "  <sup>3</sup> B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal <b>34</b>(3), 45–67 (2016).\n",
-                        STYLE_LIST.stream().filter(e -> "American Institute of Physics 4th edition".equals(e.getTitle())).findAny().get()
-                )
-        );
+                        STYLE_LIST.stream()
+                                .filter(
+                                        e ->
+                                                "American Institute of Physics 4th edition"
+                                                        .equals(e.getTitle()))
+                                .findAny()
+                                .get()));
     }
 
     /**
@@ -618,9 +800,7 @@ private static Stream<Arguments> ChangeToInText() {
 
                 // Nature Style
                 Arguments.of("1", "1"),
-                Arguments.of("1,2", "1,2")
-
-        );
+                Arguments.of("1,2", "1,2"));
     }
 
     /**
@@ -637,55 +817,66 @@ void generateAlphanumericCitationTest(String expected, List<BibEntry> entries) {
     }
 
     private static Stream<Arguments> generateAlphanumericCitationTest() {
-        BibEntry entry1 = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Garcia, Maria")
-                .withField(StandardField.TITLE, "Quantum Entanglement in Superconductors")
-                .withField(StandardField.JOURNAL, "International Review of Physics")
-                .withField(StandardField.VOLUME, "28")
-                .withField(StandardField.NUMBER, "6")
-                .withField(StandardField.PAGES, "789--810")
-                .withField(StandardField.YEAR, "2021")
-                .withCitationKey("Garcia_2021");
-
-        BibEntry entry2 = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Smith, John and Johnson, Emily")
-                .withField(StandardField.TITLE, "A Study on Machine Learning Algorithms")
-                .withField(StandardField.JOURNAL, "Journal of Computer Science")
-                .withField(StandardField.VOLUME, "15")
-                .withField(StandardField.NUMBER, "4")
-                .withField(StandardField.PAGES, "101--120")
-                .withField(StandardField.YEAR, "2020")
-                .withCitationKey("Smith_2020");
-
-        BibEntry entry3 = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Johnson, Emily; Williams, Jessica; Lee, David")
-                .withField(StandardField.TITLE, "Trends in Artificial Intelligence")
-                .withField(StandardField.JOURNAL, "AI Magazine")
-                .withField(StandardField.VOLUME, "41")
-                .withField(StandardField.NUMBER, "2")
-                .withField(StandardField.PAGES, "45--60")
-                .withField(StandardField.YEAR, "2019")
-                .withCitationKey("Johnson_2019");
-
-        BibEntry entry4 = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Smith, John; Johnson, Emily; Lee, David; Williams, Jessica")
-                .withField(StandardField.TITLE, "Big Data Analytics in Healthcare")
-                .withField(StandardField.JOURNAL, "Journal of Medical Informatics")
-                .withField(StandardField.VOLUME, "23")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.PAGES, "11--25")
-                .withField(StandardField.YEAR, "2018")
-                .withCitationKey("Smith_2018");
-
-        BibEntry entry5 = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Garcia, Maria; Smith, John; Johnson, Emily; Lee, David; Williams, Jessica")
-                .withField(StandardField.TITLE, "Advances in Renewable Energy Technologies")
-                .withField(StandardField.JOURNAL, "Energy Policy")
-                .withField(StandardField.VOLUME, "52")
-                .withField(StandardField.NUMBER, "3")
-                .withField(StandardField.PAGES, "120--135")
-                .withField(StandardField.YEAR, "2017")
-                .withCitationKey("Garcia_2017");
+        BibEntry entry1 =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Garcia, Maria")
+                        .withField(StandardField.TITLE, "Quantum Entanglement in Superconductors")
+                        .withField(StandardField.JOURNAL, "International Review of Physics")
+                        .withField(StandardField.VOLUME, "28")
+                        .withField(StandardField.NUMBER, "6")
+                        .withField(StandardField.PAGES, "789--810")
+                        .withField(StandardField.YEAR, "2021")
+                        .withCitationKey("Garcia_2021");
+
+        BibEntry entry2 =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Smith, John and Johnson, Emily")
+                        .withField(StandardField.TITLE, "A Study on Machine Learning Algorithms")
+                        .withField(StandardField.JOURNAL, "Journal of Computer Science")
+                        .withField(StandardField.VOLUME, "15")
+                        .withField(StandardField.NUMBER, "4")
+                        .withField(StandardField.PAGES, "101--120")
+                        .withField(StandardField.YEAR, "2020")
+                        .withCitationKey("Smith_2020");
+
+        BibEntry entry3 =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Johnson, Emily; Williams, Jessica; Lee, David")
+                        .withField(StandardField.TITLE, "Trends in Artificial Intelligence")
+                        .withField(StandardField.JOURNAL, "AI Magazine")
+                        .withField(StandardField.VOLUME, "41")
+                        .withField(StandardField.NUMBER, "2")
+                        .withField(StandardField.PAGES, "45--60")
+                        .withField(StandardField.YEAR, "2019")
+                        .withCitationKey("Johnson_2019");
+
+        BibEntry entry4 =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Smith, John; Johnson, Emily; Lee, David; Williams, Jessica")
+                        .withField(StandardField.TITLE, "Big Data Analytics in Healthcare")
+                        .withField(StandardField.JOURNAL, "Journal of Medical Informatics")
+                        .withField(StandardField.VOLUME, "23")
+                        .withField(StandardField.NUMBER, "1")
+                        .withField(StandardField.PAGES, "11--25")
+                        .withField(StandardField.YEAR, "2018")
+                        .withCitationKey("Smith_2018");
+
+        BibEntry entry5 =
+                new BibEntry(StandardEntryType.Article)
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Garcia, Maria; Smith, John; Johnson, Emily; Lee, David; Williams, Jessica")
+                        .withField(StandardField.TITLE, "Advances in Renewable Energy Technologies")
+                        .withField(StandardField.JOURNAL, "Energy Policy")
+                        .withField(StandardField.VOLUME, "52")
+                        .withField(StandardField.NUMBER, "3")
+                        .withField(StandardField.PAGES, "120--135")
+                        .withField(StandardField.YEAR, "2017")
+                        .withCitationKey("Garcia_2017");
 
         return Stream.of(
 
@@ -705,8 +896,8 @@ private static Stream<Arguments> generateAlphanumericCitationTest() {
                 Arguments.of("[GSJL17]", List.of(entry5)),
 
                 // Multiple entries with varying number of authors
-                Arguments.of("[Ga21; SJ20; JWL19; SJLW18; GSJL17]", List.of(entry1, entry2, entry3, entry4, entry5))
-
-        );
+                Arguments.of(
+                        "[Ga21; SJ20; JWL19; SJLW18; GSJL17]",
+                        List.of(entry1, entry2, entry3, entry4, entry5)));
     }
 }
diff --git a/src/test/java/org/jabref/logic/openoffice/style/JStyleTest.java b/src/test/java/org/jabref/logic/openoffice/style/JStyleTest.java
index 2f903bf764f8..a9583a05e71b 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/JStyleTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/JStyleTest.java
@@ -1,17 +1,10 @@
 package org.jabref.logic.openoffice.style;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.Layout;
@@ -26,23 +19,35 @@
 import org.jabref.model.openoffice.style.CitationMarkerNumericBibEntry;
 import org.jabref.model.openoffice.style.CitationMarkerNumericEntry;
 import org.jabref.model.openoffice.style.NonUniqueCitationMarker;
-
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 class JStyleTest {
-    private final LayoutFormatterPreferences layoutFormatterPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-    private final JournalAbbreviationRepository abbreviationRepository = mock(JournalAbbreviationRepository.class);
+    private final LayoutFormatterPreferences layoutFormatterPreferences =
+            mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+    private final JournalAbbreviationRepository abbreviationRepository =
+            mock(JournalAbbreviationRepository.class);
 
     @Test
     void authorYear() throws IOException {
-        JStyle style = new JStyle(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH, layoutFormatterPreferences, abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
         assertTrue(style.isValid());
         assertTrue(style.isInternalStyle());
         assertFalse(style.isCitationKeyCiteMarkers());
@@ -55,7 +60,11 @@ void authorYear() throws IOException {
 
     @Test
     void authorYearAsFile() throws URISyntaxException, IOException {
-        Path defFile = Path.of(JStyleTest.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI());
+        Path defFile =
+                Path.of(
+                        JStyleTest.class
+                                .getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH)
+                                .toURI());
 
         JStyle style = new JStyle(defFile, layoutFormatterPreferences, abbreviationRepository);
         assertTrue(style.isValid());
@@ -70,10 +79,11 @@ void authorYearAsFile() throws URISyntaxException, IOException {
 
     @Test
     void numerical() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
         assertTrue(style.isValid());
         assertFalse(style.isCitationKeyCiteMarkers());
         assertFalse(style.isBoldCitations());
@@ -86,8 +96,8 @@ void numerical() throws IOException {
     /*
      * begin helpers
      */
-    static String runGetNumCitationMarker2a(JStyle style,
-                                            List<Integer> num, int minGroupingCount, boolean inList) {
+    static String runGetNumCitationMarker2a(
+            JStyle style, List<Integer> num, int minGroupingCount, boolean inList) {
         return OOBibStyleTestHelper.runGetNumCitationMarker2a(style, num, minGroupingCount, inList);
     }
 
@@ -99,38 +109,37 @@ static CitationMarkerNumericBibEntry numBibEntry(String key, Optional<Integer> n
         return OOBibStyleTestHelper.numBibEntry(key, num);
     }
 
-    static String runGetNumCitationMarker2b(JStyle style,
-                                            int minGroupingCount,
-                                            CitationMarkerNumericEntry... s) {
+    static String runGetNumCitationMarker2b(
+            JStyle style, int minGroupingCount, CitationMarkerNumericEntry... s) {
         List<CitationMarkerNumericEntry> input = Stream.of(s).collect(Collectors.toList());
         OOText res = style.getNumCitationMarker2(input, minGroupingCount);
         return res.toString();
     }
 
-    static CitationMarkerEntry makeCitationMarkerEntry(BibEntry entry,
-                                                       BibDatabase database,
-                                                       String uniqueLetterQ,
-                                                       String pageInfoQ,
-                                                       boolean isFirstAppearanceOfSource) {
-        return OOBibStyleTestHelper.makeCitationMarkerEntry(entry,
-                database,
-                uniqueLetterQ,
-                pageInfoQ,
-                isFirstAppearanceOfSource);
+    static CitationMarkerEntry makeCitationMarkerEntry(
+            BibEntry entry,
+            BibDatabase database,
+            String uniqueLetterQ,
+            String pageInfoQ,
+            boolean isFirstAppearanceOfSource) {
+        return OOBibStyleTestHelper.makeCitationMarkerEntry(
+                entry, database, uniqueLetterQ, pageInfoQ, isFirstAppearanceOfSource);
     }
 
     /*
      * Similar to old API. pageInfo is new, and unlimAuthors is
      * replaced with isFirstAppearanceOfSource
      */
-    static String getCitationMarker2(JStyle style,
-                                     List<BibEntry> entries,
-                                     Map<BibEntry, BibDatabase> entryDBMap,
-                                     boolean inParenthesis,
-                                     String[] uniquefiers,
-                                     Boolean[] isFirstAppearanceOfSource,
-                                     String[] pageInfo) {
-        return OOBibStyleTestHelper.getCitationMarker2(style,
+    static String getCitationMarker2(
+            JStyle style,
+            List<BibEntry> entries,
+            Map<BibEntry, BibDatabase> entryDBMap,
+            boolean inParenthesis,
+            String[] uniquefiers,
+            Boolean[] isFirstAppearanceOfSource,
+            String[] pageInfo) {
+        return OOBibStyleTestHelper.getCitationMarker2(
+                style,
                 entries,
                 entryDBMap,
                 inParenthesis,
@@ -139,14 +148,16 @@ static String getCitationMarker2(JStyle style,
                 pageInfo);
     }
 
-    static String getCitationMarker2b(JStyle style,
-                                      List<BibEntry> entries,
-                                      Map<BibEntry, BibDatabase> entryDBMap,
-                                      boolean inParenthesis,
-                                      String[] uniquefiers,
-                                      Boolean[] isFirstAppearanceOfSource,
-                                      String[] pageInfo) {
-        return OOBibStyleTestHelper.getCitationMarker2b(style,
+    static String getCitationMarker2b(
+            JStyle style,
+            List<BibEntry> entries,
+            Map<BibEntry, BibDatabase> entryDBMap,
+            boolean inParenthesis,
+            String[] uniquefiers,
+            Boolean[] isFirstAppearanceOfSource,
+            String[] pageInfo) {
+        return OOBibStyleTestHelper.getCitationMarker2b(
+                style,
                 entries,
                 entryDBMap,
                 inParenthesis,
@@ -161,10 +172,11 @@ static String getCitationMarker2b(JStyle style,
 
     @Test
     void getNumCitationMarker() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
         assertEquals("[1] ", runGetNumCitationMarker2a(style, List.of(1), -1, true));
 
         assertEquals("[1]", runGetNumCitationMarker2a(style, List.of(1), -1, false));
@@ -181,42 +193,58 @@ void getNumCitationMarker() throws IOException {
 
     @Test
     void getNumCitationMarkerUndefined() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
 
         // unresolved citations look like [??key]
-        assertEquals("[" + JStyle.UNDEFINED_CITATION_MARKER + "key" + "]",
-                runGetNumCitationMarker2b(style, 1,
-                        numEntry("key", 0, null)));
+        assertEquals(
+                "[" + JStyle.UNDEFINED_CITATION_MARKER + "key" + "]",
+                runGetNumCitationMarker2b(style, 1, numEntry("key", 0, null)));
 
         // pageInfo is shown for unresolved citations
-        assertEquals("[" + JStyle.UNDEFINED_CITATION_MARKER + "key" + "; p1]",
-                runGetNumCitationMarker2b(style, 1,
-                        numEntry("key", 0, "p1")));
+        assertEquals(
+                "[" + JStyle.UNDEFINED_CITATION_MARKER + "key" + "; p1]",
+                runGetNumCitationMarker2b(style, 1, numEntry("key", 0, "p1")));
 
         // unresolved citations sorted to the front
-        assertEquals("[" + JStyle.UNDEFINED_CITATION_MARKER + "key" + "; 2-4]",
-                runGetNumCitationMarker2b(style, 1,
+        assertEquals(
+                "[" + JStyle.UNDEFINED_CITATION_MARKER + "key" + "; 2-4]",
+                runGetNumCitationMarker2b(
+                        style,
+                        1,
                         numEntry("x4", 4, ""),
                         numEntry("x2", 2, ""),
                         numEntry("x3", 3, ""),
                         numEntry("key", 0, "")));
 
-        assertEquals("[" + JStyle.UNDEFINED_CITATION_MARKER + "key" + "; 1-3]",
-                runGetNumCitationMarker2b(style, 1,
+        assertEquals(
+                "[" + JStyle.UNDEFINED_CITATION_MARKER + "key" + "; 1-3]",
+                runGetNumCitationMarker2b(
+                        style,
+                        1,
                         numEntry("x1", 1, ""),
                         numEntry("x2", 2, ""),
                         numEntry("y3", 3, ""),
                         numEntry("key", 0, "")));
 
         // multiple unresolved citations are not collapsed
-        assertEquals("["
-                        + JStyle.UNDEFINED_CITATION_MARKER + "x1" + "; "
-                        + JStyle.UNDEFINED_CITATION_MARKER + "x2" + "; "
-                        + JStyle.UNDEFINED_CITATION_MARKER + "x3" + "]",
-                runGetNumCitationMarker2b(style, 1,
+        assertEquals(
+                "["
+                        + JStyle.UNDEFINED_CITATION_MARKER
+                        + "x1"
+                        + "; "
+                        + JStyle.UNDEFINED_CITATION_MARKER
+                        + "x2"
+                        + "; "
+                        + JStyle.UNDEFINED_CITATION_MARKER
+                        + "x3"
+                        + "]",
+                runGetNumCitationMarker2b(
+                        style,
+                        1,
                         numEntry("x1", 0, ""),
                         numEntry("x2", 0, ""),
                         numEntry("x3", 0, "")));
@@ -225,16 +253,18 @@ void getNumCitationMarkerUndefined() throws IOException {
          * BIBLIOGRAPHY
          */
         CitationMarkerNumericBibEntry x = numBibEntry("key", Optional.empty());
-        assertEquals("[" + JStyle.UNDEFINED_CITATION_MARKER + "key" + "] ",
+        assertEquals(
+                "[" + JStyle.UNDEFINED_CITATION_MARKER + "key" + "] ",
                 style.getNumCitationMarkerForBibliography(x).toString());
     }
 
     @Test
     void getCitProperty() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
         assertEquals(", ", style.getStringCitProperty("AuthorSeparator"));
 
         // old
@@ -252,17 +282,25 @@ void getCitProperty() throws IOException {
 
     @Test
     void getCitationMarker() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.AUTHOR, "Gustav Bostr\\\"{o}m and Jaana W\\\"{a}yrynen and Marine Bod\\'{e}n and Konstantin Beznosov and Philippe Kruchten")
-                .withField(StandardField.YEAR, "2006")
-                .withField(StandardField.BOOKTITLE, "SESS '06: Proceedings of the 2006 international workshop on Software engineering for secure systems")
-                .withField(StandardField.PUBLISHER, "ACM")
-                .withField(StandardField.TITLE, "Extending XP practices to support security requirements engineering")
-                .withField(StandardField.PAGES, "11--18");
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
+        BibEntry entry =
+                new BibEntry()
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Gustav Bostr\\\"{o}m and Jaana W\\\"{a}yrynen and Marine Bod\\'{e}n and Konstantin Beznosov and Philippe Kruchten")
+                        .withField(StandardField.YEAR, "2006")
+                        .withField(
+                                StandardField.BOOKTITLE,
+                                "SESS '06: Proceedings of the 2006 international workshop on Software engineering for secure systems")
+                        .withField(StandardField.PUBLISHER, "ACM")
+                        .withField(
+                                StandardField.TITLE,
+                                "Extending XP practices to support security requirements engineering")
+                        .withField(StandardField.PAGES, "11--18");
         entry.setCitationKey("Bostrom2006"); // citation key is not optional now
         BibDatabase database = new BibDatabase();
         database.insertEntry(entry);
@@ -273,39 +311,62 @@ void getCitationMarker() throws IOException {
         assertEquals(3, style.getMaxAuthors());
         assertEquals(-1, style.getMaxAuthorsFirst());
 
-        assertEquals("[Boström et al., 2006]",
-                getCitationMarker2(style,
-                        Collections.singletonList(entry), entryDBMap,
-                        true, null, null, null));
+        assertEquals(
+                "[Boström et al., 2006]",
+                getCitationMarker2(
+                        style,
+                        Collections.singletonList(entry),
+                        entryDBMap,
+                        true,
+                        null,
+                        null,
+                        null));
 
-        assertEquals("Boström et al. [2006]",
-                getCitationMarker2(style,
-                        Collections.singletonList(entry), entryDBMap,
-                        false, null, new Boolean[]{false}, null));
+        assertEquals(
+                "Boström et al. [2006]",
+                getCitationMarker2(
+                        style,
+                        Collections.singletonList(entry),
+                        entryDBMap,
+                        false,
+                        null,
+                        new Boolean[] {false},
+                        null));
 
-        assertEquals("[Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006]",
-                getCitationMarker2(style,
-                        Collections.singletonList(entry), entryDBMap,
+        assertEquals(
+                "[Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006]",
+                getCitationMarker2(
+                        style,
+                        Collections.singletonList(entry),
+                        entryDBMap,
                         true,
                         null,
-                        new Boolean[]{true},
+                        new Boolean[] {true},
                         null));
     }
 
     @Test
     void layout() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
-
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.AUTHOR, "Gustav Bostr\\\"{o}m and Jaana W\\\"{a}yrynen and Marine Bod\\'{e}n and Konstantin Beznosov and Philippe Kruchten")
-                .withField(StandardField.YEAR, "2006")
-                .withField(StandardField.BOOKTITLE, "SESS '06: Proceedings of the 2006 international workshop on Software engineering for secure systems")
-                .withField(StandardField.PUBLISHER, "ACM")
-                .withField(StandardField.TITLE, "Extending XP practices to support security requirements engineering")
-                .withField(StandardField.PAGES, "11--18");
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
+
+        BibEntry entry =
+                new BibEntry()
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Gustav Bostr\\\"{o}m and Jaana W\\\"{a}yrynen and Marine Bod\\'{e}n and Konstantin Beznosov and Philippe Kruchten")
+                        .withField(StandardField.YEAR, "2006")
+                        .withField(
+                                StandardField.BOOKTITLE,
+                                "SESS '06: Proceedings of the 2006 international workshop on Software engineering for secure systems")
+                        .withField(StandardField.PUBLISHER, "ACM")
+                        .withField(
+                                StandardField.TITLE,
+                                "Extending XP practices to support security requirements engineering")
+                        .withField(StandardField.PAGES, "11--18");
         BibDatabase database = new BibDatabase();
         database.insertEntry(entry);
 
@@ -324,10 +385,11 @@ void layout() throws IOException {
 
     @Test
     void institutionAuthor() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
         BibDatabase database = new BibDatabase();
 
         Layout l = style.getReferenceFormat(StandardEntryType.Article);
@@ -339,16 +401,18 @@ void institutionAuthor() throws IOException {
         entry.setField(StandardField.TITLE, "JabRef Manual");
         entry.setField(StandardField.YEAR, "2016");
         database.insertEntry(entry);
-        assertEquals("<b>JabRef Development Team</b> (<b>2016</b>). <i>JabRef Manual</i>,  .",
+        assertEquals(
+                "<b>JabRef Development Team</b> (<b>2016</b>). <i>JabRef Manual</i>,  .",
                 l.doLayout(entry, database));
     }
 
     @Test
     void vonAuthor() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
         BibDatabase database = new BibDatabase();
 
         Layout l = style.getReferenceFormat(StandardEntryType.Article);
@@ -360,38 +424,42 @@ void vonAuthor() throws IOException {
         entry.setField(StandardField.TITLE, "JabRef Manual");
         entry.setField(StandardField.YEAR, "2016");
         database.insertEntry(entry);
-        assertEquals("<b>von Beta, A.</b> (<b>2016</b>). <i>JabRef Manual</i>,  .",
+        assertEquals(
+                "<b>von Beta, A.</b> (<b>2016</b>). <i>JabRef Manual</i>,  .",
                 l.doLayout(entry, database));
     }
 
     @Test
     void institutionAuthorMarker() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
 
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("JabRef2016")
-                .withField(StandardField.AUTHOR, "{JabRef Development Team}")
-                .withField(StandardField.TITLE, "JabRef Manual")
-                .withField(StandardField.YEAR, "2016");
+        BibEntry entry =
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("JabRef2016")
+                        .withField(StandardField.AUTHOR, "{JabRef Development Team}")
+                        .withField(StandardField.TITLE, "JabRef Manual")
+                        .withField(StandardField.YEAR, "2016");
         List<BibEntry> entries = List.of(entry);
         BibDatabase database = new BibDatabase(entries);
         entryDBMap.put(entry, database);
-        assertEquals("[JabRef Development Team, 2016]",
-                getCitationMarker2(style,
-                        entries, entryDBMap, true, null, null, null));
+        assertEquals(
+                "[JabRef Development Team, 2016]",
+                getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
     }
 
     @Test
     void vonAuthorMarker() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -406,15 +474,18 @@ void vonAuthorMarker() throws IOException {
         database.insertEntry(entry);
         entries.add(entry);
         entryDBMap.put(entry, database);
-        assertEquals("[von Beta, 2016]", getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
+        assertEquals(
+                "[von Beta, 2016]",
+                getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
     }
 
     @Test
     void nullAuthorMarker() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -427,15 +498,17 @@ void nullAuthorMarker() throws IOException {
         database.insertEntry(entry);
         entries.add(entry);
         entryDBMap.put(entry, database);
-        assertEquals("[, 2016]", getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
+        assertEquals(
+                "[, 2016]", getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
     }
 
     @Test
     void nullYearMarker() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -448,15 +521,18 @@ void nullYearMarker() throws IOException {
         database.insertEntry(entry);
         entries.add(entry);
         entryDBMap.put(entry, database);
-        assertEquals("[von Beta, ]", getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
+        assertEquals(
+                "[von Beta, ]",
+                getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
     }
 
     @Test
     void emptyEntryMarker() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -468,15 +544,17 @@ void emptyEntryMarker() throws IOException {
         database.insertEntry(entry);
         entries.add(entry);
         entryDBMap.put(entry, database);
-        assertEquals("[, ]", getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
+        assertEquals(
+                "[, ]", getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
     }
 
     @Test
     void getCitationMarkerInParenthesisUniquefiers() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -506,21 +584,28 @@ void getCitationMarkerInParenthesisUniquefiers() throws IOException {
             entryDBMap.put(entry, database);
         }
 
-        assertEquals("[Beta, 2000; Beta, 2000; Epsilon, 2001]",
+        assertEquals(
+                "[Beta, 2000; Beta, 2000; Epsilon, 2001]",
                 getCitationMarker2b(style, entries, entryDBMap, true, null, null, null));
-        assertEquals("[Beta, 2000a,b; Epsilon, 2001]",
-                getCitationMarker2(style, entries, entryDBMap, true,
-                        new String[]{"a", "b", ""},
-                        new Boolean[]{false, false, false},
+        assertEquals(
+                "[Beta, 2000a,b; Epsilon, 2001]",
+                getCitationMarker2(
+                        style,
+                        entries,
+                        entryDBMap,
+                        true,
+                        new String[] {"a", "b", ""},
+                        new Boolean[] {false, false, false},
                         null));
     }
 
     @Test
     void getCitationMarkerInTextUniquefiers() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -550,21 +635,28 @@ void getCitationMarkerInTextUniquefiers() throws IOException {
             entryDBMap.put(entry, database);
         }
 
-        assertEquals("Beta [2000]; Beta [2000]; Epsilon [2001]",
+        assertEquals(
+                "Beta [2000]; Beta [2000]; Epsilon [2001]",
                 getCitationMarker2b(style, entries, entryDBMap, false, null, null, null));
-        assertEquals("Beta [2000a,b]; Epsilon [2001]",
-                getCitationMarker2(style, entries, entryDBMap, false,
-                        new String[]{"a", "b", ""},
-                        new Boolean[]{false, false, false},
+        assertEquals(
+                "Beta [2000a,b]; Epsilon [2001]",
+                getCitationMarker2(
+                        style,
+                        entries,
+                        entryDBMap,
+                        false,
+                        new String[] {"a", "b", ""},
+                        new Boolean[] {false, false, false},
                         null));
     }
 
     @Test
     void getCitationMarkerInParenthesisUniquefiersThreeSameAuthor() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -595,19 +687,25 @@ void getCitationMarkerInParenthesisUniquefiersThreeSameAuthor() throws IOExcepti
             entryDBMap.put(entry, database);
         }
 
-        assertEquals("[Beta, 2000a,b,c]",
-                getCitationMarker2(style, entries, entryDBMap, true,
-                        new String[]{"a", "b", "c"},
-                        new Boolean[]{false, false, false},
+        assertEquals(
+                "[Beta, 2000a,b,c]",
+                getCitationMarker2(
+                        style,
+                        entries,
+                        entryDBMap,
+                        true,
+                        new String[] {"a", "b", "c"},
+                        new Boolean[] {false, false, false},
                         null));
     }
 
     @Test
     void getCitationMarkerInTextUniquefiersThreeSameAuthor() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -638,71 +736,85 @@ void getCitationMarkerInTextUniquefiersThreeSameAuthor() throws IOException {
             entryDBMap.put(entry, database);
         }
 
-        assertEquals("Beta [2000a,b,c]",
-                getCitationMarker2(style, entries, entryDBMap, false,
-                        new String[]{"a", "b", "c"},
-                        new Boolean[]{false, false, false},
+        assertEquals(
+                "Beta [2000a,b,c]",
+                getCitationMarker2(
+                        style,
+                        entries,
+                        entryDBMap,
+                        false,
+                        new String[] {"a", "b", "c"},
+                        new Boolean[] {false, false, false},
                         null));
     }
 
     @Test
-        // TODO: equals only work when initialized from file, not from reader
+    // TODO: equals only work when initialized from file, not from reader
     void equals() throws IOException {
-        JStyle style1 = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
-        JStyle style2 = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style1 =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
+        JStyle style2 =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
         assertEquals(style1, style2);
     }
 
     @Test
-        // TODO: equals only work when initialized from file, not from reader
+    // TODO: equals only work when initialized from file, not from reader
     void notEquals() throws IOException {
-        JStyle style1 = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
-        JStyle style2 = new JStyle(
-                StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style1 =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
+        JStyle style2 =
+                new JStyle(
+                        StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
         assertNotEquals(style1, style2);
     }
 
     @Test
     void compareToEqual() throws IOException {
-        JStyle style1 = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
-        JStyle style2 = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style1 =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
+        JStyle style2 =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
         assertEquals(0, style1.compareTo(style2));
     }
 
     @Test
     void compareToNotEqual() throws IOException {
-        JStyle style1 = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
-        JStyle style2 = new JStyle(
-                StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style1 =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
+        JStyle style2 =
+                new JStyle(
+                        StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
         assertTrue(style1.compareTo(style2) > 0);
         assertFalse(style2.compareTo(style1) > 0);
     }
 
     @Test
     void emptyStringPropertyAndOxfordComma() throws Exception {
-        JStyle style = new JStyle("test.jstyle", layoutFormatterPreferences, abbreviationRepository);
+        JStyle style =
+                new JStyle("test.jstyle", layoutFormatterPreferences, abbreviationRepository);
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
         BibDatabase database = new BibDatabase();
@@ -716,69 +828,81 @@ void emptyStringPropertyAndOxfordComma() throws Exception {
         database.insertEntry(entry);
         entries.add(entry);
         entryDBMap.put(entry, database);
-        assertEquals("von Beta, Epsilon, & Tau, 2016",
+        assertEquals(
+                "von Beta, Epsilon, & Tau, 2016",
                 getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
     }
 
     @Test
     void isValidWithDefaultSectionAtTheStart() throws Exception {
-        JStyle style = new JStyle("testWithDefaultAtFirstLIne.jstyle", layoutFormatterPreferences, abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        "testWithDefaultAtFirstLIne.jstyle",
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
         assertTrue(style.isValid());
     }
 
     @Test
     void getCitationMarkerJoinFirst() throws IOException {
-        JStyle style = new JStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+        JStyle style =
+                new JStyle(
+                        StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                        layoutFormatterPreferences,
+                        abbreviationRepository);
 
         // Question: What should happen if some sources are
         // marked as isFirstAppearanceOfSource?
         // This test documents what is happening now.
 
         // Two entries with identical normalizedMarkers and many authors.
-        BibEntry entry1 = new BibEntry()
-                .withField(StandardField.AUTHOR,
-                        "Gustav Bostr\\\"{o}m"
-                                + " and Jaana W\\\"{a}yrynen"
-                                + " and Marine Bod\\'{e}n"
-                                + " and Konstantin Beznosov"
-                                + " and Philippe Kruchten")
-                .withField(StandardField.YEAR, "2006")
-                .withField(StandardField.BOOKTITLE, "A book 1")
-                .withField(StandardField.PUBLISHER, "ACM")
-                .withField(StandardField.TITLE, "Title 1")
-                .withField(StandardField.PAGES, "11--18");
+        BibEntry entry1 =
+                new BibEntry()
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Gustav Bostr\\\"{o}m"
+                                        + " and Jaana W\\\"{a}yrynen"
+                                        + " and Marine Bod\\'{e}n"
+                                        + " and Konstantin Beznosov"
+                                        + " and Philippe Kruchten")
+                        .withField(StandardField.YEAR, "2006")
+                        .withField(StandardField.BOOKTITLE, "A book 1")
+                        .withField(StandardField.PUBLISHER, "ACM")
+                        .withField(StandardField.TITLE, "Title 1")
+                        .withField(StandardField.PAGES, "11--18");
         entry1.setCitationKey("b1");
 
-        BibEntry entry2 = new BibEntry()
-                .withField(StandardField.AUTHOR,
-                        "Gustav Bostr\\\"{o}m"
-                                + " and Jaana W\\\"{a}yrynen"
-                                + " and Marine Bod\\'{e}n"
-                                + " and Konstantin Beznosov"
-                                + " and Philippe Kruchten")
-                .withField(StandardField.YEAR, "2006")
-                .withField(StandardField.BOOKTITLE, "A book 2")
-                .withField(StandardField.PUBLISHER, "ACM")
-                .withField(StandardField.TITLE, "title2")
-                .withField(StandardField.PAGES, "11--18");
+        BibEntry entry2 =
+                new BibEntry()
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Gustav Bostr\\\"{o}m"
+                                        + " and Jaana W\\\"{a}yrynen"
+                                        + " and Marine Bod\\'{e}n"
+                                        + " and Konstantin Beznosov"
+                                        + " and Philippe Kruchten")
+                        .withField(StandardField.YEAR, "2006")
+                        .withField(StandardField.BOOKTITLE, "A book 2")
+                        .withField(StandardField.PUBLISHER, "ACM")
+                        .withField(StandardField.TITLE, "title2")
+                        .withField(StandardField.PAGES, "11--18");
         entry2.setCitationKey("b2");
 
         // Last Author differs.
-        BibEntry entry3 = new BibEntry()
-                .withField(StandardField.AUTHOR,
-                        "Gustav Bostr\\\"{o}m"
-                                + " and Jaana W\\\"{a}yrynen"
-                                + " and Marine Bod\\'{e}n"
-                                + " and Konstantin Beznosov"
-                                + " and Philippe NotKruchten")
-                .withField(StandardField.YEAR, "2006")
-                .withField(StandardField.BOOKTITLE, "A book 3")
-                .withField(StandardField.PUBLISHER, "ACM")
-                .withField(StandardField.TITLE, "title3")
-                .withField(StandardField.PAGES, "11--18");
+        BibEntry entry3 =
+                new BibEntry()
+                        .withField(
+                                StandardField.AUTHOR,
+                                "Gustav Bostr\\\"{o}m"
+                                        + " and Jaana W\\\"{a}yrynen"
+                                        + " and Marine Bod\\'{e}n"
+                                        + " and Konstantin Beznosov"
+                                        + " and Philippe NotKruchten")
+                        .withField(StandardField.YEAR, "2006")
+                        .withField(StandardField.BOOKTITLE, "A book 3")
+                        .withField(StandardField.PUBLISHER, "ACM")
+                        .withField(StandardField.TITLE, "title3")
+                        .withField(StandardField.PAGES, "11--18");
         entry3.setCitationKey("b3");
 
         BibDatabase database = new BibDatabase();
@@ -790,27 +914,26 @@ void getCitationMarkerJoinFirst() throws IOException {
         // The third is NotKruchten, should not be joined.
         if (true) {
             List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>();
-            CitationMarkerEntry cm1 =
-                    makeCitationMarkerEntry(entry1, database, "a", null, true);
+            CitationMarkerEntry cm1 = makeCitationMarkerEntry(entry1, database, "a", null, true);
             citationMarkerEntries.add(cm1);
-            CitationMarkerEntry cm2 =
-                    makeCitationMarkerEntry(entry2, database, "b", null, true);
+            CitationMarkerEntry cm2 = makeCitationMarkerEntry(entry2, database, "b", null, true);
             citationMarkerEntries.add(cm2);
-            CitationMarkerEntry cm3 =
-                    makeCitationMarkerEntry(entry3, database, "c", null, true);
+            CitationMarkerEntry cm3 = makeCitationMarkerEntry(entry3, database, "c", null, true);
             citationMarkerEntries.add(cm3);
 
-            assertEquals("[Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006a,b"
+            assertEquals(
+                    "[Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006a,b"
                             + "; Boström, Wäyrynen, Bodén, Beznosov & NotKruchten, 2006c]",
-                    style.createCitationMarker(citationMarkerEntries,
-                            true,
-                            NonUniqueCitationMarker.THROWS).toString());
+                    style.createCitationMarker(
+                                    citationMarkerEntries, true, NonUniqueCitationMarker.THROWS)
+                            .toString());
 
-            assertEquals("Boström, Wäyrynen, Bodén, Beznosov & Kruchten [2006a,b]"
+            assertEquals(
+                    "Boström, Wäyrynen, Bodén, Beznosov & Kruchten [2006a,b]"
                             + "; Boström, Wäyrynen, Bodén, Beznosov & NotKruchten [2006c]",
-                    style.createCitationMarker(citationMarkerEntries,
-                            false,
-                            NonUniqueCitationMarker.THROWS).toString());
+                    style.createCitationMarker(
+                                    citationMarkerEntries, false, NonUniqueCitationMarker.THROWS)
+                            .toString());
         }
 
         // Without pageInfo, only the first is isFirstAppearanceOfSource.
@@ -818,21 +941,19 @@ void getCitationMarkerJoinFirst() throws IOException {
         // The third is NotKruchten, should not be joined.
         if (true) {
             List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>();
-            CitationMarkerEntry cm1 =
-                    makeCitationMarkerEntry(entry1, database, "a", null, true);
+            CitationMarkerEntry cm1 = makeCitationMarkerEntry(entry1, database, "a", null, true);
             citationMarkerEntries.add(cm1);
-            CitationMarkerEntry cm2 =
-                    makeCitationMarkerEntry(entry2, database, "b", null, false);
+            CitationMarkerEntry cm2 = makeCitationMarkerEntry(entry2, database, "b", null, false);
             citationMarkerEntries.add(cm2);
-            CitationMarkerEntry cm3 =
-                    makeCitationMarkerEntry(entry3, database, "c", null, false);
+            CitationMarkerEntry cm3 = makeCitationMarkerEntry(entry3, database, "c", null, false);
             citationMarkerEntries.add(cm3);
 
-            assertEquals("[Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006a,b"
+            assertEquals(
+                    "[Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006a,b"
                             + "; Boström et al., 2006c]",
-                    style.createCitationMarker(citationMarkerEntries,
-                            true,
-                            NonUniqueCitationMarker.THROWS).toString());
+                    style.createCitationMarker(
+                                    citationMarkerEntries, true, NonUniqueCitationMarker.THROWS)
+                            .toString());
         }
         // Without pageInfo, only the second is isFirstAppearanceOfSource.
         // The second is not joined, because it is a first appearance, thus
@@ -840,22 +961,20 @@ void getCitationMarkerJoinFirst() throws IOException {
         // The third is NotKruchten, should not be joined.
         if (true) {
             List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>();
-            CitationMarkerEntry cm1 =
-                    makeCitationMarkerEntry(entry1, database, "a", null, false);
+            CitationMarkerEntry cm1 = makeCitationMarkerEntry(entry1, database, "a", null, false);
             citationMarkerEntries.add(cm1);
-            CitationMarkerEntry cm2 =
-                    makeCitationMarkerEntry(entry2, database, "b", null, true);
+            CitationMarkerEntry cm2 = makeCitationMarkerEntry(entry2, database, "b", null, true);
             citationMarkerEntries.add(cm2);
-            CitationMarkerEntry cm3 =
-                    makeCitationMarkerEntry(entry3, database, "c", null, false);
+            CitationMarkerEntry cm3 = makeCitationMarkerEntry(entry3, database, "c", null, false);
             citationMarkerEntries.add(cm3);
 
-            assertEquals("[Boström et al., 2006a"
+            assertEquals(
+                    "[Boström et al., 2006a"
                             + "; Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006b"
                             + "; Boström et al., 2006c]",
-                    style.createCitationMarker(citationMarkerEntries,
-                            true,
-                            NonUniqueCitationMarker.THROWS).toString());
+                    style.createCitationMarker(
+                                    citationMarkerEntries, true, NonUniqueCitationMarker.THROWS)
+                            .toString());
         }
 
         // Without pageInfo, neither is isFirstAppearanceOfSource.
@@ -864,42 +983,38 @@ void getCitationMarkerJoinFirst() throws IOException {
         // Is this the correct behaviour?
         if (true) {
             List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>();
-            CitationMarkerEntry cm1 =
-                    makeCitationMarkerEntry(entry1, database, "a", null, false);
+            CitationMarkerEntry cm1 = makeCitationMarkerEntry(entry1, database, "a", null, false);
             citationMarkerEntries.add(cm1);
-            CitationMarkerEntry cm2 =
-                    makeCitationMarkerEntry(entry2, database, "b", null, false);
+            CitationMarkerEntry cm2 = makeCitationMarkerEntry(entry2, database, "b", null, false);
             citationMarkerEntries.add(cm2);
-            CitationMarkerEntry cm3 =
-                    makeCitationMarkerEntry(entry3, database, "c", null, false);
+            CitationMarkerEntry cm3 = makeCitationMarkerEntry(entry3, database, "c", null, false);
             citationMarkerEntries.add(cm3);
 
-            assertEquals("[Boström et al., 2006a,b,c]",
-                    style.createCitationMarker(citationMarkerEntries,
-                            true,
-                            NonUniqueCitationMarker.THROWS).toString());
+            assertEquals(
+                    "[Boström et al., 2006a,b,c]",
+                    style.createCitationMarker(
+                                    citationMarkerEntries, true, NonUniqueCitationMarker.THROWS)
+                            .toString());
         }
 
         // With pageInfo: different entries with identical non-null pageInfo: not joined.
         // XY [2000a,b,c; p1] whould be confusing.
         if (true) {
             List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>();
-            CitationMarkerEntry cm1 =
-                    makeCitationMarkerEntry(entry1, database, "a", "p1", false);
+            CitationMarkerEntry cm1 = makeCitationMarkerEntry(entry1, database, "a", "p1", false);
             citationMarkerEntries.add(cm1);
-            CitationMarkerEntry cm2 =
-                    makeCitationMarkerEntry(entry2, database, "b", "p1", false);
+            CitationMarkerEntry cm2 = makeCitationMarkerEntry(entry2, database, "b", "p1", false);
             citationMarkerEntries.add(cm2);
-            CitationMarkerEntry cm3 =
-                    makeCitationMarkerEntry(entry3, database, "c", "p1", false);
+            CitationMarkerEntry cm3 = makeCitationMarkerEntry(entry3, database, "c", "p1", false);
             citationMarkerEntries.add(cm3);
 
-            assertEquals("[Boström et al., 2006a; p1"
+            assertEquals(
+                    "[Boström et al., 2006a; p1"
                             + "; Boström et al., 2006b; p1"
                             + "; Boström et al., 2006c; p1]",
-                    style.createCitationMarker(citationMarkerEntries,
-                            true,
-                            NonUniqueCitationMarker.THROWS).toString());
+                    style.createCitationMarker(
+                                    citationMarkerEntries, true, NonUniqueCitationMarker.THROWS)
+                            .toString());
         }
 
         // With pageInfo: same entries with identical non-null pageInfo: collapsed.
@@ -907,44 +1022,39 @@ void getCitationMarkerJoinFirst() throws IOException {
         //       but ignores the rest. Normally the citation key should distinguish.
         if (true) {
             List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>();
-            CitationMarkerEntry cm1 =
-                    makeCitationMarkerEntry(entry1, database, "a", "p1", false);
+            CitationMarkerEntry cm1 = makeCitationMarkerEntry(entry1, database, "a", "p1", false);
             citationMarkerEntries.add(cm1);
-            CitationMarkerEntry cm2 =
-                    makeCitationMarkerEntry(entry1, database, "a", "p1", false);
+            CitationMarkerEntry cm2 = makeCitationMarkerEntry(entry1, database, "a", "p1", false);
             citationMarkerEntries.add(cm2);
-            CitationMarkerEntry cm3 =
-                    makeCitationMarkerEntry(entry1, database, "a", "p1", false);
+            CitationMarkerEntry cm3 = makeCitationMarkerEntry(entry1, database, "a", "p1", false);
             citationMarkerEntries.add(cm3);
 
-            assertEquals("[Boström et al., 2006a; p1]",
-                    style.createCitationMarker(citationMarkerEntries,
-                            true,
-                            NonUniqueCitationMarker.THROWS).toString());
+            assertEquals(
+                    "[Boström et al., 2006a; p1]",
+                    style.createCitationMarker(
+                                    citationMarkerEntries, true, NonUniqueCitationMarker.THROWS)
+                            .toString());
         }
         // With pageInfo: same entries with different pageInfo: kept separate.
         // Empty ("") and missing pageInfos considered equal, thus collapsed.
         if (true) {
             List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>();
-            CitationMarkerEntry cm1 =
-                    makeCitationMarkerEntry(entry1, database, "a", "p1", false);
+            CitationMarkerEntry cm1 = makeCitationMarkerEntry(entry1, database, "a", "p1", false);
             citationMarkerEntries.add(cm1);
-            CitationMarkerEntry cm2 =
-                    makeCitationMarkerEntry(entry1, database, "a", "p2", false);
+            CitationMarkerEntry cm2 = makeCitationMarkerEntry(entry1, database, "a", "p2", false);
             citationMarkerEntries.add(cm2);
-            CitationMarkerEntry cm3 =
-                    makeCitationMarkerEntry(entry1, database, "a", "", false);
+            CitationMarkerEntry cm3 = makeCitationMarkerEntry(entry1, database, "a", "", false);
             citationMarkerEntries.add(cm3);
-            CitationMarkerEntry cm4 =
-                    makeCitationMarkerEntry(entry1, database, "a", null, false);
+            CitationMarkerEntry cm4 = makeCitationMarkerEntry(entry1, database, "a", null, false);
             citationMarkerEntries.add(cm4);
 
-            assertEquals("[Boström et al., 2006a; p1"
+            assertEquals(
+                    "[Boström et al., 2006a; p1"
                             + "; Boström et al., 2006a; p2"
                             + "; Boström et al., 2006a]",
-                    style.createCitationMarker(citationMarkerEntries,
-                            true,
-                            NonUniqueCitationMarker.THROWS).toString());
+                    style.createCitationMarker(
+                                    citationMarkerEntries, true, NonUniqueCitationMarker.THROWS)
+                            .toString());
         }
     }
 }
diff --git a/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTestHelper.java b/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTestHelper.java
index 7ec50d9189e9..49dd5aab73cb 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTestHelper.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTestHelper.java
@@ -1,12 +1,6 @@
 package org.jabref.logic.openoffice.style;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
@@ -19,7 +13,13 @@
 import org.jabref.model.openoffice.style.NonUniqueCitationMarker;
 import org.jabref.model.openoffice.style.PageInfo;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 class OOBibStyleTestHelper {
     /*
@@ -30,17 +30,16 @@ static class CitationMarkerNumericEntryImpl implements CitationMarkerNumericEntr
         /*
          * The number encoding "this entry is unresolved" for the constructor.
          */
-        public final static int UNRESOLVED_ENTRY_NUMBER = 0;
+        public static final int UNRESOLVED_ENTRY_NUMBER = 0;
 
         private final String citationKey;
         private final Optional<Integer> num;
         private final Optional<OOText> pageInfo;
 
-        public CitationMarkerNumericEntryImpl(String citationKey, int num, Optional<OOText> pageInfo) {
+        public CitationMarkerNumericEntryImpl(
+                String citationKey, int num, Optional<OOText> pageInfo) {
             this.citationKey = citationKey;
-            this.num = num == UNRESOLVED_ENTRY_NUMBER
-                    ? Optional.empty()
-                    : Optional.of(num);
+            this.num = num == UNRESOLVED_ENTRY_NUMBER ? Optional.empty() : Optional.of(num);
             this.pageInfo = PageInfo.normalizePageInfo(pageInfo);
         }
 
@@ -89,25 +88,26 @@ static CitationMarkerNumericBibEntry numBibEntry(String key, Optional<Integer> n
      *
      * @param inList true means label for the bibliography
      */
-    static String runGetNumCitationMarker2a(JStyle style,
-                                            List<Integer> num, int minGroupingCount, boolean inList) {
+    static String runGetNumCitationMarker2a(
+            JStyle style, List<Integer> num, int minGroupingCount, boolean inList) {
         if (inList) {
             if (num.size() != 1) {
-                throw new IllegalArgumentException("Numeric label for the bibliography with " + num.size() + " numbers?");
+                throw new IllegalArgumentException(
+                        "Numeric label for the bibliography with " + num.size() + " numbers?");
             }
             int n = num.getFirst();
             CitationMarkerNumericBibEntryImpl x =
-                    new CitationMarkerNumericBibEntryImpl("key",
-                            n == 0 ? Optional.empty() : Optional.of(n));
+                    new CitationMarkerNumericBibEntryImpl(
+                            "key", n == 0 ? Optional.empty() : Optional.of(n));
             return style.getNumCitationMarkerForBibliography(x).toString();
         } else {
             List<CitationMarkerNumericEntry> input =
                     num.stream()
-                       .map(n ->
-                               new CitationMarkerNumericEntryImpl("key" + n,
-                                       n,
-                                       Optional.empty()))
-                       .collect(Collectors.toList());
+                            .map(
+                                    n ->
+                                            new CitationMarkerNumericEntryImpl(
+                                                    "key" + n, n, Optional.empty()))
+                            .collect(Collectors.toList());
             return style.getNumCitationMarker2(input, minGroupingCount).toString();
         }
     }
@@ -120,9 +120,8 @@ static CitationMarkerNumericEntry numEntry(String key, int num, String pageInfoO
         return new CitationMarkerNumericEntryImpl(key, num, pageInfo);
     }
 
-    static String runGetNumCitationMarker2b(JStyle style,
-                                            int minGroupingCount,
-                                            CitationMarkerNumericEntry... s) {
+    static String runGetNumCitationMarker2b(
+            JStyle style, int minGroupingCount, CitationMarkerNumericEntry... s) {
         List<CitationMarkerNumericEntry> input = Stream.of(s).collect(Collectors.toList());
         OOText res = style.getNumCitationMarker2(input, minGroupingCount);
         return res.toString();
@@ -135,11 +134,12 @@ static String runGetNumCitationMarker2b(JStyle style,
     /*
      * begin helper
      */
-    static CitationMarkerEntry makeCitationMarkerEntry(BibEntry entry,
-                                                       BibDatabase database,
-                                                       String uniqueLetterQ,
-                                                       String pageInfoQ,
-                                                       boolean isFirstAppearanceOfSource) {
+    static CitationMarkerEntry makeCitationMarkerEntry(
+            BibEntry entry,
+            BibDatabase database,
+            String uniqueLetterQ,
+            String pageInfoQ,
+            boolean isFirstAppearanceOfSource) {
         if (entry.getCitationKey().isEmpty()) {
             throw new IllegalArgumentException("entry.getCitationKey() is empty");
         }
@@ -157,14 +157,15 @@ static CitationMarkerEntry makeCitationMarkerEntry(BibEntry entry,
      * @implNote Similar to old API. pageInfo is new, and unlimAuthors is
      * replaced with isFirstAppearanceOfSource
      */
-    static String getCitationMarker2ab(JStyle style,
-                                       List<BibEntry> entries,
-                                       Map<BibEntry, BibDatabase> entryDBMap,
-                                       boolean inParenthesis,
-                                       String[] uniquefiers,
-                                       Boolean[] isFirstAppearanceOfSource,
-                                       String[] pageInfo,
-                                       NonUniqueCitationMarker nonunique) {
+    static String getCitationMarker2ab(
+            JStyle style,
+            List<BibEntry> entries,
+            Map<BibEntry, BibDatabase> entryDBMap,
+            boolean inParenthesis,
+            String[] uniquefiers,
+            Boolean[] isFirstAppearanceOfSource,
+            String[] pageInfo,
+            NonUniqueCitationMarker nonunique) {
         if (uniquefiers == null) {
             uniquefiers = new String[entries.size()];
             Arrays.fill(uniquefiers, null);
@@ -180,26 +181,29 @@ static String getCitationMarker2ab(JStyle style,
         List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>(entries.size());
         for (int i = 0; i < entries.size(); i++) {
             BibEntry entry = entries.get(i);
-            CitationMarkerEntry e = makeCitationMarkerEntry(entry,
-                    entryDBMap.get(entry),
-                    uniquefiers[i],
-                    pageInfo[i],
-                    isFirstAppearanceOfSource[i]);
+            CitationMarkerEntry e =
+                    makeCitationMarkerEntry(
+                            entry,
+                            entryDBMap.get(entry),
+                            uniquefiers[i],
+                            pageInfo[i],
+                            isFirstAppearanceOfSource[i]);
             citationMarkerEntries.add(e);
         }
-        return style.createCitationMarker(citationMarkerEntries,
-                inParenthesis,
-                nonunique).toString();
+        return style.createCitationMarker(citationMarkerEntries, inParenthesis, nonunique)
+                .toString();
     }
 
-    static String getCitationMarker2(JStyle style,
-                                     List<BibEntry> entries,
-                                     Map<BibEntry, BibDatabase> entryDBMap,
-                                     boolean inParenthesis,
-                                     String[] uniquefiers,
-                                     Boolean[] isFirstAppearanceOfSource,
-                                     String[] pageInfo) {
-        return getCitationMarker2ab(style,
+    static String getCitationMarker2(
+            JStyle style,
+            List<BibEntry> entries,
+            Map<BibEntry, BibDatabase> entryDBMap,
+            boolean inParenthesis,
+            String[] uniquefiers,
+            Boolean[] isFirstAppearanceOfSource,
+            String[] pageInfo) {
+        return getCitationMarker2ab(
+                style,
                 entries,
                 entryDBMap,
                 inParenthesis,
@@ -209,14 +213,16 @@ static String getCitationMarker2(JStyle style,
                 NonUniqueCitationMarker.THROWS);
     }
 
-    static String getCitationMarker2b(JStyle style,
-                                      List<BibEntry> entries,
-                                      Map<BibEntry, BibDatabase> entryDBMap,
-                                      boolean inParenthesis,
-                                      String[] uniquefiers,
-                                      Boolean[] isFirstAppearanceOfSource,
-                                      String[] pageInfo) {
-        return getCitationMarker2ab(style,
+    static String getCitationMarker2b(
+            JStyle style,
+            List<BibEntry> entries,
+            Map<BibEntry, BibDatabase> entryDBMap,
+            boolean inParenthesis,
+            String[] uniquefiers,
+            Boolean[] isFirstAppearanceOfSource,
+            String[] pageInfo) {
+        return getCitationMarker2ab(
+                style,
                 entries,
                 entryDBMap,
                 inParenthesis,
@@ -232,80 +238,123 @@ static String getCitationMarker2b(JStyle style,
 
     static void testGetNumCitationMarkerExtra(JStyle style) {
         // Identical numeric entries are joined.
-        assertEquals("[1; 2]", runGetNumCitationMarker2b(style, 3,
-                numEntry("x1", 1, null),
-                numEntry("x2", 2, null),
-                numEntry("x1", 2, null),
-                numEntry("x2", 1, null)));
+        assertEquals(
+                "[1; 2]",
+                runGetNumCitationMarker2b(
+                        style,
+                        3,
+                        numEntry("x1", 1, null),
+                        numEntry("x2", 2, null),
+                        numEntry("x1", 2, null),
+                        numEntry("x2", 1, null)));
 
         // ... unless minGroupingCount <= 0
-        assertEquals("[1; 1; 2; 2]", runGetNumCitationMarker2b(style, 0,
-                numEntry("x1", 1, null),
-                numEntry("x2", 2, null),
-                numEntry("x1", 2, null),
-                numEntry("x2", 1, null)));
+        assertEquals(
+                "[1; 1; 2; 2]",
+                runGetNumCitationMarker2b(
+                        style,
+                        0,
+                        numEntry("x1", 1, null),
+                        numEntry("x2", 2, null),
+                        numEntry("x1", 2, null),
+                        numEntry("x2", 1, null)));
 
         // ... or have different pageInfos
-        assertEquals("[1; p1a; 1; p1b; 2; p2; 3]", runGetNumCitationMarker2b(style, 1,
-                numEntry("x1", 1, "p1a"),
-                numEntry("x1", 1, "p1b"),
-                numEntry("x2", 2, "p2"),
-                numEntry("x2", 2, "p2"),
-                numEntry("x3", 3, null),
-                numEntry("x3", 3, null)));
+        assertEquals(
+                "[1; p1a; 1; p1b; 2; p2; 3]",
+                runGetNumCitationMarker2b(
+                        style,
+                        1,
+                        numEntry("x1", 1, "p1a"),
+                        numEntry("x1", 1, "p1b"),
+                        numEntry("x2", 2, "p2"),
+                        numEntry("x2", 2, "p2"),
+                        numEntry("x3", 3, null),
+                        numEntry("x3", 3, null)));
 
         // Consecutive numbers can become a range ...
-        assertEquals("[1-3]", runGetNumCitationMarker2b(style, 1,
-                numEntry("x1", 1, null),
-                numEntry("x2", 2, null),
-                numEntry("x3", 3, null)));
+        assertEquals(
+                "[1-3]",
+                runGetNumCitationMarker2b(
+                        style,
+                        1,
+                        numEntry("x1", 1, null),
+                        numEntry("x2", 2, null),
+                        numEntry("x3", 3, null)));
 
         // ... unless minGroupingCount is too high
-        assertEquals("[1; 2; 3]", runGetNumCitationMarker2b(style, 4,
-                numEntry("x1", 1, null),
-                numEntry("x2", 2, null),
-                numEntry("x3", 3, null)));
+        assertEquals(
+                "[1; 2; 3]",
+                runGetNumCitationMarker2b(
+                        style,
+                        4,
+                        numEntry("x1", 1, null),
+                        numEntry("x2", 2, null),
+                        numEntry("x3", 3, null)));
 
         // ... or if minGroupingCount <= 0
-        assertEquals("[1; 2; 3]", runGetNumCitationMarker2b(style, 0,
-                numEntry("x1", 1, null),
-                numEntry("x2", 2, null),
-                numEntry("x3", 3, null)));
+        assertEquals(
+                "[1; 2; 3]",
+                runGetNumCitationMarker2b(
+                        style,
+                        0,
+                        numEntry("x1", 1, null),
+                        numEntry("x2", 2, null),
+                        numEntry("x3", 3, null)));
 
         // ... a pageInfo needs to be emitted
-        assertEquals("[1; p1; 2-3]", runGetNumCitationMarker2b(style, 1,
-                numEntry("x1", 1, "p1"),
-                numEntry("x2", 2, null),
-                numEntry("x3", 3, null)));
+        assertEquals(
+                "[1; p1; 2-3]",
+                runGetNumCitationMarker2b(
+                        style,
+                        1,
+                        numEntry("x1", 1, "p1"),
+                        numEntry("x2", 2, null),
+                        numEntry("x3", 3, null)));
 
         // null and "" pageInfos are taken as equal.
         // Due to trimming, "   " is the same as well.
-        assertEquals("[1]", runGetNumCitationMarker2b(style, 1,
-                numEntry("x1", 1, ""),
-                numEntry("x1", 1, null),
-                numEntry("x1", 1, "  ")));
+        assertEquals(
+                "[1]",
+                runGetNumCitationMarker2b(
+                        style,
+                        1,
+                        numEntry("x1", 1, ""),
+                        numEntry("x1", 1, null),
+                        numEntry("x1", 1, "  ")));
 
         // pageInfos are trimmed
-        assertEquals("[1; p1]", runGetNumCitationMarker2b(style, 1,
-                numEntry("x1", 1, "p1"),
-                numEntry("x1", 1, " p1"),
-                numEntry("x1", 1, "p1 ")));
+        assertEquals(
+                "[1; p1]",
+                runGetNumCitationMarker2b(
+                        style,
+                        1,
+                        numEntry("x1", 1, "p1"),
+                        numEntry("x1", 1, " p1"),
+                        numEntry("x1", 1, "p1 ")));
 
         // The citation numbers come out sorted
-        assertEquals("[3-5; 7; 10-12]", runGetNumCitationMarker2b(style, 1,
-                numEntry("x12", 12, null),
-                numEntry("x7", 7, null),
-                numEntry("x3", 3, null),
-                numEntry("x4", 4, null),
-                numEntry("x11", 11, null),
-                numEntry("x10", 10, null),
-                numEntry("x5", 5, null)));
+        assertEquals(
+                "[3-5; 7; 10-12]",
+                runGetNumCitationMarker2b(
+                        style,
+                        1,
+                        numEntry("x12", 12, null),
+                        numEntry("x7", 7, null),
+                        numEntry("x3", 3, null),
+                        numEntry("x4", 4, null),
+                        numEntry("x11", 11, null),
+                        numEntry("x10", 10, null),
+                        numEntry("x5", 5, null)));
 
         // pageInfos are sorted together with the numbers
         // (but they inhibit ranges where they are, even if they are identical,
         //  but not empty-or-null)
-        assertEquals("[3; p3; 4; p4; 5; p5; 7; p7; 10; px; 11; px; 12; px]",
-                runGetNumCitationMarker2b(style, 1,
+        assertEquals(
+                "[3; p3; 4; p4; 5; p5; 7; p7; 10; px; 11; px; 12; px]",
+                runGetNumCitationMarker2b(
+                        style,
+                        1,
                         numEntry("x12", 12, "px"),
                         numEntry("x7", 7, "p7"),
                         numEntry("x3", 3, "p3"),
@@ -315,45 +364,66 @@ static void testGetNumCitationMarkerExtra(JStyle style) {
                         numEntry("x5", 5, "p5")));
 
         // pageInfo sorting (for the same number)
-        assertEquals("[1; 1; a; 1; b]",
-                runGetNumCitationMarker2b(style, 1,
+        assertEquals(
+                "[1; 1; a; 1; b]",
+                runGetNumCitationMarker2b(
+                        style,
+                        1,
                         numEntry("x1", 1, ""),
                         numEntry("x1", 1, "b"),
                         numEntry("x1", 1, "a")));
 
         // pageInfo sorting (for the same number) is not numeric.
-        assertEquals("[1; p100; 1; p20; 1; p9]",
-                runGetNumCitationMarker2b(style, 1,
+        assertEquals(
+                "[1; p100; 1; p20; 1; p9]",
+                runGetNumCitationMarker2b(
+                        style,
+                        1,
                         numEntry("x1", 1, "p20"),
                         numEntry("x1", 1, "p9"),
                         numEntry("x1", 1, "p100")));
 
-        assertEquals("[1-3]",
-                runGetNumCitationMarker2b(style, 1,
+        assertEquals(
+                "[1-3]",
+                runGetNumCitationMarker2b(
+                        style,
+                        1,
                         numEntry("x1", 1, null),
                         numEntry("x2", 2, null),
                         numEntry("x3", 3, null)));
 
-        assertEquals("[1; 2; 3]",
-                runGetNumCitationMarker2b(style, 5,
+        assertEquals(
+                "[1; 2; 3]",
+                runGetNumCitationMarker2b(
+                        style,
+                        5,
                         numEntry("x1", 1, null),
                         numEntry("x2", 2, null),
                         numEntry("x3", 3, null)));
 
-        assertEquals("[1; 2; 3]",
-                runGetNumCitationMarker2b(style, -1,
+        assertEquals(
+                "[1; 2; 3]",
+                runGetNumCitationMarker2b(
+                        style,
+                        -1,
                         numEntry("x1", 1, null),
                         numEntry("x2", 2, null),
                         numEntry("x3", 3, null)));
 
-        assertEquals("[1; 3; 12]",
-                runGetNumCitationMarker2b(style, 1,
+        assertEquals(
+                "[1; 3; 12]",
+                runGetNumCitationMarker2b(
+                        style,
+                        1,
                         numEntry("x1", 1, null),
                         numEntry("x12", 12, null),
                         numEntry("x3", 3, null)));
 
-        assertEquals("[3-5; 7; 10-12]",
-                runGetNumCitationMarker2b(style, 1,
+        assertEquals(
+                "[3-5; 7; 10-12]",
+                runGetNumCitationMarker2b(
+                        style,
+                        1,
                         numEntry("x12", 12, ""),
                         numEntry("x7", 7, ""),
                         numEntry("x3", 3, ""),
diff --git a/src/test/java/org/jabref/logic/openoffice/style/OOPreFormatterTest.java b/src/test/java/org/jabref/logic/openoffice/style/OOPreFormatterTest.java
index 2b49ccc73f87..5335d9320def 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/OOPreFormatterTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/OOPreFormatterTest.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.openoffice.style;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 class OOPreFormatterTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/openoffice/style/StyleLoaderTest.java b/src/test/java/org/jabref/logic/openoffice/style/StyleLoaderTest.java
index 008a61f3afd0..cd4c0e7323da 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/StyleLoaderTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/StyleLoaderTest.java
@@ -1,27 +1,26 @@
 package org.jabref.logic.openoffice.style;
 
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 class StyleLoaderTest {
 
@@ -41,17 +40,33 @@ void setUp() {
 
     @Test
     void throwNPEWithNullPreferences() {
-        assertThrows(NullPointerException.class, () -> loader = new StyleLoader(null, layoutPreferences, abbreviationRepository));
+        assertThrows(
+                NullPointerException.class,
+                () -> loader = new StyleLoader(null, layoutPreferences, abbreviationRepository));
     }
 
     @Test
     void throwNPEWithNullLayoutPreferences() {
-        assertThrows(NullPointerException.class, () -> loader = new StyleLoader(mock(OpenOfficePreferences.class), null, abbreviationRepository));
+        assertThrows(
+                NullPointerException.class,
+                () ->
+                        loader =
+                                new StyleLoader(
+                                        mock(OpenOfficePreferences.class),
+                                        null,
+                                        abbreviationRepository));
     }
 
     @Test
     void throwNPEWithNullAbbreviationRepository() {
-        assertThrows(NullPointerException.class, () -> loader = new StyleLoader(mock(OpenOfficePreferences.class), layoutPreferences, null));
+        assertThrows(
+                NullPointerException.class,
+                () ->
+                        loader =
+                                new StyleLoader(
+                                        mock(OpenOfficePreferences.class),
+                                        layoutPreferences,
+                                        null));
     }
 
     @Test
@@ -67,8 +82,13 @@ void addStyleLeadsToOneMoreStyle() throws URISyntaxException {
         preferences.setExternalStyles(Collections.emptyList());
         loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
 
-        String filename = Path.of(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                              .toFile().getPath();
+        String filename =
+                Path.of(
+                                StyleLoader.class
+                                        .getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH)
+                                        .toURI())
+                        .toFile()
+                        .getPath();
         loader.addStyleIfValid(filename);
         assertEquals(NUMBER_OF_INTERNAL_STYLES + 1, loader.getStyles().size());
     }
@@ -84,16 +104,23 @@ void addInvalidStyleLeadsToNoMoreStyle() {
 
     @Test
     void initalizeWithOneExternalFile() throws URISyntaxException {
-        String filename = Path.of(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                              .toFile().getPath();
-        when(preferences.getExternalStyles()).thenReturn(FXCollections.singletonObservableList(filename));
+        String filename =
+                Path.of(
+                                StyleLoader.class
+                                        .getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH)
+                                        .toURI())
+                        .toFile()
+                        .getPath();
+        when(preferences.getExternalStyles())
+                .thenReturn(FXCollections.singletonObservableList(filename));
         loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         assertEquals(NUMBER_OF_INTERNAL_STYLES + 1, loader.getStyles().size());
     }
 
     @Test
     void initalizeWithIncorrectExternalFile() {
-        preferences.setExternalStyles(Collections.singletonList("DefinitelyNotAValidFileNameOrWeAreExtremelyUnlucky"));
+        preferences.setExternalStyles(
+                Collections.singletonList("DefinitelyNotAValidFileNameOrWeAreExtremelyUnlucky"));
 
         loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         assertEquals(NUMBER_OF_INTERNAL_STYLES, loader.getStyles().size());
@@ -101,9 +128,15 @@ void initalizeWithIncorrectExternalFile() {
 
     @Test
     void initalizeWithOneExternalFileRemoveStyle() throws URISyntaxException {
-        String filename = Path.of(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                              .toFile().getPath();
-        when(preferences.getExternalStyles()).thenReturn(FXCollections.singletonObservableList(filename));
+        String filename =
+                Path.of(
+                                StyleLoader.class
+                                        .getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH)
+                                        .toURI())
+                        .toFile()
+                        .getPath();
+        when(preferences.getExternalStyles())
+                .thenReturn(FXCollections.singletonObservableList(filename));
 
         loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         List<JStyle> toremove = new ArrayList<>();
@@ -122,9 +155,15 @@ void initalizeWithOneExternalFileRemoveStyle() throws URISyntaxException {
 
     @Test
     void initalizeWithOneExternalFileRemoveStyleUpdatesPreferences() throws URISyntaxException {
-        String filename = Path.of(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                              .toFile().getPath();
-        when(preferences.getExternalStyles()).thenReturn(FXCollections.singletonObservableList(filename));
+        String filename =
+                Path.of(
+                                StyleLoader.class
+                                        .getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH)
+                                        .toURI())
+                        .toFile()
+                        .getPath();
+        when(preferences.getExternalStyles())
+                .thenReturn(FXCollections.singletonObservableList(filename));
 
         loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         List<JStyle> toremove = new ArrayList<>();
@@ -146,8 +185,13 @@ void addSameStyleTwiceLeadsToOneMoreStyle() throws URISyntaxException {
         preferences.setExternalStyles(Collections.emptyList());
         loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         int beforeAdding = loader.getStyles().size();
-        String filename = Path.of(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                              .toFile().getPath();
+        String filename =
+                Path.of(
+                                StyleLoader.class
+                                        .getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH)
+                                        .toURI())
+                        .toFile()
+                        .getPath();
         loader.addStyleIfValid(filename);
         loader.addStyleIfValid(filename);
         assertEquals(beforeAdding + 1, loader.getStyles().size());
@@ -182,7 +226,8 @@ void getStoredUsedStyle() {
 
     @Test
     void getDefaultUsedStyleWhenIncorrect() {
-        when(preferences.getCurrentJStyle()).thenReturn("ljlkjlkjnljnvdlsjniuhwelfhuewfhlkuewhfuwhelu");
+        when(preferences.getCurrentJStyle())
+                .thenReturn("ljlkjlkjnljnvdlsjniuhwelfhuewfhlkuewhfuwhelu");
         loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         JStyle style = loader.getUsedJstyle();
         assertTrue(style.isValid());
diff --git a/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java b/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
index 1859f48729d5..d63884f6adf1 100644
--- a/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
+++ b/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
@@ -1,23 +1,22 @@
 package org.jabref.logic.pdf;
 
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.logic.FilePreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.pdf.FileAnnotation;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 class EntryAnnotationImporterTest {
 
@@ -27,7 +26,8 @@ class EntryAnnotationImporterTest {
     @BeforeEach
     void setUp() {
         entry = new BibEntry();
-        when(databaseContext.getFileDirectories(any())).thenReturn(Collections.singletonList(Path.of("src/test/resources/pdfs/")));
+        when(databaseContext.getFileDirectories(any()))
+                .thenReturn(Collections.singletonList(Path.of("src/test/resources/pdfs/")));
     }
 
     @Test
@@ -37,7 +37,9 @@ void readEntryExampleThesis() {
         EntryAnnotationImporter entryAnnotationImporter = new EntryAnnotationImporter(entry);
 
         // when
-        Map<Path, List<FileAnnotation>> annotations = entryAnnotationImporter.importAnnotationsFromFiles(databaseContext, mock(FilePreferences.class));
+        Map<Path, List<FileAnnotation>> annotations =
+                entryAnnotationImporter.importAnnotationsFromFiles(
+                        databaseContext, mock(FilePreferences.class));
 
         // then
         int fileCounter = 0;
diff --git a/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java b/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java
index df4d76b41955..39a0a5f58090 100644
--- a/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java
+++ b/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.pdf;
 
-import java.nio.file.Path;
-import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.pdf.FileAnnotation;
 import org.jabref.model.pdf.FileAnnotationType;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.nio.file.Path;
+import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.Optional;
 
 class PdfAnnotationImporterTest {
 
@@ -18,129 +17,250 @@ class PdfAnnotationImporterTest {
 
     @Test
     void invalidPath() {
-        assertEquals(Collections.emptyList(), importer.importAnnotations(Path.of("/asdf/does/not/exist.pdf")));
+        assertEquals(
+                Collections.emptyList(),
+                importer.importAnnotations(Path.of("/asdf/does/not/exist.pdf")));
     }
 
     @Test
     void invalidDirectory() {
-        assertEquals(Collections.emptyList(), importer.importAnnotations(Path.of("src/test/resources/pdfs")));
+        assertEquals(
+                Collections.emptyList(),
+                importer.importAnnotations(Path.of("src/test/resources/pdfs")));
     }
 
     @Test
     void invalidDocumentType() {
-        assertEquals(Collections.emptyList(), importer.importAnnotations(Path.of("src/test/resources/pdfs/write-protected.docx")));
+        assertEquals(
+                Collections.emptyList(),
+                importer.importAnnotations(
+                        Path.of("src/test/resources/pdfs/write-protected.docx")));
     }
 
     @Test
     void noAnnotationsWriteProtected() {
-        assertEquals(Collections.emptyList(), importer.importAnnotations(Path.of("src/test/resources/pdfs/write-protected.pdf")));
+        assertEquals(
+                Collections.emptyList(),
+                importer.importAnnotations(Path.of("src/test/resources/pdfs/write-protected.pdf")));
     }
 
     @Test
     void noAnnotationsEncrypted() {
-        assertEquals(Collections.emptyList(), importer.importAnnotations(Path.of("src/test/resources/pdfs/encrypted.pdf")));
+        assertEquals(
+                Collections.emptyList(),
+                importer.importAnnotations(Path.of("src/test/resources/pdfs/encrypted.pdf")));
     }
 
     @Test
     void twoAnnotationsThesisExample() {
-        assertEquals(2, importer.importAnnotations(Path.of("src/test/resources/pdfs/thesis-example.pdf")).size());
+        assertEquals(
+                2,
+                importer.importAnnotations(Path.of("src/test/resources/pdfs/thesis-example.pdf"))
+                        .size());
     }
 
     @Test
     void noAnnotationsMinimal() {
-        assertEquals(Collections.emptyList(), importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal.pdf")));
+        assertEquals(
+                Collections.emptyList(),
+                importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal.pdf")));
     }
 
     @Test
     void inlineNoteMinimal() {
-        final FileAnnotation expected = new FileAnnotation("Linus Dietz", LocalDateTime.of(2017, 3, 12, 20, 25), 1,
-                "inline note annotation", FileAnnotationType.FREETEXT, Optional.empty());
+        final FileAnnotation expected =
+                new FileAnnotation(
+                        "Linus Dietz",
+                        LocalDateTime.of(2017, 3, 12, 20, 25),
+                        1,
+                        "inline note annotation",
+                        FileAnnotationType.FREETEXT,
+                        Optional.empty());
 
-        assertEquals(Collections.singletonList(expected),
-                importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-inlinenote.pdf")));
+        assertEquals(
+                Collections.singletonList(expected),
+                importer.importAnnotations(
+                        Path.of("src/test/resources/pdfs/minimal-inlinenote.pdf")));
     }
 
     @Test
     void popupNoteMinimal() {
-        final FileAnnotation expected = new FileAnnotation("Linus Dietz", LocalDateTime.of(2017, 3, 12, 20, 17, 24), 1,
-                "A simple pop-up note", FileAnnotationType.TEXT, Optional.empty());
+        final FileAnnotation expected =
+                new FileAnnotation(
+                        "Linus Dietz",
+                        LocalDateTime.of(2017, 3, 12, 20, 17, 24),
+                        1,
+                        "A simple pop-up note",
+                        FileAnnotationType.TEXT,
+                        Optional.empty());
 
-        assertEquals(Collections.singletonList(expected),
+        assertEquals(
+                Collections.singletonList(expected),
                 importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-popup.pdf")));
     }
 
     @Test
     void highlightMinimalFoxit() {
-        final FileAnnotation expectedLinkedAnnotation = new FileAnnotation("lynyus", LocalDateTime.of(2017, 5, 31, 15, 16, 1), 1,
-                "this is a foxit highlight", FileAnnotationType.HIGHLIGHT, Optional.empty());
-        final FileAnnotation expected = new FileAnnotation("lynyus", LocalDateTime.of(2017, 5, 31, 15, 16, 1), 1,
-                "Hello", FileAnnotationType.HIGHLIGHT, Optional.of(expectedLinkedAnnotation));
-        assertEquals(Collections.singletonList(expected),
-                importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-foxithighlight.pdf")));
+        final FileAnnotation expectedLinkedAnnotation =
+                new FileAnnotation(
+                        "lynyus",
+                        LocalDateTime.of(2017, 5, 31, 15, 16, 1),
+                        1,
+                        "this is a foxit highlight",
+                        FileAnnotationType.HIGHLIGHT,
+                        Optional.empty());
+        final FileAnnotation expected =
+                new FileAnnotation(
+                        "lynyus",
+                        LocalDateTime.of(2017, 5, 31, 15, 16, 1),
+                        1,
+                        "Hello",
+                        FileAnnotationType.HIGHLIGHT,
+                        Optional.of(expectedLinkedAnnotation));
+        assertEquals(
+                Collections.singletonList(expected),
+                importer.importAnnotations(
+                        Path.of("src/test/resources/pdfs/minimal-foxithighlight.pdf")));
     }
 
     @Test
     void highlightNoNoteMinimal() {
-        final FileAnnotation expectedLinkedAnnotation = new FileAnnotation("Linus Dietz", LocalDateTime.of(2017, 3, 12, 20, 28, 39), 1,
-                "", FileAnnotationType.HIGHLIGHT, Optional.empty());
-        final FileAnnotation expected = new FileAnnotation("Linus Dietz", LocalDateTime.of(2017, 3, 12, 20, 28, 39), 1,
-                "World", FileAnnotationType.HIGHLIGHT, Optional.of(expectedLinkedAnnotation));
+        final FileAnnotation expectedLinkedAnnotation =
+                new FileAnnotation(
+                        "Linus Dietz",
+                        LocalDateTime.of(2017, 3, 12, 20, 28, 39),
+                        1,
+                        "",
+                        FileAnnotationType.HIGHLIGHT,
+                        Optional.empty());
+        final FileAnnotation expected =
+                new FileAnnotation(
+                        "Linus Dietz",
+                        LocalDateTime.of(2017, 3, 12, 20, 28, 39),
+                        1,
+                        "World",
+                        FileAnnotationType.HIGHLIGHT,
+                        Optional.of(expectedLinkedAnnotation));
 
-        assertEquals(Collections.singletonList(expected),
-                importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-highlight-no-note.pdf")));
+        assertEquals(
+                Collections.singletonList(expected),
+                importer.importAnnotations(
+                        Path.of("src/test/resources/pdfs/minimal-highlight-no-note.pdf")));
     }
 
     @Test
     void squigglyWithNoteMinimal() {
-        final FileAnnotation expectedLinkedAnnotation = new FileAnnotation("lynyus", LocalDateTime.of(2017, 6, 1, 2, 40, 25), 1,
-                "Squiggly note", FileAnnotationType.SQUIGGLY, Optional.empty());
-        final FileAnnotation expected = new FileAnnotation("lynyus", LocalDateTime.of(2017, 6, 1, 2, 40, 25), 1,
-                "ello", FileAnnotationType.SQUIGGLY, Optional.of(expectedLinkedAnnotation));
+        final FileAnnotation expectedLinkedAnnotation =
+                new FileAnnotation(
+                        "lynyus",
+                        LocalDateTime.of(2017, 6, 1, 2, 40, 25),
+                        1,
+                        "Squiggly note",
+                        FileAnnotationType.SQUIGGLY,
+                        Optional.empty());
+        final FileAnnotation expected =
+                new FileAnnotation(
+                        "lynyus",
+                        LocalDateTime.of(2017, 6, 1, 2, 40, 25),
+                        1,
+                        "ello",
+                        FileAnnotationType.SQUIGGLY,
+                        Optional.of(expectedLinkedAnnotation));
 
-        assertEquals(Collections.singletonList(expected),
-                importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-squiggly.pdf")));
+        assertEquals(
+                Collections.singletonList(expected),
+                importer.importAnnotations(
+                        Path.of("src/test/resources/pdfs/minimal-squiggly.pdf")));
     }
 
     @Test
     void strikeoutWithNoteMinimal() {
-        final FileAnnotation expectedLinkedAnnotation = new FileAnnotation("lynyus", LocalDateTime.of(2017, 6, 1, 13, 2, 3), 1,
-                "striked out", FileAnnotationType.STRIKEOUT, Optional.empty());
-        final FileAnnotation expected = new FileAnnotation("lynyus", LocalDateTime.of(2017, 6, 1, 13, 2, 3), 1,
-                "World", FileAnnotationType.STRIKEOUT, Optional.of(expectedLinkedAnnotation));
+        final FileAnnotation expectedLinkedAnnotation =
+                new FileAnnotation(
+                        "lynyus",
+                        LocalDateTime.of(2017, 6, 1, 13, 2, 3),
+                        1,
+                        "striked out",
+                        FileAnnotationType.STRIKEOUT,
+                        Optional.empty());
+        final FileAnnotation expected =
+                new FileAnnotation(
+                        "lynyus",
+                        LocalDateTime.of(2017, 6, 1, 13, 2, 3),
+                        1,
+                        "World",
+                        FileAnnotationType.STRIKEOUT,
+                        Optional.of(expectedLinkedAnnotation));
 
-        assertEquals(Collections.singletonList(expected),
-                importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-strikeout.pdf")));
+        assertEquals(
+                Collections.singletonList(expected),
+                importer.importAnnotations(
+                        Path.of("src/test/resources/pdfs/minimal-strikeout.pdf")));
     }
 
     @Test
     void highlightWithNoteMinimal() {
-        final FileAnnotation expectedLinkedAnnotation = new FileAnnotation("Linus Dietz", LocalDateTime.of(2017, 3, 12, 20, 32, 2), 1,
-                "linked note to highlight", FileAnnotationType.HIGHLIGHT, Optional.empty());
-        final FileAnnotation expected = new FileAnnotation("Linus Dietz", LocalDateTime.of(2017, 3, 12, 20, 32, 2), 1,
-                "World", FileAnnotationType.HIGHLIGHT, Optional.of(expectedLinkedAnnotation));
+        final FileAnnotation expectedLinkedAnnotation =
+                new FileAnnotation(
+                        "Linus Dietz",
+                        LocalDateTime.of(2017, 3, 12, 20, 32, 2),
+                        1,
+                        "linked note to highlight",
+                        FileAnnotationType.HIGHLIGHT,
+                        Optional.empty());
+        final FileAnnotation expected =
+                new FileAnnotation(
+                        "Linus Dietz",
+                        LocalDateTime.of(2017, 3, 12, 20, 32, 2),
+                        1,
+                        "World",
+                        FileAnnotationType.HIGHLIGHT,
+                        Optional.of(expectedLinkedAnnotation));
 
-        assertEquals(Collections.singletonList(expected),
-                importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-highlight-with-note.pdf")));
+        assertEquals(
+                Collections.singletonList(expected),
+                importer.importAnnotations(
+                        Path.of("src/test/resources/pdfs/minimal-highlight-with-note.pdf")));
     }
 
     @Test
     void underlineWithNoteMinimal() {
-        final FileAnnotation expectedLinkedAnnotation = new FileAnnotation("Linus Dietz", LocalDateTime.of(2017, 3, 12, 20, 36, 9), 1,
-                "underlined", FileAnnotationType.UNDERLINE, Optional.empty());
-        final FileAnnotation expected = new FileAnnotation("Linus Dietz", LocalDateTime.of(2017, 3, 12, 20, 36, 9), 1,
-                "Hello", FileAnnotationType.UNDERLINE, Optional.of(expectedLinkedAnnotation));
+        final FileAnnotation expectedLinkedAnnotation =
+                new FileAnnotation(
+                        "Linus Dietz",
+                        LocalDateTime.of(2017, 3, 12, 20, 36, 9),
+                        1,
+                        "underlined",
+                        FileAnnotationType.UNDERLINE,
+                        Optional.empty());
+        final FileAnnotation expected =
+                new FileAnnotation(
+                        "Linus Dietz",
+                        LocalDateTime.of(2017, 3, 12, 20, 36, 9),
+                        1,
+                        "Hello",
+                        FileAnnotationType.UNDERLINE,
+                        Optional.of(expectedLinkedAnnotation));
 
-        assertEquals(Collections.singletonList(expected),
-                importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-underline.pdf")));
+        assertEquals(
+                Collections.singletonList(expected),
+                importer.importAnnotations(
+                        Path.of("src/test/resources/pdfs/minimal-underline.pdf")));
     }
 
     @Test
     void polygonNoNoteMinimal() {
-        final FileAnnotation expected = new FileAnnotation("Linus Dietz", LocalDateTime.of(2017, 3, 16, 9, 21, 1), 1,
-                "polygon annotation", FileAnnotationType.POLYGON, Optional.empty());
+        final FileAnnotation expected =
+                new FileAnnotation(
+                        "Linus Dietz",
+                        LocalDateTime.of(2017, 3, 16, 9, 21, 1),
+                        1,
+                        "polygon annotation",
+                        FileAnnotationType.POLYGON,
+                        Optional.empty());
 
-        assertEquals(Collections.singletonList(expected),
+        assertEquals(
+                Collections.singletonList(expected),
                 importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-polygon.pdf")));
     }
 }
-
diff --git a/src/test/java/org/jabref/logic/preferences/JabRefGuiPreferencesTest.java b/src/test/java/org/jabref/logic/preferences/JabRefGuiPreferencesTest.java
index 7a4c5b6894d6..d59993e9e6c2 100644
--- a/src/test/java/org/jabref/logic/preferences/JabRefGuiPreferencesTest.java
+++ b/src/test/java/org/jabref/logic/preferences/JabRefGuiPreferencesTest.java
@@ -1,20 +1,19 @@
 package org.jabref.logic.preferences;
 
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
+import java.util.stream.Stream;
 
 class JabRefGuiPreferencesTest {
     private static Stream<Arguments> provideTestData() {
         return Stream.of(
                 Arguments.of(List.of("A", "B", "C", "D"), "A;B;C;D"),
-                Arguments.of(List.of("A", "B", "C", ""), "A;B;C;")
-        );
+                Arguments.of(List.of("A", "B", "C", ""), "A;B;C;"));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java
index 0e256ee25c5d..7eba91517c46 100644
--- a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java
+++ b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java
@@ -1,18 +1,18 @@
 package org.jabref.logic.protectedterms;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
 
 class ProtectedTermsListTest {
 
@@ -25,8 +25,12 @@ void setUp(@TempDir Path temporaryFolder) throws IOException {
         Files.createFile(path);
         String tempFileName = path.toString();
 
-        internalList = new ProtectedTermsList("Name", new ArrayList<>(Arrays.asList("AAA", "BBB")), "location", true);
-        externalList = new ProtectedTermsList("Namely", new ArrayList<>(Arrays.asList("AAA", "BBB")), tempFileName);
+        internalList =
+                new ProtectedTermsList(
+                        "Name", new ArrayList<>(Arrays.asList("AAA", "BBB")), "location", true);
+        externalList =
+                new ProtectedTermsList(
+                        "Namely", new ArrayList<>(Arrays.asList("AAA", "BBB")), tempFileName);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
index b3fdacd0dd75..05d263330ace 100644
--- a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
+++ b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
@@ -1,20 +1,19 @@
 package org.jabref.logic.protectedterms;
 
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.logic.l10n.Localization;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 class ProtectedTermsLoaderTest {
 
@@ -22,8 +21,13 @@ class ProtectedTermsLoaderTest {
 
     @BeforeEach
     void setUp() {
-        loader = new ProtectedTermsLoader(new ProtectedTermsPreferences(ProtectedTermsLoader.getInternalLists(),
-                Collections.emptyList(), Collections.emptyList(), Collections.emptyList()));
+        loader =
+                new ProtectedTermsLoader(
+                        new ProtectedTermsPreferences(
+                                ProtectedTermsLoader.getInternalLists(),
+                                Collections.emptyList(),
+                                Collections.emptyList(),
+                                Collections.emptyList()));
     }
 
     @Test
@@ -34,26 +38,38 @@ void getProtectedTerms() throws URISyntaxException {
             loader.removeProtectedTermsList(list);
         }
         assertTrue(loader.getProtectedTermsLists().isEmpty());
-        Path path = Path.of(ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms")
-                                                            .toURI());
+        Path path =
+                Path.of(
+                        ProtectedTermsLoader.class
+                                .getResource("/org/jabref/logic/protectedterms/namedterms.terms")
+                                .toURI());
         loader.addProtectedTermsListFromFile(path, true);
         assertEquals(List.of("Einstein"), loader.getProtectedTerms());
     }
 
     @Test
     void addProtectedTermsListFromFile() throws URISyntaxException {
-        Path path = Path.of(ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms")
-                                                            .toURI());
-        assertEquals(ProtectedTermsLoader.getInternalLists().size(), loader.getProtectedTermsLists().size());
+        Path path =
+                Path.of(
+                        ProtectedTermsLoader.class
+                                .getResource("/org/jabref/logic/protectedterms/namedterms.terms")
+                                .toURI());
+        assertEquals(
+                ProtectedTermsLoader.getInternalLists().size(),
+                loader.getProtectedTermsLists().size());
         loader.addProtectedTermsListFromFile(path, false);
-        assertEquals(ProtectedTermsLoader.getInternalLists().size() + 1, loader.getProtectedTermsLists().size());
+        assertEquals(
+                ProtectedTermsLoader.getInternalLists().size() + 1,
+                loader.getProtectedTermsLists().size());
     }
 
     @Test
     void readProtectedTermsListFromFileReadsDescription() throws URISyntaxException {
-        Path file = Path.of(
-                ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms")
-                                          .toURI());
+        Path file =
+                Path.of(
+                        ProtectedTermsLoader.class
+                                .getResource("/org/jabref/logic/protectedterms/namedterms.terms")
+                                .toURI());
 
         ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
         assertEquals("Term list", list.getDescription());
@@ -61,8 +77,11 @@ void readProtectedTermsListFromFileReadsDescription() throws URISyntaxException
 
     @Test
     void readProtectedTermsListFromFileDisabledWorks() throws URISyntaxException {
-        Path file = Path.of(ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms")
-                                                      .toURI());
+        Path file =
+                Path.of(
+                        ProtectedTermsLoader.class
+                                .getResource("/org/jabref/logic/protectedterms/namedterms.terms")
+                                .toURI());
 
         ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, false);
         assertFalse(list.isEnabled());
@@ -70,8 +89,11 @@ void readProtectedTermsListFromFileDisabledWorks() throws URISyntaxException {
 
     @Test
     void readProtectedTermsListFromFileEnabledWorks() throws URISyntaxException {
-        Path file = Path.of(ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms")
-                                                      .toURI());
+        Path file =
+                Path.of(
+                        ProtectedTermsLoader.class
+                                .getResource("/org/jabref/logic/protectedterms/namedterms.terms")
+                                .toURI());
 
         ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
         assertTrue(list.isEnabled());
@@ -79,8 +101,11 @@ void readProtectedTermsListFromFileEnabledWorks() throws URISyntaxException {
 
     @Test
     void readProtectedTermsListFromFileIsNotInternalList() throws URISyntaxException {
-        Path file = Path.of(ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms")
-                                                      .toURI());
+        Path file =
+                Path.of(
+                        ProtectedTermsLoader.class
+                                .getResource("/org/jabref/logic/protectedterms/namedterms.terms")
+                                .toURI());
 
         ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
         assertFalse(list.isInternalList());
@@ -89,31 +114,40 @@ void readProtectedTermsListFromFileIsNotInternalList() throws URISyntaxException
     @Test
     void readProtectedTermsListFromFileNoDescriptionGivesDefaultDescription()
             throws URISyntaxException {
-        Path file = Path.of(
-                ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/unnamedterms.terms")
-                                          .toURI());
+        Path file =
+                Path.of(
+                        ProtectedTermsLoader.class
+                                .getResource("/org/jabref/logic/protectedterms/unnamedterms.terms")
+                                .toURI());
         ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
-        assertEquals(Localization.lang("The text after the last line starting with # will be used"),
+        assertEquals(
+                Localization.lang("The text after the last line starting with # will be used"),
                 list.getDescription());
     }
 
     @Test
     void newListsAreIncluded() {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
-                Collections.emptyList(),
-                Collections.emptyList(),
-                Collections.emptyList(),
-                Collections.emptyList()));
-        assertEquals(ProtectedTermsLoader.getInternalLists().size(), localLoader.getProtectedTermsLists().size());
+        ProtectedTermsLoader localLoader =
+                new ProtectedTermsLoader(
+                        new ProtectedTermsPreferences(
+                                Collections.emptyList(),
+                                Collections.emptyList(),
+                                Collections.emptyList(),
+                                Collections.emptyList()));
+        assertEquals(
+                ProtectedTermsLoader.getInternalLists().size(),
+                localLoader.getProtectedTermsLists().size());
     }
 
     @Test
     void newListsAreEnabled() {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
-                Collections.emptyList(),
-                Collections.emptyList(),
-                Collections.emptyList(),
-                Collections.emptyList()));
+        ProtectedTermsLoader localLoader =
+                new ProtectedTermsLoader(
+                        new ProtectedTermsPreferences(
+                                Collections.emptyList(),
+                                Collections.emptyList(),
+                                Collections.emptyList(),
+                                Collections.emptyList()));
         for (ProtectedTermsList list : localLoader.getProtectedTermsLists()) {
             assertTrue(list.isEnabled());
         }
@@ -121,11 +155,13 @@ void newListsAreEnabled() {
 
     @Test
     void initalizedAllInternalDisabled() {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
-                Collections.emptyList(),
-                Collections.emptyList(),
-                ProtectedTermsLoader.getInternalLists(),
-                Collections.emptyList()));
+        ProtectedTermsLoader localLoader =
+                new ProtectedTermsLoader(
+                        new ProtectedTermsPreferences(
+                                Collections.emptyList(),
+                                Collections.emptyList(),
+                                ProtectedTermsLoader.getInternalLists(),
+                                Collections.emptyList()));
         for (ProtectedTermsList list : localLoader.getProtectedTermsLists()) {
             assertFalse(list.isEnabled());
         }
@@ -133,92 +169,124 @@ void initalizedAllInternalDisabled() {
 
     @Test
     void unknownExternalFileWillNotLoad() {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
-                ProtectedTermsLoader.getInternalLists(),
-                Collections.singletonList("someUnlikelyNameThatNeverWillExist"),
-                Collections.emptyList(),
-                Collections.emptyList()));
-        assertEquals(ProtectedTermsLoader.getInternalLists().size(), localLoader.getProtectedTermsLists().size());
+        ProtectedTermsLoader localLoader =
+                new ProtectedTermsLoader(
+                        new ProtectedTermsPreferences(
+                                ProtectedTermsLoader.getInternalLists(),
+                                Collections.singletonList("someUnlikelyNameThatNeverWillExist"),
+                                Collections.emptyList(),
+                                Collections.emptyList()));
+        assertEquals(
+                ProtectedTermsLoader.getInternalLists().size(),
+                localLoader.getProtectedTermsLists().size());
     }
 
     @Test
     void allDisabledNoWords() {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
-                Collections.emptyList(),
-                Collections.emptyList(),
-                ProtectedTermsLoader.getInternalLists(),
-                Collections.emptyList()));
+        ProtectedTermsLoader localLoader =
+                new ProtectedTermsLoader(
+                        new ProtectedTermsPreferences(
+                                Collections.emptyList(),
+                                Collections.emptyList(),
+                                ProtectedTermsLoader.getInternalLists(),
+                                Collections.emptyList()));
         assertEquals(Collections.emptyList(), localLoader.getProtectedTerms());
     }
 
     @Test
     void doNotLoadTheSameInternalListTwice() {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
-                new ProtectedTermsPreferences(
-                        ProtectedTermsLoader.getInternalLists(),
-                        Collections.emptyList(),
-                        ProtectedTermsLoader.getInternalLists(),
-                        Collections.emptyList()));
-        assertEquals(ProtectedTermsLoader.getInternalLists().size(), localLoader.getProtectedTermsLists().size());
+        ProtectedTermsLoader localLoader =
+                new ProtectedTermsLoader(
+                        new ProtectedTermsPreferences(
+                                ProtectedTermsLoader.getInternalLists(),
+                                Collections.emptyList(),
+                                ProtectedTermsLoader.getInternalLists(),
+                                Collections.emptyList()));
+        assertEquals(
+                ProtectedTermsLoader.getInternalLists().size(),
+                localLoader.getProtectedTermsLists().size());
     }
 
     @Test
     void addNewTermListAddsList(@TempDir Path tempDir) {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
-                Collections.emptyList(),
-                Collections.emptyList(),
-                ProtectedTermsLoader.getInternalLists(),
-                Collections.emptyList()));
-        localLoader.addNewProtectedTermsList("My new list", tempDir.resolve("MyNewList.terms").toAbsolutePath().toString());
-        assertEquals(ProtectedTermsLoader.getInternalLists().size() + 1, localLoader.getProtectedTermsLists().size());
+        ProtectedTermsLoader localLoader =
+                new ProtectedTermsLoader(
+                        new ProtectedTermsPreferences(
+                                Collections.emptyList(),
+                                Collections.emptyList(),
+                                ProtectedTermsLoader.getInternalLists(),
+                                Collections.emptyList()));
+        localLoader.addNewProtectedTermsList(
+                "My new list", tempDir.resolve("MyNewList.terms").toAbsolutePath().toString());
+        assertEquals(
+                ProtectedTermsLoader.getInternalLists().size() + 1,
+                localLoader.getProtectedTermsLists().size());
     }
 
     @Test
     void addNewTermListNewListInList(@TempDir Path tempDir) {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
-                new ProtectedTermsPreferences(
-                        Collections.emptyList(),
-                        Collections.emptyList(),
-                        ProtectedTermsLoader.getInternalLists(),
-                        Collections.emptyList()));
-        ProtectedTermsList newList = localLoader.addNewProtectedTermsList("My new list", tempDir.resolve("MyNewList.terms")
-                                                                                                .toAbsolutePath()
-                                                                                                .toString());
+        ProtectedTermsLoader localLoader =
+                new ProtectedTermsLoader(
+                        new ProtectedTermsPreferences(
+                                Collections.emptyList(),
+                                Collections.emptyList(),
+                                ProtectedTermsLoader.getInternalLists(),
+                                Collections.emptyList()));
+        ProtectedTermsList newList =
+                localLoader.addNewProtectedTermsList(
+                        "My new list",
+                        tempDir.resolve("MyNewList.terms").toAbsolutePath().toString());
         assertTrue(localLoader.getProtectedTermsLists().contains(newList));
     }
 
     @Test
     void removeTermList(@TempDir Path tempDir) {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
-                new ProtectedTermsPreferences(
-                        Collections.emptyList(),
-                        Collections.emptyList(),
-                        ProtectedTermsLoader.getInternalLists(),
-                        Collections.emptyList()));
-        ProtectedTermsList newList = localLoader.addNewProtectedTermsList("My new list", tempDir.resolve("MyNewList.terms").toAbsolutePath().toString());
+        ProtectedTermsLoader localLoader =
+                new ProtectedTermsLoader(
+                        new ProtectedTermsPreferences(
+                                Collections.emptyList(),
+                                Collections.emptyList(),
+                                ProtectedTermsLoader.getInternalLists(),
+                                Collections.emptyList()));
+        ProtectedTermsList newList =
+                localLoader.addNewProtectedTermsList(
+                        "My new list",
+                        tempDir.resolve("MyNewList.terms").toAbsolutePath().toString());
         assertTrue(localLoader.removeProtectedTermsList(newList));
     }
 
     @Test
     void removeTermListReduceTheCount(@TempDir Path tempDir) {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
-                Collections.emptyList(),
-                Collections.emptyList(),
-                ProtectedTermsLoader.getInternalLists(),
-                Collections.emptyList()));
-        ProtectedTermsList newList = localLoader.addNewProtectedTermsList("My new list", tempDir.resolve("MyNewList.terms").toAbsolutePath().toString());
+        ProtectedTermsLoader localLoader =
+                new ProtectedTermsLoader(
+                        new ProtectedTermsPreferences(
+                                Collections.emptyList(),
+                                Collections.emptyList(),
+                                ProtectedTermsLoader.getInternalLists(),
+                                Collections.emptyList()));
+        ProtectedTermsList newList =
+                localLoader.addNewProtectedTermsList(
+                        "My new list",
+                        tempDir.resolve("MyNewList.terms").toAbsolutePath().toString());
         localLoader.removeProtectedTermsList(newList);
-        assertEquals(ProtectedTermsLoader.getInternalLists().size(), localLoader.getProtectedTermsLists().size());
+        assertEquals(
+                ProtectedTermsLoader.getInternalLists().size(),
+                localLoader.getProtectedTermsLists().size());
     }
 
     @Test
     void addNewTermListSetsCorrectDescription(@TempDir Path tempDir) {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
-                Collections.emptyList(),
-                Collections.emptyList(),
-                ProtectedTermsLoader.getInternalLists(),
-                Collections.emptyList()));
-        ProtectedTermsList newList = localLoader.addNewProtectedTermsList("My new list", tempDir.resolve("MyNewList.terms").toAbsolutePath().toString());
+        ProtectedTermsLoader localLoader =
+                new ProtectedTermsLoader(
+                        new ProtectedTermsPreferences(
+                                Collections.emptyList(),
+                                Collections.emptyList(),
+                                ProtectedTermsLoader.getInternalLists(),
+                                Collections.emptyList()));
+        ProtectedTermsList newList =
+                localLoader.addNewProtectedTermsList(
+                        "My new list",
+                        tempDir.resolve("MyNewList.terms").toAbsolutePath().toString());
         assertEquals("My new list", newList.getDescription());
     }
 }
diff --git a/src/test/java/org/jabref/logic/pseudonymization/PseudonymizationTest.java b/src/test/java/org/jabref/logic/pseudonymization/PseudonymizationTest.java
index 0f2fb51decf2..de70347396fa 100644
--- a/src/test/java/org/jabref/logic/pseudonymization/PseudonymizationTest.java
+++ b/src/test/java/org/jabref/logic/pseudonymization/PseudonymizationTest.java
@@ -1,11 +1,8 @@
 package org.jabref.logic.pseudonymization;
 
-import java.io.StringWriter;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
@@ -23,15 +20,17 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
+import java.io.StringWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 class PseudonymizationTest {
 
@@ -47,48 +46,76 @@ class PseudonymizationTest {
 
     @BeforeEach
     void setUp() {
-        importer = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
+        importer =
+                new BibtexImporter(
+                        mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        new DummyFileUpdateMonitor());
 
         stringWriter = new StringWriter();
         bibWriter = new BibWriter(stringWriter, "\n");
-        saveConfiguration = new SelfContainedSaveConfiguration(SaveOrder.getDefaultSaveOrder(), false, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, false);
-        fieldPreferences = new FieldPreferences(true, Collections.emptyList(), Collections.emptyList());
-        citationKeyPatternPreferences = mock(CitationKeyPatternPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        saveConfiguration =
+                new SelfContainedSaveConfiguration(
+                        SaveOrder.getDefaultSaveOrder(),
+                        false,
+                        BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
+                        false);
+        fieldPreferences =
+                new FieldPreferences(true, Collections.emptyList(), Collections.emptyList());
+        citationKeyPatternPreferences =
+                mock(CitationKeyPatternPreferences.class, Answers.RETURNS_DEEP_STUBS);
         entryTypesManager = new BibEntryTypesManager();
 
-        databaseWriter = new BibtexDatabaseWriter(
-                bibWriter,
-                saveConfiguration,
-                fieldPreferences,
-                citationKeyPatternPreferences,
-                entryTypesManager);
+        databaseWriter =
+                new BibtexDatabaseWriter(
+                        bibWriter,
+                        saveConfiguration,
+                        fieldPreferences,
+                        citationKeyPatternPreferences,
+                        entryTypesManager);
     }
 
     @Test
     void pseudonymizeTwoEntries() throws Exception {
-        BibEntry first = new BibEntry("first")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PAGES, "some pages");
-        BibEntry second = new BibEntry("second")
-                .withField(StandardField.AUTHOR, "Author Two")
-                .withField(StandardField.PAGES, "some pages");
-
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(List.of(first, second)));
+        BibEntry first =
+                new BibEntry("first")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PAGES, "some pages");
+        BibEntry second =
+                new BibEntry("second")
+                        .withField(StandardField.AUTHOR, "Author Two")
+                        .withField(StandardField.PAGES, "some pages");
+
+        BibDatabaseContext databaseContext =
+                new BibDatabaseContext(new BibDatabase(List.of(first, second)));
 
         Pseudonymization pseudonymization = new Pseudonymization();
         Pseudonymization.Result result = pseudonymization.pseudonymizeLibrary(databaseContext);
 
-        BibEntry firstPseudo = new BibEntry("citationkey-1")
-                .withField(StandardField.AUTHOR, "author-1")
-                .withField(StandardField.PAGES, "pages-1");
-        BibEntry secondPseudo = new BibEntry("citationkey-2")
-                .withField(StandardField.AUTHOR, "author-2")
-                .withField(StandardField.PAGES, "pages-1");
-        BibDatabaseContext bibDatabaseContextExpected = new BibDatabaseContext(new BibDatabase(List.of(firstPseudo, secondPseudo)));
+        BibEntry firstPseudo =
+                new BibEntry("citationkey-1")
+                        .withField(StandardField.AUTHOR, "author-1")
+                        .withField(StandardField.PAGES, "pages-1");
+        BibEntry secondPseudo =
+                new BibEntry("citationkey-2")
+                        .withField(StandardField.AUTHOR, "author-2")
+                        .withField(StandardField.PAGES, "pages-1");
+        BibDatabaseContext bibDatabaseContextExpected =
+                new BibDatabaseContext(new BibDatabase(List.of(firstPseudo, secondPseudo)));
         bibDatabaseContextExpected.setMode(BibDatabaseMode.BIBLATEX);
-        Pseudonymization.Result expected = new Pseudonymization.Result(
-                bibDatabaseContextExpected,
-                Map.of("author-1", "Author One", "author-2", "Author Two", "pages-1", "some pages", "citationkey-1", "first", "citationkey-2", "second"));
+        Pseudonymization.Result expected =
+                new Pseudonymization.Result(
+                        bibDatabaseContextExpected,
+                        Map.of(
+                                "author-1",
+                                "Author One",
+                                "author-2",
+                                "Author Two",
+                                "pages-1",
+                                "some pages",
+                                "citationkey-1",
+                                "first",
+                                "citationkey-2",
+                                "second"));
 
         assertEquals(expected, result);
     }
@@ -102,7 +129,11 @@ void pseudonymizeLibrary() throws Exception {
         Pseudonymization.Result result = pseudonymization.pseudonymizeLibrary(databaseContext);
         databaseWriter.saveDatabase(result.bibDatabaseContext());
 
-        Path expectedPath = Path.of(PseudonymizationTest.class.getResource("Chocolate-pseudnomyized.bib").toURI());
+        Path expectedPath =
+                Path.of(
+                        PseudonymizationTest.class
+                                .getResource("Chocolate-pseudnomyized.bib")
+                                .toURI());
         assertEquals(Files.readString(expectedPath), stringWriter.toString());
     }
 
diff --git a/src/test/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultCsvWriterTest.java b/src/test/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultCsvWriterTest.java
index 75eda7a68ecd..15e15e1faff6 100644
--- a/src/test/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultCsvWriterTest.java
+++ b/src/test/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultCsvWriterTest.java
@@ -1,10 +1,7 @@
 package org.jabref.logic.quality.consistency;
 
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
@@ -14,120 +11,153 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
 
 class BibliographyConsistencyCheckResultCsvWriterTest {
 
-    private BibtexImporter importer = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
+    private BibtexImporter importer =
+            new BibtexImporter(
+                    mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                    new DummyFileUpdateMonitor());
 
     @Test
     void checkSimpleLibrary(@TempDir Path tempDir) throws Exception {
-        BibEntry first = new BibEntry(StandardEntryType.Article, "first")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PAGES, "some pages");
-        BibEntry second = new BibEntry(StandardEntryType.Article, "second")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PUBLISHER, "publisher");
-        BibliographyConsistencyCheck.Result result = new BibliographyConsistencyCheck().check(List.of(first, second));
+        BibEntry first =
+                new BibEntry(StandardEntryType.Article, "first")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PAGES, "some pages");
+        BibEntry second =
+                new BibEntry(StandardEntryType.Article, "second")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PUBLISHER, "publisher");
+        BibliographyConsistencyCheck.Result result =
+                new BibliographyConsistencyCheck().check(List.of(first, second));
 
         Path csvFile = tempDir.resolve("checkSimpleLibrary-result.csv");
         try (Writer writer = new OutputStreamWriter(Files.newOutputStream(csvFile));
-             BibliographyConsistencyCheckResultCsvWriter paperConsistencyCheckResultCsvWriter = new BibliographyConsistencyCheckResultCsvWriter(result, writer)) {
+                BibliographyConsistencyCheckResultCsvWriter paperConsistencyCheckResultCsvWriter =
+                        new BibliographyConsistencyCheckResultCsvWriter(result, writer)) {
             paperConsistencyCheckResultCsvWriter.writeFindings();
         }
-        assertEquals("""
+        assertEquals(
+                """
                 entry type,citation key,Pages,Publisher
                 Article,first,o,-
                 Article,second,-,?
-                """, Files.readString(csvFile).replace("\r\n", "\n"));
+                """,
+                Files.readString(csvFile).replace("\r\n", "\n"));
     }
 
     @Test
     void checkDifferentOutputSymbols(@TempDir Path tempDir) throws Exception {
         UnknownField customField = new UnknownField("custom");
-        BibEntry first = new BibEntry(StandardEntryType.Article, "first")
-                .withField(StandardField.AUTHOR, "Author One") // required
-                .withField(StandardField.TITLE, "Title") // required
-                .withField(StandardField.PAGES, "some pages") // optional
-                .withField(customField, "custom"); // unknown
-        BibEntry second = new BibEntry(StandardEntryType.Article, "second")
-                .withField(StandardField.AUTHOR, "Author One");
-        BibliographyConsistencyCheck.Result result = new BibliographyConsistencyCheck().check(List.of(first, second));
+        BibEntry first =
+                new BibEntry(StandardEntryType.Article, "first")
+                        .withField(StandardField.AUTHOR, "Author One") // required
+                        .withField(StandardField.TITLE, "Title") // required
+                        .withField(StandardField.PAGES, "some pages") // optional
+                        .withField(customField, "custom"); // unknown
+        BibEntry second =
+                new BibEntry(StandardEntryType.Article, "second")
+                        .withField(StandardField.AUTHOR, "Author One");
+        BibliographyConsistencyCheck.Result result =
+                new BibliographyConsistencyCheck().check(List.of(first, second));
 
         Path csvFile = tempDir.resolve("checkDifferentOutputSymbols-result.csv");
         try (Writer writer = new OutputStreamWriter(Files.newOutputStream(csvFile));
-             BibliographyConsistencyCheckResultCsvWriter paperConsistencyCheckResultCsvWriter = new BibliographyConsistencyCheckResultCsvWriter(result, writer)) {
+                BibliographyConsistencyCheckResultCsvWriter paperConsistencyCheckResultCsvWriter =
+                        new BibliographyConsistencyCheckResultCsvWriter(result, writer)) {
             paperConsistencyCheckResultCsvWriter.writeFindings();
         }
-        assertEquals("""
+        assertEquals(
+                """
                 entry type,citation key,Custom,Pages,Title
                 Article,first,?,o,x
-                """, Files.readString(csvFile).replace("\r\n", "\n"));
+                """,
+                Files.readString(csvFile).replace("\r\n", "\n"));
     }
 
     @Test
     void checkComplexLibrary(@TempDir Path tempDir) throws Exception {
-        BibEntry first = new BibEntry(StandardEntryType.Article, "first")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PAGES, "some pages");
-        BibEntry second = new BibEntry(StandardEntryType.Article, "second")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PUBLISHER, "publisher");
-
-        BibEntry third = new BibEntry(StandardEntryType.InProceedings, "third")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.LOCATION, "location")
-                .withField(StandardField.YEAR, "2024")
-                .withField(StandardField.PAGES, "some pages");
-        BibEntry fourth = new BibEntry(StandardEntryType.InProceedings, "fourth")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.YEAR, "2024")
-                .withField(StandardField.PUBLISHER, "publisher");
-        BibEntry fifth = new BibEntry(StandardEntryType.InProceedings, "fifth")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.YEAR, "2024");
-
-        BibliographyConsistencyCheck.Result result = new BibliographyConsistencyCheck().check(List.of(first, second, third, fourth, fifth));
+        BibEntry first =
+                new BibEntry(StandardEntryType.Article, "first")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PAGES, "some pages");
+        BibEntry second =
+                new BibEntry(StandardEntryType.Article, "second")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PUBLISHER, "publisher");
+
+        BibEntry third =
+                new BibEntry(StandardEntryType.InProceedings, "third")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.LOCATION, "location")
+                        .withField(StandardField.YEAR, "2024")
+                        .withField(StandardField.PAGES, "some pages");
+        BibEntry fourth =
+                new BibEntry(StandardEntryType.InProceedings, "fourth")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.YEAR, "2024")
+                        .withField(StandardField.PUBLISHER, "publisher");
+        BibEntry fifth =
+                new BibEntry(StandardEntryType.InProceedings, "fifth")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.YEAR, "2024");
+
+        BibliographyConsistencyCheck.Result result =
+                new BibliographyConsistencyCheck()
+                        .check(List.of(first, second, third, fourth, fifth));
 
         Path csvFile = tempDir.resolve("checkSimpleLibrary-result.csv");
         try (Writer writer = new OutputStreamWriter(Files.newOutputStream(csvFile));
-             BibliographyConsistencyCheckResultCsvWriter paperConsistencyCheckResultCsvWriter = new BibliographyConsistencyCheckResultCsvWriter(result, writer)) {
+                BibliographyConsistencyCheckResultCsvWriter paperConsistencyCheckResultCsvWriter =
+                        new BibliographyConsistencyCheckResultCsvWriter(result, writer)) {
             paperConsistencyCheckResultCsvWriter.writeFindings();
         }
-        assertEquals("""
+        assertEquals(
+                """
                 entry type,citation key,Location,Pages,Publisher
                 Article,first,-,o,-
                 Article,second,-,-,?
                 InProceedings,fourth,-,-,o
                 InProceedings,third,?,o,-
-                """, Files.readString(csvFile).replace("\r\n", "\n"));
+                """,
+                Files.readString(csvFile).replace("\r\n", "\n"));
     }
 
     @Test
     void checkLibraryWithoutIssues(@TempDir Path tempDir) throws Exception {
-        BibEntry first = new BibEntry(StandardEntryType.Article, "first")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PAGES, "some pages");
-        BibEntry second = new BibEntry(StandardEntryType.Article, "second")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PAGES, "some pages");
-        BibliographyConsistencyCheck.Result result = new BibliographyConsistencyCheck().check(List.of(first, second));
+        BibEntry first =
+                new BibEntry(StandardEntryType.Article, "first")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PAGES, "some pages");
+        BibEntry second =
+                new BibEntry(StandardEntryType.Article, "second")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PAGES, "some pages");
+        BibliographyConsistencyCheck.Result result =
+                new BibliographyConsistencyCheck().check(List.of(first, second));
 
         Path csvFile = tempDir.resolve("checkLibraryWithoutIssues-result.csv");
         try (Writer writer = new OutputStreamWriter(Files.newOutputStream(csvFile));
-             BibliographyConsistencyCheckResultCsvWriter paperConsistencyCheckResultCsvWriter = new BibliographyConsistencyCheckResultCsvWriter(result, writer)) {
+                BibliographyConsistencyCheckResultCsvWriter paperConsistencyCheckResultCsvWriter =
+                        new BibliographyConsistencyCheckResultCsvWriter(result, writer)) {
             paperConsistencyCheckResultCsvWriter.writeFindings();
         }
-        assertEquals("""
+        assertEquals(
+                """
                 entry type,citation key
-                """, Files.readString(csvFile).replace("\r\n", "\n"));
+                """,
+                Files.readString(csvFile).replace("\r\n", "\n"));
     }
 
     @Test
@@ -136,9 +166,11 @@ void checkManualInput() throws Exception {
         Path file = Path.of("C:\\TEMP\\JabRef\\biblio-anon.bib");
         Path csvFile = file.resolveSibling("biblio-cited.csv");
         BibDatabaseContext databaseContext = importer.importDatabase(file).getDatabaseContext();
-        BibliographyConsistencyCheck.Result result = new BibliographyConsistencyCheck().check(databaseContext.getEntries());
+        BibliographyConsistencyCheck.Result result =
+                new BibliographyConsistencyCheck().check(databaseContext.getEntries());
         try (Writer writer = new OutputStreamWriter(Files.newOutputStream(csvFile));
-             BibliographyConsistencyCheckResultCsvWriter paperConsistencyCheckResultCsvWriter = new BibliographyConsistencyCheckResultCsvWriter(result, writer)) {
+                BibliographyConsistencyCheckResultCsvWriter paperConsistencyCheckResultCsvWriter =
+                        new BibliographyConsistencyCheckResultCsvWriter(result, writer)) {
             paperConsistencyCheckResultCsvWriter.writeFindings();
         }
     }
diff --git a/src/test/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultTxtWriterTest.java b/src/test/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultTxtWriterTest.java
index df05bbfe3467..1a24c6270800 100644
--- a/src/test/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultTxtWriterTest.java
+++ b/src/test/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckResultTxtWriterTest.java
@@ -1,10 +1,7 @@
 package org.jabref.logic.quality.consistency;
 
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
@@ -14,34 +11,45 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
 
 class BibliographyConsistencyCheckResultTxtWriterTest {
-    private BibtexImporter importer = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
+    private BibtexImporter importer =
+            new BibtexImporter(
+                    mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                    new DummyFileUpdateMonitor());
 
     @Test
     void checkSimpleLibrary(@TempDir Path tempDir) throws Exception {
-        BibEntry first = new BibEntry(StandardEntryType.Article, "first")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PAGES, "some pages");
-        BibEntry second = new BibEntry(StandardEntryType.Article, "second")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PUBLISHER, "publisher");
-        BibliographyConsistencyCheck.Result result = new BibliographyConsistencyCheck().check(List.of(first, second));
+        BibEntry first =
+                new BibEntry(StandardEntryType.Article, "first")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PAGES, "some pages");
+        BibEntry second =
+                new BibEntry(StandardEntryType.Article, "second")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PUBLISHER, "publisher");
+        BibliographyConsistencyCheck.Result result =
+                new BibliographyConsistencyCheck().check(List.of(first, second));
 
         Path txtFile = tempDir.resolve("checkSimpleLibrary-result.txt");
         try (Writer writer = new OutputStreamWriter(Files.newOutputStream(txtFile));
-             BibliographyConsistencyCheckResultTxtWriter BibliographyConsistencyCheckResultTxtWriter = new BibliographyConsistencyCheckResultTxtWriter(result, writer)) {
+                BibliographyConsistencyCheckResultTxtWriter
+                        BibliographyConsistencyCheckResultTxtWriter =
+                                new BibliographyConsistencyCheckResultTxtWriter(result, writer)) {
             BibliographyConsistencyCheckResultTxtWriter.writeFindings();
         }
-        assertEquals("""
+        assertEquals(
+                """
                 Field Presence Consistency Check Result
 
                 | entry type | citation key | Pages | Publisher |
@@ -53,27 +61,34 @@ void checkSimpleLibrary(@TempDir Path tempDir) throws Exception {
                 o | optional field is present
                 ? | unknown field is present
                 - | field is absent
-                """, Files.readString(txtFile).replace("\r\n", "\n"));
+                """,
+                Files.readString(txtFile).replace("\r\n", "\n"));
     }
 
     @Test
     void checkDifferentOutputSymbols(@TempDir Path tempDir) throws Exception {
         UnknownField customField = new UnknownField("custom");
-        BibEntry first = new BibEntry(StandardEntryType.Article, "first")
-                .withField(StandardField.AUTHOR, "Author One") // required
-                .withField(StandardField.TITLE, "Title") // required
-                .withField(StandardField.PAGES, "some pages") // optional
-                .withField(customField, "custom"); // unknown
-        BibEntry second = new BibEntry(StandardEntryType.Article, "second")
-                .withField(StandardField.AUTHOR, "Author One");
-        BibliographyConsistencyCheck.Result result = new BibliographyConsistencyCheck().check(List.of(first, second));
+        BibEntry first =
+                new BibEntry(StandardEntryType.Article, "first")
+                        .withField(StandardField.AUTHOR, "Author One") // required
+                        .withField(StandardField.TITLE, "Title") // required
+                        .withField(StandardField.PAGES, "some pages") // optional
+                        .withField(customField, "custom"); // unknown
+        BibEntry second =
+                new BibEntry(StandardEntryType.Article, "second")
+                        .withField(StandardField.AUTHOR, "Author One");
+        BibliographyConsistencyCheck.Result result =
+                new BibliographyConsistencyCheck().check(List.of(first, second));
 
         Path txtFile = tempDir.resolve("checkDifferentOutputSymbols-result.txt");
         try (Writer writer = new OutputStreamWriter(Files.newOutputStream(txtFile));
-             BibliographyConsistencyCheckResultTxtWriter BibliographyConsistencyCheckResultTxtWriter = new BibliographyConsistencyCheckResultTxtWriter(result, writer)) {
+                BibliographyConsistencyCheckResultTxtWriter
+                        BibliographyConsistencyCheckResultTxtWriter =
+                                new BibliographyConsistencyCheckResultTxtWriter(result, writer)) {
             BibliographyConsistencyCheckResultTxtWriter.writeFindings();
         }
-        assertEquals("""
+        assertEquals(
+                """
                 Field Presence Consistency Check Result
 
                 | entry type | citation key | Custom | Pages | Title |
@@ -84,39 +99,50 @@ void checkDifferentOutputSymbols(@TempDir Path tempDir) throws Exception {
                 o | optional field is present
                 ? | unknown field is present
                 - | field is absent
-                """, Files.readString(txtFile).replace("\r\n", "\n"));
+                """,
+                Files.readString(txtFile).replace("\r\n", "\n"));
     }
 
     @Test
     void checkComplexLibrary(@TempDir Path tempDir) throws Exception {
-        BibEntry first = new BibEntry(StandardEntryType.Article, "first")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PAGES, "some pages");
-        BibEntry second = new BibEntry(StandardEntryType.Article, "second")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PUBLISHER, "publisher");
-
-        BibEntry third = new BibEntry(StandardEntryType.InProceedings, "third")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.LOCATION, "location")
-                .withField(StandardField.YEAR, "2024")
-                .withField(StandardField.PAGES, "some pages");
-        BibEntry fourth = new BibEntry(StandardEntryType.InProceedings, "fourth")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.YEAR, "2024")
-                .withField(StandardField.PUBLISHER, "publisher");
-        BibEntry fifth = new BibEntry(StandardEntryType.InProceedings, "fifth")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.YEAR, "2024");
-
-        BibliographyConsistencyCheck.Result result = new BibliographyConsistencyCheck().check(List.of(first, second, third, fourth, fifth));
+        BibEntry first =
+                new BibEntry(StandardEntryType.Article, "first")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PAGES, "some pages");
+        BibEntry second =
+                new BibEntry(StandardEntryType.Article, "second")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PUBLISHER, "publisher");
+
+        BibEntry third =
+                new BibEntry(StandardEntryType.InProceedings, "third")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.LOCATION, "location")
+                        .withField(StandardField.YEAR, "2024")
+                        .withField(StandardField.PAGES, "some pages");
+        BibEntry fourth =
+                new BibEntry(StandardEntryType.InProceedings, "fourth")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.YEAR, "2024")
+                        .withField(StandardField.PUBLISHER, "publisher");
+        BibEntry fifth =
+                new BibEntry(StandardEntryType.InProceedings, "fifth")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.YEAR, "2024");
+
+        BibliographyConsistencyCheck.Result result =
+                new BibliographyConsistencyCheck()
+                        .check(List.of(first, second, third, fourth, fifth));
 
         Path txtFile = tempDir.resolve("checkSimpleLibrary-result.txt");
         try (Writer writer = new OutputStreamWriter(Files.newOutputStream(txtFile));
-             BibliographyConsistencyCheckResultTxtWriter BibliographyConsistencyCheckResultTxtWriter = new BibliographyConsistencyCheckResultTxtWriter(result, writer)) {
+                BibliographyConsistencyCheckResultTxtWriter
+                        BibliographyConsistencyCheckResultTxtWriter =
+                                new BibliographyConsistencyCheckResultTxtWriter(result, writer)) {
             BibliographyConsistencyCheckResultTxtWriter.writeFindings();
         }
-        assertEquals("""
+        assertEquals(
+                """
                 Field Presence Consistency Check Result
 
                 | entry type    | citation key  | Location | Pages | Publisher |
@@ -130,29 +156,37 @@ void checkComplexLibrary(@TempDir Path tempDir) throws Exception {
                 o | optional field is present
                 ? | unknown field is present
                 - | field is absent
-                """, Files.readString(txtFile).replace("\r\n", "\n"));
+                """,
+                Files.readString(txtFile).replace("\r\n", "\n"));
     }
 
     @Test
     void checkLibraryWithoutIssues(@TempDir Path tempDir) throws Exception {
-        BibEntry first = new BibEntry(StandardEntryType.Article, "first")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PAGES, "some pages");
-        BibEntry second = new BibEntry(StandardEntryType.Article, "second")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PAGES, "some pages");
-        BibliographyConsistencyCheck.Result result = new BibliographyConsistencyCheck().check(List.of(first, second));
+        BibEntry first =
+                new BibEntry(StandardEntryType.Article, "first")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PAGES, "some pages");
+        BibEntry second =
+                new BibEntry(StandardEntryType.Article, "second")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PAGES, "some pages");
+        BibliographyConsistencyCheck.Result result =
+                new BibliographyConsistencyCheck().check(List.of(first, second));
 
         Path txtFile = tempDir.resolve("checkLibraryWithoutIssues-result.txt");
         try (Writer writer = new OutputStreamWriter(Files.newOutputStream(txtFile));
-             BibliographyConsistencyCheckResultTxtWriter BibliographyConsistencyCheckResultTxtWriter = new BibliographyConsistencyCheckResultTxtWriter(result, writer)) {
+                BibliographyConsistencyCheckResultTxtWriter
+                        BibliographyConsistencyCheckResultTxtWriter =
+                                new BibliographyConsistencyCheckResultTxtWriter(result, writer)) {
             BibliographyConsistencyCheckResultTxtWriter.writeFindings();
         }
-        assertEquals("""
+        assertEquals(
+                """
                 Field Presence Consistency Check Result
 
                 No errors found.
-                """, Files.readString(txtFile).replace("\r\n", "\n"));
+                """,
+                Files.readString(txtFile).replace("\r\n", "\n"));
     }
 
     @Test
@@ -161,9 +195,12 @@ void checkManualInput() throws Exception {
         Path file = Path.of("C:\\TEMP\\JabRef\\biblio-anon.bib");
         Path txtFile = file.resolveSibling("biblio-cited.txt");
         BibDatabaseContext databaseContext = importer.importDatabase(file).getDatabaseContext();
-        BibliographyConsistencyCheck.Result result = new BibliographyConsistencyCheck().check(databaseContext.getEntries());
+        BibliographyConsistencyCheck.Result result =
+                new BibliographyConsistencyCheck().check(databaseContext.getEntries());
         try (Writer writer = new OutputStreamWriter(Files.newOutputStream(txtFile));
-             BibliographyConsistencyCheckResultTxtWriter BibliographyConsistencyCheckResultTxtWriter = new BibliographyConsistencyCheckResultTxtWriter(result, writer)) {
+                BibliographyConsistencyCheckResultTxtWriter
+                        BibliographyConsistencyCheckResultTxtWriter =
+                                new BibliographyConsistencyCheckResultTxtWriter(result, writer)) {
             BibliographyConsistencyCheckResultTxtWriter.writeFindings();
         }
     }
diff --git a/src/test/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckTest.java b/src/test/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckTest.java
index d20e45216d36..c8c89cff05da 100644
--- a/src/test/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckTest.java
+++ b/src/test/java/org/jabref/logic/quality/consistency/BibliographyConsistencyCheckTest.java
@@ -1,9 +1,7 @@
 package org.jabref.logic.quality.consistency;
 
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
@@ -12,94 +10,135 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 class BibliographyConsistencyCheckTest {
 
-    private BibtexImporter importer = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
+    private BibtexImporter importer =
+            new BibtexImporter(
+                    mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                    new DummyFileUpdateMonitor());
 
     @Test
     void checkSimpleLibrary(@TempDir Path tempDir) throws Exception {
-        BibEntry first = new BibEntry(StandardEntryType.Article, "first")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PAGES, "some pages");
-        BibEntry second = new BibEntry(StandardEntryType.Article, "second")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PUBLISHER, "publisher");
-        BibliographyConsistencyCheck.Result result = new BibliographyConsistencyCheck().check(List.of(first, second));
-
-        BibliographyConsistencyCheck.EntryTypeResult entryTypeResult = new BibliographyConsistencyCheck.EntryTypeResult(Set.of(StandardField.PAGES, StandardField.PUBLISHER), List.of(first, second));
-        BibliographyConsistencyCheck.Result expected = new BibliographyConsistencyCheck.Result(Map.of(StandardEntryType.Article, entryTypeResult));
+        BibEntry first =
+                new BibEntry(StandardEntryType.Article, "first")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PAGES, "some pages");
+        BibEntry second =
+                new BibEntry(StandardEntryType.Article, "second")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PUBLISHER, "publisher");
+        BibliographyConsistencyCheck.Result result =
+                new BibliographyConsistencyCheck().check(List.of(first, second));
+
+        BibliographyConsistencyCheck.EntryTypeResult entryTypeResult =
+                new BibliographyConsistencyCheck.EntryTypeResult(
+                        Set.of(StandardField.PAGES, StandardField.PUBLISHER),
+                        List.of(first, second));
+        BibliographyConsistencyCheck.Result expected =
+                new BibliographyConsistencyCheck.Result(
+                        Map.of(StandardEntryType.Article, entryTypeResult));
         assertEquals(expected, result);
     }
 
     @Test
     void checkDifferentOutputSymbols(@TempDir Path tempDir) throws Exception {
         UnknownField customField = new UnknownField("custom");
-        BibEntry first = new BibEntry(StandardEntryType.Article, "first")
-                .withField(StandardField.AUTHOR, "Author One") // required
-                .withField(StandardField.TITLE, "Title") // required
-                .withField(StandardField.PAGES, "some pages") // optional
-                .withField(customField, "custom"); // unknown
-        BibEntry second = new BibEntry(StandardEntryType.Article, "second")
-                .withField(StandardField.AUTHOR, "Author One");
-        BibliographyConsistencyCheck.Result result = new BibliographyConsistencyCheck().check(List.of(first, second));
-
-        BibliographyConsistencyCheck.EntryTypeResult entryTypeResult = new BibliographyConsistencyCheck.EntryTypeResult(Set.of(StandardField.PAGES, StandardField.TITLE, customField), List.of(first));
-        BibliographyConsistencyCheck.Result expected = new BibliographyConsistencyCheck.Result(Map.of(StandardEntryType.Article, entryTypeResult));
+        BibEntry first =
+                new BibEntry(StandardEntryType.Article, "first")
+                        .withField(StandardField.AUTHOR, "Author One") // required
+                        .withField(StandardField.TITLE, "Title") // required
+                        .withField(StandardField.PAGES, "some pages") // optional
+                        .withField(customField, "custom"); // unknown
+        BibEntry second =
+                new BibEntry(StandardEntryType.Article, "second")
+                        .withField(StandardField.AUTHOR, "Author One");
+        BibliographyConsistencyCheck.Result result =
+                new BibliographyConsistencyCheck().check(List.of(first, second));
+
+        BibliographyConsistencyCheck.EntryTypeResult entryTypeResult =
+                new BibliographyConsistencyCheck.EntryTypeResult(
+                        Set.of(StandardField.PAGES, StandardField.TITLE, customField),
+                        List.of(first));
+        BibliographyConsistencyCheck.Result expected =
+                new BibliographyConsistencyCheck.Result(
+                        Map.of(StandardEntryType.Article, entryTypeResult));
         assertEquals(expected, result);
     }
 
     @Test
     void checkComplexLibrary(@TempDir Path tempDir) throws Exception {
-        BibEntry first = new BibEntry(StandardEntryType.Article, "first")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PAGES, "some pages");
-        BibEntry second = new BibEntry(StandardEntryType.Article, "second")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PUBLISHER, "publisher");
-
-        BibEntry third = new BibEntry(StandardEntryType.InProceedings, "third")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.LOCATION, "location")
-                .withField(StandardField.YEAR, "2024")
-                .withField(StandardField.PAGES, "some pages");
-        BibEntry fourth = new BibEntry(StandardEntryType.InProceedings, "fourth")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.YEAR, "2024")
-                .withField(StandardField.PUBLISHER, "publisher");
-        BibEntry fifth = new BibEntry(StandardEntryType.InProceedings, "fifth")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.YEAR, "2024");
-
-        BibliographyConsistencyCheck.Result result = new BibliographyConsistencyCheck().check(List.of(first, second, third, fourth, fifth));
-
-        BibliographyConsistencyCheck.EntryTypeResult articleResult = new BibliographyConsistencyCheck.EntryTypeResult(Set.of(StandardField.PAGES, StandardField.PUBLISHER), List.of(first, second));
-        BibliographyConsistencyCheck.EntryTypeResult inProceedingsResult = new BibliographyConsistencyCheck.EntryTypeResult(Set.of(StandardField.PAGES, StandardField.PUBLISHER, StandardField.LOCATION), List.of(fourth, third));
-        BibliographyConsistencyCheck.Result expected = new BibliographyConsistencyCheck.Result(Map.of(
-                StandardEntryType.Article, articleResult,
-                StandardEntryType.InProceedings, inProceedingsResult
-        ));
+        BibEntry first =
+                new BibEntry(StandardEntryType.Article, "first")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PAGES, "some pages");
+        BibEntry second =
+                new BibEntry(StandardEntryType.Article, "second")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PUBLISHER, "publisher");
+
+        BibEntry third =
+                new BibEntry(StandardEntryType.InProceedings, "third")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.LOCATION, "location")
+                        .withField(StandardField.YEAR, "2024")
+                        .withField(StandardField.PAGES, "some pages");
+        BibEntry fourth =
+                new BibEntry(StandardEntryType.InProceedings, "fourth")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.YEAR, "2024")
+                        .withField(StandardField.PUBLISHER, "publisher");
+        BibEntry fifth =
+                new BibEntry(StandardEntryType.InProceedings, "fifth")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.YEAR, "2024");
+
+        BibliographyConsistencyCheck.Result result =
+                new BibliographyConsistencyCheck()
+                        .check(List.of(first, second, third, fourth, fifth));
+
+        BibliographyConsistencyCheck.EntryTypeResult articleResult =
+                new BibliographyConsistencyCheck.EntryTypeResult(
+                        Set.of(StandardField.PAGES, StandardField.PUBLISHER),
+                        List.of(first, second));
+        BibliographyConsistencyCheck.EntryTypeResult inProceedingsResult =
+                new BibliographyConsistencyCheck.EntryTypeResult(
+                        Set.of(
+                                StandardField.PAGES,
+                                StandardField.PUBLISHER,
+                                StandardField.LOCATION),
+                        List.of(fourth, third));
+        BibliographyConsistencyCheck.Result expected =
+                new BibliographyConsistencyCheck.Result(
+                        Map.of(
+                                StandardEntryType.Article, articleResult,
+                                StandardEntryType.InProceedings, inProceedingsResult));
         assertEquals(expected, result);
     }
 
     @Test
     void checkLibraryWithoutIssues(@TempDir Path tempDir) throws Exception {
-        BibEntry first = new BibEntry(StandardEntryType.Article, "first")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PAGES, "some pages");
-        BibEntry second = new BibEntry(StandardEntryType.Article, "second")
-                .withField(StandardField.AUTHOR, "Author One")
-                .withField(StandardField.PAGES, "some pages");
-        BibliographyConsistencyCheck.Result result = new BibliographyConsistencyCheck().check(List.of(first, second));
-
-        BibliographyConsistencyCheck.Result expected = new BibliographyConsistencyCheck.Result(Map.of());
+        BibEntry first =
+                new BibEntry(StandardEntryType.Article, "first")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PAGES, "some pages");
+        BibEntry second =
+                new BibEntry(StandardEntryType.Article, "second")
+                        .withField(StandardField.AUTHOR, "Author One")
+                        .withField(StandardField.PAGES, "some pages");
+        BibliographyConsistencyCheck.Result result =
+                new BibliographyConsistencyCheck().check(List.of(first, second));
+
+        BibliographyConsistencyCheck.Result expected =
+                new BibliographyConsistencyCheck.Result(Map.of());
         assertEquals(expected, result);
     }
 }
diff --git a/src/test/java/org/jabref/logic/remote/RemoteCommunicationTest.java b/src/test/java/org/jabref/logic/remote/RemoteCommunicationTest.java
index bb2cdc8dc908..159c9894c82e 100644
--- a/src/test/java/org/jabref/logic/remote/RemoteCommunicationTest.java
+++ b/src/test/java/org/jabref/logic/remote/RemoteCommunicationTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.remote;
 
-import java.io.IOException;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import org.jabref.logic.remote.client.RemoteClient;
 import org.jabref.logic.remote.server.RemoteListenerServerManager;
 import org.jabref.logic.remote.server.RemoteMessageHandler;
 import org.jabref.support.DisabledOnCIServer;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
+import java.io.IOException;
 
 /**
  * Tests for the case where the client and server are set-up correctly. Testing the exceptional cases happens in {@link
@@ -49,7 +48,7 @@ void pingReturnsTrue() throws IOException, InterruptedException {
 
     @Test
     void commandLineArgumentSinglePassedToServer() {
-        final String[] message = new String[]{"my message"};
+        final String[] message = new String[] {"my message"};
 
         client.sendCommandLineArguments(message);
 
@@ -58,7 +57,7 @@ void commandLineArgumentSinglePassedToServer() {
 
     @Test
     void commandLineArgumentTwoPassedToServer() {
-        final String[] message = new String[]{"my message", "second"};
+        final String[] message = new String[] {"my message", "second"};
 
         client.sendCommandLineArguments(message);
 
@@ -67,7 +66,7 @@ void commandLineArgumentTwoPassedToServer() {
 
     @Test
     void commandLineArgumentMultiLinePassedToServer() {
-        final String[] message = new String[]{"my message\n second line", "second \r and third"};
+        final String[] message = new String[] {"my message\n second line", "second \r and third"};
 
         client.sendCommandLineArguments(message);
 
@@ -76,7 +75,7 @@ void commandLineArgumentMultiLinePassedToServer() {
 
     @Test
     void commandLineArgumentEncodingAndDecoding() {
-        final String[] message = new String[]{"D:\\T EST\\测试te st.bib"};
+        final String[] message = new String[] {"D:\\T EST\\测试te st.bib"};
 
         // will be encoded as "D%3A%5CT+EST%5C%E6%B5%8B%E8%AF%95te+st.bib"
         client.sendCommandLineArguments(message);
diff --git a/src/test/java/org/jabref/logic/remote/RemoteGuiPreferencesTest.java b/src/test/java/org/jabref/logic/remote/RemoteGuiPreferencesTest.java
index 9aab6f25425b..f91d9df82d30 100644
--- a/src/test/java/org/jabref/logic/remote/RemoteGuiPreferencesTest.java
+++ b/src/test/java/org/jabref/logic/remote/RemoteGuiPreferencesTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.remote;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 class RemoteGuiPreferencesTest {
 
     private RemotePreferences preferences;
diff --git a/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java b/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java
index 6db9a4c9541b..cbcc9ca5f7dd 100644
--- a/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java
+++ b/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java
@@ -1,27 +1,26 @@
 package org.jabref.logic.remote;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.nio.charset.StandardCharsets;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 
 import org.jabref.logic.os.OS;
 import org.jabref.logic.remote.client.RemoteClient;
 import org.jabref.logic.remote.server.RemoteListenerServerManager;
 import org.jabref.logic.remote.server.RemoteMessageHandler;
 import org.jabref.support.DisabledOnCIServer;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
 
 @DisabledOnCIServer("Tests fails sporadically on CI server")
 class RemoteSetupTest {
@@ -36,7 +35,7 @@ void setUp() {
     @Test
     void goodCase() {
         final int port = 34567;
-        final String[] message = new String[]{"MYMESSAGE"};
+        final String[] message = new String[] {"MYMESSAGE"};
 
         try (RemoteListenerServerManager server = new RemoteListenerServerManager()) {
             assertFalse(server.isOpen());
@@ -52,7 +51,7 @@ void goodCase() {
     @Test
     void goodCaseWithAllLifecycleMethods() {
         final int port = 34567;
-        final String[] message = new String[]{"MYMESSAGE"};
+        final String[] message = new String[] {"MYMESSAGE"};
 
         try (RemoteListenerServerManager server = new RemoteListenerServerManager()) {
             assertFalse(server.isOpen());
@@ -98,7 +97,7 @@ void clientTimeout() {
         final int port = 34567;
         final String message = "MYMESSAGE";
 
-        assertFalse(new RemoteClient(port).sendCommandLineArguments(new String[]{message}));
+        assertFalse(new RemoteClient(port).sendCommandLineArguments(new String[] {message}));
     }
 
     @Test
@@ -107,13 +106,16 @@ void pingReturnsFalseForWrongServerListening() throws IOException, InterruptedEx
 
         try (ServerSocket socket = new ServerSocket(port)) {
             // Setup dummy server always answering "whatever"
-            new Thread(() -> {
-                try (Socket message = socket.accept(); OutputStream os = message.getOutputStream()) {
-                    os.write("whatever".getBytes(StandardCharsets.UTF_8));
-                } catch (IOException e) {
-                    // Ignored
-                }
-            }).start();
+            new Thread(
+                            () -> {
+                                try (Socket message = socket.accept();
+                                        OutputStream os = message.getOutputStream()) {
+                                    os.write("whatever".getBytes(StandardCharsets.UTF_8));
+                                } catch (IOException e) {
+                                    // Ignored
+                                }
+                            })
+                    .start();
             Thread.sleep(100);
 
             assertFalse(new RemoteClient(port).ping());
diff --git a/src/test/java/org/jabref/logic/remote/RemoteUtilTest.java b/src/test/java/org/jabref/logic/remote/RemoteUtilTest.java
index 0a3b8c0b145b..a8d49ea9e95a 100644
--- a/src/test/java/org/jabref/logic/remote/RemoteUtilTest.java
+++ b/src/test/java/org/jabref/logic/remote/RemoteUtilTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.remote;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Test;
+
 class RemoteUtilTest {
 
     @Test
@@ -14,8 +14,12 @@ void rejectPortNumberBelowZero() {
 
     @Test
     void rejectReservedSystemPorts() {
-        assertFalse(RemoteUtil.isUserPort(0), "Port number must be outside reserved system range (0-1023).");
-        assertFalse(RemoteUtil.isUserPort(1023), "Port number must be outside reserved system range (0-1023).");
+        assertFalse(
+                RemoteUtil.isUserPort(0),
+                "Port number must be outside reserved system range (0-1023).");
+        assertFalse(
+                RemoteUtil.isUserPort(1023),
+                "Port number must be outside reserved system range (0-1023).");
     }
 
     @Test
@@ -27,7 +31,11 @@ void rejectPortsAbove16Bits() {
     @Test
     void acceptPortsAboveSystemPorts() {
         // ports 1024 -> 65535
-        assertTrue(RemoteUtil.isUserPort(1024), "Port number in between 1024 and 65535 should be valid.");
-        assertTrue(RemoteUtil.isUserPort(65535), "Port number in between 1024 and 65535 should be valid.");
+        assertTrue(
+                RemoteUtil.isUserPort(1024),
+                "Port number in between 1024 and 65535 should be valid.");
+        assertTrue(
+                RemoteUtil.isUserPort(65535),
+                "Port number in between 1024 and 65535 should be valid.");
     }
 }
diff --git a/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java b/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
index 2b2d1eca991d..5e36dc98a536 100644
--- a/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
+++ b/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
@@ -1,10 +1,9 @@
 package org.jabref.logic.search;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
 import javafx.beans.property.BooleanProperty;
 
@@ -17,40 +16,44 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.search.SearchQuery;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.stream.Stream;
 
 public class DatabaseSearcherTest {
     private static final TaskExecutor TASK_EXECUTOR = new CurrentThreadTaskExecutor();
     private BibDatabaseContext databaseContext;
     private final FilePreferences filePreferences = mock(FilePreferences.class);
-    @TempDir
-    private Path indexDir;
+    @TempDir private Path indexDir;
 
     @BeforeEach
     void setUp() {
         when(filePreferences.shouldFulltextIndexLinkedFiles()).thenReturn(false);
-        when(filePreferences.fulltextIndexLinkedFilesProperty()).thenReturn(mock(BooleanProperty.class));
+        when(filePreferences.fulltextIndexLinkedFilesProperty())
+                .thenReturn(mock(BooleanProperty.class));
         databaseContext = spy(new BibDatabaseContext());
         when(databaseContext.getFulltextIndexPath()).thenReturn(indexDir);
     }
 
     @ParameterizedTest
     @MethodSource
-    void testDatabaseSearcher(List<BibEntry> expectedMatches, SearchQuery query, List<BibEntry> entries) throws IOException {
+    void testDatabaseSearcher(
+            List<BibEntry> expectedMatches, SearchQuery query, List<BibEntry> entries)
+            throws IOException {
         for (BibEntry entry : entries) {
             databaseContext.getDatabase().insertEntry(entry);
         }
-        List<BibEntry> matches = new DatabaseSearcher(query, databaseContext, TASK_EXECUTOR, filePreferences).getMatches();
+        List<BibEntry> matches =
+                new DatabaseSearcher(query, databaseContext, TASK_EXECUTOR, filePreferences)
+                        .getMatches();
         assertEquals(expectedMatches, matches);
     }
 
@@ -64,18 +67,39 @@ private static Stream<Arguments> testDatabaseSearcher() {
         inCollectionEntry.setField(StandardField.AUTHOR, "tonho");
 
         return Stream.of(
-                Arguments.of(List.of(), new SearchQuery("whatever", EnumSet.noneOf(SearchFlags.class)), List.of()),
-                Arguments.of(List.of(), new SearchQuery("whatever", EnumSet.noneOf(SearchFlags.class)), List.of(emptyEntry)),
-                Arguments.of(List.of(), new SearchQuery("whatever", EnumSet.noneOf(SearchFlags.class)), List.of(emptyEntry, articleEntry, inCollectionEntry)),
+                Arguments.of(
+                        List.of(),
+                        new SearchQuery("whatever", EnumSet.noneOf(SearchFlags.class)),
+                        List.of()),
+                Arguments.of(
+                        List.of(),
+                        new SearchQuery("whatever", EnumSet.noneOf(SearchFlags.class)),
+                        List.of(emptyEntry)),
+                Arguments.of(
+                        List.of(),
+                        new SearchQuery("whatever", EnumSet.noneOf(SearchFlags.class)),
+                        List.of(emptyEntry, articleEntry, inCollectionEntry)),
 
                 // invalid search syntax
-                Arguments.of(List.of(), new SearchQuery("author:", EnumSet.noneOf(SearchFlags.class)), List.of(articleEntry)),
-
-                Arguments.of(List.of(articleEntry), new SearchQuery("harrer", EnumSet.noneOf(SearchFlags.class)), List.of(articleEntry)),
-                Arguments.of(List.of(), new SearchQuery("title: harrer", EnumSet.noneOf(SearchFlags.class)), List.of(articleEntry)),
-
-                Arguments.of(List.of(inCollectionEntry), new SearchQuery("tonho", EnumSet.noneOf(SearchFlags.class)), List.of(inCollectionEntry)),
-                Arguments.of(List.of(inCollectionEntry), new SearchQuery("tonho", EnumSet.noneOf(SearchFlags.class)), List.of(articleEntry, inCollectionEntry))
-        );
+                Arguments.of(
+                        List.of(),
+                        new SearchQuery("author:", EnumSet.noneOf(SearchFlags.class)),
+                        List.of(articleEntry)),
+                Arguments.of(
+                        List.of(articleEntry),
+                        new SearchQuery("harrer", EnumSet.noneOf(SearchFlags.class)),
+                        List.of(articleEntry)),
+                Arguments.of(
+                        List.of(),
+                        new SearchQuery("title: harrer", EnumSet.noneOf(SearchFlags.class)),
+                        List.of(articleEntry)),
+                Arguments.of(
+                        List.of(inCollectionEntry),
+                        new SearchQuery("tonho", EnumSet.noneOf(SearchFlags.class)),
+                        List.of(inCollectionEntry)),
+                Arguments.of(
+                        List.of(inCollectionEntry),
+                        new SearchQuery("tonho", EnumSet.noneOf(SearchFlags.class)),
+                        List.of(articleEntry, inCollectionEntry)));
     }
 }
diff --git a/src/test/java/org/jabref/logic/search/DatabaseSearcherWithBibFilesTest.java b/src/test/java/org/jabref/logic/search/DatabaseSearcherWithBibFilesTest.java
index 13e59c1b6832..dba2961ee4ce 100644
--- a/src/test/java/org/jabref/logic/search/DatabaseSearcherWithBibFilesTest.java
+++ b/src/test/java/org/jabref/logic/search/DatabaseSearcherWithBibFilesTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.search;
 
-import java.nio.file.Path;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Stream;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
 import javafx.beans.property.SimpleBooleanProperty;
 
+import org.hamcrest.Matchers;
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParserResult;
@@ -23,66 +23,113 @@
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.search.SearchQuery;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
-import org.hamcrest.Matchers;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
+import java.nio.file.Path;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
 
 class DatabaseSearcherWithBibFilesTest {
     private static final TaskExecutor TASK_EXECUTOR = new CurrentThreadTaskExecutor();
-    private static final BibEntry TITLE_SENTENCE_CASED = new BibEntry(StandardEntryType.Misc)
-            .withCitationKey("title-sentence-cased")
-            .withField(StandardField.TITLE, "Title Sentence Cased");
-    private static final BibEntry TITLE_MIXED_CASED = new BibEntry(StandardEntryType.Misc)
-            .withCitationKey("title-mixed-cased")
-            .withField(StandardField.TITLE, "TiTle MiXed CaSed");
-    private static final BibEntry TITLE_UPPER_CASED = new BibEntry(StandardEntryType.Misc)
-            .withCitationKey("title-upper-cased")
-            .withField(StandardField.TITLE, "TITLE UPPER CASED");
-
-    private static final BibEntry MINIMAL_SENTENCE_CASE = new BibEntry(StandardEntryType.Misc)
-            .withCitationKey("minimal-sentence-case")
-            .withFiles(List.of(new LinkedFile("", "minimal-sentence-case.pdf", StandardFileType.PDF.getName())));
-    private static final BibEntry MINIMAL_ALL_UPPER_CASE = new BibEntry(StandardEntryType.Misc)
-            .withCitationKey("minimal-all-upper-case")
-            .withFiles(List.of(new LinkedFile("", "minimal-all-upper-case.pdf", StandardFileType.PDF.getName())));
-    private static final BibEntry MINIMAL_MIXED_CASE = new BibEntry(StandardEntryType.Misc)
-            .withCitationKey("minimal-mixed-case")
-            .withFiles(List.of(new LinkedFile("", "minimal-mixed-case.pdf", StandardFileType.PDF.getName())));
-    private static final BibEntry MINIMAL_NOTE_SENTENCE_CASE = new BibEntry(StandardEntryType.Misc)
-            .withCitationKey("minimal-note-sentence-case")
-            .withFiles(List.of(new LinkedFile("", "minimal-note-sentence-case.pdf", StandardFileType.PDF.getName())));
-    private static final BibEntry MINIMAL_NOTE_ALL_UPPER_CASE = new BibEntry(StandardEntryType.Misc)
-            .withCitationKey("minimal-note-all-upper-case")
-            .withFiles(List.of(new LinkedFile("", "minimal-note-all-upper-case.pdf", StandardFileType.PDF.getName())));
-    private static final BibEntry MINIMAL_NOTE_MIXED_CASE = new BibEntry(StandardEntryType.Misc)
-            .withCitationKey("minimal-note-mixed-case")
-            .withFiles(List.of(new LinkedFile("", "minimal-note-mixed-case.pdf", StandardFileType.PDF.getName())));
+    private static final BibEntry TITLE_SENTENCE_CASED =
+            new BibEntry(StandardEntryType.Misc)
+                    .withCitationKey("title-sentence-cased")
+                    .withField(StandardField.TITLE, "Title Sentence Cased");
+    private static final BibEntry TITLE_MIXED_CASED =
+            new BibEntry(StandardEntryType.Misc)
+                    .withCitationKey("title-mixed-cased")
+                    .withField(StandardField.TITLE, "TiTle MiXed CaSed");
+    private static final BibEntry TITLE_UPPER_CASED =
+            new BibEntry(StandardEntryType.Misc)
+                    .withCitationKey("title-upper-cased")
+                    .withField(StandardField.TITLE, "TITLE UPPER CASED");
+
+    private static final BibEntry MINIMAL_SENTENCE_CASE =
+            new BibEntry(StandardEntryType.Misc)
+                    .withCitationKey("minimal-sentence-case")
+                    .withFiles(
+                            List.of(
+                                    new LinkedFile(
+                                            "",
+                                            "minimal-sentence-case.pdf",
+                                            StandardFileType.PDF.getName())));
+    private static final BibEntry MINIMAL_ALL_UPPER_CASE =
+            new BibEntry(StandardEntryType.Misc)
+                    .withCitationKey("minimal-all-upper-case")
+                    .withFiles(
+                            List.of(
+                                    new LinkedFile(
+                                            "",
+                                            "minimal-all-upper-case.pdf",
+                                            StandardFileType.PDF.getName())));
+    private static final BibEntry MINIMAL_MIXED_CASE =
+            new BibEntry(StandardEntryType.Misc)
+                    .withCitationKey("minimal-mixed-case")
+                    .withFiles(
+                            List.of(
+                                    new LinkedFile(
+                                            "",
+                                            "minimal-mixed-case.pdf",
+                                            StandardFileType.PDF.getName())));
+    private static final BibEntry MINIMAL_NOTE_SENTENCE_CASE =
+            new BibEntry(StandardEntryType.Misc)
+                    .withCitationKey("minimal-note-sentence-case")
+                    .withFiles(
+                            List.of(
+                                    new LinkedFile(
+                                            "",
+                                            "minimal-note-sentence-case.pdf",
+                                            StandardFileType.PDF.getName())));
+    private static final BibEntry MINIMAL_NOTE_ALL_UPPER_CASE =
+            new BibEntry(StandardEntryType.Misc)
+                    .withCitationKey("minimal-note-all-upper-case")
+                    .withFiles(
+                            List.of(
+                                    new LinkedFile(
+                                            "",
+                                            "minimal-note-all-upper-case.pdf",
+                                            StandardFileType.PDF.getName())));
+    private static final BibEntry MINIMAL_NOTE_MIXED_CASE =
+            new BibEntry(StandardEntryType.Misc)
+                    .withCitationKey("minimal-note-mixed-case")
+                    .withFiles(
+                            List.of(
+                                    new LinkedFile(
+                                            "",
+                                            "minimal-note-mixed-case.pdf",
+                                            StandardFileType.PDF.getName())));
 
     private final FilePreferences filePreferences = mock(FilePreferences.class);
 
-    @TempDir
-    private Path indexDir;
+    @TempDir private Path indexDir;
 
     private BibDatabaseContext initializeDatabaseFromPath(String testFile) throws Exception {
-        return initializeDatabaseFromPath(Path.of(Objects.requireNonNull(DatabaseSearcherWithBibFilesTest.class.getResource(testFile)).toURI()));
+        return initializeDatabaseFromPath(
+                Path.of(
+                        Objects.requireNonNull(
+                                        DatabaseSearcherWithBibFilesTest.class.getResource(
+                                                testFile))
+                                .toURI()));
     }
 
     private BibDatabaseContext initializeDatabaseFromPath(Path testFile) throws Exception {
-        ParserResult result = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor()).importDatabase(testFile);
+        ParserResult result =
+                new BibtexImporter(
+                                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                                new DummyFileUpdateMonitor())
+                        .importDatabase(testFile);
         BibDatabaseContext databaseContext = spy(result.getDatabaseContext());
         when(databaseContext.getFulltextIndexPath()).thenReturn(indexDir);
 
         when(filePreferences.shouldFulltextIndexLinkedFiles()).thenReturn(true);
-        when(filePreferences.fulltextIndexLinkedFilesProperty()).thenReturn(new SimpleBooleanProperty(true));
+        when(filePreferences.fulltextIndexLinkedFilesProperty())
+                .thenReturn(new SimpleBooleanProperty(true));
         return databaseContext;
     }
 
@@ -92,49 +139,126 @@ private static Stream<Arguments> searchLibrary() {
                 Arguments.of(List.of(), "empty.bib", "Test", EnumSet.noneOf(SearchFlags.class)),
 
                 // test-library-title-casing
-                Arguments.of(List.of(), "test-library-title-casing.bib", "NotExisting", EnumSet.noneOf(SearchFlags.class)),
-                Arguments.of(List.of(TITLE_SENTENCE_CASED, TITLE_MIXED_CASED, TITLE_UPPER_CASED), "test-library-title-casing.bib", "Title", EnumSet.noneOf(SearchFlags.class)),
-
-                Arguments.of(List.of(), "test-library-title-casing.bib", "title:NotExisting", EnumSet.noneOf(SearchFlags.class)),
-                Arguments.of(List.of(TITLE_SENTENCE_CASED, TITLE_MIXED_CASED, TITLE_UPPER_CASED), "test-library-title-casing.bib", "title:Title", EnumSet.noneOf(SearchFlags.class)),
+                Arguments.of(
+                        List.of(),
+                        "test-library-title-casing.bib",
+                        "NotExisting",
+                        EnumSet.noneOf(SearchFlags.class)),
+                Arguments.of(
+                        List.of(TITLE_SENTENCE_CASED, TITLE_MIXED_CASED, TITLE_UPPER_CASED),
+                        "test-library-title-casing.bib",
+                        "Title",
+                        EnumSet.noneOf(SearchFlags.class)),
+                Arguments.of(
+                        List.of(),
+                        "test-library-title-casing.bib",
+                        "title:NotExisting",
+                        EnumSet.noneOf(SearchFlags.class)),
+                Arguments.of(
+                        List.of(TITLE_SENTENCE_CASED, TITLE_MIXED_CASED, TITLE_UPPER_CASED),
+                        "test-library-title-casing.bib",
+                        "title:Title",
+                        EnumSet.noneOf(SearchFlags.class)),
 
-                // Arguments.of(List.of(), "test-library-title-casing.bib", "title:TiTLE", EnumSet.of(SearchFlags.CASE_SENSITIVE)),
-                // Arguments.of(List.of(titleSentenceCased), "test-library-title-casing.bib", "title:Title", EnumSet.of(SearchFlags.CASE_SENSITIVE)),
+                // Arguments.of(List.of(), "test-library-title-casing.bib", "title:TiTLE",
+                // EnumSet.of(SearchFlags.CASE_SENSITIVE)),
+                // Arguments.of(List.of(titleSentenceCased), "test-library-title-casing.bib",
+                // "title:Title", EnumSet.of(SearchFlags.CASE_SENSITIVE)),
 
-                // Arguments.of(List.of(), "test-library-title-casing.bib", "TiTLE", EnumSet.of(SearchFlags.CASE_SENSITIVE)),
-                // Arguments.of(List.of(titleMixedCased), "test-library-title-casing.bib", "TiTle", EnumSet.of(SearchFlags.CASE_SENSITIVE)),
+                // Arguments.of(List.of(), "test-library-title-casing.bib", "TiTLE",
+                // EnumSet.of(SearchFlags.CASE_SENSITIVE)),
+                // Arguments.of(List.of(titleMixedCased), "test-library-title-casing.bib", "TiTle",
+                // EnumSet.of(SearchFlags.CASE_SENSITIVE)),
 
-                // Arguments.of(List.of(), "test-library-title-casing.bib", "title:NotExisting", EnumSet.of(SearchFlags.CASE_SENSITIVE)),
-                // Arguments.of(List.of(titleMixedCased), "test-library-title-casing.bib", "title:TiTle", EnumSet.of(SearchFlags.CASE_SENSITIVE)),
+                // Arguments.of(List.of(), "test-library-title-casing.bib", "title:NotExisting",
+                // EnumSet.of(SearchFlags.CASE_SENSITIVE)),
+                // Arguments.of(List.of(titleMixedCased), "test-library-title-casing.bib",
+                // "title:TiTle", EnumSet.of(SearchFlags.CASE_SENSITIVE)),
 
-                Arguments.of(List.of(), "test-library-title-casing.bib", "/[Y]/", EnumSet.noneOf(SearchFlags.class)),
+                Arguments.of(
+                        List.of(),
+                        "test-library-title-casing.bib",
+                        "/[Y]/",
+                        EnumSet.noneOf(SearchFlags.class)),
 
                 // test-library-with-attached-files
-                Arguments.of(List.of(), "test-library-with-attached-files.bib", "NotExisting.", EnumSet.of(SearchFlags.FULLTEXT)),
-                Arguments.of(List.of(MINIMAL_SENTENCE_CASE, MINIMAL_ALL_UPPER_CASE, MINIMAL_MIXED_CASE), "test-library-with-attached-files.bib", "This is a short sentence, comma included.", EnumSet.of(SearchFlags.FULLTEXT)),
-                Arguments.of(List.of(MINIMAL_SENTENCE_CASE, MINIMAL_ALL_UPPER_CASE, MINIMAL_MIXED_CASE), "test-library-with-attached-files.bib", "comma", EnumSet.of(SearchFlags.FULLTEXT)),
+                Arguments.of(
+                        List.of(),
+                        "test-library-with-attached-files.bib",
+                        "NotExisting.",
+                        EnumSet.of(SearchFlags.FULLTEXT)),
+                Arguments.of(
+                        List.of(MINIMAL_SENTENCE_CASE, MINIMAL_ALL_UPPER_CASE, MINIMAL_MIXED_CASE),
+                        "test-library-with-attached-files.bib",
+                        "This is a short sentence, comma included.",
+                        EnumSet.of(SearchFlags.FULLTEXT)),
+                Arguments.of(
+                        List.of(MINIMAL_SENTENCE_CASE, MINIMAL_ALL_UPPER_CASE, MINIMAL_MIXED_CASE),
+                        "test-library-with-attached-files.bib",
+                        "comma",
+                        EnumSet.of(SearchFlags.FULLTEXT)),
 
                 // TODO: PDF search does not support case sensitive search (yet)
-                // Arguments.of(List.of(minimalAllUpperCase, minimalMixedCase), "test-library-with-attached-files.bib", "THIS", EnumSet.of(SearchFlags.FULLTEXT, SearchFlags.CASE_SENSITIVE)),
-                // Arguments.of(List.of(minimalAllUpperCase), "test-library-with-attached-files.bib", "THIS is a short sentence, comma included.", EnumSet.of(SearchFlags.FULLTEXT, SearchFlags.CASE_SENSITIVE)),
-                // Arguments.of(List.of(minimalSentenceCase, minimalAllUpperCase, minimalMixedCase), "test-library-with-attached-files.bib", "comma", EnumSet.of(SearchFlags.FULLTEXT, SearchFlags.CASE_SENSITIVE)),
-                // Arguments.of(List.of(minimalNoteAllUpperCase), "test-library-with-attached-files.bib", "THIS IS A SHORT SENTENCE, COMMA INCLUDED.", EnumSet.of(SearchFlags.FULLTEXT, SearchFlags.CASE_SENSITIVE)),
+                // Arguments.of(List.of(minimalAllUpperCase, minimalMixedCase),
+                // "test-library-with-attached-files.bib", "THIS", EnumSet.of(SearchFlags.FULLTEXT,
+                // SearchFlags.CASE_SENSITIVE)),
+                // Arguments.of(List.of(minimalAllUpperCase),
+                // "test-library-with-attached-files.bib", "THIS is a short sentence, comma
+                // included.", EnumSet.of(SearchFlags.FULLTEXT, SearchFlags.CASE_SENSITIVE)),
+                // Arguments.of(List.of(minimalSentenceCase, minimalAllUpperCase, minimalMixedCase),
+                // "test-library-with-attached-files.bib", "comma", EnumSet.of(SearchFlags.FULLTEXT,
+                // SearchFlags.CASE_SENSITIVE)),
+                // Arguments.of(List.of(minimalNoteAllUpperCase),
+                // "test-library-with-attached-files.bib", "THIS IS A SHORT SENTENCE, COMMA
+                // INCLUDED.", EnumSet.of(SearchFlags.FULLTEXT, SearchFlags.CASE_SENSITIVE)),
 
-                Arguments.of(List.of(), "test-library-with-attached-files.bib", "NotExisting", EnumSet.of(SearchFlags.FULLTEXT)),
-                Arguments.of(List.of(MINIMAL_NOTE_SENTENCE_CASE, MINIMAL_NOTE_ALL_UPPER_CASE, MINIMAL_NOTE_MIXED_CASE), "test-library-with-attached-files.bib", "world", EnumSet.of(SearchFlags.FULLTEXT)),
-                Arguments.of(List.of(MINIMAL_NOTE_SENTENCE_CASE, MINIMAL_NOTE_ALL_UPPER_CASE, MINIMAL_NOTE_MIXED_CASE), "test-library-with-attached-files.bib", "Hello World", EnumSet.of(SearchFlags.FULLTEXT))
+                Arguments.of(
+                        List.of(),
+                        "test-library-with-attached-files.bib",
+                        "NotExisting",
+                        EnumSet.of(SearchFlags.FULLTEXT)),
+                Arguments.of(
+                        List.of(
+                                MINIMAL_NOTE_SENTENCE_CASE,
+                                MINIMAL_NOTE_ALL_UPPER_CASE,
+                                MINIMAL_NOTE_MIXED_CASE),
+                        "test-library-with-attached-files.bib",
+                        "world",
+                        EnumSet.of(SearchFlags.FULLTEXT)),
+                Arguments.of(
+                        List.of(
+                                MINIMAL_NOTE_SENTENCE_CASE,
+                                MINIMAL_NOTE_ALL_UPPER_CASE,
+                                MINIMAL_NOTE_MIXED_CASE),
+                        "test-library-with-attached-files.bib",
+                        "Hello World",
+                        EnumSet.of(SearchFlags.FULLTEXT))
 
                 // TODO: PDF search does not support case sensitive search (yet)
-                // Arguments.of(List.of(minimalNoteAllUpperCase), "test-library-with-attached-files.bib", "HELLO WORLD", EnumSet.of(SearchFlags.FULLTEXT, SearchFlags.CASE_SENSITIVE)),
-                // Arguments.of(List.of(), "test-library-with-attached-files.bib", "NotExisting", EnumSet.of(SearchFlags.FULLTEXT, SearchFlags.CASE_SENSITIVE))
-        );
+                // Arguments.of(List.of(minimalNoteAllUpperCase),
+                // "test-library-with-attached-files.bib", "HELLO WORLD",
+                // EnumSet.of(SearchFlags.FULLTEXT, SearchFlags.CASE_SENSITIVE)),
+                // Arguments.of(List.of(), "test-library-with-attached-files.bib", "NotExisting",
+                // EnumSet.of(SearchFlags.FULLTEXT, SearchFlags.CASE_SENSITIVE))
+                );
     }
 
     @ParameterizedTest
     @MethodSource
-    void searchLibrary(List<BibEntry> expected, String testFile, String query, EnumSet<SearchFlags> searchFlags) throws Exception {
+    void searchLibrary(
+            List<BibEntry> expected,
+            String testFile,
+            String query,
+            EnumSet<SearchFlags> searchFlags)
+            throws Exception {
         BibDatabaseContext databaseContext = initializeDatabaseFromPath(testFile);
-        List<BibEntry> matches = new DatabaseSearcher(new SearchQuery(query, searchFlags), databaseContext, TASK_EXECUTOR, filePreferences).getMatches();
+        List<BibEntry> matches =
+                new DatabaseSearcher(
+                                new SearchQuery(query, searchFlags),
+                                databaseContext,
+                                TASK_EXECUTOR,
+                                filePreferences)
+                        .getMatches();
         assertThat(expected, Matchers.containsInAnyOrder(matches.toArray()));
     }
 }
diff --git a/src/test/java/org/jabref/logic/search/LuceneQueryParserTest.java b/src/test/java/org/jabref/logic/search/LuceneQueryParserTest.java
index 8d495609da4b..efa8d35c65f2 100644
--- a/src/test/java/org/jabref/logic/search/LuceneQueryParserTest.java
+++ b/src/test/java/org/jabref/logic/search/LuceneQueryParserTest.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.search;
 
-import java.util.stream.Stream;
-
-import org.jabref.model.search.SearchFieldConstants;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.queryparser.classic.QueryParser;
+import org.jabref.model.search.SearchFieldConstants;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 public class LuceneQueryParserTest {
 
@@ -25,15 +24,16 @@ public static Stream<Arguments> searchQuires() {
                 Arguments.of("any:preissinger", "\"prei{\\\\ss}inger\""),
                 Arguments.of("any:jesus", "\"jes{\\\\'{u}}s\""),
                 Arguments.of("any:breitenbucher", "\"breitenb{\\\\\\\"{u}}cher\""),
-
-                Arguments.of("groups:/exclude", "groups:\\/exclude")
-        );
+                Arguments.of("groups:/exclude", "groups:\\/exclude"));
     }
 
     @ParameterizedTest
     @MethodSource
     void searchQuires(String expected, String query) throws ParseException {
-        QueryParser parser = new QueryParser(SearchFieldConstants.DEFAULT_FIELD.toString(), SearchFieldConstants.LATEX_AWARE_ANALYZER);
+        QueryParser parser =
+                new QueryParser(
+                        SearchFieldConstants.DEFAULT_FIELD.toString(),
+                        SearchFieldConstants.LATEX_AWARE_ANALYZER);
         String result = parser.parse(query).toString();
         assertEquals(expected, result);
     }
diff --git a/src/test/java/org/jabref/logic/search/indexing/DocumentReaderTest.java b/src/test/java/org/jabref/logic/search/indexing/DocumentReaderTest.java
index a9c5465531f5..22e02cd34dd8 100644
--- a/src/test/java/org/jabref/logic/search/indexing/DocumentReaderTest.java
+++ b/src/test/java/org/jabref/logic/search/indexing/DocumentReaderTest.java
@@ -1,22 +1,23 @@
 package org.jabref.logic.search.indexing;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 public class DocumentReaderTest {
 
     private static Stream<Arguments> getLinesToMerge() {
         return Stream.of(
                 Arguments.of("Sentences end with periods.", "Sentences end\nwith periods."),
-                Arguments.of("Text is usually wrapped with hyphens.", "Text is us-\nually wrapp-\ned with hyphens."),
+                Arguments.of(
+                        "Text is usually wrapped with hyphens.",
+                        "Text is us-\nually wrapp-\ned with hyphens."),
                 Arguments.of("Longer texts often have both.", "Longer te-\nxts often\nhave both."),
-                Arguments.of("No lines to break here", "No lines to break here")
-        );
+                Arguments.of("No lines to break here", "No lines to break here"));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/search/indexing/LinkedFilesIndexerTest.java b/src/test/java/org/jabref/logic/search/indexing/LinkedFilesIndexerTest.java
index 220f53d4bf33..aa5463c82aa5 100644
--- a/src/test/java/org/jabref/logic/search/indexing/LinkedFilesIndexerTest.java
+++ b/src/test/java/org/jabref/logic/search/indexing/LinkedFilesIndexerTest.java
@@ -1,11 +1,10 @@
 package org.jabref.logic.search.indexing;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import org.apache.lucene.index.IndexReader;
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.search.LuceneIndexer;
@@ -15,16 +14,16 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import org.apache.lucene.index.IndexReader;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mockito;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 public class LinkedFilesIndexerTest {
     private final CliPreferences preferences = mock(CliPreferences.class);
@@ -38,8 +37,10 @@ void setUp(@TempDir Path indexDir) throws IOException {
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
 
         BibDatabaseContext context = mock(BibDatabaseContext.class);
-        when(context.getDatabasePath()).thenReturn(Optional.of(Path.of("src/test/resources/pdfs/")));
-        when(context.getFileDirectories(Mockito.any())).thenReturn(Collections.singletonList(Path.of("src/test/resources/pdfs")));
+        when(context.getDatabasePath())
+                .thenReturn(Optional.of(Path.of("src/test/resources/pdfs/")));
+        when(context.getFileDirectories(Mockito.any()))
+                .thenReturn(Collections.singletonList(Path.of("src/test/resources/pdfs")));
         when(context.getFulltextIndexPath()).thenReturn(indexDir);
 
         this.indexer = new DefaultLinkedFilesIndexer(context, filePreferences);
@@ -49,7 +50,12 @@ void setUp(@TempDir Path indexDir) throws IOException {
     void exampleThesisIndex() throws IOException {
         // given
         BibEntry entry = new BibEntry(StandardEntryType.PhdThesis);
-        entry.setFiles(Collections.singletonList(new LinkedFile("Example Thesis", "thesis-example.pdf", StandardFileType.PDF.getName())));
+        entry.setFiles(
+                Collections.singletonList(
+                        new LinkedFile(
+                                "Example Thesis",
+                                "thesis-example.pdf",
+                                StandardFileType.PDF.getName())));
 
         // when
         indexer.addToIndex(List.of(entry), mock(BackgroundTask.class));
@@ -65,7 +71,12 @@ void exampleThesisIndex() throws IOException {
     void dontIndexNonPdf() throws IOException {
         // given
         BibEntry entry = new BibEntry(StandardEntryType.PhdThesis);
-        entry.setFiles(Collections.singletonList(new LinkedFile("Example Thesis", "thesis-example.pdf", StandardFileType.AUX.getName())));
+        entry.setFiles(
+                Collections.singletonList(
+                        new LinkedFile(
+                                "Example Thesis",
+                                "thesis-example.pdf",
+                                StandardFileType.AUX.getName())));
 
         // when
         indexer.addToIndex(List.of(entry), mock(BackgroundTask.class));
@@ -81,7 +92,12 @@ void dontIndexNonPdf() throws IOException {
     void dontIndexOnlineLinks() throws IOException {
         // given
         BibEntry entry = new BibEntry(StandardEntryType.PhdThesis);
-        entry.setFiles(Collections.singletonList(new LinkedFile("Example Thesis", "https://raw.githubusercontent.com/JabRef/jabref/main/src/test/resources/pdfs/thesis-example.pdf", StandardFileType.PDF.getName())));
+        entry.setFiles(
+                Collections.singletonList(
+                        new LinkedFile(
+                                "Example Thesis",
+                                "https://raw.githubusercontent.com/JabRef/jabref/main/src/test/resources/pdfs/thesis-example.pdf",
+                                StandardFileType.PDF.getName())));
 
         // when
         indexer.addToIndex(List.of(entry), mock(BackgroundTask.class));
@@ -98,7 +114,12 @@ void exampleThesisIndexWithKey() throws IOException {
         // given
         BibEntry entry = new BibEntry(StandardEntryType.PhdThesis);
         entry.setCitationKey("Example2017");
-        entry.setFiles(Collections.singletonList(new LinkedFile("Example Thesis", "thesis-example.pdf", StandardFileType.PDF.getName())));
+        entry.setFiles(
+                Collections.singletonList(
+                        new LinkedFile(
+                                "Example Thesis",
+                                "thesis-example.pdf",
+                                StandardFileType.PDF.getName())));
 
         // when
         indexer.addToIndex(List.of(entry), mock(BackgroundTask.class));
@@ -114,7 +135,10 @@ void exampleThesisIndexWithKey() throws IOException {
     void metaDataIndex() throws IOException {
         // given
         BibEntry entry = new BibEntry(StandardEntryType.Article);
-        entry.setFiles(Collections.singletonList(new LinkedFile("Example Thesis", "metaData.pdf", StandardFileType.PDF.getName())));
+        entry.setFiles(
+                Collections.singletonList(
+                        new LinkedFile(
+                                "Example Thesis", "metaData.pdf", StandardFileType.PDF.getName())));
 
         // when
         indexer.addToIndex(List.of(entry), mock(BackgroundTask.class));
@@ -131,7 +155,12 @@ void exampleThesisIndexAppendMetaData() throws IOException {
         // given
         BibEntry exampleThesis = new BibEntry(StandardEntryType.PhdThesis);
         exampleThesis.setCitationKey("ExampleThesis2017");
-        exampleThesis.setFiles(Collections.singletonList(new LinkedFile("Example Thesis", "thesis-example.pdf", StandardFileType.PDF.getName())));
+        exampleThesis.setFiles(
+                Collections.singletonList(
+                        new LinkedFile(
+                                "Example Thesis",
+                                "thesis-example.pdf",
+                                StandardFileType.PDF.getName())));
 
         // when
         indexer.addToIndex(List.of(exampleThesis), mock(BackgroundTask.class));
@@ -144,7 +173,10 @@ void exampleThesisIndexAppendMetaData() throws IOException {
 
         BibEntry metadata = new BibEntry(StandardEntryType.Article);
         metadata.setCitationKey("MetaData2017");
-        metadata.setFiles(Collections.singletonList(new LinkedFile("Metadata file", "metaData.pdf", StandardFileType.PDF.getName())));
+        metadata.setFiles(
+                Collections.singletonList(
+                        new LinkedFile(
+                                "Metadata file", "metaData.pdf", StandardFileType.PDF.getName())));
 
         // when
         indexer.addToIndex(List.of(metadata), mock(BackgroundTask.class));
@@ -161,7 +193,12 @@ public void flushIndex() throws IOException {
         // given
         BibEntry entry = new BibEntry(StandardEntryType.PhdThesis);
         entry.setCitationKey("Example2017");
-        entry.setFiles(Collections.singletonList(new LinkedFile("Example Thesis", "thesis-example.pdf", StandardFileType.PDF.getName())));
+        entry.setFiles(
+                Collections.singletonList(
+                        new LinkedFile(
+                                "Example Thesis",
+                                "thesis-example.pdf",
+                                StandardFileType.PDF.getName())));
 
         indexer.addToIndex(List.of(entry), mock(BackgroundTask.class));
 
diff --git a/src/test/java/org/jabref/logic/shared/ConnectorTest.java b/src/test/java/org/jabref/logic/shared/ConnectorTest.java
index fabcf68b1b10..cfefa728e457 100644
--- a/src/test/java/org/jabref/logic/shared/ConnectorTest.java
+++ b/src/test/java/org/jabref/logic/shared/ConnectorTest.java
@@ -1,17 +1,18 @@
 package org.jabref.logic.shared;
 
-import java.sql.SQLException;
-
 import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
 import org.jabref.testutils.category.DatabaseTest;
 
+import java.sql.SQLException;
+
 /**
  * Stores the credentials for the test systems
  */
 @DatabaseTest
 public class ConnectorTest {
 
-    public static DBMSConnection getTestDBMSConnection(DBMSType dbmsType) throws SQLException, InvalidDBMSConnectionPropertiesException {
+    public static DBMSConnection getTestDBMSConnection(DBMSType dbmsType)
+            throws SQLException, InvalidDBMSConnectionPropertiesException {
         DBMSConnectionProperties properties = getTestConnectionProperties(dbmsType);
         return new DBMSConnection(properties);
     }
@@ -19,11 +20,36 @@ public static DBMSConnection getTestDBMSConnection(DBMSType dbmsType) throws SQL
     public static DBMSConnectionProperties getTestConnectionProperties(DBMSType dbmsType) {
         switch (dbmsType) {
             case MYSQL:
-                return new DBMSConnectionPropertiesBuilder().setType(dbmsType).setHost("127.0.0.1").setPort(3800).setDatabase("jabref").setUser("root").setPassword("root").setUseSSL(false).setAllowPublicKeyRetrieval(true).createDBMSConnectionProperties();
+                return new DBMSConnectionPropertiesBuilder()
+                        .setType(dbmsType)
+                        .setHost("127.0.0.1")
+                        .setPort(3800)
+                        .setDatabase("jabref")
+                        .setUser("root")
+                        .setPassword("root")
+                        .setUseSSL(false)
+                        .setAllowPublicKeyRetrieval(true)
+                        .createDBMSConnectionProperties();
             case POSTGRESQL:
-                return new DBMSConnectionPropertiesBuilder().setType(dbmsType).setHost("localhost").setPort(dbmsType.getDefaultPort()).setDatabase("postgres").setUser("postgres").setPassword("postgres").setUseSSL(false).createDBMSConnectionProperties();
+                return new DBMSConnectionPropertiesBuilder()
+                        .setType(dbmsType)
+                        .setHost("localhost")
+                        .setPort(dbmsType.getDefaultPort())
+                        .setDatabase("postgres")
+                        .setUser("postgres")
+                        .setPassword("postgres")
+                        .setUseSSL(false)
+                        .createDBMSConnectionProperties();
             case ORACLE:
-                return new DBMSConnectionPropertiesBuilder().setType(dbmsType).setHost("localhost").setPort(32118).setDatabase("jabref").setUser("jabref").setPassword("jabref").setUseSSL(false).createDBMSConnectionProperties();
+                return new DBMSConnectionPropertiesBuilder()
+                        .setType(dbmsType)
+                        .setHost("localhost")
+                        .setPort(32118)
+                        .setDatabase("jabref")
+                        .setUser("jabref")
+                        .setPassword("jabref")
+                        .setUseSSL(false)
+                        .createDBMSConnectionProperties();
             default:
                 return new DBMSConnectionPropertiesBuilder().createDBMSConnectionProperties();
         }
diff --git a/src/test/java/org/jabref/logic/shared/DBMSConnectionPropertiesTest.java b/src/test/java/org/jabref/logic/shared/DBMSConnectionPropertiesTest.java
index 5f7e6e983b86..09c3eebe5dbb 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSConnectionPropertiesTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSConnectionPropertiesTest.java
@@ -1,20 +1,41 @@
 package org.jabref.logic.shared;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 class DBMSConnectionPropertiesTest {
 
     @Test
     void urlForMySqlDoesNotIncludeSslConfig() {
-        DBMSConnectionProperties connectionProperties = new DBMSConnectionPropertiesBuilder().setType(DBMSType.MYSQL).setHost("localhost").setPort(3108).setDatabase("jabref").setUser("user").setPassword("password").setUseSSL(false).setAllowPublicKeyRetrieval(true).setServerTimezone("").createDBMSConnectionProperties();
+        DBMSConnectionProperties connectionProperties =
+                new DBMSConnectionPropertiesBuilder()
+                        .setType(DBMSType.MYSQL)
+                        .setHost("localhost")
+                        .setPort(3108)
+                        .setDatabase("jabref")
+                        .setUser("user")
+                        .setPassword("password")
+                        .setUseSSL(false)
+                        .setAllowPublicKeyRetrieval(true)
+                        .setServerTimezone("")
+                        .createDBMSConnectionProperties();
         assertEquals("jdbc:mariadb://localhost:3108/jabref", connectionProperties.getUrl());
     }
 
     @Test
     void urlForOracle() {
-        DBMSConnectionProperties connectionProperties = new DBMSConnectionPropertiesBuilder().setType(DBMSType.ORACLE).setHost("localhost").setPort(3108).setDatabase("jabref").setUser("user").setPassword("password").setUseSSL(false).setServerTimezone("").createDBMSConnectionProperties();
+        DBMSConnectionProperties connectionProperties =
+                new DBMSConnectionPropertiesBuilder()
+                        .setType(DBMSType.ORACLE)
+                        .setHost("localhost")
+                        .setPort(3108)
+                        .setDatabase("jabref")
+                        .setUser("user")
+                        .setPassword("password")
+                        .setUseSSL(false)
+                        .setServerTimezone("")
+                        .createDBMSConnectionProperties();
         assertEquals("jdbc:oracle:thin:@localhost:3108/jabref", connectionProperties.getUrl());
     }
 }
diff --git a/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java b/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
index 717403a9960b..3adf723a4c10 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
@@ -1,13 +1,12 @@
 package org.jabref.logic.shared;
 
-import java.sql.SQLException;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.jabref.testutils.category.DatabaseTest;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.sql.SQLException;
 
 @DatabaseTest
 class DBMSConnectionTest {
@@ -15,18 +14,20 @@ class DBMSConnectionTest {
     @ParameterizedTest
     @EnumSource(DBMSType.class)
     void getConnectionFailsWhenconnectingToInvalidHost(DBMSType dbmsType) {
-        assertThrows(SQLException.class,
-                () -> new DBMSConnection(
-                        new DBMSConnectionPropertiesBuilder()
-                                .setType(dbmsType)
-                                .setHost("XXXX")
-                                .setPort(33778)
-                                .setDatabase("XXXX")
-                                .setUser("XXXX")
-                                .setPassword("XXXX")
-                                .setUseSSL(false)
-                                .setServerTimezone("XXXX")
-                                .createDBMSConnectionProperties())
-                        .getConnection());
+        assertThrows(
+                SQLException.class,
+                () ->
+                        new DBMSConnection(
+                                        new DBMSConnectionPropertiesBuilder()
+                                                .setType(dbmsType)
+                                                .setHost("XXXX")
+                                                .setPort(33778)
+                                                .setDatabase("XXXX")
+                                                .setUser("XXXX")
+                                                .setPassword("XXXX")
+                                                .setUseSSL(false)
+                                                .setServerTimezone("XXXX")
+                                                .createDBMSConnectionProperties())
+                                .getConnection());
     }
 }
diff --git a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
index 8f0b4625daac..ec5a6d6d20c6 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
@@ -1,15 +1,11 @@
 package org.jabref.logic.shared;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import org.jabref.logic.shared.exception.OfflineLockException;
 import org.jabref.model.entry.BibEntry;
@@ -18,19 +14,22 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.DatabaseTest;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 @DatabaseTest
 @Execution(ExecutionMode.SAME_THREAD)
@@ -44,7 +43,8 @@ class DBMSProcessorTest {
     void setup() throws Exception {
         this.dbmsType = TestManager.getDBMSTypeTestParameter();
         this.dbmsConnection = ConnectorTest.getTestDBMSConnection(dbmsType);
-        this.dbmsProcessor = DBMSProcessor.getProcessorInstance(ConnectorTest.getTestDBMSConnection(dbmsType));
+        this.dbmsProcessor =
+                DBMSProcessor.getProcessorInstance(ConnectorTest.getTestDBMSConnection(dbmsType));
         TestManager.clearTables(this.dbmsConnection);
         dbmsProcessor.setupSharedDatabase();
     }
@@ -86,12 +86,17 @@ void insertEntry() throws SQLException {
 
             try (ResultSet fieldResultSet = selectFrom("FIELD", dbmsConnection, dbmsProcessor)) {
                 while (fieldResultSet.next()) {
-                    actualFieldMap.put(fieldResultSet.getString("NAME"), fieldResultSet.getString("VALUE"));
+                    actualFieldMap.put(
+                            fieldResultSet.getString("NAME"), fieldResultSet.getString("VALUE"));
                 }
             }
         }
 
-        Map<String, String> expectedFieldMap = expectedEntry.getFieldMap().entrySet().stream().collect(Collectors.toMap(entry -> entry.getKey().getName(), Map.Entry::getValue));
+        Map<String, String> expectedFieldMap =
+                expectedEntry.getFieldMap().entrySet().stream()
+                        .collect(
+                                Collectors.toMap(
+                                        entry -> entry.getKey().getName(), Map.Entry::getValue));
 
         assertEquals(expectedFieldMap, actualFieldMap);
     }
@@ -118,9 +123,15 @@ void insertEntryWithEmptyFields() throws SQLException {
 
     private static BibEntry getBibEntryExample() {
         return new BibEntry(StandardEntryType.InProceedings)
-                .withField(StandardField.AUTHOR, "Wirthlin, Michael J and Hutchings, Brad L and Gilson, Kent L")
-                .withField(StandardField.TITLE, "The nano processor: a low resource reconfigurable processor")
-                .withField(StandardField.BOOKTITLE, "FPGAs for Custom Computing Machines, 1994. Proceedings. IEEE Workshop on")
+                .withField(
+                        StandardField.AUTHOR,
+                        "Wirthlin, Michael J and Hutchings, Brad L and Gilson, Kent L")
+                .withField(
+                        StandardField.TITLE,
+                        "The nano processor: a low resource reconfigurable processor")
+                .withField(
+                        StandardField.BOOKTITLE,
+                        "FPGAs for Custom Computing Machines, 1994. Proceedings. IEEE Workshop on")
                 .withField(StandardField.YEAR, "1994")
                 .withCitationKey("nanoproc1994");
     }
@@ -136,7 +147,8 @@ void updateEntry() throws Exception {
         expectedEntry.clearField(StandardField.BOOKTITLE);
         dbmsProcessor.updateEntry(expectedEntry);
 
-        Optional<BibEntry> actualEntry = dbmsProcessor.getSharedEntry(expectedEntry.getSharedBibEntryData().getSharedID());
+        Optional<BibEntry> actualEntry =
+                dbmsProcessor.getSharedEntry(expectedEntry.getSharedBibEntryData().getSharedID());
         assertEquals(Optional.of(expectedEntry), actualEntry);
     }
 
@@ -150,7 +162,8 @@ void updateEmptyEntry() throws Exception {
         // Update field should now find the entry
         dbmsProcessor.updateEntry(expectedEntry);
 
-        Optional<BibEntry> actualEntry = dbmsProcessor.getSharedEntry(expectedEntry.getSharedBibEntryData().getSharedID());
+        Optional<BibEntry> actualEntry =
+                dbmsProcessor.getSharedEntry(expectedEntry.getSharedBibEntryData().getSharedID());
         assertEquals(Optional.of(expectedEntry), actualEntry);
     }
 
@@ -191,8 +204,9 @@ void updateEqualEntry() throws OfflineLockException, SQLException {
         expectedBibEntry.getSharedBibEntryData().setVersion(0);
         dbmsProcessor.updateEntry(expectedBibEntry);
 
-        Optional<BibEntry> actualBibEntryOptional = dbmsProcessor
-                .getSharedEntry(expectedBibEntry.getSharedBibEntryData().getSharedID());
+        Optional<BibEntry> actualBibEntryOptional =
+                dbmsProcessor.getSharedEntry(
+                        expectedBibEntry.getSharedBibEntryData().getSharedID());
 
         assertEquals(Optional.of(expectedBibEntry), actualBibEntryOptional);
     }
@@ -274,7 +288,9 @@ void getSharedEntry() {
 
         dbmsProcessor.insertEntry(expectedBibEntry);
 
-        Optional<BibEntry> actualBibEntryOptional = dbmsProcessor.getSharedEntry(expectedBibEntry.getSharedBibEntryData().getSharedID());
+        Optional<BibEntry> actualBibEntryOptional =
+                dbmsProcessor.getSharedEntry(
+                        expectedBibEntry.getSharedBibEntryData().getSharedID());
 
         assertEquals(Optional.of(expectedBibEntry), actualBibEntryOptional);
     }
@@ -307,8 +323,16 @@ void getSharedIDVersionMapping() throws OfflineLockException, SQLException {
     void getSharedMetaData() {
         insertMetaData("databaseType", "bibtex;", dbmsConnection, dbmsProcessor);
         insertMetaData("protectedFlag", "true;", dbmsConnection, dbmsProcessor);
-        insertMetaData("saveActions", "enabled;\nauthor[capitalize,html_to_latex]\ntitle[title_case]\n;", dbmsConnection, dbmsProcessor);
-        insertMetaData("saveOrderConfig", "specified;author;false;title;false;year;true;", dbmsConnection, dbmsProcessor);
+        insertMetaData(
+                "saveActions",
+                "enabled;\nauthor[capitalize,html_to_latex]\ntitle[title_case]\n;",
+                dbmsConnection,
+                dbmsProcessor);
+        insertMetaData(
+                "saveOrderConfig",
+                "specified;author;false;title;false;year;true;",
+                dbmsConnection,
+                dbmsProcessor);
         insertMetaData("VersionDBStructure", "1", dbmsConnection, dbmsProcessor);
 
         Map<String, String> expectedMetaData = getMetaDataExample();
@@ -332,7 +356,8 @@ private static Map<String, String> getMetaDataExample() {
 
         expectedMetaData.put("databaseType", "bibtex;");
         expectedMetaData.put("protectedFlag", "true;");
-        expectedMetaData.put("saveActions", "enabled;\nauthor[capitalize,html_to_latex]\ntitle[title_case]\n;");
+        expectedMetaData.put(
+                "saveActions", "enabled;\nauthor[capitalize,html_to_latex]\ntitle[title_case]\n;");
         expectedMetaData.put("saveOrderConfig", "specified;author;false;title;false;year;true;");
         expectedMetaData.put("VersionDBStructure", "1");
 
@@ -340,10 +365,11 @@ private static Map<String, String> getMetaDataExample() {
     }
 
     private static BibEntry getBibEntryExampleWithEmptyFields() {
-        BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.AUTHOR, "Author")
-                .withField(StandardField.TITLE, "")
-                .withField(StandardField.YEAR, "");
+        BibEntry bibEntry =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "Author")
+                        .withField(StandardField.TITLE, "")
+                        .withField(StandardField.YEAR, "");
         bibEntry.getSharedBibEntryData().setSharedID(1);
         return bibEntry;
     }
@@ -370,8 +396,10 @@ private static BibEntry getBibEntryExample3() {
     void insertMultipleEntries() throws SQLException {
         List<BibEntry> entries = new ArrayList<>();
         for (int i = 0; i < 5; i++) {
-            entries.add(new BibEntry(StandardEntryType.Article).withField(StandardField.JOURNAL, "journal " + i)
-                                                               .withField(StandardField.ISSUE, Integer.toString(i)));
+            entries.add(
+                    new BibEntry(StandardEntryType.Article)
+                            .withField(StandardField.JOURNAL, "journal " + i)
+                            .withField(StandardField.ISSUE, Integer.toString(i)));
         }
         entries.get(3).setType(StandardEntryType.Thesis);
         dbmsProcessor.insertEntries(entries);
@@ -404,29 +432,47 @@ void insertMultipleEntries() throws SQLException {
             try (ResultSet fieldResultSet = selectFrom("FIELD", dbmsConnection, dbmsProcessor)) {
                 while (fieldResultSet.next()) {
                     if (actualFieldMap.containsKey(fieldResultSet.getInt("ENTRY_SHARED_ID"))) {
-                        actualFieldMap.get(fieldResultSet.getInt("ENTRY_SHARED_ID")).put(
-                                fieldResultSet.getString("NAME"), fieldResultSet.getString("VALUE"));
+                        actualFieldMap
+                                .get(fieldResultSet.getInt("ENTRY_SHARED_ID"))
+                                .put(
+                                        fieldResultSet.getString("NAME"),
+                                        fieldResultSet.getString("VALUE"));
                     } else {
                         int sharedId = fieldResultSet.getInt("ENTRY_SHARED_ID");
-                        actualFieldMap.put(sharedId,
-                                new HashMap<>());
-                        actualFieldMap.get(sharedId).put(fieldResultSet.getString("NAME"),
-                                fieldResultSet.getString("VALUE"));
+                        actualFieldMap.put(sharedId, new HashMap<>());
+                        actualFieldMap
+                                .get(sharedId)
+                                .put(
+                                        fieldResultSet.getString("NAME"),
+                                        fieldResultSet.getString("VALUE"));
                     }
                 }
             }
         }
-        Map<Integer, Map<String, String>> expectedFieldMap = entries.stream()
-                                                                    .collect(Collectors.toMap(bibEntry -> bibEntry.getSharedBibEntryData().getSharedID(),
-                                                                            bibEntry -> bibEntry.getFieldMap().entrySet().stream()
-                                                                                                  .collect(Collectors.toMap(entry -> entry.getKey().getName(), Map.Entry::getValue))));
+        Map<Integer, Map<String, String>> expectedFieldMap =
+                entries.stream()
+                        .collect(
+                                Collectors.toMap(
+                                        bibEntry -> bibEntry.getSharedBibEntryData().getSharedID(),
+                                        bibEntry ->
+                                                bibEntry.getFieldMap().entrySet().stream()
+                                                        .collect(
+                                                                Collectors.toMap(
+                                                                        entry ->
+                                                                                entry.getKey()
+                                                                                        .getName(),
+                                                                        Map.Entry::getValue))));
 
         assertEquals(expectedFieldMap, actualFieldMap);
     }
 
-    private ResultSet selectFrom(String table, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) {
+    private ResultSet selectFrom(
+            String table, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) {
         try {
-            return dbmsConnection.getConnection().createStatement().executeQuery("SELECT * FROM " + escape_Table(table, dbmsProcessor));
+            return dbmsConnection
+                    .getConnection()
+                    .createStatement()
+                    .executeQuery("SELECT * FROM " + escape_Table(table, dbmsProcessor));
         } catch (SQLException e) {
             fail(e.getMessage());
             return null;
@@ -435,12 +481,26 @@ private ResultSet selectFrom(String table, DBMSConnection dbmsConnection, DBMSPr
 
     // Oracle does not support multiple tuple insertion in one INSERT INTO command.
     // Therefore this function was defined to improve the readability and to keep the code short.
-    private void insertMetaData(String key, String value, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) {
-        assertDoesNotThrow(() -> {
-            dbmsConnection.getConnection().createStatement().executeUpdate("INSERT INTO " + escape_Table("METADATA", dbmsProcessor) + "("
-                    + escape("KEY", dbmsProcessor) + ", " + escape("VALUE", dbmsProcessor) + ") VALUES("
-                    + escapeValue(key) + ", " + escapeValue(value) + ")");
-        });
+    private void insertMetaData(
+            String key, String value, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) {
+        assertDoesNotThrow(
+                () -> {
+                    dbmsConnection
+                            .getConnection()
+                            .createStatement()
+                            .executeUpdate(
+                                    "INSERT INTO "
+                                            + escape_Table("METADATA", dbmsProcessor)
+                                            + "("
+                                            + escape("KEY", dbmsProcessor)
+                                            + ", "
+                                            + escape("VALUE", dbmsProcessor)
+                                            + ") VALUES("
+                                            + escapeValue(key)
+                                            + ", "
+                                            + escapeValue(value)
+                                            + ")");
+                });
     }
 
     private static String escape(String expression, DBMSProcessor dbmsProcessor) {
diff --git a/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java b/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java
index 5983b345ade1..0ba687a26c46 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.shared;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -24,17 +24,16 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.testutils.category.DatabaseTest;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 @DatabaseTest
 @Execution(ExecutionMode.SAME_THREAD)
@@ -42,15 +41,17 @@ class DBMSSynchronizerTest {
 
     private DBMSSynchronizer dbmsSynchronizer;
     private BibDatabase bibDatabase;
-    private final GlobalCitationKeyPatterns pattern = GlobalCitationKeyPatterns.fromPattern("[auth][year]");
+    private final GlobalCitationKeyPatterns pattern =
+            GlobalCitationKeyPatterns.fromPattern("[auth][year]");
     private DBMSConnection dbmsConnection;
     private DBMSProcessor dbmsProcessor;
     private DBMSType dbmsType;
 
     private BibEntry createExampleBibEntry(int index) {
-        BibEntry bibEntry = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.AUTHOR, "Wirthlin, Michael J" + index)
-                .withField(StandardField.TITLE, "The nano processor" + index);
+        BibEntry bibEntry =
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.AUTHOR, "Wirthlin, Michael J" + index)
+                        .withField(StandardField.TITLE, "The nano processor" + index);
         bibEntry.getSharedBibEntryData().setSharedID(index);
         return bibEntry;
     }
@@ -67,9 +68,12 @@ void setup() throws Exception {
         BibDatabaseContext context = new BibDatabaseContext(bibDatabase);
 
         FieldPreferences fieldPreferences = mock(FieldPreferences.class);
-        when(fieldPreferences.getNonWrappableFields()).thenReturn(FXCollections.observableArrayList());
+        when(fieldPreferences.getNonWrappableFields())
+                .thenReturn(FXCollections.observableArrayList());
 
-        dbmsSynchronizer = new DBMSSynchronizer(context, ',', fieldPreferences, pattern, new DummyFileUpdateMonitor());
+        dbmsSynchronizer =
+                new DBMSSynchronizer(
+                        context, ',', fieldPreferences, pattern, new DummyFileUpdateMonitor());
         bibDatabase.registerListener(dbmsSynchronizer);
 
         dbmsSynchronizer.openSharedDatabase(dbmsConnection);
@@ -115,12 +119,13 @@ void oneLocalAndOneSharedFieldChangeIsSynchronizedCorrectly() throws Exception {
         bibDatabase.insertEntry(exampleBibEntry);
         exampleBibEntry.setField(StandardField.AUTHOR, "Brad L and Gilson");
         // shared updates are not synchronized back to the remote database
-        exampleBibEntry.setField(StandardField.TITLE, "The micro multiplexer", EntriesEventSource.SHARED);
+        exampleBibEntry.setField(
+                StandardField.TITLE, "The micro multiplexer", EntriesEventSource.SHARED);
 
         List<BibEntry> actualEntries = dbmsProcessor.getSharedEntries();
 
-        BibEntry expectedBibEntry = createExampleBibEntry(1)
-                .withField(StandardField.AUTHOR, "Brad L and Gilson");
+        BibEntry expectedBibEntry =
+                createExampleBibEntry(1).withField(StandardField.AUTHOR, "Brad L and Gilson");
 
         assertEquals(Collections.singletonList(expectedBibEntry), actualEntries);
     }
@@ -154,7 +159,8 @@ void metaDataChangedEventListener() throws Exception {
         dbmsSynchronizer.setMetaData(testMetaData);
         testMetaData.setMode(BibDatabaseMode.BIBTEX);
 
-        Map<String, String> expectedMap = MetaDataSerializer.getSerializedStringMap(testMetaData, pattern);
+        Map<String, String> expectedMap =
+                MetaDataSerializer.getSerializedStringMap(testMetaData, pattern);
         Map<String, String> actualMap = dbmsProcessor.getSharedMetaData();
         actualMap.remove("VersionDBStructure");
 
@@ -171,7 +177,8 @@ void initializeDatabases() throws Exception {
 
     @Test
     void synchronizeLocalDatabaseWithEntryRemoval() throws Exception {
-        List<BibEntry> expectedBibEntries = Arrays.asList(createExampleBibEntry(1), createExampleBibEntry(2));
+        List<BibEntry> expectedBibEntries =
+                Arrays.asList(createExampleBibEntry(1), createExampleBibEntry(2));
 
         dbmsProcessor.insertEntry(expectedBibEntries.getFirst());
         dbmsProcessor.insertEntry(expectedBibEntries.get(1));
@@ -197,8 +204,8 @@ void synchronizeLocalDatabaseWithEntryUpdate() throws Exception {
         bibDatabase.insertEntry(bibEntry);
         assertEquals(List.of(bibEntry), bibDatabase.getEntries());
 
-        BibEntry modifiedBibEntry = createExampleBibEntry(1)
-                .withField(new UnknownField("custom"), "custom value");
+        BibEntry modifiedBibEntry =
+                createExampleBibEntry(1).withField(new UnknownField("custom"), "custom value");
         modifiedBibEntry.clearField(StandardField.TITLE);
         modifiedBibEntry.setType(StandardEntryType.Article);
 
@@ -216,8 +223,8 @@ void updateEntryDoesNotModifyLocalDatabase() throws Exception {
         bibDatabase.insertEntry(bibEntry);
         assertEquals(List.of(bibEntry), bibDatabase.getEntries());
 
-        BibEntry modifiedBibEntry = createExampleBibEntry(1)
-                .withField(new UnknownField("custom"), "custom value");
+        BibEntry modifiedBibEntry =
+                createExampleBibEntry(1).withField(new UnknownField("custom"), "custom value");
         modifiedBibEntry.clearField(StandardField.TITLE);
         modifiedBibEntry.setType(StandardEntryType.Article);
 
@@ -233,7 +240,12 @@ void applyMetaData() throws Exception {
         bibDatabase.insertEntry(bibEntry);
 
         MetaData testMetaData = new MetaData();
-        testMetaData.setSaveActions(new FieldFormatterCleanups(true, Collections.singletonList(new FieldFormatterCleanup(StandardField.AUTHOR, new LowerCaseFormatter()))));
+        testMetaData.setSaveActions(
+                new FieldFormatterCleanups(
+                        true,
+                        Collections.singletonList(
+                                new FieldFormatterCleanup(
+                                        StandardField.AUTHOR, new LowerCaseFormatter()))));
         dbmsSynchronizer.setMetaData(testMetaData);
 
         dbmsSynchronizer.applyMetaData();
diff --git a/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java b/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java
index 04abaf58939e..79b776154343 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java
@@ -1,13 +1,12 @@
 package org.jabref.logic.shared;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import org.jabref.testutils.category.DatabaseTest;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import java.util.Optional;
 
 @DatabaseTest
 class DBMSTypeTest {
@@ -89,17 +88,22 @@ void fromStringFromInvalidStringReturnsOptionalEmpty() {
 
     @Test
     void getUrlForMysqlHasCorrectFormat() {
-        assertEquals("jdbc:mariadb://localhost:3306/xe", DBMSType.MYSQL.getUrl("localhost", 3306, "xe"));
+        assertEquals(
+                "jdbc:mariadb://localhost:3306/xe", DBMSType.MYSQL.getUrl("localhost", 3306, "xe"));
     }
 
     @Test
     void getUrlForOracleHasCorrectFormat() {
-        assertEquals("jdbc:oracle:thin:@localhost:1521/xe", DBMSType.ORACLE.getUrl("localhost", 1521, "xe"));
+        assertEquals(
+                "jdbc:oracle:thin:@localhost:1521/xe",
+                DBMSType.ORACLE.getUrl("localhost", 1521, "xe"));
     }
 
     @Test
     void getUrlForPostgresHasCorrectFormat() {
-        assertEquals("jdbc:postgresql://localhost:5432/xe", DBMSType.POSTGRESQL.getUrl("localhost", 5432, "xe"));
+        assertEquals(
+                "jdbc:postgresql://localhost:5432/xe",
+                DBMSType.POSTGRESQL.getUrl("localhost", 5432, "xe"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/shared/SynchronizationEventListenerTest.java b/src/test/java/org/jabref/logic/shared/SynchronizationEventListenerTest.java
index 2846bb6688ab..e4730b7b2bb8 100644
--- a/src/test/java/org/jabref/logic/shared/SynchronizationEventListenerTest.java
+++ b/src/test/java/org/jabref/logic/shared/SynchronizationEventListenerTest.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.shared;
 
+import com.google.common.eventbus.Subscribe;
+
 import org.jabref.logic.shared.event.SharedEntriesNotPresentEvent;
 import org.jabref.logic.shared.event.UpdateRefusedEvent;
 import org.jabref.testutils.category.DatabaseTest;
 
-import com.google.common.eventbus.Subscribe;
-
 @DatabaseTest
 public class SynchronizationEventListenerTest {
 
diff --git a/src/test/java/org/jabref/logic/shared/SynchronizationSimulatorTest.java b/src/test/java/org/jabref/logic/shared/SynchronizationSimulatorTest.java
index 2558cbdb85ff..a7e6084d497b 100644
--- a/src/test/java/org/jabref/logic/shared/SynchronizationSimulatorTest.java
+++ b/src/test/java/org/jabref/logic/shared/SynchronizationSimulatorTest.java
@@ -1,7 +1,12 @@
 package org.jabref.logic.shared;
 
-import java.sql.SQLException;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import javafx.collections.FXCollections;
 
@@ -14,20 +19,14 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.testutils.category.DatabaseTest;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.sql.SQLException;
+import java.util.List;
 
 @DatabaseTest
 @Execution(ExecutionMode.SAME_THREAD)
@@ -36,35 +35,61 @@ class SynchronizationSimulatorTest {
     private BibDatabaseContext clientContextA;
     private BibDatabaseContext clientContextB;
     private SynchronizationEventListenerTest eventListenerB; // used to monitor occurring events
-    private final GlobalCitationKeyPatterns pattern = GlobalCitationKeyPatterns.fromPattern("[auth][year]");
+    private final GlobalCitationKeyPatterns pattern =
+            GlobalCitationKeyPatterns.fromPattern("[auth][year]");
 
     private BibEntry getBibEntryExample(int index) {
         return new BibEntry(StandardEntryType.InProceedings)
-                .withField(StandardField.AUTHOR, "Wirthlin, Michael J and Hutchings, Brad L and Gilson, Kent L " + index)
-                .withField(StandardField.TITLE, "The nano processor: a low resource reconfigurable processor " + index)
-                .withField(StandardField.BOOKTITLE, "FPGAs for Custom Computing Machines, 1994. Proceedings. IEEE Workshop on " + index)
+                .withField(
+                        StandardField.AUTHOR,
+                        "Wirthlin, Michael J and Hutchings, Brad L and Gilson, Kent L " + index)
+                .withField(
+                        StandardField.TITLE,
+                        "The nano processor: a low resource reconfigurable processor " + index)
+                .withField(
+                        StandardField.BOOKTITLE,
+                        "FPGAs for Custom Computing Machines, 1994. Proceedings. IEEE Workshop on "
+                                + index)
                 .withField(StandardField.YEAR, "199" + index)
                 .withCitationKey("nanoproc199" + index);
     }
 
     @BeforeEach
     void setup() throws Exception {
-        DBMSConnection dbmsConnection = ConnectorTest.getTestDBMSConnection(TestManager.getDBMSTypeTestParameter());
+        DBMSConnection dbmsConnection =
+                ConnectorTest.getTestDBMSConnection(TestManager.getDBMSTypeTestParameter());
         TestManager.clearTables(dbmsConnection);
 
         FieldPreferences fieldPreferences = mock(FieldPreferences.class);
-        when(fieldPreferences.getNonWrappableFields()).thenReturn(FXCollections.observableArrayList());
+        when(fieldPreferences.getNonWrappableFields())
+                .thenReturn(FXCollections.observableArrayList());
 
         clientContextA = new BibDatabaseContext();
-        DBMSSynchronizer synchronizerA = new DBMSSynchronizer(clientContextA, ',', fieldPreferences, pattern, new DummyFileUpdateMonitor());
+        DBMSSynchronizer synchronizerA =
+                new DBMSSynchronizer(
+                        clientContextA,
+                        ',',
+                        fieldPreferences,
+                        pattern,
+                        new DummyFileUpdateMonitor());
         clientContextA.convertToSharedDatabase(synchronizerA);
         clientContextA.getDBMSSynchronizer().openSharedDatabase(dbmsConnection);
 
         clientContextB = new BibDatabaseContext();
-        DBMSSynchronizer synchronizerB = new DBMSSynchronizer(clientContextB, ',', fieldPreferences, pattern, new DummyFileUpdateMonitor());
+        DBMSSynchronizer synchronizerB =
+                new DBMSSynchronizer(
+                        clientContextB,
+                        ',',
+                        fieldPreferences,
+                        pattern,
+                        new DummyFileUpdateMonitor());
         clientContextB.convertToSharedDatabase(synchronizerB);
         // use a second connection, because this is another client (typically on another machine)
-        clientContextB.getDBMSSynchronizer().openSharedDatabase(ConnectorTest.getTestDBMSConnection(TestManager.getDBMSTypeTestParameter()));
+        clientContextB
+                .getDBMSSynchronizer()
+                .openSharedDatabase(
+                        ConnectorTest.getTestDBMSConnection(
+                                TestManager.getDBMSTypeTestParameter()));
         eventListenerB = new SynchronizationEventListenerTest();
         clientContextB.getDBMSSynchronizer().registerListener(eventListenerB);
     }
@@ -84,7 +109,9 @@ void simulateEntryInsertionAndManualPull() throws Exception {
         // client B pulls the changes
         clientContextB.getDBMSSynchronizer().pullChanges();
 
-        assertEquals(clientContextA.getDatabase().getEntries(), clientContextB.getDatabase().getEntries());
+        assertEquals(
+                clientContextA.getDatabase().getEntries(),
+                clientContextB.getDatabase().getEntries());
     }
 
     @Test
@@ -99,7 +126,9 @@ void simulateEntryUpdateAndManualPull() throws Exception {
 
         clientContextB.getDBMSSynchronizer().pullChanges();
 
-        assertEquals(clientContextA.getDatabase().getEntries(), clientContextB.getDatabase().getEntries());
+        assertEquals(
+                clientContextA.getDatabase().getEntries(),
+                clientContextB.getDatabase().getEntries());
     }
 
     @Test
@@ -112,7 +141,9 @@ void simulateEntryDelitionAndManualPull() throws Exception {
 
         assertFalse(clientContextA.getDatabase().getEntries().isEmpty());
         assertFalse(clientContextB.getDatabase().getEntries().isEmpty());
-        assertEquals(clientContextA.getDatabase().getEntries(), clientContextB.getDatabase().getEntries());
+        assertEquals(
+                clientContextA.getDatabase().getEntries(),
+                clientContextB.getDatabase().getEntries());
 
         // client A removes the entry
         clientContextA.getDatabase().removeEntry(bibEntry);
@@ -133,7 +164,9 @@ void simulateUpdateOnNoLongerExistingEntry() throws Exception {
 
         assertFalse(clientContextA.getDatabase().getEntries().isEmpty());
         assertFalse(clientContextB.getDatabase().getEntries().isEmpty());
-        assertEquals(clientContextA.getDatabase().getEntries(), clientContextB.getDatabase().getEntries());
+        assertEquals(
+                clientContextA.getDatabase().getEntries(),
+                clientContextB.getDatabase().getEntries());
 
         // client A removes the entry
         clientContextA.getDatabase().removeEntry(bibEntryOfClientA);
@@ -144,9 +177,12 @@ void simulateUpdateOnNoLongerExistingEntry() throws Exception {
         BibEntry bibEntryOfClientB = clientContextB.getDatabase().getEntries().getFirst();
         bibEntryOfClientB.setField(StandardField.YEAR, "2009");
 
-        // here a new SharedEntryNotPresentEvent has been thrown. In this case the user B would get an pop-up window.
+        // here a new SharedEntryNotPresentEvent has been thrown. In this case the user B would get
+        // an pop-up window.
         assertNotNull(eventListenerB.getSharedEntriesNotPresentEvent());
-        assertEquals(List.of(bibEntryOfClientB), eventListenerB.getSharedEntriesNotPresentEvent().getBibEntries());
+        assertEquals(
+                List.of(bibEntryOfClientB),
+                eventListenerB.getSharedEntriesNotPresentEvent().getBibEntries());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/shared/TestManager.java b/src/test/java/org/jabref/logic/shared/TestManager.java
index 954bbccbb5c0..f5523fa3ec10 100644
--- a/src/test/java/org/jabref/logic/shared/TestManager.java
+++ b/src/test/java/org/jabref/logic/shared/TestManager.java
@@ -21,32 +21,85 @@ public static void clearTables(DBMSConnection dbmsConnection) throws SQLExceptio
         DBMSType dbmsType = dbmsConnection.getProperties().getType();
 
         if (dbmsType == DBMSType.MYSQL) {
-            dbmsConnection.getConnection().createStatement().executeUpdate("DROP TABLE IF EXISTS `JABREF_FIELD`");
-            dbmsConnection.getConnection().createStatement().executeUpdate("DROP TABLE IF EXISTS `JABREF_ENTRY`");
-            dbmsConnection.getConnection().createStatement().executeUpdate("DROP TABLE IF EXISTS `JABREF_METADATA`");
+            dbmsConnection
+                    .getConnection()
+                    .createStatement()
+                    .executeUpdate("DROP TABLE IF EXISTS `JABREF_FIELD`");
+            dbmsConnection
+                    .getConnection()
+                    .createStatement()
+                    .executeUpdate("DROP TABLE IF EXISTS `JABREF_ENTRY`");
+            dbmsConnection
+                    .getConnection()
+                    .createStatement()
+                    .executeUpdate("DROP TABLE IF EXISTS `JABREF_METADATA`");
         } else if (dbmsType == DBMSType.POSTGRESQL) {
-            dbmsConnection.getConnection().createStatement().executeUpdate("DROP TABLE IF EXISTS jabref.\"FIELD\"");
-            dbmsConnection.getConnection().createStatement().executeUpdate("DROP TABLE IF EXISTS jabref.\"ENTRY\"");
-            dbmsConnection.getConnection().createStatement().executeUpdate("DROP TABLE IF EXISTS jabref.\"METADATA\"");
-            dbmsConnection.getConnection().createStatement().executeUpdate("DROP SCHEMA IF EXISTS jabref");
+            dbmsConnection
+                    .getConnection()
+                    .createStatement()
+                    .executeUpdate("DROP TABLE IF EXISTS jabref.\"FIELD\"");
+            dbmsConnection
+                    .getConnection()
+                    .createStatement()
+                    .executeUpdate("DROP TABLE IF EXISTS jabref.\"ENTRY\"");
+            dbmsConnection
+                    .getConnection()
+                    .createStatement()
+                    .executeUpdate("DROP TABLE IF EXISTS jabref.\"METADATA\"");
+            dbmsConnection
+                    .getConnection()
+                    .createStatement()
+                    .executeUpdate("DROP SCHEMA IF EXISTS jabref");
         } else if (dbmsType == DBMSType.ORACLE) {
-            dbmsConnection.getConnection().createStatement()
-                          .executeUpdate("BEGIN\n"
-                                  + "EXECUTE IMMEDIATE 'DROP TABLE \"FIELD\"';\n" + "EXCEPTION\n" + "WHEN OTHERS THEN\n"
-                                  + "IF SQLCODE != -942 THEN\n" + "RAISE;\n" + "END IF;\n" + "END;\n");
-            dbmsConnection.getConnection().createStatement()
-                          .executeUpdate("BEGIN\n"
-                                  + "EXECUTE IMMEDIATE 'DROP TABLE \"ENTRY\"';\n" + "EXCEPTION\n" + "WHEN OTHERS THEN\n"
-                                  + "IF SQLCODE != -942 THEN\n" + "RAISE;\n" + "END IF;\n" + "END;\n");
-            dbmsConnection.getConnection().createStatement()
-                          .executeUpdate("BEGIN\n"
-                                  + "EXECUTE IMMEDIATE 'DROP TABLE \"METADATA\"';\n" + "EXCEPTION\n" + "WHEN OTHERS THEN\n"
-                                  + "IF SQLCODE != -942 THEN\n" + "RAISE;\n" + "END IF;\n" + "END;\n");
-            dbmsConnection.getConnection().createStatement()
-                          // Sequence does not exist has a different error code than table does not exist
-                          .executeUpdate("BEGIN\n"
-                                  + "EXECUTE IMMEDIATE 'DROP SEQUENCE \"ENTRY_SEQ\"';\n" + "EXCEPTION\n" + "WHEN OTHERS THEN\n"
-                                  + "IF SQLCODE != -2289 THEN\n" + "RAISE;\n" + "END IF;\n" + "END;\n");
+            dbmsConnection
+                    .getConnection()
+                    .createStatement()
+                    .executeUpdate(
+                            "BEGIN\n"
+                                    + "EXECUTE IMMEDIATE 'DROP TABLE \"FIELD\"';\n"
+                                    + "EXCEPTION\n"
+                                    + "WHEN OTHERS THEN\n"
+                                    + "IF SQLCODE != -942 THEN\n"
+                                    + "RAISE;\n"
+                                    + "END IF;\n"
+                                    + "END;\n");
+            dbmsConnection
+                    .getConnection()
+                    .createStatement()
+                    .executeUpdate(
+                            "BEGIN\n"
+                                    + "EXECUTE IMMEDIATE 'DROP TABLE \"ENTRY\"';\n"
+                                    + "EXCEPTION\n"
+                                    + "WHEN OTHERS THEN\n"
+                                    + "IF SQLCODE != -942 THEN\n"
+                                    + "RAISE;\n"
+                                    + "END IF;\n"
+                                    + "END;\n");
+            dbmsConnection
+                    .getConnection()
+                    .createStatement()
+                    .executeUpdate(
+                            "BEGIN\n"
+                                    + "EXECUTE IMMEDIATE 'DROP TABLE \"METADATA\"';\n"
+                                    + "EXCEPTION\n"
+                                    + "WHEN OTHERS THEN\n"
+                                    + "IF SQLCODE != -942 THEN\n"
+                                    + "RAISE;\n"
+                                    + "END IF;\n"
+                                    + "END;\n");
+            dbmsConnection
+                    .getConnection()
+                    .createStatement()
+                    // Sequence does not exist has a different error code than table does not exist
+                    .executeUpdate(
+                            "BEGIN\n"
+                                    + "EXECUTE IMMEDIATE 'DROP SEQUENCE \"ENTRY_SEQ\"';\n"
+                                    + "EXCEPTION\n"
+                                    + "WHEN OTHERS THEN\n"
+                                    + "IF SQLCODE != -2289 THEN\n"
+                                    + "RAISE;\n"
+                                    + "END IF;\n"
+                                    + "END;\n");
         }
     }
 }
diff --git a/src/test/java/org/jabref/logic/shared/security/PasswordTest.java b/src/test/java/org/jabref/logic/shared/security/PasswordTest.java
index d315d0d1e888..ba0c5cba5e43 100644
--- a/src/test/java/org/jabref/logic/shared/security/PasswordTest.java
+++ b/src/test/java/org/jabref/logic/shared/security/PasswordTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.shared.security;
 
-import java.io.UnsupportedEncodingException;
-import java.security.GeneralSecurityException;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.io.UnsupportedEncodingException;
+import java.security.GeneralSecurityException;
 
 class PasswordTest {
 
diff --git a/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java b/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java
index e59dc54f20ea..2f76dc24dee7 100644
--- a/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java
+++ b/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java
@@ -1,26 +1,25 @@
 package org.jabref.logic.texparser;
 
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.texparser.LatexParserResult;
 import org.jabref.model.texparser.LatexParserResults;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
 
 class DefaultTexParserTest {
 
-    private final static String DARWIN = "Darwin1888";
-    private final static String EINSTEIN = "Einstein1920";
-    private final static String NEWTON = "Newton1999";
-    private final static String EINSTEIN_A = "Einstein1920a";
-    private final static String EINSTEIN_C = "Einstein1920c";
-    private final static String UNRESOLVED = "UnresolvedKey";
-    private final static String UNKNOWN = "UnknownKey";
+    private static final String DARWIN = "Darwin1888";
+    private static final String EINSTEIN = "Einstein1920";
+    private static final String NEWTON = "Newton1999";
+    private static final String EINSTEIN_A = "Einstein1920a";
+    private static final String EINSTEIN_C = "Einstein1920c";
+    private static final String UNRESOLVED = "UnresolvedKey";
+    private static final String UNKNOWN = "UnknownKey";
 
     private void testMatchCite(String key, String citeString) {
         Path path = Path.of("");
@@ -78,7 +77,8 @@ void fileEncodingUtf8() throws URISyntaxException {
         LatexParserResult parserResult = new DefaultLatexParser().parse(texFile).get();
         LatexParserResult expectedParserResult = new LatexParserResult(texFile);
 
-        expectedParserResult.addKey("anykey", texFile, 1, 32, 45, "Danach wir anschließend mittels \\cite{anykey}.");
+        expectedParserResult.addKey(
+                "anykey", texFile, 1, 32, 45, "Danach wir anschließend mittels \\cite{anykey}.");
 
         assertEquals(expectedParserResult, parserResult);
     }
@@ -90,8 +90,10 @@ void fileEncodingIso88591() throws URISyntaxException {
         LatexParserResult parserResult = new DefaultLatexParser().parse(texFile).get();
         LatexParserResult expectedParserResult = new LatexParserResult(texFile);
 
-        // The character � is on purpose - we cannot use Apache Tika's CharsetDetector - see ADR-0005
-        expectedParserResult.addKey("anykey", texFile, 1, 32, 45, "Danach wir anschlie�end mittels \\cite{anykey}.");
+        // The character � is on purpose - we cannot use Apache Tika's CharsetDetector - see
+        // ADR-0005
+        expectedParserResult.addKey(
+                "anykey", texFile, 1, 32, 45, "Danach wir anschlie�end mittels \\cite{anykey}.");
 
         assertEquals(expectedParserResult, parserResult);
     }
@@ -103,8 +105,10 @@ void fileEncodingIso885915() throws URISyntaxException {
         LatexParserResult parserResult = new DefaultLatexParser().parse(texFile).get();
         LatexParserResult expectedParserResult = new LatexParserResult(texFile);
 
-        // The character � is on purpose - we cannot use Apache Tika's CharsetDetector - see ADR-0005
-        expectedParserResult.addKey("anykey", texFile, 1, 32, 45, "Danach wir anschlie�end mittels \\cite{anykey}.");
+        // The character � is on purpose - we cannot use Apache Tika's CharsetDetector - see
+        // ADR-0005
+        expectedParserResult.addKey(
+                "anykey", texFile, 1, 32, 45, "Danach wir anschlie�end mittels \\cite{anykey}.");
 
         assertEquals(expectedParserResult, parserResult);
     }
@@ -115,16 +119,21 @@ void fileEncodingForThreeFiles() throws URISyntaxException {
         Path texFile2 = Path.of(DefaultTexParserTest.class.getResource("iso-8859-1.tex").toURI());
         Path texFile3 = Path.of(DefaultTexParserTest.class.getResource("iso-8859-15.tex").toURI());
 
-        LatexParserResults parserResults = new DefaultLatexParser().parse(List.of(texFile, texFile2, texFile3));
+        LatexParserResults parserResults =
+                new DefaultLatexParser().parse(List.of(texFile, texFile2, texFile3));
 
         LatexParserResult result1 = new LatexParserResult(texFile);
-        result1.addKey("anykey", texFile, 1, 32, 45, "Danach wir anschließend mittels \\cite{anykey}.");
+        result1.addKey(
+                "anykey", texFile, 1, 32, 45, "Danach wir anschließend mittels \\cite{anykey}.");
         LatexParserResult result2 = new LatexParserResult(texFile2);
-        result2.addKey("anykey", texFile2, 1, 32, 45, "Danach wir anschlie�end mittels \\cite{anykey}.");
+        result2.addKey(
+                "anykey", texFile2, 1, 32, 45, "Danach wir anschlie�end mittels \\cite{anykey}.");
         LatexParserResult result3 = new LatexParserResult(texFile3);
-        result3.addKey("anykey", texFile3, 1, 32, 45, "Danach wir anschlie�end mittels \\cite{anykey}.");
+        result3.addKey(
+                "anykey", texFile3, 1, 32, 45, "Danach wir anschlie�end mittels \\cite{anykey}.");
 
-        LatexParserResults expectedParserResults = new LatexParserResults(result1, result2, result3);
+        LatexParserResults expectedParserResults =
+                new LatexParserResults(result1, result2, result3);
 
         assertEquals(expectedParserResults, parserResults);
     }
@@ -139,8 +148,20 @@ void singleFile() throws URISyntaxException {
         expectedParserResult.addBibFile(texFile.getParent().resolve("origin.bib"));
         expectedParserResult.addKey(EINSTEIN, texFile, 4, 0, 19, "\\cite{Einstein1920}");
         expectedParserResult.addKey(DARWIN, texFile, 5, 0, 17, "\\cite{Darwin1888}.");
-        expectedParserResult.addKey(EINSTEIN, texFile, 6, 14, 33, "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
-        expectedParserResult.addKey(DARWIN, texFile, 7, 67, 84, "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
+        expectedParserResult.addKey(
+                EINSTEIN,
+                texFile,
+                6,
+                14,
+                33,
+                "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
+        expectedParserResult.addKey(
+                DARWIN,
+                texFile,
+                7,
+                67,
+                84,
+                "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
 
         assertEquals(expectedParserResult, parserResult);
     }
@@ -150,20 +171,51 @@ void twoFiles() throws URISyntaxException {
         Path texFile = Path.of(DefaultTexParserTest.class.getResource("paper.tex").toURI());
         Path texFile2 = Path.of(DefaultTexParserTest.class.getResource("paper2.tex").toURI());
 
-        LatexParserResults parserResults = new DefaultLatexParser().parse(List.of(texFile, texFile2));
+        LatexParserResults parserResults =
+                new DefaultLatexParser().parse(List.of(texFile, texFile2));
 
         LatexParserResult result1 = new LatexParserResult(texFile);
         result1.addBibFile(texFile.getParent().resolve("origin.bib"));
         result1.addKey(EINSTEIN, texFile, 4, 0, 19, "\\cite{Einstein1920}");
         result1.addKey(DARWIN, texFile, 5, 0, 17, "\\cite{Darwin1888}.");
-        result1.addKey(EINSTEIN, texFile, 6, 14, 33, "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
-        result1.addKey(DARWIN, texFile, 7, 67, 84, "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
+        result1.addKey(
+                EINSTEIN,
+                texFile,
+                6,
+                14,
+                33,
+                "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
+        result1.addKey(
+                DARWIN,
+                texFile,
+                7,
+                67,
+                84,
+                "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
 
         LatexParserResult result2 = new LatexParserResult(texFile2);
         result2.addBibFile(texFile2.getParent().resolve("origin.bib"));
-        result2.addKey(DARWIN, texFile2, 4, 48, 65, "This is some content trying to cite a bib file: \\cite{Darwin1888}");
-        result2.addKey(EINSTEIN, texFile2, 5, 48, 67, "This is some content trying to cite a bib file: \\cite{Einstein1920}");
-        result2.addKey(NEWTON, texFile2, 6, 48, 65, "This is some content trying to cite a bib file: \\cite{Newton1999}");
+        result2.addKey(
+                DARWIN,
+                texFile2,
+                4,
+                48,
+                65,
+                "This is some content trying to cite a bib file: \\cite{Darwin1888}");
+        result2.addKey(
+                EINSTEIN,
+                texFile2,
+                5,
+                48,
+                67,
+                "This is some content trying to cite a bib file: \\cite{Einstein1920}");
+        result2.addKey(
+                NEWTON,
+                texFile2,
+                6,
+                48,
+                65,
+                "This is some content trying to cite a bib file: \\cite{Newton1999}");
 
         LatexParserResults expectedParserResults = new LatexParserResults(result1, result2);
 
@@ -174,15 +226,28 @@ void twoFiles() throws URISyntaxException {
     void duplicateFiles() throws URISyntaxException {
         Path texFile = Path.of(DefaultTexParserTest.class.getResource("paper.tex").toURI());
 
-        LatexParserResults parserResults = new DefaultLatexParser().parse(List.of(texFile, texFile));
+        LatexParserResults parserResults =
+                new DefaultLatexParser().parse(List.of(texFile, texFile));
 
         LatexParserResult result = new LatexParserResult(texFile);
 
         result.addBibFile(texFile.getParent().resolve("origin.bib"));
         result.addKey(EINSTEIN, texFile, 4, 0, 19, "\\cite{Einstein1920}");
         result.addKey(DARWIN, texFile, 5, 0, 17, "\\cite{Darwin1888}.");
-        result.addKey(EINSTEIN, texFile, 6, 14, 33, "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
-        result.addKey(DARWIN, texFile, 7, 67, 84, "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
+        result.addKey(
+                EINSTEIN,
+                texFile,
+                6,
+                14,
+                33,
+                "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
+        result.addKey(
+                DARWIN,
+                texFile,
+                7,
+                67,
+                84,
+                "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
 
         LatexParserResults expectedParserResults = new LatexParserResults(result, result);
 
@@ -197,9 +262,27 @@ void unknownKey() throws URISyntaxException {
         LatexParserResult expectedParserResult = new LatexParserResult(texFile);
 
         expectedParserResult.addBibFile(texFile.getParent().resolve("origin.bib"));
-        expectedParserResult.addKey(DARWIN, texFile, 4, 48, 65, "This is some content trying to cite a bib file: \\cite{Darwin1888}");
-        expectedParserResult.addKey(EINSTEIN, texFile, 5, 48, 67, "This is some content trying to cite a bib file: \\cite{Einstein1920}");
-        expectedParserResult.addKey(UNKNOWN, texFile, 6, 48, 65, "This is some content trying to cite a bib file: \\cite{UnknownKey}");
+        expectedParserResult.addKey(
+                DARWIN,
+                texFile,
+                4,
+                48,
+                65,
+                "This is some content trying to cite a bib file: \\cite{Darwin1888}");
+        expectedParserResult.addKey(
+                EINSTEIN,
+                texFile,
+                5,
+                48,
+                67,
+                "This is some content trying to cite a bib file: \\cite{Einstein1920}");
+        expectedParserResult.addKey(
+                UNKNOWN,
+                texFile,
+                6,
+                48,
+                65,
+                "This is some content trying to cite a bib file: \\cite{UnknownKey}");
 
         assertEquals(expectedParserResult, parserResult);
     }
diff --git a/src/test/java/org/jabref/logic/texparser/LatexParserTest.java b/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
index 60ec5779d8f1..03d86c12679d 100644
--- a/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
+++ b/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
@@ -1,8 +1,7 @@
 package org.jabref.logic.texparser;
 
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.database.BibDatabase;
@@ -14,21 +13,21 @@
 import org.jabref.model.texparser.LatexParserResults;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.List;
 
 class LatexParserTest {
-    private final static String DARWIN = "Darwin1888";
-    private final static String EINSTEIN = "Einstein1920";
-    private final static String NEWTON = "Newton1999";
-    private final static String EINSTEIN_A = "Einstein1920a";
-    private final static String EINSTEIN_B = "Einstein1920b";
-    private final static String EINSTEIN_C = "Einstein1920c";
+    private static final String DARWIN = "Darwin1888";
+    private static final String EINSTEIN = "Einstein1920";
+    private static final String NEWTON = "Newton1999";
+    private static final String EINSTEIN_A = "Einstein1920a";
+    private static final String EINSTEIN_B = "Einstein1920b";
+    private static final String EINSTEIN_C = "Einstein1920c";
 
     private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
     private ImportFormatPreferences importFormatPreferences;
@@ -42,47 +41,58 @@ void setUp() {
         database = new BibDatabase();
         database2 = new BibDatabase();
 
-        BibEntry darwin = new BibEntry(StandardEntryType.Book)
-                .withCitationKey(DARWIN)
-                .withField(StandardField.TITLE, "The descent of man, and selection in relation to sex")
-                .withField(StandardField.PUBLISHER, "J. Murray")
-                .withField(StandardField.YEAR, "1888")
-                .withField(StandardField.AUTHOR, "Darwin, Charles");
+        BibEntry darwin =
+                new BibEntry(StandardEntryType.Book)
+                        .withCitationKey(DARWIN)
+                        .withField(
+                                StandardField.TITLE,
+                                "The descent of man, and selection in relation to sex")
+                        .withField(StandardField.PUBLISHER, "J. Murray")
+                        .withField(StandardField.YEAR, "1888")
+                        .withField(StandardField.AUTHOR, "Darwin, Charles");
         database.insertEntry(darwin);
 
-        BibEntry einstein = new BibEntry(StandardEntryType.Book)
-                .withCitationKey(EINSTEIN)
-                .withField(StandardField.TITLE, "Relativity: The special and general theory")
-                .withField(StandardField.PUBLISHER, "Penguin")
-                .withField(StandardField.YEAR, "1920")
-                .withField(StandardField.AUTHOR, "Einstein, Albert");
+        BibEntry einstein =
+                new BibEntry(StandardEntryType.Book)
+                        .withCitationKey(EINSTEIN)
+                        .withField(
+                                StandardField.TITLE, "Relativity: The special and general theory")
+                        .withField(StandardField.PUBLISHER, "Penguin")
+                        .withField(StandardField.YEAR, "1920")
+                        .withField(StandardField.AUTHOR, "Einstein, Albert");
         database.insertEntry(einstein);
 
-        BibEntry newton = new BibEntry(StandardEntryType.Book)
-                .withCitationKey(NEWTON)
-                .withField(StandardField.TITLE, "The Principia: mathematical principles of natural philosophy")
-                .withField(StandardField.PUBLISHER, "Univ of California Press")
-                .withField(StandardField.YEAR, "1999")
-                .withField(StandardField.AUTHOR, "Newton, Isaac");
+        BibEntry newton =
+                new BibEntry(StandardEntryType.Book)
+                        .withCitationKey(NEWTON)
+                        .withField(
+                                StandardField.TITLE,
+                                "The Principia: mathematical principles of natural philosophy")
+                        .withField(StandardField.PUBLISHER, "Univ of California Press")
+                        .withField(StandardField.YEAR, "1999")
+                        .withField(StandardField.AUTHOR, "Newton, Isaac");
         database.insertEntry(newton);
         database2.insertEntry(newton);
 
-        BibEntry einsteinA = new BibEntry(StandardEntryType.InBook)
-                .withCitationKey(EINSTEIN_A)
-                .withField(StandardField.CROSSREF, "Einstein1920")
-                .withField(StandardField.PAGES, "22--23");
+        BibEntry einsteinA =
+                new BibEntry(StandardEntryType.InBook)
+                        .withCitationKey(EINSTEIN_A)
+                        .withField(StandardField.CROSSREF, "Einstein1920")
+                        .withField(StandardField.PAGES, "22--23");
         database.insertEntry(einsteinA);
 
-        BibEntry einsteinB = new BibEntry(StandardEntryType.InBook)
-                .withCitationKey(EINSTEIN_B)
-                .withField(StandardField.CROSSREF, "Einstein1921")
-                .withField(StandardField.PAGES, "22--23");
+        BibEntry einsteinB =
+                new BibEntry(StandardEntryType.InBook)
+                        .withCitationKey(EINSTEIN_B)
+                        .withField(StandardField.CROSSREF, "Einstein1921")
+                        .withField(StandardField.PAGES, "22--23");
         database.insertEntry(einsteinB);
 
-        BibEntry einsteinC = new BibEntry(StandardEntryType.InBook)
-                .withCitationKey(EINSTEIN_C)
-                .withField(StandardField.CROSSREF, "Einstein1920")
-                .withField(StandardField.PAGES, "25--33");
+        BibEntry einsteinC =
+                new BibEntry(StandardEntryType.InBook)
+                        .withCitationKey(EINSTEIN_C)
+                        .withField(StandardField.CROSSREF, "Einstein1920")
+                        .withField(StandardField.PAGES, "25--33");
         database.insertEntry(einsteinC);
     }
 
@@ -96,16 +106,34 @@ void sameFileDifferentDatabases() throws URISyntaxException {
         expectedParserResult.addBibFile(texFile.getParent().resolve("origin.bib"));
         expectedParserResult.addKey(EINSTEIN, texFile, 4, 0, 19, "\\cite{Einstein1920}");
         expectedParserResult.addKey(DARWIN, texFile, 5, 0, 17, "\\cite{Darwin1888}.");
-        expectedParserResult.addKey(EINSTEIN, texFile, 6, 14, 33, "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
-        expectedParserResult.addKey(DARWIN, texFile, 7, 67, 84, "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
-
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(new LatexParserResults(parserResult));
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(new LatexParserResults(expectedParserResult));
+        expectedParserResult.addKey(
+                EINSTEIN,
+                texFile,
+                6,
+                14,
+                33,
+                "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
+        expectedParserResult.addKey(
+                DARWIN,
+                texFile,
+                7,
+                67,
+                84,
+                "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
+
+        LatexBibEntriesResolverResult crossingResult =
+                new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor)
+                        .resolve(new LatexParserResults(parserResult));
+        LatexBibEntriesResolverResult expectedCrossingResult =
+                new LatexBibEntriesResolverResult(new LatexParserResults(expectedParserResult));
 
         assertEquals(expectedCrossingResult, crossingResult);
 
-        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, importFormatPreferences, fileMonitor).resolve(new LatexParserResults(parserResult));
-        LatexBibEntriesResolverResult expectedCrossingResult2 = new LatexBibEntriesResolverResult(new LatexParserResults(expectedParserResult));
+        LatexBibEntriesResolverResult crossingResult2 =
+                new TexBibEntriesResolver(database2, importFormatPreferences, fileMonitor)
+                        .resolve(new LatexParserResults(parserResult));
+        LatexBibEntriesResolverResult expectedCrossingResult2 =
+                new LatexBibEntriesResolverResult(new LatexParserResults(expectedParserResult));
 
         expectedCrossingResult2.addEntry(database.getEntryByCitationKey(EINSTEIN).get());
         expectedCrossingResult2.addEntry(database.getEntryByCitationKey(DARWIN).get());
@@ -118,30 +146,68 @@ void twoFilesDifferentDatabases() throws URISyntaxException {
         Path texFile = Path.of(LatexParserTest.class.getResource("paper.tex").toURI());
         Path texFile2 = Path.of(LatexParserTest.class.getResource("paper2.tex").toURI());
 
-        LatexParserResults parserResults = new DefaultLatexParser().parse(List.of(texFile, texFile2));
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResults);
+        LatexParserResults parserResults =
+                new DefaultLatexParser().parse(List.of(texFile, texFile2));
+        LatexBibEntriesResolverResult crossingResult =
+                new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor)
+                        .resolve(parserResults);
 
         LatexParserResult expectedParserResult = new LatexParserResult(texFile);
         expectedParserResult.addBibFile(texFile.getParent().resolve("origin.bib"));
         expectedParserResult.addKey(EINSTEIN, texFile, 4, 0, 19, "\\cite{Einstein1920}");
         expectedParserResult.addKey(DARWIN, texFile, 5, 0, 17, "\\cite{Darwin1888}.");
-        expectedParserResult.addKey(EINSTEIN, texFile, 6, 14, 33, "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
-        expectedParserResult.addKey(DARWIN, texFile, 7, 67, 84, "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
+        expectedParserResult.addKey(
+                EINSTEIN,
+                texFile,
+                6,
+                14,
+                33,
+                "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
+        expectedParserResult.addKey(
+                DARWIN,
+                texFile,
+                7,
+                67,
+                84,
+                "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
 
         LatexParserResult expectedParserResult2 = new LatexParserResult(texFile2);
         expectedParserResult2.addBibFile(texFile2.getParent().resolve("origin.bib"));
-        expectedParserResult2.addKey(DARWIN, texFile2, 4, 48, 65, "This is some content trying to cite a bib file: \\cite{Darwin1888}");
-        expectedParserResult2.addKey(EINSTEIN, texFile2, 5, 48, 67, "This is some content trying to cite a bib file: \\cite{Einstein1920}");
-        expectedParserResult2.addKey(NEWTON, texFile2, 6, 48, 65, "This is some content trying to cite a bib file: \\cite{Newton1999}");
-
-        LatexParserResults expectedParserResults = new LatexParserResults(expectedParserResult, expectedParserResult2);
-
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(expectedParserResults);
+        expectedParserResult2.addKey(
+                DARWIN,
+                texFile2,
+                4,
+                48,
+                65,
+                "This is some content trying to cite a bib file: \\cite{Darwin1888}");
+        expectedParserResult2.addKey(
+                EINSTEIN,
+                texFile2,
+                5,
+                48,
+                67,
+                "This is some content trying to cite a bib file: \\cite{Einstein1920}");
+        expectedParserResult2.addKey(
+                NEWTON,
+                texFile2,
+                6,
+                48,
+                65,
+                "This is some content trying to cite a bib file: \\cite{Newton1999}");
+
+        LatexParserResults expectedParserResults =
+                new LatexParserResults(expectedParserResult, expectedParserResult2);
+
+        LatexBibEntriesResolverResult expectedCrossingResult =
+                new LatexBibEntriesResolverResult(expectedParserResults);
 
         assertEquals(expectedCrossingResult, crossingResult);
 
-        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, importFormatPreferences, fileMonitor).resolve(parserResults);
-        LatexBibEntriesResolverResult expectedCrossingResult2 = new LatexBibEntriesResolverResult(expectedParserResults);
+        LatexBibEntriesResolverResult crossingResult2 =
+                new TexBibEntriesResolver(database2, importFormatPreferences, fileMonitor)
+                        .resolve(parserResults);
+        LatexBibEntriesResolverResult expectedCrossingResult2 =
+                new LatexBibEntriesResolverResult(expectedParserResults);
 
         expectedCrossingResult2.addEntry(database.getEntryByCitationKey(EINSTEIN).get());
         expectedCrossingResult2.addEntry(database.getEntryByCitationKey(DARWIN).get());
diff --git a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
index 2367a47e68f8..16647909680d 100644
--- a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
+++ b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
@@ -1,8 +1,7 @@
 package org.jabref.logic.texparser;
 
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.database.BibDatabase;
@@ -13,21 +12,21 @@
 import org.jabref.model.texparser.LatexParserResults;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.List;
 
 class TexBibEntriesResolverTest {
-    private final static String DARWIN = "Darwin1888";
-    private final static String EINSTEIN = "Einstein1920";
-    private final static String NEWTON = "Newton1999";
-    private final static String EINSTEIN_A = "Einstein1920a";
-    private final static String EINSTEIN_B = "Einstein1920b";
-    private final static String EINSTEIN_C = "Einstein1920c";
+    private static final String DARWIN = "Darwin1888";
+    private static final String EINSTEIN = "Einstein1920";
+    private static final String NEWTON = "Newton1999";
+    private static final String EINSTEIN_A = "Einstein1920a";
+    private static final String EINSTEIN_B = "Einstein1920b";
+    private static final String EINSTEIN_C = "Einstein1920c";
 
     private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
     private ImportFormatPreferences importFormatPreferences;
@@ -40,50 +39,62 @@ void setUp() {
 
         database = new BibDatabase();
 
-        BibEntry darwin = new BibEntry(StandardEntryType.Book)
-                .withCitationKey(DARWIN)
-                .withField(StandardField.TITLE, "The descent of man, and selection in relation to sex")
-                .withField(StandardField.PUBLISHER, "J. Murray")
-                .withField(StandardField.YEAR, "1888")
-                .withField(StandardField.AUTHOR, "Darwin, Charles");
+        BibEntry darwin =
+                new BibEntry(StandardEntryType.Book)
+                        .withCitationKey(DARWIN)
+                        .withField(
+                                StandardField.TITLE,
+                                "The descent of man, and selection in relation to sex")
+                        .withField(StandardField.PUBLISHER, "J. Murray")
+                        .withField(StandardField.YEAR, "1888")
+                        .withField(StandardField.AUTHOR, "Darwin, Charles");
         database.insertEntry(darwin);
 
-        BibEntry einstein = new BibEntry(StandardEntryType.Book)
-                .withCitationKey(EINSTEIN)
-                .withField(StandardField.TITLE, "Relativity: The special and general theory")
-                .withField(StandardField.PUBLISHER, "Penguin")
-                .withField(StandardField.YEAR, "1920")
-                .withField(StandardField.AUTHOR, "Einstein, Albert");
+        BibEntry einstein =
+                new BibEntry(StandardEntryType.Book)
+                        .withCitationKey(EINSTEIN)
+                        .withField(
+                                StandardField.TITLE, "Relativity: The special and general theory")
+                        .withField(StandardField.PUBLISHER, "Penguin")
+                        .withField(StandardField.YEAR, "1920")
+                        .withField(StandardField.AUTHOR, "Einstein, Albert");
         database.insertEntry(einstein);
 
-        BibEntry newton = new BibEntry(StandardEntryType.Book)
-                .withCitationKey(NEWTON)
-                .withField(StandardField.TITLE, "The Principia: mathematical principles of natural philosophy")
-                .withField(StandardField.PUBLISHER, "Univ of California Press")
-                .withField(StandardField.YEAR, "1999")
-                .withField(StandardField.AUTHOR, "Newton, Isaac");
+        BibEntry newton =
+                new BibEntry(StandardEntryType.Book)
+                        .withCitationKey(NEWTON)
+                        .withField(
+                                StandardField.TITLE,
+                                "The Principia: mathematical principles of natural philosophy")
+                        .withField(StandardField.PUBLISHER, "Univ of California Press")
+                        .withField(StandardField.YEAR, "1999")
+                        .withField(StandardField.AUTHOR, "Newton, Isaac");
         database.insertEntry(newton);
 
-        BibEntry einsteinB = new BibEntry(StandardEntryType.InBook)
-                .withCitationKey(EINSTEIN_B)
-                .withField(StandardField.CROSSREF, "Einstein1921")
-                .withField(StandardField.PAGES, "22--23");
+        BibEntry einsteinB =
+                new BibEntry(StandardEntryType.InBook)
+                        .withCitationKey(EINSTEIN_B)
+                        .withField(StandardField.CROSSREF, "Einstein1921")
+                        .withField(StandardField.PAGES, "22--23");
         database.insertEntry(einsteinB);
 
-        BibEntry einsteinC = new BibEntry(StandardEntryType.InBook)
-                .withCitationKey(EINSTEIN_C)
-                .withField(StandardField.CROSSREF, EINSTEIN)
-                .withField(StandardField.PAGES, "25--33");
+        BibEntry einsteinC =
+                new BibEntry(StandardEntryType.InBook)
+                        .withCitationKey(EINSTEIN_C)
+                        .withField(StandardField.CROSSREF, EINSTEIN)
+                        .withField(StandardField.PAGES, "25--33");
         database.insertEntry(einsteinC);
 
-        bibEntry = new BibEntry(StandardEntryType.InBook)
-                .withCitationKey(EINSTEIN_A)
-                .withField(StandardField.TITLE, "Relativity: The special and general theory")
-                .withField(StandardField.PUBLISHER, "Penguin")
-                .withField(StandardField.YEAR, "1920")
-                .withField(StandardField.AUTHOR, "Einstein, Albert")
-                .withField(StandardField.CROSSREF, "Einstein1920")
-                .withField(StandardField.PAGES, "22--23");
+        bibEntry =
+                new BibEntry(StandardEntryType.InBook)
+                        .withCitationKey(EINSTEIN_A)
+                        .withField(
+                                StandardField.TITLE, "Relativity: The special and general theory")
+                        .withField(StandardField.PUBLISHER, "Penguin")
+                        .withField(StandardField.YEAR, "1920")
+                        .withField(StandardField.AUTHOR, "Einstein, Albert")
+                        .withField(StandardField.CROSSREF, "Einstein1920")
+                        .withField(StandardField.PAGES, "22--23");
     }
 
     @Test
@@ -91,9 +102,12 @@ void singleFile() throws URISyntaxException {
         Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
         LatexParserResults latexParserResults = new DefaultLatexParser().parse(List.of(texFile));
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(latexParserResults);
+        LatexBibEntriesResolverResult crossingResult =
+                new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor)
+                        .resolve(latexParserResults);
 
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(latexParserResults);
+        LatexBibEntriesResolverResult expectedCrossingResult =
+                new LatexBibEntriesResolverResult(latexParserResults);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
@@ -102,10 +116,14 @@ void singleFile() throws URISyntaxException {
     void twoFiles() throws URISyntaxException {
         Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
         Path texFile2 = Path.of(TexBibEntriesResolverTest.class.getResource("paper2.tex").toURI());
-        LatexParserResults latexParserResults = new DefaultLatexParser().parse(List.of(texFile, texFile2));
+        LatexParserResults latexParserResults =
+                new DefaultLatexParser().parse(List.of(texFile, texFile2));
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(latexParserResults);
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(latexParserResults);
+        LatexBibEntriesResolverResult crossingResult =
+                new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor)
+                        .resolve(latexParserResults);
+        LatexBibEntriesResolverResult expectedCrossingResult =
+                new LatexBibEntriesResolverResult(latexParserResults);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
@@ -115,19 +133,26 @@ void duplicateFiles() throws URISyntaxException {
         Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
         LatexParserResults parserResults = new DefaultLatexParser().parse(List.of(texFile));
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResults);
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResults);
+        LatexBibEntriesResolverResult crossingResult =
+                new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor)
+                        .resolve(parserResults);
+        LatexBibEntriesResolverResult expectedCrossingResult =
+                new LatexBibEntriesResolverResult(parserResults);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
 
     @Test
     void unknownKey() throws URISyntaxException {
-        Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("unknown_key.tex").toURI());
+        Path texFile =
+                Path.of(TexBibEntriesResolverTest.class.getResource("unknown_key.tex").toURI());
         LatexParserResults parserResults = new DefaultLatexParser().parse(List.of(texFile));
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResults);
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResults);
+        LatexBibEntriesResolverResult crossingResult =
+                new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor)
+                        .resolve(parserResults);
+        LatexBibEntriesResolverResult expectedCrossingResult =
+                new LatexBibEntriesResolverResult(parserResults);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
@@ -137,8 +162,11 @@ void nestedFiles() throws URISyntaxException {
         Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("nested.tex").toURI());
         LatexParserResults parserResults = new DefaultLatexParser().parse(List.of(texFile));
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResults);
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResults);
+        LatexBibEntriesResolverResult crossingResult =
+                new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor)
+                        .resolve(parserResults);
+        LatexBibEntriesResolverResult expectedCrossingResult =
+                new LatexBibEntriesResolverResult(parserResults);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
@@ -148,8 +176,11 @@ void crossRef() throws URISyntaxException {
         Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("crossref.tex").toURI());
         LatexParserResults parserResults = new DefaultLatexParser().parse(List.of(texFile));
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResults);
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResults);
+        LatexBibEntriesResolverResult crossingResult =
+                new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor)
+                        .resolve(parserResults);
+        LatexBibEntriesResolverResult expectedCrossingResult =
+                new LatexBibEntriesResolverResult(parserResults);
 
         expectedCrossingResult.addEntry(bibEntry);
 
diff --git a/src/test/java/org/jabref/logic/util/BuildInfoTest.java b/src/test/java/org/jabref/logic/util/BuildInfoTest.java
index ceabe9e2657e..b60e66880ded 100644
--- a/src/test/java/org/jabref/logic/util/BuildInfoTest.java
+++ b/src/test/java/org/jabref/logic/util/BuildInfoTest.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.util;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import org.junit.jupiter.api.Test;
+
 class BuildInfoTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java b/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java
index 192423b126f9..ccd8ae39eefe 100644
--- a/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java
+++ b/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java
@@ -1,19 +1,23 @@
 package org.jabref.logic.util;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Test;
+
 class DevelopmentStageTest {
 
     @Test
     void checkStabilityOrder() {
-        assertTrue(Version.DevelopmentStage.ALPHA.isMoreStableThan(Version.DevelopmentStage.UNKNOWN));
+        assertTrue(
+                Version.DevelopmentStage.ALPHA.isMoreStableThan(Version.DevelopmentStage.UNKNOWN));
         assertTrue(Version.DevelopmentStage.BETA.isMoreStableThan(Version.DevelopmentStage.ALPHA));
         assertTrue(Version.DevelopmentStage.STABLE.isMoreStableThan(Version.DevelopmentStage.BETA));
 
-        assertEquals(4, Version.DevelopmentStage.values().length, "It seems that the development stages have been changed, please adjust the test");
+        assertEquals(
+                4,
+                Version.DevelopmentStage.values().length,
+                "It seems that the development stages have been changed, please adjust the test");
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/util/ExternalLinkCreatorTest.java b/src/test/java/org/jabref/logic/util/ExternalLinkCreatorTest.java
index 28f1337b3e7f..13abc79008c6 100644
--- a/src/test/java/org/jabref/logic/util/ExternalLinkCreatorTest.java
+++ b/src/test/java/org/jabref/logic/util/ExternalLinkCreatorTest.java
@@ -1,18 +1,17 @@
 package org.jabref.logic.util;
 
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Optional;
+import static org.jabref.logic.util.ExternalLinkCreator.getShortScienceSearchURL;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.jabref.logic.util.ExternalLinkCreator.getShortScienceSearchURL;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Optional;
 
 class ExternalLinkCreatorTest {
 
@@ -48,9 +47,13 @@ void getShortScienceSearchURLReturnsEmptyOnMissingTitle() {
     @Test
     void getShortScienceSearchURLLinksToSearchResults() {
         // Take an arbitrary article name
-        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "JabRef bibliography management");
+        BibEntry entry =
+                new BibEntry().withField(StandardField.TITLE, "JabRef bibliography management");
         Optional<String> url = getShortScienceSearchURL(entry);
         // Expected behaviour is to link to the search results page, /internalsearch
-        assertEquals(Optional.of("https://www.shortscience.org/internalsearch?q=JabRef%20bibliography%20management"), url);
+        assertEquals(
+                Optional.of(
+                        "https://www.shortscience.org/internalsearch?q=JabRef%20bibliography%20management"),
+                url);
     }
 }
diff --git a/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java b/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java
index d4ae98057b21..7d914587a10c 100644
--- a/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java
+++ b/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java
@@ -1,36 +1,48 @@
 package org.jabref.logic.util;
 
-import org.jabref.logic.util.io.FileNameCleaner;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.util.io.FileNameCleaner;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class FileNameCleanerTest {
 
     @Test
     void cleanFileName() {
         assertEquals("legalFilename.txt", FileNameCleaner.cleanFileName("legalFilename.txt"));
-        assertEquals("illegalFilename______.txt", FileNameCleaner.cleanFileName("illegalFilename/?*<>|.txt"));
+        assertEquals(
+                "illegalFilename______.txt",
+                FileNameCleaner.cleanFileName("illegalFilename/?*<>|.txt"));
         assertEquals("illegalFileName_.txt", FileNameCleaner.cleanFileName("illegalFileName{.txt"));
     }
 
     @Test
     void cleanDirectoryName() {
         assertEquals("legalFilename.txt", FileNameCleaner.cleanDirectoryName("legalFilename.txt"));
-        assertEquals("subdir/legalFilename.txt", FileNameCleaner.cleanDirectoryName("subdir/legalFilename.txt"));
-        assertEquals("illegalFilename/_____.txt", FileNameCleaner.cleanDirectoryName("illegalFilename/?*<>|.txt"));
+        assertEquals(
+                "subdir/legalFilename.txt",
+                FileNameCleaner.cleanDirectoryName("subdir/legalFilename.txt"));
+        assertEquals(
+                "illegalFilename/_____.txt",
+                FileNameCleaner.cleanDirectoryName("illegalFilename/?*<>|.txt"));
     }
 
     @Test
     void cleanDirectoryNameForWindows() {
         assertEquals("legalFilename.txt", FileNameCleaner.cleanDirectoryName("legalFilename.txt"));
-        assertEquals("subdir\\legalFilename.txt", FileNameCleaner.cleanDirectoryName("subdir\\legalFilename.txt"));
-        assertEquals("illegalFilename\\_____.txt", FileNameCleaner.cleanDirectoryName("illegalFilename\\?*<>|.txt"));
+        assertEquals(
+                "subdir\\legalFilename.txt",
+                FileNameCleaner.cleanDirectoryName("subdir\\legalFilename.txt"));
+        assertEquals(
+                "illegalFilename\\_____.txt",
+                FileNameCleaner.cleanDirectoryName("illegalFilename\\?*<>|.txt"));
     }
 
     @Test
     void cleanCurlyBracesAsWell() {
-        assertEquals("The Evolution of Sentiment_ Analysis_A Review of Research Topics, Venues, and Top Cited Papers.PDF", FileNameCleaner.cleanFileName("The Evolution of Sentiment} Analysis}A Review of Research Topics, Venues, and Top Cited Papers.PDF"));
+        assertEquals(
+                "The Evolution of Sentiment_ Analysis_A Review of Research Topics, Venues, and Top Cited Papers.PDF",
+                FileNameCleaner.cleanFileName(
+                        "The Evolution of Sentiment} Analysis}A Review of Research Topics, Venues, and Top Cited Papers.PDF"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/util/UpdateFieldTest.java b/src/test/java/org/jabref/logic/util/UpdateFieldTest.java
index d9804b126ce3..baf43f814a9c 100644
--- a/src/test/java/org/jabref/logic/util/UpdateFieldTest.java
+++ b/src/test/java/org/jabref/logic/util/UpdateFieldTest.java
@@ -1,24 +1,23 @@
 package org.jabref.logic.util;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.logic.preferences.OwnerPreferences;
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
 
 class UpdateFieldTest {
 
@@ -145,14 +144,16 @@ void updateFieldSameContentHasChanged() {
     @Test
     void updateFieldSameContentHasFieldChange() {
         entry.setField(StandardField.YEAR, "2016");
-        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, "2016", true);
+        Optional<FieldChange> change =
+                UpdateField.updateField(entry, StandardField.YEAR, "2016", true);
         assertTrue(change.isPresent());
     }
 
     @Test
     void updateFieldSameContentHasCorrectFieldChange() {
         entry.setField(StandardField.YEAR, "2016");
-        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, "2016", true);
+        Optional<FieldChange> change =
+                UpdateField.updateField(entry, StandardField.YEAR, "2016", true);
         assertNull(change.get().getNewValue());
         assertEquals(StandardField.YEAR, change.get().getField());
         assertEquals("2016", change.get().getOldValue());
@@ -182,7 +183,10 @@ void emptyOwnerFieldNowPresentAfterAutomaticSet() {
         TimestampPreferences timestampPreferences = createTimestampPreference();
         UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
 
-        assertEquals(Optional.of("testDefaultOwner"), entry.getField(StandardField.OWNER), "No owner exists");
+        assertEquals(
+                Optional.of("testDefaultOwner"),
+                entry.getField(StandardField.OWNER),
+                "No owner exists");
     }
 
     @Test
@@ -205,13 +209,22 @@ void ownerIsNotResetAfterAutomaticSetIfOverwriteOwnerFalse() {
         TimestampPreferences timestampPreferences = createTimestampPreference();
         UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
 
-        assertNotEquals(Optional.of("testDefaultOwner"), entry.getField(StandardField.OWNER), "Owner has changed");
-        assertEquals(Optional.of(alreadySetOwner), entry.getField(StandardField.OWNER), "Owner has not changed");
+        assertNotEquals(
+                Optional.of("testDefaultOwner"),
+                entry.getField(StandardField.OWNER),
+                "Owner has changed");
+        assertEquals(
+                Optional.of(alreadySetOwner),
+                entry.getField(StandardField.OWNER),
+                "Owner has not changed");
     }
 
     @Test
     void emptyCreationDateFieldNowPresentAfterAutomaticSet() {
-        assertEquals(Optional.empty(), entry.getField(StandardField.CREATIONDATE), "CreationDate is present");
+        assertEquals(
+                Optional.empty(),
+                entry.getField(StandardField.CREATIONDATE),
+                "CreationDate is present");
 
         OwnerPreferences ownerPreferences = createOwnerPreference(true, true);
         TimestampPreferences timestampPreferences = createTimestampPreference();
@@ -219,7 +232,10 @@ void emptyCreationDateFieldNowPresentAfterAutomaticSet() {
 
         String creationDate = timestampPreferences.now();
 
-        assertEquals(Optional.of(creationDate), entry.getField(StandardField.CREATIONDATE), "No CreationDate exists");
+        assertEquals(
+                Optional.of(creationDate),
+                entry.getField(StandardField.CREATIONDATE),
+                "No CreationDate exists");
     }
 
     @Test
@@ -230,7 +246,10 @@ void creationDateAssignedCorrectlyAfterAutomaticSet() {
 
         String creationDate = timestampPreferences.now();
 
-        assertEquals(Optional.of(creationDate), entry.getField(StandardField.CREATIONDATE), "Not the same date");
+        assertEquals(
+                Optional.of(creationDate),
+                entry.getField(StandardField.CREATIONDATE),
+                "Not the same date");
     }
 
     @Test
@@ -238,9 +257,18 @@ void ownerSetToDefaultValueForCollectionOfBibEntries() {
         BibEntry entry2 = new BibEntry();
         BibEntry entry3 = new BibEntry();
 
-        assertEquals(Optional.empty(), entry.getField(StandardField.OWNER), "Owner field for entry is present");
-        assertEquals(Optional.empty(), entry.getField(StandardField.OWNER), "Owner field for entry2 is present");
-        assertEquals(Optional.empty(), entry.getField(StandardField.OWNER), "Owner field for entry3 is present");
+        assertEquals(
+                Optional.empty(),
+                entry.getField(StandardField.OWNER),
+                "Owner field for entry is present");
+        assertEquals(
+                Optional.empty(),
+                entry.getField(StandardField.OWNER),
+                "Owner field for entry2 is present");
+        assertEquals(
+                Optional.empty(),
+                entry.getField(StandardField.OWNER),
+                "Owner field for entry3 is present");
 
         Collection<BibEntry> bibs = Arrays.asList(entry, entry2, entry3);
 
@@ -250,9 +278,18 @@ void ownerSetToDefaultValueForCollectionOfBibEntries() {
 
         String defaultOwner = "testDefaultOwner";
 
-        assertEquals(Optional.of(defaultOwner), entry.getField(StandardField.OWNER), "entry has no owner field");
-        assertEquals(Optional.of(defaultOwner), entry2.getField(StandardField.OWNER), "entry2 has no owner field");
-        assertEquals(Optional.of(defaultOwner), entry3.getField(StandardField.OWNER), "entry3 has no owner field");
+        assertEquals(
+                Optional.of(defaultOwner),
+                entry.getField(StandardField.OWNER),
+                "entry has no owner field");
+        assertEquals(
+                Optional.of(defaultOwner),
+                entry2.getField(StandardField.OWNER),
+                "entry2 has no owner field");
+        assertEquals(
+                Optional.of(defaultOwner),
+                entry3.getField(StandardField.OWNER),
+                "entry3 has no owner field");
     }
 
     @Test
@@ -263,8 +300,14 @@ void ownerNotChangedForCollectionOfBibEntriesIfOptionsDisabled() {
         BibEntry entry2 = new BibEntry();
         entry2.setField(StandardField.OWNER, initialOwner);
 
-        assertEquals(Optional.of(initialOwner), entry.getField(StandardField.OWNER), "Owner field for entry is not present");
-        assertEquals(Optional.of(initialOwner), entry2.getField(StandardField.OWNER), "Owner field for entry2 is not present");
+        assertEquals(
+                Optional.of(initialOwner),
+                entry.getField(StandardField.OWNER),
+                "Owner field for entry is not present");
+        assertEquals(
+                Optional.of(initialOwner),
+                entry2.getField(StandardField.OWNER),
+                "Owner field for entry2 is not present");
 
         Collection<BibEntry> bibs = Arrays.asList(entry, entry2);
 
@@ -272,8 +315,14 @@ void ownerNotChangedForCollectionOfBibEntriesIfOptionsDisabled() {
         TimestampPreferences timestampPreferences = createTimestampPreference();
         UpdateField.setAutomaticFields(bibs, ownerPreferences, timestampPreferences);
 
-        assertEquals(Optional.of(initialOwner), entry.getField(StandardField.OWNER), "entry has new value for owner field");
-        assertEquals(Optional.of(initialOwner), entry2.getField(StandardField.OWNER), "entry2 has new value for owner field");
+        assertEquals(
+                Optional.of(initialOwner),
+                entry.getField(StandardField.OWNER),
+                "entry has new value for owner field");
+        assertEquals(
+                Optional.of(initialOwner),
+                entry2.getField(StandardField.OWNER),
+                "entry2 has new value for owner field");
     }
 
     private OwnerPreferences createOwnerPreference(boolean useOwner, boolean overwriteOwner) {
diff --git a/src/test/java/org/jabref/logic/util/VersionTest.java b/src/test/java/org/jabref/logic/util/VersionTest.java
index 2193784b7c67..e95412124529 100644
--- a/src/test/java/org/jabref/logic/util/VersionTest.java
+++ b/src/test/java/org/jabref/logic/util/VersionTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.util;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.support.DisabledOnCIServer;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 class VersionTest {
 
@@ -109,7 +108,8 @@ void versionThreeDigitDevVersion() {
 
     @Test
     void validVersionIsNotNewerThanUnknownVersion() {
-        // Reason: unknown version should only happen for developer builds where we don't want an update notification
+        // Reason: unknown version should only happen for developer builds where we don't want an
+        // update notification
         Version unknownVersion = Version.parse(BuildInfo.UNKNOWN_VERSION);
         Version validVersion = Version.parse("4.2");
         assertFalse(validVersion.isNewerThan(unknownVersion));
@@ -217,13 +217,17 @@ void equalVersionsNotNewer() {
     @Test
     void changelogOfDevelopmentVersionWithDash() {
         Version version = Version.parse("4.0-dev");
-        assertEquals("https://github.com/JabRef/jabref/blob/main/CHANGELOG.md#unreleased", version.getChangelogUrl());
+        assertEquals(
+                "https://github.com/JabRef/jabref/blob/main/CHANGELOG.md#unreleased",
+                version.getChangelogUrl());
     }
 
     @Test
     void changelogOfDevelopmentVersionWithoutDash() {
         Version version = Version.parse("3.7dev");
-        assertEquals("https://github.com/JabRef/jabref/blob/main/CHANGELOG.md#unreleased", version.getChangelogUrl());
+        assertEquals(
+                "https://github.com/JabRef/jabref/blob/main/CHANGELOG.md#unreleased",
+                version.getChangelogUrl());
     }
 
     @Test
@@ -232,22 +236,34 @@ void changelogOfDevelopmentStageSubNumber() {
         Version version2 = Version.parse("4.0-beta");
         Version version3 = Version.parse("4.0-beta2");
         Version version4 = Version.parse("4.0-beta3");
-        assertEquals("https://github.com/JabRef/jabref/blob/v4.0/CHANGELOG.md", version1.getChangelogUrl());
-        assertEquals("https://github.com/JabRef/jabref/blob/v4.0-beta/CHANGELOG.md", version2.getChangelogUrl());
-        assertEquals("https://github.com/JabRef/jabref/blob/v4.0-beta2/CHANGELOG.md", version3.getChangelogUrl());
-        assertEquals("https://github.com/JabRef/jabref/blob/v4.0-beta3/CHANGELOG.md", version4.getChangelogUrl());
+        assertEquals(
+                "https://github.com/JabRef/jabref/blob/v4.0/CHANGELOG.md",
+                version1.getChangelogUrl());
+        assertEquals(
+                "https://github.com/JabRef/jabref/blob/v4.0-beta/CHANGELOG.md",
+                version2.getChangelogUrl());
+        assertEquals(
+                "https://github.com/JabRef/jabref/blob/v4.0-beta2/CHANGELOG.md",
+                version3.getChangelogUrl());
+        assertEquals(
+                "https://github.com/JabRef/jabref/blob/v4.0-beta3/CHANGELOG.md",
+                version4.getChangelogUrl());
     }
 
     @Test
     void changelogWithTwoDigits() {
         Version version = Version.parse("3.4");
-        assertEquals("https://github.com/JabRef/jabref/blob/v3.4/CHANGELOG.md", version.getChangelogUrl());
+        assertEquals(
+                "https://github.com/JabRef/jabref/blob/v3.4/CHANGELOG.md",
+                version.getChangelogUrl());
     }
 
     @Test
     void changelogWithThreeDigits() {
         Version version = Version.parse("3.4.1");
-        assertEquals("https://github.com/JabRef/jabref/blob/v3.4.1/CHANGELOG.md", version.getChangelogUrl());
+        assertEquals(
+                "https://github.com/JabRef/jabref/blob/v3.4.1/CHANGELOG.md",
+                version.getChangelogUrl());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/util/io/BackupFileUtilTest.java b/src/test/java/org/jabref/logic/util/io/BackupFileUtilTest.java
index 65eda176b845..c346e18d7fcf 100644
--- a/src/test/java/org/jabref/logic/util/io/BackupFileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/BackupFileUtilTest.java
@@ -1,12 +1,10 @@
 package org.jabref.logic.util.io;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.jabref.logic.util.BackupFileType;
 import org.jabref.logic.util.Directories;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -14,8 +12,9 @@
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 class BackupFileUtilTest {
 
@@ -28,7 +27,8 @@ void setup(@TempDir Path tempDir) {
 
     @Test
     void uniqueFilePrefix() {
-        // We cannot test for a concrete hash code, because hashing implementation differs from environment to environment
+        // We cannot test for a concrete hash code, because hashing implementation differs from
+        // environment to environment
         assertNotEquals("", BackupFileUtil.getUniqueFilePrefix(Path.of("test.bib")));
     }
 
@@ -36,7 +36,10 @@ void uniqueFilePrefix() {
     void getPathOfBackupFileAndCreateDirectoryReturnsAppDirectoryInCaseOfNoError() {
         String start = Directories.getBackupDirectory().toString();
         backupDir = Directories.getBackupDirectory();
-        String result = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(Path.of("test.bib"), BackupFileType.BACKUP, backupDir).toString();
+        String result =
+                BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(
+                                Path.of("test.bib"), BackupFileType.BACKUP, backupDir)
+                        .toString();
         // We just check the prefix
         assertEquals(start, result.substring(0, start.length()));
     }
@@ -44,12 +47,16 @@ void getPathOfBackupFileAndCreateDirectoryReturnsAppDirectoryInCaseOfNoError() {
     @Test
     void getPathOfBackupFileAndCreateDirectoryReturnsSameDirectoryInCaseOfException() {
         backupDir = Directories.getBackupDirectory();
-        try (MockedStatic<Files> files = Mockito.mockStatic(Files.class, Answers.RETURNS_DEEP_STUBS)) {
+        try (MockedStatic<Files> files =
+                Mockito.mockStatic(Files.class, Answers.RETURNS_DEEP_STUBS)) {
             files.when(() -> Files.createDirectories(Directories.getBackupDirectory()))
-                 .thenThrow(new IOException());
+                    .thenThrow(new IOException());
             Path testPath = Path.of("tmp", "test.bib");
-            Path result = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(testPath, BackupFileType.BACKUP, backupDir);
-            // The intended fallback behavior is to put the .bak file in the same directory as the .bib file
+            Path result =
+                    BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(
+                            testPath, BackupFileType.BACKUP, backupDir);
+            // The intended fallback behavior is to put the .bak file in the same directory as the
+            // .bib file
             assertEquals(Path.of("tmp", "test.bib.bak"), result);
         }
     }
diff --git a/src/test/java/org/jabref/logic/util/io/CitationKeyBasedFileFinderTest.java b/src/test/java/org/jabref/logic/util/io/CitationKeyBasedFileFinderTest.java
index 3f29211f4e0c..41605e2239d2 100644
--- a/src/test/java/org/jabref/logic/util/io/CitationKeyBasedFileFinderTest.java
+++ b/src/test/java/org/jabref/logic/util/io/CitationKeyBasedFileFinderTest.java
@@ -1,21 +1,20 @@
 package org.jabref.logic.util.io;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 class CitationKeyBasedFileFinderTest {
 
@@ -75,7 +74,11 @@ void findAssociatedFilesIgnoresFilesStartingWithKeyButContinueWithText() throws
         Files.createFile(pdfsDir.resolve("HipKro03a - Hello second paper.pdf"));
         FileFinder fileFinder = new CitationKeyBasedFileFinder(false);
 
-        List<Path> results = fileFinder.findAssociatedFiles(entry, Collections.singletonList(pdfsDir), Collections.singletonList("pdf"));
+        List<Path> results =
+                fileFinder.findAssociatedFiles(
+                        entry,
+                        Collections.singletonList(pdfsDir),
+                        Collections.singletonList("pdf"));
 
         assertEquals(Collections.singletonList(pdfFile), results);
     }
@@ -85,7 +88,11 @@ void findAssociatedFilesFindsFilesStartingWithKey() throws Exception {
         Path secondPdfFile = Files.createFile(pdfsDir.resolve("HipKro03_Hello second paper.pdf"));
         FileFinder fileFinder = new CitationKeyBasedFileFinder(false);
 
-        List<Path> results = fileFinder.findAssociatedFiles(entry, Collections.singletonList(pdfsDir), Collections.singletonList("pdf"));
+        List<Path> results =
+                fileFinder.findAssociatedFiles(
+                        entry,
+                        Collections.singletonList(pdfsDir),
+                        Collections.singletonList("pdf"));
 
         assertEquals(Arrays.asList(secondPdfFile, pdfFile), results);
     }
@@ -109,7 +116,11 @@ void findAssociatedFilesWithUnsafeCharactersStartWithSearch() throws Exception {
         Path testFile = Files.createFile(pdfsDir.resolve("_test_file.pdf"));
         FileFinder fileFinder = new CitationKeyBasedFileFinder(false);
 
-        List<Path> results = fileFinder.findAssociatedFiles(entryWithUnsafeCitationKey, Collections.singletonList(pdfsDir), Collections.singletonList("pdf"));
+        List<Path> results =
+                fileFinder.findAssociatedFiles(
+                        entryWithUnsafeCitationKey,
+                        Collections.singletonList(pdfsDir),
+                        Collections.singletonList("pdf"));
 
         assertEquals(Collections.singletonList(testFile), results);
     }
@@ -122,7 +133,11 @@ void findAssociatedFilesWithUnsafeCharactersExactSearch() throws Exception {
         Path testFile = Files.createFile(pdfsDir.resolve("test_test__test_.pdf"));
         FileFinder fileFinder = new CitationKeyBasedFileFinder(true);
 
-        List<Path> results = fileFinder.findAssociatedFiles(entryWithUnsafeCitationKey, Collections.singletonList(pdfsDir), Collections.singletonList("pdf"));
+        List<Path> results =
+                fileFinder.findAssociatedFiles(
+                        entryWithUnsafeCitationKey,
+                        Collections.singletonList(pdfsDir),
+                        Collections.singletonList("pdf"));
 
         assertNotEquals(Collections.singletonList(testFile), results);
     }
diff --git a/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java b/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java
index 6d37300cfa31..6210aacbe694 100644
--- a/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java
@@ -1,15 +1,15 @@
 package org.jabref.logic.util.io;
 
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
 
 class FileHistoryTest {
     private FileHistory history;
@@ -69,5 +69,3 @@ void getFileAtTest() {
         assertEquals(Path.of("bb"), history.get(1));
     }
 }
-
-
diff --git a/src/test/java/org/jabref/logic/util/io/FileNameUniquenessTest.java b/src/test/java/org/jabref/logic/util/io/FileNameUniquenessTest.java
index a8c4154fdad0..9ef5eea046ce 100644
--- a/src/test/java/org/jabref/logic/util/io/FileNameUniquenessTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileNameUniquenessTest.java
@@ -1,30 +1,30 @@
 package org.jabref.logic.util.io;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 class FileNameUniquenessTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FileNameUniquenessTest.class);
 
-    @TempDir
-    protected Path tempDir;
+    @TempDir protected Path tempDir;
 
     @Test
     void getNonOverWritingFileNameReturnsSameName() throws IOException {
         assertFalse(Files.exists(tempDir.resolve("sameFile.txt")));
 
-        String outputFileName = FileNameUniqueness.getNonOverWritingFileName(tempDir, "sameFile.txt");
+        String outputFileName =
+                FileNameUniqueness.getNonOverWritingFileName(tempDir, "sameFile.txt");
         assertEquals("sameFile.txt", outputFileName);
     }
 
@@ -34,7 +34,8 @@ void getNonOverWritingFileNameReturnsUniqueNameOver1Conflict() throws IOExceptio
 
         Files.createFile(dummyFilePath1);
 
-        String outputFileName = FileNameUniqueness.getNonOverWritingFileName(tempDir, "differentFile.txt");
+        String outputFileName =
+                FileNameUniqueness.getNonOverWritingFileName(tempDir, "differentFile.txt");
         assertEquals("differentFile (1).txt", outputFileName);
     }
 
@@ -46,7 +47,8 @@ void getNonOverWritingFileNameReturnsUniqueNameOverNConflicts() throws IOExcepti
         Files.createFile(dummyFilePath1);
         Files.createFile(dummyFilePath2);
 
-        String outputFileName = FileNameUniqueness.getNonOverWritingFileName(tempDir, "manyfiles.txt");
+        String outputFileName =
+                FileNameUniqueness.getNonOverWritingFileName(tempDir, "manyfiles.txt");
         assertEquals("manyfiles (2).txt", outputFileName);
     }
 
diff --git a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
index 2256c23789f6..1196e851091c 100644
--- a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
@@ -1,14 +1,11 @@
 package org.jabref.logic.util.io;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.logic.FilePreferences;
@@ -17,7 +14,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -26,18 +22,20 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @AllowedToUseLogic("uses OS from logic package")
 class FileUtilTest {
 
-    @TempDir
-    static Path bibTempDir;
+    @TempDir static Path bibTempDir;
 
     private final Path nonExistingTestPath = Path.of("nonExistingTestPath");
     private Path existingTestFile;
@@ -52,22 +50,28 @@ void setUpViewModel(@TempDir Path temporaryFolder) throws IOException {
 
         existingTestFile = subDir.resolve("existingTestFile.txt");
         Files.createFile(existingTestFile);
-        Files.write(existingTestFile, "existingTestFile.txt".getBytes(StandardCharsets.UTF_8), StandardOpenOption.APPEND);
+        Files.write(
+                existingTestFile,
+                "existingTestFile.txt".getBytes(StandardCharsets.UTF_8),
+                StandardOpenOption.APPEND);
 
         otherExistingTestFile = subDir.resolve("otherExistingTestFile.txt");
         Files.createFile(otherExistingTestFile);
-        Files.write(otherExistingTestFile, "otherExistingTestFile.txt".getBytes(StandardCharsets.UTF_8), StandardOpenOption.APPEND);
+        Files.write(
+                otherExistingTestFile,
+                "otherExistingTestFile.txt".getBytes(StandardCharsets.UTF_8),
+                StandardOpenOption.APPEND);
     }
 
     @Test
     void extensionBakAddedCorrectly() {
-        assertEquals(Path.of("demo.bib.bak"),
-                FileUtil.addExtension(Path.of("demo.bib"), ".bak"));
+        assertEquals(Path.of("demo.bib.bak"), FileUtil.addExtension(Path.of("demo.bib"), ".bak"));
     }
 
     @Test
     void extensionBakAddedCorrectlyToAFileContainedInTmpDirectory() {
-        assertEquals(Path.of("tmp", "demo.bib.bak"),
+        assertEquals(
+                Path.of("tmp", "demo.bib.bak"),
                 FileUtil.addExtension(Path.of("tmp", "demo.bib"), ".bak"));
     }
 
@@ -78,8 +82,8 @@ void getLinkedFileNameDefaultFullTitle() {
         entry.setCitationKey("1234");
         entry.setField(StandardField.TITLE, "mytitle");
 
-        assertEquals("1234 - mytitle",
-                FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
+        assertEquals(
+                "1234 - mytitle", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
     }
 
     @Test
@@ -89,8 +93,8 @@ void getLinkedFileNameDefaultWithLowercaseTitle() {
         entry.setCitationKey("1234");
         entry.setField(StandardField.TITLE, "mytitle");
 
-        assertEquals("1234 - mytitle",
-                FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
+        assertEquals(
+                "1234 - mytitle", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
     }
 
     @Test
@@ -100,8 +104,7 @@ void getLinkedFileNameBibTeXKey() {
         entry.setCitationKey("1234");
         entry.setField(StandardField.TITLE, "mytitle");
 
-        assertEquals("1234",
-                FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
+        assertEquals("1234", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
     }
 
     @Test
@@ -148,7 +151,9 @@ void getLinkedFileNameByYearAuthorFirstpage() {
         entry.setField(StandardField.YEAR, "1868");
         entry.setField(StandardField.PAGES, "567-579");
 
-        assertEquals("1868_Kitsune_567", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
+        assertEquals(
+                "1868_Kitsune_567",
+                FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
     }
 
     @Test
@@ -168,7 +173,8 @@ void getFileExtensionNoExtensionFile() {
 
     @Test
     void getFileExtensionNoExtension2File() {
-        assertFalse(FileUtil.getFileExtension(Path.of(".StartsWithADotIsNotAnExtension")).isPresent());
+        assertFalse(
+                FileUtil.getFileExtension(Path.of(".StartsWithADotIsNotAnExtension")).isPresent());
     }
 
     @Test
@@ -193,7 +199,8 @@ void getFileExtensionWithNoDotReturnsEmptyExtension() {
 
     @Test
     void getFileExtensionWithDotAtStartReturnsEmptyExtension() {
-        assertEquals(Optional.empty(), FileUtil.getFileExtension(".StartsWithADotIsNotAnExtension"));
+        assertEquals(
+                Optional.empty(), FileUtil.getFileExtension(".StartsWithADotIsNotAnExtension"));
     }
 
     @Test
@@ -208,16 +215,20 @@ void getFileNameWithMultipleDotsString() {
 
     @Test
     void uniquePathSubstrings() {
-       List<String> paths = List.of("C:/uniquefile.bib",
-               "C:/downloads/filename.bib",
-               "C:/mypaper/bib/filename.bib",
-               "C:/external/mypaper/bib/filename.bib",
-               "");
-        List<String> uniqPath = List.of("uniquefile.bib",
-              "downloads/filename.bib",
-              "C:/mypaper/bib/filename.bib",
-              "external/mypaper/bib/filename.bib",
-              "");
+        List<String> paths =
+                List.of(
+                        "C:/uniquefile.bib",
+                        "C:/downloads/filename.bib",
+                        "C:/mypaper/bib/filename.bib",
+                        "C:/external/mypaper/bib/filename.bib",
+                        "");
+        List<String> uniqPath =
+                List.of(
+                        "uniquefile.bib",
+                        "downloads/filename.bib",
+                        "C:/mypaper/bib/filename.bib",
+                        "external/mypaper/bib/filename.bib",
+                        "");
 
         List<String> result = FileUtil.uniquePathSubstrings(paths);
         assertEquals(uniqPath, result);
@@ -225,14 +236,21 @@ void uniquePathSubstrings() {
 
     @Test
     void uniquePathFragmentWithSameSuffix() {
-        List<String> dirs = List.of("/users/jabref/bibliography.bib", "/users/jabref/koppor-bibliograsphy.bib");
-        assertEquals(Optional.of("bibliography.bib"), FileUtil.getUniquePathFragment(dirs, Path.of("/users/jabref/bibliography.bib")));
+        List<String> dirs =
+                List.of("/users/jabref/bibliography.bib", "/users/jabref/koppor-bibliograsphy.bib");
+        assertEquals(
+                Optional.of("bibliography.bib"),
+                FileUtil.getUniquePathFragment(dirs, Path.of("/users/jabref/bibliography.bib")));
     }
 
     @Test
     void uniquePathFragmentWithSameSuffixAndLongerName() {
-        List<String> paths = List.of("/users/jabref/bibliography.bib", "/users/jabref/koppor-bibliography.bib");
-        assertEquals(Optional.of("koppor-bibliography.bib"), FileUtil.getUniquePathFragment(paths, Path.of("/users/jabref/koppor-bibliography.bib")));
+        List<String> paths =
+                List.of("/users/jabref/bibliography.bib", "/users/jabref/koppor-bibliography.bib");
+        assertEquals(
+                Optional.of("koppor-bibliography.bib"),
+                FileUtil.getUniquePathFragment(
+                        paths, Path.of("/users/jabref/koppor-bibliography.bib")));
     }
 
     @Test
@@ -282,7 +300,9 @@ void copyFileSuccessfulWithOverrideExistFile() throws IOException {
         Path temp = subDir.resolve("existingTestFile.txt");
         Files.createFile(temp);
         FileUtil.copyFile(existingTestFile, temp, true);
-        assertEquals(Files.readAllLines(existingTestFile, StandardCharsets.UTF_8), Files.readAllLines(temp, StandardCharsets.UTF_8));
+        assertEquals(
+                Files.readAllLines(existingTestFile, StandardCharsets.UTF_8),
+                Files.readAllLines(temp, StandardCharsets.UTF_8));
     }
 
     @Test
@@ -292,7 +312,9 @@ void copyFileSuccessfulWithoutOverrideExistFile() throws IOException {
         Path temp = subDir.resolve("existingTestFile.txt");
         Files.createFile(temp);
         FileUtil.copyFile(existingTestFile, temp, false);
-        assertNotEquals(Files.readAllLines(existingTestFile, StandardCharsets.UTF_8), Files.readAllLines(temp, StandardCharsets.UTF_8));
+        assertNotEquals(
+                Files.readAllLines(existingTestFile, StandardCharsets.UTF_8),
+                Files.readAllLines(temp, StandardCharsets.UTF_8));
     }
 
     @Test
@@ -307,15 +329,25 @@ void validFilenameWithoutExtension() {
 
     @Test
     void validFilenameShouldBeMaximum255Chars() {
-        String longestValidFilename = Stream.generate(() -> String.valueOf('1')).limit(FileUtil.MAXIMUM_FILE_NAME_LENGTH - 4).collect(Collectors.joining()) + ".pdf";
-        String longerFilename = Stream.generate(() -> String.valueOf('1')).limit(260).collect(Collectors.joining()) + ".pdf";
+        String longestValidFilename =
+                Stream.generate(() -> String.valueOf('1'))
+                                .limit(FileUtil.MAXIMUM_FILE_NAME_LENGTH - 4)
+                                .collect(Collectors.joining())
+                        + ".pdf";
+        String longerFilename =
+                Stream.generate(() -> String.valueOf('1')).limit(260).collect(Collectors.joining())
+                        + ".pdf";
         assertEquals(longestValidFilename, FileUtil.getValidFileName(longerFilename));
     }
 
     @Test
     void invalidFilenameWithoutExtension() {
-        String longestValidFilename = Stream.generate(() -> String.valueOf('1')).limit(FileUtil.MAXIMUM_FILE_NAME_LENGTH).collect(Collectors.joining());
-        String longerFilename = Stream.generate(() -> String.valueOf('1')).limit(260).collect(Collectors.joining());
+        String longestValidFilename =
+                Stream.generate(() -> String.valueOf('1'))
+                        .limit(FileUtil.MAXIMUM_FILE_NAME_LENGTH)
+                        .collect(Collectors.joining());
+        String longerFilename =
+                Stream.generate(() -> String.valueOf('1')).limit(260).collect(Collectors.joining());
         assertEquals(longestValidFilename, FileUtil.getValidFileName(longerFilename));
     }
 
@@ -328,7 +360,9 @@ void getLinkedDirNameDefaultFullTitle() {
         entry.setField(StandardField.YEAR, "1998");
         entry.setField(StandardField.AUTHOR, "A. Åuthör and Author, Bete");
 
-        assertEquals("PDF/1998/Åuthör/1234 - mytitle", FileUtil.createDirNameFromPattern(null, entry, fileDirPattern));
+        assertEquals(
+                "PDF/1998/Åuthör/1234 - mytitle",
+                FileUtil.createDirNameFromPattern(null, entry, fileDirPattern));
     }
 
     @Test
@@ -356,13 +390,15 @@ void isNotBibFile() throws IOException {
 
     @Test
     void findInPath() {
-        Optional<Path> resultPath1 = FileUtil.findSingleFileRecursively("existingTestFile.txt", rootDir);
+        Optional<Path> resultPath1 =
+                FileUtil.findSingleFileRecursively("existingTestFile.txt", rootDir);
         assertEquals(resultPath1.get().toString(), existingTestFile.toString());
     }
 
     @Test
     void findInListOfPath() {
-        // due to the added workaround for old JabRef behavior as both path starts with the same name they are considered equal
+        // due to the added workaround for old JabRef behavior as both path starts with the same
+        // name they are considered equal
         List<Path> paths = List.of(existingTestFile, otherExistingTestFile, rootDir);
         List<Path> resultPaths = List.of(existingTestFile);
         List<Path> result = FileUtil.findListOfFiles("existingTestFile.txt", paths);
@@ -377,7 +413,8 @@ void extractFileExtension() {
 
     @Test
     void fileExtensionFromUrl() {
-        final String filePath = "https://link.springer.com/content/pdf/10.1007%2Fs40955-018-0121-9.pdf";
+        final String filePath =
+                "https://link.springer.com/content/pdf/10.1007%2Fs40955-018-0121-9.pdf";
         assertEquals(Optional.of("pdf"), FileUtil.getFileExtension(filePath));
     }
 
@@ -409,17 +446,21 @@ void findsFileStartingWithTheSameDirectory(@TempDir Path temp) throws Exception
         Files.createDirectories(firstFilePath);
         Path firstFile = Files.createFile(firstFilePath.resolve("test.pdf"));
 
-        assertEquals(Optional.of(firstFile), FileUtil.find("files/test.pdf", temp.resolve("files")));
+        assertEquals(
+                Optional.of(firstFile), FileUtil.find("files/test.pdf", temp.resolve("files")));
     }
 
     @Test
-    void doesNotFindsFileStartingWithTheSameDirectoryHasASubdirectory(@TempDir Path temp) throws Exception {
+    void doesNotFindsFileStartingWithTheSameDirectoryHasASubdirectory(@TempDir Path temp)
+            throws Exception {
         Path firstFilesPath = temp.resolve("files");
         Path secondFilesPath = firstFilesPath.resolve("files");
         Files.createDirectories(secondFilesPath);
         Path testFile = secondFilesPath.resolve("test.pdf");
         Files.createFile(testFile);
-        assertEquals(Optional.of(testFile.toAbsolutePath()), FileUtil.find("files/test.pdf", firstFilesPath));
+        assertEquals(
+                Optional.of(testFile.toAbsolutePath()),
+                FileUtil.find("files/test.pdf", firstFilesPath));
     }
 
     public void testCTemp() {
@@ -447,21 +488,26 @@ public static Stream<Arguments> relativize() {
 
         Path testPdf = filesPath.resolve("test.pdf");
         BibEntry source1 = new BibEntry().withFiles(List.of(new LinkedFile(testPdf)));
-        BibEntry target1 = new BibEntry().withFiles(List.of(new LinkedFile(filesPath.relativize(testPdf))));
+        BibEntry target1 =
+                new BibEntry().withFiles(List.of(new LinkedFile(filesPath.relativize(testPdf))));
 
         testPdf = bibPath.resolve("test.pdf");
         BibEntry source2 = new BibEntry().withFiles(List.of(new LinkedFile(testPdf)));
-        BibEntry target2 = new BibEntry().withFiles(List.of(new LinkedFile(bibTempDir.relativize(testPdf))));
+        BibEntry target2 =
+                new BibEntry().withFiles(List.of(new LinkedFile(bibTempDir.relativize(testPdf))));
 
         return Stream.of(
                 Arguments.of(List.of(target1), List.of(source1), database, fileDirPrefs),
-                Arguments.of(List.of(target2), List.of(source2), database, fileDirPrefs)
-        );
+                Arguments.of(List.of(target2), List.of(source2), database, fileDirPrefs));
     }
 
     @ParameterizedTest
     @MethodSource
-    void relativize(List<BibEntry> expected, List<BibEntry> entries, BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+    void relativize(
+            List<BibEntry> expected,
+            List<BibEntry> entries,
+            BibDatabaseContext databaseContext,
+            FilePreferences filePreferences) {
         List<BibEntry> actual = FileUtil.relativize(entries, databaseContext, filePreferences);
         assertEquals(expected, actual);
     }
diff --git a/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTest.java b/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTest.java
index e6da72165969..afb736a265bc 100644
--- a/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTest.java
+++ b/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTest.java
@@ -1,32 +1,31 @@
 package org.jabref.logic.util.io;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
 
 class RegExpBasedFileFinderTest {
     private static final List<String> PDF_EXTENSION = Collections.singletonList("pdf");
-    private static final List<String> FILE_NAMES = List.of(
-            "ACM_IEEE-CS.pdf",
-            "pdfInDatabase.pdf",
-            "Regexp from [A-Z].pdf",
-            "directory/subdirectory/2003_Hippel_209.pdf",
-            "directory/subdirectory/2017_Gražulis_726.pdf",
-            "directory/subdirectory/pdfInSubdirectory.pdf",
-            "directory/subdirectory/GUO ea - INORG CHEM COMMUN 2010 - Ferroelectric Metal Organic Framework (MOF).pdf"
-            );
+    private static final List<String> FILE_NAMES =
+            List.of(
+                    "ACM_IEEE-CS.pdf",
+                    "pdfInDatabase.pdf",
+                    "Regexp from [A-Z].pdf",
+                    "directory/subdirectory/2003_Hippel_209.pdf",
+                    "directory/subdirectory/2017_Gražulis_726.pdf",
+                    "directory/subdirectory/pdfInSubdirectory.pdf",
+                    "directory/subdirectory/GUO ea - INORG CHEM COMMUN 2010 - Ferroelectric Metal Organic Framework (MOF).pdf");
     private Path directory;
     private BibEntry entry;
 
@@ -36,13 +35,17 @@ void setUp(@TempDir Path tempDir) throws Exception {
         entry.setType(StandardEntryType.Article);
         entry.setCitationKey("HipKro03");
         entry.setField(StandardField.AUTHOR, "Eric von Hippel and Georg von Krogh");
-        entry.setField(StandardField.TITLE, "Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science");
+        entry.setField(
+                StandardField.TITLE,
+                "Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science");
         entry.setField(StandardField.JOURNAL, "Organization Science");
         entry.setField(StandardField.YEAR, "2003");
         entry.setField(StandardField.VOLUME, "14");
         entry.setField(StandardField.PAGES, "209--223");
         entry.setField(StandardField.NUMBER, "2");
-        entry.setField(StandardField.ADDRESS, "Institute for Operations Research and the Management Sciences (INFORMS), Linthicum, Maryland, USA");
+        entry.setField(
+                StandardField.ADDRESS,
+                "Institute for Operations Research and the Management Sciences (INFORMS), Linthicum, Maryland, USA");
         entry.setField(StandardField.DOI, "http://dx.doi.org/10.1287/orsc.14.2.209.14992");
         entry.setField(StandardField.ISSN, "1526-5455");
         entry.setField(StandardField.PUBLISHER, "INFORMS");
@@ -58,12 +61,15 @@ void setUp(@TempDir Path tempDir) throws Exception {
     @Test
     void findFiles() throws Exception {
         // given
-        BibEntry localEntry = new BibEntry(StandardEntryType.Article).withCitationKey("pdfInDatabase");
+        BibEntry localEntry =
+                new BibEntry(StandardEntryType.Article).withCitationKey("pdfInDatabase");
 
-        RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder("**/[citationkey].*\\\\.[extension]", ',');
+        RegExpBasedFileFinder fileFinder =
+                new RegExpBasedFileFinder("**/[citationkey].*\\\\.[extension]", ',');
 
         // when
-        List<Path> result = fileFinder.findAssociatedFiles(localEntry, List.of(directory), PDF_EXTENSION);
+        List<Path> result =
+                fileFinder.findAssociatedFiles(localEntry, List.of(directory), PDF_EXTENSION);
         List<Path> expected = List.of(directory.resolve("pdfInDatabase.pdf"));
 
         // then
@@ -73,11 +79,14 @@ void findFiles() throws Exception {
     @Test
     void yearAuthFirstPageFindFiles() throws Exception {
         // given
-        RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder("**/[year]_[auth]_[firstpage].*\\\\.[extension]", ',');
+        RegExpBasedFileFinder fileFinder =
+                new RegExpBasedFileFinder("**/[year]_[auth]_[firstpage].*\\\\.[extension]", ',');
 
         // when
-        List<Path> result = fileFinder.findAssociatedFiles(entry, List.of(directory), PDF_EXTENSION);
-        List<Path> expected = List.of(directory.resolve("directory/subdirectory/2003_Hippel_209.pdf"));
+        List<Path> result =
+                fileFinder.findAssociatedFiles(entry, List.of(directory), PDF_EXTENSION);
+        List<Path> expected =
+                List.of(directory.resolve("directory/subdirectory/2003_Hippel_209.pdf"));
 
         // then
         assertEquals(expected, result);
@@ -87,9 +96,11 @@ void yearAuthFirstPageFindFiles() throws Exception {
     void findAssociatedFilesFindFileContainingBracketsFromBracketedExpression() throws Exception {
         var bibEntry = new BibEntry().withField(StandardField.TITLE, "Regexp from [A-Z]");
 
-        RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder("[TITLE]\\\\.[extension]", ',');
+        RegExpBasedFileFinder fileFinder =
+                new RegExpBasedFileFinder("[TITLE]\\\\.[extension]", ',');
 
-        List<Path> result = fileFinder.findAssociatedFiles(bibEntry, List.of(directory), PDF_EXTENSION);
+        List<Path> result =
+                fileFinder.findAssociatedFiles(bibEntry, List.of(directory), PDF_EXTENSION);
         List<Path> pdfFile = List.of(directory.resolve("Regexp from [A-Z].pdf"));
 
         assertEquals(pdfFile, result);
@@ -99,26 +110,37 @@ void findAssociatedFilesFindFileContainingBracketsFromBracketedExpression() thro
     void findAssociatedFilesFindCleanedFileFromBracketedExpression() throws Exception {
         var bibEntry = new BibEntry().withField(StandardField.JOURNAL, "ACM/IEEE-CS");
 
-        RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder("[JOURNAL]\\\\.[extension]", ',');
+        RegExpBasedFileFinder fileFinder =
+                new RegExpBasedFileFinder("[JOURNAL]\\\\.[extension]", ',');
 
-        List<Path> result = fileFinder.findAssociatedFiles(bibEntry, List.of(directory), PDF_EXTENSION);
+        List<Path> result =
+                fileFinder.findAssociatedFiles(bibEntry, List.of(directory), PDF_EXTENSION);
         List<Path> pdfFile = List.of(directory.resolve("ACM_IEEE-CS.pdf"));
 
         assertEquals(pdfFile, result);
     }
 
     @Test
-    void findAssociatedFilesFindFileContainingParenthesizesFromBracketedExpression() throws Exception {
-        var bibEntry = new BibEntry().withCitationKey("Guo_ICC_2010")
-                                     .withField(StandardField.TITLE, "Ferroelectric Metal Organic Framework (MOF)")
-                                     .withField(StandardField.AUTHOR, "Guo, M. and Cai, H.-L. and Xiong, R.-G.")
-                                     .withField(StandardField.JOURNAL, "Inorganic Chemistry Communications")
-                                     .withField(StandardField.YEAR, "2010");
-
-        RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder("**/.*[TITLE].*\\\\.[extension]", ',');
-
-        List<Path> result = fileFinder.findAssociatedFiles(bibEntry, List.of(directory), PDF_EXTENSION);
-        List<Path> pdfFile = List.of(directory.resolve("directory/subdirectory/GUO ea - INORG CHEM COMMUN 2010 - Ferroelectric Metal Organic Framework (MOF).pdf"));
+    void findAssociatedFilesFindFileContainingParenthesizesFromBracketedExpression()
+            throws Exception {
+        var bibEntry =
+                new BibEntry()
+                        .withCitationKey("Guo_ICC_2010")
+                        .withField(
+                                StandardField.TITLE, "Ferroelectric Metal Organic Framework (MOF)")
+                        .withField(StandardField.AUTHOR, "Guo, M. and Cai, H.-L. and Xiong, R.-G.")
+                        .withField(StandardField.JOURNAL, "Inorganic Chemistry Communications")
+                        .withField(StandardField.YEAR, "2010");
+
+        RegExpBasedFileFinder fileFinder =
+                new RegExpBasedFileFinder("**/.*[TITLE].*\\\\.[extension]", ',');
+
+        List<Path> result =
+                fileFinder.findAssociatedFiles(bibEntry, List.of(directory), PDF_EXTENSION);
+        List<Path> pdfFile =
+                List.of(
+                        directory.resolve(
+                                "directory/subdirectory/GUO ea - INORG CHEM COMMUN 2010 - Ferroelectric Metal Organic Framework (MOF).pdf"));
 
         assertEquals(pdfFile, result);
     }
@@ -126,16 +148,20 @@ void findAssociatedFilesFindFileContainingParenthesizesFromBracketedExpression()
     @Test
     void authorWithDiacritics() throws Exception {
         // given
-        BibEntry localEntry = new BibEntry(StandardEntryType.Article).withCitationKey("Grazulis2017");
+        BibEntry localEntry =
+                new BibEntry(StandardEntryType.Article).withCitationKey("Grazulis2017");
         localEntry.setField(StandardField.YEAR, "2017");
         localEntry.setField(StandardField.AUTHOR, "Gražulis, Saulius and O. Kitsune");
         localEntry.setField(StandardField.PAGES, "726--729");
 
-        RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder("**/[year]_[auth]_[firstpage]\\\\.[extension]", ',');
+        RegExpBasedFileFinder fileFinder =
+                new RegExpBasedFileFinder("**/[year]_[auth]_[firstpage]\\\\.[extension]", ',');
 
         // when
-        List<Path> result = fileFinder.findAssociatedFiles(localEntry, List.of(directory), PDF_EXTENSION);
-        List<Path> expected = List.of(directory.resolve("directory/subdirectory/2017_Gražulis_726.pdf"));
+        List<Path> result =
+                fileFinder.findAssociatedFiles(localEntry, List.of(directory), PDF_EXTENSION);
+        List<Path> expected =
+                List.of(directory.resolve("directory/subdirectory/2017_Gražulis_726.pdf"));
 
         // then
         assertEquals(expected, result);
@@ -148,11 +174,14 @@ void findFileInSubdirectory() throws Exception {
         localEntry.setCitationKey("pdfInSubdirectory");
         localEntry.setField(StandardField.YEAR, "2017");
 
-        RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder("**/[citationkey].*\\\\.[extension]", ',');
+        RegExpBasedFileFinder fileFinder =
+                new RegExpBasedFileFinder("**/[citationkey].*\\\\.[extension]", ',');
 
         // when
-        List<Path> result = fileFinder.findAssociatedFiles(localEntry, List.of(directory), PDF_EXTENSION);
-        List<Path> expected = List.of(directory.resolve("directory/subdirectory/pdfInSubdirectory.pdf"));
+        List<Path> result =
+                fileFinder.findAssociatedFiles(localEntry, List.of(directory), PDF_EXTENSION);
+        List<Path> expected =
+                List.of(directory.resolve("directory/subdirectory/pdfInSubdirectory.pdf"));
 
         // then
         assertEquals(expected, result);
@@ -165,10 +194,12 @@ void findFileNonRecursive() throws Exception {
         localEntry.setCitationKey("pdfInSubdirectory");
         localEntry.setField(StandardField.YEAR, "2017");
 
-        RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder("*/[citationkey].*\\\\.[extension]", ',');
+        RegExpBasedFileFinder fileFinder =
+                new RegExpBasedFileFinder("*/[citationkey].*\\\\.[extension]", ',');
 
         // when
-        List<Path> result = fileFinder.findAssociatedFiles(localEntry, List.of(directory), PDF_EXTENSION);
+        List<Path> result =
+                fileFinder.findAssociatedFiles(localEntry, List.of(directory), PDF_EXTENSION);
 
         // then
         assertTrue(result.isEmpty());
diff --git a/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java b/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java
index 0530c2179472..560c3d815093 100644
--- a/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java
+++ b/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.util.strings;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class StringLengthComparatorTest {
 
diff --git a/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java b/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
index 26d9fd31bdc8..30813b72ad50 100644
--- a/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
+++ b/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.util.strings;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.util.ResultingStringState;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class StringManipulatorTest {
 
@@ -83,7 +82,8 @@ void killWordTrimsTrailingWhitespace() {
     void backwardsKillWordTrimsPreceedingWhitespace() {
         int caretPosition = 1; // Second space
         String input = "  hello";
-        // One space should be preserved since we are deleting everything preceding the second space.
+        // One space should be preserved since we are deleting everything preceding the second
+        // space.
         String expectedResult = " hello";
         ResultingStringState textOutput = StringManipulator.backwardKillWord(caretPosition, input);
         assertEquals(expectedResult, textOutput.text);
@@ -140,7 +140,11 @@ void killPreviousWord() {
 
     @ParameterizedTest
     @MethodSource("wordBoundaryTestData")
-    void getNextWordBoundary(String text, int caretPosition, int expectedPosition, StringManipulator.Direction direction) {
+    void getNextWordBoundary(
+            String text,
+            int caretPosition,
+            int expectedPosition,
+            StringManipulator.Direction direction) {
         int result = StringManipulator.getNextWordBoundary(caretPosition, text, direction);
         assertEquals(expectedPosition, result);
     }
diff --git a/src/test/java/org/jabref/logic/util/strings/StringSimilarityTest.java b/src/test/java/org/jabref/logic/util/strings/StringSimilarityTest.java
index a7d0ba6c4f22..afec5aea602e 100644
--- a/src/test/java/org/jabref/logic/util/strings/StringSimilarityTest.java
+++ b/src/test/java/org/jabref/logic/util/strings/StringSimilarityTest.java
@@ -1,28 +1,28 @@
 package org.jabref.logic.util.strings;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class StringSimilarityTest {
 
     private StringSimilarity similarityChecker = new StringSimilarity();
 
     @ParameterizedTest(name = "a={0}, b={1}, result={2}")
     @CsvSource({
-            "'', '', true", // same empty strings
-            "a, a, true", // same one-letter strings
-            "a, '', true", // one string is empty and similarity < threshold (4)
-            "'', a, true", // one string is empty and similarity < threshold (4)
-            "abcd, '', true", // one string is empty and similarity == threshold (4)
-            "'', abcd, true", // one string is empty and similarity == threshold (4)
-            "abcde, '', false", // one string is empty and similarity > threshold (4)
-            "'', abcde, false", // one string is empty and similarity > threshold (4)
-            "abcdef, abcdef, true", // same multi-letter strings
-            "abcdef, abc, true", // no empty strings and similarity < threshold (4)
-            "abcdef, ab, true", // no empty strings and similarity == threshold (4)
-            "abcdef, a, false" // no empty string sand similarity > threshold (4)
+        "'', '', true", // same empty strings
+        "a, a, true", // same one-letter strings
+        "a, '', true", // one string is empty and similarity < threshold (4)
+        "'', a, true", // one string is empty and similarity < threshold (4)
+        "abcd, '', true", // one string is empty and similarity == threshold (4)
+        "'', abcd, true", // one string is empty and similarity == threshold (4)
+        "abcde, '', false", // one string is empty and similarity > threshold (4)
+        "'', abcde, false", // one string is empty and similarity > threshold (4)
+        "abcdef, abcdef, true", // same multi-letter strings
+        "abcdef, abc, true", // no empty strings and similarity < threshold (4)
+        "abcdef, ab, true", // no empty strings and similarity == threshold (4)
+        "abcdef, a, false" // no empty string sand similarity > threshold (4)
     })
     void stringSimilarity(String a, String b, String expectedResult) {
         assertEquals(Boolean.valueOf(expectedResult), similarityChecker.isSimilar(a, b));
diff --git a/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java b/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
index 31264b9ff77d..50a6ff26d4f9 100644
--- a/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
+++ b/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
@@ -1,29 +1,28 @@
 package org.jabref.logic.xmp;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import org.apache.xmpbox.XMPMetadata;
+import org.apache.xmpbox.schema.DublinCoreSchema;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.schema.DublinCoreSchemaCustom;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
-import org.apache.xmpbox.XMPMetadata;
-import org.apache.xmpbox.schema.DublinCoreSchema;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 class XmpUtilReaderTest {
 
@@ -42,7 +41,10 @@ void setUp() {
 
         when(xmpPreferences.getKeywordSeparator()).thenReturn(',');
 
-        testImporter = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
+        testImporter =
+                new BibtexImporter(
+                        mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                        new DummyFileUpdateMonitor());
     }
 
     /**
@@ -50,14 +52,24 @@ void setUp() {
      */
     @Test
     void readArticleDublinCoreReadRawXmp() throws IOException, URISyntaxException {
-        Path path = Path.of(XmpUtilShared.class.getResource("article_dublinCore_without_day.pdf").toURI());
+        Path path =
+                Path.of(
+                        XmpUtilShared.class
+                                .getResource("article_dublinCore_without_day.pdf")
+                                .toURI());
         List<XMPMetadata> meta = xmpUtilReader.readRawXmp(path);
 
-        DublinCoreSchema dcSchema = DublinCoreSchemaCustom.copyDublinCoreSchema(meta.getFirst().getDublinCoreSchema());
-        DublinCoreExtractor dcExtractor = new DublinCoreExtractor(dcSchema, xmpPreferences, new BibEntry());
+        DublinCoreSchema dcSchema =
+                DublinCoreSchemaCustom.copyDublinCoreSchema(meta.getFirst().getDublinCoreSchema());
+        DublinCoreExtractor dcExtractor =
+                new DublinCoreExtractor(dcSchema, xmpPreferences, new BibEntry());
         Optional<BibEntry> entry = dcExtractor.extractBibtexEntry();
 
-        Path bibFile = Path.of(XmpUtilShared.class.getResource("article_dublinCore_without_day.bib").toURI());
+        Path bibFile =
+                Path.of(
+                        XmpUtilShared.class
+                                .getResource("article_dublinCore_without_day.bib")
+                                .toURI());
         List<BibEntry> expected = testImporter.importDatabase(bibFile).getDatabase().getEntries();
 
         assertEquals(expected, Collections.singletonList(entry.get()));
@@ -73,24 +85,35 @@ void readArticleDublinCoreReadXmp() throws IOException, URISyntaxException {
         Path bibFile = Path.of(XmpUtilShared.class.getResource("article_dublinCore.bib").toURI());
         List<BibEntry> expected = testImporter.importDatabase(bibFile).getDatabase().getEntries();
 
-        expected.forEach(bibEntry -> bibEntry.setFiles(Arrays.asList(
-                new LinkedFile("", Path.of("paper.pdf"), "PDF"),
-                new LinkedFile("", pathPdf.toAbsolutePath(), "PDF"))
-        ));
+        expected.forEach(
+                bibEntry ->
+                        bibEntry.setFiles(
+                                Arrays.asList(
+                                        new LinkedFile("", Path.of("paper.pdf"), "PDF"),
+                                        new LinkedFile("", pathPdf.toAbsolutePath(), "PDF"))));
 
         assertEquals(expected, entries);
     }
 
     @Test
     void readArticleDublinCoreReadXmpPartialDate() throws IOException, URISyntaxException {
-        Path pathPdf = Path.of(XmpUtilShared.class.getResource("article_dublinCore_partial_date.pdf").toURI());
+        Path pathPdf =
+                Path.of(
+                        XmpUtilShared.class
+                                .getResource("article_dublinCore_partial_date.pdf")
+                                .toURI());
         List<BibEntry> entries = xmpUtilReader.readXmp(pathPdf, xmpPreferences);
-        Path bibFile = Path.of(XmpUtilShared.class.getResource("article_dublinCore_partial_date.bib").toURI());
+        Path bibFile =
+                Path.of(
+                        XmpUtilShared.class
+                                .getResource("article_dublinCore_partial_date.bib")
+                                .toURI());
         List<BibEntry> expected = testImporter.importDatabase(bibFile).getDatabase().getEntries();
 
-        expected.forEach(bibEntry -> bibEntry.setFiles(List.of(
-                new LinkedFile("", pathPdf.toAbsolutePath(), "PDF"))
-        ));
+        expected.forEach(
+                bibEntry ->
+                        bibEntry.setFiles(
+                                List.of(new LinkedFile("", pathPdf.toAbsolutePath(), "PDF"))));
 
         assertEquals(expected, entries);
     }
@@ -100,7 +123,10 @@ void readArticleDublinCoreReadXmpPartialDate() throws IOException, URISyntaxExce
      */
     @Test
     void readEmtpyMetadata() throws IOException, URISyntaxException {
-        List<BibEntry> entries = xmpUtilReader.readXmp(Path.of(XmpUtilShared.class.getResource("empty_metadata.pdf").toURI()), xmpPreferences);
+        List<BibEntry> entries =
+                xmpUtilReader.readXmp(
+                        Path.of(XmpUtilShared.class.getResource("empty_metadata.pdf").toURI()),
+                        xmpPreferences);
         assertEquals(Collections.emptyList(), entries);
     }
 
@@ -115,9 +141,10 @@ void readPDMetadata() throws IOException, URISyntaxException {
         Path bibFile = Path.of(XmpUtilShared.class.getResource("PD_metadata.bib").toURI());
         List<BibEntry> expected = testImporter.importDatabase(bibFile).getDatabase().getEntries();
 
-        expected.forEach(bibEntry -> bibEntry.setFiles(List.of(
-                new LinkedFile("", pathPdf.toAbsolutePath(), "PDF"))
-        ));
+        expected.forEach(
+                bibEntry ->
+                        bibEntry.setFiles(
+                                List.of(new LinkedFile("", pathPdf.toAbsolutePath(), "PDF"))));
 
         assertEquals(expected, entries);
     }
@@ -127,7 +154,13 @@ void readPDMetadata() throws IOException, URISyntaxException {
      */
     @Test
     void readNoDescriptionMetadata() throws IOException, URISyntaxException {
-        List<BibEntry> entries = xmpUtilReader.readXmp(Path.of(XmpUtilShared.class.getResource("no_description_metadata.pdf").toURI()), xmpPreferences);
+        List<BibEntry> entries =
+                xmpUtilReader.readXmp(
+                        Path.of(
+                                XmpUtilShared.class
+                                        .getResource("no_description_metadata.pdf")
+                                        .toURI()),
+                        xmpPreferences);
         assertEquals(Collections.emptyList(), entries);
     }
 }
diff --git a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
index 1e06c9ad895f..0adbe3ac1ca6 100644
--- a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
+++ b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
@@ -1,78 +1,81 @@
 package org.jabref.logic.xmp;
 
-import java.nio.file.Path;
-import java.util.List;
+import static org.jabref.logic.xmp.DublinCoreExtractor.DC_COVERAGE;
+import static org.jabref.logic.xmp.DublinCoreExtractor.DC_RIGHTS;
+import static org.jabref.logic.xmp.DublinCoreExtractor.DC_SOURCE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Date;
 import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.jabref.logic.xmp.DublinCoreExtractor.DC_COVERAGE;
-import static org.jabref.logic.xmp.DublinCoreExtractor.DC_RIGHTS;
-import static org.jabref.logic.xmp.DublinCoreExtractor.DC_SOURCE;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Path;
+import java.util.List;
 
 /**
  * This tests the writing to a PDF. If the creation of the RDF content should be checked, please head to {@link org.jabref.logic.exporter.XmpExporterTest}
  */
 class XmpUtilWriterTest {
 
-    @TempDir
-    private Path tempDir;
-
-    private final BibEntry olly2018 = new BibEntry(StandardEntryType.Article)
-            .withCitationKey("Olly2018")
-            .withField(StandardField.AUTHOR, "Olly and Johannes")
-            .withField(StandardField.TITLE, "Stefan's palace")
-            .withField(StandardField.JOURNAL, "Test Journal")
-            .withField(StandardField.VOLUME, "1")
-            .withField(StandardField.NUMBER, "1")
-            .withField(StandardField.PAGES, "1-2")
-            .withMonth(Month.MARCH)
-            .withField(StandardField.ISSN, "978-123-123")
-            .withField(StandardField.NOTE, "NOTE")
-            .withField(StandardField.ABSTRACT, "ABSTRACT")
-            .withField(StandardField.COMMENT, "COMMENT")
-            .withField(StandardField.DOI, "10/3212.3123")
-            .withField(StandardField.FILE, ":article_dublinCore.pdf:PDF")
-            .withField(StandardField.GROUPS, "NO")
-            .withField(StandardField.HOWPUBLISHED, "online")
-            .withField(StandardField.KEYWORDS, "k1, k2")
-            .withField(StandardField.OWNER, "me")
-            .withField(StandardField.REVIEW, "review")
-            .withField(StandardField.URL, "https://www.olly2018.edu");
-
-    private final BibEntry toral2006 = new BibEntry(StandardEntryType.InProceedings)
-            .withField(StandardField.AUTHOR, "Antonio Toral and Rafael Munoz")
-            .withField(StandardField.TITLE, "A proposal to automatically build and maintain gazetteers for Named Entity Recognition by using Wikipedia")
-            .withField(StandardField.BOOKTITLE, "Proceedings of EACL")
-            .withField(StandardField.PAGES, "56--61")
-            .withField(StandardField.EPRINTTYPE, "asdf")
-            .withField(StandardField.OWNER, "Ich")
-            .withField(StandardField.URL, "www.url.de");
-    private final BibEntry vapnik2000 = new BibEntry(StandardEntryType.Book)
-            .withCitationKey("vapnik2000")
-            .withField(StandardField.TITLE, "The Nature of Statistical Learning Theory")
-            .withField(StandardField.PUBLISHER, "Springer Science + Business Media")
-            .withField(StandardField.AUTHOR, "Vladimir N. Vapnik")
-            .withField(StandardField.DOI, "10.1007/978-1-4757-3264-1")
-            .withField(StandardField.OWNER, "Ich")
-            .withField(StandardField.LANGUAGE, "English, Japanese")
-            .withDate(new Date(2000, 5))
-            .withField(new UnknownField(DC_COVERAGE), "coverageField")
-            .withField(new UnknownField(DC_SOURCE), "JabRef")
-            .withField(new UnknownField(DC_RIGHTS), "Right To X");
+    @TempDir private Path tempDir;
+
+    private final BibEntry olly2018 =
+            new BibEntry(StandardEntryType.Article)
+                    .withCitationKey("Olly2018")
+                    .withField(StandardField.AUTHOR, "Olly and Johannes")
+                    .withField(StandardField.TITLE, "Stefan's palace")
+                    .withField(StandardField.JOURNAL, "Test Journal")
+                    .withField(StandardField.VOLUME, "1")
+                    .withField(StandardField.NUMBER, "1")
+                    .withField(StandardField.PAGES, "1-2")
+                    .withMonth(Month.MARCH)
+                    .withField(StandardField.ISSN, "978-123-123")
+                    .withField(StandardField.NOTE, "NOTE")
+                    .withField(StandardField.ABSTRACT, "ABSTRACT")
+                    .withField(StandardField.COMMENT, "COMMENT")
+                    .withField(StandardField.DOI, "10/3212.3123")
+                    .withField(StandardField.FILE, ":article_dublinCore.pdf:PDF")
+                    .withField(StandardField.GROUPS, "NO")
+                    .withField(StandardField.HOWPUBLISHED, "online")
+                    .withField(StandardField.KEYWORDS, "k1, k2")
+                    .withField(StandardField.OWNER, "me")
+                    .withField(StandardField.REVIEW, "review")
+                    .withField(StandardField.URL, "https://www.olly2018.edu");
+
+    private final BibEntry toral2006 =
+            new BibEntry(StandardEntryType.InProceedings)
+                    .withField(StandardField.AUTHOR, "Antonio Toral and Rafael Munoz")
+                    .withField(
+                            StandardField.TITLE,
+                            "A proposal to automatically build and maintain gazetteers for Named Entity Recognition by using Wikipedia")
+                    .withField(StandardField.BOOKTITLE, "Proceedings of EACL")
+                    .withField(StandardField.PAGES, "56--61")
+                    .withField(StandardField.EPRINTTYPE, "asdf")
+                    .withField(StandardField.OWNER, "Ich")
+                    .withField(StandardField.URL, "www.url.de");
+    private final BibEntry vapnik2000 =
+            new BibEntry(StandardEntryType.Book)
+                    .withCitationKey("vapnik2000")
+                    .withField(StandardField.TITLE, "The Nature of Statistical Learning Theory")
+                    .withField(StandardField.PUBLISHER, "Springer Science + Business Media")
+                    .withField(StandardField.AUTHOR, "Vladimir N. Vapnik")
+                    .withField(StandardField.DOI, "10.1007/978-1-4757-3264-1")
+                    .withField(StandardField.OWNER, "Ich")
+                    .withField(StandardField.LANGUAGE, "English, Japanese")
+                    .withDate(new Date(2000, 5))
+                    .withField(new UnknownField(DC_COVERAGE), "coverageField")
+                    .withField(new UnknownField(DC_SOURCE), "JabRef")
+                    .withField(new UnknownField(DC_RIGHTS), "Right To X");
     private XmpPreferences xmpPreferences;
 
     @BeforeEach
@@ -120,7 +123,8 @@ void writeTwoBibEntries(@TempDir Path tempDir) throws Exception {
         Path pdfFile = this.createDefaultFile("JabRef_writeTwo.pdf", tempDir);
         List<BibEntry> entries = List.of(olly2018, toral2006);
         new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), entries, null);
-        List<BibEntry> entryList = new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
+        List<BibEntry> entryList =
+                new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
 
         // the file field is not written - and the read file field contains the PDF file name
         // thus, we do not need to compare
@@ -135,7 +139,8 @@ void writeThreeBibEntries(@TempDir Path tempDir) throws Exception {
         Path pdfFile = this.createDefaultFile("JabRef_writeThree.pdf", tempDir);
         List<BibEntry> entries = List.of(olly2018, vapnik2000, toral2006);
         new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), entries, null);
-        List<BibEntry> entryList = new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
+        List<BibEntry> entryList =
+                new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
 
         // the file field is not written - and the read file field contains the PDF file name
         // thus, we do not need to compare
@@ -148,25 +153,27 @@ void writeThreeBibEntries(@TempDir Path tempDir) throws Exception {
     @Test
     void proctingBracesAreRemovedAtTitle(@TempDir Path tempDir) throws Exception {
         Path pdfFile = this.createDefaultFile("JabRef_writeBraces.pdf", tempDir);
-        BibEntry original = new BibEntry()
-                .withField(StandardField.TITLE, "Some {P}rotected {T}erm");
-        new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), List.of(original), null);
-        List<BibEntry> entryList = new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
+        BibEntry original =
+                new BibEntry().withField(StandardField.TITLE, "Some {P}rotected {T}erm");
+        new XmpUtilWriter(xmpPreferences)
+                .writeXmp(pdfFile.toAbsolutePath(), List.of(original), null);
+        List<BibEntry> entryList =
+                new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
 
         entryList.forEach(entry -> entry.clearField(StandardField.FILE));
 
-        BibEntry expected = new BibEntry()
-                .withField(StandardField.TITLE, "Some Protected Term");
+        BibEntry expected = new BibEntry().withField(StandardField.TITLE, "Some Protected Term");
         assertEquals(List.of(expected), entryList);
     }
 
     @Test
     void proctingBracesAreKeptAtPages(@TempDir Path tempDir) throws Exception {
         Path pdfFile = this.createDefaultFile("JabRef_writeBraces.pdf", tempDir);
-        BibEntry original = new BibEntry()
-                .withField(StandardField.PAGES, "{55}-{99}");
-        new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), List.of(original), null);
-        List<BibEntry> entryList = new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
+        BibEntry original = new BibEntry().withField(StandardField.PAGES, "{55}-{99}");
+        new XmpUtilWriter(xmpPreferences)
+                .writeXmp(pdfFile.toAbsolutePath(), List.of(original), null);
+        List<BibEntry> entryList =
+                new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
 
         entryList.forEach(entry -> entry.clearField(StandardField.FILE));
 
@@ -176,10 +183,11 @@ void proctingBracesAreKeptAtPages(@TempDir Path tempDir) throws Exception {
     @Test
     void doubleDashAtPageNumberIsKept(@TempDir Path tempDir) throws Exception {
         Path pdfFile = this.createDefaultFile("JabRef_writeBraces.pdf", tempDir);
-        BibEntry original = new BibEntry()
-                .withField(StandardField.PAGES, "2--33");
-        new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), List.of(original), null);
-        List<BibEntry> entryList = new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
+        BibEntry original = new BibEntry().withField(StandardField.PAGES, "2--33");
+        new XmpUtilWriter(xmpPreferences)
+                .writeXmp(pdfFile.toAbsolutePath(), List.of(original), null);
+        List<BibEntry> entryList =
+                new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
 
         entryList.forEach(entry -> entry.clearField(StandardField.FILE));
 
@@ -189,8 +197,10 @@ void doubleDashAtPageNumberIsKept(@TempDir Path tempDir) throws Exception {
     @Test
     void singleEntry(@TempDir Path tempDir) throws Exception {
         Path pdfFile = this.createDefaultFile("JabRef.pdf", tempDir);
-        new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), List.of(vapnik2000), null);
-        List<BibEntry> entryList = new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
+        new XmpUtilWriter(xmpPreferences)
+                .writeXmp(pdfFile.toAbsolutePath(), List.of(vapnik2000), null);
+        List<BibEntry> entryList =
+                new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
 
         vapnik2000.clearField(StandardField.FILE);
         entryList.forEach(entry -> entry.clearField(StandardField.FILE));
diff --git a/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java b/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java
index 5a6b17e3bee9..a8175b25b571 100644
--- a/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java
+++ b/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java
@@ -1,7 +1,6 @@
 package org.jabref.migrations;
 
-import java.util.Collections;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.model.entry.BibEntry;
@@ -10,11 +9,11 @@
 import org.jabref.model.groups.ExplicitGroup;
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.groups.GroupTreeNode;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
+import java.util.Optional;
 
 class ConvertLegacyExplicitGroupsTest {
 
diff --git a/src/test/java/org/jabref/migrations/ConvertMarkingToGroupsTest.java b/src/test/java/org/jabref/migrations/ConvertMarkingToGroupsTest.java
index 4a0942b77de2..7df766b5d2c9 100644
--- a/src/test/java/org/jabref/migrations/ConvertMarkingToGroupsTest.java
+++ b/src/test/java/org/jabref/migrations/ConvertMarkingToGroupsTest.java
@@ -1,7 +1,6 @@
 package org.jabref.migrations;
 
-import java.util.Collections;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.groups.DefaultGroupsFactory;
 import org.jabref.logic.importer.ParserResult;
@@ -10,22 +9,24 @@
 import org.jabref.model.groups.ExplicitGroup;
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.groups.GroupTreeNode;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
+import java.util.Optional;
 
 class ConvertMarkingToGroupsTest {
     @Test
     void performMigrationForSingleEntry() {
-        BibEntry entry = new BibEntry()
-                .withField(InternalField.MARKED_INTERNAL, "[Nicolas:6]");
+        BibEntry entry = new BibEntry().withField(InternalField.MARKED_INTERNAL, "[Nicolas:6]");
         ParserResult parserResult = new ParserResult(Collections.singleton(entry));
 
         new ConvertMarkingToGroups().performMigration(parserResult);
 
-        GroupTreeNode rootExpected = GroupTreeNode.fromGroup(DefaultGroupsFactory.getAllEntriesGroup());
-        GroupTreeNode markings = rootExpected.addSubgroup(new ExplicitGroup("Markings", GroupHierarchyType.INCLUDING, ','));
+        GroupTreeNode rootExpected =
+                GroupTreeNode.fromGroup(DefaultGroupsFactory.getAllEntriesGroup());
+        GroupTreeNode markings =
+                rootExpected.addSubgroup(
+                        new ExplicitGroup("Markings", GroupHierarchyType.INCLUDING, ','));
         markings.addSubgroup(new ExplicitGroup("Nicolas:6", GroupHierarchyType.INCLUDING, ','));
 
         assertEquals(Optional.empty(), entry.getField(InternalField.MARKED_INTERNAL));
diff --git a/src/test/java/org/jabref/migrations/GuiPreferencesMigrationsTest.java b/src/test/java/org/jabref/migrations/GuiPreferencesMigrationsTest.java
index b1655808c721..f57a616d93fd 100644
--- a/src/test/java/org/jabref/migrations/GuiPreferencesMigrationsTest.java
+++ b/src/test/java/org/jabref/migrations/GuiPreferencesMigrationsTest.java
@@ -1,38 +1,41 @@
 package org.jabref.migrations;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.prefs.Preferences;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.airhacks.afterburner.injection.Injector;
+import com.github.javakeyring.Keyring;
 
 import org.jabref.gui.preferences.JabRefGuiPreferences;
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.preferences.JabRefCliPreferences;
-
-import com.airhacks.afterburner.injection.Injector;
-import com.github.javakeyring.Keyring;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.prefs.Preferences;
 
 class GuiPreferencesMigrationsTest {
 
     private JabRefGuiPreferences preferences;
     private Preferences mainPrefsNode;
 
-    private final String[] oldStylePatterns = new String[]{"\\bibtexkey",
-            "\\bibtexkey\\begin{title} - \\format[RemoveBrackets]{\\title}\\end{title}"};
-    private final String[] newStylePatterns = new String[]{"[citationkey]",
-            "[citationkey] - [title]"};
+    private final String[] oldStylePatterns =
+            new String[] {
+                "\\bibtexkey",
+                "\\bibtexkey\\begin{title} - \\format[RemoveBrackets]{\\title}\\end{title}"
+            };
+    private final String[] newStylePatterns =
+            new String[] {"[citationkey]", "[citationkey] - [title]"};
 
     @BeforeEach
     void setUp() {
@@ -43,8 +46,10 @@ void setUp() {
 
     @Test
     void oldStyleBibtexkeyPattern0() {
-        when(preferences.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(oldStylePatterns[0]);
-        when(mainPrefsNode.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN, null)).thenReturn(oldStylePatterns[0]);
+        when(preferences.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN))
+                .thenReturn(oldStylePatterns[0]);
+        when(mainPrefsNode.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN, null))
+                .thenReturn(oldStylePatterns[0]);
         when(preferences.hasKey(JabRefCliPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(true);
 
         PreferencesMigrations.upgradeImportFileAndDirePatterns(preferences, mainPrefsNode);
@@ -55,8 +60,10 @@ void oldStyleBibtexkeyPattern0() {
 
     @Test
     void oldStyleBibtexkeyPattern1() {
-        when(preferences.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(oldStylePatterns[1]);
-        when(mainPrefsNode.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN, null)).thenReturn(oldStylePatterns[1]);
+        when(preferences.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN))
+                .thenReturn(oldStylePatterns[1]);
+        when(mainPrefsNode.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN, null))
+                .thenReturn(oldStylePatterns[1]);
         when(preferences.hasKey(JabRefCliPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(true);
 
         PreferencesMigrations.upgradeImportFileAndDirePatterns(preferences, mainPrefsNode);
@@ -69,28 +76,34 @@ void oldStyleBibtexkeyPattern1() {
     void arbitraryBibtexkeyPattern() {
         String arbitraryPattern = "[anyUserPrividedString]";
 
-        when(preferences.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(arbitraryPattern);
-        when(mainPrefsNode.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN, null)).thenReturn(arbitraryPattern);
+        when(preferences.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN))
+                .thenReturn(arbitraryPattern);
+        when(mainPrefsNode.get(JabRefCliPreferences.IMPORT_FILENAMEPATTERN, null))
+                .thenReturn(arbitraryPattern);
 
         PreferencesMigrations.upgradeImportFileAndDirePatterns(preferences, mainPrefsNode);
 
-        verify(preferences, never()).put(JabRefCliPreferences.IMPORT_FILENAMEPATTERN, arbitraryPattern);
-        verify(mainPrefsNode, never()).put(JabRefCliPreferences.IMPORT_FILENAMEPATTERN, arbitraryPattern);
+        verify(preferences, never())
+                .put(JabRefCliPreferences.IMPORT_FILENAMEPATTERN, arbitraryPattern);
+        verify(mainPrefsNode, never())
+                .put(JabRefCliPreferences.IMPORT_FILENAMEPATTERN, arbitraryPattern);
     }
 
     @Test
     void previewStyleReviewToComment() {
-        String oldPreviewStyle = "<font face=\"sans-serif\">__NEWLINE__"
-                + "Customized preview style using reviews and comments:__NEWLINE__"
-                + "\\begin{review}<BR><BR><b>Review: </b> \\format[HTMLChars]{\\review} \\end{review}__NEWLINE__"
-                + "\\begin{comment} Something: \\format[HTMLChars]{\\comment} special \\end{comment}__NEWLINE__"
-                + "</font>__NEWLINE__";
-
-        String newPreviewStyle = "<font face=\"sans-serif\">__NEWLINE__"
-                + "Customized preview style using reviews and comments:__NEWLINE__"
-                + "\\begin{comment}<BR><BR><b>Comment: </b> \\format[Markdown,HTMLChars(keepCurlyBraces)]{\\comment} \\end{comment}__NEWLINE__"
-                + "\\begin{comment} Something: \\format[Markdown,HTMLChars(keepCurlyBraces)]{\\comment} special \\end{comment}__NEWLINE__"
-                + "</font>__NEWLINE__";
+        String oldPreviewStyle =
+                "<font face=\"sans-serif\">__NEWLINE__"
+                        + "Customized preview style using reviews and comments:__NEWLINE__"
+                        + "\\begin{review}<BR><BR><b>Review: </b> \\format[HTMLChars]{\\review} \\end{review}__NEWLINE__"
+                        + "\\begin{comment} Something: \\format[HTMLChars]{\\comment} special \\end{comment}__NEWLINE__"
+                        + "</font>__NEWLINE__";
+
+        String newPreviewStyle =
+                "<font face=\"sans-serif\">__NEWLINE__"
+                        + "Customized preview style using reviews and comments:__NEWLINE__"
+                        + "\\begin{comment}<BR><BR><b>Comment: </b> \\format[Markdown,HTMLChars(keepCurlyBraces)]{\\comment} \\end{comment}__NEWLINE__"
+                        + "\\begin{comment} Something: \\format[Markdown,HTMLChars(keepCurlyBraces)]{\\comment} special \\end{comment}__NEWLINE__"
+                        + "</font>__NEWLINE__";
 
         when(preferences.get(JabRefGuiPreferences.PREVIEW_STYLE)).thenReturn(oldPreviewStyle);
 
@@ -101,11 +114,20 @@ void previewStyleReviewToComment() {
 
     @Test
     void upgradeColumnPreferencesAlreadyMigrated() {
-        List<String> columnNames = Arrays.asList("entrytype", "author/editor", "title", "year", "journal/booktitle", "citationkey", "printed");
+        List<String> columnNames =
+                Arrays.asList(
+                        "entrytype",
+                        "author/editor",
+                        "title",
+                        "year",
+                        "journal/booktitle",
+                        "citationkey",
+                        "printed");
         List<String> columnWidths = Arrays.asList("75", "300", "470", "60", "130", "100", "30");
 
         when(preferences.getStringList(JabRefGuiPreferences.COLUMN_NAMES)).thenReturn(columnNames);
-        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_WIDTHS)).thenReturn(columnWidths);
+        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_WIDTHS))
+                .thenReturn(columnWidths);
 
         PreferencesMigrations.upgradeColumnPreferences(preferences);
 
@@ -115,14 +137,46 @@ void upgradeColumnPreferencesAlreadyMigrated() {
 
     @Test
     void upgradeColumnPreferencesFromWithoutTypes() {
-        List<String> columnNames = Arrays.asList("entrytype", "author/editor", "title", "year", "journal/booktitle", "citationkey", "printed");
+        List<String> columnNames =
+                Arrays.asList(
+                        "entrytype",
+                        "author/editor",
+                        "title",
+                        "year",
+                        "journal/booktitle",
+                        "citationkey",
+                        "printed");
         List<String> columnWidths = Arrays.asList("75", "300", "470", "60", "130", "100", "30");
-        List<String> updatedNames = Arrays.asList("groups", "files", "linked_id", "field:entrytype", "field:author/editor", "field:title", "field:year", "field:journal/booktitle", "field:citationkey", "special:printed");
-        List<String> updatedWidths = Arrays.asList("28", "28", "28", "75", "300", "470", "60", "130", "100", "30");
-        List<String> newSortTypes = Arrays.asList("ASCENDING", "ASCENDING", "ASCENDING", "ASCENDING", "ASCENDING", "ASCENDING", "ASCENDING", "ASCENDING", "ASCENDING", "ASCENDING");
+        List<String> updatedNames =
+                Arrays.asList(
+                        "groups",
+                        "files",
+                        "linked_id",
+                        "field:entrytype",
+                        "field:author/editor",
+                        "field:title",
+                        "field:year",
+                        "field:journal/booktitle",
+                        "field:citationkey",
+                        "special:printed");
+        List<String> updatedWidths =
+                Arrays.asList("28", "28", "28", "75", "300", "470", "60", "130", "100", "30");
+        List<String> newSortTypes =
+                Arrays.asList(
+                        "ASCENDING",
+                        "ASCENDING",
+                        "ASCENDING",
+                        "ASCENDING",
+                        "ASCENDING",
+                        "ASCENDING",
+                        "ASCENDING",
+                        "ASCENDING",
+                        "ASCENDING",
+                        "ASCENDING");
 
         when(preferences.getStringList(JabRefGuiPreferences.COLUMN_NAMES)).thenReturn(columnNames);
-        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_WIDTHS)).thenReturn(columnWidths);
+        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_WIDTHS))
+                .thenReturn(columnWidths);
 
         PreferencesMigrations.upgradeColumnPreferences(preferences);
 
@@ -133,7 +187,15 @@ void upgradeColumnPreferencesFromWithoutTypes() {
 
     @Test
     void changeColumnPreferencesVariableNamesFor51() {
-        List<String> columnNames = Arrays.asList("entrytype", "author/editor", "title", "year", "journal/booktitle", "citationkey", "printed");
+        List<String> columnNames =
+                Arrays.asList(
+                        "entrytype",
+                        "author/editor",
+                        "title",
+                        "year",
+                        "journal/booktitle",
+                        "citationkey",
+                        "printed");
         List<String> columnWidths = Arrays.asList("75", "300", "470", "60", "130", "100", "30");
 
         // The variable names have to be hardcoded, because they have changed between 5.0 and 5.1
@@ -142,10 +204,14 @@ void changeColumnPreferencesVariableNamesFor51() {
         when(preferences.getStringList("mainTableColumnSortTypes")).thenReturn(columnNames);
         when(preferences.getStringList("mainTableColumnSortOrder")).thenReturn(columnWidths);
 
-        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_NAMES)).thenReturn(Collections.emptyList());
-        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_WIDTHS)).thenReturn(Collections.emptyList());
-        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_SORT_TYPES)).thenReturn(Collections.emptyList());
-        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_SORT_ORDER)).thenReturn(Collections.emptyList());
+        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_NAMES))
+                .thenReturn(Collections.emptyList());
+        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_WIDTHS))
+                .thenReturn(Collections.emptyList());
+        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_SORT_TYPES))
+                .thenReturn(Collections.emptyList());
+        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_SORT_ORDER))
+                .thenReturn(Collections.emptyList());
 
         PreferencesMigrations.changeColumnVariableNamesFor51(preferences);
 
@@ -157,7 +223,15 @@ void changeColumnPreferencesVariableNamesFor51() {
 
     @Test
     void changeColumnPreferencesVariableNamesBackwardsCompatibility() {
-        List<String> columnNames = Arrays.asList("entrytype", "author/editor", "title", "year", "journal/booktitle", "citationkey", "printed");
+        List<String> columnNames =
+                Arrays.asList(
+                        "entrytype",
+                        "author/editor",
+                        "title",
+                        "year",
+                        "journal/booktitle",
+                        "citationkey",
+                        "printed");
         List<String> columnWidths = Arrays.asList("75", "300", "470", "60", "130", "100", "30");
 
         // The variable names have to be hardcoded, because they have changed between 5.0 and 5.1
@@ -166,10 +240,14 @@ void changeColumnPreferencesVariableNamesBackwardsCompatibility() {
         when(preferences.getStringList("mainTableColumnSortTypes")).thenReturn(columnNames);
         when(preferences.getStringList("mainTableColumnSortOrder")).thenReturn(columnWidths);
 
-        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_NAMES)).thenReturn(Collections.emptyList());
-        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_WIDTHS)).thenReturn(Collections.emptyList());
-        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_SORT_TYPES)).thenReturn(Collections.emptyList());
-        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_SORT_ORDER)).thenReturn(Collections.emptyList());
+        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_NAMES))
+                .thenReturn(Collections.emptyList());
+        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_WIDTHS))
+                .thenReturn(Collections.emptyList());
+        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_SORT_TYPES))
+                .thenReturn(Collections.emptyList());
+        when(preferences.getStringList(JabRefGuiPreferences.COLUMN_SORT_ORDER))
+                .thenReturn(Collections.emptyList());
 
         PreferencesMigrations.upgradeColumnPreferences(preferences);
 
@@ -181,8 +259,27 @@ void changeColumnPreferencesVariableNamesBackwardsCompatibility() {
 
     @Test
     void restoreColumnVariablesForBackwardCompatibility() {
-        List<String> updatedNames = Arrays.asList("groups", "files", "linked_id", "field:entrytype", "field:author/editor", "field:title", "field:year", "field:journal/booktitle", "field:citationkey", "special:printed");
-        List<String> columnNames = Arrays.asList("entrytype", "author/editor", "title", "year", "journal/booktitle", "citationkey", "printed");
+        List<String> updatedNames =
+                Arrays.asList(
+                        "groups",
+                        "files",
+                        "linked_id",
+                        "field:entrytype",
+                        "field:author/editor",
+                        "field:title",
+                        "field:year",
+                        "field:journal/booktitle",
+                        "field:citationkey",
+                        "special:printed");
+        List<String> columnNames =
+                Arrays.asList(
+                        "entrytype",
+                        "author/editor",
+                        "title",
+                        "year",
+                        "journal/booktitle",
+                        "citationkey",
+                        "printed");
         List<String> columnWidths = Arrays.asList("100", "100", "100", "100", "100", "100", "100");
 
         when(preferences.getStringList("columnNames")).thenReturn(updatedNames);
@@ -205,11 +302,14 @@ void moveApiKeysToKeyRing() throws Exception {
         final String V5_9_FETCHER_CUSTOM_KEYS = "fetcherCustomKeys";
         final Keyring keyring = mock(Keyring.class);
 
-        when(preferences.getStringList(V5_9_FETCHER_CUSTOM_KEY_NAMES)).thenReturn(List.of("FetcherA", "FetcherB", "FetcherC"));
-        when(preferences.getStringList(V5_9_FETCHER_CUSTOM_KEYS)).thenReturn(List.of("KeyA", "KeyB", "KeyC"));
+        when(preferences.getStringList(V5_9_FETCHER_CUSTOM_KEY_NAMES))
+                .thenReturn(List.of("FetcherA", "FetcherB", "FetcherC"));
+        when(preferences.getStringList(V5_9_FETCHER_CUSTOM_KEYS))
+                .thenReturn(List.of("KeyA", "KeyB", "KeyC"));
         when(preferences.getInternalPreferences().getUserAndHost()).thenReturn("user-host");
 
-        try (MockedStatic<Keyring> keyringFactory = Mockito.mockStatic(Keyring.class, Answers.RETURNS_DEEP_STUBS)) {
+        try (MockedStatic<Keyring> keyringFactory =
+                Mockito.mockStatic(Keyring.class, Answers.RETURNS_DEEP_STUBS)) {
             keyringFactory.when(Keyring::create).thenReturn(keyring);
 
             PreferencesMigrations.moveApiKeysToKeyring(preferences);
diff --git a/src/test/java/org/jabref/migrations/MergeReviewIntoCommentActionMigrationTest.java b/src/test/java/org/jabref/migrations/MergeReviewIntoCommentActionMigrationTest.java
index 46c3b61a0ed9..92ed8623fc08 100644
--- a/src/test/java/org/jabref/migrations/MergeReviewIntoCommentActionMigrationTest.java
+++ b/src/test/java/org/jabref/migrations/MergeReviewIntoCommentActionMigrationTest.java
@@ -1,17 +1,16 @@
 package org.jabref.migrations;
 
-import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Collections;
 
 class MergeReviewIntoCommentActionMigrationTest {
 
@@ -44,7 +43,9 @@ void reviewField() {
 
         action.performMigration(actualParserResult);
 
-        assertEquals(expectedEntry, actualParserResult.getDatabase().getEntryByCitationKey("Entry1").get());
+        assertEquals(
+                expectedEntry,
+                actualParserResult.getDatabase().getEntryByCitationKey("Entry1").get());
     }
 
     @Test
@@ -68,22 +69,29 @@ void multiLineReviewField() {
 
         action.performMigration(actualParserResult);
 
-        assertEquals(expectedEntry, actualParserResult.getDatabase().getEntryByCitationKey("Entry1").get());
+        assertEquals(
+                expectedEntry,
+                actualParserResult.getDatabase().getEntryByCitationKey("Entry1").get());
     }
 
     @Test
-    @Disabled("Re-enable if the MergeReviewIntoCommentMigration.mergeCommentFieldIfPresent() does not block and wait for user input.")
+    @Disabled(
+            "Re-enable if the MergeReviewIntoCommentMigration.mergeCommentFieldIfPresent() does not block and wait for user input.")
     void reviewAndCommentField() {
         entry.setField(StandardField.REVIEW, "My Review");
         entry.setField(StandardField.COMMENT, "My Comment");
 
         ParserResult actualParserResult = new ParserResult(Collections.singletonList(entry));
 
-        expectedEntry.setField(StandardField.COMMENT, "My Comment\n" + Localization.lang("Review") + ":\nMy Review");
+        expectedEntry.setField(
+                StandardField.COMMENT,
+                "My Comment\n" + Localization.lang("Review") + ":\nMy Review");
 
         action.performMigration(actualParserResult);
 
-        assertEquals(expectedEntry, actualParserResult.getDatabase().getEntryByCitationKey("Entry1").get());
+        assertEquals(
+                expectedEntry,
+                actualParserResult.getDatabase().getEntryByCitationKey("Entry1").get());
     }
 
     private BibEntry createMinimalBibEntry() {
diff --git a/src/test/java/org/jabref/migrations/SearchToLuceneMigrationTest.java b/src/test/java/org/jabref/migrations/SearchToLuceneMigrationTest.java
index 37ee05fb358c..2ed64d6816f8 100644
--- a/src/test/java/org/jabref/migrations/SearchToLuceneMigrationTest.java
+++ b/src/test/java/org/jabref/migrations/SearchToLuceneMigrationTest.java
@@ -1,50 +1,67 @@
 package org.jabref.migrations;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class SearchToLuceneMigrationTest {
 
     public static Stream<Arguments> transformationNormal() {
         return Stream.of(
-                // If "any:" should not be added, see e46e0a23d7b9526bd449cbecfb189ae6dbc40a28 for a fix
+                // If "any:" should not be added, see e46e0a23d7b9526bd449cbecfb189ae6dbc40a28 for a
+                // fix
                 Arguments.of("any:chocolate", "chocolate"),
-
                 Arguments.of("title:chocolate", "title=chocolate"),
-                Arguments.of("title:chocolate OR author:smith", "title = chocolate or author = smith"),
+                Arguments.of(
+                        "title:chocolate OR author:smith", "title = chocolate or author = smith"),
                 Arguments.of("groups:\\/exclude", "groups= /exclude"),
-                Arguments.of("title:chocolate AND author:smith", "title = \"chocolate\" AND author = \"smith\""),
-                Arguments.of("title:chocolate AND author:smith", "title contains \"chocolate\" AND author matches \"smith\""),
-                Arguments.of("( title:chocolate ) OR ( author:smith )", "(title == chocolate) or (author == smith)"),
-                Arguments.of("( title:chocolate OR author:smith ) AND ( year:2024 )", "(title contains chocolate or author matches smith) AND (year = 2024)"),
+                Arguments.of(
+                        "title:chocolate AND author:smith",
+                        "title = \"chocolate\" AND author = \"smith\""),
+                Arguments.of(
+                        "title:chocolate AND author:smith",
+                        "title contains \"chocolate\" AND author matches \"smith\""),
+                Arguments.of(
+                        "( title:chocolate ) OR ( author:smith )",
+                        "(title == chocolate) or (author == smith)"),
+                Arguments.of(
+                        "( title:chocolate OR author:smith ) AND ( year:2024 )",
+                        "(title contains chocolate or author matches smith) AND (year = 2024)"),
                 Arguments.of("any:video AND year:1932", "video and year == 1932"),
                 Arguments.of("title:neighbou?r", "title =neighbou?r"),
                 Arguments.of("abstract:model\\{1,2\\}ing", "abstract = model{1,2}ing"),
                 Arguments.of("any:* AND -title:chocolate", "title != chocolate"),
                 Arguments.of("any:* AND -title:chocolate", "not title contains chocolate"),
                 // https://github.com/JabRef/jabref/issues/11654#issuecomment-2313178736
-                Arguments.of("( groups:\\:paywall AND -file:/.+/ ) AND -groups:\\/exclude", "groups=:paywall and file!=\"\" and groups!=/exclude"),
-
-                Arguments.of("( any:* AND -( groups:alpha ) ) AND ( any:* AND -( groups:beta ) )", "NOT(groups=alpha) AND NOT(groups=beta)"),
+                Arguments.of(
+                        "( groups:\\:paywall AND -file:/.+/ ) AND -groups:\\/exclude",
+                        "groups=:paywall and file!=\"\" and groups!=/exclude"),
+                Arguments.of(
+                        "( any:* AND -( groups:alpha ) ) AND ( any:* AND -( groups:beta ) )",
+                        "NOT(groups=alpha) AND NOT(groups=beta)"),
                 // not converted, because not working in JabRef 5.x
-                // Arguments.of("title:\"image processing\" OR keywords:\"image processing\"", "title|keywords = \"image processing\""),
+                // Arguments.of("title:\"image processing\" OR keywords:\"image processing\"",
+                // "title|keywords = \"image processing\""),
 
                 // not converted, because wrong syntax for JabRef 5.x
-                // Arguments.of("( author:miller OR title:\"image processing\" OR keywords:\"image processing\" ) AND NOT author:brown AND NOT author:blue", "(author = miller or title|keywords = \"image processing\") and not author = brown and != author = blue"),
+                // Arguments.of("( author:miller OR title:\"image processing\" OR keywords:\"image
+                // processing\" ) AND NOT author:brown AND NOT author:blue", "(author = miller or
+                // title|keywords = \"image processing\") and not author = brown and != author =
+                // blue"),
 
                 // String with a space
-                Arguments.of("title:image\\ processing AND author:smith", "title = \"image processing\" AND author= smith"),
+                Arguments.of(
+                        "title:image\\ processing AND author:smith",
+                        "title = \"image processing\" AND author= smith"),
 
                 // We renamed fields
                 Arguments.of("any:somecontent", "anyfield = somecontent"),
                 Arguments.of("keywords:somekeyword", "anykeyword = somekeyword"),
-                Arguments.of("citationkey:somebibtexkey", "key = somebibtexkey")
-        );
+                Arguments.of("citationkey:somebibtexkey", "key = somebibtexkey"));
     }
 
     @ParameterizedTest
@@ -57,11 +74,13 @@ void transformationNormal(String expected, String query) {
     public static Stream<Arguments> transformationRegularExpression() {
         return Stream.of(
                 Arguments.of("any:* AND -groups:/.+/", "groups != .+"),
-                Arguments.of("( any:* AND -groups:/.+/ ) AND ( any:* AND -readstatus:/.+/ )", "groups != .+ and readstatus != .+"),
-                Arguments.of("author:/(John|Doe).+(John|Doe)/", "author = \"(John|Doe).+(John|Doe)\""),
+                Arguments.of(
+                        "( any:* AND -groups:/.+/ ) AND ( any:* AND -readstatus:/.+/ )",
+                        "groups != .+ and readstatus != .+"),
+                Arguments.of(
+                        "author:/(John|Doe).+(John|Doe)/", "author = \"(John|Doe).+(John|Doe)\""),
                 Arguments.of("any:/rev*/", "anyfield=rev*"),
-                Arguments.of("any:/*rev*/", "anyfield=*rev*")
-        );
+                Arguments.of("any:/*rev*/", "anyfield=*rev*"));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/migrations/SpecialFieldsToSeparateFieldsTest.java b/src/test/java/org/jabref/migrations/SpecialFieldsToSeparateFieldsTest.java
index 11dbc262077d..5d7ea6929003 100644
--- a/src/test/java/org/jabref/migrations/SpecialFieldsToSeparateFieldsTest.java
+++ b/src/test/java/org/jabref/migrations/SpecialFieldsToSeparateFieldsTest.java
@@ -1,19 +1,18 @@
 package org.jabref.migrations;
 
-import java.util.List;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.List;
+import java.util.stream.Stream;
 
 class SpecialFieldsToSeparateFieldsTest {
 
@@ -29,10 +28,14 @@ void migrateToCorrectField(SpecialField field, String fieldInKeyword, BibEntry e
 
     @Test
     void noKewordToMigrate() {
-        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "JabRef")
-                                       .withField(StandardField.KEYWORDS, "tdd");
-        BibEntry expected = new BibEntry().withField(StandardField.AUTHOR, "JabRef")
-                                          .withField(StandardField.KEYWORDS, "tdd");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "JabRef")
+                        .withField(StandardField.KEYWORDS, "tdd");
+        BibEntry expected =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "JabRef")
+                        .withField(StandardField.KEYWORDS, "tdd");
 
         new SpecialFieldsToSeparateFields(',').performMigration(new ParserResult(List.of(entry)));
 
@@ -41,10 +44,14 @@ void noKewordToMigrate() {
 
     @Test
     void noKeywordToMigrateButDuplicateKeywords() {
-        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "JabRef")
-                                       .withField(StandardField.KEYWORDS, "asdf, asdf, asdf");
-        BibEntry expected = new BibEntry().withField(StandardField.AUTHOR, "JabRef")
-                                          .withField(StandardField.KEYWORDS, "asdf, asdf, asdf");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "JabRef")
+                        .withField(StandardField.KEYWORDS, "asdf, asdf, asdf");
+        BibEntry expected =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "JabRef")
+                        .withField(StandardField.KEYWORDS, "asdf, asdf, asdf");
 
         new SpecialFieldsToSeparateFields(',').performMigration(new ParserResult(List.of(entry)));
 
@@ -53,11 +60,15 @@ void noKeywordToMigrateButDuplicateKeywords() {
 
     @Test
     void migrateMultipleSpecialFields() {
-        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "JabRef")
-                                       .withField(StandardField.KEYWORDS, "printed, prio1");
-        BibEntry expected = new BibEntry().withField(StandardField.AUTHOR, "JabRef")
-                                          .withField(SpecialField.PRINTED, "printed")
-                                          .withField(SpecialField.PRIORITY, "prio1");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "JabRef")
+                        .withField(StandardField.KEYWORDS, "printed, prio1");
+        BibEntry expected =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "JabRef")
+                        .withField(SpecialField.PRINTED, "printed")
+                        .withField(SpecialField.PRIORITY, "prio1");
 
         new SpecialFieldsToSeparateFields(',').performMigration(new ParserResult(List.of(entry)));
 
@@ -66,12 +77,16 @@ void migrateMultipleSpecialFields() {
 
     @Test
     void migrateSpecialFieldsMixedWithKeyword() {
-        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "JabRef")
-                                       .withField(StandardField.KEYWORDS, "tdd, prio1, SE");
+        BibEntry entry =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "JabRef")
+                        .withField(StandardField.KEYWORDS, "tdd, prio1, SE");
 
-        BibEntry expected = new BibEntry().withField(StandardField.AUTHOR, "JabRef")
-                                          .withField(StandardField.KEYWORDS, "tdd, SE")
-                                          .withField(SpecialField.PRIORITY, "prio1");
+        BibEntry expected =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "JabRef")
+                        .withField(StandardField.KEYWORDS, "tdd, SE")
+                        .withField(SpecialField.PRIORITY, "prio1");
 
         new SpecialFieldsToSeparateFields(',').performMigration(new ParserResult(List.of(entry)));
 
@@ -81,24 +96,28 @@ void migrateSpecialFieldsMixedWithKeyword() {
     private static Stream<Arguments> provideKeywordFieldPairs() {
         return Stream.of(
                 Arguments.of(
-                        SpecialField.PRINTED, "printed", new BibEntry().withField(SpecialField.PRINTED, "printed")
-                ),
+                        SpecialField.PRINTED,
+                        "printed",
+                        new BibEntry().withField(SpecialField.PRINTED, "printed")),
                 Arguments.of(
-                        SpecialField.PRIORITY, "prio1", new BibEntry().withField(SpecialField.PRIORITY, "prio1")
-                ),
+                        SpecialField.PRIORITY,
+                        "prio1",
+                        new BibEntry().withField(SpecialField.PRIORITY, "prio1")),
                 Arguments.of(
-                        SpecialField.QUALITY, "qualityAssured", new BibEntry().withField(SpecialField.QUALITY, "qualityAssured")
-                ),
+                        SpecialField.QUALITY,
+                        "qualityAssured",
+                        new BibEntry().withField(SpecialField.QUALITY, "qualityAssured")),
                 Arguments.of(
-                        SpecialField.RANKING, "rank2", new BibEntry().withField(SpecialField.RANKING, "rank2")
-                ),
+                        SpecialField.RANKING,
+                        "rank2",
+                        new BibEntry().withField(SpecialField.RANKING, "rank2")),
                 Arguments.of(
-                        SpecialField.READ_STATUS, "skimmed", new BibEntry().withField(SpecialField.READ_STATUS, "skimmed")
-                ),
+                        SpecialField.READ_STATUS,
+                        "skimmed",
+                        new BibEntry().withField(SpecialField.READ_STATUS, "skimmed")),
                 Arguments.of(
-                        SpecialField.RELEVANCE, "relevant", new BibEntry().withField(SpecialField.RELEVANCE, "relevant")
-                )
-        );
+                        SpecialField.RELEVANCE,
+                        "relevant",
+                        new BibEntry().withField(SpecialField.RELEVANCE, "relevant")));
     }
 }
-
diff --git a/src/test/java/org/jabref/model/FieldChangeTest.java b/src/test/java/org/jabref/model/FieldChangeTest.java
index b2a6b77f64ba..9b80730ef238 100644
--- a/src/test/java/org/jabref/model/FieldChangeTest.java
+++ b/src/test/java/org/jabref/model/FieldChangeTest.java
@@ -1,24 +1,24 @@
 package org.jabref.model;
 
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.StandardField;
-
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.junit.jupiter.api.Test;
+
 class FieldChangeTest {
 
-    private BibEntry entry = new BibEntry()
-            .withField(StandardField.DOI, "foo");
+    private BibEntry entry = new BibEntry().withField(StandardField.DOI, "foo");
     private BibEntry entryOther = new BibEntry();
     private FieldChange fc = new FieldChange(entry, StandardField.DOI, "foo", "bar");
 
     @Test
     void fieldChangeOnNullEntryNotAllowed() {
-        assertThrows(NullPointerException.class, () -> new FieldChange(null, StandardField.DOI, "foo", "bar"));
+        assertThrows(
+                NullPointerException.class,
+                () -> new FieldChange(null, StandardField.DOI, "foo", "bar"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/TreeNodeTest.java b/src/test/java/org/jabref/model/TreeNodeTest.java
index 7044fa5cc0c5..15d8a5bb1843 100644
--- a/src/test/java/org/jabref/model/TreeNodeTest.java
+++ b/src/test/java/org/jabref/model/TreeNodeTest.java
@@ -1,14 +1,5 @@
 package org.jabref.model;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Consumer;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -17,6 +8,15 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+
 class TreeNodeTest {
 
     Consumer<TreeNodeTestData.TreeNodeMock> subscriber;
@@ -53,12 +53,16 @@ void getIndexedPathFromRootReturnsEmptyListForRoot() {
 
     @Test
     void getIndexedPathFromRootSimplePath() {
-        assertEquals(Arrays.asList(1, 0), TreeNodeTestData.getNodeInSimpleTree().getIndexedPathFromRoot());
+        assertEquals(
+                Arrays.asList(1, 0),
+                TreeNodeTestData.getNodeInSimpleTree().getIndexedPathFromRoot());
     }
 
     @Test
     void getIndexedPathFromRootComplexPath() {
-        assertEquals(Arrays.asList(2, 1, 0), TreeNodeTestData.getNodeInComplexTree().getIndexedPathFromRoot());
+        assertEquals(
+                Arrays.asList(2, 1, 0),
+                TreeNodeTestData.getNodeInComplexTree().getIndexedPathFromRoot());
     }
 
     @Test
@@ -616,14 +620,20 @@ void removeChildIndexSomewhereInTreeInvokesChangeEvent() {
     @Test
     void findChildrenWithSameName() throws Exception {
         TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock("A");
-        TreeNodeTestData.TreeNodeMock childB = root.addChild(new TreeNodeTestData.TreeNodeMock("B"));
-        TreeNodeTestData.TreeNodeMock node = childB.addChild(new TreeNodeTestData.TreeNodeMock("A"));
-        TreeNodeTestData.TreeNodeMock childA = root.addChild(new TreeNodeTestData.TreeNodeMock("A"));
+        TreeNodeTestData.TreeNodeMock childB =
+                root.addChild(new TreeNodeTestData.TreeNodeMock("B"));
+        TreeNodeTestData.TreeNodeMock node =
+                childB.addChild(new TreeNodeTestData.TreeNodeMock("A"));
+        TreeNodeTestData.TreeNodeMock childA =
+                root.addChild(new TreeNodeTestData.TreeNodeMock("A"));
 
-        assertEquals(Arrays.asList(root, node, childA), root.findChildrenSatisfying(treeNode -> "A".equals(treeNode.getName())));
+        assertEquals(
+                Arrays.asList(root, node, childA),
+                root.findChildrenSatisfying(treeNode -> "A".equals(treeNode.getName())));
     }
 
-    private static class WrongTreeNodeImplementation extends TreeNode<TreeNodeTestData.TreeNodeMock> {
+    private static class WrongTreeNodeImplementation
+            extends TreeNode<TreeNodeTestData.TreeNodeMock> {
 
         // This class is a wrong derived class of TreeNode<T>
         // since it does not extends TreeNode<WrongTreeNodeImplementation>
diff --git a/src/test/java/org/jabref/model/TreeNodeTestData.java b/src/test/java/org/jabref/model/TreeNodeTestData.java
index 0df7c6f35537..4059bf46e72e 100644
--- a/src/test/java/org/jabref/model/TreeNodeTestData.java
+++ b/src/test/java/org/jabref/model/TreeNodeTestData.java
@@ -86,9 +86,7 @@ public void setName(String name) {
 
         @Override
         public String toString() {
-            return "TreeNodeMock{" +
-                    "name='" + name + '\'' +
-                    '}';
+            return "TreeNodeMock{" + "name='" + name + '\'' + '}';
         }
 
         @Override
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java b/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
index 4af7d610682c..e4f408fb9758 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
@@ -1,8 +1,9 @@
 package org.jabref.model.database;
 
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.gui.desktop.os.NativeDesktop;
@@ -11,14 +12,12 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.metadata.MetaData;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
 
 @AllowedToUseLogic("Needs access to OS class")
 class BibDatabaseContextTest {
@@ -47,7 +46,9 @@ void getFileDirectoriesWithRelativeDbParent() {
 
         BibDatabaseContext database = new BibDatabaseContext();
         database.setDatabasePath(file);
-        assertEquals(List.of(currentWorkingDir.resolve(file.getParent())), database.getFileDirectories(fileDirPrefs));
+        assertEquals(
+                List.of(currentWorkingDir.resolve(file.getParent())),
+                database.getFileDirectories(fileDirPrefs));
     }
 
     @Test
@@ -56,7 +57,9 @@ void getFileDirectoriesWithRelativeDottedDbParent() {
 
         BibDatabaseContext database = new BibDatabaseContext();
         database.setDatabasePath(file);
-        assertEquals(List.of(currentWorkingDir.resolve(file.getParent())), database.getFileDirectories(fileDirPrefs));
+        assertEquals(
+                List.of(currentWorkingDir.resolve(file.getParent())),
+                database.getFileDirectories(fileDirPrefs));
     }
 
     @Test
@@ -74,7 +77,9 @@ void getFileDirectoriesWithAbsoluteDbParent() {
 
         BibDatabaseContext database = new BibDatabaseContext();
         database.setDatabasePath(file);
-        assertEquals(List.of(currentWorkingDir.resolve(file.getParent())), database.getFileDirectories(fileDirPrefs));
+        assertEquals(
+                List.of(currentWorkingDir.resolve(file.getParent())),
+                database.getFileDirectories(fileDirPrefs));
     }
 
     @Test
@@ -84,11 +89,11 @@ void getFileDirectoriesWithRelativeMetadata() {
         BibDatabaseContext database = new BibDatabaseContext();
         database.setDatabasePath(file);
         database.getMetaData().setDefaultFileDirectory("../Literature");
-        assertEquals(List.of(
+        assertEquals(
+                List.of(
                         // first directory originates from the metadata
                         Path.of("/absolute/Literature").toAbsolutePath(),
-                        Path.of("/absolute/subdir").toAbsolutePath()
-                ),
+                        Path.of("/absolute/subdir").toAbsolutePath()),
                 database.getFileDirectories(fileDirPrefs));
     }
 
@@ -99,11 +104,11 @@ void getFileDirectoriesWithMetadata() {
         BibDatabaseContext database = new BibDatabaseContext();
         database.setDatabasePath(file);
         database.getMetaData().setDefaultFileDirectory("Literature");
-        assertEquals(List.of(
+        assertEquals(
+                List.of(
                         // first directory originates from the metadata
                         Path.of("/absolute/subdir/Literature").toAbsolutePath(),
-                        Path.of("/absolute/subdir").toAbsolutePath()
-                ),
+                        Path.of("/absolute/subdir").toAbsolutePath()),
                 database.getFileDirectories(fileDirPrefs));
     }
 
@@ -120,7 +125,8 @@ void getUserFileDirectoryIfAllAreEmpty() {
 
     @Test
     void typeBasedOnDefaultBiblatex() {
-        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(new BibDatabase(), new MetaData());
+        BibDatabaseContext bibDatabaseContext =
+                new BibDatabaseContext(new BibDatabase(), new MetaData());
         assertEquals(BibDatabaseMode.BIBLATEX, bibDatabaseContext.getMode());
 
         bibDatabaseContext.setMode(BibDatabaseMode.BIBLATEX);
@@ -129,7 +135,8 @@ void typeBasedOnDefaultBiblatex() {
 
     @Test
     void typeBasedOnDefaultBibtex() {
-        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(new BibDatabase(), new MetaData());
+        BibDatabaseContext bibDatabaseContext =
+                new BibDatabaseContext(new BibDatabase(), new MetaData());
         assertEquals(BibDatabaseMode.BIBLATEX, bibDatabaseContext.getMode());
 
         bibDatabaseContext.setMode(BibDatabaseMode.BIBTEX);
@@ -168,7 +175,8 @@ void getFullTextIndexPathWhenPathIsNotNull() {
         assertNotNull(actualPath);
 
         String fulltextIndexBaseDirectory = Directories.getFulltextIndexBaseDirectory().toString();
-        String actualPathStart = actualPath.toString().substring(0, fulltextIndexBaseDirectory.length());
+        String actualPathStart =
+                actualPath.toString().substring(0, fulltextIndexBaseDirectory.length());
         assertEquals(fulltextIndexBaseDirectory, actualPathStart);
     }
 }
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java b/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
index 6c204cdf5245..a6e3e0cea66a 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
@@ -1,17 +1,16 @@
 package org.jabref.model.database;
 
-import java.util.Arrays;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.entry.types.UnknownEntryType;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Arrays;
+import java.util.List;
 
 class BibDatabaseModeDetectionTest {
 
@@ -21,7 +20,9 @@ class BibDatabaseModeDetectionTest {
     void detectBiblatex() {
         List<BibEntry> entries = Arrays.asList(new BibEntry(StandardEntryType.MvBook));
 
-        assertEquals(BibDatabaseMode.BIBLATEX, BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
+        assertEquals(
+                BibDatabaseMode.BIBLATEX,
+                BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
     }
 
     @Test
@@ -30,7 +31,9 @@ void detectUndistinguishableAsBibtex() {
         entry.setField(StandardField.TITLE, "My cool paper");
         List<BibEntry> entries = Arrays.asList(entry);
 
-        assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
+        assertEquals(
+                BibDatabaseMode.BIBTEX,
+                BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
     }
 
     @Test
@@ -41,7 +44,9 @@ void detectMixedModeAsBiblatex() {
         biblatex.setField(StandardField.TRANSLATOR, "Stefan Kolb");
         List<BibEntry> entries = Arrays.asList(bibtex, biblatex);
 
-        assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
+        assertEquals(
+                BibDatabaseMode.BIBTEX,
+                BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
     }
 
     @Test
@@ -49,7 +54,9 @@ void detectUnknownTypeAsBibtex() {
         BibEntry entry = new BibEntry(UNKNOWN_TYPE);
         List<BibEntry> entries = Arrays.asList(entry);
 
-        assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
+        assertEquals(
+                BibDatabaseMode.BIBTEX,
+                BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
     }
 
     @Test
@@ -59,7 +66,9 @@ void ignoreUnknownTypesForBibtexDecision() {
         BibEntry biblatex = new BibEntry(StandardEntryType.Article);
         List<BibEntry> entries = Arrays.asList(custom, bibtex, biblatex);
 
-        assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
+        assertEquals(
+                BibDatabaseMode.BIBTEX,
+                BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
     }
 
     @Test
@@ -69,6 +78,8 @@ void ignoreUnknownTypesForBiblatexDecision() {
         BibEntry biblatex = new BibEntry(StandardEntryType.MvBook);
         List<BibEntry> entries = Arrays.asList(custom, bibtex, biblatex);
 
-        assertEquals(BibDatabaseMode.BIBLATEX, BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
+        assertEquals(
+                BibDatabaseMode.BIBLATEX,
+                BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
     }
 }
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseTest.java b/src/test/java/org/jabref/model/database/BibDatabaseTest.java
index b3ce97fb4401..ec1bca6f356f 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseTest.java
@@ -1,14 +1,10 @@
 package org.jabref.model.database;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibtexString;
@@ -16,15 +12,18 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.event.EventListenerTest;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 
 class BibDatabaseTest {
 
@@ -392,8 +391,7 @@ void resolveForStringsOddHashMarkAtTheEnd() {
 
     @Test
     void getUsedStrings() {
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.AUTHOR, "#AAA#");
+        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "#AAA#");
         BibtexString tripleA = new BibtexString("AAA", "Some other #BBB#");
         BibtexString tripleB = new BibtexString("BBB", "Some more text");
         BibtexString tripleC = new BibtexString("CCC", "Even more text");
@@ -406,14 +404,14 @@ void getUsedStrings() {
         database.addString(tripleC);
         database.insertEntry(entry);
 
-        Set<BibtexString> usedStrings = new HashSet<>(database.getUsedStrings(Collections.singletonList(entry)));
+        Set<BibtexString> usedStrings =
+                new HashSet<>(database.getUsedStrings(Collections.singletonList(entry)));
         assertEquals(stringSet, usedStrings);
     }
 
     @Test
     void getUsedStringsSingleString() {
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.AUTHOR, "#AAA#");
+        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "#AAA#");
         BibtexString tripleA = new BibtexString("AAA", "Some other text");
         BibtexString tripleB = new BibtexString("BBB", "Some more text");
         List<BibtexString> strings = new ArrayList<>(1);
@@ -423,18 +421,19 @@ void getUsedStringsSingleString() {
         database.addString(tripleB);
         database.insertEntry(entry);
 
-        List<BibtexString> usedStrings = (List<BibtexString>) database.getUsedStrings(Collections.singletonList(entry));
+        List<BibtexString> usedStrings =
+                (List<BibtexString>) database.getUsedStrings(Collections.singletonList(entry));
         assertEquals(strings, usedStrings);
     }
 
     @Test
     void getUsedStringsNoString() {
-        BibEntry entry = new BibEntry()
-                .withField(StandardField.AUTHOR, "Oscar Gustafsson");
+        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "Oscar Gustafsson");
         BibtexString string = new BibtexString("AAA", "Some other text");
         database.addString(string);
         database.insertEntry(entry);
-        Collection<BibtexString> usedStrings = database.getUsedStrings(Collections.singletonList(entry));
+        Collection<BibtexString> usedStrings =
+                database.getUsedStrings(Collections.singletonList(entry));
         assertEquals(Collections.emptyList(), usedStrings);
     }
 
@@ -445,7 +444,9 @@ void getEntriesSortedWithTwoEntries() {
         BibEntry entryA = new BibEntry(StandardEntryType.Article);
         entryB.setId("1");
         database.insertEntries(entryB, entryA);
-        assertEquals(Arrays.asList(entryA, entryB), database.getEntriesSorted(Comparator.comparing(BibEntry::getId)));
+        assertEquals(
+                Arrays.asList(entryA, entryB),
+                database.getEntriesSorted(Comparator.comparing(BibEntry::getId)));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java b/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java
index deea1130357f..ff5a7de6af39 100644
--- a/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java
+++ b/src/test/java/org/jabref/model/database/DuplicationCheckerTest.java
@@ -1,12 +1,11 @@
 package org.jabref.model.database;
 
-import org.jabref.model.entry.BibEntry;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.model.entry.BibEntry;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class DuplicationCheckerTest {
 
     private BibDatabase database;
diff --git a/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java b/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java
index 3607758901ca..2012f5dd3b11 100644
--- a/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java
+++ b/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java
@@ -1,17 +1,16 @@
 package org.jabref.model.database;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
 
 class KeyChangeListenerTest {
 
diff --git a/src/test/java/org/jabref/model/entry/AuthorListTest.java b/src/test/java/org/jabref/model/entry/AuthorListTest.java
index 90216475e536..81ff96b50eca 100644
--- a/src/test/java/org/jabref/model/entry/AuthorListTest.java
+++ b/src/test/java/org/jabref/model/entry/AuthorListTest.java
@@ -1,12 +1,5 @@
 package org.jabref.model.entry;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Optional;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -15,6 +8,13 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Optional;
+
 /**
  * Other parsing tests are available in {@link org.jabref.logic.importer.AuthorListParserTest}
  */
@@ -28,19 +28,22 @@ public class AuthorListTest {
             new Author("Mu{\\d{h}}ammad", "M.", null, "al-Khw{\\={a}}rizm{\\={i}}", null);
     private static final Author CORRADO_BOHM =
             new Author("Corrado", "C.", null, "B{\\\"o}hm", null);
-    private static final Author KURT_GODEL =
-            new Author("Kurt", "K.", null, "G{\\\"{o}}del", null);
+    private static final Author KURT_GODEL = new Author("Kurt", "K.", null, "G{\\\"{o}}del", null);
     private static final Author BANU_MOSA =
             new Author(null, null, null, "{The Ban\\={u} M\\={u}s\\={a} brothers}", null);
     private static final AuthorList EMPTY_AUTHOR = AuthorList.of(Collections.emptyList());
     private static final AuthorList ONE_AUTHOR_WITH_LATEX = AuthorList.of(MUHAMMAD_ALKHWARIZMI);
-    private static final AuthorList TWO_AUTHORS_WITH_LATEX = AuthorList.of(MUHAMMAD_ALKHWARIZMI, CORRADO_BOHM);
-    private static final AuthorList THREE_AUTHORS_WITH_LATEX = AuthorList.of(MUHAMMAD_ALKHWARIZMI, CORRADO_BOHM, KURT_GODEL);
+    private static final AuthorList TWO_AUTHORS_WITH_LATEX =
+            AuthorList.of(MUHAMMAD_ALKHWARIZMI, CORRADO_BOHM);
+    private static final AuthorList THREE_AUTHORS_WITH_LATEX =
+            AuthorList.of(MUHAMMAD_ALKHWARIZMI, CORRADO_BOHM, KURT_GODEL);
     private static final AuthorList ONE_INSTITUTION_WITH_LATEX = AuthorList.of(BANU_MOSA);
-    private static final AuthorList ONE_INSTITUTION_WITH_STARTING_PARANTHESIS = AuthorList.of(new Author(
-            null, null, null, "{{\\L{}}ukasz Micha\\l{}}", null));
-    private static final AuthorList TWO_INSTITUTIONS_WITH_LATEX = AuthorList.of(BANU_MOSA, BANU_MOSA);
-    private static final AuthorList MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX = AuthorList.of(BANU_MOSA, CORRADO_BOHM);
+    private static final AuthorList ONE_INSTITUTION_WITH_STARTING_PARANTHESIS =
+            AuthorList.of(new Author(null, null, null, "{{\\L{}}ukasz Micha\\l{}}", null));
+    private static final AuthorList TWO_INSTITUTIONS_WITH_LATEX =
+            AuthorList.of(BANU_MOSA, BANU_MOSA);
+    private static final AuthorList MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX =
+            AuthorList.of(BANU_MOSA, CORRADO_BOHM);
 
     public static int size(String bibtex) {
         return AuthorList.parse(bibtex).getNumberOfAuthors();
@@ -50,10 +53,13 @@ public static int size(String bibtex) {
     void fixAuthorNatbib() {
         assertEquals("", AuthorList.fixAuthorNatbib(""));
         assertEquals("Smith", AuthorList.fixAuthorNatbib("John Smith"));
-        assertEquals("Smith and Black Brown", AuthorList
-                .fixAuthorNatbib("John Smith and Black Brown, Peter"));
-        assertEquals("von Neumann et al.", AuthorList
-                .fixAuthorNatbib("John von Neumann and John Smith and Black Brown, Peter"));
+        assertEquals(
+                "Smith and Black Brown",
+                AuthorList.fixAuthorNatbib("John Smith and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann et al.",
+                AuthorList.fixAuthorNatbib(
+                        "John von Neumann and John Smith and Black Brown, Peter"));
     }
 
     @Test
@@ -63,43 +69,43 @@ void getAsNatbibLatexFreeEmptyAuthorStringForEmptyInput() {
 
     @Test
     void getAsNatbibLatexFreeUnicodeOneAuthorNameFromLatex() {
-        assertEquals("al-Khwārizmī",
-                ONE_AUTHOR_WITH_LATEX.latexFree().getAsNatbib());
+        assertEquals("al-Khwārizmī", ONE_AUTHOR_WITH_LATEX.latexFree().getAsNatbib());
     }
 
     @Test
     void getAsNatbibLatexFreeUnicodeTwoAuthorNamesFromLatex() {
-        assertEquals("al-Khwārizmī and Böhm",
-                TWO_AUTHORS_WITH_LATEX.latexFree().getAsNatbib());
+        assertEquals("al-Khwārizmī and Böhm", TWO_AUTHORS_WITH_LATEX.latexFree().getAsNatbib());
     }
 
     @Test
     void getAsNatbibLatexFreeUnicodeAuthorEtAlFromLatex() {
-        assertEquals("al-Khwārizmī et al.",
-                THREE_AUTHORS_WITH_LATEX.latexFree().getAsNatbib());
+        assertEquals("al-Khwārizmī et al.", THREE_AUTHORS_WITH_LATEX.latexFree().getAsNatbib());
     }
 
     @Test
     void getAsNatbibLatexFreeUnicodeOneInsitutionNameFromLatex() {
-        assertEquals("The Banū Mūsā brothers",
-                ONE_INSTITUTION_WITH_LATEX.latexFree().getAsNatbib());
+        assertEquals(
+                "The Banū Mūsā brothers", ONE_INSTITUTION_WITH_LATEX.latexFree().getAsNatbib());
     }
 
     @Test
     void getAsNatbibLatexFreeUnicodeTwoInsitutionNameFromLatex() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
+        assertEquals(
+                "The Banū Mūsā brothers and The Banū Mūsā brothers",
                 TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsNatbib());
     }
 
     @Test
     void getAsNatbibLatexFreeUnicodeMixedAuthorsFromLatex() {
-        assertEquals("The Banū Mūsā brothers and Böhm",
+        assertEquals(
+                "The Banū Mūsā brothers and Böhm",
                 MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsNatbib());
     }
 
     @Test
     void getAsNatbibLatexFreeOneInstitutionWithParanthesisAtStart() {
-        assertEquals("Łukasz Michał",
+        assertEquals(
+                "Łukasz Michał",
                 ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsNatbib());
     }
 
@@ -125,62 +131,80 @@ void fixAuthorFirstNameFirstCommas() {
         assertEquals("", AuthorList.fixAuthorFirstNameFirstCommas("", true, false));
         assertEquals("", AuthorList.fixAuthorFirstNameFirstCommas("", false, false));
 
-        assertEquals("John Smith", AuthorList.fixAuthorFirstNameFirstCommas("John Smith",
-                false, false));
-        assertEquals("J. Smith", AuthorList.fixAuthorFirstNameFirstCommas("John Smith", true,
-                false));
+        assertEquals(
+                "John Smith", AuthorList.fixAuthorFirstNameFirstCommas("John Smith", false, false));
+        assertEquals(
+                "J. Smith", AuthorList.fixAuthorFirstNameFirstCommas("John Smith", true, false));
 
         // Check caching
-        assertEquals(AuthorList.fixAuthorFirstNameFirstCommas(
-                "John von Neumann and John Smith and Black Brown, Peter", true, false), AuthorList
-                .fixAuthorFirstNameFirstCommas("John von Neumann and John Smith and Black Brown, Peter", true, false));
+        assertEquals(
+                AuthorList.fixAuthorFirstNameFirstCommas(
+                        "John von Neumann and John Smith and Black Brown, Peter", true, false),
+                AuthorList.fixAuthorFirstNameFirstCommas(
+                        "John von Neumann and John Smith and Black Brown, Peter", true, false));
 
-        assertEquals("John Smith and Peter Black Brown", AuthorList
-                .fixAuthorFirstNameFirstCommas("John Smith and Black Brown, Peter", false, false));
-        assertEquals("J. Smith and P. Black Brown", AuthorList.fixAuthorFirstNameFirstCommas(
-                "John Smith and Black Brown, Peter", true, false));
+        assertEquals(
+                "John Smith and Peter Black Brown",
+                AuthorList.fixAuthorFirstNameFirstCommas(
+                        "John Smith and Black Brown, Peter", false, false));
+        assertEquals(
+                "J. Smith and P. Black Brown",
+                AuthorList.fixAuthorFirstNameFirstCommas(
+                        "John Smith and Black Brown, Peter", true, false));
 
         // Method description is different from code -> additional comma
         // there
-        assertEquals("John von Neumann, John Smith and Peter Black Brown", AuthorList
-                .fixAuthorFirstNameFirstCommas(
+        assertEquals(
+                "John von Neumann, John Smith and Peter Black Brown",
+                AuthorList.fixAuthorFirstNameFirstCommas(
                         "John von Neumann and John Smith and Black Brown, Peter", false, false));
-        assertEquals("J. von Neumann, J. Smith and P. Black Brown", AuthorList
-                .fixAuthorFirstNameFirstCommas(
+        assertEquals(
+                "J. von Neumann, J. Smith and P. Black Brown",
+                AuthorList.fixAuthorFirstNameFirstCommas(
                         "John von Neumann and John Smith and Black Brown, Peter", true, false));
 
-        assertEquals("J. P. von Neumann", AuthorList.fixAuthorFirstNameFirstCommas(
-                "John Peter von Neumann", true, false));
+        assertEquals(
+                "J. P. von Neumann",
+                AuthorList.fixAuthorFirstNameFirstCommas("John Peter von Neumann", true, false));
         // Oxford Commas
         assertEquals("", AuthorList.fixAuthorFirstNameFirstCommas("", true, true));
         assertEquals("", AuthorList.fixAuthorFirstNameFirstCommas("", false, true));
 
-        assertEquals("John Smith", AuthorList.fixAuthorFirstNameFirstCommas("John Smith",
-                false, true));
-        assertEquals("J. Smith", AuthorList.fixAuthorFirstNameFirstCommas("John Smith", true,
-                true));
+        assertEquals(
+                "John Smith", AuthorList.fixAuthorFirstNameFirstCommas("John Smith", false, true));
+        assertEquals(
+                "J. Smith", AuthorList.fixAuthorFirstNameFirstCommas("John Smith", true, true));
 
         // Check caching
-        assertEquals(AuthorList.fixAuthorFirstNameFirstCommas(
-                "John von Neumann and John Smith and Black Brown, Peter", true, true), AuthorList
-                .fixAuthorFirstNameFirstCommas("John von Neumann and John Smith and Black Brown, Peter", true, true));
+        assertEquals(
+                AuthorList.fixAuthorFirstNameFirstCommas(
+                        "John von Neumann and John Smith and Black Brown, Peter", true, true),
+                AuthorList.fixAuthorFirstNameFirstCommas(
+                        "John von Neumann and John Smith and Black Brown, Peter", true, true));
 
-        assertEquals("John Smith and Peter Black Brown", AuthorList
-                .fixAuthorFirstNameFirstCommas("John Smith and Black Brown, Peter", false, true));
-        assertEquals("J. Smith and P. Black Brown", AuthorList.fixAuthorFirstNameFirstCommas(
-                "John Smith and Black Brown, Peter", true, true));
+        assertEquals(
+                "John Smith and Peter Black Brown",
+                AuthorList.fixAuthorFirstNameFirstCommas(
+                        "John Smith and Black Brown, Peter", false, true));
+        assertEquals(
+                "J. Smith and P. Black Brown",
+                AuthorList.fixAuthorFirstNameFirstCommas(
+                        "John Smith and Black Brown, Peter", true, true));
 
         // Method description is different than code -> additional comma
         // there
-        assertEquals("John von Neumann, John Smith, and Peter Black Brown", AuthorList
-                .fixAuthorFirstNameFirstCommas(
+        assertEquals(
+                "John von Neumann, John Smith, and Peter Black Brown",
+                AuthorList.fixAuthorFirstNameFirstCommas(
                         "John von Neumann and John Smith and Black Brown, Peter", false, true));
-        assertEquals("J. von Neumann, J. Smith, and P. Black Brown", AuthorList
-                .fixAuthorFirstNameFirstCommas(
+        assertEquals(
+                "J. von Neumann, J. Smith, and P. Black Brown",
+                AuthorList.fixAuthorFirstNameFirstCommas(
                         "John von Neumann and John Smith and Black Brown, Peter", true, true));
 
-        assertEquals("J. P. von Neumann", AuthorList.fixAuthorFirstNameFirstCommas(
-                "John Peter von Neumann", true, true));
+        assertEquals(
+                "J. P. von Neumann",
+                AuthorList.fixAuthorFirstNameFirstCommas("John Peter von Neumann", true, true));
     }
 
     @Test
@@ -190,55 +214,69 @@ void getAsFirstLastNamesLatexFreeEmptyAuthorStringForEmptyInputAbbreviate() {
 
     @Test
     void getAsFirstLastNamesLatexFreeUnicodeOneAuthorNameFromLatexAbbreviate() {
-        assertEquals("M. al-Khwārizmī",
+        assertEquals(
+                "M. al-Khwārizmī",
                 ONE_AUTHOR_WITH_LATEX.latexFree().getAsFirstLastNames(true, false));
     }
 
     @Test
     void getAsFirstLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatexAbbreviate() {
-        assertEquals("M. al-Khwārizmī and C. Böhm",
+        assertEquals(
+                "M. al-Khwārizmī and C. Böhm",
                 TWO_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(true, false));
     }
 
     @Test
     void getAsFirstLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatexAbbreviateAndOxfordComma() {
-        assertEquals("M. al-Khwārizmī and C. Böhm",
+        assertEquals(
+                "M. al-Khwārizmī and C. Böhm",
                 TWO_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(true, true));
     }
 
     @Test
     void getAsFirstLastNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbreviate() {
-        assertEquals("M. al-Khwārizmī, C. Böhm and K. Gödel",
+        assertEquals(
+                "M. al-Khwārizmī, C. Böhm and K. Gödel",
                 THREE_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(true, false));
     }
 
     @Test
     void getAsFirstLastNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbreviateAndOxfordComma() {
-        assertEquals("M. al-Khwārizmī, C. Böhm, and K. Gödel",
+        assertEquals(
+                "M. al-Khwārizmī, C. Böhm, and K. Gödel",
                 THREE_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(true, true));
     }
 
     @Test
     void getAsFirstLastNamesLatexFreeUnicodeOneInsitutionNameFromLatexAbbreviate() {
-        assertEquals("The Banū Mūsā brothers", ONE_INSTITUTION_WITH_LATEX.latexFree().getAsFirstLastNames(true, false));
+        assertEquals(
+                "The Banū Mūsā brothers",
+                ONE_INSTITUTION_WITH_LATEX.latexFree().getAsFirstLastNames(true, false));
     }
 
     @Test
     void getAsFirstLastNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbreviate() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
+        assertEquals(
+                "The Banū Mūsā brothers and The Banū Mūsā brothers",
                 TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsFirstLastNames(true, false));
     }
 
     @Test
     void getAsFirstLastNamesLatexFreeUnicodeMixedAuthorsFromLatexAbbreviate() {
-        assertEquals("The Banū Mūsā brothers and C. Böhm",
-                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsFirstLastNames(true, false));
+        assertEquals(
+                "The Banū Mūsā brothers and C. Böhm",
+                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX
+                        .latexFree()
+                        .getAsFirstLastNames(true, false));
     }
 
     @Test
     void getAsFirstLastNamesLatexFreeOneInstitutionWithParanthesisAtStartAbbreviate() {
-        assertEquals("Łukasz Michał",
-                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsFirstLastNames(true, false));
+        assertEquals(
+                "Łukasz Michał",
+                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS
+                        .latexFree()
+                        .getAsFirstLastNames(true, false));
     }
 
     @Test
@@ -248,63 +286,80 @@ void getAsFirstLastNamesLatexFreeEmptyAuthorStringForEmptyInput() {
 
     @Test
     void getAsFirstLastNamesLatexFreeUnicodeOneAuthorNameFromLatex() {
-        assertEquals("Muḥammad al-Khwārizmī",
+        assertEquals(
+                "Muḥammad al-Khwārizmī",
                 ONE_AUTHOR_WITH_LATEX.latexFree().getAsFirstLastNames(false, false));
     }
 
     @Test
     void getAsFirstLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatex() {
-        assertEquals("Muḥammad al-Khwārizmī and Corrado Böhm",
+        assertEquals(
+                "Muḥammad al-Khwārizmī and Corrado Böhm",
                 TWO_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(false, false));
     }
 
     @Test
     void getAsFirstLastNamesLatexFreeThreeUnicodeAuthorsFromLatex() {
-        assertEquals("Muḥammad al-Khwārizmī, Corrado Böhm and Kurt Gödel",
+        assertEquals(
+                "Muḥammad al-Khwārizmī, Corrado Böhm and Kurt Gödel",
                 THREE_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(false, false));
     }
 
     @Test
     void getAsFirstLastNamesLatexFreeUnicodeOneInsitutionNameFromLatex() {
-        assertEquals("The Banū Mūsā brothers",
+        assertEquals(
+                "The Banū Mūsā brothers",
                 ONE_INSTITUTION_WITH_LATEX.latexFree().getAsFirstLastNames(false, false));
     }
 
     @Test
     void getAsFirstLastNamesLatexFreeUnicodeTwoInsitutionNameFromLatex() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
+        assertEquals(
+                "The Banū Mūsā brothers and The Banū Mūsā brothers",
                 TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsFirstLastNames(false, false));
     }
 
     @Test
     void getAsFirstLastNamesLatexFreeUnicodeMixedAuthorsFromLatex() {
-        assertEquals("The Banū Mūsā brothers and Corrado Böhm",
-                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsFirstLastNames(false, false));
+        assertEquals(
+                "The Banū Mūsā brothers and Corrado Böhm",
+                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX
+                        .latexFree()
+                        .getAsFirstLastNames(false, false));
     }
 
     @Test
     void getAsFirstLastNamesLatexFreeOneInstitutionWithParanthesisAtStart() {
-        assertEquals("Łukasz Michał",
-                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsFirstLastNames(false, false));
+        assertEquals(
+                "Łukasz Michał",
+                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS
+                        .latexFree()
+                        .getAsFirstLastNames(false, false));
     }
 
     @Test
     void fixAuthorFirstNameFirst() {
         assertEquals("John Smith", AuthorList.fixAuthorFirstNameFirst("John Smith"));
 
-        assertEquals("John Smith and Peter Black Brown", AuthorList
-                .fixAuthorFirstNameFirst("John Smith and Black Brown, Peter"));
+        assertEquals(
+                "John Smith and Peter Black Brown",
+                AuthorList.fixAuthorFirstNameFirst("John Smith and Black Brown, Peter"));
 
-        assertEquals("John von Neumann and John Smith and Peter Black Brown", AuthorList
-                .fixAuthorFirstNameFirst("John von Neumann and John Smith and Black Brown, Peter"));
+        assertEquals(
+                "John von Neumann and John Smith and Peter Black Brown",
+                AuthorList.fixAuthorFirstNameFirst(
+                        "John von Neumann and John Smith and Black Brown, Peter"));
 
-        assertEquals("First von Last, Jr. III", AuthorList
-                .fixAuthorFirstNameFirst("von Last, Jr. III, First"));
+        assertEquals(
+                "First von Last, Jr. III",
+                AuthorList.fixAuthorFirstNameFirst("von Last, Jr. III, First"));
 
         // Check caching
-        assertEquals(AuthorList
-                .fixAuthorFirstNameFirst("John von Neumann and John Smith and Black Brown, Peter"), AuthorList
-                .fixAuthorFirstNameFirst("John von Neumann and John Smith and Black Brown, Peter"));
+        assertEquals(
+                AuthorList.fixAuthorFirstNameFirst(
+                        "John von Neumann and John Smith and Black Brown, Peter"),
+                AuthorList.fixAuthorFirstNameFirst(
+                        "John von Neumann and John Smith and Black Brown, Peter"));
     }
 
     @Test
@@ -313,28 +368,41 @@ void fixAuthorLastNameFirstCommasNoComma() {
         assertEquals("", AuthorList.fixAuthorLastNameFirstCommas("", true, false));
         assertEquals("", AuthorList.fixAuthorLastNameFirstCommas("", false, false));
 
-        assertEquals("Smith, John", AuthorList.fixAuthorLastNameFirstCommas("John Smith", false, false));
-        assertEquals("Smith, J.", AuthorList.fixAuthorLastNameFirstCommas("John Smith", true, false));
+        assertEquals(
+                "Smith, John", AuthorList.fixAuthorLastNameFirstCommas("John Smith", false, false));
+        assertEquals(
+                "Smith, J.", AuthorList.fixAuthorLastNameFirstCommas("John Smith", true, false));
 
-        String a = AuthorList.fixAuthorLastNameFirstCommas("John von Neumann and John Smith and Black Brown, Peter",
-                true, false);
-        String b = AuthorList.fixAuthorLastNameFirstCommas(
-                "John von Neumann and John Smith and Black Brown, Peter", true, false);
+        String a =
+                AuthorList.fixAuthorLastNameFirstCommas(
+                        "John von Neumann and John Smith and Black Brown, Peter", true, false);
+        String b =
+                AuthorList.fixAuthorLastNameFirstCommas(
+                        "John von Neumann and John Smith and Black Brown, Peter", true, false);
 
         // Check caching
         assertEquals(a, b);
 
-        assertEquals("Smith, John and Black Brown, Peter",
-                AuthorList.fixAuthorLastNameFirstCommas("John Smith and Black Brown, Peter", false, false));
-        assertEquals("Smith, J. and Black Brown, P.",
-                AuthorList.fixAuthorLastNameFirstCommas("John Smith and Black Brown, Peter", true, false));
+        assertEquals(
+                "Smith, John and Black Brown, Peter",
+                AuthorList.fixAuthorLastNameFirstCommas(
+                        "John Smith and Black Brown, Peter", false, false));
+        assertEquals(
+                "Smith, J. and Black Brown, P.",
+                AuthorList.fixAuthorLastNameFirstCommas(
+                        "John Smith and Black Brown, Peter", true, false));
 
-        assertEquals("von Neumann, John, Smith, John and Black Brown, Peter", AuthorList
-                .fixAuthorLastNameFirstCommas("John von Neumann and John Smith and Black Brown, Peter", false, false));
-        assertEquals("von Neumann, J., Smith, J. and Black Brown, P.", AuthorList
-                .fixAuthorLastNameFirstCommas("John von Neumann and John Smith and Black Brown, Peter", true, false));
+        assertEquals(
+                "von Neumann, John, Smith, John and Black Brown, Peter",
+                AuthorList.fixAuthorLastNameFirstCommas(
+                        "John von Neumann and John Smith and Black Brown, Peter", false, false));
+        assertEquals(
+                "von Neumann, J., Smith, J. and Black Brown, P.",
+                AuthorList.fixAuthorLastNameFirstCommas(
+                        "John von Neumann and John Smith and Black Brown, Peter", true, false));
 
-        assertEquals("von Neumann, J. P.",
+        assertEquals(
+                "von Neumann, J. P.",
                 AuthorList.fixAuthorLastNameFirstCommas("John Peter von Neumann", true, false));
     }
 
@@ -344,33 +412,43 @@ void fixAuthorLastNameFirstCommasOxfordComma() {
         assertEquals("", AuthorList.fixAuthorLastNameFirstCommas("", true, true));
         assertEquals("", AuthorList.fixAuthorLastNameFirstCommas("", false, true));
 
-        assertEquals("Smith, John", AuthorList.fixAuthorLastNameFirstCommas("John Smith",
-                false, true));
-        assertEquals("Smith, J.", AuthorList.fixAuthorLastNameFirstCommas("John Smith", true,
-                true));
+        assertEquals(
+                "Smith, John", AuthorList.fixAuthorLastNameFirstCommas("John Smith", false, true));
+        assertEquals(
+                "Smith, J.", AuthorList.fixAuthorLastNameFirstCommas("John Smith", true, true));
 
-        String a = AuthorList.fixAuthorLastNameFirstCommas(
-                "John von Neumann and John Smith and Black Brown, Peter", true, true);
-        String b = AuthorList.fixAuthorLastNameFirstCommas("John von Neumann and John Smith and Black Brown, Peter", true, true);
+        String a =
+                AuthorList.fixAuthorLastNameFirstCommas(
+                        "John von Neumann and John Smith and Black Brown, Peter", true, true);
+        String b =
+                AuthorList.fixAuthorLastNameFirstCommas(
+                        "John von Neumann and John Smith and Black Brown, Peter", true, true);
 
         // Check caching
         assertEquals(a, b);
         // assertSame(a, b);
 
-        assertEquals("Smith, John and Black Brown, Peter", AuthorList
-                .fixAuthorLastNameFirstCommas("John Smith and Black Brown, Peter", false, true));
-        assertEquals("Smith, J. and Black Brown, P.", AuthorList.fixAuthorLastNameFirstCommas(
-                "John Smith and Black Brown, Peter", true, true));
+        assertEquals(
+                "Smith, John and Black Brown, Peter",
+                AuthorList.fixAuthorLastNameFirstCommas(
+                        "John Smith and Black Brown, Peter", false, true));
+        assertEquals(
+                "Smith, J. and Black Brown, P.",
+                AuthorList.fixAuthorLastNameFirstCommas(
+                        "John Smith and Black Brown, Peter", true, true));
 
-        assertEquals("von Neumann, John, Smith, John, and Black Brown, Peter", AuthorList
-                .fixAuthorLastNameFirstCommas(
+        assertEquals(
+                "von Neumann, John, Smith, John, and Black Brown, Peter",
+                AuthorList.fixAuthorLastNameFirstCommas(
                         "John von Neumann and John Smith and Black Brown, Peter", false, true));
-        assertEquals("von Neumann, J., Smith, J., and Black Brown, P.", AuthorList
-                .fixAuthorLastNameFirstCommas(
+        assertEquals(
+                "von Neumann, J., Smith, J., and Black Brown, P.",
+                AuthorList.fixAuthorLastNameFirstCommas(
                         "John von Neumann and John Smith and Black Brown, Peter", true, true));
 
-        assertEquals("von Neumann, J. P.", AuthorList.fixAuthorLastNameFirstCommas(
-                "John Peter von Neumann", true, true));
+        assertEquals(
+                "von Neumann, J. P.",
+                AuthorList.fixAuthorLastNameFirstCommas("John Peter von Neumann", true, true));
     }
 
     @Test
@@ -380,44 +458,55 @@ void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInputAbbr() {
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeOneAuthorNameFromLatexAbbr() {
-        assertEquals("al-Khwārizmī, M.",
+        assertEquals(
+                "al-Khwārizmī, M.",
                 ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastFirstNames(true, false));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeTwoAuthorNamesFromLatexAbbr() {
-        assertEquals("al-Khwārizmī, M. and Böhm, C.",
+        assertEquals(
+                "al-Khwārizmī, M. and Böhm, C.",
                 TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(true, false));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbr() {
-        assertEquals("al-Khwārizmī, M., Böhm, C. and Gödel, K.",
+        assertEquals(
+                "al-Khwārizmī, M., Böhm, C. and Gödel, K.",
                 THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(true, false));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatexAbbr() {
-        assertEquals("The Banū Mūsā brothers",
+        assertEquals(
+                "The Banū Mūsā brothers",
                 ONE_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(true, false));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbr() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
+        assertEquals(
+                "The Banū Mūsā brothers and The Banū Mūsā brothers",
                 TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsLastFirstNames(true, false));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatexAbbr() {
-        assertEquals("The Banū Mūsā brothers and Böhm, C.",
-                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(true, false));
+        assertEquals(
+                "The Banū Mūsā brothers and Böhm, C.",
+                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX
+                        .latexFree()
+                        .getAsLastFirstNames(true, false));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeOneInstitutionWithParanthesisAtStartAbbr() {
-        assertEquals("Łukasz Michał",
-                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsLastFirstNames(true, false));
+        assertEquals(
+                "Łukasz Michał",
+                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS
+                        .latexFree()
+                        .getAsLastFirstNames(true, false));
     }
 
     @Test
@@ -427,44 +516,55 @@ void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInput() {
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeOneAuthorNameFromLatex() {
-        assertEquals("al-Khwārizmī, Muḥammad",
+        assertEquals(
+                "al-Khwārizmī, Muḥammad",
                 ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastFirstNames(false, false));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeTwoAuthorNamesFromLatex() {
-        assertEquals("al-Khwārizmī, Muḥammad and Böhm, Corrado",
+        assertEquals(
+                "al-Khwārizmī, Muḥammad and Böhm, Corrado",
                 TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(false, false));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatex() {
-        assertEquals("al-Khwārizmī, Muḥammad, Böhm, Corrado and Gödel, Kurt",
+        assertEquals(
+                "al-Khwārizmī, Muḥammad, Böhm, Corrado and Gödel, Kurt",
                 THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(false, false));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatex() {
-        assertEquals("The Banū Mūsā brothers",
+        assertEquals(
+                "The Banū Mūsā brothers",
                 ONE_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(false, false));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatex() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
+        assertEquals(
+                "The Banū Mūsā brothers and The Banū Mūsā brothers",
                 TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsLastFirstNames(false, false));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatex() {
-        assertEquals("The Banū Mūsā brothers and Böhm, Corrado",
-                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(false, false));
+        assertEquals(
+                "The Banū Mūsā brothers and Böhm, Corrado",
+                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX
+                        .latexFree()
+                        .getAsLastFirstNames(false, false));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeOneInstitutionWithParanthesisAtStart() {
-        assertEquals("Łukasz Michał",
-                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsLastFirstNames(false, false));
+        assertEquals(
+                "Łukasz Michał",
+                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS
+                        .latexFree()
+                        .getAsLastFirstNames(false, false));
     }
 
     @Test
@@ -474,44 +574,55 @@ void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInputAbbrOxfordComma()
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeOneAuthorNameFromLatexAbbrOxfordComma() {
-        assertEquals("al-Khwārizmī, M.",
+        assertEquals(
+                "al-Khwārizmī, M.",
                 ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastFirstNames(true, true));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeTwoAuthorNamesFromLatexAbbrOxfordComma() {
-        assertEquals("al-Khwārizmī, M. and Böhm, C.",
+        assertEquals(
+                "al-Khwārizmī, M. and Böhm, C.",
                 TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(true, true));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbrOxfordComma() {
-        assertEquals("al-Khwārizmī, M., Böhm, C., and Gödel, K.",
+        assertEquals(
+                "al-Khwārizmī, M., Böhm, C., and Gödel, K.",
                 THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(true, true));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatexAbbrOxfordComma() {
-        assertEquals("The Banū Mūsā brothers",
+        assertEquals(
+                "The Banū Mūsā brothers",
                 ONE_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(true, true));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbrOxfordComma() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
+        assertEquals(
+                "The Banū Mūsā brothers and The Banū Mūsā brothers",
                 TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsLastFirstNames(true, true));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatexAbbrOxfordComma() {
-        assertEquals("The Banū Mūsā brothers and Böhm, C.",
-                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(true, true));
+        assertEquals(
+                "The Banū Mūsā brothers and Böhm, C.",
+                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX
+                        .latexFree()
+                        .getAsLastFirstNames(true, true));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeOneInstitutionWithParanthesisAtStartAbbrOxfordComma() {
-        assertEquals("Łukasz Michał",
-                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsLastFirstNames(true, true));
+        assertEquals(
+                "Łukasz Michał",
+                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS
+                        .latexFree()
+                        .getAsLastFirstNames(true, true));
     }
 
     @Test
@@ -521,44 +632,55 @@ void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInputOxfordComma() {
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeOneAuthorNameFromLatexOxfordComma() {
-        assertEquals("al-Khwārizmī, Muḥammad",
+        assertEquals(
+                "al-Khwārizmī, Muḥammad",
                 ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastFirstNames(false, true));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeTwoAuthorNamesFromLatexOxfordComma() {
-        assertEquals("al-Khwārizmī, Muḥammad and Böhm, Corrado",
+        assertEquals(
+                "al-Khwārizmī, Muḥammad and Böhm, Corrado",
                 TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(false, true));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatexOxfordComma() {
-        assertEquals("al-Khwārizmī, Muḥammad, Böhm, Corrado, and Gödel, Kurt",
+        assertEquals(
+                "al-Khwārizmī, Muḥammad, Böhm, Corrado, and Gödel, Kurt",
                 THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(false, true));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatexOxfordComma() {
-        assertEquals("The Banū Mūsā brothers",
+        assertEquals(
+                "The Banū Mūsā brothers",
                 ONE_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(false, true));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatexOxfordComma() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
+        assertEquals(
+                "The Banū Mūsā brothers and The Banū Mūsā brothers",
                 TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsLastFirstNames(false, true));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatexOxfordComma() {
-        assertEquals("The Banū Mūsā brothers and Böhm, Corrado",
-                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(false, true));
+        assertEquals(
+                "The Banū Mūsā brothers and Böhm, Corrado",
+                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX
+                        .latexFree()
+                        .getAsLastFirstNames(false, true));
     }
 
     @Test
     void getAsLastFirstNamesLatexFreeOneInstitutionWithParanthesisAtStartOxfordComma() {
-        assertEquals("Łukasz Michał",
-                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsLastFirstNames(false, true));
+        assertEquals(
+                "Łukasz Michał",
+                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS
+                        .latexFree()
+                        .getAsLastFirstNames(false, true));
     }
 
     @Test
@@ -567,52 +689,66 @@ void fixAuthorLastNameFirst() {
 
         assertEquals("Smith, John", AuthorList.fixAuthorLastNameFirst("John Smith"));
 
-        assertEquals("Smith, John and Black Brown, Peter", AuthorList
-                .fixAuthorLastNameFirst("John Smith and Black Brown, Peter"));
+        assertEquals(
+                "Smith, John and Black Brown, Peter",
+                AuthorList.fixAuthorLastNameFirst("John Smith and Black Brown, Peter"));
 
-        assertEquals("von Neumann, John and Smith, John and Black Brown, Peter", AuthorList
-                .fixAuthorLastNameFirst("John von Neumann and John Smith and Black Brown, Peter"));
+        assertEquals(
+                "von Neumann, John and Smith, John and Black Brown, Peter",
+                AuthorList.fixAuthorLastNameFirst(
+                        "John von Neumann and John Smith and Black Brown, Peter"));
 
-        assertEquals("von Last, Jr, First", AuthorList
-                .fixAuthorLastNameFirst("von Last, Jr ,First"));
+        assertEquals(
+                "von Last, Jr, First", AuthorList.fixAuthorLastNameFirst("von Last, Jr ,First"));
 
-        assertEquals(AuthorList
-                .fixAuthorLastNameFirst("John von Neumann and John Smith and Black Brown, Peter"), AuthorList
-                .fixAuthorLastNameFirst("John von Neumann and John Smith and Black Brown, Peter"));
+        assertEquals(
+                AuthorList.fixAuthorLastNameFirst(
+                        "John von Neumann and John Smith and Black Brown, Peter"),
+                AuthorList.fixAuthorLastNameFirst(
+                        "John von Neumann and John Smith and Black Brown, Peter"));
 
         // Test Abbreviation == false
         assertEquals("Smith, John", AuthorList.fixAuthorLastNameFirst("John Smith", false));
 
-        assertEquals("Smith, John and Black Brown, Peter", AuthorList.fixAuthorLastNameFirst(
-                "John Smith and Black Brown, Peter", false));
+        assertEquals(
+                "Smith, John and Black Brown, Peter",
+                AuthorList.fixAuthorLastNameFirst("John Smith and Black Brown, Peter", false));
 
-        assertEquals("von Neumann, John and Smith, John and Black Brown, Peter", AuthorList
-                .fixAuthorLastNameFirst("John von Neumann and John Smith and Black Brown, Peter",
-                        false));
+        assertEquals(
+                "von Neumann, John and Smith, John and Black Brown, Peter",
+                AuthorList.fixAuthorLastNameFirst(
+                        "John von Neumann and John Smith and Black Brown, Peter", false));
 
-        assertEquals("von Last, Jr, First", AuthorList.fixAuthorLastNameFirst(
-                "von Last, Jr ,First", false));
+        assertEquals(
+                "von Last, Jr, First",
+                AuthorList.fixAuthorLastNameFirst("von Last, Jr ,First", false));
 
-        assertEquals(AuthorList.fixAuthorLastNameFirst(
-                "John von Neumann and John Smith and Black Brown, Peter", false), AuthorList
-                .fixAuthorLastNameFirst("John von Neumann and John Smith and Black Brown, Peter", false));
+        assertEquals(
+                AuthorList.fixAuthorLastNameFirst(
+                        "John von Neumann and John Smith and Black Brown, Peter", false),
+                AuthorList.fixAuthorLastNameFirst(
+                        "John von Neumann and John Smith and Black Brown, Peter", false));
 
         // Test Abbreviate == true
         assertEquals("Smith, J.", AuthorList.fixAuthorLastNameFirst("John Smith", true));
 
-        assertEquals("Smith, J. and Black Brown, P.", AuthorList.fixAuthorLastNameFirst(
-                "John Smith and Black Brown, Peter", true));
+        assertEquals(
+                "Smith, J. and Black Brown, P.",
+                AuthorList.fixAuthorLastNameFirst("John Smith and Black Brown, Peter", true));
 
-        assertEquals("von Neumann, J. and Smith, J. and Black Brown, P.",
+        assertEquals(
+                "von Neumann, J. and Smith, J. and Black Brown, P.",
                 AuthorList.fixAuthorLastNameFirst(
                         "John von Neumann and John Smith and Black Brown, Peter", true));
 
-        assertEquals("von Last, Jr, F.", AuthorList.fixAuthorLastNameFirst("von Last, Jr ,First",
-                true));
+        assertEquals(
+                "von Last, Jr, F.", AuthorList.fixAuthorLastNameFirst("von Last, Jr ,First", true));
 
-        assertEquals(AuthorList.fixAuthorLastNameFirst(
-                "John von Neumann and John Smith and Black Brown, Peter", true), AuthorList
-                .fixAuthorLastNameFirst("John von Neumann and John Smith and Black Brown, Peter", true));
+        assertEquals(
+                AuthorList.fixAuthorLastNameFirst(
+                        "John von Neumann and John Smith and Black Brown, Peter", true),
+                AuthorList.fixAuthorLastNameFirst(
+                        "John von Neumann and John Smith and Black Brown, Peter", true));
     }
 
     @Test
@@ -622,24 +758,30 @@ void fixAuthorLastNameOnlyCommas() {
         assertEquals("Smith", AuthorList.fixAuthorLastNameOnlyCommas("John Smith", false));
         assertEquals("Smith", AuthorList.fixAuthorLastNameOnlyCommas("Smith, Jr, John", false));
 
-        assertEquals(AuthorList.fixAuthorLastNameOnlyCommas(
-                "John von Neumann and John Smith and Black Brown, Peter", false), AuthorList
-                .fixAuthorLastNameOnlyCommas("John von Neumann and John Smith and Black Brown, Peter", false));
+        assertEquals(
+                AuthorList.fixAuthorLastNameOnlyCommas(
+                        "John von Neumann and John Smith and Black Brown, Peter", false),
+                AuthorList.fixAuthorLastNameOnlyCommas(
+                        "John von Neumann and John Smith and Black Brown, Peter", false));
 
-        assertEquals("von Neumann, Smith and Black Brown", AuthorList
-                .fixAuthorLastNameOnlyCommas(
+        assertEquals(
+                "von Neumann, Smith and Black Brown",
+                AuthorList.fixAuthorLastNameOnlyCommas(
                         "John von Neumann and John Smith and Black Brown, Peter", false));
         // Oxford Comma
         assertEquals("", AuthorList.fixAuthorLastNameOnlyCommas("", true));
         assertEquals("Smith", AuthorList.fixAuthorLastNameOnlyCommas("John Smith", true));
         assertEquals("Smith", AuthorList.fixAuthorLastNameOnlyCommas("Smith, Jr, John", true));
 
-        assertEquals(AuthorList.fixAuthorLastNameOnlyCommas(
-                "John von Neumann and John Smith and Black Brown, Peter", true), AuthorList
-                .fixAuthorLastNameOnlyCommas("John von Neumann and John Smith and Black Brown, Peter", true));
+        assertEquals(
+                AuthorList.fixAuthorLastNameOnlyCommas(
+                        "John von Neumann and John Smith and Black Brown, Peter", true),
+                AuthorList.fixAuthorLastNameOnlyCommas(
+                        "John von Neumann and John Smith and Black Brown, Peter", true));
 
-        assertEquals("von Neumann, Smith, and Black Brown", AuthorList
-                .fixAuthorLastNameOnlyCommas(
+        assertEquals(
+                "von Neumann, Smith, and Black Brown",
+                AuthorList.fixAuthorLastNameOnlyCommas(
                         "John von Neumann and John Smith and Black Brown, Peter", true));
     }
 
@@ -650,44 +792,55 @@ void getAsLastNamesLatexFreeUnicodeOneAuthorNameFromLatex() {
 
     @Test
     void getAsLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatex() {
-        assertEquals("al-Khwārizmī and Böhm", TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastNames(false));
+        assertEquals(
+                "al-Khwārizmī and Böhm", TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastNames(false));
     }
 
     @Test
     void getAsLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatexUsingOxfordComma() {
-        assertEquals("al-Khwārizmī and Böhm", TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastNames(true));
+        assertEquals(
+                "al-Khwārizmī and Böhm", TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastNames(true));
     }
 
     @Test
     void getAsLastNamesLatexFreeUnicodeThreeAuthorsFromLatex() {
-        assertEquals("al-Khwārizmī, Böhm and Gödel", THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastNames(false));
+        assertEquals(
+                "al-Khwārizmī, Böhm and Gödel",
+                THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastNames(false));
     }
 
     @Test
     void getAsLastNamesLatexFreeUnicodeThreeAuthorsFromLatexUsingOxfordComma() {
-        assertEquals("al-Khwārizmī, Böhm, and Gödel", THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastNames(true));
+        assertEquals(
+                "al-Khwārizmī, Böhm, and Gödel",
+                THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastNames(true));
     }
 
     @Test
     void getAsLastNamesLatexFreeUnicodeOneInsitutionNameFromLatex() {
-        assertEquals("The Banū Mūsā brothers", ONE_INSTITUTION_WITH_LATEX.latexFree().getAsLastNames(false));
+        assertEquals(
+                "The Banū Mūsā brothers",
+                ONE_INSTITUTION_WITH_LATEX.latexFree().getAsLastNames(false));
     }
 
     @Test
     void getAsLastNamesLatexFreeUnicodeTwoInsitutionNameFromLatex() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
+        assertEquals(
+                "The Banū Mūsā brothers and The Banū Mūsā brothers",
                 TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsLastNames(false));
     }
 
     @Test
     void getAsLastNamesLatexFreeUnicodeMixedAuthorsFromLatex() {
-        assertEquals("The Banū Mūsā brothers and Böhm",
+        assertEquals(
+                "The Banū Mūsā brothers and Böhm",
                 MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsLastNames(false));
     }
 
     @Test
     void getAsLastNamesLatexFreeOneInstitutionWithParanthesisAtStart() {
-        assertEquals("Łukasz Michał",
+        assertEquals(
+                "Łukasz Michał",
                 ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsLastNames(false));
     }
 
@@ -698,8 +851,8 @@ void fixAuthorForAlphabetization() {
         assertEquals("Neumann, J.", AuthorList.fixAuthorForAlphabetization("J. von Neumann"));
         assertEquals(
                 "Neumann, J. and Smith, J. and Black Brown, Jr., P.",
-                AuthorList
-                        .fixAuthorForAlphabetization("John von Neumann and John Smith and de Black Brown, Jr., Peter"));
+                AuthorList.fixAuthorForAlphabetization(
+                        "John von Neumann and John Smith and de Black Brown, Jr., Peter"));
     }
 
     @Test
@@ -715,7 +868,8 @@ void size() {
         assertEquals(2, AuthorListTest.size("John Neumann and Foo Bar"));
         assertEquals(2, AuthorListTest.size("John von Neumann and Bar, Jr, Foo"));
 
-        assertEquals(3, AuthorListTest.size("John von Neumann and John Smith and Black Brown, Peter"));
+        assertEquals(
+                3, AuthorListTest.size("John von Neumann and John Smith and Black Brown, Peter"));
 
         StringBuilder s = new StringBuilder("John von Neumann");
         for (int i = 0; i < 25; i++) {
@@ -783,7 +937,9 @@ void companyAuthor() {
     void companyAuthorAndPerson() {
         Author company = new Author(null, null, null, "{JabRef Developers}", null);
         Author person = new Author("Stefan", "S.", null, "Kolb", null);
-        assertEquals(Arrays.asList(company, person), AuthorList.parse("{JabRef Developers} and Stefan Kolb").getAuthors());
+        assertEquals(
+                Arrays.asList(company, person),
+                AuthorList.parse("{JabRef Developers} and Stefan Kolb").getAuthors());
     }
 
     @Test
@@ -804,20 +960,25 @@ void abbreviationWithRelax() {
     void getAuthorsNatbib() {
         assertEquals("", AuthorList.parse("").getAsNatbib());
         assertEquals("Smith", AuthorList.parse("John Smith").getAsNatbib());
-        assertEquals("Smith and Black Brown", AuthorList.parse(
-                "John Smith and Black Brown, Peter").getAsNatbib());
-        assertEquals("von Neumann et al.", AuthorList.parse(
-                "John von Neumann and John Smith and Black Brown, Peter").getAsNatbib());
+        assertEquals(
+                "Smith and Black Brown",
+                AuthorList.parse("John Smith and Black Brown, Peter").getAsNatbib());
+        assertEquals(
+                "von Neumann et al.",
+                AuthorList.parse("John von Neumann and John Smith and Black Brown, Peter")
+                        .getAsNatbib());
 
         /*
          * [ 1465610 ] (Double-)Names containing hyphen (-) not handled correctly
          */
-        assertEquals("Last-Name et al.", AuthorList.parse(
-                "First Second Last-Name" + " and John Smith and Black Brown, Peter").getAsNatbib());
+        assertEquals(
+                "Last-Name et al.",
+                AuthorList.parse(
+                                "First Second Last-Name" + " and John Smith and Black Brown, Peter")
+                        .getAsNatbib());
 
         // Test caching
-        AuthorList al = AuthorList
-                .parse("John von Neumann and John Smith and Black Brown, Peter");
+        AuthorList al = AuthorList.parse("John von Neumann and John Smith and Black Brown, Peter");
         assertEquals(al.getAsNatbib(), al.getAsNatbib());
     }
 
@@ -826,21 +987,24 @@ void getAuthorsLastOnly() {
         // No comma before and
         assertEquals("", AuthorList.parse("").getAsLastNames(false));
         assertEquals("Smith", AuthorList.parse("John Smith").getAsLastNames(false));
-        assertEquals("Smith", AuthorList.parse("Smith, Jr, John").getAsLastNames(
-                false));
+        assertEquals("Smith", AuthorList.parse("Smith, Jr, John").getAsLastNames(false));
 
-        assertEquals("von Neumann, Smith and Black Brown", AuthorList.parse(
-                "John von Neumann and John Smith and Black Brown, Peter").getAsLastNames(false));
+        assertEquals(
+                "von Neumann, Smith and Black Brown",
+                AuthorList.parse("John von Neumann and John Smith and Black Brown, Peter")
+                        .getAsLastNames(false));
         // Oxford comma
         assertEquals("", AuthorList.parse("").getAsLastNames(true));
         assertEquals("Smith", AuthorList.parse("John Smith").getAsLastNames(true));
-        assertEquals("Smith", AuthorList.parse("Smith, Jr, John").getAsLastNames(
-                true));
+        assertEquals("Smith", AuthorList.parse("Smith, Jr, John").getAsLastNames(true));
 
-        assertEquals("von Neumann, Smith, and Black Brown", AuthorList.parse(
-                "John von Neumann and John Smith and Black Brown, Peter").getAsLastNames(true));
+        assertEquals(
+                "von Neumann, Smith, and Black Brown",
+                AuthorList.parse("John von Neumann and John Smith and Black Brown, Peter")
+                        .getAsLastNames(true));
 
-        assertEquals("von Neumann and Smith",
+        assertEquals(
+                "von Neumann and Smith",
                 AuthorList.parse("John von Neumann and John Smith").getAsLastNames(false));
     }
 
@@ -864,9 +1028,12 @@ void getAuthorsLastFirstNoComma() {
         al = AuthorList.parse("John von Neumann and John Smith and Black Brown, Peter");
         // Method description is different than code -> additional comma
         // there
-        assertEquals("von Neumann, John, Smith, John and Black Brown, Peter",
+        assertEquals(
+                "von Neumann, John, Smith, John and Black Brown, Peter",
                 al.getAsLastFirstNames(false, false));
-        assertEquals("von Neumann, J., Smith, J. and Black Brown, P.", al.getAsLastFirstNames(true, false));
+        assertEquals(
+                "von Neumann, J., Smith, J. and Black Brown, P.",
+                al.getAsLastFirstNames(true, false));
 
         al = AuthorList.parse("John Peter von Neumann");
         assertEquals("von Neumann, J. P.", al.getAsLastFirstNames(true, false));
@@ -890,10 +1057,12 @@ void getAuthorsLastFirstOxfordComma() {
         assertEquals("Smith, J. and Black Brown, P.", al.getAsLastFirstNames(true, true));
 
         al = AuthorList.parse("John von Neumann and John Smith and Black Brown, Peter");
-        assertEquals("von Neumann, John, Smith, John, and Black Brown, Peter", al
-                .getAsLastFirstNames(false, true));
-        assertEquals("von Neumann, J., Smith, J., and Black Brown, P.", al.getAsLastFirstNames(
-                true, true));
+        assertEquals(
+                "von Neumann, John, Smith, John, and Black Brown, Peter",
+                al.getAsLastFirstNames(false, true));
+        assertEquals(
+                "von Neumann, J., Smith, J., and Black Brown, P.",
+                al.getAsLastFirstNames(true, true));
 
         al = AuthorList.parse("John Peter von Neumann");
         assertEquals("von Neumann, J. P.", al.getAsLastFirstNames(true, true));
@@ -901,24 +1070,32 @@ void getAuthorsLastFirstOxfordComma() {
 
     @Test
     void getAuthorsLastFirstAnds() {
-        assertEquals("Smith, John", AuthorList.parse("John Smith").getAsLastFirstNamesWithAnd(
-                false));
-        assertEquals("Smith, John and Black Brown, Peter", AuthorList.parse(
-                "John Smith and Black Brown, Peter").getAsLastFirstNamesWithAnd(false));
-        assertEquals("von Neumann, John and Smith, John and Black Brown, Peter", AuthorList
-                .parse("John von Neumann and John Smith and Black Brown, Peter")
-                .getAsLastFirstNamesWithAnd(false));
-        assertEquals("von Last, Jr, First", AuthorList.parse("von Last, Jr ,First")
-                                                      .getAsLastFirstNamesWithAnd(false));
-
-        assertEquals("Smith, J.", AuthorList.parse("John Smith").getAsLastFirstNamesWithAnd(
-                true));
-        assertEquals("Smith, J. and Black Brown, P.", AuthorList.parse(
-                "John Smith and Black Brown, Peter").getAsLastFirstNamesWithAnd(true));
-        assertEquals("von Neumann, J. and Smith, J. and Black Brown, P.", AuthorList.parse(
-                "John von Neumann and John Smith and Black Brown, Peter").getAsLastFirstNamesWithAnd(true));
-        assertEquals("von Last, Jr, F.", AuthorList.parse("von Last, Jr ,First")
-                                                   .getAsLastFirstNamesWithAnd(true));
+        assertEquals(
+                "Smith, John", AuthorList.parse("John Smith").getAsLastFirstNamesWithAnd(false));
+        assertEquals(
+                "Smith, John and Black Brown, Peter",
+                AuthorList.parse("John Smith and Black Brown, Peter")
+                        .getAsLastFirstNamesWithAnd(false));
+        assertEquals(
+                "von Neumann, John and Smith, John and Black Brown, Peter",
+                AuthorList.parse("John von Neumann and John Smith and Black Brown, Peter")
+                        .getAsLastFirstNamesWithAnd(false));
+        assertEquals(
+                "von Last, Jr, First",
+                AuthorList.parse("von Last, Jr ,First").getAsLastFirstNamesWithAnd(false));
+
+        assertEquals("Smith, J.", AuthorList.parse("John Smith").getAsLastFirstNamesWithAnd(true));
+        assertEquals(
+                "Smith, J. and Black Brown, P.",
+                AuthorList.parse("John Smith and Black Brown, Peter")
+                        .getAsLastFirstNamesWithAnd(true));
+        assertEquals(
+                "von Neumann, J. and Smith, J. and Black Brown, P.",
+                AuthorList.parse("John von Neumann and John Smith and Black Brown, Peter")
+                        .getAsLastFirstNamesWithAnd(true));
+        assertEquals(
+                "von Last, Jr, F.",
+                AuthorList.parse("von Last, Jr ,First").getAsLastFirstNamesWithAnd(true));
     }
 
     @Test
@@ -944,14 +1121,16 @@ void getAuthorsFirstFirst() {
         assertEquals("J. Smith and P. Black Brown", al.getAsFirstLastNames(true, true));
 
         al = AuthorList.parse("John von Neumann and John Smith and Black Brown, Peter");
-        assertEquals("John von Neumann, John Smith and Peter Black Brown", al.getAsFirstLastNames(
-                false, false));
-        assertEquals("J. von Neumann, J. Smith and P. Black Brown", al.getAsFirstLastNames(true,
-                false));
-        assertEquals("John von Neumann, John Smith, and Peter Black Brown", al
-                .getAsFirstLastNames(false, true));
-        assertEquals("J. von Neumann, J. Smith, and P. Black Brown", al.getAsFirstLastNames(true,
-                true));
+        assertEquals(
+                "John von Neumann, John Smith and Peter Black Brown",
+                al.getAsFirstLastNames(false, false));
+        assertEquals(
+                "J. von Neumann, J. Smith and P. Black Brown", al.getAsFirstLastNames(true, false));
+        assertEquals(
+                "John von Neumann, John Smith, and Peter Black Brown",
+                al.getAsFirstLastNames(false, true));
+        assertEquals(
+                "J. von Neumann, J. Smith, and P. Black Brown", al.getAsFirstLastNames(true, true));
 
         al = AuthorList.parse("John Peter von Neumann");
         assertEquals("John Peter von Neumann", al.getAsFirstLastNames(false, false));
@@ -962,44 +1141,51 @@ void getAuthorsFirstFirst() {
 
     @Test
     void getAuthorsFirstFirstAnds() {
-        assertEquals("John Smith", AuthorList.parse("John Smith")
-                                             .getAsFirstLastNamesWithAnd());
-        assertEquals("John Smith and Peter Black Brown", AuthorList.parse(
-                "John Smith and Black Brown, Peter").getAsFirstLastNamesWithAnd());
-        assertEquals("John von Neumann and John Smith and Peter Black Brown", AuthorList
-                .parse("John von Neumann and John Smith and Black Brown, Peter")
-                .getAsFirstLastNamesWithAnd());
-        assertEquals("First von Last, Jr. III", AuthorList
-                .parse("von Last, Jr. III, First").getAsFirstLastNamesWithAnd());
+        assertEquals("John Smith", AuthorList.parse("John Smith").getAsFirstLastNamesWithAnd());
+        assertEquals(
+                "John Smith and Peter Black Brown",
+                AuthorList.parse("John Smith and Black Brown, Peter").getAsFirstLastNamesWithAnd());
+        assertEquals(
+                "John von Neumann and John Smith and Peter Black Brown",
+                AuthorList.parse("John von Neumann and John Smith and Black Brown, Peter")
+                        .getAsFirstLastNamesWithAnd());
+        assertEquals(
+                "First von Last, Jr. III",
+                AuthorList.parse("von Last, Jr. III, First").getAsFirstLastNamesWithAnd());
     }
 
     @Test
     void getAuthorsForAlphabetization() {
-        assertEquals("Smith, J.", AuthorList.parse("John Smith")
-                                            .getForAlphabetization());
-        assertEquals("Neumann, J.", AuthorList.parse("John von Neumann")
-                                              .getForAlphabetization());
-        assertEquals("Neumann, J.", AuthorList.parse("J. von Neumann")
-                                              .getForAlphabetization());
-        assertEquals("Neumann, J. and Smith, J. and Black Brown, Jr., P.", AuthorList
-                .parse("John von Neumann and John Smith and de Black Brown, Jr., Peter")
-                .getForAlphabetization());
+        assertEquals("Smith, J.", AuthorList.parse("John Smith").getForAlphabetization());
+        assertEquals("Neumann, J.", AuthorList.parse("John von Neumann").getForAlphabetization());
+        assertEquals("Neumann, J.", AuthorList.parse("J. von Neumann").getForAlphabetization());
+        assertEquals(
+                "Neumann, J. and Smith, J. and Black Brown, Jr., P.",
+                AuthorList.parse("John von Neumann and John Smith and de Black Brown, Jr., Peter")
+                        .getForAlphabetization());
     }
 
     @Test
     void removeStartAndEndBraces() {
         assertEquals("{A}bbb{c}", AuthorList.parse("{A}bbb{c}").getAsLastNames(false));
-        assertEquals("{Vall{\\'e}e Poussin}", AuthorList.parse("{Vall{\\'e}e Poussin}").getAsLastNames(false));
+        assertEquals(
+                "{Vall{\\'e}e Poussin}",
+                AuthorList.parse("{Vall{\\'e}e Poussin}").getAsLastNames(false));
         assertEquals("Poussin", AuthorList.parse("{Vall{\\'e}e} {Poussin}").getAsLastNames(false));
         assertEquals("Poussin", AuthorList.parse("Vall{\\'e}e Poussin").getAsLastNames(false));
         assertEquals("Lastname", AuthorList.parse("Firstname {Lastname}").getAsLastNames(false));
-        assertEquals("{Firstname Lastname}", AuthorList.parse("{Firstname Lastname}").getAsLastNames(false));
+        assertEquals(
+                "{Firstname Lastname}",
+                AuthorList.parse("{Firstname Lastname}").getAsLastNames(false));
     }
 
     @Test
     void createCorrectInitials() {
-        assertEquals(Optional.of("J. G."),
-                AuthorList.parse("Hornberg, Johann Gottfried").getAuthor(0).getGivenNameAbbreviated());
+        assertEquals(
+                Optional.of("J. G."),
+                AuthorList.parse("Hornberg, Johann Gottfried")
+                        .getAuthor(0)
+                        .getGivenNameAbbreviated());
     }
 
     @Test
@@ -1054,8 +1240,7 @@ void parseWithDash() throws Exception {
                         new Author("Z.", "Z.", null, "Yao", null),
                         new Author("D. S.", "D. S.", null, "Weld", null),
                         new Author("W-P.", "W-P.", null, "Chen", null),
-                        new Author("H.", "H.", null, "Sun", null)
-                ),
+                        new Author("H.", "H.", null, "Sun", null)),
                 AuthorList.parse("Z. Yao, D. S. Weld, W.-P. Chen, and H. Sun"));
     }
 
@@ -1067,36 +1252,56 @@ void parseNameWithBraces() throws Exception {
 
     @Test
     void parseFirstNameFromFirstAuthorMultipleAuthorsWithLatexNames() throws Exception {
-        assertEquals("Mu{\\d{h}}ammad",
-                AuthorList.parse("Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
-                          .getAuthor(0).getGivenName().orElse(null));
+        assertEquals(
+                "Mu{\\d{h}}ammad",
+                AuthorList.parse(
+                                "Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
+                        .getAuthor(0)
+                        .getGivenName()
+                        .orElse(null));
     }
 
     @Test
     void parseFirstNameFromSecondAuthorMultipleAuthorsWithLatexNames() throws Exception {
-        assertEquals("Corrado",
-                AuthorList.parse("Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
-                          .getAuthor(1).getGivenName().orElse(null));
+        assertEquals(
+                "Corrado",
+                AuthorList.parse(
+                                "Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
+                        .getAuthor(1)
+                        .getGivenName()
+                        .orElse(null));
     }
 
     @Test
     void parseLastNameFromFirstAuthorMultipleAuthorsWithLatexNames() throws Exception {
-        assertEquals("al-Khw{\\={a}}rizm{\\={i}}",
-                AuthorList.parse("Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
-                          .getAuthor(0).getFamilyName().orElse(null));
+        assertEquals(
+                "al-Khw{\\={a}}rizm{\\={i}}",
+                AuthorList.parse(
+                                "Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
+                        .getAuthor(0)
+                        .getFamilyName()
+                        .orElse(null));
     }
 
     @Test
     void parseLastNameFromSecondAuthorMultipleAuthorsWithLatexNames() throws Exception {
-        assertEquals("B{\\\"o}hm",
-                AuthorList.parse("Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
-                          .getAuthor(1).getFamilyName().orElse(null));
+        assertEquals(
+                "B{\\\"o}hm",
+                AuthorList.parse(
+                                "Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
+                        .getAuthor(1)
+                        .getFamilyName()
+                        .orElse(null));
     }
 
     @Test
     void parseInstitutionAuthorWithLatexNames() throws Exception {
-        assertEquals("{The Ban\\={u} M\\={u}s\\={a} brothers}",
-                AuthorList.parse("{The Ban\\={u} M\\={u}s\\={a} brothers}").getAuthor(0).getFamilyName().orElse(null));
+        assertEquals(
+                "{The Ban\\={u} M\\={u}s\\={a} brothers}",
+                AuthorList.parse("{The Ban\\={u} M\\={u}s\\={a} brothers}")
+                        .getAuthor(0)
+                        .getFamilyName()
+                        .orElse(null));
     }
 
     @Test
@@ -1152,14 +1357,17 @@ void parseCacheAuthorsWithTwoOrMoreCommasAndWithoutSpaceInAllParts() throws Exce
      */
     @Test
     void correctNamesWithOneComma() throws Exception {
-        Author expected = new Author("Alexander der Große", "A. d. G.", null, "Canon der Barbar", null);
-        assertEquals(AuthorList.of(expected), AuthorList.parse("Canon der Barbar, Alexander der Große"));
+        Author expected =
+                new Author("Alexander der Große", "A. d. G.", null, "Canon der Barbar", null);
+        assertEquals(
+                AuthorList.of(expected), AuthorList.parse("Canon der Barbar, Alexander der Große"));
 
         expected = new Author("Alexander H. G.", "A. H. G.", null, "Rinnooy Kan", null);
         assertEquals(AuthorList.of(expected), AuthorList.parse("Rinnooy Kan, Alexander H. G."));
 
         expected = new Author("Alexander Hendrik George", "A. H. G.", null, "Rinnooy Kan", null);
-        assertEquals(AuthorList.of(expected), AuthorList.parse("Rinnooy Kan, Alexander Hendrik George"));
+        assertEquals(
+                AuthorList.of(expected), AuthorList.parse("Rinnooy Kan, Alexander Hendrik George"));
 
         expected = new Author("José María", "J. M.", null, "Rodriguez Fernandez", null);
         assertEquals(AuthorList.of(expected), AuthorList.parse("Rodriguez Fernandez, José María"));
@@ -1176,7 +1384,8 @@ void equalsFalseDifferentOrder() {
 
     @Test
     void equalsFalseWhenNotAuthorList() {
-        assertNotEquals(AuthorList.of(new Author(null, null, null, null, null)),
+        assertNotEquals(
+                AuthorList.of(new Author(null, null, null, null, null)),
                 new Author(null, null, null, null, null));
     }
 
@@ -1233,13 +1442,13 @@ void hashCodeNotConstant() {
 
     @Test
     void getAsLastFirstFirstLastNamesWithAndEmptyAuthor() {
-        assertEquals("",
-                EMPTY_AUTHOR.getAsLastFirstFirstLastNamesWithAnd(true));
+        assertEquals("", EMPTY_AUTHOR.getAsLastFirstFirstLastNamesWithAnd(true));
     }
 
     @Test
     void getAsLastFirstFirstLastNamesWithAndMultipleAuthors() {
-        assertEquals("al-Khw{\\={a}}rizm{\\={i}}, M. and C. B{\\\"o}hm and K. G{\\\"{o}}del",
+        assertEquals(
+                "al-Khw{\\={a}}rizm{\\={i}}, M. and C. B{\\\"o}hm and K. G{\\\"{o}}del",
                 THREE_AUTHORS_WITH_LATEX.getAsLastFirstFirstLastNamesWithAnd(true));
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/AuthorTest.java b/src/test/java/org/jabref/model/entry/AuthorTest.java
index 592f84f99231..a227497a8be8 100644
--- a/src/test/java/org/jabref/model/entry/AuthorTest.java
+++ b/src/test/java/org/jabref/model/entry/AuthorTest.java
@@ -1,13 +1,13 @@
 package org.jabref.model.entry;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.NullAndEmptySource;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 class AuthorTest {
 
@@ -26,11 +26,25 @@ void addDotIfAbbreviationDoesNotAddMultipleSpaces() {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"O.", "A. O.", "A.-O.",
-                            "O. Moore", "A. O. Moore", "O. von Moore", "A.-O. Moore",
-                            "Moore, O.", "Moore, O., Jr.", "Moore, A. O.", "Moore, A.-O.",
-                            "MEmre", "{\\'{E}}douard", "J{\\\"o}rg", "Moore, O. and O. Moore",
-                            "Moore, O. and O. Moore and Moore, O. O."})
+    @ValueSource(
+            strings = {
+                "O.",
+                "A. O.",
+                "A.-O.",
+                "O. Moore",
+                "A. O. Moore",
+                "O. von Moore",
+                "A.-O. Moore",
+                "Moore, O.",
+                "Moore, O., Jr.",
+                "Moore, A. O.",
+                "Moore, A.-O.",
+                "MEmre",
+                "{\\'{E}}douard",
+                "J{\\\"o}rg",
+                "Moore, O. and O. Moore",
+                "Moore, O. and O. Moore and Moore, O. O."
+            })
     void addDotIfAbbreviationDoNotAddDot(String input) {
         assertEquals(input, Author.addDotIfAbbreviation(input));
     }
@@ -74,7 +88,9 @@ void addDotIfAbbreviationEndsWithDoubleAbbreviation() {
 
     @Test
     void bracesKept() {
-        assertEquals(Optional.of("{Company Name, LLC}"), new Author("", "", null, "{Company Name, LLC}", null).getFamilyName());
+        assertEquals(
+                Optional.of("{Company Name, LLC}"),
+                new Author("", "", null, "{Company Name, LLC}", null).getFamilyName());
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTest.java b/src/test/java/org/jabref/model/entry/BibEntryTest.java
index 3d87ba15c48f..36ddb0c75d0e 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTest.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTest.java
@@ -1,15 +1,14 @@
 package org.jabref.model.entry;
 
-import java.net.URI;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT;
+
+import com.google.common.collect.Sets;
 
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabase;
@@ -22,20 +21,21 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import com.google.common.collect.Sets;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT;
+import java.net.URI;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Stream;
 
 @Execution(CONCURRENT)
 class BibEntryTest {
@@ -67,7 +67,10 @@ void getFieldIsCaseInsensitive() {
     @Test
     void getFieldWorksWithBibFieldAsWell() {
         entry.setField(StandardField.AUTHOR, "value");
-        assertEquals(Optional.of("value"), entry.getField(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT).field()));
+        assertEquals(
+                Optional.of("value"),
+                entry.getField(
+                        new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT).field()));
     }
 
     @Test
@@ -83,7 +86,8 @@ void setFieldLeadsToAChangedEntry() {
 
     @Test
     void setFieldWorksWithBibFieldAsWell() {
-        entry.setField(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT).field(), "value");
+        entry.setField(
+                new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT).field(), "value");
         assertEquals(Optional.of("value"), entry.getField(StandardField.AUTHOR));
     }
 
@@ -220,31 +224,41 @@ void getFieldOrAliasMonthWithDateYYYYMMDD() {
     @Test
     void getFieldOrAliasLatexFreeAlreadyFreeValueIsUnchanged() {
         entry.setField(StandardField.TITLE, "A Title Without any LaTeX commands");
-        assertEquals(Optional.of("A Title Without any LaTeX commands"), entry.getFieldOrAliasLatexFree(StandardField.TITLE));
+        assertEquals(
+                Optional.of("A Title Without any LaTeX commands"),
+                entry.getFieldOrAliasLatexFree(StandardField.TITLE));
     }
 
     @Test
     void getFieldOrAliasLatexFreeAlreadyFreeAliasValueIsUnchanged() {
         entry.setField(StandardField.JOURNAL, "A Title Without any LaTeX commands");
-        assertEquals(Optional.of("A Title Without any LaTeX commands"), entry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE));
+        assertEquals(
+                Optional.of("A Title Without any LaTeX commands"),
+                entry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE));
     }
 
     @Test
     void getFieldOrAliasLatexFreeBracesAreRemoved() {
         entry.setField(StandardField.TITLE, "{A Title with some {B}ra{C}es}");
-        assertEquals(Optional.of("A Title with some BraCes"), entry.getFieldOrAliasLatexFree(StandardField.TITLE));
+        assertEquals(
+                Optional.of("A Title with some BraCes"),
+                entry.getFieldOrAliasLatexFree(StandardField.TITLE));
     }
 
     @Test
     void getFieldOrAliasLatexFreeBracesAreRemovedFromAlias() {
         entry.setField(StandardField.JOURNAL, "{A Title with some {B}ra{C}es}");
-        assertEquals(Optional.of("A Title with some BraCes"), entry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE));
+        assertEquals(
+                Optional.of("A Title with some BraCes"),
+                entry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE));
     }
 
     @Test
     void getFieldOrAliasLatexFreeComplexConversionInAlias() {
         entry.setField(StandardField.JOURNAL, "A 32~{mA} {$\\Sigma\\Delta$}-modulator");
-        assertEquals(Optional.of("A 32 mA ΣΔ-modulator"), entry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE));
+        assertEquals(
+                Optional.of("A 32 mA ΣΔ-modulator"),
+                entry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE));
     }
 
     @Test
@@ -403,7 +417,8 @@ void putNullKeywordListThrowsNPE() {
     @Test
     void putNullKeywordSeparatorThrowsNPE() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
-        assertThrows(NullPointerException.class, () -> entry.putKeywords(Arrays.asList("A", "B"), null));
+        assertThrows(
+                NullPointerException.class, () -> entry.putKeywords(Arrays.asList("A", "B"), null));
     }
 
     @Test
@@ -536,14 +551,19 @@ void putKeywordsToEmptyReturnsNoChange() {
     void clearKeywordsReturnsChange() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         Optional<FieldChange> change = entry.putKeywords(Collections.emptyList(), ',');
-        assertEquals(Optional.of(new FieldChange(entry, StandardField.KEYWORDS, "Foo, Bar", null)), change);
+        assertEquals(
+                Optional.of(new FieldChange(entry, StandardField.KEYWORDS, "Foo, Bar", null)),
+                change);
     }
 
     @Test
     void changeKeywordsReturnsChange() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         Optional<FieldChange> change = entry.putKeywords(Arrays.asList("Test", "FooTest"), ',');
-        assertEquals(Optional.of(new FieldChange(entry, StandardField.KEYWORDS, "Foo, Bar", "Test, FooTest")),
+        assertEquals(
+                Optional.of(
+                        new FieldChange(
+                                entry, StandardField.KEYWORDS, "Foo, Bar", "Test, FooTest")),
                 change);
     }
 
@@ -562,7 +582,8 @@ void getKeywordsReturnsParsedKeywordListFromKeywordsField() {
 
     @Test
     void removeKeywordsOnEntryWithoutKeywordsDoesNothing() {
-        Optional<FieldChange> change = entry.removeKeywords(SpecialField.RANKING.getKeyWords(), ',');
+        Optional<FieldChange> change =
+                entry.removeKeywords(SpecialField.RANKING.getKeyWords(), ',');
         assertEquals(Optional.empty(), change);
     }
 
@@ -578,7 +599,8 @@ void removeKeywordsWithEmptyListDoesNothing() {
     void removeKeywordsWithNonExistingKeywordsDoesNothing() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.putKeywords(Arrays.asList("kw1", "kw2"), ',');
-        Optional<FieldChange> change = entry.removeKeywords(KeywordList.parse("kw3, kw4", ','), ',');
+        Optional<FieldChange> change =
+                entry.removeKeywords(KeywordList.parse("kw3, kw4", ','), ',');
         assertEquals(Optional.empty(), change);
         assertEquals(Sets.newHashSet("kw1", "kw2"), entry.getKeywords(',').toStringList());
     }
@@ -587,7 +609,8 @@ void removeKeywordsWithNonExistingKeywordsDoesNothing() {
     void removeKeywordsWithExistingKeywordsRemovesThem() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.putKeywords(Arrays.asList("kw1", "kw2", "kw3"), ',');
-        Optional<FieldChange> change = entry.removeKeywords(KeywordList.parse("kw1, kw2", ','), ',');
+        Optional<FieldChange> change =
+                entry.removeKeywords(KeywordList.parse("kw1, kw2", ','), ',');
         assertTrue(change.isPresent());
         assertEquals(KeywordList.parse("kw3", ','), entry.getKeywords(','));
     }
@@ -598,7 +621,8 @@ void keywordListCorrectlyConstructedForThreeKeywords() {
         entry.addKeyword("kw2", ',');
         entry.addKeyword("kw3", ',');
         KeywordList actual = entry.getKeywords(',');
-        assertEquals(new KeywordList(new Keyword("kw"), new Keyword("kw2"), new Keyword("kw3")), actual);
+        assertEquals(
+                new KeywordList(new Keyword("kw"), new Keyword("kw2"), new Keyword("kw3")), actual);
     }
 
     @Test
@@ -649,7 +673,8 @@ void getResolvedKeywords() {
 
         KeywordList actual = entry.getResolvedKeywords(',', database);
 
-        assertEquals(new KeywordList(new Keyword("kw"), new Keyword("kw2"), new Keyword("kw3")), actual);
+        assertEquals(
+                new KeywordList(new Keyword("kw"), new Keyword("kw2"), new Keyword("kw3")), actual);
     }
 
     @Test
@@ -666,23 +691,25 @@ void builderReturnsABibEntryNotChangedFlagged() {
 
     @Test
     void mergeEntriesWithNoOverlap() {
-        BibEntry expected = new BibEntry()
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.EPRINT, "1234.56789")
-                .withField(StandardField.DATE, "1970-01-01");
+        BibEntry expected =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.EPRINT, "1234.56789")
+                        .withField(StandardField.DATE, "1970-01-01");
 
         BibEntry copyEntry = (BibEntry) entry.clone();
         BibEntry otherEntry = new BibEntry();
 
-        copyEntry.setField(Map.of(
-                StandardField.AUTHOR, "Test Author",
-                StandardField.TITLE, "Test Title"));
+        copyEntry.setField(
+                Map.of(
+                        StandardField.AUTHOR, "Test Author",
+                        StandardField.TITLE, "Test Title"));
 
-        otherEntry.setField(Map.of(
-                StandardField.EPRINT, "1234.56789",
-                StandardField.DATE, "1970-01-01"
-        ));
+        otherEntry.setField(
+                Map.of(
+                        StandardField.EPRINT, "1234.56789",
+                        StandardField.DATE, "1970-01-01"));
 
         copyEntry.mergeWith(otherEntry);
         assertEquals(expected.getFields(), copyEntry.getFields());
@@ -690,22 +717,24 @@ void mergeEntriesWithNoOverlap() {
 
     @Test
     void mergeEntriesWithOverlap() {
-        BibEntry expected = new BibEntry()
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.DATE, "1970-01-01");
+        BibEntry expected =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.DATE, "1970-01-01");
 
         BibEntry copyEntry = (BibEntry) entry.clone();
         BibEntry otherEntry = new BibEntry();
 
-        copyEntry.setField(Map.of(
-                StandardField.AUTHOR, "Test Author",
-                StandardField.TITLE, "Test Title"));
+        copyEntry.setField(
+                Map.of(
+                        StandardField.AUTHOR, "Test Author",
+                        StandardField.TITLE, "Test Title"));
 
-        otherEntry.setField(Map.of(
-                StandardField.AUTHOR, "Another Test Author",
-                StandardField.DATE, "1970-01-01"
-        ));
+        otherEntry.setField(
+                Map.of(
+                        StandardField.AUTHOR, "Another Test Author",
+                        StandardField.DATE, "1970-01-01"));
 
         copyEntry.mergeWith(otherEntry);
         assertEquals(expected.getFields(), copyEntry.getFields());
@@ -713,23 +742,25 @@ void mergeEntriesWithOverlap() {
 
     @Test
     void mergeEntriesWithNoOverlapAndNonExistingPriorityFields() {
-        BibEntry expected = new BibEntry()
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.EPRINT, "1234.56789")
-                .withField(StandardField.DATE, "1970-01-01");
+        BibEntry expected =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.EPRINT, "1234.56789")
+                        .withField(StandardField.DATE, "1970-01-01");
 
         BibEntry copyEntry = (BibEntry) entry.clone();
         BibEntry otherEntry = new BibEntry();
 
-        copyEntry.setField(Map.of(
-                StandardField.AUTHOR, "Test Author",
-                StandardField.TITLE, "Test Title"));
+        copyEntry.setField(
+                Map.of(
+                        StandardField.AUTHOR, "Test Author",
+                        StandardField.TITLE, "Test Title"));
 
-        otherEntry.setField(Map.of(
-                StandardField.EPRINT, "1234.56789",
-                StandardField.DATE, "1970-01-01"
-        ));
+        otherEntry.setField(
+                Map.of(
+                        StandardField.EPRINT, "1234.56789",
+                        StandardField.DATE, "1970-01-01"));
 
         Set<Field> otherPrioritizedFields = Set.of(StandardField.VOLUME, StandardField.KEYWORDS);
 
@@ -739,23 +770,25 @@ void mergeEntriesWithNoOverlapAndNonExistingPriorityFields() {
 
     @Test
     void mergeEntriesWithNoOverlapAndExistingPriorityFields() {
-        BibEntry expected = new BibEntry()
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.EPRINT, "1234.56789")
-                .withField(StandardField.DATE, "1970-01-01");
+        BibEntry expected =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.EPRINT, "1234.56789")
+                        .withField(StandardField.DATE, "1970-01-01");
 
         BibEntry copyEntry = (BibEntry) entry.clone();
         BibEntry otherEntry = new BibEntry();
 
-        copyEntry.setField(Map.of(
-                StandardField.AUTHOR, "Test Author",
-                StandardField.TITLE, "Test Title"));
+        copyEntry.setField(
+                Map.of(
+                        StandardField.AUTHOR, "Test Author",
+                        StandardField.TITLE, "Test Title"));
 
-        otherEntry.setField(Map.of(
-                StandardField.EPRINT, "1234.56789",
-                StandardField.DATE, "1970-01-01"
-        ));
+        otherEntry.setField(
+                Map.of(
+                        StandardField.EPRINT, "1234.56789",
+                        StandardField.DATE, "1970-01-01"));
 
         Set<Field> otherPrioritizedFields = Set.of(StandardField.AUTHOR, StandardField.EPRINT);
 
@@ -765,22 +798,24 @@ void mergeEntriesWithNoOverlapAndExistingPriorityFields() {
 
     @Test
     void mergeEntriesWithOverlapAndPriorityGivenToNonOverlappingField() {
-        BibEntry expected = new BibEntry()
-                .withField(StandardField.AUTHOR, "Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.DATE, "1970-01-01");
+        BibEntry expected =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.DATE, "1970-01-01");
 
         BibEntry copyEntry = (BibEntry) entry.clone();
         BibEntry otherEntry = new BibEntry();
 
-        copyEntry.setField(Map.of(
-                StandardField.AUTHOR, "Test Author",
-                StandardField.TITLE, "Test Title"));
+        copyEntry.setField(
+                Map.of(
+                        StandardField.AUTHOR, "Test Author",
+                        StandardField.TITLE, "Test Title"));
 
-        otherEntry.setField(Map.of(
-                StandardField.AUTHOR, "Another Test Author",
-                StandardField.DATE, "1970-01-01"
-        ));
+        otherEntry.setField(
+                Map.of(
+                        StandardField.AUTHOR, "Another Test Author",
+                        StandardField.DATE, "1970-01-01"));
 
         Set<Field> otherPrioritizedFields = Set.of(StandardField.TITLE, StandardField.DATE);
 
@@ -790,22 +825,24 @@ void mergeEntriesWithOverlapAndPriorityGivenToNonOverlappingField() {
 
     @Test
     void mergeEntriesWithOverlapAndPriorityGivenToOverlappingField() {
-        BibEntry expected = new BibEntry()
-                .withField(StandardField.AUTHOR, "Another Test Author")
-                .withField(StandardField.TITLE, "Test Title")
-                .withField(StandardField.DATE, "1970-01-01");
+        BibEntry expected =
+                new BibEntry()
+                        .withField(StandardField.AUTHOR, "Another Test Author")
+                        .withField(StandardField.TITLE, "Test Title")
+                        .withField(StandardField.DATE, "1970-01-01");
 
         BibEntry copyEntry = (BibEntry) entry.clone();
         BibEntry otherEntry = new BibEntry();
 
-        copyEntry.setField(Map.of(
-                StandardField.AUTHOR, "Test Author",
-                StandardField.TITLE, "Test Title"));
+        copyEntry.setField(
+                Map.of(
+                        StandardField.AUTHOR, "Test Author",
+                        StandardField.TITLE, "Test Title"));
 
-        otherEntry.setField(Map.of(
-                StandardField.AUTHOR, "Another Test Author",
-                StandardField.DATE, "1970-01-01"
-        ));
+        otherEntry.setField(
+                Map.of(
+                        StandardField.AUTHOR, "Another Test Author",
+                        StandardField.DATE, "1970-01-01"));
 
         Set<Field> otherPrioritizedFields = Set.of(StandardField.AUTHOR, StandardField.DATE);
 
@@ -837,8 +874,7 @@ void isEmpty(BibEntry entry) {
     public static Stream<BibEntry> isNotEmpty() {
         return Stream.of(
                 new BibEntry().withCitationKey("test"),
-                new BibEntry().withField(StandardField.AUTHOR, "test")
-        );
+                new BibEntry().withField(StandardField.AUTHOR, "test"));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTypeBuilderTest.java b/src/test/java/org/jabref/model/entry/BibEntryTypeBuilderTest.java
index fa4b10dffffb..dcfeacbf300a 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTypeBuilderTest.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTypeBuilderTest.java
@@ -1,44 +1,50 @@
 package org.jabref.model.entry;
 
-import java.util.LinkedHashSet;
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.LinkedHashSet;
+import java.util.List;
 
 class BibEntryTypeBuilderTest {
 
     @Test
     @Disabled("There is just a log message written, but no exception thrown")
     void fieldAlreadySeenSameCategory() {
-        assertThrows(IllegalArgumentException.class, () ->
-        new BibEntryTypeBuilder()
-                .withImportantFields(StandardField.AUTHOR)
-                .withImportantFields(StandardField.AUTHOR)
-                .build());
+        assertThrows(
+                IllegalArgumentException.class,
+                () ->
+                        new BibEntryTypeBuilder()
+                                .withImportantFields(StandardField.AUTHOR)
+                                .withImportantFields(StandardField.AUTHOR)
+                                .build());
     }
 
     @Test
     void detailOptionalWorks() {
-        BibEntryType bibEntryType = new BibEntryTypeBuilder()
-                .withImportantFields(StandardField.AUTHOR)
-                .withDetailFields(StandardField.NOTE)
-                .build();
-        assertEquals(new LinkedHashSet<>(List.of(StandardField.NOTE)), bibEntryType.getDetailOptionalFields());
+        BibEntryType bibEntryType =
+                new BibEntryTypeBuilder()
+                        .withImportantFields(StandardField.AUTHOR)
+                        .withDetailFields(StandardField.NOTE)
+                        .build();
+        assertEquals(
+                new LinkedHashSet<>(List.of(StandardField.NOTE)),
+                bibEntryType.getDetailOptionalFields());
     }
 
     @Test
     @Disabled("There is just a log message written, but no exception thrown")
     void fieldAlreadySeenDifferentCategories() {
-        assertThrows(IllegalArgumentException.class, () ->
-        new BibEntryTypeBuilder()
-                .withRequiredFields(StandardField.AUTHOR)
-                .withImportantFields(StandardField.AUTHOR)
-                .build());
+        assertThrows(
+                IllegalArgumentException.class,
+                () ->
+                        new BibEntryTypeBuilder()
+                                .withRequiredFields(StandardField.AUTHOR)
+                                .withImportantFields(StandardField.AUTHOR)
+                                .build());
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java b/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java
index d9fb4eb1a9cf..63d1b9c6e645 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java
@@ -1,10 +1,9 @@
 package org.jabref.model.entry;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.logic.exporter.MetaDataSerializer;
@@ -22,16 +21,16 @@
 import org.jabref.model.entry.types.IEEETranEntryTypeDefinitions;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.entry.types.UnknownEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 @AllowedToUseLogic("Requires MetaDataSerializer and MetaDataParser for parsing tests")
 class BibEntryTypesManagerTest {
@@ -45,19 +44,24 @@ class BibEntryTypesManagerTest {
 
     @BeforeEach
     void setUp() {
-        newCustomType = new BibEntryType(
-                CUSTOM_TYPE,
-                List.of(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT)),
-                Collections.emptySet());
-        overwrittenStandardType = new BibEntryType(
-                StandardEntryType.Article,
-                List.of(new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)),
-                Collections.emptySet());
+        newCustomType =
+                new BibEntryType(
+                        CUSTOM_TYPE,
+                        List.of(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT)),
+                        Collections.emptySet());
+        overwrittenStandardType =
+                new BibEntryType(
+                        StandardEntryType.Article,
+                        List.of(new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)),
+                        Collections.emptySet());
         entryTypesManager = new BibEntryTypesManager();
     }
 
     private BibEntryType getStandardArticleType(BibDatabaseMode mode) {
-        return entryTypesManager.getEntryTypes(mode).standardTypes.stream().filter(t -> StandardEntryType.Article == t.getType()).findAny().get();
+        return entryTypesManager.getEntryTypes(mode).standardTypes.stream()
+                .filter(t -> StandardEntryType.Article == t.getType())
+                .findAny()
+                .get();
     }
 
     @ParameterizedTest
@@ -102,37 +106,46 @@ void newCustomEntryTypeFound(BibDatabaseMode mode) {
     @EnumSource(BibDatabaseMode.class)
     void registeredBibEntryTypeIsContainedInListOfCustomizedEntryTypes(BibDatabaseMode mode) {
         entryTypesManager.addCustomOrModifiedType(newCustomType, mode);
-        assertEquals(Collections.singletonList(newCustomType), entryTypesManager.getAllCustomTypes(mode));
+        assertEquals(
+                Collections.singletonList(newCustomType),
+                entryTypesManager.getAllCustomTypes(mode));
     }
 
     @Test
     void registerBibEntryTypeDoesNotAffectOtherMode() {
         entryTypesManager.addCustomOrModifiedType(newCustomType, BibDatabaseMode.BIBTEX);
-        assertFalse(entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX).contains(newCustomType));
+        assertFalse(
+                entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX).contains(newCustomType));
     }
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
     void overwriteBibEntryTypeFields(BibDatabaseMode mode) {
         entryTypesManager.addCustomOrModifiedType(newCustomType, mode);
-        BibEntryType newBibEntryTypeTitle = new BibEntryType(
-                CUSTOM_TYPE,
-                Collections.singleton(new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)),
-                Collections.emptySet());
+        BibEntryType newBibEntryTypeTitle =
+                new BibEntryType(
+                        CUSTOM_TYPE,
+                        Collections.singleton(
+                                new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)),
+                        Collections.emptySet());
         entryTypesManager.addCustomOrModifiedType(newBibEntryTypeTitle, mode);
-        assertEquals(Optional.of(newBibEntryTypeTitle), entryTypesManager.enrich(CUSTOM_TYPE, mode));
+        assertEquals(
+                Optional.of(newBibEntryTypeTitle), entryTypesManager.enrich(CUSTOM_TYPE, mode));
     }
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
     void overwriteStandardTypeRequiredFields(BibDatabaseMode mode) {
         entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
-        assertEquals(Optional.of(overwrittenStandardType), entryTypesManager.enrich(overwrittenStandardType.getType(), mode));
+        assertEquals(
+                Optional.of(overwrittenStandardType),
+                entryTypesManager.enrich(overwrittenStandardType.getType(), mode));
     }
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
-    void registeredCustomizedStandardEntryTypeIsNotContainedInListOfCustomEntryTypes(BibDatabaseMode mode) {
+    void registeredCustomizedStandardEntryTypeIsNotContainedInListOfCustomEntryTypes(
+            BibDatabaseMode mode) {
         entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
         assertEquals(Collections.emptyList(), entryTypesManager.getAllCustomTypes(mode));
     }
@@ -172,28 +185,36 @@ void resettingArticleWithUpdate(BibDatabaseMode mode) {
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
     void modifyingArticle(BibDatabaseMode mode) {
-        overwrittenStandardType = new BibEntryType(
-                                                   StandardEntryType.Article,
-                                                   List.of(new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
-                                                           new BibField(StandardField.NUMBER, FieldPriority.IMPORTANT),
-                                                           new BibField(new UnknownField("langid"), FieldPriority.IMPORTANT),
-                                                           new BibField(StandardField.COMMENT, FieldPriority.IMPORTANT)),
-                                                   Collections.emptySet());
+        overwrittenStandardType =
+                new BibEntryType(
+                        StandardEntryType.Article,
+                        List.of(
+                                new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
+                                new BibField(StandardField.NUMBER, FieldPriority.IMPORTANT),
+                                new BibField(new UnknownField("langid"), FieldPriority.IMPORTANT),
+                                new BibField(StandardField.COMMENT, FieldPriority.IMPORTANT)),
+                        Collections.emptySet());
 
         entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
-        assertEquals(Collections.singletonList(overwrittenStandardType), entryTypesManager.getAllTypes(mode).stream().filter(t -> "article".equals(t.getType().getName())).collect(Collectors.toList()));
+        assertEquals(
+                Collections.singletonList(overwrittenStandardType),
+                entryTypesManager.getAllTypes(mode).stream()
+                        .filter(t -> "article".equals(t.getType().getName()))
+                        .collect(Collectors.toList()));
     }
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
     void modifyingArticleWithParsing(BibDatabaseMode mode) {
-        overwrittenStandardType = new BibEntryType(
-                                                   StandardEntryType.Article,
-                                                   List.of(new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
-                                                           new BibField(StandardField.NUMBER, FieldPriority.IMPORTANT),
-                                                           new BibField(new UnknownField("langid"), FieldPriority.IMPORTANT),
-                                                           new BibField(StandardField.COMMENT, FieldPriority.IMPORTANT)),
-                                                   Collections.emptySet());
+        overwrittenStandardType =
+                new BibEntryType(
+                        StandardEntryType.Article,
+                        List.of(
+                                new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
+                                new BibField(StandardField.NUMBER, FieldPriority.IMPORTANT),
+                                new BibField(new UnknownField("langid"), FieldPriority.IMPORTANT),
+                                new BibField(StandardField.COMMENT, FieldPriority.IMPORTANT)),
+                        Collections.emptySet());
 
         entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
         String serialized = MetaDataSerializer.serializeCustomEntryTypes(overwrittenStandardType);
@@ -205,13 +226,15 @@ void modifyingArticleWithParsing(BibDatabaseMode mode) {
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
     void modifyingArticleWithParsingKeepsListOrder(BibDatabaseMode mode) {
-        overwrittenStandardType = new BibEntryType(
-                                                   StandardEntryType.Article,
-                                                   List.of(new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
-                                                           new BibField(StandardField.NUMBER, FieldPriority.IMPORTANT),
-                                                           new BibField(new UnknownField("langid"), FieldPriority.IMPORTANT),
-                                                           new BibField(StandardField.COMMENT, FieldPriority.IMPORTANT)),
-                                                   Collections.emptySet());
+        overwrittenStandardType =
+                new BibEntryType(
+                        StandardEntryType.Article,
+                        List.of(
+                                new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
+                                new BibField(StandardField.NUMBER, FieldPriority.IMPORTANT),
+                                new BibField(new UnknownField("langid"), FieldPriority.IMPORTANT),
+                                new BibField(StandardField.COMMENT, FieldPriority.IMPORTANT)),
+                        Collections.emptySet());
 
         entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
         String serialized = MetaDataSerializer.serializeCustomEntryTypes(overwrittenStandardType);
@@ -222,7 +245,8 @@ void modifyingArticleWithParsingKeepsListOrder(BibDatabaseMode mode) {
 
     @Test
     void translatorDetailOptionalAtArticle() {
-        BibEntryType entryType = entryTypesManager.enrich(StandardEntryType.Article, BibDatabaseMode.BIBLATEX).get();
+        BibEntryType entryType =
+                entryTypesManager.enrich(StandardEntryType.Article, BibDatabaseMode.BIBLATEX).get();
         assertTrue(entryType.getDetailOptionalFields().contains(StandardField.TRANSLATOR));
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/BibtexStringTest.java b/src/test/java/org/jabref/model/entry/BibtexStringTest.java
index e16104bd9918..bbc79722508a 100644
--- a/src/test/java/org/jabref/model/entry/BibtexStringTest.java
+++ b/src/test/java/org/jabref/model/entry/BibtexStringTest.java
@@ -1,11 +1,11 @@
 package org.jabref.model.entry;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import org.junit.jupiter.api.Test;
+
 class BibtexStringTest {
 
     @Test
@@ -105,7 +105,8 @@ void authorTypeCorrectlyDetermined() {
     @Test
     void institutionTypeCorrectlyDetermined() {
         // Source of the example: https://docs.jabref.org/fields/strings
-        BibtexString bibtexString = new BibtexString("iMIT", "{Massachusetts Institute of Technology ({MIT})}");
+        BibtexString bibtexString =
+                new BibtexString("iMIT", "{Massachusetts Institute of Technology ({MIT})}");
         assertEquals(BibtexString.Type.INSTITUTION, bibtexString.getType());
     }
 
@@ -119,7 +120,10 @@ void otherTypeCorrectlyDeterminedForLowerCase() {
     @Test
     void otherTypeCorrectlyDeterminedForUpperCase() {
         // Source of the example: https://docs.jabref.org/fields/strings
-        BibtexString bibtexString = new BibtexString("lTOSCA", "Topology and Orchestration Specification for Cloud Applications");
+        BibtexString bibtexString =
+                new BibtexString(
+                        "lTOSCA",
+                        "Topology and Orchestration Specification for Cloud Applications");
         assertEquals(BibtexString.Type.OTHER, bibtexString.getType());
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java b/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
index a05c1980b835..1c24cba85534 100644
--- a/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
+++ b/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
@@ -1,22 +1,23 @@
 package org.jabref.model.entry;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class CanonicalBibEntryTest {
 
     @Test
     void canonicalRepresentationIsCorrectForStringMonth() {
         BibEntry entry = new BibEntry();
         entry.setMonth(Month.MAY);
-        assertEquals("@misc{,\n" +
-                "  month = {#may#},\n" +
-                "  _jabref_shared = {sharedId: -1, version: 1}\n" +
-                "}", CanonicalBibEntry.getCanonicalRepresentation(entry));
+        assertEquals(
+                "@misc{,\n"
+                        + "  month = {#may#},\n"
+                        + "  _jabref_shared = {sharedId: -1, version: 1}\n"
+                        + "}",
+                CanonicalBibEntry.getCanonicalRepresentation(entry));
     }
 
     @Test
@@ -27,7 +28,8 @@ void simpleCanonicalRepresentation() {
         e.setField(StandardField.TITLE, "def");
         e.setField(StandardField.JOURNAL, "hij");
         String canonicalRepresentation = CanonicalBibEntry.getCanonicalRepresentation(e);
-        assertEquals("@article{key,\n  author = {abc},\n  journal = {hij},\n  title = {def},\n  _jabref_shared = {sharedId: -1, version: 1}\n}",
+        assertEquals(
+                "@article{key,\n  author = {abc},\n  journal = {hij},\n  title = {def},\n  _jabref_shared = {sharedId: -1, version: 1}\n}",
                 canonicalRepresentation);
     }
 
@@ -37,6 +39,8 @@ void canonicalRepresentationWithNewlines() {
         e.setCitationKey("key");
         e.setField(StandardField.ABSTRACT, "line 1\nline 2");
         String canonicalRepresentation = CanonicalBibEntry.getCanonicalRepresentation(e);
-        assertEquals("@article{key,\n  abstract = {line 1\nline 2},\n  _jabref_shared = {sharedId: -1, version: 1}\n}", canonicalRepresentation);
+        assertEquals(
+                "@article{key,\n  abstract = {line 1\nline 2},\n  _jabref_shared = {sharedId: -1, version: 1}\n}",
+                canonicalRepresentation);
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/CrossrefTest.java b/src/test/java/org/jabref/model/entry/CrossrefTest.java
index 9f212b5b519d..29532dbad8d3 100644
--- a/src/test/java/org/jabref/model/entry/CrossrefTest.java
+++ b/src/test/java/org/jabref/model/entry/CrossrefTest.java
@@ -1,23 +1,22 @@
 package org.jabref.model.entry;
 
-import java.util.Arrays;
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 class CrossrefTest {
 
@@ -49,7 +48,9 @@ void setup() {
     }
 
     @ParameterizedTest
-    @EnumSource(value = StandardField.class, names = {"IDS", "XREF", "ENTRYSET", "RELATED", "SORTKEY"})
+    @EnumSource(
+            value = StandardField.class,
+            names = {"IDS", "XREF", "ENTRYSET", "RELATED", "SORTKEY"})
     void forbiddenFields(StandardField field) {
         Optional<String> childField = child.getResolvedFieldOrAlias(field, db);
         assertTrue(childField.isEmpty());
@@ -63,13 +64,11 @@ void authorInheritance(EntryType parentType, EntryType childType) {
 
         assertEquals(
                 parent.getResolvedFieldOrAlias(StandardField.AUTHOR, null),
-                child.getResolvedFieldOrAlias(StandardField.AUTHOR, db)
-        );
+                child.getResolvedFieldOrAlias(StandardField.AUTHOR, db));
 
         assertEquals(
                 parent.getResolvedFieldOrAlias(StandardField.AUTHOR, null),
-                child.getResolvedFieldOrAlias(StandardField.BOOKAUTHOR, db)
-        );
+                child.getResolvedFieldOrAlias(StandardField.BOOKAUTHOR, db));
     }
 
     private static Stream<Arguments> authorInheritanceSource() {
@@ -79,8 +78,7 @@ private static Stream<Arguments> authorInheritanceSource() {
                 Arguments.of(StandardEntryType.MvBook, StandardEntryType.SuppBook),
                 Arguments.of(StandardEntryType.Book, StandardEntryType.InBook),
                 Arguments.of(StandardEntryType.Book, StandardEntryType.BookInBook),
-                Arguments.of(StandardEntryType.Book, StandardEntryType.SuppBook)
-        );
+                Arguments.of(StandardEntryType.Book, StandardEntryType.SuppBook));
     }
 
     @ParameterizedTest
@@ -91,16 +89,13 @@ void mainTitleInheritance(EntryType parentType, EntryType childType) {
 
         assertEquals(
                 parent.getResolvedFieldOrAlias(StandardField.TITLE, null),
-                child.getResolvedFieldOrAlias(StandardField.MAINTITLE, db)
-        );
+                child.getResolvedFieldOrAlias(StandardField.MAINTITLE, db));
         assertEquals(
                 parent.getResolvedFieldOrAlias(StandardField.SUBTITLE, null),
-                child.getResolvedFieldOrAlias(StandardField.MAINSUBTITLE, db)
-        );
+                child.getResolvedFieldOrAlias(StandardField.MAINSUBTITLE, db));
         assertEquals(
                 parent.getResolvedFieldOrAlias(StandardField.TITLEADDON, null),
-                child.getResolvedFieldOrAlias(StandardField.MAINTITLEADDON, db)
-        );
+                child.getResolvedFieldOrAlias(StandardField.MAINTITLEADDON, db));
     }
 
     private static Stream<Arguments> mainTitleInheritanceSource() {
@@ -115,8 +110,7 @@ private static Stream<Arguments> mainTitleInheritanceSource() {
                 Arguments.of(StandardEntryType.MvProceedings, StandardEntryType.Proceedings),
                 Arguments.of(StandardEntryType.MvProceedings, StandardEntryType.InProceedings),
                 Arguments.of(StandardEntryType.MvReference, StandardEntryType.Reference),
-                Arguments.of(StandardEntryType.MvReference, StandardEntryType.InReference)
-        );
+                Arguments.of(StandardEntryType.MvReference, StandardEntryType.InReference));
     }
 
     @ParameterizedTest
@@ -127,16 +121,13 @@ void bookTitleInheritance(EntryType parentType, EntryType childType) {
 
         assertEquals(
                 parent.getResolvedFieldOrAlias(StandardField.TITLE, null),
-                child.getResolvedFieldOrAlias(StandardField.BOOKTITLE, db)
-        );
+                child.getResolvedFieldOrAlias(StandardField.BOOKTITLE, db));
         assertEquals(
                 parent.getResolvedFieldOrAlias(StandardField.SUBTITLE, null),
-                child.getResolvedFieldOrAlias(StandardField.BOOKSUBTITLE, db)
-        );
+                child.getResolvedFieldOrAlias(StandardField.BOOKSUBTITLE, db));
         assertEquals(
                 parent.getResolvedFieldOrAlias(StandardField.TITLEADDON, null),
-                child.getResolvedFieldOrAlias(StandardField.BOOKTITLEADDON, db)
-        );
+                child.getResolvedFieldOrAlias(StandardField.BOOKTITLEADDON, db));
     }
 
     private static Stream<Arguments> bookTitleInheritanceSource() {
@@ -147,8 +138,7 @@ private static Stream<Arguments> bookTitleInheritanceSource() {
                 Arguments.of(StandardEntryType.Collection, StandardEntryType.InCollection),
                 Arguments.of(StandardEntryType.Collection, StandardEntryType.SuppCollection),
                 Arguments.of(StandardEntryType.Reference, StandardEntryType.InReference),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings)
-        );
+                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings));
     }
 
     @ParameterizedTest
@@ -159,19 +149,16 @@ void journalTitleInheritance(EntryType parentType, EntryType childType) {
 
         assertEquals(
                 parent.getResolvedFieldOrAlias(StandardField.TITLE, null),
-                child.getResolvedFieldOrAlias(StandardField.JOURNALTITLE, db)
-        );
+                child.getResolvedFieldOrAlias(StandardField.JOURNALTITLE, db));
         assertEquals(
                 parent.getResolvedFieldOrAlias(StandardField.SUBTITLE, null),
-                child.getResolvedFieldOrAlias(StandardField.JOURNALSUBTITLE, db)
-        );
+                child.getResolvedFieldOrAlias(StandardField.JOURNALSUBTITLE, db));
     }
 
     private static Stream<Arguments> journalTitleInheritanceSource() {
         return Stream.of(
                 Arguments.of(IEEETranEntryType.Periodical, StandardEntryType.Article),
-                Arguments.of(IEEETranEntryType.Periodical, StandardEntryType.SuppPeriodical)
-        );
+                Arguments.of(IEEETranEntryType.Periodical, StandardEntryType.SuppPeriodical));
     }
 
     @ParameterizedTest
@@ -205,8 +192,7 @@ private static Stream<Arguments> noTitleInheritanceSource() {
                 Arguments.of(StandardEntryType.Collection, StandardEntryType.InCollection),
                 Arguments.of(StandardEntryType.Collection, StandardEntryType.SuppCollection),
                 Arguments.of(StandardEntryType.Reference, StandardEntryType.InReference),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings)
-        );
+                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings));
     }
 
     @ParameterizedTest
@@ -219,105 +205,382 @@ void sameNameInheritance(EntryType parentType, EntryType childType, StandardFiel
 
         assertEquals(
                 parent.getResolvedFieldOrAlias(field, null),
-                child.getResolvedFieldOrAlias(field, db)
-        );
+                child.getResolvedFieldOrAlias(field, db));
     }
 
     private static Stream<Arguments> sameNameInheritance() {
         return Stream.of(
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ABSTRACT),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ADDENDUM),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ADDRESS),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.AFTERWORD),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ANNOTE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ANNOTATION),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ANNOTATOR),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ARCHIVEPREFIX),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ASSIGNEE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.AUTHOR),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.BOOKPAGINATION),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.CHAPTER),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.COMMENTATOR),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.COMMENT),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.DATE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.DAY),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.DAYFILED),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.DOI),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EDITION),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EDITOR),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EDITORA),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EDITORB),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EDITORC),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EDITORTYPE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EDITORATYPE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EDITORBTYPE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EDITORCTYPE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EID),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EPRINT),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EPRINTCLASS),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EPRINTTYPE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EVENTDATE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EVENTTITLE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.EVENTTITLEADDON),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.FILE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.FOREWORD),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.FOLDER),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.GENDER),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.HOLDER),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.HOWPUBLISHED),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.INSTITUTION),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.INTRODUCTION),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ISBN),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ISRN),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ISSN),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ISSUE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ISSUETITLE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ISSUESUBTITLE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.JOURNAL),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.KEY),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.KEYWORDS),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.LANGUAGE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.LOCATION),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.MONTH),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.MONTHFILED),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.NAMEADDON),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.NATIONALITY),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.NOTE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.NUMBER),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ORGANIZATION),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ORIGDATE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.ORIGLANGUAGE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.PAGES),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.PAGETOTAL),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.PAGINATION),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.PART),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.PDF),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.PMID),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.PS),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.PUBLISHER),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.PUBSTATE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.PRIMARYCLASS),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.REPORTNO),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.REVIEW),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.REVISION),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.SCHOOL),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.SERIES),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.SHORTAUTHOR),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.SHORTEDITOR),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.SORTNAME),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.TRANSLATOR),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.TYPE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.URI),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.URL),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.URLDATE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.VENUE),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.VERSION),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.VOLUME),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.VOLUMES),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.YEAR),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.YEARFILED),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.MR_NUMBER),
-                Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings, StandardField.XDATA)
-        );
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ABSTRACT),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ADDENDUM),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ADDRESS),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.AFTERWORD),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ANNOTE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ANNOTATION),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ANNOTATOR),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ARCHIVEPREFIX),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ASSIGNEE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.AUTHOR),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.BOOKPAGINATION),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.CHAPTER),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.COMMENTATOR),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.COMMENT),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.DATE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.DAY),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.DAYFILED),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.DOI),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EDITION),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EDITOR),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EDITORA),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EDITORB),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EDITORC),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EDITORTYPE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EDITORATYPE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EDITORBTYPE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EDITORCTYPE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EID),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EPRINT),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EPRINTCLASS),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EPRINTTYPE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EVENTDATE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EVENTTITLE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.EVENTTITLEADDON),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.FILE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.FOREWORD),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.FOLDER),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.GENDER),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.HOLDER),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.HOWPUBLISHED),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.INSTITUTION),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.INTRODUCTION),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ISBN),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ISRN),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ISSN),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ISSUE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ISSUETITLE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ISSUESUBTITLE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.JOURNAL),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.KEY),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.KEYWORDS),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.LANGUAGE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.LOCATION),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.MONTH),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.MONTHFILED),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.NAMEADDON),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.NATIONALITY),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.NOTE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.NUMBER),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ORGANIZATION),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ORIGDATE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.ORIGLANGUAGE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.PAGES),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.PAGETOTAL),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.PAGINATION),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.PART),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.PDF),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.PMID),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.PS),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.PUBLISHER),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.PUBSTATE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.PRIMARYCLASS),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.REPORTNO),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.REVIEW),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.REVISION),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.SCHOOL),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.SERIES),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.SHORTAUTHOR),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.SHORTEDITOR),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.SORTNAME),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.TRANSLATOR),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.TYPE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.URI),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.URL),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.URLDATE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.VENUE),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.VERSION),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.VOLUME),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.VOLUMES),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.YEAR),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.YEARFILED),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.MR_NUMBER),
+                Arguments.of(
+                        StandardEntryType.Proceedings,
+                        StandardEntryType.InProceedings,
+                        StandardField.XDATA));
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/DateTest.java b/src/test/java/org/jabref/model/entry/DateTest.java
index f25fa62136f7..c1afa8eae6c2 100644
--- a/src/test/java/org/jabref/model/entry/DateTest.java
+++ b/src/test/java/org/jabref/model/entry/DateTest.java
@@ -1,5 +1,14 @@
 package org.jabref.model.entry;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.Month;
@@ -12,15 +21,6 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 class DateTest {
     private static Stream<Arguments> validDates() {
         return Stream.of(
@@ -54,8 +54,7 @@ private static Stream<Arguments> validDates() {
                 Arguments.of(Year.of(2), "2 AD"),
                 Arguments.of(Year.of(2), "0002 AD"),
                 Arguments.of(YearMonth.of(-29, Month.JANUARY), "0030-01 BC"),
-                Arguments.of(YearMonth.of(5, Month.FEBRUARY), "0005-02 AD")
-        );
+                Arguments.of(YearMonth.of(5, Month.FEBRUARY), "0005-02 AD"));
     }
 
     @ParameterizedTest
@@ -66,28 +65,56 @@ void parseByDatePattern(Temporal expected, String provided) {
 
     private static Stream<Arguments> validDateRanges() {
         return Stream.of(
-             Arguments.of(Year.of(2014), Year.of(2017), "2014/2017"),
-             Arguments.of(YearMonth.of(2015, Month.JANUARY), YearMonth.of(2015, Month.FEBRUARY), "2015-01/2015-02"),
-             Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), LocalDate.of(2015, Month.FEBRUARY, 25), "2015-01-15/2015-02-25"),
-             Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), LocalDate.of(2015, Month.FEBRUARY, 25), "2015-01-15 / 2015-02-25"),
-             Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), LocalDate.of(2015, Month.FEBRUARY, 25), "15 January 2015/25 February 2015"),
-             Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), LocalDate.of(2015, Month.FEBRUARY, 25), "15 January 2015 / 25 February 2015"),
-             Arguments.of(Year.of(-29), Year.of(5), "30 BC/5 AD"),
-             Arguments.of(Year.of(-29), Year.of(5), "30 BC / 5 AD"),
-             Arguments.of(Year.of(-29), Year.of(5), "0030 BC/0005 AD"),
-             Arguments.of(Year.of(-29), Year.of(-9), "0030 BC/0010 BC"),
-             Arguments.of(Year.of(5), Year.of(10), "0005 AD/0010 AD"),
-             Arguments.of(YearMonth.of(-29, Month.JANUARY), YearMonth.of(5, Month.FEBRUARY), "0030-01 BC/0005-02 AD"),
-             Arguments.of(YearMonth.of(-29, Month.JANUARY), YearMonth.of(5, Month.FEBRUARY), "0030-01 BC / 0005-02 AD"),
-             Arguments.of(YearMonth.of(-29, Month.JANUARY), YearMonth.of(-9, Month.FEBRUARY), "0030-01 BC / 0010-02 BC"),
-             Arguments.of(YearMonth.of(5, Month.JANUARY), YearMonth.of(20, Month.FEBRUARY), "0005-01 AD / 0020-02 AD")
-        );
+                Arguments.of(Year.of(2014), Year.of(2017), "2014/2017"),
+                Arguments.of(
+                        YearMonth.of(2015, Month.JANUARY),
+                        YearMonth.of(2015, Month.FEBRUARY),
+                        "2015-01/2015-02"),
+                Arguments.of(
+                        LocalDate.of(2015, Month.JANUARY, 15),
+                        LocalDate.of(2015, Month.FEBRUARY, 25),
+                        "2015-01-15/2015-02-25"),
+                Arguments.of(
+                        LocalDate.of(2015, Month.JANUARY, 15),
+                        LocalDate.of(2015, Month.FEBRUARY, 25),
+                        "2015-01-15 / 2015-02-25"),
+                Arguments.of(
+                        LocalDate.of(2015, Month.JANUARY, 15),
+                        LocalDate.of(2015, Month.FEBRUARY, 25),
+                        "15 January 2015/25 February 2015"),
+                Arguments.of(
+                        LocalDate.of(2015, Month.JANUARY, 15),
+                        LocalDate.of(2015, Month.FEBRUARY, 25),
+                        "15 January 2015 / 25 February 2015"),
+                Arguments.of(Year.of(-29), Year.of(5), "30 BC/5 AD"),
+                Arguments.of(Year.of(-29), Year.of(5), "30 BC / 5 AD"),
+                Arguments.of(Year.of(-29), Year.of(5), "0030 BC/0005 AD"),
+                Arguments.of(Year.of(-29), Year.of(-9), "0030 BC/0010 BC"),
+                Arguments.of(Year.of(5), Year.of(10), "0005 AD/0010 AD"),
+                Arguments.of(
+                        YearMonth.of(-29, Month.JANUARY),
+                        YearMonth.of(5, Month.FEBRUARY),
+                        "0030-01 BC/0005-02 AD"),
+                Arguments.of(
+                        YearMonth.of(-29, Month.JANUARY),
+                        YearMonth.of(5, Month.FEBRUARY),
+                        "0030-01 BC / 0005-02 AD"),
+                Arguments.of(
+                        YearMonth.of(-29, Month.JANUARY),
+                        YearMonth.of(-9, Month.FEBRUARY),
+                        "0030-01 BC / 0010-02 BC"),
+                Arguments.of(
+                        YearMonth.of(5, Month.JANUARY),
+                        YearMonth.of(20, Month.FEBRUARY),
+                        "0005-01 AD / 0020-02 AD"));
     }
 
     @ParameterizedTest
     @MethodSource("validDateRanges")
-    void parseByDatePatternRange(Temporal expectedRangeStart, Temporal expectedRangeEnd, String provided) {
-        assertEquals(Optional.of(new Date(expectedRangeStart, expectedRangeEnd)), Date.parse(provided));
+    void parseByDatePatternRange(
+            Temporal expectedRangeStart, Temporal expectedRangeEnd, String provided) {
+        assertEquals(
+                Optional.of(new Date(expectedRangeStart, expectedRangeEnd)), Date.parse(provided));
     }
 
     private static Stream<Arguments> invalidCornerCases() {
@@ -96,8 +123,7 @@ private static Stream<Arguments> invalidCornerCases() {
                 Arguments.of("32-06-2014", "day of month exists [1]"),
                 Arguments.of("00-06-2014", "day of month exists [2]"),
                 Arguments.of("30-13-2014", "month exists [1]"),
-                Arguments.of("30-00-2014", "month exists [2]")
-        );
+                Arguments.of("30-00-2014", "month exists [2]"));
     }
 
     @ParameterizedTest
@@ -108,12 +134,12 @@ void nonExistentDates(String invalidDate, String errorMessage) {
 
     @Test
     void parseZonedTime() {
-        Optional<Date> expected = Optional.of(
-                new Date(ZonedDateTime.of(
-                        LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 24, 14),
-                        ZoneId.from(ZoneOffset.ofHours(3)))
-                )
-        );
+        Optional<Date> expected =
+                Optional.of(
+                        new Date(
+                                ZonedDateTime.of(
+                                        LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 24, 14),
+                                        ZoneId.from(ZoneOffset.ofHours(3)))));
 
         assertEquals(expected, Date.parse("2018-10-03T07:24:14+03:00"));
         assertNotEquals(expected, Date.parse("2018-10-03T07:24:14+02:00"));
diff --git a/src/test/java/org/jabref/model/entry/EntryLinkListTest.java b/src/test/java/org/jabref/model/entry/EntryLinkListTest.java
index 83729e7dd3aa..8928ba48de00 100644
--- a/src/test/java/org/jabref/model/entry/EntryLinkListTest.java
+++ b/src/test/java/org/jabref/model/entry/EntryLinkListTest.java
@@ -1,17 +1,16 @@
 package org.jabref.model.entry;
 
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.List;
+import java.util.Optional;
 
 class EntryLinkListTest {
 
@@ -33,8 +32,7 @@ void before() {
     }
 
     private BibEntry create(String citeKey) {
-        BibEntry entry = new BibEntry()
-                .withCitationKey(citeKey);
+        BibEntry entry = new BibEntry().withCitationKey(citeKey);
         database.insertEntry(entry);
         return entry;
     }
@@ -62,8 +60,8 @@ void givenFieldValueAndDatabaseWhenParsingThenExpectLink() {
 
     @Test
     void givenBibEntryWhenParsingThenExpectLink() {
-      ParsedEntryLink expected = new ParsedEntryLink(new BibEntry().withCitationKey("key"));
-      assertFalse(expected.getLinkedEntry().isEmpty());
+        ParsedEntryLink expected = new ParsedEntryLink(new BibEntry().withCitationKey("key"));
+        assertFalse(expected.getLinkedEntry().isEmpty());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/EntryTypeFactoryTest.java b/src/test/java/org/jabref/model/entry/EntryTypeFactoryTest.java
index a277319be213..f0cdc63070ef 100644
--- a/src/test/java/org/jabref/model/entry/EntryTypeFactoryTest.java
+++ b/src/test/java/org/jabref/model/entry/EntryTypeFactoryTest.java
@@ -1,13 +1,12 @@
 package org.jabref.model.entry;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.entry.types.IEEETranEntryType;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class EntryTypeFactoryTest {
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/IdGeneratorTest.java b/src/test/java/org/jabref/model/entry/IdGeneratorTest.java
index 3f373d61dea3..3b913dbb3006 100644
--- a/src/test/java/org/jabref/model/entry/IdGeneratorTest.java
+++ b/src/test/java/org/jabref/model/entry/IdGeneratorTest.java
@@ -1,10 +1,10 @@
 package org.jabref.model.entry;
 
-import java.util.HashSet;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import java.util.HashSet;
 
 class IdGeneratorTest {
 
diff --git a/src/test/java/org/jabref/model/entry/KeywordListTest.java b/src/test/java/org/jabref/model/entry/KeywordListTest.java
index b4c3edf57bcd..789d6338f39e 100644
--- a/src/test/java/org/jabref/model/entry/KeywordListTest.java
+++ b/src/test/java/org/jabref/model/entry/KeywordListTest.java
@@ -1,10 +1,10 @@
 package org.jabref.model.entry;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class KeywordListTest {
 
     private KeywordList keywords;
@@ -23,49 +23,53 @@ void parseEmptyStringReturnsEmptyList() throws Exception {
 
     @Test
     void parseOneWordReturnsOneKeyword() throws Exception {
-        assertEquals(new KeywordList("keywordOne"),
-                KeywordList.parse("keywordOne", ','));
+        assertEquals(new KeywordList("keywordOne"), KeywordList.parse("keywordOne", ','));
     }
 
     @Test
     void parseTwoWordReturnsTwoKeywords() throws Exception {
-        assertEquals(new KeywordList("keywordOne", "keywordTwo"),
+        assertEquals(
+                new KeywordList("keywordOne", "keywordTwo"),
                 KeywordList.parse("keywordOne, keywordTwo", ','));
     }
 
     @Test
     void parseTwoWordReturnsTwoKeywordsWithoutSpace() throws Exception {
-        assertEquals(new KeywordList("keywordOne", "keywordTwo"),
+        assertEquals(
+                new KeywordList("keywordOne", "keywordTwo"),
                 KeywordList.parse("keywordOne,keywordTwo", ','));
     }
 
     @Test
     void parseTwoWordReturnsTwoKeywordsWithDifferentDelimiter() throws Exception {
-        assertEquals(new KeywordList("keywordOne", "keywordTwo"),
+        assertEquals(
+                new KeywordList("keywordOne", "keywordTwo"),
                 KeywordList.parse("keywordOne| keywordTwo", '|'));
     }
 
     @Test
     void parseWordsWithWhitespaceReturnsOneKeyword() throws Exception {
-        assertEquals(new KeywordList("keyword and one"),
-                KeywordList.parse("keyword and one", ','));
+        assertEquals(new KeywordList("keyword and one"), KeywordList.parse("keyword and one", ','));
     }
 
     @Test
     void parseWordsWithWhitespaceAndCommaReturnsTwoKeyword() throws Exception {
-        assertEquals(new KeywordList("keyword and one", "and two"),
+        assertEquals(
+                new KeywordList("keyword and one", "and two"),
                 KeywordList.parse("keyword and one, and two", ','));
     }
 
     @Test
     void parseIgnoresDuplicates() throws Exception {
-        assertEquals(new KeywordList("keywordOne", "keywordTwo"),
+        assertEquals(
+                new KeywordList("keywordOne", "keywordTwo"),
                 KeywordList.parse("keywordOne, keywordTwo, keywordOne", ','));
     }
 
     @Test
     void parseTakeDelimiterNotRegexWhite() throws Exception {
-        assertEquals(new KeywordList("keywordOne keywordTwo", "keywordThree"),
+        assertEquals(
+                new KeywordList("keywordOne keywordTwo", "keywordThree"),
                 KeywordList.parse("keywordOne keywordTwoskeywordThree", 's'));
     }
 
@@ -83,7 +87,8 @@ void asStringAddsSpaceAfterDelimiter() throws Exception {
     void parseHierarchicalChain() throws Exception {
         Keyword expected = Keyword.of("Parent", "Node", "Child");
 
-        assertEquals(new KeywordList(expected), KeywordList.parse("Parent > Node > Child", ',', '>'));
+        assertEquals(
+                new KeywordList(expected), KeywordList.parse("Parent > Node > Child", ',', '>'));
     }
 
     @Test
@@ -91,7 +96,8 @@ void parseTwoHierarchicalChains() throws Exception {
         Keyword expectedOne = Keyword.of("Parent1", "Node1", "Child1");
         Keyword expectedTwo = Keyword.of("Parent2", "Node2", "Child2");
 
-        assertEquals(new KeywordList(expectedOne, expectedTwo),
+        assertEquals(
+                new KeywordList(expectedOne, expectedTwo),
                 KeywordList.parse("Parent1 > Node1 > Child1, Parent2 > Node2 > Child2", ',', '>'));
     }
 
@@ -113,6 +119,8 @@ void mergeTwoDistinctKeywordsShouldReturnTheTwoKeywordsMerged() {
 
     @Test
     void mergeTwoListsOfKeywordsShouldReturnTheKeywordsMerged() {
-        assertEquals(new KeywordList("Figma", "Adobe", "JabRef", "Eclipse", "JetBrains"), KeywordList.merge("Figma, Adobe, JetBrains, Eclipse", "Adobe, JabRef", ','));
+        assertEquals(
+                new KeywordList("Figma", "Adobe", "JabRef", "Eclipse", "JetBrains"),
+                KeywordList.merge("Figma, Adobe, JetBrains, Eclipse", "Adobe, JabRef", ','));
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/KeywordTest.java b/src/test/java/org/jabref/model/entry/KeywordTest.java
index 3557012ea4f9..0e81abacb931 100644
--- a/src/test/java/org/jabref/model/entry/KeywordTest.java
+++ b/src/test/java/org/jabref/model/entry/KeywordTest.java
@@ -1,11 +1,11 @@
 package org.jabref.model.entry;
 
-import java.util.HashSet;
-import java.util.Set;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.HashSet;
+import java.util.Set;
 
 class KeywordTest {
 
diff --git a/src/test/java/org/jabref/model/entry/MonthTest.java b/src/test/java/org/jabref/model/entry/MonthTest.java
index 4b5c975261c3..e890dd70e56e 100644
--- a/src/test/java/org/jabref/model/entry/MonthTest.java
+++ b/src/test/java/org/jabref/model/entry/MonthTest.java
@@ -1,19 +1,29 @@
 package org.jabref.model.entry;
 
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.params.provider.Arguments.arguments;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 class MonthTest {
 
     @ParameterizedTest
-    @MethodSource({"parseShortName", "parseBibtexName", "parseFullName", "parseTwoDigitNumber", "parseNumber", "parseShortNameGerman", "parseFullNameGerman", "parseShortNameGermanLowercase", "parseSpecialCases"})
+    @MethodSource({
+        "parseShortName",
+        "parseBibtexName",
+        "parseFullName",
+        "parseTwoDigitNumber",
+        "parseNumber",
+        "parseShortNameGerman",
+        "parseFullNameGerman",
+        "parseShortNameGermanLowercase",
+        "parseSpecialCases"
+    })
     void parseCorrectly(Optional<Month> expected, String input) {
         assertEquals(expected, Month.parse(input));
     }
@@ -31,8 +41,7 @@ private static Stream<Arguments> parseShortName() {
                 arguments(Optional.of(Month.SEPTEMBER), "sep"),
                 arguments(Optional.of(Month.OCTOBER), "oct"),
                 arguments(Optional.of(Month.NOVEMBER), "nov"),
-                arguments(Optional.of(Month.DECEMBER), "dec")
-        );
+                arguments(Optional.of(Month.DECEMBER), "dec"));
     }
 
     private static Stream<Arguments> parseBibtexName() {
@@ -48,8 +57,7 @@ private static Stream<Arguments> parseBibtexName() {
                 arguments(Optional.of(Month.SEPTEMBER), "#sep#"),
                 arguments(Optional.of(Month.OCTOBER), "#oct#"),
                 arguments(Optional.of(Month.NOVEMBER), "#nov#"),
-                arguments(Optional.of(Month.DECEMBER), "#dec#")
-        );
+                arguments(Optional.of(Month.DECEMBER), "#dec#"));
     }
 
     private static Stream<Arguments> parseFullName() {
@@ -65,8 +73,7 @@ private static Stream<Arguments> parseFullName() {
                 arguments(Optional.of(Month.SEPTEMBER), "September"),
                 arguments(Optional.of(Month.OCTOBER), "October"),
                 arguments(Optional.of(Month.NOVEMBER), "November"),
-                arguments(Optional.of(Month.DECEMBER), "December")
-        );
+                arguments(Optional.of(Month.DECEMBER), "December"));
     }
 
     private static Stream<Arguments> parseTwoDigitNumber() {
@@ -82,8 +89,7 @@ private static Stream<Arguments> parseTwoDigitNumber() {
                 arguments(Optional.of(Month.SEPTEMBER), "09"),
                 arguments(Optional.of(Month.OCTOBER), "10"),
                 arguments(Optional.of(Month.NOVEMBER), "11"),
-                arguments(Optional.of(Month.DECEMBER), "12")
-        );
+                arguments(Optional.of(Month.DECEMBER), "12"));
     }
 
     private static Stream<Arguments> parseNumber() {
@@ -99,8 +105,7 @@ private static Stream<Arguments> parseNumber() {
                 arguments(Optional.of(Month.SEPTEMBER), "9"),
                 arguments(Optional.of(Month.OCTOBER), "10"),
                 arguments(Optional.of(Month.NOVEMBER), "11"),
-                arguments(Optional.of(Month.DECEMBER), "12")
-        );
+                arguments(Optional.of(Month.DECEMBER), "12"));
     }
 
     private static Stream<Arguments> parseShortNameGerman() {
@@ -117,8 +122,7 @@ private static Stream<Arguments> parseShortNameGerman() {
                 arguments(Optional.of(Month.SEPTEMBER), "Sep"),
                 arguments(Optional.of(Month.OCTOBER), "Okt"),
                 arguments(Optional.of(Month.NOVEMBER), "Nov"),
-                arguments(Optional.of(Month.DECEMBER), "Dez")
-        );
+                arguments(Optional.of(Month.DECEMBER), "Dez"));
     }
 
     private static Stream<Arguments> parseFullNameGerman() {
@@ -135,8 +139,7 @@ private static Stream<Arguments> parseFullNameGerman() {
                 arguments(Optional.of(Month.SEPTEMBER), "September"),
                 arguments(Optional.of(Month.OCTOBER), "Oktober"),
                 arguments(Optional.of(Month.NOVEMBER), "November"),
-                arguments(Optional.of(Month.DECEMBER), "Dezember")
-        );
+                arguments(Optional.of(Month.DECEMBER), "Dezember"));
     }
 
     private static Stream<Arguments> parseShortNameGermanLowercase() {
@@ -153,8 +156,7 @@ private static Stream<Arguments> parseShortNameGermanLowercase() {
                 arguments(Optional.of(Month.SEPTEMBER), "sep"),
                 arguments(Optional.of(Month.OCTOBER), "okt"),
                 arguments(Optional.of(Month.NOVEMBER), "nov"),
-                arguments(Optional.of(Month.DECEMBER), "dez")
-        );
+                arguments(Optional.of(Month.DECEMBER), "dez"));
     }
 
     private static Stream<Arguments> parseSpecialCases() {
@@ -163,8 +165,7 @@ private static Stream<Arguments> parseSpecialCases() {
                 arguments(Optional.empty(), "3.2"),
                 arguments(Optional.empty(), "#test#"),
                 arguments(Optional.empty(), "8,"),
-                arguments(Optional.empty(), "")
-        );
+                arguments(Optional.empty(), ""));
     }
 
     @ParameterizedTest
@@ -199,8 +200,7 @@ private static Stream<Arguments> parseGermanShortMonthTest() {
                 arguments(Optional.of(Month.NOVEMBER), "nov"),
                 arguments(Optional.of(Month.NOVEMBER), "november"),
                 arguments(Optional.of(Month.DECEMBER), "dez"),
-                arguments(Optional.of(Month.DECEMBER), "dezember")
-        );
+                arguments(Optional.of(Month.DECEMBER), "dezember"));
     }
 
     @ParameterizedTest
@@ -226,8 +226,7 @@ private static Stream<Arguments> getMonthByNumberTest() {
                 arguments(Optional.of(Month.NOVEMBER), 11),
                 arguments(Optional.of(Month.DECEMBER), 12),
                 arguments(Optional.empty(), 13),
-                arguments(Optional.empty(), 14)
-        );
+                arguments(Optional.empty(), 14));
     }
 
     @ParameterizedTest
@@ -243,8 +242,7 @@ private static Stream<Arguments> getMonthByShortNameSpecialCases() {
                 arguments(Optional.of(Month.JANUARY), "JAN"),
                 arguments(Optional.empty(), ""),
                 arguments(Optional.empty(), "dez"),
-                arguments(Optional.empty(), "+*ç%&/()=.,:;-${}![]^'?~¦@#°§¬|¢äüö")
-        );
+                arguments(Optional.empty(), "+*ç%&/()=.,:;-${}![]^'?~¦@#°§¬|¢äüö"));
     }
 
     @ParameterizedTest
@@ -266,8 +264,7 @@ private static Stream<Arguments> getShortNameTest() {
                 arguments("sep", Month.SEPTEMBER),
                 arguments("oct", Month.OCTOBER),
                 arguments("nov", Month.NOVEMBER),
-                arguments("dec", Month.DECEMBER)
-        );
+                arguments("dec", Month.DECEMBER));
     }
 
     @ParameterizedTest
@@ -289,8 +286,7 @@ private static Stream<Arguments> getJabRefFormatTest() {
                 arguments("#sep#", Month.SEPTEMBER),
                 arguments("#oct#", Month.OCTOBER),
                 arguments("#nov#", Month.NOVEMBER),
-                arguments("#dec#", Month.DECEMBER)
-        );
+                arguments("#dec#", Month.DECEMBER));
     }
 
     @ParameterizedTest
@@ -312,8 +308,7 @@ private static Stream<Arguments> getNumberTest() {
                 arguments(9, Month.SEPTEMBER),
                 arguments(10, Month.OCTOBER),
                 arguments(11, Month.NOVEMBER),
-                arguments(12, Month.DECEMBER)
-        );
+                arguments(12, Month.DECEMBER));
     }
 
     @ParameterizedTest
@@ -335,8 +330,7 @@ private static Stream<Arguments> getFullNameTest() {
                 arguments("September", Month.SEPTEMBER),
                 arguments("October", Month.OCTOBER),
                 arguments("November", Month.NOVEMBER),
-                arguments("December", Month.DECEMBER)
-        );
+                arguments("December", Month.DECEMBER));
     }
 
     @ParameterizedTest
@@ -358,7 +352,6 @@ private static Stream<Arguments> getTwoDigitNumberTest() {
                 arguments("09", Month.SEPTEMBER),
                 arguments("10", Month.OCTOBER),
                 arguments("11", Month.NOVEMBER),
-                arguments("12", Month.DECEMBER)
-        );
+                arguments("12", Month.DECEMBER));
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/field/BibFieldTest.java b/src/test/java/org/jabref/model/entry/field/BibFieldTest.java
index 9775efda9764..7ae4dcf72105 100644
--- a/src/test/java/org/jabref/model/entry/field/BibFieldTest.java
+++ b/src/test/java/org/jabref/model/entry/field/BibFieldTest.java
@@ -1,19 +1,23 @@
 package org.jabref.model.entry.field;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
+import org.junit.jupiter.api.Test;
+
 class BibFieldTest {
 
     @Test
     void bibFieldsConsideredEqualIfUnderlyingFieldIsEqual() {
-        assertEquals(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT), new BibField(StandardField.AUTHOR, FieldPriority.DETAIL));
+        assertEquals(
+                new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT),
+                new BibField(StandardField.AUTHOR, FieldPriority.DETAIL));
     }
 
     @Test
     void bibFieldsConsideredNotEqualIfUnderlyingFieldNotEqual() {
-        assertNotEquals(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT), new BibField(StandardField.TITLE, FieldPriority.IMPORTANT));
+        assertNotEquals(
+                new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT),
+                new BibField(StandardField.TITLE, FieldPriority.IMPORTANT));
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/field/FieldFactoryTest.java b/src/test/java/org/jabref/model/entry/field/FieldFactoryTest.java
index 731d2cfc3196..958f14bef355 100644
--- a/src/test/java/org/jabref/model/entry/field/FieldFactoryTest.java
+++ b/src/test/java/org/jabref/model/entry/field/FieldFactoryTest.java
@@ -1,36 +1,40 @@
 package org.jabref.model.entry.field;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.jabref.model.entry.types.BiblatexApaEntryType;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import java.util.stream.Stream;
 
 class FieldFactoryTest {
     @Test
     void orFieldsTwoTerms() {
-        assertEquals("Aaa/Bbb", FieldFactory.serializeOrFields(new UnknownField("aaa"), new UnknownField("bbb")));
+        assertEquals(
+                "Aaa/Bbb",
+                FieldFactory.serializeOrFields(new UnknownField("aaa"), new UnknownField("bbb")));
     }
 
     @Test
     void orFieldsThreeTerms() {
-        assertEquals("Aaa/Bbb/Ccc", FieldFactory.serializeOrFields(new UnknownField("aaa"), new UnknownField("bbb"), new UnknownField("ccc")));
+        assertEquals(
+                "Aaa/Bbb/Ccc",
+                FieldFactory.serializeOrFields(
+                        new UnknownField("aaa"), new UnknownField("bbb"), new UnknownField("ccc")));
     }
 
     private static Stream<Arguments> fieldsWithoutFieldProperties() {
         return Stream.of(
                 // comment fields
                 Arguments.of(new UserSpecificCommentField("user1"), "comment-user1"),
-                Arguments.of(new UserSpecificCommentField("other-user-id"), "comment-other-user-id"),
+                Arguments.of(
+                        new UserSpecificCommentField("other-user-id"), "comment-other-user-id"),
                 // unknown field
-                Arguments.of(new UnknownField("cased", "cAsEd"), "cAsEd")
-        );
+                Arguments.of(new UnknownField("cased", "cAsEd"), "cAsEd"));
     }
 
     @ParameterizedTest
@@ -46,6 +50,8 @@ void doesNotParseApaFieldWithoutEntryType() {
 
     @Test
     void doesParseApaFieldWithEntryType() {
-        assertEquals(BiblatexApaField.ARTICLE, FieldFactory.parseField(BiblatexApaEntryType.Constitution, "article"));
+        assertEquals(
+                BiblatexApaField.ARTICLE,
+                FieldFactory.parseField(BiblatexApaEntryType.Constitution, "article"));
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/field/SpecialFieldTest.java b/src/test/java/org/jabref/model/entry/field/SpecialFieldTest.java
index 6d5f50f863a5..66d6d349ebe2 100644
--- a/src/test/java/org/jabref/model/entry/field/SpecialFieldTest.java
+++ b/src/test/java/org/jabref/model/entry/field/SpecialFieldTest.java
@@ -1,17 +1,16 @@
 package org.jabref.model.entry.field;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 class SpecialFieldTest {
 
     @Test
     void getSpecialFieldInstanceFromFieldNameValid() {
-        assertEquals(Optional.of(SpecialField.RANKING),
-                SpecialField.fromName("ranking"));
+        assertEquals(Optional.of(SpecialField.RANKING), SpecialField.fromName("ranking"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/field/StandardFieldTest.java b/src/test/java/org/jabref/model/entry/field/StandardFieldTest.java
index 4ea68752d792..1c459a37ad43 100644
--- a/src/test/java/org/jabref/model/entry/field/StandardFieldTest.java
+++ b/src/test/java/org/jabref/model/entry/field/StandardFieldTest.java
@@ -1,9 +1,9 @@
 package org.jabref.model.entry.field;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 class StandardFieldTest {
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/field/UnknownFieldTest.java b/src/test/java/org/jabref/model/entry/field/UnknownFieldTest.java
index 1b6ca0212c0e..a970aab36b81 100644
--- a/src/test/java/org/jabref/model/entry/field/UnknownFieldTest.java
+++ b/src/test/java/org/jabref/model/entry/field/UnknownFieldTest.java
@@ -1,9 +1,9 @@
 package org.jabref.model.entry.field;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 class UnknownFieldTest {
     @Test
     void fieldsConsideredEqualIfSameName() {
diff --git a/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java b/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java
index fd395d54ee7a..58631b3950d9 100644
--- a/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java
@@ -1,11 +1,11 @@
 package org.jabref.model.entry.identifier;
 
-import java.net.URI;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.net.URI;
+import java.util.Optional;
 
 class ArXivIdentifierTest {
 
@@ -54,7 +54,8 @@ void parseOldIdentifier() throws Exception {
     @Test
     void acceptLegacyEprint() {
         Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("astro-ph.GT/1234567");
-        assertEquals(Optional.of(new ArXivIdentifier("astro-ph.GT/1234567", "astro-ph.GT")), parsed);
+        assertEquals(
+                Optional.of(new ArXivIdentifier("astro-ph.GT/1234567", "astro-ph.GT")), parsed);
     }
 
     @Test
@@ -79,7 +80,8 @@ void parseUrl() throws Exception {
 
     @Test
     void parseHttpsUrl() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("https://arxiv.org/abs/1502.05795");
+        Optional<ArXivIdentifier> parsed =
+                ArXivIdentifier.parse("https://arxiv.org/abs/1502.05795");
 
         assertEquals(Optional.of(new ArXivIdentifier("1502.05795", "")), parsed);
     }
@@ -93,14 +95,16 @@ void parsePdfUrl() throws Exception {
 
     @Test
     void parseUrlWithVersion() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("http://arxiv.org/abs/1502.05795v1");
+        Optional<ArXivIdentifier> parsed =
+                ArXivIdentifier.parse("http://arxiv.org/abs/1502.05795v1");
 
         assertEquals(Optional.of(new ArXivIdentifier("1502.05795", "1", "")), parsed);
     }
 
     @Test
     void parseOldUrlWithVersion() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("http://arxiv.org/pdf/hep-ex/0307015v1");
+        Optional<ArXivIdentifier> parsed =
+                ArXivIdentifier.parse("http://arxiv.org/pdf/hep-ex/0307015v1");
 
         assertEquals(Optional.of(new ArXivIdentifier("hep-ex/0307015", "1", "hep-ex")), parsed);
     }
@@ -149,25 +153,30 @@ void rejectInvalidEprint() {
 
     @Test
     void acceptUrlHttpEprint() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("http://arxiv.org/abs/0706.0001v1");
+        Optional<ArXivIdentifier> parsed =
+                ArXivIdentifier.parse("http://arxiv.org/abs/0706.0001v1");
         assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "v1", "")), parsed);
     }
 
     @Test
     void acceptUrlHttpsEprint() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("https://arxiv.org/abs/0706.0001v1");
+        Optional<ArXivIdentifier> parsed =
+                ArXivIdentifier.parse("https://arxiv.org/abs/0706.0001v1");
         assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "v1", "")), parsed);
     }
 
     @Test
     void rejectUrlOtherDomainEprint() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("https://asdf.org/abs/0706.0001v1");
+        Optional<ArXivIdentifier> parsed =
+                ArXivIdentifier.parse("https://asdf.org/abs/0706.0001v1");
         assertEquals(Optional.empty(), parsed);
     }
 
     @Test
     void constructCorrectURLForEprint() throws Exception {
         Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("0706.0001v1");
-        assertEquals(Optional.of(new URI("https://arxiv.org/abs/0706.0001v1")), parsed.get().getExternalURI());
+        assertEquals(
+                Optional.of(new URI("https://arxiv.org/abs/0706.0001v1")),
+                parsed.get().getExternalURI());
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/identifier/DOITest.java b/src/test/java/org/jabref/model/entry/identifier/DOITest.java
index 3648351c42c3..ef14e8745d14 100644
--- a/src/test/java/org/jabref/model/entry/identifier/DOITest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/DOITest.java
@@ -1,17 +1,17 @@
 package org.jabref.model.entry.identifier;
 
-import java.util.Optional;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 class DOITest {
 
@@ -19,9 +19,13 @@ private static Stream<Arguments> testData() {
         return Stream.of(
                 // PlainDoi
                 Arguments.of("10.1006/jmbi.1998.2354", new DOI("10.1006/jmbi.1998.2354").getDOI()),
-                Arguments.of("10.231/JIM.0b013e31820bab4c", new DOI("10.231/JIM.0b013e31820bab4c").getDOI()),
-                Arguments.of("10.1002/(SICI)1522-2594(199911)42:5<952::AID-MRM16>3.0.CO;2-S",
-                        new DOI("10.1002/(SICI)1522-2594(199911)42:5<952::AID-MRM16>3.0.CO;2-S").getDOI()),
+                Arguments.of(
+                        "10.231/JIM.0b013e31820bab4c",
+                        new DOI("10.231/JIM.0b013e31820bab4c").getDOI()),
+                Arguments.of(
+                        "10.1002/(SICI)1522-2594(199911)42:5<952::AID-MRM16>3.0.CO;2-S",
+                        new DOI("10.1002/(SICI)1522-2594(199911)42:5<952::AID-MRM16>3.0.CO;2-S")
+                                .getDOI()),
                 Arguments.of("10.1126/sciadv.1500214", new DOI("10.1126/sciadv.1500214").getDOI()),
 
                 // PlainShortDoi
@@ -31,14 +35,16 @@ private static Stream<Arguments> testData() {
                 Arguments.of("10/adc", new DOI("10/adc").getDOI()),
 
                 // ignoreLeadingAndTrailingWhitespaces
-                Arguments.of("10.1006/jmbi.1998.2354", new DOI("  10.1006/jmbi.1998.2354 ").getDOI()),
+                Arguments.of(
+                        "10.1006/jmbi.1998.2354", new DOI("  10.1006/jmbi.1998.2354 ").getDOI()),
 
                 // ignoreLeadingAndTrailingWhitespacesInShortDoi
                 Arguments.of("10/gf4gqc", new DOI("   10/gf4gqc ").getDOI()),
 
                 // acceptDoiPrefix
                 // Doi prefix
-                Arguments.of("10.1006/jmbi.1998.2354", new DOI("doi:10.1006/jmbi.1998.2354").getDOI()),
+                Arguments.of(
+                        "10.1006/jmbi.1998.2354", new DOI("doi:10.1006/jmbi.1998.2354").getDOI()),
 
                 // acceptDoiPrefixInShortDoi
                 Arguments.of("10/gf4gqc", new DOI("doi:10/gf4gqc").getDOI()),
@@ -47,7 +53,9 @@ private static Stream<Arguments> testData() {
                 Arguments.of("10.123/456", new DOI("urn:10.123/456").getDOI()),
                 Arguments.of("10.123/456", new DOI("http://doi.org/urn:doi:10.123/456").getDOI()),
                 // : is also allowed as divider, will be replaced by RESOLVER
-                Arguments.of("10.123:456ABC/zyz", new DOI("http://doi.org/urn:doi:10.123:456ABC%2Fzyz").getDOI()),
+                Arguments.of(
+                        "10.123:456ABC/zyz",
+                        new DOI("http://doi.org/urn:doi:10.123:456ABC%2Fzyz").getDOI()),
 
                 // acceptShortcutShortDoi
                 Arguments.of("10/d8dn", new DOI("https://doi.org/d8dn").getDOI()),
@@ -66,27 +74,47 @@ private static Stream<Arguments> testData() {
 
                 // acceptURLDoi
                 // http
-                Arguments.of("10.1006/jmbi.1998.2354", new DOI("http://doi.org/10.1006/jmbi.1998.2354").getDOI()),
+                Arguments.of(
+                        "10.1006/jmbi.1998.2354",
+                        new DOI("http://doi.org/10.1006/jmbi.1998.2354").getDOI()),
                 // https
-                Arguments.of("10.1006/jmbi.1998.2354", new DOI("https://doi.org/10.1006/jmbi.1998.2354").getDOI()),
+                Arguments.of(
+                        "10.1006/jmbi.1998.2354",
+                        new DOI("https://doi.org/10.1006/jmbi.1998.2354").getDOI()),
                 // https with % divider
-                Arguments.of("10.2307/1990888", new DOI("https://dx.doi.org/10.2307%2F1990888").getDOI()),
+                Arguments.of(
+                        "10.2307/1990888",
+                        new DOI("https://dx.doi.org/10.2307%2F1990888").getDOI()),
                 // other domains
-                Arguments.of("10.1145/1294928.1294933", new DOI("http://doi.acm.org/10.1145/1294928.1294933").getDOI()),
-                Arguments.of("10.1145/1294928.1294933", new DOI("http://doi.acm.net/10.1145/1294928.1294933").getDOI()),
-                Arguments.of("10.1145/1294928.1294933", new DOI("http://doi.acm.com/10.1145/1294928.1294933").getDOI()),
-                Arguments.of("10.1145/1294928.1294933", new DOI("http://doi.acm.de/10.1145/1294928.1294933").getDOI()),
-                Arguments.of("10.1007/978-3-642-15618-2_19",
+                Arguments.of(
+                        "10.1145/1294928.1294933",
+                        new DOI("http://doi.acm.org/10.1145/1294928.1294933").getDOI()),
+                Arguments.of(
+                        "10.1145/1294928.1294933",
+                        new DOI("http://doi.acm.net/10.1145/1294928.1294933").getDOI()),
+                Arguments.of(
+                        "10.1145/1294928.1294933",
+                        new DOI("http://doi.acm.com/10.1145/1294928.1294933").getDOI()),
+                Arguments.of(
+                        "10.1145/1294928.1294933",
+                        new DOI("http://doi.acm.de/10.1145/1294928.1294933").getDOI()),
+                Arguments.of(
+                        "10.1007/978-3-642-15618-2_19",
                         new DOI("http://dx.doi.org/10.1007/978-3-642-15618-2_19").getDOI()),
-                Arguments.of("10.1007/978-3-642-15618-2_19",
+                Arguments.of(
+                        "10.1007/978-3-642-15618-2_19",
                         new DOI("http://dx.doi.net/10.1007/978-3-642-15618-2_19").getDOI()),
-                Arguments.of("10.1007/978-3-642-15618-2_19",
+                Arguments.of(
+                        "10.1007/978-3-642-15618-2_19",
                         new DOI("http://dx.doi.com/10.1007/978-3-642-15618-2_19").getDOI()),
-                Arguments.of("10.1007/978-3-642-15618-2_19",
+                Arguments.of(
+                        "10.1007/978-3-642-15618-2_19",
                         new DOI("http://dx.doi.de/10.1007/978-3-642-15618-2_19").getDOI()),
-                Arguments.of("10.4108/ICST.COLLABORATECOM2009.8275",
+                Arguments.of(
+                        "10.4108/ICST.COLLABORATECOM2009.8275",
                         new DOI("http://dx.doi.org/10.4108/ICST.COLLABORATECOM2009.8275").getDOI()),
-                Arguments.of("10.1109/MIC.2012.43",
+                Arguments.of(
+                        "10.1109/MIC.2012.43",
                         new DOI("http://doi.ieeecomputersociety.org/10.1109/MIC.2012.43").getDOI()),
 
                 // acceptURLShortDoi
@@ -112,125 +140,237 @@ private static Stream<Arguments> testData() {
                 Arguments.of("10/gf4gqc", new DOI("http://dx.doi.com/10/gf4gqc").getDOI()),
                 Arguments.of("10/gf4gqc", new DOI("http://dx.doi.de/10/gf4gqc").getDOI()),
                 Arguments.of("10/gf4gqc", new DOI("http://dx.doi.org/10/gf4gqc").getDOI()),
-                Arguments.of("10/gf4gqc", new DOI("http://doi.ieeecomputersociety.org/10/gf4gqc").getDOI()),
+                Arguments.of(
+                        "10/gf4gqc",
+                        new DOI("http://doi.ieeecomputersociety.org/10/gf4gqc").getDOI()),
 
                 // parse DOI with whitespace
-                Arguments.of("https://doi.org/10.1109/VLHCC.2004.20", DOI.parse("https : / / doi.org / 10 .1109 /V LHCC.20 04.20").get().getURIAsASCIIString()),
+                Arguments.of(
+                        "https://doi.org/10.1109/VLHCC.2004.20",
+                        DOI.parse("https : / / doi.org / 10 .1109 /V LHCC.20 04.20")
+                                .get()
+                                .getURIAsASCIIString()),
                 // parse short DOI with whitespace
-                Arguments.of("https://doi.org/10/gf4gqc", DOI.parse("https : / / doi.org / 10 / gf4gqc").get().getURIAsASCIIString()),
+                Arguments.of(
+                        "https://doi.org/10/gf4gqc",
+                        DOI.parse("https : / / doi.org / 10 / gf4gqc").get().getURIAsASCIIString()),
                 // parse DOI with non-ASCII characters and whitespace
-                Arguments.of("https://doi.org/10/gf4gqc", DOI.parse("�https : \n  ␛ / / doi.org / \t 10 / \r gf4gqc�␛").get().getURIAsASCIIString()),
-                Arguments.of("10/gf4gqc", DOI.parse("�https : \n  ␛ / / doi.org / \t 10 / \r gf4gqc�␛").get().getDOI()),
+                Arguments.of(
+                        "https://doi.org/10/gf4gqc",
+                        DOI.parse("�https : \n  ␛ / / doi.org / \t 10 / \r gf4gqc�␛")
+                                .get()
+                                .getURIAsASCIIString()),
+                Arguments.of(
+                        "10/gf4gqc",
+                        DOI.parse("�https : \n  ␛ / / doi.org / \t 10 / \r gf4gqc�␛")
+                                .get()
+                                .getDOI()),
                 Arguments.of("10/gf4gqc", DOI.parse(" 10 / gf4gqc ").get().getDOI()),
                 Arguments.of("10.3218/3846-0", DOI.parse(" �10.3218\n/384␛6-0�").get().getDOI()),
                 // parse DOI with backslashes
-                Arguments.of("10.1007/978-3-030-02671-4_7", DOI.parse("10.1007/978-3-030-02671-4\\_7").get().getDOI()),
-                Arguments.of("10.1007/978-3-030-02671-4_7", DOI.parse("10.1007/\\978-3-03\\0-02671-4\\_7").get().getDOI()),
-                Arguments.of("https://doi.org/10.1007/978-3-030-02671-4_7", DOI.parse("https://doi.org/10.\\\\1007/9\\\\78-3\\\\-030-026\\\\\\71-4_7").get().getURIAsASCIIString()),
+                Arguments.of(
+                        "10.1007/978-3-030-02671-4_7",
+                        DOI.parse("10.1007/978-3-030-02671-4\\_7").get().getDOI()),
+                Arguments.of(
+                        "10.1007/978-3-030-02671-4_7",
+                        DOI.parse("10.1007/\\978-3-03\\0-02671-4\\_7").get().getDOI()),
+                Arguments.of(
+                        "https://doi.org/10.1007/978-3-030-02671-4_7",
+                        DOI.parse("https://doi.org/10.\\\\1007/9\\\\78-3\\\\-030-026\\\\\\71-4_7")
+                                .get()
+                                .getURIAsASCIIString()),
                 // parse DOI with {}
-                Arguments.of("10.1007/978-3-030-02671-4_7", DOI.parse("10.1007/9{}78{-3{-03{0-0}}}26}{71-4}_7").get().getDOI()),
+                Arguments.of(
+                        "10.1007/978-3-030-02671-4_7",
+                        DOI.parse("10.1007/9{}78{-3{-03{0-0}}}26}{71-4}_7").get().getDOI()),
                 // parse DOI with `
-                Arguments.of("10.1007/978-3-030-02671-4_7", DOI.parse("10.1007/9`78`-3`-03`0-0``26````71-4}_7").get().getDOI()),
+                Arguments.of(
+                        "10.1007/978-3-030-02671-4_7",
+                        DOI.parse("10.1007/9`78`-3`-03`0-0``26````71-4}_7").get().getDOI()),
                 // parse DOI with |
-                Arguments.of("10.1007/978-3-030-02671-4_7", DOI.parse("10.1007/9||78|-3|-03|0-0|26|71-4|||_7").get().getDOI()),
+                Arguments.of(
+                        "10.1007/978-3-030-02671-4_7",
+                        DOI.parse("10.1007/9||78|-3|-03|0-0|26|71-4|||_7").get().getDOI()),
                 // parse DOI with ~
-                Arguments.of("10.1007/978-3-030-02671-4_7", DOI.parse("10.1007/9~~~78~-3~-03~0-0~26~71-4~_7").get().getDOI()),
+                Arguments.of(
+                        "10.1007/978-3-030-02671-4_7",
+                        DOI.parse("10.1007/9~~~78~-3~-03~0-0~26~71-4~_7").get().getDOI()),
                 // parse DOI with []
-                Arguments.of("10.1007/978-3-030-02671-4_7", DOI.parse("10.1007/][9[][]78-3-03[[]0-02671-4_7").get().getDOI()),
+                Arguments.of(
+                        "10.1007/978-3-030-02671-4_7",
+                        DOI.parse("10.1007/][9[][]78-3-03[[]0-02671-4_7").get().getDOI()),
                 // parse DOI with ^
-                Arguments.of("10.1007/978-3-030-02671-4_7", DOI.parse("^^^10.10^07/978-3^-0^30-02671-4_7").get().getDOI()),
+                Arguments.of(
+                        "10.1007/978-3-030-02671-4_7",
+                        DOI.parse("^^^10.10^07/978-3^-0^30-02671-4_7").get().getDOI()),
                 // parse DOI with special characters
-                Arguments.of("10.1007/978-3-030-02671-4_7", DOI.parse("10.1^00^^7/9|~^]`7^8-3~[[[]]-0^3]~0-0~26``71-4~||_7").get().getDOI()),
+                Arguments.of(
+                        "10.1007/978-3-030-02671-4_7",
+                        DOI.parse("10.1^00^^7/9|~^]`7^8-3~[[[]]-0^3]~0-0~26``71-4~||_7")
+                                .get()
+                                .getDOI()),
                 // parse already-cleaned DOI
                 Arguments.of("10.3218/3846-0", DOI.parse("10.3218/3846-0").get().getDOI()),
 
                 // correctlyEncodeDOIs
                 // See http://www.doi.org/doi_handbook/2_Numbering.html#2.5.2.4
                 // % -> (%25)
-                Arguments.of("https://doi.org/10.1006/rwei.1999%25.0001",
+                Arguments.of(
+                        "https://doi.org/10.1006/rwei.1999%25.0001",
                         new DOI("https://doi.org/10.1006/rwei.1999%25.0001").getURIAsASCIIString()),
                 // " -> (%22)
-                Arguments.of("https://doi.org/10.1006/rwei.1999%22.0001",
+                Arguments.of(
+                        "https://doi.org/10.1006/rwei.1999%22.0001",
                         new DOI("https://doi.org/10.1006/rwei.1999%22.0001").getURIAsASCIIString()),
                 // # -> (%23)
-                Arguments.of("https://doi.org/10.1006/rwei.1999%23.0001",
+                Arguments.of(
+                        "https://doi.org/10.1006/rwei.1999%23.0001",
                         new DOI("https://doi.org/10.1006/rwei.1999%23.0001").getURIAsASCIIString()),
                 // SPACE -> (%20)
-                Arguments.of("https://doi.org/10.1006/rwei.1999%20.0001",
+                Arguments.of(
+                        "https://doi.org/10.1006/rwei.1999%20.0001",
                         new DOI("https://doi.org/10.1006/rwei.1999%20.0001").getURIAsASCIIString()),
                 // ? -> (%3F)
-                Arguments.of("https://doi.org/10.1006/rwei.1999%3F.0001",
+                Arguments.of(
+                        "https://doi.org/10.1006/rwei.1999%3F.0001",
                         new DOI("https://doi.org/10.1006/rwei.1999%3F.0001").getURIAsASCIIString()),
 
                 // constructCorrectURLForDoi
                 // add / to RESOLVER url if missing
-                Arguments.of("https://doi.org/10.1006/jmbi.1998.2354",
+                Arguments.of(
+                        "https://doi.org/10.1006/jmbi.1998.2354",
                         new DOI("10.1006/jmbi.1998.2354").getURIAsASCIIString()),
-                Arguments.of("https://doi.org/10.1006/jmbi.1998.2354",
+                Arguments.of(
+                        "https://doi.org/10.1006/jmbi.1998.2354",
                         new DOI("https://doi.org/10.1006/jmbi.1998.2354").getURIAsASCIIString()),
-                Arguments.of("https://doi.org/10.1109/VLHCC.2004.20",
+                Arguments.of(
+                        "https://doi.org/10.1109/VLHCC.2004.20",
                         new DOI("doi:10.1109/VLHCC.2004.20").getURIAsASCIIString()),
 
                 // constructCorrectURLForShortDoi
-                Arguments.of("https://doi.org/10/gf4gqc", new DOI("10/gf4gqc").getURIAsASCIIString()),
+                Arguments.of(
+                        "https://doi.org/10/gf4gqc", new DOI("10/gf4gqc").getURIAsASCIIString()),
 
                 // correctlyDecodeHttpDOIs
                 // See http://www.doi.org/doi_handbook/2_Numbering.html#2.5.2.4
                 // % -> (%25)
-                Arguments.of("10.1006/rwei.1999%.0001", new DOI("http://doi.org/10.1006/rwei.1999%25.0001").getDOI()),
+                Arguments.of(
+                        "10.1006/rwei.1999%.0001",
+                        new DOI("http://doi.org/10.1006/rwei.1999%25.0001").getDOI()),
                 // " -> (%22)
-                Arguments.of("10.1006/rwei.1999\".0001", new DOI("http://doi.org/10.1006/rwei.1999%22.0001").getDOI()),
+                Arguments.of(
+                        "10.1006/rwei.1999\".0001",
+                        new DOI("http://doi.org/10.1006/rwei.1999%22.0001").getDOI()),
                 // # -> (%23)
-                Arguments.of("10.1006/rwei.1999#.0001", new DOI("http://doi.org/10.1006/rwei.1999%23.0001").getDOI()),
+                Arguments.of(
+                        "10.1006/rwei.1999#.0001",
+                        new DOI("http://doi.org/10.1006/rwei.1999%23.0001").getDOI()),
                 // SPACE -> (%20)
-                Arguments.of("10.1006/rwei.1999 .0001", new DOI("http://doi.org/10.1006/rwei.1999%20.0001").getDOI()),
+                Arguments.of(
+                        "10.1006/rwei.1999 .0001",
+                        new DOI("http://doi.org/10.1006/rwei.1999%20.0001").getDOI()),
                 // ? -> (%3F)
-                Arguments.of("10.1006/rwei.1999?.0001", new DOI("http://doi.org/10.1006/rwei.1999%3F.0001").getDOI()),
+                Arguments.of(
+                        "10.1006/rwei.1999?.0001",
+                        new DOI("http://doi.org/10.1006/rwei.1999%3F.0001").getDOI()),
                 // <,> -> (%3C, %3E)
-                Arguments.of("10.1175/1520-0493(2002)130<1913:EDAWPO>2.0.CO;2", new DOI("https://doi.org/10.1175/1520-0493(2002)130%3C1913:EDAWPO%3E2.0.CO;2").getDOI()),
+                Arguments.of(
+                        "10.1175/1520-0493(2002)130<1913:EDAWPO>2.0.CO;2",
+                        new DOI(
+                                        "https://doi.org/10.1175/1520-0493(2002)130%3C1913:EDAWPO%3E2.0.CO;2")
+                                .getDOI()),
 
                 // acceptDoiWithSpecialCharacters
-                Arguments.of("10.1175/1520-0493(2002)130<1913:EDAWPO>2.0.CO;2", new DOI("https://doi.org/10.1175/1520-0493(2002)130<1913:EDAWPO>2.0.CO;2").getDOI()),
+                Arguments.of(
+                        "10.1175/1520-0493(2002)130<1913:EDAWPO>2.0.CO;2",
+                        new DOI("https://doi.org/10.1175/1520-0493(2002)130<1913:EDAWPO>2.0.CO;2")
+                                .getDOI()),
 
                 // findDoiInsideArbitraryText
-                Arguments.of("10.1006/jmbi.1998.2354",
+                Arguments.of(
+                        "10.1006/jmbi.1998.2354",
                         DOI.findInText("other stuff 10.1006/jmbi.1998.2354 end").get().getDOI()),
-                Arguments.of("10.1007/s10549-018-4743-9",
-                        DOI.findInText("Breast Cancer Res Treat. 2018 July ; 170(1): 77–87. doi:10.1007/s10549-018-4743-9. ").get().getDOI()),
-                Arguments.of("10.1007/s10549-018-4743-9",
-                        DOI.findInText("Breast Cancer Res Treat. 2018 July ; 170(1): 77–87. doi:10.1007/s10549-018-4743-9, ").get().getDOI()),
-                Arguments.of("10.1007/s10549-018-4743-9",
-                        DOI.findInText("Breast Cancer Res Treat. 2018 July ; 170(1): 77–87. doi:10.1007/s10549-018-4743-9; something else").get().getDOI()),
-                Arguments.of("10.1007/s10549-018-4743-9.1234",
-                        DOI.findInText("bla doi:10.1007/s10549-018-4743-9.1234 with . in doi").get().getDOI()),
+                Arguments.of(
+                        "10.1007/s10549-018-4743-9",
+                        DOI.findInText(
+                                        "Breast Cancer Res Treat. 2018 July ; 170(1): 77–87. doi:10.1007/s10549-018-4743-9. ")
+                                .get()
+                                .getDOI()),
+                Arguments.of(
+                        "10.1007/s10549-018-4743-9",
+                        DOI.findInText(
+                                        "Breast Cancer Res Treat. 2018 July ; 170(1): 77–87. doi:10.1007/s10549-018-4743-9, ")
+                                .get()
+                                .getDOI()),
+                Arguments.of(
+                        "10.1007/s10549-018-4743-9",
+                        DOI.findInText(
+                                        "Breast Cancer Res Treat. 2018 July ; 170(1): 77–87. doi:10.1007/s10549-018-4743-9; something else")
+                                .get()
+                                .getDOI()),
+                Arguments.of(
+                        "10.1007/s10549-018-4743-9.1234",
+                        DOI.findInText("bla doi:10.1007/s10549-018-4743-9.1234 with . in doi")
+                                .get()
+                                .getDOI()),
 
                 // findShortDoiInsideArbitraryText
-                Arguments.of("10/12ab", DOI.findInText("other stuff doi:10/12ab end").get().getDOI()),
-                Arguments.of("10/12ab", DOI.findInText("other stuff /urn:doi:10/12ab end").get().getDOI()),
-                Arguments.of("10%12ab", DOI.findInText("other stuff doi:10%12ab end").get().getDOI()),
-                Arguments.of("10%12ab", DOI.findInText("other stuff /doi:10%12ab end").get().getDOI()),
-                Arguments.of("10%12ab", DOI.findInText("other stuff /doi:10%12ab, end").get().getDOI()),
-                Arguments.of("10%12ab", DOI.findInText("other stuff /doi:10%12ab. end").get().getDOI()),
-                Arguments.of("10%12ab", DOI.findInText("other stuff /doi:10%12ab; end").get().getDOI()),
-                Arguments.of("10/1234", DOI.findInText("10/B(C)/15 \n" +
-                        " \n" +
-                        "10:51 \n" +
-                        " \n" +
-                        " \n" +
-                        "doi.org/10/1234 ").get().getDOI()),
+                Arguments.of(
+                        "10/12ab", DOI.findInText("other stuff doi:10/12ab end").get().getDOI()),
+                Arguments.of(
+                        "10/12ab",
+                        DOI.findInText("other stuff /urn:doi:10/12ab end").get().getDOI()),
+                Arguments.of(
+                        "10%12ab", DOI.findInText("other stuff doi:10%12ab end").get().getDOI()),
+                Arguments.of(
+                        "10%12ab", DOI.findInText("other stuff /doi:10%12ab end").get().getDOI()),
+                Arguments.of(
+                        "10%12ab", DOI.findInText("other stuff /doi:10%12ab, end").get().getDOI()),
+                Arguments.of(
+                        "10%12ab", DOI.findInText("other stuff /doi:10%12ab. end").get().getDOI()),
+                Arguments.of(
+                        "10%12ab", DOI.findInText("other stuff /doi:10%12ab; end").get().getDOI()),
+                Arguments.of(
+                        "10/1234",
+                        DOI.findInText(
+                                        "10/B(C)/15 \n"
+                                                + " \n"
+                                                + "10:51 \n"
+                                                + " \n"
+                                                + " \n"
+                                                + "doi.org/10/1234 ")
+                                .get()
+                                .getDOI()),
 
                 // findShortcutDoiInsideArbitraryText
-                Arguments.of("10/ab123", DOI.findInText("other stuff doi.org/ab123 end").get().getDOI()),
-                Arguments.of("10/76543", DOI.findInText("other stuff www.doi.org/76543 end").get().getDOI()),
-                Arguments.of("10/abcde", DOI.findInText("other stuff https://www.doi.org/abcde end").get().getDOI()),
-                Arguments.of("10/abcde", DOI.findInText("other stuff https://doi.org/abcde end").get().getDOI()),
-                Arguments.of("10.5220/0010404301780189", DOI.findInText("https://www.scitepress.org/Link.aspx?doi=10.5220/0010404301780189").get().getDOI()),
-                Arguments.of("10.5220/0010404301780189", DOI.findInText("10.5220/0010404301780189").get().getDOI()),
+                Arguments.of(
+                        "10/ab123", DOI.findInText("other stuff doi.org/ab123 end").get().getDOI()),
+                Arguments.of(
+                        "10/76543",
+                        DOI.findInText("other stuff www.doi.org/76543 end").get().getDOI()),
+                Arguments.of(
+                        "10/abcde",
+                        DOI.findInText("other stuff https://www.doi.org/abcde end").get().getDOI()),
+                Arguments.of(
+                        "10/abcde",
+                        DOI.findInText("other stuff https://doi.org/abcde end").get().getDOI()),
+                Arguments.of(
+                        "10.5220/0010404301780189",
+                        DOI.findInText(
+                                        "https://www.scitepress.org/Link.aspx?doi=10.5220/0010404301780189")
+                                .get()
+                                .getDOI()),
+                Arguments.of(
+                        "10.5220/0010404301780189",
+                        DOI.findInText("10.5220/0010404301780189").get().getDOI()),
 
                 // findDoiWithSpecialCharactersInText
-                Arguments.of("10.1175/1520-0493(2002)130%3C1913:EDAWPO%3E2.0.CO;2",
-                        DOI.findInText("https://doi.org/10.1175/1520-0493(2002)130%3C1913:EDAWPO%3E2.0.CO;2").get().getDOI())
-        );
+                Arguments.of(
+                        "10.1175/1520-0493(2002)130%3C1913:EDAWPO%3E2.0.CO;2",
+                        DOI.findInText(
+                                        "https://doi.org/10.1175/1520-0493(2002)130%3C1913:EDAWPO%3E2.0.CO;2")
+                                .get()
+                                .getDOI()));
     }
 
     @ParameterizedTest
@@ -259,9 +399,19 @@ void noDOIFoundInsideArbitraryText() {
 
     @Test
     void rejectURLShortDoi() {
-        assertThrows(IllegalArgumentException.class, () -> new DOI("http://www.cs.utexas.edu/users/kaufmann/itp-trusted-extensions-aug-2010/summary/summary.pdf"));
-        assertThrows(IllegalArgumentException.class, () -> new DOI("http://www.cs.utexas.edu/users/kaufmann/itp-trusted-extensions-aug-20/10/summary/summary.pdf"));
-        assertThrows(IllegalArgumentException.class, () -> new DOI("http://www.boi.org/10/2010bingbong"));
+        assertThrows(
+                IllegalArgumentException.class,
+                () ->
+                        new DOI(
+                                "http://www.cs.utexas.edu/users/kaufmann/itp-trusted-extensions-aug-2010/summary/summary.pdf"));
+        assertThrows(
+                IllegalArgumentException.class,
+                () ->
+                        new DOI(
+                                "http://www.cs.utexas.edu/users/kaufmann/itp-trusted-extensions-aug-20/10/summary/summary.pdf"));
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> new DOI("http://www.boi.org/10/2010bingbong"));
     }
 
     @Test
@@ -271,7 +421,9 @@ void isShortDoiShouldReturnFalseWhenItIsDoi() {
 
     @Test
     void rejectEmbeddedDoi() {
-        assertThrows(IllegalArgumentException.class, () -> new DOI("other stuff 10.1006/jmbi.1998.2354 end"));
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> new DOI("other stuff 10.1006/jmbi.1998.2354 end"));
     }
 
     @Test
@@ -295,9 +447,9 @@ void rejectInvalidDirectoryIndicatorInShortDoi() {
 
     @Test
     void emptyOrUndescoreOnlyReturnsEmpty() {
-       assertEquals(Optional.empty(), DOI.parse("_"));
-       assertEquals(Optional.empty(), DOI.parse("\t_"));
-       assertEquals(Optional.empty(), DOI.parse("___"));
+        assertEquals(Optional.empty(), DOI.parse("_"));
+        assertEquals(Optional.empty(), DOI.parse("\t_"));
+        assertEquals(Optional.empty(), DOI.parse("___"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java b/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java
index 7dfe2d5efd74..d46aacbd7089 100644
--- a/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/ISBNTest.java
@@ -1,10 +1,10 @@
 package org.jabref.model.entry.identifier;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Test;
+
 class ISBNTest {
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/identifier/ISSNTest.java b/src/test/java/org/jabref/model/entry/identifier/ISSNTest.java
index ed9a3668a13f..110a6875f82c 100644
--- a/src/test/java/org/jabref/model/entry/identifier/ISSNTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/ISSNTest.java
@@ -1,11 +1,11 @@
 package org.jabref.model.entry.identifier;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Test;
+
 class ISSNTest {
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
index e82cc952520f..3ac33223e958 100644
--- a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
@@ -1,44 +1,25 @@
 package org.jabref.model.entry.identifier;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.stream.Stream;
 
 class IacrEprintTest {
 
     private static Stream<Arguments> provideTestData() {
         return Stream.of(
-                Arguments.arguments(
-                        "acceptPlainIacrEprint",
-                        "2019/001"
-                ),
-                Arguments.arguments(
-                        "ignoreLeadingAndTrailingWhitespaces",
-                        " 2019/001   "
-                ),
-                Arguments.arguments(
-                        "acceptFullUrlIacrEprint",
-                        "https://eprint.iacr.org/2019/001"
-                ),
-                Arguments.arguments(
-                        "acceptShortenedUrlIacrEprint",
-                        "https://ia.cr/2019/001"
-                ),
-                Arguments.arguments(
-                        "acceptDomainUrlIacrEprint",
-                        "eprint.iacr.org/2019/001"
-                ),
-                Arguments.arguments(
-                        "acceptShortenedDomainUrlIacrEprint",
-                        "ia.cr/2019/001"
-                )
-        );
+                Arguments.arguments("acceptPlainIacrEprint", "2019/001"),
+                Arguments.arguments("ignoreLeadingAndTrailingWhitespaces", " 2019/001   "),
+                Arguments.arguments("acceptFullUrlIacrEprint", "https://eprint.iacr.org/2019/001"),
+                Arguments.arguments("acceptShortenedUrlIacrEprint", "https://ia.cr/2019/001"),
+                Arguments.arguments("acceptDomainUrlIacrEprint", "eprint.iacr.org/2019/001"),
+                Arguments.arguments("acceptShortenedDomainUrlIacrEprint", "ia.cr/2019/001"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java b/src/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java
index f4d742454340..618107908c03 100644
--- a/src/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java
@@ -1,10 +1,10 @@
 package org.jabref.model.entry.identifier;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 class MathSciNetIdTest {
 
diff --git a/src/test/java/org/jabref/model/entry/types/BiblatexAPAEntryTypeDefinitionsTest.java b/src/test/java/org/jabref/model/entry/types/BiblatexAPAEntryTypeDefinitionsTest.java
index 3ca45fbaa3fe..c3d79db3e75f 100644
--- a/src/test/java/org/jabref/model/entry/types/BiblatexAPAEntryTypeDefinitionsTest.java
+++ b/src/test/java/org/jabref/model/entry/types/BiblatexAPAEntryTypeDefinitionsTest.java
@@ -1,9 +1,9 @@
 package org.jabref.model.entry.types;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import org.junit.jupiter.api.Test;
+
 class BiblatexAPAEntryTypeDefinitionsTest {
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitionsTest.java b/src/test/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitionsTest.java
index a2511daa9406..c8dca824bab3 100644
--- a/src/test/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitionsTest.java
+++ b/src/test/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitionsTest.java
@@ -1,9 +1,9 @@
 package org.jabref.model.entry.types;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import org.junit.jupiter.api.Test;
+
 class BiblatexEntryTypeDefinitionsTest {
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitionsTest.java b/src/test/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitionsTest.java
index cb8f1789101d..f1f1cdb01597 100644
--- a/src/test/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitionsTest.java
+++ b/src/test/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitionsTest.java
@@ -1,9 +1,9 @@
 package org.jabref.model.entry.types;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import org.junit.jupiter.api.Test;
+
 class BiblatexSoftwareEntryTypeDefinitionsTest {
     @Test
     void all() {
diff --git a/src/test/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitionsTest.java b/src/test/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitionsTest.java
index 05aef2a503fc..b60b7426aa3b 100644
--- a/src/test/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitionsTest.java
+++ b/src/test/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitionsTest.java
@@ -1,13 +1,12 @@
 package org.jabref.model.entry.types;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 class BibtexEntryTypeDefinitionsTest {
 
     @Test
@@ -17,10 +16,11 @@ void all() {
 
     @Test
     void languageContained() {
-        BibEntryType articleEntryType = BiblatexEntryTypeDefinitions.ALL.stream()
-                                                                    .filter(type -> type.getType().equals(StandardEntryType.Article))
-                                                                    .findFirst()
-                                                                    .get();
+        BibEntryType articleEntryType =
+                BiblatexEntryTypeDefinitions.ALL.stream()
+                        .filter(type -> type.getType().equals(StandardEntryType.Article))
+                        .findFirst()
+                        .get();
         assertTrue(articleEntryType.getDetailOptionalFields().contains(StandardField.LANGUAGE));
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/types/IEEETranEntryTypeDefinitionsTest.java b/src/test/java/org/jabref/model/entry/types/IEEETranEntryTypeDefinitionsTest.java
index 2bb58af26b7f..375c467037f1 100644
--- a/src/test/java/org/jabref/model/entry/types/IEEETranEntryTypeDefinitionsTest.java
+++ b/src/test/java/org/jabref/model/entry/types/IEEETranEntryTypeDefinitionsTest.java
@@ -1,9 +1,9 @@
 package org.jabref.model.entry.types;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import org.junit.jupiter.api.Test;
+
 class IEEETranEntryTypeDefinitionsTest {
     @Test
     void all() {
diff --git a/src/test/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryTypeDefinitionsTest.java b/src/test/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryTypeDefinitionsTest.java
index 553b5125ad92..739f44827bff 100644
--- a/src/test/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryTypeDefinitionsTest.java
+++ b/src/test/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryTypeDefinitionsTest.java
@@ -1,9 +1,9 @@
 package org.jabref.model.entry.types;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import org.junit.jupiter.api.Test;
+
 class SystematicLiteratureReviewStudyEntryTypeDefinitionsTest {
     @Test
     void all() {
diff --git a/src/test/java/org/jabref/model/event/EventListenerTest.java b/src/test/java/org/jabref/model/event/EventListenerTest.java
index 598e784b7f5d..24af55af1693 100644
--- a/src/test/java/org/jabref/model/event/EventListenerTest.java
+++ b/src/test/java/org/jabref/model/event/EventListenerTest.java
@@ -1,13 +1,13 @@
 package org.jabref.model.event;
 
-import java.util.List;
+import com.google.common.eventbus.Subscribe;
 
 import org.jabref.model.database.event.EntriesAddedEvent;
 import org.jabref.model.database.event.EntriesRemovedEvent;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.event.EntryChangedEvent;
 
-import com.google.common.eventbus.Subscribe;
+import java.util.List;
 
 public class EventListenerTest {
 
diff --git a/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java b/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java
index a6a84698ff24..c14653c76e33 100644
--- a/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java
@@ -1,20 +1,25 @@
 package org.jabref.model.groups;
 
-import java.util.HashSet;
-import java.util.Set;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.HashSet;
+import java.util.Set;
 
 class AutomaticKeywordGroupTest {
 
     @Test
     void createSubgroupsForTwoKeywords() throws Exception {
-        AutomaticKeywordGroup keywordsGroup = new AutomaticKeywordGroup("Keywords", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, ',', '>');
+        AutomaticKeywordGroup keywordsGroup =
+                new AutomaticKeywordGroup(
+                        "Keywords",
+                        GroupHierarchyType.INDEPENDENT,
+                        StandardField.KEYWORDS,
+                        ',',
+                        '>');
         BibEntry entry = new BibEntry().withField(StandardField.KEYWORDS, "A, B");
 
         Set<GroupTreeNode> expected = createIncludingKeywordsSubgroup();
@@ -24,7 +29,13 @@ void createSubgroupsForTwoKeywords() throws Exception {
 
     @Test
     void createSubgroupsIgnoresEmptyKeyword() throws Exception {
-        AutomaticKeywordGroup keywordsGroup = new AutomaticKeywordGroup("Keywords", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, ',', '>');
+        AutomaticKeywordGroup keywordsGroup =
+                new AutomaticKeywordGroup(
+                        "Keywords",
+                        GroupHierarchyType.INDEPENDENT,
+                        StandardField.KEYWORDS,
+                        ',',
+                        '>');
         BibEntry entry = new BibEntry().withField(StandardField.KEYWORDS, "A, ,B");
 
         Set<GroupTreeNode> expected = createIncludingKeywordsSubgroup();
@@ -34,8 +45,26 @@ void createSubgroupsIgnoresEmptyKeyword() throws Exception {
 
     private Set<GroupTreeNode> createIncludingKeywordsSubgroup() {
         Set<GroupTreeNode> expectedKeywordsSubgroup = new HashSet<>();
-        expectedKeywordsSubgroup.add(GroupTreeNode.fromGroup(new WordKeywordGroup("A", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true)));
-        expectedKeywordsSubgroup.add(GroupTreeNode.fromGroup(new WordKeywordGroup("B", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "B", true, ',', true)));
+        expectedKeywordsSubgroup.add(
+                GroupTreeNode.fromGroup(
+                        new WordKeywordGroup(
+                                "A",
+                                GroupHierarchyType.INCLUDING,
+                                StandardField.KEYWORDS,
+                                "A",
+                                true,
+                                ',',
+                                true)));
+        expectedKeywordsSubgroup.add(
+                GroupTreeNode.fromGroup(
+                        new WordKeywordGroup(
+                                "B",
+                                GroupHierarchyType.INCLUDING,
+                                StandardField.KEYWORDS,
+                                "B",
+                                true,
+                                ',',
+                                true)));
 
         return expectedKeywordsSubgroup;
     }
diff --git a/src/test/java/org/jabref/model/groups/AutomaticPersonsGroupTest.java b/src/test/java/org/jabref/model/groups/AutomaticPersonsGroupTest.java
index 6bceb4625d75..ff9a0e21f713 100644
--- a/src/test/java/org/jabref/model/groups/AutomaticPersonsGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/AutomaticPersonsGroupTest.java
@@ -1,39 +1,49 @@
 package org.jabref.model.groups;
 
-import java.util.Arrays;
-import java.util.stream.Collectors;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
+import java.util.Arrays;
+import java.util.stream.Collectors;
 
 class AutomaticPersonsGroupTest {
     private static GroupTreeNode[] createPersonSubGroupFrom(String... lastNames) {
         return Arrays.stream(lastNames)
-                     .map(lastName ->
-                             new LastNameGroup(lastName, GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR, lastName))
-                     .map(GroupTreeNode::new)
-                     .collect(Collectors.toList())
-                     .toArray(GroupTreeNode[]::new);
+                .map(
+                        lastName ->
+                                new LastNameGroup(
+                                        lastName,
+                                        GroupHierarchyType.INDEPENDENT,
+                                        StandardField.AUTHOR,
+                                        lastName))
+                .map(GroupTreeNode::new)
+                .collect(Collectors.toList())
+                .toArray(GroupTreeNode[]::new);
     }
 
     @Test
     void createSubgroupsFromCommaSeparatedLastNames() {
-        BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, "Turing, Alan and Hopper, Grace");
-        var subgroups = new AutomaticPersonsGroup("", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR).createSubgroups(bibEntry);
+        BibEntry bibEntry =
+                new BibEntry().withField(StandardField.AUTHOR, "Turing, Alan and Hopper, Grace");
+        var subgroups =
+                new AutomaticPersonsGroup("", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR)
+                        .createSubgroups(bibEntry);
         var expectedSubgroups = createPersonSubGroupFrom("Turing", "Hopper");
         assertThat(subgroups, containsInAnyOrder(expectedSubgroups));
     }
 
     @Test
     void createSubgroupsContainingSpaceSeparatedNames() {
-        BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, "Alan Turing and Grace Hopper");
-        var subgroups = new AutomaticPersonsGroup("", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR).createSubgroups(bibEntry);
+        BibEntry bibEntry =
+                new BibEntry().withField(StandardField.AUTHOR, "Alan Turing and Grace Hopper");
+        var subgroups =
+                new AutomaticPersonsGroup("", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR)
+                        .createSubgroups(bibEntry);
         var expectedSubgroups = createPersonSubGroupFrom("Turing", "Hopper");
         assertThat(subgroups, containsInAnyOrder(expectedSubgroups));
     }
@@ -41,7 +51,9 @@ void createSubgroupsContainingSpaceSeparatedNames() {
     @Test
     void createSubgroupFromLatex() {
         BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, "Kurt G{\\\"{o}}del");
-        var subgroup = new AutomaticPersonsGroup("", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR).createSubgroups(bibEntry);
+        var subgroup =
+                new AutomaticPersonsGroup("", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR)
+                        .createSubgroups(bibEntry);
         var expectedSubgroup = createPersonSubGroupFrom("Gödel");
         assertThat(subgroup, contains(expectedSubgroup));
     }
@@ -49,7 +61,9 @@ void createSubgroupFromLatex() {
     @Test
     void createSubgroupFromUnicode() {
         BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, "Kurt Gödel");
-        var subgroup = new AutomaticPersonsGroup("", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR).createSubgroups(bibEntry);
+        var subgroup =
+                new AutomaticPersonsGroup("", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR)
+                        .createSubgroups(bibEntry);
         var expectedSubgroup = createPersonSubGroupFrom("Gödel");
         assertThat(subgroup, contains(expectedSubgroup));
     }
diff --git a/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java b/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java
index e629b7dfc766..ac2df1427d63 100644
--- a/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java
@@ -1,16 +1,15 @@
 package org.jabref.model.groups;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Optional;
 
 class ExplicitGroupTest {
 
@@ -36,14 +35,17 @@ void addSingleGroupToEmptyBibEntryChangesGroupsField() {
     void addSingleGroupToNonemptyBibEntryAppendsToGroupsField() {
         entry.setField(StandardField.GROUPS, "some thing");
         group.add(entry);
-        assertEquals(Optional.of("some thing, myExplicitGroup"), entry.getField(StandardField.GROUPS));
+        assertEquals(
+                Optional.of("some thing, myExplicitGroup"), entry.getField(StandardField.GROUPS));
     }
 
     @Test
     void addTwoGroupsToBibEntryChangesGroupsField() {
         group.add(entry);
         group2.add(entry);
-        assertEquals(Optional.of("myExplicitGroup, myExplicitGroup2"), entry.getField(StandardField.GROUPS));
+        assertEquals(
+                Optional.of("myExplicitGroup, myExplicitGroup2"),
+                entry.getField(StandardField.GROUPS));
     }
 
     @Test
@@ -54,31 +56,33 @@ void addDuplicateGroupDoesNotChangeGroupsField() throws Exception {
     }
 
     @Test
-        // For https://github.com/JabRef/jabref/issues/2334
+    // For https://github.com/JabRef/jabref/issues/2334
     void removeDoesNotChangeFieldIfContainsNameAsPart() throws Exception {
         entry.setField(StandardField.GROUPS, "myExplicitGroup_alternative");
         group.remove(entry);
-        assertEquals(Optional.of("myExplicitGroup_alternative"), entry.getField(StandardField.GROUPS));
+        assertEquals(
+                Optional.of("myExplicitGroup_alternative"), entry.getField(StandardField.GROUPS));
     }
 
     @Test
-        // For https://github.com/JabRef/jabref/issues/2334
+    // For https://github.com/JabRef/jabref/issues/2334
     void removeDoesNotChangeFieldIfContainsNameAsWord() throws Exception {
         entry.setField(StandardField.GROUPS, "myExplicitGroup alternative");
         group.remove(entry);
 
-        assertEquals(Optional.of("myExplicitGroup alternative"), entry.getField(StandardField.GROUPS));
+        assertEquals(
+                Optional.of("myExplicitGroup alternative"), entry.getField(StandardField.GROUPS));
     }
 
     @Test
-        // For https://github.com/JabRef/jabref/issues/1873
+    // For https://github.com/JabRef/jabref/issues/1873
     void containsOnlyMatchesCompletePhraseWithWhitespace() throws Exception {
         entry.setField(StandardField.GROUPS, "myExplicitGroup b");
         assertFalse(group.contains(entry));
     }
 
     @Test
-        // For https://github.com/JabRef/jabref/issues/1873
+    // For https://github.com/JabRef/jabref/issues/1873
     void containsOnlyMatchesCompletePhraseWithSlash() throws Exception {
         entry.setField(StandardField.GROUPS, "myExplicitGroup/b");
 
@@ -86,10 +90,11 @@ void containsOnlyMatchesCompletePhraseWithSlash() throws Exception {
     }
 
     @Test
-        // For https://github.com/JabRef/jabref/issues/2394
+    // For https://github.com/JabRef/jabref/issues/2394
     void containsMatchesPhraseWithBrackets() throws Exception {
         entry.setField(StandardField.GROUPS, "[aa] Subgroup1");
-        ExplicitGroup explicitGroup = new ExplicitGroup("[aa] Subgroup1", GroupHierarchyType.INCLUDING, ',');
+        ExplicitGroup explicitGroup =
+                new ExplicitGroup("[aa] Subgroup1", GroupHierarchyType.INCLUDING, ',');
 
         assertTrue(explicitGroup.contains(entry));
     }
diff --git a/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java b/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java
index 5ea7055e22ba..3a485dd081fd 100644
--- a/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java
+++ b/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java
@@ -1,11 +1,8 @@
 package org.jabref.model.groups;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
@@ -13,13 +10,15 @@
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.search.matchers.AndMatcher;
 import org.jabref.model.search.matchers.OrMatcher;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Optional;
 
 public class GroupTreeNodeTest {
 
@@ -35,9 +34,11 @@ public class GroupTreeNodeTest {
      */
     public static GroupTreeNode getNodeInSimpleTree(GroupTreeNode root) {
         root.addSubgroup(new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ','));
-        GroupTreeNode parent = root
-                .addSubgroup(new ExplicitGroup("ExplicitParent", GroupHierarchyType.INDEPENDENT, ','));
-        return parent.addSubgroup(new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ','));
+        GroupTreeNode parent =
+                root.addSubgroup(
+                        new ExplicitGroup("ExplicitParent", GroupHierarchyType.INDEPENDENT, ','));
+        return parent.addSubgroup(
+                new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ','));
     }
 
     /**
@@ -60,8 +61,10 @@ public static GroupTreeNode getNodeInSimpleTree(GroupTreeNode root) {
     public static GroupTreeNode getNodeInComplexTree(GroupTreeNode root) {
         root.addSubgroup(getSearchGroup("SearchA"));
         root.addSubgroup(new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ','));
-        GroupTreeNode grandParent = root
-                .addSubgroup(new ExplicitGroup("ExplicitGrandParent", GroupHierarchyType.INDEPENDENT, ','));
+        GroupTreeNode grandParent =
+                root.addSubgroup(
+                        new ExplicitGroup(
+                                "ExplicitGrandParent", GroupHierarchyType.INDEPENDENT, ','));
         root.addSubgroup(getKeywordGroup("KeywordA"));
 
         grandParent.addSubgroup(getExplict("ExplicitB"));
@@ -79,11 +82,22 @@ public static GroupTreeNode getNodeInComplexTree(GroupTreeNode root) {
     }
 
     private static AbstractGroup getKeywordGroup(String name) {
-        return new WordKeywordGroup(name, GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, "searchExpression", true, ',', false);
+        return new WordKeywordGroup(
+                name,
+                GroupHierarchyType.INDEPENDENT,
+                StandardField.KEYWORDS,
+                "searchExpression",
+                true,
+                ',',
+                false);
     }
 
     private static AbstractGroup getSearchGroup(String name) {
-        return new SearchGroup(name, GroupHierarchyType.INCLUDING, "searchExpression", EnumSet.of(SearchFlags.CASE_SENSITIVE));
+        return new SearchGroup(
+                name,
+                GroupHierarchyType.INCLUDING,
+                "searchExpression",
+                EnumSet.of(SearchFlags.CASE_SENSITIVE));
     }
 
     private static AbstractGroup getExplict(String name) {
@@ -133,18 +147,19 @@ private GroupTreeNode getNodeInSimpleTree() {
 
     @Test
     void getSearchRuleForIndependentGroupReturnsGroupAsMatcher() {
-        GroupTreeNode node = GroupTreeNode
-                .fromGroup(new ExplicitGroup("node", GroupHierarchyType.INDEPENDENT, ','));
+        GroupTreeNode node =
+                GroupTreeNode.fromGroup(
+                        new ExplicitGroup("node", GroupHierarchyType.INDEPENDENT, ','));
         assertEquals(node.getGroup(), node.getSearchMatcher());
     }
 
     @Test
     void getSearchRuleForRefiningGroupReturnsParentAndGroupAsMatcher() {
-        GroupTreeNode parent = GroupTreeNode
-                .fromGroup(
+        GroupTreeNode parent =
+                GroupTreeNode.fromGroup(
                         new ExplicitGroup("parent", GroupHierarchyType.INDEPENDENT, ','));
-        GroupTreeNode node = parent
-                .addSubgroup(new ExplicitGroup("node", GroupHierarchyType.REFINING, ','));
+        GroupTreeNode node =
+                parent.addSubgroup(new ExplicitGroup("node", GroupHierarchyType.REFINING, ','));
 
         AndMatcher matcher = new AndMatcher();
         matcher.addRule(node.getGroup());
@@ -154,8 +169,11 @@ void getSearchRuleForRefiningGroupReturnsParentAndGroupAsMatcher() {
 
     @Test
     void getSearchRuleForIncludingGroupReturnsGroupOrSubgroupAsMatcher() {
-        GroupTreeNode node = GroupTreeNode.fromGroup(new ExplicitGroup("node", GroupHierarchyType.INCLUDING, ','));
-        GroupTreeNode child = node.addSubgroup(new ExplicitGroup("child", GroupHierarchyType.INDEPENDENT, ','));
+        GroupTreeNode node =
+                GroupTreeNode.fromGroup(
+                        new ExplicitGroup("node", GroupHierarchyType.INCLUDING, ','));
+        GroupTreeNode child =
+                node.addSubgroup(new ExplicitGroup("child", GroupHierarchyType.INDEPENDENT, ','));
 
         OrMatcher matcher = new OrMatcher();
         matcher.addRule(node.getGroup());
@@ -165,42 +183,92 @@ void getSearchRuleForIncludingGroupReturnsGroupOrSubgroupAsMatcher() {
 
     @Test
     void findMatchesReturnsEmptyForEmptyList() {
-        assertEquals(Collections.emptyList(), getNodeInSimpleTree().findMatches(Collections.emptyList()));
+        assertEquals(
+                Collections.emptyList(),
+                getNodeInSimpleTree().findMatches(Collections.emptyList()));
     }
 
     @Test
     void findMatchesOneEntry() {
         GroupTreeNode parent = getNodeInSimpleTree();
-        GroupTreeNode node = parent.addSubgroup(
-                new WordKeywordGroup("node", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR, "author2", true, ',', false));
+        GroupTreeNode node =
+                parent.addSubgroup(
+                        new WordKeywordGroup(
+                                "node",
+                                GroupHierarchyType.INDEPENDENT,
+                                StandardField.AUTHOR,
+                                "author2",
+                                true,
+                                ',',
+                                false));
         assertEquals(1, node.findMatches(entries).size());
     }
 
     @Test
     void findMatchesMultipleEntries() {
         GroupTreeNode parent = getNodeInSimpleTree();
-        GroupTreeNode node = parent.addSubgroup(
-                new WordKeywordGroup("node", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR, "author1", true, ',', false));
+        GroupTreeNode node =
+                parent.addSubgroup(
+                        new WordKeywordGroup(
+                                "node",
+                                GroupHierarchyType.INDEPENDENT,
+                                StandardField.AUTHOR,
+                                "author1",
+                                true,
+                                ',',
+                                false));
         assertEquals(2, node.findMatches(entries).size());
     }
 
     @Test
     void findMatchesWorksForRefiningGroups() {
         GroupTreeNode grandParent = getNodeInSimpleTree();
-        GroupTreeNode parent = grandParent.addSubgroup(
-                new WordKeywordGroup("node", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR, "author2", true, ',', false));
-        GroupTreeNode node = parent.addSubgroup(
-                new WordKeywordGroup("node", GroupHierarchyType.REFINING, StandardField.AUTHOR, "author1", true, ',', false));
+        GroupTreeNode parent =
+                grandParent.addSubgroup(
+                        new WordKeywordGroup(
+                                "node",
+                                GroupHierarchyType.INDEPENDENT,
+                                StandardField.AUTHOR,
+                                "author2",
+                                true,
+                                ',',
+                                false));
+        GroupTreeNode node =
+                parent.addSubgroup(
+                        new WordKeywordGroup(
+                                "node",
+                                GroupHierarchyType.REFINING,
+                                StandardField.AUTHOR,
+                                "author1",
+                                true,
+                                ',',
+                                false));
         assertEquals(1, node.findMatches(entries).size());
     }
 
     @Test
     void findMatchesWorksForHierarchyOfIndependentGroups() {
         GroupTreeNode grandParent = getNodeInSimpleTree();
-        GroupTreeNode parent = grandParent.addSubgroup(
-                new WordKeywordGroup("node", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR, "author2", true, ',', false));
-        GroupTreeNode node = parent.addSubgroup(
-                new WordKeywordGroup("node", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR, "author1", true, ',', false));
+        GroupTreeNode parent =
+                grandParent.addSubgroup(
+                        new WordKeywordGroup(
+                                "node",
+                                GroupHierarchyType.INDEPENDENT,
+                                StandardField.AUTHOR,
+                                "author2",
+                                true,
+                                ',',
+                                false));
+        GroupTreeNode node =
+                parent.addSubgroup(
+                        new WordKeywordGroup(
+                                "node",
+                                GroupHierarchyType.INDEPENDENT,
+                                StandardField.AUTHOR,
+                                "author1",
+                                true,
+                                ',',
+                                false));
         assertEquals(2, node.findMatches(entries).size());
     }
 
@@ -255,7 +323,12 @@ void setGroupExplicitToSearchDoesNotKeepPreviousAssignments() {
         ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ',');
         oldGroup.add(entry);
         GroupTreeNode node = GroupTreeNode.fromGroup(oldGroup);
-        AbstractGroup newGroup = new SearchGroup("NewGroup", GroupHierarchyType.INDEPENDENT, "test", EnumSet.noneOf(SearchFlags.class));
+        AbstractGroup newGroup =
+                new SearchGroup(
+                        "NewGroup",
+                        GroupHierarchyType.INDEPENDENT,
+                        "test",
+                        EnumSet.noneOf(SearchFlags.class));
 
         node.setGroup(newGroup, true, true, entries);
 
@@ -303,9 +376,12 @@ void getPathSimpleTree() {
     void onlyRootAndChildNodeContainAtLeastOneEntry() {
         GroupTreeNode rootNode = getRoot();
         rootNode.addSubgroup(new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ','));
-        GroupTreeNode parent = rootNode
-                .addSubgroup(new ExplicitGroup("ExplicitParent", GroupHierarchyType.INDEPENDENT, ','));
-        GroupTreeNode child = parent.addSubgroup(new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ','));
+        GroupTreeNode parent =
+                rootNode.addSubgroup(
+                        new ExplicitGroup("ExplicitParent", GroupHierarchyType.INDEPENDENT, ','));
+        GroupTreeNode child =
+                parent.addSubgroup(
+                        new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ','));
 
         BibEntry newEntry = new BibEntry().withField(StandardField.AUTHOR, "Stephen King");
         child.addEntriesToGroup(Collections.singletonList(newEntry));
@@ -318,22 +394,38 @@ void onlyRootAndChildNodeContainAtLeastOneEntry() {
     void onlySubgroupsContainAllEntries() {
         GroupTreeNode rootNode = getRoot();
         rootNode.addSubgroup(new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ','));
-        GroupTreeNode parent = rootNode
-                .addSubgroup(new ExplicitGroup("ExplicitParent", GroupHierarchyType.INDEPENDENT, ','));
-        GroupTreeNode firstChild = parent.addSubgroup(new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ','));
-        GroupTreeNode secondChild = parent.addSubgroup(new ExplicitGroup("ExplicitSecondNode", GroupHierarchyType.REFINING, ','));
-        GroupTreeNode grandChild = secondChild.addSubgroup(new ExplicitGroup("ExplicitNodeThirdLevel", GroupHierarchyType.REFINING, ','));
+        GroupTreeNode parent =
+                rootNode.addSubgroup(
+                        new ExplicitGroup("ExplicitParent", GroupHierarchyType.INDEPENDENT, ','));
+        GroupTreeNode firstChild =
+                parent.addSubgroup(
+                        new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ','));
+        GroupTreeNode secondChild =
+                parent.addSubgroup(
+                        new ExplicitGroup("ExplicitSecondNode", GroupHierarchyType.REFINING, ','));
+        GroupTreeNode grandChild =
+                secondChild.addSubgroup(
+                        new ExplicitGroup(
+                                "ExplicitNodeThirdLevel", GroupHierarchyType.REFINING, ','));
 
         parent.addEntriesToGroup(Collections.singletonList(entry));
         firstChild.addEntriesToGroup(entries);
         secondChild.addEntriesToGroup(entries);
         grandChild.addEntriesToGroup(entries);
-        assertEquals(parent.getContainingGroups(entries, true), Arrays.asList(firstChild, secondChild, grandChild));
+        assertEquals(
+                parent.getContainingGroups(entries, true),
+                Arrays.asList(firstChild, secondChild, grandChild));
     }
 
     @Test
     void addEntriesToGroupWorksNotForGroupsNotSupportingExplicitAddingOfEntries() {
-        GroupTreeNode searchGroup = new GroupTreeNode(new SearchGroup("Search A", GroupHierarchyType.INCLUDING, "searchExpression", EnumSet.of(SearchFlags.CASE_SENSITIVE)));
+        GroupTreeNode searchGroup =
+                new GroupTreeNode(
+                        new SearchGroup(
+                                "Search A",
+                                GroupHierarchyType.INCLUDING,
+                                "searchExpression",
+                                EnumSet.of(SearchFlags.CASE_SENSITIVE)));
         List<FieldChange> fieldChanges = searchGroup.addEntriesToGroup(entries);
 
         assertEquals(Collections.emptyList(), fieldChanges);
@@ -341,7 +433,13 @@ void addEntriesToGroupWorksNotForGroupsNotSupportingExplicitAddingOfEntries() {
 
     @Test
     void removeEntriesFromGroupWorksNotForGroupsNotSupportingExplicitRemovalOfEntries() {
-        GroupTreeNode searchGroup = new GroupTreeNode(new SearchGroup("Search A", GroupHierarchyType.INCLUDING, "searchExpression", EnumSet.of(SearchFlags.CASE_SENSITIVE)));
+        GroupTreeNode searchGroup =
+                new GroupTreeNode(
+                        new SearchGroup(
+                                "Search A",
+                                GroupHierarchyType.INCLUDING,
+                                "searchExpression",
+                                EnumSet.of(SearchFlags.CASE_SENSITIVE)));
         List<FieldChange> fieldChanges = searchGroup.removeEntriesFromGroup(entries);
 
         assertEquals(Collections.emptyList(), fieldChanges);
diff --git a/src/test/java/org/jabref/model/groups/TexGroupTest.java b/src/test/java/org/jabref/model/groups/TexGroupTest.java
index c4ce616f6d34..a4c7052527f5 100644
--- a/src/test/java/org/jabref/model/groups/TexGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/TexGroupTest.java
@@ -1,6 +1,8 @@
 package org.jabref.model.groups;
 
-import java.nio.file.Path;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.logic.auxparser.DefaultAuxParser;
@@ -8,13 +10,10 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.nio.file.Path;
 
 @AllowedToUseLogic("because class under test relies on logic classes")
 class TexGroupTest {
@@ -29,7 +28,14 @@ void setUp() throws Exception {
     @Test
     void containsReturnsTrueForEntryInAux() throws Exception {
         Path auxFile = Path.of(TexGroupTest.class.getResource("paper.aux").toURI());
-        TexGroup group = new TexGroup("paper", GroupHierarchyType.INDEPENDENT, auxFile, new DefaultAuxParser(new BibDatabase()), new DummyFileUpdateMonitor(), metaData);
+        TexGroup group =
+                new TexGroup(
+                        "paper",
+                        GroupHierarchyType.INDEPENDENT,
+                        auxFile,
+                        new DefaultAuxParser(new BibDatabase()),
+                        new DummyFileUpdateMonitor(),
+                        metaData);
         BibEntry inAux = new BibEntry();
         inAux.setCitationKey("Darwin1888");
 
@@ -39,7 +45,14 @@ void containsReturnsTrueForEntryInAux() throws Exception {
     @Test
     void containsReturnsTrueForEntryNotInAux() throws Exception {
         Path auxFile = Path.of(TexGroupTest.class.getResource("paper.aux").toURI());
-        TexGroup group = new TexGroup("paper", GroupHierarchyType.INDEPENDENT, auxFile, new DefaultAuxParser(new BibDatabase()), new DummyFileUpdateMonitor(), metaData);
+        TexGroup group =
+                new TexGroup(
+                        "paper",
+                        GroupHierarchyType.INDEPENDENT,
+                        auxFile,
+                        new DefaultAuxParser(new BibDatabase()),
+                        new DummyFileUpdateMonitor(),
+                        metaData);
         BibEntry notInAux = new BibEntry();
         notInAux.setCitationKey("NotInAux2017");
 
@@ -51,7 +64,15 @@ void getFilePathReturnsRelativePath() throws Exception {
         Path auxFile = Path.of(TexGroupTest.class.getResource("paper.aux").toURI());
         String user = "Darwin";
         metaData.setLatexFileDirectory(user, auxFile.getParent());
-        TexGroup group = new TexGroup("paper", GroupHierarchyType.INDEPENDENT, auxFile, new DefaultAuxParser(new BibDatabase()), new DummyFileUpdateMonitor(), metaData, user);
+        TexGroup group =
+                new TexGroup(
+                        "paper",
+                        GroupHierarchyType.INDEPENDENT,
+                        auxFile,
+                        new DefaultAuxParser(new BibDatabase()),
+                        new DummyFileUpdateMonitor(),
+                        metaData,
+                        user);
 
         assertEquals("paper.aux", group.getFilePath().toString());
     }
diff --git a/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java b/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java
index a9b453a99c56..eccb69ea4c28 100644
--- a/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java
@@ -1,16 +1,15 @@
 package org.jabref.model.groups;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Optional;
 
 class WordKeywordGroupTest {
 
@@ -21,9 +20,33 @@ class WordKeywordGroupTest {
 
     @BeforeEach
     void setUp() {
-        testGroup = new WordKeywordGroup("name", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, "test", false, ',', false);
-        testCaseSensitiveGroup = new WordKeywordGroup("name", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, "test", true, ',', false);
-        waterGroup = new WordKeywordGroup("name", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, "\\H2O", false, ',', false);
+        testGroup =
+                new WordKeywordGroup(
+                        "name",
+                        GroupHierarchyType.INDEPENDENT,
+                        StandardField.KEYWORDS,
+                        "test",
+                        false,
+                        ',',
+                        false);
+        testCaseSensitiveGroup =
+                new WordKeywordGroup(
+                        "name",
+                        GroupHierarchyType.INDEPENDENT,
+                        StandardField.KEYWORDS,
+                        "test",
+                        true,
+                        ',',
+                        false);
+        waterGroup =
+                new WordKeywordGroup(
+                        "name",
+                        GroupHierarchyType.INDEPENDENT,
+                        StandardField.KEYWORDS,
+                        "\\H2O",
+                        false,
+                        ',',
+                        false);
         entry = new BibEntry();
     }
 
diff --git a/src/test/java/org/jabref/model/metadata/MetaDataTest.java b/src/test/java/org/jabref/model/metadata/MetaDataTest.java
index e67d8b0ba154..61f13737994d 100644
--- a/src/test/java/org/jabref/model/metadata/MetaDataTest.java
+++ b/src/test/java/org/jabref/model/metadata/MetaDataTest.java
@@ -1,11 +1,11 @@
 package org.jabref.model.metadata;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Optional;
 
 class MetaDataTest {
 
diff --git a/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java b/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java
index 6e003d6746b4..e60bdea17fd5 100644
--- a/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java
+++ b/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java
@@ -1,13 +1,13 @@
 package org.jabref.model.openoffice;
 
-import java.util.Optional;
-
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+
 class CitationEntryTest {
 
     @Test
diff --git a/src/test/java/org/jabref/model/paging/PageTest.java b/src/test/java/org/jabref/model/paging/PageTest.java
index e58f593a5212..d4716116445f 100644
--- a/src/test/java/org/jabref/model/paging/PageTest.java
+++ b/src/test/java/org/jabref/model/paging/PageTest.java
@@ -1,17 +1,17 @@
 package org.jabref.model.paging;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 class PageTest {
     private Page<String> page1;
     private Page<String> page2;
diff --git a/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java b/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java
index 4cc4d315b347..a2107981aba0 100644
--- a/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java
+++ b/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java
@@ -1,13 +1,13 @@
 package org.jabref.model.pdf;
 
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.Optional;
 
 class FileAnnotationTest {
 
@@ -41,10 +41,14 @@ void parseNotADate() {
 
     @Test
     void abbreviateAnnotationName() {
-        final FileAnnotation fileAnnotation = new FileAnnotation("John Robertson",
-                LocalDateTime.of(2020, 4, 18, 17, 10), 1,
-                "this is an annotation that is very long and goes over the character limit of 45",
-                FileAnnotationType.FREETEXT, Optional.empty());
+        final FileAnnotation fileAnnotation =
+                new FileAnnotation(
+                        "John Robertson",
+                        LocalDateTime.of(2020, 4, 18, 17, 10),
+                        1,
+                        "this is an annotation that is very long and goes over the character limit of 45",
+                        FileAnnotationType.FREETEXT,
+                        Optional.empty());
 
         assertEquals("this is an annotation that is very long and g...", fileAnnotation.toString());
     }
diff --git a/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java b/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java
index d55c8ecb68b8..3be52205030b 100644
--- a/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java
+++ b/src/test/java/org/jabref/model/search/matchers/MatcherSetsTest.java
@@ -1,13 +1,12 @@
 package org.jabref.model.search.matchers;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.rules.MockSearchMatcher;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 class MatcherSetsTest {
 
     @Test
diff --git a/src/test/java/org/jabref/model/strings/StringUtilTest.java b/src/test/java/org/jabref/model/strings/StringUtilTest.java
index 5adf4d6f9e3a..ed0603a85bb3 100644
--- a/src/test/java/org/jabref/model/strings/StringUtilTest.java
+++ b/src/test/java/org/jabref/model/strings/StringUtilTest.java
@@ -1,16 +1,5 @@
 package org.jabref.model.strings;
 
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -18,16 +7,36 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.stream.Stream;
+
 class StringUtilTest {
 
     @Test
     void StringUtilClassIsSmall() throws Exception {
-        Path path = Path.of("src", "main", "java", StringUtil.class.getName().replace('.', '/') + ".java");
+        Path path =
+                Path.of(
+                        "src",
+                        "main",
+                        "java",
+                        StringUtil.class.getName().replace('.', '/') + ".java");
         int lineCount = Files.readAllLines(path, StandardCharsets.UTF_8).size();
 
-        assertTrue(lineCount <= 774, "StringUtil increased in size to " + lineCount + ". "
-                + "We try to keep this class as small as possible. "
-                + "Thus think twice if you add something to StringUtil.");
+        assertTrue(
+                lineCount <= 774,
+                "StringUtil increased in size to "
+                        + lineCount
+                        + ". "
+                        + "We try to keep this class as small as possible. "
+                        + "Thus think twice if you add something to StringUtil.");
     }
 
     @Test
@@ -131,7 +140,7 @@ void join() {
 
         assertEquals("", StringUtil.join(s, "\\", 3, s.length));
 
-        assertEquals("", StringUtil.join(new String[]{}, "\\", 0, 0));
+        assertEquals("", StringUtil.join(new String[] {}, "\\", 0, 0));
     }
 
     @Test
@@ -166,27 +175,44 @@ void findEncodingsForString() {
     @Test
     void wrap() {
         String newline = "newline";
-        assertEquals("aaaaa" + newline + "\tbbbbb" + newline + "\tccccc",
+        assertEquals(
+                "aaaaa" + newline + "\tbbbbb" + newline + "\tccccc",
                 StringUtil.wrap("aaaaa bbbbb ccccc", 5, newline));
-        assertEquals("aaaaa bbbbb" + newline + "\tccccc", StringUtil.wrap("aaaaa bbbbb ccccc", 8, newline));
-        assertEquals("aaaaa bbbbb" + newline + "\tccccc", StringUtil.wrap("aaaaa bbbbb ccccc", 11, newline));
+        assertEquals(
+                "aaaaa bbbbb" + newline + "\tccccc",
+                StringUtil.wrap("aaaaa bbbbb ccccc", 8, newline));
+        assertEquals(
+                "aaaaa bbbbb" + newline + "\tccccc",
+                StringUtil.wrap("aaaaa bbbbb ccccc", 11, newline));
         assertEquals("aaaaa bbbbb ccccc", StringUtil.wrap("aaaaa bbbbb ccccc", 12, newline));
-        assertEquals("aaaaa" + newline + "\t" + newline + "\tbbbbb" + newline + "\t" + newline + "\tccccc",
+        assertEquals(
+                "aaaaa" + newline + "\t" + newline + "\tbbbbb" + newline + "\t" + newline
+                        + "\tccccc",
                 StringUtil.wrap("aaaaa\nbbbbb\nccccc", 12, newline));
         assertEquals(
-                "aaaaa" + newline + "\t" + newline + "\t" + newline + "\tbbbbb" + newline + "\t" + newline + "\tccccc",
+                "aaaaa" + newline + "\t" + newline + "\t" + newline + "\tbbbbb" + newline + "\t"
+                        + newline + "\tccccc",
                 StringUtil.wrap("aaaaa\n\nbbbbb\nccccc", 12, newline));
-        assertEquals("aaaaa" + newline + "\t" + newline + "\tbbbbb" + newline + "\t" + newline + "\tccccc",
+        assertEquals(
+                "aaaaa" + newline + "\t" + newline + "\tbbbbb" + newline + "\t" + newline
+                        + "\tccccc",
                 StringUtil.wrap("aaaaa\r\nbbbbb\r\nccccc", 12, newline));
     }
 
     @Test
     void decodeStringDoubleArray() {
-        assertArrayEquals(new String[][]{{"a", "b"}, {"c", "d"}}, StringUtil.decodeStringDoubleArray("a:b;c:d"));
-        assertArrayEquals(new String[][]{{"a", ""}, {"c", "d"}}, StringUtil.decodeStringDoubleArray("a:;c:d"));
-        // arrays first differed at element [0][1]; expected: null<null> but was: java.lang.String<null>
+        assertArrayEquals(
+                new String[][] {{"a", "b"}, {"c", "d"}},
+                StringUtil.decodeStringDoubleArray("a:b;c:d"));
+        assertArrayEquals(
+                new String[][] {{"a", ""}, {"c", "d"}},
+                StringUtil.decodeStringDoubleArray("a:;c:d"));
+        // arrays first differed at element [0][1]; expected: null<null> but was:
+        // java.lang.String<null>
         // assertArrayEquals(stringArray2res, StringUtil.decodeStringDoubleArray(encStringArray2));
-        assertArrayEquals(new String[][]{{"a", ":b"}, {"c;", "d"}}, StringUtil.decodeStringDoubleArray("a:\\:b;c\\;:d"));
+        assertArrayEquals(
+                new String[][] {{"a", ":b"}, {"c;", "d"}},
+                StringUtil.decodeStringDoubleArray("a:\\:b;c\\;:d"));
     }
 
     @Test
@@ -320,8 +346,7 @@ static Stream<Arguments> testRepeatSpacesData() {
                 Arguments.of("", -1),
                 Arguments.of("", 0),
                 Arguments.of(" ", 1),
-                Arguments.of("       ", 7)
-        );
+                Arguments.of("       ", 7));
     }
 
     @ParameterizedTest
@@ -372,8 +397,7 @@ private static Stream<Arguments> getQuoteStringIfSpaceIsContainedData() {
                 Arguments.of("", ""),
                 Arguments.of("\" \"", " "),
                 Arguments.of("world", "world"),
-                Arguments.of("\"hello world\"", "hello world")
-        );
+                Arguments.of("\"hello world\"", "hello world"));
     }
 
     @ParameterizedTest
@@ -398,7 +422,6 @@ static Stream<Arguments> containsWhitespace() {
                 Arguments.of(true, "file_url "),
                 Arguments.of(true, "file url\n"),
                 Arguments.of(true, " "),
-
                 Arguments.of(false, "file_url"),
                 Arguments.of(false, "PascalCase"),
                 Arguments.of(false, ""));
diff --git a/src/test/java/org/jabref/model/texparser/CitationTest.java b/src/test/java/org/jabref/model/texparser/CitationTest.java
index f51600aa0c06..7ae93bdadc1e 100644
--- a/src/test/java/org/jabref/model/texparser/CitationTest.java
+++ b/src/test/java/org/jabref/model/texparser/CitationTest.java
@@ -1,7 +1,9 @@
 package org.jabref.model.texparser;
 
-import java.nio.file.Path;
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -10,10 +12,8 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.params.provider.Arguments.arguments;
+import java.nio.file.Path;
+import java.util.stream.Stream;
 
 class CitationTest {
 
@@ -32,23 +32,20 @@ void init() {
     }
 
     private static Stream<Arguments> colStartColEndNotInBounds() {
-        return Stream.of(
-                arguments(-1, 2),
-                arguments(1, 9)
-        );
+        return Stream.of(arguments(-1, 2), arguments(1, 9));
     }
 
     private static Stream<Arguments> colStartColEndInBounds() {
-        return Stream.of(
-                arguments(0, 2),
-                arguments(1, 8)
-        );
+        return Stream.of(arguments(0, 2), arguments(1, 8));
     }
 
     @ParameterizedTest
     @ValueSource(ints = {-1, 0})
     void constructorLineSmallerEqualZeroTest(int line) {
-        Exception e = assertThrows(IllegalArgumentException.class, () -> new Citation(path, line, 1, 5, lineText));
+        Exception e =
+                assertThrows(
+                        IllegalArgumentException.class,
+                        () -> new Citation(path, line, 1, 5, lineText));
         assertEquals("Line has to be greater than 0.", e.getMessage());
     }
 
@@ -61,7 +58,10 @@ void constructorLineLargerZeroTest(int line) {
     @ParameterizedTest
     @MethodSource("colStartColEndNotInBounds")
     void constructorColStartColEndNotInBoundsTest(int colStart, int colEnd) {
-        Exception e = assertThrows(IllegalArgumentException.class, () -> new Citation(path, line, colStart, colEnd, lineText));
+        Exception e =
+                assertThrows(
+                        IllegalArgumentException.class,
+                        () -> new Citation(path, line, colStart, colEnd, lineText));
         assertEquals("Citation has to be between 0 and line length.", e.getMessage());
     }
 
diff --git a/src/test/java/org/jabref/performance/BibtexEntryGenerator.java b/src/test/java/org/jabref/performance/BibtexEntryGenerator.java
index f69932fe26a6..30e77e44caf6 100644
--- a/src/test/java/org/jabref/performance/BibtexEntryGenerator.java
+++ b/src/test/java/org/jabref/performance/BibtexEntryGenerator.java
@@ -12,15 +12,17 @@ public String generateBibtexEntries(int number) {
     }
 
     private String generateBibtexEntry(int i) {
-        return "@article{einstein1916grundlage" + i + ",\n" +
-                "  title={Die grundlage der allgemeinen relativit{\\\"a}tstheorie},\n" +
-                "  author={Einstein, Albert},\n" +
-                "  journal={Annalen der Physik},\n" +
-                "  volume={354},\n" +
-                "  number={7},\n" +
-                "  pages={769--822},\n" +
-                "  year={1916},\n" +
-                "  publisher={Wiley Online Library}\n" +
-                "}\n";
+        return "@article{einstein1916grundlage"
+                + i
+                + ",\n"
+                + "  title={Die grundlage der allgemeinen relativit{\\\"a}tstheorie},\n"
+                + "  author={Einstein, Albert},\n"
+                + "  journal={Annalen der Physik},\n"
+                + "  volume={354},\n"
+                + "  number={7},\n"
+                + "  pages={769--822},\n"
+                + "  year={1916},\n"
+                + "  publisher={Wiley Online Library}\n"
+                + "}\n";
     }
 }
diff --git a/src/test/java/org/jabref/preferences/CitationCommandStringTest.java b/src/test/java/org/jabref/preferences/CitationCommandStringTest.java
index 0bca17e7eed0..66388ebcb0ef 100644
--- a/src/test/java/org/jabref/preferences/CitationCommandStringTest.java
+++ b/src/test/java/org/jabref/preferences/CitationCommandStringTest.java
@@ -1,39 +1,31 @@
 package org.jabref.preferences;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jabref.logic.push.CitationCommandString;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.stream.Stream;
 
 class CitationCommandStringTest {
 
     @Test
     void testToString() {
-        assertEquals("\\cite{key1,key2}", new CitationCommandString("\\cite{", ",", "}").toString());
+        assertEquals(
+                "\\cite{key1,key2}", new CitationCommandString("\\cite{", ",", "}").toString());
     }
 
     public static Stream<Arguments> from() {
         return Stream.of(
-                Arguments.of(
-                        new CitationCommandString("\\cite{", ",", "}"),
-                        "\\cite{key1,key2}"
-                ),
-                Arguments.of(
-                        new CitationCommandString("\\cite{", ",", "}"),
-                        "\\cite"
-                ),
+                Arguments.of(new CitationCommandString("\\cite{", ",", "}"), "\\cite{key1,key2}"),
+                Arguments.of(new CitationCommandString("\\cite{", ",", "}"), "\\cite"),
                 // We could do better, but this is very seldom
                 Arguments.of(
                         new CitationCommandString("\\cite[key1,key]{", ",", "}"),
-                        "\\cite[key1,key]"
-                )
-        );
+                        "\\cite[key1,key]"));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/support/DisabledOnCIServer.java b/src/test/java/org/jabref/support/DisabledOnCIServer.java
index 63cbef5c1305..7fca2d609da3 100644
--- a/src/test/java/org/jabref/support/DisabledOnCIServer.java
+++ b/src/test/java/org/jabref/support/DisabledOnCIServer.java
@@ -1,12 +1,12 @@
 package org.jabref.support;
 
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
-
 @Target(value = {ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @DisabledIfEnvironmentVariable(named = "CI", matches = "true")
diff --git a/src/test/java/org/jabref/testutils/category/DatabaseTest.java b/src/test/java/org/jabref/testutils/category/DatabaseTest.java
index b4611ddc2e45..a1b98a72e49a 100644
--- a/src/test/java/org/jabref/testutils/category/DatabaseTest.java
+++ b/src/test/java/org/jabref/testutils/category/DatabaseTest.java
@@ -1,16 +1,15 @@
 package org.jabref.testutils.category;
 
+import org.junit.jupiter.api.Tag;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.junit.jupiter.api.Tag;
-
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Tag("DatabaseTest")
-public @interface DatabaseTest {
-}
+public @interface DatabaseTest {}
diff --git a/src/test/java/org/jabref/testutils/category/FetcherTest.java b/src/test/java/org/jabref/testutils/category/FetcherTest.java
index 3f01fae2ce3a..cc91e696ca82 100644
--- a/src/test/java/org/jabref/testutils/category/FetcherTest.java
+++ b/src/test/java/org/jabref/testutils/category/FetcherTest.java
@@ -1,13 +1,13 @@
 package org.jabref.testutils.category;
 
+import org.junit.jupiter.api.Tag;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.junit.jupiter.api.Tag;
-
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
diff --git a/src/test/java/org/jabref/testutils/category/GUITest.java b/src/test/java/org/jabref/testutils/category/GUITest.java
index 8add1b3eda8d..0545fe2c0b43 100644
--- a/src/test/java/org/jabref/testutils/category/GUITest.java
+++ b/src/test/java/org/jabref/testutils/category/GUITest.java
@@ -1,13 +1,13 @@
 package org.jabref.testutils.category;
 
+import org.junit.jupiter.api.Tag;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.junit.jupiter.api.Tag;
-
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
diff --git a/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterMain.java b/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterMain.java
index c026d68fe991..827a4a6b37c6 100644
--- a/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterMain.java
+++ b/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterMain.java
@@ -23,11 +23,13 @@ public static void main(String[] args) {
     public void start(Stage stage) throws JabRefException {
         StyleTesterView view = new StyleTesterView();
         DefaultFileUpdateMonitor fileUpdateMonitor = new DefaultFileUpdateMonitor();
-        HeadlessExecutorService.INSTANCE.executeInterruptableTask(fileUpdateMonitor, "FileUpdateMonitor");
-        ThemeManager themeManager = new ThemeManager(
-                JabRefGuiPreferences.getInstance().getWorkspacePreferences(),
-                fileUpdateMonitor,
-                Runnable::run);
+        HeadlessExecutorService.INSTANCE.executeInterruptableTask(
+                fileUpdateMonitor, "FileUpdateMonitor");
+        ThemeManager themeManager =
+                new ThemeManager(
+                        JabRefGuiPreferences.getInstance().getWorkspacePreferences(),
+                        fileUpdateMonitor,
+                        Runnable::run);
 
         Scene scene = new Scene(view.getContent());
         themeManager.installCss(scene);
diff --git a/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterView.java b/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterView.java
index c4e3c3779b09..e915c0f969c3 100644
--- a/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterView.java
+++ b/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterView.java
@@ -1,12 +1,12 @@
 package org.jabref.testutils.interactive.styletester;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
 import javafx.css.PseudoClass;
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
 import javafx.scene.control.Button;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
 public class StyleTesterView {
     @FXML private Button normalButtonHover;
     @FXML private Button normalButtonPressed;
@@ -20,9 +20,7 @@ public class StyleTesterView {
     private Parent content;
 
     StyleTesterView() {
-        content = ViewLoader.view(this)
-                            .load()
-                            .getView();
+        content = ViewLoader.view(this).load().getView();
 
         setStates();
     }